@etsoo/appscript 1.5.20 → 1.5.22

package/__tests__/app/CoreApp.ts

@@ -88,6 +88,13 @@ class CoreAppTest extends CoreApp<
                  */
                 endpoint: 'http://{hostname}/com.etsoo.SmartERPApi/api/',
 
+                endpoints: {
+                    core: {
+                        endpoint: 'http://{hostname}:9001/api/',
+                        webUrl: ''
+                    }
+                },
+
                 /**
                  * App root url
                  */
@@ -155,6 +162,16 @@ const appClass = EnhanceApp(CoreAppTest);
 const app = new appClass();
 app.changeCulture(app.settings.cultures[0]);
 
+test('Test for domain replacement', () => {
+    expect(app.settings.endpoint).toBe(
+        'http://localhost/com.etsoo.SmartERPApi/api/'
+    );
+
+    expect(app.settings.endpoints?.core.endpoint).toBe(
+        'http://localhost:9001/api/'
+    );
+});
+
 test('Test for properties', () => {
     expect(app.settings.currentRegion.label).toBe('中国大陆');
 });

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

@@ -9,6 +9,10 @@ import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { FormatResultCustomCallback, IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps, RefreshTokenResult } from './IApp';
 import { UserRole } from './UserRole';
+import { ExternalEndpoint } from './ExternalSettings';
+import { ApiRefreshTokenDto } from '../erp/dto/ApiRefreshTokenDto';
+type ApiRefreshTokenFunction = (api: IApi, token: string) => Promise<[string, number] | undefined>;
+type ApiTaskData = [IApi, number, number, ApiRefreshTokenFunction, string?];
 /**
  * Core application interface
  */
@@ -119,15 +123,16 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     get isReady(): boolean;
     private set isReady(value);
+    /**
+     * Current cached URL
+     */
+    get cachedUrl(): string | undefined | null;
+    set cachedUrl(value: string | undefined | null);
     private _isTryingLogin;
     /**
      * Last called with token refresh
      */
     protected lastCalled: boolean;
-    /**
-     * Token refresh count down seed
-     */
-    protected refreshCountdownSeed: number;
     /**
      * Init call Api URL
      */
@@ -137,6 +142,8 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     protected passphrase: string;
     private cachedRefreshToken?;
+    private apis;
+    private tasks;
     /**
      * Get persisted fields
      */
@@ -150,7 +157,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param name Application name
      * @param debug Debug mode
      */
-    protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, storage: IStorage, name: string, debug?: boolean);
+    protected constructor(settings: S, api: IApi | undefined | null, notifier: INotifier<N, C>, storage: IStorage, name: string, debug?: boolean);
     private getDeviceId;
     private resetKeys;
     /**
@@ -178,11 +185,32 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Persist settings to source when application exit
      */
     persist(): void;
+    /**
+     * Add scheduled task
+     * @param task Task, return false to stop
+     * @param seconds Interval in seconds
+     */
+    addTask(task: () => PromiseLike<void | false>, seconds: number): void;
+    /**
+     * Create API client, override to implement custom client creation by name
+     * @param name Client name
+     * @param item External endpoint item
+     * @returns Result
+     */
+    createApi(name: string, item: ExternalEndpoint, refresh?: (api: IApi, token: string) => Promise<[string, number] | undefined>): IApi<any>;
+    /**
+     * Update API token and expires
+     * @param name Api name
+     * @param token Refresh token
+     * @param seconds Access token expires in seconds
+     */
+    updateApi(name: string, token: string | undefined, seconds: number): void;
+    updateApi(data: ApiTaskData, token: string | undefined, seconds: number): void;
     /**
      * Setup Api
      * @param api Api
      */
-    protected setApi(api: IApi): void;
+    protected setApi(api: IApi, refresh?: ApiRefreshTokenFunction): void;
     /**
      * Setup Api error handler
      * @param api Api
@@ -535,12 +563,6 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Callback where exit a page
      */
     pageExit(): void;
