serverless-simple-middleware 0.0.61 → 0.0.63

package/.idea/workspace.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="d3e8841d-4c1b-4775-9eaf-7a7f45125ca6" name="Changes" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="GitHubPullRequestSearchHistory">{
+  &quot;lastFilter&quot;: {
+    &quot;state&quot;: &quot;OPEN&quot;,
+    &quot;assignee&quot;: &quot;mintae-v6x&quot;
+  }
+}</component>
+  <component name="GithubPullRequestsUISettings">{
+  &quot;selectedUrlAndAccountId&quot;: {
+    &quot;url&quot;: &quot;git@github.com:v6x/serverless-simple-middleware.git&quot;,
+    &quot;accountId&quot;: &quot;651af4d7-dc5b-4c87-ad25-95bb095bbdab&quot;
+  }
+}</component>
+  <component name="ProjectColorInfo">{
+  &quot;customColor&quot;: &quot;&quot;,
+  &quot;associatedIndex&quot;: 0
+}</component>
+  <component name="ProjectId" id="2wLO998bpCyv1XeFcGkak71tJ00" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "yarn",
+    "ts.external.directory.path": "C:\\Users\\MintaeHwang\\Projects\\serverless-simple-middleware\\node_modules\\typescript\\lib",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-WS-241.18034.50" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="d3e8841d-4c1b-4775-9eaf-7a7f45125ca6" name="Changes" comment="" />
+      <created>1745817233391</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1745817233391</updated>
+      <workItem from="1745817234628" duration="4410000" />
+      <workItem from="1746006740077" duration="129000" />
+      <workItem from="1749703698039" duration="5259000" />
+      <workItem from="1749721908491" duration="1629000" />
+      <workItem from="1750211888403" duration="1739000" />
+      <workItem from="1750643159276" duration="1164000" />
+      <workItem from="1751023632877" duration="2292000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="javascript">
+          <url>file://$PROJECT_DIR$/src/middleware/trace.ts</url>
+          <line>118</line>
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
+</project>

package/.prettierignore

@@ -1,3 +1,3 @@
-tslint.json
-tsconfig.json
+tslint.json
+tsconfig.json
 package.json

package/README.md

@@ -1,3 +1,3 @@
-# Serverless simple middleware
-
-This is just simple middleware for me to translate the interface of lambda's handler to use `request => response`.
+# Serverless simple middleware
+
+This is just simple middleware for me to translate the interface of lambda's handler to use `request => response`.

package/dist/aws/simple.d.ts

@@ -2,7 +2,7 @@ import { CloudfrontSignedCookiesOutput } from '@aws-sdk/cloudfront-signer';
 import { SimpleAWSConfig } from './config';
 import { SQSMessageBody } from './define';
 import { DynamoDB } from '@aws-sdk/client-dynamodb';
-import { S3 } from '@aws-sdk/client-s3';
+import { S3, Tag } from '@aws-sdk/client-s3';
 import { SQS } from '@aws-sdk/client-sqs';
 import { DynamoDBDocument } from '@aws-sdk/lib-dynamodb';
 import { PresignerOptions } from '../internal/s3';
@@ -13,6 +13,8 @@ export declare class SimpleAWS {
     private lazySqs;
     private lazyDynamodb;
     private lazyDynamodbAdmin;
+    private static readonly stageTag;
+    private static readonly stringifiedStageTag;
     constructor(config?: SimpleAWSConfig);
     get s3(): S3;
     get sqs(): SQS;
@@ -28,8 +30,8 @@ export declare class SimpleAWS {
     download: (bucket: string, key: string, localPath: string) => Promise<string>;
     readFile: (bucket: string, key: string) => Promise<string>;
     readFileBuffer: (bucket: string, key: string) => Promise<Buffer>;
-    upload: (bucket: string, localPath: string, key: string) => Promise<string>;
-    uploadFromBuffer: (bucket: string, key: string, buffer: Buffer) => Promise<string>;
+    upload: (bucket: string, localPath: string, key: string, tags?: Tag[]) => Promise<string>;
+    uploadFromBuffer: (bucket: string, key: string, buffer: Buffer, tags?: Tag[]) => Promise<string>;
     writeFile: (bucket: string, key: string, content: string) => Promise<void>;
     getSignedUrl(options: PresignerOptions): Promise<string>;
     getSignedCookie: (keyPairId: string, privateKey: string, url: string, expires: number) => CloudfrontSignedCookiesOutput;

package/dist/aws/simple.js

@@ -58,6 +58,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
@@ -366,7 +367,7 @@ var SimpleAWS = /** @class */ (function () {
                 }
             });
         }); };
