@x-9lab/xlab 1.4.1 → 1.5.1

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

@@ -24,28 +24,6 @@ export { base64Toascii };
  */
 declare function params(dat: Record<string, any>, url: string): string;
 export { params };
-/**
- * 格式化时间
- * @param  format 日期格式
- * @param  ts     时间戳
- * @return        格式化后的时间
- */
-declare function date(format: string, ts: number): string;
-/**
- * 格式化时间
- * @param  format 日期格式
- * @param  ts     日期字符串
- * @return        格式化后的时间
- */
-declare function date(format: string, ts: string): string;
-/**
- * 格式化时间
- * @param  format 日期格式
- * @param  ts     日期对象
- * @return        格式化后的时间
- */
-declare function date(format: string, ts: Date): string;
-export { date };
 /**
  * 生成操作结果数据对象
  * @param  status 返回码
@@ -76,6 +54,9 @@ export { responseResult };
  */
 declare function getMD5(...args: any[]): string;
 export { getMD5 };
+/**将一个输入字符串转为 md5 */
+declare function md5(str: string): string;
+export { md5 };
 /**
  * 对象值转化为数组
  * @param  obj 待转的对象
@@ -83,22 +64,6 @@ export { getMD5 };
  */
 declare function object2Array(obj: XLab.JsonObject): any[];
 export { object2Array };
-/**
- * 默认 Promise 处理函数
- * @param resolve Promise 成功处理函数
- * @param reject  Promise 异常处理函数
- */
-declare function defPromiseHandler<T = any>(resolve: Function, reject: Function): (err: Error, re: T) => void;
-export { defPromiseHandler };
-/**Promise 包装函数 */
-declare function promiseWapper(...args: any[]): Promise<unknown>;
-export { promiseWapper };
-/**
- * 封装一个 promise 形式的 request 方法
- * @deprecated 请直接使用 component 中的 request 模块
- */
-declare function requestWapper<T = any>(...args: any[]): Promise<unknown>;
-export { requestWapper };
 /**
  * 格式化 JSON 数据
  * @param  data 原始数据字符串

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

@@ -2,32 +2,14 @@
 interface InternalComponents {
     /**资产 */
     assets: typeof import("./assets");
-    /**缓存 */
-    cache: typeof import("./cache");
     /**cluster */
     cluster: typeof import("./cluster");
     /**Http header 相关 */
     header: typeof import("./header");
-    /**Html 内容处理器 */
-    "html-processor": typeof import("./html-processor");
-    /**JS 内容处理器 */
-    "js-processor": typeof import("./js-processor");
-    /**数据注入 */
-    injection: typeof import("./injection");
-    /**MD5 */
-    md5: typeof import("./md5");
     /**MIME */
     mime: typeof import("./mime");
-    /**客户端判断 */
-    platform: typeof import("./platform");
-    /**请求参数处理 */
-    querystring: typeof import("./querystring");
-    /**各种重定向方法 */
-    redirect: typeof import("./redirect");
     /**简单的 uuid */
     uuid: typeof import("./uuid");
-    /**版本比对 */
-    version: typeof import("./version");
     /**定时任务 */
     cron: typeof import("./cron");
     /**日志 */
@@ -36,7 +18,5 @@ interface InternalComponents {
     "return-code": typeof import("./return-code");
     /**通用工具函数集 */
     common: typeof import("./common");
-    /**内部请求模块 */
-    request: typeof import("./request");
 }
 export type { InternalComponents };

package/@types/global.d.ts

@@ -1,5 +1,4 @@
 import type { InternalComponents } from "./components";
