@x-9lab/xlab 1.0.2 → 1.0.4-alpha.1

package/@types/components/common/index.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="node" />
+import { sleep, labelReplace, fix0, numberFormat } from "@x-drive/utils";
 import fs from "fs";
+export { labelReplace, fix0, numberFormat, sleep };
 /**
  * ascii字符串转为base64字符串
  * @param  str 要转化的字符串
@@ -22,38 +24,6 @@ export { base64Toascii };
  */
 declare function params(dat: Record<string, any>, url: string): string;
 export { params };
-/**
- * 按位数格式化数字
- * @param  val       要格式化的数字
- * @param  separator 分割符
- * @param  size      分割位数间隔
- * @return           格式化完的字符串
- */
-declare function numberFormat(val: number, separator: string, size: number): string;
-export { numberFormat };
-/**
- * 批量替换字符串中带花括号标签为指定数据
- * @param  tpl  待处理的字符串
- * @param  data 替换数据
- * @return      替换后端字符串
- */
-declare function labelReplace(tpl: string, data: Record<string, XLab.JsonValue>): string;
-/**
- * 批量替换字符串中带花括号标签为指定数据
- * @param  tpl  待处理的字符串
- * @param  data 替换数据
- * @return      替换后端字符串
- */
-declare function labelReplace(tpl: string, data: XLab.JsonValue): string;
-export { labelReplace };
-/**
- * 格式化数字, 自动补0前续
- * @param  number 要格式化的数字
- * @param  size   格式化后出来的数字位数
- * @return        格式化结果
- */
-declare function fix0(number: number, size: number): string;
-export { fix0 };
 /**
  * 格式化时间
  * @param  format 日期格式
@@ -168,16 +138,3 @@ export { checkFileStat };
 /**获取真正可执行的模块 */
 declare function getRealDefaultMod(mod: any): any;
 export { getRealDefaultMod };
-/**
-* 休眠随机时间
-* @param time 随机时间范围
-* @property min 最小时间(ms)
-* @property max 最大时间(ms)
-*/
-declare function sleep(time: [min: number, max: number]): Promise<boolean>;
-/**
- * 休眠
- * @param time 休眠时间(ms)
- */
-declare function sleep(time: number): Promise<boolean>;
-export { sleep };

package/@types/components/html-processor/index.d.ts

@@ -1,5 +1,5 @@
 import type Koa from "koa";
-declare type RouteOption = Record<string, string | string[]>;
+declare type RouteOption = Record<string, string | string[] | Function>;
 interface HtmlProcessorOptions {
     route?: RouteOption;
 }

package/@types/components/request/index.d.ts

@@ -1,4 +1,4 @@
-import type { RequestInit } from "node-fetch";
+import type { RequestInit, Response } from "node-fetch";
 /**支持的返回数据类型 */
 declare type IFetchType = "text" | "json" | "blob" | "buffer" | "arrayBuffer";
 /**请求配置 */
@@ -32,14 +32,14 @@ export { setDefHeaders };
  * @param config            请求配置
  * @param needProcessConfig 是否需要处理配置
  */
-declare function httpFetch<T = unknown>(type: string, uri: string, query?: Record<string, any>, data?: any, config?: IFetchConfig, retry?: number, needProcessConfig?: boolean): any;
+declare function httpFetch<T = unknown>(type: string, uri: string, query?: Record<string, any>, data?: any, config?: IFetchConfig, retry?: number, needProcessConfig?: boolean): Promise<T>;
 export { httpFetch as fetch };
 /**
  * 发起一个 get 请求
  * @param uri   请求地址
  * @param query 请求参数
  */
-declare function requsetGet<T = unknown>(uri: string, query?: Record<string, any>, config?: IFetchConfig): Promise<any>;
+declare function requsetGet<T = unknown>(uri: string, query?: Record<string, any>, config?: IFetchConfig): Promise<T>;
 export { requsetGet as get };
 /**
  * 发起一个 post 请求
@@ -47,5 +47,5 @@ export { requsetGet as get };
  * @param query 请求参数
  * @param data  请求数据
  */
