@joystick.js/node-canary 0.0.0-canary.345 → 0.0.0-canary.347

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

@@ -6,7 +6,7 @@ var sessions_default = {
     await process.databases._sessions?.collection("sessions").insertOne({
       _id: session_id,
       csrf: generateId(32),
-      createdAt: new Date().toISOString()
+      createdAt: new Date(new Date().toISOString())
     });
     return session_id;
   },

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/index.js

@@ -17,9 +17,7 @@ import pushLogs from "./push/logs/index.js";
 import nodeUrlPolyfills from "./lib/nodeUrlPolyfills.js";
 import sendEmail from "./email/send";
 const { readFile } = fs.promises;
-if (process.env.NODE_ENV !== "development" && process.env.IS_PUSH_DEPLOYED) {
-  pushLogs();
-}
+await pushLogs();
 const generate_sql_from_object = _generate_sql_from_object;
 const accounts = _accounts;
 const action = _action;

package/dist/push/connectMongoDB.js

@@ -1,21 +1,30 @@
 import { MongoClient } from "mongodb";
 import { MEGABYTE } from "../lib/constants.js";
-const connectMongoDB = async () => {
+const connect_mongodb = 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
-  };
+  const existing_collections = (await db.listCollections().toArray())?.map((collection) => collection?.name);
+  const has_logs_collection = existing_collections?.includes("logs");
+  const has_metrics_collection = existing_collections?.includes("metrics");
+  if (!has_logs_collection) {
+    await db.createCollection("logs", { capped: true, size: MEGABYTE * 50, max: 1e3 });
+  }
+  if (!has_metrics_collection) {
+    await db.createCollection("metrics", { capped: true, size: MEGABYTE * 50, max: 1e3 });
+  }
+  const logs_index = (await db.collection("logs").listIndexes().toArray())?.find((index) => index?.name === "timestamp_1");
+  const metrics_index = (await db.collection("metrics").listIndexes().toArray())?.find((index) => index?.name === "timestamp_1");
+  if (!logs_index) {
+    await db.collection("logs").createIndex({ timestamp: 1 });
+  }
+  if (!metrics_index) {
+    await db.collection("metrics").createIndex({ timestamp: 1 });
+  }
+  return db;
 };
-var connectMongoDB_default = connectMongoDB;
+var connectMongoDB_default = connect_mongodb;
 export {
   connectMongoDB_default as default
 };

package/dist/push/logs/index.js

@@ -22,28 +22,26 @@ const captureLog = (callback = null) => {
     }
   });
 };
-var logs_default = () => {
+var logs_default = async () => {
+  const mongodb = await connectMongoDB();
   return captureLog(async (source = "", data = "") => {
-    const mongodb = await connectMongoDB();
     switch (source) {
       case "stdout":
-        await mongodb.db.collection("logs").insertOne({
+        await mongodb.collection("logs").insertOne({
           error: false,
           timestamp: timestamps.get_current_time(),
           process_id: process.pid,
           data
         });
-        return mongodb.client.close();
       case "stderr":
       case "uncaughtException":
       case "unhandledRejection":
-        await mongodb.db.collection("logs").insertOne({
+        await mongodb.collection("logs").insertOne({
           error: true,
           timestamp: timestamps.get_current_time(),
           process_id: process.pid,
           data
         });
-        return mongodb.client.close();
       default:
         return;
     }

package/package.json

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