@etsoo/appscript 1.5.99 → 1.6.1

package/__tests__/app/CoreApp.ts

@@ -22,10 +22,10 @@ const app = new appClass();
 await app.changeCulture(app.settings.cultures[0]);
 
 test("Test for domain substitution", () => {
-  expect(app.settings.endpoint).toBe("http://localhost:9000/api/");
+  expect(app.settings.endpoint).toBe("http://admin.etsoo.com:9000/api/");
 
   expect(app.settings.endpoints?.core.endpoint).toBe(
-    "https://localhost:9001/api/"
+    "https://core.etsoo.com:9001/api/"
   );
 });
 

package/__tests__/app/TestApp.ts

@@ -11,7 +11,6 @@ import {
   CoreApp,
   createClient,
   Culture,
-  ExternalSettings,
   IAppSettings,
   InitCallResultData,
   IUser
@@ -87,6 +86,8 @@ export class TestApp extends CoreApp<
           }
         },
 
+        hostname: "admin.etsoo.com",
+
         /**
          * App root url
          */
@@ -126,16 +127,6 @@ export class TestApp extends CoreApp<
     );
   }
 
-  // Example of local format settings
-  protected override formatSettings(settings: IAppSettings): IAppSettings {
-    const { endpoint, endpoints, ...rest } = settings;
-    return {
-      ...rest,
-      endpoint: ExternalSettings.formatHost(endpoint, "localhost"),
-      endpoints: ExternalSettings.formatHost(endpoints, "localhost")
-    };
-  }
-
   freshCountdownUI(callback?: () => PromiseLike<unknown>): void {
     throw new Error("Method not implemented.");
   }

package/lib/cjs/app/CoreApp.js

@@ -11,6 +11,7 @@ const EntityStatus_1 = require("../business/EntityStatus");
 const ActionResultError_1 = require("../result/ActionResultError");
 const IApp_1 = require("./IApp");
 const UserRole_1 = require("./UserRole");
+const ExternalSettings_1 = require("./ExternalSettings");
 const AuthApi_1 = require("../api/AuthApi");
 let CJ;
 const loadCrypto = () => import("crypto-js");
@@ -188,17 +189,19 @@ class CoreApp {
             }
             return undefined;
         };
+        // Destruct the settings
+        const { currentCulture, currentRegion, endpoint, webUrl } = this.settings;
         if (api) {
             // Base URL of the API
-            api.baseUrl = this.settings.endpoint;
+            api.baseUrl = endpoint;
             api.name = systemApi;
             this.setApi(api, refresh);
             this.api = api;
         }
         else {
             this.api = this.createApi(systemApi, {
-                endpoint: settings.endpoint,
-                webUrl: settings.webUrl
+                endpoint,
+                webUrl
             }, refresh);
         }
         this.notifier = notifier;
