mock-service-cli 2.3.1 → 2.3.2

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.3.2](https://github.com/chandq/mock-service-cli/compare/v2.3.1...v2.3.2) (2022-01-02)
+
+
+### Bug Fixes
+
+* be sure to write file successfully ([55415e3](https://github.com/chandq/mock-service-cli/commit/55415e387af4d8232db2bede0a51dad1dca474b3))
+
 ### [2.3.1](https://github.com/chandq/mock-service-cli/compare/v2.2.0...v2.3.1) (2022-01-01)
 
 

package/README.md

@@ -162,7 +162,7 @@ const socket = io.connect('http://192.168.31.54:8090/mock-data', {
   }
 });
 
-socket.emit('mock-dir-stat', '/home/chen/projects/isc-twin-model-ui/mock');
+socket.emit('mock-dir-stat', '/home/chen/projects/model-ui/mock');
 socket.on('mock-dir-stat', function (data) {
   console.debug('mock-dir-stat:', data);
 });

package/lib/manageMockFiles.js

@@ -2,7 +2,7 @@
  * @description: 生成Mock文件、获取mock数据统计
  * @Date: 2021-12-22 16:57:08
  * @LastEditors: chendq
- * @LastEditTime: 2022-01-01 10:51:12
+ * @LastEditTime: 2022-01-02 12:16:12
  * @Author: chendq
  */
 const fsa = require('fs-extra'),
@@ -21,9 +21,23 @@ const {
 } = require('./utils');
 const log = logger(process.env.SILENT);
 const processArgv = process.env.ARGV ? JSON.parse(process.env.ARGV) : {};
-let LOGGER = getLogger();
 
 const methodRegExp = new RegExp(`(${SupportMethods.join('|')}) +(.*)`, 'i');
+/**
+ * @description: 记录日志文件函数
+ * @param {boolean} isWriteLogFile 是否写入日志文件
+ * @param {string} mockDir 存放日志文件的目录
+ * @return {object}
+ */
+const logFile = (isWriteLogFile = false, mockDir) => {
+  if (isWriteLogFile) {
+    return getLogger(mockDir);
+  }
+  return {
+    log: function () {},
+    error: function () {}
+  };
+};
 /**
  * @description: 生成mock文件（自动生成mock-list.json文件，并维护<url, [method]>的关系映射）
  * @param {string} apiUrl 请求url
@@ -33,7 +47,7 @@ const methodRegExp = new RegExp(`(${SupportMethods.join('|')}) +(.*)`, 'i');
  * @return {*} void
  *
  */
-const genMockFiles = function ({ url: apiUrl, method, data: resJsonData, dir: mockDir }) {
+const genMockFiles = async function ({ url: apiUrl, method, data: resJsonData, dir: mockDir }) {
   const type = getDataType(resJsonData);
   if (!apiUrl || !method || !resJsonData || !mockDir) {
     log.info(
@@ -53,7 +67,7 @@ const genMockFiles = function ({ url: apiUrl, method, data: resJsonData, dir: mo
     return;
   }
   apiUrl = apiUrl.trim().split('?')[0];
-  LOGGER = getLogger(mockDir);
+  const LOGGER = logFile(processArgv.l || processArgv.log, mockDir);
   const normalizeApiUrl = filePath2ApiUrl(path.normalize(apiUrl));
   const mockListFilePath = path.resolve(process.cwd(), `${mockDir}/mock-list.json`);
   const mockFilePath = path.resolve(process.cwd(), `${mockDir}/${encodeURIComponent(path.normalize(apiUrl))}.json`);
@@ -74,7 +88,7 @@ const genMockFiles = function ({ url: apiUrl, method, data: resJsonData, dir: mo
   }
   if (!oldMockListContent || !_.isEqual(oldMockListContent, newMockListContent)) {
     Object.keys(newMockListContent).length > 0 &&
-      writeStream(mockListFilePath, JSON.stringify(newMockListContent, null, 2));
+      fs.writeFileSync(mockListFilePath, JSON.stringify(newMockListContent, null, 2));
   }
 
   // mock文件存在
@@ -89,17 +103,13 @@ const genMockFiles = function ({ url: apiUrl, method, data: resJsonData, dir: mo
       return;
     }
     mockFileContent[method] = resJsonData;
-    writeStream(mockFilePath, JSON.stringify(mockFileContent, null, 2));
-    if (processArgv.l || processArgv.log) {
-      LOGGER.log(`Update file:  ${method} ${apiUrl}  ${mockFilePath}`);
-    }
+    await writeStream(mockFilePath, JSON.stringify(mockFileContent, null, 2));
+    LOGGER.log(`Update file:  ${method} ${apiUrl}  ${mockFilePath}`);
   } else {
     // fsa.ensureFileSync(mockFilePath);
 
-    writeStream(mockFilePath, JSON.stringify({ [method]: resJsonData }, null, 2));
-    if (processArgv.l || processArgv.log) {
-      LOGGER.log(`Write new file:  ${method} ${apiUrl}  ${mockFilePath}`);
-    }
+    await writeStream(mockFilePath, JSON.stringify({ [method]: resJsonData }, null, 2));
+    LOGGER.log(`Write new file:  ${method} ${apiUrl}  ${mockFilePath}`);
   }
   // console.debug('file::', `${mockDir}/${apiUrl}`, newMockListContent);
 };

package/lib/mockServer.js

@@ -150,9 +150,9 @@ if (process.env.SOCKET_SERVER) {
     socket.on('mock-file-stat', function (filePath) {
       socket.emit('mock-file-stat', getMockStatFromFile(filePath));
     });
-    socket.on('save-data', function (data) {
+    socket.on('save-data', async function (data) {
       // console.log('lis save-data:', data);
-      genMockFiles(data);
+      await genMockFiles(data);
     });
 
     socket.on('disconnect', function () {

package/lib/utils.js

@@ -2,7 +2,7 @@
  * @description: 工具函数库
  * @Date: 2021-12-25 17:52:48
  * @LastEditors: chendq
- * @LastEditTime: 2021-12-31 23:10:02
+ * @LastEditTime: 2022-01-02 12:32:33
  * @Author: chendq
  */
 const fs = require('fs');
@@ -119,20 +119,25 @@ const getDataType = function (data) {
  * @description: 流方式写文件（适合写超大文件）
  * @param {string} filePath
  * @param {object} data
- * @return {*}
+ * @return {promise}
  */
 const writeStream = function (filePath, data) {
   // 创建一个可写流   也会创建一个test1.txt文件
   const writerStream = fs.createWriteStream(filePath);
-  // 将数据写入流
-  writerStream.write(data, 'utf-8');
-  // 标记文件的结束
-  writerStream.end();
-  writerStream.on('finish', () => {
-    // console.log('写入完成');
-  });
-  writerStream.on('error', () => {
-    console.error(`${filePath} 写入失败`);
+  return new Promise((resolve, reject) => {
+    // 将数据写入流
+    writerStream.write(data, 'utf-8');
+    // 标记文件的结束
+    writerStream.end();
+    writerStream.on('finish', () => {
+      resolve(data);
+      // console.log('写入完成');
+    });
+
+    writerStream.on('error', err => {
+      reject(err);
+      console.error(`${filePath} 写入失败`);
+    });
   });
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mock-service-cli",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "🦅 Local mock server",
   "main": "./lib/mockServer.js",
   "bin": {