1adde74f · permissionBRICK/SillyTavern

default/config.yaml+5 -0 Viewed

 disableCsrfProtection: false
 # Disable startup security checks - NOT RECOMMENDED
 securityOverride: false
+# -- RATE LIMITING CONFIGURATION --
+rateLimiting:
+  # Use X-Real-IP header instead of socket IP for rate limiting
+  # Only enable this if you are using a properly configured reverse proxy (like Nginx/traefik/Caddy)
+  preferRealIpHeader: false
 # -- ADVANCED CONFIGURATION --
 # Open the browser automatically
 autorun: true

docker/build-lib.js+1 -1 Viewed

 import getWebpackServeMiddleware from '../src/middleware/webpack-serve.js';
 const middleware = getWebpackServeMiddleware();
-await middleware.runWebpackCompiler();
+await middleware.runWebpackCompiler({ forceDist: true });

package-lock.json+35 -4 Viewed

                 "ip-matching": "^2.1.2",
                 "ip-regex": "^5.0.0",
                 "ipaddr.js": "^2.0.1",
+                "is-docker": "^3.0.0",
                 "jimp": "^0.22.10",
                 "localforage": "^1.10.0",
                 "lodash": "^4.17.21",

             "license": "MIT"
         },
         "node_modules/is-docker": {
-            "version": "2.2.1",
+            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+            "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
-            "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+            "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
             "license": "MIT",
             "bin": {
                 "is-docker": "cli.js"
             },
             "engines": {
-                "node": ">=8"
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
             },
             "funding": {
                 "url": "https://github.com/sponsors/sindresorhus"

                 "node": ">=8"
+            }
         },
+        "node_modules/is-wsl/node_modules/is-docker": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+            "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+            "license": "MIT",
+            "bin": {
+                "is-docker": "cli.js"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/isarray": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",

                 "url": "https://github.com/sponsors/sindresorhus"
+            }
         },
+        "node_modules/open/node_modules/is-docker": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+            "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+            "license": "MIT",
+            "bin": {
+                "is-docker": "cli.js"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/openai": {
             "version": "4.17.4",
             "resolved": "https://registry.npmjs.org/openai/-/openai-4.17.4.tgz",

package.json+1 -0 Viewed

         "ip-matching": "^2.1.2",
         "ip-regex": "^5.0.0",
         "ipaddr.js": "^2.0.1",
+        "is-docker": "^3.0.0",
         "jimp": "^0.22.10",
         "localforage": "^1.10.0",
         "lodash": "^4.17.21",

plugins.js+2 -2 Viewed

 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
-import { default as git } from 'simple-git';
+import { default as git, CheckRepoActions } from 'simple-git';
 import { color } from './src/util.js';
 const __dirname = import.meta.dirname ?? path.dirname(fileURLToPath(import.meta.url));

             const pluginPath = path.join(pluginsPath, directory);
             const pluginRepo = git(pluginPath);
-            const isRepo = await pluginRepo.checkIsRepo();
+            const isRepo = await pluginRepo.checkIsRepo(CheckRepoActions.IS_REPO_ROOT);
             if (!isRepo) {
                 console.log(`Directory ${color.yellow(directory)} is not a Git repository`);
                 continue;

public/index.html+1 -1 Viewed

                                             <small data-i18n="Enabled">Enabled</small>
                                         </label>
                                         <small data-i18n="Minimum generated message length">Minimum generated message length</small>
-                                        <input id="auto_swipe_minimum_length" name="auto_swipe_minimum_length" type="number" min="0" step="1" value="0" class="text_pole" title="If the generated message is shorter than this, trigger an auto-swipe." data-i18n="[title]If the generated message is shorter than this, trigger an auto-swipe">
+                                        <input id="auto_swipe_minimum_length" name="auto_swipe_minimum_length" type="number" min="0" step="1" value="0" class="text_pole" title="If the generated message is shorter than these many characters, trigger an auto-swipe." data-i18n="[title]If the generated message is shorter than these many characters, trigger an auto-swipe">
                                         <small data-i18n="Blacklisted words">Blacklisted words</small>
                                         <div class="auto_swipe">
                                             <textarea id="auto_swipe_blacklist" name="auto_swipe_blacklist" data-i18n="[placeholder]words you dont want generated separated by comma ','" placeholder="words you don't want generated separated by comma ','" class="text_pole textarea_compact" value="" autocomplete="off" rows="3"></textarea>

public/lib/eventemitter.js+43 -2 Viewed

 /* Polyfill EventEmitter. */
-var EventEmitter = function () {
+/**
+ * Creates an event emitter.
+ * @param {string[]} autoFireAfterEmit Auto-fire event names
+ */
+var EventEmitter = function (autoFireAfterEmit = []) {
     this.events = {};
+    this.autoFireLastArgs = new Map();
+    this.autoFireAfterEmit = new Set(autoFireAfterEmit);
 };
+/**
+ * Adds a listener to an event.
+ * @param {string} event Event name
+ * @param {function} listener Event listener
+ * @returns
+ */
 EventEmitter.prototype.on = function (event, listener) {
     // Unknown event used by external libraries?
     if (event === undefined) {

+    }
     this.events[event].push(listener);
+    if (this.autoFireAfterEmit.has(event) && this.autoFireLastArgs.has(event)) {
+        listener.apply(this, this.autoFireLastArgs.get(event));
+    }
 };
 /**

@@ -60,6 +76,10 @@ EventEmitter.prototype.makeLast = function (event, listener) {
60	}	76	}
61		77
62	events.push(listener);	78	events.push(listener);
		79
		80	if (this.autoFireAfterEmit.has(event) && this.autoFireLastArgs.has(event)) {
		81	listener.apply(this, this.autoFireLastArgs.get(event));
		82	}
63	}	83	}
64		84
65	/**	85	/**

+    }
     events.unshift(listener);
+    if (this.autoFireAfterEmit.has(event) && this.autoFireLastArgs.has(event)) {
+        listener.apply(this, this.autoFireLastArgs.get(event));
+    }
+}
+/**
+ * Removes a listener from an event.
+ * @param {string} event Event name
+ * @param {function} listener Event listener
+ */
 EventEmitter.prototype.removeListener = function (event, listener) {
     var idx;

+    }
 };
+/**
+ * Emits an event with optional arguments.
+ * @param {string} event Event name
+ */
 EventEmitter.prototype.emit = async function (event) {
     let args = [].slice.call(arguments, 1);
     if (localStorage.getItem('eventTracing') === 'true') {

@@ -118,6 +151,10 @@ EventEmitter.prototype.emit = async function (event) {
118	}	151	}
119	}	152	}
120	}	153	}
		154
		155	if (this.autoFireAfterEmit.has(event)) {
		156	this.autoFireLastArgs.set(event, args);
		157	}
