@mtkruto/node 0.0.988 → 0.0.990

package/script/client/3_client.js

@@ -26,34 +26,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Client = exports.ParseMode = exports.restartAuth = exports.handleMigrationError = exports.getStickerSetName = exports.getEntity = void 0;
 const deps_js_1 = require("../deps.js");
 const constants_js_1 = require("../constants.js");
+const _1_misc_js_1 = require("../utilities/1_misc.js");
 const _0_bigint_js_1 = require("../utilities/0_bigint.js");
+const _0_utilities_js_1 = require("./0_utilities.js");
 const _0_control_js_1 = require("../utilities/0_control.js");
+const _0_queue_js_1 = require("../utilities/0_queue.js");
 const _0_hash_js_1 = require("../utilities/0_hash.js");
+const _0_tl_raw_reader_js_1 = require("../tl/0_tl_raw_reader.js");
 const _1_tl_object_js_1 = require("../tl/1_tl_object.js");
 const types = __importStar(require("../tl/2_types.js"));
-const functions = __importStar(require("../tl/3_functions.js"));
 const _3_tl_reader_js_1 = require("../tl/3_tl_reader.js");
+const functions = __importStar(require("../tl/3_functions.js"));
 const _5_rpc_result_js_1 = require("../tl/5_rpc_result.js");
 const _6_message_js_1 = require("../tl/6_message.js"); // MTProto API message
 const _7_message_container_js_1 = require("../tl/7_message_container.js");
-const _1_storage_memory_js_1 = require("../storage/1_storage_memory.js");
 const _0_file_id_js_1 = require("../types/!0_file_id.js");
-const _0_message_entity_js_1 = require("../types/0_message_entity.js");
 const _0_reply_keyboard_remove_js_1 = require("../types/0_reply_keyboard_remove.js");
+const _0_message_entity_js_1 = require("../types/0_message_entity.js");
 const _0_force_reply_js_1 = require("../types/0_force_reply.js");
-const _2_reply_keyboard_markup_js_1 = require("../types/2_reply_keyboard_markup.js");
+const _1_user_js_1 = require("../types/1_user.js");
 const _2_inline_keyboard_markup_js_1 = require("../types/2_inline_keyboard_markup.js");
+const _2_reply_keyboard_markup_js_1 = require("../types/2_reply_keyboard_markup.js");
 const _3_message_js_1 = require("../types/3_message.js"); // high-level wrapper for Telegram API's message
+const _1_storage_memory_js_1 = require("../storage/1_storage_memory.js");
 const _0_message_js_1 = require("./0_message.js");
-const _0_html_js_1 = require("./0_html.js");
 const _0_password_js_1 = require("./0_password.js");
-const _1_client_abstract_js_1 = require("./1_client_abstract.js");
+const _0_html_js_1 = require("./0_html.js");
 const _2_client_plain_js_1 = require("./2_client_plain.js");
-const _1_misc_js_1 = require("../utilities/1_misc.js");
-const _0_utilities_js_1 = require("./0_utilities.js");
-const _1_user_js_1 = require("../types/1_user.js");
-const _0_tl_raw_reader_js_1 = require("../tl/0_tl_raw_reader.js");
-const _0_queue_js_1 = require("../utilities/0_queue.js");
+const _1_client_abstract_js_1 = require("./1_client_abstract.js");
 const d = (0, deps_js_1.debug)("Client");
 const dGap = (0, deps_js_1.debug)("Client/recoverUpdateGap");
 const dGapC = (0, deps_js_1.debug)("Client/recoverChannelUpdateGap");
