fix: cereusdb worker and CDN-backed wasmUrl

Author: erdalkaraca

packages/extension-cereusdb/src/cereusdb-sqldatabase.ts

@@ -15,21 +15,13 @@ async function loadWorkerFactoryForVariant(
 ): Promise<WorkerFactory> {
   switch (variant) {
     case 'minimal':
-      return (
-        await import('./cereusdb-worker-minimal.ts?worker')
-      ).default;
+      return (await import('./cereusdb-worker-minimal.ts?worker')).default;
     case 'standard':
-      return (
-        await import('./cereusdb-worker-standard.ts?worker')
-      ).default;
+      return (await import('./cereusdb-worker-standard.ts?worker')).default;
     case 'full':
-      return (
-        await import('./cereusdb-worker-full.ts?worker')
-      ).default;
+      return (await import('./cereusdb-worker-full.ts?worker')).default;
     case 'global':
-      return (
-        await import('./cereusdb-worker-global.ts?worker')
-      ).default;
+      return (await import('./cereusdb-worker-global.ts?worker')).default;
     default: {
       const neverVariant: never = variant;
       throw new Error(`Unknown CereusDB variant: ${String(neverVariant)}`);

packages/extension-cereusdb/src/cereusdb-worker-full.ts

@@ -1,6 +1,8 @@
 import { CereusDB } from '@cereusdb/full';
-import { runCereusWorker } from './cereusdb-worker-runtime';
+import { cereusWasmUrl, runCereusWorker } from './cereusdb-worker-runtime';
 
 runCereusWorker(async () => {
-  return (await CereusDB.create()) as Awaited<ReturnType<typeof CereusDB.create>>;
+  return (await CereusDB.create({
+    wasmUrl: cereusWasmUrl('@cereusdb/full'),
+  })) as Awaited<ReturnType<typeof CereusDB.create>>;
 });

packages/extension-cereusdb/src/cereusdb-worker-global.ts

@@ -1,6 +1,8 @@
 import { CereusDB } from '@cereusdb/global';
-import { runCereusWorker } from './cereusdb-worker-runtime';
+import { cereusWasmUrl, runCereusWorker } from './cereusdb-worker-runtime';
 
 runCereusWorker(async () => {
-  return (await CereusDB.create()) as Awaited<ReturnType<typeof CereusDB.create>>;
+  return (await CereusDB.create({
+    wasmUrl: cereusWasmUrl('@cereusdb/global'),
+  })) as Awaited<ReturnType<typeof CereusDB.create>>;
 });

packages/extension-cereusdb/src/cereusdb-worker-minimal.ts

@@ -1,6 +1,8 @@
 import { CereusDB } from '@cereusdb/minimal';
-import { runCereusWorker } from './cereusdb-worker-runtime';
+import { cereusWasmUrl, runCereusWorker } from './cereusdb-worker-runtime';
 
 runCereusWorker(async () => {
-  return (await CereusDB.create()) as Awaited<ReturnType<typeof CereusDB.create>>;
+  return (await CereusDB.create({
+    wasmUrl: cereusWasmUrl('@cereusdb/minimal'),
+  })) as Awaited<ReturnType<typeof CereusDB.create>>;
 });

packages/extension-cereusdb/src/cereusdb-worker-runtime.ts

@@ -1,4 +1,5 @@
 /** Shared surface used by each variant worker entry. */
+import pkg from '../package.json';
 
 export type CereusDbApi = {
   sqlJSON: (sql: string) => Promise<Record<string, unknown>[]>;
@@ -12,6 +13,25 @@ type CereusWorkerMessage = {
 };
 
 type CreateDb = () => Promise<CereusDbApi>;
+const DEFAULT_CEREUS_CDN_BASE = 'https://cdn.jsdelivr.net/npm';
+const CEREUS_DEPENDENCIES = (pkg.dependencies ?? {}) as Record<string, string>;
+
+export function cereusWasmUrl(
+  packageName:
+    | '@cereusdb/minimal'
+    | '@cereusdb/standard'
+    | '@cereusdb/full'
+    | '@cereusdb/global',
+): string {
+  const configuredBase = (self as unknown as { __cereusdbCdnBase?: string })
+    .__cereusdbCdnBase;
+  const base = (configuredBase && configuredBase.trim()) || DEFAULT_CEREUS_CDN_BASE;
+  const normalized = base.replace(/\/+$/, '');
+  const spec = (CEREUS_DEPENDENCIES[packageName] ?? '').trim();
+  const resolvedVersion = spec.replace(/^[~^><=\s]*/, '');
+  const packageRef = resolvedVersion ? `${packageName}@${resolvedVersion}` : packageName;
+  return `${normalized}/${packageRef}/dist/wasm/cereusdb_bg.wasm`;
+}
 
 export function runCereusWorker(createDb: CreateDb): void {
   let db: CereusDbApi | null = null;

packages/extension-cereusdb/src/cereusdb-worker-standard.ts

@@ -1,6 +1,8 @@
 import { CereusDB } from '@cereusdb/standard';
-import { runCereusWorker } from './cereusdb-worker-runtime';
+import { cereusWasmUrl, runCereusWorker } from './cereusdb-worker-runtime';
 
 runCereusWorker(async () => {
-  return (await CereusDB.create()) as Awaited<ReturnType<typeof CereusDB.create>>;
+  return (await CereusDB.create({
+    wasmUrl: cereusWasmUrl('@cereusdb/standard'),
+  })) as Awaited<ReturnType<typeof CereusDB.create>>;
 });

packages/extension-cereusdb/src/vite-env.d.ts

@@ -8,3 +8,7 @@ declare module '*?worker&inline' {
   const WorkerFactory: new () => Worker;
   export default WorkerFactory;
 }
+declare module '*?worker&url' {
+  const workerUrl: string;
+  export default workerUrl;
+}

packages/extension-pwa/package.json

@@ -9,8 +9,8 @@
       "import": "./dist/index.js"
     },
     "./vite": {
-      "types": "./src/vite-pwa-plugin.d.ts",
-      "import": "./src/vite-pwa-plugin.js"
+      "types": "./dist/vite-pwa-plugin.d.ts",
+      "import": "./dist/vite-pwa-plugin.js"
     },
     "./sw": {
       "import": "./src/sw.ts"
@@ -29,9 +29,7 @@
   "types": "./dist/index.d.ts",
   "files": [
     "dist",
-    "src/sw.ts",
-    "src/vite-pwa-plugin.js",
-    "src/vite-pwa-plugin.d.ts"
+    "src/sw.ts"
   ],
   "scripts": {
     "build": "vite build"

packages/extension-pwa/src/vite-pwa-plugin.d.ts

@@ -1,10 +1,19 @@
 import { fileURLToPath } from 'url';
 import path from 'path';
+import type { PluginOption } from 'vite';
 import { VitePWA } from 'vite-plugin-pwa';
 
+export type CreateDocksPwaPluginOptions = {
+  basePath: string;
+  appName: string;
+  appDescription: string;
+  maximumFileSizeToCacheInBytes: number;
+  shortName?: string;
+};
+
 const DEFAULT_GLOB_PATTERNS = ['**/*.{js,css,html,ico,png,svg,webp,woff2,woff,ttf,wasm}'];
 const DEFAULT_ASSETS = ['favicon.svg', 'logo.svg', 'logo-loading.svg'];
-const pwaSwPath = fileURLToPath(new URL('./sw.ts', import.meta.url));
+const pwaSwPath = fileURLToPath(import.meta.resolve('@eclipse-docks/extension-pwa/sw'));
 const pwaSwDir = path.dirname(pwaSwPath);
 const pwaSwFilename = path.basename(pwaSwPath);
 
@@ -14,7 +23,7 @@ export function createDocksPwaPlugin({
   appDescription,
   maximumFileSizeToCacheInBytes,
   shortName = appName,
-}) {
+}: CreateDocksPwaPluginOptions): PluginOption {
   return VitePWA({
     registerType: 'autoUpdate',
     injectRegister: 'inline',