@kbve/droid 0.0.5 → 0.0.6

package/README.md

@@ -20,6 +20,7 @@ Droid requires a few runtime dependencies to provide its full feature set:
 - [@nanostores/persistent](https://www.npmjs.com/package/@nanostores/persistent): Persistent state management
 - [dexie](https://www.npmjs.com/package/dexie): IndexedDB wrapper for browser storage
 - [zod](https://www.npmjs.com/package/zod): TypeScript-first schema validation
+- [flatbuffers](https://www.npmjs.com/flatbuffers) - Flatbuffers
 
 These dependencies are automatically installed when you add Droid to your project. If you plan to use Droid with specific frameworks or build tools, you may need to install related peer dependencies (such as React, Vue, or Angular) according to your project requirements.
 
@@ -40,4 +41,5 @@ For questions, help, or to connect with the community, support can be reached vi
 
 ### Chores
 
-Preparing to release next batch, trying to resolving the CDN issue, which might still be broken.
+Preparing to release next batch, trying to resolving the CDN issue, which might still be broken.
+Updating the order on the init functions, but we will still have a CDN error that needs to be resolved.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kbve/droid",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "A manager for web, shared and service workers, aimming to make it as modular and upgradable.",
   "keywords": [
     "workers",

package/src/lib/workers/main.ts

@@ -41,66 +41,78 @@ function deepProxy<T>(obj: T): T {
 
 	return obj;
 }
-
 async function initWsComlink(opts?: {
   workerRef?: SharedWorker;
   workerURL?: string;
 }): Promise<Remote<WSInstance>> {
   let api: Remote<WSInstance> | null = null;
 
-  // 1. Try Vite-style import
-  try {
-    const worker = new SharedWorker(new URL('./ws-worker.ts', import.meta.url), {
-      type: 'module',
-    });
-    worker.port.start();
-    api = wrap<WSInstance>(worker.port);
-  } catch (err) {
-    console.warn('[DROID] ws-worker import.meta fallback failed:', err);
-  }
-
-  // 2. Try hardcoded path
-  if (!api) {
-    try {
-      const worker = new SharedWorker('/ws-worker.js', { type: 'module' });
-      worker.port.start();
-      api = wrap<WSInstance>(worker.port);
-    } catch (err) {
-      console.warn('[DROID] ws-worker hardcoded fallback failed:', err);
-    }
-  }
-
-  // 3. Try provided SharedWorker reference
-  if (!api && opts?.workerRef) {
+  // 1. Try provided SharedWorker reference
+  if (opts?.workerRef) {
     try {
       opts.workerRef.port.start();
       api = wrap<WSInstance>(opts.workerRef.port);
+      return api;
     } catch (err) {
       console.warn('[DROID] ws-worker workerRef failed:', err);
     }
   }
 
-  // 4. Try provided URL
-  if (!api && opts?.workerURL) {
+  // 2. Try provided URL (e.g. from CDN or blob)
+  if (opts?.workerURL) {
     try {
       const worker = new SharedWorker(opts.workerURL, { type: 'module' });
       worker.port.start();
       api = wrap<WSInstance>(worker.port);
+      return api;
     } catch (err) {
       console.warn('[DROID] ws-worker workerURL failed:', err);
     }
   }
 
-  // 5. Final failure
-  if (!api) {
-    console.error('[DROID] No WS Worker Comlink Initialized');
-    throw new Error('[DROID] Failed to initialize ws-worker');
+  // 3. Vite-style TS import
+  try {
+    const worker = new SharedWorker(
+      new URL('./ws-worker.ts', import.meta.url),
+      { type: 'module' },
+    );
+    worker.port.start();
+    api = wrap<WSInstance>(worker.port);
+    return api;
+  } catch (err) {
+    console.warn('[DROID] ws-worker vite-style .ts import failed:', err);
   }
 
-  return api;
+  // 4. Same-dir JS fallback (post-build)
+  try {
+    const worker = new SharedWorker(
+      new URL('./ws-worker.js', import.meta.url),
+      { type: 'module' },
+    );
+    worker.port.start();
+    api = wrap<WSInstance>(worker.port);
+    return api;
+  } catch (err) {
+    console.warn('[DROID] ws-worker ./ws-worker.js fallback failed:', err);
+  }
+
+  // 5. Browser-root hardcoded path (static /public/)
+  try {
+    const worker = new SharedWorker('/ws-worker.js', { type: 'module' });
+    worker.port.start();
+    api = wrap<WSInstance>(worker.port);
+    return api;
+  } catch (err) {
+    console.warn('[DROID] ws-worker absolute hardcoded fallback failed:', err);
+  }
+
+  // 6. Final failure
+  console.error('[DROID] No WS Worker Comlink Initialized');
+  throw new Error('[DROID] Failed to initialize ws-worker');
 }
 
 
+
 //	* UIUX
 const uiuxState = persistentMap<{
 	panelManager: Record<
@@ -133,52 +145,71 @@ const uiuxState = persistentMap<{
 );
 
 async function initCanvasComlink(opts?: {
-	workerRef?: Worker;
-	workerURL?: string;
+  workerRef?: Worker;
+  workerURL?: string;
 }): Promise<Remote<CanvasWorkerAPI>> {
-	// 1. Try Vite-style import resolution
-	try {
-		const worker = new Worker(
-			new URL('./canvas-worker.ts', import.meta.url),
-			{ type: 'module' },
-		);
-		return wrap<CanvasWorkerAPI>(worker);
-	} catch (err) {
-		console.warn('[DROID] Vite-style canvas-worker import failed:', err);
-	}
+  let api: Remote<CanvasWorkerAPI> | null = null;
 
-	// 2. Try hardcoded path fallback
-	try {
-		const worker = new Worker('./canvas-worker.js', { type: 'module' });
-		return wrap<CanvasWorkerAPI>(worker);
-	} catch (err) {
-		console.warn('[DROID] Fallback /canvas-worker.js failed:', err);
-	}
+  // 1. Try direct Worker reference
+  if (opts?.workerRef) {
+    try {
+      api = wrap<CanvasWorkerAPI>(opts.workerRef);
+      return api;
+    } catch (err) {
+      console.warn('[DROID] Provided canvasWorkerRef failed:', err);
+    }
+  }
 
-	// 3. Try direct Worker instance
-	if (opts?.workerRef) {
-		try {
-			return wrap<CanvasWorkerAPI>(opts.workerRef);
-		} catch (err) {
-			console.warn('[DROID] Provided workerRef failed:', err);
-		}
-	}
+  // 2. Try provided worker URL
+  if (opts?.workerURL) {
+    try {
+      const worker = new Worker(opts.workerURL, { type: 'module' });
+      api = wrap<CanvasWorkerAPI>(worker);
+      return api;
+    } catch (err) {
+      console.warn('[DROID] Provided canvasWorkerURL failed:', err);
+    }
+  }
 
-	// 4. Try provided URL
-	if (opts?.workerURL) {
-		try {
-			const worker = new Worker(opts.workerURL, { type: 'module' });
-			return wrap<CanvasWorkerAPI>(worker);
-		} catch (err) {
-			console.warn('[DROID] Provided workerURL failed:', err);
-		}
-	}
+  // 3. Vite-style dev import (.ts)
+  try {
+    const worker = new Worker(
+      new URL('./canvas-worker.ts', import.meta.url),
+      { type: 'module' },
+    );
+    api = wrap<CanvasWorkerAPI>(worker);
+    return api;
+  } catch (err) {
+    console.warn('[DROID] Vite-style canvas-worker.ts import failed:', err);
+  }
 
-	// 5. Failure
-	console.error('[DROID] No Canvas Comlink Initialized');
-	throw new Error('[DROID] Failed to initialize canvas worker');
+  // 4. Same-dir .js fallback (build output)
+  try {
+    const worker = new Worker(
+      new URL('./canvas-worker.js', import.meta.url),
+      { type: 'module' },
+    );
+    api = wrap<CanvasWorkerAPI>(worker);
+    return api;
+  } catch (err) {
+    console.warn('[DROID] canvas-worker.js (same dir) fallback failed:', err);
+  }
+
+  // 5. Runtime hardcoded absolute path (public/)
+  try {
+    const worker = new Worker('/canvas-worker.js', { type: 'module' });
+    api = wrap<CanvasWorkerAPI>(worker);
+    return api;
+  } catch (err) {
+    console.warn('[DROID] canvas-worker.js (absolute root) fallback failed:', err);
+  }
+
+  // 6. Final failure
+  console.error('[DROID] No Canvas Comlink Initialized');
+  throw new Error('[DROID] Failed to initialize canvas worker');
 }
 
+
 export const uiux = {
 	state: uiuxState,
 	openPanel(id: PanelId, payload?: PanelPayload) {
@@ -331,77 +362,89 @@ function initSWComlink() {
 	]);
 	channel.port1.start();
 }
-
 async function initStorageComlink(opts?: {
-	workerRef?: SharedWorker;
-	workerURL?: string;
+  workerRef?: SharedWorker;
+  workerURL?: string;
 }): Promise<Remote<LocalStorageAPI>> {
-	let api: Remote<LocalStorageAPI> | null = null;
-	// 1. Try Vite-style import
-	try {
-		const worker = new SharedWorker(
-			new URL('./db-worker.ts', import.meta.url),
-			{
-				type: 'module',
-			},
-		);
-		worker.port.start();
-		api = wrap<LocalStorageAPI>(worker.port);
-	} catch (err) {
-		console.warn('[DROID] db-worker import.meta fallback failed:', err);
-	}
+  let api: Remote<LocalStorageAPI> | null = null;
 
-	// 2. Try hardcoded path
-	if (!api) {
-		try {
-			const worker = new SharedWorker('/db-worker.js', {
-				type: 'module',
-			});
-			worker.port.start();
-			api = wrap<LocalStorageAPI>(worker.port);
-		} catch (err) {
-			console.warn('[DROID] db-worker hardcoded fallback failed:', err);
-		}
-	}
+  // 1. Try provided SharedWorker reference
+  if (opts?.workerRef) {
+    try {
+      opts.workerRef.port.start();
+      api = wrap<LocalStorageAPI>(opts.workerRef.port);
+      return await finalize(api);
+    } catch (err) {
+      console.warn('[DROID] db-worker workerRef failed:', err);
+    }
+  }
 
-	// 3. Try provided SharedWorker reference
-	if (!api && opts?.workerRef) {
-		try {
-			opts.workerRef.port.start();
-			api = wrap<LocalStorageAPI>(opts.workerRef.port);
-		} catch (err) {
-			console.warn('[DROID] db-worker workerRef failed:', err);
-		}
-	}
+  // 2. Try provided worker URL
+  if (opts?.workerURL) {
+    try {
+      const worker = new SharedWorker(opts.workerURL, { type: 'module' });
+      worker.port.start();
+      api = wrap<LocalStorageAPI>(worker.port);
+      return await finalize(api);
+    } catch (err) {
+      console.warn('[DROID] db-worker workerURL failed:', err);
+    }
+  }
 
-	// 4. Try provided URL
-	if (!api && opts?.workerURL) {
-		try {
-			const worker = new SharedWorker(opts.workerURL, { type: 'module' });
-			worker.port.start();
-			api = wrap<LocalStorageAPI>(worker.port);
-		} catch (err) {
-			console.warn('[DROID] db-worker workerURL failed:', err);
-		}
-	}
+  // 3. Vite-style TS dev import
+  try {
+    const worker = new SharedWorker(
+      new URL('./db-worker.ts', import.meta.url),
+      { type: 'module' },
+    );
+    worker.port.start();
+    api = wrap<LocalStorageAPI>(worker.port);
+    return await finalize(api);
+  } catch (err) {
+    console.warn('[DROID] db-worker .ts vite-style import failed:', err);
+  }
 
-	// 5. Final failure
-	if (!api) {
-		console.error('[DROID] No DB Worker Comlink Initialized');
-		throw new Error('[DROID] Failed to initialize db-worker');
-	}
+  // 4. Same-dir .js fallback (production build output)
+  try {
+    const worker = new SharedWorker(
+      new URL('./db-worker.js', import.meta.url),
+      { type: 'module' },
+    );
+    worker.port.start();
+    api = wrap<LocalStorageAPI>(worker.port);
+    return await finalize(api);
+  } catch (err) {
+    console.warn('[DROID] db-worker.js same-dir fallback failed:', err);
+  }
+
+  // 5. Hardcoded browser-root fallback (e.g. /public)
+  try {
+    const worker = new SharedWorker('/db-worker.js', { type: 'module' });
+    worker.port.start();
+    api = wrap<LocalStorageAPI>(worker.port);
+    return await finalize(api);
+  } catch (err) {
+    console.warn('[DROID] db-worker.js absolute hardcoded fallback failed:', err);
+  }
+
+  // 6. Final failure
+  console.error('[DROID] No DB Worker Comlink Initialized');
+  throw new Error('[DROID] Failed to initialize db-worker');
+}
 
-	const version = await api.getVersion();
-	if (version !== EXPECTED_DB_VERSION) {
-		await initializeWorkerDatabase(api, {
-			version: EXPECTED_DB_VERSION,
-			i18nPath: 'https://discord.sh/i18n/db.json',
-			locale: 'en',
-			defaults: { welcome: 'Welcome!', theme: 'dark' },
-		});
-	}
 
-	return api;
+// Internal helper to finalize storage worker setup
+async function finalize(api: Remote<LocalStorageAPI>): Promise<Remote<LocalStorageAPI>> {
+  const version = await api.getVersion();
+  if (version !== EXPECTED_DB_VERSION) {
+    await initializeWorkerDatabase(api, {
+      version: EXPECTED_DB_VERSION,
+      i18nPath: 'https://discord.sh/i18n/db.json',
+      locale: 'en',
+      defaults: { welcome: 'Welcome!', theme: 'dark' },
+    });
+  }
+  return api;
 }
 
 // * Bridge