@jwn-js/common 1.3.21 → 1.3.25

package/index.d.ts

@@ -11,6 +11,51 @@ import { Client } from 'memjs';
 import { Query } from 'buildmsql';
 export { Context as ContextSsr } from 'vite-ssr-vue';
 
+/**
+ * @class Jwt
+ * @description working with jwt tokens use webcrypto
+ */
+declare class AsyncJwt {
+    private readonly secret;
+    private readonly algorithm;
+    /**
+     * @constructor
+     * @param secret
+     * @param opt addition options
+     */
+    constructor(secret: string, opt?: {
+        algorithm: string;
+    });
+    /**
+     * Verify jwt token
+     * @param jwt token
+     * @returns is token valid
+     */
+    verify(jwt: string): Promise<boolean>;
+    /**
+     * Get token
+     * @param data - user data
+     * @returns jwt
+     */
+    sign(data: any): Promise<string>;
+    /**
+     * Decode token
+     * @param jwt - jwt token
+     * @returns {head, body}
+     */
+    decode(jwt: string): {
+        head: any;
+        body: any;
+    };
+    /**
+     * Sign
+     * @param str input string
+     * @returns base64 sign
+     * @private
+     */
+    private signString;
+}
+
 /**
  * Reed static files
  * @param req
@@ -673,6 +718,10 @@ declare const helpers: {
     staticBody: typeof staticBody;
     extensions: string[];
     getExt: (path: string) => string;
+    jwtDecode: (jwt: string) => {
+        head: any;
+        body: any;
+    };
 };
 
-export { ContextWeb$1 as ContextWeb, Controller, Model, OptionsSsr, OptionsWeb, Route$1 as Route, Schema, Ssr, Web, action, body, config, connection, context, controller, cookies, db, headers, helpers, home, hostname, http, init, json, logerror, method, mixin, mountWithContext as mount, pool, protocol, request, stream, subaction, url, xml };
+export { AsyncJwt, ContextWeb$1 as ContextWeb, Controller, Model, OptionsSsr, OptionsWeb, Route$1 as Route, Schema, Ssr, Web, action, body, config, connection, context, controller, cookies, db, headers, helpers, home, hostname, http, init, json, logerror, method, mixin, mountWithContext as mount, pool, protocol, request, stream, subaction, url, xml };

package/index.js

@@ -3,8 +3,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var ApiError = require('./ApiError.js');
-var Server = require('./Server-77093d28.js');
-var Jwt = require('./Jwt.js');
+var Server = require('./Server-dadc1f87.js');
+var Jwt = require('./Jwt-e49753f6.js');
+var crypto = require('crypto');
+var util = require('util');
 var Memcached = require('./Memcached.js');
 var jsonBody$1 = require('./jsonBody.js');
 var ApiError$1 = require('./ApiError-b517f53a.js');
@@ -24,7 +26,6 @@ var querystring = require('querystring');
 var xmljs = require('xml-js');
 var formidable = require('formidable');
 require('reflect-metadata');
-require('crypto');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -34,6 +35,56 @@ var querystring__default = /*#__PURE__*/_interopDefaultLegacy(querystring);
 var xmljs__default = /*#__PURE__*/_interopDefaultLegacy(xmljs);
 var formidable__default = /*#__PURE__*/_interopDefaultLegacy(formidable);
 
