serverless-simple-middleware 0.0.52 → 0.0.56

package/dist/aws/simple.d.ts

@@ -20,8 +20,10 @@ export declare class SimpleAWS {
     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>;
+    download: (bucket: string, key: string, localPath: string) => Promise<string>;
+    readFile: (bucket: string, key: string) => Promise<string>;
+    upload: (bucket: string, localPath: string, key: string) => Promise<string>;
+    writeFile: (bucket: string, key: string, content: string) => Promise<void>;
     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;

package/dist/aws/simple.js

@@ -48,6 +48,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var AWS = require("aws-sdk"); // tslint:disable-line
 var fs = require("fs");
+var os = require("os");
+var non_secure_1 = require("nanoid/non-secure");
 var utils_1 = require("../utils");
 var config_1 = require("./config");
 var define_1 = require("./define");
@@ -283,15 +285,12 @@ var SimpleAWS = /** @class */ (function () {
                 }
             });
         }); };
-        this.download = function (bucketName, key, localPath) { return __awaiter(_this, void 0, void 0, function () {
+        this.download = function (bucket, key, localPath) { return __awaiter(_this, void 0, void 0, function () {
             var stream;
             return __generator(this, function (_a) {
-                logger.debug("Get a stream of item[" + key + "] from bucket[" + bucketName + "]");
+                logger.debug("Get a stream of item[" + key + "] from bucket[" + bucket + "]");
                 stream = this.s3
-                    .getObject({
-                    Bucket: bucketName,
-                    Key: key,
-                })
+                    .getObject({ Bucket: bucket, Key: key })
                     .createReadStream();
                 return [2 /*return*/, new Promise(function (resolve, reject) {
                         return stream
@@ -302,15 +301,52 @@ var SimpleAWS = /** @class */ (function () {
                     })];
             });
         }); };
-        this.upload = function (bucketName, localPath, key) { return __awaiter(_this, void 0, void 0, function () {
+        this.readFile = function (bucket, key) { return __awaiter(_this, void 0, void 0, function () {
+            var tempFile, content, error_1;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        logger.debug("Read item[" + key + "] from bucket[" + bucket + "]");
+                        tempFile = os.tmpdir() + "/" + non_secure_1.nanoid();
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, , 4, 9]);
+                        return [4 /*yield*/, this.download(bucket, key, tempFile)];
+                    case 2:
+                        _a.sent();
+                        return [4 /*yield*/, fs.promises.readFile(tempFile, {
+                                encoding: 'utf-8',
+                            })];
+                    case 3:
+                        content = _a.sent();
+                        return [2 /*return*/, content];
+                    case 4:
+                        if (!fs.existsSync(tempFile)) return [3 /*break*/, 8];
+                        _a.label = 5;
+                    case 5:
+                        _a.trys.push([5, 7, , 8]);
+                        return [4 /*yield*/, fs.promises.unlink(tempFile)];
+                    case 6:
+                        _a.sent();
+                        return [3 /*break*/, 8];
+                    case 7:
+                        error_1 = _a.sent();
+                        logger.error("Failed to delete temp file " + tempFile + ": " + utils_1.stringifyError(error_1));
+                        return [3 /*break*/, 8];
+                    case 8: return [7 /*endfinally*/];
+                    case 9: return [2 /*return*/];
+                }
+            });
+        }); };
+        this.upload = function (bucket, localPath, key) { return __awaiter(_this, void 0, void 0, function () {
             var putResult;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        logger.debug("Upload item[" + key + "] into bucket[" + bucketName + "]");
+                        logger.debug("Upload item[" + key + "] into bucket[" + bucket + "]");
                         return [4 /*yield*/, this.s3
                                 .upload({
-                                Bucket: bucketName,
+                                Bucket: bucket,
                                 Key: key,
                                 Body: fs.createReadStream(localPath),
                             })
@@ -322,6 +358,39 @@ var SimpleAWS = /** @class */ (function () {
                 }
             });
         }); };
+        this.writeFile = function (bucket, key, content) { return __awaiter(_this, void 0, void 0, function () {
+            var tempFile;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        logger.debug("Write item[" + key + "] into bucket[" + bucket + "]");
+                        tempFile = os.tmpdir() + "/" + non_secure_1.nanoid();
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, , 4, 5]);
+                        return [4 /*yield*/, fs.promises.writeFile(tempFile, content, 'utf-8')];
+                    case 2:
+                        _a.sent();
+                        return [4 /*yield*/, this.upload(bucket, tempFile, key)];
+                    case 3:
+                        _a.sent();
+                        return [3 /*break*/, 5];
+                    case 4:
+                        if (!fs.existsSync(tempFile)) {
+                            return [2 /*return*/];
+                        }
+                        fs.unlink(tempFile, function (error) {
+                            if (!error) {
+                                return;
+                            }
+                            var msg = "Error during writeFile: unlink file " + tempFile + ": " + utils_1.stringifyError(error);
+                            logger.error(msg);
+                        });
+                        return [7 /*endfinally*/];
+                    case 5: return [2 /*return*/];
+                }
+            });
+        }); };
         this.getSignedUrl = function (bucketName, key, operation, params) {
             if (operation === void 0) { operation = 'getObject'; }
             return {
@@ -405,7 +474,7 @@ var SimpleAWS = /** @class */ (function () {
         }); };
         // Setup
         this.setupQueue = function (queueName) { return __awaiter(_this, void 0, void 0, function () {
-            var listResult, _i, _a, queueUrl, error_1, createResult;
+            var listResult, _i, _a, queueUrl, error_2, createResult;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -428,8 +497,8 @@ var SimpleAWS = /** @class */ (function () {
                         }
                         return [3 /*break*/, 3];
                     case 2:
-                        error_1 = _b.sent();
-                        logger.debug("No Queue[" + queueName + "] exists due to " + error_1);
+                        error_2 = _b.sent();
+                        logger.debug("No Queue[" + queueName + "] exists due to " + error_2);
                         return [3 /*break*/, 3];
                     case 3:
                         logger.debug("Create a queue[" + queueName + "] newly.");
@@ -446,7 +515,7 @@ var SimpleAWS = /** @class */ (function () {
             });
         }); };
         this.setupStorage = function (bucketName, cors) { return __awaiter(_this, void 0, void 0, function () {
-            var listResult, error_2, createResult, corsResult;
+            var listResult, error_3, createResult, corsResult;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -461,8 +530,8 @@ var SimpleAWS = /** @class */ (function () {
                         }
                         return [3 /*break*/, 3];
                     case 2:
-                        error_2 = _a.sent();
-                        logger.debug("No bucket[" + bucketName + "] exists due to " + error_2);
+                        error_3 = _a.sent();
+                        logger.debug("No bucket[" + bucketName + "] exists due to " + error_3);
                         return [3 /*break*/, 3];
                     case 3:
                         logger.debug("Create a bucket[" + bucketName + "] newly.");
@@ -498,7 +567,7 @@ var SimpleAWS = /** @class */ (function () {
             });
         }); };
         this.setupDynamoDb = function (tableName, keyColumn) { return __awaiter(_this, void 0, void 0, function () {
-            var listResult, error_3, createResult;
+            var listResult, error_4, createResult;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -512,8 +581,8 @@ var SimpleAWS = /** @class */ (function () {
                         }
                         return [3 /*break*/, 3];
                     case 2:
-                        error_3 = _a.sent();
-                        logger.debug("No table[" + tableName + "] exists due to " + error_3);
+                        error_4 = _a.sent();
+                        logger.debug("No table[" + tableName + "] exists due to " + error_4);
                         return [3 /*break*/, 3];
                     case 3:
                         logger.debug("Create a table[" + tableName + "] newly.");

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.52",
+  "version": "0.0.56",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "VoyagerX",
@@ -30,6 +30,7 @@
     "@types/mysql": "^2.15.5",
     "cross-fetch": "^2.2.2",
     "mysql": "^2.16.0",
+    "nanoid": "4.0.2",
     "p-limit": "^2.0.0",
     "simple-staging": "^0.0.12",
     "ts-enum-util": "^3.1.0",
@@ -41,7 +42,7 @@
   },
   "devDependencies": {
     "@types/jest": "^23.3.1",
-    "@types/node": "8",
+    "@types/node": "11",
     "@types/uuid": "^3.4.4",
     "babel-core": "6.26.0",
     "babel-jest": "^23.4.2",

package/src/aws/simple.ts

@@ -1,7 +1,9 @@
 import * as AWS from 'aws-sdk'; // tslint:disable-line
 import * as fs from 'fs';
+import * as os from 'os';
+import { nanoid } from 'nanoid/non-secure';
 
-import { getLogger } from '../utils';
+import { getLogger, stringifyError } from '../utils';
 import { SimpleAWSConfig } from './config';
 
 import {
@@ -237,16 +239,13 @@ export class SimpleAWS {
   };
 
   public download = async (
-    bucketName: string,
+    bucket: string,
     key: string,
     localPath: string,
   ): Promise<string> => {
-    logger.debug(`Get a stream of item[${key}] from bucket[${bucketName}]`);
+    logger.debug(`Get a stream of item[${key}] from bucket[${bucket}]`);
     const stream = this.s3
-      .getObject({
-        Bucket: bucketName,
-        Key: key,
-      })
+      .getObject({ Bucket: bucket, Key: key })
       .createReadStream();
     return new Promise<string>((resolve, reject) =>
       stream
@@ -257,15 +256,37 @@ export class SimpleAWS {
     );
   };
 
+  public readFile = async (bucket: string, key: string): Promise<string> => {
+    logger.debug(`Read item[${key}] from bucket[${bucket}]`);
+    const tempFile = `${os.tmpdir()}/${nanoid()}`;
+    try {
+      await this.download(bucket, key, tempFile);
+      const content = await fs.promises.readFile(tempFile, {
+        encoding: 'utf-8',
+      });
+      return content;
+    } finally {
+      if (fs.existsSync(tempFile)) {
+        try {
+          await fs.promises.unlink(tempFile);
+        } catch (error) {
+          logger.error(
+            `Failed to delete temp file ${tempFile}: ${stringifyError(error)}`,
+          );
+        }
+      }
+    }
+  };
+
   public upload = async (
-    bucketName: string,
+    bucket: string,
     localPath: string,
     key: string,
   ): Promise<string> => {
-    logger.debug(`Upload item[${key}] into bucket[${bucketName}]`);
+    logger.debug(`Upload item[${key}] into bucket[${bucket}]`);
     const putResult = await this.s3
       .upload({
-        Bucket: bucketName,
+        Bucket: bucket,
         Key: key,
         Body: fs.createReadStream(localPath),
       })
@@ -274,6 +295,32 @@ export class SimpleAWS {
     return key;
   };
 
+  public writeFile = async (
+    bucket: string,
+    key: string,
+    content: string,
+  ): Promise<void> => {
+    logger.debug(`Write item[${key}] into bucket[${bucket}]`);
+    const tempFile = `${os.tmpdir()}/${nanoid()}`;
+    try {
+      await fs.promises.writeFile(tempFile, content, 'utf-8');
+      await this.upload(bucket, tempFile, key);
+    } finally {
+      if (!fs.existsSync(tempFile)) {
+        return;
+      }
+      fs.unlink(tempFile, error => {
+        if (!error) {
+          return;
+        }
+        const msg = `Error during writeFile: unlink file ${tempFile}: ${stringifyError(
+          error,
+        )}`;
+        logger.error(msg);
+      });
+    }
+  };
+
   public getSignedUrl = (
     bucketName: string,
     key: string,