@faasjs/http 0.0.3-beta.99 → 0.0.4-beta.2

package/dist/index.d.mts

@@ -159,7 +159,7 @@ type Response = {
 declare class HttpError extends Error {
     readonly statusCode: number;
     readonly message: string;
-    constructor({ statusCode, message }: {
+    constructor({ statusCode, message, }: {
         statusCode?: number;
         message: string;
     });

package/dist/index.d.ts

@@ -159,7 +159,7 @@ type Response = {
 declare class HttpError extends Error {
     readonly statusCode: number;
     readonly message: string;
-    constructor({ statusCode, message }: {
+    constructor({ statusCode, message, }: {
         statusCode?: number;
         message: string;
     });

package/dist/index.js

@@ -18,16 +18,19 @@ var Session = class {
     this.cookie = cookie;
     if (!(config == null ? void 0 : config.secret))
       cookie.logger.warn("Session's secret is missing.");
-    this.config = Object.assign({
-      key: "key",
-      secret: crypto.randomBytes(128).toString("hex"),
-      salt: "salt",
-      signedSalt: "signedSalt",
-      keylen: 64,
-      iterations: 100,
-      digest: "sha256",
-      cipherName: "aes-256-cbc"
-    }, config);
+    this.config = Object.assign(
+      {
+        key: "key",
+        secret: crypto.randomBytes(128).toString("hex"),
+        salt: "salt",
+        signedSalt: "signedSalt",
+        keylen: 64,
+        iterations: 100,
+        digest: "sha256",
+        cipherName: "aes-256-cbc"
+      },
+      config
+    );
     this.secret = crypto.pbkdf2Sync(
       this.config.secret,
       this.config.salt,
@@ -58,12 +61,17 @@ var Session = class {
       text = JSON.stringify(text);
     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 encrypted = Buffer.concat([
+      cipher.update(text),
+      cipher.final()
+    ]).toString("base64");
+    const main = Buffer.from(
+      [encrypted, iv.toString("base64")].join("--")
+    ).toString("base64");
     const hmac = crypto.createHmac(this.config.digest, this.signedSecret);
     hmac.update(main);
     const digest = hmac.digest("hex");
-    return main + "--" + digest;
+    return `${main}--${digest}`;
   }
   decode(text) {
     text = decodeURIComponent(text);
@@ -77,7 +85,11 @@ var Session = class {
     const parts = message.split("--").map(function(part2) {
       return Buffer.from(part2, "base64");
     });
-    const cipher = 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("");
@@ -96,20 +108,26 @@ var Session = class {
   }
   update() {
     if (this.changed)
-      this.cookie.write(this.config.key, this.encode(JSON.stringify(this.content)));
+      this.cookie.write(
+        this.config.key,
+        this.encode(JSON.stringify(this.content))
+      );
     return this;
   }
 };
 var Cookie = class {
   constructor(config, logger) {
     this.logger = logger;
-    this.config = deep_merge.deepMerge({
-      path: "/",
-      expires: 31536e3,
-      secure: true,
-      httpOnly: true,
-      session: {}
-    }, config);
+    this.config = deep_merge.deepMerge(
+      {
+        path: "/",
+        expires: 31536e3,
+        secure: true,
+        httpOnly: true,
+        session: {}
+      },
+      config
+    );
     this.session = new Session(this, this.config.session);
     this.content = /* @__PURE__ */ Object.create(null);
     this.setCookie = /* @__PURE__ */ Object.create(null);
@@ -121,7 +139,9 @@ var Cookie = class {
         x = x.trim();
         const k = /([^=]+)/.exec(x);
         if (k !== null)
-          this.content[k[0]] = decodeURIComponent(x.replace(`${k[0]}=`, "").replace(/;$/, ""));
+          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), logger);
@@ -370,6 +390,23 @@ var HttpError = class _HttpError extends Error {
   }
 };
 var Name = "http";
+function deepClone(obj) {
+  if (obj === null || typeof obj !== "object")
+    return obj;
+  if (Array.isArray(obj))
+    return JSON.parse(JSON.stringify(obj));
+  const clone = {};
+  for (const key in obj) {
+    if (!obj.hasOwnProperty(key))
+      continue;
+    if (typeof obj[key] === "function") {
+      clone[key] = obj[key];
+      continue;
+    }
+    clone[key] = deepClone(obj[key]);
+  }
+  return clone;
+}
 var Http = class {
   constructor(config) {
     this.type = Name;
@@ -386,13 +423,18 @@ var Http = class {
     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 };
+    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$/, ""));
+      config.config.path = `/${(_a = data.name) == null ? void 0 : _a.replace(/_/g, "/").replace(/\/index$/, "")}`;
       if (config.config.path === "/index")
         config.config.path = "/";
       if (config.config.ignorePathPrefix) {
-        config.config.path = config.config.path.replace(new RegExp("^" + config.config.ignorePathPrefix), "");
+        config.config.path = config.config.path.replace(
+          new RegExp(`^${config.config.ignorePathPrefix}`),
+          ""
+        );
         if (config.config.path === "")
           config.config.path = "/";
       }
@@ -403,6 +445,7 @@ var Http = class {
     await provider.deploy(this.type, data, config);
   }
   async onMount(data, next) {
+    var _a;
     data.logger.debug("[onMount] merge config");
     const prefix = `SECRET_${this.name.toUpperCase()}_`;
     for (let key in process.env)
@@ -421,14 +464,19 @@ var Http = class {
         } else
           this.config[key] = value;
       }
-    if (data.config.plugins && data.config.plugins[this.name || this.type])
-      this.config = deep_merge.deepMerge(this.config, data.config.plugins[this.name || this.type].config);
+    if ((_a = data.config.plugins) == null ? void 0 : _a[this.name || this.type])
+      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 || {}, data.logger);
     this.session = this.cookie.session;
     if (this.validatorOptions) {
       data.logger.debug("[onMount] prepare validator");
-      this.validator = new Validator(this.validatorOptions);
+      this.validator = new Validator(
+        this.validatorOptions
+      );
     }
     await next();
   }
@@ -444,15 +492,18 @@ var Http = class {
         try {
           this.params = Object.keys(this.params).length ? Object.assign(this.params, JSON.parse(data.event.body)) : JSON.parse(data.event.body);
         } catch (error) {
-          data.logger.error("[onInvoke] Parse params from json body failed: %s", error.message);
+          data.logger.error(
+            "[onInvoke] Parse params from json body failed: %s",
+            error.message
+          );
         }
       } else {
         data.logger.debug("[onInvoke] Parse params from raw body");
         this.params = data.event.body || /* @__PURE__ */ Object.create(null);
       }
-      if (this.params && typeof this.params === "object" && this.params["_"])
-        delete this.params["_"];
-      data.event.params = JSON.parse(JSON.stringify(this.params));
+      if (this.params && typeof this.params === "object" && this.params._)
+        delete this.params._;
+      data.event.params = deepClone(this.params);
       data.logger.debug("[onInvoke] Params: %j", this.params);
     }
     this.cookie.invoke(this.headers.cookie, data.logger);
@@ -463,12 +514,15 @@ var Http = class {
     try {
       if (this.validator) {
         data.logger.debug("[onInvoke] Valid request");
-        await this.validator.valid({
-          headers: this.headers,
-          params: this.params,
-          cookie: this.cookie,
-          session: this.session
-        }, data.logger);
+        await this.validator.valid(
+          {
+            headers: this.headers,
+            params: this.params,
+            cookie: this.cookie,
+            session: this.session
+          },
+          data.logger
+        );
       }
       await next();
     } catch (error) {
@@ -478,7 +532,9 @@ var Http = class {
     if (data.response)
       if (data.response instanceof Error || ((_b = data.response.constructor) == null ? void 0 : _b.name) === "Error") {
         data.logger.error(data.response);
-        this.response.body = JSON.stringify({ error: { message: data.response.message } });
+        this.response.body = JSON.stringify({
+          error: { message: data.response.message }
+        });
         try {
           this.response.statusCode = data.response.statusCode || 500;
         } catch (error) {
@@ -490,11 +546,15 @@ var Http = class {
         this.response.body = JSON.stringify({ data: data.response });
     if (!this.response.statusCode)
       this.response.statusCode = this.response.body ? 200 : 201;
-    this.response.headers = Object.assign({
-      "Content-Type": "application/json; charset=utf-8",
-      "Cache-Control": "no-cache, no-store",
-      "X-FaasJS-Request-Id": data.logger.label
-    }, this.cookie.headers(), this.response.headers);
+    this.response.headers = Object.assign(
+      {
+        "Content-Type": "application/json; charset=utf-8",
+        "Cache-Control": "no-cache, no-store",
+        "X-FaasJS-Request-Id": data.logger.label
+      },
+      this.cookie.headers(),
+      this.response.headers
+    );
     data.response = Object.assign({}, data.response, this.response);
     const originBody = data.response.body;
     data.response.originBody = originBody;

package/dist/index.mjs

@@ -16,16 +16,19 @@ var Session = class {
     this.cookie = cookie;
     if (!(config == null ? void 0 : config.secret))
       cookie.logger.warn("Session's secret is missing.");
-    this.config = Object.assign({
-      key: "key",
-      secret: randomBytes(128).toString("hex"),
-      salt: "salt",
-      signedSalt: "signedSalt",
-      keylen: 64,
-      iterations: 100,
-      digest: "sha256",
-      cipherName: "aes-256-cbc"
-    }, config);
+    this.config = Object.assign(
+      {
+        key: "key",
+        secret: randomBytes(128).toString("hex"),
+        salt: "salt",
+        signedSalt: "signedSalt",
+        keylen: 64,
+        iterations: 100,
+        digest: "sha256",
+        cipherName: "aes-256-cbc"
+      },
+      config
+    );
     this.secret = pbkdf2Sync(
       this.config.secret,
       this.config.salt,
@@ -56,12 +59,17 @@ var Session = class {
       text = JSON.stringify(text);
     const iv = randomBytes(16);
     const cipher = 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 encrypted = Buffer.concat([
+      cipher.update(text),
+      cipher.final()
+    ]).toString("base64");
+    const main = Buffer.from(
+      [encrypted, iv.toString("base64")].join("--")
+    ).toString("base64");
     const hmac = createHmac(this.config.digest, this.signedSecret);
     hmac.update(main);
     const digest = hmac.digest("hex");
-    return main + "--" + digest;
+    return `${main}--${digest}`;
   }
   decode(text) {
     text = decodeURIComponent(text);
@@ -75,7 +83,11 @@ var Session = class {
     const parts = message.split("--").map(function(part2) {
       return Buffer.from(part2, "base64");
     });
-    const cipher = createDecipheriv(this.config.cipherName, this.secret, parts[1]);
+    const cipher = 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("");
@@ -94,20 +106,26 @@ var Session = class {
   }
   update() {
     if (this.changed)
-      this.cookie.write(this.config.key, this.encode(JSON.stringify(this.content)));
+      this.cookie.write(
+        this.config.key,
+        this.encode(JSON.stringify(this.content))
+      );
     return this;
   }
 };
 var Cookie = class {
   constructor(config, logger) {
     this.logger = logger;
-    this.config = deepMerge({
-      path: "/",
-      expires: 31536e3,
-      secure: true,
-      httpOnly: true,
-      session: {}
-    }, config);
+    this.config = deepMerge(
+      {
+        path: "/",
+        expires: 31536e3,
+        secure: true,
+        httpOnly: true,
+        session: {}
+      },
+      config
+    );
     this.session = new Session(this, this.config.session);
     this.content = /* @__PURE__ */ Object.create(null);
     this.setCookie = /* @__PURE__ */ Object.create(null);
@@ -119,7 +137,9 @@ var Cookie = class {
         x = x.trim();
         const k = /([^=]+)/.exec(x);
         if (k !== null)
-          this.content[k[0]] = decodeURIComponent(x.replace(`${k[0]}=`, "").replace(/;$/, ""));
+          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), logger);
@@ -368,6 +388,23 @@ var HttpError = class _HttpError extends Error {
   }
 };
 var Name = "http";
+function deepClone(obj) {
+  if (obj === null || typeof obj !== "object")
+    return obj;
+  if (Array.isArray(obj))
+    return JSON.parse(JSON.stringify(obj));
+  const clone = {};
+  for (const key in obj) {
+    if (!obj.hasOwnProperty(key))
+      continue;
+    if (typeof obj[key] === "function") {
+      clone[key] = obj[key];
+      continue;
+    }
+    clone[key] = deepClone(obj[key]);
+  }
+  return clone;
+}
 var Http = class {
   constructor(config) {
     this.type = Name;
@@ -384,13 +421,18 @@ 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 ? deepMerge(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$/, ""));
+      config.config.path = `/${(_a = data.name) == null ? void 0 : _a.replace(/_/g, "/").replace(/\/index$/, "")}`;
       if (config.config.path === "/index")
         config.config.path = "/";
       if (config.config.ignorePathPrefix) {
-        config.config.path = config.config.path.replace(new RegExp("^" + config.config.ignorePathPrefix), "");
+        config.config.path = config.config.path.replace(
+          new RegExp(`^${config.config.ignorePathPrefix}`),
+          ""
+        );
         if (config.config.path === "")
           config.config.path = "/";
       }
@@ -401,6 +443,7 @@ var Http = class {
     await provider.deploy(this.type, data, config);
   }
   async onMount(data, next) {
+    var _a;
     data.logger.debug("[onMount] merge config");
     const prefix = `SECRET_${this.name.toUpperCase()}_`;
     for (let key in process.env)
@@ -419,14 +462,19 @@ var Http = class {
         } else
           this.config[key] = value;
       }
-    if (data.config.plugins && data.config.plugins[this.name || this.type])
-      this.config = deepMerge(this.config, data.config.plugins[this.name || this.type].config);
+    if ((_a = data.config.plugins) == null ? void 0 : _a[this.name || this.type])
+      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 || {}, data.logger);
     this.session = this.cookie.session;
     if (this.validatorOptions) {
       data.logger.debug("[onMount] prepare validator");
-      this.validator = new Validator(this.validatorOptions);
+      this.validator = new Validator(
+        this.validatorOptions
+      );
     }
     await next();
   }
@@ -442,15 +490,18 @@ var Http = class {
         try {
           this.params = Object.keys(this.params).length ? Object.assign(this.params, JSON.parse(data.event.body)) : JSON.parse(data.event.body);
         } catch (error) {
-          data.logger.error("[onInvoke] Parse params from json body failed: %s", error.message);
+          data.logger.error(
+            "[onInvoke] Parse params from json body failed: %s",
+            error.message
+          );
         }
       } else {
         data.logger.debug("[onInvoke] Parse params from raw body");
         this.params = data.event.body || /* @__PURE__ */ Object.create(null);
       }
-      if (this.params && typeof this.params === "object" && this.params["_"])
-        delete this.params["_"];
-      data.event.params = JSON.parse(JSON.stringify(this.params));
+      if (this.params && typeof this.params === "object" && this.params._)
+        delete this.params._;
+      data.event.params = deepClone(this.params);
       data.logger.debug("[onInvoke] Params: %j", this.params);
     }
     this.cookie.invoke(this.headers.cookie, data.logger);
@@ -461,12 +512,15 @@ var Http = class {
     try {
       if (this.validator) {
         data.logger.debug("[onInvoke] Valid request");
-        await this.validator.valid({
-          headers: this.headers,
-          params: this.params,
-          cookie: this.cookie,
-          session: this.session
-        }, data.logger);
+        await this.validator.valid(
+          {
+            headers: this.headers,
+            params: this.params,
+            cookie: this.cookie,
+            session: this.session
+          },
+          data.logger
+        );
       }
       await next();
     } catch (error) {
@@ -476,7 +530,9 @@ var Http = class {
     if (data.response)
       if (data.response instanceof Error || ((_b = data.response.constructor) == null ? void 0 : _b.name) === "Error") {
         data.logger.error(data.response);
-        this.response.body = JSON.stringify({ error: { message: data.response.message } });
+        this.response.body = JSON.stringify({
+          error: { message: data.response.message }
+        });
         try {
           this.response.statusCode = data.response.statusCode || 500;
         } catch (error) {
@@ -488,11 +544,15 @@ var Http = class {
         this.response.body = JSON.stringify({ data: data.response });
     if (!this.response.statusCode)
       this.response.statusCode = this.response.body ? 200 : 201;
-    this.response.headers = Object.assign({
-      "Content-Type": "application/json; charset=utf-8",
-      "Cache-Control": "no-cache, no-store",
-      "X-FaasJS-Request-Id": data.logger.label
-    }, this.cookie.headers(), this.response.headers);
+    this.response.headers = Object.assign(
+      {
+        "Content-Type": "application/json; charset=utf-8",
+        "Cache-Control": "no-cache, no-store",
+        "X-FaasJS-Request-Id": data.logger.label
+      },
+      this.cookie.headers(),
+      this.response.headers
+    );
     data.response = Object.assign({}, data.response, this.response);
     const originBody = data.response.body;
     data.response.originBody = originBody;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/http",
-  "version": "0.0.3-beta.99",
+  "version": "0.0.4-beta.2",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,12 +21,16 @@
   "files": [
     "dist"
   ],
-  "dependencies": {
-    "@faasjs/func": "0.0.3-beta.99",
-    "@faasjs/logger": "0.0.3-beta.99"
+  "peerDependencies": {
+    "@faasjs/func": "0.0.4-beta.2",
+    "@faasjs/logger": "0.0.4-beta.2"
+  },
+  "devDependencies": {
+    "@faasjs/func": "0.0.4-beta.2",
+    "@faasjs/logger": "0.0.4-beta.2"
   },
   "engines": {
-    "npm": ">=8.0.0",
-    "node": ">=16.0.0"
+    "npm": ">=9.0.0",
+    "node": ">=18.0.0"
   }
 }