serverless-simple-middleware 0.0.45 → 0.0.50

package/dist/middleware/base.d.ts

@@ -24,10 +24,12 @@ export declare class HandlerResponse {
     result: any | Promise<any> | undefined;
     private corsHeaders;
     private cookies;
+    private crossOrigin?;
     constructor(callback: any);
     ok(body?: {}, code?: number): any;
     fail(body?: {}, code?: number): any;
-    addCookie(key: string, value: string, domain?: string): void;
+    addCookie(key: string, value: string, domain?: string, specifyCrossOrigin?: true): void;
+    setCrossOrigin: (origin?: string | undefined) => void;
 }
 export interface HandlerAuxBase {
     [key: string]: any;

package/dist/middleware/base.js

@@ -60,6 +60,10 @@ var HandlerRequest = /** @class */ (function () {
 exports.HandlerRequest = HandlerRequest;
 var HandlerResponse = /** @class */ (function () {
     function HandlerResponse(callback) {
+        var _this = this;
+        this.setCrossOrigin = function (origin) {
+            _this.crossOrigin = origin;
+        };
         this.callback = callback;
         this.completed = false;
         this.corsHeaders = {
@@ -74,6 +78,9 @@ var HandlerResponse = /** @class */ (function () {
         if (code === void 0) { code = 200; }
         logger.stupid("ok", body);
         var headers = __assign({}, this.corsHeaders);
+        if (this.crossOrigin) {
+            headers['Access-Control-Allow-Origin'] = this.crossOrigin;
+        }
         var multiValueHeaders = undefined;
         if (this.cookies.length > 0) {
             multiValueHeaders = { 'Set-Cookie': this.cookies };
@@ -99,10 +106,14 @@ var HandlerResponse = /** @class */ (function () {
         this.completed = true;
         return result;
     };
-    HandlerResponse.prototype.addCookie = function (key, value, domain) {
+    HandlerResponse.prototype.addCookie = function (key, value, domain, specifyCrossOrigin) {
         var keyValueStr = key + "=" + value;
         var domainStr = domain ? "Domain=" + domain : '';
-        var cookieStr = [keyValueStr, domainStr].filter(function (x) { return x; }).join('; ');
+        var sameSiteStr = specifyCrossOrigin ? 'SameSite=None' : '';
+        var secureStr = specifyCrossOrigin ? 'Secure' : '';
+        var cookieStr = [keyValueStr, domainStr, sameSiteStr, secureStr]
+            .filter(function (x) { return x; })
+            .join('; ');
         this.cookies.push(cookieStr);
     };
     return HandlerResponse;

package/dist/middleware/trace.js

@@ -122,7 +122,9 @@ var Tracer = /** @class */ (function () {
                     case 5:
                         begin += chunkSize;
                         return [3 /*break*/, 3];
-                    case 6: return [3 /*break*/, 8];
+                    case 6:
+                        this.buffer = [];
+                        return [3 /*break*/, 8];
                     case 7:
                         error_1 = _a.sent();
                         logger.warn("Error in eventSource: " + error_1);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "serverless-simple-middleware",
   "description": "Simple middleware to translate the interface of lambda's handler to request => response",
-  "version": "0.0.45",
+  "version": "0.0.50",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "VoyagerX",
@@ -57,4 +57,4 @@
     "singleQuote": true,
     "trailingComma": "all"
   }
-}
+}

package/src/middleware/base.ts

@@ -57,6 +57,7 @@ export class HandlerResponse {
 
   private corsHeaders: { [header: string]: any };
   private cookies: string[];
+  private crossOrigin?: string;
 
   constructor(callback: any) {
     this.callback = callback;
@@ -74,6 +75,9 @@ export class HandlerResponse {
     const headers = {
       ...this.corsHeaders,
     };
+    if (this.crossOrigin) {
+      headers['Access-Control-Allow-Origin'] = this.crossOrigin;
+    }
     let multiValueHeaders = undefined;
     if (this.cookies.length > 0) {
       multiValueHeaders = { 'Set-Cookie': this.cookies };
@@ -99,12 +103,25 @@ export class HandlerResponse {
     return result;
   }
 
-  public addCookie(key: string, value: string, domain?: string) {
+  public addCookie(
+    key: string,
+    value: string,
+    domain?: string,
+    specifyCrossOrigin?: true,
+  ) {
     const keyValueStr = `${key}=${value}`;
     const domainStr = domain ? `Domain=${domain}` : '';
-    const cookieStr = [keyValueStr, domainStr].filter(x => x).join('; ');
+    const sameSiteStr = specifyCrossOrigin ? 'SameSite=None' : '';
+    const secureStr = specifyCrossOrigin ? 'Secure' : '';
+    const cookieStr = [keyValueStr, domainStr, sameSiteStr, secureStr]
+      .filter(x => x)
+      .join('; ');
     this.cookies.push(cookieStr);
   }
+
+  public setCrossOrigin = (origin?: string) => {
+    this.crossOrigin = origin;
+  };
 }
 
 export interface HandlerAuxBase {

package/src/middleware/trace.ts

@@ -103,6 +103,8 @@ export class Tracer {
           .promise();
         logger.stupid(`sendBatchResult`, sendBatchResult);
       }
+
+      this.buffer = [];
     } catch (error) {
       logger.warn(`Error in eventSource: ${error}`);
     }