Merge branch 'main' into dependabot/npm_and_yarn/sharp-0.34.5

Author: carlpatchett

package-lock.json

@@ -26,24 +26,24 @@
     "@eslint/js": "~9.36",
     "@types/brotli": "^1.3.4",
     "@types/eslint__js": "~9.14",
-    "@types/node": "~24",
-    "@typescript-eslint/parser": "~8.44",
-    "@vitest/coverage-v8": "^3.2.4",
-    "@vitest/eslint-plugin": "~1.3",
+    "@types/node": "~25",
+    "@typescript-eslint/parser": "~8.55",
+    "@vitest/coverage-v8": "^4.0.18",
+    "@vitest/eslint-plugin": "~1.6",
     "eslint": "^9.38.0",
     "eslint-config-prettier": "~10.1",
-    "globals": "~16.4",
+    "globals": "~17.3",
     "grpc_tools_node_protoc": "^1.0.0",
     "grpc-tools": "^1.13.0",
-    "prettier": "~3.6",
-    "rimraf": "~6.0",
-    "ts-api-utils": "~2.1",
+    "prettier": "~3.8",
+    "rimraf": "~6.1",
+    "ts-api-utils": "~2.4",
     "ts-proto": "^2.7.7",
     "typed-emitter": "^2.1.0",
     "typedoc": "^0.28.12",
     "typescript": "~5.9",
-    "typescript-eslint": "~8.46",
-    "vitest": "^3.2.4"
+    "typescript-eslint": "~8.55",
+    "vitest": "^4.0.18"
   },
   "scripts": {
     "start": "node build/src/main.js",
@@ -75,10 +75,11 @@
     "@grpc/proto-loader": "^0.8.0",
     "brotli": "^1.3.3",
     "jwt-decode": "^4.0.0",
+    "opencv-wasm": "^4.3.0-10",
     "openid-client": "^6.8.1",
     "protobufjs": "^7.5.4",
     "rxjs": "^7.8.2",
-    "sharp": "^0.34.4",
+    "sharp": "^0.34.5",
     "tslib": "~2.8"
   },
   "volta": {

package.json

@@ -16,7 +16,7 @@
   "description": "",
   "dependencies": {
     "@crispthinking/athena-classifier-sdk": "file:../../",
-    "express": "^4.19.2",
+    "express": "^4.22.1",
     "multer": "^2.0.2"
   },
   "devDependencies": {

samples/hash-server/package-lock.json

@@ -1,4 +1,5 @@
 import { Readable } from 'stream';
+import { createRequire } from 'module';
 import crypto from 'crypto';
 import sharp from 'sharp';
 import {
@@ -9,6 +10,9 @@ import {
 import brotli from 'brotli';
 import { buffer } from 'stream/consumers';
 
+const require_ = createRequire(import.meta.url);
+const { cv } = require_('opencv-wasm');
+
 /**
  * Computes MD5 and SHA1 hashes from a readable stream and resizes any image data.
  * @param stream Node.js readable stream (e.g., fs.createReadStream)
@@ -54,16 +58,29 @@ export async function computeHashesFromStream(
   }
 
   if (resize) {
-    const resizer = sharp().resize(448, 448).raw({ depth: 'char' });
-    stream.pipe(resizer);
-    const rgbData = await resizer.toBuffer();
-    // Sharp outputs RGB format, but Athena expects BGR - swap R and B channels
-    data = Buffer.alloc(rgbData.length);
-    for (let i = 0; i < rgbData.length; i += 3) {
-      data[i] = rgbData[i + 2]; // B <- R
-      data[i + 1] = rgbData[i + 1]; // G <- G
-      data[i + 2] = rgbData[i]; // R <- B
-    }
+    const rawBuffer = await buffer(stream);
+
+    const decoded = await sharp(rawBuffer)
+      .removeAlpha()
+      .raw({ depth: 'uchar' })
+      .toBuffer({ resolveWithObject: true });
+
+    const { data: rgbPixels, info } = decoded;
+
+    const srcMat = new cv.Mat(info.height, info.width, cv.CV_8UC3);
+    srcMat.data.set(rgbPixels);
+
+    const dstMat = new cv.Mat(448, 448, cv.CV_8UC3);
+    cv.resize(srcMat, dstMat, new cv.Size(448, 448), 0, 0, cv.INTER_LINEAR);
+    srcMat.delete();
+
+    const bgrMat = new cv.Mat(448, 448, cv.CV_8UC3);
+    cv.cvtColor(dstMat, bgrMat, cv.COLOR_RGB2BGR);
+    dstMat.delete();
+
+    data = Buffer.from(bgrMat.data);
+    bgrMat.delete();
+
     imageFormat = ImageFormat.IMAGE_FORMAT_RAW_UINT8_BGR;
   } else {
     data = await buffer(stream);

samples/hash-server/package.json

@@ -0,0 +1,26 @@
+declare module 'opencv-wasm' {
+  export interface Mat {
+    data: Uint8Array;
+    rows: number;
+    cols: number;
+    channels(): number;
+    delete(): void;
+  }
+
+  export const cv: {
+    Mat: new (rows: number, cols: number, type: number) => Mat;
+    Size: new (width: number, height: number) => unknown;
+    CV_8UC3: number;
+    INTER_LINEAR: number;
+    COLOR_RGB2BGR: number;
+    resize(
+      src: Mat,
+      dst: Mat,
+      size: unknown,
+      fx: number,
+      fy: number,
+      interpolation: number,
+    ): void;
+    cvtColor(src: Mat, dst: Mat, code: number): void;
+  };
+}