@breautek/storm 9.0.5 → 9.0.7

package/lib/private/ConnectionReplicationWaiter.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConnectionReplicationWaiter.js","sourceRoot":"","sources":["../../src/private/ConnectionReplicationWaiter.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;EAcE;;;AAIF,oDAAiD;AACjD,kDAA+C;AAE/C,MAAa,2BAA2B;IAqBpC,YAAmB,IAAyB,EAAE,aAAqB,2BAA2B,CAAC,mBAAmB;QAC9G,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAClC,CAAC;IAEO,MAAM,CAAC,OAAe;QAC1B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,UAAU,CAAC,GAAG,EAAE;gBACZ,OAAO,EAAE,CAAC;YACd,CAAC,EAAE,OAAO,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAAyB,EAAE,UAAkB,2BAA2B,CAAC,eAAe;QACtG,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC;YACxB,OAAO;QACX,CAAC;QAED,IAAI,aAAa,GAAY,KAAK,CAAC;QACnC,IAAI,UAAU,GAAY,KAAK,CAAC;QAEhC,IAAI,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;YAC/B,aAAa,GAAG,IAAI,CAAC;QACzB,CAAC,EAAE,OAAO,CAAC,CAAC;QAEZ,OAAO,IAAI,EAAE,CAAC;YACV,IAAI,aAAa,EAAE,CAAC;gBAChB,UAAU,GAAG,IAAI,CAAC;gBAClB,MAAM;YACV,CAAC;YAED,IAAI,UAAU,GAAsB,MAAM,IAAI,CAAC,KAAK,CAAC,0BAA0B,EAAE,CAAC;YAElF,wEAAwE;YACxE,yDAAyD;YACzD,IAAI,UAAU,KAAK,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,QAAQ,KAAK,IAAI,CAAC,EAAE,CAAC;gBACpH,MAAM,IAAI,6BAAa,CAAC,iCAAiC,CAAC,CAAC;YAC/D,CAAC;YAED,uDAAuD;YACvD,wDAAwD;YACxD,2BAA2B;YAC3B,IAAI,UAAU,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;gBAChC,MAAM;YACV,CAAC;YAED,wDAAwD;YACxD,mDAAmD;YACnD,IAAI,UAAU,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,IAAI,UAAU,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAC5E,MAAM;YACV,CAAC;YAED,gEAAgE;YAChE,4CAA4C;YAC5C,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACb,+CAA+C;YAC/C,6BAA6B;YAC7B,MAAM,IAAI,2BAAY,EAAE,CAAC;QAC7B,CAAC;QAED,+BAA+B;QAC/B,YAAY,CAAC,YAAY,CAAC,CAAC;IAC/B,CAAC;;AAtFL,kEAuFC;AAtFG;;;;;GAKG;AACoB,+CAAmB,GAAW,IAAI,CAAC;AAE1D;;;;;;GAMG;AACoB,2CAAe,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,oBAAoB"}
+{"version":3,"file":"ConnectionReplicationWaiter.js","sourceRoot":"","sources":["../../src/private/ConnectionReplicationWaiter.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;EAcE;;;AAIF,kDAA+C;AAE/C,MAAa,2BAA2B;IAqBpC,YAAmB,IAAyB,EAAE,aAAqB,2BAA2B,CAAC,mBAAmB;QAC9G,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAClC,CAAC;IAEO,MAAM,CAAC,OAAe;QAC1B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,UAAU,CAAC,GAAG,EAAE;gBACZ,OAAO,EAAE,CAAC;YACd,CAAC,EAAE,OAAO,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,MAAyB,EAAE,UAAkB,2BAA2B,CAAC,eAAe;QACtG,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC;YACxB,OAAO;QACX,CAAC;QAED,IAAI,aAAa,GAAY,KAAK,CAAC;QACnC,IAAI,UAAU,GAAY,KAAK,CAAC;QAEhC,IAAI,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;YAC/B,aAAa,GAAG,IAAI,CAAC;QACzB,CAAC,EAAE,OAAO,CAAC,CAAC;QAEZ,OAAO,IAAI,EAAE,CAAC;YACV,IAAI,aAAa,EAAE,CAAC;gBAChB,UAAU,GAAG,IAAI,CAAC;gBAClB,MAAM;YACV,CAAC;YAED,IAAI,UAAU,GAAsB,MAAM,IAAI,CAAC,KAAK,CAAC,0BAA0B,EAAE,CAAC;YAElF,IAAI,CAAC,UAAU,EAAE,CAAC;gBACd,6CAA6C;gBAC7C,MAAM;YACV,CAAC;YAED,uDAAuD;YACvD,wDAAwD;YACxD,2BAA2B;YAC3B,IAAI,UAAU,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;gBAChC,MAAM;YACV,CAAC;YAED,wDAAwD;YACxD,mDAAmD;YACnD,IAAI,UAAU,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,IAAI,UAAU,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAC5E,MAAM;YACV,CAAC;YAED,gEAAgE;YAChE,4CAA4C;YAC5C,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACb,+CAA+C;YAC/C,6BAA6B;YAC7B,MAAM,IAAI,2BAAY,EAAE,CAAC;QAC7B,CAAC;QAED,+BAA+B;QAC/B,YAAY,CAAC,YAAY,CAAC,CAAC;IAC/B,CAAC;;AArFL,kEAsFC;AArFG;;;;;GAKG;AACoB,+CAAmB,GAAW,IAAI,CAAC;AAE1D;;;;;;GAMG;AACoB,2CAAe,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,oBAAoB"}

package/lib/private/GetSlavePositionQuery.d.ts

@@ -1,7 +1,7 @@
 import { GetBinLogPositionQuery } from './GetBinLogPositionQuery';
 interface IStatus {
-    Master_Log_File: string;
-    Read_Master_Log_Pos: string;
+    Relay_Source_Log_File: string;
+    Exec_Source_Log_Pos: string;
 }
 export declare class GetSlavePositionQuery extends GetBinLogPositionQuery<IStatus> {
     protected _getQuery(): string;

package/lib/private/GetSlavePositionQuery.js

@@ -19,13 +19,13 @@ exports.GetSlavePositionQuery = void 0;
 const GetBinLogPositionQuery_1 = require("./GetBinLogPositionQuery");
 class GetSlavePositionQuery extends GetBinLogPositionQuery_1.GetBinLogPositionQuery {
     _getQuery() {
-        return 'SHOW SLAVE STATUS';
+        return 'SHOW REPLICA STATUS';
     }
     _getFile(row) {
-        return row.Master_Log_File;
+        return row.Relay_Source_Log_File;
     }
     _getPosition(row) {
-        return row.Read_Master_Log_Pos;
+        return row.Exec_Source_Log_Pos;
     }
 }
 exports.GetSlavePositionQuery = GetSlavePositionQuery;

package/lib/private/GetSlavePositionQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetSlavePositionQuery.js","sourceRoot":"","sources":["../../src/private/GetSlavePositionQuery.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;EAcE;;;AAEF,qEAAkE;AAOlE,MAAa,qBAAsB,SAAQ,+CAA+B;IAEnD,SAAS;QACxB,OAAO,mBAAmB,CAAC;IAC/B,CAAC;IAEkB,QAAQ,CAAC,GAAY;QACpC,OAAO,GAAG,CAAC,eAAe,CAAC;IAC/B,CAAC;IAEkB,YAAY,CAAC,GAAY;QACxC,OAAO,GAAG,CAAC,mBAAmB,CAAC;IACnC,CAAC;CACJ;AAbD,sDAaC"}
+{"version":3,"file":"GetSlavePositionQuery.js","sourceRoot":"","sources":["../../src/private/GetSlavePositionQuery.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;EAcE;;;AAEF,qEAAkE;AAOlE,MAAa,qBAAsB,SAAQ,+CAA+B;IAEnD,SAAS;QACxB,OAAO,qBAAqB,CAAC;IACjC,CAAC;IAEkB,QAAQ,CAAC,GAAY;QACpC,OAAO,GAAG,CAAC,qBAAqB,CAAC;IACrC,CAAC;IAEkB,YAAY,CAAC,GAAY;QACxC,OAAO,GAAG,CAAC,mBAAmB,CAAC;IACnC,CAAC;CACJ;AAbD,sDAaC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@breautek/storm",
-  "version": "9.0.5",
+  "version": "9.0.7",
   "description": "Object-Oriented REST API framework",
   "main": "lib/api.js",
   "types": "lib/api.d.ts",
@@ -51,13 +51,13 @@
     "@types/formidable": "3.4.5",
     "@types/jsonwebtoken": "9.0.10",
     "@types/mysql": "2.15.27",
-    "@types/node": "24.0.10",
+    "@types/node": "24.0.14",
     "@types/uuid": "10.0.0",
     "ajv": "8.17.1",
     "body-parser": "2.2.0",
     "commander": "14.0.0",
     "express": "5.1.0",
-    "form-data": "4.0.3",
+    "form-data": "4.0.4",
     "formidable": "3.5.4",
     "jsonwebtoken": "9.0.2",
     "mysql": "2.18.1",
@@ -72,7 +72,8 @@
   "devDependencies": {
     "@arashi/interfaces": "1.2.1",
     "@arashi/logger": "4.1.3",
-    "@totalpave/eslint-plugin": "7.0.11",
+    "@jest/types": "30.0.5",
+    "@totalpave/eslint-plugin": "7.0.13",
     "@types/jest": "30.0.0",
     "@types/ms": "2.1.0",
     "auto-changelog": "2.5.0",

package/pnpm-workspace.yaml

@@ -0,0 +1,6 @@
+onlyBuiltDependencies:
+  - unrs-resolver
+
+publicHoistPattern:
+  - eslint
+

package/src/MySQLDatabase.ts

@@ -20,6 +20,7 @@ import * as MySQL from 'mysql';
 import {getInstance} from './instance';
 import { IDatabasePosition } from './IDatabasePosition';
 import { ConnectionReplicationWaiter } from './private/ConnectionReplicationWaiter';
+import { ILogger } from '@arashi/interfaces';
 
 const TAG: string = 'MySQLDatabase';
 
@@ -83,13 +84,19 @@ export class MySQLDatabase extends Database<MySQL.PoolConfig, MySQL.PoolConnecti
     }
 
     protected override async _getConnection(query: string, requireWriteAccess: boolean, position?: IDatabasePosition): Promise<MySQLConnection> {
-        getInstance().getLogger().trace(TAG, `Querying connection pool for "${query}".`);
+        let logger: ILogger = getInstance().getLogger();
+        logger.trace(TAG, `Querying connection pool for "${query}".`);
         let instantationStack: string = new Error().stack;
 
         let conn: MySQLConnection = await this.$getConnectionFromPool(query, requireWriteAccess, instantationStack);
         await conn.__internal_init();
 
+        logger.trace(TAG, `Replication Enabled: ${conn.hasReplicationEnabled() ? 'true' : 'false'}`);
+        logger.trace(TAG, `Connection Replicating: ${conn.isReplication() ? 'true' : 'false'}`);
+
+
         if (conn.hasReplicationEnabled() && conn.isReplication() && position && position.page && position.position) {
+            logger.trace(TAG, 'Connection is waiting on Replication');
             // master connections will not wait on database positions
             // they are guarenteed to be at the tip.
             // readonly, or otherwise known as replication connections

package/src/TokenManager.ts

@@ -24,6 +24,8 @@ import { StringValue } from 'ms';
 
 // const TAG: string = 'TokenManager';
 
+export type TExpiresIn = StringValue | number;
+
 export class TokenManager<TAuthToken extends IAuthTokenData = IAuthTokenData> {
     private $secret: string;
 
@@ -31,7 +33,7 @@ export class TokenManager<TAuthToken extends IAuthTokenData = IAuthTokenData> {
         this.$secret = secret;
     }
 
-    public sign(payload: {[key: string]: any}, expiresIn: StringValue | number): Promise<Token> {
+    public sign(payload: {[key: string]: any}, expiresIn: TExpiresIn): Promise<Token> {
         return new Promise<Token>((resolve, reject) => {
             randomBytes(64, (err: Error, buffer: Buffer) => {
                 if (err) {

package/src/api.ts

@@ -98,7 +98,7 @@ export {IDatabasePosition} from './IDatabasePosition';
 
 // Token
 export {Token} from './Token';
-export {TokenManager} from './TokenManager';
+export {TokenManager, TExpiresIn} from './TokenManager';
 
 // Utils
 export {ExitCode} from './ExitCode';

package/src/private/ConnectionReplicationWaiter.ts

@@ -17,7 +17,6 @@
 
 import { IDatabaseConnection } from '../IDatabaseConnection';
 import { IDatabasePosition } from '../IDatabasePosition';
-import { InternalError } from '../InternalError';
 import { TimeoutError } from '../TimeoutError';
 
 export class ConnectionReplicationWaiter {
@@ -74,10 +73,9 @@ export class ConnectionReplicationWaiter {
 
             let currentPos: IDatabasePosition = await this.$conn.getCurrentDatabasePosition();
 
-            // TODO: I have no idea what my intent is here, but it's obviously wrong
-            // eslint-disable-next-line no-constant-binary-expression
-            if (currentPos === null || (currentPos && !currentPos.page === null) || (currentPos && !currentPos.position === null)) {
-                throw new InternalError('Database Position not supported');
+            if (!currentPos) {
+                // Replication not supported... just continue
+                break;
             }
 
             // If the current page is greater than the target page,

package/src/private/GetSlavePositionQuery.ts

@@ -17,21 +17,21 @@
 import { GetBinLogPositionQuery } from './GetBinLogPositionQuery';
 
 interface IStatus {
-    Master_Log_File: string;
-    Read_Master_Log_Pos: string;
+    Relay_Source_Log_File: string;
+    Exec_Source_Log_Pos: string;
 }
 
 export class GetSlavePositionQuery extends GetBinLogPositionQuery<IStatus> {
 
     protected override _getQuery(): string {
-        return 'SHOW SLAVE STATUS';
+        return 'SHOW REPLICA STATUS';
     }
 
     protected override _getFile(row: IStatus): string {
-        return row.Master_Log_File;
+        return row.Relay_Source_Log_File;
     }
 
     protected override _getPosition(row: IStatus): string {
-        return row.Read_Master_Log_Pos;
+        return row.Exec_Source_Log_Pos;
     }
 }