samarthya-bot 1.1.1 → 1.1.2

package/README.md

@@ -34,7 +34,7 @@ SamarthyaBot is built for developers. The best way to start is the **CLI Wizard*
 
 ### 📦 Install (Global)
 
-Runtime: **Node JS ≥ 20** and **MongoDB** (Local).
+Runtime: **Node 20 LTS** (Officially Supported/Recommended) and **MongoDB** (Local).
 
 ```bash
 npm install -g samarthya-bot
@@ -42,10 +42,13 @@ npm install -g samarthya-bot
 # Start the interactive setup
 samarthya onboard
 
-# Launch the engine and dashboard
+# Launch the engine and dashboard (Terminal 1)
 samarthya gateway
+
+# Expose to internet & setup Telegram Webhook (Terminal 2)
+samarthya tunnel
 ```
-*The wizard guides you through API keys (Gemini/Ollama) and system permissions.*
+*The wizard guides you through API keys (Gemini/Ollama, Telegram Bot Token) and system permissions.*
 
 ### 🛠️ From Source (Development)
 
@@ -87,7 +90,7 @@ npm run dev
 | `samarthya status` | Display the status of background jobs and the engine. |
 | `samarthya stop` | Gracefully shut down all background autonomous agents. |
 | `samarthya model` | Swap between LLM providers (e.g. `ollama`, `gemini`). |
-| `samarthya tunnel` | Expose gateway to internet & auto-setup Telegram webhooks. |
+| `samarthya tunnel` | Expose gateway to internet. **(Must run in a separate terminal)** |
 
 ---
 
@@ -113,11 +116,10 @@ ACTIVE_PROVIDER=gemini # or ollama
 ### 📱 Telegram Integration
 To connect SamarthyaBot to Telegram:
 1. Get a bot token from [@BotFather](https://t.me/BotFather).
-2. Add `TELEGRAM_BOT_TOKEN` to your `.env` file.
-3. Run `samarthya tunnel` in your terminal.
-4. Samarthya will automatically create a secure tunnel and link your bot!
-
-*Note: The `samarthya onboard` command handles these for you automatically!*
+2. The `samarthya onboard` wizard will automatically ask for this token.
+3. Run `samarthya gateway` in your **first terminal**.
+4. Run `samarthya tunnel` in a **new, separate terminal**.
+5. Samarthya will automatically create a secure tunnel and link your bot!
 
 ---
 

package/backend/bin/samarthya.js

@@ -12,8 +12,15 @@ const backendDir = path.join(__dirname, '..');
 // Helper to check if server is already running on port 5000
 const isServerRunning = () => {
     try {
-        execSync('fuser 5000/tcp 2>/dev/null');
-        return true;
+        if (process.platform === 'win32') {
+            const output = execSync('netstat -ano | findstr :5000', { encoding: 'utf-8' });
+            return output.includes('LISTENING');
+        } else {
+            // macOS and Linux
+            // Using lsof as it's more standard across unix than fuser
+            execSync('lsof -i:5000 -t 2>/dev/null');
+            return true;
+        }
     } catch {
         return false;
     }
@@ -79,6 +86,7 @@ switch (command) {
             const anthropicKey = await question('🔑 Enter Anthropic (Claude) API Key (or press Enter to skip): ');
             const groqKey = await question('🔑 Enter Groq API Key (or press Enter to skip): ');
             const openAiKey = await question('🔑 Enter OpenAI API Key (or press Enter to skip): ');
+            const telegramToken = await question('🤖 Enter Telegram Bot Token (or press Enter to skip): ');
 
             const envPath = path.join(backendDir, '.env');
             let envVars = {};
@@ -113,6 +121,7 @@ switch (command) {
             if (anthropicKey.trim()) envVars['ANTHROPIC_API_KEY'] = anthropicKey.trim();
             if (groqKey.trim()) envVars['GROQ_API_KEY'] = groqKey.trim();
             if (openAiKey.trim()) envVars['OPENAI_API_KEY'] = openAiKey.trim();
+            if (telegramToken.trim()) envVars['TELEGRAM_BOT_TOKEN'] = telegramToken.trim();
 
             if (!envVars['GEMINI_API_KEY']) envVars['GEMINI_API_KEY'] = 'dummy';
 
@@ -297,7 +306,11 @@ switch (command) {
 
         try { require('dotenv').config({ path: path.join(backendDir, '.env') }); } catch (e) { }
 
-        const tunnelProcess = spawn('npx', ['localtunnel', '--port', '5000'], { stdio: 'pipe' });
+        const isWindows = process.platform === 'win32';
+        const tunnelProcess = spawn('npm', ['exec', 'localtunnel', '--', '--port', '5000'], {
+            stdio: 'pipe',
+            shell: isWindows
+        });
 
         tunnelProcess.stdout.on('data', async (data) => {
             const output = data.toString();
@@ -346,7 +359,23 @@ switch (command) {
         if (isServerRunning()) {
             console.log('🛑 Stopping SamarthyaBot Gateway...');
             try {
-                execSync('fuser -k 5000/tcp 2>/dev/null');
+                if (process.platform === 'win32') {
+                    // Find PID of process listening on port 5000 and kill it
+                    const netstatOut = execSync('netstat -ano | findstr :5000', { encoding: 'utf-8' });
+                    const lines = netstatOut.split('\\n');
+                    for (const line of lines) {
+                        if (line.includes('LISTENING')) {
+                            const parts = line.trim().split(/\\s+/);
+                            const pid = parts[parts.length - 1];
+                            if (pid && pid !== '0') {
+                                execSync(`taskkill /PID ${pid} /F`, { stdio: 'ignore' });
+                            }
+                        }
+                    }
+                } else {
+                    // macOS and Linux
+                    execSync('lsof -t -i:5000 | xargs kill -9 2>/dev/null || fuser -k 5000/tcp 2>/dev/null');
+                }
                 console.log('✅ Gateway stopped successfully.');
             } catch (e) {
                 console.log('❌ Failed to stop gateway gracefully. Process might already be dead.');
@@ -360,7 +389,21 @@ switch (command) {
         console.log('🔄 Restarting SamarthyaBot Gateway...');
         if (isServerRunning()) {
             try {
-                execSync('fuser -k 5000/tcp 2>/dev/null');
+                if (process.platform === 'win32') {
+                    const netstatOut = execSync('netstat -ano | findstr :5000', { encoding: 'utf-8' });
+                    const lines = netstatOut.split('\\n');
+                    for (const line of lines) {
+                        if (line.includes('LISTENING')) {
+                            const parts = line.trim().split(/\\s+/);
+                            const pid = parts[parts.length - 1];
+                            if (pid && pid !== '0') {
+                                execSync(`taskkill /PID ${pid} /F`, { stdio: 'ignore' });
+                            }
+                        }
+                    }
+                } else {
+                    execSync('lsof -t -i:5000 | xargs kill -9 2>/dev/null || fuser -k 5000/tcp 2>/dev/null');
+                }
             } catch (e) { /* ignore */ }
         }
         // Give it a moment to free the port

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "samarthya-bot",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "description": "Privacy-First Local Agentic OS & Command Center",
     "main": "backend/server.js",
     "bin": {
@@ -37,7 +37,7 @@
         "samarthya-bot",
         "ollama"
     ],
-    "author": "Bishnu Sahu",
+    "author": "Bishnu Prasad Sahu",
     "license": "MIT",
     "engines": {
         "node": ">=20.0.0"
@@ -46,4 +46,4 @@
         "type": "git",
         "url": "https://github.com/mebishnusahu0595/SamarthyaBot.git"
     }
-}
+}