-export type { IPlat } from "./components/platform";
 import type Koa from "koa";
 declare global {
     /**全局日志对象 */
@@ -170,6 +169,8 @@ declare global {
             staticResourceCacheTime?: number;
             /**是否允许静态资源跨域访问 */
             staticCros?: boolean;
+            /**时区, 默认是 Asia/Shanghai */
+            timezone?: string;
         }
         /**业务错误数据对象 */
         interface ICodeItem {

package/dist/@config/config.js

@@ -19,6 +19,7 @@ const CONFIG = {
     "enableCron": false,
     "middleware": [],
     "strictSSL": false,
-    "root": "public"
+    "root": "public",
+    "timezone": "Asia/Shanghai"
 };
 const _default = CONFIG;

package/dist/components/common/index.js

@@ -16,13 +16,10 @@ _export(exports, {
     asciiTobase64: ()=>asciiTobase64,
     base64Toascii: ()=>base64Toascii,
     params: ()=>params,
-    date: ()=>date,
     responseResult: ()=>responseResult,
     getMD5: ()=>getMD5,
+    md5: ()=>md5,
     object2Array: ()=>object2Array,
-    defPromiseHandler: ()=>defPromiseHandler,
-    promiseWapper: ()=>promiseWapper,
-    requestWapper: ()=>requestWapper,
     formatJson: ()=>formatJson,
     toJsonp: ()=>toJsonp,
     walk: ()=>walk,
@@ -79,52 +76,6 @@ function checkLogger() {
     }
     return data;
 }
-const format_exp = /[YymndjNwaAghGHis]/g;
-/**
- * 格式化时间
- * @param  format 日期格式
- * @param  ts     日期数据(时间戳, 字符串)
- * @return        格式化后的时间
- */ function date(format, ts) {
-    ts = new Date(ts);
-    return format.replace(format_exp, function(tag) {
-        switch(tag){
-            case "Y":
-                return ts.getFullYear();
-            case "y":
-                return ts.getFullYear() % 100;
-            case "m":
-                return (0, _utils.fix0)(ts.getMonth() + 1, 2);
-            case "n":
-                return ts.getMonth() + 1;
-            case "d":
-                return (0, _utils.fix0)(ts.getDate(), 2);
-            case "j":
-                return ts.getDate();
-            case "N":
-                return ts.getDay();
-            case "w":
-                return ts.getDay() % 7;
-            case "a":
-                return ts.getHours() < 12 ? "am" : "pm";
-            case "A":
-                return ts.getHours() < 12 ? "AM" : "PM";
-            case "g":
-                return ts.getHours() % 12 + 1;
-            case "h":
-                return (0, _utils.fix0)(ts.getHours() % 12 + 1, 2);
-            case "G":
-                return ts.getHours();
-            case "H":
-                return (0, _utils.fix0)(ts.getHours(), 2);
-            case "i":
-                return (0, _utils.fix0)(ts.getMinutes(), 2);
-            case "s":
-                return (0, _utils.fix0)(ts.getSeconds(), 2);
-        }
-        return tag;
-    });
-}
 /**
  * 生成操作结果数据对象
  * @param  status 布尔，操作结果
@@ -150,6 +101,11 @@ const format_exp = /[YymndjNwaAghGHis]/g;
     });
     return _crypto.default.createHash("md5").update(JSON.stringify(conditions), "utf8").digest("hex");
 }
+/**将一个输入字符串转为 md5 */ function md5(str) {
+    var md5 = _crypto.default.createHash("md5");
+    md5.update(str);
+    return md5.digest("hex");
+}
 /**
  * 对象值转化为数组
  * @param  obj 待转的对象
@@ -161,36 +117,6 @@ const format_exp = /[YymndjNwaAghGHis]/g;
     });
     return arr;
 }
-/**
- * 默认 Promise 处理函数
- * @param resolve Promise 成功处理函数
- * @param reject  Promise 异常处理函数
- */ function defPromiseHandler(resolve, reject) {
-    return function(err, re) {
-        if (err) {
-            console.error(err);
-            reject(err);
-        } else if (re) {
-            resolve(re);
-        } else {
-            reject("No result.");
-        }
-    };
-}
-/**Promise 包装函数 */ function promiseWapper(...args) {
-    var handler = args.pop();
-    handler = handler;
-    var p = new Promise(handler);
-    return p;
-}
-/**
- * 封装一个 promise 形式的 request 方法
- * @deprecated 请直接使用 component 中的 request 模块
- */ function requestWapper(...args) {
-    return new Promise(function(_, reject) {
-        reject(new Error("请直接使用 component 中的 request 模块"));
-    });
-}
 /**
  * 格式化 JSON 数据
  * @param  data 原始数据字符串

package/dist/components/cron/index.js

@@ -59,7 +59,7 @@ const config = getSysConfig("cron") || {
  * @return      无返回值
  */ function killSomeone(name) {
     if (CRON_TIMERS[name]) {
-        console.log("Stop crontab job ", name);
+        logger.info("Stop crontab job ", name);
         clearTimeout(CRON_TIMERS[name]);
         CRON_TIMERS[name] = null;
     }

package/dist/components/uuid/index.js

@@ -14,7 +14,7 @@ _export(exports, {
 });
 const _utils = require("@x-drive/utils");
 const _os = require("os");
-const _md5 = require("../md5");
+const _common = require("../common");
 var ref;
 var netInterfaces = (0, _os.networkInterfaces)();
 const X_MAC = ((ref = Object.keys(netInterfaces).sort().map((key)=>netInterfaces[key]).flat(1).find((en)=>{
@@ -29,7 +29,7 @@ netInterfaces = null;
     var r = (0, _utils.random)(2333333, 23333).toString(16);
     r = r.length < 6 ? r += "0" : r;
     return [
-        (0, _md5.md5)([
+        (0, _common.getMD5)([
             one,
             X_MAC,
             tow

package/dist/middleware/service-mark.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "default", {
     enumerable: true,
     get: ()=>_default
 });
+const _utils = require("@x-drive/utils");
 const serverPackge = require("../../package.json");
 var info = {};
 // 业务名称
@@ -17,7 +18,7 @@ info.serverVer = serverPackge.version;
 info.serverName = serverPackge.name;
 // 业务启动时间
 // FIX ME : 服务器不是北京时间的时候这个数据跟实际启动的时间存在时差
-info.date = requireMod("common").date("Y-m-d H:i:s", new Date());
+info.date = (0, _utils.date)(new Date(), "Y-m-d H:i:s");
 // 模块版本信息
 const CLIENT_MARK = `${info.mark}@${info.version}`;
 const SERVER_MARK = `${info.serverName}@${info.serverVer}`;

package/dist/middlewares.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "default", {
     enumerable: true,
     get: ()=>_default
 });
-const _common = require("./components/common");
 const _utils = require("@x-drive/utils");
+const _common = require("./components/common");
 const _defaultXConfig = /*#__PURE__*/ _interopRequireDefault(require("./default-x-config"));
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
@@ -25,34 +25,11 @@ const cwd = process.cwd();
     "compress": true,
     "cors": true
 };
-/**兼容老的中间件声明 */ function compatibleWithOldVer(list) {
-    const middlewares = {};
-    list.forEach((item, index)=>{
-        var subject;
-        var name;
-        subject = {
-            index
-        };
-        if ((0, _utils.isString)(item)) {
-            name = item;
-        } else if ((0, _utils.isArray)(item)) {
-            name = item[0];
-            if (item[1]) {
-                subject.config = item[1];
-            }
-        }
-        middlewares[name] = subject;
-    });
-    return middlewares;
-}
 /**获取中间件加载执行列表 */ function getExeList() {
     const config = getSysConfig();
     var mConfig;
     if (config.middlewares) {
         mConfig = config.middlewares;
-    } else if ((0, _utils.isArray)(config.middleware) && config.middleware.length) {
-        masterLog("middlewares", "warn", "middleware 配置已弃用并将在 v1.3.0 之后删除，请使用 middlewares 配置中间件");
-        mConfig = compatibleWithOldVer(config.middleware);
     } else {
         mConfig = null;
     }

package/dist/router.js

@@ -155,7 +155,9 @@ function _interopRequireDefault(obj) {
     };
     // 业务基本目录
     var _p = _path.default.resolve(__dirname, API_BUSINESS_DIR);
-    walk(_p, {}, processBusiness);
+    if ((0, _common.checkFileStat)(_p)) {
+        walk(_p, {}, processBusiness);
+    }
     // 支持自定义 api
     _p = _path.default.resolve(process.cwd(), _defaultXConfig.default.businessDir, API_BUSINESS_DIR);
     if (process.cwd() !== __dirname && (0, _common.checkFileStat)(_p)) {

package/dist/server.js

@@ -72,6 +72,7 @@ function _interopRequireWildcard(obj, nodeInterop) {
     }
     return newObj;
 }
+process.env.TZ = _config.default.timezone;
 const logger = _log.globalLog.getLogger("system");
 (0, _dotFile.processDotFile)(_config.default.env, logger);
 // 只在 master 上输出的日志
@@ -93,8 +94,6 @@ if (_config.default.custom) {
 }
 // 加载中间件
 (0, _middlewares.default)(app);
-// 数据体解析
-// app.use(koaBody());
 const koaRouter = new _koaRouter.default();
 // 路由中间件
 app.use(koaRouter.routes());

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@x-9lab/xlab",
-    "version": "1.4.1",
+    "version": "1.5.1",
     "description": "9lab 服务端模块",
     "versionDesc": "静态文件服务支持跨域",
     "scripts": {
@@ -24,33 +24,25 @@
         "cron": "1.8.2",
         "log4js": "^1.1.1",
         "liftoff": "4.0.0",
-        "koa-ejs": "4.3.0",
         "minimist": "1.2.6",
-        "koa-body": "5.0.0",
-        "lru-cache": "^6.0.0",
-        "node-fetch": "3.0.0",
         "koa-static": "5.0.0",
         "koa-router": "11.0.1",
-        "http-proxy": "1.18.1",
         "koa-compress": "5.1.0",
-        "@x-drive/utils": "1.1.23",
-        "@x-drive/node-fetch-warper": "1.0.1"
+        "@x-drive/utils": "1.1.24"
     },
     "devDependencies": {
-        "co": "4.6.0",
-        "mocha": "10.0.0",
         "tslib": "2.3.0",
         "colors": "1.4.0",
         "should": "11.2.1",
         "nodemon": "2.0.12",
         "chokidar": "3.5.3",
+        "@swc/cli": "0.1.57",
         "typescript": "4.3.4",
-        "@types/node": "16.11.40",
+        "@swc/core": "1.2.212",
         "@types/log4js": "2.3.5",
+        "@types/node": "16.11.40",
         "@types/koa-static": "4.0.2",
         "@types/koa-router": "7.4.4",
-        "@swc/cli": "0.1.57",
-        "@swc/core": "1.2.212",
         "@x-drive/changelog": "1.1.6"
     },
     "bin": {

package/dist/business/utils/cookie/1.1.0/clean/index.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: ()=>_default
-});
-function onClean(ctx) {
-    var cookies = ctx.query.c && ctx.query.c.split(",") || null;
-    if (!cookies) {
-        cookies = [];
-        (ctx.headers.cookie || "").split("; ").forEach((item)=>{
-            cookies.push(item.split("=")[0]);
-        });
-    }
-    let len = 0;
-    if (cookies && cookies.length) {
-        let cookiePath = "/";
-        let expires = new Date(-1);
-        let httpOnly = false;
-        cookies.forEach((cookie)=>{
-            if (cookie) {
-                ctx.cookies.set(cookie, "", {
-                    "path": cookiePath,
-                    expires,
-                    httpOnly
-                });
-                len += 1;
-            }
-        });
-    }
-    ctx.body = `Clean ${len}`;
-}
-const _default = onClean;

package/dist/business/utils/cookie/1.1.0/clean/js/@tpls/js.tpl

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<meta name="HandheldFriendly" content="true">
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="format-detection" content="telephone=no" />
-<script type="text/javascript">
-(function(){
-    var el = document.createElement("p");
-    var cookies = {cookies};
-    var expires = (new Date(-1)).toUTCString();
-    var len = 0;
-    if (cookies && cookies.length) {
-        cookies.forEach(item => {
-            if (item) {
-                document.cookie = item + "=''; path=/;expires=" + expires;
-                len += 1;
-            }
-        });
-    }
-    el.innerHTML = "Clean " + len;
-    setTimeout(function(){
-        document.body.append(el);
-        el = null;
-    }, 100)
-})()
-</script>
-</head>
-<body>
-</body>
-</html>

package/dist/business/utils/cookie/1.1.0/clean/js/index.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: ()=>_default
-});
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-const _fs = /*#__PURE__*/ _interopRequireDefault(require("fs"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-const JS_TPL = _fs.default.readFileSync(_path.default.resolve(__dirname, "./@tpls/js.tpl"), "utf8");
-function onJsClean(ctx) {
-    var cookies = ctx.query.c;
-    cookies = cookies && cookies.split(",") || null;
-    if (!cookies) {
-        cookies = [];
-        (ctx.headers.cookie || "").split("; ").forEach((item)=>{
-            if (item) {
-                cookies.push(item.split("=")[0]);
-            }
-        });
-    }
-    ctx.body = JS_TPL.replace("{cookies}", JSON.stringify(cookies));
-}
-const _default = onJsClean;

package/dist/components/cache/index.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "local", {
-    enumerable: true,
-    get: ()=>_lru.create
-});
-const _lru = require("./lru");

package/dist/components/cache/lru.js

@@ -1,93 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    create: ()=>create,
-    get: ()=>get,
-    len: ()=>len
-});
-const _utils = require("@x-drive/utils");
-const _lruCache = /*#__PURE__*/ _interopRequireDefault(require("lru-cache"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-const maxCache = 100;
-const maxAge = 60 * 60 * 1000;
-const MAX_NUM = 20;
-var NOW_NUM = 0;
-const CACHE_LIST = [];
-/**
- * LRU-CACHE实例缓存对象
- */ var LRU_CACHES = {};
-/**
- * 初始化缓存实例
- * @param  cacheName 缓存名称
- * @param  conf      缓存配置
- * @return           缓存实例
- */ function init(cacheName, conf) {
-    if (NOW_NUM >= MAX_NUM) {
-        var cache;
-        var deadName;
-        deadName = CACHE_LIST.shift();
-        cache = LRU_CACHES[deadName];
-        if (cache) {
-            cache.reset();
-            cache = null;
-            LRU_CACHES[deadName] = null;
-            NOW_NUM -= 1;
-        }
-    }
-    conf = conf || {};
-    conf.max = conf.max || maxCache;
-    conf.maxAge = conf.maxAge || maxAge;
-    LRU_CACHES[cacheName] = new _lruCache.default(conf);
-    NOW_NUM += 1;
-    CACHE_LIST.push(cacheName);
-    return LRU_CACHES[cacheName];
-}
-/**
- * 生成或获取一个缓存实例
- * @param  cacheName 实例名称
- * @param  conf      缓存配置，仅在生成的时候有效
- * @return           缓存实例
- */ function create(cacheName, conf) {
-    cacheName = cacheName || "DEFAULT";
-    if (!LRU_CACHES[cacheName]) {
-        if (LRU_CACHES[cacheName] === null) {
-            console.log(`${cacheName} 为已被回收的缓存实例，重新生成新实例对象`);
-        }
-        init(cacheName, conf);
-    }
-    return LRU_CACHES[cacheName];
-}
-/**
- * 获取一个缓存实例
- * @param name 缓存名称
- * @param conf 缓存配置
- */ function get(name, conf) {
-    if (!(0, _utils.isString)(name)) {
-        throw new Error("必须指定缓存名称");
-    }
-    if (LRU_CACHES[name]) {
-        return LRU_CACHES[name];
-    }
-    if ((0, _utils.isObject)(conf)) {
-        return create(name, conf);
-    }
-    throw new Error(`找不到缓存 ${name}, 你可以先创建再调用本方法获取,或传入配置对象自动生成`);
-}
-/**
- * 获取当前缓存实例数量
- * @return 缓存数量
- */ function len() {
-    return CACHE_LIST.length;
-}