@rdyl/node-koa-controller 0.2.6 → 0.2.8

package/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.2.5 (2025-08-26)
+## 0.2.8 (2025-08-28)
 
 
 

package/dist/cache.js

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

package/dist/meta.js

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

package/package.json

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

package/types/cache.d.ts

@@ -1,5 +1,5 @@
 import Router from "koa-router";
-import { ASTCacheRoute, KoaCtx } from "./meta";
+import { ASTCacheRoute, UseJwtHandler } from "./meta";
 export default class ASTCache {
     static prefix: string;
     static routes: ASTCacheRoute[];
@@ -7,10 +7,3 @@ export default class ASTCache {
     static resolve(dir: string): Promise<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/meta.d.ts

@@ -1,7 +1,6 @@
 import { ParameterizedContext } from "koa";
 import { IRouterParamContext } from "koa-router";
 import { ExtendedFormidableOptions } from "koa-body";
-import { UseJwtHandler, UseJwtHandlerRes } from "./cache";
 export type KoaCtx = ParameterizedContext<any, IRouterParamContext<any, {}>, any>;
 export declare enum HttpMethod {
     GET = "GET",
@@ -80,3 +79,12 @@ export interface ASTCacheRoute {
     prefix: string;
     handlers: ASTCacheHandler[];
 }
+export type UseJwtHandlerRes = {
+    ok: boolean;
+    token: string;
+    value: unknown;
+};
+export type UseJwtHandlerOpts = {
+    public: boolean;
+};
+export type UseJwtHandler = (_ctx: KoaCtx, opts: UseJwtHandlerOpts) => UseJwtHandlerRes | Promise<UseJwtHandlerRes>;

package/dist/jwt.js

@@ -1,171 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    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);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            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;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JwtSecretGateway = void 0;
-var crypto_js_1 = __importDefault(require("crypto-js"));
-var JwtTokens = /** @class */ (function () {
-    function JwtTokens(KEY, duration) {
-        this.KEY = KEY;
-        this.duration = duration;
-        this.records = [];
-    }
-    JwtTokens.prototype.encode = function (payload) {
-        var KEY = this.KEY;
-        var text = JSON.stringify(payload);
-        return crypto_js_1.default.AES.encrypt(text, KEY).toString();
-    };
-    JwtTokens.prototype.decode = function (value) {
-        try {
-            var KEY = this.KEY;
-            var bytes = crypto_js_1.default.AES.decrypt(value, KEY);
-            var result = bytes.toString(crypto_js_1.default.enc.Utf8);
-            return JSON.parse(result);
-        }
-        catch (error) {
-            return null;
-        }
-    };
-    JwtTokens.prototype.removeBy = function (t) {
-        var records = this.records;
-        for (var i = 0; i < records.length; i++) {
-            var ele = records[i];
-            if (ele.token == t) {
-                this.records.splice(i, 1);
-                break;
-            }
-        }
-    };
-    JwtTokens.prototype.find = function (t) {
-        var records = this.records;
-        var result = null;
-        for (var i = 0; i < records.length; i++) {
-            var ele = records[i];
-            if (ele.token == t) {
-                result = ele;
-                break;
-            }
-        }
-        return result;
-    };
-    JwtTokens.prototype.get = function (token) {
-        return __awaiter(this, void 0, void 0, function () {
-            var result, time;
-            return __generator(this, function (_a) {
-                result = this.find(token);
-                if (!result) {
-                    return [2 /*return*/, {
-                            stat: "none",
-                            token: token,
-                            value: null,
-                        }];
-                }
-                else {
-                    time = new Date().getTime();
-                    if (result.expired <= time) {
-                        this.removeBy(token);
-                        return [2 /*return*/, {
-                                stat: "expired",
-                                token: token,
-                                value: result.data,
-                            }];
-                    }
-                    return [2 /*return*/, {
-                            stat: "ok",
-                            token: token,
-                            value: result.data,
-                        }];
-                }
-                return [2 /*return*/];
-            });
-        });
-    };
-    JwtTokens.prototype.create = function (data) {
-        var token = this.encode(data);
-        var created = new Date().getTime();
-        var item = {
-            token: token,
-            data: data,
-            created: created,
-            expired: created + this.duration,
-        };
-        this.records.push(item);
-        return token;
-    };
-    return JwtTokens;
-}());
-var JwtSecretGateway = /** @class */ (function () {
-    function JwtSecretGateway(headerName, opts) {
-        this.headerName = headerName;
-        var KEY = opts.KEY, _a = opts.duration, duration = _a === void 0 ? 7 * 24 * 60 * 60 * 1000 : _a;
-        this._jwtToken = new JwtTokens(KEY, duration);
-    }
-    JwtSecretGateway.prototype.use = function (ctx) {
-        return __awaiter(this, void 0, void 0, function () {
-            var token, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _b.trys.push([0, 2, , 3]);
-                        token = ctx.request.headers[this.headerName.toLowerCase()];
-                        return [4 /*yield*/, this._jwtToken.get(token)];
-                    case 1: return [2 /*return*/, _b.sent()];
-                    case 2:
-                        _a = _b.sent();
-                        return [2 /*return*/, {
-                                stat: "none",
-                                token: "",
-                                value: null,
-                            }];
-                    case 3: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    JwtSecretGateway.prototype.authorize = function (data) {
-        var token = this._jwtToken.create(data);
-        return token;
-    };
-    JwtSecretGateway.prototype.remove = function (t) {
-        this._jwtToken.removeBy(t);
-    };
-    return JwtSecretGateway;
-}());
-exports.JwtSecretGateway = JwtSecretGateway;

package/types/jwt.d.ts

@@ -1,37 +0,0 @@
-import { KoaCtx } from "./meta";
-declare class JwtTokens {
-    KEY: string;
-    duration: number;
-    records: JwtTokenItem[];
-    constructor(KEY: string, duration: number);
-    encode(payload: UseJwtValue): string;
-    decode(value: string): UseJwtValue | null;
-    removeBy(t: string): void;
-    find(t: string): JwtTokenItem | null;
-    get(token: string): Promise<JwtResData>;
-    create(data: UseJwtValue): string;
-}
-export declare class JwtSecretGateway {
-    headerName: string;
-    _jwtToken: JwtTokens;
-    constructor(headerName: string, opts: {
-        KEY: string;
-        duration?: number;
-    });
-    use(ctx: KoaCtx): Promise<JwtResData>;
-    authorize(data: UseJwtValue): string;
-    remove(t: string): void;
-}
-export interface JwtTokenItem {
-    token: string;
-    data: UseJwtValue;
-    expired: number;
-    created: number;
-}
-export type JwtStat = "ok" | "expired" | "none";
-export type JwtResData = {
-    stat: JwtStat;
-    token: string;
-    value: UseJwtValue | null;
-};
-export {};

package/types/type.d.ts

@@ -1,6 +0,0 @@
-type UseJwtCtx = {
-  token: string;
-  value: UseJwtValue;
-};
-
-type UseJwtValue = Record<string, unknown>;