aione-web 1.0.0 → 1.0.1

package/AIOne.d.ts

@@ -1,5 +1,8 @@
 export interface AIOneOptions {
-    workerUrl?: string;
+    workerUrl?: string | URL;
+    runtimeUrl?: string;
+    wasmUrl?: string;
+    threads?: boolean;
     name?: string;
 }
 

package/AIOne.js

@@ -1,6 +1,21 @@
 export default class AIOne {
 	static async create(options = {}) {
-		const workerUrl = options.workerUrl ?? "/aio1-worker.js";
+		const workerUrl = new URL(
+			options.workerUrl ?? "/aio1-worker.js",
+			globalThis.location?.href ?? import.meta.url
+		);
+
+		if (options.threads) {
+			workerUrl.searchParams.set("threads", "1");
+		}
+
+		if (options.runtimeUrl) {
+			workerUrl.searchParams.set("runtime", options.runtimeUrl);
+		}
+
+		if (options.wasmUrl) {
+			workerUrl.searchParams.set("wasm", options.wasmUrl);
+		}
 
 		if (typeof SharedWorker === "undefined") {
 			throw new Error("SharedWorker is not supported by this browser");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aione-web",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Browser AI inference powered by llama.cpp and WebGPU",
   "keywords": [
     "ai",
@@ -38,18 +38,27 @@
     },
     "./runtime": "./worker-runtime.js",
     "./workerfs-bridge": "./workerfs-bridge.js",
-    "./AIOneWeb.js": "./AIOneWeb.js",
-    "./AIOneWeb.wasm": "./AIOneWeb.wasm",
+    "./single": "./build/Release/AIOneWeb.js",
+    "./single/wasm": "./build/Release/AIOneWeb.wasm",
+    "./mt": "./build/Release-mt/AIOneWebMT.js",
+    "./mt/wasm": "./build/Release-mt/AIOneWebMT.wasm",
+    "./AIOneWeb.js": "./build/Release/AIOneWeb.js",
+    "./AIOneWeb.wasm": "./build/Release/AIOneWeb.wasm",
+    "./AIOneWebMT.js": "./build/Release-mt/AIOneWebMT.js",
+    "./AIOneWebMT.wasm": "./build/Release-mt/AIOneWebMT.wasm",
+    "./build/*": "./build/*",
     "./package.json": "./package.json"
   },
   "files": [
     "AIOne.js",
     "AIOne.d.ts",
-    "AIOneWeb.js",
-    "AIOneWeb.wasm",
     "RPCClient.js",
     "worker-runtime.js",
     "workerfs-bridge.js",
+    "build/Release/AIOneWeb.js",
+    "build/Release/AIOneWeb.wasm",
+    "build/Release-mt/AIOneWebMT.js",
+    "build/Release-mt/AIOneWebMT.wasm",
     "README.md"
   ],
   "publishConfig": {

package/worker-runtime.js

@@ -5,7 +5,36 @@ let mountedFile;
 
 let operationQueue = Promise.resolve();
 
-const BASE_URL = "https://iemand005.github.io/AIOneJS/web/";
+const WORKER_URL = new URL(self.location.href);
+const SEARCH_PARAMS = WORKER_URL.searchParams;
+const USE_THREADS = SEARCH_PARAMS.get("threads") === "1";
+
+const DEFAULT_RUNTIME_DIR = new URL(
+    USE_THREADS ? "./build/Release-mt/" : "./build/Release/",
+    WORKER_URL
+);
+
+const RUNTIME_URL = SEARCH_PARAMS.get("runtime")
+    ? new URL(SEARCH_PARAMS.get("runtime"), WORKER_URL).href
+    : new URL(
+        USE_THREADS ? "AIOneWebMT.js" : "AIOneWeb.js",
+        DEFAULT_RUNTIME_DIR
+    ).href;
+
+const WASM_URL = SEARCH_PARAMS.get("wasm");
+const HAS_EXTERNAL_RUNTIME = typeof Module !== "undefined";
+
+if (!HAS_EXTERNAL_RUNTIME) {
+    importScripts(RUNTIME_URL);
+}
+
+function locateFile(path) {
+    if (WASM_URL) {
+        return new URL(WASM_URL, WORKER_URL).href;
+    }
+
+    return new URL(path, RUNTIME_URL).href;
+}
 
 async function initialize(file) {
     if (session) {
@@ -18,12 +47,13 @@ async function initialize(file) {
 
     if (!initializing && !module) {
         initializing = (async () => {
-            module = await Module({
-                workerFile: file,
+            const moduleOptions = { workerFile: file };
+
+            if (WASM_URL || !HAS_EXTERNAL_RUNTIME) {
+                moduleOptions.locateFile = locateFile;
+            }
 
-                locateFile: path =>
-                    new URL(path, BASE_URL).href
-            });
+            module = await Module(moduleOptions);
 
             mountedFile = file.name;
             session = new module.ModelSession();