lupine.web 1.1.3 → 1.1.5

package/src/lib/cookie.ts

@@ -1,44 +1,44 @@
-export const setCookie = (
-  name: string,
-  value: string,
-  expireDays = 365,
-  path?: string,
-  domain?: string,
-  secure?: string
-) => {
-  const expires = new Date(new Date().getTime() + expireDays * 24 * 3600000);
-  document.cookie =
-    name +
-    '=' +
-    escape(value) +
-    ';expires=' +
-    expires.toUTCString() +
-    ';path=' +
-    (path ? path : '/') +
-    (domain ? ';domain=' + domain : '') +
-    (secure ? ';secure' : '');
-};
-
-export const getCookie = (key: string) => {
-  const cookies = document.cookie.split(';');
-  for (let i = 0; i < cookies.length; i++) {
-    const c = cookies[i].trim();
-    if (c.substring(0, key.length + 1) == key + '=') {
-      return unescape(c.substring(key.length + 1));
-    }
-  }
-  return null;
-};
-
-export const clearCookie = (name: string, path?: string, domain?: string, secure?: string) => {
-  document.cookie =
-    name +
-    '=;expires=Fri, 02-Jan-1970 00:00:00 GMT' +
-    ';path=' +
-    (path ? path : '/') +
-    (domain ? ';domain=' + domain : '') +
-    (secure ? ';secure' : '');
-};
-
-// convinent but not good for tree-shaking
-export const cookie = { set: setCookie, get: getCookie, clear: clearCookie };
+export const setCookie = (
+  name: string,
+  value: string,
+  expireDays = 365,
+  path?: string,
+  domain?: string,
+  secure?: string
+) => {
+  const expires = new Date(new Date().getTime() + expireDays * 24 * 3600000);
+  document.cookie =
+    name +
+    '=' +
+    escape(value) +
+    ';expires=' +
+    expires.toUTCString() +
+    ';path=' +
+    (path ? path : '/') +
+    (domain ? ';domain=' + domain : '') +
+    (secure ? ';secure' : '');
+};
+
+export const getCookie = (key: string) => {
+  const cookies = document.cookie.split(';');
+  for (let i = 0; i < cookies.length; i++) {
+    const c = cookies[i].trim();
+    if (c.substring(0, key.length + 1) == key + '=') {
+      return unescape(c.substring(key.length + 1));
+    }
+  }
+  return null;
+};
+
+export const clearCookie = (name: string, path?: string, domain?: string, secure?: string) => {
+  document.cookie =
+    name +
+    '=;expires=Fri, 02-Jan-1970 00:00:00 GMT' +
+    ';path=' +
+    (path ? path : '/') +
+    (domain ? ';domain=' + domain : '') +
+    (secure ? ';secure' : '');
+};
+
+// convinent but not good for tree-shaking
+export const cookie = { set: setCookie, get: getCookie, clear: clearCookie };

package/src/lib/debug-watch.ts

@@ -1,32 +1,32 @@
-let flag = 0;
-export const debugWatch = (port: number) => {
-  console.log('Creating debug-watch socket');
-  const protocol = location.protocol === "https:" ? "wss:" : "ws:";
-  const socket = new WebSocket(`${protocol}//${location.host}/debug/client`);
-  window.addEventListener('beforeunload', () => {
-    socket.close();
-  });
-  socket.onopen = () => {
-    // console.log('Socket open.');
-    socket.send(JSON.stringify({ message: 'get-flag' }));
-  };
-  socket.onmessage = (message) => {
-    try {
-      const jsonData = JSON.parse(message.data);
-      console.log('Debug socket message:', jsonData);
-      if (jsonData && jsonData.flag) {
-        if (!flag) {
-          flag = jsonData.flag;
-        } else if (flag !== jsonData.flag) {
-          document.location.reload();
-        }
-      }
-    } catch {}
-  };
-  socket.onclose = () => {
-    console.log('Debug socket close.');
-    setTimeout(() => {
-      debugWatch(port);
-    }, 3000);
-  };
-};
+let flag = 0;
+export const debugWatch = (port: number) => {
+  console.log('Creating debug-watch socket');
+  const protocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
+  const socket = new WebSocket(`${protocol}//${location.host}/debug/client`);
+  window.addEventListener('beforeunload', () => {
+    socket.close();
+  });
+  socket.onopen = () => {
+    // console.log('Socket open.');
+    socket.send(JSON.stringify({ message: 'get-flag' }));
+  };
+  socket.onmessage = (message) => {
+    try {
+      const jsonData = JSON.parse(message.data);
+      console.log('Debug socket message:', jsonData);
+      if (jsonData && jsonData.flag) {
+        if (!flag) {
+          flag = jsonData.flag;
+        } else if (flag !== jsonData.flag) {
+          document.location.reload();
+        }
+      }
+    } catch {}
+  };
+  socket.onclose = () => {
+    console.log('Debug socket close.');
+    setTimeout(() => {
+      debugWatch(port);
+    }, 3000);
+  };
+};

