rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Cohee
2023-06-04 04:29:46 +03:00
parent e480282717 c299ef0a86
commit 0d0b572935
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/docker-entrypoint.sh
View File

@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# Initialize missing user files # Initialize missing user files
IFS="," RESOURCES="characters,groups,group chats,chats,User Avatars,settings.json" IFS="," RESOURCES="characters,groups,group chats,chats,User Avatars,worlds,settings.json"
for R in $RESOURCES; do for R in $RESOURCES; do
if [ ! -e "config/$R" ]; then if [ ! -e "config/$R" ]; then
echo "Resource not found, copying from defaults: $R" echo "Resource not found, copying from defaults: $R"

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "sillytavern", "name": "sillytavern",
"version": "1.6.5", "version": "1.6.6",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "sillytavern", "name": "sillytavern",
"version": "1.6.5", "version": "1.6.6",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"dependencies": { "dependencies": {
"@dqbd/tiktoken": "^1.0.2", "@dqbd/tiktoken": "^1.0.2",

2
package.json
View File

@@ -49,7 +49,7 @@
"type": "git", "type": "git",
"url": "https://github.com/SillyTavern/SillyTavern.git" "url": "https://github.com/SillyTavern/SillyTavern.git"
}, },
"version": "1.6.5", "version": "1.6.6",
"scripts": { "scripts": {
"start": "node server.js", "start": "node server.js",
"pkg": "pkg --compress Gzip --no-bytecode --public ." "pkg": "pkg --compress Gzip --no-bytecode --public ."

3
server.js
View File

@@ -2805,7 +2805,8 @@ function putAsync(url, args) {
} }
async function postAsync(url, args) { async function postAsync(url, args) {
const response = await fetch(url, { method: 'POST', ...args }); const fetch = require('node-fetch').default;
const response = await fetch(url, { method: 'POST', timeout: 0, ...args });
if (response.ok) { if (response.ok) {
const data = await response.json(); const data = await response.json();