@zwa73/utils 1.0.264 → 1.0.266

package/dist/UtilClass/Hbs.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Hbs = void 0;
 const UtilLogger_1 = require("../UtilLogger");
 const js_utils_1 = require("@zwa73/js-utils");
+const UtilFunctions_1 = require("../UtilFunctions");
 /**文本模板渲染器
  * @template T - 上下文对象的类型，默认为记录类型
  */
@@ -34,6 +35,8 @@ class Hbs {
     */
     static async create(context = {}) {
         const Handlebars = await js_utils_1.JsFunc.dynamicImport('handlebars');
+        if (Handlebars == undefined)
+            UtilFunctions_1.UtilFunc.throwError(`npm包 handlebars 动态导入失败, 此包不会随@zwa73/utils自动安装, 可能是未安装, 可使用 npm i handlebars@4.7.8 来安装`);
         //console.log(Handlebars);
         const hbs = Handlebars.create();
         return new Hbs(hbs, context);

package/dist/UtilCodecs.js

@@ -27,7 +27,10 @@ exports.UtilCodec = void 0;
 const he = __importStar(require("html-entities"));
 const UtilFunctions_1 = require("./UtilFunctions");
 async function importTikToken() {
-    return await UtilFunctions_1.UtilFunc.dynamicImport("tiktoken");
+    const tik = await UtilFunctions_1.UtilFunc.dynamicImport("tiktoken");
+    if (tik == undefined)
+        UtilFunctions_1.UtilFunc.throwError(`npm包 tiktoken 动态导入失败, 此包不会随@zwa73/utils自动安装, 可能是未安装, 可使用 npm i tiktoken@1.0.7 来安装`);
+    return tik;
 }
 /**编码/解码器 */
 var UtilCodec;
@@ -57,9 +60,9 @@ var UtilCodec;
     UtilCodec.encodeHtmlEntities = encodeHtmlEntities;
     //#region LAM
     //token长度计算器
-    //cl100k_base	ChatGPT models, text-embedding-ada-002
-    //p50k_base	Code models, text-davinci-002, text-davinci-003
-    //r50k_base (or gpt2)	GPT-3 models like davinci
+    //cl100k_base  ChatGPT models, text-embedding-ada-002
+    //p50k_base    Code models, text-davinci-002, text-davinci-003
+    //r50k_base (or gpt2)    GPT-3 models like davinci
     //避免在nextjs调用时出错
     async function initTikTokenEncoder() {
         if (encoderCl100kBase != null && encoderP50kBase != null)

package/dist/UtilFunctions.d.ts

@@ -45,7 +45,7 @@ declare class _UtilFunc {
     /**获取当前公网ipv4
      * 依赖于 public-ip@6.0.2 但不会自动安装
      */
-    static getPublicIpv4(): Promise<string>;
+    static getPublicIpv4(): Promise<string | undefined>;
 }
 export declare const UtilFunc: import("@zwa73/modular-mixer").ComposedClass<typeof _UtilFunc, typeof JsFunc, "__jsUtils", "match" | "failed" | "success" | "prototype" | "genUUID" | "range" | "preset" | "assignOption" | "getTime" | "initField" | "initObject" | "afterward" | "sleep" | "getNeverResolvedPromise" | "retryPromise" | "timelimitPromise" | "mapEntries" | "eachField" | "stringifyJToken" | "sortJToken" | "assertType" | "assertLiteral" | "deepClone" | "isSafeNumber" | "dedent" | "throwError" | "getFuncLoc" | "cachePool" | "memoize" | "asyncize" | "lazyFunction" | "splitToChunk" | "mergeFromChunk" | "structEqual" | "concurrent" | "dynamicImport" | "createInjectable" | "createAsyncProxy" | "checkSharpSchema" | "outcome" | "extractOutcome" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "s2l" | "l2s">;
 export type UtilFunc = typeof UtilFunc;

package/dist/UtilFunctions.js

@@ -123,6 +123,10 @@ class _UtilFunc {
         const pip = await js_utils_1.JsFunc.dynamicImport('public-ip');
         //if(_UtilFunc.publicIp===undefined)
         //    _UtilFunc.publicIp = await import("public-ip");
+        if (pip == undefined) {
+            UtilLogger_1.SLogger.warn(`npm包 public-ip 动态导入失败, 此包不会随@zwa73/utils自动安装, 可能是未安装, 可使用 npm i public-ip@6.0.2 来安装`);
+            return undefined;
+        }
         return pip.publicIpv4();
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.264",
+	"version": "1.0.266",
 	"description": "my utils",
 	"main": "dist/index.js",
 	"scripts": {
@@ -20,14 +20,12 @@
 		"@zwa73/modular-mixer": "^1.0.8",
 		"form-data": "^4.0.2",
 		"glob": "^10.4.1",
-		"handlebars": "^4.7.8",
 		"html-entities": "^2.3.3",
 		"http-proxy-agent": "^5.0.0",
 		"https-proxy-agent": "^5.0.1",
 		"json5": "^2.2.3",
 		"pathe": "^1.1.2",
 		"querystring": "^0.2.1",
-		"tiktoken": "^1.0.7",
 		"winston": "^3.10.0",
 		"winston-daily-rotate-file": "^4.7.1"
 	},
@@ -36,7 +34,9 @@
 		"@types/jest": "^29.5.12",
 		"@types/node": "^20.14.11",
 		"@zwa73/dev-utils": "*",
+		"handlebars": "^4.7.8",
 		"public-ip": "^6.0.2",
+		"tiktoken": "^1.0.7",
 		"tsc-alias": "^1.8.8",
 		"typescript": "^5.3.3"
 	},