serverless-simple-middleware 0.0.71 → 0.0.73

package/dist/middleware/base.js

@@ -12,6 +12,13 @@ class HandlerRequest {
         this.event = event;
         this.context = context;
         this.lastError = undefined;
+        const normalizedHeaders = {};
+        if (this.event.headers) {
+            for (const key of Object.keys(this.event.headers)) {
+                normalizedHeaders[key.toLowerCase()] = this.event.headers[key];
+            }
+        }
+        this.event.headers = normalizedHeaders;
     }
     get body() {
         if (!this.event.body) {
@@ -29,9 +36,7 @@ class HandlerRequest {
         return this.event.queryStringParameters || {};
     }
     header(key) {
-        return this.event.headers
-            ? this.event.headers[key] || this.event.headers[key.toLowerCase()]
-            : undefined;
+        return this.event.headers[key.toLowerCase()];
     }
     records(selector) {
         const target = (this.event.Records || []);

package/dist/middleware/database/connectionProxy.js

@@ -84,11 +84,16 @@ class ConnectionProxy {
         });
     });
     clearConnection = () => {
-        if (this.connection) {
-            this.connection.end();
-            this.connection = undefined;
-            this.connectionInitOnce.reset();
-            logger.verbose('Connection is end');
+        const conn = this.connection;
+        this.connection = undefined;
+        this.connectionInitOnce.reset();
+        if (conn) {
+            try {
+                conn.end();
+            }
+            catch (error) {
+                logger.warn(`Error occurred while ending connection: ${error}`);
+            }
         }
     };
     /**
@@ -96,11 +101,16 @@ class ConnectionProxy {
      * This should be used only for special use cases!
      */
     destroyConnection = () => {
-        if (this.connection) {
-            this.connection.destroy();
-            this.connection = undefined;
-            this.connectionInitOnce.reset();
-            logger.verbose('Connection is destroyed');
+        const conn = this.connection;
+        this.connection = undefined;
+        this.connectionInitOnce.reset();
+        if (conn) {
+            try {
+                conn.destroy();
+            }
+            catch (error) {
+                logger.warn(`Error occurred while destroying connection: ${error}`);
+            }
         }
     };
     onPluginCreated = async () => this.tryToInitializeSchema(true);

package/dist/middleware/database/sqlClient.d.ts

@@ -10,4 +10,4 @@ export declare class SQLClient<T = unknown> extends Kysely<T> {
      */
     destroyConnection: () => void;
 }
-export { expressionBuilder, sql, type DeleteQueryBuilder, type DeleteResult, type Expression, type ExpressionBuilder, type InferResult, type Insertable, type InsertQueryBuilder, type InsertResult, type NotNull, type RawBuilder, type Selectable, type SelectQueryBuilder, type SqlBool, type Transaction, type Updateable, type UpdateQueryBuilder, type UpdateResult, } from 'kysely';
+export { expressionBuilder, sql, type DeleteQueryBuilder, type DeleteResult, type Expression, type ExpressionBuilder, type InferResult, type Insertable, type InsertQueryBuilder, type InsertResult, type NotNull, type RawBuilder, type Selectable, type SelectQueryBuilder, type SqlBool, type Transaction, type Updateable, type UpdateQueryBuilder, type UpdateResult } from 'kysely';

package/dist/middleware/database/sqlClient.js

@@ -4,7 +4,9 @@ exports.sql = exports.expressionBuilder = exports.SQLClient = void 0;
 const kysely_1 = require("kysely");
 const mysql2_1 = require("mysql2");
 const oncePromise_1 = require("../../internal/oncePromise");
+const utils_1 = require("../../utils");
 const secretsManager_1 = require("../../utils/secretsManager");
+const logger = (0, utils_1.getLogger)(__filename);
 class LazyConnectionPool {
     options;
     connection = null;
@@ -59,10 +61,11 @@ class LazyConnectionPool {
             .catch((err) => callback(err, {}));
     };
     end = (callback) => {
-        if (this.connection) {
-            this.connection.end((err) => {
-                this.connection = null;
-                this.connectionInitOnce.reset();
+        const conn = this.connection;
+        this.connection = null;
+        this.connectionInitOnce.reset();
+        if (conn) {
+            conn.end((err) => {
                 callback(err);
             });
         }
@@ -71,10 +74,16 @@ class LazyConnectionPool {
         }
     };
     destroy = () => {
-        if (this.connection) {
-            this.connection.destroy();
-            this.connection = null;
-            this.connectionInitOnce.reset();
+        const conn = this.connection;
+        this.connection = null;
+        this.connectionInitOnce.reset();
+        if (conn) {
+            try {
+                conn.destroy();
+            }
+            catch (error) {
+                logger.warn(`Error occurred while destroying connection: ${error}`);
+            }
         }
     };
     _addRelease = (connection) => Object.assign(connection, {

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.71",
+  "version": "0.0.73",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "VoyagerX",

package/src/middleware/base.ts

@@ -21,6 +21,13 @@ export class HandlerRequest {
     this.event = event;
     this.context = context;
     this.lastError = undefined;
+    const normalizedHeaders: Record<string, string | undefined> = {};
+    if (this.event.headers) {
+      for (const key of Object.keys(this.event.headers)) {
+        normalizedHeaders[key.toLowerCase()] = this.event.headers[key];
+      }
+    }
+    this.event.headers = normalizedHeaders;
   }
 
   get body() {
@@ -41,10 +48,8 @@ export class HandlerRequest {
     return this.event.queryStringParameters || {};
   }
 
-  public header(key: string) {
-    return this.event.headers
-      ? this.event.headers[key] || this.event.headers[key.toLowerCase()]
-      : undefined;
+  public header(key: string): string | undefined {
+    return this.event.headers[key.toLowerCase()];
   }
 
   public records<T, U>(selector?: (each: T) => U) {

package/src/middleware/database/connectionProxy.ts

@@ -113,11 +113,16 @@ export class ConnectionProxy {
     });
 
   public clearConnection = () => {
-    if (this.connection) {
-      this.connection.end();
-      this.connection = undefined;
-      this.connectionInitOnce.reset();
-      logger.verbose('Connection is end');
+    const conn = this.connection;
+    this.connection = undefined;
+    this.connectionInitOnce.reset();
+
+    if (conn) {
+      try {
+        conn.end();
+      } catch (error) {
+        logger.warn(`Error occurred while ending connection: ${error}`);
+      }
     }
   };
 
@@ -126,11 +131,16 @@ export class ConnectionProxy {
    * This should be used only for special use cases!
    */
   public destroyConnection = () => {
-    if (this.connection) {
-      this.connection.destroy();
-      this.connection = undefined;
-      this.connectionInitOnce.reset();
-      logger.verbose('Connection is destroyed');
+    const conn = this.connection;
+    this.connection = undefined;
+    this.connectionInitOnce.reset();
+
+    if (conn) {
+      try {
+        conn.destroy();
+      } catch (error) {
+        logger.warn(`Error occurred while destroying connection: ${error}`);
+      }
     }
   };
 

package/src/middleware/database/sqlClient.ts

@@ -13,9 +13,12 @@ import {
   type QueryError,
 } from 'mysql2';
 import { OncePromise } from '../../internal/oncePromise';
+import { getLogger } from '../../utils';
 import { SecretsManagerCache } from '../../utils/secretsManager';
 import { MySQLPluginOptions } from '../mysql';
 
+const logger = getLogger(__filename);
+
 interface LazyMysqlPoolConnection extends Connection {
   release: () => void;
 }
@@ -83,10 +86,12 @@ class LazyConnectionPool implements MysqlPool {
   };
 
   public end = (callback: (error: unknown) => void): void => {
-    if (this.connection) {
-      this.connection.end((err: QueryError) => {
-        this.connection = null;
-        this.connectionInitOnce.reset();
+    const conn = this.connection;
+    this.connection = null;
+    this.connectionInitOnce.reset();
+
+    if (conn) {
+      conn.end((err: QueryError) => {
         callback(err);
       });
     } else {
@@ -95,10 +100,16 @@ class LazyConnectionPool implements MysqlPool {
   };
 
   public destroy = (): void => {
-    if (this.connection) {
-      this.connection.destroy();
-      this.connection = null;
-      this.connectionInitOnce.reset();
+    const conn = this.connection;
+    this.connection = null;
+    this.connectionInitOnce.reset();
+
+    if (conn) {
+      try {
+        conn.destroy();
+      } catch (error) {
+        logger.warn(`Error occurred while destroying connection: ${error}`);
+      }
     }
   };
 
@@ -160,5 +171,6 @@ export {
   type Transaction,
   type Updateable,
   type UpdateQueryBuilder,
-  type UpdateResult,
+  type UpdateResult
 } from 'kysely';
+