@fugood/llama.node 0.3.11 → 0.3.12

package/lib/index.js

@@ -23,15 +23,39 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toggleNativeLog = exports.loadLlamaModelInfo = exports.initLlama = exports.loadModel = void 0;
+exports.loadLlamaModelInfo = exports.initLlama = exports.loadModel = exports.toggleNativeLog = void 0;
 exports.addNativeLogListener = addNativeLogListener;
 const binding_1 = require("./binding");
 __exportStar(require("./binding"), exports);
 const mods = {};
+const logListeners = [];
+const logCallback = (level, text) => {
+    logListeners.forEach((listener) => listener(level, text));
+};
+let logEnabled = false;
+const refreshNativeLogSetup = () => {
+    Object.entries(mods).forEach(([, mod]) => {
+        mod.LlamaContext.toggleNativeLog(logEnabled, logCallback);
+    });
+};
+const toggleNativeLog = (enable) => __awaiter(void 0, void 0, void 0, function* () {
+    logEnabled = enable;
+    refreshNativeLogSetup();
+});
+exports.toggleNativeLog = toggleNativeLog;
+function addNativeLogListener(listener) {
+    logListeners.push(listener);
+    return {
+        remove: () => {
+            logListeners.splice(logListeners.indexOf(listener), 1);
+        },
+    };
+}
 const loadModel = (options) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     const variant = (_a = options.lib_variant) !== null && _a !== void 0 ? _a : 'default';
     (_b = mods[variant]) !== null && _b !== void 0 ? _b : (mods[variant] = yield (0, binding_1.loadModule)(options.lib_variant));
+    refreshNativeLogSetup();
     return new mods[variant].LlamaContext(options);
 });
 exports.loadModel = loadModel;
@@ -47,25 +71,7 @@ const loadLlamaModelInfo = (path) => __awaiter(void 0, void 0, void 0, function*
     var _a;
     const variant = 'default';
     (_a = mods[variant]) !== null && _a !== void 0 ? _a : (mods[variant] = yield (0, binding_1.loadModule)(variant));
+    refreshNativeLogSetup();
     return mods[variant].LlamaContext.loadModelInfo(path, modelInfoSkip);
 });
 exports.loadLlamaModelInfo = loadLlamaModelInfo;
-const logListeners = [];
-const logCallback = (level, text) => {
-    logListeners.forEach((listener) => listener(level, text));
-};
-const toggleNativeLog = (enable, options) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
-    const v = (_a = options === null || options === void 0 ? void 0 : options.variant) !== null && _a !== void 0 ? _a : 'default';
-    (_b = mods[v]) !== null && _b !== void 0 ? _b : (mods[v] = yield (0, binding_1.loadModule)(v));
-    return mods[v].LlamaContext.toggleNativeLog(enable, logCallback);
-});
-exports.toggleNativeLog = toggleNativeLog;
-function addNativeLogListener(listener) {
-    logListeners.push(listener);
-    return {
-        remove: () => {
-            logListeners.splice(logListeners.indexOf(listener), 1);
-        },
-    };
-}

package/lib/index.ts

@@ -9,11 +9,42 @@ export interface LlamaModelOptionsExtended extends LlamaModelOptions {
 
 const mods: { [key: string]: Module } = {}
 
+const logListeners: Array<(level: string, text: string) => void> = []
+
+const logCallback = (level: string, text: string) => {
+  logListeners.forEach((listener) => listener(level, text))
+}
+
+let logEnabled = false
+
+const refreshNativeLogSetup = () => {
+  Object.entries(mods).forEach(([, mod]) => {
+    mod.LlamaContext.toggleNativeLog(logEnabled, logCallback)
+  })
+}
+
+export const toggleNativeLog = async (enable: boolean) => {
+  logEnabled = enable
+  refreshNativeLogSetup()
+}
+
+export function addNativeLogListener(
+  listener: (level: string, text: string) => void,
+): { remove: () => void } {
+  logListeners.push(listener)
+  return {
+    remove: () => {
+      logListeners.splice(logListeners.indexOf(listener), 1)
+    },
+  }
+}
+
 export const loadModel = async (
   options: LlamaModelOptionsExtended,
 ): Promise<LlamaContext> => {
   const variant = options.lib_variant ?? 'default'
   mods[variant] ??= await loadModule(options.lib_variant)
+  refreshNativeLogSetup()
   return new mods[variant].LlamaContext(options)
 }
 
@@ -30,33 +61,6 @@ const modelInfoSkip = [
 export const loadLlamaModelInfo = async (path: string): Promise<Object> => {
   const variant = 'default'
   mods[variant] ??= await loadModule(variant)
+  refreshNativeLogSetup()
   return mods[variant].LlamaContext.loadModelInfo(path, modelInfoSkip)
 }
-
-const logListeners: Array<(level: string, text: string) => void> = []
-
-const logCallback = (level: string, text: string) => {
-  logListeners.forEach((listener) => listener(level, text))
-}
-
-export const toggleNativeLog = async (
-  enable: boolean,
-  options?: {
-    variant?: LibVariant
-  },
-) => {
-  const v = options?.variant ?? 'default'
-  mods[v] ??= await loadModule(v)
-  return mods[v].LlamaContext.toggleNativeLog(enable, logCallback)
-}
-
-export function addNativeLogListener(
-  listener: (level: string, text: string) => void,
-): { remove: () => void } {
-  logListeners.push(listener)
-  return {
-    remove: () => {
-      logListeners.splice(logListeners.indexOf(listener), 1)
-    },
-  }
-}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fugood/llama.node",
   "access": "public",
-  "version": "0.3.11",
+  "version": "0.3.12",
   "description": "An another Node binding of llama.cpp",
   "main": "lib/index.js",
   "scripts": {