wllama-service 2.0.0 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wllama-service",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Framework-agnostic browser LLM service wrapper with WebGPU and WebAssembly support",
   "main": "./dist/index.js",
   "bin": {

package/scripts/postinstall.js

@@ -1,26 +1,53 @@
 #!/usr/bin/env node
 'use strict';
 
+const fs = require('fs');
 const path = require('path');
-const { copyWasm } = require('./copyWllamaWasm');
 
-// This file is wired up as the "postinstall" script in the CONSUMING
-// APP's package.json (see setup below) — npm runs it automatically
-// right after `npm install` finishes. No command to type, no step
-// to remember.
-//
-// Destination defaults to <app>/public/wllama, but can be overridden
-// with an env var if the app's public folder lives somewhere else:
-//   WLLAMA_WASM_DEST=./static/wllama npm install
+/**
+ * Resolve @wllama/wllama's wasm file using Node's real module resolution
+ * 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', {
+    paths: [process.cwd()],
+  });
+  const pkgRoot = path.dirname(pkgJsonPath);
 
-const destArg = process.env.WLLAMA_WASM_DEST || 'public/wllama';
-const destDir = path.resolve(process.cwd(), destArg);
+  // 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.join(pkgRoot, 'esm', 'wasm', 'wllama.wasm'),
+    path.join(pkgRoot, 'esm', 'single-thread', 'wllama.wasm'),
+  ];
+  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;
+}
 
-const result = copyWasm(destDir);
+// 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');
 
-if (!result) {
-  // Non-fatal: don't break `npm install` for the app if something's
-  // off. Worst case, loadModel() fails clearly at runtime with a 404,
-  // which is easier to debug than a broken install.
+let wasmSrc;
+try {
+  wasmSrc = resolveWasmSrc();
+} catch (err) {
+  console.warn('[copy-wllama-wasm] ' + err.message);
   process.exit(0);
-}
+}
+
+fs.mkdirSync(destDir, { recursive: true });
+const dest = path.join(destDir, 'wllama.wasm');
+fs.copyFileSync(wasmSrc, dest);
+console.log(`[copy-wllama-wasm] ✓ Copied ${wasmSrc} -> ${dest}`);