@etsoo/appscript 1.4.73 → 1.4.75

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

@@ -1,6 +1,6 @@
 import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent, NotificationReturn } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
-import { DataTypes, DateUtils, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
+import { DataTypes, DateUtils, ErrorData, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { EntityStatus } from '../business/EntityStatus';
 import { InitCallDto } from '../erp/dto/InitCallDto';
@@ -189,6 +189,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param api Api
      */
     setApiLoading(api: IApi): void;
+    /**
+     * Setup frontend logging
+     * @param action Custom action
+     */
+    setupLogging(action?: (data: ErrorData) => void | Promise<void>): void;
     /**
      * Api init call
      * @param data Data

package/lib/cjs/app/CoreApp.js

@@ -306,6 +306,7 @@ class CoreApp {
                 ? api.transformResponse(error.response).status
                 : undefined;
             if (status === 401) {
+                // Unauthorized
                 if (handlerFor401 === false)
                     return;
                 if (typeof handlerFor401 === 'function') {
@@ -316,6 +317,17 @@ class CoreApp {
                 }
                 return;
             }
+            else if (error.response == null &&
+                (error.message === 'Network Error' ||
+                    error.message === 'Failed to fetch')) {
+                // Network error
+                this.notifier.alert(this.get('networkError'));
+                return;
+            }
+            else {
+                // Log
+                console.error('API error', error);
+            }
             // Report the error
             this.notifier.alert(this.formatError(error));
         };
@@ -339,6 +351,23 @@ class CoreApp {
             this.lastCalled = true;
         };
     }
+    /**
+     * Setup frontend logging
+     * @param action Custom action
+     */
+    setupLogging(action) {
+        action !== null && action !== void 0 ? action : (action = (data) => {
+            this.api.post('Auth/LogFrontendError', data, {
+                onError: (error) => {
+                    // Use 'debug' to avoid infinite loop
+                    console.debug('Log front-end error', data, error);
+                    // Prevent global error handler
+                    return false;
+                }
+            });
+        });
+        shared_1.DomUtils.setupLogging(action);
+    }
     /**
      * Api init call
      * @param data Data
@@ -650,7 +679,7 @@ class CoreApp {
             const iv = enc.Hex.parse(messageEncrypted.substring(34, 66));
             const encrypted = messageEncrypted.substring(66);
             const key = PBKDF2(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, salt, {
-                keySize: 8,
+                keySize: 8, // 256 / 32
                 hasher: algo.SHA256,
                 iterations: 1000 * iterations
             });
@@ -661,7 +690,7 @@ class CoreApp {
             }).toString(enc.Utf8);
         }
         catch (e) {
-            console.log('decrypt', e);
+            console.error(`CoreApp.decrypt ${messageEncrypted} error`, e);
             return undefined;
         }
     }
@@ -696,7 +725,7 @@ class CoreApp {
             return this.decrypt(message, passphrase);
         }
         catch (e) {
-            console.log('decryptEnhanced', e);
+            console.error(`CoreApp.decryptEnhanced ${messageEncrypted} error`, e);
             return undefined;
         }
     }
@@ -776,7 +805,7 @@ class CoreApp {
         const bits = 16; // 128 / 8
         const salt = lib.WordArray.random(bits);
         const key = PBKDF2(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, salt, {
-            keySize: 8,
+            keySize: 8, // 256 / 32
             hasher: algo.SHA256,
             iterations: 1000 * iterations
         });
@@ -864,7 +893,7 @@ class CoreApp {
      * @returns Error message
      */
     formatError(error) {
-        return error.toString();
+        return `${error.message} (${error.name})`;
     }
     /**
      * Refresh token failed
@@ -1311,7 +1340,7 @@ class CoreApp {
     async signout() {
         await this.api.put('User/Signout', { deviceId: this.deviceId }, {
             onError: (error) => {
-                console.log(error);
+                console.error('CoreApp.signout error', error);
                 // Prevent further processing
                 return false;
             }

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

@@ -1,6 +1,6 @@
 import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent, NotificationReturn } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
-import { DataTypes, DateUtils, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
+import { DataTypes, DateUtils, ErrorData, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
@@ -459,6 +459,11 @@ export interface IApp {
      * @param api Api
      */
     setApiLoading(api: IApi): void;
+    /**
+     * Setup frontend logging
+     * @param action Custom action
+     */
+    setupLogging(action?: (data: ErrorData) => void | Promise<void>): void;
     /**
      * Signout, with userLogout and toLoginPage
      */

package/lib/cjs/business/ShoppingCart.js

@@ -31,7 +31,7 @@ class ShoppingCart {
             storage.setPersistedData(identifier, null);
         }
         catch (error) {
-            console.log('ShoppingCart clear', error);
+            console.warn(`ShoppingCart clear ${identifier} error`, error);
         }
     }
     /**
@@ -47,7 +47,7 @@ class ShoppingCart {
             return ((_a = storage.getPersistedObject(id)) !== null && _a !== void 0 ? _a : storage.getObject(id));
         }
         catch (error) {
-            console.log('ShoppingCart constructor', error);
+            console.warn(`ShoppingCart getCartData ${id} error`, error);
         }
     }
     /**
@@ -345,7 +345,7 @@ class ShoppingCart {
             }
         }
         catch (error) {
-            console.log('ShoppingCart save', error);
+            console.warn(`ShoppingCart save ${this.identifier} error`, error);
         }
         return data;
     }

package/lib/cjs/i18n/en.json

@@ -110,6 +110,7 @@
     "moreTag": "{0} more",
     "name": "Name",
     "nameB": "Name",
+    "networkError": "The local network is faulty and cannot connect to the remote server",
     "newPassword": "New password",
     "newPasswordRequired": "Please enter your new password",
     "newPasswordTip": "New password should be different",

package/lib/cjs/i18n/zh-Hans.json

@@ -110,6 +110,7 @@
     "moreTag": "({0}+)",
     "name": "姓名",
     "nameB": "名称",
+    "networkError": "本地网络故障，无法链接到远程服务器",
     "newPassword": "新密码",
     "newPasswordRequired": "请输入新密码",
     "newPasswordTip": "请设置一个和现在的密码不一样的新密码",

package/lib/cjs/i18n/zh-Hant.json

@@ -110,6 +110,7 @@
     "moreTag": "({0}+)",
     "name": "姓名",
     "nameB": "名稱",
+    "networkError": "本地網路故障，無法連結到遠端伺服器",
     "newPassword": "新密碼",
     "newPasswordRequired": "請輸入新密碼",
     "newPasswordTip": "請設置一個和現在的密碼不一樣的新密碼",

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

@@ -1,6 +1,6 @@
 import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent, NotificationReturn } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
-import { DataTypes, DateUtils, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
+import { DataTypes, DateUtils, ErrorData, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { EntityStatus } from '../business/EntityStatus';
 import { InitCallDto } from '../erp/dto/InitCallDto';
@@ -189,6 +189,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param api Api
      */
     setApiLoading(api: IApi): void;
+    /**
+     * Setup frontend logging
+     * @param action Custom action
+     */
+    setupLogging(action?: (data: ErrorData) => void | Promise<void>): void;
     /**
      * Api init call
      * @param data Data

package/lib/mjs/app/CoreApp.js

@@ -280,6 +280,7 @@ export class CoreApp {
                 ? api.transformResponse(error.response).status
                 : undefined;
             if (status === 401) {
+                // Unauthorized
                 if (handlerFor401 === false)
                     return;
                 if (typeof handlerFor401 === 'function') {
@@ -290,6 +291,17 @@ export class CoreApp {
                 }
                 return;
             }
+            else if (error.response == null &&
+                (error.message === 'Network Error' ||
+                    error.message === 'Failed to fetch')) {
+                // Network error
+                this.notifier.alert(this.get('networkError'));
+                return;
+            }
+            else {
+                // Log
+                console.error('API error', error);
+            }
             // Report the error
             this.notifier.alert(this.formatError(error));
         };
@@ -313,6 +325,23 @@ export class CoreApp {
             this.lastCalled = true;
         };
     }
+    /**
+     * Setup frontend logging
+     * @param action Custom action
+     */
+    setupLogging(action) {
+        action !== null && action !== void 0 ? action : (action = (data) => {
+            this.api.post('Auth/LogFrontendError', data, {
+                onError: (error) => {
+                    // Use 'debug' to avoid infinite loop
+                    console.debug('Log front-end error', data, error);
+                    // Prevent global error handler
+                    return false;
+                }
+            });
+        });
+        DomUtils.setupLogging(action);
+    }
     /**
      * Api init call
      * @param data Data
@@ -624,7 +653,7 @@ export class CoreApp {
             const iv = enc.Hex.parse(messageEncrypted.substring(34, 66));
             const encrypted = messageEncrypted.substring(66);
             const key = PBKDF2(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, salt, {
-                keySize: 8,
+                keySize: 8, // 256 / 32
                 hasher: algo.SHA256,
                 iterations: 1000 * iterations
             });
@@ -635,7 +664,7 @@ export class CoreApp {
             }).toString(enc.Utf8);
         }
         catch (e) {
-            console.log('decrypt', e);
+            console.error(`CoreApp.decrypt ${messageEncrypted} error`, e);
             return undefined;
         }
     }
@@ -670,7 +699,7 @@ export class CoreApp {
             return this.decrypt(message, passphrase);
         }
         catch (e) {
-            console.log('decryptEnhanced', e);
+            console.error(`CoreApp.decryptEnhanced ${messageEncrypted} error`, e);
             return undefined;
         }
     }
@@ -750,7 +779,7 @@ export class CoreApp {
         const bits = 16; // 128 / 8
         const salt = lib.WordArray.random(bits);
         const key = PBKDF2(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, salt, {
-            keySize: 8,
+            keySize: 8, // 256 / 32
             hasher: algo.SHA256,
             iterations: 1000 * iterations
         });
@@ -838,7 +867,7 @@ export class CoreApp {
      * @returns Error message
      */
     formatError(error) {
-        return error.toString();
+        return `${error.message} (${error.name})`;
     }
     /**
      * Refresh token failed
@@ -1285,7 +1314,7 @@ export class CoreApp {
     async signout() {
         await this.api.put('User/Signout', { deviceId: this.deviceId }, {
             onError: (error) => {
-                console.log(error);
+                console.error('CoreApp.signout error', error);
                 // Prevent further processing
                 return false;
             }

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

@@ -1,6 +1,6 @@
 import { INotifier, NotificationAlign, NotificationCallProps, NotificationContent, NotificationReturn } from '@etsoo/notificationbase';
 import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
-import { DataTypes, DateUtils, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
+import { DataTypes, DateUtils, ErrorData, IActionResult, IStorage, ListType, ListType1 } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
@@ -459,6 +459,11 @@ export interface IApp {
      * @param api Api
      */
     setApiLoading(api: IApi): void;
+    /**
+     * Setup frontend logging
+     * @param action Custom action
+     */
+    setupLogging(action?: (data: ErrorData) => void | Promise<void>): void;
     /**
      * Signout, with userLogout and toLoginPage
      */

package/lib/mjs/business/ShoppingCart.js

@@ -28,7 +28,7 @@ export class ShoppingCart {
             storage.setPersistedData(identifier, null);
         }
         catch (error) {
-            console.log('ShoppingCart clear', error);
+            console.warn(`ShoppingCart clear ${identifier} error`, error);
         }
     }
     /**
@@ -44,7 +44,7 @@ export class ShoppingCart {
             return ((_a = storage.getPersistedObject(id)) !== null && _a !== void 0 ? _a : storage.getObject(id));
         }
         catch (error) {
-            console.log('ShoppingCart constructor', error);
+            console.warn(`ShoppingCart getCartData ${id} error`, error);
         }
     }
     /**
@@ -342,7 +342,7 @@ export class ShoppingCart {
             }
         }
         catch (error) {
-            console.log('ShoppingCart save', error);
+            console.warn(`ShoppingCart save ${this.identifier} error`, error);
         }
         return data;
     }

package/lib/mjs/i18n/en.json

@@ -110,6 +110,7 @@
     "moreTag": "{0} more",
     "name": "Name",
     "nameB": "Name",
+    "networkError": "The local network is faulty and cannot connect to the remote server",
     "newPassword": "New password",
     "newPasswordRequired": "Please enter your new password",
     "newPasswordTip": "New password should be different",

package/lib/mjs/i18n/zh-Hans.json

@@ -110,6 +110,7 @@
     "moreTag": "({0}+)",
     "name": "姓名",
     "nameB": "名称",
+    "networkError": "本地网络故障，无法链接到远程服务器",
     "newPassword": "新密码",
     "newPasswordRequired": "请输入新密码",
     "newPasswordTip": "请设置一个和现在的密码不一样的新密码",

package/lib/mjs/i18n/zh-Hant.json

@@ -110,6 +110,7 @@
     "moreTag": "({0}+)",
     "name": "姓名",
     "nameB": "名稱",
+    "networkError": "本地網路故障，無法連結到遠端伺服器",
     "newPassword": "新密碼",
     "newPasswordRequired": "請輸入新密碼",
     "newPasswordTip": "請設置一個和現在的密碼不一樣的新密碼",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.4.73",
+    "version": "1.4.75",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,22 +52,22 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.1.32",
-        "@etsoo/restclient": "^1.0.95",
-        "@etsoo/shared": "^1.2.22",
+        "@etsoo/notificationbase": "^1.1.35",
+        "@etsoo/restclient": "^1.0.98",
+        "@etsoo/shared": "^1.2.26",
         "crypto-js": "^4.2.0"
     },
     "devDependencies": {
-        "@babel/cli": "^7.23.0",
-        "@babel/core": "^7.23.3",
-        "@babel/plugin-transform-runtime": "^7.23.3",
-        "@babel/preset-env": "^7.23.3",
-        "@babel/runtime-corejs3": "^7.23.2",
-        "@types/crypto-js": "^4.2.1",
-        "@types/jest": "^29.5.8",
+        "@babel/cli": "^7.23.9",
+        "@babel/core": "^7.23.9",
+        "@babel/plugin-transform-runtime": "^7.23.9",
+        "@babel/preset-env": "^7.23.9",
+        "@babel/runtime-corejs3": "^7.23.9",
+        "@types/crypto-js": "^4.2.2",
+        "@types/jest": "^29.5.12",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
-        "ts-jest": "^29.1.1",
-        "typescript": "^5.2.2"
+        "ts-jest": "^29.1.2",
+        "typescript": "^5.3.3"
     }
 }

package/src/app/CoreApp.ts

@@ -12,6 +12,7 @@ import {
     DataTypes,
     DateUtils,
     DomUtils,
+    ErrorData,
     IActionResult,
     IStorage,
     ListType,
@@ -469,6 +470,7 @@ export abstract class CoreApp<
                 : undefined;
 
             if (status === 401) {
+                // Unauthorized
                 if (handlerFor401 === false) return;
                 if (typeof handlerFor401 === 'function') {
                     handlerFor401();
@@ -476,6 +478,17 @@ export abstract class CoreApp<
                     this.tryLogin();
                 }
                 return;
+            } else if (
+                error.response == null &&
+                (error.message === 'Network Error' ||
+                    error.message === 'Failed to fetch')
+            ) {
+                // Network error
+                this.notifier.alert(this.get('networkError')!);
+                return;
+            } else {
+                // Log
+                console.error('API error', error);
             }
 
             // Report the error
@@ -504,6 +517,25 @@ export abstract class CoreApp<
         };
     }
 
+    /**
+     * Setup frontend logging
+     * @param action Custom action
+     */
+    public setupLogging(action?: (data: ErrorData) => void | Promise<void>) {
+        action ??= (data) => {
+            this.api.post('Auth/LogFrontendError', data, {
+                onError: (error) => {
+                    // Use 'debug' to avoid infinite loop
+                    console.debug('Log front-end error', data, error);
+
+                    // Prevent global error handler
+                    return false;
+                }
+            });
+        };
+        DomUtils.setupLogging(action);
+    }
+
     /**
      * Api init call
      * @param data Data
@@ -905,7 +937,7 @@ export abstract class CoreApp<
                 mode: mode.CBC
             }).toString(enc.Utf8);
         } catch (e) {
-            console.log('decrypt', e);
+            console.error(`CoreApp.decrypt ${messageEncrypted} error`, e);
             return undefined;
         }
     }
@@ -952,7 +984,10 @@ export abstract class CoreApp<
 
             return this.decrypt(message, passphrase);
         } catch (e) {
-            console.log('decryptEnhanced', e);
+            console.error(
+                `CoreApp.decryptEnhanced ${messageEncrypted} error`,
+                e
+            );
             return undefined;
         }
     }
@@ -1175,7 +1210,7 @@ export abstract class CoreApp<
      * @returns Error message
      */
     formatError(error: ApiDataError) {
-        return error.toString();
+        return `${error.message} (${error.name})`;
     }
 
     /**
@@ -1686,7 +1721,7 @@ export abstract class CoreApp<
             { deviceId: this.deviceId },
             {
                 onError: (error) => {
-                    console.log(error);
+                    console.error('CoreApp.signout error', error);
                     // Prevent further processing
                     return false;
                 }

package/src/app/IApp.ts

@@ -9,6 +9,7 @@ import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import {
     DataTypes,
     DateUtils,
+    ErrorData,
     IActionResult,
     IStorage,
     ListType,
@@ -623,6 +624,12 @@ export interface IApp {
      */
     setApiLoading(api: IApi): void;
 