-        this.upload = function (bucket, localPath, key) { return __awaiter(_this, void 0, void 0, function () {
+        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) {
@@ -381,6 +382,7 @@ var SimpleAWS = /** @class */ (function () {
                             },
                             partSize: 5 * 1024 * 1024, // 5MB
                             queueSize: 4,
+                            tags: __spreadArray([SimpleAWS.stageTag], (tags || []), true),
                         });
                         return [4 /*yield*/, upload.done()];
                     case 1:
@@ -389,7 +391,7 @@ var SimpleAWS = /** @class */ (function () {
                 }
             });
         }); };
-        this.uploadFromBuffer = function (bucket, key, buffer) { return __awaiter(_this, void 0, void 0, function () {
+        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) {
@@ -404,6 +406,7 @@ var SimpleAWS = /** @class */ (function () {
                             },
                             partSize: 5 * 1024 * 1024, // 5MB
                             queueSize: 4,
+                            tags: __spreadArray([SimpleAWS.stageTag], (tags || []), true),
                         });
                         return [4 /*yield*/, upload.done()];
                     case 1:
@@ -696,12 +699,16 @@ var SimpleAWS = /** @class */ (function () {
     });
     SimpleAWS.prototype.getSignedUrl = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, expiresIn, unhoistableHeaders, cmd, cmd, cmd, cmd, cmd, cmd, cmd, cmd, cmd, cmd, cmd, cmd;
-            return __generator(this, function (_b) {
+            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': {
-                        cmd = new client_s3_1.PutObjectCommand(__assign({ Bucket: options.bucket, Key: options.key }, options.params));
+                        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,
@@ -757,7 +764,10 @@ var SimpleAWS = /** @class */ (function () {
                             })];
                     }
                     case 'createMultipartUpload': {
-                        cmd = new client_s3_1.CreateMultipartUploadCommand(__assign({ Bucket: options.bucket, Key: options.key }, options.params));
+                        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,
@@ -789,6 +799,11 @@ var SimpleAWS = /** @class */ (function () {
             });
         });
     };
+    SimpleAWS.stageTag = {
+        Key: 'STAGE',
+        Value: simple_staging_1.envDefault.level,
+    };
+    SimpleAWS.stringifiedStageTag = "STAGE=".concat(simple_staging_1.envDefault.level);
     return SimpleAWS;
 }());
 exports.SimpleAWS = SimpleAWS;

package/dist/middleware/base.d.ts

@@ -28,7 +28,7 @@ export declare class HandlerResponse {
     constructor(callback: any);
     ok(body?: {}, code?: number): any;
     fail(body?: {}, code?: number): any;
-    addCookie(key: string, value: string, domain?: string, specifyCrossOrigin?: true, path?: string): void;
+    addCookie(key: string, value: string, domain?: string, sameSite?: 'None' | 'Lax' | 'Strict', secure?: boolean, path?: string, httpOnly?: boolean, maxAgeSeconds?: number): void;
     setCrossOrigin: (origin?: string) => void;
     addHeader: (header: string, value: string) => void;
 }

package/dist/middleware/base.js

