@2byte/tgbot-framework 1.0.3 → 1.0.5

package/src/cli/GenerateCommand.ts

@@ -1,196 +1,196 @@
-import * as fs from 'fs-extra';
-import * as path from 'path';
-import chalk from 'chalk';
-
-export class GenerateCommand {
-  async generateSection(name: string): Promise<void> {
-    console.log(chalk.blue(`🎯 Generating section: ${name}`));
-
-    const currentDir = process.cwd();
-    const sectionsDir = path.join(currentDir, 'sections');
-    const sectionName = this.formatSectionName(name);
-    const sectionPath = path.join(sectionsDir, `${sectionName}Section.ts`);
-
-    // Ensure sections directory exists
-    await fs.ensureDir(sectionsDir);
-
-    // Check if section already exists
-    if (await fs.pathExists(sectionPath)) {
-      console.log(chalk.red(`❌ Section ${sectionName} already exists at ${sectionPath}`));
-      return;
-    }
-
-    // Generate section content
-    const template = this.getSectionTemplate(sectionName);
-    await fs.writeFile(sectionPath, template);
-
-    console.log(chalk.green(`✅ Created section ${sectionName} at ${sectionPath}`));
-  }
-
-  async generateService(name: string): Promise<void> {
-    console.log(chalk.blue(`⚙️  Generating service: ${name}`));
-
-    const currentDir = process.cwd();
-    const servicesDir = path.join(currentDir, 'workflow', 'services');
-    const serviceName = this.formatServiceName(name);
-    const servicePath = path.join(servicesDir, `${serviceName}.ts`);
-
-    // Ensure services directory exists
-    await fs.ensureDir(servicesDir);
-
-    // Check if service already exists
-    if (await fs.pathExists(servicePath)) {
-      console.log(chalk.red(`❌ Service ${serviceName} already exists at ${servicePath}`));
-      return;
-    }
-
-    // Generate service content
-    const template = this.getServiceTemplate(serviceName);
-    await fs.writeFile(servicePath, template);
-
-    console.log(chalk.green(`✅ Created service ${serviceName} at ${servicePath}`));
-    console.log(chalk.yellow(`💡 Service will be automatically loaded from workflow/services directory`));
-  }
-
-  async generateMigration(name: string): Promise<void> {
-    console.log(chalk.blue(`🗃️  Generating migration: ${name}`));
-
-    const currentDir = process.cwd();
-    const migrationsDir = path.join(currentDir, 'database', 'migrations');
-
-    // Ensure migrations directory exists
-    await fs.ensureDir(migrationsDir);
-
-    // Get next migration ID
-    const files = await fs.readdir(migrationsDir);
-    const migrationFiles = files
-      .filter(file => file.endsWith('.sql'))
-      .map(file => parseInt(file.split('_')[0]))
-      .filter(id => !isNaN(id));
-
-    const nextId = (Math.max(0, ...migrationFiles) + 1).toString().padStart(3, '0');
-    const fileName = `${nextId}_${name}.sql`;
-    const filePath = path.join(migrationsDir, fileName);
-
-    const template = this.getMigrationTemplate(name);
-    await fs.writeFile(filePath, template);
-
-    console.log(chalk.green(`✅ Created migration: ${fileName}`));
-  }
-
-  private formatSectionName(name: string): string {
-    return name.charAt(0).toUpperCase() + name.slice(1);
-  }
-
-  private formatServiceName(name: string): string {
-    // Convert to PascalCase and add "Service" suffix if not present
-    const pascalName = name.charAt(0).toUpperCase() + name.slice(1);
-    return pascalName.endsWith('Service') ? pascalName : `${pascalName}Service`;
-  }
-
-  private getSectionTemplate(name: string): string {
-    return `import { Section } from "@2byte/tgbot-framework";
-import { SectionOptions } from "@2byte/tgbot-framework";
-import { InlineKeyboard } from "@2byte/tgbot-framework";
-
-export default class ${name}Section extends Section {
-  static command = "${name.toLowerCase()}";
-  static description = "${name} section";
-  static actionRoutes = {
-    "${name}.index": "index",
-  };
-  
-  public sectionId = "${name}";
-  private mainInlineKeyboard: InlineKeyboard;
-
-  constructor(options: SectionOptions) {
-    super(options);
-
-    this.mainInlineKeyboard = this.makeInlineKeyboard().addFootFixedButtons(this.btnHome);
-  }
-
-  public async up(): Promise<void> {}
-  public async down(): Promise<void> {}
-  public async setup(): Promise<void> {}
-  public async unsetup(): Promise<void> {}
-
-  async index() {
-    const message = \`
-      👋 Welcome to ${name} Section
-    \`;
-
-    await this.message(message)
-      .inlineKeyboard(this.mainInlineKeyboard)
-      .send();
-  }
-}
-`;
-  }
-
-  private getServiceTemplate(name: string): string {
-    return `import { App } from "@2byte/tgbot-framework";
-import { ApiService } from "@2byte/tgbot-framework";
-
-export default class ${name} extends ApiService {
-
-    constructor(
-        protected app: App,
-        public name: string = "${name}"
-    ) {
-        super(app, name);
-    }
-
-    /**
-     * Setup method called when service is registered
-     * Use this for initialization tasks like setting up connections,
-     * loading configurations, etc.
-     */
-    public async setup(): Promise<void> {
-        // TODO: Add setup logic here
-        this.app.debugLog(\`[\${this.name}] Service setup completed\`);
-        return Promise.resolve();
-    }
-
-    /**
-     * Cleanup method called when service is being destroyed
-     * Use this for cleanup tasks like closing connections,
-     * releasing resources, etc.
-     */
-    public async unsetup(): Promise<void> {
-        // TODO: Add cleanup logic here
-        this.app.debugLog(\`[\${this.name}] Service cleanup completed\`);
-        return Promise.resolve();
-    }
-
-    /**
-     * Main run method for the service
-     * This is where your service's main logic should be implemented
-     */
-    public async run(): Promise<void> {
-        // TODO: Add your service logic here
-        this.app.debugLog(\`[\${this.name}] Service running\`);
-        return Promise.resolve();
-    }
-
-    /**
-     * Example method - you can add your own methods here
-     */
-    // public async exampleMethod(): Promise<void> {
-    //     // Your custom logic
-    // }
-}
-`;
-  }
-
-  private getMigrationTemplate(name: string): string {
-    return `-- UP
-CREATE TABLE IF NOT EXISTS ${name} (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  created_at DATETIME DEFAULT CURRENT_TIMESTAMP
-);
-
--- DOWN
-DROP TABLE IF EXISTS ${name};
-`;
-  }
+import * as fs from 'fs-extra';
+import * as path from 'path';
+import chalk from 'chalk';
+
+export class GenerateCommand {
+  async generateSection(name: string): Promise<void> {
+    console.log(chalk.blue(`🎯 Generating section: ${name}`));
+
+    const currentDir = process.cwd();
+    const sectionsDir = path.join(currentDir, 'sections');
+    const sectionName = this.formatSectionName(name);
+    const sectionPath = path.join(sectionsDir, `${sectionName}Section.ts`);
+
+    // Ensure sections directory exists
+    await fs.ensureDir(sectionsDir);
+
+    // Check if section already exists
+    if (await fs.pathExists(sectionPath)) {
+      console.log(chalk.red(`❌ Section ${sectionName} already exists at ${sectionPath}`));
+      return;
+    }
+
+    // Generate section content
+    const template = this.getSectionTemplate(sectionName);
+    await fs.writeFile(sectionPath, template);
+
+    console.log(chalk.green(`✅ Created section ${sectionName} at ${sectionPath}`));
+  }
+
+  async generateService(name: string): Promise<void> {
+    console.log(chalk.blue(`⚙️  Generating service: ${name}`));
+
+    const currentDir = process.cwd();
+    const servicesDir = path.join(currentDir, 'workflow', 'services');
+    const serviceName = this.formatServiceName(name);
+    const servicePath = path.join(servicesDir, `${serviceName}.ts`);
+
+    // Ensure services directory exists
+    await fs.ensureDir(servicesDir);
+
+    // Check if service already exists
+    if (await fs.pathExists(servicePath)) {
+      console.log(chalk.red(`❌ Service ${serviceName} already exists at ${servicePath}`));
+      return;
+    }
+
+    // Generate service content
+    const template = this.getServiceTemplate(serviceName);
+    await fs.writeFile(servicePath, template);
+
+    console.log(chalk.green(`✅ Created service ${serviceName} at ${servicePath}`));
+    console.log(chalk.yellow(`💡 Service will be automatically loaded from workflow/services directory`));
+  }
+
+  async generateMigration(name: string): Promise<void> {
+    console.log(chalk.blue(`🗃️  Generating migration: ${name}`));
+
+    const currentDir = process.cwd();
+    const migrationsDir = path.join(currentDir, 'database', 'migrations');
+
+    // Ensure migrations directory exists
+    await fs.ensureDir(migrationsDir);
+
+    // Get next migration ID
+    const files = await fs.readdir(migrationsDir);
+    const migrationFiles = files
+      .filter(file => file.endsWith('.sql'))
+      .map(file => parseInt(file.split('_')[0]))
+      .filter(id => !isNaN(id));
+
+    const nextId = (Math.max(0, ...migrationFiles) + 1).toString().padStart(3, '0');
+    const fileName = `${nextId}_${name}.sql`;
+    const filePath = path.join(migrationsDir, fileName);
+
+    const template = this.getMigrationTemplate(name);
+    await fs.writeFile(filePath, template);
+
+    console.log(chalk.green(`✅ Created migration: ${fileName}`));
+  }
+
+  private formatSectionName(name: string): string {
+    return name.charAt(0).toUpperCase() + name.slice(1);
+  }
+
+  private formatServiceName(name: string): string {
+    // Convert to PascalCase and add "Service" suffix if not present
+    const pascalName = name.charAt(0).toUpperCase() + name.slice(1);
+    return pascalName.endsWith('Service') ? pascalName : `${pascalName}Service`;
+  }
+
+  private getSectionTemplate(name: string): string {
+    return `import { Section } from "@2byte/tgbot-framework";
+import { SectionOptions } from "@2byte/tgbot-framework";
+import { InlineKeyboard } from "@2byte/tgbot-framework";
+
+export default class ${name}Section extends Section {
+  static command = "${name.toLowerCase()}";
+  static description = "${name} section";
+  static actionRoutes = {
+    "${name}.index": "index",
+  };
+  
+  public sectionId = "${name}";
+  private mainInlineKeyboard: InlineKeyboard;
+
+  constructor(options: SectionOptions) {
+    super(options);
+
+    this.mainInlineKeyboard = this.makeInlineKeyboard().addFootFixedButtons(this.btnHome);
+  }
+
+  public async up(): Promise<void> {}
+  public async down(): Promise<void> {}
+  public async setup(): Promise<void> {}
+  public async unsetup(): Promise<void> {}
+
+  async index() {
+    const message = \`
+      👋 Welcome to ${name} Section
+    \`;
+
+    await this.message(message)
+      .inlineKeyboard(this.mainInlineKeyboard)
+      .send();
+  }
+}
+`;
+  }
+
+  private getServiceTemplate(name: string): string {
+    return `import { App } from "@2byte/tgbot-framework";
+import { ApiService } from "@2byte/tgbot-framework";
+
+export default class ${name} extends ApiService {
+
+    constructor(
+        protected app: App,
+        public name: string = "${name}"
+    ) {
+        super(app, name);
+    }
+
+    /**
+     * Setup method called when service is registered
+     * Use this for initialization tasks like setting up connections,
+     * loading configurations, etc.
+     */
+    public async setup(): Promise<void> {
+        // TODO: Add setup logic here
+        this.app.debugLog(\`[\${this.name}] Service setup completed\`);
+        return Promise.resolve();
+    }
+
+    /**
+     * Cleanup method called when service is being destroyed
+     * Use this for cleanup tasks like closing connections,
+     * releasing resources, etc.
+     */
+    public async unsetup(): Promise<void> {
+        // TODO: Add cleanup logic here
+        this.app.debugLog(\`[\${this.name}] Service cleanup completed\`);
+        return Promise.resolve();
+    }
+
+    /**
+     * Main run method for the service
+     * This is where your service's main logic should be implemented
+     */
+    public async run(): Promise<void> {
+        // TODO: Add your service logic here
+        this.app.debugLog(\`[\${this.name}] Service running\`);
+        return Promise.resolve();
+    }
+
+    /**
+     * Example method - you can add your own methods here
+     */
+    // public async exampleMethod(): Promise<void> {
+    //     // Your custom logic
+    // }
+}
+`;
+  }
+
+  private getMigrationTemplate(name: string): string {
+    return `-- UP
+CREATE TABLE IF NOT EXISTS ${name} (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+);
+
+-- DOWN
+DROP TABLE IF EXISTS ${name};
+`;
+  }
 }

package/src/cli/InitCommand.ts

@@ -1,108 +1,108 @@
-import * as fs from 'fs-extra';
-import * as path from 'path';
-import chalk from 'chalk';
-
-export class InitCommand {
-  async execute(options: any): Promise<void> {
-    const currentDir = process.cwd();
-    const packageJsonPath = path.join(currentDir, 'package.json');
-
-    console.log(chalk.blue('🔧 Initializing 2byte bot in current directory...'));
-
-    // Check if already a 2byte bot
-    if (await fs.pathExists(packageJsonPath)) {
-      const packageJson = await fs.readJson(packageJsonPath);
-      
-      if (packageJson.dependencies && packageJson.dependencies['2bytetgbot']) {
-        if (!options.force) {
-          console.log(chalk.yellow('⚠️  This directory already contains a 2byte bot.'));
-          console.log(chalk.yellow('   Use --force to override existing files.'));
-          return;
-        }
-      }
-    }
-
-    // Create basic bot structure
-    await this.createBotStructure(currentDir, options);
-
-    console.log(chalk.green('✅ 2byte bot initialized successfully!'));
-    console.log(chalk.blue('📋 Next steps:'));
-    console.log('   bun install           # Install dependencies');
-    console.log('   bun run migrate        # Run migrations');
-    console.log('   bun run seed           # Seed database');
-    console.log('   bun run dev            # Start bot');
-  }
-
-  private async createBotStructure(targetPath: string, options: any): Promise<void> {
-    const templatesPath = path.join(__dirname, '../../templates/bot');
-    
-    // Copy essential files
-    const essentialFiles = [
-      'package.json',
-      'artisan.ts',
-      'bot.ts',
-      'sections.ts',
-      '.env.example',
-      'database/migrate.ts',
-      'database/seed.ts',
-    ];
-
-    for (const file of essentialFiles) {
-      const sourcePath = path.join(templatesPath, file);
-      const targetFilePath = path.join(targetPath, file);
-
-      if (await fs.pathExists(sourcePath)) {
-        if (!options.force && await fs.pathExists(targetFilePath)) {
-          console.log(chalk.yellow(`⚠️  Skipping ${file} (already exists)`));
-          continue;
-        }
-
-        await fs.ensureDir(path.dirname(targetFilePath));
-        
-        // Read and process template
-        let content = await fs.readFile(sourcePath, 'utf-8');
-        
-        // For now, use current directory name as bot name
-        const botName = path.basename(targetPath);
-        const config = {
-          botName,
-          className: this.toPascalCase(botName),
-          kebabName: this.toKebabCase(botName),
-          description: `A telegram bot created with 2byte framework`,
-          author: '',
-          useDatabase: true,
-        };
-
-        // Simple template replacement
-        content = this.processTemplate(content, config);
-        
-        await fs.writeFile(targetFilePath, content);
-        console.log(chalk.green(`✅ Created ${file}`));
-      }
-    }
-  }
-
-  private processTemplate(content: string, config: any): string {
-    // Simple mustache-style replacement
-    return content
-      .replace(/\{\{botName\}\}/g, config.botName)
-      .replace(/\{\{className\}\}/g, config.className)
-      .replace(/\{\{kebabName\}\}/g, config.kebabName)
-      .replace(/\{\{description\}\}/g, config.description)
-      .replace(/\{\{author\}\}/g, config.author);
-  }
-
-  private toPascalCase(str: string): string {
-    return str
-      .split(/[-_\s]+/)
-      .map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
-      .join('');
-  }
-
-  private toKebabCase(str: string): string {
-    return str
-      .replace(/([a-z])([A-Z])/g, '$1-$2')
-      .replace(/[\s_]+/g, '-')
-      .toLowerCase();
-  }
+import * as fs from 'fs-extra';
+import * as path from 'path';
+import chalk from 'chalk';
+
+export class InitCommand {
+  async execute(options: any): Promise<void> {
+    const currentDir = process.cwd();
+    const packageJsonPath = path.join(currentDir, 'package.json');
+
+    console.log(chalk.blue('🔧 Initializing 2byte bot in current directory...'));
+
+    // Check if already a 2byte bot
+    if (await fs.pathExists(packageJsonPath)) {
+      const packageJson = await fs.readJson(packageJsonPath);
+      
+      if (packageJson.dependencies && packageJson.dependencies['2bytetgbot']) {
+        if (!options.force) {
+          console.log(chalk.yellow('⚠️  This directory already contains a 2byte bot.'));
+          console.log(chalk.yellow('   Use --force to override existing files.'));
+          return;
+        }
+      }
+    }
+
+    // Create basic bot structure
+    await this.createBotStructure(currentDir, options);
+
+    console.log(chalk.green('✅ 2byte bot initialized successfully!'));
+    console.log(chalk.blue('📋 Next steps:'));
+    console.log('   bun install           # Install dependencies');
+    console.log('   bun run migrate        # Run migrations');
+    console.log('   bun run seed           # Seed database');
+    console.log('   bun run dev            # Start bot');
+  }
+
+  private async createBotStructure(targetPath: string, options: any): Promise<void> {
+    const templatesPath = path.join(__dirname, '../../templates/bot');
+    
+    // Copy essential files
+    const essentialFiles = [
+      'package.json',
+      'artisan.ts',
+      'bot.ts',
+      'sections.ts',
+      '.env.example',
+      'database/migrate.ts',
+      'database/seed.ts',
+    ];
+
+    for (const file of essentialFiles) {
+      const sourcePath = path.join(templatesPath, file);
+      const targetFilePath = path.join(targetPath, file);
+
+      if (await fs.pathExists(sourcePath)) {
+        if (!options.force && await fs.pathExists(targetFilePath)) {
+          console.log(chalk.yellow(`⚠️  Skipping ${file} (already exists)`));
+          continue;
+        }
+
+        await fs.ensureDir(path.dirname(targetFilePath));
+        
+        // Read and process template
+        let content = await fs.readFile(sourcePath, 'utf-8');
+        
+        // For now, use current directory name as bot name
+        const botName = path.basename(targetPath);
+        const config = {
+          botName,
+          className: this.toPascalCase(botName),
+          kebabName: this.toKebabCase(botName),
+          description: `A telegram bot created with 2byte framework`,
+          author: '',
+          useDatabase: true,
+        };
+
+        // Simple template replacement
+        content = this.processTemplate(content, config);
+        
+        await fs.writeFile(targetFilePath, content);
+        console.log(chalk.green(`✅ Created ${file}`));
+      }
+    }
+  }
+
+  private processTemplate(content: string, config: any): string {
+    // Simple mustache-style replacement
+    return content
+      .replace(/\{\{botName\}\}/g, config.botName)
+      .replace(/\{\{className\}\}/g, config.className)
+      .replace(/\{\{kebabName\}\}/g, config.kebabName)
+      .replace(/\{\{description\}\}/g, config.description)
+      .replace(/\{\{author\}\}/g, config.author);
+  }
+
+  private toPascalCase(str: string): string {
+    return str
+      .split(/[-_\s]+/)
+      .map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
+      .join('');
+  }
+
+  private toKebabCase(str: string): string {
+    return str
+      .replace(/([a-z])([A-Z])/g, '$1-$2')
+      .replace(/[\s_]+/g, '-')
+      .toLowerCase();
+  }
 }

package/src/cli/TgAccountManager.ts

@@ -0,0 +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();
+};