wllama-service 2.0.1 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wllama-service",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "Framework-agnostic browser LLM service wrapper with WebGPU and WebAssembly support",
   "main": "./dist/index.js",
   "bin": {
@@ -20,6 +20,7 @@
     "README.md"
   ],
   "scripts": {
+    "postinstall": "node scripts/postinstall.js",
     "build": "tsup",
     "dev": "tsup --watch",
     "typecheck": "tsc --noEmit",

package/scripts/postinstall.js

@@ -6,58 +6,48 @@ const path = require('path');
 
 /**
  * Resolve @wllama/wllama's wasm file using Node's real module resolution
- * instead of a fixed relative path. This is the part that breaks in
- * yarn workspaces monorepos: @wllama/wllama gets hoisted to the
- * monorepo ROOT node_modules, not nested under wllama-service's own
- * node_modules, so `__dirname + '../node_modules/@wllama/wllama/...'`
- * never finds it. require.resolve walks up node_modules the same way
- * Node itself would, so it finds the package wherever it actually is.
+ * instead of a guessed relative path. This works correctly regardless of
+ * where in the yarn workspaces hoisting tree @wllama/wllama actually
+ * landed (monorepo root, nested under wllama-service, etc) — Node's own
+ * require.resolve algorithm finds it the same way `require()` would.
  */
 function resolveWasmSrc() {
-  const pkgJsonPath = require.resolve('@wllama/wllama/package.json');
+  const pkgJsonPath = require.resolve('@wllama/wllama/package.json', {
+    paths: [process.cwd()],
+  });
   const pkgRoot = path.dirname(pkgJsonPath);
-  return path.join(pkgRoot, 'esm', 'wasm', 'wllama.wasm');
-}
 
-/**
- * Find the consuming app's public directory. Tries common monorepo
- * layouts, then falls back to walking up from cwd looking for a
- * package.json + public/ pair.
- */
-function findPublicDir() {
+  // Different @wllama/wllama versions ship different layouts:
+  //   older: esm/wasm/wllama.wasm
+  //   newer: esm/single-thread/wllama.wasm (+ esm/multi-thread/wllama.wasm)
   const candidates = [
-    path.resolve(process.cwd(), 'public'),
-    path.resolve(process.cwd(), '../../public'),
-    path.resolve(process.cwd(), '../../../public'),
-    path.resolve(process.cwd(), '../../../../public'),
+    path.join(pkgRoot, 'esm', 'wasm', 'wllama.wasm'),
+    path.join(pkgRoot, 'esm', 'single-thread', 'wllama.wasm'),
   ];
-  return candidates.find((p) => fs.existsSync(p));
+  const found = candidates.find((p) => fs.existsSync(p));
+  if (!found) {
+    throw new Error(
+      `wllama.wasm not found in any known location under ${pkgRoot}\n` +
+        `Checked: ${candidates.join(', ')}`,
+    );
+  }
+  return found;
 }
 
+// Destination: this app's own public folder. Adjust this path if your
+// app's public folder lives somewhere other than apps/<this-app>/public
+// relative to where this script sits.
+const destDir = path.resolve(__dirname, '..', 'public', 'wllama');
+
 let wasmSrc;
 try {
   wasmSrc = resolveWasmSrc();
 } catch (err) {
-  console.warn('[wllama-service] Could not resolve @wllama/wllama:', err.message);
-  process.exit(0);
-}
-
-if (!fs.existsSync(wasmSrc)) {
-  console.warn('[wllama-service] wllama.wasm not found at', wasmSrc);
-  process.exit(0);
-}
-
-const publicDir = findPublicDir();
-if (!publicDir) {
-  console.warn(
-    '[wllama-service] Could not find a public/ directory near',
-    process.cwd(),
-    '\n  Set WLLAMA_PUBLIC_DIR env var to specify it explicitly.',
-  );
+  console.warn('[copy-wllama-wasm] ' + err.message);
   process.exit(0);
 }
 
-const dest = path.join(publicDir, 'wllama', 'wllama.wasm');
-fs.mkdirSync(path.dirname(dest), { recursive: true });
+fs.mkdirSync(destDir, { recursive: true });
+const dest = path.join(destDir, 'wllama.wasm');
 fs.copyFileSync(wasmSrc, dest);
-console.log(`[wllama-service] ✓ Copied wllama.wasm to ${dest}`);
+console.log(`[copy-wllama-wasm] ✓ Copied ${wasmSrc} -> ${dest}`);