@clairejs/server 3.22.10 → 3.22.12

package/README.md

@@ -1,5 +1,9 @@
 ## Change Log
 
+#### 3.22.12
+
+-   add log in lambda wrapper
+
 #### 3.22.10
 
 -   fix aws job scheduler name space job removal issue

package/dist/system/LambdaWrapper.d.ts

@@ -12,6 +12,7 @@ export declare class LambdaWrapper {
     protected readonly serverFactory: () => Promise<ClaireServer>;
     protected readonly requestMapper: (event: any) => RequestOptions | undefined;
     protected readonly config?: LambdaWrapperConfig | undefined;
+    private logger?;
     private httpRequestHandler?;
     private socketManager?;
     private jobScheduler?;

package/dist/system/LambdaWrapper.js

@@ -1,4 +1,4 @@
-import { getServiceProvider, HttpMethod, SocketMethod, Errors } from "@clairejs/core";
+import { getServiceProvider, HttpMethod, SocketMethod, Errors, AbstractLogger } from "@clairejs/core";
 import { AbstractHttpRequestHandler } from "../http/controller/AbstractHttpRequestHandler";
 import { AbstractServerSocketManager } from "../socket/AbstractServerSocketManager";
 import { CRON_REQUEST_METHOD } from "../job/interfaces";
@@ -66,6 +66,7 @@ export class LambdaWrapper {
     serverFactory;
     requestMapper;
     config;
+    logger;
     httpRequestHandler;
     socketManager;
     jobScheduler;
@@ -80,30 +81,36 @@ export class LambdaWrapper {
         if (!this._server) {
             this._server = await this.serverFactory();
             const injector = getServiceProvider().getInjector();
+            this.logger = injector.resolveOptional(AbstractLogger);
             this.socketManager = injector.resolveOptional(AbstractServerSocketManager);
             this.httpRequestHandler = injector.resolveOptional(AbstractHttpRequestHandler);
             this.jobScheduler = injector.resolveOptional(AbstractJobScheduler);
             await injector.initInstances();
             this.socketManager?.configure();
             await this._server.init();
+            this.logger?.info("Server init finish");
+        }
+        else {
+            this.logger?.info("Server already booted, reusing");
         }
     }
     async handler(event) {
-        await this.bootServer();
-        //-- handle http otherwise
+        console.log("Raw lambda event", event);
         const requestOptions = this.requestMapper(event);
-        if (!requestOptions) {
-            throw Errors.SYSTEM_ERROR("Cannot resolve event");
-        }
-        const corsHeaders = convertCorsToHeaders(requestOptions.headers?.origin || "", this.httpRequestHandler?.corsConfig);
-        if (requestOptions.method === HttpMethod.OPTIONS) {
-            return toApiGatewayFormat({ code: 200, headers: corsHeaders, cookies: {} });
-        }
-        if (requestOptions.method === CRON_REQUEST_METHOD) {
-            await this.jobScheduler?.handleCron(requestOptions.body);
-            return toApiGatewayFormat({ code: 200, headers: corsHeaders, cookies: {} });
-        }
+        console.log("after map event", requestOptions);
+        const corsHeaders = convertCorsToHeaders(requestOptions?.headers?.origin || "", this.httpRequestHandler?.corsConfig);
         try {
+            await this.bootServer();
+            if (!requestOptions) {
+                throw Errors.SYSTEM_ERROR("Cannot resolve event");
+            }
+            if (requestOptions.method === HttpMethod.OPTIONS) {
+                return toApiGatewayFormat({ code: 200, headers: corsHeaders, cookies: {} });
+            }
+            if (requestOptions.method === CRON_REQUEST_METHOD) {
+                await this.jobScheduler?.handleCron(requestOptions.body);
+                return toApiGatewayFormat({ code: 200, headers: corsHeaders, cookies: {} });
+            }
             if (Object.values(HttpMethod).includes(requestOptions.method)) {
                 if (!this.httpRequestHandler) {
                     throw Errors.SYSTEM_ERROR("Http request handler not found");
@@ -136,6 +143,8 @@ export class LambdaWrapper {
             return toApiGatewayFormat({ code: 200, headers: corsHeaders, cookies: {} });
         }
         catch (err) {
+            console.log(err);
+            this.logger?.error(err);
             return toApiGatewayFormat({
                 code: typeof err.code === "number" ? err.code : 500,
                 value: { name: err.name, message: err.message, code: err.code || 500 },

package/dist/system/lamba-request-mapper.js

@@ -12,6 +12,7 @@ const parseCookie = (cookieArray) => {
 };
 export const lambdaRequestMapper = (event) => {
     if (event.requestContext.eventType) {
+        console.log("map socket");
         //-- socket
         const method = event.requestContext.eventType.toLowerCase();
         const body = event.body && JSON.parse(event.body);
@@ -22,6 +23,7 @@ export const lambdaRequestMapper = (event) => {
         };
     }
     if (event.requestContext.cronScheduler) {
+        console.log("map cron");
         //-- cron scheduler
         return {
             method: CRON_REQUEST_METHOD,
@@ -29,6 +31,7 @@ export const lambdaRequestMapper = (event) => {
             body: event.requestContext.cronScheduler.data,
         };
     }
+    console.log("map http");
     //-- http
     return {
         clientIP: event.requestContext.http.sourceIp,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clairejs/server",
-    "version": "3.22.10",
+    "version": "3.22.12",
     "description": "Claire server NodeJs framework written in Typescript.",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",