@cratis/arc 19.12.0 → 20.1.0

package/Globals.ts

@@ -1,12 +1,28 @@
 // Copyright (c) Cratis. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+import { QueryTransportMethod } from './queries/QueryTransportMethod';
+
 export interface IGlobals {
     microservice: string;
     apiBasePath: string;
     origin: string;
     microserviceHttpHeader: string;
     microserviceWSQueryArgument: string;
+    queryTransportMethod: QueryTransportMethod;
+    /**
+     * Number of hub connections maintained for observable queries.
+     * When greater than one, queries are distributed across the pool round-robin.
+     * Only applies when {@link queryTransportMethod} is a centralized hub transport.
+     * Defaults to 1.
+     */
+    queryConnectionCount: number;
+    /**
+     * When true, observable queries connect directly to the per-query WebSocket URL
+     * instead of routing through the centralized hub endpoint.
+     * Defaults to false (use the centralized hub).
+     */
+    queryDirectMode: boolean;
 }
 
 export const Globals: IGlobals = {
@@ -14,5 +30,8 @@ export const Globals: IGlobals = {
     apiBasePath: '',
     origin: '',
     microserviceHttpHeader: 'x-cratis-microservice',
-    microserviceWSQueryArgument: 'x-cratis-microservice'
+    microserviceWSQueryArgument: 'x-cratis-microservice',
+    queryTransportMethod: QueryTransportMethod.WebSocket,
+    queryConnectionCount: 1,
+    queryDirectMode: false,
 };

package/dist/cjs/Globals.d.ts

@@ -1,9 +1,13 @@
+import { QueryTransportMethod } from './queries/QueryTransportMethod';
 export interface IGlobals {
     microservice: string;
     apiBasePath: string;
     origin: string;
     microserviceHttpHeader: string;
     microserviceWSQueryArgument: string;
+    queryTransportMethod: QueryTransportMethod;
+    queryConnectionCount: number;
+    queryDirectMode: boolean;
 }
 export declare const Globals: IGlobals;
 //# sourceMappingURL=Globals.d.ts.map

package/dist/cjs/Globals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Globals.d.ts","sourceRoot":"","sources":["../../Globals.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,QAAQ;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB,EAAE,MAAM,CAAC;IAC/B,2BAA2B,EAAE,MAAM,CAAC;CACvC;AAED,eAAO,MAAM,OAAO,EAAE,QAMrB,CAAC"}
+{"version":3,"file":"Globals.d.ts","sourceRoot":"","sources":["../../Globals.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAEtE,MAAM,WAAW,QAAQ;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB,EAAE,MAAM,CAAC;IAC/B,2BAA2B,EAAE,MAAM,CAAC;IACpC,oBAAoB,EAAE,oBAAoB,CAAC;IAO3C,oBAAoB,EAAE,MAAM,CAAC;IAM7B,eAAe,EAAE,OAAO,CAAC;CAC5B;AAED,eAAO,MAAM,OAAO,EAAE,QASrB,CAAC"}

package/dist/cjs/Globals.js

@@ -1,11 +1,16 @@
 'use strict';
 
+var QueryTransportMethod = require('./queries/QueryTransportMethod.js');
+
 const Globals = {
     microservice: '',
     apiBasePath: '',
     origin: '',
     microserviceHttpHeader: 'x-cratis-microservice',
-    microserviceWSQueryArgument: 'x-cratis-microservice'
+    microserviceWSQueryArgument: 'x-cratis-microservice',
+    queryTransportMethod: QueryTransportMethod.QueryTransportMethod.WebSocket,
+    queryConnectionCount: 1,
+    queryDirectMode: false,
 };
 
 exports.Globals = Globals;

package/dist/cjs/Globals.js.map

@@ -1 +1 @@
-{"version":3,"file":"Globals.js","sources":["../../Globals.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\nexport interface IGlobals {\n    microservice: string;\n    apiBasePath: string;\n    origin: string;\n    microserviceHttpHeader: string;\n    microserviceWSQueryArgument: string;\n}\n\nexport const Globals: IGlobals = {\n    microservice: '',\n    apiBasePath: '',\n    origin: '',\n    microserviceHttpHeader: 'x-cratis-microservice',\n    microserviceWSQueryArgument: 'x-cratis-microservice'\n};"],"names":[],"mappings":";;AAWO,MAAM,OAAO,GAAa;AAC7B,IAAA,YAAY,EAAE,EAAE;AAChB,IAAA,WAAW,EAAE,EAAE;AACf,IAAA,MAAM,EAAE,EAAE;AACV,IAAA,sBAAsB,EAAE,uBAAuB;AAC/C,IAAA,2BAA2B,EAAE;;;;;"}
+{"version":3,"file":"Globals.js","sources":["../../Globals.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\nimport { QueryTransportMethod } from './queries/QueryTransportMethod';\n\nexport interface IGlobals {\n    microservice: string;\n    apiBasePath: string;\n    origin: string;\n    microserviceHttpHeader: string;\n    microserviceWSQueryArgument: string;\n    queryTransportMethod: QueryTransportMethod;\n    /**\n     * Number of hub connections maintained for observable queries.\n     * When greater than one, queries are distributed across the pool round-robin.\n     * Only applies when {@link queryTransportMethod} is a centralized hub transport.\n     * Defaults to 1.\n     */\n    queryConnectionCount: number;\n    /**\n     * When true, observable queries connect directly to the per-query WebSocket URL\n     * instead of routing through the centralized hub endpoint.\n     * Defaults to false (use the centralized hub).\n     */\n    queryDirectMode: boolean;\n}\n\nexport const Globals: IGlobals = {\n    microservice: '',\n    apiBasePath: '',\n    origin: '',\n    microserviceHttpHeader: 'x-cratis-microservice',\n    microserviceWSQueryArgument: 'x-cratis-microservice',\n    queryTransportMethod: QueryTransportMethod.WebSocket,\n    queryConnectionCount: 1,\n    queryDirectMode: false,\n};"],"names":["QueryTransportMethod"],"mappings":";;;;AA2BO,MAAM,OAAO,GAAa;AAC7B,IAAA,YAAY,EAAE,EAAE;AAChB,IAAA,WAAW,EAAE,EAAE;AACf,IAAA,MAAM,EAAE,EAAE;AACV,IAAA,sBAAsB,EAAE,uBAAuB;AAC/C,IAAA,2BAA2B,EAAE,uBAAuB;IACpD,oBAAoB,EAAEA,yCAAoB,CAAC,SAAS;AACpD,IAAA,oBAAoB,EAAE,CAAC;AACvB,IAAA,eAAe,EAAE,KAAK;;;;;"}

package/dist/cjs/queries/HubConnectionKeepAlive.d.ts

@@ -0,0 +1,11 @@
+export declare class HubConnectionKeepAlive {
+    private readonly _intervalMs;
+    private readonly _onIdle;
+    private _lastActivityTime;
+    private _timer?;
+    constructor(_intervalMs: number, _onIdle: () => void);
+    start(): void;
+    stop(): void;
+    recordActivity(): void;
+}
+//# sourceMappingURL=HubConnectionKeepAlive.d.ts.map

package/dist/cjs/queries/HubConnectionKeepAlive.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"HubConnectionKeepAlive.d.ts","sourceRoot":"","sources":["../../../queries/HubConnectionKeepAlive.ts"],"names":[],"mappings":"AAeA,qBAAa,sBAAsB;IAW3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAX5B,OAAO,CAAC,iBAAiB,CAAc;IACvC,OAAO,CAAC,MAAM,CAAC,CAAiC;gBAS3B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,IAAI;IAMxC,KAAK,IAAI,IAAI;IAab,IAAI,IAAI,IAAI;IAWZ,cAAc,IAAI,IAAI;CAGzB"}

package/dist/cjs/queries/HubConnectionKeepAlive.js

@@ -0,0 +1,33 @@
+'use strict';
+
+class HubConnectionKeepAlive {
+    _intervalMs;
+    _onIdle;
+    _lastActivityTime = Date.now();
+    _timer;
+    constructor(_intervalMs, _onIdle) {
+        this._intervalMs = _intervalMs;
+        this._onIdle = _onIdle;
+    }
+    start() {
+        this.stop();
+        this._lastActivityTime = Date.now();
+        this._timer = setInterval(() => {
+            if (Date.now() - this._lastActivityTime >= this._intervalMs) {
+                this._onIdle();
+            }
+        }, this._intervalMs);
+    }
+    stop() {
+        if (this._timer !== undefined) {
+            clearInterval(this._timer);
+            this._timer = undefined;
+        }
+    }
+    recordActivity() {
+        this._lastActivityTime = Date.now();
+    }
+}
+
+exports.HubConnectionKeepAlive = HubConnectionKeepAlive;
+//# sourceMappingURL=HubConnectionKeepAlive.js.map

package/dist/cjs/queries/HubConnectionKeepAlive.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HubConnectionKeepAlive.js","sources":["../../../queries/HubConnectionKeepAlive.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\n/**\n * Manages keep-alive behavior for hub connections (both WebSocket and Server-Sent Events).\n *\n * Records connection activity (any message received or sent). An interval fires every\n * {@link intervalMs} milliseconds; if no activity has been recorded since the last tick the\n * provided {@link onIdle} callback is invoked — the caller decides whether to send a ping,\n * trigger a reconnect, or take some other action.\n *\n * Both {@link WebSocketHubConnection} and {@link ServerSentEventHubConnection} own one instance\n * of this class so the keep-alive logic is written once and behaves identically for both\n * transports.\n */\nexport class HubConnectionKeepAlive {\n    private _lastActivityTime = Date.now();\n    private _timer?: ReturnType<typeof setInterval>;\n\n    /**\n     * Initializes a new instance of {@link HubConnectionKeepAlive}.\n     * @param {number} intervalMs How often (in milliseconds) to check for idle connections.\n     * @param {() => void} onIdle Callback invoked when the interval fires and no activity has\n     *   been recorded in the last {@link intervalMs} milliseconds.\n     */\n    constructor(\n        private readonly _intervalMs: number,\n        private readonly _onIdle: () => void,\n    ) {}\n\n    /**\n     * Start the keep-alive timer. Safe to call multiple times — a running timer is stopped first.\n     */\n    start(): void {\n        this.stop();\n        this._lastActivityTime = Date.now();\n        this._timer = setInterval(() => {\n            if (Date.now() - this._lastActivityTime >= this._intervalMs) {\n                this._onIdle();\n            }\n        }, this._intervalMs);\n    }\n\n    /**\n     * Stop the keep-alive timer.\n     */\n    stop(): void {\n        if (this._timer !== undefined) {\n            clearInterval(this._timer);\n            this._timer = undefined;\n        }\n    }\n\n    /**\n     * Record that the connection has been active (message sent or received).\n     * Resets the idle timer so that a keep-alive is not sent while data is already flowing.\n     */\n    recordActivity(): void {\n        this._lastActivityTime = Date.now();\n    }\n}\n"],"names":[],"mappings":";;MAea,sBAAsB,CAAA;AAWV,IAAA,WAAA;AACA,IAAA,OAAA;AAXb,IAAA,iBAAiB,GAAG,IAAI,CAAC,GAAG,EAAE;AAC9B,IAAA,MAAM;IAQd,WAAA,CACqB,WAAmB,EACnB,OAAmB,EAAA;QADnB,IAAA,CAAA,WAAW,GAAX,WAAW;QACX,IAAA,CAAA,OAAO,GAAP,OAAO;IACzB;IAKH,KAAK,GAAA;QACD,IAAI,CAAC,IAAI,EAAE;AACX,QAAA,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,GAAG,EAAE;AACnC,QAAA,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,MAAK;AAC3B,YAAA,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,WAAW,EAAE;gBACzD,IAAI,CAAC,OAAO,EAAE;YAClB;AACJ,QAAA,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC;IACxB;IAKA,IAAI,GAAA;AACA,QAAA,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;AAC3B,YAAA,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC;AAC1B,YAAA,IAAI,CAAC,MAAM,GAAG,SAAS;QAC3B;IACJ;IAMA,cAAc,GAAA;AACV,QAAA,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,GAAG,EAAE;IACvC;AACH;;;;"}

package/dist/cjs/queries/IObservableQueryHubConnection.d.ts

@@ -0,0 +1,11 @@
+import { DataReceived } from './ObservableQueryConnection';
+import { SubscriptionRequest } from './WebSocketHubConnection';
+export interface IObservableQueryHubConnection {
+    readonly queryCount: number;
+    readonly lastPingLatency: number;
+    readonly averageLatency: number;
+    subscribe(queryId: string, request: SubscriptionRequest, callback: DataReceived<any>): void;
+    unsubscribe(queryId: string): void;
+    dispose(): void;
+}
+//# sourceMappingURL=IObservableQueryHubConnection.d.ts.map

package/dist/cjs/queries/IObservableQueryHubConnection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"IObservableQueryHubConnection.d.ts","sourceRoot":"","sources":["../../../queries/IObservableQueryHubConnection.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAW/D,MAAM,WAAW,6BAA6B;IAI1C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAK5B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAKjC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAQhC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,YAAY,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IAM5F,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAKnC,OAAO,IAAI,IAAI,CAAC;CACnB"}

package/dist/cjs/queries/IReconnectPolicy.d.ts

@@ -0,0 +1,8 @@
+export type ReconnectCallback = () => void;
+export interface IReconnectPolicy {
+    readonly attempt: number;
+    schedule(onReconnect: ReconnectCallback, label: string): boolean;
+    reset(): void;
+    cancel(): void;
+}
+//# sourceMappingURL=IReconnectPolicy.d.ts.map

package/dist/cjs/queries/IReconnectPolicy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"IReconnectPolicy.d.ts","sourceRoot":"","sources":["../../../queries/IReconnectPolicy.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC;AAM3C,MAAM,WAAW,gBAAgB;IAI7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IASzB,QAAQ,CAAC,WAAW,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IAMjE,KAAK,IAAI,IAAI,CAAC;IAMd,MAAM,IAAI,IAAI,CAAC;CAClB"}

package/dist/cjs/queries/ObservableQueryConnection.d.ts

@@ -1,8 +1,10 @@
 import { IObservableQueryConnection } from './IObservableQueryConnection';
+import { IReconnectPolicy } from './IReconnectPolicy';
 import { QueryResult } from './QueryResult';
 export type DataReceived<TDataType> = (data: QueryResult<TDataType>) => void;
 export declare class ObservableQueryConnection<TDataType> implements IObservableQueryConnection<TDataType> {
     private readonly _microservice;
+    private readonly _reconnectPolicy;
     private _socket;
     private _disconnected;
     private _url;
@@ -12,7 +14,7 @@ export declare class ObservableQueryConnection<TDataType> implements IObservable
     private _lastPongLatency;
     private _latencySamples;
     private _connectionStartTime?;
-    constructor(url: URL, _microservice: string, pingIntervalMs?: number);
+    constructor(url: URL, _microservice: string, pingIntervalMs?: number, _reconnectPolicy?: IReconnectPolicy);
     dispose(): void;
     get lastPingLatency(): number;
     get averageLatency(): number;

package/dist/cjs/queries/ObservableQueryConnection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObservableQueryConnection.d.ts","sourceRoot":"","sources":["../../../queries/ObservableQueryConnection.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,MAAM,MAAM,YAAY,CAAC,SAAS,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC;AAK7E,qBAAa,yBAAyB,CAAC,SAAS,CAAE,YAAW,0BAA0B,CAAC,SAAS,CAAC;IAkBxE,OAAO,CAAC,QAAQ,CAAC,aAAa;IAhBpD,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,aAAa,CAAC,CAAiC;IACvD,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,iBAAiB,CAAC,CAAS;IACnC,OAAO,CAAC,gBAAgB,CAAa;IACrC,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,oBAAoB,CAAC,CAAS;gBAQ1B,GAAG,EAAE,GAAG,EAAmB,aAAa,EAAE,MAAM,EAAE,cAAc,GAAE,MAAc;IAkB5F,OAAO;IAOP,IAAI,eAAe,IAAI,MAAM,CAE5B;IAKD,IAAI,cAAc,IAAI,MAAM,CAM3B;IAGD,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC,EAAE,MAAM;IAmEtE,UAAU;IAYV,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,QAAQ;IAchB,OAAO,CAAC,aAAa;IAiBrB,OAAO,CAAC,UAAU;CAYrB"}
+{"version":3,"file":"ObservableQueryConnection.d.ts","sourceRoot":"","sources":["../../../queries/ObservableQueryConnection.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,MAAM,MAAM,YAAY,CAAC,SAAS,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC;AAK7E,qBAAa,yBAAyB,CAAC,SAAS,CAAE,YAAW,0BAA0B,CAAC,SAAS,CAAC;IAmBxE,OAAO,CAAC,QAAQ,CAAC,aAAa;IAA0C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAjB/H,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,aAAa,CAAC,CAAiC;IACvD,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,iBAAiB,CAAC,CAAS;IACnC,OAAO,CAAC,gBAAgB,CAAa;IACrC,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,oBAAoB,CAAC,CAAS;gBAS1B,GAAG,EAAE,GAAG,EAAmB,aAAa,EAAE,MAAM,EAAE,cAAc,GAAE,MAAc,EAAmB,gBAAgB,GAAE,gBAAwC;IAkBzK,OAAO;IAOP,IAAI,eAAe,IAAI,MAAM,CAE5B;IAKD,IAAI,cAAc,IAAI,MAAM,CAM3B;IAGD,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC,EAAE,MAAM;IA+CtE,UAAU;IAaV,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,QAAQ;IAchB,OAAO,CAAC,aAAa;IAiBrB,OAAO,CAAC,UAAU;CAYrB"}

package/dist/cjs/queries/ObservableQueryConnection.js

@@ -1,10 +1,12 @@
 'use strict';
 
 var Globals = require('../Globals.js');
+var ReconnectPolicy = require('./ReconnectPolicy.js');
 var WebSocketMessage = require('./WebSocketMessage.js');
 
 class ObservableQueryConnection {
     _microservice;
+    _reconnectPolicy;
     _socket;
     _disconnected = false;
     _url;
@@ -14,8 +16,9 @@ class ObservableQueryConnection {
     _lastPongLatency = 0;
     _latencySamples = [];
     _connectionStartTime;
-    constructor(url, _microservice, pingIntervalMs = 10000) {
+    constructor(url, _microservice, pingIntervalMs = 10000, _reconnectPolicy = new ReconnectPolicy.ReconnectPolicy()) {
         this._microservice = _microservice;
+        this._reconnectPolicy = _reconnectPolicy;
         this._pingIntervalMs = pingIntervalMs;
         const secure = url.protocol?.indexOf('https') === 0 || false;
         this._url = `${secure ? 'wss' : 'ws'}://${url.host}${url.pathname}${url.search}`;
@@ -54,30 +57,13 @@ class ObservableQueryConnection {
             const query = Object.keys(queryArguments).map(key => `${key}=${queryArguments[key]}`).join('&');
             url = `${url}${query}`;
         }
-        let timeToWait = 500;
-        const timeExponent = 500;
-        const retries = 100;
-        let currentAttempt = 0;
-        const maxTime = 10_000;
         const connectSocket = () => {
-            const retry = () => {
-                currentAttempt++;
-                if (currentAttempt > retries) {
-                    console.log(`Attempted ${retries} retries for route '${url}'. Abandoning.`);
-                    return;
-                }
-                console.log(`Attempting to reconnect for '${url}' (#${currentAttempt})`);
-                setTimeout(connectSocket, timeToWait);
-                timeToWait += (timeExponent * currentAttempt);
-                timeToWait = timeToWait > maxTime ? maxTime : timeToWait;
-            };
             this._socket = new WebSocket(url);
             this._socket.onopen = () => {
                 if (this._disconnected)
                     return;
                 console.log(`Connection for '${url}' established`);
-                timeToWait = 500;
-                currentAttempt = 0;
+                this._reconnectPolicy.reset();
                 this._connectionStartTime = Date.now();
                 this.startPinging();
             };
@@ -86,14 +72,14 @@ class ObservableQueryConnection {
                     return;
                 console.log(`Unexpected connection closed for route '${url}'`);
                 this.stopPinging();
-                retry();
+                this._reconnectPolicy.schedule(connectSocket, url);
             };
             this._socket.onerror = (error) => {
                 if (this._disconnected)
                     return;
                 console.log(`Error with connection for '${url}' - ${error}`);
                 this.stopPinging();
-                retry();
+                this._reconnectPolicy.schedule(connectSocket, url);
             };
             this._socket.onmessage = (ev) => {
                 if (this._disconnected) {
@@ -113,6 +99,7 @@ class ObservableQueryConnection {
         }
         console.log(`Disconnecting '${this._url}'`);
         this._disconnected = true;
+        this._reconnectPolicy.cancel();
         this.stopPinging();
         this._socket?.close();
         console.log(`Connection for '${this._url}' closed`);

package/dist/cjs/queries/ObservableQueryConnection.js.map

@@ -1 +1 @@
-{"version":3,"file":"ObservableQueryConnection.js","sources":["../../../queries/ObservableQueryConnection.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\nimport { Globals } from '../Globals';\nimport { IObservableQueryConnection } from './IObservableQueryConnection';\nimport { QueryResult } from './QueryResult';\nimport { WebSocketMessage, WebSocketMessageType } from './WebSocketMessage';\n\nexport type DataReceived<TDataType> = (data: QueryResult<TDataType>) => void;\n\n/**\n * Represents the connection for an observable query.\n */\nexport class ObservableQueryConnection<TDataType> implements IObservableQueryConnection<TDataType> {\n\n    private _socket!: WebSocket;\n    private _disconnected = false;\n    private _url: string;\n    private _pingInterval?: ReturnType<typeof setInterval>;\n    private _pingIntervalMs: number = 10000;\n    private _lastPingSentTime?: number;\n    private _lastPongLatency: number = 0;\n    private _latencySamples: number[] = [];\n    private _connectionStartTime?: number;\n\n    /**\n     * Initializes a new instance of the {@link ObservableQueryConnection<TDataType>} class.\n     * @param {Url} url The fully qualified Url.\n     * @param {string} _microservice The microservice name.\n     * @param {number} pingIntervalMs The ping interval in milliseconds (default: 10000).\n     */\n    constructor(url: URL, private readonly _microservice: string, pingIntervalMs: number = 10000) {\n        this._pingIntervalMs = pingIntervalMs;\n        const secure = url.protocol?.indexOf('https') === 0 || false;\n\n        this._url = `${secure ? 'wss' : 'ws'}://${url.host}${url.pathname}${url.search}`;\n        if (this._microservice?.length > 0) {\n            const microserviceParam = `${Globals.microserviceWSQueryArgument}=${this._microservice}`;\n            if (this._url.indexOf('?') > 0) {\n                this._url = `${this._url}&${microserviceParam}`;\n            } else {\n                this._url = `${this._url}?${microserviceParam}`;\n            }\n        }\n    }\n\n    /**\n     * Disposes the connection.\n     */\n    dispose() {\n        this.disconnect();\n    }\n\n    /**\n     * Gets the latency of the last ping/pong sequence in milliseconds.\n     */\n    get lastPingLatency(): number {\n        return this._lastPongLatency;\n    }\n\n    /**\n     * Gets the average latency since the connection started in milliseconds.\n     */\n    get averageLatency(): number {\n        if (this._latencySamples.length === 0) {\n            return 0;\n        }\n        const sum = this._latencySamples.reduce((acc, val) => acc + val, 0);\n        return sum / this._latencySamples.length;\n    }\n\n    /** @inheritdoc */\n    connect(dataReceived: DataReceived<TDataType>, queryArguments?: object) {\n        let url = this._url;\n        if (queryArguments) {\n            if (url.indexOf('?') < 0) {\n                url = `${url}?`;\n            } else {\n                url = `${url}&`;\n            }\n            const query = Object.keys(queryArguments).map(key => `${key}=${queryArguments[key]}`).join('&');\n            url = `${url}${query}`;\n        }\n\n        let timeToWait = 500;\n        const timeExponent = 500;\n        const retries = 100;\n        let currentAttempt = 0;\n        const maxTime = 10_000;\n\n        const connectSocket = () => {\n            const retry = () => {\n                currentAttempt++;\n                if (currentAttempt > retries) {\n                    console.log(`Attempted ${retries} retries for route '${url}'. Abandoning.`);\n                    return;\n                }\n                console.log(`Attempting to reconnect for '${url}' (#${currentAttempt})`);\n\n                setTimeout(connectSocket, timeToWait);\n                timeToWait += (timeExponent * currentAttempt);\n                timeToWait = timeToWait > maxTime ? maxTime : timeToWait; \n            };\n\n            this._socket = new WebSocket(url);\n            this._socket.onopen = () => {\n                if (this._disconnected) return;\n                console.log(`Connection for '${url}' established`);\n                timeToWait = 500;\n                currentAttempt = 0;\n                this._connectionStartTime = Date.now();\n                this.startPinging();\n            };\n            this._socket.onclose = () => {\n                if (this._disconnected) return;\n                console.log(`Unexpected connection closed for route '${url}'`);\n                this.stopPinging();\n                retry();\n            };\n            this._socket.onerror = (error) => {\n                if (this._disconnected) return;\n                console.log(`Error with connection for '${url}' - ${error}`);\n                this.stopPinging();\n                retry();\n            };\n            this._socket.onmessage = (ev) => {\n                if (this._disconnected) {\n                    console.log('Received message after closing connection');\n                    return;\n                }\n                this.handleMessage(ev.data, dataReceived);\n            };\n        };\n\n        if (this._disconnected) return;\n        connectSocket();\n    }\n\n    /** @inheritdoc */\n    disconnect() {\n        if (this._disconnected) {\n            return;\n        }\n        console.log(`Disconnecting '${this._url}'`);\n        this._disconnected = true;\n        this.stopPinging();\n        this._socket?.close();\n        console.log(`Connection for '${this._url}' closed`);\n        this._socket = undefined!;\n    }\n\n    private startPinging() {\n        this.stopPinging();\n        this._pingInterval = setInterval(() => {\n            this.sendPing();\n        }, this._pingIntervalMs);\n    }\n\n    private stopPinging() {\n        if (this._pingInterval) {\n            clearInterval(this._pingInterval);\n            this._pingInterval = undefined;\n        }\n    }\n\n    private sendPing() {\n        if (this._disconnected || !this._socket || this._socket.readyState !== WebSocket.OPEN) {\n            return;\n        }\n\n        this._lastPingSentTime = Date.now();\n        const pingMessage: WebSocketMessage = {\n            type: WebSocketMessageType.Ping,\n            timestamp: this._lastPingSentTime\n        };\n\n        this._socket.send(JSON.stringify(pingMessage));\n    }\n\n    private handleMessage(rawData: string, dataReceived: DataReceived<TDataType>) {\n        try {\n            const message = JSON.parse(rawData) as WebSocketMessage;\n\n            // Handle messages based on type\n            if (message.type === WebSocketMessageType.Pong) {\n                this.handlePong(message);\n            } else if (message.type === WebSocketMessageType.Data || !message.type) {\n                // For backward compatibility, treat messages without a type as data messages\n                const data = message.data ?? message;\n                dataReceived(data as QueryResult<TDataType>);\n            }\n        } catch (error) {\n            console.error('Error parsing WebSocket message:', error);\n        }\n    }\n\n    private handlePong(message: WebSocketMessage) {\n        if (message.timestamp && this._lastPingSentTime) {\n            const latency = Date.now() - message.timestamp;\n            this._lastPongLatency = latency;\n            this._latencySamples.push(latency);\n\n            // Keep only the last 100 samples for average calculation\n            if (this._latencySamples.length > 100) {\n                this._latencySamples.shift();\n            }\n        }\n    }\n}\n"],"names":["Globals","WebSocketMessageType"],"mappings":"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"}
+{"version":3,"file":"ObservableQueryConnection.js","sources":["../../../queries/ObservableQueryConnection.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\nimport { Globals } from '../Globals';\nimport { IObservableQueryConnection } from './IObservableQueryConnection';\nimport { IReconnectPolicy } from './IReconnectPolicy';\nimport { ReconnectPolicy } from './ReconnectPolicy';\nimport { QueryResult } from './QueryResult';\nimport { WebSocketMessage, WebSocketMessageType } from './WebSocketMessage';\n\nexport type DataReceived<TDataType> = (data: QueryResult<TDataType>) => void;\n\n/**\n * Represents the connection for an observable query.\n */\nexport class ObservableQueryConnection<TDataType> implements IObservableQueryConnection<TDataType> {\n\n    private _socket!: WebSocket;\n    private _disconnected = false;\n    private _url: string;\n    private _pingInterval?: ReturnType<typeof setInterval>;\n    private _pingIntervalMs: number = 10000;\n    private _lastPingSentTime?: number;\n    private _lastPongLatency: number = 0;\n    private _latencySamples: number[] = [];\n    private _connectionStartTime?: number;\n\n    /**\n     * Initializes a new instance of the {@link ObservableQueryConnection<TDataType>} class.\n     * @param {Url} url The fully qualified Url.\n     * @param {string} _microservice The microservice name.\n     * @param {number} pingIntervalMs The ping interval in milliseconds (default: 10000).\n     * @param {IReconnectPolicy} reconnectPolicy The reconnect policy to use (default: {@link ReconnectPolicy}).\n     */\n    constructor(url: URL, private readonly _microservice: string, pingIntervalMs: number = 10000, private readonly _reconnectPolicy: IReconnectPolicy = new ReconnectPolicy()) {\n        this._pingIntervalMs = pingIntervalMs;\n        const secure = url.protocol?.indexOf('https') === 0 || false;\n\n        this._url = `${secure ? 'wss' : 'ws'}://${url.host}${url.pathname}${url.search}`;\n        if (this._microservice?.length > 0) {\n            const microserviceParam = `${Globals.microserviceWSQueryArgument}=${this._microservice}`;\n            if (this._url.indexOf('?') > 0) {\n                this._url = `${this._url}&${microserviceParam}`;\n            } else {\n                this._url = `${this._url}?${microserviceParam}`;\n            }\n        }\n    }\n\n    /**\n     * Disposes the connection.\n     */\n    dispose() {\n        this.disconnect();\n    }\n\n    /**\n     * Gets the latency of the last ping/pong sequence in milliseconds.\n     */\n    get lastPingLatency(): number {\n        return this._lastPongLatency;\n    }\n\n    /**\n     * Gets the average latency since the connection started in milliseconds.\n     */\n    get averageLatency(): number {\n        if (this._latencySamples.length === 0) {\n            return 0;\n        }\n        const sum = this._latencySamples.reduce((acc, val) => acc + val, 0);\n        return sum / this._latencySamples.length;\n    }\n\n    /** @inheritdoc */\n    connect(dataReceived: DataReceived<TDataType>, queryArguments?: object) {\n        let url = this._url;\n        if (queryArguments) {\n            if (url.indexOf('?') < 0) {\n                url = `${url}?`;\n            } else {\n                url = `${url}&`;\n            }\n            const query = Object.keys(queryArguments).map(key => `${key}=${queryArguments[key]}`).join('&');\n            url = `${url}${query}`;\n        }\n\n        const connectSocket = () => {\n            this._socket = new WebSocket(url);\n            this._socket.onopen = () => {\n                if (this._disconnected) return;\n                console.log(`Connection for '${url}' established`);\n                this._reconnectPolicy.reset();\n                this._connectionStartTime = Date.now();\n                this.startPinging();\n            };\n            this._socket.onclose = () => {\n                if (this._disconnected) return;\n                console.log(`Unexpected connection closed for route '${url}'`);\n                this.stopPinging();\n                this._reconnectPolicy.schedule(connectSocket, url);\n            };\n            this._socket.onerror = (error) => {\n                if (this._disconnected) return;\n                console.log(`Error with connection for '${url}' - ${error}`);\n                this.stopPinging();\n                this._reconnectPolicy.schedule(connectSocket, url);\n            };\n            this._socket.onmessage = (ev) => {\n                if (this._disconnected) {\n                    console.log('Received message after closing connection');\n                    return;\n                }\n                this.handleMessage(ev.data, dataReceived);\n            };\n        };\n\n        if (this._disconnected) return;\n        connectSocket();\n    }\n\n    /** @inheritdoc */\n    disconnect() {\n        if (this._disconnected) {\n            return;\n        }\n        console.log(`Disconnecting '${this._url}'`);\n        this._disconnected = true;\n        this._reconnectPolicy.cancel();\n        this.stopPinging();\n        this._socket?.close();\n        console.log(`Connection for '${this._url}' closed`);\n        this._socket = undefined!;\n    }\n\n    private startPinging() {\n        this.stopPinging();\n        this._pingInterval = setInterval(() => {\n            this.sendPing();\n        }, this._pingIntervalMs);\n    }\n\n    private stopPinging() {\n        if (this._pingInterval) {\n            clearInterval(this._pingInterval);\n            this._pingInterval = undefined;\n        }\n    }\n\n    private sendPing() {\n        if (this._disconnected || !this._socket || this._socket.readyState !== WebSocket.OPEN) {\n            return;\n        }\n\n        this._lastPingSentTime = Date.now();\n        const pingMessage: WebSocketMessage = {\n            type: WebSocketMessageType.Ping,\n            timestamp: this._lastPingSentTime\n        };\n\n        this._socket.send(JSON.stringify(pingMessage));\n    }\n\n    private handleMessage(rawData: string, dataReceived: DataReceived<TDataType>) {\n        try {\n            const message = JSON.parse(rawData) as WebSocketMessage;\n\n            // Handle messages based on type\n            if (message.type === WebSocketMessageType.Pong) {\n                this.handlePong(message);\n            } else if (message.type === WebSocketMessageType.Data || !message.type) {\n                // For backward compatibility, treat messages without a type as data messages\n                const data = message.data ?? message;\n                dataReceived(data as QueryResult<TDataType>);\n            }\n        } catch (error) {\n            console.error('Error parsing WebSocket message:', error);\n        }\n    }\n\n    private handlePong(message: WebSocketMessage) {\n        if (message.timestamp && this._lastPingSentTime) {\n            const latency = Date.now() - message.timestamp;\n            this._lastPongLatency = latency;\n            this._latencySamples.push(latency);\n\n            // Keep only the last 100 samples for average calculation\n            if (this._latencySamples.length > 100) {\n                this._latencySamples.shift();\n            }\n        }\n    }\n}\n"],"names":["ReconnectPolicy","Globals","WebSocketMessageType"],"mappings":"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"}

package/dist/cjs/queries/ObservableQueryConnectionFactory.d.ts

@@ -0,0 +1,13 @@
+import { IObservableQueryConnection } from './IObservableQueryConnection';
+export declare const SSE_SUBSCRIBE_ROUTE = "/.cratis/queries/sse/subscribe";
+export declare const SSE_UNSUBSCRIBE_ROUTE = "/.cratis/queries/sse/unsubscribe";
+export interface QueryConnectionDescriptor {
+    route: string;
+    queryName: string;
+    origin: string;
+    apiBasePath: string;
+    microservice: string;
+    args?: object;
+}
+export declare function createObservableQueryConnection<TDataType>(descriptor: QueryConnectionDescriptor): IObservableQueryConnection<TDataType>;
+//# sourceMappingURL=ObservableQueryConnectionFactory.d.ts.map

package/dist/cjs/queries/ObservableQueryConnectionFactory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ObservableQueryConnectionFactory.d.ts","sourceRoot":"","sources":["../../../queries/ObservableQueryConnectionFactory.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAW1E,eAAO,MAAM,mBAAmB,mCAAmC,CAAC;AAKpE,eAAO,MAAM,qBAAqB,qCAAqC,CAAC;AAOxE,MAAM,WAAW,yBAAyB;IAEtC,KAAK,EAAE,MAAM,CAAC;IAEd,SAAS,EAAE,MAAM,CAAC;IAElB,MAAM,EAAE,MAAM,CAAC;IAEf,WAAW,EAAE,MAAM,CAAC;IAEpB,YAAY,EAAE,MAAM,CAAC;IAErB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAiBD,wBAAgB,+BAA+B,CAAC,SAAS,EAAE,UAAU,EAAE,yBAAyB,GAAG,0BAA0B,CAAC,SAAS,CAAC,CAUvI"}

package/dist/cjs/queries/ObservableQueryConnectionFactory.js

@@ -0,0 +1,62 @@
+'use strict';
+
+var Globals = require('../Globals.js');
+var joinPaths = require('../joinPaths.js');
+var UrlHelpers = require('../UrlHelpers.js');
+var ObservableQueryConnection = require('./ObservableQueryConnection.js');
+var QueryTransportMethod = require('./QueryTransportMethod.js');
+var ServerSentEventQueryConnection = require('./ServerSentEventQueryConnection.js');
+var ServerSentEventHubConnection = require('./ServerSentEventHubConnection.js');
+var WebSocketHubConnection = require('./WebSocketHubConnection.js');
+var ObservableQueryMultiplexer = require('./ObservableQueryMultiplexer.js');
+
+const SSE_SUBSCRIBE_ROUTE = '/.cratis/queries/sse/subscribe';
+const SSE_UNSUBSCRIBE_ROUTE = '/.cratis/queries/sse/unsubscribe';
+function createObservableQueryConnection(descriptor) {
+    const isSSE = Globals.Globals.queryTransportMethod === QueryTransportMethod.QueryTransportMethod.ServerSentEvents;
+    if (Globals.Globals.queryDirectMode) {
+        return isSSE
+            ? createDirectSSEConnection(descriptor)
+            : createDirectWebSocketConnection(descriptor);
+    }
+    return createMultiplexedConnection(descriptor, isSSE);
+}
+function buildDirectUrl(descriptor) {
+    const { route } = UrlHelpers.UrlHelpers.replaceRouteParameters(descriptor.route, descriptor.args);
+    const actualRoute = joinPaths.joinPaths(descriptor.apiBasePath, route);
+    return UrlHelpers.UrlHelpers.createUrlFrom(descriptor.origin, descriptor.apiBasePath, actualRoute);
+}
+function createDirectWebSocketConnection(descriptor) {
+    return new ObservableQueryConnection.ObservableQueryConnection(buildDirectUrl(descriptor), descriptor.microservice);
+}
+function createDirectSSEConnection(descriptor) {
+    return new ServerSentEventQueryConnection.ServerSentEventQueryConnection(buildDirectUrl(descriptor));
+}
+function createMultiplexedConnection(descriptor, isSSE) {
+    const transport = isSSE ? 'sse' : 'ws';
+    const cacheKey = `${Globals.Globals.queryConnectionCount}|${transport}|${descriptor.origin}|${descriptor.apiBasePath}|${descriptor.microservice}`;
+    const multiplexer = ObservableQueryMultiplexer.getOrCreateMultiplexer(() => {
+        if (isSSE) {
+            const sseRoute = joinPaths.joinPaths(descriptor.apiBasePath, ServerSentEventQueryConnection.SSE_HUB_ROUTE);
+            const sseUrl = UrlHelpers.UrlHelpers.createUrlFrom(descriptor.origin, descriptor.apiBasePath, sseRoute);
+            const subscribeRoute = joinPaths.joinPaths(descriptor.apiBasePath, SSE_SUBSCRIBE_ROUTE);
+            const subscribeUrl = UrlHelpers.UrlHelpers.createUrlFrom(descriptor.origin, descriptor.apiBasePath, subscribeRoute);
+            const unsubscribeRoute = joinPaths.joinPaths(descriptor.apiBasePath, SSE_UNSUBSCRIBE_ROUTE);
+            const unsubscribeUrl = UrlHelpers.UrlHelpers.createUrlFrom(descriptor.origin, descriptor.apiBasePath, unsubscribeRoute);
+            return new ServerSentEventHubConnection.ServerSentEventHubConnection(sseUrl.toString(), subscribeUrl.toString(), unsubscribeUrl.toString(), descriptor.microservice);
+        }
+        else {
+            const hubRoute = joinPaths.joinPaths(descriptor.apiBasePath, ObservableQueryMultiplexer.WS_HUB_ROUTE);
+            const hubUrl = UrlHelpers.UrlHelpers.createUrlFrom(descriptor.origin, descriptor.apiBasePath, hubRoute);
+            const secure = hubUrl.protocol?.indexOf('https') === 0;
+            const wsUrl = `${secure ? 'wss' : 'ws'}://${hubUrl.host}${hubUrl.pathname}${hubUrl.search}`;
+            return new WebSocketHubConnection.WebSocketHubConnection(wsUrl, descriptor.microservice);
+        }
+    }, cacheKey);
+    return new ObservableQueryMultiplexer.MultiplexedObservableQueryConnection(multiplexer, descriptor.queryName);
+}
+
+exports.SSE_SUBSCRIBE_ROUTE = SSE_SUBSCRIBE_ROUTE;
+exports.SSE_UNSUBSCRIBE_ROUTE = SSE_UNSUBSCRIBE_ROUTE;
+exports.createObservableQueryConnection = createObservableQueryConnection;
+//# sourceMappingURL=ObservableQueryConnectionFactory.js.map

package/dist/cjs/queries/ObservableQueryConnectionFactory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ObservableQueryConnectionFactory.js","sources":["../../../queries/ObservableQueryConnectionFactory.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\nimport { Globals } from '../Globals';\nimport { joinPaths } from '../joinPaths';\nimport { UrlHelpers } from '../UrlHelpers';\nimport { IObservableQueryConnection } from './IObservableQueryConnection';\nimport { ObservableQueryConnection } from './ObservableQueryConnection';\nimport { QueryTransportMethod } from './QueryTransportMethod';\nimport { ServerSentEventQueryConnection, SSE_HUB_ROUTE } from './ServerSentEventQueryConnection';\nimport { ServerSentEventHubConnection } from './ServerSentEventHubConnection';\nimport { WebSocketHubConnection } from './WebSocketHubConnection';\nimport { MultiplexedObservableQueryConnection, WS_HUB_ROUTE, getOrCreateMultiplexer } from './ObservableQueryMultiplexer';\n\n/**\n * The SSE subscribe POST endpoint route.\n */\nexport const SSE_SUBSCRIBE_ROUTE = '/.cratis/queries/sse/subscribe';\n\n/**\n * The SSE unsubscribe POST endpoint route.\n */\nexport const SSE_UNSUBSCRIBE_ROUTE = '/.cratis/queries/sse/unsubscribe';\n\n/**\n * Describes what the factory needs to know about a query in order to create\n * the right connection. Transport details are intentionally absent — the\n * factory reads those from {@link Globals}.\n */\nexport interface QueryConnectionDescriptor {\n    /** The route template (e.g. `/api/accounts/debit/all-accounts`). */\n    route: string;\n    /** Fully-qualified backend query name used by hub transports. */\n    queryName: string;\n    /** Origin base URL (e.g. `http://localhost:5000`). */\n    origin: string;\n    /** API base path prefix. */\n    apiBasePath: string;\n    /** Microservice identifier. */\n    microservice: string;\n    /** Route/query arguments for the current subscription. */\n    args?: object;\n}\n\n/**\n * Single entry-point for creating observable query connections.\n *\n * The transport is chosen as a 2x2 matrix of (direct | hub) x (WebSocket | SSE):\n *\n * |                | Direct (per-query URL)         | Hub (centralized endpoint)    |\n * |----------------|-------------------------------|-------------------------------|\n * | **WebSocket**  | ObservableQueryConnection                | MultiplexedObservableQueryConnection |\n * | **SSE**        | ServerSentEventQueryConnection           | MultiplexedObservableQueryConnection |\n *\n * In multiplexed mode, both transports share the same multiplexer — it creates either\n * WebSocket or SSE connections depending on the transport setting.\n *\n * {@link ObservableQueryFor} never needs to know which transport is in use.\n */\nexport function createObservableQueryConnection<TDataType>(descriptor: QueryConnectionDescriptor): IObservableQueryConnection<TDataType> {\n    const isSSE = Globals.queryTransportMethod === QueryTransportMethod.ServerSentEvents;\n\n    if (Globals.queryDirectMode) {\n        return isSSE\n            ? createDirectSSEConnection<TDataType>(descriptor)\n            : createDirectWebSocketConnection<TDataType>(descriptor);\n    }\n\n    return createMultiplexedConnection<TDataType>(descriptor, isSSE);\n}\n\n// ---- Direct mode: one connection per query, hitting the query's own URL ----\n\nfunction buildDirectUrl(descriptor: QueryConnectionDescriptor): URL {\n    const { route } = UrlHelpers.replaceRouteParameters(descriptor.route, descriptor.args as object);\n    const actualRoute = joinPaths(descriptor.apiBasePath, route);\n    return UrlHelpers.createUrlFrom(descriptor.origin, descriptor.apiBasePath, actualRoute);\n}\n\nfunction createDirectWebSocketConnection<TDataType>(descriptor: QueryConnectionDescriptor): IObservableQueryConnection<TDataType> {\n    return new ObservableQueryConnection<TDataType>(buildDirectUrl(descriptor), descriptor.microservice);\n}\n\nfunction createDirectSSEConnection<TDataType>(descriptor: QueryConnectionDescriptor): IObservableQueryConnection<TDataType> {\n    return new ServerSentEventQueryConnection<TDataType>(buildDirectUrl(descriptor));\n}\n\n// ---- Multiplexed mode: centralized endpoint, multiple queries share connections ----\n\nfunction createMultiplexedConnection<TDataType>(descriptor: QueryConnectionDescriptor, isSSE: boolean): IObservableQueryConnection<TDataType> {\n    const transport = isSSE ? 'sse' : 'ws';\n    const cacheKey = `${Globals.queryConnectionCount}|${transport}|${descriptor.origin}|${descriptor.apiBasePath}|${descriptor.microservice}`;\n\n    const multiplexer = getOrCreateMultiplexer(() => {\n        if (isSSE) {\n            const sseRoute = joinPaths(descriptor.apiBasePath, SSE_HUB_ROUTE);\n            const sseUrl = UrlHelpers.createUrlFrom(descriptor.origin, descriptor.apiBasePath, sseRoute);\n            const subscribeRoute = joinPaths(descriptor.apiBasePath, SSE_SUBSCRIBE_ROUTE);\n            const subscribeUrl = UrlHelpers.createUrlFrom(descriptor.origin, descriptor.apiBasePath, subscribeRoute);\n            const unsubscribeRoute = joinPaths(descriptor.apiBasePath, SSE_UNSUBSCRIBE_ROUTE);\n            const unsubscribeUrl = UrlHelpers.createUrlFrom(descriptor.origin, descriptor.apiBasePath, unsubscribeRoute);\n            return new ServerSentEventHubConnection(\n                sseUrl.toString(),\n                subscribeUrl.toString(),\n                unsubscribeUrl.toString(),\n                descriptor.microservice,\n            );\n        } else {\n            const hubRoute = joinPaths(descriptor.apiBasePath, WS_HUB_ROUTE);\n            const hubUrl = UrlHelpers.createUrlFrom(descriptor.origin, descriptor.apiBasePath, hubRoute);\n            const secure = hubUrl.protocol?.indexOf('https') === 0;\n            const wsUrl = `${secure ? 'wss' : 'ws'}://${hubUrl.host}${hubUrl.pathname}${hubUrl.search}`;\n            return new WebSocketHubConnection(wsUrl, descriptor.microservice);\n        }\n    }, cacheKey);\n\n    return new MultiplexedObservableQueryConnection<TDataType>(multiplexer, descriptor.queryName);\n}\n"],"names":["Globals","QueryTransportMethod","UrlHelpers","joinPaths","ObservableQueryConnection","ServerSentEventQueryConnection","getOrCreateMultiplexer","SSE_HUB_ROUTE","ServerSentEventHubConnection","WS_HUB_ROUTE","WebSocketHubConnection","MultiplexedObservableQueryConnection"],"mappings":";;;;;;;;;;;;AAiBO,MAAM,mBAAmB,GAAG;AAK5B,MAAM,qBAAqB,GAAG;AAqC/B,SAAU,+BAA+B,CAAY,UAAqC,EAAA;IAC5F,MAAM,KAAK,GAAGA,eAAO,CAAC,oBAAoB,KAAKC,yCAAoB,CAAC,gBAAgB;AAEpF,IAAA,IAAID,eAAO,CAAC,eAAe,EAAE;AACzB,QAAA,OAAO;AACH,cAAE,yBAAyB,CAAY,UAAU;AACjD,cAAE,+BAA+B,CAAY,UAAU,CAAC;IAChE;AAEA,IAAA,OAAO,2BAA2B,CAAY,UAAU,EAAE,KAAK,CAAC;AACpE;AAIA,SAAS,cAAc,CAAC,UAAqC,EAAA;AACzD,IAAA,MAAM,EAAE,KAAK,EAAE,GAAGE,qBAAU,CAAC,sBAAsB,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,IAAc,CAAC;IAChG,MAAM,WAAW,GAAGC,mBAAS,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC;AAC5D,IAAA,OAAOD,qBAAU,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,WAAW,EAAE,WAAW,CAAC;AAC3F;AAEA,SAAS,+BAA+B,CAAY,UAAqC,EAAA;AACrF,IAAA,OAAO,IAAIE,mDAAyB,CAAY,cAAc,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC,YAAY,CAAC;AACxG;AAEA,SAAS,yBAAyB,CAAY,UAAqC,EAAA;IAC/E,OAAO,IAAIC,6DAA8B,CAAY,cAAc,CAAC,UAAU,CAAC,CAAC;AACpF;AAIA,SAAS,2BAA2B,CAAY,UAAqC,EAAE,KAAc,EAAA;IACjG,MAAM,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,IAAI;IACtC,MAAM,QAAQ,GAAG,CAAA,EAAGL,eAAO,CAAC,oBAAoB,CAAA,CAAA,EAAI,SAAS,CAAA,CAAA,EAAI,UAAU,CAAC,MAAM,CAAA,CAAA,EAAI,UAAU,CAAC,WAAW,IAAI,UAAU,CAAC,YAAY,CAAA,CAAE;AAEzI,IAAA,MAAM,WAAW,GAAGM,iDAAsB,CAAC,MAAK;QAC5C,IAAI,KAAK,EAAE;YACP,MAAM,QAAQ,GAAGH,mBAAS,CAAC,UAAU,CAAC,WAAW,EAAEI,4CAAa,CAAC;AACjE,YAAA,MAAM,MAAM,GAAGL,qBAAU,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC;YAC5F,MAAM,cAAc,GAAGC,mBAAS,CAAC,UAAU,CAAC,WAAW,EAAE,mBAAmB,CAAC;AAC7E,YAAA,MAAM,YAAY,GAAGD,qBAAU,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,WAAW,EAAE,cAAc,CAAC;YACxG,MAAM,gBAAgB,GAAGC,mBAAS,CAAC,UAAU,CAAC,WAAW,EAAE,qBAAqB,CAAC;AACjF,YAAA,MAAM,cAAc,GAAGD,qBAAU,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,WAAW,EAAE,gBAAgB,CAAC;YAC5G,OAAO,IAAIM,yDAA4B,CACnC,MAAM,CAAC,QAAQ,EAAE,EACjB,YAAY,CAAC,QAAQ,EAAE,EACvB,cAAc,CAAC,QAAQ,EAAE,EACzB,UAAU,CAAC,YAAY,CAC1B;QACL;aAAO;YACH,MAAM,QAAQ,GAAGL,mBAAS,CAAC,UAAU,CAAC,WAAW,EAAEM,uCAAY,CAAC;AAChE,YAAA,MAAM,MAAM,GAAGP,qBAAU,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC;AAC5F,YAAA,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;YACtD,MAAM,KAAK,GAAG,CAAA,EAAG,MAAM,GAAG,KAAK,GAAG,IAAI,MAAM,MAAM,CAAC,IAAI,CAAA,EAAG,MAAM,CAAC,QAAQ,CAAA,EAAG,MAAM,CAAC,MAAM,CAAA,CAAE;YAC3F,OAAO,IAAIQ,6CAAsB,CAAC,KAAK,EAAE,UAAU,CAAC,YAAY,CAAC;QACrE;IACJ,CAAC,EAAE,QAAQ,CAAC;IAEZ,OAAO,IAAIC,+DAAoC,CAAY,WAAW,EAAE,UAAU,CAAC,SAAS,CAAC;AACjG;;;;;;"}

package/dist/cjs/queries/ObservableQueryConnectionPool.d.ts

@@ -0,0 +1,9 @@
+import { IObservableQueryConnection } from './IObservableQueryConnection';
+import { DataReceived } from './ObservableQueryConnection';
+export declare class ObservableQueryConnectionPool<TDataType> {
+    private readonly _factory;
+    private readonly _slots;
+    constructor(size: number, _factory: () => IObservableQueryConnection<TDataType>);
+    acquire(dataReceived: DataReceived<TDataType>, queryArguments?: object): () => void;
+}
+//# sourceMappingURL=ObservableQueryConnectionPool.d.ts.map

package/dist/cjs/queries/ObservableQueryConnectionPool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ObservableQueryConnectionPool.d.ts","sourceRoot":"","sources":["../../../queries/ObservableQueryConnectionPool.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAuB3D,qBAAa,6BAA6B,CAAC,SAAS;IAU5C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAT7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;gBAQhC,IAAI,EAAE,MAAM,EACK,QAAQ,EAAE,MAAM,0BAA0B,CAAC,SAAS,CAAC;IAY1E,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,IAAI;CActF"}

package/dist/cjs/queries/ObservableQueryConnectionPool.js

@@ -0,0 +1,23 @@
+'use strict';
+
+class ObservableQueryConnectionPool {
+    _factory;
+    _slots;
+    constructor(size, _factory) {
+        this._factory = _factory;
+        this._slots = Array.from({ length: Math.max(1, size) }, () => ({ queryCount: 0 }));
+    }
+    acquire(dataReceived, queryArguments) {
+        const slot = this._slots.reduce((min, current) => current.queryCount < min.queryCount ? current : min, this._slots[0]);
+        slot.queryCount++;
+        const connection = this._factory();
+        connection.connect(dataReceived, queryArguments);
+        return () => {
+            connection.disconnect();
+            slot.queryCount = Math.max(0, slot.queryCount - 1);
+        };
+    }
+}
+
+exports.ObservableQueryConnectionPool = ObservableQueryConnectionPool;
+//# sourceMappingURL=ObservableQueryConnectionPool.js.map

package/dist/cjs/queries/ObservableQueryConnectionPool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ObservableQueryConnectionPool.js","sources":["../../../queries/ObservableQueryConnectionPool.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\nimport { IObservableQueryConnection } from './IObservableQueryConnection';\nimport { DataReceived } from './ObservableQueryConnection';\n\n/**\n * Tracks the number of active subscribers assigned to each pool slot.\n */\ninterface PoolSlot {\n    queryCount: number;\n}\n\n/**\n * Represents a pool of observable query connection factories distributed round-robin across N slots.\n *\n * Each call to {@link acquire} picks the slot with the fewest active queries (falling back to\n * round-robin when counts are equal) and creates a fresh connection for that subscriber via the\n * provided factory. The connection is a dedicated instance per subscriber; the pool only tracks\n * slot utilization so future multiplexed transports (e.g. WebSocket) can share connections\n * across a fixed number of physical hub connections.\n *\n * When {@link size} is 1 (the default), all queries are counted against a single slot — the\n * natural behavior for a single multiplexed connection.\n *\n * @template TDataType The type of data received from the connections.\n */\nexport class ObservableQueryConnectionPool<TDataType> {\n    private readonly _slots: PoolSlot[];\n\n    /**\n     * Initializes a new {@link ObservableQueryConnectionPool}.\n     * @param {number} size Number of logical slots (hub connections) in the pool.\n     * @param {() => IObservableQueryConnection<TDataType>} factory Factory that produces a new connection instance per subscriber.\n     */\n    constructor(\n        size: number,\n        private readonly _factory: () => IObservableQueryConnection<TDataType>\n    ) {\n        this._slots = Array.from({ length: Math.max(1, size) }, () => ({ queryCount: 0 }));\n    }\n\n    /**\n     * Picks the least-loaded pool slot, creates a fresh connection via the factory, and starts\n     * delivering data to the provided callback.\n     * @param {DataReceived<TDataType>} dataReceived Callback invoked for each message.\n     * @param {object} queryArguments Arguments forwarded to the connection.\n     * @returns A cleanup function that decrements the slot counter and disconnects the connection.\n     */\n    acquire(dataReceived: DataReceived<TDataType>, queryArguments?: object): () => void {\n        // Pick the slot with the fewest active queries.\n        const slot = this._slots.reduce((min, current) => current.queryCount < min.queryCount ? current : min, this._slots[0]);\n        slot.queryCount++;\n\n        // Each subscriber gets its own dedicated connection instance.\n        const connection = this._factory();\n        connection.connect(dataReceived, queryArguments);\n\n        return () => {\n            connection.disconnect();\n            slot.queryCount = Math.max(0, slot.queryCount - 1);\n        };\n    }\n}\n"],"names":[],"mappings":";;MA2Ba,6BAA6B,CAAA;AAUjB,IAAA,QAAA;AATJ,IAAA,MAAM;IAOvB,WAAA,CACI,IAAY,EACK,QAAqD,EAAA;QAArD,IAAA,CAAA,QAAQ,GAAR,QAAQ;AAEzB,QAAA,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;IACtF;IASA,OAAO,CAAC,YAAqC,EAAE,cAAuB,EAAA;AAElE,QAAA,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,GAAG,OAAO,GAAG,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACtH,IAAI,CAAC,UAAU,EAAE;AAGjB,QAAA,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE;AAClC,QAAA,UAAU,CAAC,OAAO,CAAC,YAAY,EAAE,cAAc,CAAC;AAEhD,QAAA,OAAO,MAAK;YACR,UAAU,CAAC,UAAU,EAAE;AACvB,YAAA,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;AACtD,QAAA,CAAC;IACL;AACH;;;;"}

package/dist/cjs/queries/ObservableQueryFor.d.ts

@@ -17,6 +17,7 @@ export declare abstract class ObservableQueryFor<TDataType, TParameters = object
     abstract readonly route: string;
     abstract readonly defaultValue: TDataType;
     readonly roles: string[];
+    readonly queryName?: string;
     abstract readonly parameterDescriptors: ParameterDescriptor[];
     abstract get requiredRequestParameters(): string[];
     sorting: Sorting;

package/dist/cjs/queries/ObservableQueryFor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObservableQueryFor.d.ts","sourceRoot":"","sources":["../../../queries/ObservableQueryFor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1E,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAI5E,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKlC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AASxE,8BAAsB,kBAAkB,CAAC,SAAS,EAAE,WAAW,GAAG,MAAM,CAAE,YAAW,mBAAmB,CAAC,SAAS,EAAE,WAAW,CAAC;IAoBhH,QAAQ,CAAC,SAAS,EAAE,WAAW;IAAE,QAAQ,CAAC,UAAU,EAAE,OAAO;IAnBzE,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAAC,CAAwC;IAC5D,OAAO,CAAC,oBAAoB,CAAiB;IAE7C,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC;IAC1C,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAM;IAC9B,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC9D,QAAQ,KAAK,yBAAyB,IAAI,MAAM,EAAE,CAAC;IACnD,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;gBAOM,SAAS,EAAE,WAAW,EAAW,UAAU,EAAE,OAAO;IAYzE,OAAO;IAKP,eAAe,CAAC,YAAY,EAAE,MAAM;IAKpC,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAKzC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK/B,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAKtD,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,2BAA2B,CAAC,SAAS,CAAC;IAqC/G,OAAO,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAyDlE,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,iBAAiB;CAW5B"}
+{"version":3,"file":"ObservableQueryFor.d.ts","sourceRoot":"","sources":["../../../queries/ObservableQueryFor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAK5E,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKlC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AASxE,8BAAsB,kBAAkB,CAAC,SAAS,EAAE,WAAW,GAAG,MAAM,CAAE,YAAW,mBAAmB,CAAC,SAAS,EAAE,WAAW,CAAC;IAsBhH,QAAQ,CAAC,SAAS,EAAE,WAAW;IAAE,QAAQ,CAAC,UAAU,EAAE,OAAO;IArBzE,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAAC,CAAwC;IAC5D,OAAO,CAAC,oBAAoB,CAAiB;IAE7C,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC;IAC1C,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAM;IAE9B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC9D,QAAQ,KAAK,yBAAyB,IAAI,MAAM,EAAE,CAAC;IACnD,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;gBAOM,SAAS,EAAE,WAAW,EAAW,UAAU,EAAE,OAAO;IAYzE,OAAO;IAKP,eAAe,CAAC,YAAY,EAAE,MAAM;IAKpC,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAKzC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK/B,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAKtD,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,2BAA2B,CAAC,SAAS,CAAC;IAyC/G,OAAO,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAyDlE,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,iBAAiB;CAW5B"}

package/dist/cjs/queries/ObservableQueryFor.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var ObservableQueryConnection = require('./ObservableQueryConnection.js');
 var ObservableQuerySubscription = require('./ObservableQuerySubscription.js');
 var ValidateRequestArguments = require('./ValidateRequestArguments.js');
 var NullObservableQueryConnection = require('./NullObservableQueryConnection.js');
+var ObservableQueryConnectionFactory = require('./ObservableQueryConnectionFactory.js');
 var fundamentals = require('@cratis/fundamentals');
 var QueryResult = require('./QueryResult.js');
 var Sorting = require('./Sorting.js');
@@ -23,6 +23,7 @@ class ObservableQueryFor {
     _connection;
     _httpHeadersCallback;
     roles = [];
+    queryName;
     sorting;
     paging;
     constructor(modelType, enumerable) {
@@ -58,10 +59,14 @@ class ObservableQueryFor {
             this._connection = new NullObservableQueryConnection.NullObservableQueryConnection(this.defaultValue);
         }
         else {
-            const { route } = UrlHelpers.UrlHelpers.replaceRouteParameters(this.route, args);
-            const actualRoute = joinPaths.joinPaths(this._apiBasePath, route);
-            const url = UrlHelpers.UrlHelpers.createUrlFrom(this._origin, this._apiBasePath, actualRoute);
-            this._connection = new ObservableQueryConnection.ObservableQueryConnection(url, this._microservice);
+            this._connection = ObservableQueryConnectionFactory.createObservableQueryConnection({
+                route: this.route,
+                queryName: this.queryName ?? this.constructor.name,
+                origin: this._origin,
+                apiBasePath: this._apiBasePath,
+                microservice: this._microservice,
+                args: args,
+            });
         }
         const parameterValues = ParametersHelper.ParametersHelper.collectParameterValues(this);
         const { unusedParameters } = UrlHelpers.UrlHelpers.replaceRouteParameters(this.route, args);