sillytavern 1.11.8 → 1.12.0-preview

package/.dockerignore

@@ -4,6 +4,7 @@ npm-debug.log
 readme*
 Start.bat
 /dist
-/backups/
+/backups
 cloudflared.exe
 access.log
+/data

package/.eslintrc.js

@@ -42,11 +42,21 @@ module.exports = {
                 showdownKatex: 'readonly',
                 SVGInject: 'readonly',
                 toastr: 'readonly',
+                Readability: 'readonly',
+                isProbablyReaderable: 'readonly',
             },
         },
     ],
     // There are various vendored libraries that shouldn't be linted
-    ignorePatterns: ['public/lib/**/*', '*.min.js', 'src/ai_horde/**/*'],
+    ignorePatterns: [
+        'public/lib/**/*',
+        '*.min.js',
+        'src/ai_horde/**/*',
+        'plugins/**/*',
+        'data/**/*',
+        'backups/**/*',
+        'node_modules/**/*',
+    ],
     rules: {
         'no-unused-vars': ['error', { args: 'none' }],
         'no-control-regex': 'off',

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:19.1.0-alpine3.16
+FROM node:lts-alpine3.18
 
 # Arguments
 ARG APP_HOME=/home/node/app
@@ -26,19 +26,9 @@ COPY . ./
 
 # Copy default chats, characters and user avatars to <folder>.default folder
 RUN \
-  IFS="," RESOURCES="assets,backgrounds,user,context,instruct,QuickReplies,movingUI,themes,characters,chats,groups,group chats,User Avatars,worlds,OpenAI Settings,NovelAI Settings,KoboldAI Settings,TextGen Settings" && \
-  \
-  echo "*** Store default $RESOURCES in <folder>.default ***" && \
-  for R in $RESOURCES; do mv "public/$R" "public/$R.default"; done || true && \
-  \
-  echo "*** Create symbolic links to config directory ***" && \
-  for R in $RESOURCES; do ln -s "../config/$R" "public/$R"; done || true && \
-  \
-  rm -f "config.yaml" "public/settings.json" || true && \
+  rm -f "config.yaml" || true && \
   ln -s "./config/config.yaml" "config.yaml" || true && \
-  ln -s "../config/settings.json" "public/settings.json" || true && \
-  mkdir "config" || true && \
-  mkdir -p "public/user" || true
+  mkdir "config" || true
 
 # Cleanup unnecessary files
 RUN \

package/config.yaml

@@ -1,8 +1,12 @@
-# -- NETWORK CONFIGURATION --
+# -- DATA CONFIGURATION --
+# Root directory for user data storage
+dataRoot: ./data
+# -- SERVER CONFIGURATION --
 # Listen for incoming connections
 listen: false
 # Server port
 port: 8000
+# -- SECURITY CONFIGURATION --
 # Toggle whitelist mode
 whitelistMode: true
 # Whitelist of allowed IP addresses
@@ -16,7 +20,15 @@ basicAuthUser:
   password: "password"
 # Enables CORS proxy middleware
 enableCorsProxy: false
-# Disable security checks - NOT RECOMMENDED
+# Enable multi-user mode
+enableUserAccounts: false
+# Enable discreet login mode: hides user list on the login screen
+enableDiscreetLogin: false
+# Used to sign session cookies. Will be auto-generated if not set
+cookieSecret: ''
+# Disable CSRF protection - NOT RECOMMENDED
+disableCsrfProtection: false
+# Disable startup security checks - NOT RECOMMENDED
 securityOverride: false
 # -- ADVANCED CONFIGURATION --
 # Open the browser automatically

package/default/config.yaml

@@ -1,8 +1,12 @@
-# -- NETWORK CONFIGURATION --
+# -- DATA CONFIGURATION --
+# Root directory for user data storage
+dataRoot: ./data
+# -- SERVER CONFIGURATION --
 # Listen for incoming connections
 listen: false
 # Server port
 port: 8000
+# -- SECURITY CONFIGURATION --
 # Toggle whitelist mode
 whitelistMode: true
 # Whitelist of allowed IP addresses
@@ -16,7 +20,15 @@ basicAuthUser:
   password: "password"
 # Enables CORS proxy middleware
 enableCorsProxy: false
-# Disable security checks - NOT RECOMMENDED
+# Enable multi-user mode
+enableUserAccounts: false
+# Enable discreet login mode: hides user list on the login screen
+enableDiscreetLogin: false
+# Used to sign session cookies. Will be auto-generated if not set
+cookieSecret: ''
+# Disable CSRF protection - NOT RECOMMENDED
+disableCsrfProtection: false
+# Disable startup security checks - NOT RECOMMENDED
 securityOverride: false
 # -- ADVANCED CONFIGURATION --
 # Open the browser automatically

package/default/content/index.json

@@ -1,4 +1,108 @@
 [
+    {
+        "filename": "settings.json",
+        "type": "settings"
+    },
+    {
+        "filename": "themes/Dark Lite.json",
+        "type": "theme"
+    },
+    {
+        "filename": "themes/Cappuccino.json",
+        "type": "theme"
+    },
+    {
+        "filename": "backgrounds/__transparent.png",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/_black.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/_white.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/bedroom clean.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/bedroom cyberpunk.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/bedroom red.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/bedroom tatami.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/cityscape medieval market.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/cityscape medieval night.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/cityscape postapoc.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/forest treehouse fireworks air baloons (by kallmeflocc).jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/japan classroom side.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/japan classroom.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/japan path cherry blossom.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/japan university.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/landscape autumn great tree.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/landscape beach day.png",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/landscape beach night.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/landscape mountain lake.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/landscape postapoc.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/landscape winter lake house.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/royal.jpg",
+        "type": "background"
+    },
+    {
+        "filename": "backgrounds/tavern day.jpg",
+        "type": "background"
+    },
     {
         "filename": "default_Seraphina.png",
         "type": "character"
@@ -211,7 +315,6 @@
         "filename": "presets/novel/Writers-Daemon-Kayra.json",
         "type": "novel_preset"
     },
-
     {
         "filename": "presets/textgen/Asterism.json",
         "type": "textgen_preset"
@@ -527,5 +630,17 @@
     {
         "filename": "presets/instruct/Llama 3 Instruct.json",
         "type": "instruct"
+    },
+    {
+        "filename": "presets/moving-ui/Default.json",
+        "type": "moving_ui"
+    },
+    {
+        "filename": "presets/moving-ui/Black Magic Time.json",
+        "type": "moving_ui"
+    },
+    {
+        "filename": "presets/quick-replies/Default.json",
+        "type": "quick_replies"
     }
 ]

package/default/{settings.json → content/settings.json}

@@ -95,7 +95,7 @@
         "user_prompt_bias": "",
         "show_user_prompt_bias": true,
         "markdown_escape_strings": "",
-        "fast_ui_mode": false,
+        "fast_ui_mode": true,
         "avatar_style": 0,
         "chat_display": 0,
         "chat_width": 50,
@@ -115,16 +115,17 @@
         "italics_text_color": "rgba(145, 145, 145, 1)",
         "underline_text_color": "rgba(188, 231, 207, 1)",
         "quote_text_color": "rgba(225, 138, 36, 1)",
+        "chat_tint_color": "rgba(23, 23, 23, 1)",
         "blur_tint_color": "rgba(23, 23, 23, 1)",
-        "user_mes_blur_tint_color": "rgba(0, 0, 0, 0.9)",
-        "bot_mes_blur_tint_color": "rgba(0, 0, 0, 0.9)",
+        "user_mes_blur_tint_color": "rgba(30, 30, 30, 0.9)",
+        "bot_mes_blur_tint_color": "rgba(30, 30, 30, 0.9)",
         "shadow_color": "rgba(0, 0, 0, 1)",
         "waifuMode": false,
         "movingUI": false,
         "movingUIState": {},
         "movingUIPreset": "Default",
         "noShadows": true,
-        "theme": "Default (Dark) 1.7.1",
+        "theme": "Dark Lite",
         "auto_swipe": false,
         "auto_swipe_minimum_length": 0,
         "auto_swipe_blacklist": [],
@@ -139,7 +140,7 @@
         "hotswap_enabled": true,
         "timer_enabled": false,
         "timestamps_enabled": true,
-        "timestamp_model_icon": false,
+        "timestamp_model_icon": true,
         "mesIDDisplay_enabled": false,
         "max_context_unlocked": false,
         "prefer_character_prompt": true,
@@ -193,7 +194,8 @@
         "encode_tags": false,
         "enableLabMode": false,
         "enableZenSliders": false,
-        "ui_mode": 1
+        "ui_mode": 1,
+        "forbid_external_media": true
     },
     "extension_settings": {
         "apiUrl": "http://localhost:5100",

package/default/content/themes/Cappuccino.json

@@ -0,0 +1,35 @@
+{
+    "name": "Cappuccino",
+    "blur_strength": 3,
+    "main_text_color": "rgba(255, 255, 255, 1)",
+    "italics_text_color": "rgba(230, 210, 190, 1)",
+    "underline_text_color": "rgba(205, 180, 160, 1)",
+    "quote_text_color": "rgba(165, 140, 115, 1)",
+    "blur_tint_color": "rgba(34, 30, 32, 0.95)",
+    "chat_tint_color": "rgba(50, 45, 50, 0.75)",
+    "user_mes_blur_tint_color": "rgba(34, 30, 32, 0.75)",
+    "bot_mes_blur_tint_color": "rgba(34, 30, 32, 0.75)",
+    "shadow_color": "rgba(0, 0, 0, 0.3)",
+    "shadow_width": 1,
+    "border_color": "rgba(80, 80, 80, 0.89)",
+    "font_scale": 1,
+    "fast_ui_mode": false,
+    "waifuMode": false,
+    "avatar_style": 0,
+    "chat_display": 1,
+    "noShadows": false,
+    "chat_width": 50,
+    "timer_enabled": false,
+    "timestamps_enabled": true,
+    "timestamp_model_icon": true,
+    "mesIDDisplay_enabled": true,
+    "message_token_count_enabled": false,
+    "expand_message_actions": false,
+    "enableZenSliders": false,
+    "enableLabMode": false,
+    "hotswap_enabled": true,
+    "custom_css": "",
+    "bogus_folders": true,
+    "reduced_motion": false,
+    "compact_input_area": true
+}

package/default/content/themes/Dark Lite.json

@@ -0,0 +1,35 @@
+{
+    "name": "Dark Lite",
+    "blur_strength": 10,
+    "main_text_color": "rgba(220, 220, 210, 1)",
+    "italics_text_color": "rgba(145, 145, 145, 1)",
+    "underline_text_color": "rgba(188, 231, 207, 1)",
+    "quote_text_color": "rgba(225, 138, 36, 1)",
+    "blur_tint_color": "rgba(23, 23, 23, 1)",
+    "chat_tint_color": "rgba(23, 23, 23, 1)",
+    "user_mes_blur_tint_color": "rgba(30, 30, 30, 0.9)",
+    "bot_mes_blur_tint_color": "rgba(30, 30, 30, 0.9)",
+    "shadow_color": "rgba(0, 0, 0, 1)",
+    "shadow_width": 2,
+    "border_color": "rgba(0, 0, 0, 1)",
+    "font_scale": 1,
+    "fast_ui_mode": true,
+    "waifuMode": false,
+    "avatar_style": 0,
+    "chat_display": 0,
+    "noShadows": true,
+    "chat_width": 50,
+    "timer_enabled": false,
+    "timestamps_enabled": true,
+    "timestamp_model_icon": true,
+    "mesIDDisplay_enabled": false,
+    "message_token_count_enabled": false,
+    "expand_message_actions": false,
+    "enableZenSliders": "",
+    "enableLabMode": "",
+    "hotswap_enabled": true,
+    "custom_css": "",
+    "bogus_folders": true,
+    "reduced_motion": false,
+    "compact_input_area": true
+}

package/docker/docker-compose.yml

@@ -8,7 +8,6 @@ services:
     ports:
       - "8000:8000"
     volumes:
-      - "./extensions:/home/node/app/public/scripts/extensions/third-party"
       - "./config:/home/node/app/config"
-      - "./user:/home/node/app/public/user"
+      - "./data:/home/node/app/data"
     restart: unless-stopped

package/docker/docker-entrypoint.sh

@@ -1,38 +1,9 @@
 #!/bin/sh
 
-# Initialize missing user files
-IFS="," RESOURCES="assets,backgrounds,user,context,instruct,QuickReplies,movingUI,themes,characters,chats,groups,group chats,User Avatars,worlds,OpenAI Settings,NovelAI Settings,KoboldAI Settings,TextGen Settings"
-for R in $RESOURCES; do
-  if [ ! -e "config/$R" ]; then
-    echo "Resource not found, copying from defaults: $R"
-    cp -r "public/$R.default" "config/$R"
-  fi
-done
-
 if [ ! -e "config/config.yaml" ]; then
     echo "Resource not found, copying from defaults: config.yaml"
     cp -r "default/config.yaml" "config/config.yaml"
 fi
 
-if [ ! -e "config/settings.json" ]; then
-    echo "Resource not found, copying from defaults: settings.json"
-    cp -r "default/settings.json" "config/settings.json"
-fi
-
-CONFIG_FILE="config.yaml"
-
-echo "Starting with the following config:"
-cat $CONFIG_FILE
-
-if grep -q "listen: false" $CONFIG_FILE; then
-  echo -e "\033[1;31mThe listen parameter is set to false. If you can't connect to the server, edit the \"docker/config/config.yaml\" file and restart the container.\033[0m"
-  sleep 5
-fi
-
-if grep -q "whitelistMode: true" $CONFIG_FILE; then
-  echo -e "\033[1;31mThe whitelistMode parameter is set to true. If you can't connect to the server, edit the \"docker/config/config.yaml\" file and restart the container.\033[0m"
-  sleep 5
-fi
-
 # Start the server
-exec node server.js
+exec node server.js --listen

package/index.d.ts

@@ -0,0 +1,20 @@
+import { UserDirectoryList, User } from "./src/users";
+
+declare global {
+    namespace Express {
+        export interface Request {
+            user: {
+                profile: User;
+                directories: UserDirectoryList;
+            };
+        }
+    }
+}
+
+declare module 'express-session' {
+    export interface SessionData {
+      handle: string;
+      touch: number;
+      // other properties...
+    }
+  }

package/jsconfig.json

@@ -12,6 +12,9 @@
     },
     "exclude": [
         "node_modules",
-        "**/node_modules/*"
+        "**/node_modules/*",
+        "public/lib",
+        "backups/*",
+        "data/*"
     ]
-}
+}