@@ -187,12 +187,29 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "lastPropagatedConnectionState", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
         Object.defineProperty(this, "stateChangeHandler", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: ((connected) => {
-                this.propagateConnectionState(connected ? "ready" : "not-connected");
+                this.connectMutex.acquire().then(async (release) => {
+                    try {
+                        const connectionState = connected ? "ready" : "not-connected";
+                        if (this.connected == connected && this.lastPropagatedConnectionState != connectionState) {
+                            await this.propagateConnectionState(connectionState);
+                            this.lastPropagatedConnectionState = connectionState;
+                        }
+                    }
+                    finally {
+                        release();
+                    }
+                });
             }).bind(this)
         });
         Object.defineProperty(this, "storageInited", {
@@ -229,13 +246,13 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: new _0_queue_js_1.Queue()
+            value: new _0_queue_js_1.Queue("handleUpdate")
         });
         Object.defineProperty(this, "processUpdatesQueue", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: new _0_queue_js_1.Queue()
+            value: new _0_queue_js_1.Queue("processUpdates")
         });
         Object.defineProperty(this, "handler", {
             enumerable: true,
@@ -587,7 +604,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                         body = new _3_tl_reader_js_1.TLReader((0, deps_js_1.gunzip)(body.packedData)).readObject();
                     }
                     dRecv("received %s", body.constructor.name);
-                    if (body instanceof types.TypeUpdates || body instanceof types.TypeUpdate) {
+                    if (body instanceof types._TypeUpdates || body instanceof types._TypeUpdate) {
                         this.processUpdatesQueue.add(() => this.processUpdates(body));
                     }
                     else if (message.body instanceof _5_rpc_result_js_1.RPCResult) {
@@ -614,7 +631,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                                 this.promises.delete(messageId);
                             }
                         };
-                        if (result instanceof types.TypeUpdates || result instanceof types.TypeUpdate) {
+                        if (result instanceof types._TypeUpdates || result instanceof types._TypeUpdate) {
                             this.processUpdatesQueue.add(async () => {
                                 await this.processUpdates(result);
                                 resolvePromise();
@@ -718,7 +735,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                     await this.storage.updateUsernames("channel", chat.id, [chat.username]);
                 }
                 if (chat.usernames) {
-                    await this.storage.updateUsernames("channel", chat.id, chat.usernames.map((v) => v[_1_tl_object_js_1.as](types.Username)).map((v) => v.username));
+                    await this.storage.updateUsernames("channel", chat.id, chat.usernames.map((v) => v.username));
                 }
             }
             else if (chat instanceof types.Chat) {
@@ -735,7 +752,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                     await this.storage.updateUsernames("user", user.id, [user.username]);
                 }
                 if (user.usernames) {
-                    await this.storage.updateUsernames("user", user.id, user.usernames.map((v) => v[_1_tl_object_js_1.as](types.Username)).map((v) => v.username));
+                    await this.storage.updateUsernames("user", user.id, user.usernames.map((v) => v.username));
                 }
             }
         }
@@ -789,7 +806,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             await this.recoverUpdateGap("updatesTooLong");
             return;
         }
-        else if (updates_ instanceof types.TypeUpdate) {
+        else if (updates_ instanceof types._TypeUpdate) {
             updates = [updates_];
         }
         else {
@@ -868,7 +885,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                 await this.recoverChannelUpdateGap(update.channelId, "updateChannelTooLong");
             }
             else if (update instanceof types.UpdateUserName) {
-                await this.storage.updateUsernames("user", update.userId, update.usernames.map((v) => v[_1_tl_object_js_1.as](types.Username)).map((v) => v.username));
+                await this.storage.updateUsernames("user", update.userId, update.usernames.map((v) => v.username));
             }
             else if (update instanceof types.UpdatePtsChanged) {
                 await this.fetchState("updatePtsChanged");
@@ -880,7 +897,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                 }
             }
             /// If there were any Update, they will be passed to the update handling queue.
-            if (update instanceof types.TypeUpdate) {
+            if (update instanceof types._TypeUpdate) {
                 updatesToHandle.push(update);
             }
         }
@@ -932,12 +949,12 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                         await this.processUpdates(update, true);
                     }
                     if (difference instanceof types.UpdatesDifference) {
-                        await this.storage.setState(difference.state[_1_tl_object_js_1.as](types.UpdatesState));
+                        await this.storage.setState(difference.state);
                         dGap("recovered from update gap");
                         break;
                     }
                     else if (difference instanceof types.UpdatesDifferenceSlice) {
-                        state = difference.intermediateState[_1_tl_object_js_1.as](types.UpdatesState);
+                        state = difference.intermediateState;
                     }
                     else {
                         (0, _0_control_js_1.UNREACHABLE)();
@@ -1390,7 +1407,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         }
         else {
             const stickerSet = await this.invoke(new functions.MessagesGetStickerSet({ stickerset: inputStickerSet, hash }));
-            const name = stickerSet[_1_tl_object_js_1.as](types.MessagesStickerSet).set[_1_tl_object_js_1.as](types.StickerSet).shortName;
+            const name = stickerSet[_1_tl_object_js_1.as](types.MessagesStickerSet).set.shortName;
             await this.storage.updateStickerSetName(inputStickerSet.id, inputStickerSet.accessHash, name);
             return name;
         }
@@ -1437,25 +1454,13 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         }
         return (0, _1_user_js_1.constructUser)(users[0][_1_tl_object_js_1.as](types.User));
     }