@@ -111,13 +111,23 @@ var HandlerResponse = /** @class */ (function () {
         this.completed = true;
         return result;
     };
-    HandlerResponse.prototype.addCookie = function (key, value, domain, specifyCrossOrigin, path) {
+    HandlerResponse.prototype.addCookie = function (key, value, domain, sameSite, secure, path, httpOnly, maxAgeSeconds) {
         var keyValueStr = "".concat(key, "=").concat(value);
         var domainStr = domain ? "Domain=".concat(domain) : '';
-        var sameSiteStr = specifyCrossOrigin ? 'SameSite=None' : '';
-        var secureStr = specifyCrossOrigin ? 'Secure' : '';
+        var sameSiteStr = sameSite ? "SameSite=".concat(sameSite) : '';
+        var secureStr = secure ? 'Secure' : '';
         var pathStr = path !== undefined ? "Path=".concat(path) : '';
-        var cookieStr = [keyValueStr, domainStr, sameSiteStr, secureStr, pathStr]
+        var httpOnlyStr = httpOnly ? 'HttpOnly' : '';
+        var maxAgeStr = maxAgeSeconds || maxAgeSeconds === 0 ? "Max-Age=".concat(maxAgeSeconds) : '';
+        var cookieStr = [
+            keyValueStr,
+            domainStr,
+            sameSiteStr,
+            secureStr,
+            pathStr,
+            httpOnlyStr,
+            maxAgeStr,
+        ]
             .filter(function (x) { return x; })
             .join('; ');
         this.cookies.push(cookieStr);

package/jest.config.js

@@ -1,7 +1,7 @@
-module.exports = {
-  transform: {
-    '^.+\\.tsx?$': 'ts-jest',
-  },
-  testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$',
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
-};
+module.exports = {
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest',
+  },
+  testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$',
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+};

package/package.json

@@ -1,69 +1,69 @@
-{
-  "name": "serverless-simple-middleware",
-  "description": "Simple middleware to translate the interface of lambda's handler to request => response",
-  "version": "0.0.61",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "author": "VoyagerX",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/v6x/serverless-simple-middleware.git"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "keywords": [
-    "serverless"
-  ],
-  "bugs": {
-    "url": "https://github.com/v6x/serverless-simple-middleware/issues"
-  },
-  "homepage": "https://github.com/v6x/serverless-simple-middleware#readme",
-  "scripts": {
-    "lint": "tslint --project tsconfig.json",
-    "build": "tsc --project tsconfig.json",
-    "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",
-    "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",
-    "mysql": "^2.16.0",
-    "nanoid": "4.0.2",
-    "p-limit": "^2.0.0",
-    "simple-staging": "^0.0.12",
-    "ts-enum-util": "^3.1.0",
-    "uuid": "^3.3.2"
-  },
-  "devDependencies": {
-    "@types/jest": "^23.3.1",
-    "@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": "3.3.3",
-    "ts-jest": "^23.1.3",
-    "tslint": "^5.11.0",
-    "tslint-config-prettier": "^1.14.0",
-    "typescript": "5.5.3"
-  },
-  "prettier": {
-    "printWidth": 80,
-    "singleQuote": true,
-    "trailingComma": "all"
-  }
-}
+{
+  "name": "serverless-simple-middleware",
+  "description": "Simple middleware to translate the interface of lambda's handler to request => response",
+  "version": "0.0.63",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "author": "VoyagerX",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/v6x/serverless-simple-middleware.git"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "keywords": [
+    "serverless"
+  ],
+  "bugs": {
+    "url": "https://github.com/v6x/serverless-simple-middleware/issues"
+  },
+  "homepage": "https://github.com/v6x/serverless-simple-middleware#readme",
+  "scripts": {
+    "lint": "tslint --project tsconfig.json",
+    "build": "tsc --project tsconfig.json",
+    "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",
+    "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",
+    "mysql": "^2.16.0",
+    "nanoid": "4.0.2",
+    "p-limit": "^2.0.0",
+    "simple-staging": "^0.0.12",
+    "ts-enum-util": "^3.1.0",
+    "uuid": "^3.3.2"
+  },
+  "devDependencies": {
+    "@types/jest": "^23.3.1",
+    "@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": "3.3.3",
+    "ts-jest": "^23.1.3",
+    "tslint": "^5.11.0",
+    "tslint-config-prettier": "^1.14.0",
+    "typescript": "5.5.3"
+  },
+  "prettier": {
+    "printWidth": 80,
+    "singleQuote": true,
+    "trailingComma": "all"
+  }
+}

