@clairejs/server 3.22.9 → 3.22.11

package/README.md

@@ -1,5 +1,13 @@
 ## Change Log
 
+#### 3.22.11
+
+-   add log in lambda wrapper
+
+#### 3.22.10
+
+-   fix aws job scheduler name space job removal issue
+
 #### 3.22.9
 
 -   fix typing issue with job handler function

package/dist/job/AwsJobScheduler.d.ts

@@ -12,10 +12,10 @@ export declare class AwsJobScheduler extends AbstractJobScheduler {
     protected readonly db: AbstractDbAdapter;
     protected readonly uniqueJobIdFactory: () => string;
     protected readonly apiLambdaFunctionArn: string;
+    protected readonly jobNamespace: string;
     protected readonly eventBusName: string;
-    protected readonly jobNamePrefix: string;
     protected readonly eventbridge: aws.EventBridge;
-    constructor(logger: AbstractLogger, db: AbstractDbAdapter, uniqueJobIdFactory: () => string, apiLambdaFunctionArn: string, eventBusName?: string, jobNamePrefix?: string);
+    constructor(logger: AbstractLogger, db: AbstractDbAdapter, uniqueJobIdFactory: () => string, apiLambdaFunctionArn: string, jobNamespace: string, eventBusName?: string);
     handleCron(jobInfo: ScheduledJob): Promise<void>;
     protected afterJob(_job: ScheduledJob, _tx: ITransaction): Promise<void>;
     private generateCronFromTimestamp;

package/dist/job/AwsJobScheduler.js

@@ -21,17 +21,17 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
     db;
     uniqueJobIdFactory;
     apiLambdaFunctionArn;
+    jobNamespace;
     eventBusName;
-    jobNamePrefix;
     eventbridge = new aws.EventBridge();
-    constructor(logger, db, uniqueJobIdFactory, apiLambdaFunctionArn, eventBusName = "default", jobNamePrefix = "claire-aws-job-") {
+    constructor(logger, db, uniqueJobIdFactory, apiLambdaFunctionArn, jobNamespace, eventBusName = "default") {
         super(logger, db);
         this.logger = logger;
         this.db = db;
         this.uniqueJobIdFactory = uniqueJobIdFactory;
         this.apiLambdaFunctionArn = apiLambdaFunctionArn;
+        this.jobNamespace = jobNamespace;
         this.eventBusName = eventBusName;
-        this.jobNamePrefix = jobNamePrefix;
     }
     async handleCron(jobInfo) {
         this.logger.debug(`Handle cron`, jobInfo);
@@ -59,7 +59,7 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
         const allRules = await this.eventbridge
             .listRules({
             EventBusName: this.eventBusName,
-            NamePrefix: this.jobNamePrefix,
+            NamePrefix: this.jobNamespace,
         })
             .promise();
         const allJobs = await Promise.all((allRules.Rules || []).map(async (rule) => {
@@ -83,7 +83,7 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
     async scheduleJob(jobInfo) {
         this.logger.debug("Scheduling job: ", jobInfo);
         if (jobInfo.cron || jobInfo.at) {
-            const jobId = `${this.jobNamePrefix}${this.uniqueJobIdFactory()}`;
+            const jobId = `${this.jobNamespace}${this.uniqueJobIdFactory()}`;
             let cronExpression;
             if (jobInfo.at) {
                 cronExpression = this.generateCronFromTimestamp(jobInfo.at);
@@ -139,8 +139,10 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
         //-- remove job that no more exist
         const nomoreExistJobs = scheduledJobs.filter((job) => !allJobs.find((j) => j.jobName === job.jobName));
         for (const job of nomoreExistJobs) {
-            this.logger.info(`Removing stale job: ${job.jobName} of id: ${job.id}`);
-            await this.removeJob(job.id);
+            if (job.id) {
+                this.logger.info(`Removing stale job: ${job.jobName} of id: ${job.id}`);
+                await this.removeJob(job.id);
+            }
         }
         if (nomoreExistJobs.length) {
             this.logger.info(`Cleaned up: ${nomoreExistJobs.length} stale jobs`);
@@ -184,6 +186,6 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
 AwsJobScheduler = __decorate([
     LogContext(),
     __metadata("design:paramtypes", [AbstractLogger,
-        AbstractDbAdapter, Function, String, Object, Object])
+        AbstractDbAdapter, Function, String, String, Object])
 ], AwsJobScheduler);
 export { AwsJobScheduler };

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,34 @@ 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
         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: {} });
-        }
+        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 +141,7 @@ export class LambdaWrapper {
             return toApiGatewayFormat({ code: 200, headers: corsHeaders, cookies: {} });
         }
         catch (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/package.json

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