package/src/lib/index.ts

@@ -1,7 +1,7 @@
-export * from './cookie';
-export * from './debug-watch';
-export * from './is-frontend';
-export * from './logger';
-export * from './unique-id';
-export * from './web-config';
-export * from './web-env';
+export * from './cookie';
+export * from './debug-watch';
+export * from './is-frontend';
+export * from './logger';
+export * from './unique-id';
+export * from './web-config';
+export * from './web-env';

package/src/lib/is-frontend.ts

@@ -1,3 +1,3 @@
-export const isFrontEnd = () => {
-  return typeof window === 'object' && typeof document === 'object';
-};
+export const isFrontEnd = () => {
+  return typeof window === 'object' && typeof document === 'object';
+};

package/src/lib/logger.ts

@@ -1,55 +1,55 @@
-// Colors for console
-export const ConsoleColors = {
-  Red: '#f44336',
-  Pink: '#e81e63',
-  Purple: '#9c27b0',
-  DeepPurple: '#673ab7',
-  Indigo: '#3f51b5',
-  Blue: '#2196f3',
-  LightBlue: '#03a9f4',
-  Cyan: '#00bcd4',
-  Teal: '#009688',
-  Green: '#4caf50',
-  LightGreen: '#8bc34a',
-  Lime: '#cddc39',
-  DarkYellow: '#bfa40e',
-  Amber: '#ffc107',
-  Orange: '#ff9800',
-  DeepOrange: '#ff5722',
-  Silver: '#c0c0c0',
-  Gray: '#808080',
-  Black: '#000000',
-};
-
-export class Logger {
-  private static enabled = true;
-  private namespace = '';
-  private color = '';
-  constructor(namespace: string, color?: string) {
-    this.namespace = namespace ? `[${namespace}] ` : '';
-    if (color) {
-      this.color = 'color:' + color;
-    }
-  }
-
-  static setEnabled(enabled: boolean) {
-    enabled && !Logger.enabled && console.log(`Logger is enabled.`);
-    Logger.enabled = enabled;
-  }
-
-  log(message: string, ...data: (string | object | number | undefined)[]) {
-    Logger.enabled && console.log(`%c${this.timestamp()} ${this.namespace}${message}`, this.color, ...data);
-  }
-
-  timestamp(date?: Date) {
-    return (date || new Date()).toJSON().substring(11, 23);
-  }
-
-  warn(message: string, ...data: (string | object | number | undefined)[]) {
-    console.warn(`%c${this.timestamp()} ${this.namespace}${message}`, this.color, ...data);
-  }
-
-  error(message: string, ...data: (string | object | number | undefined)[]) {
-    console.error(`%c${this.timestamp()} ${this.namespace}${message}`, this.color, ...data);
-  }
-}
+// Colors for console
+export const ConsoleColors = {
+  Red: '#f44336',
+  Pink: '#e81e63',
+  Purple: '#9c27b0',
+  DeepPurple: '#673ab7',
+  Indigo: '#3f51b5',
+  Blue: '#2196f3',
+  LightBlue: '#03a9f4',
+  Cyan: '#00bcd4',
+  Teal: '#009688',
+  Green: '#4caf50',
+  LightGreen: '#8bc34a',
+  Lime: '#cddc39',
+  DarkYellow: '#bfa40e',
+  Amber: '#ffc107',
+  Orange: '#ff9800',
+  DeepOrange: '#ff5722',
+  Silver: '#c0c0c0',
+  Gray: '#808080',
+  Black: '#000000',
+};
+
+export class Logger {
+  private static enabled = true;
+  private namespace = '';
+  private color = '';
+  constructor(namespace: string, color?: string) {
+    this.namespace = namespace ? `[${namespace}] ` : '';
+    if (color) {
+      this.color = 'color:' + color;
+    }
+  }
+
+  static setEnabled(enabled: boolean) {
+    enabled && !Logger.enabled && console.log(`Logger is enabled.`);
+    Logger.enabled = enabled;
+  }
+
+  log(message: string, ...data: (string | object | number | undefined)[]) {
+    Logger.enabled && console.log(`%c${this.timestamp()} ${this.namespace}${message}`, this.color, ...data);
+  }
+
+  timestamp(date?: Date) {
+    return (date || new Date()).toJSON().substring(11, 23);
+  }
+
+  warn(message: string, ...data: (string | object | number | undefined)[]) {
+    console.warn(`%c${this.timestamp()} ${this.namespace}${message}`, this.color, ...data);
+  }
+
+  error(message: string, ...data: (string | object | number | undefined)[]) {
+    console.error(`%c${this.timestamp()} ${this.namespace}${message}`, this.color, ...data);
+  }
+}

