serverless-simple-middleware 0.0.46 → 0.0.50-beta.0

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.46",
+  "version": "0.0.50-beta.0",
   "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/build.ts

@@ -54,6 +54,7 @@ class HandlerProxy<A extends HandlerAuxBase> {
     middleware: HandlerMiddleware<A>,
     handler: Handler<A>,
   ) => {
+    logger.info('call!')
     try {
       this.aux = await middleware.auxPromise;
     } catch (error) {

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}`);
     }

package/dist/aws/config.d.ts

@@ -1,15 +0,0 @@
-import { AWSComponent } from './define';
-export interface AWSConfig {
-    [key: string]: string | boolean | number | undefined;
-}
-export interface AWSConfigs {
-    [service: string]: AWSConfig;
-}
-export declare type AWSConfigResolver = (service: string) => AWSConfig;
-export declare type SimpleAWSConfigLoadParam = AWSConfigs | string;
-export declare class SimpleAWSConfig {
-    private configs;
-    constructor(configs?: AWSConfigs);
-    get: (service: AWSComponent) => AWSConfig | undefined;
-}
-export declare const loadAWSConfig: (newConfigsOrUrl: SimpleAWSConfigLoadParam) => Promise<SimpleAWSConfig>;

package/dist/aws/config.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var cross_fetch_1 = require("cross-fetch");
-var fs = require("fs");
-var SimpleAWSConfig = /** @class */ (function () {
-    function SimpleAWSConfig(configs) {
-        var _this = this;
-        this.get = function (service) {
-            return _this.configs ? _this.configs[service] : undefined;
-        };
-        this.configs = configs;
-    }
-    return SimpleAWSConfig;
-}());
-exports.SimpleAWSConfig = SimpleAWSConfig;
-exports.loadAWSConfig = function (newConfigsOrUrl) {
-    if (typeof newConfigsOrUrl === 'string') {
-        if (/^http.*json$/.test(newConfigsOrUrl)) {
-            return cross_fetch_1.default(newConfigsOrUrl)
-                .then(function (r) { return r.json(); })
-                .then(exports.loadAWSConfig);
-        }
-        else if (/json$/.test(newConfigsOrUrl)) {
-            return exports.loadAWSConfig(JSON.parse(fs.readFileSync(newConfigsOrUrl, 'utf-8')));
-        }
-        return exports.loadAWSConfig(JSON.parse(newConfigsOrUrl));
-    }
-    return Promise.resolve(new SimpleAWSConfig(newConfigsOrUrl));
-};

package/dist/aws/define.d.ts

@@ -1,21 +0,0 @@
-export declare enum AWSComponent {
-    s3 = "s3",
-    sqs = "sqs",
-    dynamodb = "dynamodb"
-}
-export interface SQSMessageBody<T> {
-    handle: string;
-    body?: T;
-}
-export interface S3SignedUrlParams {
-    Key?: string;
-    Expires?: number;
-    ContentType?: string;
-    ACL?: 'private' | 'public-read' | 'public-read-write' | 'authenticated-read' | string;
-    ResponseContentDisposition?: string;
-    ResponseContentType?: string;
-}
-export interface S3SignedUrlResult {
-    key: string;
-    url: string;
-}

package/dist/aws/define.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var AWSComponent;
-(function (AWSComponent) {
-    AWSComponent["s3"] = "s3";
-    AWSComponent["sqs"] = "sqs";
-    AWSComponent["dynamodb"] = "dynamodb";
-})(AWSComponent = exports.AWSComponent || (exports.AWSComponent = {}));

package/dist/aws/index.d.ts

@@ -1,3 +0,0 @@
-export * from './define';
-export * from './config';
-export * from './simple';

package/dist/aws/index.js

@@ -1,8 +0,0 @@
-"use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./define"));
-__export(require("./config"));
-__export(require("./simple"));

package/dist/aws/simple.d.ts

@@ -1,42 +0,0 @@
-import * as AWS from 'aws-sdk';
-import { SimpleAWSConfig } from './config';
-import { S3SignedUrlParams, S3SignedUrlResult, SQSMessageBody } from './define';
-export declare class SimpleAWS {
-    private queueUrls;
-    private config;
-    private lazyS3;
-    private lazySqs;
-    private lazyDynamodb;
-    private lazyDynamodbAdmin;
-    constructor(config?: SimpleAWSConfig);
-    readonly s3: AWS.S3;
-    readonly sqs: AWS.SQS;
-    readonly dynamodb: AWS.DynamoDB.DocumentClient;
-    readonly dynamodbAdmin: AWS.DynamoDB;
-    getQueueUrl: (queueName: string) => Promise<string>;
-    enqueue: (queueName: string, data: any) => Promise<number>;
-    dequeue: <T>(queueName: string, fetchSize?: number, waitSeconds?: number, visibilityTimeout?: number) => Promise<SQSMessageBody<T>[]>;
-    dequeueAll: <T>(queueName: string, limitSize?: number, visibilityTimeout?: number) => Promise<SQSMessageBody<T>[]>;
-    retainMessage: (queueName: string, handle: string, seconds: number) => Promise<string>;
-    completeMessage: (queueName: string, handle: string) => Promise<string>;
-    completeMessages: (queueName: string, handles: string[]) => Promise<string[]>;
-    download: (bucketName: string, key: string, localPath: string) => Promise<string>;
-    upload: (bucketName: string, localPath: string, key: string) => Promise<string>;
-    getSignedUrl: (bucketName: string, key: string, operation?: "getObject" | "putObject", params?: S3SignedUrlParams | undefined) => S3SignedUrlResult;
-    getSignedCookie: (keyPairId: string, privateKey: string, url: string, expires: number) => AWS.CloudFront.Signer.CustomPolicy;
-    getAttachmentUrl: (bucketName: string, key: string, fileName: string, params?: S3SignedUrlParams | undefined) => S3SignedUrlResult;
-    getDynamoDbItem: <T>(tableName: string, key: {
-        [keyColumn: string]: string;
-    }, defaultValue?: T | undefined) => Promise<T | undefined>;
-    updateDynamoDbItem: (tableName: string, key: {
-        [keyColumn: string]: string;
-    }, columnValues: {
-        [column: string]: any;
-    }) => Promise<import("aws-sdk/lib/request").PromiseResult<AWS.DynamoDB.DocumentClient.UpdateItemOutput, AWS.AWSError>>;
-    setupQueue: (queueName: string) => Promise<boolean>;
-    setupStorage: (bucketName: string, cors: {
-        methods: ("DELETE" | "GET" | "HEAD" | "POST" | "PUT")[];
-        origins: string[];
-    }) => Promise<boolean>;
-    setupDynamoDb: (tableName: string, keyColumn: string) => Promise<boolean>;
-}