Merge branch 'release' into staging

b6a480b3290a0fd78c9b4fb337fb9d1519fe48e2

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: 43f182430973d55314aeed4b20eb37b02ade2a70 52a08603209d8b45999729b97a4f0e6dd3509300
8 files changed, +112 -101Ignore whitespace
Dockerfile+1 -1
@@ -17,7 +17,7 @@ COPY . ./
1717
18RUN \18RUN \
19 echo "*** Install npm packages ***" && \19 echo "*** Install npm packages ***" && \
20 npm i --no-audit --no-fund --loglevel=error --no-progress --omit=dev && npm cache clean --force20 npm ci --no-audit --no-fund --loglevel=error --no-progress --omit=dev && npm cache clean --force
2121
22# Create config directory and link config.yaml22# Create config directory and link config.yaml
23RUN \23RUN \
Start.bat+1 -1
@@ -1,7 +1,7 @@
1@echo off1@echo off
2pushd %~dp02pushd %~dp0
3set NODE_ENV=production3set NODE_ENV=production
4call npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev4call npm install --no-save --no-audit --no-fund --loglevel=error --no-progress --omit=dev
5node server.js %*5node server.js %*
6pause6pause
7popd7popd
UpdateAndStart.bat+1 -1
@@ -20,7 +20,7 @@ if %errorlevel% neq 0 (
20 )20 )
21)21)
22set NODE_ENV=production22set NODE_ENV=production
23call npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev23call npm install --no-save --no-audit --no-fund --loglevel=error --no-progress --omit=dev
24node server.js %*24node server.js %*
25:end25:end
26pause26pause
UpdateForkAndStart.bat+1 -1
@@ -102,7 +102,7 @@ if %errorlevel% neq 0 (
102102
103echo Installing npm packages and starting server103echo Installing npm packages and starting server
104set NODE_ENV=production104set NODE_ENV=production
105call npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev105call npm install --no-save --no-audit --no-fund --loglevel=error --no-progress --omit=dev
106node server.js %*106node server.js %*
107107
108:end108:end
package-lock.json+105 -94
@@ -3255,36 +3255,33 @@
3255 "node": ">=8"3255 "node": ">=8"
3256 }3256 }
3257 },3257 },
3258 "node_modules/call-bind": {3258 "node_modules/call-bind-apply-helpers": {
3259 "version": "1.0.7",3259 "version": "1.0.2",
3260 "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",3260 "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
3261 "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",3261 "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
3262 "license": "MIT",3262 "license": "MIT",
3263 "dependencies": {3263 "dependencies": {
3264 "es-define-property": "^1.0.0",
3265 "es-errors": "^1.3.0",3264 "es-errors": "^1.3.0",
3266 "function-bind": "^1.1.2",3265 "function-bind": "^1.1.2"
3267 "get-intrinsic": "^1.2.4",
3268 "set-function-length": "^1.2.1"
3269 },3266 },
3270 "engines": {3267 "engines": {
3271 "node": ">= 0.4"3268 "node": ">= 0.4"
3272 },
3273 "funding": {
3274 "url": "https://github.com/sponsors/ljharb"
3275 }3269 }
3276 },3270 },
3277 "node_modules/call-bind-apply-helpers": {3271 "node_modules/call-bound": {
3278 "version": "1.0.2",3272 "version": "1.0.4",
3279 "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",3273 "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
3280 "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",3274 "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
3281 "license": "MIT",3275 "license": "MIT",
3282 "dependencies": {3276 "dependencies": {
3283 "es-errors": "^1.3.0",3277 "call-bind-apply-helpers": "^1.0.2",
3284 "function-bind": "^1.1.2"3278 "get-intrinsic": "^1.3.0"
3285 },3279 },
3286 "engines": {3280 "engines": {
3287 "node": ">= 0.4"3281 "node": ">= 0.4"
3282 },
3283 "funding": {
3284 "url": "https://github.com/sponsors/ljharb"
3288 }3285 }
3289 },3286 },
3290 "node_modules/callsites": {3287 "node_modules/callsites": {
@@ -4019,23 +4016,6 @@
4019 "node": ">=10"4016 "node": ">=10"
4020 }4017 }
4021 },4018 },
4022 "node_modules/define-data-property": {
4023 "version": "1.1.4",
4024 "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
4025 "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
4026 "license": "MIT",
4027 "dependencies": {
4028 "es-define-property": "^1.0.0",
4029 "es-errors": "^1.3.0",
4030 "gopd": "^1.0.1"
4031 },
4032 "engines": {
4033 "node": ">= 0.4"
4034 },
4035 "funding": {
4036 "url": "https://github.com/sponsors/ljharb"
4037 }
4038 },
4039 "node_modules/define-lazy-prop": {4019 "node_modules/define-lazy-prop": {
4040 "version": "3.0.0",4020 "version": "3.0.0",
4041 "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",4021 "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
@@ -4793,39 +4773,39 @@
4793 "integrity": "sha512-c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw=="4773 "integrity": "sha512-c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw=="
4794 },4774 },
4795 "node_modules/express": {4775 "node_modules/express": {
4796 "version": "4.21.2",4776 "version": "4.22.1",
4797 "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",4777 "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz",
4798 "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",4778 "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==",
4799 "license": "MIT",4779 "license": "MIT",
4800 "dependencies": {4780 "dependencies": {
4801 "accepts": "~1.3.8",4781 "accepts": "~1.3.8",
4802 "array-flatten": "1.1.1",4782 "array-flatten": "1.1.1",
4803 "body-parser": "1.20.3",4783 "body-parser": "~1.20.3",
4804 "content-disposition": "0.5.4",4784 "content-disposition": "~0.5.4",
4805 "content-type": "~1.0.4",4785 "content-type": "~1.0.4",
4806 "cookie": "0.7.1",4786 "cookie": "~0.7.1",
4807 "cookie-signature": "1.0.6",4787 "cookie-signature": "~1.0.6",
4808 "debug": "2.6.9",4788 "debug": "2.6.9",
4809 "depd": "2.0.0",4789 "depd": "2.0.0",
4810 "encodeurl": "~2.0.0",4790 "encodeurl": "~2.0.0",
4811 "escape-html": "~1.0.3",4791 "escape-html": "~1.0.3",
4812 "etag": "~1.8.1",4792 "etag": "~1.8.1",
4813 "finalhandler": "1.3.1",4793 "finalhandler": "~1.3.1",
4814 "fresh": "0.5.2",4794 "fresh": "~0.5.2",
4815 "http-errors": "2.0.0",4795 "http-errors": "~2.0.0",
4816 "merge-descriptors": "1.0.3",4796 "merge-descriptors": "1.0.3",
4817 "methods": "~1.1.2",4797 "methods": "~1.1.2",
4818 "on-finished": "2.4.1",4798 "on-finished": "~2.4.1",
4819 "parseurl": "~1.3.3",4799 "parseurl": "~1.3.3",
4820 "path-to-regexp": "0.1.12",4800 "path-to-regexp": "~0.1.12",
4821 "proxy-addr": "~2.0.7",4801 "proxy-addr": "~2.0.7",
4822 "qs": "6.13.0",4802 "qs": "~6.14.0",
4823 "range-parser": "~1.2.1",4803 "range-parser": "~1.2.1",
4824 "safe-buffer": "5.2.1",4804 "safe-buffer": "5.2.1",
4825 "send": "0.19.0",4805 "send": "~0.19.0",
4826 "serve-static": "1.16.2",4806 "serve-static": "~1.16.2",
4827 "setprototypeof": "1.2.0",4807 "setprototypeof": "1.2.0",
4828 "statuses": "2.0.1",4808 "statuses": "~2.0.1",
4829 "type-is": "~1.6.18",4809 "type-is": "~1.6.18",
4830 "utils-merge": "1.0.1",4810 "utils-merge": "1.0.1",
4831 "vary": "~1.1.2"4811 "vary": "~1.1.2"
@@ -4838,13 +4818,19 @@
4838 "url": "https://opencollective.com/express"4818 "url": "https://opencollective.com/express"
4839 }4819 }
4840 },4820 },
4841 "node_modules/express/node_modules/cookie": {4821 "node_modules/express/node_modules/qs": {
4842 "version": "0.7.1",4822 "version": "6.14.0",
4843 "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",4823 "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
4844 "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",4824 "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
4845 "license": "MIT",4825 "license": "BSD-3-Clause",
4826 "dependencies": {
4827 "side-channel": "^1.1.0"
4828 },
4846 "engines": {4829 "engines": {
4847 "node": ">= 0.6"4830 "node": ">=0.6"
4831 },
4832 "funding": {
4833 "url": "https://github.com/sponsors/ljharb"
4848 }4834 }
4849 },4835 },
4850 "node_modules/express/node_modules/safe-buffer": {4836 "node_modules/express/node_modules/safe-buffer": {
@@ -5514,18 +5500,6 @@
5514 "node": ">=8"5500 "node": ">=8"
5515 }5501 }
5516 },5502 },
5517 "node_modules/has-property-descriptors": {
5518 "version": "1.0.2",
5519 "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
5520 "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
5521 "license": "MIT",
5522 "dependencies": {
5523 "es-define-property": "^1.0.0"
5524 },
5525 "funding": {
5526 "url": "https://github.com/sponsors/ljharb"
5527 }
5528 },
5529 "node_modules/has-symbols": {5503 "node_modules/has-symbols": {
5530 "version": "1.1.0",5504 "version": "1.1.0",
5531 "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",5505 "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
@@ -6738,9 +6712,9 @@
6738 }6712 }
6739 },6713 },
6740 "node_modules/object-inspect": {6714 "node_modules/object-inspect": {
6741 "version": "1.13.2",6715 "version": "1.13.4",
6742 "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",6716 "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
6743 "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",6717 "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
6744 "license": "MIT",6718 "license": "MIT",
6745 "engines": {6719 "engines": {
6746 "node": ">= 0.4"6720 "node": ">= 0.4"
@@ -7875,23 +7849,6 @@
7875 "node": ">= 0.8.0"7849 "node": ">= 0.8.0"
7876 }7850 }
7877 },7851 },
7878 "node_modules/set-function-length": {
7879 "version": "1.2.2",
7880 "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
7881 "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
7882 "license": "MIT",
7883 "dependencies": {
7884 "define-data-property": "^1.1.4",
7885 "es-errors": "^1.3.0",
7886 "function-bind": "^1.1.2",
7887 "get-intrinsic": "^1.2.4",
7888 "gopd": "^1.0.1",
7889 "has-property-descriptors": "^1.0.2"
7890 },
7891 "engines": {
7892 "node": ">= 0.4"
7893 }
7894 },
7895 "node_modules/setprototypeof": {7852 "node_modules/setprototypeof": {
7896 "version": "1.2.0",7853 "version": "1.2.0",
7897 "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",7854 "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -7945,15 +7902,69 @@
7945 }7902 }
7946 },7903 },
7947 "node_modules/side-channel": {7904 "node_modules/side-channel": {
7948 "version": "1.0.6",7905 "version": "1.1.0",
7949 "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",7906 "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
7950 "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",7907 "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
7908 "license": "MIT",
7909 "dependencies": {
7910 "es-errors": "^1.3.0",
7911 "object-inspect": "^1.13.3",
7912 "side-channel-list": "^1.0.0",
7913 "side-channel-map": "^1.0.1",
7914 "side-channel-weakmap": "^1.0.2"
7915 },
7916 "engines": {
7917 "node": ">= 0.4"
7918 },
7919 "funding": {
7920 "url": "https://github.com/sponsors/ljharb"
7921 }
7922 },
7923 "node_modules/side-channel-list": {
7924 "version": "1.0.0",
7925 "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
7926 "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
7927 "license": "MIT",
7928 "dependencies": {
7929 "es-errors": "^1.3.0",
7930 "object-inspect": "^1.13.3"
7931 },
7932 "engines": {
7933 "node": ">= 0.4"
7934 },
7935 "funding": {
7936 "url": "https://github.com/sponsors/ljharb"
7937 }
7938 },
7939 "node_modules/side-channel-map": {
7940 "version": "1.0.1",
7941 "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
7942 "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
7943 "license": "MIT",
7944 "dependencies": {
7945 "call-bound": "^1.0.2",
7946 "es-errors": "^1.3.0",
7947 "get-intrinsic": "^1.2.5",
7948 "object-inspect": "^1.13.3"
7949 },
7950 "engines": {
7951 "node": ">= 0.4"
7952 },
7953 "funding": {
7954 "url": "https://github.com/sponsors/ljharb"
7955 }
7956 },
7957 "node_modules/side-channel-weakmap": {
7958 "version": "1.0.2",
7959 "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
7960 "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
7951 "license": "MIT",7961 "license": "MIT",
7952 "dependencies": {7962 "dependencies": {
7953 "call-bind": "^1.0.7",7963 "call-bound": "^1.0.2",
7954 "es-errors": "^1.3.0",7964 "es-errors": "^1.3.0",
7955 "get-intrinsic": "^1.2.4",7965 "get-intrinsic": "^1.2.5",
7956 "object-inspect": "^1.13.1"7966 "object-inspect": "^1.13.3",
7967 "side-channel-map": "^1.0.1"
7957 },7968 },
7958 "engines": {7969 "engines": {
7959 "node": ">= 0.4"7970 "node": ">= 0.4"
src/electron/Start.bat+1 -1
@@ -1,6 +1,6 @@
1@echo off1@echo off
2pushd %~dp02pushd %~dp0
3call npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev3call npm install --no-save --no-audit --no-fund --loglevel=error --no-progress --omit=dev
4npm run start server.js %*4npm run start server.js %*
5pause5pause
6popd6popd
src/electron/start.sh+1 -1
@@ -5,7 +5,7 @@ cd "$(dirname "$0")"
55
6echo "Assuming nodejs and npm is already installed. If you haven't installed them already, do so now"6echo "Assuming nodejs and npm is already installed. If you haven't installed them already, do so now"
7echo "Installing Electron Wrapper's Node Modules..."7echo "Installing Electron Wrapper's Node Modules..."
8npm i --no-audit --no-fund --loglevel=error --no-progress --omit=dev8npm i --no-save --no-audit --no-fund --loglevel=error --no-progress --omit=dev
99
10echo "Starting Electron Wrapper..."10echo "Starting Electron Wrapper..."
11npm run start -- "$@"11npm run start -- "$@"
start.sh+1 -1
@@ -10,7 +10,7 @@ fi
1010
11echo "Installing Node Modules..."11echo "Installing Node Modules..."
12export NODE_ENV=production12export NODE_ENV=production
13npm i --no-audit --no-fund --loglevel=error --no-progress --omit=dev13npm i --no-save --no-audit --no-fund --loglevel=error --no-progress --omit=dev
1414
15echo "Entering SillyTavern..."15echo "Entering SillyTavern..."
16node "server.js" "$@"16node "server.js" "$@"