@effindomv2/create-fui-as-app 0.1.33 → 0.1.35

package/dist/src/versions.d.ts

@@ -1,2 +1,2 @@
-export declare const FUI_AS_VERSION = "0.1.27";
-export declare const RUNTIME_VERSION = "0.1.10";
+export declare const FUI_AS_VERSION = "0.1.29";
+export declare const RUNTIME_VERSION = "0.1.12";

package/dist/src/versions.js

@@ -1,2 +1,2 @@
-export const FUI_AS_VERSION = "0.1.27";
-export const RUNTIME_VERSION = "0.1.10";
+export const FUI_AS_VERSION = "0.1.29";
+export const RUNTIME_VERSION = "0.1.12";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effindomv2/create-fui-as-app",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "private": false,
   "license": "MIT",
   "description": "Scaffold a minimal EffinDom v2 FUI-AS app",

package/templates/hello/asconfig.json

@@ -19,6 +19,6 @@
     }
   },
   "options": {
-    "runtime": "stub"
+    "runtime": "minimal"
   }
 }

package/templates/mvc/README.md

@@ -38,6 +38,28 @@ For example, to ship custom fonts alongside the bundled Noto set:
 2. Add `"fonts/*.ttf": "fonts"` to `stage-assets.json`.
 3. Reference them in app code as `/runtime/fonts/YourFont.ttf`.
 
+## Workers
+
+Workers are compiled as separate WASM modules and loaded on demand via `Worker.start(...)`. The worker manifest lives at `src/worker-config.ts`; add entries there for each worker entrypoint.
+
+### Adding a worker
+
+1. Create a worker module in `src/workers/` (use `advanced_workers.ts` as a reference).
+2. Register it in `src/worker-config.ts`.
+3. Add build scripts in `package.json` (copy the `build:wasm:workers:advanced` pattern).
+4. Define any host services the worker needs in `src/host/worker-host-services.ts`, then regenerate with `npm run generate:worker-host-services`.
+5. Ensure `worker-host-services.ts` at the project root registers the services under `globalThis.__fuiWorkerHostServicesModule`.
+
+The harness (`harness.ts`) already wires `workerHostServices` to `startRoutedHarness`. Workers are available from any route via:
+
+```ts
+const worker = Worker.start("advanced-workers")
+  .onProgress(this, (view, message) => { ... })
+  .onComplete(this, (view, result) => { ... })
+  .onError(this, (view, message) => { ... });
+worker.sendString("input-data");
+```
+
 ## Routing + deployment model
 
 Each route builds to its own wasm (`home.wasm`, `settings.wasm`) and is mounted by routed harness config. This is designed for true MFE slices: each route app can evolve and deploy independently while still sharing the same browser host/runtime contract.

package/templates/mvc/asconfig.json

@@ -19,6 +19,6 @@
     }
   },
   "options": {
-    "runtime": "stub"
+    "runtime": "minimal"
   }
 }

package/templates/mvc/harness.ts

@@ -24,4 +24,8 @@ startRoutedHarness<RouteExports>({
   },
   hostEvents: appHostEvents,
   hostServices: appHostServices,
+  workerHostServices: {
+    scriptUrl: new URL('./worker-host-services.js', import.meta.url).toString(),
+    exportName: 'appWorkerHostServices',
+  },
 });

package/templates/mvc/package.json

