v1.1 web (redux)

binding/web/.gitignore

@@ -1,7 +1,7 @@
 node_modules
 dist
-src/lib/*
-src/!lib/.gitkeep
+lib/*
+!lib/.gitkeep
 test/*.bin
 .idea/
 test_data.json

binding/web/README.md

@@ -13,26 +13,13 @@ models. picoLLM Inference Engine is:
 - Runs on CPU and GPU
 - Free for open-weight models
 
-## Requirements
-
-PicoLLM Web Binding uses [SharedArrayBuffer](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer) to generate
-text. Modern browsers require the following response headers to allow the usage of `SharedArrayBuffers`:
-
-```
-Cross-Origin-Opener-Policy: same-origin
-Cross-Origin-Embedder-Policy: require-corp
-```
-
-Refer to our [Web demos](https://github.com/Picovoice/picollm/tree/master/demo/web) for example on creating a server
-with the corresponding response headers.
-
 ## Compatibility
 
 - Chrome / Edge
 - Firefox
 - Safari
 
-**NOTE**: IndexedDB, SIMD and SharedArrayBuffers are required to use `picoLLM`.
+**NOTE**: IndexedDB and SIMD are required to use `picoLLM`.
 
 ## Installation
 

binding/web/cypress.config.ts

@@ -8,14 +8,5 @@ export default defineConfig({
     specPattern: 'test/*.test.{js,jsx,ts,tsx}',
     video: false,
     screenshotOnRunFailure: false,
-    setupNodeEvents(on, config) {
-      on('before:browser:launch', (browser, launchOptions) => {
-        if (browser.name === 'chrome') {
-          launchOptions.args.push('--enable-features=SharedArrayBuffer');
-        }
-
-        return launchOptions;
-      });
-    },
   },
 });

binding/web/module.d.ts

@@ -3,11 +3,6 @@ declare module "*.wasm" {
   export default content;
 }
 
-declare module "*.txt" {
-  const content: string;
-  export default content;
-}
-
 declare module 'web-worker:*' {
   const WorkerFactory: new () => Worker;
   export default WorkerFactory;

binding/web/package.json

@@ -22,15 +22,14 @@
     "lint": "eslint . --ext .js,.ts",
     "prepack": "npm-run-all build",
     "start": "cross-env TARGET='debug' rollup --config --watch",
-    "serve": "node server.js",
     "watch": "rollup --config --watch",
     "format": "prettier --write \"**/*.{js,ts,json}\"",
     "copywasm": "node scripts/copy_wasm.js",
     "setup-test": "node scripts/setup_test.js",
     "test": "cypress run --spec test/picollm.test.ts --browser chrome --headed"
   },
   "dependencies": {
-    "@picovoice/web-utils": "~1.4.1"
+    "@picovoice/web-utils": "~1.4.3"
   },
   "devDependencies": {
     "@babel/core": "^7.21.3",
@@ -42,18 +41,20 @@
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-terser": "^0.4.0",
     "@rollup/pluginutils": "^5.0.2",
-    "@types/emscripten": "^1.39.13",
     "@types/node": "^18.11.9",
+    "@types/pv-xpu-web-worker": "../../lib/wasm/dist/types/xpu_web_worker",
+    "@types/pv-xpu-webgpu": "../../lib/wasm/dist/types/xpu_webgpu",
     "@typescript-eslint/eslint-plugin": "^5.51.0",
     "@typescript-eslint/parser": "^5.51.0",
     "async-mutex": "^0.4.0",
     "cross-env": "^7.0.3",
     "cypress": "^12.8.1",
     "eslint": "^8.22.0",
     "eslint-plugin-cypress": "^2.12.1",
-    "mime-types": "^2.1.35",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.3",
+    "pv-xpu-web-worker": "../../lib/wasm/dist/xpu_web_worker/esm",
+    "pv-xpu-webgpu": "../../lib/wasm/dist/xpu_webgpu/esm",
     "rollup": "^2.79.1",
     "rollup-plugin-typescript2": "^0.34.1",
     "rollup-plugin-web-worker-loader": "^1.6.1",

binding/web/rollup.config.js

@@ -69,7 +69,7 @@ export default {
       exclude: '**/node_modules/**',
     }),
     base64({
-      include: ['./**/*.wasm', './**/*.txt'],
+      include: ['./lib/**/*.wasm'],
     })
   ],
 };

binding/web/scripts/copy_wasm.js

@@ -1,11 +1,11 @@
 const fs = require("fs");
-const { join, extname } = require("path");
+const { join } = require("path");
 
 const wasmFiles = [
   "pv_picollm.wasm",
   "pv_picollm_simd.wasm",
-  "pv_picollm.js",
-  "pv_picollm_simd.js",
+  "pv_picollm_web_worker_helper.wasm",
+  "pv_picollm_web_worker_helper_simd.wasm",
 ]
 
 console.log("Copying the WASM model...");
@@ -19,16 +19,12 @@ const sourceDirectory = join(
   "wasm"
 );
 
-const outputDirectory = join(__dirname, "..", "src", "lib");
+const outputDirectory = join(__dirname, "..", "lib");
 
 try {
   fs.mkdirSync(outputDirectory, { recursive: true });
   wasmFiles.forEach(file => {
     fs.copyFileSync(join(sourceDirectory, file), join(outputDirectory, file))
-    const ext = extname(file);
-    if (ext === ".js") {
-      fs.copyFileSync(join(sourceDirectory, file), join(outputDirectory, file.replace(ext, ".txt")));
-    }
   })
 } catch (error) {
   console.error(error);

binding/web/src/index.ts

@@ -41,15 +41,12 @@ import {
   PicoLLMWorkerResponse,
 } from './types';
 
-import picoLLMWasmSimd from './lib/pv_picollm_simd.wasm';
-import picoLLMWasmLib from './lib/pv_picollm_simd.txt';
+import picoLLMWasmSimd from '../lib/pv_picollm_simd.wasm';
 
 import * as PicoLLMErrors from './picollm_errors';
 
 PicoLLM.setWasmSimd(picoLLMWasmSimd);
 PicoLLMWorker.setWasmSimd(picoLLMWasmSimd);
-PicoLLM.setWasmLib(picoLLMWasmLib);
-PicoLLMWorker.setWasmLib(picoLLMWasmLib);
 
 export {
   Dialog,