121	};	158	};
122		159
123	EventEmitter.prototype.emitAndWait = function (event) {	160	EventEmitter.prototype.emitAndWait = function (event) {

@@ -144,10 +181,14 @@ EventEmitter.prototype.emitAndWait = function (event) {
144	}	181	}
145	}	182	}
146	}	183	}
		184
		185	if (this.autoFireAfterEmit.has(event)) {
		186	this.autoFireLastArgs.set(event, args);
		187	}
147	};	188	};
148		189
149	EventEmitter.prototype.once = function (event, listener) {	190	EventEmitter.prototype.once = function (event, listener) {
150	this.on(event, function g () {	191	this.on(event, function g() {
151	this.removeListener(event, g);	192	this.removeListener(event, g);
152	listener.apply(this, arguments);	193	listener.apply(this, arguments);
153	});	194	});

public/locales/ar-sa.json+1 -1 Viewed

     "Auto-swipe": "السحب التلقائي",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "تمكين وظيفة السحب التلقائي. الإعدادات في هذا القسم تؤثر فقط عند تمكين السحب التلقائي",
     "Minimum generated message length": "الحد الأدنى لطول الرسالة المولدة",
-    "If the generated message is shorter than this, trigger an auto-swipe": "إذا كانت الرسالة المولدة أقصر من هذا، فتحريض السحب التلقائي",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "إذا كانت الرسالة المولدة أقصر من هذا، فتحريض السحب التلقائي",
     "Blacklisted words": "الكلمات الممنوعة",
     "words you dont want generated separated by comma ','": "الكلمات التي لا تريد توليدها مفصولة بفاصلة ','",
     "Blacklisted word count to swipe": "عدد الكلمات الممنوعة للسحب",

public/locales/de-de.json+1 -1 Viewed

     "Auto-swipe": "Automatisches Wischen",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Aktiviere die Auto-Wisch-Funktion. Einstellungen in diesem Abschnitt haben nur dann Auswirkungen, wenn das automatische Wischen aktiviert ist",
     "Minimum generated message length": "Minimale generierte Nachrichtenlänge",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Wenn die generierte Nachricht kürzer ist als diese, löse automatisches Wischen aus",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Wenn die generierte Nachricht kürzer ist als diese, löse automatisches Wischen aus",
     "Blacklisted words": "Verbotene Wörter",
     "words you dont want generated separated by comma ','": "Wörter, die du nicht generiert haben möchtest, durch Komma ',' getrennt",
     "Blacklisted word count to swipe": "Anzahl der verbotenen Wörter, um zu wischen",

public/locales/es-es.json+1 -1 Viewed

     "Auto-swipe": "Deslizamiento automático",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Habilitar la función de deslizamiento automático. La configuración en esta sección solo tiene efecto cuando el deslizamiento automático está habilitado",
     "Minimum generated message length": "Longitud mínima del mensaje generado",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Si el mensaje generado es más corto que esto, activar un deslizamiento automático",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Si el mensaje generado es más corto que esto, activar un deslizamiento automático",
     "Blacklisted words": "Palabras prohibidas",
     "words you dont want generated separated by comma ','": "palabras que no desea generar separadas por coma ','",
     "Blacklisted word count to swipe": "Número de palabras prohibidas para deslizar",

public/locales/fr-fr.json+1 -1 Viewed

     "Auto-swipe": "Balayage automatique",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Activer la fonction de balayage automatique. Les paramètres de cette section n'ont d'effet que lorsque le balayage automatique est activé",
     "Minimum generated message length": "Longueur minimale du message généré",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Si le message généré est plus court que cela, déclenchez un balayage automatique",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Si le message généré est plus court que cela, déclenchez un balayage automatique",
     "Blacklisted words": "Mots en liste noire",
     "words you dont want generated separated by comma ','": "mots que vous ne voulez pas générer séparés par des virgules ','",
     "Blacklisted word count to swipe": "Nombre de mots en liste noire pour balayer",

public/locales/is-is.json+1 -1 Viewed

     "Auto-swipe": "Sjálfvirkur sveip",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Virkjaðu sjálfvirka sveiflugerð. Stillingar í þessum hluta hafa aðeins áhrif þegar sjálfvirkur sveiflugerð er virk",
     "Minimum generated message length": "Lágmarks lengd á mynduðum skilaboðum",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Ef mynduðu skilaboðin eru styttri en þessi, kallaðu fram sjálfvirkar sveiflugerðar",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Ef mynduðu skilaboðin eru styttri en þessi, kallaðu fram sjálfvirkar sveiflugerðar",
     "Blacklisted words": "Svört orð",
     "words you dont want generated separated by comma ','": "orð sem þú vilt ekki að framleiða aðskilin með kommu ','",
     "Blacklisted word count to swipe": "Fjöldi svörtra orða til að sveipa",

public/locales/it-it.json+1 -1 Viewed

     "Auto-swipe": "Auto-swipe",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Abilita la funzione di auto-swipe. Le impostazioni in questa sezione hanno effetto solo quando l'auto-swipe è abilitato",
     "Minimum generated message length": "Lunghezza minima del messaggio generato",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Se il messaggio generato è più breve di questo, attiva un'automatica rimozione",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Se il messaggio generato è più breve di questo, attiva un'automatica rimozione",
     "Blacklisted words": "Parole in blacklist",
     "words you dont want generated separated by comma ','": "parole che non vuoi generate separate da virgola ','",
     "Blacklisted word count to swipe": "Numero di parole in blacklist per attivare un'automatica rimozione",

public/locales/ja-jp.json+1 -1 Viewed

     "Auto-swipe": "オートスワイプ",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "自動スワイプ機能を有効にします。このセクションの設定は、自動スワイプが有効になっている場合にのみ効果があります",
     "Minimum generated message length": "生成されたメッセージの最小長",
-    "If the generated message is shorter than this, trigger an auto-swipe": "生成されたメッセージがこれよりも短い場合、自動スワイプをトリガーします",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "生成されたメッセージがこれよりも短い場合、自動スワイプをトリガーします",
     "Blacklisted words": "ブラックリストされた単語",
     "words you dont want generated separated by comma ','": "コンマ ',' で区切られた生成したくない単語",
     "Blacklisted word count to swipe": "スワイプするブラックリストされた単語の数",

public/locales/ko-kr.json+1 -1 Viewed

     "Auto-swipe": "자동 스와이프",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "자동 스와이프 기능을 활성화합니다. 이 섹션의 설정은 자동 스와이프가 활성화되었을 때만 영향을 미칩니다",
     "Minimum generated message length": "생성된 메시지 최소 길이",
-    "If the generated message is shorter than this, trigger an auto-swipe": "생성된 메시지가이보다 짧으면 자동 스와이프를 트리거합니다",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "생성된 메시지가이보다 짧으면 자동 스와이프를 트리거합니다",
     "Blacklisted words": "금지어",
     "words you dont want generated separated by comma ','": "쉼표로 구분된 생성하지 않으려는 단어",
     "Blacklisted word count to swipe": "스와이프할 금지어 개수",

public/locales/nl-nl.json+1 -1 Viewed

     "Auto-swipe": "Automatisch vegen",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Schakel de automatische-vegen functie in. Instellingen in dit gedeelte hebben alleen effect wanneer automatisch vegen is ingeschakeld",
     "Minimum generated message length": "Minimale gegenereerde berichtlengte",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Als het gegenereerde bericht korter is dan dit, activeer dan een automatische veeg",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Als het gegenereerde bericht korter is dan dit, activeer dan een automatische veeg",
     "Blacklisted words": "Verboden woorden",
     "words you dont want generated separated by comma ','": "woorden die je niet gegenereerd wilt hebben gescheiden door komma ','",
     "Blacklisted word count to swipe": "Aantal verboden woorden om te vegen",

public/locales/pt-pt.json+1 -1 Viewed

     "Auto-swipe": "Auto-swipe",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Ativar a função de auto-swipe. As configurações nesta seção só têm efeito quando o auto-swipe está ativado",
     "Minimum generated message length": "Comprimento mínimo da mensagem gerada",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Se a mensagem gerada for mais curta que isso, acione um auto-swipe",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Se a mensagem gerada for mais curta que isso, acione um auto-swipe",
     "Blacklisted words": "Palavras proibidas",
     "words you dont want generated separated by comma ','": "palavras que você não quer geradas separadas por vírgula ','",
     "Blacklisted word count to swipe": "Contagem de palavras proibidas para swipe",

public/locales/ru-ru.json+2 -2 Viewed

     "Requests logprobs from the API for the Token Probabilities feature": "Запросить логпробы из API для функции Token Probabilities.",
     "Automatically reject and re-generate AI message based on configurable criteria": "Автоматическое отклонение и повторная генерация сообщений AI на основе настраиваемых критериев.",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Включить авто-свайп. Настройки в этом разделе действуют только при включенном авто-свайпе.",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Если сгенерированное сообщение короче этого значения, срабатывает авто-свайп.",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Если сгенерированное сообщение короче этого значения, срабатывает авто-свайп.",
     "Reload and redraw the currently open chat": "Перезагрузить и перерисовать открытый в данный момент чат.",
     "Auto-Expand Message Actions": "Развернуть действия",
     "Persona Management": "Управление персоной",

     "Tokenized text:": "Токенизированный текст:",
     "Token IDs:": "Идентификаторы токенов:",
     "Tokens:": "Токенов:"
-}
 \ No newline at end of file
+}