package/package.json

@@ -4,17 +4,21 @@
         "@agnai/web-tokenizers": "^0.1.3",
         "@dqbd/tiktoken": "^1.0.13",
         "@zeldafan0225/ai_horde": "^4.0.1",
+        "archiver": "^7.0.1",
         "bing-translate-api": "^2.9.1",
         "body-parser": "^1.20.2",
         "command-exists": "^1.2.9",
         "compression": "^1",
         "cookie-parser": "^1.4.6",
+        "cookie-session": "^2.1.0",
         "cors": "^2.8.5",
         "csrf-csrf": "^2.2.3",
         "express": "^4.19.2",
         "form-data": "^4.0.0",
         "google-translate-api-browser": "^3.0.1",
         "gpt3-tokenizer": "^1.1.5",
+        "he": "^1.2.0",
+        "helmet": "^7.1.0",
         "ip-matching": "^2.1.2",
         "ipaddr.js": "^2.0.1",
         "jimp": "^0.22.10",
@@ -22,10 +26,12 @@
         "mime-types": "^2.1.35",
         "multer": "^1.4.5-lts.1",
         "node-fetch": "^2.6.11",
+        "node-persist": "^4.0.1",
         "open": "^8.4.2",
         "png-chunk-text": "^1.0.0",
         "png-chunks-encode": "^1.0.0",
         "png-chunks-extract": "^1.0.0",
