Merge 4ec6a14252 into ae317e590d

Add Version in sist2-admin
Added the version badge-pill to the sist2-admin page so you can check the version without going to the main search frontend.
2025-12-20 10:36:00 +00:00 · 2024-01-08 16:41:32 -06:00 · 2023-12-20 09:45:15 -06:00
28 changed files with 11571 additions and 4143 deletions
--- a/README.md
+++ b/README.md
@@ -44,28 +44,20 @@ services:
  elasticsearch:
    image: elasticsearch:7.17.9
    restart: unless-stopped
-    volumes:
-      # This directory must have 1000:1000 permissions (or update PUID & PGID below)
-      - /data/sist2-es-data/:/usr/share/elasticsearch/data
    environment:
      - "discovery.type=single-node"
      - "ES_JAVA_OPTS=-Xms2g -Xmx2g"
-      - "PUID=1000"
-      - "PGID=1000"
  sist2-admin:
-    image: simon987/sist2:3.4.2-x64-linux
+    image: simon987/sist2:3.3.4-x64-linux
    restart: unless-stopped
    volumes:
-      - /data/sist2-admin-data/:/sist2-admin/
+      - ./sist2-admin-data/:/sist2-admin/
      - /:/host
    ports:
-      - 4090:4090
-      # NOTE: Don't expose this port publicly!
-      - 8080:8080
+      - 4090:4090 # sist2
+      - 8080:8080 # sist2-admin
    working_dir: /root/sist2-admin/
-    entrypoint: python3
-    command:
-      - /root/sist2-admin/sist2_admin/app.py
+    entrypoint: python3 /root/sist2-admin/sist2_admin/app.py
 ```

 Navigate to http://localhost:8080/ to configure sist2-admin.
@@ -90,10 +82,8 @@ Example usage:
 1. Scan a directory: `sist2 scan ~/Documents --output ./documents.sist2`
 2. Prepare search index:
    * **Elasticsearch**: `sist2 index --es-url http://localhost:9200 ./documents.sist2`
-    * **SQLite**: `sist2 sqlite-index --search-index ./search.sist2 ./documents.sist2`
-3. Start web interface: 
-   * **Elasticsearch**: `sist2 web ./documents.sist2`
-   * **SQLite**: `sist2 web --search-index ./search.sist2 ./documents.sist2`
+    * **SQLite**: `sist2 index --search-index ./search.sist2 ./documents.sist2`
+3. Start web interface: `sist2 web ./documents.sist2`

 ## Format support

@@ -218,7 +208,7 @@ docker run --rm --entrypoint cat my-sist2-image /root/sist2 > sist2-x64-linux
 3. Install vcpkg dependencies

    ```bash
-    vcpkg install openblas curl[core,openssl] sqlite3[core,fts5,json1] cpp-jwt pcre cjson brotli libarchive[core,bzip2,libxml2,lz4,lzma,lzo] pthread tesseract libxml2 libmupdf[ocr] gtest mongoose libmagic libraw gumbo ffmpeg[core,avcodec,avformat,swscale,swresample,webp,opus,mp3lame,vpx,zlib]
+    vcpkg install openblas curl[core,openssl] sqlite3[core,fts5] cpp-jwt pcre cjson brotli libarchive[core,bzip2,libxml2,lz4,lzma,lzo] pthread tesseract libxml2 libmupdf[ocr] gtest mongoose libmagic libraw gumbo ffmpeg[core,avcodec,avformat,swscale,swresample,webp,opus,mp3lame,vpx,zlib]
    ```

 4. Build
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,20 +4,15 @@ services:
  elasticsearch:
    image: elasticsearch:7.17.9
    container_name: sist2-es
-    volumes:
-      # This directory must have 1000:1000 permissions (or update PUID & PGID below)
-      - /data/sist2-es-data/:/usr/share/elasticsearch/data
    environment:
      - "discovery.type=single-node"
      - "ES_JAVA_OPTS=-Xms2g -Xmx2g"
-      - "PUID=1000"
-      - "PGID=1000"
  sist2-admin:
    build:
      context: .
    container_name: sist2-admin
    volumes:
-      - /data/sist2-admin-data/:/sist2-admin/
+      - /mnt/array/sist2-admin-data/:/sist2-admin/
      - /:/host
    ports:
      - 4090:4090
--- a/sist2-admin/frontend/package-lock.json
+++ b/sist2-admin/frontend/package-lock.json
@@ -3552,13 +3552,13 @@
      "dev": true
    },
    "node_modules/body-parser": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
      "dev": true,
      "dependencies": {
        "bytes": "3.1.2",
-        "content-type": "~1.0.5",
+        "content-type": "~1.0.4",
        "debug": "2.6.9",
        "depd": "2.0.0",
        "destroy": "1.2.0",
@@ -3566,7 +3566,7 @@
        "iconv-lite": "0.4.24",
        "on-finished": "2.4.1",
        "qs": "6.11.0",
-        "raw-body": "2.5.2",
+        "raw-body": "2.5.1",
        "type-is": "~1.6.18",
        "unpipe": "1.0.0"
      },
@@ -3655,12 +3655,12 @@
      }
    },
    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
      "dev": true,
      "dependencies": {
-        "fill-range": "^7.1.1"
+        "fill-range": "^7.0.1"
      },
      "engines": {
        "node": ">=8"
@@ -3734,19 +3734,13 @@
      }
    },
    "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
      "dev": true,
      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
@@ -4246,9 +4240,9 @@
      }
    },
    "node_modules/content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
      "dev": true,
      "engines": {
        "node": ">= 0.6"
@@ -4272,9 +4266,9 @@
      "license": "MIT"
    },
    "node_modules/cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
      "dev": true,
      "engines": {
        "node": ">= 0.6"
@@ -4874,23 +4868,6 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-      "dev": true,
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/define-lazy-prop": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
@@ -5234,27 +5211,6 @@
        "stackframe": "^1.1.1"
      }
    },
-    "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/es-module-lexer": {
      "version": "0.9.3",
      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
@@ -5746,17 +5702,17 @@
      }
    },
    "node_modules/express": {
-      "version": "4.19.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
-      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
      "dev": true,
      "dependencies": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
-        "body-parser": "1.20.2",
+        "body-parser": "1.20.1",
        "content-disposition": "0.5.4",
        "content-type": "~1.0.4",
-        "cookie": "0.6.0",
+        "cookie": "0.5.0",
        "cookie-signature": "1.0.6",
        "debug": "2.6.9",
        "depd": "2.0.0",
@@ -5892,9 +5848,9 @@
      }
    },
    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
      "dev": true,
      "dependencies": {
        "to-regex-range": "^5.0.1"
@@ -5971,15 +5927,16 @@
      "peer": true
    },
    "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz",
+      "integrity": "sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==",
      "funding": [
        {
          "type": "individual",
          "url": "https://github.com/sponsors/RubenVerborgh"
        }
      ],
