@clairejs/server 3.22.4 → 3.22.6

package/README.md

@@ -1,7 +1,8 @@
 ## Change Log
 
-#### 3.22.4:
+#### 3.22.6:
 
+-   fix Lambda Wrapper resolve job scheduler
 -   add log to debug aws cron
 
 #### 3.22.3:

package/dist/job/AwsJobScheduler.js

@@ -33,7 +33,6 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
     }
     async handleCron(jobInfo) {
         this.logger.debug(`Handle cron`, jobInfo);
-        console.log("handling cron", JSON.stringify(jobInfo));
         await this.executeJob(jobInfo);
     }
     async afterJob(_job, _tx) {

package/dist/system/LambdaWrapper.d.ts

@@ -12,10 +12,9 @@ export declare class LambdaWrapper {
     protected readonly serverFactory: () => Promise<ClaireServer>;
     protected readonly requestMapper: (event: any) => RequestOptions | undefined;
     protected readonly config?: LambdaWrapperConfig | undefined;
-    private readonly injector;
-    private readonly httpRequestHandler?;
-    private readonly socketManager?;
-    private readonly jobScheduler?;
+    private httpRequestHandler?;
+    private socketManager?;
+    private jobScheduler?;
     private _server?;
     constructor(serverFactory: () => Promise<ClaireServer>, requestMapper: (event: any) => RequestOptions | undefined, config?: LambdaWrapperConfig | undefined);
     private bootServer;

package/dist/system/LambdaWrapper.js

@@ -1,8 +1,8 @@
 import { getServiceProvider, HttpMethod, SocketMethod, Errors } from "@clairejs/core";
 import { AbstractHttpRequestHandler } from "../http/controller/AbstractHttpRequestHandler";
-import { AwsJobScheduler } from "../job/AwsJobScheduler";
-import { CRON_REQUEST_METHOD } from "../job/interfaces";
 import { AbstractServerSocketManager } from "../socket/AbstractServerSocketManager";
+import { CRON_REQUEST_METHOD } from "../job/interfaces";
+import { AbstractJobScheduler } from "../job/AbstractJobScheduler";
 const convertCorsToHeaders = (origin, cors) => {
     const headers = {};
     if (cors?.credentials) {
@@ -66,7 +66,6 @@ export class LambdaWrapper {
     serverFactory;
     requestMapper;
     config;
-    injector = getServiceProvider().getInjector();
     httpRequestHandler;
     socketManager;
     jobScheduler;
@@ -76,24 +75,23 @@ export class LambdaWrapper {
         this.requestMapper = requestMapper;
         this.config = config;
         this.handler = this.handler.bind(this);
-        this.socketManager = this.injector.resolveOptional(AbstractServerSocketManager);
-        this.httpRequestHandler = this.injector.resolveOptional(AbstractHttpRequestHandler);
-        this.jobScheduler = this.injector.resolveOptional(AwsJobScheduler);
     }
     async bootServer() {
         if (!this._server) {
             this._server = await this.serverFactory();
-            await this.injector.initInstances();
+            const injector = getServiceProvider().getInjector();
+            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();
         }
     }
     async handler(event) {
-        console.log("lambda wrapper handler");
         await this.bootServer();
         //-- handle http otherwise
         const requestOptions = this.requestMapper(event);
-        console.log("request optons", JSON.stringify(requestOptions));
         if (!requestOptions) {
             throw Errors.SYSTEM_ERROR("Cannot resolve event");
         }
@@ -102,7 +100,6 @@ export class LambdaWrapper {
             return toApiGatewayFormat({ code: 200, headers: corsHeaders, cookies: {} });
         }
         if (requestOptions.method === CRON_REQUEST_METHOD) {
-            console.log("request handle cron", !!this.jobScheduler);
             await this.jobScheduler?.handleCron(requestOptions.body);
             return toApiGatewayFormat({ code: 200, headers: corsHeaders, cookies: {} });
         }

package/package.json

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