@rdyl/node-koa-controller 0.2.5 → 0.2.7
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 +12 -14
- package/dist/index.js +3 -4
- package/dist/meta.js +1 -0
- package/package.json +1 -1
- package/types/cache.d.ts +2 -3
- package/types/index.d.ts +0 -1
- package/types/meta.d.ts +9 -3
- package/dist/jwt.js +0 -171
- package/types/jwt.d.ts +0 -37
- package/types/type.d.ts +0 -6
package/CHANGELOG.md
CHANGED
package/dist/cache.js
CHANGED
|
@@ -99,32 +99,30 @@ var ASTCache = /** @class */ (function () {
|
|
|
99
99
|
}
|
|
100
100
|
// @ts-ignore
|
|
101
101
|
router[method.toLowerCase()](path, function (_ctx) { return __awaiter(_this, void 0, void 0, function () {
|
|
102
|
-
var instance,
|
|
103
|
-
return __generator(this, function (
|
|
104
|
-
switch (
|
|
102
|
+
var instance, jwt, stat, _a;
|
|
103
|
+
return __generator(this, function (_b) {
|
|
104
|
+
switch (_b.label) {
|
|
105
105
|
case 0:
|
|
106
106
|
instance = new Instance(_ctx);
|
|
107
|
-
|
|
107
|
+
_b.label = 1;
|
|
108
108
|
case 1:
|
|
109
|
-
|
|
109
|
+
_b.trys.push([1, 5, , 6]);
|
|
110
110
|
if (!useJwt) return [3 /*break*/, 3];
|
|
111
|
-
return [4 /*yield*/, useJwt
|
|
111
|
+
return [4 /*yield*/, useJwt(_ctx)];
|
|
112
112
|
case 2:
|
|
113
|
-
|
|
113
|
+
jwt = _b.sent();
|
|
114
|
+
stat = jwt.stat;
|
|
114
115
|
if ((stat === "none" || stat === "expired") && !isPublic) {
|
|
115
116
|
return [2 /*return*/, instance.status.unauthorized()];
|
|
116
117
|
}
|
|
117
|
-
instance.jwt =
|
|
118
|
-
|
|
119
|
-
value: value,
|
|
120
|
-
};
|
|
121
|
-
_c.label = 3;
|
|
118
|
+
instance.jwt = jwt;
|
|
119
|
+
_b.label = 3;
|
|
122
120
|
case 3: return [4 /*yield*/, Promise.resolve(instance[name]())];
|
|
123
121
|
case 4:
|
|
124
|
-
|
|
122
|
+
_b.sent();
|
|
125
123
|
return [3 /*break*/, 6];
|
|
126
124
|
case 5:
|
|
127
|
-
|
|
125
|
+
_a = _b.sent();
|
|
128
126
|
instance.status.exception();
|
|
129
127
|
return [3 /*break*/, 6];
|
|
130
128
|
case 6: return [2 /*return*/];
|
package/dist/index.js
CHANGED
|
@@ -62,11 +62,11 @@ var utils_1 = require("./utils");
|
|
|
62
62
|
var cache_1 = __importDefault(require("./cache"));
|
|
63
63
|
function useApiController(app, opts) {
|
|
64
64
|
return __awaiter(this, void 0, void 0, function () {
|
|
65
|
-
var root, _a, prefix, _b, port, _c, logs, formidable,
|
|
65
|
+
var root, _a, prefix, _b, port, _c, logs, formidable, useJwt, router, rootDir, ip;
|
|
66
66
|
return __generator(this, function (_d) {
|
|
67
67
|
switch (_d.label) {
|
|
68
68
|
case 0:
|
|
69
|
-
root = opts.root, _a = opts.prefix, prefix = _a === void 0 ? "" : _a, _b = opts.port, port = _b === void 0 ? 8080 : _b, _c = opts.logs, logs = _c === void 0 ? true : _c, formidable = opts.formidable,
|
|
69
|
+
root = opts.root, _a = opts.prefix, prefix = _a === void 0 ? "" : _a, _b = opts.port, port = _b === void 0 ? 8080 : _b, _c = opts.logs, logs = _c === void 0 ? true : _c, formidable = opts.formidable, useJwt = opts.useJwt;
|
|
70
70
|
cache_1.default.prefix = prefix;
|
|
71
71
|
router = new koa_router_1.default();
|
|
72
72
|
rootDir = (0, path_1.resolve)(process.cwd(), root);
|
|
@@ -74,7 +74,7 @@ function useApiController(app, opts) {
|
|
|
74
74
|
case 1:
|
|
75
75
|
_d.sent();
|
|
76
76
|
// 注册路由
|
|
77
|
-
cache_1.default.register(router,
|
|
77
|
+
cache_1.default.register(router, useJwt);
|
|
78
78
|
if (opts.static) {
|
|
79
79
|
app.use((0, koa_static_1.default)(process.cwd(), {
|
|
80
80
|
root: opts.static,
|
|
@@ -108,4 +108,3 @@ function useApiController(app, opts) {
|
|
|
108
108
|
});
|
|
109
109
|
}
|
|
110
110
|
__exportStar(require("./meta"), exports);
|
|
111
|
-
__exportStar(require("./jwt"), exports);
|
package/dist/meta.js
CHANGED
package/package.json
CHANGED
package/types/cache.d.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import Router from "koa-router";
|
|
2
|
-
import { ASTCacheRoute } from "./meta";
|
|
3
|
-
import { JwtSecretGateway } from "./jwt";
|
|
2
|
+
import { ASTCacheRoute, UseJwtHandler } from "./meta";
|
|
4
3
|
export default class ASTCache {
|
|
5
4
|
static prefix: string;
|
|
6
5
|
static routes: ASTCacheRoute[];
|
|
7
6
|
static whitelist: (string | RegExp)[];
|
|
8
7
|
static resolve(dir: string): Promise<void>;
|
|
9
|
-
static register(router: Router, useJwt?:
|
|
8
|
+
static register(router: Router, useJwt?: UseJwtHandler): void;
|
|
10
9
|
}
|
package/types/index.d.ts
CHANGED
package/types/meta.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { ParameterizedContext } from "koa";
|
|
2
2
|
import { IRouterParamContext } from "koa-router";
|
|
3
3
|
import { ExtendedFormidableOptions } from "koa-body";
|
|
4
|
-
import { JwtSecretGateway } from "./jwt";
|
|
5
4
|
export type KoaCtx = ParameterizedContext<any, IRouterParamContext<any, {}>, any>;
|
|
6
5
|
export declare enum HttpMethod {
|
|
7
6
|
GET = "GET",
|
|
@@ -12,7 +11,7 @@ export declare enum HttpMethod {
|
|
|
12
11
|
}
|
|
13
12
|
export declare class BaseController {
|
|
14
13
|
_ctx: KoaCtx;
|
|
15
|
-
jwt:
|
|
14
|
+
jwt: UseJwtHandlerRes;
|
|
16
15
|
constructor(_ctx: KoaCtx);
|
|
17
16
|
get pathname(): string;
|
|
18
17
|
get query(): {
|
|
@@ -59,7 +58,7 @@ export interface UseProps {
|
|
|
59
58
|
static?: string;
|
|
60
59
|
logs?: boolean;
|
|
61
60
|
formidable?: ExtendedFormidableOptions;
|
|
62
|
-
|
|
61
|
+
useJwt?: UseJwtHandler;
|
|
63
62
|
}
|
|
64
63
|
export interface SyncUseValue {
|
|
65
64
|
port: number;
|
|
@@ -80,3 +79,10 @@ export interface ASTCacheRoute {
|
|
|
80
79
|
prefix: string;
|
|
81
80
|
handlers: ASTCacheHandler[];
|
|
82
81
|
}
|
|
82
|
+
export type UseJwtStat = "ok" | "expired" | "none";
|
|
83
|
+
export type UseJwtHandlerRes = {
|
|
84
|
+
stat: UseJwtStat;
|
|
85
|
+
token: string;
|
|
86
|
+
value: unknown;
|
|
87
|
+
};
|
|
88
|
+
export type UseJwtHandler = (_ctx: KoaCtx) => Promise<UseJwtHandlerRes>;
|
package/dist/jwt.js
DELETED
|
@@ -1,171 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
13
|
-
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
-
function step(op) {
|
|
16
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
-
switch (op[0]) {
|
|
21
|
-
case 0: case 1: t = op; break;
|
|
22
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
-
default:
|
|
26
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
-
if (t[2]) _.ops.pop();
|
|
31
|
-
_.trys.pop(); continue;
|
|
32
|
-
}
|
|
33
|
-
op = body.call(thisArg, _);
|
|
34
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
-
}
|
|
37
|
-
};
|
|
38
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
|
-
};
|
|
41
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
|
-
exports.JwtSecretGateway = void 0;
|
|
43
|
-
var crypto_js_1 = __importDefault(require("crypto-js"));
|
|
44
|
-
var JwtTokens = /** @class */ (function () {
|
|
45
|
-
function JwtTokens(KEY, duration) {
|
|
46
|
-
this.KEY = KEY;
|
|
47
|
-
this.duration = duration;
|
|
48
|
-
this.records = [];
|
|
49
|
-
}
|
|
50
|
-
JwtTokens.prototype.encode = function (payload) {
|
|
51
|
-
var KEY = this.KEY;
|
|
52
|
-
var text = JSON.stringify(payload);
|
|
53
|
-
return crypto_js_1.default.AES.encrypt(text, KEY).toString();
|
|
54
|
-
};
|
|
55
|
-
JwtTokens.prototype.decode = function (value) {
|
|
56
|
-
try {
|
|
57
|
-
var KEY = this.KEY;
|
|
58
|
-
var bytes = crypto_js_1.default.AES.decrypt(value, KEY);
|
|
59
|
-
var result = bytes.toString(crypto_js_1.default.enc.Utf8);
|
|
60
|
-
return JSON.parse(result);
|
|
61
|
-
}
|
|
62
|
-
catch (error) {
|
|
63
|
-
return null;
|
|
64
|
-
}
|
|
65
|
-
};
|
|
66
|
-
JwtTokens.prototype.removeBy = function (t) {
|
|
67
|
-
var records = this.records;
|
|
68
|
-
for (var i = 0; i < records.length; i++) {
|
|
69
|
-
var ele = records[i];
|
|
70
|
-
if (ele.token == t) {
|
|
71
|
-
this.records.splice(i, 1);
|
|
72
|
-
break;
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
};
|
|
76
|
-
JwtTokens.prototype.find = function (t) {
|
|
77
|
-
var records = this.records;
|
|
78
|
-
var result = null;
|
|
79
|
-
for (var i = 0; i < records.length; i++) {
|
|
80
|
-
var ele = records[i];
|
|
81
|
-
if (ele.token == t) {
|
|
82
|
-
result = ele;
|
|
83
|
-
break;
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
return result;
|
|
87
|
-
};
|
|
88
|
-
JwtTokens.prototype.get = function (token) {
|
|
89
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
90
|
-
var result, time;
|
|
91
|
-
return __generator(this, function (_a) {
|
|
92
|
-
result = this.find(token);
|
|
93
|
-
if (!result) {
|
|
94
|
-
return [2 /*return*/, {
|
|
95
|
-
stat: "none",
|
|
96
|
-
token: token,
|
|
97
|
-
value: null,
|
|
98
|
-
}];
|
|
99
|
-
}
|
|
100
|
-
else {
|
|
101
|
-
time = new Date().getTime();
|
|
102
|
-
if (result.expired <= time) {
|
|
103
|
-
this.removeBy(token);
|
|
104
|
-
return [2 /*return*/, {
|
|
105
|
-
stat: "expired",
|
|
106
|
-
token: token,
|
|
107
|
-
value: result.data,
|
|
108
|
-
}];
|
|
109
|
-
}
|
|
110
|
-
return [2 /*return*/, {
|
|
111
|
-
stat: "ok",
|
|
112
|
-
token: token,
|
|
113
|
-
value: result.data,
|
|
114
|
-
}];
|
|
115
|
-
}
|
|
116
|
-
return [2 /*return*/];
|
|
117
|
-
});
|
|
118
|
-
});
|
|
119
|
-
};
|
|
120
|
-
JwtTokens.prototype.create = function (data) {
|
|
121
|
-
var token = this.encode(data);
|
|
122
|
-
var created = new Date().getTime();
|
|
123
|
-
var item = {
|
|
124
|
-
token: token,
|
|
125
|
-
data: data,
|
|
126
|
-
created: created,
|
|
127
|
-
expired: created + this.duration,
|
|
128
|
-
};
|
|
129
|
-
this.records.push(item);
|
|
130
|
-
return token;
|
|
131
|
-
};
|
|
132
|
-
return JwtTokens;
|
|
133
|
-
}());
|
|
134
|
-
var JwtSecretGateway = /** @class */ (function () {
|
|
135
|
-
function JwtSecretGateway(headerName, opts) {
|
|
136
|
-
this.headerName = headerName;
|
|
137
|
-
var KEY = opts.KEY, _a = opts.duration, duration = _a === void 0 ? 7 * 24 * 60 * 60 * 1000 : _a;
|
|
138
|
-
this._jwtToken = new JwtTokens(KEY, duration);
|
|
139
|
-
}
|
|
140
|
-
JwtSecretGateway.prototype.use = function (ctx) {
|
|
141
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
142
|
-
var token, _a;
|
|
143
|
-
return __generator(this, function (_b) {
|
|
144
|
-
switch (_b.label) {
|
|
145
|
-
case 0:
|
|
146
|
-
_b.trys.push([0, 2, , 3]);
|
|
147
|
-
token = ctx.request.headers[this.headerName.toLowerCase()];
|
|
148
|
-
return [4 /*yield*/, this._jwtToken.get(token)];
|
|
149
|
-
case 1: return [2 /*return*/, _b.sent()];
|
|
150
|
-
case 2:
|
|
151
|
-
_a = _b.sent();
|
|
152
|
-
return [2 /*return*/, {
|
|
153
|
-
stat: "none",
|
|
154
|
-
token: "",
|
|
155
|
-
value: null,
|
|
156
|
-
}];
|
|
157
|
-
case 3: return [2 /*return*/];
|
|
158
|
-
}
|
|
159
|
-
});
|
|
160
|
-
});
|
|
161
|
-
};
|
|
162
|
-
JwtSecretGateway.prototype.authorize = function (data) {
|
|
163
|
-
var token = this._jwtToken.create(data);
|
|
164
|
-
return token;
|
|
165
|
-
};
|
|
166
|
-
JwtSecretGateway.prototype.remove = function (t) {
|
|
167
|
-
this._jwtToken.removeBy(t);
|
|
168
|
-
};
|
|
169
|
-
return JwtSecretGateway;
|
|
170
|
-
}());
|
|
171
|
-
exports.JwtSecretGateway = JwtSecretGateway;
|
package/types/jwt.d.ts
DELETED
|
@@ -1,37 +0,0 @@
|
|
|
1
|
-
import { KoaCtx } from "./meta";
|
|
2
|
-
declare class JwtTokens {
|
|
3
|
-
KEY: string;
|
|
4
|
-
duration: number;
|
|
5
|
-
records: JwtTokenItem[];
|
|
6
|
-
constructor(KEY: string, duration: number);
|
|
7
|
-
encode(payload: UseJwtValue): string;
|
|
8
|
-
decode(value: string): UseJwtValue | null;
|
|
9
|
-
removeBy(t: string): void;
|
|
10
|
-
find(t: string): JwtTokenItem | null;
|
|
11
|
-
get(token: string): Promise<JwtResData>;
|
|
12
|
-
create(data: UseJwtValue): string;
|
|
13
|
-
}
|
|
14
|
-
export declare class JwtSecretGateway {
|
|
15
|
-
headerName: string;
|
|
16
|
-
_jwtToken: JwtTokens;
|
|
17
|
-
constructor(headerName: string, opts: {
|
|
18
|
-
KEY: string;
|
|
19
|
-
duration?: number;
|
|
20
|
-
});
|
|
21
|
-
use(ctx: KoaCtx): Promise<JwtResData>;
|
|
22
|
-
authorize(data: UseJwtValue): string;
|
|
23
|
-
remove(t: string): void;
|
|
24
|
-
}
|
|
25
|
-
export interface JwtTokenItem {
|
|
26
|
-
token: string;
|
|
27
|
-
data: UseJwtValue;
|
|
28
|
-
expired: number;
|
|
29
|
-
created: number;
|
|
30
|
-
}
|
|
31
|
-
export type JwtStat = "ok" | "expired" | "none";
|
|
32
|
-
export type JwtResData = {
|
|
33
|
-
stat: JwtStat;
|
|
34
|
-
token: string;
|
|
35
|
-
value: UseJwtValue | null;
|
|
36
|
-
};
|
|
37
|
-
export {};
|