+      "license": "MIT",
      "engines": {
        "node": ">=4.0"
      },
@@ -6063,13 +6020,11 @@
      }
    },
    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "license": "MIT"
    },
    "node_modules/gensync": {
      "version": "1.0.0-beta.2",
@@ -6092,19 +6047,14 @@
      }
    },
    "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
      "dev": true,
      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
@@ -6192,18 +6142,6 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
    "node_modules/graceful-fs": {
      "version": "4.2.10",
      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -6262,24 +6200,12 @@
      }
    },
    "node_modules/has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
      "dev": true,
      "dependencies": {
-        "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
+        "get-intrinsic": "^1.1.1"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
@@ -6303,18 +6229,6 @@
      "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
      "dev": true
    },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/he": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -6544,6 +6458,7 @@
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "safer-buffer": ">= 2.1.2 < 3"
      },
@@ -7435,12 +7350,12 @@
      }
    },
    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
      "dev": true,
      "dependencies": {
-        "braces": "^3.0.3",
+        "braces": "^3.0.2",
        "picomatch": "^2.3.1"
      },
      "engines": {
@@ -7855,9 +7770,9 @@
      }
    },
    "node_modules/object-inspect": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
      "dev": true,
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
@@ -9033,9 +8948,9 @@
      }
    },
    "node_modules/raw-body": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
-      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
      "dev": true,
      "dependencies": {
        "bytes": "3.1.2",
@@ -9360,7 +9275,8 @@
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
    },
    "node_modules/schema-utils": {
      "version": "3.1.1",
@@ -9548,23 +9464,6 @@
        "node": ">= 0.8.0"
      }
    },
-    "node_modules/set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-      "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
    "node_modules/setprototypeof": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -9614,18 +9513,14 @@
      "license": "MIT"
    },
    "node_modules/side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
      "dev": true,
      "dependencies": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
      },
      "funding": {
        "url": "https://github.com/sponsors/ljharb"
@@ -10623,9 +10518,9 @@
      }
    },
    "node_modules/webpack-dev-middleware": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
-      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
+      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
      "dev": true,
      "dependencies": {
        "colorette": "^2.0.10",
@@ -13616,13 +13511,13 @@
      "dev": true
    },
    "body-parser": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
-      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
      "dev": true,
      "requires": {
        "bytes": "3.1.2",
-        "content-type": "~1.0.5",
+        "content-type": "~1.0.4",
        "debug": "2.6.9",
        "depd": "2.0.0",
        "destroy": "1.2.0",
@@ -13630,7 +13525,7 @@
        "iconv-lite": "0.4.24",
        "on-finished": "2.4.1",
        "qs": "6.11.0",
-        "raw-body": "2.5.2",
+        "raw-body": "2.5.1",
        "type-is": "~1.6.18",
        "unpipe": "1.0.0"
      },
@@ -13705,12 +13600,12 @@
      }
    },
    "braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
      "dev": true,
      "requires": {
-        "fill-range": "^7.1.1"
+        "fill-range": "^7.0.1"
      }
    },
    "browserslist": {
@@ -13748,16 +13643,13 @@
      "dev": true
    },
    "call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
      "dev": true,
      "requires": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
      }
    },
    "callsites": {
@@ -14131,9 +14023,9 @@
      }
    },
    "content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
      "dev": true
    },
    "convert-source-map": {
@@ -14154,9 +14046,9 @@
      }
    },
    "cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
      "dev": true
    },
    "cookie-signature": {
@@ -14569,17 +14461,6 @@
        "clone": "^1.0.2"
      }
    },
-    "define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-      "dev": true,
-      "requires": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      }
-    },
    "define-lazy-prop": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
@@ -14839,21 +14720,6 @@
        "stackframe": "^1.1.1"
      }
    },
-    "es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.2.4"
-      }
-    },
-    "es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-      "dev": true
-    },
    "es-module-lexer": {
      "version": "0.9.3",
      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
@@ -15200,17 +15066,17 @@
      }
    },
    "express": {
-      "version": "4.19.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
-      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
      "dev": true,
      "requires": {
        "accepts": "~1.3.8",
        "array-flatten": "1.1.1",
-        "body-parser": "1.20.2",
+        "body-parser": "1.20.1",
        "content-disposition": "0.5.4",
        "content-type": "~1.0.4",
-        "cookie": "0.6.0",
+        "cookie": "0.5.0",
        "cookie-signature": "1.0.6",
        "debug": "2.6.9",
        "depd": "2.0.0",
@@ -15333,9 +15199,9 @@
      }
    },
    "fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
      "dev": true,
      "requires": {
        "to-regex-range": "^5.0.1"
@@ -15402,9 +15268,9 @@
      "peer": true
    },
    "follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz",
+      "integrity": "sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ=="
    },
    "forwarded": {
      "version": "0.2.0",
@@ -15456,9 +15322,9 @@
      "optional": true
    },
    "function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
      "dev": true
    },
    "gensync": {
@@ -15474,16 +15340,14 @@
      "dev": true
    },
    "get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
      "dev": true,
      "requires": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.3"
      }
    },
    "get-stream": {
@@ -15544,15 +15408,6 @@
        "slash": "^3.0.0"
      }
    },
-    "gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.1.3"
-      }
-    },
    "graceful-fs": {
      "version": "4.2.10",
      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -15597,20 +15452,14 @@
      "dev": true
    },
    "has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
      "dev": true,
      "requires": {
-        "es-define-property": "^1.0.0"
+        "get-intrinsic": "^1.1.1"
      }
    },
-    "has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
-      "dev": true
-    },
    "has-symbols": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
@@ -15623,15 +15472,6 @@
      "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
      "dev": true
    },
-    "hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.2"
-      }
-    },
    "he": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -16472,12 +16312,12 @@
      "dev": true
    },
    "micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
      "dev": true,
      "requires": {
-        "braces": "^3.0.3",
+        "braces": "^3.0.2",
        "picomatch": "^2.3.1"
      }
    },
@@ -16779,9 +16619,9 @@
      "dev": true
    },
    "object-inspect": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
      "dev": true
    },
    "object-keys": {
@@ -17588,9 +17428,9 @@
      "dev": true
    },
    "raw-body": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
-      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
      "dev": true,
      "requires": {
        "bytes": "3.1.2",
@@ -17986,20 +17826,6 @@
        "send": "0.18.0"
      }
    },
-    "set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-      "dev": true,
-      "requires": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
-      }
-    },
    "setprototypeof": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -18037,15 +17863,14 @@
      "dev": true
    },
    "side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
      "dev": true,
      "requires": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
      }
    },
    "signal-exit": {
@@ -18797,9 +18622,9 @@
      }
    },
    "webpack-dev-middleware": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
