@2byte/tgbot-framework 1.0.12 → 1.0.14

package/src/cli/TgAccountManager.ts

@@ -1,50 +1,50 @@
-import {
-  TelegramManagerCredentialsDB,
-  TelegramAccountRemote,
-} from "../libs/TelegramAccountControl";
-import { Model } from "../models/Model";
-import Input from "input";
-
-export const manualAdderTgAccount = async () => {
-  const credentialsManager = new TelegramManagerCredentialsDB(Model.getConnection());
-
-  const tgAccountControl = TelegramAccountRemote.init({
-    appId: process.env.TG_APP_ID!,
-    appHash: process.env.TG_APP_HASH!,
-    credetialsManager: credentialsManager,
-  });
-
-  const phone = await Input.text("Введите номер телефона (с кодом страны, например, 79614416445):");
-  
-  await credentialsManager.addCredential({
-    phone,
-  });
-
-  const credentials = await credentialsManager.getCredential(
-    phone
-  );
-
-  if (!credentials) {
-    console.log("Учётная запись с таким номером телефона не найдена.");
-    return;
-  }
-  
-  await tgAccountControl.login(
-    credentials,
-    async () => {
-      console.log("Требуется код подтверждения");
-      return await Input.text("Введите код подтверждения:");
-    },
-    async () => {
-      console.log("Требуется пароль");
-      return await Input.password("Введите пароль:");
-    },
-    async (err: any) => {
-      console.log("Ошибка логина:", err);
-      tgAccountControl.disconnect();
-      throw new Error(err);
-    }
-  );
-
-  tgAccountControl.disconnect();
-};
+import {
+  TelegramManagerCredentialsDB,
+  TelegramAccountRemote,
+} from "../libs/TelegramAccountControl";
+import { Model } from "../models/Model";
+import Input from "input";
+
+export const manualAdderTgAccount = async () => {
+  const credentialsManager = new TelegramManagerCredentialsDB(Model.getConnection());
+
+  const tgAccountControl = TelegramAccountRemote.init({
+    appId: process.env.TG_APP_ID!,
+    appHash: process.env.TG_APP_HASH!,
+    credetialsManager: credentialsManager,
+  });
+
+  const phone = await Input.text("Введите номер телефона (с кодом страны, например, 79614416445):");
+  
+  await credentialsManager.addCredential({
+    phone,
+  });
+
+  const credentials = await credentialsManager.getCredential(
+    phone
+  );
+
+  if (!credentials) {
+    console.log("Учётная запись с таким номером телефона не найдена.");
+    return;
+  }
+  
+  await tgAccountControl.login(
+    credentials,
+    async () => {
+      console.log("Требуется код подтверждения");
+      return await Input.text("Введите код подтверждения:");
+    },
+    async () => {
+      console.log("Требуется пароль");
+      return await Input.password("Введите пароль:");
+    },
+    async (err: any) => {
+      console.log("Ошибка логина:", err);
+      tgAccountControl.disconnect();
+      throw new Error(err);
+    }
+  );
+
+  tgAccountControl.disconnect();
+};

package/src/console/migrate.ts

