ttsd-colabcli 1.0.2 → 1.0.4

package/cli.js

@@ -2,12 +2,19 @@
 
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 const { spawn, execSync } = require('child_process');
 
+const HOME_DIR = path.join(os.homedir(), '.colabcli');
+if (!fs.existsSync(HOME_DIR)) {
+  fs.mkdirSync(HOME_DIR, { recursive: true });
+}
+
 const CMD = process.argv[2] || 'start';
-const ENV_PATH = path.join(__dirname, '.env');
+const ENV_PATH = path.join(HOME_DIR, '.env');
 const CORE_DIR = path.join(__dirname, 'core');
-const PID_FILE = path.join(__dirname, '.daemon.pid');
+const PID_FILE = path.join(HOME_DIR, '.daemon.pid');
+const VENV_DIR = path.join(HOME_DIR, 'venv');
 
 async function promptConfig() {
   const inquirer = require('inquirer');
@@ -35,21 +42,20 @@ async function promptConfig() {
 }
 
 function setupPythonEnv() {
-  const venvDir = path.join(CORE_DIR, 'venv');
-  if (!fs.existsSync(venvDir)) {
+  if (!fs.existsSync(VENV_DIR)) {
     console.log('Creating Python virtual environment...');
     try {
-      execSync(`python3 -m venv "${venvDir}"`, { stdio: 'inherit' });
+      execSync(`python3 -m venv "${VENV_DIR}"`, { stdio: 'inherit' });
     } catch (e) {
       console.log('python3 not found, trying python...');
-      execSync(`python -m venv "${venvDir}"`, { stdio: 'inherit' });
+      execSync(`python -m venv "${VENV_DIR}"`, { stdio: 'inherit' });
     }
   }
 
   console.log('Installing dependencies...');
   const pip = process.platform === 'win32' 
-    ? path.join(venvDir, 'Scripts', 'pip')
-    : path.join(venvDir, 'bin', 'pip');
+    ? path.join(VENV_DIR, 'Scripts', 'pip')
+    : path.join(VENV_DIR, 'bin', 'pip');
   execSync(`"${pip}" install -r "${path.join(CORE_DIR, 'requirements.txt')}" -q`, { stdio: 'inherit' });
 }
 
@@ -75,17 +81,14 @@ async function start() {
   console.log('Starting Satellite Daemon in background...');
   
   const pythonBin = process.platform === 'win32'
-    ? path.join(CORE_DIR, 'venv', 'Scripts', 'python')
-    : path.join(CORE_DIR, 'venv', 'bin', 'python');
-
-  // Copy .env to core dir so daemon.py can load it
-  fs.copyFileSync(ENV_PATH, path.join(CORE_DIR, '.env'));
+    ? path.join(VENV_DIR, 'Scripts', 'python')
+    : path.join(VENV_DIR, 'bin', 'python');
 
-  const out = fs.openSync(path.join(__dirname, 'daemon.log'), 'a');
-  const err = fs.openSync(path.join(__dirname, 'daemon.error.log'), 'a');
+  const out = fs.openSync(path.join(HOME_DIR, 'daemon.log'), 'a');
+  const err = fs.openSync(path.join(HOME_DIR, 'daemon.error.log'), 'a');
 
-  const child = spawn(pythonBin, ['daemon.py'], {
-    cwd: CORE_DIR,
+  const child = spawn(pythonBin, [path.join(CORE_DIR, 'daemon.py')], {
+    cwd: HOME_DIR,
     detached: true,
     stdio: ['ignore', out, err]
   });

package/core/daemon.py

@@ -106,7 +106,19 @@ async def launch_worker(email: str, public_url: str):
     
     try:
         from app.colab_cli.runtime import ColabRuntime
-        _worker_bytes = open(os.path.join(os.path.dirname(__file__), "../colab/worker.py"), "rb").read()
+        # Try local first (satellite_node/daemon.py), fallback to packaged structure
+        possible_paths = [
+            os.path.join(os.path.dirname(__file__), "../colab/worker.py"),
+            os.path.join(os.path.dirname(__file__), "colab", "worker.py")
+        ]
+        _worker_bytes = None
+        for p in possible_paths:
+            if os.path.exists(p):
+                _worker_bytes = open(p, "rb").read()
+                break
+        if not _worker_bytes:
+            raise FileNotFoundError(f"Could not find worker.py in {possible_paths}")
+
         _worker_b64 = base64.b64encode(_worker_bytes).decode()
         
         _rt = ColabRuntime(url, token, session_name=name)
@@ -133,7 +145,18 @@ print("DEPLOYED PID=" + str(proc.pid) + " ALIVE=" + str(ret is None), flush=True
         await loop.run_in_executor(None, lambda: _rt.execute_code(_deploy_code, timeout=300))
         logger.info("Worker deployed on Colab runtime for %s", email)
     except Exception as e:
-        logger.error("Worker deploy failed: %s", e)
+        logger.error("Worker deploy failed: %s, cleaning up Colab assignment", e)
+        # Rollback: unassign the runtime so quota isn't wasted
+        try:
+            from app.colab_cli.common import kill_process
+            if pid:
+                kill_process(pid)
+        except Exception:
+            pass
+        try:
+            await loop.run_in_executor(None, _client.unassign, endpoint)
+        except Exception:
+            pass
         await report_status(email, "FAILED", error=str(e))
         return
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ttsd-colabcli",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Satellite Node CLI for TTS Dubbing Distributed Architecture",
   "main": "cli.js",
   "bin": {