@clairejs/server 3.20.0 → 3.20.2

package/README.md

@@ -1,7 +1,9 @@
 ## Change Log
 
-#### 3.20.0:
+#### 3.20.2:
 
+-   fix redlock timeout issue
+-   fix req not resolve leads to undefined request in DefaultHttpRequestHandler
 -   fix concurrent transactions in updateRecords
 -   update claire core, claire orm and fix returning
 

package/dist/http/controller/DefaultHttpRequestHandler.js

@@ -31,20 +31,22 @@ let DefaultHttpRequestHandler = class DefaultHttpRequestHandler extends Abstract
     }
     async handleRequest(endpoint, req) {
         //-- supply correct order of params into handler
-        const params = Object.values(endpoint.params || {}).map((p) => {
-            switch (p.source) {
-                case "body":
-                    return req.getBody();
-                case "params":
-                    return req.getParams();
-                case "queries":
-                    return req.getQuery();
-                case "headers":
-                    return req.headers;
-                case "raw":
-                    return req;
-            }
-        });
+        const params = !endpoint.params
+            ? [req]
+            : Object.values(endpoint.params).map((p) => {
+                switch (p.source) {
+                    case "body":
+                        return req.getBody();
+                    case "params":
+                        return req.getParams();
+                    case "queries":
+                        return req.getQuery();
+                    case "headers":
+                        return req.headers;
+                    case "raw":
+                        return req;
+                }
+            });
         const response = await endpoint.controller[endpoint.name](...params);
         //-- validate response value against response dto
         if (endpoint.responseDto) {

package/dist/job/LocalJobScheduler.d.ts

@@ -29,7 +29,7 @@ export declare class LocalJobScheduler extends AbstractJobScheduler implements I
     /**
      * The time to lock active scheduler
      */
-    protected readonly keyRetentionDurationSecond: number;
+    protected readonly keyRetentionDurationSeconds: number;
     protected intervals: any[];
     private mutexHoldInterval?;
     private isActive;
@@ -55,7 +55,7 @@ export declare class LocalJobScheduler extends AbstractJobScheduler implements I
     /**
      * The time to lock active scheduler
      */
-    keyRetentionDurationSecond?: number);
+    keyRetentionDurationSeconds?: number);
     private sendJob;
     private processMessage;
     private extendMutexKey;

package/dist/job/LocalJobScheduler.js

@@ -32,7 +32,7 @@ let LocalJobScheduler = class LocalJobScheduler extends AbstractJobScheduler {
     holdMutexKey;
     uniqueIdKey;
     multiClientChannel;
-    keyRetentionDurationSecond;
+    keyRetentionDurationSeconds;
     intervals = [];
     mutexHoldInterval;
     isActive = false;
@@ -58,7 +58,7 @@ let LocalJobScheduler = class LocalJobScheduler extends AbstractJobScheduler {
     /**
      * The time to lock active scheduler
      */
-    keyRetentionDurationSecond = 30) {
+    keyRetentionDurationSeconds = 30) {
         super(logger, db);
         this.logger = logger;
         this.db = db;
@@ -69,7 +69,7 @@ let LocalJobScheduler = class LocalJobScheduler extends AbstractJobScheduler {
         this.holdMutexKey = holdMutexKey;
         this.uniqueIdKey = uniqueIdKey;
         this.multiClientChannel = multiClientChannel;
-        this.keyRetentionDurationSecond = keyRetentionDurationSecond;
+        this.keyRetentionDurationSeconds = keyRetentionDurationSeconds;
     }
     sendJob(type, messageId, data) {
         this.subscribeClient.publish(this.multiClientChannel, JSON.stringify({ type, messageId, data }));
@@ -116,7 +116,7 @@ let LocalJobScheduler = class LocalJobScheduler extends AbstractJobScheduler {
         if (!this.redisClient) {
             return;
         }
-        await this.redisClient.setex(this.holdMutexKey, this.keyRetentionDurationSecond, 1);
+        await this.redisClient.setex(this.holdMutexKey, this.keyRetentionDurationSeconds, 1);
         this.logger.debug("Scheduler extends mutex key");
     }
     async afterJob({ at, ...job }, tx) {
@@ -139,15 +139,15 @@ let LocalJobScheduler = class LocalJobScheduler extends AbstractJobScheduler {
         //-- try to claim active scheduler
         const locker = new Redlock([this.redisClient]);
         try {
-            const lock = await locker.acquire([this.lockMutexKey], this.keyRetentionDurationSecond);
+            const lock = await locker.acquire([this.lockMutexKey], this.keyRetentionDurationSeconds * 1000);
             this.isActive = true;
             await this.extendMutexKey();
             await lock.release();
-            this.logger.debug("Being active scheduler");
+            this.logger.debug("Became active scheduler");
             //-- actively hold the mutex key
             this.mutexHoldInterval = setInterval(() => {
                 this.extendMutexKey();
-            }, Math.trunc((this.keyRetentionDurationSecond * 1000) / 2) + 1);
+            }, Math.trunc((this.keyRetentionDurationSeconds * 1000) / 2) + 1);
         }
         catch (err) {
             this.logger.info("Failed to lock mutex key, ignore", err);

package/dist/system/ClaireServer.js

@@ -35,10 +35,10 @@ let ClaireServer = class ClaireServer extends ClaireApp {
         }
         //-- save mounted endpoint info in server store to prevent circular dependency when resolving http request handler in controller
         for (const endpoint of mountedEndpointInfo) {
-            this.logger.info(`Mounting: ${endpoint.method}:${endpoint.mount}`);
+            this.logger.debug(`Mounting: ${endpoint.method}:${endpoint.mount}`);
         }
         getGlobalStore().mountedEndpointInfo = mountedEndpointInfo;
-        this.logger.debug("Claire server initing");
+        this.logger.info("Claire server initing");
         //-- handle exceptions
         this.logger.debug(`Setting up exception handlers`);
         process.on("SIGTERM", () => {

package/package.json

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