-declare function requestPost<T>(uri: string, query?: any, data?: any, config?: IFetchConfig): Promise<any>;
+declare function requestPost<T>(uri: string, query?: any, data?: any, config?: IFetchConfig): Promise<T>;
 export { requestPost as post };

package/@types/components/uuid/index.d.ts

@@ -1,3 +1,5 @@
+/**当前机器的 mac */
+export declare const X_MAC: string;
 /**
  * 生成一个 uuid
  * @param one 第一节数据

package/@types/default-x-config.d.ts

@@ -0,0 +1,6 @@
+declare class Config {
+    get businessDir(): string;
+    set businessDir(val: string);
+}
+declare const _default: Config;
+export default _default;

package/@types/global.d.ts

@@ -164,5 +164,15 @@ declare global {
         }
         /**业务错误定义 */
         type ICodeDetail = Record<string, ICodeItem>;
+        /**模块配置 */
+        interface XConfig {
+            /**watch 模式配置 */
+            watch?: {
+                /**是否启用 watch */
+                enable: boolean;
+            };
+            /**服务端业务目录，默认是 @server */
+            businessDir?: string;
+        }
     }
 }

package/README.md

@@ -14,6 +14,10 @@ X-9lab 通用服务端
         }
     }
     ```
+- 配置文件 `xlab.config.js`
+    模块会自动检测执行根目录中是否存在 `xlab.config.js` 文件。如存在该文件则会使用该文件为模块的启动配置文件。支持的配置项：
+    1. `watch` 是否开启 watch 模式
+    1. `business` 业务目录名称。注意当前只支持根目录下的文件夹
 - `watch` 模式
     `xlab` 支持自动重启业务，开发中使用该功能可以减少大量手动重启业务的操作。
     启用方式：

package/dist/bin/watch.js

@@ -1,4 +1,5 @@
 "use strict";
+const XConfig = require("../default-x-config");
 const { date  } = require("@x-drive/utils");
 const crossSpawn = require("cross-spawn");
 const colors = require("colors/safe");
@@ -107,7 +108,7 @@ const fs = require("fs");
         if (chokidar) {
             if (!config.paths) {
                 // 默认业务自定义服务端业务文件夹
-                const customDir = path.resolve(process.cwd(), "@server");
+                const customDir = path.resolve(process.cwd(), XConfig.businessDir);
                 config.paths = [
                     customDir
                 ];

package/dist/bin/xlab

@@ -1,14 +1,15 @@
 #!/usr/bin/env node
 
 const argv = require("minimist")(process.argv.slice(2));
-const { merge } = require("@x-drive/utils");
+const { merge, isString } = require("@x-drive/utils");
+const XConfig = require("../default-x-config").default;
 const Liftoff = require("liftoff");
 
 const cli = new Liftoff({
     "name": "x-lab"
     , "processTitle": "X Lab"
     , "moduleName": "xlab"
-    , "configName": "xlab-config"
+    , "configName": "xlab.config"
     , "extensions": {
         ".js": null
     }
@@ -17,6 +18,7 @@ const cli = new Liftoff({
 const hasWatch = argv.w || argv.watch;
 
 function onLaunch(env) {
+    /**@type {XLab.XConfig} */
     let config = {
         "watch": {
             "enable": false
@@ -30,6 +32,9 @@ function onLaunch(env) {
             }
         } catch (e) { }
     }
+    if (isString(config.businessDir)) {
+        XConfig.businessDir = config.businessDir;
+    }
     if (hasWatch) {
         config.watch.enable = true;
     }

package/dist/components/common/index.js

@@ -9,12 +9,13 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+    labelReplace: ()=>_utils.labelReplace,
+    fix0: ()=>_utils.fix0,
+    numberFormat: ()=>_utils.numberFormat,
+    sleep: ()=>_utils.sleep,
     asciiTobase64: ()=>asciiTobase64,
     base64Toascii: ()=>base64Toascii,
     params: ()=>params,
-    numberFormat: ()=>numberFormat,
-    labelReplace: ()=>labelReplace,
-    fix0: ()=>fix0,
     date: ()=>date,
     responseResult: ()=>responseResult,
     getMD5: ()=>getMD5,
@@ -26,8 +27,7 @@ _export(exports, {
     toJsonp: ()=>toJsonp,
     walk: ()=>walk,
     checkFileStat: ()=>checkFileStat,
-    getRealDefaultMod: ()=>getRealDefaultMod,
-    sleep: ()=>sleep
+    getRealDefaultMod: ()=>getRealDefaultMod
 });
 const _utils = require("@x-drive/utils");
 const _returnCode = require("../return-code");
@@ -79,68 +79,6 @@ function checkLogger() {
     }
     return data;
 }
-/**
- * 按位数格式化数字
- * @param  val       要格式化的数字
- * @param  separator 分割符
- * @param  size      分割位数间隔
- * @return           格式化完的字符串
- */ function numberFormat(val, separator, size) {
-    if (typeof val !== "number") {
-        return "0";
-    }
-    if (!separator) {
-        separator = ",";
-    }
-    if (!size) {
-        size = 3;
-    }
-    var last = size;
-    const valStr = val.toString();
-    var pos = valStr.indexOf(".");
-    var res = "";
-    if (pos === -1) {
-        pos = valStr.length;
-    } else {
-        res = valStr.substr(pos);
-    }
-    if (valStr.charAt(0) === "-") {
-        last++;
-    }
-    while(pos > last){
-        pos -= size;
-        res = separator + valStr.substr(pos, size) + res;
-    }
-    if (pos) {
-        res = valStr.substr(0, pos) + res;
-    }
-    return res;
-}
-/**
- * 带花括号标签检测正则
- */ const labelReplaceExp = /\{(\w+)\}/g;
-/**
- * 批量替换字符串中带花括号标签为指定数据
- * @param  tpl  待处理的字符串
- * @param  data 替换数据
- * @return      替换后端字符串
- */ function labelReplace(tpl, data) {
-    return tpl.replace(labelReplaceExp, function(label, key) {
-        return typeof data === "object" ? data[key] : data;
-    });
-}
-/**
- * 格式化数字, 自动补0前续
- * @param  number 要格式化的数字
- * @param  size   格式化后出来的数字位数
- * @return        格式化结果
- */ function fix0(number, size) {
-    var num = number.toString();
-    while(num.length < size){
-        num = "0" + num;
-    }
-    return num;
-}
 const format_exp = /[YymndjNwaAghGHis]/g;
 /**
  * 格式化时间
@@ -156,11 +94,11 @@ const format_exp = /[YymndjNwaAghGHis]/g;
             case "y":
                 return ts.getFullYear() % 100;
             case "m":
-                return fix0(ts.getMonth() + 1, 2);
+                return (0, _utils.fix0)(ts.getMonth() + 1, 2);
             case "n":
                 return ts.getMonth() + 1;
             case "d":
-                return fix0(ts.getDate(), 2);
+                return (0, _utils.fix0)(ts.getDate(), 2);
             case "j":
                 return ts.getDate();
             case "N":
@@ -174,15 +112,15 @@ const format_exp = /[YymndjNwaAghGHis]/g;
             case "g":
                 return ts.getHours() % 12 + 1;
             case "h":
-                return fix0(ts.getHours() % 12 + 1, 2);
+                return (0, _utils.fix0)(ts.getHours() % 12 + 1, 2);
             case "G":
                 return ts.getHours();
             case "H":
-                return fix0(ts.getHours(), 2);
+                return (0, _utils.fix0)(ts.getHours(), 2);
             case "i":
-                return fix0(ts.getMinutes(), 2);
+                return (0, _utils.fix0)(ts.getMinutes(), 2);
             case "s":
-                return fix0(ts.getSeconds(), 2);
+                return (0, _utils.fix0)(ts.getSeconds(), 2);
         }
         return tag;
     });
@@ -321,13 +259,3 @@ const format_exp = /[YymndjNwaAghGHis]/g;
     }
     return mod;
 }
-async function sleep(time) {
-    const delay = (0, _utils.isArray)(time) ? (0, _utils.random)(time[1], time[0]) : time;
-    checkLogger();
-    logger.log(`Sleep ${delay} ms`);
-    return await new Promise((res)=>{
-        setTimeout(()=>{
-            res(true);
-        }, delay);
-    });
-}

package/dist/components/html-processor/index.js

@@ -39,7 +39,7 @@ function processorVar(html, req) {
 //   设置缓存头
 //   根据配置设置相应头部
 function htmlProcessor(pathname, options, context) {
-    var filename = _path.default.resolve(conf.root + pathname);
+    var filename = _path.default.resolve(conf.root, pathname);
     // ua = req.get('user-agent'),
     var cacheKey;
     var html;
@@ -55,11 +55,11 @@ function htmlProcessor(pathname, options, context) {
     try {
         html = html_cache.get(cacheKey);
         if (!html) {
-            html = _fs.default.readFileSync(filename, 'utf8');
+            html = _fs.default.readFileSync(filename, "utf8");
             html_cache.set(cacheKey, html);
         }
     } catch (e) {
-        logger.error('HTML Process Error', e);
+        logger.error("HTML Process Error", e);
         return null;
     }
     // 无法正确读取 HTML
@@ -79,7 +79,7 @@ function htmlProcessor(pathname, options, context) {
         Object.keys(headers).forEach((key)=>{
             let val;
             if ((0, _utils.isFunction)(headers[key])) {
-                val = headers[key].call();
+                val = headers[key]();
             } else {
                 val = headers[key];
             }

package/dist/components/request/index.js

@@ -112,7 +112,6 @@ const DEF_CONFIG = {
         const resp = await (0, _nodeFetch.default)(url, options);
         if (resp) {
             if ((0, _utils.isExecutable)(config.onResponse)) {
-                // @ts-ignore
                 await config.onResponse(resp);
             }
             const data1 = await resp[config.type]();
@@ -123,7 +122,7 @@ const DEF_CONFIG = {
         reqLog.error(e);
         if (retry && retry > 0) {
             if ((0, _utils.isNumber)(config.retryDelay) && config.retryDelay > 0) {
-                await (0, _common.sleep)(config.retryDelay);
+                await (0, _common.sleep)(config.retryDelay, reqLog);
             }
             retry -= 1;
             return await httpFetch(type, uri, query, data, config, retry, false);
@@ -136,7 +135,6 @@ const DEF_CONFIG = {
  * @param uri   请求地址
  * @param query 请求参数
  */ async function requsetGet(uri, query, config) {
-    uri = preProcessor((0, _resolveUri.default)(uri), query, config === null || config === void 0 ? void 0 : config.random);
     return await httpFetch("get", uri, query, null, config);
 }
 /**
@@ -155,7 +153,5 @@ const DEF_CONFIG = {
     if ((0, _utils.isUndefined)(data)) {
         data = {};
     }
-    uri = (0, _resolveUri.default)(uri);
-    uri = preProcessor((0, _resolveUri.default)(uri), query, config === null || config === void 0 ? void 0 : config.random);
     return await httpFetch("post", uri, query, data, config);
 }

package/dist/components/uuid/index.js

@@ -2,17 +2,24 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "uuid", {
-    enumerable: true,
-    get: ()=>uuid
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    X_MAC: ()=>X_MAC,
+    uuid: ()=>uuid
 });
 const _utils = require("@x-drive/utils");
 const _os = require("os");
 const _md5 = require("../md5");
+var ref;
 var netInterfaces = (0, _os.networkInterfaces)();
-const MAC = ((netInterfaces && netInterfaces.en0 || []).find((en)=>en.mac !== "00:00:00:00:00:00") || {
-    "mac": "99:00:99:00:99:00"
-}).mac;
+const X_MAC = ((ref = Object.keys(netInterfaces).sort().map((key)=>netInterfaces[key]).flat(1).find((en)=>{
+    return en && en.family && en.family.toLowerCase() === "ipv4" && en.mac !== "00:00:00:00:00:00" ? true : false;
+})) === null || ref === void 0 ? void 0 : ref.mac) || null;
 netInterfaces = null;
 /**
  * 生成一个 uuid
@@ -24,7 +31,7 @@ netInterfaces = null;
     return [
         (0, _md5.md5)([
             one,
-            MAC,
+            X_MAC,
             tow
         ].join("&")),
         Date.now().toString(16),

package/dist/config/process-custom-config-files.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "default", {
     get: ()=>_default
 });
 const _common = require("../components/common");
+const _defaultXConfig = /*#__PURE__*/ _interopRequireDefault(require("../default-x-config"));
 const _utils = require("@x-drive/utils");
 const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
 const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
@@ -17,7 +18,7 @@ function _interopRequireDefault(obj) {
 }
 function customConfigProcessor(conf, env, envAddConfPath) {
     // 业务自定义服务端业务文件夹
-    const customDir = _path.default.resolve(process.cwd(), "@server");
+    const customDir = _path.default.resolve(process.cwd(), _defaultXConfig.default.businessDir);
     // 是否存在业务自定义服务端业务文件夹
     const hasCustom = (0, _common.checkFileStat)(customDir);
     if (hasCustom) {
@@ -49,7 +50,7 @@ function customConfigProcessor(conf, env, envAddConfPath) {
     }
     // apis文件夹配置处理
     if (hasCustom) {
-        const APIS_PATH = _path.default.resolve(process.cwd(), "@server", "@config", "@apis");
+        const APIS_PATH = _path.default.resolve(process.cwd(), _defaultXConfig.default.businessDir, "@config", "@apis");
         if ((0, _common.checkFileStat)(APIS_PATH) && conf.passExtApis !== true) {
             let apis = [];
             _fs.default.readdirSync(APIS_PATH).forEach((file)=>{

package/dist/custom.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "default", {
 });
 const _utils = require("@x-drive/utils");
 const _common = require("./components/common");
+const _defaultXConfig = /*#__PURE__*/ _interopRequireDefault(require("./default-x-config"));
 const _config = require("./config");
 const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
 function _interopRequireDefault(obj) {
@@ -17,7 +18,7 @@ function _interopRequireDefault(obj) {
 }
 /**处理自定义业务 */ function processCustom() {
     const config = (0, _config.get)();
-    const CustomPath = _path.default.resolve(process.cwd(), "@server", "custom");
+    const CustomPath = _path.default.resolve(process.cwd(), _defaultXConfig.default.businessDir, "custom");
     const hasCustom = (0, _common.checkFileStat)(CustomPath);
     if (!hasCustom) {
         return;

package/dist/default-x-config.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: ()=>_default
+});
+const _utils = require("@x-drive/utils");
+/**默认业务目录 */ var businessDir = "@server";
+let Config = class Config {
+    get businessDir() {
+        return businessDir;
+    }
+    set businessDir(val) {
+        if ((0, _utils.isString)(val)) {
+            businessDir = val;
+        }
+    }
+};
+const _default = new Config;

package/dist/global.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
+const _defaultXConfig = /*#__PURE__*/ _interopRequireDefault(require("./default-x-config"));
 const _config = require("./config");
 const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
 function _interopRequireDefault(obj) {
@@ -27,7 +28,7 @@ function _interopRequireDefault(obj) {
 global.requireMod = requireMod;
 /**
  * model 存放路径
- */ const MODEL_PATH = _path.default.resolve(process.cwd(), "@server", "business", "@models");
+ */ const MODEL_PATH = _path.default.resolve(process.cwd(), _defaultXConfig.default.businessDir, "business", "@models");
 /**
  * 全局获取 model 的方法
  * @param  name model 名称
@@ -38,7 +39,7 @@ global.requireMod = requireMod;
 global.requireModel = requireModel;
 /**
  * services 存放目录
- */ const SERVICES_PATH = _path.default.resolve(process.cwd(), "@server", "business", "@services");
+ */ const SERVICES_PATH = _path.default.resolve(process.cwd(), _defaultXConfig.default.businessDir, "business", "@services");
 /**
  * 全局获取 service 的方法
  * @param  name service 名称

package/dist/middlewares.js

@@ -8,6 +8,12 @@ Object.defineProperty(exports, "default", {
 });
 const _common = require("./components/common");
 const _utils = require("@x-drive/utils");
+const _defaultXConfig = /*#__PURE__*/ _interopRequireDefault(require("./default-x-config"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
 const cwd = process.cwd();
 /**内部中间件 */ const INTERNAL_MIDDLEWARE = {
     "combo": true,
@@ -30,7 +36,7 @@ const cwd = process.cwd();
             if (INTERNAL_MIDDLEWARE[name]) {
                 app.use((0, _common.getRealDefaultMod)(require(`./middleware/${name}`))(conf));
             } else {
-                app.use((0, _common.getRealDefaultMod)(require(`${cwd}/@server/middleware/${name}`))(conf));
+                app.use((0, _common.getRealDefaultMod)(require(`${cwd}/${_defaultXConfig.default.businessDir}/middleware/${name}`))(conf));
             }
             masterLog(`MIDDLEWARE >>> [${name}] launch`);
         });

package/dist/router.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "default", {
 });
 const _utils = require("@x-drive/utils");
 const _common = require("./components/common");
+const _defaultXConfig = /*#__PURE__*/ _interopRequireDefault(require("./default-x-config"));
 const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
@@ -91,7 +92,7 @@ function _interopRequireDefault(obj) {
     var _p = _path.default.resolve(__dirname, "business");
     (0, _common.walk)(_p, 0, processBusiness);
     // 支持自定义 api
-    _p = _path.default.resolve(process.cwd(), "@server", "business");
+    _p = _path.default.resolve(process.cwd(), _defaultXConfig.default.businessDir, "business");
     if (process.cwd() !== __dirname && (0, _common.checkFileStat)(_p)) {
         (0, _common.walk)(_p, 0, processBusiness);
     }

package/dist/server.js

@@ -16,6 +16,7 @@ _export(exports, {
 require("./global");
 const _log = require("./components/log");
 const _cron = require("./components/cron");
+const _defaultXConfig = /*#__PURE__*/ _interopRequireDefault(require("./default-x-config"));
 const _koaStatic = /*#__PURE__*/ _interopRequireDefault(require("koa-static"));
 const _koaRouter = /*#__PURE__*/ _interopRequireDefault(require("koa-router"));
 const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
@@ -113,7 +114,7 @@ app.use((0, _koaStatic.default)(_path.default.resolve(process.cwd(), _config.def
 app.use(_badRequest.default);
 if (_config.default.enableCron) {
     // 定时任务
-    (0, _cron.on)(_path.default.resolve(process.cwd(), "@server", "cron"));
+    (0, _cron.on)(_path.default.resolve(process.cwd(), _defaultXConfig.default.businessDir, "cron"));
 }
 /**启动服务 */ function boot() {
     (0, _cluster.default)();

package/package.json

@@ -1,8 +1,8 @@
 {
     "name": "@x-9lab/xlab",
-    "version": "1.0.2",
+    "version": "1.0.4-alpha.1",
     "description": "9lab 服务端模块",
-    "versionDesc": "修复 type 异常",
+    "versionDesc": "修改配置文件名称, 修改服务端主要业务目录",
     "scripts": {
         "dev": "swc src -D ./src/bin --config-file .swcrc -d dist -w",
         "compile": "swc src -D ./src/bin --config-file .swcrc -d dist",
@@ -33,7 +33,7 @@
         "koa-router": "11.0.1",
         "http-proxy": "1.18.1",
         "koa-compress": "5.1.0",
-        "@x-drive/utils": "1.1.19"
+        "@x-drive/utils": "1.1.22"
     },
     "devDependencies": {
         "co": "4.6.0",