@titanpl/packet 1.7.0 → 2.0.1

package/js/titan/dev.js

@@ -25,12 +25,17 @@ function getTitanVersion() {
 }
 
 function getEngineBinaryPath(root) {
+    // First: check if the CLI pre-resolved this for us (correct module context)
+    if (process.env.TITAN_ENGINE_BINARY && fs.existsSync(process.env.TITAN_ENGINE_BINARY)) {
+        return process.env.TITAN_ENGINE_BINARY;
+    }
+
     const platform = os.platform();
     const arch = os.arch();
     const binName = platform === 'win32' ? 'titan-server.exe' : 'titan-server';
     const pkgName = `@titanpl/engine-${platform}-${arch}`;
 
-    // Monorepo search
+    // 1. Monorepo search (dev environment)
     let current = root;
     for (let i = 0; i < 5; i++) {
         const potential = path.join(current, 'engine', 'target', 'release', binName);
@@ -38,7 +43,21 @@ function getEngineBinaryPath(root) {
         current = path.dirname(current);
     }
 
-    // Node modules search
+    // 2. Search relative to @titanpl/cli (where optionalDependencies are installed)
+    //    This is the primary path for globally-installed CLI users.
+    try {
+        const require = createRequire(import.meta.url);
+        const cliPkgPath = require.resolve('@titanpl/cli/package.json');
+        const cliDir = path.dirname(cliPkgPath);
+        // Check cli's own node_modules (global install sibling)
+        const cliNodeModulesBin = path.join(cliDir, 'node_modules', pkgName, 'bin', binName);
+        if (fs.existsSync(cliNodeModulesBin)) return cliNodeModulesBin;
+        // Check parent node_modules (hoisted global install)
+        const parentNodeModulesBin = path.join(path.dirname(cliDir), pkgName, 'bin', binName);
+        if (fs.existsSync(parentNodeModulesBin)) return parentNodeModulesBin;
+    } catch (e) { }
+
+    // 3. Search in the project's own node_modules
     try {
         const require = createRequire(import.meta.url);
         const pkgPath = require.resolve(`${pkgName}/package.json`);
@@ -46,6 +65,19 @@ function getEngineBinaryPath(root) {
         if (fs.existsSync(binPath)) return binPath;
     } catch (e) { }
 
+    // 4. Fallback: check common global npm paths
+    const globalSearchRoots = [
+        process.env.npm_config_prefix,
+        path.join(os.homedir(), '.npm-global'),
+        '/usr/local/lib',
+        '/usr/lib'
+    ].filter(Boolean);
+
+    for (const gRoot of globalSearchRoots) {
+        const gBin = path.join(gRoot, 'node_modules', pkgName, 'bin', binName);
+        if (fs.existsSync(gBin)) return gBin;
+    }
+
     return null;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titanpl/packet",
-  "version": "1.7.0",
+  "version": "2.0.1",
   "description": "The bundler for TitanPl servers.",
   "keywords": [
     "bundler",

package/ts/titan/dev.js

@@ -25,12 +25,17 @@ function getTitanVersion() {
 }
 
 function getEngineBinaryPath(root) {
+    // First: check if the CLI pre-resolved this for us (correct module context)
+    if (process.env.TITAN_ENGINE_BINARY && fs.existsSync(process.env.TITAN_ENGINE_BINARY)) {
+        return process.env.TITAN_ENGINE_BINARY;
+    }
+
     const platform = os.platform();
     const arch = os.arch();
     const binName = platform === 'win32' ? 'titan-server.exe' : 'titan-server';
     const pkgName = `@titanpl/engine-${platform}-${arch}`;
 
-    // Monorepo search
+    // 1. Monorepo search (dev environment)
     let current = root;
     for (let i = 0; i < 5; i++) {
         const potential = path.join(current, 'engine', 'target', 'release', binName);
@@ -38,7 +43,21 @@ function getEngineBinaryPath(root) {
         current = path.dirname(current);
     }
 
-    // Node modules search
+    // 2. Search relative to @titanpl/cli (where optionalDependencies are installed)
+    //    This is the primary path for globally-installed CLI users.
+    try {
+        const require = createRequire(import.meta.url);
+        const cliPkgPath = require.resolve('@titanpl/cli/package.json');
+        const cliDir = path.dirname(cliPkgPath);
+        // Check cli's own node_modules (global install sibling)
+        const cliNodeModulesBin = path.join(cliDir, 'node_modules', pkgName, 'bin', binName);
+        if (fs.existsSync(cliNodeModulesBin)) return cliNodeModulesBin;
+        // Check parent node_modules (hoisted global install)
+        const parentNodeModulesBin = path.join(path.dirname(cliDir), pkgName, 'bin', binName);
+        if (fs.existsSync(parentNodeModulesBin)) return parentNodeModulesBin;
+    } catch (e) { }
+
+    // 3. Search in the project's own node_modules
     try {
         const require = createRequire(import.meta.url);
         const pkgPath = require.resolve(`${pkgName}/package.json`);
@@ -46,6 +65,19 @@ function getEngineBinaryPath(root) {
         if (fs.existsSync(binPath)) return binPath;
     } catch (e) { }
 
+    // 4. Fallback: check common global npm paths
+    const globalSearchRoots = [
+        process.env.npm_config_prefix,
+        path.join(os.homedir(), '.npm-global'),
+        '/usr/local/lib',
+        '/usr/lib'
+    ].filter(Boolean);
+
+    for (const gRoot of globalSearchRoots) {
+        const gBin = path.join(gRoot, 'node_modules', pkgName, 'bin', binName);
+        if (fs.existsSync(gBin)) return gBin;
+    }
+
     return null;
 }