lupine.api 1.1.46 → 1.1.48

package/admin/admin-frame-helper.tsx

@@ -71,6 +71,14 @@ export class AdminFrameHelper {
     this.isDevAdmin = isDevAdmin;
   }
 
+  maxWidthMobileMenu = '700px';
+  setMaxWidthMobileMenu(maxWidthMobileMenu: string) {
+    this.maxWidthMobileMenu = maxWidthMobileMenu;
+  }
+  getMaxWidthMobileMenu() {
+    return this.maxWidthMobileMenu;
+  }
+
   maxTabsCount = 20;
   setMaxTabsCount(count: number) {
     this.maxTabsCount = count;

package/admin/admin-frame.tsx

@@ -1,4 +1,4 @@
-import { bindGlobalStyle, CssProps, RefProps, clearCookie, TabsPageProps } from 'lupine.components';
+import { bindGlobalStyle, CssProps, RefProps, clearCookie, TabsPageProps, getRenderPageProps } from 'lupine.components';
 import { MenuSidebar, ThemeSelector, TabsHookProps, Tabs } from 'lupine.components';
 import { adminCss } from './admin-css';
 import { adminFrameHelper } from './admin-frame-helper';
@@ -109,6 +109,7 @@ export const AdminFrame = (props: AdminFrameProps) => {
   const onLogoutClick = async () => {
     clearCookie('_token_dev', '/');
     await adminFrameHelper.getAppAdminHookLogout()?.();
+    await getRenderPageProps().renderPageFunctions.fetchData('/api/admin/logout');
     window.location.href = '/admin_dev';
   };
 

package/admin/admin-release.tsx

@@ -94,7 +94,7 @@ const ReleaseList = (props: ReleaseListProps) => {
               </label>
             </div>
           ))}
-          <label class='label mr-m release-label'>(Only update index.js file)</label>
+          <label class='label mr-m release-label'>(Skip *.js.map files)</label>
         </div>
       </div>
       <LogList logs={props.result.logs} onLogClick={props.onLogClick} />
