@laiye_packages/uci 1.0.4 → 1.0.6

package/dist/app/base/index.d.ts

@@ -1,5 +1,5 @@
 import { LYObject } from '../../object';
-import { LYAppHttpClient, type IHeaderProvider } from '../../http';
+import { LYAppHttpClient, LYOrganizationHttpClient, type IHeaderProvider } from '../../http';
 import type { LYAppPermission } from '../../permission';
 import { LYCrypto } from '../../crypto';
 import { LYi18n, ILYi18n, LYKeyofLang } from '../../i18n';
@@ -71,8 +71,12 @@ export declare class LYBaseApp extends LYObject {
     protected _createHttpClient(): LYAppHttpClient;
     load(): Promise<void>;
     protected doLoad(): Promise<void>;
+    protected getBaseUrl(): string;
     private initI18n;
     getI18nResourceUrl(relativeUrl: string, lang?: LYKeyofLang): string;
     getComponent<T>(componentName: string): Promise<T>;
     private loadRemoteComponents;
 }
+export declare class LYBaseOrganizationApp extends LYBaseApp {
+    protected _createHttpClient(): LYOrganizationHttpClient;
+}

package/dist/app/index.d.ts

@@ -1,5 +1,5 @@
 import { LYEnv } from '../env';
-import { LYBaseApp, ORGANIZATION_APP_NAME, TENANT_APP_NAME } from './base';
+import { LYBaseApp, LYBaseOrganizationApp, ORGANIZATION_APP_NAME, TENANT_APP_NAME } from './base';
 import { LYOrganizationApp, SSOConfig } from './organization';
 import { LYTenantApp } from './tenant';
 import { LYTenantSession } from './tenant/session';
@@ -8,7 +8,7 @@ import { LYGatewayAuthorizer } from './organization/authorizer/gateway';
 import { LYDirectAuthorizer } from './organization/authorizer/direct';
 import { LYRedirectAuthorizer } from './organization/authorizer/redirect';
 import { LYTenantAuthorizer } from './tenant/authorizer';
