evogram-gramjs 1.0.0 → 1.0.2

package/lib/commands/Accounts.command.d.ts

@@ -1,6 +1,6 @@
 import { Command, CommandContext, InlineQueryContext, MessageContext } from 'evogram';
 export declare class AccountsCommand extends Command {
-    execute(context: CommandContext, sessionId?: string): Promise<any>;
+    execute(context: CommandContext, sessionId?: string, page?: number): Promise<any>;
     handleMessage(context: CommandContext, message: MessageContext): Promise<any>;
     inlineExecute(context: InlineQueryContext): Promise<void>;
 }

package/lib/commands/Accounts.command.js

@@ -7,10 +7,11 @@ const evogram_1 = require("evogram");
 const EvogramGramJS_1 = require("../EvogramGramJS");
 const AddAccount_command_1 = require("./AddAccount.command");
 let AccountsCommand = AccountsCommand_1 = class AccountsCommand extends evogram_1.Command {
-    execute(context, sessionId) {
+    execute(context, sessionId, page) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            if (!sessionId)
+            if (!sessionId) {
+                const sessions = yield EvogramGramJS_1.EvogramGramJS.sessionManager.getAllLoadedSessions();
                 //@ts-ignore
                 return (_a = context[context.callbackQuery ? 'edit' : 'send']) === null || _a === void 0 ? void 0 : _a.call(context, {
                     // prettier-ignore
@@ -20,12 +21,15 @@ let AccountsCommand = AccountsCommand_1 = class AccountsCommand extends evogram_
                     reply_markup: {
                         inline_keyboard: [
                             [
-                                { text: 'Добавить', command: AddAccount_command_1.AddAccountCommand, payload: { phone: null, session: null, code: null, password: null } },
-                                { text: 'Список', command: AccountsCommand_1, switch_inline_query_current_chat: ' ' },
+                                { text: '📋 Список аккаунтов', switch_inline_query_current_chat: ' ', command: AccountsCommand_1 },
+                                { text: '➕ Добавить аккаунт', command: AddAccount_command_1.AddAccountCommand },
                             ],
+                            ...sessions.slice((Number(page) || 0) * 10, (Number(page) || 0) * 10 + 10).map((x) => { var _a, _b, _c; return [{ text: `[${((_a = x.db) === null || _a === void 0 ? void 0 : _a.error) ? '❌' : '✅'}] ${((_b = x.db) === null || _b === void 0 ? void 0 : _b.firstName) || ((_c = x.db) === null || _c === void 0 ? void 0 : _c.username) || 'Безымянный'}`, command: AccountsCommand_1, payload: { sessionId: x.sessionId } }]; }),
+                            (0, evogram_1.Pagination)({ pages: Math.ceil(sessions.length / 10), currentPage: Number(page) || 0, command: AccountsCommand_1 }),
                         ],
                     },
                 });
+            }
             const session = EvogramGramJS_1.EvogramGramJS.sessionManager.getSession(sessionId);
             const db = yield (session === null || session === void 0 ? void 0 : session.db());
             const me = yield (session === null || session === void 0 ? void 0 : session.client.getMe().then((x) => x).catch(() => null));
@@ -75,8 +79,9 @@ let AccountsCommand = AccountsCommand_1 = class AccountsCommand extends evogram_
 exports.AccountsCommand = AccountsCommand;
 tslib_1.__decorate([
     tslib_1.__param(1, (0, evogram_1.CommandArgument)('sessionId?')),
+    tslib_1.__param(2, (0, evogram_1.CommandArgument)('page?')),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [evogram_1.CommandContext, String]),
+    tslib_1.__metadata("design:paramtypes", [evogram_1.CommandContext, String, Number]),
     tslib_1.__metadata("design:returntype", Promise)
 ], AccountsCommand.prototype, "execute", null);
 tslib_1.__decorate([
@@ -86,5 +91,5 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], AccountsCommand.prototype, "handleMessage", null);
 exports.AccountsCommand = AccountsCommand = AccountsCommand_1 = tslib_1.__decorate([
-    (0, evogram_1.CommandD)({ name: 'accounts' })
+    (0, evogram_1.CommandD)({ name: 'accounts', backButton: 'Главное меню' })
 ], AccountsCommand);

package/lib/sessions/SessionManager.d.ts

@@ -1,5 +1,6 @@
 import { EventEmitter } from 'events';
-import { TelegramClient } from 'telegram';
+import { Api, TelegramClient } from 'telegram';
+import { Session as SessionEntity } from '../entities/Session.entity';
 import { DatabaseService } from '../services/DatabaseService';
 import { SessionConfig, SessionInfo } from '../types/session.types';
 import { SessionLogger } from './SessionLogger';
@@ -57,6 +58,10 @@ export declare class SessionManager extends EventEmitter {
      * @returns Массив информации о всех сессиях
      */
     getAllSessions(): SessionInfo[];
+    getAllLoadedSessions(): Promise<({
+        db: SessionEntity | null;
+        user: Api.User | null;
+    } & Omit<SessionInfo, 'db' | 'user'>)[]>;
     /**
      * Получает список всех ID сессий
      *

package/lib/sessions/SessionManager.js

@@ -67,9 +67,11 @@ class SessionManager extends events_1.EventEmitter {
             });
             yield client.connect();
             client.addEventHandler((event) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
+                var _a, _b, _c, _d;
                 if ((_b = (yield ((_a = this.getSession(config.sessionId)) === null || _a === void 0 ? void 0 : _a.db()))) === null || _b === void 0 ? void 0 : _b.error)
                     return;
+                else if (!((_d = (yield ((_c = this.getSession(config.sessionId)) === null || _c === void 0 ? void 0 : _c.db()))) === null || _d === void 0 ? void 0 : _d.sessionString))
+                    return;
                 if (event instanceof network_1.UpdateConnectionState) {
                     const error = yield client
                         .getMe()
@@ -155,6 +157,19 @@ class SessionManager extends events_1.EventEmitter {
     getAllSessions() {
         return Array.from(this.sessions.values());
     }
+    getAllLoadedSessions() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const sessions = Array.from(this.sessions.values());
+            const results = yield Promise.all(sessions.map((session) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                //@ts-ignore
+                ;
+                [session.db, session.user] = [yield session.db().catch(() => null), yield session.user().catch(() => null)];
+                return session;
+            })));
+            //@ts-ignore
+            return results;
+        });
+    }
     /**
      * Получает список всех ID сессий
      *

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "evogram-gramjs",
-	"version": "1.0.0",
+	"version": "1.0.2",
 	"main": "./lib/index.js",
 	"license": "MIT",
 	"dependencies": {

package/src/commands/Accounts.command.ts

@@ -1,11 +1,13 @@
-import { Command, CommandArgument, CommandContext, CommandD, CommandUpdate, InlineQueryContext, MessageContext } from 'evogram'
+import { Command, CommandArgument, CommandContext, CommandD, CommandUpdate, InlineQueryContext, MessageContext, Pagination } from 'evogram'
 import { EvogramGramJS } from '../EvogramGramJS'
 import { AddAccountCommand } from './AddAccount.command'
 
-@CommandD({ name: 'accounts' })
+@CommandD({ name: 'accounts', backButton: 'Главное меню' })
 export class AccountsCommand extends Command {
-	public async execute(context: CommandContext, @CommandArgument('sessionId?') sessionId?: string) {
-		if (!sessionId)
+	public async execute(context: CommandContext, @CommandArgument('sessionId?') sessionId?: string, @CommandArgument('page?') page?: number) {
+		if (!sessionId) {
+			const sessions = await EvogramGramJS.sessionManager.getAllLoadedSessions()
+
 			//@ts-ignore
 			return context[context.callbackQuery ? 'edit' : 'send']?.({
 				// prettier-ignore
@@ -17,12 +19,15 @@ export class AccountsCommand extends Command {
 				reply_markup: {
 					inline_keyboard: [
 						[
-							{ text: 'Добавить', command: AddAccountCommand, payload: { phone: null, session: null, code: null, password: null } },
-							{ text: 'Список', command: AccountsCommand, switch_inline_query_current_chat: ' ' },
+							{ text: '📋 Список аккаунтов', switch_inline_query_current_chat: ' ', command: AccountsCommand },
+							{ text: '➕ Добавить аккаунт', command: AddAccountCommand },
 						],
+						...sessions.slice((Number(page) || 0) * 10, (Number(page) || 0) * 10 + 10).map((x) => [{ text: `[${x.db?.error ? '❌' : '✅'}] ${x.db?.firstName || x.db?.username || 'Безымянный'}`, command: AccountsCommand, payload: { sessionId: x.sessionId } }]),
+						Pagination({ pages: Math.ceil(sessions.length / 10), currentPage: Number(page) || 0, command: AccountsCommand }),
 					],
 				},
 			})
+		}
 
 		const session = EvogramGramJS.sessionManager.getSession(sessionId)
 		const db = await session?.db()

package/src/sessions/SessionManager.ts

@@ -1,8 +1,9 @@
 import { EventEmitter } from 'events'
-import { TelegramClient } from 'telegram'
+import { Api, TelegramClient } from 'telegram'
 import { UpdateConnectionState } from 'telegram/network'
 import { StringSession } from 'telegram/sessions'
 import { EvogramGramJS } from '../EvogramGramJS'
+import { Session as SessionEntity } from '../entities/Session.entity'
 import { DatabaseService } from '../services/DatabaseService'
 import { SessionConfig, SessionEvent, SessionEventData, SessionInfo, SessionInvalidEventData } from '../types/session.types'
 import { Session } from './Session'
@@ -64,6 +65,7 @@ export class SessionManager extends EventEmitter {
 
 		client.addEventHandler(async (event) => {
 			if ((await this.getSession(config.sessionId)?.db())?.error) return
+			else if (!(await this.getSession(config.sessionId)?.db())?.sessionString) return
 
 			if (event instanceof UpdateConnectionState) {
 				const error = await client
@@ -160,6 +162,20 @@ export class SessionManager extends EventEmitter {
 		return Array.from(this.sessions.values())
 	}
 
+	async getAllLoadedSessions(): Promise<({ db: SessionEntity | null; user: Api.User | null } & Omit<SessionInfo, 'db' | 'user'>)[]> {
+		const sessions = Array.from(this.sessions.values())
+		const results = await Promise.all(
+			sessions.map(async (session) => {
+				//@ts-ignore
+				;[session.db, session.user] = [await session.db().catch(() => null), await session.user().catch(() => null)]
+				return session
+			})
+		)
+
+		//@ts-ignore
+		return results
+	}
+
 	/**
 	 * Получает список всех ID сессий
 	 *