@joystick.js/node-canary 0.0.0-canary.344 → 0.0.0-canary.346

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

@@ -131,7 +131,6 @@ 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,
@@ -140,16 +139,17 @@ var queues_default = {
         completed_at text,
         failed_at text,
         error text,
+        environment text,
         attempts smallint
       )
     `);
-    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)`);
+    await db?.query(`ALTER TABLE queue_${this.queue.name} ADD COLUMN IF NOT EXISTS environment text`);
+    await db?.query(`ALTER TABLE queue_${this.queue.name} ADD COLUMN IF NOT EXISTS attempts smallint`);
+    await db?.query(`CREATE INDEX IF NOT EXISTS status_index ON queue_${this.queue.name} (status)`);
+    await db?.query(`CREATE INDEX IF NOT EXISTS status_nextRunAt_index ON queue_${this.queue.name} (status, next_run_at)`);
+    await db?.query(`CREATE INDEX IF NOT EXISTS nextJob_index ON queue_${this.queue.name} (status, environment, next_run_at, locked_by)`);
+    await db?.query(`CREATE INDEX IF NOT EXISTS completedAt_index ON queue_${this.queue.name} (completed_at)`);
+    await db?.query(`CREATE INDEX IF NOT EXISTS failedAt_index ON queue_${this.queue.name} (failed_at)`);
     if (this.queue.options?.cleanup?.completedAfterSeconds) {
       cron.schedule("*/30 * * * * *", () => {
         handleCleanupQueues({

package/dist/lib/constants.js

@@ -1,3 +1,5 @@
+const KILOBYTE = 1e3;
+const MEGABYTE = KILOBYTE * 1e3;
 const HTML_ENTITY_MAP = {
   "&": "&",
   "<": "&lt;",
@@ -9,5 +11,7 @@ const HTML_ENTITY_MAP = {
   "=": "&#x3D;"
 };
 export {
-  HTML_ENTITY_MAP
+  HTML_ENTITY_MAP,
+  KILOBYTE,
+  MEGABYTE
 };

package/dist/push/connectMongoDB.js

@@ -0,0 +1,21 @@
+import { MongoClient } from "mongodb";
+import { MEGABYTE } from "../lib/constants.js";
+const connectMongoDB = async () => {
+  const client = new MongoClient("mongodb://localhost:27017");
+  const db = client.db("push");
+  await db.collection("logs").drop();
+  await db.collection("metrics").drop();
+  await db.createCollection("logs", { capped: true, size: MEGABYTE * 50, max: 1e3 });
+  await db.createCollection("metrics", { capped: true, size: MEGABYTE * 50, max: 1e3 });
+  await db.collection("logs").createIndex({ timestamp: 1 });
+  await db.collection("metrics").createIndex({ timestamp: 1 });
+  await client.connect();
+  return {
+    client,
+    db
+  };
+};
+var connectMongoDB_default = connectMongoDB;
+export {
+  connectMongoDB_default as default
+};

package/dist/push/logs/index.js

@@ -1,7 +1,5 @@
-import { MongoClient } from "mongodb";
 import timestamps from "../../lib/timestamps";
-const KILOBYTE = 1e3;
-const MEGABYTE = KILOBYTE * 1e3;
+import connectMongoDB from "../connectMongoDB.js";
 const captureLog = (callback = null) => {
   process.stdout.write = (data) => {
     if (callback) {
@@ -24,22 +22,8 @@ const captureLog = (callback = null) => {
     }
   });
 };
-const connectMongoDB = async () => {
-  const client = new MongoClient("mongodb://localhost:27017");
-  const db = client.db("push");
-  try {
-    await db.createCollection("logs", { capped: true, size: MEGABYTE * 50, max: 1e3 });
-    await db.createCollection("metrics", { capped: true, size: MEGABYTE * 50, max: 1e3 });
-  } catch {
-  }
-  await client.connect();
-  return {
-    client,
-    db
-  };
-};
-const writeLogsToDisk = () => {
-  captureLog(async (source = "", data = "") => {
+var logs_default = () => {
+  return captureLog(async (source = "", data = "") => {
     const mongodb = await connectMongoDB();
     switch (source) {
       case "stdout":
@@ -65,9 +49,6 @@ const writeLogsToDisk = () => {
     }
   });
 };
-var logs_default = () => {
-  return writeLogsToDisk();
-};
 export {
   logs_default as default
 };

package/dist/websockets/index.js

@@ -4,10 +4,10 @@ var websockets_default = (serverName = "") => {
   return {
     send: (payload = {}, uniqueConnectionId = "") => {
       const emitterName = uniqueConnectionId ? `${serverName}_${uniqueConnectionId}` : serverName;
+      emitWebsocketEvent(emitterName, "message", payload);
       trackFunctionCall(`node.websockets.${serverName}.send`, [
         payload
       ]);
-      emitWebsocketEvent(emitterName, "message", payload);
     }
   };
 };

package/package.json

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