@joystick.js/node-canary 0.0.0-canary.31 → 0.0.0-canary.310

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

@@ -1,40 +1,47 @@
-import dayjs from "dayjs";
+import getTargetDatabaseProvider from "../../getTargetDatabaseProvider.js";
 var queues_default = {
   addJob: function(jobToAdd = {}) {
-    const db = process.databases._queues?.collection(`queue_${this.queue.name}`);
-    return db.insertOne(jobToAdd);
+    const db = this.db?.collection(`queue_${this.queue.name}`);
+    return db.insertOne({
+      ...jobToAdd,
+      attempts: 0
+    });
   },
   countJobs: function(status = "") {
-    const db = process.databases._queues?.collection(`queue_${this.queue.name}`);
+    const db = this.db?.collection(`queue_${this.queue.name}`);
     return db.countDocuments({ status });
   },
   deleteJob: function(jobId = "") {
-    const db = process.databases._queues?.collection(`queue_${this.queue.name}`);
+    const db = this.db?.collection(`queue_${this.queue.name}`);
     return db.deleteOne({ _id: jobId });
   },
+  deleteIncompleteJobsForMachine: function() {
+    const db = this.db?.collection(`queue_${this.queue.name}`);
+    return db.deleteMany({ status: { $in: ["incomplete", "running"] }, lockedBy: this.machineId });
+  },
   getJobs: function(query = {}) {
-    const db = process.databases._queues?.collection(`queue_${this.queue.name}`);
+    const db = this.db?.collection(`queue_${this.queue.name}`);
     return db.find(query).toArray();
   },
   getNextJobToRun: async function() {
-    const db = process.databases._queues?.collection(`queue_${this.queue.name}`);
+    const db = this.db?.collection(`queue_${this.queue.name}`);
     const nextJob = await db.findOneAndUpdate({
       $or: [
         {
           status: "pending",
-          nextRunAt: { $lte: dayjs().format() },
+          nextRunAt: { $lte: new Date().toISOString() },
           lockedBy: { $exists: false }
         },
         {
           status: "pending",
-          nextRunAt: { $lte: dayjs().format() },
+          nextRunAt: { $lte: new Date().toISOString() },
           lockedBy: null
         }
       ]
     }, {
       $set: {
         status: "running",
-        startedAt: dayjs().format(),
+        startedAt: new Date().toISOString(),
         lockedBy: this.machineId
       }
     }, {
@@ -44,19 +51,34 @@ var queues_default = {
     });
     return nextJob?.value;
   },
-  initializeDatabase: function() {
-    const db = process.databases._queues?.collection(`queue_${this.queue.name}`);
+  initializeDatabase: async function() {
+    const db = this.db?.collection(`queue_${this.queue.name}`);
+    const indexes = await this.db?.collection(`queue_${this.queue.name}`).indexes();
     db.createIndex({ status: 1 });
     db.createIndex({ status: 1, nextRunAt: 1 });
     if (this.queue.options?.cleanup?.completedAfterSeconds) {
+      if (indexes?.find((index) => index?.name === "completedAt_1")) {
+        await db.dropIndex({ completedAt: 1 });
+      }
       db.createIndex({ completedAt: 1 }, { expireAfterSeconds: this?.queue?.options?.cleanup?.completedAfterSeconds });
     }
     if (this.queue.options?.cleanup?.failedAfterSeconds) {
+      if (indexes?.find((index) => index?.name === "failedAt_1")) {
+        await db.dropIndex({ failedAt: 1 });
+      }
       db.createIndex({ failedAt: 1 }, { expireAfterSeconds: this?.queue?.options?.cleanup?.failedAfterSeconds });
     }
   },
+  logAttempt: function(jobId = "") {
+    const db = this.db?.collection(`queue_${this.queue.name}`);
+    return db.updateOne({ _id: jobId }, {
+      $inc: {
+        attempts: 1
+      }
+    });
+  },
   requeueJob: function(jobId = "", nextRunAt = null) {
-    const db = process.databases._queues?.collection(`queue_${this.queue.name}`);
+    const db = this.db?.collection(`queue_${this.queue.name}`);
     return db.updateOne({ _id: jobId }, {
       $set: {
         status: "pending",
@@ -67,35 +89,27 @@ var queues_default = {
       }
     });
   },
-  setJobsForMachineIncomplete: function() {
-    const db = process.databases._queues?.collection(`queue_${this.queue.name}`);
-    return db.updateMany({ status: "running", lockedBy: this.machineId }, {
-      $set: {
-        status: "incomplete"
-      }
-    });
-  },
   setJobCompleted: function(jobId = "") {
-    const db = process.databases._queues?.collection(`queue_${this.queue.name}`);
+    const db = this.db?.collection(`queue_${this.queue.name}`);
     return db.updateOne({ _id: jobId }, {
       $set: {
         status: "completed",
-        completedAt: dayjs().format()
+        completedAt: new Date(new Date().toISOString())
       }
     });
   },
   setJobFailed: function(jobId = "", error = "") {
-    const db = process.databases._queues?.collection(`queue_${this.queue.name}`);
+    const db = this.db?.collection(`queue_${this.queue.name}`);
     return db.updateOne({ _id: jobId }, {
       $set: {
         status: "failed",
-        failedAt: dayjs().format(),
+        failedAt: new Date(new Date().toISOString()),
         error
       }
     });
   },
   setJobsForMachinePending: function() {
-    const db = process.databases._queues?.collection(`queue_${this.queue.name}`);
+    const db = this.db?.collection(`queue_${this.queue.name}`);
     return db.updateMany({ status: { $in: ["pending", "running"] }, lockedBy: this.machineId }, {
       $set: {
         status: "pending"

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

@@ -0,0 +1,26 @@
+import dayjs from "dayjs";
+import generateId from "../../../../lib/generateId";
+var sessions_default = {
+  create_session: async () => {
+    const session_id = generateId();
+    await process.databases._sessions?.collection("sessions").insertOne({
+      _id: session_id,
+      csrf: generateId(32),
+      createdAt: new Date().toISOString()
+    });
+    return session_id;
+  },
+  get_session: async (input = {}) => {
+    return process.databases._sessions?.collection("sessions").findOne({
+      _id: input?.session_id
+    });
+  },
+  delete_expired_sessions: async () => {
+    return process.databases._sessions?.collection("sessions").deleteMany({
+      createdAt: { $lte: dayjs().subtract(1, "hour").format() }
+    });
+  }
+};
+export {
+  sessions_default as default
+};

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

@@ -0,0 +1,10 @@
+const createIndex = async (indexName = "", tableName = "", tableColumns = []) => {
+  return process.databases._sessions?.query(`CREATE INDEX IF NOT EXISTS ${indexName} ON ${tableName}(${tableColumns.join(", ")})`);
+};
+var createSessionsIndexes_default = async () => {
+  await createIndex("session_by_id", "sessions", ["session_id"]);
+  await createIndex("session_created_at", "sessions", ["created_at"]);
+};
+export {
+  createSessionsIndexes_default as default
+};

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

@@ -0,0 +1,14 @@
+const createTable = async (table = "", tableColumns = []) => {
+  return process.databases._sessions?.query(`CREATE TABLE IF NOT EXISTS ${table} (${tableColumns.join(", ")})`);
+};
+var createSessionsTables_default = async () => {
+  await createTable("sessions", [
+    "id bigserial primary key",
+    "session_id text",
+    "csrf text",
+    "created_at text"
+  ]);
+};
+export {
+  createSessionsTables_default as default
+};

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

@@ -0,0 +1,35 @@
+const get_future_timestamp = (timestamp, seconds = 0) => {
+  const date = new Date(timestamp);
+  date.setSeconds(date.getSeconds() + seconds);
+  return date.toISOString();
+};
+var handleCleanupQueues_default = async ({
+  database = {},
+  table = "",
+  seconds = 0
+}) => {
+  const jobs_with_status = await database.query(`
+		SELECT * FROM ${table} WHERE status = ANY($1)
+	`, [
+    ["completed", "failed"]
+  ]);
+  const jobs_to_cleanup = jobs_with_status?.filter((job = {}) => {
+    if (job?.status === "completed") {
+      const completed_at_with_seconds = get_future_timestamp(job?.completed_at, seconds);
+      return completed_at_with_seconds <= new Date().toISOString();
+    }
+    if (job?.status === "failed") {
+      const failed_at_with_seconds = get_future_timestamp(job?.failed_at, seconds);
+      return failed_at_with_seconds <= new Date().toISOString();
+    }
+    return false;
+  });
+  await database.query(`
+		DELETE FROM ${table} WHERE _id = ANY($1)
+	`, [
+    jobs_to_cleanup?.map(({ _id }) => _id)
+  ]);
+};
+export {
+  handleCleanupQueues_default as default
+};

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

@@ -1,6 +1,8 @@
 import postgresql from "pg";
 import chalk from "chalk";
 import os from "os";
+import fs from "fs";
+import generate_sql_from_object from "../generate_sql_from_object";
 const { Pool } = postgresql;
 var postgresql_default = async (settings = {}, databasePort = 2610) => {
   const connection = settings?.connection || {
@@ -13,18 +15,78 @@ var postgresql_default = async (settings = {}, databasePort = 2610) => {
   };
   try {
     const host = connection.hosts && connection.hosts[0];
-    const pool = new Pool({
+    const connection_config = {
       user: connection?.username || "",
       database: connection?.database,
       password: connection?.password || "",
       host: host?.hostname,
       port: host?.port,
       ...settings?.options || {}
-    });
+    };
+    if (settings?.options?.ssl?.ca) {
+      connection_config.ssl = {
+        ca: fs.readFileSync(settings?.options?.ssl?.ca)
+      };
+    }
+    const pool = new Pool(connection_config);
     return {
       pool,
-      query: (...args) => {
-        return pool.query(...args).then((response) => {
+      query: (...args2) => {
+        return pool.query(...args2).then((response) => {
+          return response?.rows || [];
+        }).catch((error) => {
+          console.log(chalk.redBright(`
+Failed SQL Statement:
+`));
+          console.log(args2[0]);
+          console.log(`
+`);
+          console.log(chalk.redBright(`
+Failed Values:
+`));
+          console.log(args2[1]);
+          throw error;
+        });
+      },
+      select: (options = {}) => {
+        const select = generate_sql_from_object.select(options);
+        return pool.query(select.statement, select.where).then((response) => {
+          return response?.rows || [];
+        }).catch((error) => {
+          console.log(chalk.redBright(`
+Failed SQL Statement:
+`));
+          console.log(args[0]);
+          console.log(`
+`);
+          console.log(chalk.redBright(`
+Failed Values:
+`));
+          console.log(args[1]);
+          throw error;
+        });
+      },
+      insert: (options = {}) => {
+        const insert = generate_sql_from_object.insert(options);
+        return pool.query(insert.statement, insert.values).then((response) => {
+          return response?.rows || [];
+        }).catch((error) => {
+          console.log(chalk.redBright(`
+Failed SQL Statement:
+`));
+          console.log(args[0]);
+          console.log(`
+`);
+          console.log(chalk.redBright(`
+Failed Values:
+`));
+          console.log(args[1]);
+          throw error;
+        });
+      },
+      update: (options = {}) => {
+        const update = generate_sql_from_object.update(options);
+        return pool.query(update.statement, update.values).then((response) => {
           return response?.rows || [];
         }).catch((error) => {
           console.log(chalk.redBright(`

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

@@ -21,7 +21,7 @@ var accounts_default = {
   },
   createUser: async (input = {}) => {
     const userId = generateId();
-    const keys = ["user_id", ...Object.keys(input) || []]?.map((inputKey) => {
+    const keys = ["user_id", ...Object.keys(input || {}) || []]?.map((inputKey) => {
       return camelPascalToSnake(inputKey);
     })?.join(",");
     const values = [userId, ...Object.values(input) || []];
@@ -43,8 +43,11 @@ var accounts_default = {
     }
     return null;
   },
+  deleteUser: async (input = {}) => {
+    await process.databases._users?.query(`DELETE FROM users WHERE user_id = $1`, [input?.userId]);
+  },
   deleteOldSessions: async (input = {}) => {
-    await process.databases._users?.query(`DELETE FROM users_sessions WHERE user_id = $1 AND token_expires_at::date < NOW()`, [input?.userId]);
+    await process.databases._users?.query(`DELETE FROM users_sessions WHERE user_id = $1 AND token_expires_at::timestamp < NOW()`, [input?.userId]);
   },
   addSession: async (input = {}) => {
     await process.databases._users?.query(`INSERT INTO users_sessions(user_id, token, token_expires_at) VALUES ($1, $2, $3);`, [input?.userId, input?.session?.token, input?.session?.tokenExpiresAt]);

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

@@ -1,27 +1,30 @@
-import dayjs from "dayjs";
+import cron from "node-cron";
+import handleCleanupQueues from "../handleCleanupQueues";
 var queues_default = {
   addJob: function(jobToAdd = {}) {
-    const db = process.databases._queues;
+    const db = this?.db;
     return db?.query(`
       INSERT INTO queue_${this.queue.name} (
         _id,
         status,
         job,
         payload,
-        next_run_at
+        next_run_at,
+        attempts
       ) VALUES (
-        $1, $2, $3, $4, $5
+        $1, $2, $3, $4, $5, $6
       )
     `, [
       jobToAdd?._id,
       jobToAdd?.status,
       jobToAdd?.job,
       JSON.stringify(jobToAdd?.payload),
-      jobToAdd?.nextRunAt
+      jobToAdd?.nextRunAt,
+      0
     ]);
   },
   countJobs: async function(status = "") {
-    const db = process.databases._queues;
+    const db = this?.db;
     const [jobs] = await db?.query(`
       SELECT
         count(*)
@@ -35,7 +38,7 @@ var queues_default = {
     return Promise.resolve(jobs.count);
   },
   deleteJob: function(jobId = "") {
-    const db = process.databases._queues;
+    const db = this?.db;
     return db?.query(`
       DELETE FROM
         queue_${this.queue.name}
@@ -45,8 +48,22 @@ var queues_default = {
       jobId
     ]);
   },
+  deleteIncompleteJobsForMachine: function() {
+    const db = this?.db;
+    return db?.query(`
+      DELETE FROM
+        queue_${this.queue.name}
+      WHERE
+        status = ANY($1)
+      AND
+        locked_by = $2
+    `, [
+      ["incomplete", "running"],
+      this.machineId
+    ]);
+  },
   getJobs: function(query = {}) {
-    const db = process.databases._queues;
+    const db = this?.db;
     return db?.query(`
       SELECT * FROM
         queue_${this.queue.name}
@@ -59,14 +76,14 @@ var queues_default = {
     ]);
   },
   getNextJobToRun: async function() {
-    const db = process.databases._queues;
+    const db = this?.db;
     const [nextJob] = await db?.query(`
       SELECT * FROM
         queue_${this.queue.name}
       WHERE
         status = $1
       AND
-        next_run_at::date <= NOW()
+        next_run_at::timestamp <= NOW()
       AND
         locked_by IS NULL
       ORDER BY
@@ -86,7 +103,7 @@ var queues_default = {
           _id = $4
       `, [
         "running",
-        dayjs().format(),
+        new Date().toISOString(),
         this.machineId,
         nextJob?._id
       ]);
@@ -97,7 +114,7 @@ var queues_default = {
     } : {};
   },
   initializeDatabase: async function() {
-    const db = process.databases._queues;
+    const db = this?.db;
     await db?.query(`
       CREATE TABLE IF NOT EXISTS queue_${this.queue.name} (
         _id text PRIMARY KEY,
@@ -109,51 +126,67 @@ var queues_default = {
         started_at text,
         completed_at text,
         failed_at text,
-        error text
+        error text,
+        attempts smallint
       )
     `);
+    db?.query(`ALTER TABLE queue_${this.queue.name} ADD COLUMN IF NOT EXISTS attempts smallint`);
     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 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) {
+      cron.schedule("*/30 * * * * *", () => {
+        handleCleanupQueues({
+          database: db,
+          table: `queue_${this.queue.name}`,
+          seconds: this.queue.options?.cleanup?.completedAfterSeconds
+        });
+      });
+    }
+    if (this.queue.options?.cleanup?.failedAfterSeconds) {
+      cron.schedule("*/30 * * * * *", () => {
+        handleCleanupQueues({
+          database: db,
+          table: `queue_${this.queue.name}`,
+          seconds: this.queue.options?.cleanup?.failedAfterSeconds
+        });
+      });
+    }
   },
-  requeueJob: function(jobId = "", nextRunAt = null) {
-    const db = process.databases._queues;
+  logAttempt: function(jobId = "") {
+    const db = this?.db;
     return db?.query(`
       UPDATE
         queue_${this.queue.name}
       SET
-        status = $1,
-        next_run_at = $2,
-        locked_by = $3
+        attempts = attempts + 1
       WHERE
-        _id = $4
+        _id = $1
     `, [
-      "pending",
-      nextRunAt,
-      null,
       jobId
     ]);
   },
-  setJobsForMachineIncomplete: function() {
-    const db = process.databases._queues;
+  requeueJob: function(jobId = "", nextRunAt = null) {
+    const db = this?.db;
     return db?.query(`
       UPDATE
         queue_${this.queue.name}
       SET
-        status = $1
-      WHERE
-        status = $2
-      AND
+        status = $1,
+        next_run_at = $2,
         locked_by = $3
+      WHERE
+        _id = $4
     `, [
-      "incomplete",
-      "running",
-      this.machineId
+      "pending",
+      nextRunAt,
+      null,
+      jobId
     ]);
   },
   setJobCompleted: function(jobId = "") {
-    const db = process.databases._queues;
+    const db = this?.db;
     return db?.query(`
       UPDATE
         queue_${this.queue.name}
@@ -164,12 +197,12 @@ var queues_default = {
         _id = $3
     `, [
       "completed",
-      dayjs().format(),
+      new Date().toISOString(),
       jobId
     ]);
   },
   setJobFailed: function(jobId = "", error = "") {
-    const db = process.databases._queues;
+    const db = this?.db;
     return db?.query(`
       UPDATE
         queue_${this.queue.name}
@@ -181,13 +214,13 @@ var queues_default = {
         _id = $4
     `, [
       "failed",
-      dayjs().format(),
+      new Date().toISOString(),
       error,
       jobId
     ]);
   },
   setJobsForMachinePending: function() {
-    const db = process.databases._queues;
+    const db = this?.db;
     return db?.query(`
       UPDATE
         queue_${this.queue.name}

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

@@ -0,0 +1,43 @@
+import generateId from "../../../../lib/generateId";
+var sessions_default = {
+  create_session: async (input = {}) => {
+    const session_id = generateId();
+    await process.databases._sessions?.query(`
+			INSERT INTO
+				sessions (
+					session_id,
+					csrf,
+					created_at
+				)
+			VALUES ($1, $2, $3)
+		`, [
+      session_id,
+      generateId(32),
+      new Date().toISOString()
+    ]);
+    return session_id;
+  },
+  get_session: async (input = {}) => {
+    const [session] = await process.databases._sessions?.query(`
+			SELECT * FROM
+				sessions
+			WHERE
+				session_id = $1
+		`, [
+      input?.session_id
+    ]);
+    return session;
+  },
+  delete_expired_sessions: async () => {
+    const date = new Date();
+    date.setHours(date.getHours() - 1);
+    return process.databases.postgresql.query(`
+			DELETE FROM sessions WHERE created_at::timestamp < $1
+		`, [
+      date.toISOString()
+    ]);
+  }
+};
+export {
+  sessions_default as default
+};

package/dist/app/databases/queryMap.js

@@ -1,15 +1,19 @@
 import mongodbAccountsQueries from "./mongodb/queries/accounts";
 import mongodbQueuesQueries from "./mongodb/queries/queues";
+import mongodbSessionsQueries from "./mongodb/queries/sessions";
 import postgresqlAccountsQueries from "./postgresql/queries/accounts";
 import postgresqlQueuesQueries from "./postgresql/queries/queues";
+import postgresqlSessionsQueries from "./postgresql/queries/sessions";
 var queryMap_default = {
   mongodb: {
     accounts: mongodbAccountsQueries,
-    queues: mongodbQueuesQueries
+    queues: mongodbQueuesQueries,
+    sessions: mongodbSessionsQueries
   },
   postgresql: {
     accounts: postgresqlAccountsQueries,
-    queues: postgresqlQueuesQueries
+    queues: postgresqlQueuesQueries,
+    sessions: postgresqlSessionsQueries
   }
 };
 export {

package/dist/app/databases/stringToSnakeCase.js

@@ -0,0 +1,6 @@
+var stringToSnakeCase_default = (string = "") => {
+  return string?.split(/\.?(?=[A-Z])/).join("_").toLowerCase();
+};
+export {
+  stringToSnakeCase_default as default
+};

package/dist/app/getBrowserSafeRequest.js

@@ -1,8 +1,9 @@
 import getBrowserSafeUser from "./accounts/getBrowserSafeUser";
+import escapeKeyValuePair from "../lib/escapeKeyValuePair.js";
 var getBrowserSafeRequest_default = (req = {}) => {
   const browserSafeRequest = {};
-  browserSafeRequest.params = req.params;
-  browserSafeRequest.query = req.query;
+  browserSafeRequest.params = escapeKeyValuePair(req.params);
+  browserSafeRequest.query = escapeKeyValuePair(req.query);
   browserSafeRequest.context = {
     user: getBrowserSafeUser(req.context.user)
   };