@rdyl/node-koa-controller 0.0.9 → 0.1.1

package/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.0.9 (2025-04-07)
+## 0.1.1 (2025-04-07)
 
 
 

package/dist/controller/index.js

@@ -81,6 +81,8 @@ var koa_router_1 = __importDefault(require("koa-router"));
 var koa_static_1 = __importDefault(require("koa-static"));
 var fs_1 = __importDefault(require("fs"));
 var path_1 = require("path");
+var chalk_1 = __importDefault(require("chalk"));
+var utils_1 = require("./utils");
 exports.ASTCache = {
     prefix: "",
     routes: [],
@@ -98,7 +100,7 @@ function RegisterASTCacheRoutes(router) {
                 exports.ASTCache.whitelist.push(path);
             }
             // @ts-ignore
-            router[method.toLowerCase()](path, function (_ctx) { return __awaiter(_this, void 0, void 0, function () {
+            router[method.toLowerCase()](path, function (_ctx, next) { return __awaiter(_this, void 0, void 0, function () {
                 var instance, _a;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -122,12 +124,12 @@ function RegisterASTCacheRoutes(router) {
 }
 function useController(app, opts) {
     return __awaiter(this, void 0, void 0, function () {
-        var root, _a, prefix, router, rootDir, initAST;
+        var root, _a, prefix, _b, logs, router, rootDir, initAST;
         var _this = this;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
-                    root = opts.root, _a = opts.prefix, prefix = _a === void 0 ? "" : _a;
+                    root = opts.root, _a = opts.prefix, prefix = _a === void 0 ? "" : _a, _b = opts.logs, logs = _b === void 0 ? true : _b;
                     exports.ASTCache.prefix = prefix;
                     router = new koa_router_1.default();
                     rootDir = (0, path_1.resolve)(process.cwd(), root);
@@ -177,7 +179,7 @@ function useController(app, opts) {
                     }); };
                     return [4 /*yield*/, initAST(rootDir)];
                 case 1:
-                    _b.sent();
+                    _c.sent();
                     // 注册路由
                     RegisterASTCacheRoutes(router);
                     if (opts.static) {
@@ -186,6 +188,43 @@ function useController(app, opts) {
                         }));
                         exports.ASTCache.whitelist.unshift(new RegExp("/".concat(opts.static)));
                     }
+                    if (logs) {
+                        app.use(function (ctx, next) { return __awaiter(_this, void 0, void 0, function () {
+                            var start, duration, status_1, method, statusColor, dateTime;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        start = Date.now();
+                                        _a.label = 1;
+                                    case 1:
+                                        _a.trys.push([1, , 3, 4]);
+                                        return [4 /*yield*/, next()];
+                                    case 2:
+                                        _a.sent();
+                                        return [3 /*break*/, 4];
+                                    case 3:
+                                        duration = Date.now() - start;
+                                        status_1 = ctx.status;
+                                        method = ctx.method.padEnd(7);
+                                        statusColor = void 0;
+                                        if (status_1 >= 500)
+                                            statusColor = chalk_1.default.red;
+                                        else if (status_1 >= 400)
+                                            statusColor = chalk_1.default.yellow;
+                                        else if (status_1 >= 300)
+                                            statusColor = chalk_1.default.cyan;
+                                        else if (status_1 >= 200)
+                                            statusColor = chalk_1.default.green;
+                                        else
+                                            statusColor = chalk_1.default.gray;
+                                        dateTime = (0, utils_1.formatDateTime)();
+                                        console.log("- [".concat(dateTime, "] ").concat(chalk_1.default.magenta(method), " ").concat(ctx.url, " ").concat(statusColor(status_1), " ").concat(chalk_1.default.gray("".concat(duration, "ms"))));
+                                        return [7 /*endfinally*/];
+                                    case 4: return [2 /*return*/];
+                                }
+                            });
+                        }); });
+                    }
                     app.use(router.routes()).use(router.allowedMethods());
                     return [2 /*return*/, Promise.resolve({
                             whitelist: exports.ASTCache.whitelist,

package/dist/controller/meta.js

@@ -49,19 +49,7 @@ var HttpMethod;
 })(HttpMethod || (exports.HttpMethod = HttpMethod = {}));
 var BaseController = /** @class */ (function () {
     function BaseController(_ctx) {
-        var _this = this;
         this._ctx = _ctx;
-        this.getPagedQuery = function (def) {
-            if (def === void 0) { def = {}; }
-            var query = _this.query;
-            var p = Number(query.page);
-            var s = Number(query.pageSize);
-            var _a = def.page, dPage = _a === void 0 ? 1 : _a, _b = def.pageSize, dPageSize = _b === void 0 ? 20 : _b;
-            return {
-                page: isNaN(p) ? dPage : p,
-                pageSize: isNaN(s) ? dPageSize : s,
-            };
-        };
     }
     Object.defineProperty(BaseController.prototype, "pathname", {
         get: function () {
@@ -72,29 +60,42 @@ var BaseController = /** @class */ (function () {
     });
     Object.defineProperty(BaseController.prototype, "query", {
         get: function () {
-            return this._ctx.query;
+            var values = this._ctx.query;
+            return {
+                values: values,
+                getPaged: function (def) {
+                    if (def === void 0) { def = {}; }
+                    var p = Number(values.page);
+                    var s = Number(values.pageSize);
+                    var _a = def.page, dPage = _a === void 0 ? 1 : _a, _b = def.pageSize, dPageSize = _b === void 0 ? 20 : _b;
+                    return {
+                        page: isNaN(p) ? dPage : p,
+                        pageSize: isNaN(s) ? dPageSize : s,
+                    };
+                },
+                getNumber: function (k) {
+                    var n = values[k];
+                    if (!n)
+                        return null;
+                    var value = Number(n);
+                    if (isNaN(value))
+                        return null;
+                    return value;
+                },
+                getBool: function (k) {
+                    var b = values[k];
+                    if (!b)
+                        return null;
+                    if (b === "1" || b === "true" || b === "TRUE") {
+                        return true;
+                    }
+                    return false;
+                },
+            };
         },
         enumerable: false,
         configurable: true
     });
-    BaseController.prototype.getNumberQuery = function (k) {
-        var n = this.query[k];
-        if (!n)
-            return null;
-        var value = Number(n);
-        if (isNaN(value))
-            return null;
-        return value;
-    };
-    BaseController.prototype.getBoolQuery = function (k) {
-        var b = this.query[k];
-        if (!b)
-            return null;
-        if (b === "1" || b === "true" || b === "TRUE") {
-            return true;
-        }
-        return false;
-    };
     Object.defineProperty(BaseController.prototype, "params", {
         get: function () {
             return this._ctx.params || {};
@@ -123,6 +124,7 @@ var BaseController = /** @class */ (function () {
             var _ctx = this._ctx;
             var sendJson = function (body) {
                 _ctx.response.set("Content-Type", "application/json;charset=utf-8");
+                _ctx.response.status = body.code;
                 _ctx.body = body;
             };
             return {
@@ -130,9 +132,11 @@ var BaseController = /** @class */ (function () {
                     sendJson({ data: data, code: 200, msg: "ok" });
                 },
                 okCreated: function (data, msg) {
+                    if (msg === void 0) { msg = "ok created"; }
                     sendJson({ code: 201, data: data, msg: msg });
                 },
                 okAccept: function (data, msg) {
+                    if (msg === void 0) { msg = "ok accept"; }
                     sendJson({ code: 203, data: data, msg: msg });
                 },
                 parameterError: function (msg) {

package/dist/controller/utils.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatDateTime = formatDateTime;
+function formatDateTime(date, format) {
+    if (date === void 0) { date = new Date(); }
+    if (format === void 0) { format = "YYYY-MM-DD HH:mm:ss"; }
+    var pad = function (num) { return num.toString().padStart(2, "0"); };
+    var year = date.getFullYear();
+    var month = pad(date.getMonth() + 1);
+    var day = pad(date.getDate());
+    var hours = pad(date.getHours());
+    var minutes = pad(date.getMinutes());
+    var seconds = pad(date.getSeconds());
+    return format
+        .replace("YYYY", year.toString())
+        .replace("MM", month)
+        .replace("DD", day)
+        .replace("HH", hours)
+        .replace("mm", minutes)
+        .replace("ss", seconds);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rdyl/node-koa-controller",
-  "version": "0.0.9",
+  "version": "0.1.1",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -21,6 +21,7 @@
     "@types/koa": "^2.15.0",
     "@types/koa-router": "^7.4.8",
     "@types/koa-static": "^4.0.4",
+    "chalk": "^5.4.1",
     "koa": "^2.15.3",
     "koa-router": "^13.0.1",
     "koa-static": "^5.0.0"

package/types/controller/meta.d.ts

@@ -11,16 +11,18 @@ export declare class BaseController {
     _ctx: ParameterizedContext<any, IRouterParamContext<any, {}>, any>;
     constructor(_ctx: ParameterizedContext<any, IRouterParamContext<any, {}>, any>);
     get pathname(): string;
-    get query(): import("querystring").ParsedUrlQuery;
-    getPagedQuery: (def?: Partial<{
-        page: number;
-        pageSize: number;
-    }>) => {
-        page: number;
-        pageSize: number;
+    get query(): {
+        values: import("querystring").ParsedUrlQuery;
+        getPaged(def?: Partial<{
+            page: number;
+            pageSize: number;
+        }>): {
+            page: number;
+            pageSize: number;
+        };
+        getNumber(k: string): number | null;
+        getBool(k: string): boolean | null;
     };
-    getNumberQuery(k: string): number | null;
-    getBoolQuery(k: string): boolean | null;
     get params(): Record<string, string>;
     get body(): any;
     files(): Promise<any>;
@@ -42,14 +44,15 @@ export declare const Delete: (url: string, isPublic?: boolean) => (target: any,
 export declare const Put: (url: string, isPublic?: boolean) => (target: any, name: string) => void;
 export declare const Patch: (url: string, isPublic?: boolean) => (target: any, name: string) => void;
 export interface ResData<T> {
-    msg: string;
     code: number;
-    data: T;
+    msg: string;
+    data?: T | null;
 }
 export interface UseProps {
     root: string;
     prefix?: string;
     static?: string;
+    logs?: boolean;
 }
 export interface ASTCacheHandler {
     url: string;

package/types/controller/utils.d.ts

@@ -0,0 +1 @@
+export declare function formatDateTime(date?: Date, format?: string): string;