Merge branch 'master' of github.com:taskforcesh/taskforce-connector

Author: manast

index.js

@@ -64,7 +64,7 @@ program
 
 console.info(
   chalk.blueBright(
-    "Taskforce Connector v" + version + " - (c) 2017-2023 Taskforce.sh Inc."
+    "Taskforce Connector v" + version + " - (c) 2017-2024 Taskforce.sh Inc."
   )
 );
 

lib/queue-factory.ts

@@ -23,7 +23,7 @@ export interface FoundQueue {
 }
 
 const getQueueKeys = async (client: Redis | Cluster) => {
-  let nodes = "nodes" in client ? client.nodes('master'): [client]
+  let nodes = "nodes" in client ? client.nodes('master') : [client]
   let keys = [];
   const startTime = Date.now();
 
@@ -106,12 +106,12 @@ export function getRedisClient(
     if (clusterNodes && clusterNodes.length) {
       const { username, password } = redisOptsFromUrl(clusterNodes[0])
       redisClients[type] = new Redis.Cluster(clusterNodes, {
-        ...redisOpts, 
+        ...redisOpts,
         redisOptions: {
           username,
           password,
           tls: process.env.REDIS_CLUSTER_TLS ? {
-              cert: Buffer.from(process.env.REDIS_CLUSTER_TLS ?? '', 'base64').toString('ascii')
+            cert: Buffer.from(process.env.REDIS_CLUSTER_TLS ?? '', 'base64').toString('ascii')
           } : undefined,
         }
       });
@@ -121,8 +121,7 @@ export function getRedisClient(
 
     redisClients[type].on("error", (err: Error) => {
       console.log(
-        `${chalk.yellow("Redis:")} ${chalk.red("redis connection error")} ${
-          err.message
+        `${chalk.yellow("Redis:")} ${chalk.red("redis connection error")} ${err.message
         }`
       );
     });
@@ -197,7 +196,7 @@ export function createQueue(
 
     case "bull":
       return {
-        queue: new Bull(foundQueue.name, {
+        queue: new (<any>Bull)(foundQueue.name, {
           createClient,
           prefix: foundQueue.prefix,
         }),
@@ -206,7 +205,7 @@ export function createQueue(
     default:
       console.error(
         chalk.red(`ERROR:`) +
-          `Unexpected queue type: ${foundQueue.type} for queue ${foundQueue.name}`
+        `Unexpected queue type: ${foundQueue.type} for queue ${foundQueue.name}`
       );
   }
 }

lib/socket.ts

@@ -2,7 +2,7 @@ import { RedisOptions } from "ioredis";
 import { pick } from "lodash";
 import { getCache, updateQueuesCache, queueKey } from "./queues-cache";
 import { WebSocketClient } from "./ws-autoreconnect";
-import { execRedisCommand, getRedisInfo, ping } from "./queue-factory";
+import { FoundQueue, execRedisCommand, getRedisInfo, ping } from "./queue-factory";
 import { getQueueType, redisOptsFromUrl } from "./utils";
 import { Integration } from "./interfaces/integration";
 
@@ -52,8 +52,8 @@ export const Socket = (
   ws.onopen = function open() {
     console.log(
       chalk.yellow("WebSocket:") +
-        chalk.blueBright(" opened connection to ") +
-        chalk.gray("Taskforce.sh")
+      chalk.blueBright(" opened connection to ") +
+      chalk.gray("Taskforce.sh")
     );
   };
 
@@ -78,7 +78,7 @@ export const Socket = (
       if (input === "authorized") {
         console.log(
           chalk.yellow("WebSocket: ") +
-            chalk.green("Succesfully authorized to taskforce.sh service")
+          chalk.green("Succesfully authorized to taskforce.sh service")
         );
 
         //
@@ -91,8 +91,7 @@ export const Socket = (
         console.log(
           `${chalk.yellow("WebSocket: ")} ${chalk.green(
             "sending connection: "
-          )} ${chalk.blueBright(name)} ${
-            team ? chalk.green(" for team ") + chalk.blueBright(team) : ""
+          )} ${chalk.blueBright(name)} ${team ? chalk.green(" for team ") + chalk.blueBright(team) : ""
           }`
         );
         ws.send(
@@ -111,7 +110,7 @@ export const Socket = (
         if (!msg.data) {
           console.error(
             chalk.red("WebSocket:") +
-              chalk.blueBright(" missing message data "),
+            chalk.blueBright(" missing message data "),
             msg
           );
           return;
@@ -131,7 +130,7 @@ export const Socket = (
             }
             const { queue, responders } =
               cache[
-                queueKey({ name: queueName, prefix: queuePrefix || "bull" })
+              queueKey({ name: queueName, prefix: queuePrefix || "bull" })
               ];
 
             if (!queue) {
@@ -173,11 +172,12 @@ export const Socket = (
           console.log(
             `${chalk.yellow("WebSocket: ")} ${chalk.green(
               "sending connection:"
-            )} ${chalk.blueBright(name)} ${
-              team ? chalk.green(" for team ") + chalk.blueBright(team) : ""
+            )} ${chalk.blueBright(name)} ${team ? chalk.green(" for team ") + chalk.blueBright(team) : ""
             }`
           );
 
+          logSendingQueues(queues)
+
           respond(msg.id, {
             queues,
             connection: name,
@@ -190,18 +190,7 @@ export const Socket = (
         {
           const queues = await updateQueuesCache(redisOpts, opts);
 
-          for (const queue of queues) {
-            const { name, prefix, type } = queue;
-            console.log(
-              `${chalk.yellow("WebSocket:")} ${chalk.blueBright(
-                "Sending queue:"
-              )} ${chalk.green(name)} ${chalk.blueBright(
-                "type:"
-              )} ${chalk.green(type)} ${chalk.blueBright(
-                "prefix:"
-              )} ${chalk.green(prefix)}`
-            );
-          }
+          logSendingQueues(queues);
 
           respond(msg.id, queues);
         }
@@ -222,6 +211,21 @@ export const Socket = (
     }
   }
 
+  function logSendingQueues(queues: FoundQueue[]) {
+    for (const queue of queues) {
+      const { name, prefix, type } = queue;
+      console.log(
+        `${chalk.yellow("WebSocket:")} ${chalk.blueBright(
+          "Sending queue:"
+        )} ${chalk.green(name)} ${chalk.blueBright(
+          "type:"
+        )} ${chalk.green(type)} ${chalk.blueBright(
+          "prefix:"
+        )} ${chalk.green(prefix)}`
+      );
+    }
+  }
+
   function respond(id: string, data: any = {}) {
     const response = JSON.stringify({
       id,

package.json

@@ -13,11 +13,11 @@
     "dist"
   ],
   "dependencies": {
-    "bull": "^4.11.1",
-    "bullmq": "^4.16.0",
+    "bull": "^4.12.6",
+    "bullmq": "^5.7.9",
     "chalk": "^4.1.0",
     "commander": "^5.1.0",
-    "ioredis": "5.3.2",
+    "ioredis": "^5.4.1",
     "latest-version": "^5.1.0",
     "lodash": "^4.17.21",
     "semver": "^7.3.2",