@titanpl/cli 2.0.1 → 2.0.2

package/src/commands/update.js

@@ -1,90 +1,90 @@
-import fs from 'fs';
-import path from 'path';
-import { fileURLToPath } from 'url';
-import chalk from 'chalk';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-export async function updateCommand() {
-    const root = process.cwd();
-    console.log(chalk.cyan(`\n→ Updating Titan project to latest...`));
-
-    const pkgPath = path.join(root, 'package.json');
-    if (!fs.existsSync(pkgPath)) {
-        console.log(chalk.red(`✖ No package.json found. Are you in a project root ? `));
-        return;
-    }
-
-    // 1. Update package.json versions
-    try {
-        const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
-        let modified = false;
-
-        const titanDeps = [
-            'titanpl',
-            'titanpl-sdk',
-            '@titanpl/cli',
-            '@titanpl/route',
-            '@titanpl/native',
-            '@titanpl/packet',
-            '@titanpl/core',
-            '@titanpl/node'
-        ];
-
-        if (pkg.dependencies) {
-            for (const dep of titanDeps) {
-                if (pkg.dependencies[dep]) {
-                    pkg.dependencies[dep] = "latest";
-                    modified = true;
-                }
-            }
-        }
-
-        if (pkg.devDependencies) {
-            for (const dep of titanDeps) {
-                if (pkg.devDependencies[dep]) {
-                    pkg.devDependencies[dep] = "latest";
-                    modified = true;
-                }
-            }
-        }
-
-        if (modified) {
-            fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
-            console.log(chalk.green(`  ✔ Updated Titan dependencies in package.json`));
-        }
-    } catch (e) {
-        console.log(chalk.yellow(`  ⚠️ Failed to update package.json: ${e.message}`));
-    }
-
-    // 2. Refresh Dockerfile and dotfiles from templates
-    const commonDir = path.resolve(__dirname, '..', '..', '..', '..', 'templates', 'common');
-    if (fs.existsSync(commonDir)) {
-        const filesToSync = [
-            ['Dockerfile', 'Dockerfile'],
-            ['_dockerignore', '.dockerignore'],
-            ['_gitignore', '.gitignore'],
-        ];
-
-        for (const [srcName, destName] of filesToSync) {
-            const src = path.join(commonDir, srcName);
-            const dest = path.join(root, destName);
-            if (fs.existsSync(src)) {
-                fs.copyFileSync(src, dest);
-                console.log(chalk.green(`  ✔ Synchronized ${destName}`));
-            }
-        }
-
-        // Also update app/t.native.d.ts if it exists
-        const nativeTypesSrc = path.join(commonDir, 'app', 't.native.d.ts');
-        const nativeTypesDest = path.join(root, 'app', 't.native.d.ts');
-        if (fs.existsSync(nativeTypesSrc) && fs.existsSync(path.join(root, 'app'))) {
-            fs.copyFileSync(nativeTypesSrc, nativeTypesDest);
-            console.log(chalk.green(`  ✔ Updated app/t.native.d.ts`));
-        }
-    }
-
-    console.log(chalk.green(`\n✔ Update complete!\n`));
-    console.log(chalk.yellow(`  Please run 'npm install' to apply changes.\n`));
-}
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import chalk from 'chalk';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export async function updateCommand() {
+    const root = process.cwd();
+    console.log(chalk.cyan(`\n→ Updating Titan project to latest...`));
+
+    const pkgPath = path.join(root, 'package.json');
+    if (!fs.existsSync(pkgPath)) {
+        console.log(chalk.red(`✖ No package.json found. Are you in a project root ? `));
+        return;
+    }
+
+    // 1. Update package.json versions
+    try {
+        const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+        let modified = false;
+
+        const titanDeps = [
+            'titanpl',
+            'titanpl-sdk',
+            '@titanpl/cli',
+            '@titanpl/route',
+            '@titanpl/native',
+            '@titanpl/packet',
+            '@titanpl/core',
+            '@titanpl/node'
+        ];
+
+        if (pkg.dependencies) {
+            for (const dep of titanDeps) {
+                if (pkg.dependencies[dep]) {
+                    pkg.dependencies[dep] = "latest";
+                    modified = true;
+                }
+            }
+        }
+
+        if (pkg.devDependencies) {
+            for (const dep of titanDeps) {
+                if (pkg.devDependencies[dep]) {
+                    pkg.devDependencies[dep] = "latest";
+                    modified = true;
+                }
+            }
+        }
+
+        if (modified) {
+            fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
+            console.log(chalk.green(`  ✔ Updated Titan dependencies in package.json`));
+        }
+    } catch (e) {
+        console.log(chalk.yellow(`  ⚠️ Failed to update package.json: ${e.message}`));
+    }
+
+    // 2. Refresh Dockerfile and dotfiles from templates
+    const commonDir = path.resolve(__dirname, '..', '..', '..', '..', 'templates', 'common');
+    if (fs.existsSync(commonDir)) {
+        const filesToSync = [
+            ['Dockerfile', 'Dockerfile'],
+            ['_dockerignore', '.dockerignore'],
+            ['_gitignore', '.gitignore'],
+        ];
+
+        for (const [srcName, destName] of filesToSync) {
+            const src = path.join(commonDir, srcName);
+            const dest = path.join(root, destName);
+            if (fs.existsSync(src)) {
+                fs.copyFileSync(src, dest);
+                console.log(chalk.green(`  ✔ Synchronized ${destName}`));
+            }
+        }
+
+        // Also update app/t.native.d.ts if it exists
+        const nativeTypesSrc = path.join(commonDir, 'app', 't.native.d.ts');
+        const nativeTypesDest = path.join(root, 'app', 't.native.d.ts');
+        if (fs.existsSync(nativeTypesSrc) && fs.existsSync(path.join(root, 'app'))) {
+            fs.copyFileSync(nativeTypesSrc, nativeTypesDest);
+            console.log(chalk.green(`  ✔ Updated app/t.native.d.ts`));
+        }
+    }
+
+    console.log(chalk.green(`\n✔ Update complete!\n`));
+    console.log(chalk.yellow(`  Please run 'npm install' to apply changes.\n`));
+}

