@mtcute/core 0.27.6 → 0.27.8

package/highlevel/utils/file-utils.cjs

@@ -11,7 +11,7 @@ function determinePartSize(fileSize) {
   if (fileSize <= 262078465) return 128;
   if (fileSize <= 786432e3) return 256;
   if (fileSize <= 2097152e3) return 512;
-  throw new errors.MtArgumentError("File is too large");
+  return 1024;
 }
 function isProbablyPlainText(buf) {
   return !buf.some(

package/highlevel/utils/file-utils.js

@@ -4,7 +4,7 @@ function determinePartSize(fileSize) {
   if (fileSize <= 262078465) return 128;
   if (fileSize <= 786432e3) return 256;
   if (fileSize <= 2097152e3) return 512;
-  throw new MtArgumentError("File is too large");
+  return 1024;
 }
 function isProbablyPlainText(buf) {
   return !buf.some(

package/network/middlewares/internal-errors.cjs

@@ -41,9 +41,10 @@ function internalErrorsHandler(params) {
         }
         const waitSeconds = res.errorMessage === "WORKER_BUSY_TOO_LONG_RETRY" ? Math.max(1, waitTime) : waitTime;
         ctx.manager._log.warn(
-          "Telegram is having internal issues: %d:%s, retrying in %ds",
+          "Telegram is having internal issues: %d:%s (%s), retrying in %ds",
           res.errorCode,
           res.errorMessage,
+          ctx.request._,
           waitSeconds
         );
         if (waitSeconds > 0) {

package/network/middlewares/internal-errors.js

@@ -34,9 +34,10 @@ function internalErrorsHandler(params) {
         }
         const waitSeconds = res.errorMessage === "WORKER_BUSY_TOO_LONG_RETRY" ? Math.max(1, waitTime) : waitTime;
         ctx.manager._log.warn(
-          "Telegram is having internal issues: %d:%s, retrying in %ds",
+          "Telegram is having internal issues: %d:%s (%s), retrying in %ds",
           res.errorCode,
           res.errorMessage,
+          ctx.request._,
           waitSeconds
         );
         if (waitSeconds > 0) {

package/network/mtproto-session.cjs

@@ -36,6 +36,7 @@ class MtprotoSession {
   // recent msg ids
   recentOutgoingMsgIds = new utils.LruSet(1e3, longUtils.LongSet);
   recentIncomingMsgIds = new utils.LruSet(1e3, longUtils.LongSet);
+  recentStateRequests = new utils.LruMap(1e3, longUtils.LongMap);
   // queues
   queuedRpc = new utils.Deque();
   queuedAcks = [];
@@ -65,7 +66,7 @@ class MtprotoSession {
   next429ResetTimeout;
   get hasPendingMessages() {
     return Boolean(
-      this.queuedRpc.length || this.queuedAcks.length || this.queuedStateReq.length || this.queuedResendReq.length
+      this.queuedRpc.length || this.queuedAcks.length || this.queuedStateReq.length || this.queuedResendReq.length || this.queuedCancelReq.length
     );
   }
   /**
@@ -111,6 +112,7 @@ class MtprotoSession {
     }
     this.recentOutgoingMsgIds.clear();
     this.recentIncomingMsgIds.clear();
+    this.recentStateRequests.clear();
     if (!keepPending) {
       while (this.queuedRpc.length) {
         const rpc = this.queuedRpc.popFront();

package/network/mtproto-session.d.cts

@@ -1,4 +1,4 @@
-import { Deferred, Deque, LruSet, timers } from '@fuman/utils';
+import { Deferred, Deque, LruMap, LruSet, timers } from '@fuman/utils';
 import { mtp, tl } from '@mtcute/tl';
 import { TlBinaryWriter, TlReaderMap, TlWriterMap } from '@mtcute/tl-runtime';
 import { ICryptoProvider, Logger, LongMap, SortedArray } from '../utils/index.js';
@@ -77,6 +77,7 @@ export declare class MtprotoSession {
     _seqNo: number;
     recentOutgoingMsgIds: LruSet<Long>;
     recentIncomingMsgIds: LruSet<Long>;
+    recentStateRequests: LruMap<Long, Long[]>;
     queuedRpc: Deque<PendingRpc>;
     queuedAcks: Long[];
     queuedStateReq: Long[];

package/network/mtproto-session.d.ts

@@ -1,4 +1,4 @@
-import { Deferred, Deque, LruSet, timers } from '@fuman/utils';
+import { Deferred, Deque, LruMap, LruSet, timers } from '@fuman/utils';
 import { mtp, tl } from '@mtcute/tl';
 import { TlBinaryWriter, TlReaderMap, TlWriterMap } from '@mtcute/tl-runtime';
 import { ICryptoProvider, Logger, LongMap, SortedArray } from '../utils/index.js';
@@ -77,6 +77,7 @@ export declare class MtprotoSession {
     _seqNo: number;
     recentOutgoingMsgIds: LruSet<Long>;
     recentIncomingMsgIds: LruSet<Long>;
+    recentStateRequests: LruMap<Long, Long[]>;
     queuedRpc: Deque<PendingRpc>;
     queuedAcks: Long[];
     queuedStateReq: Long[];

package/network/mtproto-session.js

@@ -1,4 +1,4 @@
-import { LruSet, Deque, timers } from "@fuman/utils";
+import { LruSet, LruMap, Deque, timers } from "@fuman/utils";
 import { TlSerializationCounter } from "@mtcute/tl-runtime";
 import Long from "long";
 import { randomLong, LongSet, LongMap, compareLongs } from "../utils/long-utils.js";
@@ -29,6 +29,7 @@ class MtprotoSession {
   // recent msg ids
   recentOutgoingMsgIds = new LruSet(1e3, LongSet);
   recentIncomingMsgIds = new LruSet(1e3, LongSet);
+  recentStateRequests = new LruMap(1e3, LongMap);
   // queues
   queuedRpc = new Deque();
   queuedAcks = [];
@@ -58,7 +59,7 @@ class MtprotoSession {
   next429ResetTimeout;
   get hasPendingMessages() {
     return Boolean(
-      this.queuedRpc.length || this.queuedAcks.length || this.queuedStateReq.length || this.queuedResendReq.length
+      this.queuedRpc.length || this.queuedAcks.length || this.queuedStateReq.length || this.queuedResendReq.length || this.queuedCancelReq.length
     );
   }
   /**
@@ -104,6 +105,7 @@ class MtprotoSession {
     }
     this.recentOutgoingMsgIds.clear();
     this.recentIncomingMsgIds.clear();
+    this.recentStateRequests.clear();
     if (!keepPending) {
       while (this.queuedRpc.length) {
         const rpc = this.queuedRpc.popFront();

package/network/network-manager.cjs

@@ -225,7 +225,7 @@ class NetworkManager {
       _: "initConnection",
       deviceModel,
       systemVersion: "1.0",
-      appVersion: "0.27.6",
+      appVersion: "0.27.8",
       systemLangCode: "en",
       langPack: "",
       // "langPacks are for official apps only"

package/network/network-manager.js

@@ -218,7 +218,7 @@ class NetworkManager {
       _: "initConnection",
       deviceModel,
       systemVersion: "1.0",
-      appVersion: "0.27.6",
+      appVersion: "0.27.8",
       systemLangCode: "en",
       langPack: "",
       // "langPacks are for official apps only"

package/network/server-salt.cjs

@@ -17,35 +17,42 @@ class ServerSaltManager {
   setFutureSalts(salts) {
     this._futureSalts = salts;
     const now = Date.now() / 1e3;
-    while (salts.length > 0 && now > salts[0].validSince) {
+    while (salts.length > 0 && now > salts[0].validUntil) {
       this.currentSalt = salts[0].salt;
       this._futureSalts.shift();
     }
-    if (!this._futureSalts.length) this.currentSalt = Long.ZERO;
-    else this._scheduleNext();
+    if (salts.length > 0 && salts[0].validSince <= now) {
+      this.currentSalt = salts[0].salt;
+      this._futureSalts.shift();
+    }
+    if (!this._futureSalts.length) ;
+    else {
+      this._scheduleReplace(this._futureSalts[0]);
+    }
   }
   _timer;
-  _scheduleNext() {
+  _scheduleReplace(salt) {
+    this._timer = utils.timers.setTimeout(() => {
+      this.currentSalt = salt.salt;
+      this._replaceAndScheduleNext();
+    }, salt.validSince * 1e3 - Date.now());
+  }
+  _replaceAndScheduleNext() {
     if (this._timer) utils.timers.clearTimeout(this._timer);
     const now = Date.now() / 1e3;
     let next;
     while (this._futureSalts.length !== 0) {
-      const salt = this._futureSalts.shift();
+      const salt = this._futureSalts[0];
       if (salt.validSince <= now && now <= salt.validUntil) {
         next = salt;
         break;
       }
+      this._futureSalts.shift();
     }
     if (!next) {
       return;
     }
-    this._timer = utils.timers.setTimeout(
-      () => {
-        this.currentSalt = next.salt;
-        this._scheduleNext();
-      },
-      next.validSince * 1e3 - Date.now()
-    );
+    this._scheduleReplace(next);
   }
   destroy() {
     utils.timers.clearTimeout(this._timer);

package/network/server-salt.d.cts

@@ -7,6 +7,7 @@ export declare class ServerSaltManager {
     shouldFetchSalts(): boolean;
     setFutureSalts(salts: mtp.RawMt_future_salt[]): void;
     private _timer?;
-    private _scheduleNext;
+    private _scheduleReplace;
+    private _replaceAndScheduleNext;
     destroy(): void;
 }

package/network/server-salt.d.ts

@@ -7,6 +7,7 @@ export declare class ServerSaltManager {
     shouldFetchSalts(): boolean;
     setFutureSalts(salts: mtp.RawMt_future_salt[]): void;
     private _timer?;
-    private _scheduleNext;
+    private _scheduleReplace;
+    private _replaceAndScheduleNext;
     destroy(): void;
 }

package/network/server-salt.js

@@ -10,35 +10,42 @@ class ServerSaltManager {
   setFutureSalts(salts) {
     this._futureSalts = salts;
     const now = Date.now() / 1e3;
-    while (salts.length > 0 && now > salts[0].validSince) {
+    while (salts.length > 0 && now > salts[0].validUntil) {
       this.currentSalt = salts[0].salt;
       this._futureSalts.shift();
     }
-    if (!this._futureSalts.length) this.currentSalt = Long.ZERO;
-    else this._scheduleNext();
+    if (salts.length > 0 && salts[0].validSince <= now) {
+      this.currentSalt = salts[0].salt;
+      this._futureSalts.shift();
+    }
+    if (!this._futureSalts.length) ;
+    else {
+      this._scheduleReplace(this._futureSalts[0]);
+    }
   }
   _timer;
-  _scheduleNext() {
+  _scheduleReplace(salt) {
+    this._timer = timers.setTimeout(() => {
+      this.currentSalt = salt.salt;
+      this._replaceAndScheduleNext();
+    }, salt.validSince * 1e3 - Date.now());
+  }
+  _replaceAndScheduleNext() {
     if (this._timer) timers.clearTimeout(this._timer);
     const now = Date.now() / 1e3;
     let next;
     while (this._futureSalts.length !== 0) {
-      const salt = this._futureSalts.shift();
+      const salt = this._futureSalts[0];
       if (salt.validSince <= now && now <= salt.validUntil) {
         next = salt;
         break;
       }
+      this._futureSalts.shift();
     }
     if (!next) {
       return;
     }
-    this._timer = timers.setTimeout(
-      () => {
-        this.currentSalt = next.salt;
-        this._scheduleNext();
-      },
-      next.validSince * 1e3 - Date.now()
-    );
+    this._scheduleReplace(next);
   }
   destroy() {
     timers.clearTimeout(this._timer);

package/network/session-connection.cjs

@@ -19,7 +19,7 @@ const abstract = require("./transports/abstract.cjs");
 const errors = require("../types/errors.cjs");
 const TEMP_AUTH_KEY_EXPIRY = 86400;
 const GET_STATE_INTERVAL = 1500;
-const GET_STATE_TIMEOUT = 2e3;
+const GET_STATE_TIMEOUT = 2500;
 const GZIP_PACKED_ID = 812830625;
 const MSG_CONTAINER_ID = 1945237724;
 const RPC_RESULT_ID = 4082920705;
@@ -748,8 +748,11 @@ class SessionConnection extends persistentConnection.PersistentConnection {
           utils.timers.clearTimeout(timer);
           this._session.pendingGetStateTimeouts.delete(msgId);
         }
-        this._session.queuedStateReq.unshift(...msgInfo.msgIds);
-        this._flushTimer.emitWhenIdle();
+        const stillPending = msgInfo.msgIds.filter((id) => this._session.pendingMessages.has(id));
+        if (stillPending.length > 0) {
+          this._session.queuedStateReq.unshift(...stillPending);
+          this._flushTimer.emitWhenIdle();
+        }
         break;
       }
       case "bind":
@@ -839,7 +842,7 @@ class SessionConnection extends persistentConnection.PersistentConnection {
         if (msgId.lt(firstMsgId)) {
           this._session.pendingMessages.delete(msgId);
         }
-        return;
+        continue;
       }
       const containerId = val._ === "rpc" ? val.rpc.containerId || msgId : val.containerId;
       if (containerId.lt(firstMsgId)) {
@@ -869,7 +872,7 @@ class SessionConnection extends persistentConnection.PersistentConnection {
               status,
               answerMsgId
             );
-            return this._onMessageFailed(msgId, "message info state = 0, ans_id = 0");
+            return this._onMessageFailed(msgId, "message info state = 0 with unexpected ans_id");
           }
         // fallthrough
         case 4:
@@ -904,8 +907,16 @@ class SessionConnection extends persistentConnection.PersistentConnection {
   }
   _onMsgsStateInfo(msg) {
     const info = this._session.pendingMessages.get(msg.reqMsgId);
+    let timer;
+    if (timer = this._session.pendingGetStateTimeouts.get(msg.reqMsgId)) {
+      utils.timers.clearTimeout(timer);
+      this._session.pendingGetStateTimeouts.delete(msg.reqMsgId);
+    }
     if (!info) {
-      if (this._session.recentOutgoingMsgIds.has(msg.reqMsgId)) {
+      const msgIdsFromRecents = this._session.recentStateRequests.get(msg.reqMsgId);
+      if (msgIdsFromRecents) {
+        this._session.recentStateRequests.delete(msg.reqMsgId);
+        this._onMessagesInfo(msgIdsFromRecents, msg.info);
         return;
       }
       this.log.warn("received msgs_state_info to unknown request %l", msg.reqMsgId);
@@ -915,12 +926,8 @@ class SessionConnection extends persistentConnection.PersistentConnection {
       this.log.warn("received msgs_state_info to %s query %l", info._, msg.reqMsgId);
       return;
     }
+    this.log.debug("received msgs_state_info for %l", msg.reqMsgId);
     this._session.pendingMessages.delete(msg.reqMsgId);
-    let timer;
-    if (timer = this._session.pendingGetStateTimeouts.get(msg.reqMsgId)) {
-      utils.timers.clearTimeout(timer);
-      this._session.pendingGetStateTimeouts.delete(msg.reqMsgId);
-    }
     this._onMessagesInfo(info.msgIds, msg.info);
   }
   _onFutureSalts(msg) {
@@ -1323,6 +1330,7 @@ class SessionConnection extends persistentConnection.PersistentConnection {
         containerId: getStateMsgId
       };
       this._session.pendingMessages.set(getStateMsgId, getStatePending);
+      this._session.recentStateRequests.set(getStateMsgId, getStatePending.msgIds);
       otherPendings.push(getStatePending);
       const timeout = utils.timers.setTimeout(this._handleGetStateTimeout, GET_STATE_TIMEOUT, getStateMsgId);
       this._session.pendingGetStateTimeouts.set(getStateMsgId, timeout);
@@ -1466,9 +1474,9 @@ class SessionConnection extends persistentConnection.PersistentConnection {
       getStateMsgIds,
       getStateMsgId,
       resendMsgIds,
+      resendMsgId,
       cancelRpcs,
       cancelRpcs,
-      resendMsgId,
       getFutureSaltsRequest,
       getFutureSaltsMsgId,
       rpcToSend.map((it) => it.method),

package/network/session-connection.js

@@ -12,7 +12,7 @@ import { TransportError } from "./transports/abstract.js";
 import { MtcuteError, MtTimeoutError, MtArgumentError } from "../types/errors.js";
 const TEMP_AUTH_KEY_EXPIRY = 86400;
 const GET_STATE_INTERVAL = 1500;
-const GET_STATE_TIMEOUT = 2e3;
+const GET_STATE_TIMEOUT = 2500;
 const GZIP_PACKED_ID = 812830625;
 const MSG_CONTAINER_ID = 1945237724;
 const RPC_RESULT_ID = 4082920705;
@@ -741,8 +741,11 @@ class SessionConnection extends PersistentConnection {
           timers.clearTimeout(timer);
           this._session.pendingGetStateTimeouts.delete(msgId);
         }
-        this._session.queuedStateReq.unshift(...msgInfo.msgIds);
-        this._flushTimer.emitWhenIdle();
+        const stillPending = msgInfo.msgIds.filter((id) => this._session.pendingMessages.has(id));
+        if (stillPending.length > 0) {
+          this._session.queuedStateReq.unshift(...stillPending);
+          this._flushTimer.emitWhenIdle();
+        }
         break;
       }
       case "bind":
@@ -832,7 +835,7 @@ class SessionConnection extends PersistentConnection {
         if (msgId.lt(firstMsgId)) {
           this._session.pendingMessages.delete(msgId);
         }
-        return;
+        continue;
       }
       const containerId = val._ === "rpc" ? val.rpc.containerId || msgId : val.containerId;
       if (containerId.lt(firstMsgId)) {
@@ -862,7 +865,7 @@ class SessionConnection extends PersistentConnection {
               status,
               answerMsgId
             );
-            return this._onMessageFailed(msgId, "message info state = 0, ans_id = 0");
+            return this._onMessageFailed(msgId, "message info state = 0 with unexpected ans_id");
           }
         // fallthrough
         case 4:
@@ -897,8 +900,16 @@ class SessionConnection extends PersistentConnection {
   }
   _onMsgsStateInfo(msg) {
     const info = this._session.pendingMessages.get(msg.reqMsgId);
+    let timer;
+    if (timer = this._session.pendingGetStateTimeouts.get(msg.reqMsgId)) {
+      timers.clearTimeout(timer);
+      this._session.pendingGetStateTimeouts.delete(msg.reqMsgId);
+    }
     if (!info) {
-      if (this._session.recentOutgoingMsgIds.has(msg.reqMsgId)) {
+      const msgIdsFromRecents = this._session.recentStateRequests.get(msg.reqMsgId);
+      if (msgIdsFromRecents) {
+        this._session.recentStateRequests.delete(msg.reqMsgId);
+        this._onMessagesInfo(msgIdsFromRecents, msg.info);
         return;
       }
       this.log.warn("received msgs_state_info to unknown request %l", msg.reqMsgId);
@@ -908,12 +919,8 @@ class SessionConnection extends PersistentConnection {
       this.log.warn("received msgs_state_info to %s query %l", info._, msg.reqMsgId);
       return;
     }
+    this.log.debug("received msgs_state_info for %l", msg.reqMsgId);
     this._session.pendingMessages.delete(msg.reqMsgId);
-    let timer;
-    if (timer = this._session.pendingGetStateTimeouts.get(msg.reqMsgId)) {
-      timers.clearTimeout(timer);
-      this._session.pendingGetStateTimeouts.delete(msg.reqMsgId);
-    }
     this._onMessagesInfo(info.msgIds, msg.info);
   }
   _onFutureSalts(msg) {
@@ -1316,6 +1323,7 @@ class SessionConnection extends PersistentConnection {
         containerId: getStateMsgId
       };
       this._session.pendingMessages.set(getStateMsgId, getStatePending);
+      this._session.recentStateRequests.set(getStateMsgId, getStatePending.msgIds);
       otherPendings.push(getStatePending);
       const timeout = timers.setTimeout(this._handleGetStateTimeout, GET_STATE_TIMEOUT, getStateMsgId);
       this._session.pendingGetStateTimeouts.set(getStateMsgId, timeout);
@@ -1459,9 +1467,9 @@ class SessionConnection extends PersistentConnection {
       getStateMsgIds,
       getStateMsgId,
       resendMsgIds,
+      resendMsgId,
       cancelRpcs,
       cancelRpcs,
-      resendMsgId,
       getFutureSaltsRequest,
       getFutureSaltsMsgId,
       rpcToSend.map((it) => it.method),

package/package.json

@@ -1,15 +1,15 @@
 {
     "name": "@mtcute/core",
     "type": "module",
-    "version": "0.27.6",
+    "version": "0.27.8",
     "description": "Type-safe library for MTProto (Telegram API)",
     "license": "MIT",
     "scripts": {},
     "dependencies": {
-        "@fuman/io": "0.0.17",
-        "@fuman/net": "0.0.17",
-        "@fuman/utils": "0.0.17",
-        "@mtcute/file-id": "^0.27.6",
+        "@fuman/io": "0.0.19",
+        "@fuman/net": "0.0.19",
+        "@fuman/utils": "0.0.19",
+        "@mtcute/file-id": "^0.27.8",
         "@mtcute/tl": "^221.0.0",
         "@mtcute/tl-runtime": "^0.24.3",
         "@types/events": "3.0.0",

package/storage/sqlite/driver.cjs

@@ -95,7 +95,7 @@ class BaseSqliteStorageDriver extends driver.BaseStorageDriver {
     this.db = this._createDatabase();
     this._runMany = this.db.transaction((stmts) => {
       stmts.forEach((stmt) => {
-        stmt[0].run(stmt[1]);
+        stmt[0].run(...stmt[1]);
       });
     });
     this.db.transaction(() => this._initialize())();

package/storage/sqlite/driver.js

@@ -88,7 +88,7 @@ class BaseSqliteStorageDriver extends BaseStorageDriver {
     this.db = this._createDatabase();
     this._runMany = this.db.transaction((stmts) => {
       stmts.forEach((stmt) => {
-        stmt[0].run(stmt[1]);
+        stmt[0].run(...stmt[1]);
       });
     });
     this.db.transaction(() => this._initialize())();