+    // TODO: log errors
     async handleUpdate(update) {
         if (update instanceof types.UpdateNewMessage || update instanceof types.UpdateNewMessage || update instanceof types.UpdateNewChannelMessage || update instanceof types.UpdateNewChannelMessage) {
             if (update.message instanceof types.Message || update.message instanceof types.MessageService) {
                 await this.storage.setMessage((0, _0_utilities_js_1.peerToChatId)(update.message.peerId), update.message.id, update.message);
             }
         }
-        else if (update instanceof types.UpdateDeleteChannelMessages) {
-            for (const message of update.messages) {
-                await this.storage.setMessage((0, _0_utilities_js_1.getChannelChatId)(update.channelId), message, null);
-            }
-        }
-        else if (update instanceof types.UpdateDeleteMessages) {
-            for (const message of update.messages) {
-                const chatId = await this.storage.getMessageChat(message);
-                if (chatId) {
-                    await this.storage.setMessage(chatId, message, null);
-                }
-            }
-        }
         if (update instanceof types.UpdateNewMessage ||
             update instanceof types.UpdateNewChannelMessage ||
             update instanceof types.UpdateEditMessage ||
@@ -1464,6 +1469,36 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             const message = await (0, _3_message_js_1.constructMessage)(update.message, this[exports.getEntity].bind(this), this.getMessage.bind(this), this[exports.getStickerSetName].bind(this));
             await this.handler({ [key]: message }, resolve);
         }
+        if (update instanceof types.UpdateDeleteMessages) {
+            const deletedMessages = new Array();
+            for (const messageId of update.messages) {
+                const chatId = await this.storage.getMessageChat(messageId);
+                if (chatId) {
+                    const message = await this.storage.getMessage(chatId, messageId);
+                    if (message != null) {
+                        deletedMessages.push(await (0, _3_message_js_1.constructMessage)(message, this[exports.getEntity].bind(this), this.getMessage.bind(this), this[exports.getStickerSetName].bind(this)));
+                    }
+                    await this.storage.setMessage(chatId, messageId, null);
+                }
+            }
+            if (deletedMessages.length > 0) {
+                await this.handler({ deletedMessages: deletedMessages }, resolve);
+            }
+        }
+        else if (update instanceof types.UpdateDeleteChannelMessages) {
+            const chatId = (0, _0_utilities_js_1.getChannelChatId)(update.channelId);
+            const deletedMessages = new Array();
+            for (const messageId of update.messages) {
+                const message = await this.storage.getMessage(chatId, messageId);
+                if (message) {
+                    deletedMessages.push(await (0, _3_message_js_1.constructMessage)(message, this[exports.getEntity].bind(this), this.getMessage.bind(this), this[exports.getStickerSetName].bind(this)));
+                }
+                await this.storage.setMessage(chatId, messageId, null);
+            }
+            if (deletedMessages.length > 0) {
+                await this.handler({ deletedMessages: deletedMessages }, resolve);
+            }
+        }
     }
     use(middleware) {
         const handler = this.handler;
@@ -1477,7 +1512,9 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             });
         };
     }
-    on(filter, handler) {
+    on(
+    // deno-lint-ignore no-explicit-any
+    filter, handler) {
         const type = typeof filter === "string" ? filter : filter[0];
         const keys = Array.isArray(filter) ? filter.slice(1) : [];
         this.use((update, next) => {

package/script/constants.d.ts

@@ -5,7 +5,7 @@ export declare const PUBLIC_KEYS: PublicKeys;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const INITIAL_DC: DC;
 export declare const LAYER = 161;
-export declare const APP_VERSION = "MTKruto 0.0.988";
+export declare const APP_VERSION = "MTKruto 0.0.990";
 export declare const DEVICE_MODEL: string;
 export declare const LANG_CODE: string;
 export declare const LANG_PACK = "";

package/script/constants.js

@@ -80,7 +80,7 @@ exports.PUBLIC_KEYS = Object.freeze([
 exports.VECTOR_CONSTRUCTOR = 0x1CB5C415;
 exports.INITIAL_DC = "2-test";
 exports.LAYER = 161;
-exports.APP_VERSION = "MTKruto 0.0.988";
+exports.APP_VERSION = "MTKruto 0.0.990";
 // @ts-ignore: lib
 exports.DEVICE_MODEL = typeof dntShim.Deno === "undefined" ? typeof navigator === "undefined" ? typeof process === "undefined" ? "Unknown" : process.platform + "-" + process.arch : navigator.userAgent.split(" ")[0] : dntShim.Deno.build.os + "-" + dntShim.Deno.build.arch;
 exports.LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];