lupine.api 1.1.50 → 1.1.51

package/dev/cp-index-html.js

@@ -37,7 +37,7 @@ exports.cpIndexHtml = async (htmlFile, outputFile, appName, isMobile, defaultThe
   // if isMobile=true, then the last number is 1, or if isMobile=false, the last is 2
   const chgTime = Math.trunc(f1.mtime.getTime() / 10) * 10 + (isMobile ? 1 : 2);
 
-  // when it's isMobile, need to update env and configs
+  // when it's isMobile, need to update env and configs => no configs as mobile app fetches it from api
   if (!f2 || f2.mtime.getTime() !== chgTime || isMobile) {
     const inHtml = await fs.readFile(htmlFile, 'utf-8');
     let outStr = inHtml.replace(/{hash}/gi, new Date().getTime().toString(36));
@@ -48,7 +48,7 @@ exports.cpIndexHtml = async (htmlFile, outputFile, appName, isMobile, defaultThe
       const metaIndexStart = inHtml.indexOf(metaTextStart);
       const metaIndexEnd = inHtml.indexOf(metaTextEnd);
 
-      const webConfig = await readWebConfig(outdirData);
+      // const webConfig = await readWebConfig(outdirData);
       const webEnvData = webEnv.getWebEnv(appName);
 
       outStr =
@@ -56,9 +56,9 @@ exports.cpIndexHtml = async (htmlFile, outputFile, appName, isMobile, defaultThe
         '<script id="web-env" type="application/json">' +
         JSON.stringify(webEnvData) +
         '</script>\r\n' +
-        '<script id="web-setting" type="application/json">' +
-        JSON.stringify(webConfig) +
-        '</script>' +
+        // '<script id="web-setting" type="application/json">' +
+        // JSON.stringify(webConfig) +
+        // '</script>' +
         outStr.substring(metaIndexEnd + metaTextEnd.length);
       // outStr = webEnv.replaceWebEnv(inHtml, appName, true);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lupine.api",
-  "version": "1.1.50",
+  "version": "1.1.51",
   "license": "MIT",
   "author": "uuware.com",
   "homepage": "https://github.com/uuware/lupine.js",

package/src/admin-api/admin-api.ts

@@ -11,6 +11,7 @@ import { AdminConfig } from './admin-config';
 import { Logger } from '../lib';
 import { IApiBase, ServerRequest } from '../models';
 import { ApiRouter } from '../api';
+import { readWebConfig } from './web-config-api';
 
 const logger = new Logger('admin-api');
 
@@ -27,6 +28,8 @@ export class AdminApi implements IApiBase {
   }
 
   protected mountDashboard() {
+    this.router.use('/web-config', readWebConfig);
+
     const adminDb = new AdminDb();
     this.router.use('/db', needDevAdminSession, adminDb.getRouter());
 

package/src/admin-api/admin-auth.ts

@@ -10,6 +10,11 @@ export const needDevAdminSession = async (req: ServerRequest, res: ServerRespons
   const devAdminSession = await adminApiHelper.getDevAdminFromCookie(req, res, true);
   if (!devAdminSession) {
     // return true to skip the rest of the middleware
+    const response = {
+      status: 'error',
+      message: langHelper.getLang('shared:permission_denied'),
+    };
+    ApiHelper.sendJson(req, res, response);
     return true;
   }
   return false;

package/src/admin-api/admin-release.ts

@@ -32,7 +32,7 @@ export class AdminRelease implements IApiBase {
   protected mountDashboard() {
     // called by FE
     this.router.use('/check', needDevAdminSession, this.check.bind(this));
-    this.router.use('/update', needDevAdminSession, this.update.bind(this));
+    this.router.use('/update', needDevAdminSession, this.callUpdate.bind(this));
     this.router.use('/view-log', needDevAdminSession, this.viewLog.bind(this));
     // called online or by clients
     this.router.use('/refresh-cache', needDevAdminSession, this.refreshCache.bind(this));

package/src/admin-api/web-config-api.ts

@@ -0,0 +1,19 @@
+import { ServerResponse } from 'http';
+import { Logger } from '../lib';
+import { ServerRequest } from '../models';
+import { langHelper } from '../lang';
+import { ApiHelper, apiStorage } from '../api';
+
+// only used by mobile app. For web, it's injected in the html by server-side render
+const logger = new Logger('web-cfg-api');
+export const readWebConfig = async (req: ServerRequest, res: ServerResponse) => {
+  logger.info('readWebConfig');
+
+  const response = {
+    status: 'ok',
+    result: await apiStorage.getWebAll(),
+    message: langHelper.getLang('shared:operation_success'),
+  };
+  ApiHelper.sendJson(req, res, response);
+  return true;
+};

package/src/api/server-render.ts

@@ -9,7 +9,6 @@ import { IToClientDelivery } from '../models/to-client-delivery-props';
 import { JsonObject } from '../models/json-object';
 import { getTemplateCache } from './api-cache';
 import { apiStorage } from './api-shared-storage';
-import { SimpleStorageDataProps } from '../models';
 import { RuntimeRequire } from '../lib/runtime-require';
 
 const logger = new Logger('StaticServer');
@@ -159,13 +158,13 @@ export const serverSideRenderPage = async (
   const _lupineJs = cachedHtml[nearRoot]._lupineJs;
   const currentCache = cachedHtml[nearRoot] as CachedHtmlProps;
   const webSetting = await apiStorage.getWebAll();
-  const webSettingShortKey: SimpleStorageDataProps = {};
-  for (let item of Object.keys(webSetting)) {
-    const newItem = item.substring(4);
-    webSettingShortKey[newItem] = webSetting[item];
-  }
+  // const webSettingShortKey: SimpleStorageDataProps = {};
+  // for (let item of Object.keys(webSetting)) {
+  //   const newItem = item.substring(4);
+  //   webSettingShortKey[newItem] = webSetting[item];
+  // }
   // const webSetting = AppConfig.get(AppConfig.WEB_SETTINGS_KEY) || {};
-  const clientDelivery = new ToClientDelivery(currentCache.webEnv, webSettingShortKey, req.locals.cookies());
+  const clientDelivery = new ToClientDelivery(currentCache.webEnv, webSetting, req.locals.cookies());
   const page = await _lupineJs.generatePage(props, clientDelivery);
   // console.log(`=========load lupin: `, content);
 
@@ -199,7 +198,7 @@ export const serverSideRenderPage = async (
   res.write(page.metaData);
   res.write(page.globalCss);
   res.write('<script id="web-env" type="application/json">' + JSON.stringify(currentCache.webEnv) + '</script>');
-  res.write('<script id="web-setting" type="application/json">' + JSON.stringify(webSettingShortKey) + '</script>');
+  res.write('<script id="web-setting" type="application/json">' + JSON.stringify(webSetting) + '</script>');
   res.write(
     currentCache.content.substring(
       currentCache.metaIndexEnd + metaTextEnd.length,

package/src/app/app-shared-storage.ts

@@ -1,6 +1,6 @@
 /**
  * A persistent storage to store data in primary process and share to all workers
- * 
+ *
  * You should use apiStorage in api module
  */
 import * as fs from 'fs/promises';
@@ -141,9 +141,9 @@ export class AppSharedStorage implements IAppSharedStorage {
   }
 
   // called from primary before exit, or from api to save changes
-  async save(appName?: string) {
+  async save(appName?: string, exit?: boolean) {
     if (!cluster.isPrimary) {
-      AppSharedStorageWorker.save(appName);
+      await AppSharedStorageWorker.save(appName);
       return;
     }
 
@@ -183,8 +183,16 @@ export class AppSharedStorage implements IAppSharedStorage {
   getApi(appName: string, key: string): Promise<string> {
     return this.get(appName, AppSharedStorageApiPrefix + key);
   }
-  getWebAll(appName: string): Promise<SimpleStorageDataProps> {
-    return this.getWithPrefix(appName, AppSharedStorageWebPrefix);
+  async getWebAll(appName: string): Promise<SimpleStorageDataProps> {
+    const webAll = await this.getWithPrefix(appName, AppSharedStorageWebPrefix);
+
+    const webSettingShortKey: SimpleStorageDataProps = {};
+    for (let item of Object.keys(webAll)) {
+      const newItem = item.substring(AppSharedStorageWebPrefix.length);
+      webSettingShortKey[newItem] = webAll[item];
+    }
+
+    return webSettingShortKey;
   }
   getWithPrefix(appName: string, prefixKey: string): Promise<SimpleStorageDataProps> {
     return new Promise((resolve, reject) => {
@@ -267,7 +275,7 @@ class AppSharedStorageWorker {
       workerId: cluster.worker?.id || 0,
       action: 'save',
       appName: appName || '',
-      key: '',
+      key: 'save',
     };
     process.send!(obj);
   }

package/src/app/cleanup-exit.ts

@@ -6,7 +6,7 @@ export const cleanupAndExit = async () => {
   // save shared storage first
   if (cluster.isPrimary) {
     // save only happens once
-    await appStorage.save();
+    await appStorage.save('', true);
   }
   process.exit(0);
 };

package/src/lib/db/db.ts

@@ -2,7 +2,12 @@ import { Logger } from '../logger';
 import { DbConfig } from '../../models/db-config';
 
 // Instead, Boolean values are stored as integers 0 (false) and 1 (true).
+export type DbFieldExprssionProps = { exprssion: string; params?: (string | number)[] };
 export type DbFieldValue = { [key: string]: string | number };
+export type DbFieldExpression = { [key: string]: string | number | DbFieldExprssionProps };
+const isDbFieldExprssion = (value: any): value is DbFieldExprssionProps => {
+  return value && typeof value === 'object' && 'exprssion' in value;
+};
 
 const logger = new Logger('db');
 export class Db {
@@ -252,12 +257,28 @@ export class Db {
     return await this.execute(sql, params);
   }
 
-  public async updateObject(table: string, updateFieldValues: DbFieldValue, whereFieldValues: DbFieldValue) {
+  public async updateObject(table: string, updateFieldValues: DbFieldExpression, whereFieldValues: DbFieldValue) {
     table = this.replacePrefix(table);
     const fields = Object.keys(updateFieldValues);
-    let sql = 'UPDATE ' + table + ' SET ' + fields.map((item) => `${item}=?`).join(',');
-    const params = Object.values(updateFieldValues);
+    const setClauseParts: string[] = [];
+    const params: (string | number)[] = [];
+    // let sql = 'UPDATE ' + table + ' SET ' + fields.map((item) => `${item}=?`).join(',');
+    // const params = Object.values(updateFieldValues);
+    for (const field of fields) {
+      const value = updateFieldValues[field];
+
+      // expression
+      if (isDbFieldExprssion(value)) {
+        setClauseParts.push(`${field} = ${value.exprssion}`);
+        if (value.params) params.push(...value.params);
+      } else {
+        // static value
+        setClauseParts.push(`${field} = ?`);
+        params.push(value);
+      }
+    }
 
+    let sql = `UPDATE ${table} SET ${setClauseParts.join(', ')}`;
     if (whereFieldValues && Object.keys(whereFieldValues).length > 0) {
       sql +=
         ' WHERE ' +

package/src/models/app-shared-storage-props.ts

@@ -25,7 +25,7 @@ export interface IAppSharedStorage {
   // this is primary, msg is from a client
   messageFromSubProcess(msgObject: any): void;
   load(appName: string, rootPath: string): Promise<void>;
-  save(appName?: string): Promise<void>;
+  save(appName?: string, exit?: boolean): Promise<void>;
   get(appName: string, key: string): Promise<string>;
   getWeb(appName: string, key: string): Promise<string>;
   getApi(appName: string, key: string): Promise<string>;