@mtkruto/node 0.153.0 → 0.154.0

package/script/session/0_session_state.js

@@ -27,16 +27,20 @@ class SessionState {
     #seqNo = 0;
     #messageId = 0n;
     nextMessageId() {
+        return this.#messageId = this.previewNextMessageId();
+    }
+    previewNextMessageId() {
         const now = (0, _1_utilities_js_1.toUnixTimestamp)(new Date()) + this.timeDifference;
         const nanoseconds = Math.floor((now - Math.floor(now)) * 1e9);
         const newMessageId = (BigInt(Math.floor(now)) << 32n) || (BigInt(nanoseconds) << 2n);
-        if (this.#messageId >= newMessageId) {
-            this.#messageId += 4n;
+        let messageId = this.#messageId;
+        if (messageId >= newMessageId) {
+            messageId += 4n;
         }
         else {
-            this.#messageId = newMessageId;
+            messageId = newMessageId;
         }
-        return this.#messageId;
+        return messageId;
     }
     nextSeqNo(contentRelated) {
         let seqNo = this.#seqNo * 2;

package/script/session/1_session.d.ts

@@ -24,5 +24,6 @@ export declare abstract class Session {
     get isDisconnected(): boolean;
     disconnect(): void;
     abstract send(body: Uint8Array): Promise<bigint>;
+    previewNextMessageId(): bigint;
 }
 //# sourceMappingURL=1_session.d.ts.map

package/script/session/1_session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"1_session.d.ts","sourceRoot":"","sources":["../../src/session/1_session.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,iBAAiB,EAAoD,MAAM,mBAAmB,CAAC;AACtH,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAQpD,MAAM,WAAW,aAAa;IAC5B,wIAAwI;IACxI,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,wEAAwE;IACxE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,8BAAsB,OAAO;;IAG3B,SAAS,CAAC,KAAK,EAAE,YAAY,CAAsB;IACnD,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC;gBAMvC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,aAAa;IAc1C,IAAI,uBAAuB,CAAC,uBAAuB,EAAE,UAAU,CAAC,oBAAoB,CAAC,EAEpF;IAED,IAAI,kBAAkB,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,EAExE;IAED,IAAI,EAAE,IAAI,EAAE,CAEX;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,IAAI,UAAU,CAAC,UAAU,EAAE,MAAM,EAEhC;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IA6BD,IAAI,WAAW,IAAI,OAAO,CAEzB;IAGK,OAAO;cAeG,kBAAkB;IAIlC,IAAI,cAAc,IAAI,OAAO,CAE5B;IAED,UAAU;IAOV,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;CACjD"}
+{"version":3,"file":"1_session.d.ts","sourceRoot":"","sources":["../../src/session/1_session.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,iBAAiB,EAAoD,MAAM,mBAAmB,CAAC;AACtH,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAQpD,MAAM,WAAW,aAAa;IAC5B,wIAAwI;IACxI,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,wEAAwE;IACxE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,8BAAsB,OAAO;;IAG3B,SAAS,CAAC,KAAK,EAAE,YAAY,CAAsB;IACnD,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,iBAAiB,CAAC,CAAC;gBAMvC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,aAAa;IAc1C,IAAI,uBAAuB,CAAC,uBAAuB,EAAE,UAAU,CAAC,oBAAoB,CAAC,EAEpF;IAED,IAAI,kBAAkB,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,SAAS,EAExE;IAED,IAAI,EAAE,IAAI,EAAE,CAEX;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,IAAI,UAAU,CAAC,UAAU,EAAE,MAAM,EAEhC;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IA6BD,IAAI,WAAW,IAAI,OAAO,CAEzB;IAGK,OAAO;cAeG,kBAAkB;IAIlC,IAAI,cAAc,IAAI,OAAO,CAE5B;IAED,UAAU;IAOV,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAEhD,oBAAoB,IAAI,MAAM;CAG/B"}

package/script/session/1_session.js

@@ -158,5 +158,8 @@ class Session {
             this.transport.connection.close();
         }
     }
+    previewNextMessageId() {
+        return this.state.previewNextMessageId();
+    }
 }
 exports.Session = Session;

package/script/session/2_session_encrypted.d.ts

@@ -17,23 +17,28 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+import { TransportError } from "../0_errors.js";
+import { type MaybePromise } from "../1_utilities.js";
 import { Mtproto } from "../2_tl.js";
 import type { DC } from "../3_transport.js";
 import { Session, type SessionParams } from "./1_session.js";
 export interface Handlers {
-    onUpdate?: (body: Uint8Array) => void;
-    onNewServerSalt?: (serverSalt: bigint) => void;
-    onMessageFailed?: (id: bigint, reason: unknown) => void;
-    onPong?: (pong: Mtproto.pong) => void;
-    onRpcError?: (id: bigint, error: Mtproto.rpc_error) => void;
-    onRpcResult?: (id: bigint, result: Uint8Array) => void;
+    onTransportError?: (transportError: TransportError) => MaybePromise<void>;
+    onUpdate?: (body: Uint8Array) => MaybePromise<void>;
+    onNewServerSalt?: (serverSalt: bigint) => MaybePromise<void>;
+    onMessageFailed?: (id: bigint, reason: unknown) => MaybePromise<void>;
+    onPong?: (pong: Mtproto.pong) => MaybePromise<void>;
+    onRpcError?: (id: bigint, error: Mtproto.rpc_error) => MaybePromise<void>;
+    onRpcResult?: (id: bigint, result: Uint8Array) => MaybePromise<void>;
 }
 export declare class SessionEncrypted extends Session implements Session {
     #private;
     handlers: Handlers;
     constructor(dc: DC, params?: SessionParams);
     setAuthKey(key: Uint8Array<ArrayBuffer>): Promise<void>;
+    get id(): bigint;
     get authKey(): Uint8Array<ArrayBuffer>;
+    get authKeyId(): bigint;
     connect(): Promise<void>;
     disconnect(): void;
     send(body: Uint8Array<ArrayBuffer>): Promise<bigint>;

package/script/session/2_session_encrypted.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"2_session_encrypted.d.ts","sourceRoot":"","sources":["../../src/session/2_session_encrypted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAKH,OAAO,EAAwD,OAAO,EAAuC,MAAM,YAAY,CAAC;AAChI,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAI5C,OAAO,EAAE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAa7D,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;IACtC,eAAe,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,eAAe,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACxD,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC;IACtC,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,KAAK,IAAI,CAAC;IAC5D,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;CACxD;AAED,qBAAa,gBAAiB,SAAQ,OAAQ,YAAW,OAAO;;IAI9D,QAAQ,EAAE,QAAQ,CAAM;gBAiBZ,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,aAAa;IAQpC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,WAAW,CAAC;IAM7C,IAAI,OAAO,IAAI,UAAU,CAAC,WAAW,CAAC,CAErC;IAEc,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAe9B,UAAU,IAAI,IAAI;IA6ErB,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CA4X3D"}
+{"version":3,"file":"2_session_encrypted.d.ts","sourceRoot":"","sources":["../../src/session/2_session_encrypted.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,EAAmB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAA+E,KAAK,YAAY,EAAsC,MAAM,mBAAmB,CAAC;AACvK,OAAO,EAAwD,OAAO,EAAuC,MAAM,YAAY,CAAC;AAChI,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAI5C,OAAO,EAAE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAa7D,MAAM,WAAW,QAAQ;IACvB,gBAAgB,CAAC,EAAE,CAAC,cAAc,EAAE,cAAc,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAC1E,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IACpD,eAAe,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7D,eAAe,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IACtE,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IACpD,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAC1E,WAAW,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CACtE;AAED,qBAAa,gBAAiB,SAAQ,OAAQ,YAAW,OAAO;;IAI9D,QAAQ,EAAE,QAAQ,CAAM;gBAiBZ,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,aAAa;IAQpC,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,WAAW,CAAC;IAM7C,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,OAAO,IAAI,UAAU,CAAC,WAAW,CAAC,CAErC;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAEc,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAe9B,UAAU,IAAI,IAAI;IA+ErB,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CA6X3D"}

package/script/session/2_session_encrypted.js

@@ -61,9 +61,15 @@ class SessionEncrypted extends _1_session_js_1.Session {
         this.#authKeyId = (0, _1_utilities_js_1.intFromBytes)(hash.slice(-8));
         this.#authKey = key;
     }
+    get id() {
+        return this.#id;
+    }
     get authKey() {
         return this.#authKey;
     }
+    get authKeyId() {
+        return this.#authKeyId;
+    }
     async connect() {
         if (!this.isConnected) {
             this.#rejectAllPending(new _0_errors_js_1.ConnectionError("The connection was closed."));
@@ -82,6 +88,8 @@ class SessionEncrypted extends _1_session_js_1.Session {
         super.disconnect();
         this.state.reset();
         this.#id = (0, _1_utilities_js_1.getRandomId)();
+        this.#receiveLoop.abort();
+        this.#sendLoop.abort();
         this.#pingLoop.abort();
         this.#awakeSendLoop?.();
         this.#rejectAllPending(new _0_errors_js_1.ConnectionError("The connection was disconnected."));
@@ -140,11 +148,11 @@ class SessionEncrypted extends _1_session_js_1.Session {
             return;
         }
         // message was not sent by us
-        this.handlers.onMessageFailed?.(id, reason);
+        (0, _1_utilities_js_1.drop)(this.handlers.onMessageFailed?.(id, reason));
     }
     #setServerSalt(newServerSalt) {
         this.state.serverSalt = newServerSalt;
-        this.handlers.onNewServerSalt?.(newServerSalt);
+        (0, _1_utilities_js_1.drop)(this.handlers.onNewServerSalt?.(newServerSalt));
     }
     async send(body) {
         if (!this.isDisconnected && !this.isConnected) {
@@ -304,11 +312,11 @@ class SessionEncrypted extends _1_session_js_1.Session {
             if (!this.isConnected) {
                 this.#LreceiveLoop.debug("aborting as not connected");
                 loop.abort();
-                return;
             }
-            else {
-                return;
+            else if (err instanceof _0_errors_js_1.TransportError) {
+                await this.handlers.onTransportError?.(err);
             }
+            return;
         }
         try {
             if (message.body instanceof Uint8Array) {
@@ -334,13 +342,13 @@ class SessionEncrypted extends _1_session_js_1.Session {
             id = reader.readInt32(false);
         }
         if (id === RPC_RESULT) {
-            this.#onRpcResult(msgId, reader.buffer, logger);
+            await this.#onRpcResult(msgId, reader.buffer, logger);
             return;
         }
         if (!_2_tl_js_1.Mtproto.schema.identifierToName[id]) {
             logger.debug("identified body as a non-MTProto constructor");
             reader.unreadInt32();
-            this.handlers.onUpdate?.(reader.buffer);
+            await this.handlers.onUpdate?.(reader.buffer);
             return;
         }
         let type;
@@ -393,10 +401,10 @@ class SessionEncrypted extends _1_session_js_1.Session {
         if (id === RPC_ERROR) {
             logger.debug("received rpc_error from message", msgId);
             const error = await _2_tl_js_1.Mtproto.deserializeType("rpc_error", reader);
-            this.handlers.onRpcError?.(reqMsgId, error);
+            await this.handlers.onRpcError?.(reqMsgId, error);
         }
         else {
-            this.handlers.onRpcResult?.(reqMsgId, reader.buffer);
+            await this.handlers.onRpcResult?.(reqMsgId, reader.buffer);
         }
     }
     #onMsgDetailedInfo(msgDetailedInfo, logger) {
@@ -448,7 +456,7 @@ class SessionEncrypted extends _1_session_js_1.Session {
         }
         else {
             // pong is not ours
-            this.handlers.onPong?.(pong);
+            (0, _1_utilities_js_1.drop)(this.handlers.onPong?.(pong));
         }
     }
     #onNewSessionCreated(msgId, newSessionCreated) {