serverless-simple-middleware 0.0.60 → 0.0.62

package/dist/aws/simple.js

@@ -11,10 +11,11 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -24,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -45,18 +46,36 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var AWS = require("aws-sdk"); // tslint:disable-line
+exports.SimpleAWS = void 0;
+var cloudfront_signer_1 = require("@aws-sdk/cloudfront-signer");
+var simple_staging_1 = require("simple-staging");
 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");
-var logger = utils_1.getLogger(__filename);
+var client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
+var client_s3_1 = require("@aws-sdk/client-s3");
+var client_sqs_1 = require("@aws-sdk/client-sqs");
+var lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
+var s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
+var lib_storage_1 = require("@aws-sdk/lib-storage");
+var logger = (0, utils_1.getLogger)(__filename);
 var SimpleAWS = /** @class */ (function () {
     function SimpleAWS(config) {
         var _this = this;
+        this.queueUrls = {};
         this.getQueueUrl = function (queueName) { return __awaiter(_this, void 0, void 0, function () {
             var urlResult;
             return __generator(this, function (_a) {
@@ -65,16 +84,14 @@ var SimpleAWS = /** @class */ (function () {
                         if (this.queueUrls[queueName] !== undefined) {
                             return [2 /*return*/, this.queueUrls[queueName]];
                         }
-                        return [4 /*yield*/, this.sqs
-                                .getQueueUrl({
+                        return [4 /*yield*/, this.sqs.getQueueUrl({
                                 QueueName: queueName,
-                            })
-                                .promise()];
+                            })];
                     case 1:
                         urlResult = _a.sent();
                         logger.stupid("urlResult", urlResult);
                         if (!urlResult.QueueUrl) {
-                            throw new Error("No queue url with name[" + queueName + "]");
+                            throw new Error("No queue url with name[".concat(queueName, "]"));
                         }
                         return [2 /*return*/, (this.queueUrls[queueName] = urlResult.QueueUrl)];
                 }
@@ -82,73 +99,72 @@ var SimpleAWS = /** @class */ (function () {
         }); };
         this.enqueue = function (queueName, data) { return __awaiter(_this, void 0, void 0, function () {
             var queueUrl, sendResult, attrResult;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        logger.debug("Send message[" + data.key + "] to queue.");
+                        logger.debug("Send message[".concat(data.key, "] to queue."));
                         logger.stupid("data", data);
                         return [4 /*yield*/, this.getQueueUrl(queueName)];
                     case 1:
-                        queueUrl = _a.sent();
-                        return [4 /*yield*/, this.sqs
-                                .sendMessage({
+                        queueUrl = _b.sent();
+                        return [4 /*yield*/, this.sqs.sendMessage({
                                 QueueUrl: queueUrl,
                                 MessageBody: JSON.stringify(data),
                                 DelaySeconds: 0,
-                            })
-                                .promise()];
+                            })];
                     case 2:
-                        sendResult = _a.sent();
+                        sendResult = _b.sent();
                         logger.stupid("sendResult", sendResult);
-                        return [4 /*yield*/, this.sqs
-                                .getQueueAttributes({
+                        return [4 /*yield*/, this.sqs.getQueueAttributes({
                                 QueueUrl: queueUrl,
                                 AttributeNames: ['ApproximateNumberOfMessages'],
-                            })
-                                .promise()];
+                            })];
                     case 3:
-                        attrResult = _a.sent();
+                        attrResult = _b.sent();
                         logger.stupid("attrResult", attrResult);
                         if (!attrResult.Attributes) {
                             return [2 /*return*/, 0];
                         }
-                        return [2 /*return*/, +attrResult.Attributes.ApproximateNumberOfMessages];
+                        return [2 /*return*/, +(((_a = attrResult.Attributes) === null || _a === void 0 ? void 0 : _a.ApproximateNumberOfMessages) || 0)];
                 }
             });
         }); };
-        this.dequeue = function (queueName, fetchSize, waitSeconds, visibilityTimeout) {
-            if (fetchSize === void 0) { fetchSize = 1; }
-            if (waitSeconds === void 0) { waitSeconds = 1; }
-            if (visibilityTimeout === void 0) { visibilityTimeout = 15; }
-            return __awaiter(_this, void 0, void 0, function () {
-                var queueUrl, receiveResult, data, _i, _a, each, message;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+        this.dequeue = function (queueName_1) {
+            var args_1 = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                args_1[_i - 1] = arguments[_i];
+            }
+            return __awaiter(_this, __spreadArray([queueName_1], args_1, true), void 0, function (queueName, fetchSize, waitSeconds, visibilityTimeout) {
+                var queueUrl, receiveResult, data, _a, _b, each, message;
+                if (fetchSize === void 0) { fetchSize = 1; }
+                if (waitSeconds === void 0) { waitSeconds = 1; }
+                if (visibilityTimeout === void 0) { visibilityTimeout = 15; }
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
-                            logger.debug("Receive message from queue[" + queueName + "].");
+                            logger.debug("Receive message from queue[".concat(queueName, "]."));
                             return [4 /*yield*/, this.getQueueUrl(queueName)];
                         case 1:
-                            queueUrl = _b.sent();
-                            return [4 /*yield*/, this.sqs
-                                    .receiveMessage({
+                            queueUrl = _c.sent();
+                            return [4 /*yield*/, this.sqs.receiveMessage({
                                     QueueUrl: queueUrl,
                                     MaxNumberOfMessages: fetchSize,
                                     WaitTimeSeconds: waitSeconds,
                                     VisibilityTimeout: visibilityTimeout,
-                                })
-                                    .promise()];
+                                })];
                         case 2:
-                            receiveResult = _b.sent();
+                            receiveResult = _c.sent();
                             logger.stupid("receiveResult", receiveResult);
                             if (receiveResult.Messages === undefined ||
                                 receiveResult.Messages.length === 0) {
                                 return [2 /*return*/, []];
                             }
                             data = [];
-                            for (_i = 0, _a = receiveResult.Messages; _i < _a.length; _i++) {
-                                each = _a[_i];
+                            for (_a = 0, _b = receiveResult.Messages; _a < _b.length; _a++) {
+                                each = _b[_a];
                                 if (!each.ReceiptHandle) {
-                                    logger.warn("No receipt handler: " + JSON.stringify(each));
+                                    logger.warn("No receipt handler: ".concat(JSON.stringify(each)));
                                     continue;
                                 }
                                 message = {
@@ -157,33 +173,37 @@ var SimpleAWS = /** @class */ (function () {
                                 };
                                 data.push(message);
                             }
-                            logger.verbose("Receive a message[" + JSON.stringify(data) + "] from queue");
+                            logger.verbose("Receive a message[".concat(JSON.stringify(data), "] from queue"));
                             return [2 /*return*/, data];
                     }
                 });
             });
         };
-        this.dequeueAll = function (queueName, limitSize, visibilityTimeout) {
-            if (limitSize === void 0) { limitSize = Number.MAX_VALUE; }
-            if (visibilityTimeout === void 0) { visibilityTimeout = 15; }
-            return __awaiter(_this, void 0, void 0, function () {
-                var messages, maxFetchSize, eachOfMessages, _i, eachOfMessages_1, each;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+        this.dequeueAll = function (queueName_1) {
+            var args_1 = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                args_1[_i - 1] = arguments[_i];
+            }
+            return __awaiter(_this, __spreadArray([queueName_1], args_1, true), void 0, function (queueName, limitSize, visibilityTimeout) {
+                var messages, maxFetchSize, eachOfMessages, _a, eachOfMessages_1, each;
+                if (limitSize === void 0) { limitSize = Number.MAX_VALUE; }
+                if (visibilityTimeout === void 0) { visibilityTimeout = 15; }
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             messages = [];
                             maxFetchSize = 10;
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
                             if (!(messages.length < limitSize)) return [3 /*break*/, 3];
                             return [4 /*yield*/, this.dequeue(queueName, Math.min(limitSize - messages.length, maxFetchSize), 0, visibilityTimeout)];
                         case 2:
-                            eachOfMessages = _a.sent();
+                            eachOfMessages = _b.sent();
                             if (!eachOfMessages || eachOfMessages.length === 0) {
                                 return [3 /*break*/, 3];
                             }
-                            for (_i = 0, eachOfMessages_1 = eachOfMessages; _i < eachOfMessages_1.length; _i++) {
-                                each = eachOfMessages_1[_i];
+                            for (_a = 0, eachOfMessages_1 = eachOfMessages; _a < eachOfMessages_1.length; _a++) {
+                                each = eachOfMessages_1[_a];
                                 messages.push(each);
                             }
                             return [3 /*break*/, 1];
@@ -195,32 +215,23 @@ var SimpleAWS = /** @class */ (function () {
             });
         };
         this.retainMessage = function (queueName, handle, seconds) { return __awaiter(_this, void 0, void 0, function () {
-            var _this = this;
+            var queueUrl;
             return __generator(this, function (_a) {
-                return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                        var _this = this;
-                        return __generator(this, function (_a) {
-                            logger.debug("Change visibilityTimeout of " + handle + " to " + seconds + "secs.");
-                            this.getQueueUrl(queueName)
-                                .then(function (queueUrl) {
-                                _this.sqs.changeMessageVisibility({
-                                    QueueUrl: queueUrl,
-                                    ReceiptHandle: handle,
-                                    VisibilityTimeout: seconds,
-                                }, function (err, changeResult) {
-                                    if (err) {
-                                        reject(err);
-                                    }
-                                    else {
-                                        logger.stupid("changeResult", changeResult);
-                                        resolve(handle);
-                                    }
-                                });
-                            })
-                                .catch(reject);
-                            return [2 /*return*/];
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0:
+                        logger.debug("Change visibilityTimeout of ".concat(handle, " to ").concat(seconds, "secs."));
+                        return [4 /*yield*/, this.getQueueUrl(queueName)];
+                    case 1:
+                        queueUrl = _a.sent();
+                        return [4 /*yield*/, this.sqs.changeMessageVisibility({
+                                QueueUrl: queueUrl,
+                                ReceiptHandle: handle,
+                                VisibilityTimeout: seconds,
+                            })];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/, handle];
+                }
             });
         }); };
         this.completeMessage = function (queueName, handle) { return __awaiter(_this, void 0, void 0, function () {
@@ -228,16 +239,14 @@ var SimpleAWS = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        logger.debug("Complete a message with handle[" + handle + "]");
+                        logger.debug("Complete a message with handle[".concat(handle, "]"));
                         return [4 /*yield*/, this.getQueueUrl(queueName)];
                     case 1:
                         queueUrl = _a.sent();
-                        return [4 /*yield*/, this.sqs
-                                .deleteMessage({
+                        return [4 /*yield*/, this.sqs.deleteMessage({
                                 QueueUrl: queueUrl,
                                 ReceiptHandle: handle,
-                            })
-                                .promise()];
+                            })];
                     case 2:
                         deleteResult = _a.sent();
                         logger.stupid("deleteResult", deleteResult);
@@ -250,7 +259,7 @@ var SimpleAWS = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        logger.debug("Complete a message with handle[" + handles + "]");
+                        logger.debug("Complete a message with handle[".concat(handles, "]"));
                         if (!handles) {
                             return [2 /*return*/, handles];
                         }
@@ -265,15 +274,13 @@ var SimpleAWS = /** @class */ (function () {
                         return [4 /*yield*/, this.getQueueUrl(queueName)];
                     case 2:
                         queueUrl = _a.sent();
-                        return [4 /*yield*/, this.sqs
-                                .deleteMessageBatch({
+                        return [4 /*yield*/, this.sqs.deleteMessageBatch({
                                 QueueUrl: queueUrl,
                                 Entries: sublist.map(function (handle) { return ({
                                     Id: (++index).toString(),
                                     ReceiptHandle: handle,
                                 }); }),
-                            })
-                                .promise()];
+                            })];
                     case 3:
                         deletesResult = _a.sent();
                         logger.stupid("deleteResult", deletesResult);
@@ -286,19 +293,22 @@ var SimpleAWS = /** @class */ (function () {
             });
         }); };
         this.download = function (bucket, key, localPath) { return __awaiter(_this, void 0, void 0, function () {
-            var stream;
+            var Body;
             return __generator(this, function (_a) {
-                logger.debug("Get a stream of item[" + key + "] from bucket[" + bucket + "]");
-                stream = this.s3
-                    .getObject({ Bucket: bucket, Key: key })
-                    .createReadStream();
-                return [2 /*return*/, new Promise(function (resolve, reject) {
-                        return stream
-                            .on('error', function (error) { return reject(error); })
-                            .pipe(fs.createWriteStream(localPath))
-                            .on('finish', function () { return resolve(localPath); })
-                            .on('error', function (error) { return reject(error); });
-                    })];
+                switch (_a.label) {
+                    case 0:
+                        logger.debug("Get a stream of item[".concat(key, "] from bucket[").concat(bucket, "]"));
+                        return [4 /*yield*/, this.s3.getObject({ Bucket: bucket, Key: key })];
+                    case 1:
+                        Body = (_a.sent()).Body;
+                        return [2 /*return*/, new Promise(function (resolve, reject) {
+                                return Body
+                                    .on('error', function (error) { return reject(error); })
+                                    .pipe(fs.createWriteStream(localPath))
+                                    .on('finish', function () { return resolve(localPath); })
+                                    .on('error', function (error) { return reject(error); });
+                            })];
+                }
             });
         }); };
         this.readFile = function (bucket, key) { return __awaiter(_this, void 0, void 0, function () {
@@ -306,8 +316,8 @@ var SimpleAWS = /** @class */ (function () {
             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();
+                        logger.debug("Read item[".concat(key, "] from bucket[").concat(bucket, "]"));
+                        tempFile = "".concat(os.tmpdir(), "/").concat((0, non_secure_1.nanoid)());
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, , 4, 9]);
@@ -331,7 +341,7 @@ var SimpleAWS = /** @class */ (function () {
                         return [3 /*break*/, 8];
                     case 7:
                         error_1 = _a.sent();
-                        logger.error("Failed to delete temp file " + tempFile + ": " + utils_1.stringifyError(error_1));
+                        logger.error("Failed to delete temp file ".concat(tempFile, ": ").concat((0, utils_1.stringifyError)(error_1)));
                         return [3 /*break*/, 8];
                     case 8: return [7 /*endfinally*/];
                     case 9: return [2 /*return*/];
@@ -339,111 +349,112 @@ var SimpleAWS = /** @class */ (function () {
             });
         }); };
         this.readFileBuffer = function (bucket, key) { return __awaiter(_this, void 0, void 0, function () {
-            var params, data;
+            var Body, buffer;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        logger.debug("Read item[" + key + "] from bucket[" + bucket + "]");
-                        params = {
-                            Bucket: bucket,
-                            Key: key,
-                        };
-                        return [4 /*yield*/, this.s3.getObject(params).promise()];
+                        logger.debug("Read item[".concat(key, "] from bucket[").concat(bucket, "]"));
+                        return [4 /*yield*/, this.s3.getObject({ Bucket: bucket, Key: key })];
                     case 1:
-                        data = _a.sent();
-                        if (data.Body) {
-                            return [2 /*return*/, data.Body];
-                        }
-                        else {
-                            throw new Error("Failed to read file " + key + " from bucket " + bucket);
+                        Body = (_a.sent()).Body;
+                        return [4 /*yield*/, (Body === null || Body === void 0 ? void 0 : Body.transformToByteArray())];
+                    case 2:
+                        buffer = _a.sent();
+                        if (!buffer) {
+                            throw new Error("Failed to read file ".concat(key, " from bucket ").concat(bucket));
                         }
-                        return [2 /*return*/];
+                        return [2 /*return*/, Buffer.from(buffer)];
                 }
             });
         }); };
-        this.upload = function (bucket, localPath, key) { return __awaiter(_this, void 0, void 0, function () {
-            var putResult;
+        this.upload = function (bucket, localPath, key, tags) { return __awaiter(_this, void 0, void 0, function () {
+            var upload;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        logger.debug("Upload item[" + key + "] into bucket[" + bucket + "]");
-                        return [4 /*yield*/, this.s3
-                                .upload({
+                        logger.debug("Upload item[".concat(key, "] into bucket[").concat(bucket, "]"));
+                        upload = new lib_storage_1.Upload({
+                            client: this.s3,
+                            params: {
                                 Bucket: bucket,
                                 Key: key,
                                 Body: fs.createReadStream(localPath),
-                            })
-                                .promise()];
+                            },
+                            partSize: 5 * 1024 * 1024, // 5MB
+                            queueSize: 4,
+                            tags: __spreadArray([SimpleAWS.stageTag], (tags || []), true),
+                        });
+                        return [4 /*yield*/, upload.done()];
                     case 1:
-                        putResult = _a.sent();
-                        logger.stupid("putResult", putResult);
+                        _a.sent();
                         return [2 /*return*/, key];
                 }
             });
         }); };
-        this.uploadFromBuffer = function (bucket, key, buffer) { return __awaiter(_this, void 0, void 0, function () {
-            var putResult;
+        this.uploadFromBuffer = function (bucket, key, buffer, tags) { return __awaiter(_this, void 0, void 0, function () {
+            var upload;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        logger.debug("Upload item[" + key + "] into bucket[" + bucket + "]");
-                        return [4 /*yield*/, this.s3
-                                .upload({
+                        logger.debug("Upload item[".concat(key, "] into bucket[").concat(bucket, "]"));
+                        upload = new lib_storage_1.Upload({
+                            client: this.s3,
+                            params: {
                                 Bucket: bucket,
                                 Key: key,
                                 Body: buffer,
-                            })
-                                .promise()];
+                            },
+                            partSize: 5 * 1024 * 1024, // 5MB
+                            queueSize: 4,
+                            tags: __spreadArray([SimpleAWS.stageTag], (tags || []), true),
+                        });
+                        return [4 /*yield*/, upload.done()];
                     case 1:
-                        putResult = _a.sent();
-                        logger.stupid("putResult", putResult);
+                        _a.sent();
                         return [2 /*return*/, key];
                 }
             });
         }); };
         this.writeFile = function (bucket, key, content) { return __awaiter(_this, void 0, void 0, function () {
-            var tempFile;
+            var tempFile, error_2, msg;
             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();
+                        logger.debug("Write item[".concat(key, "] into bucket[").concat(bucket, "]"));
+                        tempFile = "".concat(os.tmpdir(), "/").concat((0, non_secure_1.nanoid)());
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, , 4, 5]);
+                        _a.trys.push([1, , 4, 9]);
                         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];
+                        return [3 /*break*/, 9];
                     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*/];
+                        _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_2 = _a.sent();
+                        msg = "Error during writeFile: unlink file ".concat(tempFile, ": ").concat((0, utils_1.stringifyError)(error_2));
+                        logger.error(msg);
+                        return [3 /*break*/, 8];
+                    case 8: return [7 /*endfinally*/];
+                    case 9: return [2 /*return*/];
                 }
             });
         }); };
-        this.getSignedUrl = function (bucketName, key, operation, params) {
-            if (operation === void 0) { operation = 'getObject'; }
-            return {
-                key: key,
-                url: _this.s3.getSignedUrl(operation, __assign({ Bucket: bucketName, Key: key, Expires: 60 * 10 }, (params || {}))),
-            };
-        };
         this.getSignedCookie = function (keyPairId, privateKey, url, expires) {
-            var signer = new AWS.CloudFront.Signer(keyPairId, privateKey);
-            var policy = {
+            var policy = JSON.stringify({
                 Statement: [
                     {
                         Resource: url,
@@ -452,25 +463,23 @@ var SimpleAWS = /** @class */ (function () {
                         },
                     },
                 ],
-            };
-            var ret = signer.getSignedCookie({ policy: JSON.stringify(policy) });
-            return ret;
-        };
-        this.getAttachmentUrl = function (bucketName, key, fileName, params) {
-            return _this.getSignedUrl(bucketName, key, 'getObject', __assign({}, params, { ResponseContentDisposition: "attachment; filename=\"" + fileName + "\"" }));
+            });
+            return (0, cloudfront_signer_1.getSignedCookies)({
+                keyPairId: keyPairId,
+                privateKey: privateKey,
+                policy: policy,
+            });
         };
         this.getDynamoDbItem = function (tableName, key, defaultValue) { return __awaiter(_this, void 0, void 0, function () {
             var getResult, item;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        logger.debug("Read an item with key[" + JSON.stringify(key) + "] from " + tableName + ".");
-                        return [4 /*yield*/, this.dynamodb
-                                .get({
+                        logger.debug("Read an item with key[".concat(JSON.stringify(key), "] from ").concat(tableName, "."));
+                        return [4 /*yield*/, this.dynamodb.get({
                                 TableName: tableName,
                                 Key: key,
-                            })
-                                .promise()];
+                            })];
                     case 1:
                         getResult = _a.sent();
                         logger.stupid("getResult", getResult);
@@ -487,27 +496,25 @@ var SimpleAWS = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        logger.debug("Update an item with key[" + JSON.stringify(key) + "] to " + tableName);
+                        logger.debug("Update an item with key[".concat(JSON.stringify(key), "] to ").concat(tableName));
                         logger.stupid("keyValues", columnValues);
                         expressions = Object.keys(columnValues)
-                            .map(function (column) { return column + " = :" + column; })
+                            .map(function (column) { return "".concat(column, " = :").concat(column); })
                             .join(', ');
                         attributeValues = Object.keys(columnValues)
-                            .map(function (column) { return [":" + column, columnValues[column]]; })
+                            .map(function (column) { return [":".concat(column), columnValues[column]]; })
                             .reduce(function (obj, pair) {
                             var _a;
-                            return (__assign({}, obj, (_a = {}, _a[pair[0]] = pair[1], _a)));
+                            return (__assign(__assign({}, obj), (_a = {}, _a[pair[0]] = pair[1], _a)));
                         }, {});
                         logger.stupid("expressions", expressions);
                         logger.stupid("attributeValues", attributeValues);
-                        return [4 /*yield*/, this.dynamodb
-                                .update({
+                        return [4 /*yield*/, this.dynamodb.update({
                                 TableName: tableName,
                                 Key: key,
-                                UpdateExpression: "set " + expressions,
+                                UpdateExpression: "set ".concat(expressions),
                                 ExpressionAttributeValues: attributeValues,
-                            })
-                                .promise()];
+                            })];
                     case 1:
                         updateResult = _a.sent();
                         logger.stupid("updateResult", updateResult);
@@ -517,39 +524,35 @@ var SimpleAWS = /** @class */ (function () {
         }); };
         // Setup
         this.setupQueue = function (queueName) { return __awaiter(_this, void 0, void 0, function () {
-            var listResult, _i, _a, queueUrl, error_2, createResult;
+            var listResult, _i, _a, queueUrl, error_3, createResult;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _b.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.sqs
-                                .listQueues({
+                        return [4 /*yield*/, this.sqs.listQueues({
                                 QueueNamePrefix: queueName,
-                            })
-                                .promise()];
+                            })];
                     case 1:
                         listResult = _b.sent();
                         if (listResult.QueueUrls) {
                             for (_i = 0, _a = listResult.QueueUrls; _i < _a.length; _i++) {
                                 queueUrl = _a[_i];
                                 if (queueUrl.endsWith(queueName)) {
-                                    logger.debug("Queue[" + queueName + " => " + queueUrl + "] already exists.");
+                                    logger.debug("Queue[".concat(queueName, " => ").concat(queueUrl, "] already exists."));
                                     return [2 /*return*/, true];
                                 }
                             }
                         }
                         return [3 /*break*/, 3];
                     case 2:
-                        error_2 = _b.sent();
-                        logger.debug("No Queue[" + queueName + "] exists due to " + error_2);
+                        error_3 = _b.sent();
+                        logger.debug("No Queue[".concat(queueName, "] exists due to ").concat(error_3));
                         return [3 /*break*/, 3];
                     case 3:
-                        logger.debug("Create a queue[" + queueName + "] newly.");
-                        return [4 /*yield*/, this.sqs
-                                .createQueue({
+                        logger.debug("Create a queue[".concat(queueName, "] newly."));
+                        return [4 /*yield*/, this.sqs.createQueue({
                                 QueueName: queueName,
-                            })
-                                .promise()];
+                            })];
                     case 4:
                         createResult = _b.sent();
                         logger.stupid("createResult", createResult);
@@ -558,37 +561,34 @@ var SimpleAWS = /** @class */ (function () {
             });
         }); };
         this.setupStorage = function (bucketName, cors) { return __awaiter(_this, void 0, void 0, function () {
-            var listResult, error_3, createResult, corsResult;
+            var listResult, error_4, createResult, corsResult;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.s3.listBuckets().promise()];
+                        return [4 /*yield*/, this.s3.listBuckets()];
                     case 1:
                         listResult = _a.sent();
                         if (listResult.Buckets &&
                             listResult.Buckets.map(function (each) { return each.Name; }).includes(bucketName)) {
-                            logger.debug("Bucket[" + bucketName + "] already exists.");
+                            logger.debug("Bucket[".concat(bucketName, "] already exists."));
                             return [2 /*return*/, true];
                         }
                         return [3 /*break*/, 3];
                     case 2:
-                        error_3 = _a.sent();
-                        logger.debug("No bucket[" + bucketName + "] exists due to " + error_3);
+                        error_4 = _a.sent();
+                        logger.debug("No bucket[".concat(bucketName, "] exists due to ").concat(error_4));
                         return [3 /*break*/, 3];
                     case 3:
-                        logger.debug("Create a bucket[" + bucketName + "] newly.");
-                        return [4 /*yield*/, this.s3
-                                .createBucket({
+                        logger.debug("Create a bucket[".concat(bucketName, "] newly."));
+                        return [4 /*yield*/, this.s3.createBucket({
                                 Bucket: bucketName,
-                            })
-                                .promise()];
+                            })];
                     case 4:
                         createResult = _a.sent();
                         logger.stupid("createResult", createResult);
                         if (!cors) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this.s3
-                                .putBucketCors({
+                        return [4 /*yield*/, this.s3.putBucketCors({
                                 Bucket: bucketName,
                                 CORSConfiguration: {
                                     CORSRules: [
@@ -599,8 +599,7 @@ var SimpleAWS = /** @class */ (function () {
                                         },
                                     ],
                                 },
-                            })
-                                .promise()];
+                            })];
                     case 5:
                         corsResult = _a.sent();
                         logger.stupid("corsResult", corsResult);
@@ -610,38 +609,34 @@ var SimpleAWS = /** @class */ (function () {
             });
         }); };
         this.setupDynamoDb = function (tableName, keyColumn) { return __awaiter(_this, void 0, void 0, function () {
-            var listResult, error_4, createResult;
+            var listResult, error_5, createResult;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.dynamodbAdmin.listTables().promise()];
+                        return [4 /*yield*/, this.dynamodbAdmin.listTables()];
                     case 1:
                         listResult = _a.sent();
                         if (listResult.TableNames && listResult.TableNames.includes(tableName)) {
-                            logger.debug("Table[" + tableName + "] already exists.");
+                            logger.debug("Table[".concat(tableName, "] already exists."));
                             return [2 /*return*/, true];
                         }
                         return [3 /*break*/, 3];
                     case 2:
-                        error_4 = _a.sent();
-                        logger.debug("No table[" + tableName + "] exists due to " + error_4);
+                        error_5 = _a.sent();
+                        logger.debug("No table[".concat(tableName, "] exists due to ").concat(error_5));
                         return [3 /*break*/, 3];
                     case 3:
-                        logger.debug("Create a table[" + tableName + "] newly.");
-                        return [4 /*yield*/, this.dynamodbAdmin
-                                .createTable({
+                        logger.debug("Create a table[".concat(tableName, "] newly."));
+                        return [4 /*yield*/, this.dynamodbAdmin.createTable({
                                 TableName: tableName,
                                 KeySchema: [{ AttributeName: keyColumn, KeyType: 'HASH' }],
-                                AttributeDefinitions: [
-                                    { AttributeName: keyColumn, AttributeType: 'S' },
-                                ],
+                                AttributeDefinitions: [{ AttributeName: keyColumn, AttributeType: 'S' }],
                                 ProvisionedThroughput: {
                                     ReadCapacityUnits: 30,
                                     WriteCapacityUnits: 10,
                                 },
-                            })
-                                .promise()];
+                            })];
                     case 4:
                         createResult = _a.sent();
                         logger.stupid("createResult", createResult);
@@ -660,43 +655,155 @@ var SimpleAWS = /** @class */ (function () {
     Object.defineProperty(SimpleAWS.prototype, "s3", {
         get: function () {
             if (this.lazyS3 === undefined) {
-                this.lazyS3 = new AWS.S3(this.config.get(define_1.AWSComponent.s3));
+                this.lazyS3 = new client_s3_1.S3(this.config.get(define_1.AWSComponent.s3) || {});
             }
             return this.lazyS3;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(SimpleAWS.prototype, "sqs", {
         get: function () {
             if (this.lazySqs === undefined) {
-                this.lazySqs = new AWS.SQS(this.config.get(define_1.AWSComponent.sqs));
+                this.lazySqs = new client_sqs_1.SQS(this.config.get(define_1.AWSComponent.sqs) || {});
             }
             return this.lazySqs;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(SimpleAWS.prototype, "dynamodb", {
         get: function () {
             if (this.lazyDynamodb === undefined) {
-                this.lazyDynamodb = new AWS.DynamoDB.DocumentClient(this.config.get(define_1.AWSComponent.dynamodb));
+                this.lazyDynamodb = lib_dynamodb_1.DynamoDBDocument.from(new client_dynamodb_1.DynamoDBClient(this.config.get(define_1.AWSComponent.dynamodb) || {}), {
+                    marshallOptions: {
+                        convertEmptyValues: true,
+                        removeUndefinedValues: true,
+                    },
+                });
             }
             return this.lazyDynamodb;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(SimpleAWS.prototype, "dynamodbAdmin", {
         get: function () {
             if (this.lazyDynamodbAdmin === undefined) {
-                this.lazyDynamodbAdmin = new AWS.DynamoDB(this.config.get(define_1.AWSComponent.dynamodb));
+                this.lazyDynamodbAdmin = new client_dynamodb_1.DynamoDB(this.config.get(define_1.AWSComponent.dynamodb) || {});
             }
             return this.lazyDynamodbAdmin;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
+    SimpleAWS.prototype.getSignedUrl = function (options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, expiresIn, unhoistableHeaders, tagging, cmd, cmd, cmd, cmd, cmd, cmd, cmd, cmd, tagging, cmd, cmd, cmd, cmd;
+            var _b, _c;
+            return __generator(this, function (_d) {
+                _a = options.expiresIn, expiresIn = _a === void 0 ? 600 : _a, unhoistableHeaders = options.unhoistableHeaders;
+                switch (options.operation) {
+                    case 'putObject': {
+                        tagging = ((_b = options.params) === null || _b === void 0 ? void 0 : _b.Tagging)
+                            ? SimpleAWS.stringifiedStageTag + '&' + options.params.Tagging
+                            : SimpleAWS.stringifiedStageTag;
+                        cmd = new client_s3_1.PutObjectCommand(__assign(__assign({ Bucket: options.bucket, Key: options.key }, options.params), { Tagging: tagging }));
+                        return [2 /*return*/, (0, s3_request_presigner_1.getSignedUrl)(this.s3, cmd, {
+                                expiresIn: expiresIn,
+                                unhoistableHeaders: unhoistableHeaders,
+                            })];
+                    }
+                    case 'getObject': {
+                        cmd = new client_s3_1.GetObjectCommand(__assign({ Bucket: options.bucket, Key: options.key }, options.params));
+                        return [2 /*return*/, (0, s3_request_presigner_1.getSignedUrl)(this.s3, cmd, {
+                                expiresIn: expiresIn,
+                                unhoistableHeaders: unhoistableHeaders,
+                            })];
+                    }
+                    case 'deleteObject': {
+                        cmd = new client_s3_1.DeleteObjectCommand(__assign({ Bucket: options.bucket, Key: options.key }, options.params));
+                        return [2 /*return*/, (0, s3_request_presigner_1.getSignedUrl)(this.s3, cmd, {
+                                expiresIn: expiresIn,
+                                unhoistableHeaders: unhoistableHeaders,
+                            })];
+                    }
+                    case 'headObject': {
+                        cmd = new client_s3_1.HeadObjectCommand(__assign({ Bucket: options.bucket, Key: options.key }, options.params));
+                        return [2 /*return*/, (0, s3_request_presigner_1.getSignedUrl)(this.s3, cmd, {
+                                expiresIn: expiresIn,
+                                unhoistableHeaders: unhoistableHeaders,
+                            })];
+                    }
+                    case 'copyObject': {
+                        cmd = new client_s3_1.CopyObjectCommand(__assign({ Bucket: options.bucket, Key: options.key }, options.params));
+                        return [2 /*return*/, (0, s3_request_presigner_1.getSignedUrl)(this.s3, cmd, {
+                                expiresIn: expiresIn,
+                                unhoistableHeaders: unhoistableHeaders,
+                            })];
+                    }
+                    case 'uploadPart': {
+                        cmd = new client_s3_1.UploadPartCommand(__assign({ Bucket: options.bucket, Key: options.key }, options.params));
+                        return [2 /*return*/, (0, s3_request_presigner_1.getSignedUrl)(this.s3, cmd, {
+                                expiresIn: expiresIn,
+                                unhoistableHeaders: unhoistableHeaders,
+                            })];
+                    }
+                    case 'uploadPartCopy': {
+                        cmd = new client_s3_1.UploadPartCopyCommand(__assign({ Bucket: options.bucket, Key: options.key }, options.params));
+                        return [2 /*return*/, (0, s3_request_presigner_1.getSignedUrl)(this.s3, cmd, {
+                                expiresIn: expiresIn,
+                                unhoistableHeaders: unhoistableHeaders,
+                            })];
+                    }
+                    case 'listObjectsV2': {
+                        cmd = new client_s3_1.ListObjectsV2Command(__assign({ Bucket: options.bucket }, options.params));
+                        return [2 /*return*/, (0, s3_request_presigner_1.getSignedUrl)(this.s3, cmd, {
+                                expiresIn: expiresIn,
+                                unhoistableHeaders: unhoistableHeaders,
+                            })];
+                    }
+                    case 'createMultipartUpload': {
+                        tagging = ((_c = options.params) === null || _c === void 0 ? void 0 : _c.Tagging)
+                            ? SimpleAWS.stringifiedStageTag + '&' + options.params.Tagging
+                            : SimpleAWS.stringifiedStageTag;
+                        cmd = new client_s3_1.CreateMultipartUploadCommand(__assign(__assign({ Bucket: options.bucket, Key: options.key }, options.params), { Tagging: tagging }));
+                        return [2 /*return*/, (0, s3_request_presigner_1.getSignedUrl)(this.s3, cmd, {
+                                expiresIn: expiresIn,
+                                unhoistableHeaders: unhoistableHeaders,
+                            })];
+                    }
+                    case 'completeMultipartUpload': {
+                        cmd = new client_s3_1.CompleteMultipartUploadCommand(__assign({ Bucket: options.bucket, Key: options.key }, options.params));
+                        return [2 /*return*/, (0, s3_request_presigner_1.getSignedUrl)(this.s3, cmd, {
+                                expiresIn: expiresIn,
+                                unhoistableHeaders: unhoistableHeaders,
+                            })];
+                    }
+                    case 'abortMultipartUpload': {
+                        cmd = new client_s3_1.AbortMultipartUploadCommand(__assign({ Bucket: options.bucket, Key: options.key }, options.params));
+                        return [2 /*return*/, (0, s3_request_presigner_1.getSignedUrl)(this.s3, cmd, {
+                                expiresIn: expiresIn,
+                                unhoistableHeaders: unhoistableHeaders,
+                            })];
+                    }
+                    case 'listParts': {
+                        cmd = new client_s3_1.ListPartsCommand(__assign({ Bucket: options.bucket, Key: options.key }, options.params));
+                        return [2 /*return*/, (0, s3_request_presigner_1.getSignedUrl)(this.s3, cmd, {
+                                expiresIn: expiresIn,
+                                unhoistableHeaders: unhoistableHeaders,
+                            })];
+                    }
+                }
+                return [2 /*return*/];
+            });
+        });
+    };
+    SimpleAWS.stageTag = {
+        Key: 'STAGE',
+        Value: simple_staging_1.envDefault.level,
+    };
+    SimpleAWS.stringifiedStageTag = "STAGE=".concat(simple_staging_1.envDefault.level);
     return SimpleAWS;
 }());
 exports.SimpleAWS = SimpleAWS;