refresh

package.json

@@ -8,19 +8,19 @@
   "scripts": {
     "start": "parcel src/index.html",
     "build-wasm": "wasm-pack build --target web",
-    "build": "parcel build src/index.html --public-url ."
+    "build": "tsc && tsc -p src/workers/tsconfig.json && parcel build src/index.html --public-url ."
   },
   "devDependencies": {
-    "@parcel/compressor-brotli": "^2.0.1",
-    "@parcel/compressor-gzip": "^2.0.1",
-    "@parcel/packager-raw-url": "^2.0.1",
-    "@types/w3c-image-capture": "^1.0.5",
-    "parcel": "^2.0.1",
-    "parcel-config-pwa-manifest": "^0.1.0",
-    "typescript": "^4.4.4"
+    "@parcel/compressor-brotli": "^2.9.3",
+    "@parcel/compressor-gzip": "^2.9.3",
+    "@parcel/packager-raw-url": "^2.9.3",
+    "@types/w3c-image-capture": "^1.0.7",
+    "parcel": "^2.9.3",
+    "parcel-config-pwa-manifest": "^0.1.5",
+    "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@parcel/service-worker": "^2.0.1",
+    "@parcel/service-worker": "^2.9.3",
     "image-capture": "^0.4.0"
   }
 }

src-rs/lib.rs

@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(int_abs_diff)]
 #[macro_use]
 extern crate alloc;
 

src/parcel.d.ts

@@ -1,4 +1,10 @@
 declare module 'url:*' {
   const url: string;
   export default url;
+}
+
+declare const process: {
+  env: {
+    NODE_ENV: string
+  }
 }

src/process.ts

@@ -1,4 +1,4 @@
-import { Message, Messages, Quad, Point } from './workers/process';
+import type { Message, Messages, Quad, Point } from './workers/ipc';
 
 const newWorker = () => new Worker(new URL('./workers/process.ts', import.meta.url), { type: 'module' });
 

src/workers/ipc.ts

@@ -0,0 +1,32 @@
+export type Point = {
+  x: number;
+  y: number;
+}
+
+export type Quad = {
+  a: Point;
+  b: Point;
+  c: Point;
+  d: Point;
+};
+
+export type Messages = {
+  'find-document': [{
+    data: ImageData;
+  }, Quad | undefined];
+  'extract-document': [{
+    data: ImageData;
+    region: Quad;
+    targetWidth: number;
+    targetHeight?: number;
+  }, ImageData];
+  'get-data': [{
+    bitmap: ImageBitmap;
+  }, ImageData];
+};
+
+export type Message = {
+  [T in keyof Messages]: {
+    type: T;
+  } & Messages[T][0];
+}[keyof Messages];

src/workers/process.ts

@@ -1,37 +1,7 @@
 import init, { find_document, extract_document, Quad as WasmQuad } from '../../pkg/scanner';
+import { Message, Messages } from './ipc'
 
-export type Point = {
-  x: number;
-  y: number;
-}
-
-export type Quad = {
-  a: Point;
-  b: Point;
-  c: Point;
-  d: Point;
-};
-
-export type Messages = {
-  'find-document': [{
-    data: ImageData;
-  }, Quad | undefined];
-  'extract-document': [{
-    data: ImageData;
-    region: Quad;
-    targetWidth: number;
-    targetHeight?: number;
-  }, ImageData];
-  'get-data': [{
-    bitmap: ImageBitmap;
-  }, ImageData];
-};
-
-export type Message = {
-  [T in keyof Messages]: {
-    type: T;
-  } & Messages[T][0];
-}[keyof Messages];
+declare const self: DedicatedWorkerGlobalScope
 
 const handle = <T extends Message>(message: T): { result: Messages[T['type']][1]; transfer?: Transferable[] } => {
   if (message.type == 'find-document') {
@@ -77,17 +47,17 @@ const handle = <T extends Message>(message: T): { result: Messages[T['type']][1]
 
 let load = init().catch(() => {});
 
-onmessage = async evt => {
+self.onmessage = async (evt: MessageEvent<{ msg: Message }>) => {
   await load;
   const { msg, ...data } = evt.data;
   try {
-    const { result, transfer } = handle(msg as Message);
-    postMessage({ result, ...data }, transfer || []);
+    const { result, transfer } = handle(msg);
+    self.postMessage({ result, ...data }, transfer || []);
   } catch (err) {
     if (!(err instanceof Error)) {
       err = new Error(`Error in process worker: ${err}`);
     }
-    postMessage({
+    self.postMessage({
       error: {
         message: (err as Error).message,
         stack: (err as Error).stack,

src/workers/tsconfig.json

@@ -5,7 +5,8 @@
     "module": "ESNext",
     "moduleResolution": "node",
     "noEmit": true,
-    "lib": ["ESNext", "WebWorker"]
+    "lib": ["ESNext", "WebWorker"],
+    "typeRoots": []
   },
   "include": ["."]
 }

tsconfig.json

@@ -7,5 +7,5 @@
     "noEmit": true
   },
   "include": ["src"],
-  "exclude": ["src/workers"]
+  "exclude": ["src/workers/**/*"]
 }