@grandlinex/kernel 0.28.2 → 0.30.0

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [v0.30.0] - 2023-04-03
+### Added
+- Switch to ESM
+- Update to core 0.30.0
+
 ## [v0.27.1] - 2023-01-26
 ### Added
 - Add raw body field for express calls 

package/dist/Kernel.js

@@ -1,22 +1,17 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = __importDefault(require("@grandlinex/core"));
-const CryptoClient_1 = __importDefault(require("./modules/crypto/CryptoClient"));
-const KernelModule_1 = __importDefault(require("./KernelModule"));
+import CoreKernel from '@grandlinex/core';
+import CryptoClient from './modules/crypto/CryptoClient';
+import KernelModule from './KernelModule';
 /**
  *  @class Kernel
  */
-class Kernel extends core_1.default {
+export default class Kernel extends CoreKernel {
     /**
      * Default Constructor
      * @param options App Name
      */
     constructor(options) {
-        super(Object.assign({}, options));
-        this.setBaseModule(new KernelModule_1.default(this));
+        super({ ...options });
+        this.setBaseModule(new KernelModule(this));
         if (options.portOverride) {
             this.debug(`use custiom api port @ ${options.portOverride}`);
             this.expressPort = options.portOverride;
@@ -26,7 +21,7 @@ class Kernel extends core_1.default {
         }
         const store = this.getConfigStore();
         if (store.has('SERVER_PASSWORD')) {
-            this.setCryptoClient(new CryptoClient_1.default(CryptoClient_1.default.fromPW(store.get('SERVER_PASSWORD')), this));
+            this.setCryptoClient(new CryptoClient(CryptoClient.fromPW(store.get('SERVER_PASSWORD')), this));
         }
     }
     getAppServerPort() {
@@ -42,4 +37,3 @@ class Kernel extends core_1.default {
         }
     }
 }
-exports.default = Kernel;

package/dist/KernelModule.js

@@ -1,35 +1,18 @@
-"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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@grandlinex/core");
-const BaseKernelModule_1 = __importDefault(require("./classes/BaseKernelModule"));
-const KernelEndpoint_1 = __importDefault(require("./api/KernelEndpoint"));
-const ApiVersionAction_1 = __importDefault(require("./actions/ApiVersionAction"));
-const GetTokenAction_1 = __importDefault(require("./actions/GetTokenAction"));
-const ApiAuthTestAction_1 = __importDefault(require("./actions/ApiAuthTestAction"));
-class KernelModule extends BaseKernelModule_1.default {
+import { OfflineService } from '@grandlinex/core';
+import BaseKernelModule from './classes/BaseKernelModule';
+import KernelEndpoint from './api/KernelEndpoint';
+import ApiVersionAction from './actions/ApiVersionAction';
+import GetTokenAction from './actions/GetTokenAction';
+import ApiAuthTestAction from './actions/ApiAuthTestAction';
+export default class KernelModule extends BaseKernelModule {
     constructor(kernel) {
         super('base-mod', kernel);
-        this.addAction(new ApiVersionAction_1.default(this), new ApiAuthTestAction_1.default(this), new GetTokenAction_1.default(this));
+        this.addAction(new ApiVersionAction(this), new ApiAuthTestAction(this), new GetTokenAction(this));
     }
-    initModule() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.addService(new core_1.OfflineService(this));
-            const endpoint = new KernelEndpoint_1.default('api', this, this.getKernel().getAppServerPort());
-            this.setPresenter(endpoint);
-            yield this.getKernel().triggerFunction('load');
-        });
+    async initModule() {
+        this.addService(new OfflineService(this));
+        const endpoint = new KernelEndpoint('api', this, this.getKernel().getAppServerPort());
+        this.setPresenter(endpoint);
+        await this.getKernel().triggerFunction('load');
     }
 }
-exports.default = KernelModule;

package/dist/actions/ApiAuthTestAction.js