+const { subtle } = crypto.webcrypto;
+class AsyncJwt {
+  constructor(secret, opt) {
+    this.algorithm = "SHA-256";
+    this.secret = secret;
+    this.algorithm = opt?.algorithm || this.algorithm;
+    this.algorithm = this.algorithm.replace("-", "").replace("SHA", "SHA-");
+  }
+  async verify(jwt) {
+    if (!jwt) {
+      return false;
+    }
+    const parts = jwt.split(".");
+    const signature = await this.signString(`${parts[0]}.${parts[1]}`);
+    return signature === parts[2];
+  }
+  async sign(data) {
+    const head = Jwt.toBase64url({
+      alg: this.algorithm.replace("-", "").replace("SHA", "HS"),
+      typ: "JWT"
+    });
+    const body = Jwt.toBase64url(data);
+    const signature = await this.signString(`${head}.${body}`);
+    return `${head}.${body}.${signature}`;
+  }
+  decode(jwt) {
+    const parts = (jwt || "").split(".");
+    const head = Jwt.fromBase64url(parts[0]);
+    const body = Jwt.fromBase64url(parts[1]);
+    return { head, body };
+  }
+  async signString(str) {
+    const enc = new util.TextEncoder();
+    const key = await subtle.importKey("raw", enc.encode(this.secret), {
+      name: "HMAC",
+      hash: {
+        name: this.algorithm
+      }
+    }, false, ["sign", "verify"]);
+    return Jwt.urlEncode(Buffer.from(await subtle.sign("HMAC", key, enc.encode(str))).toString("base64"));
+  }
+}
+
+const jwtDecode = (jwt) => {
+  const parts = (jwt || "").split(".");
+  const head = Jwt.fromBase64url(parts[0]);
+  const body = Jwt.fromBase64url(parts[1]);
+  return { head, body };
+};
+
 const rawBody$1 = (res, req) => new Promise((resolve, reject) => {
   readRaw$1(res, (obj) => {
     resolve(obj);
@@ -251,7 +302,7 @@ async function staticBody(res, req, base) {
     }));
     let url = req.getUrl().replace(/\.\.\//ig, "").replace(/^\.\/?/, "");
     url = `./${url}`;
-    const file = path__default['default'].resolve(base, url);
+    const file = path__default["default"].resolve(base, url);
     const content = await fs.promises.readFile(file);
     res.writeStatus("200 OK").writeHeader("content-type", getContentType(getExt(url))).end(content);
   } catch (e) {
@@ -588,7 +639,7 @@ const multipartBody = (res, req, options = { multiples: true }) => new Promise(a
         stream.end();
       }
     });
-    const form = formidable__default['default'](options);
+    const form = formidable__default["default"](options);
     form.parse(stream, (err2, fields, files) => {
       if (err2) {
         reject(err2);
@@ -614,7 +665,7 @@ function readBody(res, cb, err) {
     buffer = Buffer.concat([buffer, Buffer.from(ab)]);
     if (isLast) {
       try {
-        cb(querystring__default['default'].parse(buffer.toString()));
+        cb(querystring__default["default"].parse(buffer.toString()));
       } catch (e) {
         cb(null);
         return;
@@ -689,7 +740,7 @@ class Web {
       };
       this.req.forEach((key, value) => this.contextWeb.headers[key] = value);
       const type = this.contextWeb.headers["content-type"] || "application/json";
-      request = Object.assign({}, this.defaultRequest, request, querystring__default['default'].parse(this.req.getQuery()));
+      request = Object.assign({}, this.defaultRequest, request, querystring__default["default"].parse(this.req.getQuery()));
       if (type.indexOf("application/json") !== -1 || type.indexOf("text/json") !== -1) {
         Object.assign(request, await jsonBody(this.res, this.req));
       } else if (!["get", "head"].includes(this.contextWeb.method) && type.indexOf("multipart/form-data") !== -1) {
@@ -698,7 +749,7 @@ class Web {
         Object.assign(request, await urlencodedBody(this.res, this.req));
       } else if (!["get", "head"].includes(this.contextWeb.method) && (type.indexOf("application/xml") !== -1 || type.indexOf("text/xml") !== -1)) {
         const raw = (await rawBody(this.res, this.req)).toString();
-        const records = xmljs__default['default'].xml2js(raw, { compact: true, cdataKey: "_value", textKey: "_value" });
+        const records = xmljs__default["default"].xml2js(raw, { compact: true, cdataKey: "_value", textKey: "_value" });
         Object.assign(request, records || {});
       } else if (!["get", "head"].includes(this.contextWeb.method) && type.indexOf("application/octet-stream") !== -1) {
         Object.defineProperty(this.contextWeb, "$stream", {
@@ -810,8 +861,8 @@ class Web {
 }
 
 const readConfigSync = (jsonfile) => {
-  const file = path__default['default'].resolve(jsonfile);
-  return JSON.parse(fs__default['default'].readFileSync(file, "utf-8"));
+  const file = path__default["default"].resolve(jsonfile);
+  return JSON.parse(fs__default["default"].readFileSync(file, "utf-8"));
 };
 
 const config$1 = readConfigSync("./connect.json");
@@ -932,7 +983,7 @@ class Controller {
     const response = this.success(data, options);
     return {
       headers: Object.assign({ "content-type": "application/xml" }, this.responseHeaders, options?.headers || {}),
-      body: xmljs__default['default'].js2xml(Object.assign(defaultXml, { body: { ...response.body } }), xmlOptions),
+      body: xmljs__default["default"].js2xml(Object.assign(defaultXml, { body: { ...response.body } }), xmlOptions),
       memcache: response.memcache
     };
   }
@@ -950,7 +1001,7 @@ class Controller {
     const headers = Object.assign({ "content-type": "application/json" }, e.headers);
     return {
       headers,
-      body: xmljs__default['default'].js2xml(Object.assign(defaultXml, { body: { ...response.body } }), xmlOptions),
+      body: xmljs__default["default"].js2xml(Object.assign(defaultXml, { body: { ...response.body } }), xmlOptions),
       statusCode: response.statusCode
     };
   }
@@ -1302,7 +1353,7 @@ function http() {
             continue;
           }
           const logger = existingLoggers[key].params;
-          await this[logger].error(e, { responce: output?.body || {} });
+          await this[logger].error(e, { response: easyAsh.omit(output?.body || {}, ["stack"]) });
         }
         return output;
       } finally {
@@ -1334,7 +1385,8 @@ const helpers = {
   readConfigSync: readConfigSync$1.readConfigSync,
   staticBody,
   extensions,
-  getExt
+  getExt,
+  jwtDecode
 };
 
 exports.ApiError = ApiError.ApiError;
@@ -1342,6 +1394,7 @@ exports.Server = Server.Server;
 exports.codeToStatus = Server.codeToStatus;
 exports.Jwt = Jwt.Jwt;
 exports.Memcached = Memcached.Memcached;
+exports.AsyncJwt = AsyncJwt;
 exports.Controller = Controller;
 exports.Model = Model;
 exports.Ssr = Ssr;

package/multipartBody.js

@@ -24,7 +24,7 @@ const multipartBody = (res, req, options = { multiples: true }) => new Promise(a
         stream$1.end();
       }
     });
-    const form = formidable__default['default'](options);
+    const form = formidable__default["default"](options);
     form.parse(stream$1, (err2, fields, files) => {
       if (err2) {
         reject(err2);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jwn-js/common",
   "private": false,
-  "version": "1.3.21",
+  "version": "1.3.25",
   "description": "@jwn-js/common package",
   "main": "./index.js",
   "types": "./index.d.ts",
@@ -22,7 +22,7 @@
     "@types/formidable": "^1.2.3",
     "@types/jest": "^27.0.3",
     "@types/memjs": "^1.2.3",
-    "@types/node": "^15.3.0",
+    "@types/node": "^17.0.5",
     "@types/supertest": "^2.0.11",
     "@typescript-eslint/eslint-plugin": "^4.23.0",
     "@typescript-eslint/parser": "^4.26.1",
@@ -33,12 +33,12 @@
     "jest": "^27.4.3",
     "rollup": "^2.53.2",
     "rollup-plugin-dts": "^3.0.2",
-    "rollup-plugin-esbuild": "^4.5.0",
+    "rollup-plugin-esbuild": "4.1",
     "supertest": "^6.1.6",
     "superwstest": "^1.8.0",
     "ts-jest": "^27.1.0",
     "ts-node": "^10.4.0",
-    "typedoc": "^0.21.4",
+    "typedoc": "^0.22.10",
     "typescript": "^4.3.2",
     "zlib": "^1.0.5"
   },

package/readConfig.js

@@ -10,7 +10,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 
 const readConfig = async (jsonfile) => {
-  const file = path__default['default'].resolve(jsonfile);
+  const file = path__default["default"].resolve(jsonfile);
   return JSON.parse(await fs.promises.readFile(file, "utf-8"));
 };
 

package/readConfigSync.js

@@ -11,8 +11,8 @@ var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
 
 const readConfigSync = (jsonfile) => {
-  const file = path__default['default'].resolve(jsonfile);
-  return JSON.parse(fs__default['default'].readFileSync(file, "utf-8"));
+  const file = path__default["default"].resolve(jsonfile);
+  return JSON.parse(fs__default["default"].readFileSync(file, "utf-8"));
 };
 
 exports.readConfigSync = readConfigSync;

package/staticBody.js

@@ -193,7 +193,7 @@ async function staticBody(res, req, base) {
     }));
     let url = req.getUrl().replace(/\.\.\//ig, "").replace(/^\.\/?/, "");
     url = `./${url}`;
-    const file = path__default['default'].resolve(base, url);
+    const file = path__default["default"].resolve(base, url);
     const content = await fs.promises.readFile(file);
     res.writeStatus("200 OK").writeHeader("content-type", getContentType(getExt(url))).end(content);
   } catch (e) {

package/urlencodedBody.js

@@ -22,7 +22,7 @@ function readBody(res, cb, err) {
     buffer = Buffer.concat([buffer, Buffer.from(ab)]);
     if (isLast) {
       try {
-        cb(querystring__default['default'].parse(buffer.toString()));
+        cb(querystring__default["default"].parse(buffer.toString()));
       } catch (e) {
         cb(null);
         return;