wip

reg-viz · Sep 23, 2024 · dfdaa40 · dfdaa40
1 parent 505d51d
commit dfdaa40
Show file tree

Hide file tree

Showing 11 changed files with 101 additions and 53 deletions.
diff --git a/crates/reg_core/src/lib.rs b/crates/reg_core/src/lib.rs
@@ -15,7 +15,7 @@ use thiserror::Error;
 #[derive(Error, Debug)]
 pub enum CompareError {
     #[error("file io error, {0}")]
-    File(#[from] io::Error),
+    File(#[from] std::io::Error),
     #[error("image diff error, {0}")]
     ImageDiff(#[from] ImageDiffError),
     #[error("unknown error")]
@@ -108,31 +108,32 @@ pub fn run(
         .num_threads(options.concurrency.unwrap_or_else(|| 4))
         .build()
         .unwrap();
-    let result: Result<Vec<(PathBuf, DiffOutput)>, CompareError> = pool.install(|| {
-        targets
-            .par_iter()
-            .map(|path| {
-                let img1 = std::fs::read(actual_dir.join(path))?;
-                let img2 = std::fs::read(expected_dir.join(path))?;
-                let res = image_diff_rs::diff(
-                    img1,
-                    img2,
-                    &DiffOption {
-                        threshold: options.matching_threshold,
-                        include_anti_alias: Some(!options.enable_antialias.unwrap_or_default()),
-                    },
-                )?;
-                Ok((path.clone(), res))
-            })
-            .inspect(|r| {
-                if let Err(e) = r {
-                    dbg!(&e);
-                }
-            })
-            .collect()
-    })?;
-
-    let result = result?;
+
+    let result = pool
+        .install(|| {
+            targets
+                .par_iter()
+                .map(|path| {
+                    let img1 = std::fs::read(actual_dir.join(path))?;
+                    let img2 = std::fs::read(expected_dir.join(path))?;
+                    let res = image_diff_rs::diff(
+                        img1,
+                        img2,
+                        &DiffOption {
+                            threshold: options.matching_threshold,
+                            include_anti_alias: Some(!options.enable_antialias.unwrap_or_default()),
+                        },
+                    )?;
+                    Ok((path.clone(), res))
+                })
+                .inspect(|r| {
+                    if let Err(e) = r {
+                        dbg!(&e);
+                    }
+                })
+        })
+        .collect::<Result<Vec<(PathBuf, DiffOutput)>, CompareError>>()?;
+
     let mut differences = BTreeSet::new();
     let mut passed = BTreeSet::new();
     let mut failed = BTreeSet::new();
@@ -152,7 +153,7 @@ pub fn run(
             differences.insert(diff_image.clone());
             // TODO: make webp, png selectable
             diff_image.set_extension("webp");
-            std::fs::write(diff_dir.join(&diff_image), item.diff_image)?;
+            std::fs::write(diff_dir.join(&diff_image), item.diff_image.clone())?;
         }
     }
 
@@ -174,6 +175,7 @@ pub fn run(
     if let Some(html) = report.html {
         std::fs::write("./report.html", html)?;
     };
+
     Ok(())
 }
 

diff --git a/js/entry.mts → js/entry.ts b/js/entry.mts → js/entry.ts
diff --git a/js/index.mts → js/index.ts b/js/index.mts → js/index.ts
diff --git a/js/package.json b/js/package.json
@@ -11,5 +11,8 @@
   "license": "ISC",
   "dependencies": {
     "@tybys/wasm-util": "^0.9.0"
+  },
+  "devDependencies": {
+    "@types/node": "^22.5.5"
   }
 }
diff --git a/js/pnpm-lock.yaml b/js/pnpm-lock.yaml
diff --git a/js/proxy.mts → js/proxy.ts b/js/proxy.mts → js/proxy.ts
diff --git a/js/reg.wasm b/js/reg.wasm
diff --git a/js/sample/diff/sample0.webp b/js/sample/diff/sample0.webp
diff --git a/js/tsconfig.json b/js/tsconfig.json
@@ -0,0 +1,21 @@
+{
+    "compilerOptions": {
+      "target": "ESNext",
+      "module": "Preserve",
+      "moduleResolution": "Bundler",
+      "resolveJsonModule": true,
+      "esModuleInterop": false,
+      "allowSyntheticDefaultImports": true,
+      "skipLibCheck": true,
+      "allowJs": true,
+      "checkJs": true,
+      "strict": true,
+      "verbatimModuleSyntax": true,
+      "isolatedModules": true,
+      "forceConsistentCasingInFileNames": true,
+      "allowImportingTsExtensions": true,
+      "noImplicitOverride": true,
+      "noEmit": true
+    },
+    "include": ["./*.ts"]
+  }
diff --git a/js/worker.js b/js/worker.js
@@ -41,21 +41,20 @@ const handler = async ({ startArg, tid, memory }) => {
     const { createInstanceProxy } = require('./proxy.js');
     instance = createInstanceProxy(instance, memory);
     wasi.start(instance);
-    try {
-      const symbols = Object.getOwnPropertySymbols(wasi);
-      const selectDescription = (description) => (s) => {
-        if (s.description) {
-          return s.description === description;
-        }
-        return s.toString() === `Symbol(${description})`;
-      };
-      if (Array.isArray(description)) {
-        return description.map((d) => symbols.filter(selectDescription(d))[0]);
-      }
-      const kStarted = symbols.filter(selectDescription('kStarted'))[0];
-      wasi[kStarted] = false;
-    } catch (_) {}
-    console.log(tid);
+    // try {
+    //   const symbols = Object.getOwnPropertySymbols(wasi);
+    //   const selectDescription = (description) => (s) => {
+    //     if (s.description) {
+    //       return s.description === description;
+    //     }
+    //     return s.toString() === `Symbol(${description})`;
+    //   };
+    //   if (Array.isArray(description)) {
+    //     return description.map((d) => symbols.filter(selectDescription(d))[0]);
+    //   }
+    //   const kStarted = symbols.filter(selectDescription('kStarted'))[0];
+    //   wasi[kStarted] = false;
+    // } catch (_) {}
     instance.exports.wasi_thread_start(tid, startArg);
   } catch (e) {
     throw e;

diff --git a/js/worker.mts → js/worker.ts b/js/worker.mts → js/worker.ts
@@ -60,4 +60,4 @@ const handler = async ({ startArg, tid, memory }) => {
   }
 };
 
-parentPort.addListener('message', handler);
+parentPort?.addListener('message', handler);