@@ -1,83 +1,83 @@
-#!/usr/bin/env bun
-import { Database } from 'bun:sqlite';
-import { Migration } from '../illumination/Migration';
-import path from 'path';
-
-type setupParams = {
-  pathDatabase?: string;
-  pathMigrations?: string;
-};
-
-async function main(params: setupParams = {}) {
-
-const MIGRATIONS_PATH = params.pathMigrations || path.join(__dirname, 'migrations');
-
-  const command = process.argv[2];
-  const args = process.argv.slice(3);
-
-  if (!command) {
-    showHelp();
-    return;
-  }
-
-  const db = new Database(params.pathDatabase || __dirname + '/database/database.sqlite');
-
-  const migration = new Migration(db, MIGRATIONS_PATH);
-
-  try {
-    switch (command) {
-      case 'create':
-        if (args.length === 0) {
-          console.error('❌ Ошибка: Требуется имя миграции');
-          console.log('Использование: migrate create migration_name');
-          return;
-        }
-        await Migration.create(args[0], MIGRATIONS_PATH);
-        break;
-
-      case 'up':
-        await migration.up();
-        console.log('✅ Миграции выполнены');
-        break;
-
-      case 'down':
-        const steps = args[0] ? parseInt(args[0]) : 1;
-        await migration.down(steps);
-        console.log('✅ Откат миграций выполнен');
-        break;
-
-      case 'status':
-        migration.status();
-        break;
-
-      default:
-        console.error(`❌ Неизвестная команда: ${command}`);
-        showHelp();
-    }
-  } catch (error) {
-    console.error('❌ Ошибка:', error);
-  } finally {
-    db.close();
-  }
-}
-
-function showHelp() {
-  console.log(`
-🗃️ Migration CLI для SQLite
-
-Доступные команды:
-  create <name>    Создать новую миграцию
-  up              Выполнить все новые миграции
-  down [steps]    Откатить последние миграции (по умолчанию 1)
-  status          Показать статус миграций
-
-Примеры:
-  migrate create create_users_table
-  migrate up
-  migrate down 2
-  migrate status
-`);
-}
-export const setupMigrations = async (params: setupParams) => {
-  return main(params).catch(console.error);
+#!/usr/bin/env bun
+import { Database } from 'bun:sqlite';
+import { Migration } from '../illumination/Migration';
+import path from 'path';
+
+type setupParams = {
+  pathDatabase?: string;
+  pathMigrations?: string;
+};
+
+async function main(params: setupParams = {}) {
+
+const MIGRATIONS_PATH = params.pathMigrations || path.join(__dirname, 'migrations');
+
+  const command = process.argv[2];
+  const args = process.argv.slice(3);
+
+  if (!command) {
+    showHelp();
+    return;
+  }
+
+  const db = new Database(params.pathDatabase || __dirname + '/database/database.sqlite');
+
+  const migration = new Migration(db, MIGRATIONS_PATH);
+
+  try {
+    switch (command) {
+      case 'create':
+        if (args.length === 0) {
+          console.error('❌ Ошибка: Требуется имя миграции');
+          console.log('Использование: migrate create migration_name');
+          return;
+        }
+        await Migration.create(args[0], MIGRATIONS_PATH);
+        break;
+
+      case 'up':
+        await migration.up();
+        console.log('✅ Миграции выполнены');
+        break;
+
+      case 'down':
+        const steps = args[0] ? parseInt(args[0]) : 1;
+        await migration.down(steps);
+        console.log('✅ Откат миграций выполнен');
+        break;
+
+      case 'status':
+        migration.status();
+        break;
+
+      default:
+        console.error(`❌ Неизвестная команда: ${command}`);
+        showHelp();
+    }
+  } catch (error) {
+    console.error('❌ Ошибка:', error);
+  } finally {
+    db.close();
+  }
+}
+
+function showHelp() {
+  console.log(`
+🗃️ Migration CLI для SQLite
+
+Доступные команды:
+  create <name>    Создать новую миграцию
+  up              Выполнить все новые миграции
+  down [steps]    Откатить последние миграции (по умолчанию 1)
+  status          Показать статус миграций
+
+Примеры:
+  migrate create create_users_table
+  migrate up
+  migrate down 2
+  migrate status
+`);
+}
+export const setupMigrations = async (params: setupParams) => {
+  return main(params).catch(console.error);
 }

package/src/core/ApiService.ts

@@ -1,21 +1,29 @@
-import { App } from "./App";
-
-export abstract class ApiService {
-
-    constructor(
-        protected app: App,
-        public name: string
-    ) {}
-
-    async setup(): Promise<void> {
-        // Implement your API logic here
-    }
-
-    async unsetup(): Promise<void> {
-        // Implement your API logic here
-    }
-
-    async run(): Promise<void> {
-        // Implement your API logic here
-    }
+import { App } from "./App";
+
+export class ApiService<T = any> {
+
+    public name: string = "ApiService";
+
+    protected app!: App;
+
+    constructor(
+        public params: T = {} as T
+    ) {}
+
+    async setup(): Promise<void> {
+        // Implement your API logic here
+    }
+
+    async unsetup(): Promise<void> {
+        // Implement your API logic here
+    }
+
+    async run(): Promise<void> {
+        // Implement your API logic here
+    }
+
+    public setApp(app: App): this {
+        this.app = app;
+        return this;
+    }
 }

package/src/core/ApiServiceManager.ts

@@ -1,63 +1,79 @@
-import { App } from "./App";
-import { ApiService } from "./ApiService";
-import { readdirSync } from "fs";
-
-export class ApiServiceManager {
-  private services: Map<string, ApiService> = new Map();
-
-  constructor(private app: App) {}
-
-  static init(app: App): ApiServiceManager {
-    return new ApiServiceManager(app);
-  }
-
-  async loadServicesFromDirectory(pathDirectory: string): Promise<void> {
-    for (const entry of readdirSync(pathDirectory, { withFileTypes: true })) {
-      if (entry.isFile() && entry.name.endsWith(".ts")) {
-        const serviceModule = await import(`${pathDirectory}/${entry.name}`);
-        const ServiceClass = serviceModule.default;
-        const serviceInstance = new ServiceClass(this.app);
-        this.registerService(entry.name.replace(".ts", ""), serviceInstance);
-      }
-    }
-  }
-
-  public registerService(name: string, service: ApiService): void {
-    this.services.set(name, service);
-  }
-
-  public getService(name: string): ApiService | undefined {
-    return this.services.get(name);
-  }
-
-  public async setupService(name: string): Promise<void> {
-    const service = this.getService(name);
-    if (service) {
-      await service.setup();
-    }
-  }
-
-  public async unsetupService(name: string): Promise<void> {
-    const service = this.getService(name);
-    if (service) {
-      await service.unsetup();
-    }
-  }
-
-  public async runService(name: string): Promise<void> {
-    const service = this.getService(name);
-    if (service) {
-      await service.run();
-    }
-  }
-
-  public getAll(): Map<string, ApiService> {
-    return this.services;
-  }
-
-  public async unsetupAllServices(): Promise<void> {
-    for (const [name, service] of this.services) {
-      await service.unsetup();
-    }
-  }
-}
+import { App } from "./App";
+import { ApiService } from "./ApiService";
+import { readdirSync } from "fs";
+
+export class ApiServiceManager {
+  private services: Map<string, ApiService> = new Map();
+
+  constructor(private app: App) {}
+
+  static init(app: App): ApiServiceManager {
+    return new ApiServiceManager(app);
+  }
+
+  async loadServicesFromDirectory(pathDirectory: string): Promise<void> {
+    for (const entry of readdirSync(pathDirectory, { withFileTypes: true })) {
+      if (entry.isFile() && entry.name.endsWith(".ts")) {
+        const serviceModule = await import(`${pathDirectory}/${entry.name}`);
+        const ServiceClass = serviceModule.default;
+        const serviceInstance = new ServiceClass(this.app);
+        this.registerService(entry.name.replace(".ts", ""), serviceInstance);
+      }
+    }
+  }
+
+  public registerService(name: string, service: ApiService): void {
+    this.services.set(name, service);
+  }
+
+  public getService(name: string): ApiService | undefined {
+    return this.services.get(name);
+  }
+
+  public async setupService(name: string): Promise<void> {
+    const service = this.getService(name);
+    if (service) {
+      await service.setup();
+    }
+  }
+
+  public async unsetupService(name: string): Promise<void> {
+    const service = this.getService(name);
+    if (service) {
+      await service.unsetup();
+    }
+  }
+
+  public async runService(name: string): Promise<void> {
+    const service = this.getService(name);
+    if (service) {
+      await service.run();
+    }
+  }
+
+  public async runAllServices(): Promise<void> {
+    for (const [name, service] of this.services) {
+      this.app.debugLog(`Running API service: ${name}`);
+      await service.run();
+      this.app.debugLog(`API service run completed: ${name}`);
+    }
+  }
+
+  public getAll(): Map<string, ApiService> {
+    return this.services;
+  }
+
+  public async setupAllServices(): Promise<void> {
+    for (const [name, service] of this.services) {
+      this.app.debugLog(`Setting up API service: ${name}`);
+      await this.setupService(name);
+      this.app.debugLog(`API service setup completed: ${name}`);
+    }
+  }
+
+  public async unsetupAllServices(): Promise<void> {
+    for (const [name, service] of this.services) {
+      await this.unsetupService(name);
+    }
+  }
+}