@rdyl/node-koa-controller 0.3.3 → 0.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1 -1
- package/dist/cache.js +36 -17
- package/dist/meta.js +1 -5
- package/dist/utils.js +38 -25
- package/package.json +1 -1
- package/types/utils.d.ts +1 -1
package/CHANGELOG.md
CHANGED
package/dist/cache.js
CHANGED
|
@@ -41,6 +41,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
41
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
42
|
var fs_1 = __importDefault(require("fs"));
|
|
43
43
|
var path_1 = require("path");
|
|
44
|
+
var utils_1 = require("./utils");
|
|
44
45
|
var ASTCache = /** @class */ (function () {
|
|
45
46
|
function ASTCache() {
|
|
46
47
|
}
|
|
@@ -99,29 +100,47 @@ var ASTCache = /** @class */ (function () {
|
|
|
99
100
|
}
|
|
100
101
|
// @ts-ignore
|
|
101
102
|
router[method.toLowerCase()](path, function (_ctx) { return __awaiter(_this, void 0, void 0, function () {
|
|
102
|
-
var
|
|
103
|
+
var next;
|
|
104
|
+
var _this = this;
|
|
103
105
|
return __generator(this, function (_a) {
|
|
104
106
|
switch (_a.label) {
|
|
105
107
|
case 0:
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
108
|
+
next = function () { return __awaiter(_this, void 0, void 0, function () {
|
|
109
|
+
var instance, jwt, err_1;
|
|
110
|
+
return __generator(this, function (_a) {
|
|
111
|
+
switch (_a.label) {
|
|
112
|
+
case 0:
|
|
113
|
+
instance = new Instance(_ctx);
|
|
114
|
+
if (!useJwt) return [3 /*break*/, 4];
|
|
115
|
+
_a.label = 1;
|
|
116
|
+
case 1:
|
|
117
|
+
_a.trys.push([1, 3, , 4]);
|
|
118
|
+
return [4 /*yield*/, useJwt(_ctx, { public: isPublic })];
|
|
119
|
+
case 2:
|
|
120
|
+
jwt = _a.sent();
|
|
121
|
+
instance.jwt = jwt;
|
|
122
|
+
return [3 /*break*/, 4];
|
|
123
|
+
case 3:
|
|
124
|
+
err_1 = _a.sent();
|
|
125
|
+
// @ts-ignore
|
|
126
|
+
return [2 /*return*/, instance.status.unauthorized(err_1 === null || err_1 === void 0 ? void 0 : err_1.message)];
|
|
127
|
+
case 4: return [4 /*yield*/, Promise.resolve(instance[name]())];
|
|
128
|
+
case 5:
|
|
129
|
+
_a.sent();
|
|
130
|
+
return [2 /*return*/];
|
|
131
|
+
}
|
|
132
|
+
});
|
|
133
|
+
}); };
|
|
134
|
+
if (!ASTCache.logs) return [3 /*break*/, 2];
|
|
135
|
+
return [4 /*yield*/, (0, utils_1.LogsHandler)(_ctx, next)];
|
|
109
136
|
case 1:
|
|
110
|
-
_a.
|
|
111
|
-
return [4 /*yield*/, Promise.resolve(useJwt(_ctx, {
|
|
112
|
-
public: isPublic,
|
|
113
|
-
}))];
|
|
114
|
-
case 2:
|
|
115
|
-
jwt = _a.sent();
|
|
116
|
-
instance.jwt = jwt;
|
|
137
|
+
_a.sent();
|
|
117
138
|
return [3 /*break*/, 4];
|
|
139
|
+
case 2: return [4 /*yield*/, next()];
|
|
118
140
|
case 3:
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
case 4:
|
|
123
|
-
instance[name]();
|
|
124
|
-
return [2 /*return*/];
|
|
141
|
+
_a.sent();
|
|
142
|
+
_a.label = 4;
|
|
143
|
+
case 4: return [2 /*return*/];
|
|
125
144
|
}
|
|
126
145
|
});
|
|
127
146
|
}); });
|
package/dist/meta.js
CHANGED
|
@@ -42,7 +42,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
42
42
|
exports.Patch = exports.Put = exports.Delete = exports.Post = exports.Get = exports.BaseController = exports.HttpMethod = void 0;
|
|
43
43
|
exports.Controller = Controller;
|
|
44
44
|
var cache_1 = __importDefault(require("./cache"));
|
|
45
|
-
var utils_1 = require("./utils");
|
|
46
45
|
var HttpMethod;
|
|
47
46
|
(function (HttpMethod) {
|
|
48
47
|
HttpMethod["GET"] = "GET";
|
|
@@ -132,11 +131,8 @@ var BaseController = /** @class */ (function () {
|
|
|
132
131
|
var _this = this;
|
|
133
132
|
var sendJson = function (body) {
|
|
134
133
|
_this._ctx.response.set("Content-Type", "application/json;charset=utf-8");
|
|
135
|
-
_this._ctx.
|
|
134
|
+
_this._ctx.status = body.code;
|
|
136
135
|
_this._ctx.body = body;
|
|
137
|
-
if (cache_1.default.logs) {
|
|
138
|
-
(0, utils_1.LogsHandler)(_this._ctx);
|
|
139
|
-
}
|
|
140
136
|
};
|
|
141
137
|
return {
|
|
142
138
|
ok: function (data) {
|
package/dist/utils.js
CHANGED
|
@@ -82,34 +82,47 @@ function getIPAdress() {
|
|
|
82
82
|
}
|
|
83
83
|
return "127.0.0.1";
|
|
84
84
|
}
|
|
85
|
-
function LogsHandler(ctx) {
|
|
85
|
+
function LogsHandler(ctx, next) {
|
|
86
86
|
return __awaiter(this, void 0, void 0, function () {
|
|
87
|
-
var start, duration,
|
|
87
|
+
var start, duration, status_1, method, statusColor, dateTime, dText;
|
|
88
88
|
return __generator(this, function (_a) {
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
89
|
+
switch (_a.label) {
|
|
90
|
+
case 0:
|
|
91
|
+
start = Date.now();
|
|
92
|
+
_a.label = 1;
|
|
93
|
+
case 1:
|
|
94
|
+
_a.trys.push([1, , 3, 4]);
|
|
95
|
+
return [4 /*yield*/, next()];
|
|
96
|
+
case 2:
|
|
97
|
+
_a.sent();
|
|
98
|
+
return [3 /*break*/, 4];
|
|
99
|
+
case 3:
|
|
100
|
+
duration = Date.now() - start;
|
|
101
|
+
status_1 = ctx.response.status;
|
|
102
|
+
method = ctx.method;
|
|
103
|
+
statusColor = void 0;
|
|
104
|
+
if (status_1 >= 500)
|
|
105
|
+
statusColor = chalk_1.default.red;
|
|
106
|
+
else if (status_1 >= 400)
|
|
107
|
+
statusColor = chalk_1.default.yellow;
|
|
108
|
+
else if (status_1 >= 300)
|
|
109
|
+
statusColor = chalk_1.default.cyan;
|
|
110
|
+
else if (status_1 >= 200)
|
|
111
|
+
statusColor = chalk_1.default.green;
|
|
112
|
+
else
|
|
113
|
+
statusColor = chalk_1.default.gray;
|
|
114
|
+
dateTime = formatDateTime();
|
|
115
|
+
dText = chalk_1.default.gray("".concat(duration, "ms"));
|
|
116
|
+
if (duration > 5000) {
|
|
117
|
+
dText = chalk_1.default.red("".concat(duration, "ms"));
|
|
118
|
+
}
|
|
119
|
+
else if (duration > 1000) {
|
|
120
|
+
dText = chalk_1.default.yellow("".concat(duration, "ms"));
|
|
121
|
+
}
|
|
122
|
+
console.log("- [".concat(dateTime, " | ").concat(dText, "] ").concat(chalk_1.default.magenta(method), " ").concat(ctx.url, " ").concat(statusColor(status_1)));
|
|
123
|
+
return [7 /*endfinally*/];
|
|
124
|
+
case 4: return [2 /*return*/];
|
|
107
125
|
}
|
|
108
|
-
else if (duration > 1000) {
|
|
109
|
-
dText = chalk_1.default.yellow("".concat(duration, "ms"));
|
|
110
|
-
}
|
|
111
|
-
console.log("- [".concat(dateTime, " | ").concat(dText, "] ").concat(chalk_1.default.magenta(method), " ").concat(ctx.url, " ").concat(statusColor(status)));
|
|
112
|
-
return [2 /*return*/];
|
|
113
126
|
});
|
|
114
127
|
});
|
|
115
128
|
}
|
package/package.json
CHANGED
package/types/utils.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { KoaCtx } from "./meta";
|
|
2
2
|
export declare function formatDateTime(date?: Date, format?: string): string;
|
|
3
3
|
export declare function getIPAdress(): string;
|
|
4
|
-
export declare function LogsHandler(ctx: KoaCtx): Promise<void>;
|
|
4
|
+
export declare function LogsHandler(ctx: KoaCtx, next: () => Promise<any>): Promise<void>;
|
|
5
5
|
export declare function ServerLaunchLogs(config: {
|
|
6
6
|
port: number;
|
|
7
7
|
prefix: string;
|