-    /**
-     * Refresh countdown
-     * @param seconds Seconds
-     */
-    protected refreshCountdown(seconds: number): void;
-    protected refreshCountdownClear(): void;
     /**
      * Fresh countdown UI
      * @param callback Callback
@@ -555,6 +577,35 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Setup callback
      */
     setup(): void;
+    /**
+     * Exchange token data
+     * @param api API
+     * @param token Core system's refresh token to exchange
+     * @returns Result
+     */
+    exchangeToken(api: IApi, token: string): Promise<void>;
+    /**
+     * Exchange token update, override to get the new token
+     * @param api API
+     * @param data API refresh token data
+     */
+    protected exchangeTokenUpdate(api: IApi, data: ApiRefreshTokenDto): void;
+    /**
+     * Exchange intergration tokens for all APIs
+     * @param token Core system's refresh token to exchange
+     */
+    exchangeTokenAll(token: string): void;
+    /**
+     * API refresh token
+     * @param api Current API
+     * @param token Refresh token
+     * @returns Result
+     */
+    protected apiRefreshToken(api: IApi, token: string): Promise<[string, number] | undefined>;
+    /**
+     * Setup tasks
+     */
+    protected setupTasks(): void;
     /**
      * Signout, with userLogout and toLoginPage
      * @param apiUrl Signout API URL
@@ -597,3 +648,4 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     warning(message: NotificationContent<N>, align?: NotificationAlign): void;
 }
+export {};

package/lib/cjs/app/CoreApp.js

@@ -83,6 +83,15 @@ class CoreApp {
     set isReady(value) {
         this._isReady = value;
     }
+    /**
+     * Current cached URL
+     */
+    get cachedUrl() {
+        return this.storage.getData(this.fields.cachedUrl);
+    }
+    set cachedUrl(value) {
+        this.storage.setData(this.fields.cachedUrl, value);
+    }
     /**
      * Get persisted fields
      */
