@slithy/prim-interface 0.4.0 → 0.4.3

package/dist/index.d.ts

@@ -34,7 +34,7 @@ interface RunCallbacks {
     onStart?: (raster: HTMLCanvasElement, svg: SVGSVGElement) => void;
     onStep?: (result: StepResult) => void;
     onComplete?: (serialized: SerializedOutput) => void;
-    onStop?: () => void;
+    onStop?: (serialized: SerializedOutput | null) => void;
     onError?: (message: string) => void;
 }
 interface JobHandle {

package/dist/index.js

@@ -4,13 +4,15 @@ function run(source, cfg, callbacks = {}) {
   const url = source instanceof File ? URL.createObjectURL(source) : source;
   let optimizer = null;
   let stopped = false;
+  let computeCfg = null;
+  const accumulatedSteps = [];
   Canvas.original(url, cfg).then((original) => {
     if (stopped) {
       if (source instanceof File) URL.revokeObjectURL(url);
       return;
     }
     if (source instanceof File) URL.revokeObjectURL(url);
-    const computeCfg = { ...cfg, width: cfg.width, height: cfg.height };
+    computeCfg = { ...cfg, width: cfg.width, height: cfg.height };
     const pixelRatio = cfg.pixelRatio ?? 1;
     const viewCfg = { ...computeCfg, width: computeCfg.scale * computeCfg.width, height: computeCfg.scale * computeCfg.height };
     const deviceViewCfg = { ...viewCfg, width: viewCfg.width * pixelRatio, height: viewCfg.height * pixelRatio };
@@ -23,7 +25,6 @@ function run(source, cfg, callbacks = {}) {
     svg.setAttribute("height", String(viewCfg.height));
     callbacks.onStart?.(rasterNode, svg);
     const serializer = new XMLSerializer();
-    const accumulatedSteps = [];
     optimizer = new Optimizer(original, computeCfg);
     let stepCount = 0;
     optimizer.onStep = (step) => {
@@ -65,7 +66,14 @@ function run(source, cfg, callbacks = {}) {
     stop: () => {
       stopped = true;
       optimizer?.stop();
-      callbacks.onStop?.();
+      callbacks.onStop?.(computeCfg ? {
+        v: 1,
+        w: computeCfg.width,
+        h: computeCfg.height,
+        scale: computeCfg.scale,
+        fill: parseColor(cfg.fill),
+        steps: accumulatedSteps
+      } : null);
     },
     pause: () => optimizer?.pause(),
     resume: () => optimizer?.resume()
@@ -123,7 +131,7 @@ function runWorker(source, cfg, callbacks = {}) {
       callbacks.onComplete?.(msg.serialized);
     } else if (msg.type === "stopped") {
       if (isBlob) URL.revokeObjectURL(url);
-      callbacks.onStop?.();
+      callbacks.onStop?.(msg.serialized);
     } else if (msg.type === "error") {
       if (isBlob) URL.revokeObjectURL(url);
       callbacks.onError?.(msg.message);

package/dist/worker-entry.d.ts

@@ -41,6 +41,7 @@ type WorkerOutbound = {
     serialized: SerializedOutput;
 } | {
     type: 'stopped';
+    serialized: SerializedOutput | null;
 } | {
     type: 'error';
     message: string;

package/dist/worker-entry.js

@@ -11,6 +11,8 @@ var SHAPES = {
   Glyph
 };
 var optimizer = null;
+var computeCfg = null;
+var accumulatedSteps = [];
 self.onmessage = async (e) => {
   const msg = e.data;
   switch (msg.type) {
@@ -50,7 +52,8 @@ self.onmessage = async (e) => {
       }
       const original = Canvas.fromBitmap(bitmap, preCfg);
       bitmap.close();
-      const computeCfg = { ...preCfg, width: preCfg.width, height: preCfg.height };
+      computeCfg = { ...preCfg, width: preCfg.width, height: preCfg.height };
+      accumulatedSteps = [];
       self.postMessage({
         type: "ready",
         width: computeCfg.width,
@@ -58,9 +61,9 @@ self.onmessage = async (e) => {
         scale: computeCfg.scale,
         fill: computeCfg.fill
       });
-      const accumulatedSteps = [];
       let stepCount = 0;
-      optimizer = new Optimizer(original, computeCfg, (fn) => setTimeout(fn, 0));
+      const cc = computeCfg;
+      optimizer = new Optimizer(original, cc, (fn) => setTimeout(fn, 0));
       optimizer.onStep = (step) => {
         stepCount++;
         if (step) {
@@ -71,19 +74,19 @@ self.onmessage = async (e) => {
             stepData,
             progress: {
               current: stepCount,
-              total: computeCfg.steps,
+              total: cc.steps,
               similarity: parseFloat((100 * (1 - step.distance)).toFixed(2))
             }
           };
           self.postMessage(outbound);
         }
-        if (stepCount >= computeCfg.steps) {
+        if (stepCount >= cc.steps) {
           const serialized = {
             v: 1,
-            w: computeCfg.width,
-            h: computeCfg.height,
-            scale: computeCfg.scale,
-            fill: parseColor(computeCfg.fill),
+            w: cc.width,
+            h: cc.height,
+            scale: cc.scale,
+            fill: parseColor(cc.fill),
             steps: accumulatedSteps
           };
           self.postMessage({ type: "complete", serialized });
@@ -100,7 +103,14 @@ self.onmessage = async (e) => {
       break;
     case "stop":
       optimizer?.stop();
-      self.postMessage({ type: "stopped" });
+      self.postMessage({ type: "stopped", serialized: computeCfg ? {
+        v: 1,
+        w: computeCfg.width,
+        h: computeCfg.height,
+        scale: computeCfg.scale,
+        fill: parseColor(computeCfg.fill),
+        steps: accumulatedSteps
+      } : null });
       break;
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slithy/prim-interface",
-  "version": "0.4.0",
+  "version": "0.4.3",
   "description": "Browser-facing API for primitive-based image reconstruction.",
   "type": "module",
   "exports": {
@@ -18,7 +18,7 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@slithy/prim-lib": "0.5.0"
+    "@slithy/prim-lib": "0.5.1"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^4.1.2",
@@ -26,8 +26,8 @@
     "tsup": "^8",
     "typescript": "^5",
     "vitest": "^4.1.2",
-    "@slithy/tsconfig": "0.0.0",
-    "@slithy/eslint-config": "0.0.0"
+    "@slithy/eslint-config": "0.0.0",
+    "@slithy/tsconfig": "0.0.0"
   },
   "author": {
     "name": "Matthew Campagna",