diff --git a/e2e/node/cjs/tests/wasm.js b/e2e/node/cjs/tests/wasm.js index 3047e690..d1fc1830 100644 --- a/e2e/node/cjs/tests/wasm.js +++ b/e2e/node/cjs/tests/wasm.js @@ -1,7 +1,7 @@ const wasm = require('@mtcute/wasm') const { describe, it, before } = require('mocha') const { expect } = require('chai') -const { NodeCryptoProvider } = require('@mtcute/node') +const { NodeCryptoProvider } = require('@mtcute/node/utils.js') before(async () => { await new NodeCryptoProvider().initialize() diff --git a/e2e/node/cjs/utils.js b/e2e/node/cjs/utils.js index c1888ac1..a81c0027 100644 --- a/e2e/node/cjs/utils.js +++ b/e2e/node/cjs/utils.js @@ -1,7 +1,8 @@ const { MemoryStorage } = require('@mtcute/core') const { setPlatform } = require('@mtcute/core/platform.js') const { LogManager } = require('@mtcute/core/utils.js') -const { NodeCryptoProvider, NodePlatform, TcpTransport } = require('@mtcute/node') +const { NodePlatform, TcpTransport } = require('@mtcute/node') +const { NodeCryptoProvider } = require('@mtcute/node/utils.js') exports.getApiParams = () => { if (!process.env.API_ID || !process.env.API_HASH) { diff --git a/e2e/node/esm/tests/wasm.js b/e2e/node/esm/tests/wasm.js index 02067d0c..27291ffa 100644 --- a/e2e/node/esm/tests/wasm.js +++ b/e2e/node/esm/tests/wasm.js @@ -1,7 +1,7 @@ import { expect } from 'chai' import { before, describe, it } from 'mocha' -import { NodeCryptoProvider } from '@mtcute/node' +import { NodeCryptoProvider } from '@mtcute/node/utils.js' import { ige256Decrypt, ige256Encrypt } from '@mtcute/wasm' before(async () => { diff --git a/e2e/node/esm/utils.js b/e2e/node/esm/utils.js index 64910652..938b6c7d 100644 --- a/e2e/node/esm/utils.js +++ b/e2e/node/esm/utils.js @@ -1,7 +1,8 @@ import { MemoryStorage } from '@mtcute/core' import { setPlatform } from '@mtcute/core/platform.js' import { LogManager } from '@mtcute/core/utils.js' -import { NodeCryptoProvider, NodePlatform, TcpTransport } from '@mtcute/node' +import { NodePlatform, TcpTransport } from '@mtcute/node' +import { NodeCryptoProvider } from '@mtcute/node/utils.js' export const getApiParams = () => { if (!process.env.API_ID || !process.env.API_HASH) { diff --git a/e2e/node/ts/tests/packaging/wasm.ts b/e2e/node/ts/tests/packaging/wasm.ts index 02067d0c..27291ffa 100644 --- a/e2e/node/ts/tests/packaging/wasm.ts +++ b/e2e/node/ts/tests/packaging/wasm.ts @@ -1,7 +1,7 @@ import { expect } from 'chai' import { before, describe, it } from 'mocha' -import { NodeCryptoProvider } from '@mtcute/node' +import { NodeCryptoProvider } from '@mtcute/node/utils.js' import { ige256Decrypt, ige256Encrypt } from '@mtcute/wasm' before(async () => { diff --git a/e2e/node/ts/utils.ts b/e2e/node/ts/utils.ts index 0e289f24..c39fa786 100644 --- a/e2e/node/ts/utils.ts +++ b/e2e/node/ts/utils.ts @@ -4,7 +4,8 @@ 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, SqliteStorage, TcpTransport } from '@mtcute/node' +import { NodePlatform, SqliteStorage, TcpTransport } from '@mtcute/node' +import { NodeCryptoProvider } from '@mtcute/node/utils.js' export const getApiParams = (storage?: string) => { if (!process.env.API_ID || !process.env.API_HASH) { diff --git a/packages/crypto-node/src/index.ts b/packages/crypto-node/src/index.ts index 31961840..570ffbc1 100644 --- a/packages/crypto-node/src/index.ts +++ b/packages/crypto-node/src/index.ts @@ -1,5 +1,4 @@ -import { BaseNodeCryptoProvider } from '@mtcute/node' -import { IEncryptionScheme } from '@mtcute/node/utils.js' +import { BaseNodeCryptoProvider, IEncryptionScheme } from '@mtcute/node/utils.js' import { native } from './native.cjs' diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts index d354f7eb..bb9a6310 100644 --- a/packages/node/src/index.ts +++ b/packages/node/src/index.ts @@ -1,7 +1,6 @@ export * from './client.js' export * from './common-internals-node/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' diff --git a/packages/node/src/utils.ts b/packages/node/src/utils.ts index 2cbae9a9..70dd1c86 100644 --- a/packages/node/src/utils.ts +++ b/packages/node/src/utils.ts @@ -1,2 +1,3 @@ +export * from './utils/crypto.js' export * from './utils/stream-utils.js' export * from '@mtcute/core/utils.js' diff --git a/packages/test/src/platform.ts b/packages/test/src/platform.ts index 217a8039..7a43f98f 100644 --- a/packages/test/src/platform.ts +++ b/packages/test/src/platform.ts @@ -1,4 +1,5 @@ -import { NodeCryptoProvider, NodePlatform } from '@mtcute/node' +import { NodePlatform } from '@mtcute/node' +import { NodeCryptoProvider } from '@mtcute/node/utils.js' export const defaultPlatform = new NodePlatform() export const defaultCryptoProvider = new NodeCryptoProvider() diff --git a/packages/tl/scripts/gen-rsa-keys.ts b/packages/tl/scripts/gen-rsa-keys.ts index 73355b13..461b4f21 100644 --- a/packages/tl/scripts/gen-rsa-keys.ts +++ b/packages/tl/scripts/gen-rsa-keys.ts @@ -4,7 +4,7 @@ import { join } from 'path' import readline from 'readline' import { parsePublicKey } from '@mtcute/core/utils.js' -import { NodeCryptoProvider } from '@mtcute/node' +import { NodeCryptoProvider } from '@mtcute/node/utils.js' import { TlPublicKey } from '../binary/rsa-keys.js' import { __dirname, ESM_PRELUDE } from './constants.js'