package/src/engine.js

@@ -1,152 +1,152 @@
-import os from 'os';
-import path from 'path';
-import fs from 'fs';
-import { createRequire } from 'module';
-import { spawn } from 'child_process';
-import { fileURLToPath } from 'url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-const require = createRequire(import.meta.url);
-
-/**
- * Resolves the engine binary path. Returns null if not found (non-fatal).
- * Used by the dev command to pre-resolve and inject the path via env.
- */
-export function resolveEngineBinaryPath() {
-  const platform = os.platform();
-  const arch = os.arch();
-  const pkgName = `@titanpl/engine-${platform}-${arch}`;
-  const binName = platform === 'win32' ? 'titan-server.exe' : 'titan-server';
-
-  // 1. Monorepo search (local dev)
-  const searchPaths = [
-    __dirname,
-    process.cwd(),
-    path.join(process.cwd(), '..'),
-    path.join(process.cwd(), '..', '..')
-  ];
-
-  for (let startPath of searchPaths) {
-    let current = startPath;
-    for (let i = 0; i < 8; i++) {
-      const potential = path.join(current, 'engine', 'target', 'release', binName);
-      if (fs.existsSync(potential)) return potential;
-      const parent = path.dirname(current);
-      if (parent === current) break;
-      current = parent;
-    }
-  }
-
-  // 2. Resolve from CLI's own context (correct require context for optionalDependencies)
-  try {
-    const pkgPath = require.resolve(`${pkgName}/package.json`);
-    const binaryPath = path.join(path.dirname(pkgPath), 'bin', binName);
-    if (fs.existsSync(binaryPath)) return binaryPath;
-  } catch (e) { }
-
-  // 3. Fallback: sibling in node_modules (global install layout)
-  const cliParent = path.dirname(path.dirname(__dirname)); // up from cli/src → cli → parent
-  const siblingBin = path.join(cliParent, pkgName, 'bin', binName);
-  if (fs.existsSync(siblingBin)) return siblingBin;
-
-  return null;
-}
-
-/**
- * Resolves the engine binary path. Exits with a fatal error if not found.
- * Used by the start command.
- */
-export function getEngineBinaryPath() {
-  const platform = os.platform();
-  const arch = os.arch();
-  const pkgName = `@titanpl/engine-${platform}-${arch}`;
-
-  const resolved = resolveEngineBinaryPath();
-  if (resolved) return resolved;
-
-  console.error(`\n[TITAN FATAL] Unsupported platform: ${platform} (${arch})`);
-  console.error(`Or the optional dependency '${pkgName}' failed to install.`);
-  console.error(`Try: npm install -g @titanpl/cli\n`);
-  process.exit(1);
-}
-
-export function startEngine(watchMode = false) {
-  const distPath = path.resolve(process.cwd(), 'dist');
-
-  if (!fs.existsSync(distPath)) {
-    console.error("❌ 'dist/' directory not found. Please run 'titan build' first.");
-    process.exit(1);
-  }
-
-  const binaryPath = getEngineBinaryPath();
-
-  // Arguments passed to Rust backend
-  const args = ['run', distPath];
-  if (watchMode) args.push('--watch');
-
-  console.log(`🚀 Starting Titan Engine...`);
-
-  const engineProcess = spawn(binaryPath, args, {
-    stdio: ['inherit', 'pipe', 'pipe'],
-    env: {
-      ...process.env,
-      TITAN_ENV: watchMode ? 'development' : 'production',
-      Titan_Dev: watchMode ? '1' : '0'
-    }
-  });
-
-  let stderrBuffer = "";
-
-  engineProcess.stdout.pipe(process.stdout);
-  engineProcess.stderr.on('data', (data) => {
-    const chunk = data.toString();
-    stderrBuffer += chunk;
-    process.stderr.write(data);
-  });
-
-  engineProcess.on('close', (code) => {
-    if (code !== 0 && code !== null) {
-      // Check for port binding errors
-      const isPortError = stderrBuffer.includes("Address already in use") ||
-        stderrBuffer.includes("address in use") ||
-        stderrBuffer.includes("os error 10048") || // Windows
-        stderrBuffer.includes("EADDRINUSE") ||
-        stderrBuffer.includes("AddrInUse");
-
-      if (isPortError) {
-        // Try to read intended port
-        let port = 5100;
-        try {
-          const routesPath = path.join(process.cwd(), "dist", "routes.json");
-          if (fs.existsSync(routesPath)) {
-            const routesConfig = JSON.parse(fs.readFileSync(routesPath, "utf8"));
-            if (routesConfig && routesConfig.__config && routesConfig.__config.port) {
-              port = routesConfig.__config.port;
-            }
-          }
-        } catch (e) { }
-
-        const cyan = (t) => `\x1b[36m${t}\x1b[0m`;
-        const yellow = (t) => `\x1b[33m${t}\x1b[0m`;
-        const red = (t) => `\x1b[31m${t}\x1b[0m`;
-
-        console.log("");
-        console.log(red("⏣  Your application cannot enter this orbit"));
-        console.log(red(`↳  Another application is already bound to port ${port}.`));
-        console.log("");
-
-        console.log(yellow("Recommended Actions:"));
-        console.log(yellow("  1.") + " Release the occupied orbit (stop the other service).");
-        console.log(yellow("  2.") + " Assign your application to a new orbit in " + cyan("app/app.js"));
-        console.log(yellow("     Example: ") + cyan(`t.start(${port + 1}, "Titan Running!")`));
-        console.log("");
-      } else {
-        console.error(`\n❌ [Titan Engine died with exit code ${code}]`);
-      }
-    }
-  });
-
-  return engineProcess;
-}
+import os from 'os';
+import path from 'path';
+import fs from 'fs';
+import { createRequire } from 'module';
+import { spawn } from 'child_process';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const require = createRequire(import.meta.url);
+
+/**
+ * Resolves the engine binary path. Returns null if not found (non-fatal).
+ * Used by the dev command to pre-resolve and inject the path via env.
+ */
+export function resolveEngineBinaryPath() {
+  const platform = os.platform();
+  const arch = os.arch();
+  const pkgName = `@titanpl/engine-${platform}-${arch}`;
+  const binName = platform === 'win32' ? 'titan-server.exe' : 'titan-server';
+
+  // 1. Monorepo search (local dev)
+  const searchPaths = [
+    __dirname,
+    process.cwd(),
+    path.join(process.cwd(), '..'),
+    path.join(process.cwd(), '..', '..')
+  ];
+
+  for (let startPath of searchPaths) {
+    let current = startPath;
+    for (let i = 0; i < 8; i++) {
+      const potential = path.join(current, 'engine', 'target', 'release', binName);
+      if (fs.existsSync(potential)) return potential;
+      const parent = path.dirname(current);
+      if (parent === current) break;
+      current = parent;
+    }
+  }
+
+  // 2. Resolve from CLI's own context (correct require context for optionalDependencies)
+  try {
+    const pkgPath = require.resolve(`${pkgName}/package.json`);
+    const binaryPath = path.join(path.dirname(pkgPath), 'bin', binName);
+    if (fs.existsSync(binaryPath)) return binaryPath;
+  } catch (e) { }
+
+  // 3. Fallback: sibling in node_modules (global install layout)
+  const cliParent = path.dirname(path.dirname(__dirname)); // up from cli/src → cli → parent
+  const siblingBin = path.join(cliParent, pkgName, 'bin', binName);
+  if (fs.existsSync(siblingBin)) return siblingBin;
+
+  return null;
+}
+
+/**
+ * Resolves the engine binary path. Exits with a fatal error if not found.
+ * Used by the start command.
+ */
+export function getEngineBinaryPath() {
+  const platform = os.platform();
+  const arch = os.arch();
+  const pkgName = `@titanpl/engine-${platform}-${arch}`;
+
+  const resolved = resolveEngineBinaryPath();
+  if (resolved) return resolved;
+
+  console.error(`\n[TITAN FATAL] Unsupported platform: ${platform} (${arch})`);
+  console.error(`Or the optional dependency '${pkgName}' failed to install.`);
+  console.error(`Try: npm install -g @titanpl/cli\n`);
+  process.exit(1);
+}
+
+export function startEngine(watchMode = false) {
+  const distPath = path.resolve(process.cwd(), 'dist');
+
+  if (!fs.existsSync(distPath)) {
+    console.error("❌ 'dist/' directory not found. Please run 'titan build' first.");
+    process.exit(1);
+  }
+
+  const binaryPath = getEngineBinaryPath();
+
+  // Arguments passed to Rust backend
+  const args = ['run', distPath];
+  if (watchMode) args.push('--watch');
+
+  console.log(`🚀 Starting Titan Engine...`);
+
+  const engineProcess = spawn(binaryPath, args, {
+    stdio: ['inherit', 'pipe', 'pipe'],
+    env: {
+      ...process.env,
+      TITAN_ENV: watchMode ? 'development' : 'production',
+      Titan_Dev: watchMode ? '1' : '0'
+    }
+  });
+
+  let stderrBuffer = "";
+
+  engineProcess.stdout.pipe(process.stdout);
+  engineProcess.stderr.on('data', (data) => {
+    const chunk = data.toString();
+    stderrBuffer += chunk;
+    process.stderr.write(data);
+  });
+
+  engineProcess.on('close', (code) => {
+    if (code !== 0 && code !== null) {
+      // Check for port binding errors
+      const isPortError = stderrBuffer.includes("Address already in use") ||
+        stderrBuffer.includes("address in use") ||
+        stderrBuffer.includes("os error 10048") || // Windows
+        stderrBuffer.includes("EADDRINUSE") ||
+        stderrBuffer.includes("AddrInUse");
+
+      if (isPortError) {
+        // Try to read intended port
+        let port = 5100;
+        try {
+          const routesPath = path.join(process.cwd(), "dist", "routes.json");
+          if (fs.existsSync(routesPath)) {
+            const routesConfig = JSON.parse(fs.readFileSync(routesPath, "utf8"));
+            if (routesConfig && routesConfig.__config && routesConfig.__config.port) {
+              port = routesConfig.__config.port;
+            }
+          }
+        } catch (e) { }
+
+        const cyan = (t) => `\x1b[36m${t}\x1b[0m`;
+        const yellow = (t) => `\x1b[33m${t}\x1b[0m`;
+        const red = (t) => `\x1b[31m${t}\x1b[0m`;
+
+        console.log("");
+        console.log(red("⏣  Your application cannot enter this orbit"));
+        console.log(red(`↳  Another application is already bound to port ${port}.`));
+        console.log("");
+
+        console.log(yellow("Recommended Actions:"));
+        console.log(yellow("  1.") + " Release the occupied orbit (stop the other service).");
+        console.log(yellow("  2.") + " Assign your application to a new orbit in " + cyan("app/app.js"));
+        console.log(yellow("     Example: ") + cyan(`t.start(${port + 1}, "Titan Running!")`));
+        console.log("");
+      } else {
+        console.error(`\n❌ [Titan Engine died with exit code ${code}]`);
+      }
+    }
+  });
+
+  return engineProcess;
+}