@faasjs/http 2.8.1 → 3.0.0-canary.1

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { Plugin, DeployData, Next, MountData, InvokeData, UseifyPlugin } from '@faasjs/func';
+import { Plugin, MountData, Next, InvokeData, UseifyPlugin } from '@faasjs/func';
 import { Logger } from '@faasjs/logger';
 
 type SessionOptions = {
@@ -79,7 +79,9 @@ declare class Cookie<C extends Record<string, string> = any, S extends Record<st
     };
 }
 
+/** @deprecated */
 type ValidatorRuleOptionsType = 'string' | 'number' | 'boolean' | 'object' | 'array';
+/** @deprecated */
 type ValidatorRuleOptions = {
     type?: ValidatorRuleOptionsType;
     required?: boolean;
@@ -88,6 +90,7 @@ type ValidatorRuleOptions = {
     config?: Partial<ValidatorOptions>;
     regexp?: RegExp;
 };
+/** @deprecated */
 type ValidatorOptions<Content = Record<string, any>> = {
     whitelist?: 'error' | 'ignore';
     rules: {
@@ -106,16 +109,19 @@ type Request<TParams extends Record<string, any> = any, TCookie extends Record<s
     cookie?: Cookie<TCookie, TSession>;
     session?: Session<TSession, TCookie>;
 };
+/** @deprecated */
 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;
 }>;
+/** @deprecated */
 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;
 };
+/** @deprecated */
 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>;
@@ -161,6 +167,7 @@ type HttpConfig<TParams extends Record<string, any> = any, TCookie extends Recor
         functionName?: string;
         cookie?: CookieOptions;
     };
+    /** @deprecated */
     validator?: ValidatorConfig<TParams, TCookie, TSession>;
 };
 type Response = {
@@ -194,7 +201,6 @@ declare class Http<TParams extends Record<string, any> = any, TCookie extends Re
     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>;
     /**

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Plugin, DeployData, Next, MountData, InvokeData, UseifyPlugin } from '@faasjs/func';
+import { Plugin, MountData, Next, InvokeData, UseifyPlugin } from '@faasjs/func';
 import { Logger } from '@faasjs/logger';
 
 type SessionOptions = {
@@ -79,7 +79,9 @@ declare class Cookie<C extends Record<string, string> = any, S extends Record<st
     };
 }
 
+/** @deprecated */
 type ValidatorRuleOptionsType = 'string' | 'number' | 'boolean' | 'object' | 'array';
+/** @deprecated */
 type ValidatorRuleOptions = {
     type?: ValidatorRuleOptionsType;
     required?: boolean;
@@ -88,6 +90,7 @@ type ValidatorRuleOptions = {
     config?: Partial<ValidatorOptions>;
     regexp?: RegExp;
 };
+/** @deprecated */
 type ValidatorOptions<Content = Record<string, any>> = {
     whitelist?: 'error' | 'ignore';
     rules: {
@@ -106,16 +109,19 @@ type Request<TParams extends Record<string, any> = any, TCookie extends Record<s
     cookie?: Cookie<TCookie, TSession>;
     session?: Session<TSession, TCookie>;
 };
+/** @deprecated */
 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;
 }>;
+/** @deprecated */
 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;
 };
+/** @deprecated */
 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>;
@@ -161,6 +167,7 @@ type HttpConfig<TParams extends Record<string, any> = any, TCookie extends Recor
         functionName?: string;
         cookie?: CookieOptions;
     };
+    /** @deprecated */
     validator?: ValidatorConfig<TParams, TCookie, TSession>;
 };
 type Response = {
@@ -194,7 +201,6 @@ declare class Http<TParams extends Record<string, any> = any, TCookie extends Re
     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>;
     /**

package/dist/index.js

@@ -6,16 +6,17 @@ var logger = require('@faasjs/logger');
 var crypto = require('crypto');
 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);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
+// src/index.ts
 var Session = class {
+  content;
+  config;
+  secret;
+  signedSecret;
+  cookie;
+  changed;
   constructor(cookie, config) {
     this.cookie = cookie;
-    if (!(config == null ? void 0 : config.secret)) cookie.logger.warn("Session's secret is missing.");
+    if (!config?.secret) cookie.logger.warn("Session's secret is missing.");
     this.config = Object.assign(
       {
         key: "key",
@@ -49,7 +50,7 @@ var Session = class {
     try {
       this.content = cookie ? this.decode(cookie) : /* @__PURE__ */ Object.create(null);
     } catch (error) {
-      logger == null ? void 0 : logger.error(error);
+      logger?.error(error);
       this.content = /* @__PURE__ */ Object.create(null);
     }
     this.changed = false;
