serverless-simple-middleware 0.0.59 → 0.0.60

package/src/middleware/base.ts

@@ -1,5 +1,5 @@
 import * as awsTypes from 'aws-lambda'; // tslint:disable-line:no-implicit-dependencies
-import { getLogger } from '../utils/index.js';
+import { getLogger } from '../utils/logger';
 
 const logger = getLogger(__filename);
 
@@ -8,7 +8,7 @@ export interface RequestAuxBase {
 }
 
 export class HandlerRequest {
-  public event: awsTypes.APIGatewayProxyEvent;
+  public event: awsTypes.APIGatewayEvent;
   public context: awsTypes.APIGatewayEventRequestContext;
   public lastError: Error | string | undefined;
 
@@ -30,11 +30,11 @@ export class HandlerRequest {
     return this.lazyBody || {};
   }
 
-  get path(): { [key: string]: string | undefined } {
+  get path(): { [key: string]: string } {
     return this.event.pathParameters || {};
   }
 
-  get query(): { [key: string]: string | undefined } {
+  get query(): { [key: string]: string } {
     return this.event.queryStringParameters || {};
   }
 
@@ -50,30 +50,33 @@ export class HandlerRequest {
   }
 }
 
+const CORS_HEADERS = {
+  'Access-Control-Allow-Origin': '*',
+  'Access-Control-Allow-Headers': 'X-Version',
+  'Access-Control-Allow-Credentials': true,
+};
+
 export class HandlerResponse {
   public callback: any;
   public completed: boolean;
   public result: any | Promise<any> | undefined;
 
-  private corsHeaders: { [header: string]: any };
   private cookies: string[];
   private crossOrigin?: string;
+  private customHeaders: { [header: string]: any };
 
   constructor(callback: any) {
     this.callback = callback;
     this.completed = false;
-    this.corsHeaders = {
-      'Access-Control-Allow-Origin': '*',
-      'Access-Control-Allow-Headers': 'X-Version',
-      'Access-Control-Allow-Credentials': true,
-    };
     this.cookies = [];
+    this.customHeaders = {};
   }
 
   public ok(body = {}, code = 200) {
     logger.stupid(`ok`, body);
     const headers = {
-      ...this.corsHeaders,
+      ...CORS_HEADERS,
+      ...this.customHeaders,
     };
     if (this.crossOrigin) {
       headers['Access-Control-Allow-Origin'] = this.crossOrigin;
@@ -96,7 +99,7 @@ export class HandlerResponse {
     logger.stupid(`fail`, body);
     const result = this.callback(null, {
       statusCode: code,
-      headers: this.corsHeaders,
+      headers: CORS_HEADERS,
       body: JSON.stringify(body),
     });
     this.completed = true;
@@ -124,6 +127,10 @@ export class HandlerResponse {
   public setCrossOrigin = (origin?: string) => {
     this.crossOrigin = origin;
   };
+
+  public addHeader = (header: string, value: string) => {
+    this.customHeaders[header] = value;
+  };
 }
 
 export interface HandlerAuxBase {

package/src/middleware/build.ts

@@ -1,13 +1,13 @@
-import { getLogger } from '../utils/index.js';
+import { getLogger } from '../utils/logger';
 
-import { stringifyError } from '../utils/index.js';
+import { stringifyError } from '../utils';
 import {
   Handler,
   HandlerAuxBase,
   HandlerPluginBase,
   HandlerRequest,
   HandlerResponse,
-} from './base.js';
+} from './base';
 
 const logger = getLogger(__filename);
 

package/src/middleware/index.ts

@@ -1,9 +1,9 @@
-import build from './build.js';
+import build from './build';
 
-import aws from './aws.js';
-import logger from './logger.js';
-import mysql from './mysql.js';
-import trace from './trace.js';
+import aws from './aws';
+import logger from './logger';
+import mysql from './mysql';
+import trace from './trace';
 
 export const middleware = {
   build,
@@ -13,8 +13,8 @@ export const middleware = {
   mysql,
 };
 
-export * from './base.js';
-export * from './aws.js';
-export * from './trace.js';
-export * from './logger.js';
-export * from './mysql.js';
+export * from './base';
+export * from './aws';
+export * from './trace';
+export * from './logger';
+export * from './mysql';

package/src/middleware/logger.ts

@@ -1,5 +1,5 @@
-import { getLogger, Logger, LogLevel } from '../utils/index.js';
-import { HandlerAuxBase, HandlerPluginBase } from './base.js';
+import { getLogger, Logger, LogLevel } from '../utils';
+import { HandlerAuxBase, HandlerPluginBase } from './base';
 
 export interface LoggerPluginOptions {
   name: string;

package/src/middleware/mysql.ts

@@ -1,8 +1,7 @@
-import { Kysely, MysqlDialect, MysqlPool } from 'kysely';
 import * as mysql from 'mysql';
 
-import { getLogger } from '../utils/index.js';
-import { HandlerAuxBase, HandlerPluginBase } from './base.js';
+import { getLogger } from '../utils';
+import { HandlerAuxBase, HandlerPluginBase } from './base';
 
 const logger = getLogger(__filename);
 
@@ -128,7 +127,7 @@ export class ConnectionProxy {
   };
 
   private changeDatabase = (dbName: string) =>
-    new Promise<void>((resolve, reject) =>
+    new Promise((resolve, reject) =>
       this.prepareConnection().changeUser(
         {
           database: dbName,
@@ -183,95 +182,29 @@ export class ConnectionProxy {
   };
 }
 
-interface LazyMysqlPoolConnection extends mysql.Connection {
-  release: () => void;
-}
-
-class LazyConnectionPool implements MysqlPool {
-  private connection: LazyMysqlPoolConnection | null = null;
-
-  constructor(private config: mysql.ConnectionConfig) {}
-
-  public getConnection = (
-    callback: (error: unknown, connection: LazyMysqlPoolConnection) => void,
-  ): void => {
-    if (this.connection) {
-      callback(null, this.connection);
-      return;
-    }
-    const conn = mysql.createConnection(this.config);
-    conn.connect((err: mysql.MysqlError) => {
-      if (err) {
-        callback(err, {} as LazyMysqlPoolConnection);
-        return;
-      }
-      this.connection = this.addDummyRelease(conn);
-      callback(null, this.connection);
-    });
-  };
-
-  public end = (callback: (error: unknown) => void): void => {
-    if (this.connection) {
-      this.connection.end((err: mysql.MysqlError) => {
-        this.connection = null;
-        callback(err);
-      });
-    } else {
-      callback(null);
-    }
-  };
-
-  private addDummyRelease = (
-    connection: mysql.Connection,
-  ): LazyMysqlPoolConnection =>
-    new Proxy(connection, {
-      get(target, prop, receiver) {
-        return prop === 'release'
-          ? () => {}
-          : Reflect.get(target, prop, receiver);
-      },
-    }) as LazyMysqlPoolConnection;
-}
-
-export type SQLClient<T = unknown> = Kysely<T>;
-
-export interface MySQLPluginAux<T = unknown> extends HandlerAuxBase {
+export interface MySQLPluginAux extends HandlerAuxBase {
   db: ConnectionProxy;
-  database: SQLClient<T>;
 }
 
-export class MySQLPlugin<T = unknown> extends HandlerPluginBase<
-  MySQLPluginAux<T>
-> {
+export class MySQLPlugin extends HandlerPluginBase<MySQLPluginAux> {
   private proxy: ConnectionProxy;
-  private sqlClient: SQLClient<T>;
 
   constructor(options: MySQLPluginOptions) {
     super();
     this.proxy = new ConnectionProxy(options);
-    this.sqlClient = new Kysely<T>({
-      dialect: new MysqlDialect({
-        pool: new LazyConnectionPool(options.config),
-      }),
-    });
   }
 
   public create = async () => {
     await this.proxy.onPluginCreated();
-    return { db: this.proxy, database: this.sqlClient };
+    return { db: this.proxy };
   };
 
   public end = () => {
     if (this.proxy) {
       this.proxy.clearConnection();
     }
-
-    if (this.sqlClient) {
-      this.sqlClient.destroy();
-    }
   };
 }
 
-const build = <T = unknown>(options: MySQLPluginOptions) =>
-  new MySQLPlugin<T>(options);
+const build = (options: MySQLPluginOptions) => new MySQLPlugin(options);
 export default build;

package/src/middleware/trace.ts

@@ -5,11 +5,11 @@ import {
   loadAWSConfig,
   SimpleAWS,
   SimpleAWSConfigLoadParam,
-} from '../aws/index.js';
-import { getLogger } from '../utils/index.js';
-import { stringifyError } from '../utils/index.js';
+} from '../aws';
+import { getLogger, stringifyError } from '../utils';
+
 import { $enum } from 'ts-enum-util';
-import { HandlerAuxBase, HandlerContext, HandlerPluginBase } from './base.js';
+import { HandlerAuxBase, HandlerContext, HandlerPluginBase } from './base';
 
 const logger = getLogger(__filename);
 

package/src/utils/index.ts

@@ -1,2 +1,2 @@
-export * from './logger.js';
-export * from './misc.js';
+export * from './logger';
+export * from './misc';

package/src/utils/logger.ts

@@ -1,7 +1,7 @@
 import { basename } from 'path';
 import { envDefault as currentStage, StagingLevel } from 'simple-staging';
 import { $enum } from 'ts-enum-util';
-import { stringifyError } from './misc.js';
+import { stringifyError } from './misc';
 
 export enum LogLevel {
   Error = 'error',

package/tsconfig.json

@@ -1,9 +1,8 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
-    "module": "Node16",
-    "moduleResolution": "Node16",
-    "lib": ["ES2020", "DOM"],
+    "target": "es5",
+    "module": "commonjs",
+    "lib": ["es2017", "es7", "es6", "esnext", "dom"],
     "rootDir": "src",
     "outDir": "dist",
     "declaration": true,
@@ -13,4 +12,4 @@
     "noUnusedParameters": true
   },
   "exclude": ["node_modules", "dist", "__tests__"]
-}
+}

package/.nvmrc

@@ -1 +0,0 @@
-v16