@mtcute/convert 0.19.4 → 0.20.0

package/gramjs/convert.d.cts

@@ -1,4 +1,4 @@
 import { StringSessionData } from '@mtcute/core/utils.js';
-import { TelethonSession } from '../telethon/types.js';
-export declare function convertFromGramjsSession(session: TelethonSession | string): StringSessionData;
+import { GramjsSession } from './types.js';
+export declare function convertFromGramjsSession(session: GramjsSession | string): StringSessionData;
 export declare function convertToGramjsSession(session: StringSessionData | string): string;

package/gramjs/convert.d.ts

@@ -1,4 +1,4 @@
 import { StringSessionData } from '@mtcute/core/utils.js';
-import { TelethonSession } from '../telethon/types.js';
-export declare function convertFromGramjsSession(session: TelethonSession | string): StringSessionData;
+import { GramjsSession } from './types.js';
+export declare function convertFromGramjsSession(session: GramjsSession | string): StringSessionData;
 export declare function convertToGramjsSession(session: StringSessionData | string): string;

package/index.cjs

@@ -5,23 +5,23 @@ if (typeof globalThis !== "undefined" && !globalThis._MTCUTE_CJS_DEPRECATION_WAR
 }
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const dcs = require("./convert/src/dcs.cjs");
-const convert = require("./convert/src/gramjs/convert.cjs");
-const parse = require("./convert/src/gramjs/parse.cjs");
-const serialize = require("./convert/src/gramjs/serialize.cjs");
-const storeSession = require("./convert/src/gramjs/store-session.cjs");
-const convert$1 = require("./convert/src/mtkruto/convert.cjs");
-const parse$1 = require("./convert/src/mtkruto/parse.cjs");
-const serialize$1 = require("./convert/src/mtkruto/serialize.cjs");
-const convert$2 = require("./convert/src/pyrogram/convert.cjs");
-const parse$2 = require("./convert/src/pyrogram/parse.cjs");
-const serialize$2 = require("./convert/src/pyrogram/serialize.cjs");
-const convert$3 = require("./convert/src/tdesktop/convert.cjs");
-const tdata = require("./convert/src/tdesktop/tdata.cjs");
-const qtBundle = require("./convert/src/tdesktop/qt-bundle.cjs");
-const convert$4 = require("./convert/src/telethon/convert.cjs");
-const parse$3 = require("./convert/src/telethon/parse.cjs");
-const serialize$3 = require("./convert/src/telethon/serialize.cjs");
+const dcs = require("./dcs.cjs");
+const convert = require("./gramjs/convert.cjs");
+const parse = require("./gramjs/parse.cjs");
+const serialize = require("./gramjs/serialize.cjs");
+const storeSession = require("./gramjs/store-session.cjs");
+const convert$1 = require("./mtkruto/convert.cjs");
+const parse$1 = require("./mtkruto/parse.cjs");
+const serialize$1 = require("./mtkruto/serialize.cjs");
+const convert$2 = require("./pyrogram/convert.cjs");
+const parse$2 = require("./pyrogram/parse.cjs");
+const serialize$2 = require("./pyrogram/serialize.cjs");
+const convert$3 = require("./tdesktop/convert.cjs");
+const tdata = require("./tdesktop/tdata.cjs");
+const qtBundle = require("./tdesktop/qt-bundle.cjs");
+const convert$4 = require("./telethon/convert.cjs");
+const parse$3 = require("./telethon/parse.cjs");
+const serialize$3 = require("./telethon/serialize.cjs");
 exports.DC_MAPPING_PROD = dcs.DC_MAPPING_PROD;
 exports.DC_MAPPING_TEST = dcs.DC_MAPPING_TEST;
 exports.isTestDc = dcs.isTestDc;

package/index.js

