@mtcute/core 0.27.8 → 0.27.9

package/highlevel/methods/dialogs/iter-dialogs.cjs

@@ -158,6 +158,10 @@ async function* iterDialogs(client, params) {
     }
     for (const d of dialogs) {
       if (filterFolder && !filterFolder(d)) continue;
+      if (d.isPinned) {
+        if (archived === "exclude" && d.isArchived) continue;
+        if (archived === "only" && !d.isArchived) continue;
+      }
       yield d;
       if (++current >= limit) return;
     }

package/highlevel/methods/dialogs/iter-dialogs.js

@@ -151,6 +151,10 @@ async function* iterDialogs(client, params) {
     }
     for (const d of dialogs) {
       if (filterFolder && !filterFolder(d)) continue;
+      if (d.isPinned) {
+        if (archived === "exclude" && d.isArchived) continue;
+        if (archived === "only" && !d.isArchived) continue;
+      }
       yield d;
       if (++current >= limit) return;
     }

package/highlevel/updates/manager.cjs

@@ -64,6 +64,10 @@ class UpdatesManager {
   // channel id or 0 => pts
   noDispatchPts = /* @__PURE__ */ new Map();
   noDispatchQts = /* @__PURE__ */ new Set();
+  // message IDs from common message box that were dispatched recently,
+  // used to deduplicate messages from getDifference.newMessages that may have
+  // already been processed via regular pts-ordered updates
+  _recentlyDispatchedCommonMsgs = new utils.LruSet(100);
   lock = new utils.AsyncLock();
   // rpsIncoming?: RpsMeter
   // rpsProcessing?: RpsMeter
@@ -777,6 +781,10 @@ class UpdatesManager {
     diff.newMessages.forEach((message) => {
       log.debug("processing message %d in %j (%s) from common diff", message.id, message.peerId, message._);
       if (message._ === "messageEmpty") return;
+      if (this._recentlyDispatchedCommonMsgs.has(message.id)) {
+        log.debug("skipping message %d from common diff because it was already dispatched", message.id);
+        return;
+      }
       pendingUnorderedUpdates.pushBack(utils$2.toPendingUpdate(utils$2.messageToUpdate(message), peers, true));
     });
     diff.otherUpdates.forEach((upd) => {
@@ -984,6 +992,9 @@ class UpdatesManager {
       }
     }
     log.debug("dispatching %s (postponed = %s)", upd._, postponed);
+    if (upd._ === "updateNewMessage" && upd.message._ !== "messageEmpty") {
+      this._recentlyDispatchedCommonMsgs.add(upd.message.id);
+    }
     client.onRawUpdate.emit(new types.RawUpdateInfo(upd, pending.peers));
   }
   async _loop() {

package/highlevel/updates/manager.d.cts

@@ -1,7 +1,7 @@
 import { Logger, EarlyTimer, SortedArray } from '../../utils/index.js';
 import { BaseTelegramClient } from '../base.js';
 import { PendingUpdate, PendingUpdateContainer, UpdatesManagerParams } from './types.js';
-import { AsyncLock, ConditionVariable, Deque, timers } from '@fuman/utils';
+import { AsyncLock, ConditionVariable, Deque, LruSet, timers } from '@fuman/utils';
 import { tl } from '@mtcute/tl';
 import { PeersIndex } from '../types/peers/peers-index.js';
 export declare class UpdatesManager {
@@ -21,6 +21,7 @@ export declare class UpdatesManager {
     noDispatchMsg: Map<number, Set<number>>;
     noDispatchPts: Map<number, Set<number>>;
     noDispatchQts: Set<number>;
+    _recentlyDispatchedCommonMsgs: LruSet<number>;
     lock: AsyncLock;
     pts?: number;
     qts?: number;

package/highlevel/updates/manager.d.ts

@@ -1,7 +1,7 @@
 import { Logger, EarlyTimer, SortedArray } from '../../utils/index.js';
 import { BaseTelegramClient } from '../base.js';
 import { PendingUpdate, PendingUpdateContainer, UpdatesManagerParams } from './types.js';
-import { AsyncLock, ConditionVariable, Deque, timers } from '@fuman/utils';
+import { AsyncLock, ConditionVariable, Deque, LruSet, timers } from '@fuman/utils';
 import { tl } from '@mtcute/tl';
 import { PeersIndex } from '../types/peers/peers-index.js';
 export declare class UpdatesManager {
@@ -21,6 +21,7 @@ export declare class UpdatesManager {
     noDispatchMsg: Map<number, Set<number>>;
     noDispatchPts: Map<number, Set<number>>;
     noDispatchQts: Set<number>;
+    _recentlyDispatchedCommonMsgs: LruSet<number>;
     lock: AsyncLock;
     pts?: number;
     qts?: number;

package/highlevel/updates/manager.js

@@ -1,4 +1,4 @@
-import { ConditionVariable, Deque, AsyncLock, unknownToError, timers } from "@fuman/utils";
+import { ConditionVariable, Deque, LruSet, AsyncLock, unknownToError, timers } from "@fuman/utils";
 import { tl } from "@mtcute/tl";
 import Long from "long";
 import { MtArgumentError } from "../../types/errors.js";
@@ -57,6 +57,10 @@ class UpdatesManager {
   // channel id or 0 => pts
   noDispatchPts = /* @__PURE__ */ new Map();
   noDispatchQts = /* @__PURE__ */ new Set();
+  // message IDs from common message box that were dispatched recently,
+  // used to deduplicate messages from getDifference.newMessages that may have
+  // already been processed via regular pts-ordered updates
+  _recentlyDispatchedCommonMsgs = new LruSet(100);
   lock = new AsyncLock();
   // rpsIncoming?: RpsMeter
   // rpsProcessing?: RpsMeter
@@ -770,6 +774,10 @@ class UpdatesManager {
     diff.newMessages.forEach((message) => {
       log.debug("processing message %d in %j (%s) from common diff", message.id, message.peerId, message._);
       if (message._ === "messageEmpty") return;
+      if (this._recentlyDispatchedCommonMsgs.has(message.id)) {
+        log.debug("skipping message %d from common diff because it was already dispatched", message.id);
+        return;
+      }
       pendingUnorderedUpdates.pushBack(toPendingUpdate(messageToUpdate(message), peers, true));
     });
     diff.otherUpdates.forEach((upd) => {
@@ -977,6 +985,9 @@ class UpdatesManager {
       }
     }
     log.debug("dispatching %s (postponed = %s)", upd._, postponed);
+    if (upd._ === "updateNewMessage" && upd.message._ !== "messageEmpty") {
+      this._recentlyDispatchedCommonMsgs.add(upd.message.id);
+    }
     client.onRawUpdate.emit(new RawUpdateInfo(upd, pending.peers));
   }
   async _loop() {

package/index.cjs

@@ -145,6 +145,7 @@ const sessionConnection = require("./network/session-connection.cjs");
 const abstract = require("./network/transports/abstract.cjs");
 const intermediate = require("./network/transports/intermediate.cjs");
 const obfuscated = require("./network/transports/obfuscated.cjs");
+const proxy = require("./network/transports/proxy.cjs");
 const driver = require("./storage/driver.cjs");
 const driver$1 = require("./storage/memory/driver.cjs");
 const authKeys = require("./storage/memory/repository/auth-keys.cjs");
@@ -334,6 +335,7 @@ exports.TransportError = abstract.TransportError;
 exports.IntermediatePacketCodec = intermediate.IntermediatePacketCodec;
 exports.PaddedIntermediatePacketCodec = intermediate.PaddedIntermediatePacketCodec;
 exports.ObfuscatedPacketCodec = obfuscated.ObfuscatedPacketCodec;
+exports.createProxyTransportFactory = proxy.createProxyTransportFactory;
 exports.BaseStorageDriver = driver.BaseStorageDriver;
 exports.MemoryStorageDriver = driver$1.MemoryStorageDriver;
 exports.MemoryAuthKeysRepository = authKeys.MemoryAuthKeysRepository;

package/index.js

@@ -138,6 +138,7 @@ import { SessionConnection } from "./network/session-connection.js";
 import { TransportError } from "./network/transports/abstract.js";
 import { IntermediatePacketCodec, PaddedIntermediatePacketCodec } from "./network/transports/intermediate.js";
 import { ObfuscatedPacketCodec } from "./network/transports/obfuscated.js";
+import { createProxyTransportFactory } from "./network/transports/proxy.js";
 import { BaseStorageDriver } from "./storage/driver.js";
 import { MemoryStorageDriver } from "./storage/memory/driver.js";
 import { MemoryAuthKeysRepository } from "./storage/memory/repository/auth-keys.js";
@@ -323,6 +324,7 @@ export {
   _storyInteractiveElementFromTl,
   assertNever,
   businessWorkHoursDaysToRaw,
+  createProxyTransportFactory,
   getAllPeersFrom,
   getBarePeerId,
   getBasicPeerType,

package/network/network-manager.cjs

@@ -225,7 +225,7 @@ class NetworkManager {
       _: "initConnection",
       deviceModel,
       systemVersion: "1.0",
-      appVersion: "0.27.8",
+      appVersion: "0.27.9",
       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.8",
+      appVersion: "0.27.9",
       systemLangCode: "en",
       langPack: "",
       // "langPacks are for official apps only"

package/network/server-salt.cjs

@@ -17,16 +17,11 @@ class ServerSaltManager {
   setFutureSalts(salts) {
     this._futureSalts = salts;
     const now = Date.now() / 1e3;
-    while (salts.length > 0 && now > salts[0].validUntil) {
+    while (salts.length > 0 && salts[0].validSince <= now) {
       this.currentSalt = salts[0].salt;
       this._futureSalts.shift();
     }
-    if (salts.length > 0 && salts[0].validSince <= now) {
-      this.currentSalt = salts[0].salt;
-      this._futureSalts.shift();
-    }
-    if (!this._futureSalts.length) ;
-    else {
+    if (this._futureSalts.length) {
       this._scheduleReplace(this._futureSalts[0]);
     }
   }

package/network/server-salt.js

@@ -10,16 +10,11 @@ class ServerSaltManager {
   setFutureSalts(salts) {
     this._futureSalts = salts;
     const now = Date.now() / 1e3;
-    while (salts.length > 0 && now > salts[0].validUntil) {
+    while (salts.length > 0 && salts[0].validSince <= now) {
       this.currentSalt = salts[0].salt;
       this._futureSalts.shift();
     }
-    if (salts.length > 0 && salts[0].validSince <= now) {
-      this.currentSalt = salts[0].salt;
-      this._futureSalts.shift();
-    }
-    if (!this._futureSalts.length) ;
-    else {
+    if (this._futureSalts.length) {
       this._scheduleReplace(this._futureSalts[0]);
     }
   }

package/network/transports/index.d.cts

@@ -1,3 +1,4 @@
 export * from './abstract.js';
 export * from './intermediate.js';
 export * from './obfuscated.js';
+export * from './proxy.js';

package/network/transports/index.d.ts

@@ -1,3 +1,4 @@
 export * from './abstract.js';
 export * from './intermediate.js';
 export * from './obfuscated.js';
+export * from './proxy.js';

package/network/transports/proxy.cjs

@@ -0,0 +1,46 @@
+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 errors = require("../../types/errors.cjs");
+const proxy = require("../../utils/links/proxy.cjs");
+function createProxyTransportFactory(options) {
+  const { SocksProxyTcpTransport, MtProxyTcpTransport, HttpProxyTcpTransport } = options;
+  return (url) => {
+    const obj = new URL(url);
+    if (SocksProxyTcpTransport != null && (obj.protocol === "socks4:" || obj.protocol === "socks5:")) {
+      return new SocksProxyTcpTransport({
+        version: obj.protocol === "socks4:" ? 4 : 5,
+        host: obj.hostname,
+        port: Number(obj.port) || 1080,
+        user: obj.username,
+        password: obj.password
+      });
+    }
+    if (MtProxyTcpTransport != null) {
+      const mtproxy = proxy.mtproxy.parse(url);
+      if (mtproxy) {
+        return new MtProxyTcpTransport({
+          host: mtproxy.server,
+          port: mtproxy.port,
+          secret: mtproxy.secret
+        });
+      }
+    }
+    if (HttpProxyTcpTransport && (obj.protocol === "http:" || obj.protocol === "https:")) {
+      return new HttpProxyTcpTransport({
+        tls: obj.protocol === "https:",
+        host: obj.hostname,
+        port: Number(obj.port) || (obj.protocol === "https:" ? 443 : 80),
+        user: obj.username,
+        password: obj.password
+      });
+    } else {
+      throw new errors.MtArgumentError(`Unsupported proxy protocol: ${obj.protocol}`);
+    }
+  };
+}
+exports.createProxyTransportFactory = createProxyTransportFactory;

package/network/transports/proxy.d.cts

@@ -0,0 +1,10 @@
+import { HttpProxySettings, SocksProxySettings } from '@fuman/net';
+import { MtProxySettings } from '../mtproxy/index.js';
+import { TelegramTransport } from './abstract.js';
+export declare function createProxyTransportFactory(options: {
+    SocksProxyTcpTransport?: new (options: SocksProxySettings) => TelegramTransport;
+    MtProxyTcpTransport?: new (options: MtProxySettings) => TelegramTransport;
+    HttpProxyTcpTransport?: new (options: HttpProxySettings & {
+        tls?: boolean;
+    }) => TelegramTransport;
+}): (url: string) => TelegramTransport;

package/network/transports/proxy.d.ts

@@ -0,0 +1,10 @@
+import { HttpProxySettings, SocksProxySettings } from '@fuman/net';
+import { MtProxySettings } from '../mtproxy/index.js';
+import { TelegramTransport } from './abstract.js';
+export declare function createProxyTransportFactory(options: {
+    SocksProxyTcpTransport?: new (options: SocksProxySettings) => TelegramTransport;
+    MtProxyTcpTransport?: new (options: MtProxySettings) => TelegramTransport;
+    HttpProxyTcpTransport?: new (options: HttpProxySettings & {
+        tls?: boolean;
+    }) => TelegramTransport;
+}): (url: string) => TelegramTransport;

package/network/transports/proxy.js

@@ -0,0 +1,41 @@
+import { MtArgumentError } from "../../types/errors.js";
+import { mtproxy } from "../../utils/links/proxy.js";
+function createProxyTransportFactory(options) {
+  const { SocksProxyTcpTransport, MtProxyTcpTransport, HttpProxyTcpTransport } = options;
+  return (url) => {
+    const obj = new URL(url);
+    if (SocksProxyTcpTransport != null && (obj.protocol === "socks4:" || obj.protocol === "socks5:")) {
+      return new SocksProxyTcpTransport({
+        version: obj.protocol === "socks4:" ? 4 : 5,
+        host: obj.hostname,
+        port: Number(obj.port) || 1080,
+        user: obj.username,
+        password: obj.password
+      });
+    }
+    if (MtProxyTcpTransport != null) {
+      const mtproxy$1 = mtproxy.parse(url);
+      if (mtproxy$1) {
+        return new MtProxyTcpTransport({
+          host: mtproxy$1.server,
+          port: mtproxy$1.port,
+          secret: mtproxy$1.secret
+        });
+      }
+    }
+    if (HttpProxyTcpTransport && (obj.protocol === "http:" || obj.protocol === "https:")) {
+      return new HttpProxyTcpTransport({
+        tls: obj.protocol === "https:",
+        host: obj.hostname,
+        port: Number(obj.port) || (obj.protocol === "https:" ? 443 : 80),
+        user: obj.username,
+        password: obj.password
+      });
+    } else {
+      throw new MtArgumentError(`Unsupported proxy protocol: ${obj.protocol}`);
+    }
+  };
+}
+export {
+  createProxyTransportFactory
+};

package/network/transports/proxy.test.d.cts

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

package/network/transports/proxy.test.d.ts

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

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@mtcute/core",
     "type": "module",
-    "version": "0.27.8",
+    "version": "0.27.9",
     "description": "Type-safe library for MTProto (Telegram API)",
     "license": "MIT",
     "scripts": {},