@eclipse-glsp/server 2.6.0-next.3 → 2.7.0-next.10

package/lib/browser/di/app-module.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 EclipseSource and others.
+ * Copyright (c) 2022-2026 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

package/lib/browser/di/app-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-module.d.ts","sourceRoot":"","sources":["../../../src/browser/di/app-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAgC,mBAAmB,EAA0B,MAAM,eAAe,CAAC;AAE1G,wBAAgB,eAAe,CAAC,OAAO,GAAE,mBAAwB,GAAG,eAAe,CAOlF"}
+{"version":3,"file":"app-module.d.ts","sourceRoot":"","sources":["../../../src/browser/di/app-module.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAqD,mBAAmB,EAA0B,MAAM,eAAe,CAAC;AAG/H,wBAAgB,eAAe,CAAC,OAAO,GAAE,mBAAwB,GAAG,eAAe,CAUlF"}

package/lib/browser/di/app-module.js

@@ -1,6 +1,6 @@
 "use strict";
 /********************************************************************************
- * Copyright (c) 2022-2023 EclipseSource and others.
+ * Copyright (c) 2022-2026 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -18,10 +18,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAppModule = createAppModule;
 const inversify_1 = require("inversify");
 const common_1 = require("../../common/");
+const browser_action_dispatch_scope_1 = require("./browser-action-dispatch-scope");
 function createAppModule(options = {}) {
     const resolvedOptions = { consoleLog: true, logLevel: common_1.LogLevel.info, ...options };
     return new inversify_1.ContainerModule((bind, unbind, isBound, rebind) => {
         bind(common_1.InjectionContainer).toDynamicValue(dynamicContext => dynamicContext.container);
+        // Transient on purpose: a singleton at the server-container level would be shared across
+        // sessions and leak the browser flag between them.
+        bind(common_1.ActionDispatchScope).to(browser_action_dispatch_scope_1.BrowserActionDispatchScope);
         const context = { bind, unbind, isBound, rebind };
         (0, common_1.configureConsoleLogger)(context, resolvedOptions);
     });

package/lib/browser/di/app-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-module.js","sourceRoot":"","sources":["../../../src/browser/di/app-module.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;AAKlF,0CAOC;AAVD,yCAA4C;AAC5C,0CAA0G;AAE1G,SAAgB,eAAe,CAAC,UAA+B,EAAE;IAC7D,MAAM,eAAe,GAAwB,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAAQ,CAAC,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC;IACvG,OAAO,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACzD,IAAI,CAAC,2BAAkB,CAAC,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpF,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAClD,IAAA,+BAAsB,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"app-module.js","sourceRoot":"","sources":["../../../src/browser/di/app-module.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;AAMlF,0CAUC;AAdD,yCAA4C;AAC5C,0CAA+H;AAC/H,mFAA6E;AAE7E,SAAgB,eAAe,CAAC,UAA+B,EAAE;IAC7D,MAAM,eAAe,GAAwB,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAAQ,CAAC,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC;IACvG,OAAO,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACzD,IAAI,CAAC,2BAAkB,CAAC,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACpF,yFAAyF;QACzF,mDAAmD;QACnD,IAAI,CAAC,4BAAmB,CAAC,CAAC,EAAE,CAAC,0DAA0B,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAClD,IAAA,+BAAsB,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACP,CAAC"}

package/lib/browser/di/browser-action-dispatch-scope.d.ts

@@ -0,0 +1,39 @@
+/********************************************************************************
+ * Copyright (c) 2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+import { Action } from '@eclipse-glsp/protocol';
+import { ActionDispatchScope } from '../../common/actions/action-dispatcher';
+/**
+ * Browser-compatible {@link ActionDispatchScope} backed by a single boolean flag, used because
+ * available `AsyncLocalStorage` polyfills do not work reliably across browser engines (e.g. V8).
+ *
+ * The flag cannot distinguish "still inside the handler's async continuation" from "unrelated
+ * event fired during the handler's await". Any dispatch arriving in such a gap is observed as
+ * reentrant and routed inline. Client-originated actions are explicitly treated as non-reentrant
+ * to cover the dominant case, but server-side dispatches from non-handler contexts (timer
+ * callbacks, event listeners, adopter code) cannot be filtered this way and may interleave with
+ * the in-flight handler.
+ *
+ * The dispatcher normally serializes handler execution; the inline interleaving breaks that
+ * guarantee. A handler that pauses on `await` may resume to find that another handler has mutated
+ * state in between (model state, command stack, caches), leading to unexpected behavior.
+ * Avoid dispatching from non-handler contexts where possible.
+ */
+export declare class BrowserActionDispatchScope implements ActionDispatchScope {
+    protected active: boolean;
+    enter<R>(callback: () => R): R;
+    isReentrant(action: Action): boolean;
+}
+//# sourceMappingURL=browser-action-dispatch-scope.d.ts.map

package/lib/browser/di/browser-action-dispatch-scope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"browser-action-dispatch-scope.d.ts","sourceRoot":"","sources":["../../../src/browser/di/browser-action-dispatch-scope.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAG7E;;;;;;;;;;;;;;;GAeG;AACH,qBACa,0BAA2B,YAAW,mBAAmB;IAClE,SAAS,CAAC,MAAM,UAAS;IAIzB,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC;IAoB9B,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;CAGvC"}

package/lib/browser/di/browser-action-dispatch-scope.js

@@ -0,0 +1,77 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 2026 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BrowserActionDispatchScope = void 0;
+const inversify_1 = require("inversify");
+const client_action_1 = require("../../common/protocol/client-action");
+/**
+ * Browser-compatible {@link ActionDispatchScope} backed by a single boolean flag, used because
+ * available `AsyncLocalStorage` polyfills do not work reliably across browser engines (e.g. V8).
+ *
+ * The flag cannot distinguish "still inside the handler's async continuation" from "unrelated
+ * event fired during the handler's await". Any dispatch arriving in such a gap is observed as
+ * reentrant and routed inline. Client-originated actions are explicitly treated as non-reentrant
+ * to cover the dominant case, but server-side dispatches from non-handler contexts (timer
+ * callbacks, event listeners, adopter code) cannot be filtered this way and may interleave with
+ * the in-flight handler.
+ *
+ * The dispatcher normally serializes handler execution; the inline interleaving breaks that
+ * guarantee. A handler that pauses on `await` may resume to find that another handler has mutated
+ * state in between (model state, command stack, caches), leading to unexpected behavior.
+ * Avoid dispatching from non-handler contexts where possible.
+ */
+let BrowserActionDispatchScope = class BrowserActionDispatchScope {
+    constructor() {
+        this.active = false;
+    }
+    // Assumes serial invocation by the dispatcher's queue processor; concurrent enter() calls
+    // would corrupt the prior-restore logic and leave the flag stuck.
+    enter(callback) {
+        const prior = this.active;
+        this.active = true;
+        let result;
+        try {
+            result = callback();
+        }
+        catch (error) {
+            this.active = prior;
+            throw error;
+        }
+        if (result instanceof Promise) {
+            // Cast required because TS cannot prove the .finally() result matches the generic R.
+            return result.finally(() => {
+                this.active = prior;
+            });
+        }
+        this.active = prior;
+        return result;
+    }
+    isReentrant(action) {
+        return this.active && !client_action_1.ClientAction.is(action);
+    }
+};
+exports.BrowserActionDispatchScope = BrowserActionDispatchScope;
+exports.BrowserActionDispatchScope = BrowserActionDispatchScope = __decorate([
+    (0, inversify_1.injectable)()
+], BrowserActionDispatchScope);
+//# sourceMappingURL=browser-action-dispatch-scope.js.map

package/lib/browser/di/browser-action-dispatch-scope.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"browser-action-dispatch-scope.js","sourceRoot":"","sources":["../../../src/browser/di/browser-action-dispatch-scope.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAGlF,yCAAuC;AAEvC,uEAAmE;AAEnE;;;;;;;;;;;;;;;GAeG;AAEI,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAAhC;QACO,WAAM,GAAG,KAAK,CAAC;IA2B7B,CAAC;IAzBG,0FAA0F;IAC1F,kEAAkE;IAClE,KAAK,CAAI,QAAiB;QACtB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,MAAS,CAAC;QACd,IAAI,CAAC;YACD,MAAM,GAAG,QAAQ,EAAE,CAAC;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YACpB,MAAM,KAAK,CAAC;QAChB,CAAC;QACD,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;YAC5B,qFAAqF;YACrF,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;gBACvB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YACxB,CAAC,CAAiB,CAAC;QACvB,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,WAAW,CAAC,MAAc;QACtB,OAAO,IAAI,CAAC,MAAM,IAAI,CAAC,4BAAY,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;CACJ,CAAA;AA5BY,gEAA0B;qCAA1B,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CA4BtC"}

package/lib/browser/index.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2024 EclipseSource and others.
+ * Copyright (c) 2022-2026 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 export * from './di/app-module';
+export * from './di/browser-action-dispatch-scope';
 export * from './launch/worker-server-launcher';
 export * from './reexport';
 //# sourceMappingURL=index.d.ts.map

package/lib/browser/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,iBAAiB,CAAC;AAChC,cAAc,iCAAiC,CAAC;AAChD,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,iBAAiB,CAAC;AAChC,cAAc,oCAAoC,CAAC;AACnD,cAAc,iCAAiC,CAAC;AAChD,cAAc,YAAY,CAAC"}

package/lib/browser/index.js

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
- * Copyright (c) 2022-2024 EclipseSource and others.
+ * Copyright (c) 2022-2026 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,6 +30,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 __exportStar(require("./di/app-module"), exports);
+__exportStar(require("./di/browser-action-dispatch-scope"), exports);
 __exportStar(require("./launch/worker-server-launcher"), exports);
 __exportStar(require("./reexport"), exports);
 //# sourceMappingURL=index.js.map

package/lib/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,kDAAgC;AAChC,kEAAgD;AAChD,6CAA2B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,kDAAgC;AAChC,qEAAmD;AACnD,kEAAgD;AAChD,6CAA2B"}

package/lib/common/actions/action-dispatcher.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022-2023 STMicroelectronics and others.
+ * Copyright (c) 2022-2026 STMicroelectronics and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,9 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, Disposable, MaybeArray } from '@eclipse-glsp/protocol';
+import { Action, Deferred, Disposable, MaybeArray, RequestAction, ResponseAction } from '@eclipse-glsp/protocol';
+import { ActionQueue } from '../utils/action-queue';
 import { Logger } from '../utils/logger';