public/locales/uk-ua.json+1 -1 Viewed

     "Auto-swipe": "Автоматичний змах",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Вмикає функцію автоматичного змаху. Налаштування в цьому розділі діють лише тоді, коли увімкнено автоматичний змах",
     "Minimum generated message length": "Мінімальна довжина згенерованого повідомлення",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Якщо згенероване повідомлення коротше за це, викликайте автоматичний змаху",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Якщо згенероване повідомлення коротше за це, викликайте автоматичний змаху",
     "Blacklisted words": "Список заборонених слів",
     "words you dont want generated separated by comma ','": "слова, які ви не хочете генерувати, розділені комою ','",
     "Blacklisted word count to swipe": "Кількість заборонених слів для змаху",

public/locales/vi-vn.json+1 -1 Viewed

     "Auto-swipe": "Tự động vuốt",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "Bật chức năng tự động vuốt. Các cài đặt trong phần này chỉ có tác dụng khi tự động vuốt được bật",
     "Minimum generated message length": "Độ dài tối thiểu của tin nhắn được tạo",
-    "If the generated message is shorter than this, trigger an auto-swipe": "Nếu tin nhắn được tạo ra ngắn hơn điều này, kích hoạt tự động vuốt",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "Nếu tin nhắn được tạo ra ngắn hơn điều này, kích hoạt tự động vuốt",
     "Blacklisted words": "Từ trong danh sách đen",
     "words you dont want generated separated by comma ','": "các từ bạn không muốn được tạo ra được phân tách bằng dấu phẩy ','",
     "Blacklisted word count to swipe": "Số từ trong danh sách đen để vuốt",

