@faasjs/http 0.0.3-beta.9 → 0.0.3-beta.91

package/README.md

@@ -200,7 +200,7 @@ ___
 
 ### useHttp
 
-▸ **useHttp**<`TParams`, `TCookie`, `TSession`\>(`config?`): [`Http`](classes/Http.md)<`TParams`, `TCookie`, `TSession`\> & `UseifyPlugin`
+▸ **useHttp**<`TParams`, `TCookie`, `TSession`\>(`config?`): `UseifyPlugin`<[`Http`](classes/Http.md)<`TParams`, `TCookie`, `TSession`\>\>
 
 #### Type parameters
 
@@ -218,4 +218,4 @@ ___
 
 #### Returns
 
-[`Http`](classes/Http.md)<`TParams`, `TCookie`, `TSession`\> & `UseifyPlugin`
+`UseifyPlugin`<[`Http`](classes/Http.md)<`TParams`, `TCookie`, `TSession`\>\>

package/dist/index.d.mts

@@ -0,0 +1,210 @@
+import { Plugin, DeployData, Next, MountData, InvokeData, UseifyPlugin } from '@faasjs/func';
+import { Logger } from '@faasjs/logger';
+
+type SessionOptions = {
+    key: string;
+    secret: string;
+    salt?: string;
+    signedSalt?: string;
+    keylen?: number;
+    iterations?: number;
+    digest?: string;
+    cipherName?: string;
+};
+type SessionContent = string | number | {
+    [key: string]: any;
+} | null | undefined;
+declare class Session<S extends Record<string, string> = any, C extends Record<string, string> = any> {
+    content: Record<string, string | number>;
+    readonly config: {
+        key: string;
+        secret: string;
+        salt: string;
+        signedSalt: string;
+        keylen: number;
+        iterations: number;
+        digest: string;
+        cipherName: string;
+    };
+    private readonly secret;
+    private readonly signedSecret;
+    private readonly cookie;
+    private changed?;
+    constructor(cookie: Cookie<C, S>, config: SessionOptions);
+    invoke(cookie?: string, logger?: Logger): void;
+    encode(text: SessionContent): string;
+    decode<TData = any>(text: string): TData | SessionContent;
+    read(key: string): string | number;
+    write(key: string, value?: string | number | null): Session<S, C>;
+    update(): Session<S, C>;
+}
+
+type CookieOptions = {
+    domain?: string;
+    path?: string;
+    expires?: number;
+    secure?: boolean;
+    httpOnly?: boolean;
+    sameSite?: 'Strict' | 'Lax' | 'None';
+    session?: SessionOptions;
+    [key: string]: any;
+};
+declare class Cookie<C extends Record<string, string> = any, S extends Record<string, string> = any> {
+    session: Session<S, C>;
+    content: Record<string, string>;
+    readonly config: {
+        domain?: string;
+        path: string;
+        expires: number;
+        secure: boolean;
+        httpOnly: boolean;
+        sameSite?: 'Strict' | 'Lax' | 'None';
+        session: SessionOptions;
+    };
+    logger: Logger;
+    private setCookie;
+    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;
+        path?: string;
+        expires?: number | string;
+        secure?: boolean;
+        httpOnly?: boolean;
+        sameSite?: 'Strict' | 'Lax' | 'None';
+    }): Cookie<C, S>;
+    headers(): {
+        'Set-Cookie'?: string[];
+    };
+}
+
+type ValidatorRuleOptionsType = 'string' | 'number' | 'boolean' | 'object' | 'array';
+type ValidatorRuleOptions = {
+    type?: ValidatorRuleOptionsType;
+    required?: boolean;
+    in?: any[];
+    default?: any;
+    config?: Partial<ValidatorOptions>;
+    regexp?: RegExp;
+};
+type ValidatorOptions<Content = Record<string, any>> = {
+    whitelist?: 'error' | 'ignore';
+    rules: {
+        [k in keyof Content]?: ValidatorRuleOptions;
+    };
+    onError?: (type: string, key: string | string[], value?: any) => {
+        statusCode?: number;
+        message: any;
+    } | void;
+};
+type Request<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any> = {
+    headers: {
+        [key: string]: string;
+    };
+    params?: TParams;
+    cookie?: Cookie<TCookie, TSession>;
+    session?: Session<TSession, TCookie>;
+};
+type BeforeOption<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any> = (request: Request<TParams, TCookie, TSession>) => Promise<void | {
+    statusCode?: number;
+    message: string;
+}>;
+type ValidatorConfig<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any> = {
+    params?: ValidatorOptions<TParams>;
+    cookie?: ValidatorOptions<TCookie>;
+    session?: ValidatorOptions<TSession>;
+    before?: BeforeOption;
+};
+declare class Validator<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any> {
+    before?: BeforeOption<TParams, TCookie, TSession>;
+    paramsConfig?: ValidatorOptions<TParams>;
+    cookieConfig?: ValidatorOptions<TCookie>;
+    sessionConfig?: ValidatorOptions<TSession>;
+    private request;
+    constructor(config: ValidatorConfig<TParams, TCookie, TSession>);
+    valid(request: Request<TParams, TCookie, TSession>, logger: Logger): Promise<void>;
+    validContent(type: string, params: {
+        [key: string]: any;
+    }, baseKey: string, config: ValidatorOptions, logger: Logger): void;
+}
+
+declare const ContentType: {
+    [key: string]: string;
+};
+type HttpConfig<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any> = {
+    [key: string]: any;
+    name?: string;
+    config?: {
+        [key: string]: any;
+        /** POST as default */
+        method?: 'BEGIN' | 'GET' | 'POST' | 'DELETE' | 'HEAD' | 'PUT' | 'OPTIONS' | 'TRACE' | 'PATCH' | 'ANY';
+        timeout?: number;
+        /** file relative path as default */
+        path?: string;
+        ignorePathPrefix?: string;
+        functionName?: string;
+        cookie?: CookieOptions;
+    };
+    validator?: ValidatorConfig<TParams, TCookie, TSession>;
+};
+type Response = {
+    statusCode?: number;
+    headers?: {
+        [key: string]: string;
+    };
+    body?: string;
+    message?: string;
+};
+declare class HttpError extends Error {
+    readonly statusCode: number;
+    readonly message: string;
+    constructor({ statusCode, message }: {
+        statusCode?: number;
+        message: string;
+    });
+}
+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 name: string;
+    headers: {
+        [key: string]: string;
+    };
+    body: any;
+    params: TParams;
+    cookie: Cookie<TCookie, TSession>;
+    session: Session<TSession, TCookie>;
+    config: HttpConfig<TParams, TCookie, TSession>;
+    private readonly validatorOptions?;
+    private response?;
+    private validator?;
+    constructor(config?: HttpConfig<TParams, TCookie, TSession>);
+    onDeploy(data: DeployData, next: Next): Promise<void>;
+    onMount(data: MountData, next: Next): Promise<void>;
+    onInvoke(data: InvokeData, next: Next): Promise<void>;
+    /**
+     * set header
+     * @param key {string} key
+     * @param value {*} value
+     */
+    setHeader(key: string, value: string): Http<TParams, TCookie, TSession>;
+    /**
+     * set Content-Type
+     * @param type {string} 类型
+     * @param charset {string} 编码
+     */
+    setContentType(type: string, charset?: string): Http<TParams, TCookie, TSession>;
+    /**
+     * set status code
+     * @param code {number} 状态码
+     */
+    setStatusCode(code: number): Http<TParams, TCookie, TSession>;
+    /**
+     * set body
+     * @param body {*} 内容
+     */
+    setBody(body: string): Http<TParams, TCookie, TSession>;
+}
+declare function useHttp<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any>(config?: HttpConfig<TParams, TCookie, TSession>): UseifyPlugin<Http<TParams, TCookie, TSession>>;
+
+export { ContentType, Cookie, CookieOptions, Http, HttpConfig, HttpError, Response, Session, SessionOptions, Validator, ValidatorConfig, ValidatorOptions, ValidatorRuleOptions, useHttp };

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;
@@ -204,6 +205,6 @@ declare class Http<TParams extends Record<string, any> = any, TCookie extends Re
      */
     setBody(body: string): Http<TParams, TCookie, TSession>;
 }
