@rdyl/node-koa-controller 0.2.5 → 0.2.6

package/dist/cache.js

@@ -99,32 +99,30 @@ var ASTCache = /** @class */ (function () {
                 }
                 // @ts-ignore
                 router[method.toLowerCase()](path, function (_ctx) { return __awaiter(_this, void 0, void 0, function () {
-                    var instance, _a, stat, value, token, _b;
-                    return __generator(this, function (_c) {
-                        switch (_c.label) {
+                    var instance, jwt, stat, _a;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
                                 instance = new Instance(_ctx);
-                                _c.label = 1;
+                                _b.label = 1;
                             case 1:
-                                _c.trys.push([1, 5, , 6]);
+                                _b.trys.push([1, 5, , 6]);
                                 if (!useJwt) return [3 /*break*/, 3];
-                                return [4 /*yield*/, useJwt.use(_ctx)];
+                                return [4 /*yield*/, useJwt(_ctx)];
                             case 2:
-                                _a = _c.sent(), stat = _a.stat, value = _a.value, token = _a.token;
+                                jwt = _b.sent();
+                                stat = jwt.stat;
                                 if ((stat === "none" || stat === "expired") && !isPublic) {
                                     return [2 /*return*/, instance.status.unauthorized()];
                                 }
-                                instance.jwt = {
-                                    token: token,
-                                    value: value,
-                                };
-                                _c.label = 3;
+                                instance.jwt = jwt;
+                                _b.label = 3;
                             case 3: return [4 /*yield*/, Promise.resolve(instance[name]())];
                             case 4:
-                                _c.sent();
+                                _b.sent();
                                 return [3 /*break*/, 6];
                             case 5:
-                                _b = _c.sent();
+                                _a = _b.sent();
                                 instance.status.exception();
                                 return [3 /*break*/, 6];
                             case 6: return [2 /*return*/];

package/dist/index.js

@@ -62,11 +62,11 @@ var utils_1 = require("./utils");
 var cache_1 = __importDefault(require("./cache"));
 function useApiController(app, opts) {
     return __awaiter(this, void 0, void 0, function () {
-        var root, _a, prefix, _b, port, _c, logs, formidable, jwt, router, rootDir, ip;
+        var root, _a, prefix, _b, port, _c, logs, formidable, useJwt, router, rootDir, ip;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
-                    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, jwt = opts.jwt;
+                    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;
                     cache_1.default.prefix = prefix;
                     router = new koa_router_1.default();
                     rootDir = (0, path_1.resolve)(process.cwd(), root);
@@ -74,7 +74,7 @@ function useApiController(app, opts) {
                 case 1:
                     _d.sent();
                     // 注册路由
-                    cache_1.default.register(router, jwt);
+                    cache_1.default.register(router, useJwt);
                     if (opts.static) {
                         app.use((0, koa_static_1.default)(process.cwd(), {
                             root: opts.static,
@@ -108,4 +108,3 @@ function useApiController(app, opts) {
     });
 }
 __exportStar(require("./meta"), exports);
-__exportStar(require("./jwt"), exports);

package/dist/meta.js

@@ -54,6 +54,7 @@ var BaseController = /** @class */ (function () {
     function BaseController(_ctx) {
         this._ctx = _ctx;
         this.jwt = {
+            stat: "ok",
             token: "",
             value: {},
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rdyl/node-koa-controller",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "types/index.d.ts",

package/types/cache.d.ts

@@ -1,10 +1,16 @@
 import Router from "koa-router";
-import { ASTCacheRoute } from "./meta";
-import { JwtSecretGateway } from "./jwt";
+import { ASTCacheRoute, KoaCtx } from "./meta";
 export default class ASTCache {
     static prefix: string;
     static routes: ASTCacheRoute[];
     static whitelist: (string | RegExp)[];
     static resolve(dir: string): Promise<void>;
-    static register(router: Router, useJwt?: JwtSecretGateway): void;
+    static register(router: Router, useJwt?: UseJwtHandler): void;
 }
+export type UseJwtStat = "ok" | "expired" | "none";
+export type UseJwtHandlerRes = {
+    stat: UseJwtStat;
+    token: string;
+    value: unknown;
+};
+export type UseJwtHandler = (_ctx: KoaCtx) => Promise<UseJwtHandlerRes>;

package/types/index.d.ts

@@ -2,4 +2,3 @@ import Koa from "koa";
 import { SyncUseValue, UseProps } from "./meta";
 export declare function useApiController(app: Koa, opts: UseProps): Promise<SyncUseValue>;
 export * from "./meta";
-export * from "./jwt";

package/types/meta.d.ts

@@ -1,7 +1,7 @@
 import { ParameterizedContext } from "koa";
 import { IRouterParamContext } from "koa-router";
 import { ExtendedFormidableOptions } from "koa-body";
-import { JwtSecretGateway } from "./jwt";
+import { UseJwtHandler, UseJwtHandlerRes } from "./cache";
 export type KoaCtx = ParameterizedContext<any, IRouterParamContext<any, {}>, any>;
 export declare enum HttpMethod {
     GET = "GET",
@@ -12,7 +12,7 @@ export declare enum HttpMethod {
 }
 export declare class BaseController {
     _ctx: KoaCtx;
-    jwt: UseJwtCtx;
+    jwt: UseJwtHandlerRes;
     constructor(_ctx: KoaCtx);
     get pathname(): string;
     get query(): {
@@ -59,7 +59,7 @@ export interface UseProps {
     static?: string;
     logs?: boolean;
     formidable?: ExtendedFormidableOptions;
-    jwt?: JwtSecretGateway;
+    useJwt?: UseJwtHandler;
 }
 export interface SyncUseValue {
     port: number;