-import { PromiseQueue } from '../utils/promise-queue';
 import { ActionHandler } from './action-handler';
 import { ActionHandlerRegistry } from './action-handler-registry';
 import { ClientActionForwarder } from './client-action-handler';
@@ -27,6 +27,8 @@ export declare const ActionDispatcher: unique symbol;
 export interface ActionDispatcher {
     /**
      * Processes the given action by dispatching it to all registered handlers.
+     * Responses matching a pending {@link request} short-circuit and resolve that
+     * request without being passed to handlers.
      *
      * @param action The action that should be dispatched.
      * @returns A promise indicating when the action processing is complete.
@@ -49,20 +51,120 @@ export interface ActionDispatcher {
      */
     dispatchAfterNextUpdate(actions: Action[]): void;
     dispatchAfterNextUpdate(...actions: Action[]): void;
+    /**
+     * Dispatches a request action and returns a promise that resolves when a matching response
+     * action is dispatched or rejects if the response is a {@link RejectAction}. The response is
+     * _not_ passed to the registered action handlers. Instead, it is the responsibility of the
+     * caller of this method to handle the response properly.
+     *
+     * If the request's `kind` is registered in `ClientActionKinds`, it is forwarded to the client
+     * via {@link ClientActionForwarder}. If server-side handlers are registered, they are also
+     * executed.
+     *
+     * Only the first matching response resolves the request. Any additional or late responses
+     * are dispatched as normal actions.
+     *
+     * The promise waits indefinitely until a response arrives or the dispatcher is disposed.
+     * Use {@link requestUntil} if a timeout is needed.
+     *
+     * Note: mutates `action.requestId` (if unset) and `action.timeout`.
+     *
+     * @param action The request action to dispatch.
+     * @returns A promise that resolves with the matching response action.
+     */
+    request<Res extends ResponseAction>(action: RequestAction<Res>): Promise<Res>;
+    /**
+     * Dispatches a request and waits for a response until the timeout given in `timeoutMs` has
+     * been reached. The returned promise is resolved when a response with a matching identifier
+     * is dispatched or when the timeout has been reached. That response is _not_ passed to the
+     * registered action handlers. Instead, it is the responsibility of the caller of this method
+     * to handle the response properly.
+     * If `rejectOnTimeout` is set to `false` (default) the returned promise will be resolved with
+     * no value, otherwise it will be rejected.
+     *
+     * Note: mutates `action.requestId` (if unset) and `action.timeout`.
+     *
+     * @param action The request action to dispatch.
+     * @param timeoutMs Maximum wait time in milliseconds. Defaults to
+     *        {@link RequestAction.timeout} if set, otherwise 2000 ms.
+     * @param rejectOnTimeout Whether to reject the promise on timeout.
+     * @returns The matching response, or `undefined` on soft timeout.
+     */
+    requestUntil<Res extends ResponseAction>(action: RequestAction<Res>, timeoutMs?: number, rejectOnTimeout?: boolean): Promise<Res | undefined>;
 }