public/locales/zh-cn.json+1 -1 Viewed

     "Auto-swipe": "自动滑动",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "启用自动滑动功能。仅当启用自动滑动时，本节中的设置才会生效",
     "Minimum generated message length": "生成的消息的最小长度",
-    "If the generated message is shorter than this, trigger an auto-swipe": "如果生成的消息短于此长度，则触发自动滑动",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "如果生成的消息短于此长度，则触发自动滑动",
     "Blacklisted words": "屏蔽词",
     "words you dont want generated separated by comma ','": "不想生成的词语，用半角逗号“,”分隔",
     "Blacklisted word count to swipe": "触发滑动的黑名单词语数量",

public/locales/zh-tw.json+1 -1 Viewed

     "Auto-swipe": "自動滑動",
     "Enable the auto-swipe function. Settings in this section only have an effect when auto-swipe is enabled": "啟用自動滑動功能。此部分的設定僅在啟用自動滑動時有效。",
     "Minimum generated message length": "生成訊息的最小長度",
-    "If the generated message is shorter than this, trigger an auto-swipe": "如果生成的訊息比這個短，將觸發自動滑動。",
+    "If the generated message is shorter than these many characters, trigger an auto-swipe": "如果生成的訊息比這個短，將觸發自動滑動。",
     "Blacklisted words": "黑名單詞語",
     "words you dont want generated separated by comma ','": "您不想生成的文字，使用逗號分隔",
     "Blacklisted word count to swipe": "滑動的黑名單詞語數量",