package/src/aws/config.ts

@@ -1,46 +1,46 @@
-import fetch from 'cross-fetch';
-import * as fs from 'fs';
-
-import { AWSComponent } from './define';
-
-export interface AWSConfig {
-  [key: string]: string | boolean | number | undefined;
-}
-
-export interface AWSConfigs {
-  [service: string]: AWSConfig;
-}
-
-export type AWSConfigResolver = (service: string) => AWSConfig;
-
-export type SimpleAWSConfigLoadParam = AWSConfigs | string;
-
-export class SimpleAWSConfig {
-  private configs: AWSConfigs | undefined;
-
-  public constructor(configs?: AWSConfigs) {
-    this.configs = configs;
-  }
-
-  public get = (service: AWSComponent): AWSConfig | undefined => {
-    return this.configs ? this.configs[service] : undefined;
-  };
-}
-
-export const loadAWSConfig = (
-  newConfigsOrUrl: SimpleAWSConfigLoadParam,
-): Promise<SimpleAWSConfig> => {
-  if (typeof newConfigsOrUrl === 'string') {
-    if (/^http.*json$/.test(newConfigsOrUrl)) {
-      return fetch(newConfigsOrUrl)
-        .then((r) => r.json())
-        .then(loadAWSConfig);
-    } else if (/json$/.test(newConfigsOrUrl)) {
-      return loadAWSConfig(
-        JSON.parse(fs.readFileSync(newConfigsOrUrl, 'utf-8')),
-      );
-    }
-    return loadAWSConfig(JSON.parse(newConfigsOrUrl));
-  }
-  return Promise.resolve(new SimpleAWSConfig(newConfigsOrUrl));
-};
+import fetch from 'cross-fetch';
+import * as fs from 'fs';
+
+import { AWSComponent } from './define';
+
+export interface AWSConfig {
+  [key: string]: string | boolean | number | undefined;
+}
+
+export interface AWSConfigs {
+  [service: string]: AWSConfig;
+}
+
+export type AWSConfigResolver = (service: string) => AWSConfig;
+
+export type SimpleAWSConfigLoadParam = AWSConfigs | string;
+
+export class SimpleAWSConfig {
+  private configs: AWSConfigs | undefined;
+
+  public constructor(configs?: AWSConfigs) {
+    this.configs = configs;
+  }
+
+  public get = (service: AWSComponent): AWSConfig | undefined => {
+    return this.configs ? this.configs[service] : undefined;
+  };
+}
+
+export const loadAWSConfig = (
+  newConfigsOrUrl: SimpleAWSConfigLoadParam,
+): Promise<SimpleAWSConfig> => {
+  if (typeof newConfigsOrUrl === 'string') {
+    if (/^http.*json$/.test(newConfigsOrUrl)) {
+      return fetch(newConfigsOrUrl)
+        .then((r) => r.json())
+        .then(loadAWSConfig);
+    } else if (/json$/.test(newConfigsOrUrl)) {
+      return loadAWSConfig(
+        JSON.parse(fs.readFileSync(newConfigsOrUrl, 'utf-8')),
+      );
+    }
+    return loadAWSConfig(JSON.parse(newConfigsOrUrl));
+  }
+  return Promise.resolve(new SimpleAWSConfig(newConfigsOrUrl));
+};

package/src/aws/define.ts

@@ -1,10 +1,10 @@
-export enum AWSComponent {
-  s3 = 's3',
-  sqs = 'sqs',
-  dynamodb = 'dynamodb',
-}
-
-export interface SQSMessageBody<T> {
-  handle: string;
-  body?: T;
-}
+export enum AWSComponent {
+  s3 = 's3',
+  sqs = 'sqs',
+  dynamodb = 'dynamodb',
+}
+
+export interface SQSMessageBody<T> {
+  handle: string;
+  body?: T;
+}

package/src/aws/index.ts

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