lupine.api 1.1.59 → 1.1.61

package/package.json

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

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

@@ -1,44 +1,8 @@
 import { ServerResponse } from 'http';
-import { Logger } from 'lupine.api';
+import { exportCSVData, exportCSVHead, Logger } from 'lupine.api';
 import { Db } from '../lib/db';
 
 const logger = new Logger('admin-csv');
-export const exportCSVData = async (db: Db, tableName: string, res: ServerResponse) => {
-  res.write(`@TABLE,${tableName}\r\n`);
-
-  const result = await db.selectObject(tableName);
-  if (result && result.length > 0) {
-    const fields = Object.keys(result[0]).join(',').toLowerCase();
-    res.write(`@FIELD,${fields}\r\n`);
-    result.forEach((row: any) => {
-      res.write(`${JSON.stringify(Object.values(row))}\r\n`);
-    });
-  } else {
-    res.write('#no data\r\n');
-  }
-};
-
-export const exportCSVHead = (fileName: string, res: ServerResponse) => {
-  res.writeHead(200, {
-    'Content-Type': 'text/csv',
-    // 'Expires': '0',
-    // 'Cache-Control': 'no-cache, no-store, must-revalidate',
-    'Content-Disposition': 'attachment; filename=' + fileName + '.ljcsv',
-    // 'Content-Description': 'File Transfer',
-  });
-};
-
-export const exportCSV = async (db: Db, tableName: string, res: ServerResponse) => {
-  if (tableName) {
-    exportCSVHead(tableName + '-' + new Date().toJSON().replace(/:/g, '-'), res);
-    await exportCSVData(db, tableName, res);
-  } else {
-    res.writeHead(200, { 'Content-Type': 'text/html' });
-    res.write('Need a table name.');
-  }
-  res.end();
-  return true;
-};
 
 export const exportCSVTables = async (db: Db, tables: string[], res: ServerResponse) => {
   exportCSVHead('all-tables-' + new Date().toJSON().replace(/:/g, '-'), res);
@@ -49,46 +13,3 @@ export const exportCSVTables = async (db: Db, tables: string[], res: ServerRespo
   res.end();
   return true;
 };
-
-export const loadCSV = async (db: Db, lines: string[]) => {
-  let table = '';
-  let insSql = '';
-  const result: any = {};
-  let toFields: string[] = [];
-  let toFieldsIndex: number[] = [];
-  for (const i in lines) {
-    if (!lines[i] || lines[i].startsWith('#')) {
-      continue;
-    }
-    if (lines[i].startsWith('@TABLE,')) {
-      table = lines[i].substring(7);
-      result[table] = { succeeded: 0, failed: 0, errorMessage: [] };
-
-      const toTableInfo = await db.getTableInfo(table);
-      toFields = toTableInfo.map((item: any) => item.name);
-    } else if (lines[i].startsWith('@FIELD,')) {
-      const fromFields = lines[i]
-        .substring(7)
-        .split(',')
-        .filter((item: string) => toFields.includes(item));
-      toFieldsIndex = toFields.map((item: string) => fromFields.indexOf(item));
-      const values = Array(fromFields.length).fill('?').join(',');
-      insSql = `INSERT INTO ${table} (${fromFields.join(',')} ) VALUES (${values})`;
-    } else {
-      if (toFields.length === 0 || !insSql) {
-        throw new Error('Invalid CSV format (no @TABLE or @FIELD)');
-      }
-      try {
-        const row = JSON.parse(lines[i]);
-        const values = toFieldsIndex.map((index: number) => row[index]);
-        await db.execute(insSql, values);
-        result[table].succeeded++;
-      } catch (error: any) {
-        result[table].failed++;
-        result[table].errorMessage.push(error.message);
-      }
-    }
-  }
-
-  return result;
-};

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

@@ -1,6 +1,16 @@
 import { ServerResponse } from 'http';
-import { IApiBase, FsUtils, Logger, apiCache, ServerRequest, ApiRouter, ApiHelper } from 'lupine.api';
-import { exportCSV, exportCSVTables, loadCSV } from './admin-csv';
+import {
+  IApiBase,
+  FsUtils,
+  Logger,
+  apiCache,
+  ServerRequest,
+  ApiRouter,
+  ApiHelper,
+  loadCSV,
+  exportCSV,
+} from 'lupine.api';
+import { exportCSVTables } from './admin-csv';
 
 const logger = new Logger('admin-db');
 export class AdminDb implements IApiBase {

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

@@ -115,10 +115,16 @@ export class AdminPerformance implements IApiBase {
           times: c.times,
         })),
         process: {
-          ...(process as any),
-          mainModule: undefined,
-          moduleLoadList: undefined,
-          config: undefined,
+          // ...(process as any), // cause delay
+          pid: process.pid,
+          ppid: process.ppid,
+          title: process.title,
+          version: process.version,
+          versions: process.versions,
+          cwd: process.cwd(),
+          execPath: process.execPath,
+          argv: process.argv,
+          // config: process.config,
         },
       },
     };

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

