quidproquo-web-react 0.0.261 → 0.0.263

package/lib/commonjs/actionProcessor/ActionProcessorContext.d.ts

@@ -0,0 +1,2 @@
+import { ActionProcessorListResolver } from 'quidproquo-core';
+export declare const ActionProcessorContext: import("react").Context<ActionProcessorListResolver>;

package/lib/commonjs/actionProcessor/ActionProcessorContext.js

@@ -0,0 +1,14 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActionProcessorContext = void 0;
+const react_1 = require("react");
+exports.ActionProcessorContext = (0, react_1.createContext)(() => __awaiter(void 0, void 0, void 0, function* () { return ({}); }));

package/lib/commonjs/actionProcessor/ActionProcessorProvider.d.ts

@@ -0,0 +1,6 @@
+import { ActionProcessorListResolver } from 'quidproquo-core';
+export type ActionProcessorProviderProps = {
+    children: React.ReactNode;
+    getActionProcessors: ActionProcessorListResolver;
+};
+export declare const ActionProcessorProvider: React.FC<ActionProcessorProviderProps>;

package/lib/commonjs/actionProcessor/ActionProcessorProvider.js

@@ -0,0 +1,24 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActionProcessorProvider = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("react");
+const ActionProcessorContext_1 = require("./ActionProcessorContext");
+const ActionProcessorProvider = ({ children, getActionProcessors }) => {
+    const parentGetActionProcessors = (0, react_1.useContext)(ActionProcessorContext_1.ActionProcessorContext);
+    // Merge: parent processors first, then this provider's (so child overrides parent)
+    const mergedGetActionProcessors = (qpqConfig, dynamicModuleLoader) => __awaiter(void 0, void 0, void 0, function* () {
+        return (Object.assign(Object.assign({}, (yield parentGetActionProcessors(qpqConfig, dynamicModuleLoader))), (yield getActionProcessors(qpqConfig, dynamicModuleLoader))));
+    });
+    return (0, jsx_runtime_1.jsx)(ActionProcessorContext_1.ActionProcessorContext.Provider, { value: mergedGetActionProcessors, children: children });
+};
+exports.ActionProcessorProvider = ActionProcessorProvider;

package/lib/commonjs/actionProcessor/index.d.ts

@@ -0,0 +1,3 @@
+export * from './ActionProcessorContext';
+export * from './ActionProcessorProvider';
+export * from './useActionProcessors';

package/lib/commonjs/actionProcessor/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./ActionProcessorContext"), exports);
+__exportStar(require("./ActionProcessorProvider"), exports);
+__exportStar(require("./useActionProcessors"), exports);

package/lib/commonjs/actionProcessor/useActionProcessors.d.ts

@@ -0,0 +1 @@
+export declare const useActionProcessors: () => import("quidproquo-core").ActionProcessorListResolver;

package/lib/commonjs/actionProcessor/useActionProcessors.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useActionProcessors = void 0;
+const react_1 = require("react");
+const ActionProcessorContext_1 = require("./ActionProcessorContext");
+const useActionProcessors = () => (0, react_1.useContext)(ActionProcessorContext_1.ActionProcessorContext);
+exports.useActionProcessors = useActionProcessors;

package/lib/commonjs/hooks/asmj/index.d.ts

@@ -4,4 +4,5 @@ export * from './createQpqRuntimeDefinition';
 export * from './QpqContextProvider';
 export * from './QpqMappedApi';
 export * from './QpqRuntimeEffectCatcher';
+export * from './useBubbleReducer';
 export * from './useQpqRuntime';

package/lib/commonjs/hooks/asmj/index.js

@@ -20,4 +20,5 @@ __exportStar(require("./createQpqRuntimeDefinition"), exports);
 __exportStar(require("./QpqContextProvider"), exports);
 __exportStar(require("./QpqMappedApi"), exports);
 __exportStar(require("./QpqRuntimeEffectCatcher"), exports);
+__exportStar(require("./useBubbleReducer"), exports);
 __exportStar(require("./useQpqRuntime"), exports);

package/lib/commonjs/hooks/asmj/useBubbleReducer.d.ts

@@ -0,0 +1,2 @@
+import { QpqBubbleReducer } from './bubbleReducer';
+export declare const useBubbleReducer: <TState>(reducer: QpqBubbleReducer<TState, any>, initialState: TState | (() => TState)) => [TState, (action: unknown) => void];

