@faasjs/http 0.0.2-beta.276 → 0.0.2-beta.291

package/lib/index.es.js

@@ -147,15 +147,14 @@ class Cookie {
 }
 
 class Validator {
-    constructor(config) {
+    constructor(config, logger) {
         this.paramsConfig = config.params;
         this.cookieConfig = config.cookie;
         this.sessionConfig = config.session;
         this.before = config.before;
-        this.logger = new Logger('Http.Validator');
+        this.logger = logger;
     }
     async valid(request) {
-        this.logger.debug('Begin');
         if (this.before) {
             const result = await this.before(request);
             if (result)
@@ -163,11 +162,11 @@ class Validator {
         }
         this.request = request;
         if (this.paramsConfig && request.params) {
-            this.logger.debug('Valid params');
+            this.logger.debug('Valid Params');
             this.validContent('params', request.params, '', this.paramsConfig);
         }
         if (this.cookieConfig && request.cookie) {
-            this.logger.debug('Valid cookie');
+            this.logger.debug('Valid Cookie');
             if (request.cookie == null)
                 throw Error('Not found Cookie');
             this.validContent('cookie', request.cookie.content, '', this.cookieConfig);
@@ -187,7 +186,7 @@ class Validator {
             if (diff.length > 0)
                 if (config.whitelist === 'error') {
                     const diffKeys = diff.map(k => `${baseKey}${k}`);
-                    const error = Error(`[${type}] Unpermitted keys: ${diffKeys.join(', ')}`);
+                    const error = Error(`[${type}] Not permitted keys: ${diffKeys.join(', ')}`);
                     if (config.onError) {
                         const res = config.onError(`${type}.whitelist`, baseKey, diffKeys);
                         if (res)
@@ -371,7 +370,7 @@ class Http {
         this.session = this.cookie.session;
         if (this.validatorOptions) {
             this.logger.debug('[onMount] prepare validator');
-            this.validator = new Validator(this.validatorOptions);
+            this.validator = new Validator(this.validatorOptions, this.logger);
         }
         globals[this.name] = this;
         await next();
@@ -382,7 +381,7 @@ class Http {
         this.body = data.event.body;
         this.params = Object.create(null);
         this.response = { headers: Object.create(null) };
-        if (data.event.body)
+        if (data.event.body) {
             if (data.event.headers && data.event.headers['content-type'] && data.event.headers['content-type'].includes('application/json')) {
                 this.logger.debug('[onInvoke] Parse params from json body');
                 this.params = JSON.parse(data.event.body);
@@ -391,16 +390,19 @@ class Http {
                 this.logger.debug('[onInvoke] Parse params from raw body');
                 this.params = data.event.body;
             }
+            this.logger.debug('[onInvoke] Params: %j', this.params);
+        }
         else if (data.event.queryString) {
             this.logger.debug('[onInvoke] Parse params from queryString');
             this.params = data.event.queryString;
+            this.logger.debug('[onInvoke] Params: %j', this.params);
         }
-        this.logger.debug('[onInvoke] Params: %j', this.params);
-        this.logger.debug('[onInvoke] Parse cookie');
         this.cookie.invoke(this.headers.cookie);
-        this.logger.debug('[onInvoke] Cookie: %j', this.cookie.content);
-        this.logger.debug('[onInvoke] Session: %j', this.session.content);
-        if (this.validator && data.event.httpMethod) {
+        if (this.headers.cookie) {
+            this.logger.debug('[onInvoke] Cookie: %j', this.cookie.content);
+            this.logger.debug('[onInvoke] Session: %j', this.session.content);
+        }
+        if (this.validator) {
             this.logger.debug('[onInvoke] Valid request');
             try {
                 await this.validator.valid({
@@ -414,10 +416,7 @@ class Http {
                 this.logger.error(error);
                 data.response = {
                     statusCode: error.statusCode || 500,
-                    headers: {
-                        'Content-Type': 'application/json; charset=utf-8',
-                        'X-SCF-RequestId': data.context.request_id
-                    },
+                    headers: { 'Content-Type': 'application/json; charset=utf-8' },
                     body: JSON.stringify({ error: { message: error.message } })
                 };
                 return;
@@ -455,7 +454,7 @@ class Http {
         // 处理 headers
         this.response.headers = Object.assign({
             'Content-Type': 'application/json; charset=utf-8',
-            'X-SCF-RequestId': data.context.request_id
+            'Cache-Control': 'no-cache, no-store'
         }, this.cookie.headers(), this.response.headers);
         data.response = this.response;
         if (process.env.FaasMode === 'local') {
@@ -537,7 +536,7 @@ class Http {
 }
 function useHttp(config) {
     const name = (config === null || config === void 0 ? void 0 : config.name) || Name;
-    if (process.env.FaasEnv !== 'testing' && globals[name])
+    if (process.env.FaasMode === 'mono' || (process.env.FaasEnv !== 'testing' && globals[name]))
         return usePlugin(globals[name]);
     return usePlugin(new Http(config));
 }

package/lib/index.js

@@ -151,15 +151,14 @@ class Cookie {
 }
 
 class Validator {
-    constructor(config) {
+    constructor(config, logger) {
         this.paramsConfig = config.params;
         this.cookieConfig = config.cookie;
         this.sessionConfig = config.session;
         this.before = config.before;
-        this.logger = new logger.Logger('Http.Validator');
+        this.logger = logger;
     }
     async valid(request) {
-        this.logger.debug('Begin');
         if (this.before) {
             const result = await this.before(request);
             if (result)
@@ -167,11 +166,11 @@ class Validator {
         }
         this.request = request;
         if (this.paramsConfig && request.params) {
-            this.logger.debug('Valid params');
+            this.logger.debug('Valid Params');
             this.validContent('params', request.params, '', this.paramsConfig);
         }
         if (this.cookieConfig && request.cookie) {
-            this.logger.debug('Valid cookie');
+            this.logger.debug('Valid Cookie');
             if (request.cookie == null)
                 throw Error('Not found Cookie');
             this.validContent('cookie', request.cookie.content, '', this.cookieConfig);
@@ -191,7 +190,7 @@ class Validator {
             if (diff.length > 0)
                 if (config.whitelist === 'error') {
                     const diffKeys = diff.map(k => `${baseKey}${k}`);
-                    const error = Error(`[${type}] Unpermitted keys: ${diffKeys.join(', ')}`);
+                    const error = Error(`[${type}] Not permitted keys: ${diffKeys.join(', ')}`);
                     if (config.onError) {
                         const res = config.onError(`${type}.whitelist`, baseKey, diffKeys);
                         if (res)
@@ -375,7 +374,7 @@ class Http {
         this.session = this.cookie.session;
         if (this.validatorOptions) {
             this.logger.debug('[onMount] prepare validator');
-            this.validator = new Validator(this.validatorOptions);
+            this.validator = new Validator(this.validatorOptions, this.logger);
         }
         globals[this.name] = this;
         await next();
@@ -386,7 +385,7 @@ class Http {
         this.body = data.event.body;
         this.params = Object.create(null);
         this.response = { headers: Object.create(null) };
-        if (data.event.body)
+        if (data.event.body) {
             if (data.event.headers && data.event.headers['content-type'] && data.event.headers['content-type'].includes('application/json')) {
                 this.logger.debug('[onInvoke] Parse params from json body');
                 this.params = JSON.parse(data.event.body);
@@ -395,16 +394,19 @@ class Http {
                 this.logger.debug('[onInvoke] Parse params from raw body');
                 this.params = data.event.body;
             }
+            this.logger.debug('[onInvoke] Params: %j', this.params);
+        }
         else if (data.event.queryString) {
             this.logger.debug('[onInvoke] Parse params from queryString');
             this.params = data.event.queryString;
+            this.logger.debug('[onInvoke] Params: %j', this.params);
         }
-        this.logger.debug('[onInvoke] Params: %j', this.params);
-        this.logger.debug('[onInvoke] Parse cookie');
         this.cookie.invoke(this.headers.cookie);
-        this.logger.debug('[onInvoke] Cookie: %j', this.cookie.content);
-        this.logger.debug('[onInvoke] Session: %j', this.session.content);
-        if (this.validator && data.event.httpMethod) {
+        if (this.headers.cookie) {
+            this.logger.debug('[onInvoke] Cookie: %j', this.cookie.content);
+            this.logger.debug('[onInvoke] Session: %j', this.session.content);
+        }
+        if (this.validator) {
             this.logger.debug('[onInvoke] Valid request');
             try {
                 await this.validator.valid({
@@ -418,10 +420,7 @@ class Http {
                 this.logger.error(error);
                 data.response = {
                     statusCode: error.statusCode || 500,
-                    headers: {
-                        'Content-Type': 'application/json; charset=utf-8',
-                        'X-SCF-RequestId': data.context.request_id
-                    },
+                    headers: { 'Content-Type': 'application/json; charset=utf-8' },
                     body: JSON.stringify({ error: { message: error.message } })
                 };
                 return;
@@ -459,7 +458,7 @@ class Http {
         // 处理 headers
         this.response.headers = Object.assign({
             'Content-Type': 'application/json; charset=utf-8',
-            'X-SCF-RequestId': data.context.request_id
+            'Cache-Control': 'no-cache, no-store'
         }, this.cookie.headers(), this.response.headers);
         data.response = this.response;
         if (process.env.FaasMode === 'local') {
@@ -541,7 +540,7 @@ class Http {
 }
 function useHttp(config) {
     const name = (config === null || config === void 0 ? void 0 : config.name) || Name;
-    if (process.env.FaasEnv !== 'testing' && globals[name])
+    if (process.env.FaasMode === 'mono' || (process.env.FaasEnv !== 'testing' && globals[name]))
         return func.usePlugin(globals[name]);
     return func.usePlugin(new Http(config));
 }

package/lib/validator.d.ts

@@ -1,5 +1,6 @@
 import { Cookie } from './cookie';
 import { Session } from './session';
+import { Logger } from '@faasjs/logger';
 export declare type ValidatorRuleOptions = {
     type?: 'string' | 'number' | 'boolean' | 'object' | 'array';
     required?: boolean;
@@ -47,7 +48,7 @@ export declare class Validator<TParams extends Record<string, any> = any, TCooki
         cookie?: ValidatorOptions<TCookie>;
         session?: ValidatorOptions<TSession>;
         before?: BeforeOption<TParams, TCookie, TSession>;
-    });
+    }, logger: Logger);
     valid(request: Request<TParams, TCookie, TSession>): Promise<void>;
     validContent(type: string, params: {
         [key: string]: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/http",
-  "version": "0.0.2-beta.276",
+  "version": "0.0.2-beta.291",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "lib/index.es.js",
@@ -26,5 +26,5 @@
     "rollup-plugin-typescript2": "*",
     "typescript": "*"
   },
-  "gitHead": "7e82de988b4f9680004dd9de775a7762a053278c"
+  "gitHead": "5321c45ee65f2c5989ec39ad89d76f9f95bf205e"
 }