@mtcute/core 0.25.3 → 0.25.4

package/highlevel/methods/users/resolve-peer.cjs

@@ -133,32 +133,40 @@ async function resolvePeer(client, peerId, force = false) {
   }
   switch (peerType) {
     case "user": {
-      const res = await batchedQueries._getUsersBatched(client, {
-        _: "inputUser",
-        userId: bareId,
-        accessHash: Long.ZERO
-      });
-      if (res != null && res._ === "user" && res.accessHash != null) {
-        return {
-          _: "inputPeerUser",
+      try {
+        const res = await batchedQueries._getUsersBatched(client, {
+          _: "inputUser",
           userId: bareId,
-          accessHash: res.accessHash
-        };
+          accessHash: Long.ZERO
+        });
+        if (res != null && res._ === "user" && res.accessHash != null) {
+          return {
+            _: "inputPeerUser",
+            userId: bareId,
+            accessHash: res.accessHash
+          };
+        }
+      } catch (e) {
+        if (!tl.tl.RpcError.is(e, "USER_INVALID")) throw e;
       }
       break;
     }
     case "channel": {
-      const res = await batchedQueries._getChannelsBatched(client, {
-        _: "inputChannel",
-        channelId: bareId,
-        accessHash: Long.ZERO
-      });
-      if (res != null && res._ === "channel" && res.accessHash != null) {
-        return {
-          _: "inputPeerChannel",
+      try {
+        const res = await batchedQueries._getChannelsBatched(client, {
+          _: "inputChannel",
           channelId: bareId,
-          accessHash: res.accessHash
-        };
+          accessHash: Long.ZERO
+        });
+        if (res != null && res._ === "channel" && res.accessHash != null) {
+          return {
+            _: "inputPeerChannel",
+            channelId: bareId,
+            accessHash: res.accessHash
+          };
+        }
+      } catch (e) {
+        if (!tl.tl.RpcError.is(e, "CHANNEL_INVALID")) throw e;
       }
       break;
     }

package/highlevel/methods/users/resolve-peer.js

@@ -126,32 +126,40 @@ async function resolvePeer(client, peerId, force = false) {
   }
   switch (peerType) {
     case "user": {
-      const res = await _getUsersBatched(client, {
-        _: "inputUser",
-        userId: bareId,
-        accessHash: Long.ZERO
-      });
-      if (res != null && res._ === "user" && res.accessHash != null) {
-        return {
-          _: "inputPeerUser",
+      try {
+        const res = await _getUsersBatched(client, {
+          _: "inputUser",
           userId: bareId,
-          accessHash: res.accessHash
-        };
+          accessHash: Long.ZERO
+        });
+        if (res != null && res._ === "user" && res.accessHash != null) {
+          return {
+            _: "inputPeerUser",
+            userId: bareId,
+            accessHash: res.accessHash
+          };
+        }
+      } catch (e) {
+        if (!tl.RpcError.is(e, "USER_INVALID")) throw e;
       }
       break;
     }
     case "channel": {
-      const res = await _getChannelsBatched(client, {
-        _: "inputChannel",
-        channelId: bareId,
-        accessHash: Long.ZERO
-      });
-      if (res != null && res._ === "channel" && res.accessHash != null) {
-        return {
-          _: "inputPeerChannel",
+      try {
+        const res = await _getChannelsBatched(client, {
+          _: "inputChannel",
           channelId: bareId,
-          accessHash: res.accessHash
-        };
+          accessHash: Long.ZERO
+        });
+        if (res != null && res._ === "channel" && res.accessHash != null) {
+          return {
+            _: "inputPeerChannel",
+            channelId: bareId,
+            accessHash: res.accessHash
+          };
+        }
+      } catch (e) {
+        if (!tl.RpcError.is(e, "CHANNEL_INVALID")) throw e;
       }
       break;
     }

package/highlevel/updates/manager.cjs

@@ -219,9 +219,9 @@ class UpdatesManager {
     }
     if (this.pendingUpdateContainers.length % WARN_EVERY === 0) {
       if (this.updatesLoopActive) {
-        this.log.warn("%d pending update containers, but the updates loop is not active. did you forget to start it?", this.pendingUpdateContainers.length);
-      } else {
         this.log.warn("%d pending update containers, can't keep up!", this.pendingUpdateContainers.length);
+      } else {
+        this.log.warn("%d pending update containers, but the updates loop is not active. did you forget to start it?", this.pendingUpdateContainers.length);
       }
     }
     this.updatesLoopCv.notify();

package/highlevel/updates/manager.js

@@ -212,9 +212,9 @@ class UpdatesManager {
     }
     if (this.pendingUpdateContainers.length % WARN_EVERY === 0) {
       if (this.updatesLoopActive) {
-        this.log.warn("%d pending update containers, but the updates loop is not active. did you forget to start it?", this.pendingUpdateContainers.length);
-      } else {
         this.log.warn("%d pending update containers, can't keep up!", this.pendingUpdateContainers.length);
+      } else {
+        this.log.warn("%d pending update containers, but the updates loop is not active. did you forget to start it?", this.pendingUpdateContainers.length);
       }
     }
     this.updatesLoopCv.notify();

package/network/network-manager.cjs

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

package/network/session-connection.cjs

@@ -536,8 +536,9 @@ class SessionConnection extends persistentConnection.PersistentConnection {
       this.log.error("received rpc_result for %s request %l", msg._, reqMsgId);
       return;
     }
-    longUtils.removeFromLongArray(this._session.queuedStateReq, reqMsgId);
     const rpc = msg.rpc;
+    longUtils.removeFromLongArray(this._session.queuedStateReq, reqMsgId);
+    this._session.getStateSchedule.remove(rpc);
     rpc.resetAbortSignal?.();
     const resultConstructorId = message.peekUint();
     let result;
@@ -660,7 +661,6 @@ class SessionConnection extends persistentConnection.PersistentConnection {
           this._onMessageAcked(rpc.containerId);
         }
         longUtils.removeFromLongArray(this._session.queuedResendReq, msgId);
-        this._session.getStateSchedule.remove(rpc);
         break;
       }
       case "bind":

package/network/session-connection.js

@@ -529,8 +529,9 @@ class SessionConnection extends PersistentConnection {
       this.log.error("received rpc_result for %s request %l", msg._, reqMsgId);
       return;
     }
-    removeFromLongArray(this._session.queuedStateReq, reqMsgId);
     const rpc = msg.rpc;
+    removeFromLongArray(this._session.queuedStateReq, reqMsgId);
+    this._session.getStateSchedule.remove(rpc);
     rpc.resetAbortSignal?.();
     const resultConstructorId = message.peekUint();
     let result;
@@ -653,7 +654,6 @@ class SessionConnection extends PersistentConnection {
           this._onMessageAcked(rpc.containerId);
         }
         removeFromLongArray(this._session.queuedResendReq, msgId);
-        this._session.getStateSchedule.remove(rpc);
         break;
       }
       case "bind":

package/package.json

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