@faasjs/http 3.1.0 → 3.1.1

package/dist/index.d.mts

@@ -187,7 +187,7 @@ declare class HttpError extends Error {
     });
 }
 declare class Http<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any> implements Plugin {
-    readonly type: string;
+    readonly type = "http";
     readonly name: string;
     headers: {
         [key: string]: string;

package/dist/index.d.ts

@@ -187,7 +187,7 @@ declare class HttpError extends Error {
     });
 }
 declare class Http<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any> implements Plugin {
-    readonly type: string;
+    readonly type = "http";
     readonly name: string;
     headers: {
         [key: string]: string;

package/dist/index.js

@@ -2,7 +2,6 @@
 
 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');
 
@@ -375,7 +374,7 @@ var HttpError = class _HttpError extends Error {
     this.message = message;
   }
 };
-var Name = "http";
+var Name = "Http";
 function deepClone(obj) {
   if (obj === null || typeof obj !== "object") return obj;
   if (Array.isArray(obj)) return JSON.parse(JSON.stringify(obj));
@@ -391,7 +390,7 @@ function deepClone(obj) {
   return clone;
 }
 var Http = class {
-  type = Name;
+  type = "http";
   name = Name;
   headers;
   body;
@@ -411,10 +410,7 @@ var Http = class {
     }
   }
   async onMount(data, next) {
-    const logger$1 = new logger.Logger(data.logger?.label || this.name);
-    if (!logger$1.label.endsWith(this.name))
-      logger$1.label = `${logger$1.label}] [${this.name}`;
-    logger$1.debug("[onMount] merge config");
+    data.logger.debug("merge config");
     const prefix = `SECRET_${this.name.toUpperCase()}_`;
     for (let key in process.env)
       if (key.startsWith(prefix)) {
@@ -436,11 +432,11 @@ var Http = class {
         this.config,
         data.config.plugins[this.name || this.type].config
       );
-    logger$1.debug("[onMount] prepare cookie & session");
-    this.cookie = new Cookie(this.config.cookie || {}, logger$1);
+    data.logger.debug("prepare cookie & session");
+    this.cookie = new Cookie(this.config.cookie || {}, data.logger);
     this.session = this.cookie.session;
     if (this.validatorOptions) {
-      logger$1.debug("[onMount] prepare validator");
+      data.logger.debug("prepare validator");
       this.validator = new Validator(
         this.validatorOptions
       );
@@ -448,45 +444,42 @@ var Http = class {
     await next();
   }
   async onInvoke(data, next) {
-    const logger$1 = new logger.Logger(data.logger?.label || this.name);
-    if (!logger$1.label?.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 (this.headers["content-type"]?.includes("application/json") && typeof data.event.body === "string" && data.event.body.length > 1) {
-        logger$1.debug("[onInvoke] Parse params from json body");
+        data.logger.debug("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) {
-          logger$1.error(
-            "[onInvoke] Parse params from json body failed: %s",
+          data.logger.error(
+            "Parse params from json body failed: %s",
             error.message
           );
         }
       } else {
-        logger$1.debug("[onInvoke] Parse params from raw body");
+        data.logger.debug("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);
-      logger$1.debug("[onInvoke] Params: %j", this.params);
+      data.logger.debug("Params: %j", this.params);
     }
-    this.cookie.invoke(this.headers.cookie, logger$1);
+    this.cookie.invoke(this.headers.cookie, data.logger);
     if (this.headers.cookie) {
-      logger$1.debug("[onInvoke] Cookie: %j", this.cookie.content);
-      logger$1.debug(
-        "[onInvoke] Session: %s %j",
+      data.logger.debug("Cookie: %j", this.cookie.content);
+      data.logger.debug(
+        "Session: %s %j",
         this.session.config.key,
         this.session.content
       );
     }
     try {
       if (this.validator) {
-        logger$1.debug("[onInvoke] Valid request");
+        data.logger.debug("Valid request");
         await this.validator.valid(
           {
             headers: this.headers,
@@ -494,7 +487,7 @@ var Http = class {
             cookie: this.cookie,
             session: this.session
           },
-          logger$1
+          data.logger
         );
       }
       await next();
@@ -504,7 +497,7 @@ var Http = class {
     this.session.update();
     if (data.response)
       if (data.response instanceof Error || data.response.constructor?.name === "Error") {
-        logger$1.error(data.response);
+        data.logger.error(data.response);
         this.response.body = JSON.stringify({
           error: { message: data.response.message }
         });
@@ -523,7 +516,7 @@ var Http = class {
       {
         "content-type": "application/json; charset=utf-8",
         "cache-control": "no-cache, no-store",
-        "x-faasjs-request-id": data.logger.label
+        "x-faasjs-request-id": data.context.request_id
       },
       this.cookie.headers(),
       this.response.headers

package/dist/index.mjs

@@ -1,6 +1,5 @@
 import { usePlugin } from '@faasjs/func';
 import { deepMerge } from '@faasjs/deep_merge';
-import { Logger } from '@faasjs/logger';
 import { randomBytes, pbkdf2Sync, createCipheriv, createHmac, createDecipheriv } from 'node:crypto';
 import { brotliCompressSync, gzipSync, deflateSync } from 'node:zlib';
 
@@ -373,7 +372,7 @@ var HttpError = class _HttpError extends Error {
     this.message = message;
   }
 };
-var Name = "http";
+var Name = "Http";
 function deepClone(obj) {
   if (obj === null || typeof obj !== "object") return obj;
   if (Array.isArray(obj)) return JSON.parse(JSON.stringify(obj));
@@ -389,7 +388,7 @@ function deepClone(obj) {
   return clone;
 }
 var Http = class {
-  type = Name;
+  type = "http";
   name = Name;
   headers;
   body;
@@ -409,10 +408,7 @@ var Http = class {
     }
   }
   async onMount(data, next) {
-    const logger = new Logger(data.logger?.label || this.name);
-    if (!logger.label.endsWith(this.name))
-      logger.label = `${logger.label}] [${this.name}`;
-    logger.debug("[onMount] merge config");
+    data.logger.debug("merge config");
     const prefix = `SECRET_${this.name.toUpperCase()}_`;
     for (let key in process.env)
       if (key.startsWith(prefix)) {
@@ -434,11 +430,11 @@ var Http = class {
         this.config,
         data.config.plugins[this.name || this.type].config
       );
-    logger.debug("[onMount] prepare cookie & session");
-    this.cookie = new Cookie(this.config.cookie || {}, logger);
+    data.logger.debug("prepare cookie & session");
+    this.cookie = new Cookie(this.config.cookie || {}, data.logger);
     this.session = this.cookie.session;
     if (this.validatorOptions) {
-      logger.debug("[onMount] prepare validator");
+      data.logger.debug("prepare validator");
       this.validator = new Validator(
         this.validatorOptions
       );
@@ -446,45 +442,42 @@ var Http = class {
     await next();
   }
   async onInvoke(data, next) {
-    const logger = new Logger(data.logger?.label || this.name);
-    if (!logger.label?.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 (this.headers["content-type"]?.includes("application/json") && typeof data.event.body === "string" && data.event.body.length > 1) {
-        logger.debug("[onInvoke] Parse params from json body");
+        data.logger.debug("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) {
-          logger.error(
-            "[onInvoke] Parse params from json body failed: %s",
+          data.logger.error(
+            "Parse params from json body failed: %s",
             error.message
           );
         }
       } else {
-        logger.debug("[onInvoke] Parse params from raw body");
+        data.logger.debug("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);
-      logger.debug("[onInvoke] Params: %j", this.params);
+      data.logger.debug("Params: %j", this.params);
     }
-    this.cookie.invoke(this.headers.cookie, logger);
+    this.cookie.invoke(this.headers.cookie, data.logger);
     if (this.headers.cookie) {
-      logger.debug("[onInvoke] Cookie: %j", this.cookie.content);
-      logger.debug(
-        "[onInvoke] Session: %s %j",
+      data.logger.debug("Cookie: %j", this.cookie.content);
+      data.logger.debug(
+        "Session: %s %j",
         this.session.config.key,
         this.session.content
       );
     }
     try {
       if (this.validator) {
-        logger.debug("[onInvoke] Valid request");
+        data.logger.debug("Valid request");
         await this.validator.valid(
           {
             headers: this.headers,
@@ -492,7 +485,7 @@ var Http = class {
             cookie: this.cookie,
             session: this.session
           },
-          logger
+          data.logger
         );
       }
       await next();
@@ -502,7 +495,7 @@ var Http = class {
     this.session.update();
     if (data.response)
       if (data.response instanceof Error || data.response.constructor?.name === "Error") {
-        logger.error(data.response);
+        data.logger.error(data.response);
         this.response.body = JSON.stringify({
           error: { message: data.response.message }
         });
@@ -521,7 +514,7 @@ var Http = class {
       {
         "content-type": "application/json; charset=utf-8",
         "cache-control": "no-cache, no-store",
-        "x-faasjs-request-id": data.logger.label
+        "x-faasjs-request-id": data.context.request_id
       },
       this.cookie.headers(),
       this.response.headers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/http",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -34,12 +34,12 @@
     "dist"
   ],
   "peerDependencies": {
-    "@faasjs/func": "3.1.0",
-    "@faasjs/logger": "3.1.0"
+    "@faasjs/func": "3.1.1",
+    "@faasjs/logger": "3.1.1"
   },
   "devDependencies": {
-    "@faasjs/func": "3.1.0",
-    "@faasjs/logger": "3.1.0"
+    "@faasjs/func": "3.1.1",
+    "@faasjs/logger": "3.1.1"
   },
   "engines": {
     "node": ">=22.0.0",