Fix onnx

sist2-vue/package-lock.json

@@ -18,7 +18,7 @@
         "dom-to-image": "^2.6.0",
         "fslightbox-vue": "fslightbox-vue.tgz",
         "nouislider": "^15.2.0",
-        "onnxruntime-web": "^1.15.1",
+        "onnxruntime-web": "1.15.1",
         "underscore": "^1.13.1",
         "vue": "^2.6.12",
         "vue-color": "^2.8.1",
@@ -2538,6 +2538,11 @@
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
       "dev": true
     },
+    "node_modules/@types/long": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
+      "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="
+    },
     "node_modules/@types/mime": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
@@ -7997,9 +8002,9 @@
       }
     },
     "node_modules/long": {
-      "version": "5.2.3",
+      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
+      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
     },
     "node_modules/lower-case": {
       "version": "2.0.2",
@@ -8618,22 +8623,30 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/onnx-proto": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/onnx-proto/-/onnx-proto-4.0.4.tgz",
+      "integrity": "sha512-aldMOB3HRoo6q/phyB6QRQxSt895HNNw82BNyZ2CMh4bjeKv7g/c+VpAFtJuEMVfYLMbRx61hbuqnKceLeDcDA==",
+      "dependencies": {
+        "protobufjs": "^6.8.8"
+      }
+    },
     "node_modules/onnxruntime-common": {
-      "version": "1.17.1",
+      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/onnxruntime-common/-/onnxruntime-common-1.17.1.tgz",
+      "resolved": "https://registry.npmjs.org/onnxruntime-common/-/onnxruntime-common-1.15.1.tgz",
-      "integrity": "sha512-6wLNhpn+1hnsKN+jq6ulqUEJ61TdRmyFkGCvtRNnZkAupH8Yfr805UeNxjl9jtiX9B1q48pq6Q/67fEFpxT7Dw=="
+      "integrity": "sha512-Y89eJ8QmaRsPZPWLaX7mfqhj63ny47rSkQe80hIo+lvBQdrdXYR9VO362xvZulk9DFkCnXmGidprvgJ07bKsIQ=="
     },
     "node_modules/onnxruntime-web": {
-      "version": "1.17.1",
+      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/onnxruntime-web/-/onnxruntime-web-1.17.1.tgz",
+      "resolved": "https://registry.npmjs.org/onnxruntime-web/-/onnxruntime-web-1.15.1.tgz",
-      "integrity": "sha512-EotY9uJU4xFY/ZVZ2Zrl2OZmBcbTVTWn/2OOh4cCWODPwtsYN2xeJYgoz8LfCgZSrhenGg0q4ceYUWATXqEsYQ==",
+      "integrity": "sha512-Ky4AXFLFyiGRu5KQJdDcbhdNcO0f2ND/8IPmTEwcKKIHpCwH6/Q9UoMpcoFz78lxGvnmmy+FFgA/Bs1HjdM6LA==",
       "dependencies": {
         "flatbuffers": "^1.12.0",
         "guid-typescript": "^1.0.9",
-        "long": "^5.2.3",
+        "long": "^4.0.0",
-        "onnxruntime-common": "1.17.1",
+        "onnx-proto": "^4.0.4",
-        "platform": "^1.3.6",
+        "onnxruntime-common": "~1.15.1",
-        "protobufjs": "^7.2.4"
+        "platform": "^1.3.6"
       }
     },
     "node_modules/open": {
@@ -9684,9 +9697,9 @@
       "dev": true
     },
     "node_modules/protobufjs": {
-      "version": "7.2.6",
+      "version": "6.11.4",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.6.tgz",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.4.tgz",
-      "integrity": "sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==",
+      "integrity": "sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw==",
       "hasInstallScript": true,
       "dependencies": {
         "@protobufjs/aspromise": "^1.1.2",
@@ -9699,11 +9712,13 @@
         "@protobufjs/path": "^1.1.2",
         "@protobufjs/pool": "^1.1.0",
         "@protobufjs/utf8": "^1.1.0",
+        "@types/long": "^4.0.1",
         "@types/node": ">=13.7.0",
-        "long": "^5.0.0"
+        "long": "^4.0.0"
       },
-      "engines": {
+      "bin": {
-        "node": ">=12.0.0"
+        "pbjs": "bin/pbjs",
+        "pbts": "bin/pbts"
       }
     },
     "node_modules/proxy-addr": {

sist2-vue/package.json

@@ -17,7 +17,7 @@
     "dom-to-image": "^2.6.0",
     "fslightbox-vue": "fslightbox-vue.tgz",
     "nouislider": "^15.2.0",
-    "onnxruntime-web": "^1.15.1",
+    "onnxruntime-web": "1.15.1",
     "underscore": "^1.13.1",
     "vue": "^2.6.12",
     "vue-color": "^2.8.1",

sist2-vue/src/components/Lightbox.vue

@@ -78,16 +78,6 @@ export default {
       }
     };
 
-    document.onpointerdown = (e) => {
-      if (e.button === 2) {
-
-        const isLightboxOpen = this.$refs.lightbox === undefined || this.$refs.lightbox.$el.tagName === undefined;
-        if (isLightboxOpen) {
-          e.preventDefault();
-          return false;
-        }
-      }
-    }
   },
   methods: {
     keyDownListener(e) {

sist2-vue/src/ml/CLIPTransformerModel.js

@@ -22,7 +22,9 @@ export class CLIPTransformerModel {
 
     async loadModel(onProgress) {
         ort.env.wasm.wasmPaths = ORT_WASM_PATHS;
-        ort.env.wasm.numThreads = 2;
+        if (window.crossOriginIsolated) {
+            ort.env.wasm.numThreads = 2;
+        }
 
         let buf = await ModelStore.get(this._modelUrl);
         if (!buf) {

src/web/serve.c

@@ -430,6 +430,11 @@ void file(struct mg_connection *nc, struct mg_http_message *hm) {
 
     cJSON *source = get_root_document_by_id(sid.index_id, sid.doc_id);
 
+    if (source == NULL) {
+        HTTP_REPLY_NOT_FOUND
+        return;
+    }
+
     if (strlen(idx->desc.rewrite_url) == 0) {
         serve_file_from_disk(source, idx, nc, hm);
     } else {