package/lib/commonjs/hooks/asmj/useBubbleReducer.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useBubbleReducer = void 0;
+const react_1 = require("react");
+const bubbleReducer_1 = require("./bubbleReducer");
+const useBubbleReducer = (reducer, initialState) => {
+    const parentDispatch = (0, react_1.useContext)(bubbleReducer_1.BubbleReducerDispatchContext);
+    const [state, setState] = (0, react_1.useState)(initialState);
+    const stateRef = (0, react_1.useRef)(state);
+    stateRef.current = state;
+    const dispatch = (0, react_1.useCallback)((action) => {
+        const [newState, preventBubble] = reducer(stateRef.current, action);
+        if (preventBubble) {
+            setState(newState);
+        }
+        else {
+            parentDispatch(action);
+        }
+    }, [parentDispatch, reducer]);
+    return [state, dispatch];
+};
+exports.useBubbleReducer = useBubbleReducer;

package/lib/commonjs/hooks/asmj/useQpqRuntime.d.ts

@@ -1,4 +1,6 @@
-import { Story } from 'quidproquo-core';
+import { ActionProcessorListResolver, Story } from 'quidproquo-core';
+import { Dispatch } from 'react';
 import { QpqRuntimeDefinition } from './createQpqRuntimeDefinition';
 import { QpqApi, QpqMappedApi } from './QpqMappedApi';
-export declare function useQpqRuntime<TState, TAction, TApi extends QpqApi>(atom: QpqRuntimeDefinition<TState, TAction, TApi>, mainStory?: Story<any, any>, name?: string): [QpqMappedApi<TApi>, TState, (action: any) => void];
+export type ActionProcessorListResolverFactory<TState = any> = (dispatch: Dispatch<any>, getCurrentState: () => TState) => ActionProcessorListResolver;
+export declare function useQpqRuntime<TState, TAction, TApi extends QpqApi>(atom: QpqRuntimeDefinition<TState, TAction, TApi>, mainStory?: Story<any, any>, name?: string, getActionProcessors?: ActionProcessorListResolverFactory<TState>): [QpqMappedApi<TApi>, TState, (action: any) => void];

package/lib/commonjs/hooks/asmj/useQpqRuntime.js

@@ -1,16 +1,28 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useQpqRuntime = useQpqRuntime;
 const react_1 = require("react");
 const useQpq_1 = require("../useQpq");
 const actionProcessor_1 = require("./actionProcessor");
 const bubbleReducer_1 = require("./bubbleReducer");
