feat(loader): prefer prebuilt with vendor support; clear fallbacks and helpful errors

Author: InnovateAsterisk

lib/index.js

@@ -1,14 +1,62 @@
 const fs = require('fs');
 const path = require('path');
-// Prefer a prebuilt native binary if present, otherwise fall back to local build
+// Prefer a prebuilt native binary if present, otherwise fall back to local build.
+// If prebuilt has a vendor/ folder, adjust PATH/LD_LIBRARY_PATH on platforms that need it.
 function loadNative() {
     const abi = process.versions.modules; // Node ABI
-    const candidate = path.join(__dirname, '..', 'prebuilt', `${process.platform}-${process.arch}`, `node-v${abi}`, 'baresip_node.node');
+    const base = path.join(__dirname, '..', 'prebuilt', `${process.platform}-${process.arch}`, `node-v${abi}`);
+    const candidate = path.join(base, 'baresip_node.node');
+    const vendor = path.join(base, 'vendor');
+
+    const tryRequire = (p) => {
+        try { return require(p); } catch (e) { return e; }
+    };
+
     if (fs.existsSync(candidate)) {
-        try { return require(candidate); } catch (_) {}
+        // Windows needs PATH to include vendor for co-located DLLs
+        if (process.platform === 'win32' && fs.existsSync(vendor)) {
+            process.env.PATH = `${vendor};${process.env.PATH || ''}`;
+        }
+        // Linux may need LD_LIBRARY_PATH if RUNPATH wasn't embedded
+        if (process.platform === 'linux' && fs.existsSync(vendor)) {
+            const sep = ':';
+            process.env.LD_LIBRARY_PATH = `${vendor}${sep}${process.env.LD_LIBRARY_PATH || ''}`;
+        }
+        const res = tryRequire(candidate);
+        if (!(res instanceof Error)) return res;
+        // capture error but try fallback below
+        var prebuiltErr = res;
     }
-    // Fallback to build output
-    return require('../build/Release/baresip_node.node');
+
+    // Fallback to local build output
+    const fallback = path.join(__dirname, '..', 'build', 'Release', 'baresip_node.node');
+    if (fs.existsSync(fallback)) {
+        const res2 = tryRequire(fallback);
+        if (!(res2 instanceof Error)) return res2;
+        // If both failed, throw a helpful error
+        const msg = [
+            'Failed to load baresip_node native addon.',
+            candidate && fs.existsSync(candidate)
+                ? `- Prebuilt found at ${candidate} but failed: ${prebuiltErr && prebuiltErr.message}`
+                : `- No prebuilt found for ${process.platform}-${process.arch} (ABI node-v${abi}).`,
+            `- Local build found at ${fallback} but failed: ${res2.message}`,
+            'Solutions:',
+            '  • Use a release that includes a prebuilt for your platform/Node version',
+            '  • Or build locally: npm ci && npx cmake-js rebuild'
+        ].join('\n');
+        throw new Error(msg);
+    }
+
+    // Neither prebuilt nor local exists
+    const msg = [
+        'baresip_node native addon not available.',
+        `- No prebuilt at ${candidate}`,
+        `- No local build at ${fallback}`,
+        'Solutions:',
+        '  • Use a release that includes a prebuilt for your platform/Node version',
+        '  • Or build locally: npm ci && npx cmake-js rebuild'
+    ].join('\n');
+    throw new Error(msg);
 }
 const BareSIP = loadNative();
 // Javascript Wrapper for baresip_node addon