display qr code type; refactoring

maslick · Oct 13, 2023 · b4d266a · b4d266a
1 parent 40f6156
commit b4d266a
Show file tree

Hide file tree

Showing 15 changed files with 226 additions and 19 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kameroon",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "private": true,
   "dependencies": {
     "@maslick/kameroon": "^1.0.2",
@@ -16,13 +16,15 @@
     "react-usestateref": "^1.0.8",
     "redux": "^4.2.1",
     "styled-components": "4.3.2",
-    "web-vitals": "^2.1.4"
+    "web-vitals": "^2.1.4",
+    "http-server": "^0.13.0"
   },
   "scripts": {
     "start": "HTTPS=true HOST=0.0.0.0 react-scripts start",
     "build": "react-scripts build",
-    "build-sw": "node ./src/sw-build.js",
+    "build-sw": "node src/sw/sw-build.js",
     "test": "react-scripts test",
+    "http-server": "http-server ./build/ -p 8082 -c-1",
     "eject": "react-scripts eject"
   },
   "eslintConfig": {

diff --git a/public/wasm/koder-zbar.js b/public/wasm/koder-zbar.js
@@ -12,7 +12,8 @@ class KoderZbar {
         createBuffer: this.mod.cwrap('createBuffer', 'number', ['number']),
         deleteBuffer: this.mod.cwrap('deleteBuffer', '', ['number']),
         triggerDecode: this.mod.cwrap('triggerDecode', 'number', ['number', 'number', 'number']),
-        getScanResults: this.mod.cwrap('getScanResults', 'number', [])
+        getScanResults: this.mod.cwrap('getScanResults', 'number', []),
+        getResultType: this.mod.cwrap('getResultType', 'number', []),
       };
 
       // return the class
@@ -26,7 +27,10 @@ class KoderZbar {
     const results = [];
     if (this.api.triggerDecode(buffer, width, height) > 0) {
       const resultAddress = this.api.getScanResults();
-      results.push(this.mod.UTF8ToString(resultAddress));
+      results.push({
+        code: this.mod.UTF8ToString(resultAddress),
+        type: this.mod.UTF8ToString(this.api.getResultType())
+      });
       this.api.deleteBuffer(resultAddress);
     }
     if (results.length > 0) return results[0];

diff --git a/public/wasm/koder-zxing.js b/public/wasm/koder-zxing.js
@@ -17,7 +17,10 @@ class KoderZxing {
     const result = this.mod.readBarcodeFromPixmap(buffer, width, height, mode, format);
     this.mod._free(buffer);
     if (result && result.text.length > 0) {
-      results.push(result.text);
+      results.push({
+        code: result.text,
+        type: result.format
+      });
     }
     if (results.length > 0) return results[0];
     else return null;