@design.estate/dees-comms 1.0.28 → 1.0.30

package/dist_bundle/bundle.js

@@ -1962,7 +1962,7 @@ var Timeout = class {
 // node_modules/.pnpm/@api.global+typedrequest-interfaces@3.0.19/node_modules/@api.global/typedrequest-interfaces/dist_ts/index.js
 var dist_ts_exports3 = {};
 
-// node_modules/.pnpm/@api.global+typedrequest@3.2.2/node_modules/@api.global/typedrequest/dist_ts/index.js
+// node_modules/.pnpm/@api.global+typedrequest@3.2.3/node_modules/@api.global/typedrequest/dist_ts/index.js
 var dist_ts_exports16 = {};
 __export(dist_ts_exports16, {
   TypedHandler: () => TypedHandler,
@@ -15039,10 +15039,10 @@ var WebRequest = class {
   }
 };
 
-// node_modules/.pnpm/@api.global+typedrequest@3.2.2/node_modules/@api.global/typedrequest/dist_ts/plugins.js
+// node_modules/.pnpm/@api.global+typedrequest@3.2.3/node_modules/@api.global/typedrequest/dist_ts/plugins.js
 var isounique2 = __toESM(require_dist_ts(), 1);
 
-// node_modules/.pnpm/@api.global+typedrequest@3.2.2/node_modules/@api.global/typedrequest/dist_ts/classes.typedresponseerror.js
+// node_modules/.pnpm/@api.global+typedrequest@3.2.3/node_modules/@api.global/typedrequest/dist_ts/classes.typedresponseerror.js
 var TypedResponseError = class {
   constructor(errorTextArg, errorDataArg) {
     this.errorText = errorTextArg;
@@ -15050,7 +15050,7 @@ var TypedResponseError = class {
   }
 };
 
-// node_modules/.pnpm/@api.global+typedrequest@3.2.2/node_modules/@api.global/typedrequest/dist_ts/classes.typedtools.js
+// node_modules/.pnpm/@api.global+typedrequest@3.2.3/node_modules/@api.global/typedrequest/dist_ts/classes.typedtools.js
 var TypedTools = class {
   constructor() {
     this.localData = {};
@@ -15065,7 +15065,7 @@ var TypedTools = class {
   }
 };
 
-// node_modules/.pnpm/@api.global+typedrequest@3.2.2/node_modules/@api.global/typedrequest/dist_ts/classes.typedhandler.js
+// node_modules/.pnpm/@api.global+typedrequest@3.2.3/node_modules/@api.global/typedrequest/dist_ts/classes.typedhandler.js
 var TypedHandler = class {
   constructor(methodArg, handlerFunctionArg) {
     this.method = methodArg;
@@ -15105,7 +15105,7 @@ var TypedHandler = class {
   }
 };
 
-// node_modules/.pnpm/@api.global+typedrequest@3.2.2/node_modules/@api.global/typedrequest/dist_ts/classes.typedrouter.js
+// node_modules/.pnpm/@api.global+typedrequest@3.2.3/node_modules/@api.global/typedrequest/dist_ts/classes.typedrouter.js
 var TypedRouter = class _TypedRouter {
   constructor() {
     this.hooks = {};
@@ -15200,12 +15200,22 @@ var TypedRouter = class _TypedRouter {
     }
     return typedHandler;
   }
+  static {
+    this.defaultRouteOptions = {
+      localRequest: false,
+      skipHooks: false
+    };
+  }
   /**
    * if typedrequest object has correlation.phase === 'request' -> routes a typed request object to a handler
    * if typedrequest object has correlation.phase === 'response' -> routes a typed request object to request fire event
    * @param typedRequestArg
+   * @param optionsArg - Options object with:
+   *   - localRequest: treat as local request (default: false)
+   *   - skipHooks: skip calling hooks for this routing (default: false, use for broadcast-received messages)
    */
-  async routeAndAddResponse(typedRequestArg, localRequestArg = false) {
+  async routeAndAddResponse(typedRequestArg, optionsArg = {}) {
+    const options = { ..._TypedRouter.defaultRouteOptions, ...optionsArg };
     typedRequestArg = VirtualStream.decodePayloadFromNetwork(typedRequestArg, {
       typedrouter: this
     });
@@ -15216,16 +15226,18 @@ var TypedRouter = class _TypedRouter {
       result.localData = null;
       return result;
     }
-    if (typedRequestArg?.correlation?.phase === "request" || localRequestArg) {
+    if (typedRequestArg?.correlation?.phase === "request" || options.localRequest) {
       const requestStartTime = Date.now();
-      this.callHook("onIncomingRequest", {
-        correlationId: typedRequestArg.correlation?.id || "unknown",
-        method: typedRequestArg.method,
-        direction: "incoming",
-        phase: "request",
-        timestamp: requestStartTime,
-        payload: typedRequestArg.request
-      });
+      if (!options.skipHooks) {
+        this.callHook("onIncomingRequest", {
+          correlationId: typedRequestArg.correlation?.id || "unknown",
+          method: typedRequestArg.method,
+          direction: "incoming",
+          phase: "request",
+          timestamp: requestStartTime,
+          payload: typedRequestArg.request
+        });
+      }
       const typedHandler = this.getTypedHandlerForMethod(typedRequestArg.method);
       if (!typedHandler) {
         console.log(`Cannot find handler for methodname ${typedRequestArg.method}`);
@@ -15238,6 +15250,26 @@ var TypedRouter = class _TypedRouter {
         typedRequestArg = VirtualStream.encodePayloadForNetwork(typedRequestArg, {
           typedrouter: this
         });
+        if (!options.skipHooks) {
+          this.callHook("onOutgoingResponse", {
+            correlationId: typedRequestArg.correlation?.id || "unknown",
+            method: typedRequestArg.method,
+            direction: "outgoing",
+            phase: "response",
+            timestamp: Date.now(),
+            durationMs: Date.now() - requestStartTime,
+            payload: typedRequestArg.response,
+            error: typedRequestArg.error?.text
+          });
+        }
+        return typedRequestArg;
+      }
+      typedRequestArg = await typedHandler.addResponse(typedRequestArg);
+      typedRequestArg.localData = null;
+      typedRequestArg = VirtualStream.encodePayloadForNetwork(typedRequestArg, {
+        typedrouter: this
+      });
+      if (!options.skipHooks) {
         this.callHook("onOutgoingResponse", {
           correlationId: typedRequestArg.correlation?.id || "unknown",
           method: typedRequestArg.method,
@@ -15248,34 +15280,20 @@ var TypedRouter = class _TypedRouter {
           payload: typedRequestArg.response,
           error: typedRequestArg.error?.text
         });
-        return typedRequestArg;
       }
-      typedRequestArg = await typedHandler.addResponse(typedRequestArg);
-      typedRequestArg.localData = null;
-      typedRequestArg = VirtualStream.encodePayloadForNetwork(typedRequestArg, {
-        typedrouter: this
-      });
-      this.callHook("onOutgoingResponse", {
-        correlationId: typedRequestArg.correlation?.id || "unknown",
-        method: typedRequestArg.method,
-        direction: "outgoing",
-        phase: "response",
-        timestamp: Date.now(),
-        durationMs: Date.now() - requestStartTime,
-        payload: typedRequestArg.response,
-        error: typedRequestArg.error?.text
-      });
       return typedRequestArg;
     } else if (typedRequestArg?.correlation?.phase === "response") {
-      this.callHook("onIncomingResponse", {
-        correlationId: typedRequestArg.correlation?.id || "unknown",
-        method: typedRequestArg.method,
-        direction: "incoming",
-        phase: "response",
-        timestamp: Date.now(),
-        payload: typedRequestArg.response,
-        error: typedRequestArg.error?.text
-      });
+      if (!options.skipHooks) {
+        this.callHook("onIncomingResponse", {
+          correlationId: typedRequestArg.correlation?.id || "unknown",
+          method: typedRequestArg.method,
+          direction: "incoming",
+          phase: "response",
+          timestamp: Date.now(),
+          payload: typedRequestArg.response,
+          error: typedRequestArg.error?.text
+        });
+      }
       this.fireEventInterestMap.findInterest(typedRequestArg.correlation.id)?.fullfillInterest(typedRequestArg);
       return null;
     } else {
@@ -15304,7 +15322,7 @@ var TypedRouter = class _TypedRouter {
   }
 };
 
-// node_modules/.pnpm/@api.global+typedrequest@3.2.2/node_modules/@api.global/typedrequest/dist_ts/classes.virtualstream.js
+// node_modules/.pnpm/@api.global+typedrequest@3.2.3/node_modules/@api.global/typedrequest/dist_ts/classes.virtualstream.js
 var closingBit = "#############CLOSING BIT#############";
 var VirtualStream = class _VirtualStream {
   // STATIC
@@ -15648,7 +15666,7 @@ var VirtualStream = class _VirtualStream {
   }
 };
 
-// node_modules/.pnpm/@api.global+typedrequest@3.2.2/node_modules/@api.global/typedrequest/dist_ts/classes.typedtarget.js
+// node_modules/.pnpm/@api.global+typedrequest@3.2.3/node_modules/@api.global/typedrequest/dist_ts/classes.typedtarget.js
 var TypedTarget = class {
   constructor(optionsArg) {
     if (optionsArg.postMethodWithTypedRouter && !optionsArg.typedRouterRef) {
@@ -15675,7 +15693,7 @@ var TypedTarget = class {
   }
 };
 
-// node_modules/.pnpm/@api.global+typedrequest@3.2.2/node_modules/@api.global/typedrequest/dist_ts/classes.typedrequest.js
+// node_modules/.pnpm/@api.global+typedrequest@3.2.3/node_modules/@api.global/typedrequest/dist_ts/classes.typedrequest.js
 var webrequestInstance = new dist_ts_exports15.WebRequest();
 function callGlobalHook(hookName, entry) {
   try {
@@ -16623,7 +16641,7 @@ var DeesComms = class {
     this.broadcastChannel.onmessage = async (eventArg) => {
       const message2 = eventArg.method ? eventArg : eventArg.data;
       console.log(JSON.stringify(message2));
-      const response = await this.typedrouter.routeAndAddResponse(message2);
+      const response = await this.typedrouter.routeAndAddResponse(message2, { skipHooks: true });
       if (response && !response.error) {
         this.postMessage(response);
       } else {