3f039361 · permissionBRICK/SillyTavern

server.js+15 -15 Viewed

 /** @type {number} */
 const server_port = cliArguments.port ?? getConfigValue('port', DEFAULT_PORT, 'number');
 /** @type {boolean} */
 const autorun = (cliArguments.autorun ?? getConfigValue('autorun', DEFAULT_AUTORUN, 'boolean')) && !cliArguments.ssl;
 /** @type {boolean} */
 const listen = cliArguments.listen ?? getConfigValue('listen', DEFAULT_LISTEN, 'boolean');
 /** @type {string} */
 const listenAddressIPv6 = cliArguments.listenAddressIPv6 ?? getConfigValue('listenAddress.ipv6', DEFAULT_LISTEN_ADDRESS_IPV6);
 /** @type {string} */
 const listenAddressIPv4 = cliArguments.listenAddressIPv4 ?? getConfigValue('listenAddress.ipv4', DEFAULT_LISTEN_ADDRESS_IPV4);
 /** @type {boolean} */
 const enableCorsProxy = cliArguments.corsProxy ?? getConfigValue('enableCorsProxy', DEFAULT_CORS_PROXY, 'boolean');
 const enableWhitelist = cliArguments.whitelist ?? getConfigValue('whitelistMode', DEFAULT_WHITELIST, 'boolean');
 /** @type {string} */
 globalThis.DATA_ROOT = cliArguments.dataRoot ?? getConfigValue('dataRoot', './data');
 /** @type {boolean} */
 const disableCsrf = cliArguments.disableCsrf ?? getConfigValue('disableCsrfProtection', DEFAULT_CSRF_DISABLED, 'boolean');
 const basicAuthMode = cliArguments.basicAuthMode ?? getConfigValue('basicAuthMode', DEFAULT_BASIC_AUTH, 'boolean');
 const perUserBasicAuth = getConfigValue('perUserBasicAuth', DEFAULT_PER_USER_BASIC_AUTH, 'boolean');
 /** @type {boolean} */
 const enableAccounts = getConfigValue('enableUserAccounts', DEFAULT_ACCOUNTS, 'boolean');
 const uploadsPath = path.join(globalThis.DATA_ROOT, UPLOADS_DIRECTORY);

 /** @type {string} */
 const autorunHostname = cliArguments.autorunHostname ?? getConfigValue('autorunHostname', DEFAULT_AUTORUN_HOSTNAME);
 /** @type {number} */
 const autorunPortOverride = cliArguments.autorunPortOverride ?? getConfigValue('autorunPortOverride', DEFAULT_AUTORUN_PORT, 'number');
 /** @type {boolean} */
 const dnsPreferIPv6 = cliArguments.dnsPreferIPv6 ?? getConfigValue('dnsPreferIPv6', DEFAULT_PREFER_IPV6, 'boolean');
 /** @type {boolean} */
 const avoidLocalhost = cliArguments.avoidLocalhost ?? getConfigValue('avoidLocalhost', DEFAULT_AVOID_LOCALHOST, 'boolean');
 const proxyEnabled = cliArguments.requestProxyEnabled ?? getConfigValue('requestProxy.enabled', DEFAULT_PROXY_ENABLED, 'boolean');
 const proxyUrl = cliArguments.requestProxyUrl ?? getConfigValue('requestProxy.url', DEFAULT_PROXY_URL);
 const proxyBypass = cliArguments.requestProxyBypass ?? getConfigValue('requestProxy.bypass', DEFAULT_PROXY_BYPASS);

 function getSessionCookieAge() {
     // Defaults to "no expiration" if not set
     const configValue = getConfigValue('sessionTimeout', -1, 'number');
     // Convert to milliseconds
     if (configValue > 0) {

 function logSecurityAlert(message) {
     if (basicAuthMode || enableWhitelist) return; // safe!
     console.error(color.red(message));
     if (getConfigValue('securityOverride', false, 'boolean')) {
         console.warn(color.red('Security has been overridden. If it\'s not a trusted network, change the settings.'));
         return;
+    }

src/endpoints/backends/chat-completions.js+4 -4 Viewed

     const apiUrl = new URL(request.body.reverse_proxy || API_CLAUDE).toString();
     const apiKey = request.body.reverse_proxy ? request.body.proxy_password : readSecret(request.user.directories, SECRET_KEYS.CLAUDE);
     const divider = '-'.repeat(process.stdout.columns);
     const enableSystemPromptCache = getConfigValue('claude.enableSystemPromptCache', false, 'boolean') && request.body.model.startsWith('claude-3');
     let cachingAtDepth = getConfigValue('claude.cachingAtDepth', -1, 'number');
     // Disabled if not an integer or negative, or if the model doesn't support it
     if (!Number.isInteger(cachingAtDepth) || cachingAtDepth < 0 || !request.body.model.startsWith('claude-3')) {
         cachingAtDepth = -1;

@@ -969,7 +969,7 @@ router.post('/generate', jsonParser, function (request, response) {
969	969	bodyParams.logprobs = true;
970	970	}
971	971
972	972	if (getConfigValue('openai.randomizeUserId', false, 'boolean')) {
973	973	bodyParams['user'] = uuidv4();
974	974	}
975	975	} else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.OPENROUTER) {

@@ -1008,7 +1008,7 @@ router.post('/generate', jsonParser, function (request, response) {
1008	1008	bodyParams['include_reasoning'] = true;
1009	1009	}
1010	1010
1011	1011	let cachingAtDepth = getConfigValue('claude.cachingAtDepth', -1, 'number');
1012	1012	if (Number.isInteger(cachingAtDepth) && cachingAtDepth >= 0 && request.body.model?.startsWith('anthropic/claude-3')) {
1013	1013	cachingAtDepthForOpenRouterClaude(request.body.messages, cachingAtDepth);
1014	1014	}

src/endpoints/backends/text-completions.js+2 -2 Viewed

@@ -372,8 +372,8 @@ router.post('/generate', jsonParser, async function (request, response) {
372	372	}
373	373
374	374	if (request.body.api_type === TEXTGEN_TYPES.OLLAMA) {
375	375	const keepAlive = getConfigValue('ollama.keepAlive', -1, 'number');
376	376	const numBatch = getConfigValue('ollama.batchSize', -1, 'number');
377	377	if (numBatch > 0) {
378	378	request.body['num_batch'] = numBatch;
379	379	}

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

 const defaultAvatarPath = './public/img/ai4.png';
 // KV-store for parsed character data
 const cacheCapacity = Number(getConfigValue('cardsCacheCapacity', 100), 'number'); // MB
 // With 100 MB limit it would take roughly 3000 characters to reach this limit
 const characterDataCache = new MemoryLimitedMap(1024 * 1024 * cacheCapacity);
 // Some Android devices require tighter memory management

src/endpoints/chats.js+3 -3 Viewed

     formatBytes,
 } from '../util.js';
 const isBackupEnabled = !!getConfigValue('backups.chat.enabled', true, 'boolean');
 const maxTotalChatBackups = Number(getConfigValue('backups.chat.maxTotalBackups', -1), 'number');
 const throttleInterval = Number(getConfigValue('backups.chat.throttleInterval', 10_000), 'number');
 /**
  * Saves a chat to the backups directory.

src/endpoints/content-manager.js+1 -1 Viewed

  */
 export async function checkForNewContent(directoriesList, forceCategories = []) {
     try {
         const contentCheckSkip = getConfigValue('skipContentCheck', false, 'boolean');
         if (contentCheckSkip && forceCategories?.length === 0) {
             return;
+        }

src/endpoints/secrets.js+2 -2 Viewed

 });
 router.post('/view', jsonParser, async (request, response) => {
     const allowKeysExposure = getConfigValue('allowKeysExposure', false, 'boolean');
     if (!allowKeysExposure) {
         console.error('secrets.json could not be viewed unless the value of allowKeysExposure in config.yaml is set to true');

 });
 router.post('/find', jsonParser, (request, response) => {
     const allowKeysExposure = getConfigValue('allowKeysExposure', false, 'boolean');
     const key = request.body.key;
     if (!allowKeysExposure && !EXPORTABLE_KEYS.includes(key)) {

src/endpoints/settings.js+3 -3 Viewed

 import { getAllUserHandles, getUserDirectories } from '../users.js';
 import { getFileNameValidationFunction } from '../middleware/validateFileName.js';
 const ENABLE_EXTENSIONS = !!getConfigValue('extensions.enabled', true, 'boolean');
 const ENABLE_EXTENSIONS_AUTO_UPDATE = !!getConfigValue('extensions.autoUpdate', true, 'boolean');
 const ENABLE_ACCOUNTS = getConfigValue('enableUserAccounts', false, 'boolean');
 // 10 minutes
 const AUTOSAVE_INTERVAL = 10 * 60 * 1000;

src/endpoints/thumbnails.js+2 -2 Viewed

 import { getConfigValue } from '../util.js';
 import { jsonParser } from '../express-common.js';
 const thumbnailsEnabled = !!getConfigValue('thumbnails.enabled', true, 'boolean');
 const quality = Math.min(100, Math.max(1, parseInt(getConfigValue('thumbnails.quality', 95, 'number'))));
 const pngFormat = String(getConfigValue('thumbnails.format', 'jpg')).toLowerCase().trim() === 'png';
 /** @type {Record<string, number[]>} */

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

 ];
 const CHARS_PER_TOKEN = 3.35;
 const IS_DOWNLOAD_ALLOWED = getConfigValue('enableDownloadableTokenizers', true, 'boolean');
 /**
  * Gets a path to the tokenizer model. Downloads the model if it's a URL.

src/endpoints/users-public.js+1 -1 Viewed

 import { color, Cache, getConfigValue } from '../util.js';
 import { KEY_PREFIX, getUserAvatar, toKey, getPasswordHash, getPasswordSalt } from '../users.js';
 const DISCREET_LOGIN = getConfigValue('enableDiscreetLogin', false, 'boolean');
 const MFA_CACHE = new Cache(5 * 60 * 1000);
 export const router = express.Router();

src/middleware/basicAuth.js+2 -2 Viewed

 import { getAllUserHandles, toKey, getPasswordHash } from '../users.js';
 import { getConfig, getConfigValue, safeReadFileSync } from '../util.js';
 const PER_USER_BASIC_AUTH = getConfigValue('perUserBasicAuth', false, 'boolean');
 const ENABLE_ACCOUNTS = getConfigValue('enableUserAccounts', false, 'boolean');
 const basicAuthMiddleware = async function (request, response, callback) {
     const unauthorizedWebpage = safeReadFileSync('./public/error/unauthorized.html') ?? '';

src/middleware/whitelist.js+1 -1 Viewed

 import { color, getConfigValue, safeReadFileSync } from '../util.js';
 const whitelistPath = path.join(process.cwd(), './whitelist.txt');
 const enableForwardedWhitelist = getConfigValue('enableForwardedWhitelist', false, 'boolean');
 let whitelist = getConfigValue('whitelist', []);
 let knownIPs = new Set();

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

 import { sync as commandExistsSync } from 'command-exists';
 import { getConfigValue, color } from './util.js';
 const enableServerPlugins = !!getConfigValue('enableServerPlugins', false, 'boolean');
 const enableServerPluginsAutoUpdate = !!getConfigValue('enableServerPluginsAutoUpdate', true, 'boolean');
 /**
  * Map of loaded plugins.

src/prompt-converters.js+1 -1 Viewed

+    }
     // Make the last assistant message a prefill
     const prefixEnabled = getConfigValue('mistral.enablePrefix', false, 'boolean');
     const lastMsg = messages[messages.length - 1];
     if (prefixEnabled && messages.length > 0 && lastMsg?.role === 'assistant') {
         lastMsg.prefix = true;

src/transformers.js+1 -1 Viewed

     const cacheDir = path.join(globalThis.DATA_ROOT, '_cache');
     const model = forceModel || getModelForTask(task);
     const localOnly = !getConfigValue('extensions.models.autoDownload', true, 'boolean');
     console.log('Initializing transformers.js pipeline for task', task, 'with model', model);
     const instance = await pipeline(task, model, { cache_dir: cacheDir, quantized: tasks[task].quantized ?? true, local_files_only: localOnly });
     tasks[task].pipeline = instance;

src/users.js+3 -3 Viewed

 export const KEY_PREFIX = 'user:';
 const AVATAR_PREFIX = 'avatar:';
 const ENABLE_ACCOUNTS = getConfigValue('enableUserAccounts', false, 'boolean');
 const AUTHELIA_AUTH = getConfigValue('autheliaAuth', false, 'boolean');
 const PER_USER_BASIC_AUTH = getConfigValue('perUserBasicAuth', false, 'boolean');
 const ANON_CSRF_SECRET = crypto.randomBytes(64).toString('base64');
 /**

src/util.js+38 -3 Viewed

+    }
+}
++
 /**
  * Returns the value for the given key from the config object.
  * @param {string} key - Key to get from the config object
  * @param {any} defaultValue - Default value to return if the key is not found
 + * @param {'number'|'boolean'|null} typeConverter - Type to convert the value to
  * @returns {any} Value for the given key
  */
 export function getConfigValue(key, defaultValue = null, typeConverter = null) {
 +    function _getValue() {
         const envKey = keyToEnv(key);
         if (envKey in process.env) {
             return process.env[envKey];

         return _.get(config, key, defaultValue);
+    }
 +    const value = _getValue();
 +    switch (typeConverter) {
 +        case 'number':
 +            return Number(value);
 +        case 'boolean':
 +            return toBoolean(value);
 +        default:
 +            return value;
 +    }
 +}
++
 /**
  * Encodes the Basic Auth header value for the given user and password.
  * @param {string} auth username:password

  * @param {number?} limit Maximum number of backups to keep. If null, the limit is determined by the `backups.common.numberOfBackups` config value.
  */
 export function removeOldBackups(directory, prefix, limit = null) {
     const MAX_BACKUPS = limit ?? Number(getConfigValue('backups.common.numberOfBackups', 50, 'number'));
     let files = fs.readdirSync(directory).filter(f => f.startsWith(prefix));
     if (files.length > MAX_BACKUPS) {

+    }
+}
 +/**
 + * Converts various JavaScript primitives to boolean values.
 + * Handles special case for "true"/"false" strings (case-insensitive)
 + *
 + * @param {any} value - The value to convert to boolean
 + * @returns {boolean} - The boolean representation of the value
 + */
 +export function toBoolean(value) {
 +    // Handle string values case-insensitively
 +    if (typeof value === 'string') {
 +        // Trim and convert to lowercase for case-insensitive comparison
 +        const trimmedLower = value.trim().toLowerCase();
++
 +        // Handle explicit "true"/"false" strings
 +        if (trimmedLower === 'true') return true;
 +        if (trimmedLower === 'false') return false;
 +    }
++
 +    // Handle all other JavaScript values based on their "truthiness"
 +    return Boolean(value);
 +}
 /**
  * converts string to boolean accepts 'true' or 'false' else it returns the string put in

  * Setup the minimum log level
  */
 export function setupLogLevel() {
     const logLevel = getConfigValue('minLogLevel', LOG_LEVELS.DEBUG, 'number');
     globalThis.console.debug = logLevel <= LOG_LEVELS.DEBUG ? console.debug : () => {};
     globalThis.console.info = logLevel <= LOG_LEVELS.INFO ? console.info : () => {};

Add config value type converters for numbers and booleans