@carbonorm/carbonnode 6.0.4 → 6.0.6

package/src/executors/HttpExecutor.ts

@@ -529,7 +529,8 @@ export class HttpExecutor<
 
                         if (C6.GET === requestMethod && this.isRestResponse(response)) {
 
-                            const responseData = response.data;
+                            const responseData =
+                                response.data as DetermineResponseDataType<'GET', G['RestTableInterface']>;
 
                             const pageLimit = query?.[C6.PAGINATION]?.[C6.LIMIT];
 

package/src/executors/SqlExecutor.ts

@@ -1,26 +1,26 @@
-import {DeleteQueryBuilder} from "../orm/queries/DeleteQueryBuilder";
-import {PostQueryBuilder} from "../orm/queries/PostQueryBuilder";
-import {SelectQueryBuilder} from "../orm/queries/SelectQueryBuilder";
-import {UpdateQueryBuilder} from "../orm/queries/UpdateQueryBuilder";
-import {OrmGenerics} from "../types/ormGenerics";
-import {C6Constants as C6C} from "../constants/C6Constants";
+import { DeleteQueryBuilder } from "../orm/queries/DeleteQueryBuilder";
+import { PostQueryBuilder } from "../orm/queries/PostQueryBuilder";
+import { SelectQueryBuilder } from "../orm/queries/SelectQueryBuilder";
+import { UpdateQueryBuilder } from "../orm/queries/UpdateQueryBuilder";
+import { OrmGenerics } from "../types/ormGenerics";
+import { C6Constants as C6C } from "../constants/C6Constants";
 import {
     DetermineResponseDataType,
     iRestWebsocketPayload,
 } from "../types/ormInterfaces";
 import namedPlaceholders from 'named-placeholders';
-import type {PoolConnection} from 'mysql2/promise';
-import {Buffer} from 'buffer';
-import {Executor} from "./Executor";
+import type { PoolConnection } from 'mysql2/promise';
+import { Buffer } from 'buffer';
+import { Executor } from "./Executor";
 import { normalizeSingularRequest } from "../utils/normalizeSingularRequest";
-import {loadSqlAllowList, normalizeSql} from "../utils/sqlAllowList";
+import { loadSqlAllowList, normalizeSql } from "../utils/sqlAllowList";
 
 export class SqlExecutor<
     G extends OrmGenerics
 > extends Executor<G> {
 
     async execute(): Promise<DetermineResponseDataType<G['RequestMethod'], G['RestTableInterface']>> {
-        const {TABLE_NAME} = this.config.restModel;
+        const { TABLE_NAME } = this.config.restModel;
         const method = this.config.requestMethod;
 
         // Normalize singular T-shaped requests into complex ORM shape (GET/PUT/DELETE)
@@ -42,6 +42,13 @@ export class SqlExecutor<
         switch (method) {
             case 'GET': {
                 const rest = await this.runQuery();
+                if (this.config.reactBootstrap) {
+                    this.config.reactBootstrap.updateRestfulObjectArrays({
+                        dataOrCallback: (rest as any).rest,
+                        stateKey: this.config.restModel.TABLE_NAME,
+                        uniqueObjectId: this.config.restModel.PRIMARY_SHORT as any,
+                    });
+                }
                 return rest as DetermineResponseDataType<G['RequestMethod'], G['RestTableInterface']>;
             }
 
@@ -260,7 +267,16 @@ export class SqlExecutor<
         response?: DetermineResponseDataType<G['RequestMethod'], G['RestTableInterface']>
     ): Promise<void> {
         const broadcast = this.config.websocketBroadcast;
-        if (!broadcast || this.config.requestMethod === C6C.GET) return;
+        this.config.verbose && console.log("[SQL EXECUTOR] 📣 broadcastWebsocketIfConfigured start", {
+            method: this.config.requestMethod,
+            hasBroadcast: Boolean(broadcast),
+        });
+        if (!broadcast || this.config.requestMethod === C6C.GET) {
+            this.config.verbose && console.log("[SQL EXECUTOR] 📣 websocket broadcast skipped", {
+                reason: !broadcast ? "no broadcast configured" : "GET request",
+            });
+            return;
+        }
 
         const normalizedRequest = this.normalizeRequestPayload(this.extractRequestBody());
         const pkShorts = this.config.restModel.PRIMARY_SHORT ?? [];
@@ -269,11 +285,27 @@ export class SqlExecutor<
         let responseRest = response?.rest;
         let responsePrimaryKey = this.extractPrimaryKeyValuesFromData(responseRest);
 
+        this.config.verbose && console.log("[SQL EXECUTOR] 📣 websocket request payload", {
+            normalizedRequest,
+            requestPrimaryKey: this.extractPrimaryKeyValues(),
+            pkShorts,
+        });
+        this.config.verbose && console.log("[SQL EXECUTOR] 📣 websocket response payload", {
+            responseRest,
+            responsePrimaryKey,
+        });
+
         if (
             (responseRest === null || (Array.isArray(responseRest) && responseRest.length === 0))
             && this.config.requestMethod === C6C.POST
         ) {
+            this.config.verbose && console.log("[SQL EXECUTOR] 📣 response rest empty, attempting synthesize", {
+                responseRest,
+            });
             const insertId = (response as DetermineResponseDataType<G['RequestMethod'], G['RestTableInterface']> & { insertId?: number | string | null })?.insertId;
+            this.config.verbose && console.log("[SQL EXECUTOR] 📣 POST insertId lookup", {
+                insertId,
+            });
             if (insertId !== undefined && pkShorts.length === 1) {
                 const synthesizedRequest = {
                     ...normalizedRequest,
@@ -298,6 +330,10 @@ export class SqlExecutor<
                 responsePrimaryKey = {
                     [pkShorts[0]]: insertId,
                 };
+                this.config.verbose && console.log("[SQL EXECUTOR] 📣 synthesized response payload", {
+                    synthesized,
+                    responsePrimaryKey,
+                });
             }
         }
 
@@ -313,8 +349,12 @@ export class SqlExecutor<
             },
         };
 
+        this.config.verbose && console.log("[SQL EXECUTOR] 📣 websocket payload ready", payload);
+
         try {
+            this.config.verbose && console.log("[SQL EXECUTOR] 📣 websocket broadcast dispatch start");
             await broadcast(payload);
+            this.config.verbose && console.log("[SQL EXECUTOR] 📣 websocket broadcast dispatch complete");
         } catch (error) {
             if (this.config.verbose) {
                 console.error("[SQL EXECUTOR] websocketBroadcast failed", error);
@@ -322,7 +362,7 @@ export class SqlExecutor<
         }
     }
     async runQuery(): Promise<DetermineResponseDataType<G['RequestMethod'], G['RestTableInterface']>> {
-        const {TABLE_NAME} = this.config.restModel;
+        const { TABLE_NAME } = this.config.restModel;
         const method = this.config.requestMethod;
         let builder: SelectQueryBuilder<G> | UpdateQueryBuilder<G> | DeleteQueryBuilder<G> | PostQueryBuilder<G>;
 
@@ -361,15 +401,15 @@ export class SqlExecutor<
             if (method === 'GET') {
                 return {
                     rest: result.map(this.serialize),
-                    sql: {sql, values}
+                    sql: { sql, values }
                 } as DetermineResponseDataType<G['RequestMethod'], G['RestTableInterface']>;
             } else {
-                this.config.verbose &&  console.log(`[SQL EXECUTOR] ✏️ Rows affected:`, result.affectedRows);
+                this.config.verbose && console.log(`[SQL EXECUTOR] ✏️ Rows affected:`, result.affectedRows);
                 return {
                     affected: result.affectedRows as number,
                     insertId: result.insertId as number,
                     rest: [], // TODO - remove rest empty array from non-GET responses?
-                    sql: {sql, values}
+                    sql: { sql, values }
                 } as DetermineResponseDataType<G['RequestMethod'], G['RestTableInterface']>;
             }
         });

package/src/handlers/ExpressHandler.ts

@@ -2,7 +2,7 @@ import type {Request, Response, NextFunction} from "express";
 import type {Pool} from "mysql2/promise";
 import {C6C} from "../constants/C6Constants";
 import restRequest from "../api/restRequest";
-import type {iC6Object, iRestMethods} from "../types/ormInterfaces";
+import type {iC6Object, iRestMethods, tWebsocketBroadcast} from "../types/ormInterfaces";
 
 
 // TODO - WE MUST make this a generic - optional, but helpful
@@ -11,10 +11,12 @@ export function ExpressHandler({
     C6,
     mysqlPool,
     sqlAllowListPath,
+    websocketBroadcast,
 }: {
     C6: iC6Object;
     mysqlPool: Pool;
     sqlAllowListPath?: string;
+    websocketBroadcast?: tWebsocketBroadcast;
 }) {
 
     return async (req: Request, res: Response, next: NextFunction) => {
@@ -101,6 +103,7 @@ export function ExpressHandler({
                 C6,
                 mysqlPool,
                 sqlAllowListPath,
+                websocketBroadcast,
                 requestMethod: method,
                 restModel: C6.TABLES[table]
             })(payload);