zyket 1.2.16 → 1.2.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zyket",
-  "version": "1.2.16",
+  "version": "1.2.18",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/services/auth/index.js

@@ -64,6 +64,10 @@ module.exports = class AuthService extends Service {
     return [];
   }
 
+  get organizationEnabled() {
+    return true;
+  }
+
   get socialProviders() {
     return {}
   }
@@ -107,22 +111,24 @@ module.exports = class AuthService extends Service {
       plugins: [
         admin(),
         bearer(),
-        organization({
-          schema: {
-            organization: {
-              additionalFields: this.organizationAdditionalFields
+        ...(this.organizationEnabled ? [
+          organization({
+            schema: {
+              organization: {
+                additionalFields: this.organizationAdditionalFields
+              },
+              member: {
+                additionalFields: this.memberAdditionalFields
+              }
             },
-            member: { 
-              additionalFields: this.memberAdditionalFields
+            allowUserToCreateOrganization: async (user) => {
+              return await this.allowUserToCreateOrganization(user);
+            },
+            sendInvitationEmail: async (data) => {
+              return await this.sendInvitationEmail(data);
             }
-          },
-          allowUserToCreateOrganization: async (user) => {
-            return await this.allowUserToCreateOrganization(user);
-          },
-          sendInvitationEmail: async (data) => {
-            return await this.sendInvitationEmail(data);
-          }
-        }),
+          })
+        ] : []),
         ...this.plugins,
       ],
       socialProviders: this.socialProviders,

package/src/services/bullmq/Worker.js

@@ -1,8 +1,25 @@
-module.exports = class Worker {
-  name;
-  queueName = null;
-  
-  constructor(name) {
-    this.name = name;
-  }
-}
+module.exports = class Worker {
+  name;
+  queueName = null;
+
+  // Per-instance configuration. Controls how many BullMQ workers are spawned
+  // for this class and what extra info each one receives:
+  //   - number  -> spawns N identical instances (instance = {} for each)
+  //   - array   -> spawns one instance per entry, each entry passed to handle()
+  //                as `instance` (e.g. [{ proxy: '...' }, { proxy: '...' }])
+  //   - function({ container }) -> resolved at boot, must return a number/array
+  //                (e.g. load the proxy list from env/DB dynamically)
+  //   - empty   -> a single default instance
+  instances = [];
+
+  // BullMQ Worker options (e.g. { concurrency: 5 }). Can be:
+  //   - object   -> applied to every instance
+  //   - function({ container, instance, index }) -> resolved at boot per
+  //                instance (sync or async), so options can be computed
+  //                dynamically (per-proxy concurrency, env-driven values, ...)
+  options = {};
+
+  constructor(name) {
+    this.name = name;
+  }
+}

package/src/services/bullmq/index.js

@@ -9,6 +9,7 @@ module.exports = class BullMQ extends Service  {
   #container
   queues = {};
   queuesEvents = {};
+  workers = [];
 
   constructor(container) {
     super("queues");
@@ -35,13 +36,40 @@ module.exports = class BullMQ extends Service  {
         this.#container.get('logger').warn(`Queue ${wkr.queueName} not found for worker ${wkr.name}, skipping...`);
         continue;
       }
-      new BullWorker(
-        wkr.queueName,
-        async (job) => wkr.handle({ container: this.#container, job }),
-        this.#connection()
-      );
-      this.#container.get('logger').info(`Worker ${wkr.name} for queue ${wkr.queueName} initialized`);
+
+      const instances = await this.#resolveInstances(wkr);
+      for (const [index, instance] of instances.entries()) {
+        const options = await this.#resolveOptions(wkr, instance, index);
+        const bullWorker = new BullWorker(
+          wkr.queueName,
+          async (job) => wkr.handle({ container: this.#container, job, instance, index }),
+          { ...this.#connection(), ...options }
+        );
+        this.workers.push(bullWorker);
+      }
+      this.#container.get('logger').info(`Worker ${wkr.name} for queue ${wkr.queueName} initialized with ${instances.length} instance(s)`);
+    }
+  }
+
+  async #resolveInstances(wkr) {
+    let instances = wkr.instances;
+    if (typeof instances === 'function') {
+      instances = await instances({ container: this.#container });
     }
+    if (typeof instances === 'number' && instances > 0) {
+      return Array.from({ length: instances }, () => ({}));
+    }
+    if (Array.isArray(instances) && instances.length) {
+      return instances;
+    }
+    return [{}];
+  }
+
+  async #resolveOptions(wkr, instance, index) {
+    const options = typeof wkr.options === 'function'
+      ? await wkr.options({ container: this.#container, instance, index })
+      : wkr.options;
+    return options || {};
   }
 
   async addJob(queueName, jobName, data, opts = {}, waitForCompletion = false) {