hifun-tools 1.3.25 → 1.3.27

package/dist/init/getResource.js

@@ -7,7 +7,10 @@ export function getResource(path) {
     const isWebpack = typeof __webpack_require__ === "function" ||
         (typeof require !== "undefined" &&
             typeof require.context === "function");
-    if (isVite) {
+    if (process.env.__rspack__) {
+        return;
+    }
+    else if (isVite) {
         // ---------------- VITE ----------------
         const modules = import.meta.glob([
             "/config/**/*.json",
@@ -28,7 +31,7 @@ export function getResource(path) {
         const [, mod] = match;
         return mod;
     }
-    if (isWebpack) {
+    else if (isWebpack) {
         // ---------------- WEBPACK ----------------
         const ctx = require.context("/config", true, /\.(json|png|jpg|jpeg|svg|webp)$/);
         const files = ctx.keys();

package/dist/init/index.d.ts

@@ -27,10 +27,12 @@ declare class InitCls {
     private getTenantInfoStrictSync;
     /** 严格初始化（必须在应用启动时调用） */
     private initialize;
-    InitConfig({ fileType, defaultBaseUrl, localPath, }: {
-        fileType: string[];
+    InitConfig({ fileType, defaultBaseUrl, localPath, appDomain, appTenant, }: {
+        fileType?: string[];
         defaultBaseUrl?: string;
         localPath?: string;
+        appDomain?: string;
+        appTenant?: string;
     }): Promise<any[]>;
     private LoadGatewayConfig;
     AesEncrypt: typeof AesEncrypt;

package/dist/init/index.js

@@ -89,15 +89,19 @@ class InitCls {
         }
     }
     /** 严格初始化（必须在应用启动时调用） */
-    async initialize() {
+    async initialize(tenant) {
         if (this.initialized)
             return this.tenant;
         try {
-            const tenantInfo = await this.getTenantInfoStrictSync();
-            this.tenant = tenantInfo.tenant;
-            this.tenantConfig = getResource(`${tenantInfo.tenant}/config.json`);
+            if (tenant)
+                this.tenant = tenant;
+            else {
+                const tenantInfo = await this.getTenantInfoStrictSync();
+                this.tenant = tenantInfo.tenant;
+            }
+            this.tenantConfig = getResource(`${this.tenant}/config.json`);
             this.initialized = true;
-            console.info(`🏢 严格加载租户成功: ${this.tenant}`, this.getImgPath("logo-default.png"));
+            console.info(`🏢 严格加载租户成功: ${this.tenant}`);
             return this.tenant;
         }
         catch (error) {
@@ -105,7 +109,14 @@ class InitCls {
             throw error;
         }
     }
-    async InitConfig({ fileType, defaultBaseUrl, localPath, }) {
+    async InitConfig({ fileType, defaultBaseUrl, localPath, appDomain, appTenant, }) {
+        if (appDomain && appTenant) {
+            this.initialize(appTenant);
+            this.domainBaseUrl = appDomain;
+            const results = [this.tenant, this.domainBaseUrl];
+            console.log("所有初始化完成:", results);
+            return results;
+        }
         if (defaultBaseUrl) {
             this.defaultBaseUrl = defaultBaseUrl;
         }
@@ -114,12 +125,12 @@ class InitCls {
         }
         console.log("加载类型:", fileType);
         const results = [];
-        if (fileType.includes("lineDict")) {
+        if (fileType?.includes("lineDict")) {
             console.log("初始化 lineDict...");
             const res1 = await this.initialize();
             results.push(res1);
         }
-        if (fileType.includes("lineAddress")) {
+        if (fileType?.includes("lineAddress")) {
             console.log("初始化 lineAddress...");
             const res2 = await this.LoadGatewayConfig();
             results.push(res2);

package/dist/init/viteResource.d.ts

@@ -0,0 +1 @@
+export declare function viteLoadSync(path: string): any;

package/dist/init/viteResource.js

@@ -0,0 +1,13 @@
+// viteResource.ts
+export function viteLoadSync(path) {
+    const modules = import.meta.glob([
+        "/config/**/*.json",
+        "/config/**/*.png",
+        "/config/**/*.jpg",
+        "/config/**/*.jpeg",
+        "/config/**/*.svg",
+        "/config/**/*.webp",
+    ], { eager: true, import: "default" });
+    const match = Object.entries(modules).find(([key]) => key.endsWith(path));
+    return match ? match[1] : null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hifun-tools",
-  "version": "1.3.25",
+  "version": "1.3.27",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",