@mtkruto/node 0.79.6 → 0.80.0

package/script/client/5_client_dispatcher.js

@@ -1,23 +1,4 @@
 "use strict";
-/**
- * MTKruto - Cross-runtime JavaScript library for building Telegram clients
- * Copyright (C) 2023-2026 Roj <https://roj.im/>
- *
- * This file is part of MTKruto.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * 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/>.
- */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -53,9 +34,30 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientDispatcher = void 0;
+/**
+ * MTKruto - Cross-runtime JavaScript library for building Telegram clients
+ * Copyright (C) 2023-2026 Roj <https://roj.im/>
+ *
+ * This file is part of MTKruto.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * 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/>.
+ */
+const dntShim = __importStar(require("../_dnt.shims.js"));
 const _1_utilities_js_1 = require("../1_utilities.js");
 const _4_constants_js_1 = require("../4_constants.js");
-const errors = __importStar(require("../4_errors.js"));
+const _0_worker_error_js_1 = require("./0_worker_error.js");
+const _1_invoke_middleware_js_1 = require("./1_invoke_middleware.js");
 const _2_sign_in_js_1 = require("./2_sign_in.js");
 const _4_composer_js_1 = require("./4_composer.js");
 class ClientDispatcher extends _4_composer_js_1.Composer {
@@ -64,12 +66,12 @@ class ClientDispatcher extends _4_composer_js_1.Composer {
     #L;
     #LsignIn;
     // deno-lint-ignore no-explicit-any
-    #pendingRequests = new Array();
+    #pendingRequests = new Map();
     constructor(worker, id) {
         super();
         this.#worker = worker;
         this.#id = id;
-        this.#L = (0, _1_utilities_js_1.getLogger)("ClientController").branch(this.#id + "");
+        this.#L = (0, _1_utilities_js_1.getLogger)("ClientDispatcher").branch(this.#id);
         this.#LsignIn = this.#L.branch("signIn");
     }
     /** @internal */
@@ -79,10 +81,11 @@ class ClientDispatcher extends _4_composer_js_1.Composer {
         }
         this.#L.debug("handling response message", response);
         if (response.isError) {
-            this.#pendingRequests[response.id]?.reject(this.#constructError(response.data));
+            this.#pendingRequests.get(response.id)?.reject((0, _0_worker_error_js_1.deserializeWorkerError)(response.data));
+            this.#pendingRequests.delete(response.id);
         }
         else {
-            if (response.id === -1) {
+            if (response.id === "") {
                 try {
                     await this.handleUpdate(this, response.data);
                 }
@@ -91,38 +94,10 @@ class ClientDispatcher extends _4_composer_js_1.Composer {
                 }
             }
             else {
-                this.#pendingRequests[response.id]?.resolve(response.data);
+                this.#pendingRequests.get(response.id)?.resolve(response.data);
+                this.#pendingRequests.delete(response.id);
             }
         }
-        // clean up pending requests
-        if (response.id === 0) {
-            this.#pendingRequests.shift();
-        }
-        else if (response.id === this.#pendingRequests.length - 1) {
-            this.#pendingRequests.pop();
-        }
-    }
-    #constructError(error) {
-        switch (error.name) {
-            case "TelegramError":
-                return errors.constructTelegramError({
-                    _: "rpc_error",
-                    error_code: error.args[0].error_code,
-                    error_message: error.args[0].error_message,
-                }, error.args.call);
-            case "ConnectionError":
-                return new errors.ConnectionError(error.args[0]);
-            case "AccessError":
-                return new errors.AccessError(error.args[0]);
-            case "InputError":
-                return new errors.InputError(error.args[0]);
-            case "TransportError":
-                return new errors.TransportError(error.args[0]);
-            case "TLError":
-                return new errors.TLError(error.args[0], error.args[1]);
-            default:
-                return new TypeError("Unknown error");
-        }
     }
     get id() {
         return this.#id;
@@ -130,10 +105,12 @@ class ClientDispatcher extends _4_composer_js_1.Composer {
     async #dispatch(method, ...args) {
         // deno-lint-ignore no-explicit-any
         const promiseWithResolvers = Promise.withResolvers();
-        const index = this.#pendingRequests.push(promiseWithResolvers) - 1;
+        const id = dntShim.crypto.randomUUID();
+        this.#pendingRequests.set(id, promiseWithResolvers);
         const request = {
+            type: "request",
             clientId: this.#id,
-            id: index,
+            id,
             method,
             args,
         };
@@ -159,9 +136,53 @@ class ClientDispatcher extends _4_composer_js_1.Composer {
         await this.connect();
         await this.signIn(params);
     }
-    async invoke(function_, params) {
-        return await this.#dispatch("invoke", function_, params);
+    async #invoke(function_, params) {
+        let n = 1;
+        while (true) {
+            try {
+                await this.#dispatch("invoke", function_, params);
+            }
+            catch (err) {
+                if (await this.#handleInvokeError(Object.freeze({ client: this, error: err, function: function_, n: n++ }), () => Promise.resolve(false))) {
+                    continue;
+                }
+                else {
+                    throw err;
+                }
+            }
+        }
     }
+    #handleInvokeError = (0, _1_invoke_middleware_js_1.skipInvoke)();
+    /** @internal */
+    async handleInvokeError(request) {
+        const args = request.args[0];
+        return await this.#handleInvokeError({
+            client: this,
+            error: (0, _0_worker_error_js_1.deserializeWorkerError)(args.error),
+            function: args.function,
+            n: args.n,
+        }, () => Promise.resolve(false));
+    }
+    /**
+     * Invokes a function waiting and returning its reply.
+     * Requires the client to be connected.
+     *
+     * @param function_ The function to invoke.
+     */
+    invoke = Object.assign(this.#invoke, {
+        use: (handler) => {
+            const handle = this.#handleInvokeError;
+            this.#handleInvokeError = async (ctx, next) => {
+                let result = null;
+                return await handle(ctx, async () => {
+                    if (result !== null)
+                        return result;
+                    result = await handler(ctx, next);
+                    return result;
+                });
+            };
+        },
+    });
     /**
      * Send a user verification code.
      *

package/script/client/6_client_worker.d.ts

@@ -23,6 +23,6 @@ export declare class ClientWorker {
     constructor(specifier: Worker);
     constructor(specifier: string | URL, options?: WorkerOptions);
     terminate(): void;
-    createClient(params?: ClientDispatcherParams): Promise<ClientDispatcher>;
+    createClient(id: string, params?: ClientDispatcherParams): Promise<ClientDispatcher>;
 }
 //# sourceMappingURL=6_client_worker.d.ts.map

package/script/client/6_client_worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"6_client_worker.d.ts","sourceRoot":"","sources":["../../src/client/6_client_worker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAIH,OAAO,EAAE,gBAAgB,EAAE,KAAK,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAEzF,qBAAa,YAAY;;gBAMX,SAAS,EAAE,MAAM;gBACjB,SAAS,EAAE,MAAM,GAAG,GAAG,EAAE,OAAO,CAAC,EAAE,aAAa;IAW5D,SAAS;IAIH,YAAY,CAAC,MAAM,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAY/E"}
+{"version":3,"file":"6_client_worker.d.ts","sourceRoot":"","sources":["../../src/client/6_client_worker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAMH,OAAO,EAAE,gBAAgB,EAAE,KAAK,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAEzF,qBAAa,YAAY;;gBAKX,SAAS,EAAE,MAAM;gBACjB,SAAS,EAAE,MAAM,GAAG,GAAG,EAAE,OAAO,CAAC,EAAE,aAAa;IA4B5D,SAAS;IAIH,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAe3F"}

package/script/client/6_client_worker.js

@@ -20,33 +20,53 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientWorker = void 0;
+const _0_errors_js_1 = require("../0_errors.js");
 const _1_logger_js_1 = require("../utilities/1_logger.js");
 const _5_client_dispatcher_js_1 = require("./5_client_dispatcher.js");
 class ClientWorker {
     #worker;
-    #idCounter = 0;
-    #clients = new Array();
+    #clients = new Map();
     #L = (0, _1_logger_js_1.getLogger)("ClientWorker");
     constructor(specifier, options) {
         this.#worker = specifier instanceof Worker ? specifier : new Worker(specifier, options);
-        this.#worker.addEventListener("message", (e) => {
+        this.#worker.addEventListener("message", async (e) => {
             this.#L.debug("received message from worker", e.data);
-            const response = e.data;
-            this.#clients[response.clientId]?.handleResponse(response);
+            const message = e.data;
+            if (message.type === "response") {
+                this.#clients.get(message.clientId)?.handleResponse(message);
+            }
+            else if (message.type === "request") {
+                if (message.method === "handleInvokeError") {
+                    const client = this.#clients.get(message.clientId);
+                    if (client) {
+                        const result = await client.handleInvokeError(message);
+                        const response = {
+                            type: "response",
+                            clientId: message.clientId,
+                            id: message.id,
+                            isError: false,
+                            data: result,
+                        };
+                        this.#worker.postMessage(response);
+                    }
+                }
+            }
         });
     }
     terminate() {
         this.#worker.terminate();
     }
-    async createClient(params) {
-        const clientId = this.#idCounter++;
-        const client = new _5_client_dispatcher_js_1.ClientDispatcher(this.#worker, clientId);
-        this.#clients.push(client);
+    async createClient(id, params) {
+        if (this.#clients.has(id)) {
+            throw new _0_errors_js_1.InputError("Client already created");
+        }
+        const client = new _5_client_dispatcher_js_1.ClientDispatcher(this.#worker, id);
+        this.#clients.set(id, client);
         try {
             await client.init(params);
         }
         catch (err) {
-            this.#clients = this.#clients.filter((v) => v !== client);
+            this.#clients.delete(id);
             throw err;
         }
         return client;

package/esm/client/0_worker_response.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"0_worker_response.d.ts","sourceRoot":"","sources":["../../src/client/0_worker_response.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,eAAe,GAAG,iBAAiB,GAAG,aAAa,GAAG,YAAY,GAAG,gBAAgB,GAAG,SAAS,CAAC;IAExG,IAAI,EAAE,GAAG,CAAC;CACX;AAED,MAAM,CAAC,OAAO,WAAW,cAAc,CAAC;IACtC,UAAiB,IAAI;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,EAAE,EAAE,MAAM,CAAC;KACZ;IAED,UAAiB,KAAM,SAAQ,IAAI;QACjC,OAAO,EAAE,IAAI,CAAC;QACd,IAAI,EAAE,WAAW,CAAC;KACnB;IAED,UAAiB,IAAK,SAAQ,IAAI;QAChC,OAAO,EAAE,KAAK,CAAC;QACf,IAAI,EAAE,OAAO,CAAC;KACf;CACF;AAED,MAAM,MAAM,cAAc,GAAG,cAAc,CAAC,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC"}

package/script/client/0_worker_response.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"0_worker_response.d.ts","sourceRoot":"","sources":["../../src/client/0_worker_response.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,eAAe,GAAG,iBAAiB,GAAG,aAAa,GAAG,YAAY,GAAG,gBAAgB,GAAG,SAAS,CAAC;IAExG,IAAI,EAAE,GAAG,CAAC;CACX;AAED,MAAM,CAAC,OAAO,WAAW,cAAc,CAAC;IACtC,UAAiB,IAAI;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,EAAE,EAAE,MAAM,CAAC;KACZ;IAED,UAAiB,KAAM,SAAQ,IAAI;QACjC,OAAO,EAAE,IAAI,CAAC;QACd,IAAI,EAAE,WAAW,CAAC;KACnB;IAED,UAAiB,IAAK,SAAQ,IAAI;QAChC,OAAO,EAAE,KAAK,CAAC;QACf,IAAI,EAAE,OAAO,CAAC;KACf;CACF;AAED,MAAM,MAAM,cAAc,GAAG,cAAc,CAAC,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC"}