-declare function useHttp<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any>(config?: HttpConfig<TParams, TCookie, TSession>): Http<TParams, TCookie, TSession> & UseifyPlugin;
+declare function useHttp<TParams extends Record<string, any> = any, TCookie extends Record<string, string> = any, TSession extends Record<string, string> = any>(config?: HttpConfig<TParams, TCookie, TSession>): UseifyPlugin<Http<TParams, TCookie, TSession>>;
 
 export { ContentType, Cookie, CookieOptions, Http, HttpConfig, HttpError, Response, Session, SessionOptions, Validator, ValidatorConfig, ValidatorOptions, ValidatorRuleOptions, useHttp };

package/dist/index.js

@@ -1,74 +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);
-
-// 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");
-
-// ../deep_merge/src/index.ts
-var shouldMerge = function(item) {
-  const type = Object.prototype.toString.call(item);
-  return type === "[object Object]" || type === "[object Array]";
-};
-function deepMerge(...sources) {
-  let acc = /* @__PURE__ */ Object.create(null);
-  for (const source of sources)
-    if (source instanceof Array) {
-      if (!(acc instanceof Array))
-        acc = [];
-      acc = [...new Set(source.concat(...acc))];
-    } else if (shouldMerge(source))
-      for (const [key, value] of Object.entries(source)) {
-        let val;
-        if (shouldMerge(value))
-          val = deepMerge(acc[key], value);
-        else
-          val = value;
-        acc = {
-          ...acc,
-          [key]: val
-        };
-      }
-  return acc;
-}
+'use strict';
 