-function useQpqRuntime(atom, mainStory, name) {
+function useQpqRuntime(atom, mainStory, name, getActionProcessors = () => () => __awaiter(this, void 0, void 0, function* () { return ({}); })) {
     const atomInfo = (0, react_1.useMemo)(() => atom(name), [atom, name]);
     const [state, dispatch, getCurrentState] = (0, bubbleReducer_1.useQpqRuntimeBubblingReducer)(atom, name);
     // Api generators are memoized to prevent unnecessary re-renders.
     const [memoedApiGenerators] = (0, react_1.useState)(() => atomInfo.api);
-    const resolver = (0, useQpq_1.useQpq)((0, actionProcessor_1.getStateActionProcessor)(dispatch, getCurrentState));
+    const mergedProcessors = (qpqConfig, dynamicModuleLoader) => __awaiter(this, void 0, void 0, function* () {
+        return (Object.assign(Object.assign({}, (yield (0, actionProcessor_1.getStateActionProcessor)(dispatch, getCurrentState)(qpqConfig, dynamicModuleLoader))), (yield getActionProcessors(dispatch, getCurrentState)(qpqConfig, dynamicModuleLoader))));
+    });
+    const resolver = (0, useQpq_1.useQpq)(mergedProcessors);
     // Wrap and remap each API generator using the resolver.
     const api = (0, react_1.useMemo)(() => {
         const wrapped = {};

package/lib/commonjs/hooks/useQpq.js

@@ -13,6 +13,7 @@ exports.useQpq = useQpq;
 const quidproquo_actionprocessor_web_1 = require("quidproquo-actionprocessor-web");
 const quidproquo_core_1 = require("quidproquo-core");
 const react_1 = require("react");
+const actionProcessor_1 = require("../actionProcessor");
 const QpqContextProvider_1 = require("./asmj/QpqContextProvider");
 function* withVersionCheck(story, versionRef, capturedVersion) {
     let nextValue = undefined;
@@ -37,6 +38,7 @@ const logger = {
 };
 function useQpq(getActionProcessors = () => __awaiter(this, void 0, void 0, function* () { return ({}); })) {
     const qpqContextValues = (0, QpqContextProvider_1.useQpqContextValues)();
+    const contextGetActionProcessors = (0, actionProcessor_1.useActionProcessors)();
     const versionRef = (0, react_1.useRef)(0);
     (0, react_1.useEffect)(() => {
         return () => {
@@ -47,7 +49,7 @@ function useQpq(getActionProcessors = () => __awaiter(this, void 0, void 0, func
         depth: 0,
         context: qpqContextValues,
     }, (qpqConfig, dynamicModuleLoader) => __awaiter(this, void 0, void 0, function* () {
-        return (Object.assign(Object.assign({}, (yield (0, quidproquo_actionprocessor_web_1.getWebActionProcessors)(qpqConfig, dynamicModuleLoader))), (yield getActionProcessors(qpqConfig, dynamicModuleLoader))));
+        return (Object.assign(Object.assign(Object.assign({}, (yield (0, quidproquo_actionprocessor_web_1.getWebActionProcessors)(qpqConfig, dynamicModuleLoader))), (yield contextGetActionProcessors(qpqConfig, dynamicModuleLoader))), (yield getActionProcessors(qpqConfig, dynamicModuleLoader))));
     }), () => new Date().toISOString(), logger, `frontend::${'uuid'}`, quidproquo_core_1.QpqRuntimeType.UI, (_runtime) => __awaiter(this, void 0, void 0, function* () {
         // noop
     })), [qpqContextValues]);

package/lib/commonjs/index.d.ts

@@ -1,4 +1,5 @@
 import 'symbol-observable';
+export * from './actionProcessor';
 export * from './api';
 export * from './auth';
 export * from './baseUrl';

package/lib/commonjs/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 require("symbol-observable");
+__exportStar(require("./actionProcessor"), exports);
 __exportStar(require("./api"), exports);
 __exportStar(require("./auth"), exports);
 __exportStar(require("./baseUrl"), exports);

package/lib/commonjs/webSocketQueue/hooks/actionProcessor/getServiceRequestActionProcessor.d.ts

@@ -0,0 +1,4 @@
+import { ActionProcessorList } from 'quidproquo-core';
+import { AnyWebSocketQueueEventMessageWithCorrelation } from 'quidproquo-webserver';
+import { RefObject } from 'react';
+export declare const getServiceRequestActionProcessor: (sendEventRef: RefObject<((event: Omit<AnyWebSocketQueueEventMessageWithCorrelation, "correlationId">) => Promise<any>) | null>) => ActionProcessorList;

package/lib/commonjs/webSocketQueue/hooks/actionProcessor/getServiceRequestActionProcessor.js

@@ -0,0 +1,25 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getServiceRequestActionProcessor = void 0;
+const quidproquo_core_1 = require("quidproquo-core");
+const quidproquo_webserver_1 = require("quidproquo-webserver");
+const getServiceRequestActionProcessor = (sendEventRef) => ({
+    [quidproquo_webserver_1.ServiceActionType.Request]: (_a) => __awaiter(void 0, [_a], void 0, function* ({ serviceName, method, payload, }) {
+        var _b;
+        const response = yield ((_b = sendEventRef.current) === null || _b === void 0 ? void 0 : _b.call(sendEventRef, { type: `qpq/serviceRequest/${serviceName}/${method}`, payload }));
+        if (response && !response.success) {
+            return (0, quidproquo_core_1.actionResultError)(response.error.errorType, response.error.errorText, response.error.errorStack);
+        }
+        return (0, quidproquo_core_1.actionResult)(response === null || response === void 0 ? void 0 : response.result);
+    }),
+});
+exports.getServiceRequestActionProcessor = getServiceRequestActionProcessor;

package/lib/commonjs/webSocketQueue/hooks/index.d.ts

@@ -1,2 +1,4 @@
+export * from './actionProcessor/getServiceRequestActionProcessor';
+export * from './useQpqWebsocketQueueRuntime';
 export * from './useSubscribeToWebSocketQueueEvent';
 export * from './useWebsocketQueueSendEvent';

package/lib/commonjs/webSocketQueue/hooks/index.js

@@ -14,5 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./actionProcessor/getServiceRequestActionProcessor"), exports);
+__exportStar(require("./useQpqWebsocketQueueRuntime"), exports);
 __exportStar(require("./useSubscribeToWebSocketQueueEvent"), exports);
 __exportStar(require("./useWebsocketQueueSendEvent"), exports);

package/lib/commonjs/webSocketQueue/hooks/useQpqWebsocketQueueRuntime.d.ts

@@ -0,0 +1,11 @@
+import { Story } from 'quidproquo-core';
+import { AnyWebSocketQueueEventMessageWithCorrelation } from 'quidproquo-webserver';
+import { QpqRuntimeDefinition } from '../../hooks/asmj/createQpqRuntimeDefinition';
+import { QpqApi, QpqMappedApi } from '../../hooks/asmj/QpqMappedApi';
+import { ActionProcessorListResolverFactory } from '../../hooks/asmj/useQpqRuntime';
+export declare function useQpqWebsocketQueueRuntime<TState, TAction, TApi extends QpqApi>(atom: QpqRuntimeDefinition<TState, TAction, TApi>, mainStory?: Story<any, any>, name?: string, getActionProcessors?: ActionProcessorListResolverFactory<TState>): [
+    QpqMappedApi<TApi>,
+    TState,
+    (action: any) => void,
+    (event: Omit<AnyWebSocketQueueEventMessageWithCorrelation, 'correlationId'>) => Promise<any>
+];

package/lib/commonjs/webSocketQueue/hooks/useQpqWebsocketQueueRuntime.js

@@ -0,0 +1,35 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useQpqWebsocketQueueRuntime = useQpqWebsocketQueueRuntime;
+const quidproquo_webserver_1 = require("quidproquo-webserver");
+const react_1 = require("react");
+const useQpqRuntime_1 = require("../../hooks/asmj/useQpqRuntime");
+const getServiceRequestActionProcessor_1 = require("./actionProcessor/getServiceRequestActionProcessor");
+const useWebsocketQueueSendEvent_1 = require("./useWebsocketQueueSendEvent");
+function useQpqWebsocketQueueRuntime(atom, mainStory, name, getActionProcessors) {
+    const sendEventRef = (0, react_1.useRef)(null);
+    const mergedFactory = (dispatch, getCurrentState) => {
+        const serviceResolver = () => __awaiter(this, void 0, void 0, function* () { return (0, getServiceRequestActionProcessor_1.getServiceRequestActionProcessor)(sendEventRef); });
+        const callerResolver = getActionProcessors === null || getActionProcessors === void 0 ? void 0 : getActionProcessors(dispatch, getCurrentState);
+        return (qpqConfig, dynamicModuleLoader) => __awaiter(this, void 0, void 0, function* () {
+            return (Object.assign(Object.assign({}, (yield serviceResolver())), (callerResolver ? yield callerResolver(qpqConfig, dynamicModuleLoader) : {})));
+        });
+    };
+    const [api, state, dispatch] = (0, useQpqRuntime_1.useQpqRuntime)(atom, mainStory, name, mergedFactory);
+    const sendEvent = (0, useWebsocketQueueSendEvent_1.useWebsocketQueueSendEvent)((event) => {
+        if (event.type === quidproquo_webserver_1.WebSocketQueueServerMessageEventType.StateDispatch) {
+            dispatch(event.payload);
+        }
+    });
+    sendEventRef.current = sendEvent;
+    return [api, state, dispatch, sendEvent];
+}

package/lib/commonjs/webSocketQueue/hooks/useWebsocketQueueSendEvent.d.ts

@@ -1,2 +1,2 @@
 import { AnyWebSocketQueueEventMessageWithCorrelation } from 'quidproquo-webserver';
-export declare const useWebsocketQueueSendEvent: <E extends AnyWebSocketQueueEventMessageWithCorrelation>() => (event: E) => void;
+export declare const useWebsocketQueueSendEvent: <TSend extends AnyWebSocketQueueEventMessageWithCorrelation>(onCorrelatedMessage?: (event: AnyWebSocketQueueEventMessageWithCorrelation) => void) => (event: Omit<TSend, "correlationId">) => Promise<any>;

package/lib/commonjs/webSocketQueue/hooks/useWebsocketQueueSendEvent.js

@@ -1,9 +1,59 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useWebsocketQueueSendEvent = void 0;
+const quidproquo_web_1 = require("quidproquo-web");
+const quidproquo_webserver_1 = require("quidproquo-webserver");
+const react_1 = require("react");
+const hooks_1 = require("../../hooks");
 const websocket_1 = require("../../websocket");
-const useWebsocketQueueSendEvent = () => {
-    const sendMessage = (0, websocket_1.useWebsocketSendEvent)();
-    return sendMessage;
+const useWebsocketQueueSendEvent = (onCorrelatedMessage) => {
+    const websocketApi = (0, websocket_1.useWebsocketApi)();
+    const activeCorrelationsRef = (0, react_1.useRef)(new Set());
+    const pendingResolversRef = (0, react_1.useRef)(new Map());
+    // Subscribe to ALL messages, filter by active correlationIds
+    const handleMessage = (0, hooks_1.useFastCallback)((_ws, rawEvent) => {
+        if (!rawEvent)
+            return;
+        try {
+            const parsed = JSON.parse(rawEvent.data);
+            if (!parsed.correlationId || !activeCorrelationsRef.current.has(parsed.correlationId)) {
+                return;
+            }
+            if (parsed.type === quidproquo_webserver_1.WebSocketQueueServerMessageEventType.ServiceRequestResponse) {
+                const resolve = pendingResolversRef.current.get(parsed.correlationId);
+                if (resolve) {
+                    resolve(parsed.payload);
+                    pendingResolversRef.current.delete(parsed.correlationId);
+                    activeCorrelationsRef.current.delete(parsed.correlationId);
+                }
+            }
+            else {
+                onCorrelatedMessage === null || onCorrelatedMessage === void 0 ? void 0 : onCorrelatedMessage(parsed);
+            }
+        }
+        catch (_a) {
+            // Not JSON or not a queue message — ignore
+        }
+    });
+    (0, websocket_1.useSubscribeToWebsocket)(quidproquo_web_1.WebsocketServiceEvent.MESSAGE, handleMessage);
+    // Send with auto-generated correlationId, register it as active
+    const sendEvent = (0, hooks_1.useFastCallback)((event) => {
+        if (!websocketApi) {
+            return Promise.resolve(undefined);
+        }
+        const correlationId = crypto.randomUUID();
+        activeCorrelationsRef.current.add(correlationId);
+        const isServiceRequest = event.type.startsWith('qpq/serviceRequest/');
+        if (isServiceRequest) {
+            const promise = new Promise((resolve) => {
+                pendingResolversRef.current.set(correlationId, resolve);
+            });
+            websocketApi.sendEvent(Object.assign(Object.assign({}, event), { correlationId }));
+            return promise;
+        }
+        websocketApi.sendEvent(Object.assign(Object.assign({}, event), { correlationId }));
+        return Promise.resolve(undefined);
+    });
+    return sendEvent;
 };
 exports.useWebsocketQueueSendEvent = useWebsocketQueueSendEvent;

package/lib/esm/actionProcessor/ActionProcessorContext.d.ts

@@ -0,0 +1,2 @@
+import { ActionProcessorListResolver } from 'quidproquo-core';
+export declare const ActionProcessorContext: import("react").Context<ActionProcessorListResolver>;

package/lib/esm/actionProcessor/ActionProcessorContext.js

@@ -0,0 +1,2 @@
+import { createContext } from 'react';
+export const ActionProcessorContext = createContext(async () => ({}));

package/lib/esm/actionProcessor/ActionProcessorProvider.d.ts

@@ -0,0 +1,6 @@
+import { ActionProcessorListResolver } from 'quidproquo-core';
+export type ActionProcessorProviderProps = {
+    children: React.ReactNode;
+    getActionProcessors: ActionProcessorListResolver;
+};
+export declare const ActionProcessorProvider: React.FC<ActionProcessorProviderProps>;

package/lib/esm/actionProcessor/ActionProcessorProvider.js

@@ -0,0 +1,12 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useContext } from 'react';
+import { ActionProcessorContext } from './ActionProcessorContext';
+export const ActionProcessorProvider = ({ children, getActionProcessors }) => {
+    const parentGetActionProcessors = useContext(ActionProcessorContext);
+    // Merge: parent processors first, then this provider's (so child overrides parent)
+    const mergedGetActionProcessors = async (qpqConfig, dynamicModuleLoader) => ({
+        ...(await parentGetActionProcessors(qpqConfig, dynamicModuleLoader)),
+        ...(await getActionProcessors(qpqConfig, dynamicModuleLoader)),
+    });
+    return _jsx(ActionProcessorContext.Provider, { value: mergedGetActionProcessors, children: children });
+};

package/lib/esm/actionProcessor/index.d.ts

@@ -0,0 +1,3 @@
+export * from './ActionProcessorContext';
+export * from './ActionProcessorProvider';
+export * from './useActionProcessors';

package/lib/esm/actionProcessor/index.js

@@ -0,0 +1,3 @@
+export * from './ActionProcessorContext';
+export * from './ActionProcessorProvider';
+export * from './useActionProcessors';

package/lib/esm/actionProcessor/useActionProcessors.d.ts

@@ -0,0 +1 @@
+export declare const useActionProcessors: () => import("quidproquo-core").ActionProcessorListResolver;

package/lib/esm/actionProcessor/useActionProcessors.js

@@ -0,0 +1,3 @@
+import { useContext } from 'react';
+import { ActionProcessorContext } from './ActionProcessorContext';
+export const useActionProcessors = () => useContext(ActionProcessorContext);

package/lib/esm/hooks/asmj/index.d.ts

@@ -4,4 +4,5 @@ export * from './createQpqRuntimeDefinition';
 export * from './QpqContextProvider';
 export * from './QpqMappedApi';
 export * from './QpqRuntimeEffectCatcher';
+export * from './useBubbleReducer';
 export * from './useQpqRuntime';

package/lib/esm/hooks/asmj/index.js

@@ -4,4 +4,5 @@ export * from './createQpqRuntimeDefinition';
 export * from './QpqContextProvider';
 export * from './QpqMappedApi';
 export * from './QpqRuntimeEffectCatcher';
+export * from './useBubbleReducer';
 export * from './useQpqRuntime';

package/lib/esm/hooks/asmj/useBubbleReducer.d.ts

@@ -0,0 +1,2 @@
+import { QpqBubbleReducer } from './bubbleReducer';
+export declare const useBubbleReducer: <TState>(reducer: QpqBubbleReducer<TState, any>, initialState: TState | (() => TState)) => [TState, (action: unknown) => void];

package/lib/esm/hooks/asmj/useBubbleReducer.js

@@ -0,0 +1,18 @@
+import { useCallback, useContext, useRef, useState } from 'react';
+import { BubbleReducerDispatchContext } from './bubbleReducer';
+export const useBubbleReducer = (reducer, initialState) => {
+    const parentDispatch = useContext(BubbleReducerDispatchContext);
+    const [state, setState] = useState(initialState);
+    const stateRef = useRef(state);
+    stateRef.current = state;
+    const dispatch = useCallback((action) => {
+        const [newState, preventBubble] = reducer(stateRef.current, action);
+        if (preventBubble) {
+            setState(newState);
+        }
+        else {
+            parentDispatch(action);
+        }
+    }, [parentDispatch, reducer]);
+    return [state, dispatch];
+};

package/lib/esm/hooks/asmj/useQpqRuntime.d.ts

@@ -1,4 +1,6 @@
-import { Story } from 'quidproquo-core';
+import { ActionProcessorListResolver, Story } from 'quidproquo-core';
+import { Dispatch } from 'react';
 import { QpqRuntimeDefinition } from './createQpqRuntimeDefinition';
 import { QpqApi, QpqMappedApi } from './QpqMappedApi';
-export declare function useQpqRuntime<TState, TAction, TApi extends QpqApi>(atom: QpqRuntimeDefinition<TState, TAction, TApi>, mainStory?: Story<any, any>, name?: string): [QpqMappedApi<TApi>, TState, (action: any) => void];
+export type ActionProcessorListResolverFactory<TState = any> = (dispatch: Dispatch<any>, getCurrentState: () => TState) => ActionProcessorListResolver;
+export declare function useQpqRuntime<TState, TAction, TApi extends QpqApi>(atom: QpqRuntimeDefinition<TState, TAction, TApi>, mainStory?: Story<any, any>, name?: string, getActionProcessors?: ActionProcessorListResolverFactory<TState>): [QpqMappedApi<TApi>, TState, (action: any) => void];

package/lib/esm/hooks/asmj/useQpqRuntime.js

@@ -2,12 +2,16 @@ import { useEffect, useMemo, useState } from 'react';
 import { useQpq } from '../useQpq';
 import { getStateActionProcessor } from './actionProcessor';
 import { useQpqRuntimeBubblingReducer } from './bubbleReducer';
-export function useQpqRuntime(atom, mainStory, name) {
+export function useQpqRuntime(atom, mainStory, name, getActionProcessors = () => async () => ({})) {
     const atomInfo = useMemo(() => atom(name), [atom, name]);
     const [state, dispatch, getCurrentState] = useQpqRuntimeBubblingReducer(atom, name);
     // Api generators are memoized to prevent unnecessary re-renders.
     const [memoedApiGenerators] = useState(() => atomInfo.api);
-    const resolver = useQpq(getStateActionProcessor(dispatch, getCurrentState));
+    const mergedProcessors = async (qpqConfig, dynamicModuleLoader) => ({
+        ...(await getStateActionProcessor(dispatch, getCurrentState)(qpqConfig, dynamicModuleLoader)),
+        ...(await getActionProcessors(dispatch, getCurrentState)(qpqConfig, dynamicModuleLoader)),
+    });
+    const resolver = useQpq(mergedProcessors);
     // Wrap and remap each API generator using the resolver.
     const api = useMemo(() => {
         const wrapped = {};

package/lib/esm/hooks/useQpq.js

@@ -1,6 +1,7 @@
 import { getWebActionProcessors } from 'quidproquo-actionprocessor-web';
 import { createRuntime, defineModule, QpqRuntimeType, } from 'quidproquo-core';
 import { useCallback, useEffect, useMemo, useRef } from 'react';
+import { useActionProcessors } from '../actionProcessor';
 import { useQpqContextValues } from './asmj/QpqContextProvider';
 function* withVersionCheck(story, versionRef, capturedVersion) {
     let nextValue = undefined;
@@ -25,6 +26,7 @@ const logger = {
 };
 export function useQpq(getActionProcessors = async () => ({})) {
     const qpqContextValues = useQpqContextValues();
+    const contextGetActionProcessors = useActionProcessors();
     const versionRef = useRef(0);
     useEffect(() => {
         return () => {
@@ -36,6 +38,7 @@ export function useQpq(getActionProcessors = async () => ({})) {
         context: qpqContextValues,
     }, async (qpqConfig, dynamicModuleLoader) => ({
         ...(await getWebActionProcessors(qpqConfig, dynamicModuleLoader)),
+        ...(await contextGetActionProcessors(qpqConfig, dynamicModuleLoader)),
         ...(await getActionProcessors(qpqConfig, dynamicModuleLoader)),
     }), () => new Date().toISOString(), logger, `frontend::${'uuid'}`, QpqRuntimeType.UI, async (_runtime) => {
         // noop

package/lib/esm/index.d.ts

@@ -1,4 +1,5 @@
 import 'symbol-observable';
+export * from './actionProcessor';
 export * from './api';
 export * from './auth';
 export * from './baseUrl';

package/lib/esm/index.js

@@ -1,4 +1,5 @@
 import 'symbol-observable';
+export * from './actionProcessor';
 export * from './api';
 export * from './auth';
 export * from './baseUrl';

package/lib/esm/webSocketQueue/hooks/actionProcessor/getServiceRequestActionProcessor.d.ts

@@ -0,0 +1,4 @@
+import { ActionProcessorList } from 'quidproquo-core';
+import { AnyWebSocketQueueEventMessageWithCorrelation } from 'quidproquo-webserver';
+import { RefObject } from 'react';
+export declare const getServiceRequestActionProcessor: (sendEventRef: RefObject<((event: Omit<AnyWebSocketQueueEventMessageWithCorrelation, "correlationId">) => Promise<any>) | null>) => ActionProcessorList;

package/lib/esm/webSocketQueue/hooks/actionProcessor/getServiceRequestActionProcessor.js

@@ -0,0 +1,11 @@
+import { actionResult, actionResultError } from 'quidproquo-core';
+import { ServiceActionType } from 'quidproquo-webserver';
+export const getServiceRequestActionProcessor = (sendEventRef) => ({
+    [ServiceActionType.Request]: async ({ serviceName, method, payload, }) => {
+        const response = await sendEventRef.current?.({ type: `qpq/serviceRequest/${serviceName}/${method}`, payload });
+        if (response && !response.success) {
+            return actionResultError(response.error.errorType, response.error.errorText, response.error.errorStack);
+        }
+        return actionResult(response?.result);
+    },
+});

package/lib/esm/webSocketQueue/hooks/index.d.ts

@@ -1,2 +1,4 @@
+export * from './actionProcessor/getServiceRequestActionProcessor';
+export * from './useQpqWebsocketQueueRuntime';
 export * from './useSubscribeToWebSocketQueueEvent';
 export * from './useWebsocketQueueSendEvent';

package/lib/esm/webSocketQueue/hooks/index.js

@@ -1,2 +1,4 @@
+export * from './actionProcessor/getServiceRequestActionProcessor';
+export * from './useQpqWebsocketQueueRuntime';
 export * from './useSubscribeToWebSocketQueueEvent';
 export * from './useWebsocketQueueSendEvent';

package/lib/esm/webSocketQueue/hooks/useQpqWebsocketQueueRuntime.d.ts

@@ -0,0 +1,11 @@
+import { Story } from 'quidproquo-core';
+import { AnyWebSocketQueueEventMessageWithCorrelation } from 'quidproquo-webserver';
+import { QpqRuntimeDefinition } from '../../hooks/asmj/createQpqRuntimeDefinition';
+import { QpqApi, QpqMappedApi } from '../../hooks/asmj/QpqMappedApi';
+import { ActionProcessorListResolverFactory } from '../../hooks/asmj/useQpqRuntime';
+export declare function useQpqWebsocketQueueRuntime<TState, TAction, TApi extends QpqApi>(atom: QpqRuntimeDefinition<TState, TAction, TApi>, mainStory?: Story<any, any>, name?: string, getActionProcessors?: ActionProcessorListResolverFactory<TState>): [
+    QpqMappedApi<TApi>,
+    TState,
+    (action: any) => void,
+    (event: Omit<AnyWebSocketQueueEventMessageWithCorrelation, 'correlationId'>) => Promise<any>
+];

package/lib/esm/webSocketQueue/hooks/useQpqWebsocketQueueRuntime.js

@@ -0,0 +1,24 @@
+import { WebSocketQueueServerMessageEventType } from 'quidproquo-webserver';
+import { useRef } from 'react';
+import { useQpqRuntime } from '../../hooks/asmj/useQpqRuntime';
+import { getServiceRequestActionProcessor } from './actionProcessor/getServiceRequestActionProcessor';
+import { useWebsocketQueueSendEvent } from './useWebsocketQueueSendEvent';
+export function useQpqWebsocketQueueRuntime(atom, mainStory, name, getActionProcessors) {
+    const sendEventRef = useRef(null);
+    const mergedFactory = (dispatch, getCurrentState) => {
+        const serviceResolver = async () => getServiceRequestActionProcessor(sendEventRef);
+        const callerResolver = getActionProcessors?.(dispatch, getCurrentState);
+        return async (qpqConfig, dynamicModuleLoader) => ({
+            ...(await serviceResolver()),
+            ...(callerResolver ? await callerResolver(qpqConfig, dynamicModuleLoader) : {}),
+        });
+    };
+    const [api, state, dispatch] = useQpqRuntime(atom, mainStory, name, mergedFactory);
+    const sendEvent = useWebsocketQueueSendEvent((event) => {
+        if (event.type === WebSocketQueueServerMessageEventType.StateDispatch) {
+            dispatch(event.payload);
+        }
+    });
+    sendEventRef.current = sendEvent;
+    return [api, state, dispatch, sendEvent];
+}

package/lib/esm/webSocketQueue/hooks/useWebsocketQueueSendEvent.d.ts

@@ -1,2 +1,2 @@
 import { AnyWebSocketQueueEventMessageWithCorrelation } from 'quidproquo-webserver';
-export declare const useWebsocketQueueSendEvent: <E extends AnyWebSocketQueueEventMessageWithCorrelation>() => (event: E) => void;
+export declare const useWebsocketQueueSendEvent: <TSend extends AnyWebSocketQueueEventMessageWithCorrelation>(onCorrelatedMessage?: (event: AnyWebSocketQueueEventMessageWithCorrelation) => void) => (event: Omit<TSend, "correlationId">) => Promise<any>;

package/lib/esm/webSocketQueue/hooks/useWebsocketQueueSendEvent.js

@@ -1,5 +1,55 @@
-import { useWebsocketSendEvent } from '../../websocket';
-export const useWebsocketQueueSendEvent = () => {
-    const sendMessage = useWebsocketSendEvent();
-    return sendMessage;
+import { WebsocketServiceEvent } from 'quidproquo-web';
+import { WebSocketQueueServerMessageEventType } from 'quidproquo-webserver';
+import { useRef } from 'react';
+import { useFastCallback } from '../../hooks';
+import { useSubscribeToWebsocket, useWebsocketApi } from '../../websocket';
+export const useWebsocketQueueSendEvent = (onCorrelatedMessage) => {
+    const websocketApi = useWebsocketApi();
+    const activeCorrelationsRef = useRef(new Set());
+    const pendingResolversRef = useRef(new Map());
+    // Subscribe to ALL messages, filter by active correlationIds
+    const handleMessage = useFastCallback((_ws, rawEvent) => {
+        if (!rawEvent)
+            return;
+        try {
+            const parsed = JSON.parse(rawEvent.data);
+            if (!parsed.correlationId || !activeCorrelationsRef.current.has(parsed.correlationId)) {
+                return;
+            }
+            if (parsed.type === WebSocketQueueServerMessageEventType.ServiceRequestResponse) {
+                const resolve = pendingResolversRef.current.get(parsed.correlationId);
+                if (resolve) {
+                    resolve(parsed.payload);
+                    pendingResolversRef.current.delete(parsed.correlationId);
+                    activeCorrelationsRef.current.delete(parsed.correlationId);
+                }
+            }
+            else {
+                onCorrelatedMessage?.(parsed);
+            }
+        }
+        catch {
+            // Not JSON or not a queue message — ignore
+        }
+    });
+    useSubscribeToWebsocket(WebsocketServiceEvent.MESSAGE, handleMessage);
+    // Send with auto-generated correlationId, register it as active
+    const sendEvent = useFastCallback((event) => {
+        if (!websocketApi) {
+            return Promise.resolve(undefined);
+        }
+        const correlationId = crypto.randomUUID();
+        activeCorrelationsRef.current.add(correlationId);
+        const isServiceRequest = event.type.startsWith('qpq/serviceRequest/');
+        if (isServiceRequest) {
+            const promise = new Promise((resolve) => {
+                pendingResolversRef.current.set(correlationId, resolve);
+            });
+            websocketApi.sendEvent({ ...event, correlationId });
+            return promise;
+        }
+        websocketApi.sendEvent({ ...event, correlationId });
+        return Promise.resolve(undefined);
+    });
+    return sendEvent;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-web-react",
-  "version": "0.0.261",
+  "version": "0.0.263",
   "description": "",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/esm/index.js",
@@ -32,8 +32,8 @@
   },
   "homepage": "https://github.com/joe-coady/quidproquo#readme",
   "devDependencies": {
-    "quidproquo-core": "0.0.261",
-    "quidproquo-tsconfig": "0.0.261",
+    "quidproquo-core": "0.0.263",
+    "quidproquo-tsconfig": "0.0.263",
     "typescript": "^5.8.2"
   },
   "peerDependencies": {
@@ -42,9 +42,9 @@
   "dependencies": {
     "jotai": "^2.12.1",
     "symbol-observable": "^4.0.0",
-    "quidproquo-web": "0.0.261",
-    "quidproquo-webserver": "0.0.261",
-    "quidproquo-actionprocessor-node": "0.0.261",
-    "quidproquo-actionprocessor-web": "0.0.261"
+    "quidproquo-web": "0.0.263",
+    "quidproquo-webserver": "0.0.263",
+    "quidproquo-actionprocessor-node": "0.0.263",
+    "quidproquo-actionprocessor-web": "0.0.263"
   }
 }