serverless-simple-middleware 0.0.60 → 0.0.62

package/dist/middleware/mysql.js

@@ -3,20 +3,23 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
 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());
     });
 };
@@ -26,7 +29,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]) {
@@ -48,10 +51,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.MySQLPlugin = exports.ConnectionProxy = void 0;
 var mysql = require("mysql");
 var utils_1 = require("../utils");
 var base_1 = require("./base");
-var logger = utils_1.getLogger(__filename);
+var logger = (0, utils_1.getLogger)(__filename);
 var ConnectionProxy = /** @class */ (function () {
     function ConnectionProxy(config) {
         var _this = this;
@@ -66,17 +70,17 @@ var ConnectionProxy = /** @class */ (function () {
                         case 1:
                             _a.sent();
                             if (process.env.NODE_ENV !== 'test') {
-                                logger.silly("Execute query[" + sql + "] with params[" + params + "]");
+                                logger.silly("Execute query[".concat(sql, "] with params[").concat(params, "]"));
                             }
                             connection.query(sql, params, function (err, result) {
                                 if (err) {
-                                    logger.error("error occurred in database query=" + sql + ", error=" + err);
+                                    logger.error("error occurred in database query=".concat(sql, ", error=").concat(err));
                                     reject(err);
                                 }
                                 else {
                                     resolve(result);
                                     if (process.env.NODE_ENV !== 'test') {
-                                        logger.silly("DB result is " + JSON.stringify(result));
+                                        logger.silly("DB result is ".concat(JSON.stringify(result)));
                                     }
                                 }
                             });
@@ -185,7 +189,7 @@ var ConnectionProxy = /** @class */ (function () {
             return new Promise(function (resolve, reject) {
                 return _this.prepareConnection().changeUser({
                     database: dbName,
-                }, function (err) { return (err ? reject(err) : resolve()); });
+                }, function (err) { return (err ? reject(err) : resolve(undefined)); });
             });
         };
         this.tryToInitializeSchema = function (initial) { return __awaiter(_this, void 0, void 0, function () {
@@ -207,19 +211,19 @@ var ConnectionProxy = /** @class */ (function () {
                     case 1:
                         _h.trys.push([1, 10, , 11]);
                         if (!database) return [3 /*break*/, 3];
-                        logger.debug("Prepare a database[" + this.dbName + "]");
+                        logger.debug("Prepare a database[".concat(this.dbName, "]"));
                         logger.stupid(this.dbName, database);
                         return [4 /*yield*/, this.query(database)];
                     case 2:
                         result = _h.sent();
-                        logger.debug("Database[" + this.dbName + "] is initialized: " + JSON.stringify(result));
+                        logger.debug("Database[".concat(this.dbName, "] is initialized: ").concat(JSON.stringify(result)));
                         _h.label = 3;
                     case 3:
                         if (!this.dbName) return [3 /*break*/, 5];
                         return [4 /*yield*/, this.changeDatabase(this.dbName)];
                     case 4:
                         _h.sent();
-                        logger.verbose("Database[" + this.dbName + "] is connected.");
+                        logger.verbose("Database[".concat(this.dbName, "] is connected."));
                         _h.label = 5;
                     case 5:
                         _i = 0, _f = Object.entries(tables);
@@ -227,12 +231,12 @@ var ConnectionProxy = /** @class */ (function () {
                     case 6:
                         if (!(_i < _f.length)) return [3 /*break*/, 9];
                         _g = _f[_i], name_1 = _g[0], query = _g[1];
-                        logger.debug("Prepare a table[" + name_1 + "]");
+                        logger.debug("Prepare a table[".concat(name_1, "]"));
                         logger.stupid(name_1, query);
                         return [4 /*yield*/, this.query(query)];
                     case 7:
                         result = _h.sent();
-                        logger.debug("Table[" + name_1 + "] is initialized: " + JSON.stringify(result));
+                        logger.debug("Table[".concat(name_1, "] is initialized: ").concat(JSON.stringify(result)));
                         _h.label = 8;
                     case 8:
                         _i++;

package/dist/middleware/trace.d.ts

@@ -1,6 +1,6 @@
-import * as AWS from 'aws-sdk';
 import { SimpleAWSConfigLoadParam } from '../aws';
 import { HandlerAuxBase, HandlerContext, HandlerPluginBase } from './base';
+import { SQS } from '@aws-sdk/client-sqs';
 interface ITracerLog {
     uuid: string;
     timestamp: number;
@@ -43,7 +43,7 @@ export declare class Tracer {
     private queueName;
     private sqs;
     private buffer;
-    constructor(queueName: string, sqs: AWS.SQS);
+    constructor(queueName: string, sqs: SQS);
     push: (log: TracerLog) => number;
     flush: () => Promise<void>;
 }

package/dist/middleware/trace.js

@@ -3,20 +3,23 @@ var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
             ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
         return extendStatics(d, b);
     };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
 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());
     });
 };
@@ -26,7 +29,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]) {
@@ -48,13 +51,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var AWS = require("aws-sdk"); // tslint:disable-line
+exports.TracerPlugin = exports.TracerWrapper = exports.Tracer = exports.TracerLog = void 0;
 var uuid_1 = require("uuid");
 var aws_1 = require("../aws");
 var utils_1 = require("../utils");
 var ts_enum_util_1 = require("ts-enum-util");
 var base_1 = require("./base");
-var logger = utils_1.getLogger(__filename);
+var client_sqs_1 = require("@aws-sdk/client-sqs");
+var logger = (0, utils_1.getLogger)(__filename);
 var TracerLog = /** @class */ (function () {
     function TracerLog(route, key, system, action, attribute, body, error, client, version) {
         this.route = route;
@@ -66,7 +70,7 @@ var TracerLog = /** @class */ (function () {
         this.error = error;
         this.client = client;
         this.version = version;
-        this.uuid = uuid_1.v4();
+        this.uuid = (0, uuid_1.v4)();
         this.timestamp = Date.now();
     }
     return TracerLog;
@@ -87,16 +91,14 @@ var Tracer = /** @class */ (function () {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 7, , 8]);
-                        return [4 /*yield*/, this.sqs
-                                .getQueueUrl({
+                        return [4 /*yield*/, this.sqs.getQueueUrl({
                                 QueueName: this.queueName,
-                            })
-                                .promise()];
+                            })];
                     case 2:
                         urlResult = _a.sent();
                         logger.stupid("urlResult", urlResult);
                         if (!urlResult.QueueUrl) {
-                            throw new Error("No queue url with name[" + this.queueName + "]");
+                            throw new Error("No queue url with name[".concat(this.queueName, "]"));
                         }
                         eventQueueUrl = urlResult.QueueUrl;
                         chunkSize = 10;
@@ -106,15 +108,13 @@ var Tracer = /** @class */ (function () {
                         if (!(begin < this.buffer.length)) return [3 /*break*/, 6];
                         end = Math.min(this.buffer.length, begin + chunkSize);
                         subset = this.buffer.slice(begin, end);
-                        return [4 /*yield*/, this.sqs
-                                .sendMessageBatch({
+                        return [4 /*yield*/, this.sqs.sendMessageBatch({
                                 QueueUrl: eventQueueUrl,
                                 Entries: subset.map(function (each) { return ({
-                                    Id: each.key + "_" + each.uuid,
+                                    Id: "".concat(each.key, "_").concat(each.uuid),
                                     MessageBody: JSON.stringify(each),
                                 }); }),
-                            })
-                                .promise()];
+                            })];
                     case 4:
                         sendBatchResult = _a.sent();
                         logger.stupid("sendBatchResult", sendBatchResult);
@@ -127,7 +127,7 @@ var Tracer = /** @class */ (function () {
                         return [3 /*break*/, 8];
                     case 7:
                         error_1 = _a.sent();
-                        logger.warn("Error in eventSource: " + error_1);
+                        logger.warn("Error in eventSource: ".concat(error_1));
                         return [3 /*break*/, 8];
                     case 8: return [2 /*return*/];
                 }
@@ -172,7 +172,7 @@ var TracerPlugin = /** @class */ (function (_super) {
                 switch (_b.label) {
                     case 0:
                         if (!this.options.awsConfig) return [3 /*break*/, 2];
-                        return [4 /*yield*/, aws_1.loadAWSConfig(this.options.awsConfig)];
+                        return [4 /*yield*/, (0, aws_1.loadAWSConfig)(this.options.awsConfig)];
                     case 1:
                         _a = _b.sent();
                         return [3 /*break*/, 3];
@@ -183,11 +183,11 @@ var TracerPlugin = /** @class */ (function (_super) {
                         awsConfig = _a;
                         sqs = (function () {
                             if (!awsConfig) {
-                                return new AWS.SQS({
+                                return new client_sqs_1.SQS({
                                     region: _this.options.region,
                                 });
                             }
-                            ts_enum_util_1.$enum(aws_1.AWSComponent).forEach(function (eachComponent) {
+                            (0, ts_enum_util_1.$enum)(aws_1.AWSComponent).forEach(function (eachComponent) {
                                 var config = awsConfig.get(eachComponent);
                                 if (config) {
                                     config.region = _this.options.region;
@@ -235,7 +235,7 @@ var TracerPlugin = /** @class */ (function (_super) {
                 .tracer(key, action)
                 .push('error', typeof request.lastError === 'string'
                 ? request.lastError
-                : utils_1.stringifyError(request.lastError), true);
+                : (0, utils_1.stringifyError)(request.lastError), true);
         };
         _this.options = options;
         _this.last = {

package/dist/utils/index.js

@@ -1,7 +1,18 @@
 "use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./logger"));
-__export(require("./misc"));
+__exportStar(require("./logger"), exports);
+__exportStar(require("./misc"), exports);

package/dist/utils/logger.d.ts

@@ -8,7 +8,7 @@ export declare enum LogLevel {
     Stupid = "stupid"
 }
 export declare const currentLogLevel: LogLevel;
-declare type LogMessage = string | Error;
+type LogMessage = string | Error;
 export declare class Logger {
     private name;
     private severity;
@@ -20,7 +20,7 @@ export declare class Logger {
     debug: (message: LogMessage) => LogMessage;
     verbose: (message: LogMessage) => LogMessage;
     silly: (message: LogMessage) => LogMessage;
-    stupid: <T>(message: string, object: T, replacer?: ((key: string, value: T) => T) | undefined) => T;
+    stupid: <T>(message: string, object: T, replacer?: (key: string, value: T) => T) => T;
 }
-export declare const getLogger: (fileName: string, level?: LogLevel | undefined) => Logger;
+export declare const getLogger: (fileName: string, level?: LogLevel) => Logger;
 export {};

package/dist/utils/logger.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLogger = exports.Logger = exports.currentLogLevel = exports.LogLevel = void 0;
 var path_1 = require("path");
 var simple_staging_1 = require("simple-staging");
 var ts_enum_util_1 = require("ts-enum-util");
@@ -13,7 +14,7 @@ var LogLevel;
     LogLevel["Verbose"] = "verbose";
     LogLevel["Silly"] = "silly";
     LogLevel["Stupid"] = "stupid";
-})(LogLevel = exports.LogLevel || (exports.LogLevel = {}));
+})(LogLevel || (exports.LogLevel = LogLevel = {}));
 var severity = function (level) {
     switch (level) {
         case LogLevel.Error:
@@ -34,16 +35,16 @@ var severity = function (level) {
             return 1000;
     }
 };
-exports.currentLogLevel = ts_enum_util_1.$enum(LogLevel).asValueOrDefault(process.env.LOG_LEVEL, simple_staging_1.envDefault.level !== simple_staging_1.StagingLevel.Release
+exports.currentLogLevel = (0, ts_enum_util_1.$enum)(LogLevel).asValueOrDefault(process.env.LOG_LEVEL, simple_staging_1.envDefault.level !== simple_staging_1.StagingLevel.Release
     ? LogLevel.Verbose
     : LogLevel.Debug);
 var Logger = /** @class */ (function () {
     function Logger(name, level) {
-        var _this = this;
         if (level === void 0) { level = exports.currentLogLevel; }
+        var _this = this;
         this.log = function (level, message) {
             if (_this.severity >= severity(level)) {
-                console.log("[" + new Date().toISOString() + "][" + level.toUpperCase() + "][" + _this.name + "] " + (message instanceof Error ? misc_1.stringifyError(message) : message));
+                console.log("[".concat(new Date().toISOString(), "][").concat(level.toUpperCase(), "][").concat(_this.name, "] ").concat(message instanceof Error ? (0, misc_1.stringifyError)(message) : message));
             }
             return message;
         };
@@ -54,7 +55,7 @@ var Logger = /** @class */ (function () {
         this.verbose = function (message) { return _this.log(LogLevel.Verbose, message); };
         this.silly = function (message) { return _this.log(LogLevel.Silly, message); };
         this.stupid = function (message, object, replacer) {
-            _this.log(LogLevel.Stupid, message + ": " + JSON.stringify(object, replacer));
+            _this.log(LogLevel.Stupid, "".concat(message, ": ").concat(JSON.stringify(object, replacer)));
             return object;
         };
         this.name = name;
@@ -64,10 +65,11 @@ var Logger = /** @class */ (function () {
 }());
 exports.Logger = Logger;
 var loggers = {};
-exports.getLogger = function (fileName, level) {
-    var name = path_1.basename(fileName);
+var getLogger = function (fileName, level) {
+    var name = (0, path_1.basename)(fileName);
     if (loggers[name] === undefined) {
         loggers[name] = new Logger(name, level);
     }
     return loggers[name];
 };
+exports.getLogger = getLogger;

package/dist/utils/misc.d.ts

@@ -1 +1 @@
-export declare const stringifyError: (err: any, replacer?: ((key: string, value: any) => any) | undefined, space?: string | number | undefined) => string;
+export declare const stringifyError: (err: any, replacer?: (key: string, value: any) => any, space?: string | number) => string;

package/dist/utils/misc.js

@@ -1,9 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringifyError = function (err, replacer, space) {
+exports.stringifyError = void 0;
+var AwsError_1 = require("../internal/AwsError");
+var stringifyError = function (err, replacer, space) {
+    var error = isAWSv3Error(err) ? new AwsError_1.AwsError(err) : err;
     var plainObject = {};
-    Object.getOwnPropertyNames(err).forEach(function (key) {
-        plainObject[key] = err[key];
+    Object.getOwnPropertyNames(error).forEach(function (key) {
+        plainObject[key] = error[key];
     });
     return JSON.stringify(plainObject, replacer, space);
 };
+exports.stringifyError = stringifyError;
+var isAWSv3Error = function (error) {
+    return error instanceof Error && 'name' in error && '$metadata' in error;
+};

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.60",
+  "version": "0.0.62",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "VoyagerX",
@@ -10,6 +10,9 @@
     "type": "git",
     "url": "git+ssh://git@github.com/v6x/serverless-simple-middleware.git"
   },
+  "engines": {
+    "node": ">=18"
+  },
   "keywords": [
     "serverless"
   ],
@@ -23,9 +26,17 @@
     "build:watch": "tsc --project tsconfig.json --watch",
     "test": "jest --config jest.config.js",
     "test:watch": "jest --config jest.config.js --watch",
-    "deploy": "yarn build && yarn publish"
+    "deploy": "yarn build && yarn publish",
+    "clean": "rm -rf dist && rm -rf node_modules && yarn install"
   },
   "dependencies": {
+    "@aws-sdk/client-dynamodb": "^3.828.0",
+    "@aws-sdk/client-s3": "^3.828.0",
+    "@aws-sdk/client-sqs": "^3.828.0",
+    "@aws-sdk/cloudfront-signer": "^3.821.0",
+    "@aws-sdk/lib-dynamodb": "^3.828.0",
+    "@aws-sdk/lib-storage": "^3.828.0",
+    "@aws-sdk/s3-request-presigner": "^3.828.0",
     "@types/aws-lambda": "8",
     "@types/mysql": "^2.15.5",
     "cross-fetch": "^2.2.2",
@@ -34,28 +45,25 @@
     "p-limit": "^2.0.0",
     "simple-staging": "^0.0.12",
     "ts-enum-util": "^3.1.0",
-    "typescript": "^3.0.1",
     "uuid": "^3.3.2"
   },
-  "optionalDependencies": {
-    "aws-sdk": "2.1664.0"
-  },
   "devDependencies": {
     "@types/jest": "^23.3.1",
-    "@types/node": "11",
+    "@types/node": "18",
     "@types/uuid": "^3.4.4",
     "babel-core": "6.26.0",
     "babel-jest": "^23.4.2",
     "cross-env": "^5.2.0",
     "jest": "^23.4.2",
-    "prettier": "^1.11.1",
+    "prettier": "3.3.3",
     "ts-jest": "^23.1.3",
     "tslint": "^5.11.0",
-    "tslint-config-prettier": "^1.14.0"
+    "tslint-config-prettier": "^1.14.0",
+    "typescript": "5.5.3"
   },
   "prettier": {
     "printWidth": 80,
     "singleQuote": true,
     "trailingComma": "all"
   }
-}
+}

package/src/aws/config.ts

@@ -33,7 +33,7 @@ export const loadAWSConfig = (
   if (typeof newConfigsOrUrl === 'string') {
     if (/^http.*json$/.test(newConfigsOrUrl)) {
       return fetch(newConfigsOrUrl)
-        .then(r => r.json())
+        .then((r) => r.json())
         .then(loadAWSConfig);
     } else if (/json$/.test(newConfigsOrUrl)) {
       return loadAWSConfig(

package/src/aws/define.ts

@@ -8,22 +8,3 @@ 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;
-}