@@ -1,15 +1,4 @@
-"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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const classes_1 = require("../classes");
+import { BaseApiAction } from '../classes';
 /**
  * @name ApiAuthTestAction
  *
@@ -30,16 +19,13 @@ const classes_1 = require("../classes");
  *         description: invalid token / not authorized
  *
  */
-class ApiAuthTestAction extends classes_1.BaseApiAction {
+export default class ApiAuthTestAction extends BaseApiAction {
     constructor(module) {
         super('GET', '/test/auth', module);
         this.handler = this.handler.bind(this);
     }
-    handler(req, res, next, data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.debug(data.userid);
-            res.status(200).send("It work's");
-        });
+    async handler(req, res, next, data) {
+        this.debug(data.userid);
+        res.status(200).send("It work's");
     }
 }
-exports.default = ApiAuthTestAction;

package/dist/actions/ApiVersionAction.js

@@ -1,16 +1,5 @@
-"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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const classes_1 = require("../classes");
-const BaseAction_1 = require("../classes/BaseAction");
+import { BaseApiAction } from '../classes';
+import { ActionMode } from '../classes/BaseAction';
 /**
  * @name ApiVersionAction
  *
@@ -34,17 +23,14 @@ const BaseAction_1 = require("../classes/BaseAction");
  *         description: invalid token / not authorized
  *
  */
