@faasjs/http 0.0.4-beta.6 → 0.0.4-beta.8

package/dist/index.js

@@ -135,14 +135,14 @@ var Cookie = class {
   invoke(cookie, logger) {
     this.content = /* @__PURE__ */ Object.create(null);
     if (cookie)
-      cookie.split(";").forEach((x) => {
-        x = x.trim();
-        const k = /([^=]+)/.exec(x);
+      for (const x of cookie.split(";")) {
+        const trimX = x.trim();
+        const k = /([^=]+)/.exec(trimX);
         if (k !== null)
           this.content[k[0]] = decodeURIComponent(
-            x.replace(`${k[0]}=`, "").replace(/;$/, "")
+            trimX.replace(`${k[0]}=`, "").replace(/;$/, "")
           );
-      });
+      }
     this.setCookie = /* @__PURE__ */ Object.create(null);
     this.session.invoke(this.read(this.session.config.key), logger);
     return this;
@@ -445,8 +445,11 @@ var Http = class {
     await provider.deploy(this.type, data, config);
   }
   async onMount(data, next) {
-    var _a;
-    data.logger.debug("[onMount] merge config");
+    var _a, _b;
+    const logger$1 = new logger.Logger(((_a = data.logger) == null ? void 0 : _a.label) || this.name);
+    if (!logger$1.label.endsWith(this.name))
+      logger$1.label = `${logger$1.label}] [${this.name}`;
+    logger$1.debug("[onMount] merge config");
     const prefix = `SECRET_${this.name.toUpperCase()}_`;
     for (let key in process.env)
       if (key.startsWith(prefix)) {
@@ -455,25 +458,27 @@ var Http = class {
         if (key.includes("_")) {
           let config = this.config;
           const keys = key.split("_");
-          keys.slice(0, keys.length - 1).forEach((k) => {
+          for (const k of keys.slice(0, keys.length - 1)) {
             if (!config[k])
               config[k] = /* @__PURE__ */ Object.create(null);
             config = config[k];
-          });
+          }
           config[keys[keys.length - 1]] = value;
         } else
           this.config[key] = value;
       }
-    if ((_a = data.config.plugins) == null ? void 0 : _a[this.name || this.type])
+    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,
         data.config.plugins[this.name || this.type].config
       );
-    data.logger.debug("[onMount] prepare cookie & session");
-    this.cookie = new Cookie(this.config.cookie || {}, data.logger);
+    logger$1.debug("[onMount] prepare cookie & session");
+    this.cookie = new Cookie(this.config.cookie || {}, logger$1);
     this.session = this.cookie.session;
     if (this.validatorOptions) {
-      data.logger.debug("[onMount] prepare validator");
+      logger$1.debug("[onMount] prepare validator");
       this.validator = new Validator(
         this.validatorOptions
       );
@@ -481,39 +486,46 @@ var Http = class {
     await next();
   }
   async onInvoke(data, next) {
-    var _a, _b;
+    var _a, _b, _c, _d;
+    const logger$1 = new logger.Logger(((_a = data.logger) == null ? void 0 : _a.label) || this.name);
+    if (!((_b = logger$1.label) == null ? void 0 : _b.endsWith(this.name)))
+      logger$1.label = `${logger$1.label}] [${this.name}`;
     this.headers = data.event.headers || /* @__PURE__ */ Object.create(null);
     this.body = data.event.body;
     this.params = data.event.queryString || /* @__PURE__ */ Object.create(null);
     this.response = { headers: /* @__PURE__ */ Object.create(null) };
     if (data.event.body) {
-      if (((_a = this.headers["content-type"]) == null ? void 0 : _a.includes("application/json")) && typeof data.event.body === "string" && data.event.body.length > 1) {
-        data.logger.debug("[onInvoke] Parse params from json body");
+      if (((_c = this.headers["content-type"]) == null ? void 0 : _c.includes("application/json")) && typeof data.event.body === "string" && data.event.body.length > 1) {
+        logger$1.debug("[onInvoke] Parse params from json body");
         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(
+          logger$1.error(
             "[onInvoke] Parse params from json body failed: %s",
             error.message
           );
         }
       } else {
-        data.logger.debug("[onInvoke] Parse params from raw body");
+        logger$1.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 = deepClone(this.params);
-      data.logger.debug("[onInvoke] Params: %j", this.params);
+      logger$1.debug("[onInvoke] Params: %j", this.params);
     }
-    this.cookie.invoke(this.headers.cookie, data.logger);
+    this.cookie.invoke(this.headers.cookie, logger$1);
     if (this.headers.cookie) {
-      data.logger.debug("[onInvoke] Cookie: %j", this.cookie.content);
-      data.logger.debug("[onInvoke] Session: %j", this.session.content);
+      logger$1.debug("[onInvoke] Cookie: %j", this.cookie.content);
+      logger$1.debug(
+        "[onInvoke] Session: %s %j",
+        this.session.config.key,
+        this.session.content
+      );
     }
     try {
       if (this.validator) {
-        data.logger.debug("[onInvoke] Valid request");
+        logger$1.debug("[onInvoke] Valid request");
         await this.validator.valid(
           {
             headers: this.headers,
@@ -521,7 +533,7 @@ var Http = class {
             cookie: this.cookie,
             session: this.session
           },
-          data.logger
+          logger$1
         );
       }
       await next();
@@ -530,8 +542,8 @@ var Http = class {
     }
     this.session.update();
     if (data.response)
-      if (data.response instanceof Error || ((_b = data.response.constructor) == null ? void 0 : _b.name) === "Error") {
-        data.logger.error(data.response);
+      if (data.response instanceof Error || ((_d = data.response.constructor) == null ? void 0 : _d.name) === "Error") {
+        logger$1.error(data.response);
         this.response.body = JSON.stringify({
           error: { message: data.response.message }
         });

package/dist/index.mjs

@@ -133,14 +133,14 @@ var Cookie = class {
   invoke(cookie, logger) {
     this.content = /* @__PURE__ */ Object.create(null);
     if (cookie)
-      cookie.split(";").forEach((x) => {
-        x = x.trim();
-        const k = /([^=]+)/.exec(x);
+      for (const x of cookie.split(";")) {
+        const trimX = x.trim();
+        const k = /([^=]+)/.exec(trimX);
         if (k !== null)
           this.content[k[0]] = decodeURIComponent(
-            x.replace(`${k[0]}=`, "").replace(/;$/, "")
+            trimX.replace(`${k[0]}=`, "").replace(/;$/, "")
           );
-      });
+      }
     this.setCookie = /* @__PURE__ */ Object.create(null);
     this.session.invoke(this.read(this.session.config.key), logger);
     return this;
@@ -443,8 +443,11 @@ var Http = class {
     await provider.deploy(this.type, data, config);
   }
   async onMount(data, next) {
-    var _a;
-    data.logger.debug("[onMount] merge config");
+    var _a, _b;
+    const logger = new Logger(((_a = data.logger) == null ? void 0 : _a.label) || this.name);
+    if (!logger.label.endsWith(this.name))
+      logger.label = `${logger.label}] [${this.name}`;
+    logger.debug("[onMount] merge config");
     const prefix = `SECRET_${this.name.toUpperCase()}_`;
     for (let key in process.env)
       if (key.startsWith(prefix)) {
@@ -453,25 +456,27 @@ var Http = class {
         if (key.includes("_")) {
           let config = this.config;
           const keys = key.split("_");
-          keys.slice(0, keys.length - 1).forEach((k) => {
+          for (const k of keys.slice(0, keys.length - 1)) {
             if (!config[k])
               config[k] = /* @__PURE__ */ Object.create(null);
             config = config[k];
-          });
+          }
           config[keys[keys.length - 1]] = value;
         } else
           this.config[key] = value;
       }
-    if ((_a = data.config.plugins) == null ? void 0 : _a[this.name || this.type])
+    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,
         data.config.plugins[this.name || this.type].config
       );
-    data.logger.debug("[onMount] prepare cookie & session");
-    this.cookie = new Cookie(this.config.cookie || {}, data.logger);
+    logger.debug("[onMount] prepare cookie & session");
+    this.cookie = new Cookie(this.config.cookie || {}, logger);
     this.session = this.cookie.session;
     if (this.validatorOptions) {
-      data.logger.debug("[onMount] prepare validator");
+      logger.debug("[onMount] prepare validator");
       this.validator = new Validator(
         this.validatorOptions
       );
@@ -479,39 +484,46 @@ var Http = class {
     await next();
   }
   async onInvoke(data, next) {
-    var _a, _b;
+    var _a, _b, _c, _d;
+    const logger = new Logger(((_a = data.logger) == null ? void 0 : _a.label) || this.name);
+    if (!((_b = logger.label) == null ? void 0 : _b.endsWith(this.name)))
+      logger.label = `${logger.label}] [${this.name}`;
     this.headers = data.event.headers || /* @__PURE__ */ Object.create(null);
     this.body = data.event.body;
     this.params = data.event.queryString || /* @__PURE__ */ Object.create(null);
     this.response = { headers: /* @__PURE__ */ Object.create(null) };
     if (data.event.body) {
-      if (((_a = this.headers["content-type"]) == null ? void 0 : _a.includes("application/json")) && typeof data.event.body === "string" && data.event.body.length > 1) {
-        data.logger.debug("[onInvoke] Parse params from json body");
+      if (((_c = this.headers["content-type"]) == null ? void 0 : _c.includes("application/json")) && typeof data.event.body === "string" && data.event.body.length > 1) {
+        logger.debug("[onInvoke] Parse params from json body");
         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(
+          logger.error(
             "[onInvoke] Parse params from json body failed: %s",
             error.message
           );
         }
       } else {
-        data.logger.debug("[onInvoke] Parse params from raw body");
+        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 = deepClone(this.params);
-      data.logger.debug("[onInvoke] Params: %j", this.params);
+      logger.debug("[onInvoke] Params: %j", this.params);
     }
-    this.cookie.invoke(this.headers.cookie, data.logger);
+    this.cookie.invoke(this.headers.cookie, logger);
     if (this.headers.cookie) {
-      data.logger.debug("[onInvoke] Cookie: %j", this.cookie.content);
-      data.logger.debug("[onInvoke] Session: %j", this.session.content);
+      logger.debug("[onInvoke] Cookie: %j", this.cookie.content);
+      logger.debug(
+        "[onInvoke] Session: %s %j",
+        this.session.config.key,
+        this.session.content
+      );
     }
     try {
       if (this.validator) {
-        data.logger.debug("[onInvoke] Valid request");
+        logger.debug("[onInvoke] Valid request");
         await this.validator.valid(
           {
             headers: this.headers,
@@ -519,7 +531,7 @@ var Http = class {
             cookie: this.cookie,
             session: this.session
           },
-          data.logger
+          logger
         );
       }
       await next();
@@ -528,8 +540,8 @@ var Http = class {
     }
     this.session.update();
     if (data.response)
-      if (data.response instanceof Error || ((_b = data.response.constructor) == null ? void 0 : _b.name) === "Error") {
-        data.logger.error(data.response);
+      if (data.response instanceof Error || ((_d = data.response.constructor) == null ? void 0 : _d.name) === "Error") {
+        logger.error(data.response);
         this.response.body = JSON.stringify({
           error: { message: data.response.message }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/http",
-  "version": "0.0.4-beta.6",
+  "version": "0.0.4-beta.8",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,9 +21,13 @@
   "files": [
     "dist"
   ],
-  "dependencies": {
-    "@faasjs/func": "0.0.4-beta.6",
-    "@faasjs/logger": "0.0.4-beta.6"
+  "peerDependencies": {
+    "@faasjs/func": "0.0.4-beta.8",
+    "@faasjs/logger": "0.0.4-beta.8"
+  },
+  "devDependencies": {
+    "@faasjs/func": "0.0.4-beta.8",
+    "@faasjs/logger": "0.0.4-beta.8"
   },
   "engines": {
     "npm": ">=9.0.0",