@itrocks/mysql-maintainer 0.2.4 → 0.2.6

package/cjs/contextual-connection.d.ts

@@ -1,12 +1,16 @@
 import { ObjectOrType } from '@itrocks/class-type';
 import { Connection } from 'mariadb';
-import { QueryOptions } from 'mariadb-share';
+import { QueryOptions } from 'mariadb';
+import { SqlError } from 'mariadb';
 export type Context = ObjectOrType | ObjectOrType[];
 export declare class Contextual implements Partial<Connection> {
     [x: number]: (() => Promise<void>) | undefined;
     contexts: Context[];
+    errorCount: Record<string, Record<string, Array<number>>>;
     superQuery: <T = any>(sql: string | QueryOptions, values?: any) => Promise<T>;
     applyTo(connection: ContextualConnection): Promise<ContextualConnection>;
+    incrementErrorCount(sql: string, error: any): this is Connection;
+    isSqlError(error: any): error is SqlError;
     query<T = any>(sql: string | QueryOptions, values?: any): Promise<T>;
 }
 export type ContextualConnection = Connection & Contextual;

package/cjs/contextual-connection.js

@@ -6,13 +6,31 @@ const mysql_maintainer_2 = require("./mysql-maintainer");
 const MANAGED_ERROR_CODES = ['ER_BAD_FIELD_ERROR', 'ER_CANNOT_ADD_FOREIGN', 'ER_NO_SUCH_TABLE'];
 class Contextual {
     contexts = [];
+    errorCount = {};
     superQuery = () => new Promise(() => { });
     async applyTo(connection) {
         connection.contexts = [];
+        connection.errorCount = {};
+        connection.incrementErrorCount = Contextual.prototype.incrementErrorCount;
+        connection.isSqlError = Contextual.prototype.isSqlError;
         connection.superQuery = connection.query;
         connection.query = Contextual.prototype.query;
         return connection;
     }
+    incrementErrorCount(sql, error) {
+        if (!this.errorCount[sql]) {
+            this.errorCount[sql] = {};
+        }
+        if (!this.errorCount[sql][error.message]) {
+            this.errorCount[sql][error.message] = [];
+        }
+        this.errorCount[sql][error.message].push(new Date().getTime());
+        console.log('incremented', this.errorCount[sql][error.message].length, ':', sql, error.message);
+        return true;
+    }
+    isSqlError(error) {
+        return (typeof error === 'object') && !!error.code;
+    }
     async query(sql, values) {
         try {
             if (mysql_maintainer_1.DEBUG)
@@ -20,16 +38,19 @@ class Contextual {
             return await this.superQuery(sql, values);
         }
         catch (error) {
-            if (!(error && (typeof error === 'object') && error.code)
-                || !MANAGED_ERROR_CODES.includes(error.code)) {
+            if (!this.isSqlError(error) || !MANAGED_ERROR_CODES.includes(error.code)) {
                 if (mysql_maintainer_1.DEBUG)
                     console.log('MAINTAINER: throw', error);
                 throw error;
             }
-            // @ts-ignore query applies to a Connection
-            if (await new mysql_maintainer_2.MysqlMaintainer(this).manageError(error, this.contexts[this.contexts.length - 1], sql, values)) {
+            sql = (typeof sql === 'object') ? sql.sql : sql;
+            if (this.incrementErrorCount(sql, error)
+                && (this.errorCount[sql][error.message].length < 5)
+                && await new mysql_maintainer_2.MysqlMaintainer(this).manageError(error, this.contexts[this.contexts.length - 1], sql, values)) {
                 return this.query(sql, values);
             }
+            if (mysql_maintainer_1.DEBUG)
+                console.log('MAINTAINER: throw (2)', error);
             throw error;
         }
     }

package/cjs/mysql-maintainer.d.ts

@@ -1,8 +1,8 @@
 import { ObjectOrType } from '@itrocks/class-type';
 import { Type } from '@itrocks/class-type';
 import { Connection } from 'mariadb';
-import { QueryOptions } from 'mariadb-share';
-import { SqlError } from 'mariadb-share';
+import { QueryOptions } from 'mariadb';
+import { SqlError } from 'mariadb';
 import { Context } from './contextual-connection';
 export { Mysql } from './mysql';
 export declare const DEBUG = false;

package/package.json

@@ -17,7 +17,7 @@
 	},
 	"description": "Reactively maintains database structure by updating schema and retrying on MySQL errors",
 	"devDependencies": {
-		"typescript": "^6.0"
+		"typescript": "^7.0"
 	},
 	"engines": {
 		"node": ">=24"
@@ -51,5 +51,5 @@
 	"scripts": {
 		"build": "tsc"
 	},
-	"version": "0.2.4"
+	"version": "0.2.6"
 }