+    /**
+     * Setup frontend logging
+     * @param action Custom action
+     */
+    setupLogging(action?: (data: ErrorData) => void | Promise<void>): void;
+
     /**
      * Signout, with userLogout and toLoginPage
      */

package/src/business/ShoppingCart.ts

@@ -166,7 +166,7 @@ export class ShoppingCart<T extends ShoppingCartItem> {
             storage.setData(identifier, null);
             storage.setPersistedData(identifier, null);
         } catch (error) {
-            console.log('ShoppingCart clear', error);
+            console.warn(`ShoppingCart clear ${identifier} error`, error);
         }
     }
 
@@ -187,7 +187,7 @@ export class ShoppingCart<T extends ShoppingCartItem> {
                 storage.getObject<ShoppingCartData<D>>(id)
             );
         } catch (error) {
-            console.log('ShoppingCart constructor', error);
+            console.warn(`ShoppingCart getCartData ${id} error`, error);
         }
     }
 
@@ -582,7 +582,7 @@ export class ShoppingCart<T extends ShoppingCartItem> {
                 this.storage.setData(this.identifier, data);
             }
         } catch (error) {
-            console.log('ShoppingCart save', error);
+            console.warn(`ShoppingCart save ${this.identifier} error`, error);
         }
 
         return data;

package/src/i18n/en.json

@@ -110,6 +110,7 @@
     "moreTag": "{0} more",
     "name": "Name",
     "nameB": "Name",
+    "networkError": "The local network is faulty and cannot connect to the remote server",
     "newPassword": "New password",
     "newPasswordRequired": "Please enter your new password",
     "newPasswordTip": "New password should be different",

package/src/i18n/zh-Hans.json

@@ -110,6 +110,7 @@
     "moreTag": "({0}+)",
     "name": "姓名",
     "nameB": "名称",
+    "networkError": "本地网络故障，无法链接到远程服务器",
     "newPassword": "新密码",
     "newPasswordRequired": "请输入新密码",
     "newPasswordTip": "请设置一个和现在的密码不一样的新密码",

package/src/i18n/zh-Hant.json

@@ -110,6 +110,7 @@
     "moreTag": "({0}+)",
     "name": "姓名",
     "nameB": "名稱",
+    "networkError": "本地網路故障，無法連結到遠端伺服器",
     "newPassword": "新密碼",
     "newPasswordRequired": "請輸入新密碼",
     "newPasswordTip": "請設置一個和現在的密碼不一樣的新密碼",