public/script.js+1 -1 Viewed

     TOOL_CALLS_RENDERED: 'tool_calls_rendered',
 };
-export const eventSource = new EventEmitter();
+export const eventSource = new EventEmitter([event_types.APP_READY]);
 eventSource.on(event_types.CHAT_CHANGED, processChatSlashCommands);

public/scripts/chats.js+1 -1 Viewed

             ...chat.filter(x => x?.extra?.type !== system_message_types.ASSISTANT_NOTE),
         ];
-        download(JSON.stringify(chatToSave, null, 4), `Assistant - ${humanizedDateTime()}.json`, 'application/json');
+        download(chatToSave.map((m) => JSON.stringify(m)).join('\n'), `Assistant - ${humanizedDateTime()}.jsonl`, 'application/json');
     });
     // Do not change. #attachFile is added by extension.

public/scripts/reasoning.js+3 -2 Viewed

@@ -338,14 +338,15 @@ export class ReasoningHandler {
338	return mesChanged;	338	return mesChanged;
339	}	339	}
340		340
341	if (this.state === ReasoningState.None) {	341	if (this.state === ReasoningState.None \|\| this.#isHiddenReasoningModel) {
342	// If streamed message starts with the opening, cut it out and put all inside reasoning	342	// If streamed message starts with the opening, cut it out and put all inside reasoning
343	if (message.mes.startsWith(power_user.reasoning.prefix) && message.mes.length > power_user.reasoning.prefix.length) {	343	if (message.mes.startsWith(power_user.reasoning.prefix) && message.mes.length > power_user.reasoning.prefix.length) {
344	this.#isParsingReasoning = true;	344	this.#isParsingReasoning = true;
345		345
346	// Manually set starting state here, as we might already have received the ending suffix	346	// Manually set starting state here, as we might already have received the ending suffix
347	this.state = ReasoningState.Thinking;	347	this.state = ReasoningState.Thinking;
348	this.startTime = this.initialTime;	348	this.startTime = this.startTime ?? this.initialTime;
		349	this.endTime = null;
349	}	350	}
350	}	351	}
351		352

public/scripts/user.js+26 -0 Viewed

 export let currentUser = null;
 export let accountsEnabled = false;
