@joystick.js/node-canary 0.0.0-canary.324 → 0.0.0-canary.326

package/dist/app/index.js

@@ -71,7 +71,7 @@ class App {
     this.initWebsockets(options?.websockets || {});
     this.initAccounts(options?.accounts);
     this.initTests();
-    this.initDeploy();
+    this.initPush();
     this.initAPI(options?.api);
     this.initUploaders(options?.uploaders);
     this.initIndexes(options?.indexes);
@@ -278,8 +278,8 @@ class App {
       });
     }
   }
-  initDeploy() {
-    if (process.env.NODE_ENV === "production" && process.env.IS_PUSH_DEPLOYED) {
+  initPush() {
+    if (process.env.NODE_ENV !== "development" && process.env.IS_PUSH_DEPLOYED) {
       this.express.app.get("/api/_push/pre-version", async (req, res) => {
         const instanceToken = fs.readFileSync("/root/push/instance_token.txt", "utf-8");
         if (req?.headers["x-instance-token"] === instanceToken?.replace("\n", "")) {

package/dist/app/queues/index.js

@@ -31,7 +31,7 @@ class Queue {
           }
         });
         return boundQueries;
-      }, {});
+      }, { _connection: db });
       if (!is_external) {
         await this.db.initializeDatabase(queuesDatabase);
         if (this?.options?.runOnStartup) {
@@ -51,7 +51,21 @@ class Queue {
     }
     return process.databases._queues;
   }
-  add(options = {}) {
+  async add(options = {}) {
+    const job_to_add = {
+      _id: generateId(),
+      status: "pending",
+      environment: process.env.NODE_ENV,
+      ...options,
+      nextRunAt
+    };
+    const job_definition = this.options.jobs[options?.job];
+    if (job_definition && typeof job_definition?.preflight?.onBeforeAdd === "function") {
+      const canAddJob = await job_definition?.preflight?.onBeforeAdd(job_to_add, this.db._connection, this.name);
+      if (!canAddJob) {
+        return null;
+      }
+    }
     const nextRunAt = options?.nextRunAt === "now" || !options?.nextRunAt ? new Date().toISOString() : options?.nextRunAt;
     this.db.addJob({
       _id: generateId(),

package/package.json

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