@faasjs/http 2.3.1 → 2.5.0

package/dist/index.js

@@ -9,15 +9,13 @@ var zlib = require('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) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
+  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))
-      cookie.logger.warn("Session's secret is missing.");
+    if (!(config == null ? void 0 : config.secret)) cookie.logger.warn("Session's secret is missing.");
     this.config = Object.assign(
       {
         key: "key",
@@ -57,8 +55,7 @@ var Session = class {
     this.changed = false;
   }
   encode(text) {
-    if (typeof text !== "string")
-      text = JSON.stringify(text);
+    if (typeof text !== "string") text = JSON.stringify(text);
     const iv = crypto.randomBytes(16);
     const cipher = crypto.createCipheriv(this.config.cipherName, this.secret, iv);
     const encrypted = Buffer.concat([
@@ -79,8 +76,7 @@ var Session = class {
     const hmac = crypto.createHmac(this.config.digest, this.signedSecret);
     hmac.update(signedParts[0]);
     const digest = hmac.digest("hex");
-    if (signedParts[1] !== digest)
-      throw Error("Session Not valid");
+    if (signedParts[1] !== digest) throw Error("Session Not valid");
     const message = Buffer.from(signedParts[0], "base64").toString();
     const parts = message.split("--").map((part2) => Buffer.from(part2, "base64"));
     const cipher = crypto.createDecipheriv(
@@ -97,10 +93,8 @@ var Session = class {
     return this.content[key];
   }
   write(key, value) {
-    if (value === null || typeof value === "undefined")
-      delete this.content[key];
-    else
-      this.content[key] = value;
+    if (value === null || typeof value === "undefined") delete this.content[key];
+    else this.content[key] = value;
     this.changed = true;
     return this;
   }
@@ -159,25 +153,19 @@ var Cookie = class {
       cookie = `${key}=${encodeURIComponent(value)};`;
       this.content[key] = value;
     }
-    if (typeof opts.expires === "number")
-      cookie += `max-age=${opts.expires};`;
+    if (typeof opts.expires === "number") cookie += `max-age=${opts.expires};`;
     else if (typeof opts.expires === "string")
       cookie += `expires=${opts.expires};`;
     cookie += `path=${opts.path || "/"};`;
-    if (opts.domain)
-      cookie += `domain=${opts.domain};`;
-    if (opts.secure)
-      cookie += "Secure;";
-    if (opts.httpOnly)
-      cookie += "HttpOnly;";
-    if (opts.sameSite)
-      cookie += `SameSite=${opts.sameSite};`;
+    if (opts.domain) cookie += `domain=${opts.domain};`;
+    if (opts.secure) cookie += "Secure;";
+    if (opts.httpOnly) cookie += "HttpOnly;";
+    if (opts.sameSite) cookie += `SameSite=${opts.sameSite};`;
     this.setCookie[key] = cookie;
     return this;
   }
   headers() {
-    if (Object.keys(this.setCookie).length === 0)
-      return {};
+    if (Object.keys(this.setCookie).length === 0) return {};
     return { "Set-Cookie": Object.values(this.setCookie) };
   }
 };
@@ -193,8 +181,7 @@ var Validator = class {
   async valid(request, logger) {
     if (this.before) {
       const result = await this.before(request);
-      if (result)
-        throw new HttpError(result);
+      if (result) throw new HttpError(result);
     }
     this.request = request;
     if (this.paramsConfig && request.params) {
@@ -203,8 +190,7 @@ var Validator = class {
     }
     if (this.cookieConfig && request.cookie) {
       logger.debug("Valid Cookie");
-      if (request.cookie == null)
-        throw Error("Not found Cookie");
+      if (request.cookie == null) throw Error("Not found Cookie");
       this.validContent(
         "cookie",
         request.cookie.content,
@@ -215,8 +201,7 @@ var Validator = class {
     }
     if (this.sessionConfig && request.session) {
       logger.debug("Valid Session");
-      if (request.session == null)
-        throw Error("Not found Session");
+      if (request.session == null) throw Error("Not found Session");
       this.validContent(
         "session",
         request.session.content,
@@ -239,20 +224,17 @@ var Validator = class {
           );
           if (config.onError) {
             const res = config.onError(`${type}.whitelist`, baseKey, diffKeys);
-            if (res)
-              throw new HttpError(res);
+            if (res) throw new HttpError(res);
           }
           throw error;
         }
         if (config.whitelist === "ignore")
-          for (const key of diff)
-            delete params[key];
+          for (const key of diff) delete params[key];
       }
     }
     for (const key in config.rules) {
       const rule = config.rules[key];
-      if (!rule)
-        continue;
+      if (!rule) continue;
       let value = params[key];
       if (rule.default) {
         if (type === "cookie" || type === "session")
@@ -271,16 +253,14 @@ var Validator = class {
               `${baseKey}${key}`,
               value
             );
-            if (res)
-              throw new HttpError(res);
+            if (res) throw new HttpError(res);
           }
           throw error;
         }
       }
       if (typeof value !== "undefined" && value !== null) {
         if (rule.type)
-          if (type === "cookie")
-            logger.warn("Cookie not support type rule");
+          if (type === "cookie") logger.warn("Cookie not support type rule");
           else {
             let typed = true;
             switch (rule.type) {
@@ -304,8 +284,7 @@ var Validator = class {
                   `${baseKey}${key}`,
                   value
                 );
-                if (res)
-                  throw new HttpError(res);
+                if (res) throw new HttpError(res);
               }
               throw error;
             }
@@ -320,8 +299,7 @@ var Validator = class {
               `${baseKey}${key}`,
               value
             );
-            if (res)
-              throw new HttpError(res);
+            if (res) throw new HttpError(res);
           }
           throw error;
         }
@@ -335,14 +313,12 @@ var Validator = class {
               `${baseKey}${key}`,
               value
             );
-            if (res)
-              throw new HttpError(res);
+            if (res) throw new HttpError(res);
           }
           throw error;
         }
         if (rule.config) {
-          if (type === "cookie")
-            logger.warn("Cookie not support nest rule.");
+          if (type === "cookie") logger.warn("Cookie not support nest rule.");
           else if (Array.isArray(value))
             for (const val of value)
               this.validContent(
@@ -381,22 +357,18 @@ var HttpError = class _HttpError extends Error {
     message
   }) {
     super(message);
-    if (Error.captureStackTrace)
-      Error.captureStackTrace(this, _HttpError);
+    if (Error.captureStackTrace) Error.captureStackTrace(this, _HttpError);
     this.statusCode = statusCode || 500;
     this.message = message;
   }
 };
 var Name = "http";
 function deepClone(obj) {
-  if (obj === null || typeof obj !== "object")
-    return obj;
-  if (Array.isArray(obj))
-    return JSON.parse(JSON.stringify(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 (!obj.hasOwnProperty(key)) continue;
     if (typeof obj[key] === "function") {
       clone[key] = obj[key];
       continue;
@@ -411,8 +383,7 @@ var Http = class {
     this.name = Name;
     this.name = (config == null ? void 0 : config.name) || this.type;
     this.config = (config == null ? void 0 : config.config) || /* @__PURE__ */ Object.create(null);
-    if (config == null ? void 0 : config.validator)
-      this.validatorOptions = config.validator;
+    if (config == null ? void 0 : config.validator) this.validatorOptions = config.validator;
   }
   async onDeploy(data, next) {
     var _a;
@@ -426,15 +397,13 @@ var Http = class {
     }) : { 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")
-        config.config.path = "/";
+      if (config.config.path === "/index") config.config.path = "/";
       if (config.config.ignorePathPrefix) {
         config.config.path = config.config.path.replace(
           new RegExp(`^${config.config.ignorePathPrefix}`),
           ""
         );
-        if (config.config.path === "")
-          config.config.path = "/";
+        if (config.config.path === "") config.config.path = "/";
       }
     }
     logger$1.debug("Api gateway's config: %j", config);
@@ -457,16 +426,13 @@ var Http = class {
           let config = this.config;
           const keys = key.split("_");
           for (const k of keys.slice(0, keys.length - 1)) {
-            if (!config[k])
-              config[k] = /* @__PURE__ */ Object.create(null);
+            if (!config[k]) config[k] = /* @__PURE__ */ Object.create(null);
             config = config[k];
           }
           config[keys[keys.length - 1]] = value;
-        } else
-          this.config[key] = value;
+        } else this.config[key] = value;
       }
-    if (!data.config)
-      throw Error(`[${this.name}] Config not found.`);
+    if (!data.config) throw Error(`[${this.name}] Config not found.`);
     if ((_b = data.config.plugins) == null ? void 0 : _b[this.name || this.type])
       this.config = deep_merge.deepMerge(
         this.config,
@@ -553,8 +519,7 @@ var Http = class {
         }
       } else if (Object.prototype.toString.call(data.response) === "[object Object]" && data.response.statusCode && data.response.headers)
         this.response = data.response;
-      else
-        this.response.body = JSON.stringify({ data: data.response });
+      else 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(
@@ -574,8 +539,7 @@ var Http = class {
     if (!data.response.body || data.response.isBase64Encoded || typeof data.response.body !== "string" || data.response.body.length < 1024)
       return;
     const acceptEncoding = this.headers["accept-encoding"] || this.headers["Accept-Encoding"];
-    if (!acceptEncoding || !/(br|gzip|deflate)/.test(acceptEncoding))
-      return;
+    if (!acceptEncoding || !/(br|gzip|deflate)/.test(acceptEncoding)) return;
     try {
       if (acceptEncoding.includes("br")) {
         data.response.headers["Content-Encoding"] = "br";
@@ -586,8 +550,7 @@ var Http = class {
       } else if (acceptEncoding.includes("deflate")) {
         data.response.headers["Content-Encoding"] = "deflate";
         data.response.body = zlib.deflateSync(originBody).toString("base64");
-      } else
-        throw Error("No matched compression.");
+      } else throw Error("No matched compression.");
       data.response.isBase64Encoded = true;
     } catch (error) {
       console.error(error);
@@ -612,8 +575,7 @@ var Http = class {
   setContentType(type, charset = "utf-8") {
     if (ContentType[type])
       this.setHeader("Content-Type", `${ContentType[type]}; charset=${charset}`);
-    else
-      this.setHeader("Content-Type", `${type}; charset=${charset}`);
+    else this.setHeader("Content-Type", `${type}; charset=${charset}`);
     return this;
   }
   /**

package/dist/index.mjs

@@ -7,15 +7,13 @@ import { brotliCompressSync, gzipSync, deflateSync } from 'node: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) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
+  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))
-      cookie.logger.warn("Session's secret is missing.");
+    if (!(config == null ? void 0 : config.secret)) cookie.logger.warn("Session's secret is missing.");
     this.config = Object.assign(
       {
         key: "key",
@@ -55,8 +53,7 @@ var Session = class {
     this.changed = false;
   }
   encode(text) {
-    if (typeof text !== "string")
-      text = JSON.stringify(text);
+    if (typeof text !== "string") text = JSON.stringify(text);
     const iv = randomBytes(16);
     const cipher = createCipheriv(this.config.cipherName, this.secret, iv);
     const encrypted = Buffer.concat([
@@ -77,8 +74,7 @@ var Session = class {
     const hmac = createHmac(this.config.digest, this.signedSecret);
     hmac.update(signedParts[0]);
     const digest = hmac.digest("hex");
-    if (signedParts[1] !== digest)
-      throw Error("Session Not valid");
+    if (signedParts[1] !== digest) throw Error("Session Not valid");
     const message = Buffer.from(signedParts[0], "base64").toString();
     const parts = message.split("--").map((part2) => Buffer.from(part2, "base64"));
     const cipher = createDecipheriv(
@@ -95,10 +91,8 @@ var Session = class {
     return this.content[key];
   }
   write(key, value) {
-    if (value === null || typeof value === "undefined")
-      delete this.content[key];
-    else
-      this.content[key] = value;
+    if (value === null || typeof value === "undefined") delete this.content[key];
+    else this.content[key] = value;
     this.changed = true;
     return this;
   }
@@ -157,25 +151,19 @@ var Cookie = class {
       cookie = `${key}=${encodeURIComponent(value)};`;
       this.content[key] = value;
     }
-    if (typeof opts.expires === "number")
-      cookie += `max-age=${opts.expires};`;
+    if (typeof opts.expires === "number") cookie += `max-age=${opts.expires};`;
     else if (typeof opts.expires === "string")
       cookie += `expires=${opts.expires};`;
     cookie += `path=${opts.path || "/"};`;
-    if (opts.domain)
-      cookie += `domain=${opts.domain};`;
-    if (opts.secure)
-      cookie += "Secure;";
-    if (opts.httpOnly)
-      cookie += "HttpOnly;";
-    if (opts.sameSite)
-      cookie += `SameSite=${opts.sameSite};`;
+    if (opts.domain) cookie += `domain=${opts.domain};`;
+    if (opts.secure) cookie += "Secure;";
+    if (opts.httpOnly) cookie += "HttpOnly;";
+    if (opts.sameSite) cookie += `SameSite=${opts.sameSite};`;
     this.setCookie[key] = cookie;
     return this;
   }
   headers() {
-    if (Object.keys(this.setCookie).length === 0)
-      return {};
+    if (Object.keys(this.setCookie).length === 0) return {};
     return { "Set-Cookie": Object.values(this.setCookie) };
   }
 };
@@ -191,8 +179,7 @@ var Validator = class {
   async valid(request, logger) {
     if (this.before) {
       const result = await this.before(request);
-      if (result)
-        throw new HttpError(result);
+      if (result) throw new HttpError(result);
     }
     this.request = request;
     if (this.paramsConfig && request.params) {
@@ -201,8 +188,7 @@ var Validator = class {
     }
     if (this.cookieConfig && request.cookie) {
       logger.debug("Valid Cookie");
-      if (request.cookie == null)
-        throw Error("Not found Cookie");
+      if (request.cookie == null) throw Error("Not found Cookie");
       this.validContent(
         "cookie",
         request.cookie.content,
@@ -213,8 +199,7 @@ var Validator = class {
     }
     if (this.sessionConfig && request.session) {
       logger.debug("Valid Session");
-      if (request.session == null)
-        throw Error("Not found Session");
+      if (request.session == null) throw Error("Not found Session");
       this.validContent(
         "session",
         request.session.content,
@@ -237,20 +222,17 @@ var Validator = class {
           );
           if (config.onError) {
             const res = config.onError(`${type}.whitelist`, baseKey, diffKeys);
-            if (res)
-              throw new HttpError(res);
+            if (res) throw new HttpError(res);
           }
           throw error;
         }
         if (config.whitelist === "ignore")
-          for (const key of diff)
-            delete params[key];
+          for (const key of diff) delete params[key];
       }
     }
     for (const key in config.rules) {
       const rule = config.rules[key];
-      if (!rule)
-        continue;
+      if (!rule) continue;
       let value = params[key];
       if (rule.default) {
         if (type === "cookie" || type === "session")
@@ -269,16 +251,14 @@ var Validator = class {
               `${baseKey}${key}`,
               value
             );
-            if (res)
-              throw new HttpError(res);
+            if (res) throw new HttpError(res);
           }
           throw error;
         }
       }
       if (typeof value !== "undefined" && value !== null) {
         if (rule.type)
-          if (type === "cookie")
-            logger.warn("Cookie not support type rule");
+          if (type === "cookie") logger.warn("Cookie not support type rule");
           else {
             let typed = true;
             switch (rule.type) {
@@ -302,8 +282,7 @@ var Validator = class {
                   `${baseKey}${key}`,
                   value
                 );
-                if (res)
-                  throw new HttpError(res);
+                if (res) throw new HttpError(res);
               }
               throw error;
             }
@@ -318,8 +297,7 @@ var Validator = class {
               `${baseKey}${key}`,
               value
             );
-            if (res)
-              throw new HttpError(res);
+            if (res) throw new HttpError(res);
           }
           throw error;
         }
@@ -333,14 +311,12 @@ var Validator = class {
               `${baseKey}${key}`,
               value
             );
-            if (res)
-              throw new HttpError(res);
+            if (res) throw new HttpError(res);
           }
           throw error;
         }
         if (rule.config) {
-          if (type === "cookie")
-            logger.warn("Cookie not support nest rule.");
+          if (type === "cookie") logger.warn("Cookie not support nest rule.");
           else if (Array.isArray(value))
             for (const val of value)
               this.validContent(
@@ -379,22 +355,18 @@ var HttpError = class _HttpError extends Error {
     message
   }) {
     super(message);
-    if (Error.captureStackTrace)
-      Error.captureStackTrace(this, _HttpError);
+    if (Error.captureStackTrace) Error.captureStackTrace(this, _HttpError);
     this.statusCode = statusCode || 500;
     this.message = message;
   }
 };
 var Name = "http";
 function deepClone(obj) {
-  if (obj === null || typeof obj !== "object")
-    return obj;
-  if (Array.isArray(obj))
-    return JSON.parse(JSON.stringify(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 (!obj.hasOwnProperty(key)) continue;
     if (typeof obj[key] === "function") {
       clone[key] = obj[key];
       continue;
@@ -409,8 +381,7 @@ var Http = class {
     this.name = Name;
     this.name = (config == null ? void 0 : config.name) || this.type;
     this.config = (config == null ? void 0 : config.config) || /* @__PURE__ */ Object.create(null);
-    if (config == null ? void 0 : config.validator)
-      this.validatorOptions = config.validator;
+    if (config == null ? void 0 : config.validator) this.validatorOptions = config.validator;
   }
   async onDeploy(data, next) {
     var _a;
@@ -424,15 +395,13 @@ var Http = class {
     }) : { 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")
-        config.config.path = "/";
+      if (config.config.path === "/index") config.config.path = "/";
       if (config.config.ignorePathPrefix) {
         config.config.path = config.config.path.replace(
           new RegExp(`^${config.config.ignorePathPrefix}`),
           ""
         );
-        if (config.config.path === "")
-          config.config.path = "/";
+        if (config.config.path === "") config.config.path = "/";
       }
     }
     logger.debug("Api gateway's config: %j", config);
@@ -455,16 +424,13 @@ var Http = class {
           let config = this.config;
           const keys = key.split("_");
           for (const k of keys.slice(0, keys.length - 1)) {
-            if (!config[k])
-              config[k] = /* @__PURE__ */ Object.create(null);
+            if (!config[k]) config[k] = /* @__PURE__ */ Object.create(null);
             config = config[k];
           }
           config[keys[keys.length - 1]] = value;
-        } else
-          this.config[key] = value;
+        } else this.config[key] = value;
       }
-    if (!data.config)
-      throw Error(`[${this.name}] Config not found.`);
+    if (!data.config) throw Error(`[${this.name}] Config not found.`);
     if ((_b = data.config.plugins) == null ? void 0 : _b[this.name || this.type])
       this.config = deepMerge(
         this.config,
@@ -551,8 +517,7 @@ var Http = class {
         }
       } else if (Object.prototype.toString.call(data.response) === "[object Object]" && data.response.statusCode && data.response.headers)
         this.response = data.response;
-      else
-        this.response.body = JSON.stringify({ data: data.response });
+      else 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(
@@ -572,8 +537,7 @@ var Http = class {
     if (!data.response.body || data.response.isBase64Encoded || typeof data.response.body !== "string" || data.response.body.length < 1024)
       return;
     const acceptEncoding = this.headers["accept-encoding"] || this.headers["Accept-Encoding"];
-    if (!acceptEncoding || !/(br|gzip|deflate)/.test(acceptEncoding))
-      return;
+    if (!acceptEncoding || !/(br|gzip|deflate)/.test(acceptEncoding)) return;
     try {
       if (acceptEncoding.includes("br")) {
         data.response.headers["Content-Encoding"] = "br";
@@ -584,8 +548,7 @@ var Http = class {
       } else if (acceptEncoding.includes("deflate")) {
         data.response.headers["Content-Encoding"] = "deflate";
         data.response.body = deflateSync(originBody).toString("base64");
-      } else
-        throw Error("No matched compression.");
+      } else throw Error("No matched compression.");
       data.response.isBase64Encoded = true;
     } catch (error) {
       console.error(error);
@@ -610,8 +573,7 @@ var Http = class {
   setContentType(type, charset = "utf-8") {
     if (ContentType[type])
       this.setHeader("Content-Type", `${ContentType[type]}; charset=${charset}`);
-    else
-      this.setHeader("Content-Type", `${type}; charset=${charset}`);
+    else this.setHeader("Content-Type", `${type}; charset=${charset}`);
     return this;
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/http",
-  "version": "2.3.1",
+  "version": "2.5.0",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,12 +22,12 @@
     "dist"
   ],
   "peerDependencies": {
-    "@faasjs/func": "2.3.1",
-    "@faasjs/logger": "2.3.1"
+    "@faasjs/func": "2.5.0",
+    "@faasjs/logger": "2.5.0"
   },
   "devDependencies": {
-    "@faasjs/func": "2.3.1",
-    "@faasjs/logger": "2.3.1"
+    "@faasjs/func": "2.5.0",
+    "@faasjs/logger": "2.5.0"
   },
   "engines": {
     "npm": ">=9.0.0",