botforje 0.0.1 → 0.0.2

package/README.md

@@ -2,7 +2,7 @@
 
 [![npm version](https://img.shields.io/npm/v/botforje.svg)](https://www.npmjs.com/package/botforje)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Node.js Version](https://img.shields.io/badge/node-%3E%3D16-brightgreen.svg)](https://nodejs.org)
+[![Node.js Version](https://img.shields.io/badge/node-%3E%3D22.13-brightgreen.svg)](https://nodejs.org)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/felixzsh/botforje/pulls)
 
 **Create multiple WhatsApp bots without writing code** - Just configure in YAML!

package/dist/cli.js

@@ -35,7 +35,6 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
-const child_process_1 = require("child_process");
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const fleet_1 = require("./fleet");
@@ -59,13 +58,6 @@ program
     .description('CLI tool for creating and managing WhatsApp bots')
     .version(packageJson.version)
     .option('-c, --config <path>', `Path to config file (default: ${(0, yaml_1.getDefaultConfigPath)()})`);
-program
-    .command('setup')
-    .description('Setup/repair systemd service')
-    .action(() => {
-    const setupScript = path.join(__dirname, '..', 'scripts', 'setup-systemd.js');
-    (0, child_process_1.execSync)(`node ${setupScript}`, { stdio: 'inherit' });
-});
 program
     .command('guide')
     .description('Show AI agent configuration guide')

package/dist/commands/guide.js

@@ -555,7 +555,6 @@ curl http://localhost:3000/api/config/status
 botforje daemon                 # Start the bot daemon
 botforje status                 # Show bot session status
 botforje auth <botId>           # Authenticate a bot
-botforje setup                  # Setup systemd service
 botforje guide                  # Show this guide
 \`\`\`
 `;

package/dist/config/validation.js

@@ -467,7 +467,7 @@ function validateIdWithContext(id, kind, ctx) {
     }
 }
 async function validateConfig(configPath) {
-    const targetPath = configPath || (0, yaml_1.getDefaultConfigPath)();
+    const targetPath = configPath || (0, yaml_1.getConfigPath)();
     const configDir = path.dirname(targetPath);
     const errors = [];
     const actionsDir = path.join(configDir, 'actions');

package/dist/config/yaml.js

@@ -48,7 +48,13 @@ const logger_1 = require("../helpers/logger");
 let configPath;
 function getDefaultConfigPath() {
     const home = process.env.HOME || os.homedir();
-    return path.join(home, '.config', 'botforje', 'config.yml');
+    const userConfig = path.join(home, '.config', 'botforje', 'config.yml');
+    const systemConfig = '/etc/botforje/config.yml';
+    if (fsSync.existsSync(userConfig))
+        return userConfig;
+    if (fsSync.existsSync(systemConfig))
+        return systemConfig;
+    return userConfig;
 }
 function getConfigPath() {
     return configPath || getDefaultConfigPath();

package/dist/helpers/logger.js

@@ -9,9 +9,6 @@ exports.getLogger = getLogger;
 exports.setGlobalLogger = setGlobalLogger;
 const pino_1 = __importDefault(require("pino"));
 function getCallerInfo() {
-    const isDevelopment = process.env.NODE_ENV !== 'production';
-    if (!isDevelopment)
-        return undefined;
     const originalPrepareStackTrace = Error.prepareStackTrace;
     try {
         const err = new Error();
@@ -38,10 +35,10 @@ function getCallerInfo() {
     return undefined;
 }
 function createLogger(logLevel = 'info') {
-    const isDevelopment = process.env.NODE_ENV !== 'production';
+    const usePretty = process.stdout.isTTY;
     const logger = (0, pino_1.default)({
         level: logLevel,
-        transport: isDevelopment
+        transport: usePretty
             ? {
                 target: 'pino-pretty',
                 options: {

package/dist/whatsapp/client.js

@@ -97,9 +97,13 @@ class WhatsAppChannel {
         this.stateChangeHandlers = [];
         this.authRequiredHandlers = [];
         this.isConnected = false;
+        this.dedupCache = new Set();
         this.channelId = clientId;
         this.client = new whatsapp_web_js_1.Client(getClientOptions(clientId));
         this.setupEventListeners();
+        this.dedupInterval = setInterval(() => {
+            this.dedupCache.clear();
+        }, 30000);
     }
     get logger() {
         return (0, logger_1.getLogger)();
@@ -113,6 +117,12 @@ class WhatsAppChannel {
             this.readyHandlers.forEach(handler => handler());
         });
         this.client.on('message', async (msg) => {
+            const rawId = msg.id._serialized;
+            if (this.dedupCache.has(rawId)) {
+                this.logger.debug(`Skipping duplicate message ${rawId}`);
+                return;
+            }
+            this.dedupCache.add(rawId);
             const domainMessage = (0, whatsapp_1.toDomainMessage)(msg);
             if (msg.from.includes('@lid')) {
                 try {
@@ -184,6 +194,9 @@ class WhatsAppChannel {
         await this.client.initialize();
     }
     async disconnect() {
+        if (this.dedupInterval) {
+            clearInterval(this.dedupInterval);
+        }
         if (this.client) {
             await this.client.destroy();
             this.isConnected = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "botforje",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Create powerful WhatsApp bots with YAML configuration",
   "jest": {
     "preset": "ts-jest",
@@ -58,6 +58,7 @@
   },
   "dependencies": {
     "@types/express": "^5.0.3",
+    "botforje": "link:",
     "commander": "^12.1.0",
     "express": "^5.1.0",
     "fuse.js": "^7.4.2",
@@ -65,8 +66,7 @@
     "pino": "^10.0.0",
     "pino-pretty": "^13.1.2",
     "qrcode-terminal": "^0.12.0",
-    "whatsapp-web.js": "^1.34.7",
-    "botforje": "link:"
+    "whatsapp-web.js": "^1.34.7"
   },
   "engines": {
     "node": ">=22.13.0"

package/scripts/postinstall.js

@@ -1,45 +1,142 @@
 #!/usr/bin/env node
 
-const { execSync } = require('child_process');
+const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
-console.log('\nSetting up Botforje...\n');
+const BANNER = `
+  ██████   ██████  ████████ ███████  ██████  ██████   ██     ███████
+  ██   ██ ██    ██    ██    ██      ██    ██ ██   ██ ███     ██
+  ██████  ██    ██    ██    █████   ██    ██ ██████   ██     █████
+  ██   ██ ██    ██    ██    ██      ██    ██ ██   ██  ██     ██
+  ██████   ██████     ██    ██       ██████  ██   ██  ██     ███████
+`;
+
+console.log(BANNER);
+console.log(`  Botforje v${require('../package.json').version} installed!\n`);
+
+const scriptDir = __dirname;
+const templatePath = path.join(scriptDir, '..', 'service', 'botforje.service.template');
+const exampleConfigPath = path.join(scriptDir, '..', 'config.example.yml');
+
+function renderServiceFile(template, vars) {
+  return Object.entries(vars).reduce(
+    (content, [key, value]) => content.replace(new RegExp(`{{${key}}}`, 'g'), value),
+    template
+  );
+}
+
+async function setupSystemd() {
+  if (os.platform() !== 'linux') return 'no-systemd';
 
-function hasSystemd() {
-  if (os.platform() !== 'linux') return false;
   try {
-    execSync('systemctl --version', { stdio: 'ignore' });
-    return true;
+    require('child_process').execSync('systemctl --version', { stdio: 'ignore' });
   } catch {
-    return false;
+    return 'no-systemd';
+  }
+
+  const isRoot = process.getuid && process.getuid() === 0;
+  const homeDir = os.homedir();
+  const nodePath = process.execPath;
+
+  const nodeModulesDir = path.dirname(path.dirname(scriptDir));
+  const pkgDir = path.resolve(scriptDir, '..');
+  const scriptPath = path.join(pkgDir, 'dist', 'cli.js');
+
+  if (!fs.existsSync(scriptPath)) {
+    console.log('  (dist/cli.js not found — run "pnpm build" first for dev mode)\n');
+    return 'dev-mode';
+  }
+
+  let serviceDir, configDir, scopeLabel, wantedBy;
+
+  if (isRoot) {
+    serviceDir = '/etc/systemd/system';
+    configDir = '/etc/botforje';
+    scopeLabel = 'system';
+    wantedBy = 'multi-user.target';
+  } else {
+    serviceDir = path.join(homeDir, '.config', 'systemd', 'user');
+    configDir = path.join(homeDir, '.config', 'botforje');
+    scopeLabel = 'user';
+    wantedBy = 'default.target';
+  }
+
+  // Create config directory
+  if (!fs.existsSync(configDir)) {
+    fs.mkdirSync(configDir, { recursive: true });
+  }
+
+  // Copy example config (commented) if config.yml doesn't exist
+  const targetConfigPath = path.join(configDir, 'config.yml');
+  if (fs.existsSync(exampleConfigPath) && !fs.existsSync(targetConfigPath)) {
+    const exampleContent = fs.readFileSync(exampleConfigPath, 'utf8');
+    const commentedContent = exampleContent
+      .split('\n')
+      .map(line => line.trim() ? `# ${line}` : line)
+      .join('\n');
+    fs.writeFileSync(targetConfigPath, commentedContent);
   }
+
+  // Create service file
+  if (!fs.existsSync(serviceDir)) {
+    fs.mkdirSync(serviceDir, { recursive: true });
+  }
+
+  const template = fs.readFileSync(templatePath, 'utf8');
+  const serviceContent = renderServiceFile(template, {
+    NODE: nodePath,
+    SCRIPT: scriptPath,
+    WANTED_BY: wantedBy,
+  });
+
+  const servicePath = path.join(serviceDir, 'botforje.service');
+  fs.writeFileSync(servicePath, serviceContent);
+
+  return { scope: scopeLabel, configDir, servicePath, isRoot, homeDir };
 }
 
-if (hasSystemd()) {
-  try {
-    console.log('Detected Linux system with systemd');
-    console.log('Configuring systemd service automatically...\n');
-    
-    const setupScript = path.join(__dirname, 'setup-systemd.js');
-    execSync(`node "${setupScript}"`, { stdio: 'inherit' });
-    
-    console.log('Installation complete!\n');
-    console.log('Quick Start:\n');
-    console.log('  1. Start service:    systemctl --user start botforje');
-    console.log('  2. Enable on boot:   systemctl --user enable botforje');
-    console.log('  3. Check status:     botforje status');
-    console.log('  4. Authenticate:     botforje auth <botId>');
-    console.log('  5. View logs:        journalctl --user -u botforje -f\n');
-    
-  } catch (error) {
-    console.error('Automatic setup failed:', error.message);
-    console.log('\nYou can set it up manually: botforje setup\n');
-    process.exit(0);
-  }
-} else {
-  console.log('Systemd not detected (macOS/Windows/Container)');
-  console.log('\nTo use Botforje:\n');
-  console.log('\n  1. Start daemon:     botforje daemon');
-  console.log('  2. Authenticate:     botforje auth <botId>\n');
-}
+async function main() {
+  const result = await setupSystemd();
+
+  if (result === 'no-systemd') {
+    console.log('  (systemd not detected — run manually)\n');
+    console.log('  ── Next steps ──\n');
+    console.log('    Start daemon:       botforje daemon');
+    console.log('    Authenticate:       botforje auth <botId>\n');
+    return;
+  }
+
+  if (result === 'dev-mode') {
+    console.log('  (dev mode — systemd service skipped)\n');
+    console.log('  ── Next steps ──\n');
+    console.log('    Build:              pnpm build');
+    console.log('    Test daemon:        pnpm start daemon\n');
+    return;
+  }
+
+  const { scope, configDir, servicePath, isRoot } = result;
+  const scopeFlag = scope === 'user' ? '--user ' : '';
+
+  console.log(`  Service file:   ${servicePath}`);
+  console.log(`  Config dir:     ${configDir}\n`);
+
+  if (scope === 'system') {
+    console.log(`  ── Next steps ──\n`);
+    console.log(`    Edit config:        ${configDir}/config.yml`);
+    console.log(`    Start service:      systemctl enable --now botforje`);
+    console.log(`    View logs:          journalctl -u botforje -f`);
+    console.log(`    Authenticate:       sudo botforje auth <botId>\n`);
+  } else {
+    console.log(`  ── Next steps ──\n`);
+    console.log(`    Edit config:        ${configDir}/config.yml`);
+    console.log(`    Start service:      systemctl --user enable --now botforje`);
+    console.log(`    View logs:          journalctl --user -u botforje -f`);
+    console.log(`    Authenticate:       botforje auth <botId>\n`);
+  }
+}
+
+main().catch(err => {
+  console.error('postinstall error:', err.message);
+  process.exit(0);
+});

package/scripts/preuninstall.js

@@ -8,41 +8,44 @@ const os = require('os');
 function uninstallService() {
   if (os.platform() !== 'linux') return;
 
+  const isRoot = process.getuid && process.getuid() === 0;
+  const homeDir = os.homedir();
+
+  const userServicePath = path.join(homeDir, '.config', 'systemd', 'user', 'botforje.service');
+  const userConfigDir = path.join(homeDir, '.config', 'botforje');
+  const systemServicePath = '/etc/systemd/system/botforje.service';
+  const systemConfigDir = '/etc/botforje';
+
+  const isUserService = fs.existsSync(userServicePath);
+  const isSystemService = fs.existsSync(systemServicePath);
+
+  if (!isUserService && !isSystemService) return;
+
+  const scopeFlag = isUserService ? '--user ' : '';
+  const scope = isUserService ? 'user' : 'system';
+  const servicePath = isUserService ? userServicePath : systemServicePath;
+  const configDir = isUserService ? userConfigDir : systemConfigDir;
+
+  console.log('\nUninstalling Botforje service...\n');
+
   try {
-    const homeDir = os.homedir();
-    const servicePath = path.join(homeDir, '.config', 'systemd', 'user', 'botforje.service');
-    const configDir = path.join(homeDir, '.config', 'botforje');
-
-    if (!fs.existsSync(servicePath)) return;
-
-    console.log('\nUninstalling Botforje service...\n');
-
-    // Stop service first to prevent hanging
-    console.log('Stopping service...');
-    try {
-      execSync('systemctl --user stop botforje 2>/dev/null', { stdio: 'inherit', timeout: 10000 });
-    } catch (error) {
-      console.log('Service may not be running or failed to stop gracefully');
-    }
-
-    // Disable service
-    try {
-      execSync('systemctl --user disable botforje 2>/dev/null', { stdio: 'ignore' });
-    } catch {}
-
-    // Eliminar archivo .service
-    fs.unlinkSync(servicePath);
-    console.log('Service removed');
-
-    // Recargar systemd
-    execSync('systemctl --user daemon-reload', { stdio: 'ignore' });
-    
-    console.log(`\nConfiguration kept at: ${configDir}`);
-    console.log(`   To remove: rm -rf ${configDir}\n`);
-
-  } catch (error) {
-    console.error('Cleanup warning:', error.message);
+    console.log('  Stopping service...');
+    execSync(`systemctl ${scopeFlag}stop botforje 2>/dev/null`, { stdio: 'inherit', timeout: 10000 });
+  } catch {
+    console.log('  (service was not running)');
   }
+
+  try {
+    execSync(`systemctl ${scopeFlag}disable botforje 2>/dev/null`, { stdio: 'ignore' });
+  } catch {}
+
+  fs.unlinkSync(servicePath);
+  console.log('  Service file removed');
+
+  execSync(`systemctl ${scopeFlag}daemon-reload`, { stdio: 'ignore' });
+
+  console.log(`\n  Config kept at: ${configDir}`);
+  console.log(`  To remove:      rm -rf ${configDir}\n`);
 }
 
-uninstallService();
+uninstallService();

package/service/botforje.service.template

@@ -5,21 +5,14 @@ Documentation=https://github.com/felixzsh/botforje
 
 [Service]
 Type=simple
-WorkingDirectory={{INSTALL_DIR}}
-ExecStart=xvfb-run -a {{NODE_PATH}} {{INSTALL_DIR}}/dist/cli.js daemon
+ExecStart={{NODE}} {{SCRIPT}} daemon
 Restart=on-failure
 RestartSec=10
 StandardOutput=journal
 StandardError=journal
 SyslogIdentifier=botforje
-
-# Variables de entorno
-Environment="NODE_ENV=production"
-Environment="CONFIG_DIR={{CONFIG_DIR}}"
-
-# Límites de seguridad
 LimitNOFILE=65536
 PrivateTmp=true
 
 [Install]
-WantedBy=multi-user.target
+WantedBy={{WANTED_BY}}

package/scripts/setup-systemd.js

@@ -1,91 +0,0 @@
-#!/usr/bin/env node
-
-const fs = require('fs');
-const path = require('path');
-const { execSync } = require('child_process');
-const os = require('os');
-
-function setupSystemd() {
-  try {
-    if (os.platform() !== 'linux') {
-      console.log('Systemd setup is only available on Linux');
-      return;
-    }
-
-    const user = os.userInfo().username;
-    const homeDir = os.homedir();
-    const configDir = path.join(homeDir, '.config', 'botforje');
-    const systemdUserDir = path.join(homeDir, '.config', 'systemd', 'user');
-    
-    const globalNpmRoot = execSync('npm root -g', { encoding: 'utf8' }).trim();
-    const scriptDir = path.dirname(__filename);
-    const projectRoot = path.resolve(scriptDir, '..');
-
-    // Detect mode: If project root is within global npm root, it's production
-    const isProduction = projectRoot.startsWith(globalNpmRoot);
-    const installDir = isProduction
-      ? path.join(globalNpmRoot, 'botforje')
-      : projectRoot;
-
-    // For Node path, use 'which node' in both cases, but log a warning for dev
-    const nodePath = execSync('which node', { encoding: 'utf8' }).trim();
-    if (!isProduction) {
-      console.log('Development mode detected: Using local paths for testing');
-      console.log(`   Install dir: ${installDir}`);
-      console.log(`   Node path: ${nodePath}`);
-      console.log('   Note: Ensure dist/cli.js exists (run build first)');
-    }
-
-    console.log('Setting up Botforje systemd service...');
-    
-    if (!fs.existsSync(configDir)) {
-      fs.mkdirSync(configDir, { recursive: true });
-      console.log(`Created config directory: ${configDir}`);
-    }
-
-    // Create example config file only if config.yml doesn't exist
-    const exampleConfigPath = path.join(__dirname, '..', 'config.example.yml');
-    const targetConfigPath = path.join(configDir, 'config.yml');
-
-    if (fs.existsSync(exampleConfigPath) && !fs.existsSync(targetConfigPath)) {
-      const exampleContent = fs.readFileSync(exampleConfigPath, 'utf8');
-      // Comment out all lines for the default config
-      const commentedContent = exampleContent
-        .split('\n')
-        .map(line => line.trim() ? `# ${line}` : line)
-        .join('\n');
-      fs.writeFileSync(targetConfigPath, commentedContent);
-      console.log(`Created example config file: ${targetConfigPath}`);
-      console.log(`   Uncomment and edit this file to configure your bots`);
-    } else if (fs.existsSync(targetConfigPath)) {
-      console.log(`Config file already exists: ${targetConfigPath}`);
-    }
-
-    if (!fs.existsSync(systemdUserDir)) {
-      fs.mkdirSync(systemdUserDir, { recursive: true });
-      console.log(`Created systemd user directory: ${systemdUserDir}`);
-    }
-
-    const templatePath = path.join(__dirname, '..', 'service', 'botforje.service.template');
-    let serviceContent = fs.readFileSync(templatePath, 'utf8');
-
-    serviceContent = serviceContent
-      .replace(/{{USER}}/g, user)
-      .replace(/{{INSTALL_DIR}}/g, installDir)
-      .replace(/{{NODE_PATH}}/g, nodePath)
-      .replace(/{{CONFIG_DIR}}/g, configDir);
-
-    const servicePath = path.join(systemdUserDir, 'botforje.service');
-    fs.writeFileSync(servicePath, serviceContent);
-    console.log(`Created service file: ${servicePath}`);
-
-    execSync('systemctl --user daemon-reload', { stdio: 'inherit' });
-    console.log('Reloaded systemd daemon\n');
-
-  } catch (error) {
-    console.error('Error setting up systemd service:', error.message);
-    throw error;
-  }
-}
-
-setupSystemd();