+// Extend the session every 30 minutes
+const SESSION_EXTEND_INTERVAL = 30 * 60 * 1000;
 /**
  * Enable or disable user account controls in the UI.
  * @param {boolean} isEnabled User account controls enabled

+    }
+}
+/**
+ * Pings the server to extend the user session.
+ */
+async function extendUserSession() {
+    try {
+        const response = await fetch('/api/ping?extend=1', {
+            method: 'GET',
+            headers: getRequestHeaders(),
+        });
+        if (!response.ok) {
+            throw new Error('Ping did not succeed', { cause: response.status });
+        }
+    } catch (error) {
+        console.error('Failed to extend user session', error);
+    }
+}
 jQuery(() => {
     $('#logout_button').on('click', () => {
         logout();

     $('#account_button').on('click', () => {
         openUserProfile();
     });
+    setInterval(async () => {
+        if (currentUser) {
+            await extendUserSession();
+        }
+    }, SESSION_EXTEND_INTERVAL);
 });

public/style.css+22 -20 Viewed

     --interactable-outline-color: var(--white100);
     --interactable-outline-color-faint: var(--white20a);
+    --reasoning-body-color: var(--SmartThemeEmColor);
+    --reasoning-em-color: color-mix(in srgb, var(--SmartThemeEmColor) 67%, var(--SmartThemeBlurTintColor) 33%);
+    --reasoning-saturation: 0.5;
     /*Default Theme, will be changed by ToolCool Color Picker*/
     --SmartThemeBodyColor: rgb(220, 220, 210);

 .mes_reasoning {
     display: block;
-    border-left: 2px solid var(--SmartThemeEmColor);
+    border-left: 2px solid var(--reasoning-body-color);
     border-radius: 2px;
     padding: 5px;
     padding-left: 14px;
     margin-bottom: 0.5em;
     overflow-y: auto;
-    color: var(--SmartThemeEmColor);
+    color: hsl(from var(--reasoning-body-color) h calc(s * var(--reasoning-saturation)) l);
+}
 .mes_reasoning_details {

     margin-bottom: 0;
+}
-.mes_reasoning em,
-.mes_reasoning i,
-.mes_reasoning u,
-.mes_reasoning q,
-.mes_reasoning blockquote {
-    filter: saturate(0.5);
-}
-.mes_reasoning_details .mes_reasoning em {
-    color: color-mix(in srgb, var(--SmartThemeEmColor) 67%, var(--SmartThemeBlurTintColor) 33%);
-}
 .mes_reasoning_header_block {
     flex-grow: 1;
+}

+}
 .mes_text i,
-.mes_text em,
+.mes_text em {
+    color: var(--SmartThemeEmColor);
+}
 .mes_reasoning i,
 .mes_reasoning em {
-    color: var(--SmartThemeEmColor);
+    color: hsl(from var(--reasoning-em-color) h calc(s * var(--reasoning-saturation)) l);
+}
 .mes_text q i,
 .mes_text q em {
     color: inherit;
+}
+.mes_reasoning q i,
+.mes_reasoning q em {
+    color: hsl(from var(--SmartThemeQuoteColor) h calc(s * var(--reasoning-saturation)) l);
+}
-.mes_text u,
+.mes_text u {
-.mes_reasoning u {
     color: var(--SmartThemeUnderlineColor);
+}
+.mes_reasoning u {
+    color: hsl(from var(--SmartThemeUnderlineColor) h calc(s * var(--reasoning-saturation)) l);
+}
-.mes_text q,
+.mes_text q {
-.mes_reasoning q {
     color: var(--SmartThemeQuoteColor);
+}
+.mes_reasoning q {
+    color: hsl(from var(--SmartThemeQuoteColor) h calc(s * var(--reasoning-saturation)) l);
+}
 .mes_text font[color] em,
 .mes_text font[color] i,

server.js+7 -1 Viewed

 // Everything below this line requires authentication
 app.use(requireLoginMiddleware);
-app.get('/api/ping', (_, response) => response.sendStatus(204));
+app.get('/api/ping', (request, response) => {
+    if (request.query.extend && request.session) {
+        request.session.touch = Date.now();
+    }
+    response.sendStatus(204);
+});
 // File uploads
 app.use(multer({ dest: uploadsPath, limits: { fieldSize: 10 * 1024 * 1024 } }).single('avatar'));

src/endpoints/extensions.js+1 -1 Viewed

         } catch (error) {
             // it is not a git repo, or has no commits yet, or is a bare repo
             // not possible to update it, most likely can't get the branch name either
-            return response.send({ currentBranchName: null, currentCommitHash, isUpToDate: true, remoteUrl: null });
+            return response.send({ currentBranchName: '', currentCommitHash: '', isUpToDate: true, remoteUrl: '' });
+        }
         const currentBranch = await git.cwd(extensionPath).branch();

src/endpoints/users-public.js+10 -7 Viewed

 import storage from 'node-persist';
 import express from 'express';
 import { RateLimiterMemory, RateLimiterRes } from 'rate-limiter-flexible';
-import { jsonParser, getIpFromRequest } from '../express-common.js';
+import { jsonParser, getIpFromRequest, getRealIpFromHeader } from '../express-common.js';
 import { color, Cache, getConfigValue } from '../util.js';
 import { KEY_PREFIX, getUserAvatar, toKey, getPasswordHash, getPasswordSalt } from '../users.js';
 const DISCREET_LOGIN = getConfigValue('enableDiscreetLogin', false);
+const PREFER_REAL_IP_HEADER = getConfigValue('rateLimiting.preferRealIpHeader', false);
 const MFA_CACHE = new Cache(5 * 60 * 1000);
+const getIpAddress = (request) => PREFER_REAL_IP_HEADER ? getRealIpFromHeader(request) : getIpFromRequest(request);
 export const router = express.Router();
 const loginLimiter = new RateLimiterMemory({
     points: 5,

             return response.status(400).json({ error: 'Missing required fields' });
+        }
-        const ip = getIpFromRequest(request);
+        const ip = getIpAddress(request);
         await loginLimiter.consume(ip);
         /** @type {import('../users.js').User} */

         return response.json({ handle: user.handle });
     } catch (error) {
         if (error instanceof RateLimiterRes) {
-            console.error('Login failed: Rate limited from', getIpFromRequest(request));
+            console.error('Login failed: Rate limited from', getIpAddress(request));
             return response.status(429).send({ error: 'Too many attempts. Try again later or recover your password.' });
+        }

             return response.status(400).json({ error: 'Missing required fields' });
+        }
-        const ip = getIpFromRequest(request);
+        const ip = getIpAddress(request);
         await recoverLimiter.consume(ip);
         /** @type {import('../users.js').User} */

         return response.sendStatus(204);
     } catch (error) {
         if (error instanceof RateLimiterRes) {
-            console.error('Recover step 1 failed: Rate limited from', getIpFromRequest(request));
+            console.error('Recover step 1 failed: Rate limited from', getIpAddress(request));
             return response.status(429).send({ error: 'Too many attempts. Try again later or contact your admin.' });
+        }

         /** @type {import('../users.js').User} */
         const user = await storage.getItem(toKey(request.body.handle));
-        const ip = getIpFromRequest(request);
+        const ip = getIpAddress(request);
         if (!user) {
             console.error('Recover step 2 failed: User', request.body.handle, 'not found');

         return response.sendStatus(204);
     } catch (error) {
         if (error instanceof RateLimiterRes) {
-            console.error('Recover step 2 failed: Rate limited from', getIpFromRequest(request));
+            console.error('Recover step 2 failed: Rate limited from', getIpAddress(request));
             return response.status(429).send({ error: 'Too many attempts. Try again later or contact your admin.' });
+        }

src/express-common.js+14 -0 Viewed

+    }
     return clientIp;
+}
+/**
+ * Gets the IP address of the client when behind reverse proxy using x-real-ip header, falls back to socket remote address.
+ * This function should be used when the application is running behind a reverse proxy (e.g., Nginx, traefik, Caddy...).
+ * @param {import('express').Request} req Request object
+ * @returns {string} IP address of the client
+ */
+export function getRealIpFromHeader(req) {
+    if (req.headers['x-real-ip']) {
+        return req.headers['x-real-ip'].toString();
+    }
+    return getIpFromRequest(req);
+}

src/middleware/webpack-serve.js+9 -5 Viewed

 import path from 'node:path';
 import webpack from 'webpack';
-import { publicLibConfig } from '../../webpack.config.js';
+import getPublicLibConfig from '../../webpack.config.js';
 export default function getWebpackServeMiddleware() {
-    const outputPath = publicLibConfig.output?.path;
-    const outputFile = publicLibConfig.output?.filename;
     /**
      * A very spartan recreation of webpack-dev-middleware.
      * @param {import('express').Request} req Request object.

      * @type {import('express').RequestHandler}
      */
     function devMiddleware(req, res, next) {
+        const publicLibConfig = getPublicLibConfig();
+        const outputPath = publicLibConfig.output?.path;
+        const outputFile = publicLibConfig.output?.filename;
         if (req.method === 'GET' && path.parse(req.path).base === outputFile) {
             return res.sendFile(outputFile, { root: outputPath });
+        }

     /**
      * Wait until Webpack is done compiling.
+     * @param {object} param Parameters.
+     * @param {boolean} [param.forceDist] Whether to force the use the /dist folder.
      * @returns {Promise<void>}
      */
-    devMiddleware.runWebpackCompiler = () => {
+    devMiddleware.runWebpackCompiler = ({ forceDist = false } = {}) => {
+        const publicLibConfig = getPublicLibConfig(forceDist);
         const compiler = webpack(publicLibConfig);
         return new Promise((resolve) => {

src/plugin-loader.js+2 -2 Viewed

 import url from 'node:url';
 import express from 'express';
-import { default as git } from 'simple-git';
+import { default as git, CheckRepoActions } from 'simple-git';
 import { sync as commandExistsSync } from 'command-exists';
 import { getConfigValue, color } from './util.js';

             const pluginPath = path.join(pluginsPath, directory);
             const pluginRepo = git(pluginPath);
-            const isRepo = await pluginRepo.checkIsRepo();
+            const isRepo = await pluginRepo.checkIsRepo(CheckRepoActions.IS_REPO_ROOT);
             if (!isRepo) {
                 continue;
+            }

webpack.config.js+69 -32 Viewed

 import process from 'node:process';
 import path from 'node:path';
+import isDocker from 'is-docker';
-/** @type {import('webpack').Configuration} */
+/**
-export const publicLibConfig = {
+ * Get the Webpack configuration for the public/lib.js file.
-    mode: 'production',
+ * 1. Docker has got cache and the output file pre-baked.
-    entry: './public/lib.js',
+ * 2. Non-Docker environments use the global DATA_ROOT variable to determine the cache and output directories.
-    cache: {
+ * @param {boolean} forceDist Whether to force the use the /dist folder.
-        type: 'filesystem',
+ * @returns {import('webpack').Configuration}
-        cacheDirectory: path.resolve(process.cwd(), 'dist/webpack'),
+ * @throws {Error} If the DATA_ROOT variable is not set.
-        store: 'pack',
+ * */
-        compression: 'gzip',
+export default function getPublicLibConfig(forceDist = false) {
-    },
+    function getCacheDirectory() {
-    devtool: false,
+        if (forceDist || isDocker()) {
-    watch: false,
+            return path.resolve(process.cwd(), 'dist/webpack');
-    module: {},
+        }
-    stats: {
-        preset: 'minimal',
+        if (typeof globalThis.DATA_ROOT === 'string') {
-        assets: false,
+            return path.resolve(globalThis.DATA_ROOT, '_webpack', 'cache');
-        modules: false,
+        }
-        colors: true,
-        timings: true,
+        throw new Error('DATA_ROOT variable is not set.');
-    },
+    }
-    experiments: {
-        outputModule: true,
+    function getOutputDirectory() {
-    },
+        if (forceDist || isDocker()) {
-    performance: {
+            return path.resolve(process.cwd(), 'dist');
-        hints: false,
+        }
-    },
-    output: {
+        if (typeof globalThis.DATA_ROOT === 'string') {
-        path: path.resolve(process.cwd(), 'dist'),
+            return path.resolve(globalThis.DATA_ROOT, '_webpack', 'output');
-        filename: 'lib.js',
+        }
-        libraryTarget: 'module',
-    },
+        throw new Error('DATA_ROOT variable is not set.');
-};
+    }
+    const cacheDirectory = getCacheDirectory();
+    const outputDirectory = getOutputDirectory();
+    return {
+        mode: 'production',
+        entry: './public/lib.js',
+        cache: {
+            type: 'filesystem',
+            cacheDirectory: cacheDirectory,
+            store: 'pack',
+            compression: 'gzip',
+        },
+        devtool: false,
+        watch: false,
+        module: {},
+        stats: {
+            preset: 'minimal',
+            assets: false,
+            modules: false,
+            colors: true,
+            timings: true,
+        },
+        experiments: {
+            outputModule: true,
+        },
+        performance: {
+            hints: false,
+        },
+        output: {
+            path: outputDirectory,
+            filename: 'lib.js',
+            libraryTarget: 'module',
+        },
+    };
+}

Merge branch 'staging' into support-multiple-expressions