@@ -219,7 +222,6 @@ class CoreApp {
         // Embedded
         this._embedded =
             this.storage.getData(this.fields.embedded) ?? false;
-        const { currentCulture, currentRegion } = settings;
         // Load resources
         Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(([cj, _resources]) => {
             CJ = cj.default;
@@ -237,7 +239,16 @@ class CoreApp {
      * @returns Result
      */
     formatSettings(settings) {
-        return settings;
+        const { endpoint, webUrl, endpoints, hostname = globalThis.location.hostname, ...rest } = settings;
+        return {
+            ...rest,
+            hostname,
+            endpoint: ExternalSettings_1.ExternalSettings.formatHost(endpoint, hostname),
+            webUrl: ExternalSettings_1.ExternalSettings.formatHost(webUrl, hostname),
+            endpoints: endpoints == null
+                ? undefined
+                : ExternalSettings_1.ExternalSettings.formatHost(endpoints, hostname)
+        };
     }
     getDeviceId() {
         return this.deviceId.substring(0, 15);

package/lib/cjs/app/ExternalSettings.d.ts

@@ -28,6 +28,11 @@ export interface IExternalSettings extends ExternalEndpoint {
      * 程序编号
      */
     readonly appId: number;
+    /**
+     * Default hostname for substitution
+     * 用于替换的默认主机名
+     */
+    hostname?: string;
     /**
      * Endpoints to other services
      */
@@ -46,7 +51,7 @@ export declare namespace ExternalSettings {
      * @param settings Settings
      * @returns Result
      */
-    function create<T extends IExternalSettings = IExternalSettings>(settings: unknown): T;
+    function create<T extends IExternalSettings = IExternalSettings>(settings?: unknown, hostname?: string): T;
     /**
      * Format the app
      * @param hostname Hostname
@@ -61,7 +66,6 @@ export declare namespace ExternalSettings {
      * @param hostname Hostname
      * @returns Result
      */
-    function formatHost(setting: string, hostname?: string | null): string;
+    function formatHost(setting: string, hostname: string): string;
     function formatHost(setting: Record<string, ExternalEndpoint>, hostname?: string | null): Record<string, ExternalEndpoint>;
-    function formatHost(setting: undefined, hostname?: string | null): undefined;
 }

package/lib/cjs/app/ExternalSettings.js

@@ -15,14 +15,22 @@ var ExternalSettings;
      * @param settings Settings
      * @returns Result
      */
-    function create(settings) {
+    function create(settings, hostname) {
         // Default settings reading from globalThis
         settings ?? (settings = Reflect.get(globalThis, "settings"));
-        if (settings != null &&
-            typeof settings === "object" &&
-            "appId" in settings &&
-            "endpoint" in settings) {
-            return settings;
+        if (settings) {
+            if (typeof settings === "string") {
+                settings = JSON.parse(settings);
+            }
+            if (settings != null &&
+                typeof settings === "object" &&
+                "appId" in settings &&
+                "endpoint" in settings) {
+                const s = settings;
+                if (hostname)
+                    s.hostname = hostname;
+                return s;
+            }
         }
         throw new Error("No external settings found");
     }
@@ -39,9 +47,6 @@ var ExternalSettings;
     }
     ExternalSettings.formatApp = formatApp;
     function formatHost(setting, hostname) {
-        // No setting
-        if (setting == null)
-            return undefined;
         // Default hostname
         hostname ?? (hostname = globalThis.location.hostname);
         if (typeof setting === "string") {

package/lib/mjs/app/CoreApp.js

@@ -8,6 +8,7 @@ import { EntityStatus } from "../business/EntityStatus";
 import { ActionResultError } from "../result/ActionResultError";
 import { appFields } from "./IApp";
 import { UserRole } from "./UserRole";
+import { ExternalSettings } from "./ExternalSettings";
 import { AuthApi } from "../api/AuthApi";
 let CJ;
 const loadCrypto = () => import("crypto-js");
@@ -185,17 +186,19 @@ export class CoreApp {
             }
             return undefined;
         };
+        // Destruct the settings
+        const { currentCulture, currentRegion, endpoint, webUrl } = this.settings;
         if (api) {
             // Base URL of the API
-            api.baseUrl = this.settings.endpoint;
+            api.baseUrl = endpoint;
             api.name = systemApi;
             this.setApi(api, refresh);
             this.api = api;
         }
         else {
             this.api = this.createApi(systemApi, {
-                endpoint: settings.endpoint,
-                webUrl: settings.webUrl
+                endpoint,
+                webUrl
             }, refresh);
         }
         this.notifier = notifier;
@@ -216,7 +219,6 @@ export class CoreApp {
         // Embedded
         this._embedded =
             this.storage.getData(this.fields.embedded) ?? false;
-        const { currentCulture, currentRegion } = settings;
         // Load resources
         Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(([cj, _resources]) => {
             CJ = cj.default;
@@ -234,7 +236,16 @@ export class CoreApp {
      * @returns Result
      */
     formatSettings(settings) {
-        return settings;
+        const { endpoint, webUrl, endpoints, hostname = globalThis.location.hostname, ...rest } = settings;
+        return {
+            ...rest,
+            hostname,
+            endpoint: ExternalSettings.formatHost(endpoint, hostname),
+            webUrl: ExternalSettings.formatHost(webUrl, hostname),
+            endpoints: endpoints == null
+                ? undefined
+                : ExternalSettings.formatHost(endpoints, hostname)
+        };
     }
     getDeviceId() {
         return this.deviceId.substring(0, 15);

package/lib/mjs/app/ExternalSettings.d.ts

@@ -28,6 +28,11 @@ export interface IExternalSettings extends ExternalEndpoint {
      * 程序编号
      */
     readonly appId: number;
+    /**
+     * Default hostname for substitution
+     * 用于替换的默认主机名
+     */
+    hostname?: string;
     /**
      * Endpoints to other services
      */
@@ -46,7 +51,7 @@ export declare namespace ExternalSettings {
      * @param settings Settings
      * @returns Result
      */
-    function create<T extends IExternalSettings = IExternalSettings>(settings: unknown): T;
+    function create<T extends IExternalSettings = IExternalSettings>(settings?: unknown, hostname?: string): T;
     /**
      * Format the app
      * @param hostname Hostname
@@ -61,7 +66,6 @@ export declare namespace ExternalSettings {
      * @param hostname Hostname
      * @returns Result
      */
-    function formatHost(setting: string, hostname?: string | null): string;
+    function formatHost(setting: string, hostname: string): string;
     function formatHost(setting: Record<string, ExternalEndpoint>, hostname?: string | null): Record<string, ExternalEndpoint>;
-    function formatHost(setting: undefined, hostname?: string | null): undefined;
 }

package/lib/mjs/app/ExternalSettings.js

@@ -12,14 +12,22 @@ export var ExternalSettings;
      * @param settings Settings
      * @returns Result
      */
-    function create(settings) {
+    function create(settings, hostname) {
         // Default settings reading from globalThis
         settings ?? (settings = Reflect.get(globalThis, "settings"));
-        if (settings != null &&
-            typeof settings === "object" &&
-            "appId" in settings &&
-            "endpoint" in settings) {
-            return settings;
+        if (settings) {
+            if (typeof settings === "string") {
+                settings = JSON.parse(settings);
+            }
+            if (settings != null &&
+                typeof settings === "object" &&
+                "appId" in settings &&
+                "endpoint" in settings) {
+                const s = settings;
+                if (hostname)
+                    s.hostname = hostname;
+                return s;
+            }
         }
         throw new Error("No external settings found");
     }
@@ -36,9 +44,6 @@ export var ExternalSettings;
     }
     ExternalSettings.formatApp = formatApp;
     function formatHost(setting, hostname) {
-        // No setting
-        if (setting == null)
-            return undefined;
         // Default hostname
         hostname ?? (hostname = globalThis.location.hostname);
         if (typeof setting === "string") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/appscript",
-  "version": "1.5.99",
+  "version": "1.6.1",
   "description": "Applications shared TypeScript framework",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -45,7 +45,7 @@ import {
 import { UserRole } from "./UserRole";
 import type CryptoJS from "crypto-js";
 import { Currency } from "../business/Currency";
-import { ExternalEndpoint } from "./ExternalSettings";
+import { ExternalEndpoint, ExternalSettings } from "./ExternalSettings";
 import { ApiRefreshTokenDto } from "../api/dto/ApiRefreshTokenDto";
 import { ApiRefreshTokenRQ } from "../api/rq/ApiRefreshTokenRQ";
 import { AuthApi } from "../api/AuthApi";
@@ -365,9 +365,12 @@ export abstract class CoreApp<
       return undefined;
     };
 
+    // Destruct the settings
+    const { currentCulture, currentRegion, endpoint, webUrl } = this.settings;
+
     if (api) {
       // Base URL of the API
-      api.baseUrl = this.settings.endpoint;
+      api.baseUrl = endpoint;
       api.name = systemApi;
       this.setApi(api, refresh);
       this.api = api;
@@ -375,8 +378,8 @@ export abstract class CoreApp<
       this.api = this.createApi(
         systemApi,
         {
-          endpoint: settings.endpoint,
-          webUrl: settings.webUrl
+          endpoint,
+          webUrl
         },
         refresh
       );
@@ -408,8 +411,6 @@ export abstract class CoreApp<
     this._embedded =
       this.storage.getData<boolean>(this.fields.embedded) ?? false;
 
-    const { currentCulture, currentRegion } = settings;
-
     // Load resources
     Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(
       ([cj, _resources]) => {
@@ -438,8 +439,24 @@ export abstract class CoreApp<
    * @param settings Original settings
    * @returns Result
    */
-  protected formatSettings(settings: S) {
-    return settings;
+  protected formatSettings(settings: S): S {
+    const {
+      endpoint,
+      webUrl,
+      endpoints,
+      hostname = globalThis.location.hostname,
+      ...rest
+    } = settings;
+    return {
+      ...rest,
+      hostname,
+      endpoint: ExternalSettings.formatHost(endpoint, hostname),
+      webUrl: ExternalSettings.formatHost(webUrl, hostname),
+      endpoints:
+        endpoints == null
+          ? undefined
+          : ExternalSettings.formatHost(endpoints, hostname)
+    } as S;
   }
 
   private getDeviceId() {

package/src/app/ExternalSettings.ts

@@ -33,6 +33,12 @@ export interface IExternalSettings extends ExternalEndpoint {
    */
   readonly appId: number;
 
+  /**
+   * Default hostname for substitution
+   * 用于替换的默认主机名
+   */
+  hostname?: string;
+
   /**
    * Endpoints to other services
    */
@@ -57,18 +63,27 @@ export namespace ExternalSettings {
    * @returns Result
    */
   export function create<T extends IExternalSettings = IExternalSettings>(
-    settings: unknown
+    settings?: unknown,
+    hostname?: string
   ): T {
     // Default settings reading from globalThis
     settings ??= Reflect.get(globalThis, "settings");
 
-    if (
-      settings != null &&
-      typeof settings === "object" &&
-      "appId" in settings &&
-      "endpoint" in settings
-    ) {
-      return settings as T;
+    if (settings) {
+      if (typeof settings === "string") {
+        settings = JSON.parse(settings);
+      }
+
+      if (
+        settings != null &&
+        typeof settings === "object" &&
+        "appId" in settings &&
+        "endpoint" in settings
+      ) {
+        const s = settings as T;
+        if (hostname) s.hostname = hostname;
+        return s;
+      }
     }
 
     throw new Error("No external settings found");
@@ -91,7 +106,7 @@ export namespace ExternalSettings {
    * @param hostname Hostname
    * @returns Result
    */
-  export function formatHost(setting: string, hostname?: string | null): string;
+  export function formatHost(setting: string, hostname: string): string;
 
   export function formatHost(
     setting: Record<string, ExternalEndpoint>,
@@ -99,17 +114,9 @@ export namespace ExternalSettings {
   ): Record<string, ExternalEndpoint>;
 
   export function formatHost(
-    setting: undefined,
+    setting: string | Record<string, ExternalEndpoint>,
     hostname?: string | null
-  ): undefined;
-
-  export function formatHost(
-    setting?: string | Record<string, ExternalEndpoint>,
-    hostname?: string | null
-  ): string | Record<string, ExternalEndpoint> | undefined {
-    // No setting
-    if (setting == null) return undefined;
-
+  ): string | Record<string, ExternalEndpoint> {
     // Default hostname
     hostname ??= globalThis.location.hostname;