@mtcute/core 0.30.1 → 0.30.2

package/network/mtproto-session.d.cts

@@ -5,6 +5,7 @@ import { ICryptoProvider, Logger, LongMap, SortedArray } from '../utils/index.js
 import { ServerSaltManager } from './server-salt.js';
 import { default as Long } from 'long';
 import { AuthKey } from './auth-key.js';
+import { MessageIdStore } from './message-id-store.js';
 export interface PendingRpc {
     method: string;
     data: Uint8Array;
@@ -76,7 +77,7 @@ export declare class MtprotoSession {
     _lastMessageId: Long;
     _seqNo: number;
     recentOutgoingMsgIds: LruSet<Long>;
-    recentIncomingMsgIds: LruSet<Long>;
+    recentIncomingMsgIds: MessageIdStore;
     recentStateRequests: LruMap<Long, Long[]>;
     queuedRpc: Deque<PendingRpc>;
     queuedAcks: Long[];
@@ -91,6 +92,7 @@ export declare class MtprotoSession {
     lastPingRtt: number;
     lastPingTime: number;
     lastPingMsgId: Long;
+    lastActivityTime: number;
     lastSessionCreatedUid: Long;
     initConnectionCalled: boolean;
     authorizationPending: boolean;
@@ -101,7 +103,8 @@ export declare class MtprotoSession {
      */
     reset(withAuthKey?: boolean): void;
     resetAuthKey(): void;
-    updateTimeOffset(offset: number): void;
+    updateTimeOffset(offset: number, force?: boolean): void;
+    getServerTime(): number;
     /**
      * Reset session state and generate a new session ID.
      *

package/network/mtproto-session.d.ts

@@ -5,6 +5,7 @@ import { ICryptoProvider, Logger, LongMap, SortedArray } from '../utils/index.js
 import { ServerSaltManager } from './server-salt.js';
 import { default as Long } from 'long';
 import { AuthKey } from './auth-key.js';
+import { MessageIdStore } from './message-id-store.js';
 export interface PendingRpc {
     method: string;
     data: Uint8Array;
@@ -76,7 +77,7 @@ export declare class MtprotoSession {
     _lastMessageId: Long;
     _seqNo: number;
     recentOutgoingMsgIds: LruSet<Long>;
-    recentIncomingMsgIds: LruSet<Long>;
+    recentIncomingMsgIds: MessageIdStore;
     recentStateRequests: LruMap<Long, Long[]>;
     queuedRpc: Deque<PendingRpc>;
     queuedAcks: Long[];
@@ -91,6 +92,7 @@ export declare class MtprotoSession {
     lastPingRtt: number;
     lastPingTime: number;
     lastPingMsgId: Long;
+    lastActivityTime: number;
     lastSessionCreatedUid: Long;
     initConnectionCalled: boolean;
     authorizationPending: boolean;
@@ -101,7 +103,8 @@ export declare class MtprotoSession {
      */
     reset(withAuthKey?: boolean): void;
     resetAuthKey(): void;
-    updateTimeOffset(offset: number): void;
+    updateTimeOffset(offset: number, force?: boolean): void;
+    getServerTime(): number;
     /**
      * Reset session state and generate a new session ID.
      *

package/network/mtproto-session.js

@@ -5,6 +5,7 @@ import { randomLong, LongSet, LongMap, compareLongs } from "../utils/long-utils.
 import { getRandomInt } from "../utils/misc-utils.js";
 import { SortedArray } from "../utils/sorted-array.js";
 import { AuthKey } from "./auth-key.js";
+import { MessageIdStore } from "./message-id-store.js";
 import { MtcuteError } from "../types/errors.js";
 class MtprotoSession {
   constructor(_crypto, log, _readerMap, _writerMap, _salts) {
@@ -14,6 +15,7 @@ class MtprotoSession {
     this._writerMap = _writerMap;
     this._salts = _salts;
     this.log.prefix = `[SESSION ${this._sessionId.toString(16)}] `;
+    this._salts.setTimeSource(this.getServerTime.bind(this));
     this._authKey = new AuthKey(_crypto, log, _readerMap);
     this._authKeyTemp = new AuthKey(_crypto, log, _readerMap);
     this._authKeyTempSecondary = new AuthKey(_crypto, log, _readerMap);
@@ -28,7 +30,7 @@ class MtprotoSession {
   /// state ///
   // recent msg ids
   recentOutgoingMsgIds = new LruSet(1e3, LongSet);
-  recentIncomingMsgIds = new LruSet(1e3, LongSet);
+  recentIncomingMsgIds = new MessageIdStore();
   // <deno-tsignore>
   recentStateRequests = new LruMap(1e3, LongMap);
   // queues
@@ -51,6 +53,7 @@ class MtprotoSession {
   lastPingRtt = Number.NaN;
   lastPingTime = 0;
   lastPingMsgId = Long.ZERO;
+  lastActivityTime = 0;
   lastSessionCreatedUid = Long.ZERO;
   initConnectionCalled = false;
   authorizationPending = false;
@@ -73,11 +76,15 @@ class MtprotoSession {
     this._authKeyTemp.reset();
     this._authKeyTempSecondary.reset();
   }
-  updateTimeOffset(offset) {
+  updateTimeOffset(offset, force = false) {
+    if (!force && offset <= this._timeOffset) return;
     this.log.debug("time offset updated: %d", offset);
     this._timeOffset = offset;
     this._lastMessageId = Long.ZERO;
   }
+  getServerTime() {
+    return Math.floor(performance.now() / 1e3) + this._timeOffset;
+  }
   /**
    * Reset session state and generate a new session ID.
    *

package/network/multi-session-connection.cjs

@@ -160,6 +160,13 @@ class MultiSessionConnection {
     if (this._connections[0].isConnected) return;
     this.connect();
   }
+  get isConnected() {
+    return this._connections.some((conn) => conn.isConnected);
+  }
+  destroyAuthKey() {
+    const conn = this._connections.find((c) => c.isConnected) ?? this._connections[0];
+    conn?.destroyAuthKey();
+  }
   _authKey = null;
   setAuthKey(authKey) {
     this._authKey = authKey;

package/network/multi-session-connection.d.cts

@@ -29,6 +29,8 @@ export declare class MultiSessionConnection {
     sendRpc<T extends tl.RpcMethod>(request: T, timeout?: number, abortSignal?: AbortSignal, chainId?: string | number): Promise<tl.RpcCallReturn[T['_']] | mtp.RawMt_rpc_error>;
     connect(): void;
     ensureConnected(): void;
+    get isConnected(): boolean;
+    destroyAuthKey(): void;
     private _authKey;
     setAuthKey(authKey: Uint8Array | null): void;
     setTempAuthKey(authKey: Uint8Array | null, idx: number): void;

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

@@ -29,6 +29,8 @@ export declare class MultiSessionConnection {
     sendRpc<T extends tl.RpcMethod>(request: T, timeout?: number, abortSignal?: AbortSignal, chainId?: string | number): Promise<tl.RpcCallReturn[T['_']] | mtp.RawMt_rpc_error>;
     connect(): void;
     ensureConnected(): void;
+    get isConnected(): boolean;
+    destroyAuthKey(): void;
     private _authKey;
     setAuthKey(authKey: Uint8Array | null): void;
     setTempAuthKey(authKey: Uint8Array | null, idx: number): void;

package/network/multi-session-connection.js

@@ -153,6 +153,13 @@ class MultiSessionConnection {
     if (this._connections[0].isConnected) return;
     this.connect();
   }
+  get isConnected() {
+    return this._connections.some((conn) => conn.isConnected);
+  }
+  destroyAuthKey() {
+    const conn = this._connections.find((c) => c.isConnected) ?? this._connections[0];
+    conn?.destroyAuthKey();
+  }
   _authKey = null;
   setAuthKey(authKey) {
     this._authKey = authKey;

package/network/network-manager.cjs

@@ -227,7 +227,7 @@ class NetworkManager {
       _: "initConnection",
       deviceModel,
       systemVersion: "1.0",
-      appVersion: "0.30.1",
+      appVersion: "0.30.2",
       systemLangCode: "en",
       langPack: "",
       // "langPacks are for official apps only"
@@ -415,6 +415,12 @@ class NetworkManager {
     return user;
   }
   notifyLoggedOut() {
+    const primaryDcId = this._primaryDc?.dcId;
+    for (const dc of this._dcConnections.values()) {
+      if (dc.dcId === primaryDcId) continue;
+      const pool = [dc.main, dc.download, dc.upload, dc.downloadSmall].find((p) => p.isConnected);
+      pool?.destroyAuthKey();
+    }
     this._businessConnectionDcs.clear();
     this.setIsPremium(false);
     this.resetSessions();

package/network/network-manager.js

@@ -220,7 +220,7 @@ class NetworkManager {
       _: "initConnection",
       deviceModel,
       systemVersion: "1.0",
-      appVersion: "0.30.1",
+      appVersion: "0.30.2",
       systemLangCode: "en",
       langPack: "",
       // "langPacks are for official apps only"
@@ -408,6 +408,12 @@ class NetworkManager {
     return user;
   }
   notifyLoggedOut() {
+    const primaryDcId = this._primaryDc?.dcId;
+    for (const dc of this._dcConnections.values()) {
+      if (dc.dcId === primaryDcId) continue;
+      const pool = [dc.main, dc.download, dc.upload, dc.downloadSmall].find((p) => p.isConnected);
+      pool?.destroyAuthKey();
+    }
     this._businessConnectionDcs.clear();
     this.setIsPremium(false);
     this.resetSessions();

package/network/resource-limiter.cjs

@@ -0,0 +1,60 @@
+if (typeof globalThis !== "undefined" && !globalThis._MTCUTE_CJS_DEPRECATION_WARNED) {
+  globalThis._MTCUTE_CJS_DEPRECATION_WARNED = true;
+  console.warn("[@mtcute/core] CommonJS bundles are deprecated. They will be removed completely in one of the upcoming releases. No support is provided for CommonJS users. Please consider switching to ESM, it's " + (/* @__PURE__ */ new Date()).getFullYear() + " already.");
+  console.warn("[@mtcute/core] Learn more about switching to ESM: https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c");
+}
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const utils = require("@fuman/utils");
+class ResourceLimiter {
+  constructor(max) {
+    this.max = max;
+    this._available = max;
+  }
+  _available;
+  _waiters = [];
+  setMax(max) {
+    this._available += max - this.max;
+    this.max = max;
+    this._pump();
+  }
+  tryAcquire(bytes) {
+    if (bytes > this.max) bytes = this.max;
+    if (!this._waiters.length && this._available >= bytes) {
+      this._available -= bytes;
+      return true;
+    }
+    return false;
+  }
+  acquire(bytes, signal) {
+    if (this.tryAcquire(bytes)) return Promise.resolve();
+    if (bytes > this.max) bytes = this.max;
+    const deferred = new utils.Deferred();
+    const waiter = { need: bytes, deferred };
+    this._waiters.push(waiter);
+    if (signal) {
+      const onAbort = () => {
+        const idx = this._waiters.indexOf(waiter);
+        if (idx >= 0) this._waiters.splice(idx, 1);
+        deferred.reject(signal.reason);
+      };
+      signal.addEventListener("abort", onAbort, { once: true });
+      const removeListener = signal.removeEventListener.bind(signal, "abort", onAbort);
+      deferred.promise.then(removeListener, removeListener);
+    }
+    return deferred.promise;
+  }
+  release(bytes) {
+    if (bytes > this.max) bytes = this.max;
+    this._available += bytes;
+    this._pump();
+  }
+  _pump() {
+    while (this._waiters.length && this._waiters[0].need <= this._available) {
+      const waiter = this._waiters.shift();
+      this._available -= waiter.need;
+      waiter.deferred.resolve();
+    }
+  }
+}
+exports.ResourceLimiter = ResourceLimiter;

package/network/resource-limiter.d.cts

@@ -0,0 +1,11 @@
+export declare class ResourceLimiter {
+    max: number;
+    private _available;
+    private _waiters;
+    constructor(max: number);
+    setMax(max: number): void;
+    tryAcquire(bytes: number): boolean;
+    acquire(bytes: number, signal?: AbortSignal): Promise<void>;
+    release(bytes: number): void;
+    private _pump;
+}

package/network/resource-limiter.d.ts

@@ -0,0 +1,11 @@
+export declare class ResourceLimiter {
+    max: number;
+    private _available;
+    private _waiters;
+    constructor(max: number);
+    setMax(max: number): void;
+    tryAcquire(bytes: number): boolean;
+    acquire(bytes: number, signal?: AbortSignal): Promise<void>;
+    release(bytes: number): void;
+    private _pump;
+}

package/network/resource-limiter.js

@@ -0,0 +1,55 @@
+import { Deferred } from "@fuman/utils";
+class ResourceLimiter {
+  constructor(max) {
+    this.max = max;
+    this._available = max;
+  }
+  _available;
+  _waiters = [];
+  setMax(max) {
+    this._available += max - this.max;
+    this.max = max;
+    this._pump();
+  }
+  tryAcquire(bytes) {
+    if (bytes > this.max) bytes = this.max;
+    if (!this._waiters.length && this._available >= bytes) {
+      this._available -= bytes;
+      return true;
+    }
+    return false;
+  }
+  acquire(bytes, signal) {
+    if (this.tryAcquire(bytes)) return Promise.resolve();
+    if (bytes > this.max) bytes = this.max;
+    const deferred = new Deferred();
+    const waiter = { need: bytes, deferred };
+    this._waiters.push(waiter);
+    if (signal) {
+      const onAbort = () => {
+        const idx = this._waiters.indexOf(waiter);
+        if (idx >= 0) this._waiters.splice(idx, 1);
+        deferred.reject(signal.reason);
+      };
+      signal.addEventListener("abort", onAbort, { once: true });
+      const removeListener = signal.removeEventListener.bind(signal, "abort", onAbort);
+      deferred.promise.then(removeListener, removeListener);
+    }
+    return deferred.promise;
+  }
+  release(bytes) {
+    if (bytes > this.max) bytes = this.max;
+    this._available += bytes;
+    this._pump();
+  }
+  _pump() {
+    while (this._waiters.length && this._waiters[0].need <= this._available) {
+      const waiter = this._waiters.shift();
+      this._available -= waiter.need;
+      waiter.deferred.resolve();
+    }
+  }
+}
+export {
+  ResourceLimiter
+};

package/network/resource-limiter.test.d.cts

@@ -0,0 +1 @@
+export {};

package/network/resource-limiter.test.d.ts

@@ -0,0 +1 @@
+export {};

package/network/server-salt.cjs

@@ -11,12 +11,16 @@ class ServerSaltManager {
   _futureSalts = [];
   currentSalt = Long.ZERO;
   isFetching = false;
+  _getServerTime = () => Date.now() / 1e3;
+  setTimeSource(fn) {
+    this._getServerTime = fn;
+  }
   shouldFetchSalts() {
     return !this.isFetching && !this.currentSalt.isZero() && this._futureSalts.length < 2;
   }
   setFutureSalts(salts) {
     this._futureSalts = salts;
-    const now = Date.now() / 1e3;
+    const now = this._getServerTime();
     while (salts.length > 0 && salts[0].validSince <= now) {
       this.currentSalt = salts[0].salt;
       this._futureSalts.shift();
@@ -30,11 +34,11 @@ class ServerSaltManager {
     this._timer = utils.timers.setTimeout(() => {
       this.currentSalt = salt.salt;
       this._replaceAndScheduleNext();
-    }, salt.validSince * 1e3 - Date.now());
+    }, (salt.validSince - this._getServerTime()) * 1e3);
   }
   _replaceAndScheduleNext() {
     if (this._timer) utils.timers.clearTimeout(this._timer);
-    const now = Date.now() / 1e3;
+    const now = this._getServerTime();
     while (this._futureSalts.length !== 0) {
       const salt = this._futureSalts[0];
       if (salt.validSince > now) break;

package/network/server-salt.d.cts

@@ -4,6 +4,8 @@ export declare class ServerSaltManager {
     private _futureSalts;
     currentSalt: Long;
     isFetching: boolean;
+    private _getServerTime;
+    setTimeSource(fn: () => number): void;
     shouldFetchSalts(): boolean;
     setFutureSalts(salts: mtp.RawMt_future_salt[]): void;
     private _timer?;

package/network/server-salt.d.ts

@@ -4,6 +4,8 @@ export declare class ServerSaltManager {
     private _futureSalts;
     currentSalt: Long;
     isFetching: boolean;
+    private _getServerTime;
+    setTimeSource(fn: () => number): void;
     shouldFetchSalts(): boolean;
     setFutureSalts(salts: mtp.RawMt_future_salt[]): void;
     private _timer?;

package/network/server-salt.js

@@ -4,12 +4,16 @@ class ServerSaltManager {
   _futureSalts = [];
   currentSalt = Long.ZERO;
   isFetching = false;
+  _getServerTime = () => Date.now() / 1e3;
+  setTimeSource(fn) {
+    this._getServerTime = fn;
+  }
   shouldFetchSalts() {
     return !this.isFetching && !this.currentSalt.isZero() && this._futureSalts.length < 2;
   }
   setFutureSalts(salts) {
     this._futureSalts = salts;
-    const now = Date.now() / 1e3;
+    const now = this._getServerTime();
     while (salts.length > 0 && salts[0].validSince <= now) {
       this.currentSalt = salts[0].salt;
       this._futureSalts.shift();
@@ -23,11 +27,11 @@ class ServerSaltManager {
     this._timer = timers.setTimeout(() => {
       this.currentSalt = salt.salt;
       this._replaceAndScheduleNext();
-    }, salt.validSince * 1e3 - Date.now());
+    }, (salt.validSince - this._getServerTime()) * 1e3);
   }
   _replaceAndScheduleNext() {
     if (this._timer) timers.clearTimeout(this._timer);
-    const now = Date.now() / 1e3;
+    const now = this._getServerTime();
     while (this._futureSalts.length !== 0) {
       const salt = this._futureSalts[0];
       if (salt.validSince > now) break;