diff --git a/e2e/package.json b/e2e/package.json index db322429..21699efd 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -13,7 +13,6 @@ "@mtcute/mtproxy": "*", "@mtcute/node": "*", "@mtcute/socks-proxy": "*", - "@mtcute/sqlite": "*", "@mtcute/tl": "*", "@mtcute/tl-runtime": "*", "@mtcute/tl-utils": "*", diff --git a/e2e/ts/utils.ts b/e2e/ts/utils.ts index 7a392e2c..0e289f24 100644 --- a/e2e/ts/utils.ts +++ b/e2e/ts/utils.ts @@ -4,8 +4,7 @@ import { join } from 'path' import { MaybePromise, MemoryStorage } from '@mtcute/core' import { setPlatform } from '@mtcute/core/platform.js' import { LogManager, sleep } from '@mtcute/core/utils.js' -import { NodeCryptoProvider, NodePlatform, TcpTransport } from '@mtcute/node' -import { SqliteStorage } from '@mtcute/sqlite' +import { NodeCryptoProvider, NodePlatform, SqliteStorage, TcpTransport } from '@mtcute/node' export const getApiParams = (storage?: string) => { if (!process.env.API_ID || !process.env.API_HASH) { diff --git a/packages/node/package.json b/packages/node/package.json index db841c87..b71799a9 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -2,7 +2,7 @@ "name": "@mtcute/node", "private": true, "version": "0.8.0", - "description": "Meta-package for Node JS", + "description": "Meta-package for Node.js", "author": "Alina Sireneva ", "license": "MIT", "main": "src/index.ts", @@ -31,11 +31,12 @@ "dependencies": { "@mtcute/core": "workspace:^", "@mtcute/wasm": "workspace:^", - "@mtcute/sqlite": "workspace:^", "@mtcute/markdown-parser": "workspace:^", - "@mtcute/html-parser": "workspace:^" + "@mtcute/html-parser": "workspace:^", + "better-sqlite3": "9.2.2" }, "devDependencies": { - "@mtcute/test": "workspace:^" + "@mtcute/test": "workspace:^", + "@types/better-sqlite3": "7.6.4" } } diff --git a/packages/node/src/client.ts b/packages/node/src/client.ts index fa337990..6c38a5a9 100644 --- a/packages/node/src/client.ts +++ b/packages/node/src/client.ts @@ -9,11 +9,11 @@ import { TelegramClientOptions, } from '@mtcute/core/client.js' import { setPlatform } from '@mtcute/core/platform.js' -import { SqliteStorage } from '@mtcute/sqlite' import { downloadToFile } from './methods/download-file.js' import { downloadAsNodeStream } from './methods/download-node-stream.js' import { NodePlatform } from './platform.js' +import { SqliteStorage } from './sqlite/index.js' import { NodeCryptoProvider } from './utils/crypto.js' import { TcpTransport } from './utils/tcp.js' diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts index cd8c5fc4..87f84c57 100644 --- a/packages/node/src/index.ts +++ b/packages/node/src/index.ts @@ -1,9 +1,9 @@ export * from './client.js' export * from './platform.js' +export * from './sqlite/index.js' export * from './utils/crypto.js' export * from './utils/tcp.js' export * from './worker.js' export * from '@mtcute/core' export * from '@mtcute/html-parser' export * from '@mtcute/markdown-parser' -export * from '@mtcute/sqlite' diff --git a/packages/sqlite/src/driver.ts b/packages/node/src/sqlite/driver.ts similarity index 100% rename from packages/sqlite/src/driver.ts rename to packages/node/src/sqlite/driver.ts diff --git a/packages/sqlite/src/index.ts b/packages/node/src/sqlite/index.ts similarity index 100% rename from packages/sqlite/src/index.ts rename to packages/node/src/sqlite/index.ts diff --git a/packages/sqlite/test/sqlite.test.ts b/packages/node/src/sqlite/sqlite.test.ts similarity index 93% rename from packages/sqlite/test/sqlite.test.ts rename to packages/node/src/sqlite/sqlite.test.ts index 9b3e93ce..fe992683 100644 --- a/packages/sqlite/test/sqlite.test.ts +++ b/packages/node/src/sqlite/sqlite.test.ts @@ -9,7 +9,7 @@ import { } from '@mtcute/test' if (import.meta.env.TEST_ENV === 'node') { - const { SqliteStorage } = await import('../src/index.js') + const { SqliteStorage } = await import('./index.js') describe('SqliteStorage', () => { const storage = new SqliteStorage(':memory:') diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json index b9a14bd0..c8886a87 100644 --- a/packages/node/tsconfig.json +++ b/packages/node/tsconfig.json @@ -9,7 +9,6 @@ ], "references": [ { "path": "../core" }, - { "path": "../sqlite" }, { "path": "../dispatcher" }, { "path": "../html-parser" }, { "path": "../markdown-parser" } diff --git a/packages/sqlite/README.md b/packages/sqlite/README.md deleted file mode 100644 index abf522cb..00000000 --- a/packages/sqlite/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# @mtcute/sqlite - -📖 [API Reference](https://ref.mtcute.dev/modules/_mtcute_sqlite.html) - -SQLite backed storage for mtcute, built with `better-sqlite3` - -## Usage - -```typescript -import { SqliteStorage } from '@mtcute/sqlite' - -const tg = new TelegramClient({ - // ... - storage: new SqliteStorage('client.session') -}) -``` diff --git a/packages/sqlite/package.json b/packages/sqlite/package.json deleted file mode 100644 index fea2d1ab..00000000 --- a/packages/sqlite/package.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "@mtcute/sqlite", - "private": true, - "version": "0.8.0", - "description": "SQLite-based storage for mtcute", - "author": "Alina Sireneva ", - "license": "MIT", - "main": "src/index.ts", - "type": "module", - "sideEffects": false, - "distOnlyFields": { - "exports": { - ".": { - "import": "./esm/index.js", - "require": "./cjs/index.js" - } - } - }, - "scripts": { - "docs": "typedoc", - "build": "pnpm run -w build-package sqlite" - }, - "dependencies": { - "@mtcute/core": "workspace:^", - "@mtcute/tl": "*", - "@mtcute/tl-runtime": "workspace:^", - "better-sqlite3": "9.2.2" - }, - "devDependencies": { - "@mtcute/test": "workspace:^", - "@types/better-sqlite3": "7.6.4" - } -} diff --git a/packages/sqlite/test/tsconfig.json b/packages/sqlite/test/tsconfig.json deleted file mode 100644 index 23b6b033..00000000 --- a/packages/sqlite/test/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../../tsconfig.json", - "include": [ - "." - ], - "references": [ - { "path": "../" } - ] -} diff --git a/packages/sqlite/tsconfig.json b/packages/sqlite/tsconfig.json deleted file mode 100644 index 9ae9f2ef..00000000 --- a/packages/sqlite/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "outDir": "./dist/esm", - "rootDir": "./src" - }, - "include": [ - "./src" - ], - "references": [ - { "path": "../core" } - ] -} diff --git a/packages/sqlite/typedoc.cjs b/packages/sqlite/typedoc.cjs deleted file mode 100644 index c062faa9..00000000 --- a/packages/sqlite/typedoc.cjs +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - extends: ['../../.config/typedoc/config.base.cjs'], - entryPoints: ['./src/index.ts'], -} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 814de55d..57a42506 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -281,37 +281,9 @@ importers: '@mtcute/markdown-parser': specifier: workspace:^ version: link:../markdown-parser - '@mtcute/sqlite': - specifier: workspace:^ - version: link:../sqlite '@mtcute/wasm': specifier: workspace:^ version: link:../wasm - devDependencies: - '@mtcute/test': - specifier: workspace:^ - version: link:../test - - packages/socks-proxy: - dependencies: - '@mtcute/node': - specifier: workspace:^ - version: link:../node - ip6: - specifier: 0.2.7 - version: 0.2.7 - - packages/sqlite: - dependencies: - '@mtcute/core': - specifier: workspace:^ - version: link:../core - '@mtcute/tl': - specifier: '*' - version: link:../tl - '@mtcute/tl-runtime': - specifier: workspace:^ - version: link:../tl-runtime better-sqlite3: specifier: 9.2.2 version: 9.2.2 @@ -323,6 +295,15 @@ importers: specifier: 7.6.4 version: 7.6.4 + packages/socks-proxy: + dependencies: + '@mtcute/node': + specifier: workspace:^ + version: link:../node + ip6: + specifier: 0.2.7 + version: 0.2.7 + packages/test: dependencies: '@mtcute/core':