-class ApiVersionAction extends classes_1.BaseApiAction {
+export default class ApiVersionAction extends BaseApiAction {
     constructor(module) {
         super('GET', '/version', module);
         this.handler = this.handler.bind(this);
-        this.setMode(BaseAction_1.ActionMode.DMZ);
+        this.setMode(ActionMode.DMZ);
     }
-    handler(req, res, next, data, ex) {
-        return __awaiter(this, void 0, void 0, function* () {
-            ex.done();
-            res.status(200).send({ api: 1 });
-        });
+    async handler(req, res, next, data, ex) {
+        ex.done();
+        res.status(200).send({ api: 1 });
     }
 }
-exports.default = ApiVersionAction;

package/dist/actions/GetTokenAction.js

@@ -1,16 +1,5 @@
-"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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const classes_1 = require("../classes");
-const BaseAction_1 = require("../classes/BaseAction");
+import { BaseApiAction } from '../classes';
+import { ActionMode } from '../classes/BaseAction';
 /**
  * @openapi
  * /token:
@@ -43,7 +32,7 @@ const BaseAction_1 = require("../classes/BaseAction");
  *               token:
  *                 type: string
  */
-class GetTokenAction extends classes_1.BaseApiAction {
+export default class GetTokenAction extends BaseApiAction {
     /**
      *
      * @param module Parent Module
@@ -51,33 +40,30 @@ class GetTokenAction extends classes_1.BaseApiAction {
     constructor(module) {
         super('POST', '/token', module);
         this.handler = this.handler.bind(this);
-        this.setMode(BaseAction_1.ActionMode.DMZ);
+        this.setMode(ActionMode.DMZ);
     }
-    handler(req, res, next, data, ex) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const cc = this.getKernel().getCryptoClient();
-            if (!req.body.token) {
-                res.status(400).send('no token');
-                return;
-            }
-            if (!req.body.username) {
-                res.status(401).send('no username');
-                return;
-            }
-            const { username, token } = req.body;
-            const valid = yield ex.timing.startFunc('validation', () => cc.apiTokenValidation(username, token, 'api'));
-            if (valid.valid && valid.userId) {
-                const jwt = cc.jwtGenerateAccessToken({
-                    userid: valid.userId,
-                    username,
-                });
-                ex.done();
-                res.status(200).send({ token: jwt });
-            }
-            else {
-                res.status(403).send('no no no ...');
-            }
-        });
+    async handler(req, res, next, data, ex) {
+        const cc = this.getKernel().getCryptoClient();
+        if (!req.body.token) {
+            res.status(400).send('no token');
+            return;
+        }
+        if (!req.body.username) {
+            res.status(401).send('no username');
+            return;
+        }
+        const { username, token } = req.body;
+        const valid = await ex.timing.startFunc('validation', () => cc.apiTokenValidation(username, token, 'api'));
+        if (valid.valid && valid.userId) {
+            const jwt = cc.jwtGenerateAccessToken({
+                userid: valid.userId,
+                username,
+            });
+            ex.done();
+            res.status(200).send({ token: jwt });
+        }
+        else {
+            res.status(403).send('no no no ...');
+        }
     }
 }
-exports.default = GetTokenAction;

package/dist/actions/index.js

@@ -1,12 +1,4 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetTokenAction = exports.ApiAuthTestAction = exports.ApiVersionAction = void 0;
-const ApiAuthTestAction_1 = __importDefault(require("./ApiAuthTestAction"));
-exports.ApiAuthTestAction = ApiAuthTestAction_1.default;
-const ApiVersionAction_1 = __importDefault(require("./ApiVersionAction"));
-exports.ApiVersionAction = ApiVersionAction_1.default;
-const GetTokenAction_1 = __importDefault(require("./GetTokenAction"));
-exports.GetTokenAction = GetTokenAction_1.default;
+import ApiAuthTestAction from './ApiAuthTestAction';
+import ApiVersionAction from './ApiVersionAction';
+import GetTokenAction from './GetTokenAction';
+export { ApiVersionAction, ApiAuthTestAction, GetTokenAction };

package/dist/api/KernelEndpoint.js

@@ -1,9 +1,3 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const BaseEndpoint_1 = __importDefault(require("../classes/BaseEndpoint"));
-class KernelEndpoint extends BaseEndpoint_1.default {
+import BaseEndpoint from '../classes/BaseEndpoint';
+export default class KernelEndpoint extends BaseEndpoint {
 }
-exports.default = KernelEndpoint;

package/dist/api/index.js

@@ -1,8 +1,3 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.KernelEndpoint = void 0;
-const KernelEndpoint_1 = __importDefault(require("./KernelEndpoint"));
-exports.KernelEndpoint = KernelEndpoint_1.default;
+import KernelEndpoint from './KernelEndpoint';
+// eslint-disable-next-line import/prefer-default-export
+export { KernelEndpoint };

package/dist/classes/BaseAction.js

@@ -1,70 +1,56 @@
-"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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActionMode = void 0;
-const core_1 = require("@grandlinex/core");
-const timing_1 = require("./timing");
-var ActionMode;
+import { CoreAction } from '@grandlinex/core';
+import { ExpressServerTiming } from './timing';
+export var ActionMode;
 (function (ActionMode) {
     ActionMode[ActionMode["DEFAULT"] = 0] = "DEFAULT";
     ActionMode[ActionMode["DMZ"] = 1] = "DMZ";
     ActionMode[ActionMode["DMZ_WITH_USER"] = 2] = "DMZ_WITH_USER";
-})(ActionMode = exports.ActionMode || (exports.ActionMode = {}));
-class BaseAction extends core_1.CoreAction {
+})(ActionMode || (ActionMode = {}));
+export default class BaseAction extends CoreAction {
     constructor(chanel, module) {
         super(chanel, module);
         this.secureHandler = this.secureHandler.bind(this);
         this.mode = ActionMode.DEFAULT;
     }
-    secureHandler(req, res, next) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const extension = this.initExtension(res);
-            const auth = extension.timing.start('auth');
-            res.on('finish', () => {
-                this.getKernel().responseCodeFunction({
-                    code: res.statusCode,
-                    req,
-                });
+    async secureHandler(req, res, next) {
+        const extension = this.initExtension(res);
+        const auth = extension.timing.start('auth');
+        res.on('finish', () => {
+            this.getKernel().responseCodeFunction({
+                code: res.statusCode,
+                req,
             });
-            const cc = this.getKernel().getCryptoClient();
-            if (!cc) {
-                res.status(504).send('internal server error');
-                return;
-            }
-            if (this.mode === ActionMode.DMZ) {
-                auth.stop();
-                yield this.handler(req, res, next, null, extension);
-                return;
-            }
-            const dat = yield cc.bearerTokenValidation(req);
-            auth.stop();
-            if (dat && typeof dat !== 'number') {
-                yield this.handler(req, res, next, dat, extension);
-            }
-            else if (this.mode === ActionMode.DMZ_WITH_USER) {
-                yield this.handler(req, res, next, null, extension);
-            }
-            else if (dat) {
-                res.sendStatus(dat);
-            }
-            else {
-                res.status(401).send('no no no ...');
-            }
         });
+        const cc = this.getKernel().getCryptoClient();
+        if (!cc) {
+            res.status(504).send('internal server error');
+            return;
+        }
+        if (this.mode === ActionMode.DMZ) {
+            auth.stop();
+            await this.handler(req, res, next, null, extension);
+            return;
+        }
+        const dat = await cc.bearerTokenValidation(req);
+        auth.stop();
+        if (dat && typeof dat !== 'number') {
+            await this.handler(req, res, next, dat, extension);
+        }
+        else if (this.mode === ActionMode.DMZ_WITH_USER) {
+            await this.handler(req, res, next, null, extension);
+        }
+        else if (dat) {
+            res.sendStatus(dat);
+        }
+        else {
+            res.status(401).send('no no no ...');
+        }
     }
     setMode(mode) {
         this.mode = mode;
     }
     initExtension(res) {
-        const [el, fx] = timing_1.ExpressServerTiming.init(this, res);
+        const [el, fx] = ExpressServerTiming.init(this, res);
         return {
             done: () => {
                 fx();
@@ -73,4 +59,3 @@ class BaseAction extends core_1.CoreAction {
         };
     }
 }
-exports.default = BaseAction;

package/dist/classes/BaseApiAction.js

@@ -1,10 +1,5 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const BaseAction_1 = __importDefault(require("./BaseAction"));
-class BaseApiAction extends BaseAction_1.default {
+import BaseAction from './BaseAction';
+export default class BaseApiAction extends BaseAction {
     constructor(type, chanel, module, extMod) {
         super(chanel, module);
         this.exmod = extMod;
@@ -46,4 +41,3 @@ class BaseApiAction extends BaseAction_1.default {
         }
     }
 }
-exports.default = BaseApiAction;

package/dist/classes/BaseAuthProvider.js

@@ -1,5 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class BaseAuthProvider {
+export default class BaseAuthProvider {
 }
-exports.default = BaseAuthProvider;

package/dist/classes/BaseEndpoint.js

@@ -1,16 +1,9 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.keepRawBody = void 0;
-const express_1 = __importDefault(require("express"));
-const http_1 = __importDefault(require("http"));
-const body_parser_1 = require("body-parser");
-const core_1 = require("@grandlinex/core");
-function keepRawBody(req, res, buf, encoding) {
-    var _a;
-    if (((_a = req.headers['content-type']) === null || _a === void 0 ? void 0 : _a.startsWith('application/json')) &&
+import express from 'express';
+import http from 'http';
+import { json } from 'body-parser';
+import { CorePresenter } from '@grandlinex/core';
+export function keepRawBody(req, res, buf, encoding) {
+    if (req.headers['content-type']?.startsWith('application/json') &&
         buf &&
         buf.length) {
         try {
@@ -21,18 +14,17 @@ function keepRawBody(req, res, buf, encoding) {
         }
     }
 }
-exports.keepRawBody = keepRawBody;
-class BaseEndpoint extends core_1.CorePresenter {
+export default class BaseEndpoint extends CorePresenter {
     constructor(chanel, module, port) {
         super(`endpoint-${chanel}`, module);
         this.port = port;
-        this.appServer = (0, express_1.default)();
-        this.appServer.use((0, body_parser_1.json)({ verify: keepRawBody }));
-        this.httpServer = http_1.default.createServer(this.appServer);
+        this.appServer = express();
+        this.appServer.use(json({ verify: keepRawBody }));
+        this.httpServer = http.createServer(this.appServer);
     }
     appServerOverride(app) {
         this.appServer = app;
-        this.httpServer = http_1.default.createServer(this.appServer);
+        this.httpServer = http.createServer(this.appServer);
     }
     start() {
         return new Promise((resolve) => {
@@ -61,4 +53,3 @@ class BaseEndpoint extends core_1.CorePresenter {
         return this.httpServer;
     }
 }
-exports.default = BaseEndpoint;

package/dist/classes/BaseKernelModule.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@grandlinex/core");
-class BaseKernelModule extends core_1.CoreKernelModule {
+import { CoreKernelModule } from '@grandlinex/core';
+export default class BaseKernelModule extends CoreKernelModule {
 }
-exports.default = BaseKernelModule;

package/dist/classes/index.d.ts

@@ -4,6 +4,7 @@ import BaseEndpoint, { keepRawBody } from './BaseEndpoint';
 import BaseKernelModule from './BaseKernelModule';
 import BaseApiAction from './BaseApiAction';
 import BaseAuthProvider from './BaseAuthProvider';
+export * from './BaseAction';
 export * from './BaseAuthProvider';
 export * from './timing';
 export { BaseLoopService, BaseAuthProvider, BaseKernelModule, BaseService, BaseApiAction, BaseEndpoint, BaseElement, BaseCache, BaseAction, BaseClient, BaseBridge, keepRawBody, };

package/dist/classes/index.js

@@ -1,52 +1,10 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.keepRawBody = exports.BaseBridge = exports.BaseClient = exports.BaseAction = exports.BaseCache = exports.BaseElement = exports.BaseEndpoint = exports.BaseApiAction = exports.BaseService = exports.BaseKernelModule = exports.BaseAuthProvider = exports.BaseLoopService = void 0;
-const core_1 = require("@grandlinex/core");
-Object.defineProperty(exports, "BaseBridge", { enumerable: true, get: function () { return core_1.CoreBridge; } });
-Object.defineProperty(exports, "BaseCache", { enumerable: true, get: function () { return core_1.CoreCache; } });
-Object.defineProperty(exports, "BaseClient", { enumerable: true, get: function () { return core_1.CoreClient; } });
-Object.defineProperty(exports, "BaseElement", { enumerable: true, get: function () { return core_1.CoreElement; } });
-Object.defineProperty(exports, "BaseLoopService", { enumerable: true, get: function () { return core_1.CoreLoopService; } });
-Object.defineProperty(exports, "BaseService", { enumerable: true, get: function () { return core_1.CoreService; } });
-const BaseAction_1 = __importDefault(require("./BaseAction"));
-exports.BaseAction = BaseAction_1.default;
-const BaseEndpoint_1 = __importStar(require("./BaseEndpoint"));
-exports.BaseEndpoint = BaseEndpoint_1.default;
-Object.defineProperty(exports, "keepRawBody", { enumerable: true, get: function () { return BaseEndpoint_1.keepRawBody; } });
-const BaseKernelModule_1 = __importDefault(require("./BaseKernelModule"));
-exports.BaseKernelModule = BaseKernelModule_1.default;
-const BaseApiAction_1 = __importDefault(require("./BaseApiAction"));
-exports.BaseApiAction = BaseApiAction_1.default;
-const BaseAuthProvider_1 = __importDefault(require("./BaseAuthProvider"));
-exports.BaseAuthProvider = BaseAuthProvider_1.default;
-__exportStar(require("./BaseAuthProvider"), exports);
-__exportStar(require("./timing"), exports);
+import { CoreBridge as BaseBridge, CoreCache as BaseCache, CoreClient as BaseClient, CoreElement as BaseElement, CoreLoopService as BaseLoopService, CoreService as BaseService, } from '@grandlinex/core';
+import BaseAction from './BaseAction';
+import BaseEndpoint, { keepRawBody } from './BaseEndpoint';
+import BaseKernelModule from './BaseKernelModule';
+import BaseApiAction from './BaseApiAction';
+import BaseAuthProvider from './BaseAuthProvider';
+export * from './BaseAction';
+export * from './BaseAuthProvider';
+export * from './timing';
+export { BaseLoopService, BaseAuthProvider, BaseKernelModule, BaseService, BaseApiAction, BaseEndpoint, BaseElement, BaseCache, BaseAction, BaseClient, BaseBridge, keepRawBody, };

package/dist/classes/timing/ExpressServerTiming.js

@@ -1,35 +1,17 @@
-"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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const ServerTiming_1 = __importDefault(require("./ServerTiming"));
-class ExpressServerTiming {
+import ServerTiming from './ServerTiming';
+export default class ExpressServerTiming {
     constructor(baseApiAction) {
-        this.timing = new ServerTiming_1.default();
+        this.timing = new ServerTiming();
         this.baseApiAction = baseApiAction;
     }
     start(chanel) {
         return this.timing.start(chanel);
     }
-    startFunc(chanel, fc) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.timing.startFunc(chanel, fc);
-        });
+    async startFunc(chanel, fc) {
+        return this.timing.startFunc(chanel, fc);
     }
-    dbQuery(fc) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.timing.startFunc('db', fc);
-        });
+    async dbQuery(fc) {
+        return this.timing.startFunc('db', fc);
     }
     getHeader() {
         const out = [];
@@ -62,4 +44,3 @@ class ExpressServerTiming {
         ];
     }
 }
-exports.default = ExpressServerTiming;

package/dist/classes/timing/ServerTiming.js

@@ -1,32 +1,16 @@
-"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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const ServerTimingElement_1 = __importDefault(require("./ServerTimingElement"));
-class ServerTiming {
+import ServerTimingElement from './ServerTimingElement';
+export default class ServerTiming {
     constructor() {
         this.map = new Map();
     }
     start(chanel) {
-        return new ServerTimingElement_1.default(this, chanel);
+        return new ServerTimingElement(this, chanel);
     }
-    startFunc(chanel, fc) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const el = new ServerTimingElement_1.default(this, chanel);
-            const content = yield fc();
-            el.stop();
-            return content;
-        });
+    async startFunc(chanel, fc) {
+        const el = new ServerTimingElement(this, chanel);
+        const content = await fc();
+        el.stop();
+        return content;
     }
     completeElement(e) {
         const cur = this.map.get(e.chanel) || [];
@@ -34,4 +18,3 @@ class ServerTiming {
         this.map.set(e.chanel, cur);
     }
 }
-exports.default = ServerTiming;

package/dist/classes/timing/ServerTimingElement.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class ServerTimingElement {
+export default class ServerTimingElement {
     constructor(el, chanel) {
         this.el = el;
         this.chanel = chanel;
@@ -20,4 +18,3 @@ class ServerTimingElement {
         return this.end - this.start;
     }
 }
-exports.default = ServerTimingElement;

package/dist/classes/timing/index.js

@@ -1,12 +1,4 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServerTiming = exports.ServerTimingElement = exports.ExpressServerTiming = void 0;
-const ExpressServerTiming_1 = __importDefault(require("./ExpressServerTiming"));
-exports.ExpressServerTiming = ExpressServerTiming_1.default;
-const ServerTiming_1 = __importDefault(require("./ServerTiming"));
-exports.ServerTiming = ServerTiming_1.default;
-const ServerTimingElement_1 = __importDefault(require("./ServerTimingElement"));
-exports.ServerTimingElement = ServerTimingElement_1.default;
+import ExpressServerTiming from './ExpressServerTiming';
+import ServerTiming from './ServerTiming';
+import ServerTimingElement from './ServerTimingElement';
+export { ExpressServerTiming, ServerTimingElement, ServerTiming, };

package/dist/index.js

@@ -1,36 +1,15 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Kernel = exports.KernelModule = void 0;
 /**
  * @name Kernel Main Module
  * @author David Nagy
  */
-const Kernel_1 = __importDefault(require("./Kernel"));
-exports.Kernel = Kernel_1.default;
-const KernelModule_1 = __importDefault(require("./KernelModule"));
-exports.KernelModule = KernelModule_1.default;
-__exportStar(require("./actions"), exports);
-__exportStar(require("./api"), exports);
-__exportStar(require("./classes"), exports);
-__exportStar(require("./modules/crypto"), exports);
-__exportStar(require("./lib"), exports);
-__exportStar(require("./lib/express"), exports);
-__exportStar(require("@grandlinex/core"), exports);
-exports.default = Kernel_1.default;
+import Kernel from './Kernel';
+import KernelModule from './KernelModule';
+export * from './actions';
+export * from './api';
+export * from './classes';
+export * from './modules/crypto';
+export * from './lib';
+export * from './lib/express';
+export * from '@grandlinex/core';
+export { KernelModule, Kernel };
+export default Kernel;

package/dist/lib/express.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/lib/index.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/modules/crypto/CryptoClient.js

@@ -1,40 +1,6 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const jsonwebtoken_1 = __importStar(require("jsonwebtoken"));
-const core_1 = require("@grandlinex/core");
-class CryptoClient extends core_1.CoreCryptoClient {
+import jwt, { TokenExpiredError } from 'jsonwebtoken';
+import { CoreCryptoClient } from '@grandlinex/core';
+export default class CryptoClient extends CoreCryptoClient {
     constructor(key, kernel) {
         super(kernel, key);
         this.kernel = kernel;
@@ -50,8 +16,8 @@ class CryptoClient extends core_1.CoreCryptoClient {
     }
     jwtVerifyAccessToken(token) {
         return new Promise((resolve) => {
-            jsonwebtoken_1.default.verify(token, this.AesKey, (err, user) => {
-                if (err instanceof jsonwebtoken_1.TokenExpiredError) {
+            jwt.verify(token, this.AesKey, (err, user) => {
+                if (err instanceof TokenExpiredError) {
                     resolve(498);
                 }
                 else if (err || user === null) {
@@ -64,58 +30,51 @@ class CryptoClient extends core_1.CoreCryptoClient {
         });
     }
     jwtDecodeAccessToken(token) {
-        return jsonwebtoken_1.default.decode(token, { json: true });
+        return jwt.decode(token, { json: true });
     }
     jwtGenerateAccessToken(data, expire) {
-        return jsonwebtoken_1.default.sign(data, this.AesKey, { expiresIn: expire !== null && expire !== void 0 ? expire : this.expiresIn });
+        return jwt.sign(data, this.AesKey, { expiresIn: expire ?? this.expiresIn });
     }
-    apiTokenValidation(username, token, requestType) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.authProvider) {
-                return this.authProvider.authorizeToken(username, token, requestType);
-            }
-            const store = this.kernel.getConfigStore();
-            const cc = this.kernel.getCryptoClient();
-            if (!store.has('SERVER_PASSWORD')) {
-                return { valid: false, userId: null };
-            }
-            if ((cc === null || cc === void 0 ? void 0 : cc.timeSavePWValidation(token, store.get('SERVER_PASSWORD') || '')) ||
-                (token === store.get('SERVER_PASSWORD') && username === 'admin')) {
-                return {
-                    valid: true,
-                    userId: 'admin',
-                };
-            }
+    async apiTokenValidation(username, token, requestType) {
+        if (this.authProvider) {
+            return this.authProvider.authorizeToken(username, token, requestType);
+        }
+        const store = this.kernel.getConfigStore();
+        const cc = this.kernel.getCryptoClient();
+        if (!store.has('SERVER_PASSWORD')) {
+            return { valid: false, userId: null };
+        }
+        if (cc?.timeSavePWValidation(token, store.get('SERVER_PASSWORD') || '') ||
+            (token === store.get('SERVER_PASSWORD') && username === 'admin')) {
             return {
-                valid: false,
-                userId: null,
+                valid: true,
+                userId: 'admin',
             };
-        });
+        }
+        return {
+            valid: false,
+            userId: null,
+        };
     }
-    permissionValidation(token, requestType) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.authProvider) {
-                return this.authProvider.validateAccess(token, requestType);
-            }
-            return false;
-        });
+    async permissionValidation(token, requestType) {
+        if (this.authProvider) {
+            return this.authProvider.validateAccess(token, requestType);
+        }
+        return false;
     }
-    bearerTokenValidation(req) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.authProvider) {
-                return this.authProvider.bearerTokenValidation(req);
-            }
-            const authHeader = req.headers.authorization;
-            const token = authHeader && authHeader.split(' ')[1];
-            if (!token) {
-                return 401;
-            }
-            const tokenData = yield this.jwtVerifyAccessToken(token);
-            if (tokenData) {
-                return tokenData;
-            }
-            return 403;
-        });
+    async bearerTokenValidation(req) {
+        if (this.authProvider) {
+            return this.authProvider.bearerTokenValidation(req);
+        }
+        const authHeader = req.headers.authorization;
+        const token = authHeader && authHeader.split(' ')[1];
+        if (!token) {
+            return 401;
+        }
+        const tokenData = await this.jwtVerifyAccessToken(token);
+        if (tokenData) {
+            return tokenData;
+        }
+        return 403;
     }
 }
-exports.default = CryptoClient;

package/dist/modules/crypto/index.js

@@ -1,23 +1,3 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CryptoClient = void 0;
-const CryptoClient_1 = __importDefault(require("./CryptoClient"));
-exports.CryptoClient = CryptoClient_1.default;
-__exportStar(require("./utils/cors"), exports);
+import CryptoClient from './CryptoClient';
+export { CryptoClient };
+export * from './utils/cors';

package/dist/modules/crypto/utils/cors.js

@@ -1,10 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cors = void 0;
-const cors = (req, res, next) => {
+export const cors = (req, res, next) => {
     res.setHeader('Access-Control-Allow-Headers', '*');
     res.setHeader('Access-Control-Allow-Origin', '*');
     res.setHeader('Access-Control-Allow-Methods', '*');
     next();
 };
-exports.cors = cors;

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@grandlinex/kernel",
-  "version": "0.28.2",
+  "version": "0.30.0",
   "description": "GrandLineX is an out-of-the-box server framework on top of ExpressJs.",
-  "main": "dist/index.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
+  "type": "module",
   "scripts": {
     "buildprep": "tsc",
     "lint": "eslint src",
@@ -28,36 +29,36 @@
   },
   "license": "BSD-3-Clause",
   "dependencies": {
-    "@grandlinex/core": "0.28.0",
-    "axios": "0.27.2",
-    "body-parser": "1.20.1",
+    "@grandlinex/core": "0.30.0",
+    "axios": "1.3.4",
+    "body-parser": "1.20.2",
     "express": "4.18.2",
     "jsonwebtoken": "9.0.0"
   },
   "devDependencies": {
-    "@types/express": "^4.17.14",
-    "@types/jest": "^29.2.3",
-    "@types/jsonwebtoken": "^8.5.9",
-    "@types/node": "^16.11.12",
-    "@typescript-eslint/eslint-plugin": "^5.44.0",
-    "@typescript-eslint/parser": "^5.44.0",
+    "@types/express": "^4.17.17",
+    "@types/jest": "^29.5.0",
+    "@types/jsonwebtoken": "^9.0.1",
+    "@types/node": "^18.15.11",
+    "@typescript-eslint/eslint-plugin": "^5.57.1",
+    "@typescript-eslint/parser": "^5.57.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.28.0",
+    "eslint": "^8.37.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^27.1.5",
-    "eslint-plugin-jsx-a11y": "^6.6.1",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jest": "^27.2.1",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-prettier": "^4.2.1",
-    "jest": "^29.3.1",
+    "jest": "^29.5.0",
     "jest-junit": "^15.0.0",
-    "prettier": "^2.8.0",
-    "ts-jest": "^29.0.3",
-    "ts-loader": "^9.4.1",
+    "prettier": "^2.8.7",
+    "ts-jest": "^29.1.0",
+    "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
-    "typedoc": "^0.23.21",
-    "typescript": "^4.9.3"
+    "typedoc": "^0.23.28",
+    "typescript": "^5.0.3"
   },
   "repository": {
     "type": "git",