a32dd436 · permissionBRICK/SillyTavern

.eslintrc.cjs+3 -0 Viewed

             parserOptions: {
                 sourceType: 'module',
             },
+            globals: {
+                globalThis: 'readonly',
+            },
         },
+        {
             files: ['*.cjs'],

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

 import express from 'express';
 import { jsonParser } from '../express-common.js';
-import { getPipeline, getRawImage } from '../transformers.mjs';
+import { getPipeline, getRawImage } from '../transformers.js';
 const TASK = 'image-to-text';

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

 import express from 'express';
-import { getPipeline } from '../transformers.mjs';
+import { getPipeline } from '../transformers.js';
 import { jsonParser } from '../express-common.js';
 const TASK = 'text-classification';

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

 import express from 'express';
 import wavefile from 'wavefile';
 import { jsonParser } from '../express-common.js';
-import { getPipeline } from '../transformers.mjs';
+import { getPipeline } from '../transformers.js';
 export const router = express.Router();

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

@@ -82,7 +82,7 @@ async function getPathToTokenizer(model, fallbackModel) {
82	throw new Error('Failed to extract the file name from the URL');	82	throw new Error('Failed to extract the file name from the URL');
83	}	83	}
84		84
85	const CACHE_PATH = path.join(global.DATA_ROOT, '_cache');	85	const CACHE_PATH = path.join(globalThis.DATA_ROOT, '_cache');
86	if (!fs.existsSync(CACHE_PATH)) {	86	if (!fs.existsSync(CACHE_PATH)) {
87	fs.mkdirSync(CACHE_PATH, { recursive: true });	87	fs.mkdirSync(CACHE_PATH, { recursive: true });
88	}	88	}

src/transformers.mjs → src/transformers.js+2 -2 Viewed

 async function migrateCacheToDataDir() {
     const oldCacheDir = path.join(process.cwd(), 'cache');
-    const newCacheDir = path.join(global.DATA_ROOT, '_cache');
+    const newCacheDir = path.join(globalThis.DATA_ROOT, '_cache');
     if (!fs.existsSync(newCacheDir)) {
         fs.mkdirSync(newCacheDir, { recursive: true });

         await tasks[task].pipeline.dispose();
+    }
-    const cacheDir = path.join(global.DATA_ROOT, '_cache');
+    const cacheDir = path.join(globalThis.DATA_ROOT, '_cache');
     const model = forceModel || getModelForTask(task);
     const localOnly = getConfigValue('extras.disableAutoDownload', false);
     console.log('Initializing transformers.js pipeline for task', task, 'with model', model);

src/users.js+5 -5 Viewed

     console.log();
     console.log(color.magenta('Preparing to migrate user data...'));
-    console.log(`All public data will be moved to the ${global.DATA_ROOT} directory.`);
+    console.log(`All public data will be moved to the ${globalThis.DATA_ROOT} directory.`);
     console.log('This process may take a while depending on the amount of data to move.');
     console.log(`Backups will be placed in the ${PUBLIC_DIRECTORIES.backups} directory.`);
     console.log(`The process will start in ${TIMEOUT} seconds. Press Ctrl+C to cancel.`);

  * @returns {Promise<void>}
  */
 export async function initUserStorage(dataRoot) {
-    global.DATA_ROOT = dataRoot;
+    globalThis.DATA_ROOT = dataRoot;
-    console.log('Using data root:', color.green(global.DATA_ROOT));
+    console.log('Using data root:', color.green(globalThis.DATA_ROOT));
     console.log();
     await storage.init({
-        dir: path.join(global.DATA_ROOT, '_storage'),
+        dir: path.join(globalThis.DATA_ROOT, '_storage'),
         ttl: false, // Never expire
     });

     const directories = structuredClone(USER_DIRECTORY_TEMPLATE);
     for (const key in directories) {
-        directories[key] = path.join(global.DATA_ROOT, handle, USER_DIRECTORY_TEMPLATE[key]);
+        directories[key] = path.join(globalThis.DATA_ROOT, handle, USER_DIRECTORY_TEMPLATE[key]);
+    }
     DIRECTORIES_CACHE.set(handle, directories);
     return directories;

src/util.js+2 -2 Viewed

  * @returns {string} A UUIDv4 string
  */
 export function uuidv4() {
-    if ('crypto' in global && 'randomUUID' in global.crypto) {
+    if ('crypto' in globalThis && 'randomUUID' in globalThis.crypto) {
-        return global.crypto.randomUUID();
+        return globalThis.crypto.randomUUID();
+    }
     return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
         const r = Math.random() * 16 | 0;

src/vectors/embedding.js+1 -1 Viewed

-import { getPipeline } from '../transformers.mjs';
+import { getPipeline } from '../transformers.js';
 const TASK = 'feature-extraction';
 /**

Node: Replace global with globalThis