@@ -116,12 +116,13 @@ const LogList = (props: {
       <div class='row-box mt-m'>
         <label class='label mr-m release-label'>Logs:</label>
         <div type='text'>
-          {props.logs && props.logs.map((log: { name: string; size: number; time: string }) => (
-            <div>
-              <label class='release-log' onClick={() => props.onLogClick(log.name)}>{`${log.name}`}</label> ({log.time};{' '}
-              {formatBytes(log.size)}){' '}
-            </div>
-          ))}
+          {props.logs &&
+            props.logs.map((log: { name: string; size: number; time: string }) => (
+              <div>
+                <label class='release-log' onClick={() => props.onLogClick(log.name)}>{`${log.name}`}</label> (
+                {log.time}; {formatBytes(log.size)}){' '}
+              </div>
+            ))}
         </div>
       </div>
     </div>
@@ -131,7 +132,7 @@ const LogList = (props: {
 export const AdminReleasePage = () => {
   const fetchData = async (options: { targetUrl: string; accessToken: string; log?: boolean }) => {
     const data = await getRenderPageProps().renderPageFunctions.fetchData('/api/admin/release/check', options);
-    console.log('AdminRelease', data);
+    console.log('release/check', data);
     return data.json;
   };
   const css: CssProps = {
@@ -146,11 +147,18 @@ export const AdminReleasePage = () => {
   const domLog = new HtmlVar('');
   const domUpdate = new HtmlVar('');
   const getDomData = () => {
-    const dataOld = JSON.parse(localStorage.getItem('admin-release') || '{}');
+    const domFromList = ref.$('.from-list');
+    let fromValue = '';
+    if (!domFromList) {
+      const dataOld = JSON.parse(localStorage.getItem('admin-release') || '{}');
+      fromValue = dataOld.fromList;
+    } else {
+      fromValue = domFromList.value;
+    }
     const data = {
-      targetUrl: DomUtils.getValue('.target-url'),
-      accessToken: DomUtils.getValue('.access-token'),
-      fromList: DomUtils.getValue('.from-list') || dataOld.fromList,
+      targetUrl: ref.$('.target-url').value,
+      accessToken: ref.$('.access-token').value,
+      fromList: fromValue,
     };
     localStorage.setItem('admin-release', JSON.stringify(data));
     return data;
@@ -163,18 +171,23 @@ export const AdminReleasePage = () => {
       return;
     }
 
-    const fromList = DomUtils.getValue('.from-list');
-    const toList = DomUtils.getValue('.to-list');
-    const chkServer = DomUtils.getChecked('.chk-server');
-    const chkApi = DomUtils.getChecked('.chk-api');
-    const chkWeb = DomUtils.getChecked('.chk-web');
-    const webSub = DomUtils.getValue('.input-web-sub');
-    const webSubs = document.querySelectorAll<HTMLInputElement>('.chk-web-sub');
+    const fromList = ref.$('.from-list').value;
+    const toList = ref.$('.to-list').value;
+    const chkServer = ref.$('.chk-server').checked;
+    const chkApi = ref.$('.chk-api').checked;
+    const chkWeb = ref.$('.chk-web').checked;
+    // const webSub = ref.$('.input-web-sub').value;
+    const webSubs = ref.$all('.chk-web-sub') as HTMLInputElement[];
     const webSubsChecked = Array.from(webSubs)
       .filter((input) => input.checked)
       .map((input) => input.value);
-    const chkEnv = DomUtils.getChecked('.chk-env');
-    const chkBackup = DomUtils.getChecked('.chk-backup');
+    const wrongWebSubs = webSubsChecked.filter((s) => !s.startsWith(fromList + '_web/'));
+    if (wrongWebSubs.length > 0) {
+      NotificationMessage.sendMessage(`Some web sub folder is not under ${fromList}`, NotificationColor.Error);
+      return;
+    }
+    const chkEnv = ref.$('.chk-env').checked;
+    const chkBackup = ref.$('.chk-backup').checked;
     if (!chkServer && !chkApi && !chkWeb && !chkEnv) {
       NotificationMessage.sendMessage('Please select the release options', NotificationColor.Error);
       return;
@@ -195,16 +208,19 @@ export const AdminReleasePage = () => {
       chkServer,
       chkApi,
       chkWeb,
-      webSub, // will be deprecated
+      // webSub, // will be deprecated
       webSubs: webSubsChecked,
       chkEnv,
       chkBackup,
     });
     const dataResponse = await response.json;
-    console.log('AdminRelease', dataResponse);
+    console.log('release/update', dataResponse);
     releaseUpdateBtn.disabled = false;
     if (!dataResponse || dataResponse.status !== 'ok') {
-      NotificationMessage.sendMessage(dataResponse.message || 'Failed to update release', NotificationColor.Error);
+      NotificationMessage.sendMessage(
+        dataResponse.message || 'Failed to update release (timeout, possibly backend is runing, please wait!)',
+        NotificationColor.Error
+      );
       return;
     }
     NotificationMessage.sendMessage('Release updated successfully', NotificationColor.Success);

package/package.json

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

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

@@ -14,7 +14,6 @@ import {
 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');
@@ -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/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,13 +119,26 @@ 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 ret = [];
       const files = await fs.readdir(dirPath, {
         recursive: false,
         withFileTypes: true,
       });
-      return files;
+      ret.push(...files);
+      if (depth + 1 < maxDepth) {
+        for (const entry of files) {
+          if (entry.isDirectory()) {
+            const fullPath = path.join(dirPath, entry.name);
+            ret.push(...(await this.getDirsFullpathDepthSub(fullPath, depth + 1, maxDepth)));
+          }
+        }
+      }
+      return ret;
     } catch {
       return [];
     }