package/src/lib/unique-id.ts

@@ -1,40 +1,40 @@
-/**
- * Sample:
- *   const domUniqueId = uniqueIdGenerator('lj');
- *   const id1 = domUniqueId();
- *   const id2 = domUniqueId();
- * @param preKey
- * @returns A function to generate Unique Ids
- */
-// export function uniqueIdGenerator2(preKey: string) {
-//   let count = 0;
-//   let diff = '';
-//   return function (reset = false): string {
-//     if (reset) {
-//       count = 0;
-//       diff = '';
-//     }
-//     if (count > 9999999999999999) {
-//       count = 0;
-//       diff = Math.round(new Date().getTime() / 1000).toString(36) + '-';
-//     }
-//     count++;
-//     return `${preKey}${diff}${count.toString(36)}`;
-//   };
-// }
-
-export function uniqueIdGenerator(preKey: string) {
-  let count = 0;
-  const baseTime = Math.round(Date.now() / 1000);
-  let lastKey = '';
-  return function (): string {
-    const key = Math.round(Date.now() / 1000 - baseTime).toString(36);
-    if (key !== lastKey) {
-      count = 0;
-      lastKey = key;
-    } else {
-      count++;
-    }
-    return `${preKey}${lastKey}${count.toString(36)}`;
-  };
-}
+/**
+ * Sample:
+ *   const domUniqueId = uniqueIdGenerator('lj');
+ *   const id1 = domUniqueId();
+ *   const id2 = domUniqueId();
+ * @param preKey
+ * @returns A function to generate Unique Ids
+ */
+// export function uniqueIdGenerator2(preKey: string) {
+//   let count = 0;
+//   let diff = '';
+//   return function (reset = false): string {
+//     if (reset) {
+//       count = 0;
+//       diff = '';
+//     }
+//     if (count > 9999999999999999) {
+//       count = 0;
+//       diff = Math.round(new Date().getTime() / 1000).toString(36) + '-';
+//     }
+//     count++;
+//     return `${preKey}${diff}${count.toString(36)}`;
+//   };
+// }
+
+export function uniqueIdGenerator(preKey: string) {
+  let count = 0;
+  const baseTime = Math.round(Date.now() / 1000);
+  let lastKey = '';
+  return function (): string {
+    const key = Math.round(Date.now() / 1000 - baseTime).toString(36);
+    if (key !== lastKey) {
+      count = 0;
+      lastKey = key;
+    } else {
+      count++;
+    }
+    return `${preKey}${lastKey}${count.toString(36)}`;
+  };
+}

package/src/lib/web-config.ts

