joye-backend-utility 7.3.5 → 7.3.6-beta.1

package/dist/redisClient.d.ts

@@ -1,6 +1,8 @@
-import { createClient } from 'redis';
+import { createClient, createCluster } from 'redis';
+/** Connected standalone client or cluster client (commands used by callers are supported on both). */
+export declare type RedisConnection = Awaited<ReturnType<ReturnType<typeof createClient>['connect']>> | ReturnType<typeof createCluster>;
 declare class RedisClient {
     private static instance;
-    static getInstance(): Promise<ReturnType<typeof createClient>>;
+    static getInstance(): Promise<RedisConnection>;
 }
 export { RedisClient };

package/dist/redisClient.js

@@ -8,24 +8,47 @@ class RedisClient {
             const cachePort = process.env.REDIS_CACHE_PORT;
             const cacheHostName = process.env.REDIS_CACHE_HOST;
             const cachePassword = process.env.REDIS_CACHE_PASSWORD;
-            RedisClient.instance = await (0, redis_1.createClient)({
-                // redis for TLS
-                url: `rediss://${cacheHostName}:${cachePort}`,
+            const url = `rediss://${cacheHostName}:${cachePort}`;
+            const useCluster = process.env.REDIS_CACHE_CLUSTER === 'true';
+            const clientOptions = {
+                url,
                 password: cachePassword,
-            })
-                .on('error', err => {
-                console.log('Redis Client Error', err);
-            })
-                .on('connect', () => {
-                console.log('Connected to Redis');
-            })
-                .on('end', () => {
-                console.log('Connection to Redis end');
-            })
-                .connect();
+            };
+            if (useCluster) {
+                const cluster = (0, redis_1.createCluster)({
+                    rootNodes: [clientOptions],
+                    defaults: {
+                        password: cachePassword,
+                    },
+                })
+                    .on('error', err => {
+                    console.log('Redis Client Error', err);
+                })
+                    .on('connect', () => {
+                    console.log('Connected to Redis');
+                })
+                    .on('end', () => {
+                    console.log('Connection to Redis end');
+                });
+                await cluster.connect();
+                RedisClient.instance = cluster;
+            }
+            else {
+                const client = (0, redis_1.createClient)(clientOptions)
+                    .on('error', err => {
+                    console.log('Redis Client Error', err);
+                })
+                    .on('connect', () => {
+                    console.log('Connected to Redis');
+                })
+                    .on('end', () => {
+                    console.log('Connection to Redis end');
+                });
+                RedisClient.instance = await client.connect();
+            }
         }
         if (!RedisClient.instance.isOpen) {
-            return await RedisClient.instance.connect();
+            await RedisClient.instance.connect();
         }
         return RedisClient.instance;
     }

package/dist/schema/user_analytic.js

@@ -8,6 +8,12 @@ const UserAnalytic = new mongoose_1.Schema({
         required: true,
         index: true,
     },
+    /** Denormalized from `User.bucket` for sharded schedulers (e.g. daily-suggestion queue cron). */
+    bucket: {
+        type: Number,
+        required: false,
+        index: true,
+    },
     date: {
         type: String,
         required: true,
@@ -133,4 +139,5 @@ const UserAnalytic = new mongoose_1.Schema({
 });
 UserAnalytic.index({ employeeId: 1, weekNumber: -1, year: -1, date: -1 });
 UserAnalytic.index({ employeeId: 1, month: -1, year: -1, date: -1 });
+UserAnalytic.index({ year: 1, weekNumber: 1, bucket: 1 });
 exports.UserAnalyticSchema = UserAnalytic;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "joye-backend-utility",
-  "version": "7.3.5",
+  "version": "7.3.6-beta.1",
   "description": "Joye backend utility for db functions and common functions",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",