+        "rate-limiter-flexible": "^5.0.0",
         "response-time": "^2.3.2",
         "sanitize-filename": "^1.6.3",
         "sillytavern-transformers": "^2.14.6",
@@ -62,7 +68,7 @@
         "type": "git",
         "url": "https://github.com/SillyTavern/SillyTavern.git"
     },
-    "version": "1.11.8",
+    "version": "1.12.0-preview",
     "scripts": {
         "start": "node server.js",
         "start-multi": "node server.js --disableCsrf",
@@ -79,6 +85,7 @@
     },
     "main": "server.js",
     "devDependencies": {
+        "@types/jquery": "^3.5.29",
         "eslint": "^8.55.0",
         "jquery": "^3.6.4"
     }

package/post-install.js

@@ -60,7 +60,8 @@ function convertConfig() {
         try {
             console.log(color.blue('Converting config.conf to config.yaml. Your old config.conf will be renamed to config.conf.bak'));
             const config = require(path.join(process.cwd(), './config.conf'));
-            fs.renameSync('./config.conf', './config.conf.bak');
+            fs.copyFileSync('./config.conf', './config.conf.bak');
+            fs.rmSync('./config.conf');
             fs.writeFileSync('./config.yaml', yaml.stringify(config));
             console.log(color.green('Conversion successful. Please check your config.yaml and fix it if necessary.'));
         } catch (error) {
@@ -106,7 +107,6 @@ function addMissingConfigValues() {
  */
 function createDefaultFiles() {
     const files = {
-        settings: './public/settings.json',
         config: './config.yaml',
         user: './public/css/user.css',
     };
@@ -167,29 +167,6 @@ function copyWasmFiles() {
     }
 }
 
-/**
- * Moves the custom background into settings.json.
- */
-function migrateBackground() {
-    if (!fs.existsSync('./public/css/bg_load.css')) return;
-
-    const bgCSS = fs.readFileSync('./public/css/bg_load.css', 'utf-8');
-    const bgMatch = /url\('([^']*)'\)/.exec(bgCSS);
-    if (!bgMatch) return;
-    const bgFilename = bgMatch[1].replace('../backgrounds/', '');
-
-    const settings = fs.readFileSync('./public/settings.json', 'utf-8');
-    const settingsJSON = JSON.parse(settings);
-    if (Object.hasOwn(settingsJSON, 'background')) {
-        console.log(color.yellow('Both bg_load.css and the "background" setting exist. Please delete bg_load.css manually.'));
-        return;
-    }
-
-    settingsJSON.background = { name: bgFilename, url: `url('backgrounds/${bgFilename}')` };
-    fs.writeFileSync('./public/settings.json', JSON.stringify(settingsJSON, null, 4));
-    fs.rmSync('./public/css/bg_load.css');
-}
-
 try {
     // 0. Convert config.conf to config.yaml
     convertConfig();
@@ -199,8 +176,6 @@ try {
     copyWasmFiles();
     // 3. Add missing config values
     addMissingConfigValues();
-    // 4. Migrate bg_load.css to settings.json
-    migrateBackground();
 } catch (error) {
     console.error(error);
 }

package/public/css/accounts.css

@@ -0,0 +1,5 @@
+.userAccount {
+    border: 1px solid var(--SmartThemeBorderColor);
+    padding: 5px 10px;
+    border-radius: 5px;
+}

package/public/css/login.css

@@ -0,0 +1,44 @@
+body.login #shadow_popup {
+    opacity: 1;
+    display: flex;
+}
+
+body.login .logo {
+    max-width: 30px;
+}
+
+body.login #logoBlock {
+    align-items: center;
+    margin: 0 auto;
+    gap: 10px;
+}
+
+body.login .userSelect {
+    display: flex;
+    flex-direction: column;
+    color: var(--SmartThemeBodyColor);
+    border: 1px solid var(--SmartThemeBorderColor);
+    border-radius: 5px;
+    padding: 3px 5px;
+    width: 30%;
+    cursor: pointer;
+    margin: 5px 0;
+    transition: background-color 0.15s ease-in-out;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    overflow: hidden;
+}
+
+body.login .userSelect .userName,
+body.login .userSelect .userHandle {
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+body.login .userSelect:hover {
+    background-color: var(--black30a);
+}

package/public/css/st-tailwind.css

@@ -102,6 +102,14 @@
     justify-content: space-between;
 }
 
+.justifySpaceEvenly {
+    justify-content: space-evenly;
+}
+
+.justifySpaceAround {
+    justify-content: space-around;
+}
+
 .alignitemsflexstart {
     align-items: flex-start !important;
 }
@@ -491,6 +499,10 @@ textarea:disabled {
     font-size: calc(var(--mainFontSize) * 1.2) !important;
 }
 
+.fontsize90p {
+    font-size: calc(var(--mainFontSize) * 0.9) !important;
+}
+
 .fontsize80p {
     font-size: calc(var(--mainFontSize) * 0.8) !important;
 }