@mtcute/core 0.22.2 → 0.23.0

package/network/middlewares/flood-waiter.cjs

@@ -8,8 +8,22 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const abortSignal = require("../../utils/abort-signal.cjs");
 const miscUtils = require("../../utils/misc-utils.cjs");
 const typeAssertions = require("../../utils/type-assertions.cjs");
+const SILENTLY_SLEEP_METHODS = /* @__PURE__ */ new Set([
+  "upload.getFile",
+  "upload.saveFilePart",
+  "upload.saveBigFilePart",
+  "updates.getDifference",
+  "updates.getChannelDifference"
+]);
+const SILENTLY_SLEEP_THRESHOLD = 5;
 function floodWaiter(options) {
-  const { maxWait = 1e4, maxRetries = 5, store = true, minStoredWait = 3e3 } = options;
+  const {
+    maxWait = 1e4,
+    maxRetries = 5,
+    store = true,
+    minStoredWait = 2e3,
+    onBeforeWait
+  } = options;
   const storage = /* @__PURE__ */ new Map();
   return async (ctx, next) => {
     const method = ctx.request._;
@@ -52,7 +66,9 @@ function floodWaiter(options) {
         }
         const ms = seconds * 1e3;
         if (ms <= floodSleepThreshold) {
-          if (ctx.request._ !== "upload.getFile") {
+          if (onBeforeWait) {
+            onBeforeWait(ctx, seconds);
+          } else if (!(seconds < SILENTLY_SLEEP_THRESHOLD && SILENTLY_SLEEP_METHODS.has(method))) {
             ctx.manager._log.warn("%s resulted in a flood wait, will retry in %d seconds", method, seconds);
           }
           await miscUtils.sleepWithAbort(

package/network/middlewares/flood-waiter.d.cts

@@ -1,4 +1,4 @@
-import { RpcCallMiddleware } from '../network-manager.js';
+import { RpcCallMiddleware, RpcCallMiddlewareContext } from '../network-manager.js';
 export interface FloodWaiterOptions {
     /**
      * Maximum number of ms to wait when a FLOOD_WAIT_X
@@ -30,8 +30,15 @@ export interface FloodWaiterOptions {
      * If the stored wait time is less than this value,
      * the request will not be delayed
      *
-     * @default  3_000
+     * @default  2_000
      */
     minStoredWait?: number;
+    /**
+     * Function that will be called before we are about to wait for `seconds`
+     * seconds before retrying the request.
+     *
+     * @default  print a warning to the console, except some methods that often result in flood waits
+     */
+    onBeforeWait?: (ctx: RpcCallMiddlewareContext, seconds: number) => void;
 }
 export declare function floodWaiter(options: FloodWaiterOptions): RpcCallMiddleware;

package/network/middlewares/flood-waiter.d.ts

@@ -1,4 +1,4 @@
-import { RpcCallMiddleware } from '../network-manager.js';
+import { RpcCallMiddleware, RpcCallMiddlewareContext } from '../network-manager.js';
 export interface FloodWaiterOptions {
     /**
      * Maximum number of ms to wait when a FLOOD_WAIT_X
@@ -30,8 +30,15 @@ export interface FloodWaiterOptions {
      * If the stored wait time is less than this value,
      * the request will not be delayed
      *
-     * @default  3_000
+     * @default  2_000
      */
     minStoredWait?: number;
+    /**
+     * Function that will be called before we are about to wait for `seconds`
+     * seconds before retrying the request.
+     *
+     * @default  print a warning to the console, except some methods that often result in flood waits
+     */
+    onBeforeWait?: (ctx: RpcCallMiddlewareContext, seconds: number) => void;
 }
 export declare function floodWaiter(options: FloodWaiterOptions): RpcCallMiddleware;

package/network/middlewares/flood-waiter.js

@@ -1,8 +1,22 @@
 import { combineAbortSignals } from "../../utils/abort-signal.js";
 import { sleepWithAbort } from "../../utils/misc-utils.js";
 import { isTlRpcError } from "../../utils/type-assertions.js";
+const SILENTLY_SLEEP_METHODS = /* @__PURE__ */ new Set([
+  "upload.getFile",
+  "upload.saveFilePart",
+  "upload.saveBigFilePart",
+  "updates.getDifference",
+  "updates.getChannelDifference"
+]);
+const SILENTLY_SLEEP_THRESHOLD = 5;
 function floodWaiter(options) {
-  const { maxWait = 1e4, maxRetries = 5, store = true, minStoredWait = 3e3 } = options;
+  const {
+    maxWait = 1e4,
+    maxRetries = 5,
+    store = true,
+    minStoredWait = 2e3,
+    onBeforeWait
+  } = options;
   const storage = /* @__PURE__ */ new Map();
   return async (ctx, next) => {
     const method = ctx.request._;
@@ -45,7 +59,9 @@ function floodWaiter(options) {
         }
         const ms = seconds * 1e3;
         if (ms <= floodSleepThreshold) {
-          if (ctx.request._ !== "upload.getFile") {
+          if (onBeforeWait) {
+            onBeforeWait(ctx, seconds);
+          } else if (!(seconds < SILENTLY_SLEEP_THRESHOLD && SILENTLY_SLEEP_METHODS.has(method))) {
             ctx.manager._log.warn("%s resulted in a flood wait, will retry in %d seconds", method, seconds);
           }
           await sleepWithAbort(

package/network/network-manager.cjs

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

package/network/network-manager.d.cts

@@ -32,7 +32,7 @@ export interface NetworkManagerParams {
     writerMap: TlWriterMap;
     isPremium: boolean;
     emitError: (err: Error) => void;
-    onUpdate: (upd: tl.TypeUpdates) => void;
+    onUpdate: (upd: tl.TypeUpdates, fromClient: boolean) => void;
     onUsable: () => void;
     onConnecting: () => void;
     onNetworkChanged: (connected: boolean) => void;

package/network/network-manager.d.ts

@@ -32,7 +32,7 @@ export interface NetworkManagerParams {
     writerMap: TlWriterMap;
     isPremium: boolean;
     emitError: (err: Error) => void;
-    onUpdate: (upd: tl.TypeUpdates) => void;
+    onUpdate: (upd: tl.TypeUpdates, fromClient: boolean) => void;
     onUsable: () => void;
     onConnecting: () => void;
     onNetworkChanged: (connected: boolean) => void;

package/network/network-manager.js

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

package/network/session-connection.cjs

@@ -1151,7 +1151,9 @@ class SessionConnection extends persistentConnection.PersistentConnection {
     if (now - this._session.lastPingTime > this._pingInterval) {
       if (!this._session.lastPingMsgId.isZero()) {
         this.log.warn("didn't receive pong for previous ping (msg_id = %l). are we offline?", this._session.lastPingMsgId);
-        this._resetSession("ping timeout");
+        if (!this._disconnectedManually) {
+          this._resetSession("ping timeout");
+        }
         return;
       }
       pingId = longUtils.randomLong();

package/network/session-connection.js

@@ -1144,7 +1144,9 @@ class SessionConnection extends PersistentConnection {
     if (now - this._session.lastPingTime > this._pingInterval) {
       if (!this._session.lastPingMsgId.isZero()) {
         this.log.warn("didn't receive pong for previous ping (msg_id = %l). are we offline?", this._session.lastPingMsgId);
-        this._resetSession("ping timeout");
+        if (!this._disconnectedManually) {
+          this._resetSession("ping timeout");
+        }
         return;
       }
       pingId = randomLong();

package/package.json

@@ -1,17 +1,17 @@
 {
     "name": "@mtcute/core",
     "type": "module",
-    "version": "0.22.2",
+    "version": "0.23.0",
     "description": "Type-safe library for MTProto (Telegram API)",
     "license": "MIT",
     "scripts": {},
     "dependencies": {
-        "@fuman/io": "0.0.8",
-        "@fuman/net": "0.0.9",
-        "@fuman/utils": "0.0.4",
-        "@mtcute/file-id": "^0.22.0",
-        "@mtcute/tl": "^200.0.0",
-        "@mtcute/tl-runtime": "^0.22.0",
+        "@fuman/io": "0.0.14",
+        "@fuman/net": "0.0.14",
+        "@fuman/utils": "0.0.14",
+        "@mtcute/file-id": "^0.23.0",
+        "@mtcute/tl": "^201.0.0",
+        "@mtcute/tl-runtime": "^0.23.0",
         "@types/events": "3.0.0",
         "long": "5.2.3"
     },

package/storage/memory/index.cjs

@@ -18,4 +18,8 @@ class MemoryStorage {
   refMessages = new refMessages.MemoryRefMessagesRepository(this.driver);
 }
 exports.MemoryStorageDriver = driver.MemoryStorageDriver;
+exports.MemoryAuthKeysRepository = authKeys.MemoryAuthKeysRepository;
+exports.MemoryKeyValueRepository = kv.MemoryKeyValueRepository;
+exports.MemoryPeersRepository = peers.MemoryPeersRepository;
+exports.MemoryRefMessagesRepository = refMessages.MemoryRefMessagesRepository;
 exports.MemoryStorage = MemoryStorage;

package/storage/memory/index.d.cts

@@ -6,6 +6,10 @@ import { MemoryKeyValueRepository } from './repository/kv.js';
 import { MemoryPeersRepository } from './repository/peers.js';
 import { MemoryRefMessagesRepository } from './repository/ref-messages.js';
 export { MemoryStorageDriver } from './driver.js';
+export { MemoryAuthKeysRepository } from './repository/auth-keys.js';
+export { MemoryKeyValueRepository } from './repository/kv.js';
+export { MemoryPeersRepository } from './repository/peers.js';
+export { MemoryRefMessagesRepository } from './repository/ref-messages.js';
 /**
  * In-memory storage driver implementation for mtcute.
  *

package/storage/memory/index.d.ts

@@ -6,6 +6,10 @@ import { MemoryKeyValueRepository } from './repository/kv.js';
 import { MemoryPeersRepository } from './repository/peers.js';
 import { MemoryRefMessagesRepository } from './repository/ref-messages.js';
 export { MemoryStorageDriver } from './driver.js';
+export { MemoryAuthKeysRepository } from './repository/auth-keys.js';
+export { MemoryKeyValueRepository } from './repository/kv.js';
+export { MemoryPeersRepository } from './repository/peers.js';
+export { MemoryRefMessagesRepository } from './repository/ref-messages.js';
 /**
  * In-memory storage driver implementation for mtcute.
  *

package/storage/memory/index.js

@@ -11,6 +11,10 @@ class MemoryStorage {
   refMessages = new MemoryRefMessagesRepository(this.driver);
 }
 export {
+  MemoryAuthKeysRepository,
+  MemoryKeyValueRepository,
+  MemoryPeersRepository,
+  MemoryRefMessagesRepository,
   MemoryStorage,
   MemoryStorageDriver
 };

package/utils/binary/compat.cjs

@@ -89,6 +89,8 @@ function mapCompatObject(obj) {
       return mapCompatMessageAction(obj);
     case "userFull_layer199":
       return replaceType(dropFields(obj, ["premiumGifts"]), "userFull");
+    case "userFull_layer200":
+      return replaceType(obj, "userFull");
     case "user_layer199":
       return {
         ...obj,

package/utils/binary/compat.js

@@ -82,6 +82,8 @@ function mapCompatObject(obj) {
       return mapCompatMessageAction(obj);
     case "userFull_layer199":
       return replaceType(dropFields(obj, ["premiumGifts"]), "userFull");
+    case "userFull_layer200":
+      return replaceType(obj, "userFull");
     case "user_layer199":
       return {
         ...obj,

package/utils/early-timer.cjs

@@ -45,8 +45,13 @@ class EarlyTimer {
   emitBefore(ts) {
     if (!this._timeoutTs || ts < this._timeoutTs) {
       this.reset();
-      this._timeout = utils.timers.setTimeout(this.emitNow, ts - Date.now());
-      this._timeoutTs = ts;
+      const diff = ts - Date.now();
+      if (diff > 0) {
+        this._timeout = utils.timers.setTimeout(this.emitNow, diff);
+        this._timeoutTs = ts;
+      } else {
+        this._handler();
+      }
     }
   }
   /**

package/utils/early-timer.js

@@ -38,8 +38,13 @@ class EarlyTimer {
   emitBefore(ts) {
     if (!this._timeoutTs || ts < this._timeoutTs) {
       this.reset();
-      this._timeout = timers.setTimeout(this.emitNow, ts - Date.now());
-      this._timeoutTs = ts;
+      const diff = ts - Date.now();
+      if (diff > 0) {
+        this._timeout = timers.setTimeout(this.emitNow, diff);
+        this._timeoutTs = ts;
+      } else {
+        this._handler();
+      }
     }
   }
   /**