-declare class LYApp extends LYBaseApp {
+declare class LYApp extends LYBaseOrganizationApp {
 }
 export type { SSOConfig };
 export { LYApp, LYBaseApp, LYTenantApp, LYOrganizationApp, LYTenantSession, TENANT_APP_NAME, ORGANIZATION_APP_NAME, LYEnv, LYWebAuthorizer, LYGatewayAuthorizer, LYDirectAuthorizer, LYRedirectAuthorizer, LYTenantAuthorizer };

package/dist/app/organization/app/index.d.ts

@@ -1,4 +1,4 @@
-import { LYBaseApp } from '../../base';
+import { LYBaseOrganizationApp } from '../../base';
 import { LYSessionApi } from '../api/session';
 import type { SSOConfig } from '../api/session';
 import { LYUserApi } from '../api/user';
@@ -6,8 +6,7 @@ import type { LYBaseAuthorizer } from '../authorizer/base';
 import { LYLicenseApi } from '../api/license';
 import { LYOEMApi } from '../api/oem';
 import { LYVerificationCodesApi } from '../api/verificationCodes';
-import { LYAppHttpClient } from '../../../http';
-declare class LYOrganizationApp extends LYBaseApp {
+declare class LYOrganizationApp extends LYBaseOrganizationApp {
     static _instance?: LYOrganizationApp;
     private _sessionApi;
     private _userApi;
@@ -17,7 +16,6 @@ declare class LYOrganizationApp extends LYBaseApp {
     private _verificationCodesApi;
     constructor(name: string, version: string, description: string);
     static get instance(): LYOrganizationApp;
-    _createHttpClient(): LYAppHttpClient;
     get sessionApi(): LYSessionApi;
     get userApi(): LYUserApi;
     get oemApi(): LYOEMApi;
@@ -26,6 +24,5 @@ declare class LYOrganizationApp extends LYBaseApp {
     protected doLoad(): Promise<void>;
     private mergeOEM;
     getAuthorizer<T extends LYBaseAuthorizer = LYBaseAuthorizer>(name?: string): T;
-    private getBaseUrl;
 }
 export { LYOrganizationApp, SSOConfig };

package/dist/app/tenant/app/index.d.ts

@@ -12,6 +12,7 @@ declare class LYTenantApp extends LYBaseApp {
     private _authorizer;
     constructor(name: string, version: string, description: string);
     _createHttpClient(): LYAppHttpClient;
+    getBaseUrl(): string;
     static get instance(): LYTenantApp;
     get tenantApi(): LYTenantApi;
     get userApi(): LYUserApi;

package/dist/index.js

@@ -3624,7 +3624,7 @@ var __webpack_modules__ = {
             }, O.en = D[g], O.Ls = D, O.p = {}, O;
         });
     },
-    "../../node_modules/.pnpm/@module-federation+enhanced@0.8.12_@rspack+core@1.5.8_@swc+helpers@0.5.18__react-dom@18.3.1_r_dcbcwp56l5mltx2br2csa6d5sy/node_modules/@module-federation/enhanced/dist/src/runtime.js": function(__unused_webpack_module, exports, __webpack_require__) {
+    "../../node_modules/.pnpm/@module-federation+enhanced@0.8.12_@rspack+core@1.7.4_react-dom@18.3.1_react@18.3.1_typescript@5.9.3_webpack@5.104.1/node_modules/@module-federation/enhanced/dist/src/runtime.js": function(__unused_webpack_module, exports, __webpack_require__) {
         var __createBinding = this && this.__createBinding || (Object.create ? function(o, m, k, k2) {
             if (void 0 === k2) k2 = k;
             var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -9703,7 +9703,7 @@ class LYAppHttpError extends LYBaseHttpError {
         return this._code;
     }
 }
-var runtime = __webpack_require__("../../node_modules/.pnpm/@module-federation+enhanced@0.8.12_@rspack+core@1.5.8_@swc+helpers@0.5.18__react-dom@18.3.1_r_dcbcwp56l5mltx2br2csa6d5sy/node_modules/@module-federation/enhanced/dist/src/runtime.js");
+var runtime = __webpack_require__("../../node_modules/.pnpm/@module-federation+enhanced@0.8.12_@rspack+core@1.7.4_react-dom@18.3.1_react@18.3.1_typescript@5.9.3_webpack@5.104.1/node_modules/@module-federation/enhanced/dist/src/runtime.js");
 class LYAppPermission extends LYObject {
     constructor(app_name, codes){
         super(), this._codes = {};
@@ -10671,6 +10671,7 @@ class base_LYBaseApp extends LYObject {
         this._sessionStore = new LYSessionStorage(prefix);
         this._cloudStore = new LYCloudStorage(prefix);
         this._env = new LYEnv(this._name);
+        this.env.baseUrl = this.getBaseUrl();
         this._httpClient = this._createHttpClient();
     }
     get location() {
@@ -10721,9 +10722,10 @@ class base_LYBaseApp extends LYObject {
         return crypto_crypto;
     }
     _createHttpClient() {
-        return new http_LYAppHttpClient(this._name, {
+        return new LYOrganizationHttpClient(this._name, {
             get headers () {
-                return base_LYBaseApp.getHeaderProvider().headers;
+                const headers = base_LYBaseApp.getHeaderProvider()?.headers;
+                return headers;
             }
         });
     }
@@ -10737,6 +10739,50 @@ class base_LYBaseApp extends LYObject {
     async doLoad() {
         await this.initI18n();
     }
+    getBaseUrl() {
+        const config = LYConfig.get();
+        const url = new URL(window.location.href);
+        let baseUrl = "";
+        for (const pattern of config.host_patterns){
+            if (!pattern.includes("{tenant_name}") && pattern.startsWith(url.origin)) {
+                const parts = url.pathname.split('/');
+                const index = parts.findIndex((part)=>'view' === part);
+                let tenantName = parts[index + 2];
+                if (!tenantName) throw new Error('tenantName not found');
+                baseUrl = `${pattern}/view/${this.name}/${tenantName}`;
+                this._tenantName = tenantName;
+                return baseUrl;
+            }
+            let filterhost = pattern.replace(/\./g, "\\.").replace("{tenant_name}", "([a-zA-Z0-9_\\-]+)");
+            const reg = new RegExp(`^${filterhost}(?::\\d+)?(?:/.*)?$`);
+            const matched = url.toString().match(reg);
+            if (matched && matched[1]) {
+                const tenantName = matched[1];
+                const host = pattern.replace("{tenant_name}", tenantName);
+                baseUrl = `${host}/view/${this.name}`;
+                this._tenantName = tenantName;
+                return baseUrl;
+            }
+        }
+        try {
+            if ('development' === process.env.NODE_ENV) {
+                baseUrl = `${window.origin}/view/${this.name}/laiye`;
+                this._tenantName = "laiye";
+                return baseUrl;
+            }
+            const parts = url.pathname.split('/');
+            const index = parts.findIndex((part)=>'view' === part);
+            if (-1 === index) throw new Error('view not found in URL');
+            let tenantName = parts[index + 2];
+            if (!tenantName) throw new Error('tenantName not found');
+            baseUrl = `${window.origin}/view/${this.name}/${tenantName}`;
+            this._tenantName = tenantName;
+            return baseUrl;
+        } catch (error) {
+            console.error('Error getting base URL:', error);
+        }
+        return window.origin;
+    }
     async initI18n() {
         try {
             const resources = await this.provider.provideI18nResource(this);
@@ -10793,6 +10839,24 @@ base_LYBaseApp = app_base_ts_decorate([
         String
     ])
 ], base_LYBaseApp);
+class LYBaseOrganizationApp extends base_LYBaseApp {
+    _createHttpClient() {
+        const lang = this._i18n.lang;
+        return new LYOrganizationHttpClient(this.name, {
+            get headers () {
+                const session = LYSession.get();
+                if (!session) return;
+                return {
+                    Authorization: `Bearer ${session.token}`,
+                    'Accept-Language': lang
+                };
+            }
+        });
+    }
+}
+LYBaseOrganizationApp = app_base_ts_decorate([
+    register('LYBaseOrganizationApp')
+], LYBaseOrganizationApp);
 class session_LYSessionApi {
     constructor(httpClient){
         this._httpClient = httpClient;
@@ -11247,10 +11311,9 @@ function app_ts_decorate(decorators, target, key, desc) {
 function app_ts_metadata(k, v) {
     if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(k, v);
 }
-class LYOrganizationApp extends base_LYBaseApp {
+class LYOrganizationApp extends LYBaseOrganizationApp {
     constructor(name1, version, description){
         super(name1, version, description);
-        this.env.baseUrl = this.getBaseUrl();
         LYOrganizationApp._instance = this;
         this._sessionApi = new session_LYSessionApi(this.httpClient);
         this._userApi = new LYUserApi(this.httpClient);
@@ -11268,19 +11331,6 @@ class LYOrganizationApp extends base_LYBaseApp {
         if (!LYOrganizationApp._instance) throw new Error('LYOrganizationApp not initialized');
         return LYOrganizationApp._instance;
     }
-    _createHttpClient() {
-        const lang = this._i18n.lang;
-        return new LYOrganizationHttpClient(this.name, {
-            get headers () {
-                const session = LYSession.get();
-                if (!session) return;
-                return {
-                    Authorization: `Bearer ${session.token}`,
-                    'Accept-Language': lang
-                };
-            }
-        });
-    }
     get sessionApi() {
         return this._sessionApi;
     }
@@ -11315,50 +11365,6 @@ class LYOrganizationApp extends base_LYBaseApp {
         if (!this._authorizers[type]) throw new Error(`Authorizer ${type} not found`);
         return this._authorizers[type];
     }
-    getBaseUrl() {
-        const config = LYConfig.get();
-        const url = new URL(window.location.href);
-        let baseUrl = "";
-        for (const pattern of config.host_patterns){
-            if (!pattern.includes("{tenant_name}") && pattern.startsWith(url.origin)) {
-                const parts = url.pathname.split('/');
-                const index = parts.findIndex((part)=>'view' === part);
-                let tenantName = parts[index + 2];
-                if (!tenantName) throw new Error('tenantName not found');
-                baseUrl = `${pattern}/view/${this.name}/${tenantName}`;
-                this._tenantName = tenantName;
-                return baseUrl;
-            }
-            let filterhost = pattern.replace(/\./g, "\\.").replace("{tenant_name}", "([a-zA-Z0-9_\\-]+)");
-            const reg = new RegExp(`^${filterhost}(?::\\d+)?(?:/.*)?$`);
-            const matched = url.toString().match(reg);
-            if (matched && matched[1]) {
-                const tenantName = matched[1];
-                const host = pattern.replace("{tenant_name}", tenantName);
-                baseUrl = `${host}/view/${this.name}`;
-                this._tenantName = tenantName;
-                return baseUrl;
-            }
-        }
-        try {
-            if ('development' === process.env.NODE_ENV) {
-                baseUrl = `${window.origin}/view/${this.name}/laiye`;
-                this._tenantName = "laiye";
-                return baseUrl;
-            }
-            const parts = url.pathname.split('/');
-            const index = parts.findIndex((part)=>'view' === part);
-            if (-1 === index) throw new Error('view not found in URL');
-            let tenantName = parts[index + 2];
-            if (!tenantName) throw new Error('tenantName not found');
-            baseUrl = `${window.origin}/view/${this.name}/${tenantName}`;
-            this._tenantName = tenantName;
-            return baseUrl;
-        } catch (error) {
-            console.error('Error getting base URL:', error);
-        }
-        return window.origin;
-    }
 }
 LYOrganizationApp = app_ts_decorate([
     register('LYOrganizationApp'),
@@ -11734,6 +11740,9 @@ class LYTenantApp extends base_LYBaseApp {
             }
         });
     }
+    getBaseUrl() {
+        return window.origin;
+    }
     static get instance() {
         if (!LYTenantApp._instance) throw new Error('LYTenantApp not initialized');
         return LYTenantApp._instance;
@@ -11769,7 +11778,7 @@ function src_app_ts_decorate(decorators, target, key, desc) {
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-class LYApp extends base_LYBaseApp {
+class LYApp extends LYBaseOrganizationApp {
 }
 LYApp = src_app_ts_decorate([
     register('LYApp')