@@ -5,9 +5,9 @@
   "type": "module",
   "description": "Scaffolded FUI-AS routed app",
   "scripts": {
-    "build": "npm run generate:host && npm run build:assets && npm run build:wasm && npm run build:harness",
-    "build:dev": "npm run generate:host && npm run build:assets && npm run build:wasm:dev && npm run build:harness",
-    "publish": "npm run generate:host && npm run build:assets && npm run build:wasm:publish && npm run build:harness && npm run publish:stage",
+    "build": "npm run generate:host && npm run build:assets && npm run build:wasm && npm run build:wasm:workers && npm run build:harness && npm run build:worker-bootstrap && npm run build:worker-host-services",
+    "build:dev": "npm run generate:host && npm run build:assets && npm run build:wasm:dev && npm run build:wasm:workers:dev && npm run build:harness && npm run build:worker-bootstrap && npm run build:worker-host-services",
+    "publish": "npm run generate:host && npm run build:assets && npm run build:wasm:publish && npm run build:wasm:workers:publish && npm run build:harness && npm run build:worker-bootstrap && npm run build:worker-host-services && npm run publish:stage",
     "build:assets": "tsx scripts/prepare-runtime.ts",
     "build:wasm": "npm run build:wasm:home && npm run build:wasm:settings",
     "build:wasm:home": "asc src/routes/HomeApp.ts --config asconfig.json --target release --outFile public/home.wasm",
@@ -19,9 +19,17 @@
     "build:wasm:publish:home": "asc src/routes/HomeApp.ts --config asconfig.json --target release --optimizeLevel 3 --shrinkLevel 2 --noAssert --outFile public/home.wasm",
     "build:wasm:publish:settings": "asc src/routes/SettingsApp.ts --config asconfig.json --target release --optimizeLevel 3 --shrinkLevel 2 --noAssert --outFile public/settings.wasm",
     "build:harness": "esbuild harness.ts --bundle --format=esm --platform=browser --outfile=public/harness.js",
+    "build:worker-host-services": "esbuild worker-host-services.ts --bundle --format=esm --platform=browser --outfile=public/worker-host-services.js",
+    "build:worker-bootstrap": "esbuild node_modules/@effindomv2/fui-as/browser/src/worker-bootstrap.ts --bundle --format=esm --platform=browser --outfile=public/worker-bootstrap.js",
+
+    "build:wasm:workers": "tsx scripts/build-worker-wasm.ts --all --target release",
+    "build:wasm:workers:dev": "tsx scripts/build-worker-wasm.ts --all --target debug",
+    "build:wasm:workers:publish": "tsx scripts/build-worker-wasm.ts --all --target release --publish",
     "generate:host-services": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-services.ts src/host/host-services.ts appHostServices src/host/generated/HostServices.ts ../../fui/FuiPrimitives",
     "generate:host-events": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-events.ts src/host/host-events.ts appHostEvents src/host/generated/HostEvents.ts ../../fui/FuiPrimitives",
     "generate:host": "npm run generate:host-services && npm run generate:host-events",
+    "generate:worker-host-services": "tsx ./node_modules/@effindomv2/fui-as/scripts/generate-host-services.ts src/host/worker-host-services.ts appWorkerHostServices src/host/generated/WorkerHostServices.ts ../../fui/FuiPrimitives fui_host_service",
+    "generate:all": "npm run generate:host && npm run generate:worker-host-services",
     "publish:stage": "rm -rf published && mkdir -p published && cp -R public/. published/ && cp -f index.html published/index.html && cp -f route-shell.html published/route-shell.html",
     "watch": "chokidar \"src/**/*.ts\" \"harness.ts\" \"route-shell.html\" \"index.html\" \"asconfig.json\" --ignore \"src/host/generated/**\" -c \"npm run build:dev\"",
     "serve": "serve public --listen 8080",

package/templates/mvc/scripts/build-worker-wasm.ts

@@ -0,0 +1,66 @@
+import { spawnSync } from "node:child_process";
+import { mkdirSync } from "node:fs";
+import { workerManifest } from "../src/worker-config";
+
+const args = process.argv.slice(2);
+let target = "release";
+let publish = false;
+let workerKey = "";
+let buildAll = false;
+
+for (let index = 0; index < args.length; index += 1) {
+  const arg = args[index];
+  switch (arg) {
+    case "--all":
+      buildAll = true;
+      break;
+    case "--worker":
+      workerKey = args[++index] ?? "";
+      break;
+    case "--target":
+      target = args[++index] ?? "release";
+      break;
+    case "--publish":
+      publish = true;
+      break;
+    default:
+      if (workerKey === "") {
+        workerKey = arg;
+      } else {
+        throw new Error(`Unknown argument: ${arg}`);
+      }
+      break;
+  }
+}
+
+const selectedWorkers = buildAll
+  ? workerManifest
+  : workerManifest.filter((worker): boolean => worker.key === workerKey);
+
+if (!buildAll && selectedWorkers.length === 0) {
+  throw new Error(`Unknown worker key: ${workerKey}`);
+}
+
+mkdirSync("public", { recursive: true });
+
+for (const worker of selectedWorkers) {
+  const ascArgs = [
+    worker.entrypoint,
+    "--config",
+    "asconfig.json",
+    "--target",
+    target,
+    "--outFile",
+    `public/${worker.wasmFile}`,
+  ];
+
+  if (publish) {
+    ascArgs.push("--optimizeLevel", "3", "--shrinkLevel", "2", "--noAssert");
+  }
+
+  console.log(`Building worker ${worker.key} -> ${worker.wasmFile}`);
+  const result = spawnSync("asc", ascArgs, { stdio: "inherit" });
+  if (result.status !== 0) {
+    process.exit(result.status ?? 1);
+  }
+}

package/templates/mvc/scripts/prepare-runtime.ts

@@ -100,6 +100,7 @@ writeFileSync(
   "utf8",
 );
 copyFileSync("favicon.ico", `${outputDir}/favicon.ico`);
+copyFileSync("worker-manifest.json", `${outputDir}/worker-manifest.json`);
 const defaultRoute = resolvedManifest.routes.length == 0 ? undefined : resolvedManifest.routes[0];
 const defaultRouteTitle = defaultRoute == null ? "FUI-AS Routed App" : defaultRoute.title;
 const defaultRouteHref = defaultRoute == null ? "/home/" : defaultRoute.publishedRoutePath;

package/templates/mvc/src/host/generated/WorkerHostServices.ts

@@ -0,0 +1,9 @@
+// @ts-nocheck
+// Generated by scripts/generate-host-services.ts from ./src/host/worker-host-services.ts#appWorkerHostServices.
+
+@external("fui_host_service", "appWorkerClockWallClockSinceEpochMs")
+declare function __host_appWorkerClockWallClockSinceEpochMs(): f64;
+
+export function appWorkerClockWallClockSinceEpochMs(): f64 {
+  return __host_appWorkerClockWallClockSinceEpochMs();
+}

package/templates/mvc/src/host/worker-host-services.ts

@@ -0,0 +1,13 @@
+import { defineHostServices, hostService } from "@effindomv2/fui-as/browser/host-services";
+
+export const appWorkerHostServices = defineHostServices({
+  appWorkerClock: {
+    wallClockSinceEpochMs: hostService({
+      args: [] as const,
+      returns: "f64",
+      implementation() {
+        return Date.now();
+      },
+    }),
+  },
+});

package/templates/mvc/src/worker-config.ts

@@ -0,0 +1,13 @@
+export interface WorkerEntry {
+  readonly key: string;
+  readonly entrypoint: string;
+  readonly wasmFile: string;
+}
+
+export const workerManifest: readonly WorkerEntry[] = [
+  {
+    key: "advanced-workers",
+    entrypoint: "src/workers/advanced_workers.ts",
+    wasmFile: "advanced-workers.wasm",
+  },
+];

package/templates/mvc/src/workers/advanced_workers.ts

@@ -0,0 +1,96 @@
+export * from "@effindomv2/fui-as/src/FuiWorkerExports";
+
+import { WorkerJob } from "@effindomv2/fui-as/src/FuiWorker";
+import { appWorkerClockWallClockSinceEpochMs } from "../host/generated/WorkerHostServices";
+
+const PRIME_SEARCH_TOTAL_MS: f64 = 5000.0;
+const PRIME_SEARCH_YIELD_INTERVAL_MS: f64 = 1000.0;
+const PRIME_TIME_CHECK_MASK: i32 = 127;
+
+function parsePrimeSearchPercent(startedAtMs: f64, nowMs: f64): i32 {
+  const elapsedMs = nowMs - startedAtMs;
+  if (elapsedMs <= 0.0) {
+    return 0;
+  }
+  if (elapsedMs >= PRIME_SEARCH_TOTAL_MS) {
+    return 100;
+  }
+  return <i32>((elapsedMs * 100.0) / PRIME_SEARCH_TOTAL_MS);
+}
+
+function isPrime(value: i32): bool {
+  if (value < 2) {
+    return false;
+  }
+  if (value == 2) {
+    return true;
+  }
+  if ((value & 1) == 0) {
+    return false;
+  }
+  let divisor: i32 = 3;
+  while (divisor <= value / divisor) {
+    if (value % divisor == 0) {
+      return false;
+    }
+    divisor += 2;
+  }
+  return true;
+}
+
+class LargestPrimeCalculatorJob extends WorkerJob {
+  private startedAtMs: f64 = 0.0;
+  private deadlineMs: f64 = 0.0;
+  private nextYieldAtMs: f64 = 0.0;
+  private candidate: i32 = 2;
+  private largestPrime: i32 = 2;
+
+  protected onStart(): void {
+    this.receiveMessage();
+    const now = appWorkerClockWallClockSinceEpochMs();
+    this.startedAtMs = now;
+    this.deadlineMs = now + PRIME_SEARCH_TOTAL_MS;
+    this.nextYieldAtMs = now + PRIME_SEARCH_YIELD_INTERVAL_MS;
+    this.candidate = 2;
+    this.largestPrime = 2;
+  }
+
+  run(): void {
+    if (this.isCancelled()) {
+      this.fail("cancelled:" + parsePrimeSearchPercent(this.startedAtMs, appWorkerClockWallClockSinceEpochMs()).toString());
+      return;
+    }
+    let now = appWorkerClockWallClockSinceEpochMs();
+    const sliceDeadline = this.nextYieldAtMs < this.deadlineMs ? this.nextYieldAtMs : this.deadlineMs;
+    while (now < sliceDeadline) {
+      if (isPrime(this.candidate)) {
+        this.largestPrime = this.candidate;
+      }
+      this.candidate += 1;
+      if ((this.candidate & PRIME_TIME_CHECK_MASK) == 0) {
+        now = appWorkerClockWallClockSinceEpochMs();
+      }
+    }
+    now = appWorkerClockWallClockSinceEpochMs();
+    this.reportProgress(parsePrimeSearchPercent(this.startedAtMs, now).toString());
+    if (now >= this.deadlineMs) {
+      this.complete(this.largestPrime.toString());
+      return;
+    }
+    this.nextYieldAtMs += PRIME_SEARCH_YIELD_INTERVAL_MS;
+    if (this.nextYieldAtMs > this.deadlineMs) {
+      this.nextYieldAtMs = this.deadlineMs;
+    }
+    this.yield();
+  }
+}
+
+let largestPrimeCalculatorJob: LargestPrimeCalculatorJob | null = null;
+
+export function largestPrimeCalculatorWorker(): void {
+  let activeJob = largestPrimeCalculatorJob;
+  if (activeJob === null) {
+    activeJob = new LargestPrimeCalculatorJob();
+  }
+  largestPrimeCalculatorJob = WorkerJob.resume<LargestPrimeCalculatorJob>(activeJob);
+}

package/templates/mvc/worker-host-services.ts

@@ -0,0 +1,11 @@
+import { appWorkerHostServices } from "./src/host/worker-host-services";
+
+declare global {
+  // eslint-disable-next-line no-var
+  var __fuiWorkerHostServicesModule: Record<string, unknown> | undefined;
+}
+
+globalThis.__fuiWorkerHostServicesModule = {
+  ...(globalThis.__fuiWorkerHostServicesModule ?? {}),
+  appWorkerHostServices,
+};

package/templates/mvc/worker-manifest.json

@@ -0,0 +1,6 @@
+{
+  "version": 1,
+  "entries": {
+    "largestPrimeCalculatorWorker": "./advanced-workers.wasm"
+  }
+}