-// src/index.ts
-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))
+      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,
@@ -76,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,
@@ -92,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;
@@ -104,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;
@@ -116,16 +68,16 @@ 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)
-      throw Error("Not valid");
+      throw Error("Session Not valid");
     const message = Buffer.from(signedParts[0], "base64").toString();
     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("");
@@ -148,11 +100,10 @@ var Session = class {
     return this;
   }
 };
-
-// src/cookie.ts
 var Cookie = class {
-  constructor(config) {
-    this.config = deepMerge({
+  constructor(config, logger) {
+    this.logger = logger;
+    this.config = deep_merge.deepMerge({
       path: "/",
       expires: 31536e3,
       secure: true,
@@ -163,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) => {
@@ -173,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) {
@@ -396,9 +347,6 @@ var Validator = class {
     }
   }
 };
-
-// src/index.ts
-var import_zlib = require("zlib");
 var ContentType = {
   plain: "text/plain",
   html: "text/html",
@@ -409,14 +357,14 @@ var ContentType = {
   json: "application/json",
   jsonp: "application/javascript"
 };
-var HttpError = class extends Error {
+var HttpError = class _HttpError extends Error {
   constructor({
     statusCode,
     message
   }) {
     super(message);
     if (Error.captureStackTrace)
-      Error.captureStackTrace(this, HttpError);
+      Error.captureStackTrace(this, _HttpError);
     this.statusCode = statusCode || 500;
     this.message = message;
   }
@@ -430,18 +378,15 @@ var Http = class {
     this.config = (config == null ? void 0 : config.config) || /* @__PURE__ */ Object.create(null);
     if (config == null ? void 0 : config.validator)
       this.validatorOptions = config.validator;
-    this.headers = /* @__PURE__ */ Object.create(null);
-    this.cookie = new Cookie(this.config.cookie || {});
-    this.session = this.cookie.session;
   }
   async onDeploy(data, next) {
     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 ? 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")
@@ -452,17 +397,34 @@ 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);
   }
   async onMount(data, next) {
     data.logger.debug("[onMount] merge config");
+    const prefix = `SECRET_${this.name.toUpperCase()}_`;
+    for (let key in process.env)
+      if (key.startsWith(prefix)) {
+        const value = process.env[key];
+        key = key.replace(prefix, "").toLowerCase();
+        if (key.includes("_")) {
+          let config = this.config;
+          const keys = key.split("_");
+          keys.slice(0, keys.length - 1).forEach((k) => {
+            if (!config[k])
+              config[k] = /* @__PURE__ */ Object.create(null);
+            config = config[k];
+          });
+          config[keys[keys.length - 1]] = value;
+        } 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);
+      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");
@@ -479,14 +441,17 @@ var Http = class {
     if (data.event.body) {
       if ((_a = this.headers["content-type"]) == null ? void 0 : _a.includes("application/json")) {
         data.logger.debug("[onInvoke] Parse params from json body");
-        this.params = Object.assign(this.params, JSON.parse(data.event.body));
+        this.params = Object.keys(this.params).length ? Object.assign(this.params, JSON.parse(data.event.body)) : JSON.parse(data.event.body);
       } 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 = 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);
@@ -523,7 +488,8 @@ var Http = class {
       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"
+      "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;
@@ -538,13 +504,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;
@@ -554,10 +520,20 @@ var Http = class {
       delete data.response.headers["Content-Encoding"];
     }
   }
+  /**
+   * set header
+   * @param key {string} key
+   * @param value {*} value
+   */
   setHeader(key, value) {
     this.response.headers[key] = value;
     return this;
   }
+  /**
+   * set Content-Type
+   * @param type {string} 类型
+   * @param charset {string} 编码
+   */
   setContentType(type, charset = "utf-8") {
     if (ContentType[type])
       this.setHeader("Content-Type", `${ContentType[type]}; charset=${charset}`);
@@ -565,25 +541,31 @@ var Http = class {
       this.setHeader("Content-Type", `${type}; charset=${charset}`);
     return this;
   }
+  /**
+   * set status code
+   * @param code {number} 状态码
+   */
   setStatusCode(code) {
     this.response.statusCode = code;
     return this;
   }
+  /**
+   * set body
+   * @param body {*} 内容
+   */
   setBody(body) {
     this.response.body = body;
     return this;
   }
 };
 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,57 +1,21 @@
+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) {
   if (typeof require !== "undefined")
     return require.apply(this, arguments);
-  throw new Error('Dynamic require of "' + x + '" is not supported');
+  throw Error('Dynamic require of "' + x + '" is not supported');
 });
-
-// src/index.ts
-import {
-  usePlugin
-} from "@faasjs/func";
-
-// ../deep_merge/src/index.ts
-var shouldMerge = function(item) {
-  const type = Object.prototype.toString.call(item);
-  return type === "[object Object]" || type === "[object Array]";
-};
-function deepMerge(...sources) {
-  let acc = /* @__PURE__ */ Object.create(null);
-  for (const source of sources)
-    if (source instanceof Array) {
-      if (!(acc instanceof Array))
-        acc = [];
-      acc = [...new Set(source.concat(...acc))];
-    } else if (shouldMerge(source))
-      for (const [key, value] of Object.entries(source)) {
-        let val;
-        if (shouldMerge(value))
-          val = deepMerge(acc[key], value);
-        else
-          val = value;
-        acc = {
-          ...acc,
-          [key]: val
-        };
-      }
-  return acc;
-}
-
-// src/index.ts
-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))
+      cookie.logger.warn("Session's secret is missing.");
     this.config = Object.assign({
       key: "key",
       secret: randomBytes(128).toString("hex"),
@@ -78,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;
@@ -106,7 +70,7 @@ var Session = class {
     hmac.update(signedParts[0]);
     const digest = hmac.digest("hex");
     if (signedParts[1] !== digest)
-      throw Error("Not valid");
+      throw Error("Session Not valid");
     const message = Buffer.from(signedParts[0], "base64").toString();
     const parts = message.split("--").map(function(part2) {
       return Buffer.from(part2, "base64");
@@ -134,10 +98,9 @@ var Session = class {
     return this;
   }
 };
-
-// src/cookie.ts
 var Cookie = class {
-  constructor(config) {
+  constructor(config, logger) {
+    this.logger = logger;
     this.config = deepMerge({
       path: "/",
       expires: 31536e3,
@@ -149,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) => {
@@ -159,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) {
@@ -382,13 +345,6 @@ var Validator = class {
     }
   }
 };
-
-// src/index.ts
-import {
-  gzipSync,
-  deflateSync,
-  brotliCompressSync
-} from "zlib";
 var ContentType = {
   plain: "text/plain",
   html: "text/html",
@@ -399,14 +355,14 @@ var ContentType = {
   json: "application/json",
   jsonp: "application/javascript"
 };
-var HttpError = class extends Error {
+var HttpError = class _HttpError extends Error {
   constructor({
     statusCode,
     message
   }) {
     super(message);
     if (Error.captureStackTrace)
-      Error.captureStackTrace(this, HttpError);
+      Error.captureStackTrace(this, _HttpError);
     this.statusCode = statusCode || 500;
     this.message = message;
   }
@@ -420,9 +376,6 @@ var Http = class {
     this.config = (config == null ? void 0 : config.config) || /* @__PURE__ */ Object.create(null);
     if (config == null ? void 0 : config.validator)
       this.validatorOptions = config.validator;
-    this.headers = /* @__PURE__ */ Object.create(null);
-    this.cookie = new Cookie(this.config.cookie || {});
-    this.session = this.cookie.session;
   }
   async onDeploy(data, next) {
     var _a;
@@ -449,10 +402,27 @@ var Http = class {
   }
   async onMount(data, next) {
     data.logger.debug("[onMount] merge config");
+    const prefix = `SECRET_${this.name.toUpperCase()}_`;
+    for (let key in process.env)
+      if (key.startsWith(prefix)) {
+        const value = process.env[key];
+        key = key.replace(prefix, "").toLowerCase();
+        if (key.includes("_")) {
+          let config = this.config;
+          const keys = key.split("_");
+          keys.slice(0, keys.length - 1).forEach((k) => {
+            if (!config[k])
+              config[k] = /* @__PURE__ */ Object.create(null);
+            config = config[k];
+          });
+          config[keys[keys.length - 1]] = value;
+        } 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);
     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");
@@ -469,14 +439,17 @@ var Http = class {
     if (data.event.body) {
       if ((_a = this.headers["content-type"]) == null ? void 0 : _a.includes("application/json")) {
         data.logger.debug("[onInvoke] Parse params from json body");
-        this.params = Object.assign(this.params, JSON.parse(data.event.body));
+        this.params = Object.keys(this.params).length ? Object.assign(this.params, JSON.parse(data.event.body)) : JSON.parse(data.event.body);
       } 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 = 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);
@@ -513,7 +486,8 @@ var Http = class {
       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"
+      "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;
@@ -544,10 +518,20 @@ var Http = class {
       delete data.response.headers["Content-Encoding"];
     }
   }
+  /**
+   * set header
+   * @param key {string} key
+   * @param value {*} value
+   */
   setHeader(key, value) {
     this.response.headers[key] = value;
     return this;
   }
+  /**
+   * set Content-Type
+   * @param type {string} 类型
+   * @param charset {string} 编码
+   */
   setContentType(type, charset = "utf-8") {
     if (ContentType[type])
       this.setHeader("Content-Type", `${ContentType[type]}; charset=${charset}`);
@@ -555,10 +539,18 @@ var Http = class {
       this.setHeader("Content-Type", `${type}; charset=${charset}`);
     return this;
   }
+  /**
+   * set status code
+   * @param code {number} 状态码
+   */
   setStatusCode(code) {
     this.response.statusCode = code;
     return this;
   }
+  /**
+   * set body
+   * @param body {*} 内容
+   */
   setBody(body) {
     this.response.body = body;
     return this;
@@ -567,12 +559,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.9",
+  "version": "0.0.3-beta.91",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,15 +16,14 @@
   },
   "funding": "https://github.com/sponsors/faasjs",
   "scripts": {
-    "build": "tsup-node src/index.ts --format esm,cjs",
-    "build:types": "tsup-node src/index.ts --dts-only"
+    "build": "tsup-node src/index.ts --config ../../tsup.config.json"
   },
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@faasjs/func": "^0.0.3-beta.9",
-    "@faasjs/logger": "^0.0.3-beta.9"
+    "@faasjs/func": "^0.0.3-beta.91",
+    "@faasjs/logger": "^0.0.3-beta.91"
   },
   "engines": {
     "npm": ">=8.0.0",