lupine.api 1.1.55 → 1.1.56

package/admin/admin-config.tsx

@@ -12,7 +12,7 @@ export const AdminConfigPage = () => {
       const json = JSON.parse(ref.$('.input-cfg').value);
       const data = await getRenderPageProps().renderPageFunctions.fetchData('/api/admin/config/save', { json });
       if (data.json && data.json.status === 'ok') {
-        NotificationMessage.sendMessage('Saved', NotificationColor.Success);
+        NotificationMessage.sendMessage('Saved, and please refresh the page to load new configs', NotificationColor.Success);
       }
     } catch (e) {
       NotificationMessage.sendMessage('Config is not valid JSON', NotificationColor.Error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lupine.api",
-  "version": "1.1.55",
+  "version": "1.1.56",
   "license": "MIT",
   "author": "uuware.com",
   "homepage": "https://github.com/uuware/lupine.js",
@@ -52,4 +52,4 @@
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.12"
   }
-}
+}

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

@@ -1,6 +1,6 @@
 import { ServerResponse } from 'http';
 import * as fs from 'fs/promises';
-import { IApiBase, Logger, apiCache, ServerRequest, ApiRouter, ApiHelper, langHelper, FsUtils } from 'lupine.api';
+import { IApiBase, Logger, apiCache, ServerRequest, ApiRouter, ApiHelper, langHelper, FsUtils, appStorage } from 'lupine.api';
 import path from 'path';
 
 export class AdminConfig implements IApiBase {
@@ -72,6 +72,8 @@ export class AdminConfig implements IApiBase {
     const cfgPath = path.join(appData.dataPath, 'config.json');
     await fs.writeFile(cfgPath, JSON.stringify(data.json));
 
+    await appStorage.load(appData.appName, appData.dataPath);
+
     const response = {
       status: 'ok',
       message: langHelper.getLang('shared:operation_success'),

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

@@ -536,6 +536,7 @@ export class AdminRelease implements IApiBase {
         !chkOption ||
         !toList ||
         (chkOption !== 'server' &&
+          chkOption !== 'app-loader' &&
           chkOption !== 'api' &&
           chkOption !== 'web' &&
           chkOption !== 'web-sub' &&

package/src/api/api-module.ts

@@ -22,7 +22,7 @@ export class ApiModule implements IApiModule {
     return result;
   }
 
-  // appCache is from app-loader (parent scope), not the same in current scope
+  // appCache is from app-helper (parent scope), not the same in current scope
   public async initApi(appConfig: HostToPathProps, appCacheFromApp: IAppCache, appStorageFromApp: IAppSharedStorage) {
 
     // const evnFile = appCacheFromApp.get(AppCacheGlobal, AppCacheKeys.APP_ENV_FILE);

package/src/app/{app-loader.ts → app-helper.ts}

@@ -4,8 +4,8 @@ import { appCache } from './app-cache';
 import { AppCacheKeys, AppLoaderProps, HostToPathProps, IApiModule, setAppCache } from '../models';
 import { appStorage } from './app-shared-storage';
 
-class AppLoader {
-  logger: Logger = new Logger('app-loader');
+class AppHelper {
+  logger: Logger = new Logger('app-helper');
 
   constructor() {}
 
@@ -59,4 +59,4 @@ class AppLoader {
   }
 }
 
-export const appLoader = /* @__PURE__ */ new AppLoader();
+export const appHelper = /* @__PURE__ */ new AppHelper();

package/src/app/app-message.ts

@@ -1,6 +1,6 @@
 import cluster from 'cluster';
 import { Logger, LogWriter, LogWriterMessageId } from '../lib';
-import { processDebugMessage, snedRestartAppMsgToLoader } from './process-dev-requests';
+import { processDebugMessage, sendRestartAppMsgToLoader } from './process-dev-requests';
 import { cleanupAndExit } from './cleanup-exit';
 
 export type AppMessageProps = {
@@ -79,7 +79,7 @@ export const processMessageFromWorker = (msgObject: AppMessageProps) => {
       `Message from worker ${cluster.worker?.id}, message: ${msgObject.message}, appName: ${msgObject.appName}`
     );
     if (msgObject.message === 'restartApp') {
-      snedRestartAppMsgToLoader();
+      sendRestartAppMsgToLoader();
       return;
     } else if (msgObject.message === 'refresh') {
       broadcast(msgObject);

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

@@ -99,6 +99,8 @@ export class AppSharedStorage implements IAppSharedStorage {
     } else if (msgObject.action === 'set') {
       const storage = this.getStorage(msgObject.appName);
       storage.set(msgObject.key, msgObject.value);
+    } else if (msgObject.action === 'load') {
+      this.load(msgObject.appName, msgObject.rootPath || '');
     } else if (msgObject.action === 'save') {
       this.save(msgObject.appName);
     } else {
@@ -116,7 +118,9 @@ export class AppSharedStorage implements IAppSharedStorage {
   // should be only called from primary when the app is starting
   async load(appName: string, rootPath: string) {
     if (!cluster.isPrimary) {
-      throw new Error('AppStorage.load should be only called from primary');
+      // throw new Error('AppStorage.load should be only called from primary');
+      await AppSharedStorageWorker.load(appName, rootPath);
+      return;
     }
 
     const map = this.getStorageMap(appName);
@@ -147,6 +151,7 @@ export class AppSharedStorage implements IAppSharedStorage {
       return;
     }
 
+    console.log(`${process.pid} - AppStorage save, appName: ${appName}, exit: ${exit}`);
     if (appName) {
       const map = this.configMap[appName];
       if (map && map.fPath && map.storage.size() > 0 && map.storage.Dirty) {
@@ -166,7 +171,7 @@ export class AppSharedStorage implements IAppSharedStorage {
   // this can be called in primary or worker
   get(appName: string, key: string): Promise<string> {
     return new Promise((resolve, reject) => {
-      console.log(`${process.pid} - AppStorage get value for key: ${key}`);
+      // console.log(`${process.pid} - AppStorage get value for key: ${key}`);
 
       if (!cluster.isPrimary) {
         AppSharedStorageWorker.get(appName, key, resolve, reject);
@@ -196,7 +201,7 @@ export class AppSharedStorage implements IAppSharedStorage {
   }
   getWithPrefix(appName: string, prefixKey: string): Promise<SimpleStorageDataProps> {
     return new Promise((resolve, reject) => {
-      console.log(`${process.pid} - AppStorage getWithPrefix for prefixKey: ${prefixKey}`);
+      // console.log(`${process.pid} - AppStorage getWithPrefix for prefixKey: ${prefixKey}`);
 
       if (!cluster.isPrimary) {
         AppSharedStorageWorker.getWithPrefix(appName, prefixKey, resolve, reject);
@@ -238,7 +243,7 @@ class AppSharedStorageWorker {
     }
 
     if (msgObject.action === 'get') {
-      console.log(`${process.pid} - AppStorage get value end for key: ${msgObject.key}`);
+      // console.log(`${process.pid} - AppStorage get value end for key: ${msgObject.key}`);
 
       const value = msgObject.value;
       // how to pass the value to the caller
@@ -265,6 +270,22 @@ class AppSharedStorageWorker {
     }
   }
 
+  static async load(appName: string, rootPath: string) {
+    if (cluster.isPrimary) {
+      throw new Error('AppSharedStorageWorker should be only called from workers');
+    }
+    const obj: StorageMessageFromSubProcess = {
+      id: AppSharedStorageMessageId,
+      pid: process.pid,
+      workerId: cluster.worker?.id || 0,
+      action: 'load',
+      appName: appName,
+      rootPath: rootPath,
+      key: 'load',
+    };
+    process.send!(obj);
+  }
+
   static async save(appName?: string) {
     if (cluster.isPrimary) {
       throw new Error('AppSharedStorageWorker should be only called from workers');

package/src/app/app-start.ts

@@ -1,6 +1,6 @@
 import cluster from 'cluster';
 import { WebProcessor } from './web-processor';
-import { appLoader } from './app-loader';
+import { appHelper } from './app-helper';
 import { processMessageFromPrimary, processMessageFromWorker } from './app-message';
 import { WebServer } from './web-server';
 import { processDevRequests } from './process-dev-requests';
@@ -59,7 +59,7 @@ class AppStart {
       process.on('message', processMessageFromPrimary);
 
       HostToPath.setHostToPathList(props.apiConfig.webHostMap);
-      appLoader.loadApi(props.apiConfig);
+      appHelper.loadApi(props.apiConfig);
       this.initServer(props.serverConfig);
     } else if (cluster.isPrimary) {
       const numCPUs = props.debug ? 1 : require('os').cpus().length;

package/src/app/index.ts

@@ -1,5 +1,5 @@
 export * from './app-cache';
-export * from './app-loader';
+export * from './app-helper';
 export * from './app-message';
 export * from './app-shared-storage';
 export * from './app-start';

package/src/app/process-dev-requests.ts

@@ -2,7 +2,7 @@ import cluster from 'cluster';
 import { Logger } from '../lib/logger';
 import { ServerResponse } from 'http';
 import { AddressInfo } from 'net';
-import { appLoader } from './app-loader';
+import { appHelper } from './app-helper';
 import { DebugService } from '../api/debug-service';
 import { AppCacheGlobal, AppCacheKeys, getAppCache, ServerRequest } from '../models';
 import { cleanupAndExit } from './cleanup-exit';
@@ -27,13 +27,13 @@ export const processDebugMessage = async (msgObject: any) => {
   if (msgObject.id === 'debug' && msgObject.message === 'refresh') {
     if (msgObject.appName) {
       const appConfig = getAppCache().get(msgObject.appName, AppCacheKeys.API_CONFIG);
-      appLoader.refreshApi(appConfig);
+      appHelper.refreshApi(appConfig);
     } else {
       // refresh all in a worker (app scope)
       let appList = getAppCache().get(AppCacheGlobal, AppCacheKeys.APP_LIST);
       for (const appName of appList) {
         const appConfig = getAppCache().get(appName, AppCacheKeys.API_CONFIG);
-        appLoader.refreshApi(appConfig);
+        appHelper.refreshApi(appConfig);
       }
     }
 
@@ -72,7 +72,7 @@ export async function processRestartApp(req: ServerRequest) {
   }
   // in case if it's only one process (primary process)
   else {
-    snedRestartAppMsgToLoader();
+    sendRestartAppMsgToLoader();
   }
 }
 
@@ -103,7 +103,7 @@ export async function processDevRequests(req: ServerRequest, res: ServerResponse
 }
 
 // this is called from a request and passes the restartApp message to loader
-export const snedRestartAppMsgToLoader = async () => {
+export const sendRestartAppMsgToLoader = async () => {
   if (!cluster.isPrimary) {
     console.warn(`restartApp: shouldn't come here`);
     return;

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

@@ -2,7 +2,7 @@ import { ISimpleStorage, SimpleStorageDataProps } from './simple-storage-props';
 
 // interface of AppSharedStorage
 export const AppSharedStorageMessageId = 'AppSharedStorage';
-export type StorageMessageAction = 'get' | 'set' | 'save' | 'getWithPrefix';
+export type StorageMessageAction = 'get' | 'set' | 'load'  | 'save' | 'getWithPrefix';
 export interface StorageMessageFromSubProcess {
   id: string;
   pid: number | undefined;
@@ -13,6 +13,7 @@ export interface StorageMessageFromSubProcess {
   value?: any;
   uniqueKey?: string;
   appName: string;
+  rootPath?: string;
 }
 
 // also used in packages\lupine.api\src\common-js\web-env.js

package/src/models/app-start-props.ts

@@ -1,5 +1,5 @@
 import { RenderPageFunctionsType } from '../api';
-import { AppLoaderProps } from './app-loader-props';
+import { AppLoaderProps } from './app-helper-props';
 
 export type InitStartProps = {
   bindIp: string;

package/src/models/index.ts

@@ -3,7 +3,7 @@ export * from './api-module-props';
 export * from './api-router-props';
 export * from './app-cache-props';
 export * from './app-data-props';
-export * from './app-loader-props';
+export * from './app-helper-props';
 export * from './app-shared-storage-props';
 export * from './app-start-props';
 export * from './async-storage-props';