@mtkruto/node 0.0.989 → 0.0.991

package/esm/client/3_client.d.ts

@@ -194,6 +194,8 @@ export declare class Client extends ClientAbstract {
     private connectionInited;
     disconnect(): Promise<void>;
     private initConnection;
+    private lastPropagatedAuthorizationState;
+    private propagateAuthorizationState;
     /**
      * Calls [initConnection](1) and authorizes the client with one of the following:
      *
@@ -243,7 +245,10 @@ export declare class Client extends ClientAbstract {
     private getLocalState;
     private recoverUpdateGap;
     private recoverChannelUpdateGap;
+    private getUserAccessHash;
+    private getChannelAccessHash;
     getInputPeer(id: ChatID): Promise<types.InputPeerChat | types.InputPeerUser | types.InputPeerChannel>;
+    private getInputPeerInner;
     [getEntity](peer: types.PeerUser): Promise<types.User | null>;
     [getEntity](peer: types.PeerChat): Promise<types.Chat | null>;
     [getEntity](peer: types.PeerChannel): Promise<types.Channel | null>;
@@ -309,16 +314,21 @@ export declare class Client extends ClientAbstract {
     private handleUpdate;
     handler: Handler;
     use(middleware: Handler): void;
-    on<U extends keyof Update, K extends keyof Update[U]>(filter: Update[U] extends string ? U : Update[U] extends Array<any> ? U : U | [U, ...K[]], handler: Handler<Pick<{
+    on<U extends keyof Update, K extends keyof Update[U]>(filter: U extends FilterableUpdates ? U | [U, K, ...K[]] : U, handler: Handler<Pick<{
         [P in U]: With<Update[U], K>;
     }, U>>): void;
 }
 type With<T, K extends keyof T> = T & Required<Pick<T, K>>;
 export type ConnectionState = "not-connected" | "updating" | "ready";
+export type AuthorizationState = {
+    authorized: boolean;
+};
+type FilterableUpdates = "message" | "editedMessage";
 export interface Update {
     message: Message;
     editedMessage: Message;
     connectionState: ConnectionState;
+    authorizationState: AuthorizationState;
     deletedMessages: [Message, ...Message[]];
 }
 export interface Handler<U extends Partial<Update> = Partial<Update>> {

package/esm/client/3_client.js

@@ -204,6 +204,12 @@ export class Client extends ClientAbstract {
             writable: true,
             value: false
         });
+        Object.defineProperty(this, "lastPropagatedAuthorizationState", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
         Object.defineProperty(this, "autoStarted", {
             enumerable: true,
             configurable: true,
@@ -220,13 +226,13 @@ export class Client extends ClientAbstract {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: new Queue()
+            value: new Queue("handleUpdate")
         });
         Object.defineProperty(this, "processUpdatesQueue", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: new Queue()
+            value: new Queue("processUpdates")
         });
         Object.defineProperty(this, "handler", {
             enumerable: true,
@@ -278,11 +284,11 @@ export class Client extends ClientAbstract {
      * Before establishing the connection, the session is saved.
      */
     async connect() {
+        if (this.connected) {
+            return;
+        }
         const release = await this.connectMutex.acquire();
         try {
-            if (this.connected) {
-                return;
-            }
             if (!this.storageInited) {
                 await this.storage.init();
                 this.storageInited = true;
@@ -362,6 +368,12 @@ export class Client extends ClientAbstract {
             d("connection inited");
         }
     }
+    async propagateAuthorizationState(authorized) {
+        if (this.lastPropagatedAuthorizationState != authorized) {
+            await this.handler({ authorizationState: { authorized } }, resolve);
+            this.lastPropagatedAuthorizationState = authorized;
+        }
+    }
     /**
      * Calls [initConnection](1) and authorizes the client with one of the following:
      *
@@ -399,6 +411,7 @@ export class Client extends ClientAbstract {
         await this.initConnection();
         try {
             await this.fetchState("authorize");
+            await this.propagateAuthorizationState(true);
             d("already authorized");
             return;
         }
@@ -432,6 +445,7 @@ export class Client extends ClientAbstract {
                 }
             }
             dAuth("authorized as bot");
+            await this.propagateAuthorizationState(true);
             await this.fetchState("authorize");
             return;
         }
@@ -493,6 +507,7 @@ export class Client extends ClientAbstract {
                 }));
                 await this.storage.setAccountType("user");
                 dAuth("authorized as user");
+                await this.propagateAuthorizationState(true);
                 await this.fetchState("authorize");
                 return;
             }
@@ -520,6 +535,7 @@ export class Client extends ClientAbstract {
                 await this.invoke(new functions.AuthCheckPassword({ password: input }));
                 await this.storage.setAccountType("user");
                 dAuth("authorized as user");
+                await this.propagateAuthorizationState(true);
                 await this.fetchState("authorize");
                 break;
             }
@@ -542,6 +558,7 @@ export class Client extends ClientAbstract {
         try {
             await this.fetchState("authorize");
             d("already authorized");
+            await this.propagateAuthorizationState(true);
             return;
         }
         catch (err) {
@@ -578,7 +595,7 @@ export class Client extends ClientAbstract {
                         body = new TLReader(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 RPCResult) {
@@ -605,7 +622,7 @@ export class Client extends 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();
@@ -684,9 +701,18 @@ export class Client extends ClientAbstract {
         if (noWait) {
             return;
         }
-        const result = await new Promise((resolve, reject) => {
-            this.promises.set(message.id, { resolve, reject });
-        });
+        let result;
+        try {
+            result = await new Promise((resolve, reject) => {
+                this.promises.set(message.id, { resolve, reject });
+            });
+        }
+        catch (err) {
+            if (err instanceof types.RPCError && err.errorMessage == "AUTH_KEY_UNREGISTERED") {
+                await this.propagateAuthorizationState(false);
+            }
+            throw err;
+        }
         if (result instanceof types.BadServerSalt) {
             return await this.invoke(function_);
         }
@@ -709,7 +735,7 @@ export class Client extends 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[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) {
@@ -726,7 +752,7 @@ export class Client extends 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[as](types.Username)).map((v) => v.username));
+                    await this.storage.updateUsernames("user", user.id, user.usernames.map((v) => v.username));
                 }
             }
         }
@@ -780,7 +806,7 @@ export class Client extends ClientAbstract {
             await this.recoverUpdateGap("updatesTooLong");
             return;
         }
-        else if (updates_ instanceof types.TypeUpdate) {
+        else if (updates_ instanceof types._TypeUpdate) {
             updates = [updates_];
         }
         else {
@@ -859,7 +885,7 @@ export class Client extends 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[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");
@@ -871,7 +897,7 @@ export class Client extends 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);
             }
         }
@@ -923,12 +949,12 @@ export class Client extends ClientAbstract {
                         await this.processUpdates(update, true);
                     }
                     if (difference instanceof types.UpdatesDifference) {
-                        await this.storage.setState(difference.state[as](types.UpdatesState));
+                        await this.storage.setState(difference.state);
                         dGap("recovered from update gap");
                         break;
                     }
                     else if (difference instanceof types.UpdatesDifferenceSlice) {
-                        state = difference.intermediateState[as](types.UpdatesState);
+                        state = difference.intermediateState;
                     }
                     else {
                         UNREACHABLE();
@@ -1002,7 +1028,28 @@ export class Client extends ClientAbstract {
             }
         }
     }
+    async getUserAccessHash(userId) {
+        const users = await this.invoke(new functions.UsersGetUsers({ id: [new types.InputUser({ userId, accessHash: 0n })] }));
+        return users[0][as](types.User).accessHash ?? 0n;
+    }
+    async getChannelAccessHash(channelId) {
+        const channels = await this.invoke(new functions.ChannelsGetChannels({ id: [new types.InputChannel({ channelId, accessHash: 0n })] }));
+        return channels.chats[0][as](types.Channel).accessHash ?? 0n;
+    }
     async getInputPeer(id) {
+        const inputPeer = await this.getInputPeerInner(id);
+        if (inputPeer instanceof types.InputPeerUser || inputPeer instanceof types.InputPeerChannel && inputPeer.accessHash == 0n && await this.storage.getAccountType() == "bot") {
+            if ("channelId" in inputPeer) {
+                inputPeer.accessHash = await this.getChannelAccessHash(inputPeer.channelId);
+            }
+            else {
+                inputPeer.accessHash = await this.getUserAccessHash(inputPeer.userId);
+                await this.storage.setUserAccessHash(inputPeer.userId, inputPeer.accessHash);
+            }
+        }
+        return inputPeer;
+    }
+    async getInputPeerInner(id) {
         if (typeof id === "string") {
             if (!id.startsWith("@")) {
                 throw new Error("Expected username to start with @");
@@ -1107,9 +1154,13 @@ export class Client extends ClientAbstract {
             result instanceof types.ChatlistsExportedInvites ||
             result instanceof types.ChatlistsChatlistInviteAlready ||
             result instanceof types.ChatlistsChatlistInvite ||
-            result instanceof types.ChatlistsChatlistUpdates) {
+            result instanceof types.ChatlistsChatlistUpdates ||
+            result instanceof types.MessagesChats ||
+            result instanceof types.MessagesChatsSlice) {
             await this.processChats(result.chats);
-            await this.processUsers(result.users);
+            if ("users" in result) {
+                await this.processUsers(result.users);
+            }
         }
         if (result instanceof types.MessagesMessages) {
             for (const message of result.messages) {
@@ -1381,7 +1432,7 @@ export class Client extends ClientAbstract {
         }
         else {
             const stickerSet = await this.invoke(new functions.MessagesGetStickerSet({ stickerset: inputStickerSet, hash }));
-            const name = stickerSet[as](types.MessagesStickerSet).set[as](types.StickerSet).shortName;
+            const name = stickerSet[as](types.MessagesStickerSet).set.shortName;
             await this.storage.updateStickerSetName(inputStickerSet.id, inputStickerSet.accessHash, name);
             return name;
         }
@@ -1486,9 +1537,7 @@ export class Client extends ClientAbstract {
             });
         };
     }
-    on(
-    // deno-lint-ignore no-explicit-any
-    filter, handler) {
+    on(filter, handler) {
         const type = typeof filter === "string" ? filter : filter[0];
         const keys = Array.isArray(filter) ? filter.slice(1) : [];
         this.use((update, next) => {

package/esm/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.989";
+export declare const APP_VERSION = "MTKruto 0.0.991";
 export declare const DEVICE_MODEL: string;
 export declare const LANG_CODE: string;
 export declare const LANG_PACK = "";

package/esm/constants.js

@@ -54,7 +54,7 @@ export const PUBLIC_KEYS = Object.freeze([
 export const VECTOR_CONSTRUCTOR = 0x1CB5C415;
 export const INITIAL_DC = "2-test";
 export const LAYER = 161;
-export const APP_VERSION = "MTKruto 0.0.989";
+export const APP_VERSION = "MTKruto 0.0.991";
 // @ts-ignore: lib
 export const 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;
 export const LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];