+export declare const ActionDispatchScope: unique symbol;
+/**
+ * Scope marker that lets the {@link ActionDispatcher} know whether a call to `dispatch()`
+ * originates from inside a running handler (reentrant) or from outside (external).
+ *
+ * The {@link DefaultActionDispatcher.processActionQueue} loop wraps each action in {@link enter}
+ * so that reentrant `dispatch()` calls (handler responses, injected dispatcher calls) can be
+ * recognized via {@link isReentrant} and executed inline instead of being queued.
+ *
+ * Used by the {@link DefaultActionDispatcher} implementation.
+ */
+export interface ActionDispatchScope {
+    /**
+     * Executes the callback inside the dispatch scope. While the callback (and its full async
+     * continuation) is running, {@link isReentrant} returns `true` for reentrant calls.
+     */
+    enter<R>(callback: () => R): R;
+    /**
+     * Returns `true` if the given dispatch is reentrant — i.e. it originates from within a
+     * running {@link enter} callback (handler response or injected dispatcher call) and should
+     * run inline rather than being queued.
+     *
+     * Implementations may inspect the action to apply additional guards, e.g. to ensure
+     * client-originated actions are always queued regardless of scope state.
+     */
+    isReentrant(action: Action): boolean;
+}
+/**
+ * Default {@link ActionDispatcher}. External dispatches are queued and processed one at a
+ * time; dispatches made from within a running handler run inline with the containing action.
+ */
 export declare class DefaultActionDispatcher implements ActionDispatcher, Disposable {
+    protected static readonly STALE_TIMEOUT_GRACE_MS = 30000;
     protected actionHandlerRegistry: ActionHandlerRegistry;
     protected clientActionForwarder: ClientActionForwarder;
     protected logger: Logger;
     protected clientId: string;
-    protected actionQueue: PromiseQueue<void>;
+    protected dispatchScope: ActionDispatchScope;
+    protected actionQueue: ActionQueue<Action>;
     protected postUpdateQueue: Action[];
+    protected readonly pendingRequests: Map<string, Deferred<ResponseAction | undefined>>;
+    protected readonly requestTimeouts: Map<string, NodeJS.Timeout>;
+    protected nextRequestId: number;
+    protected initialize(): void;
+    protected generateRequestId(): string;
     dispatch(action: Action): Promise<void>;
+    protected processActionQueue(): Promise<void>;
     protected doDispatch(action: Action): Promise<void>;
-    protected executeHandler(handler: ActionHandler, request: Action): Promise<Action[]>;
+    protected executeHandler(handler: ActionHandler, action: Action): Promise<Action[]>;
     protected dispatchResponses(actions: Action[]): Promise<void>;
     dispatchAll(...actions: MaybeArray<Action>[]): Promise<void>;
     dispatchAfterNextUpdate(...actions: MaybeArray<Action>[]): void;
+    request<Res extends ResponseAction>(action: RequestAction<Res>): Promise<Res>;
+    requestUntil<Res extends ResponseAction>(action: RequestAction<Res>, timeoutMs?: number, rejectOnTimeout?: boolean): Promise<Res | undefined>;
+    protected doRequest<Res extends ResponseAction>(action: RequestAction<Res>, timeoutMs: number | undefined, rejectOnTimeout: boolean): Promise<Res | undefined>;
+    /**
+     * If the given action is a {@link SetModelAction} or {@link UpdateModelAction} and there are actions
+     * queued via {@link dispatchAfterNextUpdate}, drain and return them.
+     *
+     * @returns The drained actions, or an empty array if nothing to drain.
+     */
+    protected drainPostUpdateQueue(action: Action): Action[];
+    /**
+     * Checks whether the given action is a response matching a pending {@link request} or
+     * {@link requestUntil} call. If matched, resolves (or rejects) the corresponding deferred
+     * and returns `true` so the caller can short-circuit normal dispatch.
+     *
+     * For responses with a valid `responseId` but no matching pending request, checks for a stale
+     * timeout entry (timed-out request) and clears the `responseId` so the action is not forwarded
+     * by {@link ClientActionForwarder}. If no stale entry exists, the `responseId` is left intact
+     * for normal forwarding.
+     */
+    protected interceptPendingResponse(action: Action): boolean;
     dispose(): void;
 }
 /**

package/lib/common/actions/action-dispatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,UAAU,EACV,UAAU,EAMb,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAE3D;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC7B;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExC;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,WAAW,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;;OAMG;IACH,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACjD,uBAAuB,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACvD;AAED,qBACa,uBAAwB,YAAW,gBAAgB,EAAE,UAAU;IAExE,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAGzB,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,qBAAsB;IAC3C,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,CAAM;IAEzC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAQvB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAuBzC,cAAc,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAK1F,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7D,WAAW,CAAC,GAAG,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5D,uBAAuB,CAAC,GAAG,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI;IAM/D,OAAO,IAAI,IAAI;CAGlB;AAED;;;;;;GAMG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKjE"}
+{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../../src/common/actions/action-dispatcher.ts"],"names":[],"mappings":"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"}