abler-api 0.1.28 → 0.1.31

package/dist/cjs/pp-util.js

@@ -4,10 +4,10 @@ var require$$0 = require('crypto');
 var require$$1 = require('abler-util');
 var require$$2 = require('abler-db');
 var require$$3 = require('abler-net');
-var require$$0$1 = require('fs');
+var require$$4 = require('fs');
 var require$$1$1 = require('path');
 var require$$1$2 = require('abler-messenger');
-var require$$0$2 = require('node-cron');
+var require$$0$1 = require('node-cron');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -15,10 +15,10 @@ var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
 var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);
 var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);
 var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3);
-var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
+var require$$4__default = /*#__PURE__*/_interopDefaultLegacy(require$$4);
 var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
 var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
-var require$$0__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$0$2);
+var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
 
 const crypto = require$$0__default["default"];
 const ppUtil$4 = require$$1__default["default"].ppUtil;
@@ -26,7 +26,10 @@ const {
   dbUtil,
   kvStorage
 } = require$$2__default["default"];
-const netUtil$1 = require$$3__default["default"];
+const {
+  netUtil: netUtil$1
+} = require$$3__default["default"];
+const fs$1 = require$$4__default["default"];
 let conf$3, appSetting$1, err$2, dbSql;
 const pnToken = "access_token",
       hnToken = pnToken,
@@ -191,7 +194,7 @@ class apiUtil$2 {
 
   static sendOrRedirect(res, redirectUrl, data) {
     if (redirectUrl) {
-      redirectUrl = urlAppendParams(redirectUrl, data, true);
+      redirectUrl = netUtil$1.urlAppendParams(redirectUrl, data, true);
       res.redirect(redirectUrl);
     } else {
       res.send(data);
@@ -1421,6 +1424,25 @@ class apiUtil$2 {
     delete c.parent;
     c.host = ppUtil$4.getMyIp();
     return c; // 应用层自行处理多机同步
+  }
+  /**
+   * 修改重启标志文件
+   * 前提，PM2监视 restart,please.flag 文件，此文件若被修改则重启服务进程
+   * 此服务假设 restart,please.flag 文件最后一行是一个整数，此整数+1后保存
+   * @param options
+   * @returns {Promise<number>}
+   */
+
+
+  static async updateRestartFlag(options) {
+    const fileName = `restart,please.flag`;
+    let text = await fs$1.async_readFile(fileName, 'utf8');
+    const lines = text.split('\r\n');
+    const n = +lines[lines.length - 1] + 1;
+    lines[lines.length - 1] = ' '.repeat(50) + n.toString();
+    text = lines.join('\r\n');
+    await fs$1.async_writeFile(fileName, text);
+    return n;
   } //#endregion
 
 
@@ -1437,7 +1459,7 @@ function configNeeded() {
 
 var ppUtilApi = apiUtil$2;
 
-const fs = require$$0__default$1["default"];
+const fs = require$$4__default["default"];
 const path = require$$1__default$1["default"];
 const ppUtil$3 = require$$1__default["default"].ppUtil;
 const redisUtil = require$$2__default["default"].redisUtil;
@@ -1710,7 +1732,7 @@ var ppMessengerEx = commonMessenger$2;
  * CSCA 自动任务
  * ==============
  */
-const CRON = require$$0__default$2["default"];
+const CRON = require$$0__default$1["default"];
 const {
   ppUtil: ppUtil$1
 } = require$$1__default["default"];
@@ -1963,7 +1985,6 @@ class schedule$1 {
   }
   /**
    * 确定当前进程环境是否启用自动任务
-   * @returns {Promise<void>}
    */
 
 

package/dist/es/pp-util.js

@@ -2,10 +2,10 @@ import require$$0 from 'crypto';
 import require$$1 from 'abler-util';
 import require$$2 from 'abler-db';
 import require$$3 from 'abler-net';
-import require$$0$1 from 'fs';
+import require$$4 from 'fs';
 import require$$1$1 from 'path';
 import require$$1$2 from 'abler-messenger';
-import require$$0$2 from 'node-cron';
+import require$$0$1 from 'node-cron';
 
 const crypto = require$$0;
 const ppUtil$4 = require$$1.ppUtil;
@@ -13,7 +13,10 @@ const {
   dbUtil,
   kvStorage
 } = require$$2;
-const netUtil$1 = require$$3;
+const {
+  netUtil: netUtil$1
+} = require$$3;
+const fs$1 = require$$4;
 let conf$3, appSetting$1, err$2, dbSql;
 const pnToken = "access_token",
       hnToken = pnToken,
@@ -178,7 +181,7 @@ class apiUtil$2 {
 
   static sendOrRedirect(res, redirectUrl, data) {
     if (redirectUrl) {
-      redirectUrl = urlAppendParams(redirectUrl, data, true);
+      redirectUrl = netUtil$1.urlAppendParams(redirectUrl, data, true);
       res.redirect(redirectUrl);
     } else {
       res.send(data);
@@ -1408,6 +1411,25 @@ class apiUtil$2 {
     delete c.parent;
     c.host = ppUtil$4.getMyIp();
     return c; // 应用层自行处理多机同步
+  }
+  /**
+   * 修改重启标志文件
+   * 前提，PM2监视 restart,please.flag 文件，此文件若被修改则重启服务进程
+   * 此服务假设 restart,please.flag 文件最后一行是一个整数，此整数+1后保存
+   * @param options
+   * @returns {Promise<number>}
+   */
+
+
+  static async updateRestartFlag(options) {
+    const fileName = `restart,please.flag`;
+    let text = await fs$1.async_readFile(fileName, 'utf8');
+    const lines = text.split('\r\n');
+    const n = +lines[lines.length - 1] + 1;
+    lines[lines.length - 1] = ' '.repeat(50) + n.toString();
+    text = lines.join('\r\n');
+    await fs$1.async_writeFile(fileName, text);
+    return n;
   } //#endregion
 
 
@@ -1424,7 +1446,7 @@ function configNeeded() {
 
 var ppUtilApi = apiUtil$2;
 
-const fs = require$$0$1;
+const fs = require$$4;
 const path = require$$1$1;
 const ppUtil$3 = require$$1.ppUtil;
 const redisUtil = require$$2.redisUtil;
@@ -1697,7 +1719,7 @@ var ppMessengerEx = commonMessenger$2;
  * CSCA 自动任务
  * ==============
  */
-const CRON = require$$0$2;
+const CRON = require$$0$1;
 const {
   ppUtil: ppUtil$1
 } = require$$1;
@@ -1950,7 +1972,6 @@ class schedule$1 {
   }
   /**
    * 确定当前进程环境是否启用自动任务
-   * @returns {Promise<void>}
    */
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abler-api",
-  "version": "0.1.28",
+  "version": "0.1.31",
   "description": "API服务相关工具",
   "main": "./dist/cjs/pp-util.js",
   "module": "./dist/es/pp-util.js",