@mtcute/core 0.7.2 → 0.8.0

package/esm/network/persistent-connection.d.ts

@@ -26,6 +26,8 @@ export declare abstract class PersistentConnection extends EventEmitter {
     private _consequentFails;
     private _previousWait;
     private _reconnectionTimeout;
+    private _shouldReconnectImmediately;
+    protected _disconnectedManually: boolean;
     private _inactivityTimeout;
     private _inactive;
     _destroyed: boolean;
@@ -42,6 +44,7 @@ export declare abstract class PersistentConnection extends EventEmitter {
     onTransportClose(): void;
     connect(): void;
     reconnect(): void;
+    disconnectManual(): void;
     destroy(): void;
     protected _rescheduleInactivity(): void;
     protected _onInactivityTimeout(): void;

package/esm/network/persistent-connection.js

@@ -18,6 +18,8 @@ export class PersistentConnection extends EventEmitter {
         this._consequentFails = 0;
         this._previousWait = null;
         this._reconnectionTimeout = null;
+        this._shouldReconnectImmediately = false;
+        this._disconnectedManually = false;
         // inactivity timeout
         this._inactivityTimeout = null;
         this._inactive = true;
@@ -82,8 +84,13 @@ export class PersistentConnection extends EventEmitter {
     onTransportClose() {
         // transport closed because of inactivity
         // obviously we dont want to reconnect then
-        if (this._inactive)
+        if (this._inactive || this._disconnectedManually)
+            return;
+        if (this._shouldReconnectImmediately) {
+            this._shouldReconnectImmediately = false;
+            this.connect();
             return;
+        }
         this._consequentFails += 1;
         const wait = this.params.reconnectionStrategy(this.params, this._lastError, this._consequentFails, this._previousWait);
         if (wait === false) {
@@ -111,11 +118,26 @@ export class PersistentConnection extends EventEmitter {
         }
         if (this._reconnectionTimeout != null) {
             clearTimeout(this._reconnectionTimeout);
+            this._reconnectionTimeout = null;
         }
         this._inactive = false;
+        this._disconnectedManually = false;
         this._transport.connect(this.params.dc, this.params.testMode);
     }
     reconnect() {
+        if (this._inactive)
+            return;
+        // if we are already connected
+        if (this.isConnected) {
+            this._shouldReconnectImmediately = true;
+            this._transport.close();
+            return;
+        }
+        // if reconnection timeout is pending, it will be cancelled in connect()
+        this.connect();
+    }
+    disconnectManual() {
+        this._disconnectedManually = true;
         this._transport.close();
     }
     destroy() {

package/esm/network/persistent-connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"persistent-connection.js","sourceRoot":"","sources":["../../../src/network/persistent-connection.ts"],"names":[],"mappings":"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","sourcesContent":["import EventEmitter from 'events'\n\nimport { MtcuteError } from '../types/index.js'\nimport { BasicDcOption, ICryptoProvider, Logger } from '../utils/index.js'\nimport { ReconnectionStrategy } from './reconnection.js'\nimport { ITelegramTransport, TransportFactory, TransportState } from './transports/index.js'\n\nexport interface PersistentConnectionParams {\n    crypto: ICryptoProvider\n    transportFactory: TransportFactory\n    dc: BasicDcOption\n    testMode: boolean\n    reconnectionStrategy: ReconnectionStrategy<PersistentConnectionParams>\n    inactivityTimeout?: number\n}\n\nlet nextConnectionUid = 0\n\n/**\n * Base class for persistent connections.\n * Only used for {@link PersistentConnection} and used as a mean of code splitting.\n * This class doesn't know anything about MTProto, it just manages the transport.\n */\nexport abstract class PersistentConnection extends EventEmitter {\n    private _uid = nextConnectionUid++\n\n    readonly params: PersistentConnectionParams\n    protected _transport!: ITelegramTransport\n\n    private _sendOnceConnected: Uint8Array[] = []\n\n    // reconnection\n    private _lastError: Error | null = null\n    private _consequentFails = 0\n    private _previousWait: number | null = null\n    private _reconnectionTimeout: NodeJS.Timeout | null = null\n\n    // inactivity timeout\n    private _inactivityTimeout: NodeJS.Timeout | null = null\n    private _inactive = true\n\n    _destroyed = false\n    _usable = false\n\n    protected abstract onConnected(): void\n\n    protected abstract onError(err: Error): void\n\n    protected abstract onMessage(data: Uint8Array): void\n\n    protected constructor(\n        params: PersistentConnectionParams,\n        readonly log: Logger,\n    ) {\n        super()\n        this.params = params\n        this.changeTransport(params.transportFactory)\n\n        this.log.prefix = `[UID ${this._uid}] `\n\n        this._onInactivityTimeout = this._onInactivityTimeout.bind(this)\n    }\n\n    get isConnected(): boolean {\n        return this._transport.state() !== TransportState.Idle\n    }\n\n    changeTransport(factory: TransportFactory): void {\n        if (this._transport) {\n            this._transport.close()\n        }\n\n        this._transport = factory()\n        this._transport.setup?.(this.params.crypto, this.log)\n\n        this._transport.on('ready', this.onTransportReady.bind(this))\n        this._transport.on('message', this.onMessage.bind(this))\n        this._transport.on('error', this.onTransportError.bind(this))\n        this._transport.on('close', this.onTransportClose.bind(this))\n    }\n\n    onTransportReady(): void {\n        // transport ready does not mean actual mtproto is ready\n        if (this._sendOnceConnected.length) {\n            const sendNext = () => {\n                if (!this._sendOnceConnected.length) {\n                    this.onConnected()\n\n                    return\n                }\n\n                const data = this._sendOnceConnected.shift()!\n                this._transport\n                    .send(data)\n                    .then(sendNext)\n                    .catch((err) => {\n                        this.log.error('error sending queued data: %s', err)\n                        this._sendOnceConnected.unshift(data)\n                    })\n            }\n\n            sendNext()\n\n            return\n        }\n\n        this.onConnected()\n    }\n\n    protected onConnectionUsable(): void {\n        const isReconnection = this._consequentFails > 0\n\n        // reset reconnection related state\n        this._lastError = null\n        this._consequentFails = 0\n        this._previousWait = null\n        this._usable = true\n        this.emit('usable', isReconnection)\n        this._rescheduleInactivity()\n    }\n\n    onTransportError(err: Error): void {\n        this._lastError = err\n        this.onError(err)\n        // transport is expected to emit `close` after `error`\n    }\n\n    onTransportClose(): void {\n        // transport closed because of inactivity\n        // obviously we dont want to reconnect then\n        if (this._inactive) return\n\n        this._consequentFails += 1\n\n        const wait = this.params.reconnectionStrategy(\n            this.params,\n            this._lastError,\n            this._consequentFails,\n            this._previousWait,\n        )\n\n        if (wait === false) {\n            this.destroy()\n\n            return\n        }\n\n        this.emit('wait', wait)\n\n        this._previousWait = wait\n\n        if (this._reconnectionTimeout != null) {\n            clearTimeout(this._reconnectionTimeout)\n        }\n        this._reconnectionTimeout = setTimeout(() => {\n            if (this._destroyed) return\n            this._reconnectionTimeout = null\n            this.connect()\n        }, wait)\n    }\n\n    connect(): void {\n        if (this.isConnected) {\n            throw new MtcuteError('Connection is already opened!')\n        }\n        if (this._destroyed) {\n            throw new MtcuteError('Connection is already destroyed!')\n        }\n\n        if (this._reconnectionTimeout != null) {\n            clearTimeout(this._reconnectionTimeout)\n        }\n\n        this._inactive = false\n        this._transport.connect(this.params.dc, this.params.testMode)\n    }\n\n    reconnect(): void {\n        this._transport.close()\n    }\n\n    destroy(): void {\n        if (this._reconnectionTimeout != null) {\n            clearTimeout(this._reconnectionTimeout)\n        }\n        if (this._inactivityTimeout != null) {\n            clearTimeout(this._inactivityTimeout)\n        }\n\n        this._transport.close()\n        this._transport.removeAllListeners()\n        this._destroyed = true\n    }\n\n    protected _rescheduleInactivity(): void {\n        if (!this.params.inactivityTimeout) return\n        if (this._inactivityTimeout) clearTimeout(this._inactivityTimeout)\n        this._inactivityTimeout = setTimeout(this._onInactivityTimeout, this.params.inactivityTimeout)\n    }\n\n    protected _onInactivityTimeout(): void {\n        this.log.info('disconnected because of inactivity for %d', this.params.inactivityTimeout)\n        this._inactive = true\n        this._inactivityTimeout = null\n        this._transport.close()\n    }\n\n    setInactivityTimeout(timeout?: number): void {\n        this.params.inactivityTimeout = timeout\n\n        if (this._inactivityTimeout) {\n            clearTimeout(this._inactivityTimeout)\n        }\n\n        if (timeout) {\n            this._rescheduleInactivity()\n        }\n    }\n\n    async send(data: Uint8Array): Promise<void> {\n        if (this._inactive) {\n            this.connect()\n        }\n\n        if (this._transport.state() === TransportState.Ready) {\n            await this._transport.send(data)\n        } else {\n            this._sendOnceConnected.push(data)\n        }\n    }\n}\n"]}
+{"version":3,"file":"persistent-connection.js","sourceRoot":"","sources":["../../../src/network/persistent-connection.ts"],"names":[],"mappings":"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","sourcesContent":["import EventEmitter from 'events'\n\nimport { MtcuteError } from '../types/index.js'\nimport { BasicDcOption, ICryptoProvider, Logger } from '../utils/index.js'\nimport { ReconnectionStrategy } from './reconnection.js'\nimport { ITelegramTransport, TransportFactory, TransportState } from './transports/index.js'\n\nexport interface PersistentConnectionParams {\n    crypto: ICryptoProvider\n    transportFactory: TransportFactory\n    dc: BasicDcOption\n    testMode: boolean\n    reconnectionStrategy: ReconnectionStrategy<PersistentConnectionParams>\n    inactivityTimeout?: number\n}\n\nlet nextConnectionUid = 0\n\n/**\n * Base class for persistent connections.\n * Only used for {@link PersistentConnection} and used as a mean of code splitting.\n * This class doesn't know anything about MTProto, it just manages the transport.\n */\nexport abstract class PersistentConnection extends EventEmitter {\n    private _uid = nextConnectionUid++\n\n    readonly params: PersistentConnectionParams\n    protected _transport!: ITelegramTransport\n\n    private _sendOnceConnected: Uint8Array[] = []\n\n    // reconnection\n    private _lastError: Error | null = null\n    private _consequentFails = 0\n    private _previousWait: number | null = null\n    private _reconnectionTimeout: NodeJS.Timeout | null = null\n    private _shouldReconnectImmediately = false\n    protected _disconnectedManually = false\n\n    // inactivity timeout\n    private _inactivityTimeout: NodeJS.Timeout | null = null\n    private _inactive = true\n\n    _destroyed = false\n    _usable = false\n\n    protected abstract onConnected(): void\n\n    protected abstract onError(err: Error): void\n\n    protected abstract onMessage(data: Uint8Array): void\n\n    protected constructor(\n        params: PersistentConnectionParams,\n        readonly log: Logger,\n    ) {\n        super()\n        this.params = params\n        this.changeTransport(params.transportFactory)\n\n        this.log.prefix = `[UID ${this._uid}] `\n\n        this._onInactivityTimeout = this._onInactivityTimeout.bind(this)\n    }\n\n    get isConnected(): boolean {\n        return this._transport.state() !== TransportState.Idle\n    }\n\n    changeTransport(factory: TransportFactory): void {\n        if (this._transport) {\n            this._transport.close()\n        }\n\n        this._transport = factory()\n        this._transport.setup?.(this.params.crypto, this.log)\n\n        this._transport.on('ready', this.onTransportReady.bind(this))\n        this._transport.on('message', this.onMessage.bind(this))\n        this._transport.on('error', this.onTransportError.bind(this))\n        this._transport.on('close', this.onTransportClose.bind(this))\n    }\n\n    onTransportReady(): void {\n        // transport ready does not mean actual mtproto is ready\n        if (this._sendOnceConnected.length) {\n            const sendNext = () => {\n                if (!this._sendOnceConnected.length) {\n                    this.onConnected()\n\n                    return\n                }\n\n                const data = this._sendOnceConnected.shift()!\n                this._transport\n                    .send(data)\n                    .then(sendNext)\n                    .catch((err) => {\n                        this.log.error('error sending queued data: %s', err)\n                        this._sendOnceConnected.unshift(data)\n                    })\n            }\n\n            sendNext()\n\n            return\n        }\n\n        this.onConnected()\n    }\n\n    protected onConnectionUsable(): void {\n        const isReconnection = this._consequentFails > 0\n\n        // reset reconnection related state\n        this._lastError = null\n        this._consequentFails = 0\n        this._previousWait = null\n        this._usable = true\n        this.emit('usable', isReconnection)\n        this._rescheduleInactivity()\n    }\n\n    onTransportError(err: Error): void {\n        this._lastError = err\n        this.onError(err)\n        // transport is expected to emit `close` after `error`\n    }\n\n    onTransportClose(): void {\n        // transport closed because of inactivity\n        // obviously we dont want to reconnect then\n        if (this._inactive || this._disconnectedManually) return\n\n        if (this._shouldReconnectImmediately) {\n            this._shouldReconnectImmediately = false\n            this.connect()\n\n            return\n        }\n\n        this._consequentFails += 1\n\n        const wait = this.params.reconnectionStrategy(\n            this.params,\n            this._lastError,\n            this._consequentFails,\n            this._previousWait,\n        )\n\n        if (wait === false) {\n            this.destroy()\n\n            return\n        }\n\n        this.emit('wait', wait)\n\n        this._previousWait = wait\n\n        if (this._reconnectionTimeout != null) {\n            clearTimeout(this._reconnectionTimeout)\n        }\n        this._reconnectionTimeout = setTimeout(() => {\n            if (this._destroyed) return\n            this._reconnectionTimeout = null\n            this.connect()\n        }, wait)\n    }\n\n    connect(): void {\n        if (this.isConnected) {\n            throw new MtcuteError('Connection is already opened!')\n        }\n        if (this._destroyed) {\n            throw new MtcuteError('Connection is already destroyed!')\n        }\n\n        if (this._reconnectionTimeout != null) {\n            clearTimeout(this._reconnectionTimeout)\n            this._reconnectionTimeout = null\n        }\n\n        this._inactive = false\n        this._disconnectedManually = false\n        this._transport.connect(this.params.dc, this.params.testMode)\n    }\n\n    reconnect(): void {\n        if (this._inactive) return\n\n        // if we are already connected\n        if (this.isConnected) {\n            this._shouldReconnectImmediately = true\n            this._transport.close()\n\n            return\n        }\n\n        // if reconnection timeout is pending, it will be cancelled in connect()\n        this.connect()\n    }\n\n    disconnectManual(): void {\n        this._disconnectedManually = true\n        this._transport.close()\n    }\n\n    destroy(): void {\n        if (this._reconnectionTimeout != null) {\n            clearTimeout(this._reconnectionTimeout)\n        }\n        if (this._inactivityTimeout != null) {\n            clearTimeout(this._inactivityTimeout)\n        }\n\n        this._transport.close()\n        this._transport.removeAllListeners()\n        this._destroyed = true\n    }\n\n    protected _rescheduleInactivity(): void {\n        if (!this.params.inactivityTimeout) return\n        if (this._inactivityTimeout) clearTimeout(this._inactivityTimeout)\n        this._inactivityTimeout = setTimeout(this._onInactivityTimeout, this.params.inactivityTimeout)\n    }\n\n    protected _onInactivityTimeout(): void {\n        this.log.info('disconnected because of inactivity for %d', this.params.inactivityTimeout)\n        this._inactive = true\n        this._inactivityTimeout = null\n        this._transport.close()\n    }\n\n    setInactivityTimeout(timeout?: number): void {\n        this.params.inactivityTimeout = timeout\n\n        if (this._inactivityTimeout) {\n            clearTimeout(this._inactivityTimeout)\n        }\n\n        if (timeout) {\n            this._rescheduleInactivity()\n        }\n    }\n\n    async send(data: Uint8Array): Promise<void> {\n        if (this._inactive) {\n            this.connect()\n        }\n\n        if (this._transport.state() === TransportState.Ready) {\n            await this._transport.send(data)\n        } else {\n            this._sendOnceConnected.push(data)\n        }\n    }\n}\n"]}

package/esm/network/session-connection.d.ts

@@ -37,6 +37,7 @@ export declare class SessionConnection extends PersistentConnection {
     private _crypto;
     private _salts;
     constructor(params: SessionConnectionParams, _session: MtprotoSession);
+    private _online;
     getAuthKey(temp?: boolean): Uint8Array | null;
     setUsePfs(usePfs: boolean): void;
     onTransportClose(): void;
@@ -70,6 +71,7 @@ export declare class SessionConnection extends PersistentConnection {
     _resetSession(): void;
     private _sendAck;
     sendRpc<T extends tl.RpcMethod>(request: T, stack?: string, timeout?: number, abortSignal?: AbortSignal, chainId?: string | number): Promise<tl.RpcCallReturn[T['_']]>;
+    notifyNetworkChanged(online: boolean): void;
     private _cancelRpc;
     protected _onInactivityTimeout(): void;
     flushWhenIdle(): void;

package/esm/network/session-connection.js

@@ -3,10 +3,11 @@
 import Long from 'long';
 import { tl } from '@mtcute/tl';
 import { TlBinaryReader, TlBinaryWriter, TlSerializationCounter } from '@mtcute/tl-runtime';
+import { getPlatform } from '../platform.js';
 import { MtArgumentError, MtcuteError, MtTimeoutError } from '../types/index.js';
 import { createAesIgeForMessageOld } from '../utils/crypto/mtproto.js';
+import { reportUnknownError } from '../utils/error-reporting.js';
 import { concatBuffers, createControllablePromise, EarlyTimer, longFromBuffer, randomLong, removeFromLongArray, } from '../utils/index.js';
-import { reportUnknownError } from '../utils/platform/error-reporting.js';
 import { doAuthorization } from './authorization.js';
 import { PersistentConnection } from './persistent-connection.js';
 import { TransportError } from './transports/abstract.js';
@@ -45,6 +46,7 @@ export class SessionConnection extends PersistentConnection {
         this._isPfsBindingPending = false;
         this._isPfsBindingPendingInBackground = false;
         this._inactivityPendingFlush = false;
+        this._online = getPlatform().isOnline?.() ?? true;
         this._flushTimer.onTimeout(this._flush.bind(this));
         this._readerMap = params.readerMap;
         this._writerMap = params.writerMap;
@@ -192,7 +194,7 @@ export class SessionConnection extends PersistentConnection {
             .then(([authKey, serverSalt, timeOffset]) => {
             this._session._authKey.setup(authKey);
             this._salts.currentSalt = serverSalt;
-            this._session._timeOffset = timeOffset;
+            this._session.updateTimeOffset(timeOffset);
             this._session.authorizationPending = false;
             this.emit('key-change', authKey);
             if (this._usePfs) {
@@ -560,7 +562,7 @@ export class SessionConnection extends PersistentConnection {
             this._session.initConnectionCalled = true;
         }
         rpc.done = true;
-        this.log.verbose('<<< (%s) %j', rpc.method, result);
+        this.log.verbose('<<< (%s:%l) %j', rpc.method, reqMsgId, result);
         if (result._ === 'mt_rpc_error') {
             const res = result;
             this.log.debug('received rpc_error [%d:%s] for %l (%s)', res.errorCode, res.errorMessage, reqMsgId, rpc.method);
@@ -812,9 +814,9 @@ export class SessionConnection extends PersistentConnection {
                     // msg_id is either too high or too low
                     // code 20 means msg_id is too old,
                     // we just need to resend the message
-                    const serverTime = msgId.low >>> 0;
+                    const serverTime = msgId.high >>> 0;
                     const timeOffset = Math.floor(Date.now() / 1000) - serverTime;
-                    this._session._timeOffset = timeOffset;
+                    this._session.updateTimeOffset(timeOffset);
                     this.log.debug('server time: %d, corrected offset to %d', serverTime, timeOffset);
                 }
                 this._onMessageFailed(msg.badMsgId, `bad_msg_notification ${msg.errorCode}`);
@@ -1066,6 +1068,15 @@ export class SessionConnection extends PersistentConnection {
         this._enqueueRpc(pending, true);
         return pending.promise;
     }
+    notifyNetworkChanged(online) {
+        this._online = online;
+        if (online) {
+            this.reconnect();
+        }
+        else {
+            this.disconnectManual();
+        }
+    }
     _cancelRpc(rpc, onTimeout = false, abortSignal) {
         if (rpc.done)
             return;
@@ -1127,8 +1138,11 @@ export class SessionConnection extends PersistentConnection {
         this._flushTimer.emitWhenIdle();
     }
     _flush() {
-        if (!this._session._authKey.ready || this._isPfsBindingPending || this._session.current429Timeout) {
-            this.log.debug('skipping flush, connection is not usable (auth key ready = %b, pfs binding pending = %b, 429 timeout = %b)', this._session._authKey.ready, this._isPfsBindingPending, Boolean(this._session.current429Timeout));
+        if (this._disconnectedManually ||
+            !this._session._authKey.ready ||
+            this._isPfsBindingPending ||
+            this._session.current429Timeout) {
+            this.log.debug('skipping flush, connection is not usable (offline = %b, auth key ready = %b, pfs binding pending = %b, 429 timeout = %b)', this._disconnectedManually, this._session._authKey.ready, this._isPfsBindingPending, this._session.current429Timeout);
             // it will be flushed once connection is usable
             return;
         }