@faasjs/http 0.0.3-beta.87 → 0.0.3-beta.88

package/dist/index.d.mts

@@ -31,7 +31,7 @@ declare class Session<S extends Record<string, string> = any, C extends Record<s
     private readonly cookie;
     private changed?;
     constructor(cookie: Cookie<C, S>, config: SessionOptions);
-    invoke(cookie?: string): void;
+    invoke(cookie?: string, logger?: Logger): void;
     encode(text: SessionContent): string;
     decode<TData = any>(text: string): TData | SessionContent;
     read(key: string): string | number;
@@ -61,9 +61,10 @@ declare class Cookie<C extends Record<string, string> = any, S extends Record<st
         sameSite?: 'Strict' | 'Lax' | 'None';
         session: SessionOptions;
     };
+    logger: Logger;
     private setCookie;
-    constructor(config: CookieOptions);
-    invoke(cookie: string | undefined): Cookie<C, S>;
+    constructor(config: CookieOptions, logger?: Logger);
+    invoke(cookie: string | undefined, logger: Logger): Cookie<C, S>;
     read(key: string): any;
     write(key: string, value: string, opts?: {
         domain?: string;

package/dist/index.d.ts

@@ -31,7 +31,7 @@ declare class Session<S extends Record<string, string> = any, C extends Record<s
     private readonly cookie;
     private changed?;
     constructor(cookie: Cookie<C, S>, config: SessionOptions);
-    invoke(cookie?: string): void;
+    invoke(cookie?: string, logger?: Logger): void;
     encode(text: SessionContent): string;
     decode<TData = any>(text: string): TData | SessionContent;
     read(key: string): string | number;
@@ -61,9 +61,10 @@ declare class Cookie<C extends Record<string, string> = any, S extends Record<st
         sameSite?: 'Strict' | 'Lax' | 'None';
         session: SessionOptions;
     };
+    logger: Logger;
     private setCookie;
-    constructor(config: CookieOptions);
-    invoke(cookie: string | undefined): Cookie<C, S>;
+    constructor(config: CookieOptions, logger?: Logger);
+    invoke(cookie: string | undefined, logger: Logger): Cookie<C, S>;
     read(key: string): any;
     write(key: string, value: string, opts?: {
         domain?: string;

package/dist/index.js

@@ -1,48 +1,26 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+'use strict';
 
-// src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  ContentType: () => ContentType,
-  Cookie: () => Cookie,
-  Http: () => Http,
-  HttpError: () => HttpError,
-  Session: () => Session,
-  Validator: () => Validator,
-  useHttp: () => useHttp
-});
-module.exports = __toCommonJS(src_exports);
-var import_func = require("@faasjs/func");
-var import_deep_merge2 = require("@faasjs/deep_merge");
-var import_logger = require("@faasjs/logger");
+var func = require('@faasjs/func');
+var deep_merge = require('@faasjs/deep_merge');
+var logger = require('@faasjs/logger');
+var crypto = require('crypto');
+var zlib = require('zlib');
 
-// src/session.ts
-var import_crypto = require("crypto");
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined")
+    return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
 var Session = class {
   constructor(cookie, config) {
     this.cookie = cookie;
     if (!(config == null ? void 0 : config.secret))
-      console.warn("Session's secret is missing.");
+      cookie.logger.warn("Session's secret is missing.");
     this.config = Object.assign({
       key: "key",
-      secret: (0, import_crypto.randomBytes)(128).toString("hex"),
+      secret: crypto.randomBytes(128).toString("hex"),
       salt: "salt",
       signedSalt: "signedSalt",
       keylen: 64,
@@ -50,14 +28,14 @@ var Session = class {
       digest: "sha256",
       cipherName: "aes-256-cbc"
     }, config);
-    this.secret = (0, import_crypto.pbkdf2Sync)(
+    this.secret = crypto.pbkdf2Sync(
       this.config.secret,
       this.config.salt,
       this.config.iterations,
       this.config.keylen / 2,
       this.config.digest
     );
-    this.signedSecret = (0, import_crypto.pbkdf2Sync)(
+    this.signedSecret = crypto.pbkdf2Sync(
       this.config.secret,
       this.config.signedSalt,
       this.config.iterations,
@@ -66,11 +44,11 @@ var Session = class {
     );
     this.content = /* @__PURE__ */ Object.create(null);
   }
-  invoke(cookie) {
+  invoke(cookie, logger) {
     try {
       this.content = cookie ? this.decode(cookie) : /* @__PURE__ */ Object.create(null);
     } catch (error) {
-      console.error(error);
+      logger == null ? void 0 : logger.error(error);
       this.content = /* @__PURE__ */ Object.create(null);
     }
     this.changed = false;
@@ -78,11 +56,11 @@ var Session = class {
   encode(text) {
     if (typeof text !== "string")
       text = JSON.stringify(text);
-    const iv = (0, import_crypto.randomBytes)(16);
-    const cipher = (0, import_crypto.createCipheriv)(this.config.cipherName, this.secret, iv);
+    const iv = crypto.randomBytes(16);
+    const cipher = crypto.createCipheriv(this.config.cipherName, this.secret, iv);
     const encrypted = Buffer.concat([cipher.update(text), cipher.final()]).toString("base64");
     const main = Buffer.from([encrypted, iv.toString("base64")].join("--")).toString("base64");
-    const hmac = (0, import_crypto.createHmac)(this.config.digest, this.signedSecret);
+    const hmac = crypto.createHmac(this.config.digest, this.signedSecret);
     hmac.update(main);
     const digest = hmac.digest("hex");
     return main + "--" + digest;
@@ -90,7 +68,7 @@ var Session = class {
   decode(text) {
     text = decodeURIComponent(text);
     const signedParts = text.split("--");
-    const hmac = (0, import_crypto.createHmac)(this.config.digest, this.signedSecret);
+    const hmac = crypto.createHmac(this.config.digest, this.signedSecret);
     hmac.update(signedParts[0]);
     const digest = hmac.digest("hex");
     if (signedParts[1] !== digest)
@@ -99,7 +77,7 @@ var Session = class {
     const parts = message.split("--").map(function(part2) {
       return Buffer.from(part2, "base64");
     });
-    const cipher = (0, import_crypto.createDecipheriv)(this.config.cipherName, this.secret, parts[1]);
+    const cipher = crypto.createDecipheriv(this.config.cipherName, this.secret, parts[1]);
     const part = Buffer.from(cipher.update(parts[0])).toString("utf8");
     const final = cipher.final("utf8");
     const decrypt = [part, final].join("");
@@ -122,12 +100,10 @@ var Session = class {
     return this;
   }
 };
-
-// src/cookie.ts
-var import_deep_merge = require("@faasjs/deep_merge");
 var Cookie = class {
-  constructor(config) {
-    this.config = (0, import_deep_merge.deepMerge)({
+  constructor(config, logger) {
+    this.logger = logger;
+    this.config = deep_merge.deepMerge({
       path: "/",
       expires: 31536e3,
       secure: true,
@@ -138,7 +114,7 @@ var Cookie = class {
     this.content = /* @__PURE__ */ Object.create(null);
     this.setCookie = /* @__PURE__ */ Object.create(null);
   }
-  invoke(cookie) {
+  invoke(cookie, logger) {
     this.content = /* @__PURE__ */ Object.create(null);
     if (cookie)
       cookie.split(";").forEach((x) => {
@@ -148,7 +124,7 @@ var Cookie = class {
           this.content[k[0]] = decodeURIComponent(x.replace(`${k[0]}=`, "").replace(/;$/, ""));
       });
     this.setCookie = /* @__PURE__ */ Object.create(null);
-    this.session.invoke(this.read(this.session.config.key));
+    this.session.invoke(this.read(this.session.config.key), logger);
     return this;
   }
   read(key) {
@@ -371,9 +347,6 @@ var Validator = class {
     }
   }
 };
-
-// src/index.ts
-var import_zlib = require("zlib");
 var ContentType = {
   plain: "text/plain",
   html: "text/html",
@@ -410,10 +383,10 @@ var Http = class {
     var _a;
     data.dependencies["@faasjs/http"] = "*";
     await next();
-    const logger = new import_logger.Logger(this.name);
-    logger.debug("Generate api gateway's config");
-    logger.debug("%j", data);
-    const config = data.config.plugins ? (0, import_deep_merge2.deepMerge)(data.config.plugins[this.name || this.type], { config: this.config }) : { config: this.config };
+    const logger$1 = new logger.Logger(this.name);
+    logger$1.debug("Generate api gateway's config");
+    logger$1.debug("%j", data);
+    const config = data.config.plugins ? deep_merge.deepMerge(data.config.plugins[this.name || this.type], { config: this.config }) : { config: this.config };
     if (!config.config.path) {
       config.config.path = "/" + ((_a = data.name) == null ? void 0 : _a.replace(/_/g, "/").replace(/\/index$/, ""));
       if (config.config.path === "/index")
@@ -424,8 +397,8 @@ var Http = class {
           config.config.path = "/";
       }
     }
-    logger.debug("Api gateway's config: %j", config);
-    const Provider = require(config.provider.type).Provider;
+    logger$1.debug("Api gateway's config: %j", config);
+    const Provider = __require(config.provider.type).Provider;
     const provider = new Provider(config.provider.config);
     await provider.deploy(this.type, data, config);
   }
@@ -449,9 +422,9 @@ var Http = class {
           this.config[key] = value;
       }
     if (data.config.plugins && data.config.plugins[this.name || this.type])
-      this.config = (0, import_deep_merge2.deepMerge)(this.config, data.config.plugins[this.name || this.type].config);
+      this.config = deep_merge.deepMerge(this.config, data.config.plugins[this.name || this.type].config);
     data.logger.debug("[onMount] prepare cookie & session");
-    this.cookie = new Cookie(this.config.cookie || {});
+    this.cookie = new Cookie(this.config.cookie || {}, data.logger);
     this.session = this.cookie.session;
     if (this.validatorOptions) {
       data.logger.debug("[onMount] prepare validator");
@@ -477,7 +450,7 @@ var Http = class {
         delete this.params["_"];
       data.logger.debug("[onInvoke] Params: %j", this.params);
     }
-    this.cookie.invoke(this.headers.cookie);
+    this.cookie.invoke(this.headers.cookie, data.logger);
     if (this.headers.cookie) {
       data.logger.debug("[onInvoke] Cookie: %j", this.cookie.content);
       data.logger.debug("[onInvoke] Session: %j", this.session.content);
@@ -529,13 +502,13 @@ var Http = class {
     try {
       if (acceptEncoding.includes("br")) {
         data.response.headers["Content-Encoding"] = "br";
-        data.response.body = (0, import_zlib.brotliCompressSync)(originBody).toString("base64");
+        data.response.body = zlib.brotliCompressSync(originBody).toString("base64");
       } else if (acceptEncoding.includes("gzip")) {
         data.response.headers["Content-Encoding"] = "gzip";
-        data.response.body = (0, import_zlib.gzipSync)(originBody).toString("base64");
+        data.response.body = zlib.gzipSync(originBody).toString("base64");
       } else if (acceptEncoding.includes("deflate")) {
         data.response.headers["Content-Encoding"] = "deflate";
-        data.response.body = (0, import_zlib.deflateSync)(originBody).toString("base64");
+        data.response.body = zlib.deflateSync(originBody).toString("base64");
       } else
         throw Error("No matched compression.");
       data.response.isBase64Encoded = true;
@@ -584,15 +557,13 @@ var Http = class {
   }
 };
 function useHttp(config) {
-  return (0, import_func.usePlugin)(new Http(config));
+  return func.usePlugin(new Http(config));
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ContentType,
-  Cookie,
-  Http,
-  HttpError,
-  Session,
-  Validator,
-  useHttp
-});
+
+exports.ContentType = ContentType;
+exports.Cookie = Cookie;
+exports.Http = Http;
+exports.HttpError = HttpError;
+exports.Session = Session;
+exports.Validator = Validator;
+exports.useHttp = useHttp;

package/dist/index.mjs

@@ -1,3 +1,9 @@
+import { usePlugin } from '@faasjs/func';
+import { deepMerge } from '@faasjs/deep_merge';
+import { Logger } from '@faasjs/logger';
+import { randomBytes, pbkdf2Sync, createCipheriv, createHmac, createDecipheriv } from 'crypto';
+import { brotliCompressSync, gzipSync, deflateSync } from 'zlib';
+
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
 }) : x)(function(x) {
@@ -5,27 +11,11 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
     return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
-
-// src/index.ts
-import {
-  usePlugin
-} from "@faasjs/func";
-import { deepMerge as deepMerge2 } from "@faasjs/deep_merge";
-import { Logger } from "@faasjs/logger";
-
-// src/session.ts
-import {
-  randomBytes,
-  pbkdf2Sync,
-  createCipheriv,
-  createHmac,
-  createDecipheriv
-} from "crypto";
 var Session = class {
   constructor(cookie, config) {
     this.cookie = cookie;
     if (!(config == null ? void 0 : config.secret))
-      console.warn("Session's secret is missing.");
+      cookie.logger.warn("Session's secret is missing.");
     this.config = Object.assign({
       key: "key",
       secret: randomBytes(128).toString("hex"),
@@ -52,11 +42,11 @@ var Session = class {
     );
     this.content = /* @__PURE__ */ Object.create(null);
   }
-  invoke(cookie) {
+  invoke(cookie, logger) {
     try {
       this.content = cookie ? this.decode(cookie) : /* @__PURE__ */ Object.create(null);
     } catch (error) {
-      console.error(error);
+      logger == null ? void 0 : logger.error(error);
       this.content = /* @__PURE__ */ Object.create(null);
     }
     this.changed = false;
@@ -108,11 +98,9 @@ var Session = class {
     return this;
   }
 };
-
-// src/cookie.ts
-import { deepMerge } from "@faasjs/deep_merge";
 var Cookie = class {
-  constructor(config) {
+  constructor(config, logger) {
+    this.logger = logger;
     this.config = deepMerge({
       path: "/",
       expires: 31536e3,
@@ -124,7 +112,7 @@ var Cookie = class {
     this.content = /* @__PURE__ */ Object.create(null);
     this.setCookie = /* @__PURE__ */ Object.create(null);
   }
-  invoke(cookie) {
+  invoke(cookie, logger) {
     this.content = /* @__PURE__ */ Object.create(null);
     if (cookie)
       cookie.split(";").forEach((x) => {
@@ -134,7 +122,7 @@ var Cookie = class {
           this.content[k[0]] = decodeURIComponent(x.replace(`${k[0]}=`, "").replace(/;$/, ""));
       });
     this.setCookie = /* @__PURE__ */ Object.create(null);
-    this.session.invoke(this.read(this.session.config.key));
+    this.session.invoke(this.read(this.session.config.key), logger);
     return this;
   }
   read(key) {
@@ -357,13 +345,6 @@ var Validator = class {
     }
   }
 };
-
-// src/index.ts
-import {
-  gzipSync,
-  deflateSync,
-  brotliCompressSync
-} from "zlib";
 var ContentType = {
   plain: "text/plain",
   html: "text/html",
@@ -403,7 +384,7 @@ var Http = class {
     const logger = new Logger(this.name);
     logger.debug("Generate api gateway's config");
     logger.debug("%j", data);
-    const config = data.config.plugins ? deepMerge2(data.config.plugins[this.name || this.type], { config: this.config }) : { config: this.config };
+    const config = data.config.plugins ? deepMerge(data.config.plugins[this.name || this.type], { config: this.config }) : { config: this.config };
     if (!config.config.path) {
       config.config.path = "/" + ((_a = data.name) == null ? void 0 : _a.replace(/_/g, "/").replace(/\/index$/, ""));
       if (config.config.path === "/index")
@@ -439,9 +420,9 @@ var Http = class {
           this.config[key] = value;
       }
     if (data.config.plugins && data.config.plugins[this.name || this.type])
-      this.config = deepMerge2(this.config, data.config.plugins[this.name || this.type].config);
+      this.config = deepMerge(this.config, data.config.plugins[this.name || this.type].config);
     data.logger.debug("[onMount] prepare cookie & session");
-    this.cookie = new Cookie(this.config.cookie || {});
+    this.cookie = new Cookie(this.config.cookie || {}, data.logger);
     this.session = this.cookie.session;
     if (this.validatorOptions) {
       data.logger.debug("[onMount] prepare validator");
@@ -467,7 +448,7 @@ var Http = class {
         delete this.params["_"];
       data.logger.debug("[onInvoke] Params: %j", this.params);
     }
-    this.cookie.invoke(this.headers.cookie);
+    this.cookie.invoke(this.headers.cookie, data.logger);
     if (this.headers.cookie) {
       data.logger.debug("[onInvoke] Cookie: %j", this.cookie.content);
       data.logger.debug("[onInvoke] Session: %j", this.session.content);
@@ -576,12 +557,5 @@ var Http = class {
 function useHttp(config) {
   return usePlugin(new Http(config));
 }
-export {
-  ContentType,
-  Cookie,
-  Http,
-  HttpError,
-  Session,
-  Validator,
-  useHttp
-};
+
+export { ContentType, Cookie, Http, HttpError, Session, Validator, useHttp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/http",
-  "version": "0.0.3-beta.87",
+  "version": "0.0.3-beta.88",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,8 +22,8 @@
     "dist"
   ],
   "dependencies": {
-    "@faasjs/func": "^0.0.3-beta.87",
-    "@faasjs/logger": "^0.0.3-beta.87"
+    "@faasjs/func": "^0.0.3-beta.88",
+    "@faasjs/logger": "^0.0.3-beta.88"
   },
   "engines": {
     "npm": ">=8.0.0",