@mtkruto/node 0.0.990 → 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,
@@ -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) {
@@ -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_);
         }
@@ -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) {
@@ -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.990";
+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.990";
+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];

package/esm/types/3_message.d.ts

@@ -37,6 +37,8 @@ export interface Message {
     date?: Date;
     /** Conversation the message belongs to */
     chat: Chat;
+    /** A link to the message */
+    link?: string;
     /** For forwarded messages, sender of the original message */
     forwardFrom?: User;
     /** For messages forwarded from channels or from anonymous administrators, information about the original sender chat */

package/esm/types/3_message.js

@@ -185,6 +185,7 @@ export async function constructMessage(message_, getEntity, getMessage, getStick
     if (!(message_ instanceof types.Message) && !(message_ instanceof types.MessageService)) {
         UNREACHABLE();
     }
+    let link;
     let chat_ = null;
     if (message_.peerId instanceof types.PeerUser) {
         const entity = await getEntity(message_.peerId);
@@ -205,6 +206,7 @@ export async function constructMessage(message_, getEntity, getMessage, getStick
         }
     }
     else if (message_.peerId instanceof types.PeerChannel) {
+        link = `https://t.me/c/${message_.peerId.channelId}/${message_.id}`;
         const entity = await getEntity(message_.peerId);
         if (entity) {
             chat_ = constructChat(entity);
@@ -223,6 +225,7 @@ export async function constructMessage(message_, getEntity, getMessage, getStick
         out: message_.out ?? false,
         id: message_.id,
         chat: chat_,
+        link,
         date: new Date(message_.date * 1000),
         views: message_.views,
         isTopicMessage: false,

package/package.json

@@ -2,7 +2,7 @@
   "module": "./esm/mod.js",
   "main": "./script/mod.js",
   "name": "@mtkruto/node",
-  "version": "0.0.990",
+  "version": "0.0.991",
   "description": "MTKruto for Node.js",
   "author": "Roj <rojvv@icloud.com>",
   "license": "LGPL-3.0-or-later",

package/script/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/script/client/3_client.js

@@ -230,6 +230,12 @@ class Client extends _1_client_abstract_js_1.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,
@@ -304,11 +310,11 @@ class Client extends _1_client_abstract_js_1.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;
@@ -388,6 +394,12 @@ class Client extends _1_client_abstract_js_1.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:
      *
@@ -425,6 +437,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         await this.initConnection();
         try {
             await this.fetchState("authorize");
+            await this.propagateAuthorizationState(true);
             d("already authorized");
             return;
         }
@@ -458,6 +471,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                 }
             }
             dAuth("authorized as bot");
+            await this.propagateAuthorizationState(true);
             await this.fetchState("authorize");
             return;
         }
@@ -519,6 +533,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                 }));
                 await this.storage.setAccountType("user");
                 dAuth("authorized as user");
+                await this.propagateAuthorizationState(true);
                 await this.fetchState("authorize");
                 return;
             }
@@ -546,6 +561,7 @@ class Client extends _1_client_abstract_js_1.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;
             }
@@ -568,6 +584,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         try {
             await this.fetchState("authorize");
             d("already authorized");
+            await this.propagateAuthorizationState(true);
             return;
         }
         catch (err) {
@@ -710,9 +727,18 @@ class Client extends _1_client_abstract_js_1.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_);
         }
@@ -1028,7 +1054,28 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             }
         }
     }
+    async getUserAccessHash(userId) {
+        const users = await this.invoke(new functions.UsersGetUsers({ id: [new types.InputUser({ userId, accessHash: 0n })] }));
+        return users[0][_1_tl_object_js_1.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][_1_tl_object_js_1.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 @");
@@ -1133,9 +1180,13 @@ class Client extends _1_client_abstract_js_1.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) {
@@ -1512,9 +1563,7 @@ class Client extends _1_client_abstract_js_1.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/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.990";
+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/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.990";
+exports.APP_VERSION = "MTKruto 0.0.991";
 // @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];

package/script/types/3_message.d.ts

@@ -37,6 +37,8 @@ export interface Message {
     date?: Date;
     /** Conversation the message belongs to */
     chat: Chat;
+    /** A link to the message */
+    link?: string;
     /** For forwarded messages, sender of the original message */
     forwardFrom?: User;
     /** For messages forwarded from channels or from anonymous administrators, information about the original sender chat */

package/script/types/3_message.js

@@ -211,6 +211,7 @@ async function constructMessage(message_, getEntity, getMessage, getStickerSetNa
     if (!(message_ instanceof types.Message) && !(message_ instanceof types.MessageService)) {
         (0, _0_control_js_1.UNREACHABLE)();
     }
+    let link;
     let chat_ = null;
     if (message_.peerId instanceof types.PeerUser) {
         const entity = await getEntity(message_.peerId);
@@ -231,6 +232,7 @@ async function constructMessage(message_, getEntity, getMessage, getStickerSetNa
         }
     }
     else if (message_.peerId instanceof types.PeerChannel) {
+        link = `https://t.me/c/${message_.peerId.channelId}/${message_.id}`;
         const entity = await getEntity(message_.peerId);
         if (entity) {
             chat_ = (0, _1_chat_js_1.constructChat)(entity);
@@ -249,6 +251,7 @@ async function constructMessage(message_, getEntity, getMessage, getStickerSetNa
         out: message_.out ?? false,
         id: message_.id,
         chat: chat_,
+        link,
         date: new Date(message_.date * 1000),
         views: message_.views,
         isTopicMessage: false,