chore: add debug mode, small schema refactoring

Author: nodkz

.vscode/launch.json

@@ -4,6 +4,13 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+    {
+      "type": "node",
+      "request": "attach",
+      "name": "Debug by PID",
+      "processId": "${command:PickProcess}",
+      "skipFiles": ["<node_internals>/**"]
+    },
     {
       "name": "Jest Current File",
       "type": "node",

example/src/config.ts

@@ -6,8 +6,9 @@
 //   password: process.env.REDIS_PASSWORD || '',
 // };
 
-const BULL_REDIS_URI = 'redis://127.0.0.1:6379';
-//'redis://:uut2tiew5waeli1aefup0Toecaikoque5eepahch5AowaiJ2@10.216.129.127:6379';
+// const BULL_REDIS_URI = 'redis://127.0.0.1:6379';
+const BULL_REDIS_URI =
+  'redis://:uut2tiew5waeli1aefup0Toecaikoque5eepahch5AowaiJ2@10.216.129.127:6379';
 
 const BULL_HOST_ID = 'maybe_uuid_and_mac';
 

example/src/index.ts

@@ -11,4 +11,5 @@ const server = new ApolloServer({
 
 server.listen(5000).then(({ url }) => {
   console.log(`🚀 Server ready at ${url}`);
+  console.log(`🚀 Server pid: ${process.pid}`);
 });

example/src/schema/query/queue.ts

@@ -14,10 +14,12 @@ export function createQueueFC(schemaComposer: SchemaComposer<any>) {
       },
     },
     resolve: async (_, { queueName, prefix }) => {
-      return new Queue(queueName, {
+      const queue = new Queue(queueName, {
         prefix,
         connection: createBullConnection('queue'),
       });
+
+      return queue;
     },
   };
 }

example/src/schema/query/queueKeys.ts

@@ -9,37 +9,36 @@ export function createQueueKeysFC(schemaComposer: SchemaComposer<any>) {
         fields: {
           queueName: 'String!',
           prefix: 'String!',
-          prefixMaskNorm: 'String',
         },
       })
       .getTypePlural(),
     args: {
-      prefixMask: {
+      prefixGlob: {
         type: 'String',
         defaultValue: 'bull*',
       },
     },
-    resolve: async (_, { prefixMask }) => {
+    resolve: async (_, { prefixGlob }) => {
       const connection = createBullConnection('custom');
 
-      let prefixMaskNorm = prefixMask;
-      const nameCase = prefixMaskNorm.split(':').length - 1;
+      let prefixGlobNorm = prefixGlob;
+      const nameCase = prefixGlobNorm.split(':').length - 1;
       if (nameCase >= 2) {
-        prefixMaskNorm = prefixMaskNorm.split(':').slice(0, 2).join(':') + ':';
+        prefixGlobNorm = prefixGlobNorm.split(':').slice(0, 2).join(':') + ':';
       } else if (nameCase === 1) {
-        prefixMaskNorm += prefixMaskNorm.endsWith(':') ? '*:' : ':';
+        prefixGlobNorm += prefixGlobNorm.endsWith(':') ? '*:' : ':';
       } else {
-        prefixMaskNorm += ':*:';
+        prefixGlobNorm += ':*:';
       }
+      prefixGlobNorm += 'meta';
 
-      const keys = await connection.keys(prefixMaskNorm + 'meta');
+      const keys = await connection.keys(prefixGlobNorm);
 
       return keys.map((key) => {
         const parts = key.split(':');
         return {
           queueName: parts[1],
           prefix: parts[0],
-          prefixMaskNorm,
         };
       });
     },

example/src/schema/types/queue/index.ts

@@ -12,18 +12,16 @@ import { SchemaComposer } from 'graphql-compose';
 export function getQueueTC(sc: SchemaComposer<any>) {
   return sc.getOrCreateOTC('Queue', (etc) => {
     etc.addFields({
-      hostId: 'String',
       name: 'String!',
-      jobNames: '[String!]',
       jobCounts: createJobCountFC(sc),
       repeatables: createRepeatablesFC(sc),
       jobs: createJobsFC(sc),
-      waitingJobs: createWaitingJobsFC(sc),
-      completedJobs: createCompletedJobsFC(sc),
-      activeJobs: createActiveJobsFC(sc),
-      delayedJobs: createDelayedJobsFC(sc),
-      failedJobs: createFailedJobsFC(sc),
-      workers: createWorkersTC(sc),
+      jobsWaiting: createWaitingJobsFC(sc),
+      jobsCompleted: createCompletedJobsFC(sc),
+      jobsActive: createActiveJobsFC(sc),
+      jobsDelayed: createDelayedJobsFC(sc),
+      jobsFailed: createFailedJobsFC(sc),
+      activeWorkers: createWorkersTC(sc),
     });
   });
 }