@@ -108,6 +109,11 @@ var Session = class {
   }
 };
 var Cookie = class {
+  session;
+  content;
+  config;
+  logger;
+  setCookie;
   constructor(config, logger) {
     this.logger = logger;
     this.config = deep_merge.deepMerge(
@@ -172,6 +178,11 @@ var Cookie = class {
 
 // src/validator.ts
 var Validator = class {
+  before;
+  paramsConfig;
+  cookieConfig;
+  sessionConfig;
+  request;
   constructor(config) {
     this.paramsConfig = config.params;
     this.cookieConfig = config.cookie;
@@ -352,6 +363,8 @@ var ContentType = {
   jsonp: "application/javascript"
 };
 var HttpError = class _HttpError extends Error {
+  statusCode;
+  message;
   constructor({
     statusCode,
     message
@@ -378,42 +391,27 @@ function deepClone(obj) {
   return clone;
 }
 var Http = class {
+  type = Name;
+  name = Name;
+  headers;
+  body;
+  params;
+  cookie;
+  session;
+  config;
+  validatorOptions;
+  response;
+  validator;
   constructor(config) {
-    this.type = Name;
-    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;
-  }
-  async onDeploy(data, next) {
-    var _a;
-    data.dependencies["@faasjs/http"] = "*";
-    await next();
-    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") 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 = "/";
-      }
+    this.name = config?.name || this.type;
+    this.config = config?.config || /* @__PURE__ */ Object.create(null);
+    if (config?.validator) {
+      console.warn("Validator will deprecated in the v3.");
+      this.validatorOptions = config.validator;
     }
-    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) {
-    var _a, _b;
-    const logger$1 = new logger.Logger(((_a = data.logger) == null ? void 0 : _a.label) || this.name);
+    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");
@@ -433,7 +431,7 @@ var Http = class {
         } else this.config[key] = value;
       }
     if (!data.config) throw Error(`[${this.name}] Config not found.`);
-    if ((_b = data.config.plugins) == null ? void 0 : _b[this.name || this.type])
+    if (data.config.plugins?.[this.name || this.type])
       this.config = deep_merge.deepMerge(
         this.config,
         data.config.plugins[this.name || this.type].config
@@ -450,16 +448,15 @@ var Http = class {
     await next();
   }
   async onInvoke(data, next) {
-    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)))
+    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 (((_c = this.headers["content-type"]) == null ? void 0 : _c.includes("application/json")) && typeof data.event.body === "string" && data.event.body.length > 1) {
+      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");
         try {
           this.params = Object.keys(this.params).length ? Object.assign(this.params, JSON.parse(data.event.body)) : JSON.parse(data.event.body);
@@ -506,7 +503,7 @@ var Http = class {
     }
     this.session.update();
     if (data.response)
-      if (data.response instanceof Error || ((_d = data.response.constructor) == null ? void 0 : _d.name) === "Error") {
+      if (data.response instanceof Error || data.response.constructor?.name === "Error") {
         logger$1.error(data.response);
         this.response.body = JSON.stringify({
           error: { message: data.response.message }

package/dist/index.mjs

@@ -4,16 +4,17 @@ import { Logger } from '@faasjs/logger';
 import { randomBytes, pbkdf2Sync, createCipheriv, createHmac, createDecipheriv } from 'node:crypto';
 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);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
+// src/index.ts
 var Session = class {
+  content;
+  config;
+  secret;
+  signedSecret;
+  cookie;
+  changed;
   constructor(cookie, config) {
     this.cookie = cookie;
-    if (!(config == null ? void 0 : config.secret)) cookie.logger.warn("Session's secret is missing.");
+    if (!config?.secret) cookie.logger.warn("Session's secret is missing.");
     this.config = Object.assign(
       {
         key: "key",
@@ -47,7 +48,7 @@ var Session = class {
     try {
       this.content = cookie ? this.decode(cookie) : /* @__PURE__ */ Object.create(null);
     } catch (error) {
-      logger == null ? void 0 : logger.error(error);
+      logger?.error(error);
       this.content = /* @__PURE__ */ Object.create(null);
     }
     this.changed = false;
@@ -106,6 +107,11 @@ var Session = class {
   }
 };
 var Cookie = class {
+  session;
+  content;
+  config;
+  logger;
+  setCookie;
   constructor(config, logger) {
     this.logger = logger;
     this.config = deepMerge(
@@ -170,6 +176,11 @@ var Cookie = class {
 
 // src/validator.ts
 var Validator = class {
+  before;
+  paramsConfig;
+  cookieConfig;
+  sessionConfig;
+  request;
   constructor(config) {
     this.paramsConfig = config.params;
     this.cookieConfig = config.cookie;
@@ -350,6 +361,8 @@ var ContentType = {
   jsonp: "application/javascript"
 };
 var HttpError = class _HttpError extends Error {
+  statusCode;
+  message;
   constructor({
     statusCode,
     message
@@ -376,42 +389,27 @@ function deepClone(obj) {
   return clone;
 }
 var Http = class {
+  type = Name;
+  name = Name;
+  headers;
+  body;
+  params;
+  cookie;
+  session;
+  config;
+  validatorOptions;
+  response;
+  validator;
   constructor(config) {
-    this.type = Name;
-    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;
-  }
-  async onDeploy(data, next) {
-    var _a;
-    data.dependencies["@faasjs/http"] = "*";
-    await next();
-    const logger = new 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 };
-    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.ignorePathPrefix) {
-        config.config.path = config.config.path.replace(
-          new RegExp(`^${config.config.ignorePathPrefix}`),
-          ""
-        );
-        if (config.config.path === "") config.config.path = "/";
-      }
+    this.name = config?.name || this.type;
+    this.config = config?.config || /* @__PURE__ */ Object.create(null);
+    if (config?.validator) {
+      console.warn("Validator will deprecated in the v3.");
+      this.validatorOptions = config.validator;
     }
-    logger.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) {
-    var _a, _b;
-    const logger = new Logger(((_a = data.logger) == null ? void 0 : _a.label) || this.name);
+    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");
@@ -431,7 +429,7 @@ var Http = class {
         } else this.config[key] = value;
       }
     if (!data.config) throw Error(`[${this.name}] Config not found.`);
-    if ((_b = data.config.plugins) == null ? void 0 : _b[this.name || this.type])
+    if (data.config.plugins?.[this.name || this.type])
       this.config = deepMerge(
         this.config,
         data.config.plugins[this.name || this.type].config
@@ -448,16 +446,15 @@ var Http = class {
     await next();
   }
   async onInvoke(data, next) {
-    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)))
+    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 (((_c = this.headers["content-type"]) == null ? void 0 : _c.includes("application/json")) && typeof data.event.body === "string" && data.event.body.length > 1) {
+      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");
         try {
           this.params = Object.keys(this.params).length ? Object.assign(this.params, JSON.parse(data.event.body)) : JSON.parse(data.event.body);
@@ -504,7 +501,7 @@ var Http = class {
     }
     this.session.update();
     if (data.response)
-      if (data.response instanceof Error || ((_d = data.response.constructor) == null ? void 0 : _d.name) === "Error") {
+      if (data.response instanceof Error || data.response.constructor?.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": "2.8.1",
+  "version": "3.0.0-canary.1",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -34,15 +34,15 @@
     "dist"
   ],
   "peerDependencies": {
-    "@faasjs/func": "2.8.1",
-    "@faasjs/logger": "2.8.1"
+    "@faasjs/func": "3.0.0-canary.1",
+    "@faasjs/logger": "3.0.0-canary.1"
   },
   "devDependencies": {
-    "@faasjs/func": "2.8.1",
-    "@faasjs/logger": "2.8.1"
+    "@faasjs/func": "3.0.0-canary.1",
+    "@faasjs/logger": "3.0.0-canary.1"
   },
   "engines": {
-    "npm": ">=9.0.0",
-    "node": ">=18.0.0"
+    "node": ">=22.0.0",
+    "npm": ">=10.0.0"
   }
 }