-      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
+      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
      "dev": true,
      "requires": {
        "colorette": "^2.0.10",
--- a/sist2-admin/frontend/src/components/NavBar.vue
+++ b/sist2-admin/frontend/src/components/NavBar.vue
@@ -3,7 +3,11 @@
    <b-navbar-brand to="/">
      <Sist2Icon></Sist2Icon>
    </b-navbar-brand>
-
+    
+    <span class="badge badge-pill version" v-if="$store && $store.state.sist2Info">
+      v{{ sist2Version() }}
+    </span>
+      
    <b-button class="ml-auto" to="/task" variant="link">{{ $t("tasks") }}</b-button>
  </b-navbar>
 </template>
@@ -66,4 +70,4 @@ export default {
 .btn-link {
  color: #222;
 }
-</style>
+</style>
--- a/sist2-admin/frontend/src/components/WebOptions.vue
+++ b/sist2-admin/frontend/src/components/WebOptions.vue
@@ -1,70 +1,59 @@
 <template>
-  <div>
-    <h4>{{ $t("webOptions.title") }}</h4>
-    <b-card>
-      <label>{{ $t("webOptions.lang") }}</label>
-      <b-form-select v-model="options.lang" :options="['en', 'fr', 'zh-CN', 'pl', 'de']"
-                     @change="update()"></b-form-select>
+    <div>
+        <h4>{{ $t("webOptions.title") }}</h4>
+        <b-card>
+            <label>{{ $t("webOptions.lang") }}</label>
+            <b-form-select v-model="options.lang" :options="['en', 'fr', 'zh-CN', 'pl', 'de']"
+                           @change="update()"></b-form-select>

-      <label>{{ $t("webOptions.bind") }}</label>
-      <b-form-input v-model="options.bind" @change="update()"></b-form-input>
+            <label>{{ $t("webOptions.bind") }}</label>
+            <b-form-input v-model="options.bind" @change="update()"></b-form-input>

-      <label>{{ $t("webOptions.tagline") }}</label>
-      <b-form-textarea v-model="options.tagline" @change="update()"></b-form-textarea>
+            <label>{{ $t("webOptions.tagline") }}</label>
+            <b-form-textarea v-model="options.tagline" @change="update()"></b-form-textarea>

-      <label>{{ $t("webOptions.auth") }}</label>
-      <b-form-input v-model="options.auth" @change="update()"></b-form-input>
+            <label>{{ $t("webOptions.auth") }}</label>
+            <b-form-input v-model="options.auth" @change="update()"></b-form-input>

-      <label>{{ $t("webOptions.tagAuth") }}</label>
-      <b-form-input v-model="options.tag_auth" @change="update()" :disabled="Boolean(options.auth)"></b-form-input>
+            <label>{{ $t("webOptions.tagAuth") }}</label>
+            <b-form-input v-model="options.tag_auth" @change="update()"></b-form-input>
+        </b-card>

-      <b-form-checkbox v-model="options.verbose" @change="update()">
-        {{$t("webOptions.verbose")}}
-      </b-form-checkbox>
-    </b-card>
+        <br>
+        <h4>Auth0 options</h4>
+        <b-card>
+            <label>{{ $t("webOptions.auth0Audience") }}</label>
+            <b-form-input v-model="options.auth0_audience" @change="update()"></b-form-input>

-    <br>
-    <h4>Auth0 options</h4>
-    <b-card>
-      <label>{{ $t("webOptions.auth0Audience") }}</label>
-      <b-form-input v-model="options.auth0_audience" @change="update()"></b-form-input>
+            <label>{{ $t("webOptions.auth0Domain") }}</label>
+            <b-form-input v-model="options.auth0_domain" @change="update()"></b-form-input>

-      <label>{{ $t("webOptions.auth0Domain") }}</label>
-      <b-form-input v-model="options.auth0_domain" @change="update()"></b-form-input>
+            <label>{{ $t("webOptions.auth0ClientId") }}</label>
+            <b-form-input v-model="options.auth0_client_id" @change="update()"></b-form-input>

-      <label>{{ $t("webOptions.auth0ClientId") }}</label>
-      <b-form-input v-model="options.auth0_client_id" @change="update()"></b-form-input>
-
-      <label>{{ $t("webOptions.auth0PublicKey") }}</label>
-      <b-textarea rows="10" v-model="options.auth0_public_key" @change="update()"></b-textarea>
-    </b-card>
-  </div>
+            <label>{{ $t("webOptions.auth0PublicKey") }}</label>
+            <b-textarea rows="10" v-model="options.auth0_public_key" @change="update()"></b-textarea>
+        </b-card>
+    </div>
 </template>

 <script>

 export default {
-  name: "WebOptions",
-  props: ["options", "frontendName"],
-  data() {
-    return {
-      showEsTestAlert: false,
-      esTestOk: false,
-      esTestMessage: ""
-    }
-  },
-  methods: {
-    update() {
-
-      console.log(this.options)
-      if (this.options.auth && this.options.tag_auth) {
-        // If both are set, remove tagAuth
-        this.options.tag_auth = "";
-      }
-
-      this.$emit("change", this.options);
+    name: "WebOptions",
+    props: ["options", "frontendName"],
+    data() {
+        return {
+            showEsTestAlert: false,
+            esTestOk: false,
+            esTestMessage: "",
+        }
    },
-  }
+    methods: {
+        update() {
+            this.$emit("change", this.options);
+        },
+    }
 }
 </script>

--- a/sist2-admin/frontend/src/i18n/messages.js
+++ b/sist2-admin/frontend/src/i18n/messages.js
@@ -65,9 +65,6 @@ export default {
        gitRepository: "Git repository URL",
        extraArgs: "Extra command line arguments",

-        couldNotStartFrontend: "Could not start frontend",
-        couldNotStartFrontendBody: "Unable to start the frontend, check server logs for more details.",
-
        selectJobs: "Available jobs",
        selectJob: "Select a job",
        webOptions: {
@@ -81,7 +78,6 @@ export default {
            auth0Domain: "Auth0 domain",
            auth0ClientId: "Auth0 client ID",
            auth0PublicKey: "Auth0 public key",
-            verbose: "Verbose logs"
        },
        backendOptions: {
            title: "Search backend options",
--- a/sist2-admin/frontend/src/views/Frontend.vue
+++ b/sist2-admin/frontend/src/views/Frontend.vue
@@ -1,63 +1,63 @@
 <template>
-  <b-card>
-    <b-card-title>
-      {{ name }}
-      <small style="vertical-align: top">
-        <b-badge v-if="!loading && frontend.running" variant="success">{{ $t("online") }}</b-badge>
-        <b-badge v-else-if="!loading" variant="secondary">{{ $t("offline") }}</b-badge>
-      </small>
-    </b-card-title>
+    <b-card>
+        <b-card-title>
+            {{ name }}
+            <small style="vertical-align: top">
+                <b-badge v-if="!loading && frontend.running" variant="success">{{ $t("online") }}</b-badge>
+                <b-badge v-else-if="!loading" variant="secondary">{{ $t("offline") }}</b-badge>
+            </small>
+        </b-card-title>

-    <!-- Action buttons-->
-    <div class="mb-3" v-if="!loading">
-      <b-button class="mr-1" :disabled="frontend.running || !valid" variant="success" @click="start()">{{
-          $t("start")
-        }}
-      </b-button>
-      <b-button class="mr-1" :disabled="!frontend.running" variant="danger" @click="stop()">{{
-          $t("stop")
-        }}
-      </b-button>
-      <b-button class="mr-1" :disabled="!frontend.running" variant="primary" :href="frontendUrl" target="_blank">
-        {{ $t("go") }}
-      </b-button>
-      <b-button variant="danger" @click="deleteFrontend()">{{ $t("delete") }}</b-button>
-    </div>
+        <!-- Action buttons-->
+        <div class="mb-3" v-if="!loading">
+            <b-button class="mr-1" :disabled="frontend.running || !valid" variant="success" @click="start()">{{
+                $t("start")
+                }}
+            </b-button>
+            <b-button class="mr-1" :disabled="!frontend.running" variant="danger" @click="stop()">{{
+                $t("stop")
+                }}
+            </b-button>
+            <b-button class="mr-1" :disabled="!frontend.running" variant="primary" :href="frontendUrl" target="_blank">
+                {{ $t("go") }}
+            </b-button>
+            <b-button variant="danger" @click="deleteFrontend()">{{ $t("delete") }}</b-button>
+        </div>

-    <b-progress v-if="loading" striped animated value="100"></b-progress>
-    <b-card-body v-else>
+        <b-progress v-if="loading" striped animated value="100"></b-progress>
+        <b-card-body v-else>

-      <h4>{{ $t("backendOptions.title") }}</h4>
-      <b-card>
-        <b-alert v-if="!valid" variant="warning" show>{{ $t("frontendOptions.noJobSelectedWarning") }}</b-alert>
+            <h4>{{ $t("backendOptions.title") }}</h4>
+            <b-card>
+                <b-alert v-if="!valid" variant="warning" show>{{ $t("frontendOptions.noJobSelectedWarning") }}</b-alert>

-        <SearchBackendSelect :value="frontend.web_options.search_backend"
-                             @change="onBackendSelect($event)"></SearchBackendSelect>
+                <SearchBackendSelect :value="frontend.web_options.search_backend"
+                                     @change="onBackendSelect($event)"></SearchBackendSelect>

-        <br>
-        <JobCheckboxGroup :frontend="frontend" @input="update()"></JobCheckboxGroup>
-      </b-card>
+                <br>
+                <JobCheckboxGroup :frontend="frontend" @input="update()"></JobCheckboxGroup>
+            </b-card>

-      <br/>
+            <br/>

-      <WebOptions :options="frontend.web_options" :frontend-name="$route.params.name"
-                  @change="update()"></WebOptions>
-      <br/>
+            <WebOptions :options="frontend.web_options" :frontend-name="$route.params.name"
+                        @change="update()"></WebOptions>
+            <br/>

-      <h4>{{ $t("frontendOptions.title") }}</h4>
-      <b-card>
-        <b-form-checkbox v-model="frontend.auto_start" @change="update()">
-          {{ $t("autoStart") }}
-        </b-form-checkbox>
+            <h4>{{ $t("frontendOptions.title") }}</h4>
+            <b-card>
+                <b-form-checkbox v-model="frontend.auto_start" @change="update()">
+                    {{ $t("autoStart") }}
+                </b-form-checkbox>

-        <label>{{ $t("extraQueryArgs") }}</label>
-        <b-form-input v-model="frontend.extra_query_args" @change="update()"></b-form-input>
+                <label>{{ $t("extraQueryArgs") }}</label>
+                <b-form-input v-model="frontend.extra_query_args" @change="update()"></b-form-input>

-        <label>{{ $t("customUrl") }}</label>
-        <b-form-input v-model="frontend.custom_url" @change="update()" placeholder="http://"></b-form-input>
-      </b-card>
-    </b-card-body>
-  </b-card>
+                <label>{{ $t("customUrl") }}</label>
+                <b-form-input v-model="frontend.custom_url" @change="update()" placeholder="http://"></b-form-input>
+            </b-card>
+        </b-card-body>
+    </b-card>
 </template>

 <script>
@@ -68,78 +68,71 @@ import WebOptions from "@/components/WebOptions";
 import SearchBackendSelect from "@/components/SearchBackendSelect.vue";

 export default {
-  name: 'Frontend',
-  components: {SearchBackendSelect, JobCheckboxGroup, WebOptions},
-  data() {
-    return {
-      loading: true,
-      frontend: null,
-    }
-  },
-  computed: {
-    valid() {
-      return !this.loading && this.frontend.jobs.length > 0;
+    name: 'Frontend',
+    components: {SearchBackendSelect, JobCheckboxGroup, WebOptions},
+    data() {
+        return {
+            loading: true,
+            frontend: null,
+        }
    },
-    frontendUrl() {
-      if (this.frontend.custom_url) {
-        return this.frontend.custom_url + this.args;
-      }
+    computed: {
+        valid() {
+            return !this.loading && this.frontend.jobs.length > 0;
+        },
+        frontendUrl() {
+            if (this.frontend.custom_url) {
+                return this.frontend.custom_url + this.args;
+            }

-      if (this.frontend.web_options.bind.startsWith("0.0.0.0")) {
-        return window.location.protocol + "//" + window.location.hostname + ":" + this.port + this.args;
-      }
+            if (this.frontend.web_options.bind.startsWith("0.0.0.0")) {
+                return window.location.protocol + "//" + window.location.hostname + ":" + this.port + this.args;
+            }

-      return window.location.protocol + "//" + this.frontend.web_options.bind + this.args;
+            return window.location.protocol + "//" + this.frontend.web_options.bind + this.args;
+        },
+        name() {
+            return this.$route.params.name;
+        },
+        port() {
+            return this.frontend.web_options.bind.split(":")[1]
+        },
+        args() {
+            const args = this.frontend.extra_query_args;
+            if (args !== "") {
+                return "#" + (args.startsWith("?") ? (args) : ("?" + args));
+            }
+            return "";
+        }
    },
-    name() {
-      return this.$route.params.name;
-    },
-    port() {
-      return this.frontend.web_options.bind.split(":")[1]
-    },
-    args() {
-      const args = this.frontend.extra_query_args;
-      if (args !== "") {
-        return "#" + (args.startsWith("?") ? (args) : ("?" + args));
-      }
-      return "";
-    }
-  },
-  mounted() {
-    Sist2AdminApi.getFrontend(this.name).then(resp => {
-      this.frontend = resp.data;
-      this.loading = false;
-    });
-  },
-  methods: {
-    start() {
-      Sist2AdminApi.startFrontend(this.name).then(() => {
-        this.frontend.running = true;
-      }).catch(() => {
-        this.$bvToast.toast(this.$t("couldNotStartFrontendBody"), {
-          title: this.$t("couldNotStartFrontend"),
-          variant: "danger",
-          toaster: "b-toaster-bottom-right"
+    mounted() {
+        Sist2AdminApi.getFrontend(this.name).then(resp => {
+            this.frontend = resp.data;
+            this.loading = false;
        });
-      });
    },
-    stop() {
-      this.frontend.running = false;
-      Sist2AdminApi.stopFrontend(this.name)
-    },
-    deleteFrontend() {
-      Sist2AdminApi.deleteFrontend(this.name).then(() => {
-        this.$router.push("/");
-      });
-    },
-    update() {
-      Sist2AdminApi.updateFrontend(this.name, this.frontend);
-    },
-    onBackendSelect(backend) {
-      this.frontend.web_options.search_backend = backend;
-      this.frontend.jobs = [];
-      this.update();
+    methods: {
+        start() {
+            this.frontend.running = true;
+            Sist2AdminApi.startFrontend(this.name)
+        },
+        stop() {
+            this.frontend.running = false;
+            Sist2AdminApi.stopFrontend(this.name)
+        },
+        deleteFrontend() {
+            Sist2AdminApi.deleteFrontend(this.name).then(() => {
+                this.$router.push("/");
+            });
+        },
+        update() {
+            Sist2AdminApi.updateFrontend(this.name, this.frontend);
+        },
+        onBackendSelect(backend) {
+            this.frontend.web_options.search_backend = backend;
+            this.frontend.jobs = [];
+            this.update();
+        }
    }
-  }
 }
 </script>
--- a/sist2-admin/frontend/src/views/Tail.vue
+++ b/sist2-admin/frontend/src/views/Tail.vue
@@ -170,6 +170,6 @@ span.ADMIN {
    margin: 3px;
    white-space: pre;
    color: #000;
-    overflow-y: hidden;
+    overflow: hidden;
 }
-</style>
+</style>
--- a/sist2-admin/frontend/yarn.lock
+++ b/sist2-admin/frontend/yarn.lock
@@ -1766,12 +1766,12 @@ bluebird@^3.1.1:
  version "3.7.2"
  resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"

-body-parser@1.20.2:
-  version "1.20.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
+body-parser@1.20.1:
+  version "1.20.1"
+  resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"
  dependencies:
    bytes "3.1.2"
-    content-type "~1.0.5"
+    content-type "~1.0.4"
    debug "2.6.9"
    depd "2.0.0"
    destroy "1.2.0"
@@ -1779,7 +1779,7 @@ body-parser@1.20.2:
    iconv-lite "0.4.24"
    on-finished "2.4.1"
    qs "6.11.0"
-    raw-body "2.5.2"
+    raw-body "2.5.1"
    type-is "~1.6.18"
    unpipe "1.0.0"

@@ -1817,13 +1817,7 @@ brace-expansion@^1.1.7:
    balanced-match "^1.0.0"
    concat-map "0.0.1"

-braces@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
-  dependencies:
-    fill-range "^7.1.1"
-
-braces@~3.0.2:
+braces@^3.0.2, braces@~3.0.2:
  version "3.0.2"
  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
  dependencies:
@@ -2097,10 +2091,6 @@ content-type@~1.0.4:
  version "1.0.4"
  resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"

-content-type@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
-
 convert-source-map@^1.7.0:
  version "1.8.0"
  resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"
@@ -2111,9 +2101,9 @@ cookie-signature@1.0.6:
  version "1.0.6"
  resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"

-cookie@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051"
+cookie@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"

 copy-webpack-plugin@^9.0.1:
  version "9.1.0"
@@ -2564,15 +2554,15 @@ execa@^5.0.0:
    strip-final-newline "^2.0.0"

 express@^4.17.3:
-  version "4.19.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
+  version "4.18.2"
+  resolved "https://registry.npmjs.org/express/-/express-4.18.2.tgz"
  dependencies:
    accepts "~1.3.8"
    array-flatten "1.1.1"
-    body-parser "1.20.2"
+    body-parser "1.20.1"
    content-disposition "0.5.4"
    content-type "~1.0.4"
-    cookie "0.6.0"
+    cookie "0.5.0"
    cookie-signature "1.0.6"
    debug "2.6.9"
    depd "2.0.0"
@@ -2641,12 +2631,6 @@ fill-range@^7.0.1:
  dependencies:
    to-regex-range "^5.0.1"

-fill-range@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
-  dependencies:
-    to-regex-range "^5.0.1"
-
 finalhandler@1.2.0:
  version "1.2.0"
  resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"
@@ -2675,8 +2659,8 @@ find-up@^4.0.0, find-up@^4.1.0:
    path-exists "^4.0.0"

 follow-redirects@^1.0.0, follow-redirects@^1.15.0:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"

 form-data@^4.0.0:
  version "4.0.0"
@@ -3322,10 +3306,10 @@ methods@~1.1.2:
  resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"

 micromatch@^4.0.2, micromatch@^4.0.4:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  version "4.0.5"
+  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
  dependencies:
-    braces "^3.0.3"
+    braces "^3.0.2"
    picomatch "^2.3.1"

 mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
@@ -4009,9 +3993,9 @@ range-parser@^1.2.1, range-parser@~1.2.1:
  version "1.2.1"
  resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"

-raw-body@2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+raw-body@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"
  dependencies:
    bytes "3.1.2"
    http-errors "2.0.0"
@@ -4790,8 +4774,8 @@ webpack-chain@^6.5.1:
    javascript-stringify "^2.0.1"

 webpack-dev-middleware@^5.3.1:
-  version "5.3.4"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
+  version "5.3.3"
+  resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz"
  dependencies:
    colorette "^2.0.10"
    memfs "^3.4.3"
--- a/sist2-admin/sist2_admin/app.py
+++ b/sist2-admin/sist2_admin/app.py
@@ -2,7 +2,6 @@ import asyncio
 import os
 import signal
 from datetime import datetime
-from time import sleep
 from urllib.parse import urlparse

 import requests
@@ -26,7 +25,6 @@ from state import migrate_v1_to_v2, RUNNING_FRONTENDS, TESSERACT_LANGS, DB_SCHEM
    get_log_files_to_remove, delete_log_file, create_default_search_backends
 from web import Sist2Frontend
 from script import UserScript, SCRIPT_TEMPLATES
-from util import tail_sync, pid_is_running

 sist2 = Sist2(SIST2_BINARY, DATA_FOLDER)
 db = PersistentState(dbfile=os.path.join(DATA_FOLDER, "state.db"))
@@ -326,18 +324,7 @@ def start_frontend_(frontend: Sist2Frontend):
    logger.debug(f"Fetched search backend options for {backend_name}")

    pid = sist2.web(frontend.web_options, search_backend, frontend.name)
-
-    sleep(0.2)
-    if not pid_is_running(pid):
-        frontend_log = frontend.get_log_path(LOG_FOLDER)
-        logger.error(f"Frontend exited too quickly, check {frontend_log} for more details:")
-        for line in tail_sync(frontend.get_log_path(LOG_FOLDER), 3):
-            logger.error(line.strip())
-
-        return False
-
    RUNNING_FRONTENDS[frontend.name] = pid
-    return True


@app.post("/api/frontend/{name:str}/start")
@@ -346,12 +333,7 @@ async def start_frontend(name: str):
    if not frontend:
        raise HTTPException(status_code=404)

-    ok = start_frontend_(frontend)
-
-    if not ok:
-        raise HTTPException(status_code=500)
-
-    return "ok"
+    start_frontend_(frontend)


@app.post("/api/frontend/{name:str}/stop")
--- a/sist2-admin/sist2_admin/jobs.py
+++ b/sist2-admin/sist2_admin/jobs.py
@@ -204,7 +204,7 @@ class Sist2IndexTask(Sist2Task):
        self.job.previous_index_path = self.job.index_path
        db["jobs"][self.job.name] = self.job

-        self._logger.info(json.dumps({"sist2-admin": f"Sist2Scan task finished {return_code=}, {duration=}, {ok=}"}))
+        self._logger.info(json.dumps({"sist2-admin": f"Sist2Scan task finished {return_code=}, {duration=}"}))

        logger.info(f"Completed {self.display_name} ({return_code=})")

--- a/sist2-admin/sist2_admin/sist2.py
+++ b/sist2-admin/sist2_admin/sist2.py
@@ -2,11 +2,10 @@ import datetime
 import json
 import logging
 import os.path
-import sys
 from datetime import datetime
 from enum import Enum
 from io import TextIOWrapper
-from logging import FileHandler, StreamHandler
+from logging import FileHandler
 from subprocess import Popen, PIPE
 from tempfile import NamedTemporaryFile
 from threading import Thread
@@ -201,7 +200,6 @@ class WebOptions(BaseModel):
    auth0_client_id: str = None
    auth0_public_key: str = None
    auth0_public_key_file: str = None
-    verbose: bool = False

    def __init__(self, **kwargs):
        super().__init__(**kwargs)
@@ -233,8 +231,6 @@ class WebOptions(BaseModel):
            args.append(f"--tag-auth={self.tag_auth}")
        if self.dev:
            args.append(f"--dev")
-        if self.verbose:
-            args.append(f"--very-verbose")

        args.extend(self.indices)

@@ -261,7 +257,7 @@ class Sist2:

        set_pid_cb(proc.pid)

-        t_stderr = Thread(target=self._consume_logs_stderr, args=(logs_cb, None, proc))
+        t_stderr = Thread(target=self._consume_logs_stderr, args=(logs_cb, proc))
        t_stderr.start()

        self._consume_logs_stdout(logs_cb, proc)
@@ -288,7 +284,7 @@ class Sist2:

        set_pid_cb(proc.pid)

-        t_stderr = Thread(target=self._consume_logs_stderr, args=(logs_cb, None, proc))
+        t_stderr = Thread(target=self._consume_logs_stderr, args=(logs_cb, proc))
        t_stderr.start()

        self._consume_logs_stdout(logs_cb, proc)
@@ -298,7 +294,7 @@ class Sist2:
        return proc.returncode

    @staticmethod
-    def _consume_logs_stderr(logs_cb, exit_cb, proc):
+    def _consume_logs_stderr(logs_cb, proc):
        pipe_wrapper = TextIOWrapper(proc.stderr, encoding="utf8", errors="ignore")
        try:
            for line in pipe_wrapper:
@@ -306,9 +302,7 @@ class Sist2:
                    continue
                logs_cb({"stderr": line})
        finally:
-            return_code = proc.wait()
-            if exit_cb:
-                exit_cb(return_code)
+            proc.wait()
            pipe_wrapper.close()

    @staticmethod
@@ -342,19 +336,15 @@ class Sist2:

        web_logger = logging.Logger(name=f"sist2-frontend-{name}")
        web_logger.addHandler(FileHandler(os.path.join(LOG_FOLDER, f"frontend-{name}.log")))
-        web_logger.addHandler(StreamHandler())

        def logs_cb(message):
            web_logger.info(json.dumps(message))

-        def exit_cb(return_code):
-            logger.info(f"Web frontend exited with return code {return_code}")
-
        logger.info(f"Starting frontend {' '.join(args)}")

        proc = Popen(args, stdout=PIPE, stderr=PIPE)

-        t_stderr = Thread(target=self._consume_logs_stderr, args=(logs_cb, exit_cb, proc))
+        t_stderr = Thread(target=self._consume_logs_stderr, args=(logs_cb, proc))
        t_stderr.start()

        t_stdout = Thread(target=self._consume_logs_stdout, args=(logs_cb, proc))
--- a/sist2-admin/sist2_admin/util.py
+++ b/sist2-admin/sist2_admin/util.py
@@ -1,41 +0,0 @@
-from glob import glob
-import os
-from config import DATA_FOLDER
-
-
-def get_old_index_files(name):
-    files = glob(os.path.join(DATA_FOLDER, f"scan-{name.replace('/', '_')}-*.sist2"))
-    files = list(sorted(files, key=lambda f: os.stat(f).st_mtime))
-    files = files[-1:]
-
-    return files
-
-
-def tail_sync(filename, lines=1, _buffer=4098):
-    with open(filename) as f:
-        lines_found = []
-
-        block_counter = -1
-
-        while len(lines_found) < lines:
-            try:
-                f.seek(block_counter * _buffer, os.SEEK_END)
-            except IOError:
-                f.seek(0)
-                lines_found = f.readlines()
-                break
-
-            lines_found = f.readlines()
-
-            block_counter -= 1
-
-        return lines_found[-lines:]
-
-
-def pid_is_running(pid):
-    try:
-        os.kill(pid, 0)
-    except OSError:
-        return False
-
-    return True
--- a/sist2-vue/fslightbox-vue.tgz
+++ b/sist2-vue/fslightbox-vue.tgz
--- a/sist2-vue/package-lock.json
+++ b/sist2-vue/package-lock.json
--- a/sist2-vue/package.json
+++ b/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",
--- a/sist2-vue/src/Sist2Api.js
+++ b/sist2-vue/src/Sist2Api.js
@@ -144,6 +144,8 @@ class Sist2Api {
    }

    _getIndexRoot(indexId) {
+        console.log(indexId)
+        console.log(this.sist2Info.indices.find(idx => idx.id === indexId))
        return this.sist2Info.indices.find(idx => idx.id === indexId).root;
    }

--- a/sist2-vue/src/components/Lightbox.vue
+++ b/sist2-vue/src/components/Lightbox.vue
@@ -77,7 +77,6 @@ export default {
        return listener(e);
      }
    };
-
  },
  methods: {
    keyDownListener(e) {
--- a/sist2-vue/src/ml/CLIPTransformerModel.js
+++ b/sist2-vue/src/ml/CLIPTransformerModel.js
@@ -22,9 +22,7 @@ export class CLIPTransformerModel {

    async loadModel(onProgress) {
        ort.env.wasm.wasmPaths = ORT_WASM_PATHS;
-        if (window.crossOriginIsolated) {
-            ort.env.wasm.numThreads = 2;
-        }
+        ort.env.wasm.numThreads = 2;

        let buf = await ModelStore.get(this._modelUrl);
        if (!buf) {
--- a/sist2-vue/watch.sh
+++ b/sist2-vue/watch.sh
@@ -1,5 +1,3 @@
 #!/usr/bin/env bash

-export NODE_OPTIONS=--openssl-legacy-provider
-
 ./node_modules/@vue/cli-service/bin/vue-cli-service.js build --watch
--- a/src/database/database_fts.c
+++ b/src/database/database_fts.c
@@ -102,9 +102,7 @@ void database_fts_index(database_t *db) {
            db->db, "DELETE FROM fts.mime_index;", NULL, NULL, NULL));
    CRASH_IF_NOT_SQLITE_OK(sqlite3_exec(
            db->db, "INSERT INTO fts.mime_index (index_id, mime, count) "
-                    "SELECT index_id, mime, count(*) FROM fts.document_index "
-                    "WHERE mime IS NOT NULL "
-                    "GROUP BY index_id, mime",
+                    "SELECT index_id, mime, count(*) FROM fts.document_index GROUP BY index_id, mime",
            NULL, NULL, NULL));

    LOG_DEBUG("database_fts.c", "Generating path index");
--- a/src/index/web.c
+++ b/src/index/web.c
@@ -206,7 +206,7 @@ response_t *web_put(const char *url, const char *data, int insecure) {
    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_cb);
    curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
    curl_easy_setopt(curl, CURLOPT_USERAGENT, "sist2");
-    curl_easy_setopt(curl, CURLOPT_SHARE, 0);
+    curl_easy_setopt(curl, CURLOPT_DNS_USE_GLOBAL_CACHE, 0);
    curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURLOPT_DNS_LOCAL_IP4);
    if (insecure) {
        curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
--- a/src/sist.h
+++ b/src/sist.h
@@ -51,17 +51,17 @@
 #include <ctype.h>
 #include "git_hash.h"

-#define VERSION "3.4.2"
+#define VERSION "3.4.1"
 static const char *const Version = VERSION;
 static const int VersionMajor = 3;
 static const int VersionMinor = 4;
-static const int VersionPatch = 2;
+static const int VersionPatch = 1;

 #ifndef SIST_PLATFORM
 #define SIST_PLATFORM unknown
 #endif

-#define EXPECTED_MONGOOSE_VERSION "7.13"
+#define EXPECTED_MONGOOSE_VERSION "7.7"

 #define Q(x) #x
 #define QUOTE(x) Q(x)
--- a/src/web/serve.c
+++ b/src/web/serve.c
@@ -108,6 +108,7 @@ void stats_files(struct mg_connection *nc, struct mg_http_message *hm) {

    cJSON *json = database_get_stats(db, stat_type);
    mg_send_json(nc, json);
+
    cJSON_Delete(json);
 }

@@ -168,7 +169,6 @@ void serve_thumbnail(struct mg_connection *nc, struct mg_http_message *hm, int i
                "Cache-Control: max-age=31536000"
        );
        mg_send(nc, data, data_len);
-        nc->is_resp = 0;
        free(data);
    } else {
        HTTP_REPLY_NOT_FOUND
@@ -217,7 +217,6 @@ void search(struct mg_connection *nc, struct mg_http_message *hm) {
    snprintf(url, 4096, "%s/%s/_search", WebCtx.es_url, WebCtx.es_index);

    nc->fn_data = web_post_async(url, body, WebCtx.es_insecure_ssl);
-    nc->is_resp = 1;
 }

 void serve_file_from_url(cJSON *json, index_t *idx, struct mg_connection *nc) {
@@ -383,7 +382,11 @@ void index_info(struct mg_connection *nc) {
        cJSON_AddStringToObject(json, "searchBackend", "elasticsearch");
    }

-    mg_send_json(nc, json);
+    char *json_str = cJSON_PrintUnformatted(json);
+
+    web_send_headers(nc, 200, strlen(json_str), "Content-Type: application/json");
+    mg_send(nc, json_str, strlen(json_str));
+    free(json_str);
    cJSON_Delete(json);
 }

@@ -430,11 +433,6 @@ 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 {
@@ -452,7 +450,6 @@ void status(struct mg_connection *nc) {
    }

    free(status);
-    nc->is_resp = 0;
 }

 typedef struct {
@@ -630,7 +627,7 @@ int check_auth0(struct mg_http_message *hm) {
    return TRUE;
 }

-static void ev_router(struct mg_connection *nc, int ev, void *ev_data) {
+static void ev_router(struct mg_connection *nc, int ev, void *ev_data, UNUSED(void *fn_data)) {

    if (ev == MG_EV_HTTP_MSG) {
        struct mg_http_message *hm = (struct mg_http_message *) ev_data;
@@ -741,7 +738,6 @@ static void ev_router(struct mg_connection *nc, int ev, void *ev_data) {
                if (r->status_code == 200) {
                    web_send_headers(nc, 200, r->size, "Content-Type: application/json");
                    mg_send(nc, r->body, r->size);
-                    nc->is_resp = 0;
                } else if (r->status_code == 0) {
                    sist_log("serve.c", LOG_SIST_ERROR, "Could not connect to elasticsearch!");

--- a/src/web/web_util.c
+++ b/src/web/web_util.c
@@ -5,37 +5,31 @@
 void web_serve_asset_index_html(struct mg_connection *nc) {
    web_send_headers(nc, 200, sizeof(index_html), HTTP_CROSS_ORIGIN_HEADERS "Content-Type: text/html");
    mg_send(nc, index_html, sizeof(index_html));
-    nc->is_resp = 0;
 }

 void web_serve_asset_index_js(struct mg_connection *nc) {
    web_send_headers(nc, 200, sizeof(index_js), "Content-Type: application/javascript");
    mg_send(nc, index_js, sizeof(index_js));
-    nc->is_resp = 0;
 }

 void web_serve_asset_chunk_vendors_js(struct mg_connection *nc) {
    web_send_headers(nc, 200, sizeof(chunk_vendors_js), "Content-Type: application/javascript");
    mg_send(nc, chunk_vendors_js, sizeof(chunk_vendors_js));
-    nc->is_resp = 0;
 }

 void web_serve_asset_favicon_ico(struct mg_connection *nc) {
    web_send_headers(nc, 200, sizeof(favicon_ico), "Content-Type: image/x-icon");
    mg_send(nc, favicon_ico, sizeof(favicon_ico));
-    nc->is_resp = 0;
 }

 void web_serve_asset_style_css(struct mg_connection *nc) {
    web_send_headers(nc, 200, sizeof(index_css), "Content-Type: text/css");
    mg_send(nc, index_css, sizeof(index_css));
-    nc->is_resp = 0;
 }

 void web_serve_asset_chunk_vendors_css(struct mg_connection *nc) {
    web_send_headers(nc, 200, sizeof(chunk_vendors_css), "Content-Type: text/css");
    mg_send(nc, chunk_vendors_css, sizeof(chunk_vendors_css));
-    nc->is_resp = 0;
 }

 index_t *web_get_index_by_id(int index_id) {
@@ -98,7 +92,6 @@ void mg_send_json(struct mg_connection *nc, const cJSON *json) {

    web_send_headers(nc, 200, strlen(json_str), "Content-Type: application/json");
    mg_send(nc, json_str, strlen(json_str));
-    nc->is_resp = 0;

    free(json_str);
 }
--- a/src/web/web_util.h
+++ b/src/web/web_util.h
@@ -16,26 +16,9 @@ database_t *web_get_database(int index_id);

 __always_inline
 static char *web_address_to_string(struct mg_addr *addr) {
-    static char address_to_string_buf[64];
+    static char address_to_string_buf[INET6_ADDRSTRLEN];

-    if (addr->is_ip6) {
-        snprintf(address_to_string_buf, sizeof(address_to_string_buf),
-            "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
-                addr->ip[0], addr->ip[1],
-                addr->ip[2], addr->ip[3],
-                addr->ip[4], addr->ip[5],
-                addr->ip[6], addr->ip[7],
-                addr->ip[8], addr->ip[9],
-                addr->ip[10], addr->ip[11],
-                addr->ip[12], addr->ip[13],
-                addr->ip[14], addr->ip[15]);
-    } else {
-        snprintf(address_to_string_buf, sizeof(address_to_string_buf),
-                 "%d.%d.%d.%d",
-                 addr->ip[0], addr->ip[1], addr->ip[2], addr->ip[3]);
-    }
-
-    return address_to_string_buf;
+    return mg_ntoa(addr, address_to_string_buf, sizeof(address_to_string_buf));
 }

 void web_send_headers(struct mg_connection *nc, int status_code, size_t length, char *extra_headers);
--- a/third-party/libscan/CMakeLists.txt
+++ b/third-party/libscan/CMakeLists.txt
@@ -106,33 +106,12 @@ find_library(MUPDF_LIB NAMES liblibmupdf.a)
 find_library(CMS_LIB NAMES lcms2)
 find_library(JAS_LIB NAMES jasper)
 find_library(GUMBO_LIB NAMES gumbo)
-find_library(GOMP_LIB NAMES libgomp.a gomp
-        PATHS
-        /usr/lib/gcc/x86_64-linux-gnu/5/
-        /usr/lib/gcc/x86_64-linux-gnu/6/
-        /usr/lib/gcc/x86_64-linux-gnu/7/
-        /usr/lib/gcc/x86_64-linux-gnu/8/
-        /usr/lib/gcc/x86_64-linux-gnu/9/
-        /usr/lib/gcc/x86_64-linux-gnu/10/
-        /usr/lib/gcc/x86_64-linux-gnu/11/
-        /usr/lib/gcc/x86_64-linux-gnu/12/
-
-        /usr/lib/gcc/aarch64-linux-gnu/5/
-        /usr/lib/gcc/aarch64-linux-gnu/6/
-        /usr/lib/gcc/aarch64-linux-gnu/7/
-        /usr/lib/gcc/aarch64-linux-gnu/8/
-        /usr/lib/gcc/aarch64-linux-gnu/9/
-        /usr/lib/gcc/aarch64-linux-gnu/10/
-        /usr/lib/gcc/aarch64-linux-gnu/11/
-        /usr/lib/gcc/aarch64-linux-gnu/12/
-)
+find_library(GOMP_LIB NAMES libgomp.a gomp PATHS /usr/lib/gcc/x86_64-linux-gnu/11/ /usr/lib/gcc/x86_64-linux-gnu/5/ /usr/lib/gcc/x86_64-linux-gnu/9/ /usr/lib/gcc/x86_64-linux-gnu/10/ /usr/lib/gcc/aarch64-linux-gnu/7/ /usr/lib/gcc/aarch64-linux-gnu/9/ /usr/lib/gcc/x86_64-linux-gnu/7/ /usr/lib/gcc/aarch64-linux-gnu/11/ /usr/lib/gcc/x86_64-linux-gnu/8/ /usr/lib/gcc/aarch64-linux-gnu/8/)
 find_package(Leptonica CONFIG REQUIRED)
+find_package(FFMPEG REQUIRED)
 find_package(libraw CONFIG REQUIRED)
 find_package(Freetype REQUIRED)

-find_package(FFMPEG REQUIRED)
-list(REMOVE_ITEM FFMPEG_LIBRARIES /usr/lib/x86_64-linux-gnu/libm.a)
-list(REMOVE_ITEM FFMPEG_LIBRARIES /usr/lib/aarch64-linux-gnu/libm.a)

 target_compile_options(
        scan
@@ -187,6 +166,7 @@ target_link_libraries(
        ${WPD_LIB_DIR}/libwpd-0.9.a
        ${WPD_LIB_DIR}/libwpd-stream-0.9.a

+        ${FREETYPE_LIB}
        ${HARFBUZZ_LIB}
        ${JBIG2DEC_LIB}

--- a/third-party/libscan/libscan/media/media.c
+++ b/third-party/libscan/libscan/media/media.c
@@ -569,9 +569,6 @@ void parse_media_format_ctx(scan_media_ctx_t *ctx, AVFormatContext *pFormatCtx,
        AVStream *stream = pFormatCtx->streams[video_stream];

        if (stream->codecpar->width <= MIN_SIZE || stream->codecpar->height <= MIN_SIZE) {
-            CTX_LOG_DEBUGF(doc->filepath,
-                           "Will not generate thumbnail because image is too small: %dx%d",
-                           stream->codecpar->width, stream->codecpar->width);
            avformat_close_input(&pFormatCtx);
            avformat_free_context(pFormatCtx);
            return;
Author	SHA1	Message	Date
Andrew	b52a3d1319	Merge `4ec6a14252` into `ae317e590d`	2024-01-08 16:41:32 -06:00
Andrew	4ec6a14252	Add Version in sist2-admin Added the version badge-pill to the sist2-admin page so you can check the version without going to the main search frontend.	2023-12-20 09:45:15 -06:00