@@ -1,77 +1,79 @@
-import { getRenderPageProps } from 'lupine.web';
-
-// for mobile app, it needs the url to fetch the config for the first time
-export const bindWebConfigApi = (webConfigApi: string) => {
-  WebConfig.webConfigApi = webConfigApi;
-};
-
-export class WebConfig {
-  static webConfigApi = '';
-  static initialized = false;
-  static cfg: { [key: string]: string } = {};
-
-  // called from generatePage (SSR)
-  static initFromData(cfg: { [key: string]: string }) {
-    this.initialized = true;
-    this.cfg = cfg;
-  }
-
-  static async init(force?: boolean) {
-    if (this.initialized && !force) {
-      return;
-    }
-    this.initialized = true;
-
-    // For web, it's injected in the html by SSR, but for mobile, it's fetched from api
-    if (typeof document === 'object' && !force) {
-      const json = document.querySelector('#web-setting')?.textContent;
-      if (json) {
-        this.cfg = JSON.parse(json);
-        return;
-      }
-    }
-
-    if (!this.webConfigApi) {
-      console.error('WebConfig webConfigApi is not set');
-      return;
-    }
-    const url = getRenderPageProps().renderPageFunctions.baseUrl(this.webConfigApi);
-    const data = await getRenderPageProps().renderPageFunctions.fetchData(url);
-    if (data && data.json && data.json.status === 'ok') {
-      this.cfg = data.json.result;
-    } else {
-      console.error(data?.json?.message || 'Failed to get web config');
-    }
-  }
-
-  static async get(key: string, defaultValue: number): Promise<number>;
-  static async get(key: string, defaultValue: string): Promise<string>;
-  static async get(key: string, defaultValue: boolean): Promise<boolean>;
-  static async get(key: string, defaultValue: object): Promise<object>;
-  static async get(key: string, defaultValue?: any): Promise<any> {
-    await WebConfig.init();
-
-    if (typeof WebConfig.cfg[key] === 'undefined') {
-      return defaultValue;
-    }
-
-    if (typeof defaultValue === 'number') {
-      return Number.parseInt(WebConfig.cfg[key]!);
-    }
-    if (typeof defaultValue === 'boolean') {
-      return WebConfig.cfg[key]!.toLocaleLowerCase() === 'true' || WebConfig.cfg[key] === '1';
-    }
-    if (typeof defaultValue === 'object') {
-      if (typeof WebConfig.cfg[key] === 'object') {
-        return WebConfig.cfg[key];
-      }
-      try {
-        return JSON.parse(WebConfig.cfg[key]!);
-      } catch (error) {
-        console.error(`WebConfig JSON.parse error: `, error);
-      }
-      return defaultValue;
-    }
-    return WebConfig.cfg[key] || defaultValue;
-  }
-}
+import { getRenderPageProps } from 'lupine.web';
+
+// for mobile app, it needs the url to fetch the config for the first time
+export const bindWebConfigApi = (webConfigApi: string) => {
+  WebConfig.webConfigApi = webConfigApi;
+};
+
+export class WebConfig {
+  static webConfigApi = '';
+  static initialized = false;
+  static cfg: { [key: string]: string } = {};
+
+  // called from generatePage (SSR)
+  static initFromData(cfg: { [key: string]: string }) {
+    this.initialized = true;
+    this.cfg = cfg;
+  }
+
+  static async init(force?: boolean) {
+    if (this.initialized && !force) {
+      return;
+    }
+    this.initialized = true;
+
+    // For web, it's injected in the html by SSR, but for mobile, it's fetched from api
+    if (typeof document === 'object' && !force) {
+      const json = document.querySelector('#web-setting')?.textContent;
+      if (json) {
+        this.cfg = JSON.parse(json);
+        return;
+      }
+    }
+
+    if (!this.webConfigApi) {
+      console.error('WebConfig webConfigApi is not set');
+      return;
+    }
+    const url = getRenderPageProps().renderPageFunctions.baseUrl(this.webConfigApi);
+    const data = await getRenderPageProps().renderPageFunctions.fetchData(url);
+    if (data && data.json && data.json.status === 'ok') {
+      this.cfg = data.json.result;
+    } else {
+      console.error(data?.json?.message || 'Failed to get web config');
+    }
+  }
+
+  static async get(key: string, defaultValue: number): Promise<number>;
+  static async get(key: string, defaultValue: string): Promise<string>;
+  static async get(key: string, defaultValue: boolean): Promise<boolean>;
+  static async get(key: string, defaultValue: object): Promise<object>;
+  static async get(key: string, defaultValue?: any): Promise<any> {
+    await WebConfig.init();
+
+    const v = WebConfig.cfg[key];
+    if (typeof v === 'undefined') {
+      return defaultValue;
+    }
+
+    if (typeof defaultValue === 'number') {
+      return Number.parseInt(v!);
+    }
+    if (typeof defaultValue === 'boolean') {
+      return v!.toLocaleLowerCase() === 'true' || v === '1';
+    }
+    if (typeof defaultValue === 'object') {
+      if (typeof v === 'object') {
+        return v;
+      }
+      try {
+        return JSON.parse(v!);
+      } catch (error) {
+        console.error(`WebConfig JSON.parse error: `, error);
+      }
+      return defaultValue;
+    }
+    // if empty, then return default value
+    return v || defaultValue;
+  }
+}