lupine.api 1.1.45 → 1.1.47

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

@@ -8,13 +8,12 @@ import {
   ApiHelper,
   langHelper,
   FsUtils,
-  adminHelper,
+  adminApiHelper,
   processRefreshCache,
 } from 'lupine.api';
 import path from 'path';
 import { needDevAdminSession } from './admin-auth';
 import { adminTokenHelper } from './admin-token-helper';
-import { Readable } from 'stream';
 
 export class AdminRelease implements IApiBase {
   private logger = new Logger('release-api');
@@ -86,7 +85,7 @@ export class AdminRelease implements IApiBase {
 
   async refreshCache(req: ServerRequest, res: ServerResponse) {
     // check whether it's from online admin
-    const json = await adminHelper.getDevAdminFromCookie(req, res, false);
+    const json = await adminApiHelper.getDevAdminFromCookie(req, res, false);
     const jsonData = req.locals.json();
     if (json && jsonData && !Array.isArray(jsonData) && jsonData.isLocal) {
       await processRefreshCache(req);
@@ -184,13 +183,25 @@ export class AdminRelease implements IApiBase {
     }
 
     // local dirs under _web
-    const webSubFolders = await FsUtils.getDirsFullpath(appData.webPath);
+    const webSub: string[] = [];
+    for (let j = 0; j < apps.length; j++) {
+      const e = apps[j];
+      const p0 = path.join(appData.apiPath, '..');
+      const subFolders = await FsUtils.getDirsFullpath(path.join(p0, e + '_web'), 5);
+      webSub.push(
+        ...subFolders
+          .filter((i) => i.isDirectory())
+          .map((i) => path.join(i.parentPath.substring(p0.length + 1), i.name).replace(/\\/g, '/'))
+      );
+    }
+    // const webSub = webSubFolders.filter(i => i.isDirectory()).map(i => path.join(i.parentPath.substring(appData.webPath.length + 1), i.name).replace(/\\/g, '/')).sort();
+
     const response = {
       status: 'ok',
       message: 'check.',
       appsFrom: apps,
       ...remoteResult,
-      webSub: webSubFolders.filter((folder) => folder.isDirectory()).map((folder) => folder.name),
+      webSub: webSub, // webSubFolders.filter((folder) => folder.isDirectory()).map((folder) => folder.name),
     };
     ApiHelper.sendJson(req, res, response);
     return true;
@@ -264,6 +275,7 @@ export class AdminRelease implements IApiBase {
       return true;
     }
 
+    const appData = apiCache.getAppData();
     let targetUrl = data.targetUrl as string;
     if (targetUrl.endsWith('/')) {
       targetUrl = targetUrl.slice(0, -1);
@@ -291,22 +303,42 @@ export class AdminRelease implements IApiBase {
         ApiHelper.sendJson(req, res, result);
         return true;
       }
-      if (data.webSub) {
-        const result2 = await this.updateSendFile(data, 'web-sub');
-        if (!result2 || result2.status !== 'ok') {
-          ApiHelper.sendJson(req, res, result2);
-          return true;
-        }
-      }
+      // if (data.webSub) {
+      //   const result2 = await this.updateSendFile(data, 'web-sub');
+      //   if (!result2 || result2.status !== 'ok') {
+      //     ApiHelper.sendJson(req, res, result2);
+      //     return true;
+      //   }
+      // }
 
       if (data.webSubs && data.webSubs.length > 0) {
+        const subTop = path.join(appData.apiPath, '..', data.fromList + '_web/');
         for (let i = 0; i < data.webSubs.length; i++) {
-          data.webSub = data.webSubs[i];
-          const result2 = await this.updateSendFile(data, 'web-sub');
-          if (!result2 || result2.status !== 'ok') {
-            ApiHelper.sendJson(req, res, result2);
+          if (!data.webSubs[i].startsWith(data.fromList + '_web/')) {
+            const response = {
+              status: 'error',
+              message: `Error: ${data.webSubs[i]} is not under ${data.fromList}`,
+            };
+            ApiHelper.sendJson(req, res, response);
             return true;
           }
+          const subFolders = await FsUtils.getDirsFullpath(path.join(appData.apiPath, '..', data.webSubs[i]));
+          const subFiles = subFolders
+            .filter((e) => e.isFile())
+            .map((e) => path.join(e.parentPath.substring(subTop.length), e.name).replace(/\\/g, '/'))
+            .sort();
+          for (let j = 0; j < subFiles.length; j++) {
+            if (subFiles[j].endsWith('.js.map')) {
+              continue;
+            }
+            data.webSub = subFiles[j];
+            this.logger.info(`update, webSubs: ${data.webSubs[i]}, subFiles: ${subFiles[j]})`);
+            const result2 = await this.updateSendFile(data, 'web-sub');
+            if (!result2 || result2.status !== 'ok') {
+              ApiHelper.sendJson(req, res, result2);
+              return true;
+            }
+          }
         }
       }
     }
@@ -331,6 +363,7 @@ export class AdminRelease implements IApiBase {
       message: 'updated',
     };
     ApiHelper.sendJson(req, res, response);
+    this.logger.info(`updated, successful`);
     return true;
   }
 
@@ -349,11 +382,13 @@ export class AdminRelease implements IApiBase {
     } else if (chkOption === 'web') {
       sendFile = path.join(appData.apiPath, '..', fromList + '_web', 'index.js');
     } else if (chkOption === 'web-sub' && data.webSub) {
-      sendFile = path.join(appData.apiPath, '..', fromList + '_web', data.webSub, 'index.js');
+      // sendFile = path.join(appData.apiPath, '..', fromList + '_web', data.webSub, 'index.js');
+      sendFile = path.join(appData.apiPath, '..', fromList + '_web', data.webSub);
     } else if (chkOption.startsWith('.env')) {
       sendFile = path.join(appData.apiPath, '../../..', chkOption);
     }
     if (!(await FsUtils.pathExist(sendFile))) {
+      this.logger.error(`updateSendFile, not found: ${sendFile}`);
       return { status: 'error', message: 'Client file not found: ' + sendFile };
     }
     const fileContent = (await FsUtils.readFile(sendFile))!;
@@ -368,6 +403,7 @@ export class AdminRelease implements IApiBase {
     // })
     const chunkSize = 1024 * 500;
     let cnt = 0;
+    this.logger.info(`updateSendFile, sendFile: ${sendFile}, len: ${fileContent.length}`);
     for (let i = 0; i < fileContent.length; i += chunkSize) {
       const chunk = fileContent.slice(i, i + chunkSize);
       if (!chunk) break;
@@ -376,9 +412,15 @@ export class AdminRelease implements IApiBase {
         method: 'POST',
         body: JSON.stringify({ ...data, chkOption, index: cnt, size: fileContent.length }) + '\n\n' + chunk,
       };
-      this.logger.debug(`updateSendFile, index: ${cnt}, sending (max): ${i + chunkSize} / ${fileContent.length}`);
+      this.logger.info(
+        `updateSendFile, index: ${cnt}, sending: ${chunk.length} (${i + chunk.length} / ${
+          fileContent.length
+        }), f: ${sendFile}`
+      );
+      i > 0 && (await new Promise((resolve) => setTimeout(resolve, 1000)));
       const remoteData = await fetch(targetUrl + '/api/admin/release/byClientUpdate', postData);
       const resultText = await remoteData.text();
+      this.logger.info(`updateSendFile, index: ${cnt}, resultText: ${resultText}`);
       let remoteResult: any;
       try {
         remoteResult = JSON.parse(resultText);
@@ -437,11 +479,11 @@ export class AdminRelease implements IApiBase {
       } else if (chkOption === 'web') {
         saveFile = path.join(appData.apiPath, '..', toList + '_web', 'index.js');
       } else if (chkOption === 'web-sub' && data.webSub) {
-        const folder = path.join(appData.apiPath, '..', toList + '_web', data.webSub);
+        const folder = path.join(appData.apiPath, '..', toList + '_web', path.basename(data.webSub));
         if (!(await FsUtils.pathExist(folder))) {
           await FsUtils.mkdir(folder);
         }
-        saveFile = path.join(appData.apiPath, '..', toList + '_web', data.webSub, 'index.js');
+        saveFile = path.join(appData.apiPath, '..', toList + '_web', data.webSub);
       } else if ((chkOption as string).startsWith('.env')) {
         saveFile = path.join(appData.apiPath, '../../..', chkOption);
       }
@@ -460,6 +502,10 @@ export class AdminRelease implements IApiBase {
           await FsUtils.writeFile(bakFile, bakContent);
         }
       }
+
+      this.logger.info(
+        `byClientUpdate, index: ${data.index}, saveFile: ${saveFile}, received len: ${(fileContent || '').length}`
+      );
       if (data.index === 0) {
         await FsUtils.writeFile(saveFile, fileContent || '');
       } else {

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

@@ -9,7 +9,7 @@ import {
   ApiHelper,
   langHelper,
   FsUtils,
-  adminHelper,
+  adminApiHelper,
 } from 'lupine.api';
 import path from 'path';
 
@@ -64,7 +64,7 @@ export class AdminResources implements IApiBase {
     const chunkNumberStr = req.locals.query.get('chunkNumber') as string;
     const chunkNumber = parseInt(chunkNumberStr);
     const totalChunks = parseInt(req.locals.query.get('totalChunks') as string);
-    const decryptedKey = key && adminHelper.decryptJson(key.replace(/ /g, '+'));
+    const decryptedKey = key && adminApiHelper.decryptJson(key.replace(/ /g, '+'));
     const keyNG =
       !chunkNumberStr ||
       !totalChunks ||
@@ -100,7 +100,7 @@ export class AdminResources implements IApiBase {
       chunkNumber,
       totalChunks,
       message: langHelper.getLang('shared:file_part_updated'),
-      key: adminHelper.encryptJson({ ind: chunkNumber + 1, cnt: totalChunks, t: new Date().getTime() }),
+      key: adminApiHelper.encryptJson({ ind: chunkNumber + 1, cnt: totalChunks, t: new Date().getTime() }),
     };
     ApiHelper.sendJson(req, res, response);
     return true;

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

@@ -1,6 +1,6 @@
 import { apiStorage } from '../api';
 import { CryptoUtils, Logger } from '../lib';
-import { adminHelper } from './admin-helper';
+import { adminApiHelper } from './admin-api-helper';
 
 export type TokenProps = {
   token: string;
@@ -64,7 +64,7 @@ export class AdminTokenHelper {
 
   generate() {
     const salt = 'Lupine:' + CryptoUtils.uuid() + ':' + new Date().getTime().toString();
-    return adminHelper.encryptJson(salt) as string;
+    return adminApiHelper.encryptJson(salt) as string;
   }
 
   async validateToken(token: string) {

package/src/admin-api/index.ts

@@ -1,2 +1,2 @@
 export * from './admin-api';
-export * from './admin-helper';
+export * from './admin-api-helper';

package/src/lang/api-lang-en.ts

@@ -22,6 +22,5 @@ export const apiLangEn: OneLangProps = {
     'shared:not_found_file': 'File {fileName} is not found.',
 
     'shared:wrong_hash': 'Wrong hash.',
-    'shared:crypto_key_not_set': 'Crypto key [{cryptoKey}] not set',
   },
 };

package/src/lang/api-lang-zh-cn.ts

@@ -23,6 +23,5 @@ export const apiLangZhCn: OneLangProps = {
     'shared:not_found_file': '文件 {fileName} 未找到',
 
     'shared:wrong_hash': '错误的hash',
-    'shared:crypto_key_not_set': 'Crypto key [{cryptoKey}] 未设置',
   },
 };

package/src/lib/utils/fs-utils.ts

@@ -1,5 +1,6 @@
 import { Dirent } from 'fs';
 import * as fs from 'fs/promises';
+import path from 'path';
 
 export type FileInfoProps = {
   size: number;
@@ -118,12 +119,25 @@ export class FsUtils {
   };
 
   // return with fullpath list of Dirent
-  static getDirsFullpath = async (dirPath: string): Promise<Dirent[]> => {
+  static getDirsFullpath = async (dirPath: string, maxDepth = 1): Promise<Dirent[]> => {
+    return this.getDirsFullpathDepthSub(dirPath, 0, maxDepth);
+  };
+  private static getDirsFullpathDepthSub = async (dirPath: string, depth = 0, maxDepth = 1): Promise<Dirent[]> => {
     try {
       const files = await fs.readdir(dirPath, {
         recursive: false,
         withFileTypes: true,
       });
+      if (depth + 1 < maxDepth) {
+        for (const entry of files) {
+          if (entry.isDirectory()) {
+            if (depth < maxDepth) {
+              const fullPath = path.join(dirPath, entry.name);
+              (entry as any).sub = await this.getDirsFullpathDepthSub(fullPath, depth + 1, maxDepth);
+            }
+          }
+        }
+      }
       return files;
     } catch {
       return [];

package/admin/admin-frame-props.tsx

@@ -1,9 +0,0 @@
-import { TabsHookProps } from 'lupine.components';
-
-const adminFrameProps = {
-  maxWidthMobileMenu: '800px',
-  maxTabsCount: 20,
-  tabsHook: {} as TabsHookProps,
-};
-
-export { adminFrameProps };

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

@@ -1,111 +0,0 @@
-import { ServerResponse } from 'http';
-import { ApiHelper } from '../api';
-import { CryptoUtils, Logger } from '../lib';
-import { ServerRequest } from '../models';
-
-/*
-dev-admin uses different authentication method from frontend.
-dev-admin only provides fixed username and password authentication, no user maintenance.
-saved cookie name: _token_dev
-*/
-
-// DEFAULT_ADMIN_PASS is DEFAULT_ADMIN_NAME + ':' + login password hash.
-// Use below command to generate hash:
-// node -e "console.log(require('crypto').createHash('md5').update('admin:F4AZ5O@2fPUjw%f$LmhZpJTQ^DoXnWPkH#hqE', 'utf8').digest('hex'))"
-export type DevAdminSessionProps = {
-  u: string; // username
-  t: string; // type: admin, user
-  ip: string;
-  h: string; // md5 of name+pass
-};
-
-export const DEV_ADMIN_TYPE = 'dev-admin';
-export const DEV_ADMIN_CRYPTO_KEY_NAME = 'DEV_CRYPTO_KEY';
-export const DEV_ADMIN_SESSION_NAME = '_token_dev';
-export class AdminHelper {
-  private static instance: AdminHelper;
-  private logger = new Logger('admin-api');
-
-  private constructor() {}
-
-  public static getInstance(): AdminHelper {
-    if (!AdminHelper.instance) {
-      AdminHelper.instance = new AdminHelper();
-    }
-    return AdminHelper.instance;
-  }
-
-  decryptJson(text: string) {
-    const cryptoKey = process.env[DEV_ADMIN_CRYPTO_KEY_NAME];
-    if (cryptoKey && text) {
-      try {
-        const deCrypto = CryptoUtils.decrypt(text, cryptoKey);
-        const json = JSON.parse(deCrypto);
-        return json;
-      } catch (error: any) {
-        this.logger.error(error.message);
-      }
-    }
-    return false;
-  }
-
-  encryptJson(jsonOrText: string | object) {
-    const cryptoKey = process.env[DEV_ADMIN_CRYPTO_KEY_NAME];
-    if (cryptoKey && jsonOrText) {
-      try {
-        const text = typeof jsonOrText === 'string' ? jsonOrText : JSON.stringify(jsonOrText);
-        const encryptText = CryptoUtils.encrypt(text, cryptoKey);
-        return encryptText;
-      } catch (error: any) {
-        this.logger.error(error.message);
-      }
-    }
-    return false;
-  }
-
-  async getDevAdminFromCookie(
-    req: ServerRequest,
-    res: ServerResponse,
-    sendResponseWhenError = true
-  ): Promise<DevAdminSessionProps | false> {
-    try {
-      const cookies = req.locals.cookies();
-      const token = cookies.get(DEV_ADMIN_SESSION_NAME, '');
-      if (token) {
-        const json = this.decryptJson(token) as DevAdminSessionProps;
-        if (!json || json.t !== DEV_ADMIN_TYPE) {
-          if (sendResponseWhenError) {
-            const response = {
-              status: 'error',
-              message: 'Wrong session data, contact site admin please.',
-            };
-            ApiHelper.sendJson(req, res, response);
-          }
-          return false;
-        }
-
-        // if it's special admin
-        if (json.h && json.u === process.env['DEV_ADMIN_USER']) {
-          const hash = CryptoUtils.hash(process.env['DEV_ADMIN_USER'] + ':' + process.env['DEV_ADMIN_PASS']);
-          if (json.h === hash) {
-            return json;
-          }
-        }
-        return false;
-      }
-    } catch (error: any) {
-      this.logger.error(error.message);
-    }
-    if (sendResponseWhenError) {
-      const response = {
-        status: 'error',
-        message: 'Please login to use this system.',
-      };
-      ApiHelper.sendJson(req, res, response);
-    }
-    return false;
-  }
-}
-
-// add comment for tree shaking
-export const adminHelper = /* @__PURE__ */ AdminHelper.getInstance();