zyket 1.2.15 → 1.2.17

package/package.json

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

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) {

package/src/services/index.js

@@ -22,7 +22,7 @@ module.exports = [
   eventsActivated ? ["events", EventService, ["@service_container"]] : null,
   databaseActivated ? ["database", Database, ["@service_container", process.env.DATABASE_URL]] : null,
   ["cache", Cache, ["@service_container", process.env.CACHE_URL || '']],
-  s3Activated ? ["s3", S3, ["@service_container", process.env.S3_ENDPOINT, process.env.S3_PORT, process.env.S3_USE_SSL === "true", process.env.S3_ACCESS_KEY, process.env.S3_SECRET_KEY]] : null,
+  s3Activated ? ["s3", S3, ["@service_container", process.env.S3_ENDPOINT, process.env.S3_PORT, process.env.S3_USE_SSL === "true", process.env.S3_ACCESS_KEY, process.env.S3_SECRET_KEY, process.env.S3_PUBLIC_BUCKETS, process.env.S3_PRIVATE_BUCKETS]] : null,
   schedulerActivated ? ["scheduler", Scheduler, ["@service_container"]] : null,
   bullmqActivated ? ["bullmq", require("./bullmq"), ["@service_container"]] : null,
   socketActivated ? ["socketio", SocketIO, ["@service_container"]] : null,

package/src/services/s3/index.js

@@ -8,8 +8,10 @@ module.exports = class S3 extends Service {
   #useSSL
   #accessKey
   #secretKey
+  #publicBuckets
+  #privateBuckets
 
-  constructor(container, endPoint, port, useSSL, accessKey, secretKey) {
+  constructor(container, endPoint, port, useSSL, accessKey, secretKey, publicBuckets, privateBuckets) {
     super('s3')
     this.#container = container
     this.#endPoint = endPoint
@@ -17,6 +19,8 @@ module.exports = class S3 extends Service {
     this.#useSSL = useSSL
     this.#accessKey = accessKey
     this.#secretKey = secretKey
+    this.#publicBuckets = this.#parseBuckets(publicBuckets)
+    this.#privateBuckets = this.#parseBuckets(privateBuckets)
   }
 
   async boot() {
@@ -27,6 +31,53 @@ module.exports = class S3 extends Service {
       accessKey: this.#accessKey,
       secretKey: this.#secretKey
     })
+
+    await this.initBuckets()
+  }
+
+  #parseBuckets(value) {
+    if (!value) return []
+    return value
+      .split(',')
+      .map((name) => name.trim())
+      .filter(Boolean)
+  }
+
+  async initBuckets() {
+    for (const bucketName of this.#privateBuckets) {
+      await this.ensureBucket(bucketName, false)
+    }
+    for (const bucketName of this.#publicBuckets) {
+      await this.ensureBucket(bucketName, true)
+    }
+  }
+
+  async ensureBucket(bucketName, isPublic = false) {
+    const exists = await this.client.bucketExists(bucketName)
+    if (!exists) {
+      this.#container.get('logger').info(`Creating ${isPublic ? 'public' : 'private'} bucket ${bucketName}`)
+      await this.client.makeBucket(bucketName, 'us-east-1')
+    }
+
+    if (isPublic) {
+      await this.setBucketPublic(bucketName)
+    }
+  }
+
+  async setBucketPublic(bucketName) {
+    const policy = {
+      Version: '2012-10-17',
+      Statement: [
+        {
+          Effect: 'Allow',
+          Principal: { AWS: ['*'] },
+          Action: ['s3:GetObject'],
+          Resource: [`arn:aws:s3:::${bucketName}/*`],
+        },
+      ],
+    }
+    this.#container.get('logger').debug(`Setting public read policy on bucket ${bucketName}`)
+    return this.client.setBucketPolicy(bucketName, JSON.stringify(policy))
   }
 
   async saveFile(bucketName, fileName, file, contentType = 'binary/octet-stream') {

package/src/utils/EnvManager.js

@@ -31,6 +31,8 @@ module.exports = class EnvManager {
       S3_USE_SSL: true,
       S3_ACCESS_KEY: '',
       S3_SECRET_KEY: '',
+      S3_PUBLIC_BUCKETS: '',
+      S3_PRIVATE_BUCKETS: '',
       DISABLE_LOGGER: false,
       LOG_DIRECTORY: "./logs",
       QUEUES: '',