@carbonorm/carbonnode 6.0.4 → 6.0.6

package/dist/handlers/ExpressHandler.d.ts

@@ -1,8 +1,9 @@
 import type { Request, Response, NextFunction } from "express";
 import type { Pool } from "mysql2/promise";
-import type { iC6Object } from "../types/ormInterfaces";
-export declare function ExpressHandler({ C6, mysqlPool, sqlAllowListPath, }: {
+import type { iC6Object, tWebsocketBroadcast } from "../types/ormInterfaces";
+export declare function ExpressHandler({ C6, mysqlPool, sqlAllowListPath, websocketBroadcast, }: {
     C6: iC6Object;
     mysqlPool: Pool;
     sqlAllowListPath?: string;
+    websocketBroadcast?: tWebsocketBroadcast;
 }): (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/index.cjs.js

@@ -468,12 +468,22 @@ function restRequest(configX) {
                     config = typeof configX === "function" ? configX() : configX;
                     (_a = config.verbose) !== null && _a !== void 0 ? _a : (config.verbose = isVerbose()); // Default to env-driven verbosity if not set
                     if (!(isNode() && config.mysqlPool)) return [3 /*break*/, 2];
+                    if (config.verbose) {
+                        console.log("Using SQL Executor");
+                    }
                     return [4 /*yield*/, Promise.resolve().then(function () { return SqlExecutor$1; })];
                 case 1:
                     SqlExecutor = (_b.sent()).SqlExecutor;
                     executor = new SqlExecutor(config, request);
                     return [2 /*return*/, executor.execute()];
-                case 2: return [4 /*yield*/, Promise.resolve().then(function () { return HttpExecutor$1; })];
+                case 2:
+                    if (config.verbose) {
+                        console.log("Using HTTP Executor", {
+                            isNode: isNode(),
+                            hasPool: !!config.mysqlPool
+                        });
+                    }
+                    return [4 /*yield*/, Promise.resolve().then(function () { return HttpExecutor$1; })];
                 case 3:
                     HttpExecutor = (_b.sent()).HttpExecutor;
                     http = new HttpExecutor(config, request);
@@ -3127,6 +3137,13 @@ var SqlExecutor = /** @class */ (function (_super) {
                     case 1: return [4 /*yield*/, this.runQuery()];
                     case 2:
                         rest = _b.sent();
+                        if (this.config.reactBootstrap) {
+                            this.config.reactBootstrap.updateRestfulObjectArrays({
+                                dataOrCallback: rest.rest,
+                                stateKey: this.config.restModel.TABLE_NAME,
+                                uniqueObjectId: this.config.restModel.PRIMARY_SHORT,
+                            });
+                        }
                         return [2 /*return*/, rest];
                     case 3: return [4 /*yield*/, this.runQuery()];
                     case 4:
@@ -3354,17 +3371,40 @@ var SqlExecutor = /** @class */ (function (_super) {
                 switch (_f.label) {
                     case 0:
                         broadcast = this.config.websocketBroadcast;
-                        if (!broadcast || this.config.requestMethod === C6Constants.GET)
+                        this.config.verbose && console.log("[SQL EXECUTOR] 📣 broadcastWebsocketIfConfigured start", {
+                            method: this.config.requestMethod,
+                            hasBroadcast: Boolean(broadcast),
+                        });
+                        if (!broadcast || this.config.requestMethod === C6Constants.GET) {
+                            this.config.verbose && console.log("[SQL EXECUTOR] 📣 websocket broadcast skipped", {
+                                reason: !broadcast ? "no broadcast configured" : "GET request",
+                            });
                             return [2 /*return*/];
+                        }
                         normalizedRequest = this.normalizeRequestPayload(this.extractRequestBody());
                         pkShorts = (_c = this.config.restModel.PRIMARY_SHORT) !== null && _c !== void 0 ? _c : [];
                         columns = this.config.restModel.COLUMNS;
                         validColumns = new Set(Object.values(columns));
                         responseRest = response === null || response === void 0 ? void 0 : response.rest;
                         responsePrimaryKey = this.extractPrimaryKeyValuesFromData(responseRest);
+                        this.config.verbose && console.log("[SQL EXECUTOR] 📣 websocket request payload", {
+                            normalizedRequest: normalizedRequest,
+                            requestPrimaryKey: this.extractPrimaryKeyValues(),
+                            pkShorts: pkShorts,
+                        });
+                        this.config.verbose && console.log("[SQL EXECUTOR] 📣 websocket response payload", {
+                            responseRest: responseRest,
+                            responsePrimaryKey: responsePrimaryKey,
+                        });
                         if ((responseRest === null || (Array.isArray(responseRest) && responseRest.length === 0))
                             && this.config.requestMethod === C6Constants.POST) {
+                            this.config.verbose && console.log("[SQL EXECUTOR] 📣 response rest empty, attempting synthesize", {
+                                responseRest: responseRest,
+                            });
                             insertId = response === null || response === void 0 ? void 0 : response.insertId;
+                            this.config.verbose && console.log("[SQL EXECUTOR] 📣 POST insertId lookup", {
+                                insertId: insertId,
+                            });
                             if (insertId !== undefined && pkShorts.length === 1) {
                                 synthesizedRequest = tslib.__assign({}, normalizedRequest);
                                 now = new Date().toISOString();
@@ -3383,6 +3423,10 @@ var SqlExecutor = /** @class */ (function (_super) {
                                 responsePrimaryKey = (_b = {},
                                     _b[pkShorts[0]] = insertId,
                                     _b);
+                                this.config.verbose && console.log("[SQL EXECUTOR] 📣 synthesized response payload", {
+                                    synthesized: synthesized,
+                                    responsePrimaryKey: responsePrimaryKey,
+                                });
                             }
                         }
                         payload = {
@@ -3396,12 +3440,15 @@ var SqlExecutor = /** @class */ (function (_super) {
                                 RESPONSE_PRIMARY_KEY: responsePrimaryKey,
                             },
                         };
+                        this.config.verbose && console.log("[SQL EXECUTOR] 📣 websocket payload ready", payload);
                         _f.label = 1;
                     case 1:
                         _f.trys.push([1, 3, , 4]);
+                        this.config.verbose && console.log("[SQL EXECUTOR] 📣 websocket broadcast dispatch start");
                         return [4 /*yield*/, broadcast(payload)];
                     case 2:
                         _f.sent();
+                        this.config.verbose && console.log("[SQL EXECUTOR] 📣 websocket broadcast dispatch complete");
                         return [3 /*break*/, 4];
                     case 3:
                         error_1 = _f.sent();
@@ -3512,7 +3559,7 @@ var SqlExecutor$1 = /*#__PURE__*/Object.freeze({
 // note sure how it would help anyone actually...
 function ExpressHandler(_a) {
     var _this = this;
-    var C6 = _a.C6, mysqlPool = _a.mysqlPool, sqlAllowListPath = _a.sqlAllowListPath;
+    var C6 = _a.C6, mysqlPool = _a.mysqlPool, sqlAllowListPath = _a.sqlAllowListPath, websocketBroadcast = _a.websocketBroadcast;
     return function (req, res, next) { return tslib.__awaiter(_this, void 0, void 0, function () {
         var incomingMethod, table, primary, methodOverrideRaw, methodOverride, treatAsGet, method, payload, restModel, primaryKeys_1, primaryShortKeys_1, columnMap_1, resolveShortKey_1, hasPrimaryKeyValues, primaryKeyName, response, err_1;
         var _a, _b, _c, _d, _e, _f, _g;
@@ -3599,6 +3646,7 @@ function ExpressHandler(_a) {
                             C6: C6,
                             mysqlPool: mysqlPool,
                             sqlAllowListPath: sqlAllowListPath,
+                            websocketBroadcast: websocketBroadcast,
                             requestMethod: method,
                             restModel: C6.TABLES[table]
                         })(payload)];