@@ -115,10 +124,6 @@ class CoreApp {
          * Last called with token refresh
          */
         this.lastCalled = false;
-        /**
-         * Token refresh count down seed
-         */
-        this.refreshCountdownSeed = 0;
         /**
          * Init call Api URL
          */
@@ -127,6 +132,8 @@ class CoreApp {
          * Passphrase for encryption
          */
         this.passphrase = '';
+        this.apis = {};
+        this.tasks = [];
         if (settings?.regions?.length === 0) {
             throw new Error('No regions defined');
         }
@@ -136,7 +143,30 @@ class CoreApp {
             throw new Error('No default region defined');
         }
         this.defaultRegion = region;
-        this.api = api;
+        const refresh = async (api, token) => {
+            if (this.lastCalled) {
+                // Call refreshToken to update access token
+                await this.refreshToken();
+            }
+            else {
+                // Popup countdown for user action
+                this.freshCountdownUI();
+            }
+            return undefined;
+        };
+        if (api) {
+            // Base URL of the API
+            api.baseUrl = this.settings.endpoint;
+            api.name = 'system';
+            this.setApi(api, refresh);
+            this.api = api;
+        }
+        else {
+            this.api = this.createApi('system', {
+                endpoint: settings.endpoint,
+                webUrl: settings.webUrl
+            }, refresh);
+        }
         this.notifier = notifier;
         this.storage = storage;
         this.name = name;
@@ -145,7 +175,6 @@ class CoreApp {
         this.fields = IApp_1.appFields.reduce((a, v) => ({ ...a, [v]: 'smarterp-' + v + '-' + name }), {});
         // Device id
         this._deviceId = storage.getData(this.fields.deviceId, '');
-        this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         // Load resources
         Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(([cj, _resources]) => {
@@ -263,17 +292,56 @@ class CoreApp {
             return;
         this.storage.copyTo(this.persistedFields);
     }
+    /**
+     * Add scheduled task
+     * @param task Task, return false to stop
+     * @param seconds Interval in seconds
+     */
+    addTask(task, seconds) {
+        this.tasks.push([task, seconds, seconds]);
+    }
+    /**
+     * Create API client, override to implement custom client creation by name
+     * @param name Client name
+     * @param item External endpoint item
+     * @returns Result
+     */
+    createApi(name, item, refresh) {
+        if (this.apis[name] != null) {
+            throw new Error(`API ${name} already exists`);
+        }
+        const api = (0, restclient_1.createClient)();
+        api.name = name;
+        api.baseUrl = item.endpoint;
+        this.setApi(api, refresh);
+        return api;
+    }
+    updateApi(nameOrData, token, seconds) {
+        const api = typeof nameOrData === 'string' ? this.apis[nameOrData] : nameOrData;
+        if (api == null)
+            return;
+        // Consider the API call delay
+        if (seconds > 0) {
+            seconds -= 30;
+            if (seconds < 10)
+                seconds = 10;
+        }
+        api[1] = seconds;
+        api[2] = seconds;
+        api[4] = token;
+    }
     /**
      * Setup Api
      * @param api Api
      */
-    setApi(api) {
-        // Base URL of the API
-        api.baseUrl = this.settings.endpoint;
+    setApi(api, refresh) {
         // onRequest, show loading or not, rewrite the property to override default action
         this.setApiLoading(api);
         // Global API error handler
         this.setApiErrorHandler(api);
+        // Setup API countdown
+        refresh ?? (refresh = this.apiRefreshToken.bind(this));
+        this.apis[api.name] = [api, -1, -1, refresh];
     }
     /**
      * Setup Api error handler
@@ -284,7 +352,7 @@ class CoreApp {
         api.onError = (error) => {
             // Debug
             if (this.debug) {
-                console.debug('CoreApp.setApiErrorHandler', api, error, handlerFor401);
+                console.debug(`CoreApp.${this.name}.setApiErrorHandler`, api, error, handlerFor401);
             }
             // Error code
             const status = error.response
@@ -306,12 +374,12 @@ class CoreApp {
                 (error.message === 'Network Error' ||
                     error.message === 'Failed to fetch')) {
                 // Network error
-                this.notifier.alert(this.get('networkError'));
+                this.notifier.alert(this.get('networkError') + ` [${this.name}]`);
                 return;
             }
             else {
                 // Log
-                console.error('API error', error);
+                console.error(`${this.name} API error`, error);
             }
             // Report the error
             this.notifier.alert(this.formatError(error));
@@ -326,7 +394,7 @@ class CoreApp {
         api.onRequest = (data) => {
             // Debug
             if (this.debug) {
-                console.debug('CoreApp.setApiLoading.onRequest', api, data, this.notifier.loadingCount);
+                console.debug(`CoreApp.${this.name}.setApiLoading.onRequest`, api, data, this.notifier.loadingCount);
             }
             if (data.showLoading == null || data.showLoading) {
                 this.notifier.showLoading();
@@ -336,13 +404,13 @@ class CoreApp {
         api.onComplete = (data) => {
             // Debug
             if (this.debug) {
-                console.debug('CoreApp.setApiLoading.onComplete', api, data, this.notifier.loadingCount, this.lastCalled);
+                console.debug(`CoreApp.${this.name}.setApiLoading.onComplete`, api, data, this.notifier.loadingCount, this.lastCalled);
             }
             if (data.showLoading == null || data.showLoading) {
                 this.notifier.hideLoading();
                 // Debug
                 if (this.debug) {
-                    console.debug('CoreApp.setApiLoading.onComplete.showLoading', api, this.notifier.loadingCount);
+                    console.debug(`CoreApp.${this.name}.setApiLoading.onComplete.showLoading`, api, this.notifier.loadingCount);
                 }
             }
             this.lastCalled = true;
@@ -553,11 +621,15 @@ class CoreApp {
         // Reset tryLogin state
         this._isTryingLogin = false;
         // Token countdown
-        if (this.authorized)
-            this.refreshCountdown(this.userData.seconds);
+        if (this.authorized) {
+            this.lastCalled = false;
+            if (refreshToken) {
+                this.updateApi(this.api.name, refreshToken, this.userData.seconds);
+            }
+        }
         else {
             this.cachedRefreshToken = undefined;
-            this.refreshCountdownClear();
+            this.updateApi(this.api.name, undefined, -1);
         }
         // Host notice
         BridgeUtils_1.BridgeUtils.host?.userAuthorization(this.authorized);
@@ -1289,40 +1361,6 @@ class CoreApp {
         this.lastWarning?.dismiss();
         this.notifier.hideLoading(true);
     }
-    /**
-     * Refresh countdown
-     * @param seconds Seconds
-     */
-    refreshCountdown(seconds) {
-        // Make sure is big than 60 seconds
-        // Take action 60 seconds before expiry
-        seconds -= 60;
-        if (seconds <= 0)
-            return;
-        // Clear the current timeout seed
-        this.refreshCountdownClear();
-        // Reset last call flag
-        // Any success call will update it to true
-        // So first time after login will be always silent
-        this.lastCalled = false;
-        this.refreshCountdownSeed = window.setTimeout(() => {
-            if (this.lastCalled) {
-                // Call refreshToken to update access token
-                this.refreshToken();
-            }
-            else {
-                // Popup countdown for user action
-                this.freshCountdownUI();
-            }
-        }, 1000 * seconds);
-    }
-    refreshCountdownClear() {
-        // Clear the current timeout seed
-        if (this.refreshCountdownSeed > 0) {
-            window.clearTimeout(this.refreshCountdownSeed);
-            this.refreshCountdownSeed = 0;
-        }
-    }
     /**
      * Refresh token
      * @param props Props
@@ -1336,12 +1374,142 @@ class CoreApp {
      * Setup callback
      */
     setup() {
+        // Done already
+        if (this.isReady)
+            return;
         // Ready
         this.isReady = true;
         // Restore
         this.restore();
         // Pending actions
         this.pendings.forEach((p) => p());
+        // Setup scheduled tasks
+        this.setupTasks();
+    }
+    /**
+     * Exchange token data
+     * @param api API
+     * @param token Core system's refresh token to exchange
+     * @returns Result
+     */
+    async exchangeToken(api, token) {
+        // Call the API quietly, no loading bar and no error popup
+        const data = await api.put('Auth/ExchangeToken', {
+            token
+        }, {
+            showLoading: false,
+            onError: (error) => {
+                console.error(`CoreApp.${api.name}.ExchangeToken error`, error);
+                // Prevent further processing
+                return false;
+            }
+        });
+        if (data) {
+            // Update the access token
+            api.authorize(data.tokenType, data.accessToken);
+            // Update the API
+            this.updateApi(api.name, data.refreshToken, data.expiresIn);
+            // Update notice
+            this.exchangeTokenUpdate(api, data);
+        }
+    }
+    /**
+     * Exchange token update, override to get the new token
+     * @param api API
+     * @param data API refresh token data
+     */
+    exchangeTokenUpdate(api, data) { }
+    /**
+     * Exchange intergration tokens for all APIs
+     * @param token Core system's refresh token to exchange
+     */
+    exchangeTokenAll(token) {
+        for (const name in this.apis) {
+            const api = this.apis[name];
+            this.exchangeToken(api[0], token);
+        }
+    }
+    /**
+     * API refresh token
+     * @param api Current API
+     * @param token Refresh token
+     * @returns Result
+     */
+    async apiRefreshToken(api, token) {
+        // Call the API quietly, no loading bar and no error popup
+        const data = await api.put('Auth/ApiRefreshToken', {
+            token
+        }, {
+            showLoading: false,
+            onError: (error) => {
+                console.error(`CoreApp.${api.name}.apiRefreshToken error`, error);
+                // Prevent further processing
+                return false;
+            }
+        });
+        if (data == null)
+            return undefined;
+        // Update the access token
+        api.authorize(data.tokenType, data.accessToken);
+        // Return the new refresh token and access token expiration seconds
+        return [data.refreshToken, data.expiresIn];
+    }
+    /**
+     * Setup tasks
+     */
+    setupTasks() {
+        shared_1.ExtendUtils.intervalFor(() => {
+            // Exit when not authorized
+            if (!this.authorized)
+                return;
+            // APIs
+            for (const name in this.apis) {
+                // Get the API
+                const api = this.apis[name];
+                // Skip the negative value or when refresh token is not set
+                if (!api[4] || api[2] < 0)
+                    continue;
+                // Minus one second
+                api[2] -= 1;
+                // Ready to trigger
+                if (api[2] === 0) {
+                    // Refresh token
+                    api[3](api[0], api[4]).then((data) => {
+                        if (data == null) {
+                            // Failed, try it again in 2 seconds
+                            api[2] = 2;
+                        }
+                        else {
+                            // Reset the API
+                            const [token, seconds] = data;
+                            this.updateApi(api, token, seconds);
+                        }
+                    });
+                }
+            }
+            for (let t = this.tasks.length - 1; t >= 0; t--) {
+                // Get the task
+                const task = this.tasks[t];
+                // Minus one second
+                task[2] -= 1;
+                // Remove the tasks with negative value with splice
+                if (task[2] < 0) {
+                    this.tasks.splice(t, 1);
+                }
+                else if (task[2] === 0) {
+                    // Ready to trigger
+                    // Reset the task
+                    task[2] = task[1];
+                    // Trigger the task
+                    task[0]().then((result) => {
+                        if (result === false) {
+                            // Asynchronous task, unsafe to splice the index, flag as pending
+                            task[2] = -1;
+                        }
+                    });
+                }
+            }
+        }, 1000);
     }
     /**
      * Signout, with userLogout and toLoginPage
@@ -1366,8 +1534,9 @@ class CoreApp {
      * @param removeUrl Remove current URL for reuse
      */
     toLoginPage(tryLogin, removeUrl) {
-        const url = `/?tryLogin=${tryLogin ?? false}` +
-            (removeUrl ? '' : '&url=' + encodeURIComponent(location.href));
+        // Save the current URL
+        this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
+        const url = `/?tryLogin=${tryLogin ?? false}`;
         this.navigate(url);
     }
     /**

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

@@ -1,31 +1,32 @@
 /**
- * External settings items
+ * External endpoint
  */
-export interface IExternalSettings {
+export type ExternalEndpoint = {
     /**
-     * Core system API endpoint
+     * API endpoint
      */
     readonly endpoint: string;
+    /**
+     * Web url
+     */
+    readonly webUrl: string;
+};
+/**
+ * External settings items
+ */
+export interface IExternalSettings extends ExternalEndpoint {
     /**
      * Message hub endpoint
      */
     readonly messageHub?: string;
     /**
-     * Core system app root url
+     * App root url
      */
     readonly homepage: string;
     /**
-     * Core system web url
-     */
-    readonly webUrl: string;
-    /**
-     * Service API endpoint
-     */
-    readonly serviceEndpoint?: string;
-    /**
-     * Service web Url
+     * Endpoints to other services
      */
-    readonly serviceUrl?: string;
+    readonly endpoints?: Record<'core' | 'accounting' | 'crm' | 'calandar' | 'task' | string, ExternalEndpoint>;
 }
 /**
  * External settings namespace

package/lib/cjs/app/ExternalSettings.js

@@ -35,6 +35,9 @@ var ExternalSettings;
             if (typeof value === 'string') {
                 settings[key] = value.replace('{hostname}', hostname);
             }
+            else if (typeof value === 'object') {
+                format(value, hostname);
+            }
         }
         return settings;
     }