@@ -1,20 +1,20 @@
-import { DC_MAPPING_PROD, DC_MAPPING_TEST, isTestDc } from "./convert/src/dcs.js";
-import { convertFromGramjsSession, convertToGramjsSession } from "./convert/src/gramjs/convert.js";
-import { parseGramjsSession } from "./convert/src/gramjs/parse.js";
-import { serializeGramjsSession } from "./convert/src/gramjs/serialize.js";
-import { readGramjsStoreSession, writeGramjsStoreSession } from "./convert/src/gramjs/store-session.js";
-import { convertFromMtkrutoSession, convertToMtkrutoSession } from "./convert/src/mtkruto/convert.js";
-import { parseMtkrutoSession } from "./convert/src/mtkruto/parse.js";
-import { serializeMtkrutoSession } from "./convert/src/mtkruto/serialize.js";
-import { convertFromPyrogramSession, convertToPyrogramSession } from "./convert/src/pyrogram/convert.js";
-import { parsePyrogramSession } from "./convert/src/pyrogram/parse.js";
-import { serializePyrogramSession } from "./convert/src/pyrogram/serialize.js";
-import { convertFromTdata, convertToTdata } from "./convert/src/tdesktop/convert.js";
-import { Tdata } from "./convert/src/tdesktop/tdata.js";
-import * as qtBundle from "./convert/src/tdesktop/qt-bundle.js";
-import { convertFromTelethonSession, convertToTelethonSession } from "./convert/src/telethon/convert.js";
-import { parseTelethonSession } from "./convert/src/telethon/parse.js";
-import { serializeTelethonSession } from "./convert/src/telethon/serialize.js";
+import { DC_MAPPING_PROD, DC_MAPPING_TEST, isTestDc } from "./dcs.js";
+import { convertFromGramjsSession, convertToGramjsSession } from "./gramjs/convert.js";
+import { parseGramjsSession } from "./gramjs/parse.js";
+import { serializeGramjsSession } from "./gramjs/serialize.js";
+import { readGramjsStoreSession, writeGramjsStoreSession } from "./gramjs/store-session.js";
+import { convertFromMtkrutoSession, convertToMtkrutoSession } from "./mtkruto/convert.js";
+import { parseMtkrutoSession } from "./mtkruto/parse.js";
+import { serializeMtkrutoSession } from "./mtkruto/serialize.js";
+import { convertFromPyrogramSession, convertToPyrogramSession } from "./pyrogram/convert.js";
+import { parsePyrogramSession } from "./pyrogram/parse.js";
+import { serializePyrogramSession } from "./pyrogram/serialize.js";
+import { convertFromTdata, convertToTdata } from "./tdesktop/convert.js";
+import { Tdata } from "./tdesktop/tdata.js";
+import * as qtBundle from "./tdesktop/qt-bundle.js";
+import { convertFromTelethonSession, convertToTelethonSession } from "./telethon/convert.js";
+import { parseTelethonSession } from "./telethon/parse.js";
+import { serializeTelethonSession } from "./telethon/serialize.js";
 export {
   DC_MAPPING_PROD,
   DC_MAPPING_TEST,

package/package.json

@@ -1,15 +1,18 @@
 {
     "name": "@mtcute/convert",
     "type": "module",
-    "version": "0.19.4",
+    "version": "0.20.0",
     "description": "Cross-library session conversion utilities",
     "license": "MIT",
     "dependencies": {
-        "@mtcute/core": "^0.19.3",
+        "@mtcute/core": "^0.20.0",
         "@fuman/utils": "0.0.4",
         "@fuman/net": "0.0.9",
         "@fuman/io": "0.0.8"
     },
+    "peerDependencies": {
+        "@mtcute/node": "^0.20.0"
+    },
     "exports": {
         ".": {
             "import": {
@@ -24,6 +27,11 @@
     },
     "author": "alina sireneva <alina@tei.su>",
     "sideEffects": false,
+    "peerDependenciesMeta": {
+        "@mtcute/node": {
+            "optional": true
+        }
+    },
     "homepage": "https://mtcute.dev",
     "repository": {
         "type": "git",

package/{convert/src/utils → utils}/crypto.cjs

@@ -32,9 +32,10 @@ async function getDefaultCryptoProvider() {
     /* @vite-ignore */
     await import("node:crypto")
   );
-  const { NodeCryptoProvider } = (
+  const nodeModule = "@mtcute/node/utils.js";
+  const { NodeCryptoProvider } = await import(
     /* @vite-ignore */
-    await Promise.resolve().then(() => require("../../../node/src/utils.cjs"))
+    nodeModule
   );
   return new class extends NodeCryptoProvider {
     createHash(algorithm) {

package/{convert/src/utils → utils}/crypto.js

@@ -3,9 +3,10 @@ async function getDefaultCryptoProvider() {
     /* @vite-ignore */
     await import("node:crypto")
   );
-  const { NodeCryptoProvider } = (
+  const nodeModule = "@mtcute/node/utils.js";
+  const { NodeCryptoProvider } = await import(
     /* @vite-ignore */
-    await import("../../../node/src/utils.js")
+    nodeModule
   );
   return new class extends NodeCryptoProvider {
     createHash(algorithm) {

package/node/src/utils/crypto.cjs

@@ -1,75 +0,0 @@
-if (typeof globalThis !== "undefined" && !globalThis._MTCUTE_CJS_DEPRECATION_WARNED) {
-  globalThis._MTCUTE_CJS_DEPRECATION_WARNED = true;
-  console.warn("[@mtcute/convert] CommonJS support is deprecated and will be removed in 0.25.0. Please consider switching to ESM, it's " + (/* @__PURE__ */ new Date()).getFullYear() + " already.");
-  console.warn("[@mtcute/convert] Learn more about switching to ESM: https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c");
-}
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const node_crypto = require("node:crypto");
-const promises = require("node:fs/promises");
-const node_module = require("node:module");
-const node_zlib = require("node:zlib");
-const utils_js = require("@mtcute/core/utils.js");
-const index = require("../../../wasm/src/index.cjs");
-var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
-class BaseNodeCryptoProvider extends utils_js.BaseCryptoProvider {
-  createAesCtr(key, iv) {
-    const cipher = node_crypto.createCipheriv(`aes-${key.length * 8}-ctr`, key, iv);
-    const update = (data) => cipher.update(data);
-    return {
-      process: update
-    };
-  }
-  pbkdf2(password, salt, iterations, keylen = 64, algo = "sha512") {
-    return new Promise(
-      (resolve, reject) => node_crypto.pbkdf2(password, salt, iterations, keylen, algo, (err, buf) => err !== null ? reject(err) : resolve(buf))
-    );
-  }
-  sha1(data) {
-    return node_crypto.createHash("sha1").update(data).digest();
-  }
-  sha256(data) {
-    return node_crypto.createHash("sha256").update(data).digest();
-  }
-  hmacSha256(data, key) {
-    return node_crypto.createHmac("sha256", key).update(data).digest();
-  }
-  gzip(data, maxSize) {
-    try {
-      return node_zlib.deflateSync(data, {
-        maxOutputLength: maxSize
-      });
-    } catch (e) {
-      if (e.code === "ERR_BUFFER_TOO_LARGE") {
-        return null;
-      }
-      throw e;
-    }
-  }
-  gunzip(data) {
-    return node_zlib.gunzipSync(data);
-  }
-  randomFill(buf) {
-    node_crypto.randomFillSync(buf);
-  }
-}
-class NodeCryptoProvider extends BaseNodeCryptoProvider {
-  async initialize() {
-    const require$1 = node_module.createRequire(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("node/src/utils/crypto.cjs", document.baseURI).href);
-    const wasmFile = require$1.resolve("@mtcute/wasm/mtcute.wasm");
-    const wasm = await promises.readFile(wasmFile);
-    index.initSync(wasm);
-  }
-  createAesIge(key, iv) {
-    return {
-      encrypt(data) {
-        return index.ige256Encrypt(data, key, iv);
-      },
-      decrypt(data) {
-        return index.ige256Decrypt(data, key, iv);
-      }
-    };
-  }
-}
-exports.BaseNodeCryptoProvider = BaseNodeCryptoProvider;
-exports.NodeCryptoProvider = NodeCryptoProvider;

package/node/src/utils/crypto.js

@@ -1,69 +0,0 @@
-import { createCipheriv, pbkdf2, createHash, createHmac, randomFillSync } from "node:crypto";
-import { readFile } from "node:fs/promises";
-import { createRequire } from "node:module";
-import { deflateSync, gunzipSync } from "node:zlib";
-import { BaseCryptoProvider } from "@mtcute/core/utils.js";
-import { initSync, ige256Decrypt, ige256Encrypt } from "../../../wasm/src/index.js";
-class BaseNodeCryptoProvider extends BaseCryptoProvider {
-  createAesCtr(key, iv) {
-    const cipher = createCipheriv(`aes-${key.length * 8}-ctr`, key, iv);
-    const update = (data) => cipher.update(data);
-    return {
-      process: update
-    };
-  }
-  pbkdf2(password, salt, iterations, keylen = 64, algo = "sha512") {
-    return new Promise(
-      (resolve, reject) => pbkdf2(password, salt, iterations, keylen, algo, (err, buf) => err !== null ? reject(err) : resolve(buf))
-    );
-  }
-  sha1(data) {
-    return createHash("sha1").update(data).digest();
-  }
-  sha256(data) {
-    return createHash("sha256").update(data).digest();
-  }
-  hmacSha256(data, key) {
-    return createHmac("sha256", key).update(data).digest();
-  }
-  gzip(data, maxSize) {
-    try {
-      return deflateSync(data, {
-        maxOutputLength: maxSize
-      });
-    } catch (e) {
-      if (e.code === "ERR_BUFFER_TOO_LARGE") {
-        return null;
-      }
-      throw e;
-    }
-  }
-  gunzip(data) {
-    return gunzipSync(data);
-  }
-  randomFill(buf) {
-    randomFillSync(buf);
-  }
-}
-class NodeCryptoProvider extends BaseNodeCryptoProvider {
-  async initialize() {
-    const require2 = createRequire(import.meta.url);
-    const wasmFile = require2.resolve("@mtcute/wasm/mtcute.wasm");
-    const wasm = await readFile(wasmFile);
-    initSync(wasm);
-  }
-  createAesIge(key, iv) {
-    return {
-      encrypt(data) {
-        return ige256Encrypt(data, key, iv);
-      },
-      decrypt(data) {
-        return ige256Decrypt(data, key, iv);
-      }
-    };
-  }
-}
-export {
-  BaseNodeCryptoProvider,
-  NodeCryptoProvider
-};

package/node/src/utils.cjs

@@ -1,34 +0,0 @@
-if (typeof globalThis !== "undefined" && !globalThis._MTCUTE_CJS_DEPRECATION_WARNED) {
-  globalThis._MTCUTE_CJS_DEPRECATION_WARNED = true;
-  console.warn("[@mtcute/convert] CommonJS support is deprecated and will be removed in 0.25.0. Please consider switching to ESM, it's " + (/* @__PURE__ */ new Date()).getFullYear() + " already.");
-  console.warn("[@mtcute/convert] Learn more about switching to ESM: https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c");
-}
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const crypto = require("./utils/crypto.cjs");
-const utils_js = require("@mtcute/core/utils.js");
-function _interopNamespaceDefault(e) {
-  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
-  if (e) {
-    for (const k in e) {
-      if (k !== "default") {
-        const d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: () => e[k]
-        });
-      }
-    }
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-const utils_js__namespace = /* @__PURE__ */ _interopNamespaceDefault(utils_js);
-exports.BaseNodeCryptoProvider = crypto.BaseNodeCryptoProvider;
-exports.NodeCryptoProvider = crypto.NodeCryptoProvider;
-Object.keys(utils_js).forEach((k) => {
-  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
-    enumerable: true,
-    get: () => utils_js[k]
-  });
-});

package/node/src/utils.js

@@ -1,7 +0,0 @@
-import { BaseNodeCryptoProvider, NodeCryptoProvider } from "./utils/crypto.js";
-import * as utils_js from "@mtcute/core/utils.js";
-export * from "@mtcute/core/utils.js";
-export {
-  BaseNodeCryptoProvider,
-  NodeCryptoProvider
-};

package/wasm/src/index.cjs

@@ -1,64 +0,0 @@
-if (typeof globalThis !== "undefined" && !globalThis._MTCUTE_CJS_DEPRECATION_WARNED) {
-  globalThis._MTCUTE_CJS_DEPRECATION_WARNED = true;
-  console.warn("[@mtcute/convert] CommonJS support is deprecated and will be removed in 0.25.0. Please consider switching to ESM, it's " + (/* @__PURE__ */ new Date()).getFullYear() + " already.");
-  console.warn("[@mtcute/convert] Learn more about switching to ESM: https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c");
-}
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-let wasm;
-let sharedKeyPtr;
-let sharedIvPtr;
-let cachedUint8Memory = null;
-function initCommon() {
-  wasm.libdeflate_alloc_compressor(6);
-  wasm.libdeflate_alloc_decompressor();
-  wasm.__get_shared_out();
-  sharedKeyPtr = wasm.__get_shared_key_buffer();
-  sharedIvPtr = wasm.__get_shared_iv_buffer();
-}
-function getUint8Memory() {
-  if (cachedUint8Memory === null || cachedUint8Memory.byteLength === 0) {
-    cachedUint8Memory = new Uint8Array(wasm.memory.buffer);
-  }
-  return cachedUint8Memory;
-}
-function initSync(module2) {
-  if (wasm !== void 0) return;
-  if (!(module2 instanceof WebAssembly.Instance)) {
-    if (!(module2 instanceof WebAssembly.Module)) {
-      module2 = new WebAssembly.Module(module2);
-    }
-    module2 = new WebAssembly.Instance(module2);
-  }
-  wasm = module2.exports;
-  initCommon();
-}
-function ige256Encrypt(data, key, iv) {
-  const ptr = wasm.__malloc(data.length + data.length);
-  const inputPtr = ptr;
-  const outputPtr = inputPtr + data.length;
-  const mem = getUint8Memory();
-  mem.set(data, inputPtr);
-  mem.set(key, sharedKeyPtr);
-  mem.set(iv, sharedIvPtr);
-  wasm.ige256_encrypt(inputPtr, data.length, outputPtr);
-  const result = mem.slice(outputPtr, outputPtr + data.length);
-  wasm.__free(ptr);
-  return result;
-}
-function ige256Decrypt(data, key, iv) {
-  const ptr = wasm.__malloc(data.length + data.length);
-  const inputPtr = ptr;
-  const outputPtr = inputPtr + data.length;
-  const mem = getUint8Memory();
-  mem.set(data, inputPtr);
-  mem.set(key, sharedKeyPtr);
-  mem.set(iv, sharedIvPtr);
-  wasm.ige256_decrypt(inputPtr, data.length, outputPtr);
-  const result = mem.slice(outputPtr, outputPtr + data.length);
-  wasm.__free(ptr);
-  return result;
-}
-exports.ige256Decrypt = ige256Decrypt;
-exports.ige256Encrypt = ige256Encrypt;
-exports.initSync = initSync;

package/wasm/src/index.js

@@ -1,59 +0,0 @@
-let wasm;
-let sharedKeyPtr;
-let sharedIvPtr;
-let cachedUint8Memory = null;
-function initCommon() {
-  wasm.libdeflate_alloc_compressor(6);
-  wasm.libdeflate_alloc_decompressor();
-  wasm.__get_shared_out();
-  sharedKeyPtr = wasm.__get_shared_key_buffer();
-  sharedIvPtr = wasm.__get_shared_iv_buffer();
-}
-function getUint8Memory() {
-  if (cachedUint8Memory === null || cachedUint8Memory.byteLength === 0) {
-    cachedUint8Memory = new Uint8Array(wasm.memory.buffer);
-  }
-  return cachedUint8Memory;
-}
-function initSync(module) {
-  if (wasm !== void 0) return;
-  if (!(module instanceof WebAssembly.Instance)) {
-    if (!(module instanceof WebAssembly.Module)) {
-      module = new WebAssembly.Module(module);
-    }
-    module = new WebAssembly.Instance(module);
-  }
-  wasm = module.exports;
-  initCommon();
-}
-function ige256Encrypt(data, key, iv) {
-  const ptr = wasm.__malloc(data.length + data.length);
-  const inputPtr = ptr;
-  const outputPtr = inputPtr + data.length;
-  const mem = getUint8Memory();
-  mem.set(data, inputPtr);
-  mem.set(key, sharedKeyPtr);
-  mem.set(iv, sharedIvPtr);
-  wasm.ige256_encrypt(inputPtr, data.length, outputPtr);
-  const result = mem.slice(outputPtr, outputPtr + data.length);
-  wasm.__free(ptr);
-  return result;
-}
-function ige256Decrypt(data, key, iv) {
-  const ptr = wasm.__malloc(data.length + data.length);
-  const inputPtr = ptr;
-  const outputPtr = inputPtr + data.length;
-  const mem = getUint8Memory();
-  mem.set(data, inputPtr);
-  mem.set(key, sharedKeyPtr);
-  mem.set(iv, sharedIvPtr);
-  wasm.ige256_decrypt(inputPtr, data.length, outputPtr);
-  const result = mem.slice(outputPtr, outputPtr + data.length);
-  wasm.__free(ptr);
-  return result;
-}
-export {
-  ige256Decrypt,
-  ige256Encrypt,
-  initSync
-};