neosqlite 1.0.14 → 1.0.16

package/lib/package.json

@@ -1,7 +1,7 @@
 {
     "name": "neosqlite",
     "description": "A lightweight wrapper around better-sqlite3 that adds developer-friendly features like job scheduling, migrations, error handling, query logging, SQL utilities, and more",
-    "version": "1.0.14",
+    "version": "1.0.16",
     "main": "lib/src/index.js",
     "scripts": {
         "build": "tsc",

package/lib/src/client/util.js

@@ -21,12 +21,15 @@ const runQuery = (config, params, fn) => {
     const result = fn();
     const endTime = process.hrtime(startTime);
     const endTimeMs = endTime[0] * 1_000 + endTime[1] / 1_000_000;
-    if (config.onQueryComplete || config.onQueryLog) {
+    if (config.onQueryComplete || config.onQueryLog || config.onQueryTime) {
         const queryString = (0, exports.getFullQueryString)(params);
         config.onQueryComplete?.({ query: queryString, time: endTimeMs });
         if (typeof params === "object" && params.logQuery) {
             config.onQueryLog?.(queryString);
         }
+        if (typeof params === "object" && params.timeQuery) {
+            config.onQueryTime?.(endTimeMs);
+        }
     }
     return result;
 };

package/lib/src/jobs/index.js

@@ -96,7 +96,7 @@ class NeosqliteJobs {
         const interval = cron_parser_1.default.parse(cronString);
         const runAt = interval.next().toDate();
         this.db.write({
-            sql: (0, util_1.queryString)("INSERT OR IGNORE INTO " + this.jobsTable, "(name, data, runAt, priority, cron)", "VALUES (:name, :data, :runAt, :priority, :cron)"),
+            sql: (0, util_1.queryString)("INSERT INTO " + this.jobsTable + " (name, data, runAt, priority, cron)", "VALUES (:name, :data, :runAt, :priority, :cron)", "ON CONFLICT DO UPDATE SET cron = :cron, data = :data, priority = :priority, runAt = :runAt"),
             args: {
                 name: job.name,
                 priority: job.options.priority ?? 0,
@@ -116,6 +116,9 @@ class NeosqliteJobs {
         this.db.write((0, util_1.queryString)("CREATE TABLE IF NOT EXISTS " + this.jobsTable + " (", "  id INTEGER PRIMARY KEY AUTOINCREMENT,", "  name TEXT NOT NULL,", "  data TEXT,", "  runAt DATETIME NOT NULL,", "  priority INTEGER DEFAULT 0,", "  cron TEXT,", "  attempts INTEGER DEFAULT 0,", "  status TEXT CHECK (status IN ( " + jobStatuses + ")) DEFAULT '" + types_1.JobStatus.Pending + "',", "  updatedAt DATETIME DEFAULT CURRENT_TIMESTAMP,", "  createdAt DATETIME DEFAULT CURRENT_TIMESTAMP", ")"));
         // Prevent multiple cron jobs from getting scheduled for the same dates
         this.db.write(`CREATE UNIQUE INDEX IF NOT EXISTS idx_${this.jobsTable}_name_cron_runAt ON ${this.jobsTable} (name, cron, runAt)`);
+        // Only allow cron jobs to have one scheduled run at a time, so that updating a crons syntax is easier, and immediately updates
+        this.db.write(`CREATE UNIQUE INDEX IF NOT EXISTS idx_${this.jobsTable}_name_cron_status ON ${this.jobsTable} (name, cron, status) WHERE cron IS NOT NULL AND status IN ('${types_1.JobStatus.Pending}');`);
+        // Allow faster querying of pending jobs
         this.db.write(`CREATE INDEX IF NOT EXISTS idx_${this.jobsTable}_status_runAt_priority ON ${this.jobsTable} (status, runAt, priority DESC)`);
     }
     /**

package/lib/src/types.d.ts

@@ -4,6 +4,8 @@ export type NeosqliteConfig = {
     file: ":memory:" | string;
     /** When a query is logged using `logQuery: true`, you will receive the full query string via this callback */
     onQueryLog?: (query: string) => void;
+    /** When a query is timed using `timeQuery: true` you will receive the full query time via this callback (in ms) */
+    onQueryTime?: (time: number) => void;
     /** When a query finishes, gather data about the query from this callback */
     onQueryComplete?: (data: OnQueryFinishData) => void;
 };
@@ -39,6 +41,8 @@ export type OnQueryFinishData = {
 export type QueryParams = {
     /** The SQL query to execute */
     sql: string;
+    /** When true, logs the time that a query took to onQuery */
+    timeQuery?: boolean;
     /** When true, the query string will be sent to onQueryLog */
     logQuery?: boolean;
     /** The values to bind to the query string */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "neosqlite",
   "description": "A lightweight wrapper around better-sqlite3 that adds developer-friendly features like job scheduling, migrations, error handling, query logging, SQL utilities, and more",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "main": "lib/src/index.js",
   "scripts": {
     "build": "tsc",

package/src/client/util.ts

@@ -25,7 +25,7 @@ export const runQuery = (config: NeosqliteConfig, params: ExecuteQueryParams, fn
   const endTime = process.hrtime(startTime);
   const endTimeMs = endTime[0] * 1_000 + endTime[1] / 1_000_000;
 
-  if (config.onQueryComplete || config.onQueryLog) {
+  if (config.onQueryComplete || config.onQueryLog || config.onQueryTime) {
     const queryString = getFullQueryString(params);
 
     config.onQueryComplete?.({ query: queryString, time: endTimeMs });
@@ -33,6 +33,10 @@ export const runQuery = (config: NeosqliteConfig, params: ExecuteQueryParams, fn
     if (typeof params === "object" && params.logQuery) {
       config.onQueryLog?.(queryString);
     }
+
+    if (typeof params === "object" && params.timeQuery) {
+      config.onQueryTime?.(endTimeMs);
+    }
   }
 
   return result;

package/src/jobs/index.ts

@@ -126,9 +126,9 @@ export class NeosqliteJobs {
 
     this.db.write({
       sql: queryString(
-        "INSERT OR IGNORE INTO " + this.jobsTable,
-        "(name, data, runAt, priority, cron)",
+        "INSERT INTO " + this.jobsTable + " (name, data, runAt, priority, cron)",
         "VALUES (:name, :data, :runAt, :priority, :cron)",
+        "ON CONFLICT DO UPDATE SET cron = :cron, data = :data, priority = :priority, runAt = :runAt",
       ),
       args: {
         name: job.name,
@@ -169,6 +169,13 @@ export class NeosqliteJobs {
     this.db.write(
       `CREATE UNIQUE INDEX IF NOT EXISTS idx_${this.jobsTable}_name_cron_runAt ON ${this.jobsTable} (name, cron, runAt)`,
     );
+
+    // Only allow cron jobs to have one scheduled run at a time, so that updating a crons syntax is easier, and immediately updates
+    this.db.write(
+      `CREATE UNIQUE INDEX IF NOT EXISTS idx_${this.jobsTable}_name_cron_status ON ${this.jobsTable} (name, cron, status) WHERE cron IS NOT NULL AND status IN ('${JobStatus.Pending}');`,
+    );
+
+    // Allow faster querying of pending jobs
     this.db.write(
       `CREATE INDEX IF NOT EXISTS idx_${this.jobsTable}_status_runAt_priority ON ${this.jobsTable} (status, runAt, priority DESC)`,
     );

package/src/types.ts

@@ -7,6 +7,9 @@ export type NeosqliteConfig = {
   /** When a query is logged using `logQuery: true`, you will receive the full query string via this callback */
   onQueryLog?: (query: string) => void;
 
+  /** When a query is timed using `timeQuery: true` you will receive the full query time via this callback (in ms) */
+  onQueryTime?: (time: number) => void;
+
   /** When a query finishes, gather data about the query from this callback */
   onQueryComplete?: (data: OnQueryFinishData) => void;
 };
@@ -52,6 +55,9 @@ export type QueryParams = {
   /** The SQL query to execute */
   sql: string;
 
+  /** When true, logs the time that a query took to onQuery */
+  timeQuery?: boolean;
+
   /** When true, the query string will be sent to onQueryLog */
   logQuery?: boolean;