@faasjs/http 0.0.3-beta.8 → 0.0.3-beta.81

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.ts

@@ -204,6 +204,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

@@ -66,6 +66,8 @@ var import_crypto = require("crypto");
 var Session = class {
   constructor(cookie, config) {
     this.cookie = cookie;
+    if (!(config == null ? void 0 : config.secret))
+      console.warn("Session's secret is missing.");
     this.config = Object.assign({
       key: "key",
       secret: (0, import_crypto.randomBytes)(128).toString("hex"),
@@ -120,7 +122,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");
@@ -430,9 +432,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;
@@ -459,6 +458,23 @@ 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");
@@ -479,7 +495,7 @@ 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);

package/dist/index.mjs

@@ -52,6 +52,8 @@ import {
 var Session = class {
   constructor(cookie, config) {
     this.cookie = cookie;
+    if (!(config == null ? void 0 : config.secret))
+      console.warn("Session's secret is missing.");
     this.config = Object.assign({
       key: "key",
       secret: randomBytes(128).toString("hex"),
@@ -106,7 +108,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");
@@ -420,9 +422,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,6 +448,23 @@ 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");
@@ -469,7 +485,7 @@ 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/http",
-  "version": "0.0.3-beta.8",
+  "version": "0.0.3-beta.81",
   "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 --format esm,cjs --dts --clean"
   },
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@faasjs/func": "^0.0.3-beta.8",
-    "@faasjs/logger": "^0.0.3-beta.8"
+    "@faasjs/func": "^0.0.3-beta.81",
+    "@faasjs/logger": "^0.0.3-beta.81"
   },
   "engines": {
     "npm": ">=8.0.0",