@joystick.js/node-canary 0.0.0-canary.321 → 0.0.0-canary.323

package/dist/app/databases/mongodb/queries/queues.js

@@ -21,7 +21,10 @@ var queues_default = {
   },
   getJobs: function(query = {}) {
     const db = this.db?.collection(`queue_${this.queue.name}`);
-    return db.find(query).toArray();
+    return db.find({
+      ...query,
+      environment: process.env.NODE_ENV
+    }).toArray();
   },
   getNextJobToRun: async function() {
     const db = this.db?.collection(`queue_${this.queue.name}`);
@@ -29,11 +32,13 @@ var queues_default = {
       $or: [
         {
           status: "pending",
+          environment: process.env.NODE_ENV,
           nextRunAt: { $lte: new Date().toISOString() },
           lockedBy: { $exists: false }
         },
         {
           status: "pending",
+          environment: process.env.NODE_ENV,
           nextRunAt: { $lte: new Date().toISOString() },
           lockedBy: null
         }
@@ -56,6 +61,7 @@ var queues_default = {
     const indexes = await this.db?.collection(`queue_${this.queue.name}`).indexes();
     db.createIndex({ status: 1 });
     db.createIndex({ status: 1, nextRunAt: 1 });
+    db.createIndex({ status: 1, environment: 1, nextRunAt: 1, lockedBy: 1 });
     if (this.queue.options?.cleanup?.completedAfterSeconds) {
       if (indexes?.find((index) => index?.name === "completedAt_1")) {
         await db.dropIndex({ completedAt: 1 });
@@ -110,7 +116,10 @@ var queues_default = {
   },
   setJobsForMachinePending: function() {
     const db = this.db?.collection(`queue_${this.queue.name}`);
-    return db.updateMany({ status: { $in: ["pending", "running"] }, lockedBy: this.machineId }, {
+    return db.updateMany({
+      status: { $in: ["pending", "running"] },
+      lockedBy: this.machineId
+    }, {
       $set: {
         status: "pending"
       },

package/dist/app/databases/postgresql/handleCleanupQueues.js

@@ -9,9 +9,10 @@ var handleCleanupQueues_default = async ({
   seconds = 0
 }) => {
   const jobs_with_status = await database.query(`
-		SELECT * FROM ${table} WHERE status = ANY($1)
+		SELECT * FROM ${table} WHERE status = ANY($1) AND environment = $2
 	`, [
-    ["completed", "failed"]
+    ["completed", "failed"],
+    process.env.NODE_ENV
   ]);
   const jobs_to_cleanup = jobs_with_status?.filter((job = {}) => {
     if (job?.status === "completed") {

package/dist/app/databases/postgresql/queries/queues.js

@@ -7,16 +7,18 @@ var queues_default = {
       INSERT INTO queue_${this.queue.name} (
         _id,
         status,
+        environment,
         job,
         payload,
         next_run_at,
         attempts
       ) VALUES (
-        $1, $2, $3, $4, $5, $6
+        $1, $2, $3, $4, $5, $6, $7
       )
     `, [
       jobToAdd?._id,
       jobToAdd?.status,
+      jobToAdd?.environment,
       jobToAdd?.job,
       JSON.stringify(jobToAdd?.payload),
       jobToAdd?.nextRunAt,
@@ -70,9 +72,12 @@ var queues_default = {
       ${query?.status ? `
         WHERE
           status = $1
+        AND
+          environment = $2
       ` : ""}
     `, [
-      query?.status
+      query?.status,
+      process.env.NODE_ENV
     ]);
   },
   getNextJobToRun: async function() {
@@ -83,13 +88,16 @@ var queues_default = {
       WHERE
         status = $1
       AND
-        next_run_at::timestamp <= $2
+        environment = $2
+      AND
+        next_run_at::timestamp <= $3
       AND
         locked_by IS NULL
       ORDER BY
         next_run_at ASC
     `, [
       "pending",
+      process.env.NODE_ENV,
       new Date().toISOString()
     ]);
     if (nextJob?._id) {
@@ -120,6 +128,7 @@ var queues_default = {
       CREATE TABLE IF NOT EXISTS queue_${this.queue.name} (
         _id text PRIMARY KEY,
         status text,
+        environment text,
         job text,
         payload text,
         next_run_at text,
@@ -132,8 +141,10 @@ var queues_default = {
       )
     `);
     db?.query(`ALTER TABLE queue_${this.queue.name} ADD COLUMN IF NOT EXISTS attempts smallint`);
+    db?.query(`ALTER TABLE queue_${this.queue.name} ADD COLUMN IF NOT EXISTS environment text`);
     db?.query(`CREATE INDEX IF NOT EXISTS status_index ON queue_${this.queue.name} (status)`);
     db?.query(`CREATE INDEX IF NOT EXISTS status_nextRunAt_index ON queue_${this.queue.name} (status, next_run_at)`);
+    db?.query(`CREATE INDEX IF NOT EXISTS nextJob_index ON queue_${this.queue.name} (status, environment, next_run_at, locked_by)`);
     db?.query(`CREATE INDEX IF NOT EXISTS completedAt_index ON queue_${this.queue.name} (completed_at)`);
     db?.query(`CREATE INDEX IF NOT EXISTS failedAt_index ON queue_${this.queue.name} (failed_at)`);
     if (this.queue.options?.cleanup?.completedAfterSeconds) {

package/dist/app/queues/index.js

@@ -56,6 +56,7 @@ class Queue {
     this.db.addJob({
       _id: generateId(),
       status: "pending",
+      environment: process.env.NODE_ENV,
       ...options,
       nextRunAt
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joystick.js/node-canary",
-  "version": "0.0.0-canary.321",
+  "version": "0.0.0-canary.323",
   "type": "module",
   "description": "A Node.js framework for building web apps.",
   "main": "./dist/index.js",