@mtcute/core 0.30.1 → 0.30.2

package/highlevel/methods/files/download-iterable.cjs

@@ -7,7 +7,9 @@ if (typeof globalThis !== "undefined" && !globalThis._MTCUTE_CJS_DEPRECATION_WAR
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const utils = require("@fuman/utils");
 const fileId = require("@mtcute/file-id");
+const delayGate = require("../../../network/delay-gate.cjs");
 const errors$1 = require("../../../types/errors.cjs");
+const abortSignal = require("../../../utils/abort-signal.cjs");
 const peerUtils = require("../../../utils/peer-utils.cjs");
 const convertFileId = require("../../utils/convert-file-id.cjs");
 const fileUtils = require("../../utils/file-utils.cjs");
@@ -90,8 +92,17 @@ async function* downloadAsIterable(client, input, params) {
   let dcId = params?.dcId ?? normalized?.dcId;
   const primaryDcId = await client.getPrimaryDcId();
   if (!dcId) dcId = primaryDcId;
-  const abortSignal = params?.abortSignal;
+  const stallTimeout = params?.stallTimeout;
+  const stallAbort = stallTimeout != null ? new AbortController() : void 0;
+  const abortSignal$1 = stallAbort ? params?.abortSignal ? abortSignal.combineAbortSignals(params.abortSignal, stallAbort.signal) : stallAbort.signal : params?.abortSignal;
   let ended = false;
+  let stallTimer;
+  const resetStallTimer = stallAbort && stallTimeout != null ? () => {
+    if (stallTimer) utils.timers.clearTimeout(stallTimer);
+    stallTimer = utils.timers.setTimeout(() => {
+      stallAbort.abort(new errors$1.MtTimeoutError(stallTimeout));
+    }, stallTimeout);
+  } : void 0;
   const partSizeKb = params?.partSize ?? (fileSize ? fileUtils.determinePartSize(fileSize) : 64);
   if (partSizeKb % 4 !== 0) {
     throw new errors$1.MtArgumentError(`Invalid part size: ${partSizeKb}. Must be divisible by 4.`);
@@ -120,6 +131,7 @@ async function* downloadAsIterable(client, input, params) {
     connectionKind = "download";
   }
   const poolSize = await client.getPoolSize(connectionKind, dcId);
+  const delayGate$1 = isSmall ? void 0 : new delayGate.DownloadDelayGate();
   client.log.debug(
     "Downloading file of size %d from dc %d using %s connection pool (pool size: %d)",
     limitBytes,
@@ -127,6 +139,44 @@ async function* downloadAsIterable(client, input, params) {
     connectionKind,
     poolSize
   );
+  const callPart = async (chunk) => {
+    while (true) {
+      try {
+        return await client.call(
+          {
+            _: isWeb ? "upload.getWebFile" : "upload.getFile",
+            // eslint-disable-next-line
+            location,
+            offset: offset + chunkSize * chunk,
+            limit: chunkSize
+          },
+          {
+            dcId,
+            kind: connectionKind,
+            maxRetryCount: Infinity,
+            // retry until explicitly aborted (or finished)
+            floodSleepThreshold: Infinity,
+            abortSignal: abortSignal$1
+          }
+        );
+      } catch (e) {
+        if (e instanceof DOMException && e.name === "AbortError") return void 0;
+        if (!innerTl.RpcError.is(e)) throw e;
+        if (e.is("FILE_MIGRATE_%d")) {
+          dcId = e.newDc;
+          continue;
+        } else if (e.is("FILEREF_UPGRADE_NEEDED")) {
+          throw new errors$1.MtUnsupportedError("File ref expired!");
+        } else if (e.is("MTPROTO_CLUSTER_INVALID") && dcId != null) {
+          client.log.debug("received cluster invalid error for dc %d, recreating dc", dcId);
+          await client.recreateDc(dcId);
+          continue;
+        } else {
+          throw e;
+        }
+      }
+    }
+  };
   const downloadChunk = async (chunk = nextWorkerChunkIdx++) => {
     let result;
     if (ended) {
@@ -136,40 +186,20 @@ async function* downloadAsIterable(client, input, params) {
     if (throttlePromise) {
       await throttlePromise;
     }
+    if (ended) {
+      return;
+    }
     try {
-      result = await client.call(
-        {
-          _: isWeb ? "upload.getWebFile" : "upload.getFile",
-          // eslint-disable-next-line
-          location,
-          offset: offset + chunkSize * chunk,
-          limit: chunkSize
-        },
-        {
-          dcId,
-          kind: connectionKind,
-          maxRetryCount: Infinity,
-          // retry until explicitly aborted (or finished)
-          floodSleepThreshold: Infinity,
-          abortSignal
-        }
-      );
+      if (delayGate$1) await delayGate$1.wait(abortSignal$1);
+      result = await callPart(chunk);
     } catch (e) {
       if (e instanceof DOMException && e.name === "AbortError") return;
-      if (!innerTl.RpcError.is(e)) throw e;
-      if (e.is("FILE_MIGRATE_%d")) {
-        dcId = e.newDc;
-        return downloadChunk(chunk);
-      } else if (e.is("FILEREF_UPGRADE_NEEDED")) {
-        throw new errors$1.MtUnsupportedError("File ref expired!");
-      } else if (e.is("MTPROTO_CLUSTER_INVALID") && dcId != null) {
-        client.log.debug("received cluster invalid error for dc %d, recreating dc", dcId);
-        await client.recreateDc(dcId);
-        return downloadChunk(chunk);
-      } else {
-        throw e;
-      }
+      throw e;
     }
+    if (!result) {
+      return;
+    }
+    resetStallTimer?.();
     if (result._ === "upload.fileCdnRedirect") {
       throw new errors$1.MtUnsupportedError("Received CDN redirect, which is not supported (yet)");
     }
@@ -189,6 +219,7 @@ async function* downloadAsIterable(client, input, params) {
     }
   };
   let error;
+  resetStallTimer?.();
   void Promise.all(Array.from({
     length: Math.min(poolSize * (isSmall ? 1 : REQUESTS_PER_CONNECTION), numChunks)
   }, downloadChunk)).catch((e) => {
@@ -199,27 +230,31 @@ async function* downloadAsIterable(client, input, params) {
   }).then(() => {
     client.log.debug("download workers finished");
   });
-  abortSignal?.addEventListener("abort", () => {
+  abortSignal$1?.addEventListener("abort", () => {
     client.log.debug("download aborted");
-    error = abortSignal.reason;
+    error = abortSignal$1.reason;
     ended = true;
     nextChunkCv.notify();
   });
   let position = offset;
-  while (position < limitBytes) {
-    await nextChunkCv.wait();
-    if (error) throw error;
-    while (nextChunkIdx in buffer) {
-      const buf = buffer[nextChunkIdx];
-      delete buffer[nextChunkIdx];
-      position += buf.length;
-      params?.progressCallback?.(position, limitBytes);
-      yield buf;
-      nextChunkIdx++;
-      if (buf.length < chunkSize) {
-        return;
+  try {
+    while (position < limitBytes) {
+      await nextChunkCv.wait();
+      if (error) throw error;
+      while (nextChunkIdx in buffer) {
+        const buf = buffer[nextChunkIdx];
+        delete buffer[nextChunkIdx];
+        position += buf.length;
+        params?.progressCallback?.(position, limitBytes);
+        yield buf;
+        nextChunkIdx++;
+        if (buf.length < chunkSize) {
+          return;
+        }
       }
     }
+  } finally {
+    if (stallTimer) utils.timers.clearTimeout(stallTimer);
   }
 }
 exports._normalizeFileDownloadLocation = _normalizeFileDownloadLocation;

package/highlevel/methods/files/download-iterable.js

@@ -1,6 +1,8 @@
-import { ConditionVariable } from "@fuman/utils";
+import { ConditionVariable, timers } from "@fuman/utils";
 import { parseFileId } from "@mtcute/file-id";
-import { MtArgumentError, MtUnsupportedError } from "../../../types/errors.js";
+import { DownloadDelayGate } from "../../../network/delay-gate.js";
+import { MtArgumentError, MtTimeoutError, MtUnsupportedError } from "../../../types/errors.js";
+import { combineAbortSignals } from "../../../utils/abort-signal.js";
 import { toggleChannelIdMark } from "../../../utils/peer-utils.js";
 import { fileIdToInputWebFileLocation, fileIdToInputFileLocation } from "../../utils/convert-file-id.js";
 import { determinePartSize } from "../../utils/file-utils.js";
@@ -83,8 +85,17 @@ async function* downloadAsIterable(client, input, params) {
   let dcId = params?.dcId ?? normalized?.dcId;
   const primaryDcId = await client.getPrimaryDcId();
   if (!dcId) dcId = primaryDcId;
-  const abortSignal = params?.abortSignal;
+  const stallTimeout = params?.stallTimeout;
+  const stallAbort = stallTimeout != null ? new AbortController() : void 0;
+  const abortSignal = stallAbort ? params?.abortSignal ? combineAbortSignals(params.abortSignal, stallAbort.signal) : stallAbort.signal : params?.abortSignal;
   let ended = false;
+  let stallTimer;
+  const resetStallTimer = stallAbort && stallTimeout != null ? () => {
+    if (stallTimer) timers.clearTimeout(stallTimer);
+    stallTimer = timers.setTimeout(() => {
+      stallAbort.abort(new MtTimeoutError(stallTimeout));
+    }, stallTimeout);
+  } : void 0;
   const partSizeKb = params?.partSize ?? (fileSize ? determinePartSize(fileSize) : 64);
   if (partSizeKb % 4 !== 0) {
     throw new MtArgumentError(`Invalid part size: ${partSizeKb}. Must be divisible by 4.`);
@@ -113,6 +124,7 @@ async function* downloadAsIterable(client, input, params) {
     connectionKind = "download";
   }
   const poolSize = await client.getPoolSize(connectionKind, dcId);
+  const delayGate = isSmall ? void 0 : new DownloadDelayGate();
   client.log.debug(
     "Downloading file of size %d from dc %d using %s connection pool (pool size: %d)",
     limitBytes,
@@ -120,6 +132,44 @@ async function* downloadAsIterable(client, input, params) {
     connectionKind,
     poolSize
   );
+  const callPart = async (chunk) => {
+    while (true) {
+      try {
+        return await client.call(
+          {
+            _: isWeb ? "upload.getWebFile" : "upload.getFile",
+            // eslint-disable-next-line
+            location,
+            offset: offset + chunkSize * chunk,
+            limit: chunkSize
+          },
+          {
+            dcId,
+            kind: connectionKind,
+            maxRetryCount: Infinity,
+            // retry until explicitly aborted (or finished)
+            floodSleepThreshold: Infinity,
+            abortSignal
+          }
+        );
+      } catch (e) {
+        if (e instanceof DOMException && e.name === "AbortError") return void 0;
+        if (!RpcError.is(e)) throw e;
+        if (e.is("FILE_MIGRATE_%d")) {
+          dcId = e.newDc;
+          continue;
+        } else if (e.is("FILEREF_UPGRADE_NEEDED")) {
+          throw new MtUnsupportedError("File ref expired!");
+        } else if (e.is("MTPROTO_CLUSTER_INVALID") && dcId != null) {
+          client.log.debug("received cluster invalid error for dc %d, recreating dc", dcId);
+          await client.recreateDc(dcId);
+          continue;
+        } else {
+          throw e;
+        }
+      }
+    }
+  };
   const downloadChunk = async (chunk = nextWorkerChunkIdx++) => {
     let result;
     if (ended) {
@@ -129,40 +179,20 @@ async function* downloadAsIterable(client, input, params) {
     if (throttlePromise) {
       await throttlePromise;
     }
+    if (ended) {
+      return;
+    }
     try {
-      result = await client.call(
-        {
-          _: isWeb ? "upload.getWebFile" : "upload.getFile",
-          // eslint-disable-next-line
-          location,
-          offset: offset + chunkSize * chunk,
-          limit: chunkSize
-        },
-        {
-          dcId,
-          kind: connectionKind,
-          maxRetryCount: Infinity,
-          // retry until explicitly aborted (or finished)
-          floodSleepThreshold: Infinity,
-          abortSignal
-        }
-      );
+      if (delayGate) await delayGate.wait(abortSignal);
+      result = await callPart(chunk);
     } catch (e) {
       if (e instanceof DOMException && e.name === "AbortError") return;
-      if (!RpcError.is(e)) throw e;
-      if (e.is("FILE_MIGRATE_%d")) {
-        dcId = e.newDc;
-        return downloadChunk(chunk);
-      } else if (e.is("FILEREF_UPGRADE_NEEDED")) {
-        throw new MtUnsupportedError("File ref expired!");
-      } else if (e.is("MTPROTO_CLUSTER_INVALID") && dcId != null) {
-        client.log.debug("received cluster invalid error for dc %d, recreating dc", dcId);
-        await client.recreateDc(dcId);
-        return downloadChunk(chunk);
-      } else {
-        throw e;
-      }
+      throw e;
     }
+    if (!result) {
+      return;
+    }
+    resetStallTimer?.();
     if (result._ === "upload.fileCdnRedirect") {
       throw new MtUnsupportedError("Received CDN redirect, which is not supported (yet)");
     }
@@ -182,6 +212,7 @@ async function* downloadAsIterable(client, input, params) {
     }
   };
   let error;
+  resetStallTimer?.();
   void Promise.all(Array.from({
     length: Math.min(poolSize * (isSmall ? 1 : REQUESTS_PER_CONNECTION), numChunks)
   }, downloadChunk)).catch((e) => {
@@ -199,20 +230,24 @@ async function* downloadAsIterable(client, input, params) {
     nextChunkCv.notify();
   });
   let position = offset;
-  while (position < limitBytes) {
-    await nextChunkCv.wait();
-    if (error) throw error;
-    while (nextChunkIdx in buffer) {
-      const buf = buffer[nextChunkIdx];
-      delete buffer[nextChunkIdx];
-      position += buf.length;
-      params?.progressCallback?.(position, limitBytes);
-      yield buf;
-      nextChunkIdx++;
-      if (buf.length < chunkSize) {
-        return;
+  try {
+    while (position < limitBytes) {
+      await nextChunkCv.wait();
+      if (error) throw error;
+      while (nextChunkIdx in buffer) {
+        const buf = buffer[nextChunkIdx];
+        delete buffer[nextChunkIdx];
+        position += buf.length;
+        params?.progressCallback?.(position, limitBytes);
+        yield buf;
+        nextChunkIdx++;
+        if (buf.length < chunkSize) {
+          return;
+        }
       }
     }
+  } finally {
+    if (stallTimer) timers.clearTimeout(stallTimer);
   }
 }
 export {

package/highlevel/methods/files/normalize-input-media.cjs

@@ -283,7 +283,7 @@ async function _normalizeInputMedia(client, media, params = {}, uploadMedia = fa
           fileReference: res.photo.fileReference
         },
         ttlSeconds: media.ttlSeconds,
-        spoiler: media.type === "video" && media.spoiler,
+        spoiler: "spoiler" in media ? media.spoiler : false,
         livePhoto: Boolean(livePhotoVideo),
         video: livePhotoVideo
       };

package/highlevel/methods/files/normalize-input-media.js

@@ -276,7 +276,7 @@ async function _normalizeInputMedia(client, media, params = {}, uploadMedia = fa
           fileReference: res.photo.fileReference
         },
         ttlSeconds: media.ttlSeconds,
-        spoiler: media.type === "video" && media.spoiler,
+        spoiler: "spoiler" in media ? media.spoiler : false,
         livePhoto: Boolean(livePhotoVideo),
         video: livePhotoVideo
       };

package/highlevel/methods/files/upload-file.cjs

@@ -174,7 +174,12 @@ async function uploadFile(client, params) {
       filePart: thisIdx,
       bytes: part
     };
-    const result = await client.call(request, { kind: connectionKind, abortSignal });
+    const result = await client.call(request, {
+      kind: connectionKind,
+      maxRetryCount: Infinity,
+      floodSleepThreshold: Infinity,
+      abortSignal
+    });
     if (!result) throw new Error(`Failed to upload part ${idx}`);
     if (abortSignal?.aborted) return;
     pos += part.length;

package/highlevel/methods/files/upload-file.js

@@ -167,7 +167,12 @@ async function uploadFile(client, params) {
       filePart: thisIdx,
       bytes: part
     };
-    const result = await client.call(request, { kind: connectionKind, abortSignal });
+    const result = await client.call(request, {
+      kind: connectionKind,
+      maxRetryCount: Infinity,
+      floodSleepThreshold: Infinity,
+      abortSignal
+    });
     if (!result) throw new Error(`Failed to upload part ${idx}`);
     if (abortSignal?.aborted) return;
     pos += part.length;

package/highlevel/methods/messages/normalize-rich-message.cjs

@@ -8,7 +8,10 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const utils = require("@fuman/utils");
 const errors = require("../../../types/errors.cjs");
 const typeAssertions = require("../../../utils/type-assertions.cjs");
+const peerUtils = require("../../utils/peer-utils.cjs");
+const walkPageBlocks = require("../../utils/walk-page-blocks.cjs");
 const normalizeInputMedia = require("../files/normalize-input-media.cjs");
+const resolvePeerMany = require("../users/resolve-peer-many.cjs");
 function _richMediaCacheKey(media) {
   if (typeof media === "string") return `auto:${media}`;
   if ("_" in media) return void 0;
@@ -103,6 +106,13 @@ async function _normalizeInputRichMessage(client, peer, input, params) {
     }
   }
   const blocks = input.blocks.map(processBlock);
+  const mentionIds = /* @__PURE__ */ new Set();
+  walkPageBlocks.walkPageBlocks(blocks, {
+    richText: (text) => {
+      if (text._ === "textMentionName") mentionIds.add(text.userId);
+    }
+  });
+  const users = mentionIds.size ? await resolvePeerMany.resolvePeerMany(client, [...mentionIds], peerUtils.toInputUser) : void 0;
   const uploaded = await utils.parallelMap(
     fileBlocks,
     async ({ block, media }, idx) => {
@@ -151,7 +161,8 @@ async function _normalizeInputRichMessage(client, peer, input, params) {
     noautolink: input.skipEntityDetection,
     blocks,
     photos: photos.length ? photos : void 0,
-    documents: documents.length ? documents : void 0
+    documents: documents.length ? documents : void 0,
+    users: users?.length ? users : void 0
   };
 }
 exports._normalizeInputRichMessage = _normalizeInputRichMessage;

package/highlevel/methods/messages/normalize-rich-message.js

@@ -1,7 +1,10 @@
 import { parallelMap } from "@fuman/utils";
 import { MtArgumentError, MtTypeAssertionError } from "../../../types/errors.js";
 import { assertTypeIs } from "../../../utils/type-assertions.js";
+import { toInputUser } from "../../utils/peer-utils.js";
+import { walkPageBlocks } from "../../utils/walk-page-blocks.js";
 import { _normalizeInputMedia } from "../files/normalize-input-media.js";
+import { resolvePeerMany } from "../users/resolve-peer-many.js";
 function _richMediaCacheKey(media) {
   if (typeof media === "string") return `auto:${media}`;
   if ("_" in media) return void 0;
@@ -96,6 +99,13 @@ async function _normalizeInputRichMessage(client, peer, input, params) {
     }
   }
   const blocks = input.blocks.map(processBlock);
+  const mentionIds = /* @__PURE__ */ new Set();
+  walkPageBlocks(blocks, {
+    richText: (text) => {
+      if (text._ === "textMentionName") mentionIds.add(text.userId);
+    }
+  });
+  const users = mentionIds.size ? await resolvePeerMany(client, [...mentionIds], toInputUser) : void 0;
   const uploaded = await parallelMap(
     fileBlocks,
     async ({ block, media }, idx) => {
@@ -144,7 +154,8 @@ async function _normalizeInputRichMessage(client, peer, input, params) {
     noautolink: input.skipEntityDetection,
     blocks,
     photos: photos.length ? photos : void 0,
-    documents: documents.length ? documents : void 0
+    documents: documents.length ? documents : void 0,
+    users: users?.length ? users : void 0
   };
 }
 export {

package/highlevel/methods/messages/send-common.cjs

@@ -48,11 +48,12 @@ async function _processCommonSendParameters(client, chatId, params) {
     throw new errors.MtArgumentError("replyTo/commentTo and replyToStory cannot be used together");
   }
   let tlReplyTo;
-  if (replyTo) {
+  if (replyTo || params.threadId) {
     tlReplyTo = {
       _: "inputReplyToMessage",
-      replyToMsgId: replyTo,
+      replyToMsgId: replyTo ?? params.threadId,
       replyToPeerId: replyToPeer,
+      topMsgId: params.threadId,
       quoteText: params.quote?.text,
       quoteEntities: params.quote?.entities,
       quoteOffset: params.quoteOffset,

package/highlevel/methods/messages/send-common.d.cts

@@ -7,11 +7,14 @@ export interface CommonSendParams {
     /**
      * Message to reply to. Either a message object or message ID.
      *
-     * For forums - can also be an ID of the topic (i.e. its top message ID)
+     * For forums - can also be an ID of the topic (i.e. its top message ID),
+     * but prefer using {@link threadId} for that instead.
      *
      * Can also be a message from another chat, in which case a quote will be sent.
      */
     replyTo?: number | Message;
+    /** ID of the thread to reply to */
+    threadId?: number;
     /**
      * If this is a reply to a specific todo item, ID of that item
      */

package/highlevel/methods/messages/send-common.d.ts

@@ -7,11 +7,14 @@ export interface CommonSendParams {
     /**
      * Message to reply to. Either a message object or message ID.
      *
-     * For forums - can also be an ID of the topic (i.e. its top message ID)
+     * For forums - can also be an ID of the topic (i.e. its top message ID),
+     * but prefer using {@link threadId} for that instead.
      *
      * Can also be a message from another chat, in which case a quote will be sent.
      */
     replyTo?: number | Message;
+    /** ID of the thread to reply to */
+    threadId?: number;
     /**
      * If this is a reply to a specific todo item, ID of that item
      */

package/highlevel/methods/messages/send-common.js

@@ -41,11 +41,12 @@ async function _processCommonSendParameters(client, chatId, params) {
     throw new MtArgumentError("replyTo/commentTo and replyToStory cannot be used together");
   }
   let tlReplyTo;
-  if (replyTo) {
+  if (replyTo || params.threadId) {
     tlReplyTo = {
       _: "inputReplyToMessage",
-      replyToMsgId: replyTo,
+      replyToMsgId: replyTo ?? params.threadId,
       replyToPeerId: replyToPeer,
+      topMsgId: params.threadId,
       quoteText: params.quote?.text,
       quoteEntities: params.quote?.entities,
       quoteOffset: params.quoteOffset,

package/highlevel/types/files/utils.d.cts

@@ -93,4 +93,13 @@ export interface FileDownloadParameters {
      * Abort signal that can be used to cancel the download.
      */
     abortSignal?: AbortSignal;
+    /**
+     * If set, the download will be aborted (and an `MtTimeoutError` will be thrown)
+     * if no new chunk has been received within this amount of time (in milliseconds).
+     *
+     * Useful for bulk downloads where some files might be unavailable server-side
+     * (and would otherwise cause the download to hang indefinitely due to the server
+     * repeatedly responding with `FLOOD_WAIT` or `-503 Timeout`).
+     */
+    stallTimeout?: number;
 }

package/highlevel/types/files/utils.d.ts

@@ -93,4 +93,13 @@ export interface FileDownloadParameters {
      * Abort signal that can be used to cancel the download.
      */
     abortSignal?: AbortSignal;
+    /**
+     * If set, the download will be aborted (and an `MtTimeoutError` will be thrown)
+     * if no new chunk has been received within this amount of time (in milliseconds).
+     *
+     * Useful for bulk downloads where some files might be unavailable server-side
+     * (and would otherwise cause the download to hang indefinitely due to the server
+     * repeatedly responding with `FLOOD_WAIT` or `-503 Timeout`).
+     */
+    stallTimeout?: number;
 }