@mtcute/web 0.8.0 → 0.9.1

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Alina Sireneva
+Copyright 2023 alina sireneva
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/cjs/websocket.js

@@ -79,13 +79,13 @@ class BaseWebSocketTransport extends events_1.default {
         if (this._state === core_1.TransportState.Idle)
             return;
         this.log.info('connection closed');
-        this.emit('close');
         this._state = core_1.TransportState.Idle;
         this._socket.removeEventListener('close', this.close);
         this._socket.close();
         this._socket = null;
         this._currentDc = null;
         this._packetCodec.reset();
+        this.emit('close');
     }
     handleError(event) {
         const error = 'error' in event ? event.error : new Error('unknown WebSocket error');

package/cjs/websocket.js.map

@@ -1 +1 @@
-{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../src/websocket.ts"],"names":[],"mappings":"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","sourcesContent":["import EventEmitter from 'events'\n\nimport {\n    IntermediatePacketCodec,\n    IPacketCodec,\n    ITelegramTransport,\n    MtcuteError,\n    MtUnsupportedError,\n    ObfuscatedPacketCodec,\n    TransportState,\n} from '@mtcute/core'\nimport { BasicDcOption, ICryptoProvider, Logger } from '@mtcute/core/utils.js'\n\nexport type WebSocketConstructor = {\n    new (address: string, protocol?: string): WebSocket\n}\n\nconst subdomainsMap: Record<string, string> = {\n    '1': 'pluto',\n    '2': 'venus',\n    '3': 'aurora',\n    '4': 'vesta',\n    '5': 'flora',\n}\n\n/**\n * Base for WebSocket transports.\n * Subclasses must provide packet codec in `_packetCodec` property\n */\nexport abstract class BaseWebSocketTransport extends EventEmitter implements ITelegramTransport {\n    private _currentDc: BasicDcOption | null = null\n    private _state: TransportState = TransportState.Idle\n    private _socket: WebSocket | null = null\n    private _crypto!: ICryptoProvider\n    protected log!: Logger\n\n    abstract _packetCodec: IPacketCodec\n    packetCodecInitialized = false\n\n    private _baseDomain: string\n    private _subdomains: Record<string, string>\n    private _WebSocket: WebSocketConstructor\n\n    constructor({\n        ws = WebSocket,\n        baseDomain = 'web.telegram.org',\n        subdomains = subdomainsMap,\n    }: {\n        /** Custom implementation of WebSocket (e.g. https://npm.im/ws) */\n        ws?: WebSocketConstructor\n        /** Base WebSocket domain */\n        baseDomain?: string\n        /** Map of sub-domains (key is DC ID, value is string) */\n        subdomains?: Record<string, string>\n    } = {}) {\n        super()\n\n        if (!ws) {\n            throw new MtUnsupportedError(\n                'To use WebSocket transport with NodeJS, install `ws` package and pass it to constructor',\n            )\n        }\n\n        // gotta love cjs/esm compat\n        if ('default' in ws) {\n            ws = ws.default as WebSocketConstructor\n        }\n\n        this._baseDomain = baseDomain\n        this._subdomains = subdomains\n        this._WebSocket = ws\n\n        this.close = this.close.bind(this)\n    }\n\n    private _updateLogPrefix() {\n        if (this._currentDc) {\n            this.log.prefix = `[WS:${this._subdomains[this._currentDc.id]}.${this._baseDomain}] `\n        } else {\n            this.log.prefix = '[WS:disconnected] '\n        }\n    }\n\n    setup(crypto: ICryptoProvider, log: Logger): void {\n        this._crypto = crypto\n        this.log = log.create('ws')\n    }\n\n    state(): TransportState {\n        return this._state\n    }\n\n    currentDc(): BasicDcOption | null {\n        return this._currentDc\n    }\n\n    connect(dc: BasicDcOption, testMode: boolean): void {\n        if (this._state !== TransportState.Idle) {\n            throw new MtcuteError('Transport is not IDLE')\n        }\n\n        if (!this.packetCodecInitialized) {\n            this._packetCodec.setup?.(this._crypto, this.log)\n            this._packetCodec.on('error', (err) => this.emit('error', err))\n            this._packetCodec.on('packet', (buf) => this.emit('message', buf))\n            this.packetCodecInitialized = true\n        }\n\n        this._state = TransportState.Connecting\n        this._currentDc = dc\n        this._socket = new this._WebSocket(\n            `wss://${this._subdomains[dc.id]}.${this._baseDomain}/apiws${testMode ? '_test' : ''}`,\n            'binary',\n        )\n\n        this._updateLogPrefix()\n        this.log.debug('connecting to %s (%j)', this._socket.url, dc)\n\n        this._socket.binaryType = 'arraybuffer'\n\n        this._socket.addEventListener('message', (evt) =>\n            this._packetCodec.feed(new Uint8Array(evt.data as ArrayBuffer)),\n        )\n        this._socket.addEventListener('open', this.handleConnect.bind(this))\n        this._socket.addEventListener('error', this.handleError.bind(this))\n        this._socket.addEventListener('close', this.close)\n    }\n\n    close(): void {\n        if (this._state === TransportState.Idle) return\n        this.log.info('connection closed')\n\n        this.emit('close')\n        this._state = TransportState.Idle\n        this._socket!.removeEventListener('close', this.close)\n        this._socket!.close()\n        this._socket = null\n        this._currentDc = null\n        this._packetCodec.reset()\n    }\n\n    handleError(event: Event | { error: Error }): void {\n        const error = 'error' in event ? event.error : new Error('unknown WebSocket error')\n\n        this.log.error('error: %s', error.stack)\n        this.emit('error', error)\n    }\n\n    handleConnect(): void {\n        this.log.info('connected')\n\n        Promise.resolve(this._packetCodec.tag())\n            .then((initialMessage) => {\n                this._socket!.send(initialMessage)\n                this._state = TransportState.Ready\n                this.emit('ready')\n            })\n            .catch((err) => this.emit('error', err))\n    }\n\n    async send(bytes: Uint8Array): Promise<void> {\n        if (this._state !== TransportState.Ready) {\n            throw new MtcuteError('Transport is not READY')\n        }\n\n        const framed = await this._packetCodec.encode(bytes)\n\n        this._socket!.send(framed)\n    }\n}\n\nexport class WebSocketTransport extends BaseWebSocketTransport {\n    _packetCodec = new ObfuscatedPacketCodec(new IntermediatePacketCodec())\n}\n"]}
+{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../src/websocket.ts"],"names":[],"mappings":"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","sourcesContent":["import EventEmitter from 'events'\n\nimport {\n    IntermediatePacketCodec,\n    IPacketCodec,\n    ITelegramTransport,\n    MtcuteError,\n    MtUnsupportedError,\n    ObfuscatedPacketCodec,\n    TransportState,\n} from '@mtcute/core'\nimport { BasicDcOption, ICryptoProvider, Logger } from '@mtcute/core/utils.js'\n\nexport type WebSocketConstructor = {\n    new (address: string, protocol?: string): WebSocket\n}\n\nconst subdomainsMap: Record<string, string> = {\n    '1': 'pluto',\n    '2': 'venus',\n    '3': 'aurora',\n    '4': 'vesta',\n    '5': 'flora',\n}\n\n/**\n * Base for WebSocket transports.\n * Subclasses must provide packet codec in `_packetCodec` property\n */\nexport abstract class BaseWebSocketTransport extends EventEmitter implements ITelegramTransport {\n    private _currentDc: BasicDcOption | null = null\n    private _state: TransportState = TransportState.Idle\n    private _socket: WebSocket | null = null\n    private _crypto!: ICryptoProvider\n    protected log!: Logger\n\n    abstract _packetCodec: IPacketCodec\n    packetCodecInitialized = false\n\n    private _baseDomain: string\n    private _subdomains: Record<string, string>\n    private _WebSocket: WebSocketConstructor\n\n    constructor({\n        ws = WebSocket,\n        baseDomain = 'web.telegram.org',\n        subdomains = subdomainsMap,\n    }: {\n        /** Custom implementation of WebSocket (e.g. https://npm.im/ws) */\n        ws?: WebSocketConstructor\n        /** Base WebSocket domain */\n        baseDomain?: string\n        /** Map of sub-domains (key is DC ID, value is string) */\n        subdomains?: Record<string, string>\n    } = {}) {\n        super()\n\n        if (!ws) {\n            throw new MtUnsupportedError(\n                'To use WebSocket transport with NodeJS, install `ws` package and pass it to constructor',\n            )\n        }\n\n        // gotta love cjs/esm compat\n        if ('default' in ws) {\n            ws = ws.default as WebSocketConstructor\n        }\n\n        this._baseDomain = baseDomain\n        this._subdomains = subdomains\n        this._WebSocket = ws\n\n        this.close = this.close.bind(this)\n    }\n\n    private _updateLogPrefix() {\n        if (this._currentDc) {\n            this.log.prefix = `[WS:${this._subdomains[this._currentDc.id]}.${this._baseDomain}] `\n        } else {\n            this.log.prefix = '[WS:disconnected] '\n        }\n    }\n\n    setup(crypto: ICryptoProvider, log: Logger): void {\n        this._crypto = crypto\n        this.log = log.create('ws')\n    }\n\n    state(): TransportState {\n        return this._state\n    }\n\n    currentDc(): BasicDcOption | null {\n        return this._currentDc\n    }\n\n    connect(dc: BasicDcOption, testMode: boolean): void {\n        if (this._state !== TransportState.Idle) {\n            throw new MtcuteError('Transport is not IDLE')\n        }\n\n        if (!this.packetCodecInitialized) {\n            this._packetCodec.setup?.(this._crypto, this.log)\n            this._packetCodec.on('error', (err) => this.emit('error', err))\n            this._packetCodec.on('packet', (buf) => this.emit('message', buf))\n            this.packetCodecInitialized = true\n        }\n\n        this._state = TransportState.Connecting\n        this._currentDc = dc\n        this._socket = new this._WebSocket(\n            `wss://${this._subdomains[dc.id]}.${this._baseDomain}/apiws${testMode ? '_test' : ''}`,\n            'binary',\n        )\n\n        this._updateLogPrefix()\n        this.log.debug('connecting to %s (%j)', this._socket.url, dc)\n\n        this._socket.binaryType = 'arraybuffer'\n\n        this._socket.addEventListener('message', (evt) =>\n            this._packetCodec.feed(new Uint8Array(evt.data as ArrayBuffer)),\n        )\n        this._socket.addEventListener('open', this.handleConnect.bind(this))\n        this._socket.addEventListener('error', this.handleError.bind(this))\n        this._socket.addEventListener('close', this.close)\n    }\n\n    close(): void {\n        if (this._state === TransportState.Idle) return\n        this.log.info('connection closed')\n\n        this._state = TransportState.Idle\n        this._socket!.removeEventListener('close', this.close)\n        this._socket!.close()\n        this._socket = null\n        this._currentDc = null\n        this._packetCodec.reset()\n        this.emit('close')\n    }\n\n    handleError(event: Event | { error: Error }): void {\n        const error = 'error' in event ? event.error : new Error('unknown WebSocket error')\n\n        this.log.error('error: %s', error.stack)\n        this.emit('error', error)\n    }\n\n    handleConnect(): void {\n        this.log.info('connected')\n\n        Promise.resolve(this._packetCodec.tag())\n            .then((initialMessage) => {\n                this._socket!.send(initialMessage)\n                this._state = TransportState.Ready\n                this.emit('ready')\n            })\n            .catch((err) => this.emit('error', err))\n    }\n\n    async send(bytes: Uint8Array): Promise<void> {\n        if (this._state !== TransportState.Ready) {\n            throw new MtcuteError('Transport is not READY')\n        }\n\n        const framed = await this._packetCodec.encode(bytes)\n\n        this._socket!.send(framed)\n    }\n}\n\nexport class WebSocketTransport extends BaseWebSocketTransport {\n    _packetCodec = new ObfuscatedPacketCodec(new IntermediatePacketCodec())\n}\n"]}

package/esm/websocket.js

@@ -73,13 +73,13 @@ export class BaseWebSocketTransport extends EventEmitter {
         if (this._state === TransportState.Idle)
             return;
         this.log.info('connection closed');
-        this.emit('close');
         this._state = TransportState.Idle;
         this._socket.removeEventListener('close', this.close);
         this._socket.close();
         this._socket = null;
         this._currentDc = null;
         this._packetCodec.reset();
+        this.emit('close');
     }
     handleError(event) {
         const error = 'error' in event ? event.error : new Error('unknown WebSocket error');

package/esm/websocket.js.map

@@ -1 +1 @@
-{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../src/websocket.ts"],"names":[],"mappings":"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","sourcesContent":["import EventEmitter from 'events'\n\nimport {\n    IntermediatePacketCodec,\n    IPacketCodec,\n    ITelegramTransport,\n    MtcuteError,\n    MtUnsupportedError,\n    ObfuscatedPacketCodec,\n    TransportState,\n} from '@mtcute/core'\nimport { BasicDcOption, ICryptoProvider, Logger } from '@mtcute/core/utils.js'\n\nexport type WebSocketConstructor = {\n    new (address: string, protocol?: string): WebSocket\n}\n\nconst subdomainsMap: Record<string, string> = {\n    '1': 'pluto',\n    '2': 'venus',\n    '3': 'aurora',\n    '4': 'vesta',\n    '5': 'flora',\n}\n\n/**\n * Base for WebSocket transports.\n * Subclasses must provide packet codec in `_packetCodec` property\n */\nexport abstract class BaseWebSocketTransport extends EventEmitter implements ITelegramTransport {\n    private _currentDc: BasicDcOption | null = null\n    private _state: TransportState = TransportState.Idle\n    private _socket: WebSocket | null = null\n    private _crypto!: ICryptoProvider\n    protected log!: Logger\n\n    abstract _packetCodec: IPacketCodec\n    packetCodecInitialized = false\n\n    private _baseDomain: string\n    private _subdomains: Record<string, string>\n    private _WebSocket: WebSocketConstructor\n\n    constructor({\n        ws = WebSocket,\n        baseDomain = 'web.telegram.org',\n        subdomains = subdomainsMap,\n    }: {\n        /** Custom implementation of WebSocket (e.g. https://npm.im/ws) */\n        ws?: WebSocketConstructor\n        /** Base WebSocket domain */\n        baseDomain?: string\n        /** Map of sub-domains (key is DC ID, value is string) */\n        subdomains?: Record<string, string>\n    } = {}) {\n        super()\n\n        if (!ws) {\n            throw new MtUnsupportedError(\n                'To use WebSocket transport with NodeJS, install `ws` package and pass it to constructor',\n            )\n        }\n\n        // gotta love cjs/esm compat\n        if ('default' in ws) {\n            ws = ws.default as WebSocketConstructor\n        }\n\n        this._baseDomain = baseDomain\n        this._subdomains = subdomains\n        this._WebSocket = ws\n\n        this.close = this.close.bind(this)\n    }\n\n    private _updateLogPrefix() {\n        if (this._currentDc) {\n            this.log.prefix = `[WS:${this._subdomains[this._currentDc.id]}.${this._baseDomain}] `\n        } else {\n            this.log.prefix = '[WS:disconnected] '\n        }\n    }\n\n    setup(crypto: ICryptoProvider, log: Logger): void {\n        this._crypto = crypto\n        this.log = log.create('ws')\n    }\n\n    state(): TransportState {\n        return this._state\n    }\n\n    currentDc(): BasicDcOption | null {\n        return this._currentDc\n    }\n\n    connect(dc: BasicDcOption, testMode: boolean): void {\n        if (this._state !== TransportState.Idle) {\n            throw new MtcuteError('Transport is not IDLE')\n        }\n\n        if (!this.packetCodecInitialized) {\n            this._packetCodec.setup?.(this._crypto, this.log)\n            this._packetCodec.on('error', (err) => this.emit('error', err))\n            this._packetCodec.on('packet', (buf) => this.emit('message', buf))\n            this.packetCodecInitialized = true\n        }\n\n        this._state = TransportState.Connecting\n        this._currentDc = dc\n        this._socket = new this._WebSocket(\n            `wss://${this._subdomains[dc.id]}.${this._baseDomain}/apiws${testMode ? '_test' : ''}`,\n            'binary',\n        )\n\n        this._updateLogPrefix()\n        this.log.debug('connecting to %s (%j)', this._socket.url, dc)\n\n        this._socket.binaryType = 'arraybuffer'\n\n        this._socket.addEventListener('message', (evt) =>\n            this._packetCodec.feed(new Uint8Array(evt.data as ArrayBuffer)),\n        )\n        this._socket.addEventListener('open', this.handleConnect.bind(this))\n        this._socket.addEventListener('error', this.handleError.bind(this))\n        this._socket.addEventListener('close', this.close)\n    }\n\n    close(): void {\n        if (this._state === TransportState.Idle) return\n        this.log.info('connection closed')\n\n        this.emit('close')\n        this._state = TransportState.Idle\n        this._socket!.removeEventListener('close', this.close)\n        this._socket!.close()\n        this._socket = null\n        this._currentDc = null\n        this._packetCodec.reset()\n    }\n\n    handleError(event: Event | { error: Error }): void {\n        const error = 'error' in event ? event.error : new Error('unknown WebSocket error')\n\n        this.log.error('error: %s', error.stack)\n        this.emit('error', error)\n    }\n\n    handleConnect(): void {\n        this.log.info('connected')\n\n        Promise.resolve(this._packetCodec.tag())\n            .then((initialMessage) => {\n                this._socket!.send(initialMessage)\n                this._state = TransportState.Ready\n                this.emit('ready')\n            })\n            .catch((err) => this.emit('error', err))\n    }\n\n    async send(bytes: Uint8Array): Promise<void> {\n        if (this._state !== TransportState.Ready) {\n            throw new MtcuteError('Transport is not READY')\n        }\n\n        const framed = await this._packetCodec.encode(bytes)\n\n        this._socket!.send(framed)\n    }\n}\n\nexport class WebSocketTransport extends BaseWebSocketTransport {\n    _packetCodec = new ObfuscatedPacketCodec(new IntermediatePacketCodec())\n}\n"]}
+{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../src/websocket.ts"],"names":[],"mappings":"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","sourcesContent":["import EventEmitter from 'events'\n\nimport {\n    IntermediatePacketCodec,\n    IPacketCodec,\n    ITelegramTransport,\n    MtcuteError,\n    MtUnsupportedError,\n    ObfuscatedPacketCodec,\n    TransportState,\n} from '@mtcute/core'\nimport { BasicDcOption, ICryptoProvider, Logger } from '@mtcute/core/utils.js'\n\nexport type WebSocketConstructor = {\n    new (address: string, protocol?: string): WebSocket\n}\n\nconst subdomainsMap: Record<string, string> = {\n    '1': 'pluto',\n    '2': 'venus',\n    '3': 'aurora',\n    '4': 'vesta',\n    '5': 'flora',\n}\n\n/**\n * Base for WebSocket transports.\n * Subclasses must provide packet codec in `_packetCodec` property\n */\nexport abstract class BaseWebSocketTransport extends EventEmitter implements ITelegramTransport {\n    private _currentDc: BasicDcOption | null = null\n    private _state: TransportState = TransportState.Idle\n    private _socket: WebSocket | null = null\n    private _crypto!: ICryptoProvider\n    protected log!: Logger\n\n    abstract _packetCodec: IPacketCodec\n    packetCodecInitialized = false\n\n    private _baseDomain: string\n    private _subdomains: Record<string, string>\n    private _WebSocket: WebSocketConstructor\n\n    constructor({\n        ws = WebSocket,\n        baseDomain = 'web.telegram.org',\n        subdomains = subdomainsMap,\n    }: {\n        /** Custom implementation of WebSocket (e.g. https://npm.im/ws) */\n        ws?: WebSocketConstructor\n        /** Base WebSocket domain */\n        baseDomain?: string\n        /** Map of sub-domains (key is DC ID, value is string) */\n        subdomains?: Record<string, string>\n    } = {}) {\n        super()\n\n        if (!ws) {\n            throw new MtUnsupportedError(\n                'To use WebSocket transport with NodeJS, install `ws` package and pass it to constructor',\n            )\n        }\n\n        // gotta love cjs/esm compat\n        if ('default' in ws) {\n            ws = ws.default as WebSocketConstructor\n        }\n\n        this._baseDomain = baseDomain\n        this._subdomains = subdomains\n        this._WebSocket = ws\n\n        this.close = this.close.bind(this)\n    }\n\n    private _updateLogPrefix() {\n        if (this._currentDc) {\n            this.log.prefix = `[WS:${this._subdomains[this._currentDc.id]}.${this._baseDomain}] `\n        } else {\n            this.log.prefix = '[WS:disconnected] '\n        }\n    }\n\n    setup(crypto: ICryptoProvider, log: Logger): void {\n        this._crypto = crypto\n        this.log = log.create('ws')\n    }\n\n    state(): TransportState {\n        return this._state\n    }\n\n    currentDc(): BasicDcOption | null {\n        return this._currentDc\n    }\n\n    connect(dc: BasicDcOption, testMode: boolean): void {\n        if (this._state !== TransportState.Idle) {\n            throw new MtcuteError('Transport is not IDLE')\n        }\n\n        if (!this.packetCodecInitialized) {\n            this._packetCodec.setup?.(this._crypto, this.log)\n            this._packetCodec.on('error', (err) => this.emit('error', err))\n            this._packetCodec.on('packet', (buf) => this.emit('message', buf))\n            this.packetCodecInitialized = true\n        }\n\n        this._state = TransportState.Connecting\n        this._currentDc = dc\n        this._socket = new this._WebSocket(\n            `wss://${this._subdomains[dc.id]}.${this._baseDomain}/apiws${testMode ? '_test' : ''}`,\n            'binary',\n        )\n\n        this._updateLogPrefix()\n        this.log.debug('connecting to %s (%j)', this._socket.url, dc)\n\n        this._socket.binaryType = 'arraybuffer'\n\n        this._socket.addEventListener('message', (evt) =>\n            this._packetCodec.feed(new Uint8Array(evt.data as ArrayBuffer)),\n        )\n        this._socket.addEventListener('open', this.handleConnect.bind(this))\n        this._socket.addEventListener('error', this.handleError.bind(this))\n        this._socket.addEventListener('close', this.close)\n    }\n\n    close(): void {\n        if (this._state === TransportState.Idle) return\n        this.log.info('connection closed')\n\n        this._state = TransportState.Idle\n        this._socket!.removeEventListener('close', this.close)\n        this._socket!.close()\n        this._socket = null\n        this._currentDc = null\n        this._packetCodec.reset()\n        this.emit('close')\n    }\n\n    handleError(event: Event | { error: Error }): void {\n        const error = 'error' in event ? event.error : new Error('unknown WebSocket error')\n\n        this.log.error('error: %s', error.stack)\n        this.emit('error', error)\n    }\n\n    handleConnect(): void {\n        this.log.info('connected')\n\n        Promise.resolve(this._packetCodec.tag())\n            .then((initialMessage) => {\n                this._socket!.send(initialMessage)\n                this._state = TransportState.Ready\n                this.emit('ready')\n            })\n            .catch((err) => this.emit('error', err))\n    }\n\n    async send(bytes: Uint8Array): Promise<void> {\n        if (this._state !== TransportState.Ready) {\n            throw new MtcuteError('Transport is not READY')\n        }\n\n        const framed = await this._packetCodec.encode(bytes)\n\n        this._socket!.send(framed)\n    }\n}\n\nexport class WebSocketTransport extends BaseWebSocketTransport {\n    _packetCodec = new ObfuscatedPacketCodec(new IntermediatePacketCodec())\n}\n"]}

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@mtcute/web",
-  "version": "0.8.0",
+  "version": "0.9.1",
   "description": "Meta-package for the web platform",
-  "author": "Alina Sireneva <alina@tei.su>",
+  "author": "alina sireneva <alina@tei.su>",
   "license": "MIT",
   "main": "cjs/index.js",
   "type": "module",
@@ -19,8 +19,8 @@
     }
   },
   "dependencies": {
-    "@mtcute/core": "^0.8.0",
-    "@mtcute/wasm": "^0.8.0"
+    "@mtcute/core": "^0.9.1",
+    "@mtcute/wasm": "^0.9.0"
   },
   "module": "esm/index.js"
 }