@@ -609,9 +609,12 @@ 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', path.basename(data.webSub));
-        if (!(await FsUtils.pathExist(folder))) {
-          await FsUtils.mkdir(folder);
+        const baseName = path.basename(data.webSub);
+        if (baseName !== data.webSub) {
+          const folder = path.join(appData.apiPath, '..', toList + '_web', baseName);
+          if (!(await FsUtils.pathExist(folder))) {
+            await FsUtils.mkdir(folder);
+          }
         }
         saveFile = path.join(appData.apiPath, '..', toList + '_web', data.webSub);
       } else if ((chkOption as string).startsWith('.env')) {

package/src/api/encode-html.ts

@@ -1,5 +1,8 @@
 export const encodeHtml = (str: string): string => {
-  return str.replace(
+  if (!str) {
+    return str;
+  }
+  return str.toString().replace(
     /[&<>'"]/g,
     (tag) =>
       ({
@@ -13,7 +16,10 @@ export const encodeHtml = (str: string): string => {
 };
 
 export const decodeHtml = (str: string): string => {
-  return str.replace(
+  if (!str) {
+    return str;
+  }
+  return str.toString().replace(
     /&(\D+);/gi,
     (tag) =>
       ({

package/src/lib/utils/csv-util.ts

@@ -0,0 +1,89 @@
+import { ServerResponse } from 'http';
+import { Db } from '../db';
+
+export const exportCSVData = async (db: Db, tableName: string, res: ServerResponse) => {
+  res.write(`@TABLE,${tableName}\r\n`);
+
+  const result = await db.selectObject(tableName);
+  if (result && result.length > 0) {
+    const fields = Object.keys(result[0]).join(',').toLowerCase();
+    res.write(`@FIELD,${fields}\r\n`);
+    result.forEach((row: any) => {
+      res.write(`${JSON.stringify(Object.values(row))}\r\n`);
+    });
+  } else {
+    res.write('#no data\r\n');
+  }
+};
+
+export const exportCSVHead = (fileName: string, res: ServerResponse) => {
+  res.writeHead(200, {
+    'Content-Type': 'text/csv',
+    // 'Expires': '0',
+    // 'Cache-Control': 'no-cache, no-store, must-revalidate',
+    'Content-Disposition': 'attachment; filename=' + fileName + '.ljcsv',
+    // 'Content-Description': 'File Transfer',
+  });
+};
+
+export const exportCSV = async (db: Db, tableName: string, res: ServerResponse) => {
+  if (tableName) {
+    exportCSVHead(tableName + '-' + new Date().toJSON().replace(/:/g, '-'), res);
+    await exportCSVData(db, tableName, res);
+  } else {
+    res.writeHead(200, { 'Content-Type': 'text/html' });
+    res.write('Need a table name.');
+  }
+  res.end();
+  return true;
+};
+
+export const loadCSV = async (db: Db, lines: string[]) => {
+  let table = '';
+  let insSql = '';
+  const result: any = {};
+  let toFields: string[] = [];
+  let toFieldsIndex: number[] = [];
+  for (const i in lines) {
+    if (!lines[i] || lines[i].startsWith('#')) {
+      continue;
+    }
+    if (lines[i].startsWith('@TABLE,')) {
+      table = lines[i].substring(7);
+      result[table] = { succeeded: 0, failed: 0, errorMessage: [] };
+
+      const toTableInfo = await db.getTableInfo(table);
+      toFields = toTableInfo.map((item: any) => item.name);
+    } else if (lines[i].startsWith('@FIELD,')) {
+      const allCsvFields = lines[i].substring(7).split(',');
+      const validFields: string[] = [];
+      const validIndices: number[] = [];
+
+      allCsvFields.forEach((field, index) => {
+        if (toFields.includes(field)) {
+          validFields.push(field);
+          validIndices.push(index);
+        }
+      });
+
+      toFieldsIndex = validIndices;
+      const values = Array(validFields.length).fill('?').join(',');
+      insSql = `INSERT INTO ${table} (${validFields.join(',')}) VALUES (${values})`;
+    } else {
+      if (toFields.length === 0 || !insSql) {
+        throw new Error('Invalid CSV format (no @TABLE or @FIELD)');
+      }
+      try {
+        const row = JSON.parse(lines[i]);
+        const values = toFieldsIndex.map((index: number) => row[index]);
+        await db.execute(insSql, values);
+        result[table].succeeded++;
+      } catch (error: any) {
+        result[table].failed++;
+        result[table].errorMessage.push(error.message);
+      }
+    }
+  }
+
+  return result;
+};

package/src/lib/utils/index.ts

@@ -1,12 +1,13 @@
+export * from './cookie-util';
 export * from './crypto';
+export * from './csv-util';
 export * from './date-utils';
 export * from './deep-merge';
 export * from './delay';
 export * from './file-setting';
 export * from './format-bytes';
+export * from './fs-utils';
 export * from './get-env';
 export * from './is-type';
 export * from './load-env';
 export * from './pad';
-export * from './cookie-util';
-export * from './fs-utils';