@theia/core 1.71.0-next.8 → 1.71.0

package/lib/browser/frontend-application.js

@@ -54,6 +54,7 @@ let FrontendApplication = class FrontendApplication {
      */
     async start() {
         const startup = this.backendStopwatch.start('frontend');
+        this.settlementContext = new common_1.MeasurementContext(this.stopwatch, 'Frontend', TIMER_WARNING_THRESHOLD);
         await this.measure('startContributions', () => this.startContributions(), 'Start frontend contributions', false);
         this.stateService.state = 'started_contributions';
         const host = await this.getHost();
@@ -67,7 +68,8 @@ let FrontendApplication = class FrontendApplication {
         await this.measure('revealShell', () => this.revealShell(host), 'Replace loading indicator with ready workbench UI (animation)', false);
         this.registerEventListeners();
         this.stateService.state = 'ready';
-        startup.then(idToken => this.backendStopwatch.stop(idToken, 'Frontend application start', []));
+        this.settlementContext?.armAllSettled();
+        startup.then(idToken => this.backendStopwatch.stop(idToken, 'Frontend application startup sequence completed (async work may still be pending)', []));
     }
     /**
      * Return a promise to the host element to which the application shell is attached.
@@ -194,14 +196,14 @@ let FrontendApplication = class FrontendApplication {
     async createDefaultLayout() {
         for (const contribution of this.contributions.getContributions()) {
             if (contribution.initializeLayout) {
-                await this.measure(contribution.constructor.name + '.initializeLayout', () => contribution.initializeLayout(this));
+                await this.measureContribution(contribution, 'initializeLayout', () => contribution.initializeLayout(this));
             }
         }
     }
     async fireOnDidInitializeLayout() {
         for (const contribution of this.contributions.getContributions()) {
             if (contribution.onDidInitializeLayout) {
-                await this.measure(contribution.constructor.name + '.onDidInitializeLayout', () => contribution.onDidInitializeLayout(this));
+                await this.measureContribution(contribution, 'onDidInitializeLayout', () => contribution.onDidInitializeLayout(this));
             }
         }
     }
@@ -212,7 +214,7 @@ let FrontendApplication = class FrontendApplication {
         for (const contribution of this.contributions.getContributions()) {
             if (contribution.initialize) {
                 try {
-                    await this.measure(contribution.constructor.name + '.initialize', () => contribution.initialize());
+                    await this.measureContribution(contribution, 'initialize', () => contribution.initialize());
                 }
                 catch (error) {
                     console.error('Could not initialize contribution', error);
@@ -222,7 +224,7 @@ let FrontendApplication = class FrontendApplication {
         for (const contribution of this.contributions.getContributions()) {
             if (contribution.configure) {
                 try {
-                    await this.measure(contribution.constructor.name + '.configure', () => contribution.configure(this));
+                    await this.measureContribution(contribution, 'configure', () => contribution.configure(this));
                 }
                 catch (error) {
                     console.error('Could not configure contribution', error);
@@ -240,7 +242,7 @@ let FrontendApplication = class FrontendApplication {
         for (const contribution of this.contributions.getContributions()) {
             if (contribution.onStart) {
                 try {
-                    await this.measure(contribution.constructor.name + '.onStart', () => contribution.onStart(this));
+                    await this.measureContribution(contribution, 'onStart', () => contribution.onStart(this));
                 }
                 catch (error) {
                     console.error('Could not start contribution', error);
@@ -265,6 +267,13 @@ let FrontendApplication = class FrontendApplication {
         }
         console.info('<<< All frontend contributions have been stopped.');
     }
+    async measureContribution(contribution, hook, fn) {
+        let innerResult;
+        this.settlementContext?.ensureEntry(contribution);
+        const result = await this.measure(contribution.constructor.name + '.' + hook, () => (innerResult = fn()));
+        this.settlementContext?.trackSettlement(contribution, innerResult);
+        return result;
+    }
     async measure(name, fn, message = `Frontend ${name}`, threshold = true) {
         return this.stopwatch.startAsync(name, message, fn, threshold ? { thresholdMillis: TIMER_WARNING_THRESHOLD, defaultLogLevel: common_1.LogLevel.DEBUG } : {});
     }

package/lib/browser/frontend-application.js.map

@@ -1 +1 @@
-{"version":3,"file":"frontend-application.js","sourceRoot":"","sources":["../../src/browser/frontend-application.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"frontend-application.js","sourceRoot":"","sources":["../../src/browser/frontend-application.ts"],"names":[],"mappings":"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"}

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

@@ -2,4 +2,5 @@ export * from './keys';
 export * from './keyboard-layout-service';
 export * from './browser-keyboard-layout-provider';
 export * from './browser-keyboard-frontend-contribution';
+export * from './keyboard-utils';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/browser/keyboard/index.ts"],"names":[],"mappings":"AAgBA,cAAc,QAAQ,CAAC;AACvB,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oCAAoC,CAAC;AACnD,cAAc,0CAA0C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/browser/keyboard/index.ts"],"names":[],"mappings":"AAgBA,cAAc,QAAQ,CAAC;AACvB,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oCAAoC,CAAC;AACnD,cAAc,0CAA0C,CAAC;AACzD,cAAc,kBAAkB,CAAC"}

package/lib/browser/keyboard/index.js

@@ -20,4 +20,5 @@ tslib_1.__exportStar(require("./keys"), exports);
 tslib_1.__exportStar(require("./keyboard-layout-service"), exports);
 tslib_1.__exportStar(require("./browser-keyboard-layout-provider"), exports);
 tslib_1.__exportStar(require("./browser-keyboard-frontend-contribution"), exports);
+tslib_1.__exportStar(require("./keyboard-utils"), exports);
 //# sourceMappingURL=index.js.map

package/lib/browser/keyboard/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser/keyboard/index.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,iDAAuB;AACvB,oEAA0C;AAC1C,6EAAmD;AACnD,mFAAyD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser/keyboard/index.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,iDAAuB;AACvB,oEAA0C;AAC1C,6EAAmD;AACnD,mFAAyD;AACzD,2DAAiC"}

package/lib/browser/keyboard/keyboard-utils.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Query whether the keyboard event represents an element activation.
+ * That is, whether the user pressed `Enter` or `Space` on a focusable
+ * element with `role="button"` or similar interactive role.
+ */
+export declare function isActivationKey(e: React.KeyboardEvent | KeyboardEvent): boolean;
+/**
+ * Returns the ARIA/accessibility props that make a non-button HTML element
+ * keyboard-navigable and screen-reader-accessible as a button.
+ *
+ * Spread these onto the element alongside `onClick` and `onKeyDown`:
+ * ```tsx
+ * <div {...buttonKeyboardProps(label)} onClick={handler} onKeyDown={e => isActivationKey(e) && handler()} />
+ * ```
+ */
+export declare function buttonKeyboardProps(ariaLabel: string, tabIndex?: number): React.HTMLAttributes<HTMLElement>;
+//# sourceMappingURL=keyboard-utils.d.ts.map

package/lib/browser/keyboard/keyboard-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"keyboard-utils.d.ts","sourceRoot":"","sources":["../../../src/browser/keyboard/keyboard-utils.ts"],"names":[],"mappings":"AAgBA;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,KAAK,CAAC,aAAa,GAAG,aAAa,GAAG,OAAO,CAE/E;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,SAAI,GAAG,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,CAEtG"}

package/lib/browser/keyboard/keyboard-utils.js

@@ -0,0 +1,40 @@
+"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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isActivationKey = isActivationKey;
+exports.buttonKeyboardProps = buttonKeyboardProps;
+/**
+ * Query whether the keyboard event represents an element activation.
+ * That is, whether the user pressed `Enter` or `Space` on a focusable
+ * element with `role="button"` or similar interactive role.
+ */
+function isActivationKey(e) {
+    return e.key === 'Enter' || e.key === ' ';
+}
+/**
+ * Returns the ARIA/accessibility props that make a non-button HTML element
+ * keyboard-navigable and screen-reader-accessible as a button.
+ *
+ * Spread these onto the element alongside `onClick` and `onKeyDown`:
+ * ```tsx
+ * <div {...buttonKeyboardProps(label)} onClick={handler} onKeyDown={e => isActivationKey(e) && handler()} />
+ * ```
+ */
+function buttonKeyboardProps(ariaLabel, tabIndex = 0) {
+    return { tabIndex, role: 'button', 'aria-label': ariaLabel };
+}
+//# sourceMappingURL=keyboard-utils.js.map

package/lib/browser/keyboard/keyboard-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"keyboard-utils.js","sourceRoot":"","sources":["../../../src/browser/keyboard/keyboard-utils.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAOhF,0CAEC;AAWD,kDAEC;AApBD;;;;GAIG;AACH,SAAgB,eAAe,CAAC,CAAsC;IAClE,OAAO,CAAC,CAAC,GAAG,KAAK,OAAO,IAAI,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC;AAC9C,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,mBAAmB,CAAC,SAAiB,EAAE,QAAQ,GAAG,CAAC;IAC/D,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;AACjE,CAAC"}

package/lib/browser/menu/browser-menu-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser-menu-plugin.d.ts","sourceRoot":"","sources":["../../../src/browser/menu/browser-menu-plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"browser-menu-plugin.d.ts","sourceRoot":"","sources":["../../../src/browser/menu/browser-menu-plugin.ts"],"names":[],"mappings":"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"}

package/lib/browser/menu/browser-menu-plugin.js

@@ -123,7 +123,14 @@ function isMenuElement(element) {
 }
 class DynamicMenuBarWidget extends MenuBarWidget {
     constructor() {
-        super();
+        // Disable Lumino's overflow menu feature. The feature has a bug where
+        // `onUpdateRequest` consumes a stale `_overflowIndex` (only recomputed at the
+        // end of the method), which causes a RangeError when the menu bar is rendered
+        // at zero width. Additionally, Theia's CSS does not constrain the menu bar's
+        // offsetWidth to the available space, so the overflow detection never triggers.
+        // See https://github.com/eclipse-theia/theia/issues/17352
+        // See https://github.com/jupyterlab/lumino/issues/811
+        super({ overflowMenuOptions: { isVisible: false } });
         // HACK we need to hook in on private method _openChildMenu. Don't do this at home!
         DynamicMenuBarWidget.prototype['_openChildMenu'] = () => {
             if (this.activeMenu instanceof DynamicMenuWidget) {

package/lib/browser/menu/browser-menu-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"browser-menu-plugin.js","sourceRoot":"","sources":["../../../src/browser/menu/browser-menu-plugin.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAuHhF,sCAEC;;AAvHD,yCAA+C;AAC/C,6CAA4E;AAC5E,+CAA4E;AAC5E,yCAKsB;AACtB,8CAAmD;AAGnD,gEAA2E;AAC3E,iEAA4D;AAC5D,wCAAsD;AACtD,oCAA4C;AAC5C,oEAAgE;AAChE,+CAA8C;AAC9C,6DAA2I;AAC3I,+EAA0E;AAE1E,MAAsB,aAAc,SAAQ,iBAAO;CAGlD;AAHD,sCAGC;AAIA,CAAC;AAGK,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAiB/B,aAAa;QACT,MAAM,OAAO,GAAG,IAAI,oBAAoB,EAAE,CAAC;QAC3C,OAAO,CAAC,EAAE,GAAG,eAAe,CAAC;QAC7B,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACjC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,6BAAoB,CACvC,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE;YAC9C,IAAI,MAAM,CAAC,cAAc,KAAK,0BAA0B,EAAE,CAAC;gBACvD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,0BAA0B,CAAC,CAAC,CAAC;YAChF,CAAC;QACL,CAAC,CAAC,EACF,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,GAAG,EAAE;YAC9C,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC,CAAC,EACF,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;YAChC,IAAI,mBAAU,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,0BAAa,CAAC,EAAE,CAAC;gBACjD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC9B,CAAC;QACL,CAAC,CAAC,CACL,CAAC;QACF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;QACrD,OAAO,OAAO,CAAC;IACnB,CAAC;IAES,oBAAoB;QAC1B,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAC;IAC3E,CAAC;IAES,WAAW,CAAC,OAA6B,EAAE,UAAU,GAAG,IAAI,CAAC,oBAAoB,EAAE;QACzF,IAAI,UAAU,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YAC5D,OAAO,CAAC,UAAU,EAAE,CAAC;YACrB,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,UAAU,EAAE,CAAC;QACzB,CAAC;IACL,CAAC;IAES,WAAW,CAAC,OAAsB;QACxC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,0BAAa,CAAY,CAAC;QAC1E,MAAM,mBAAmB,GAAG,IAAI,0BAAqB,EAAE,CAAC;QACxD,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACpC,IAAI,6BAAgB,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,6BAAgB,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzD,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,0BAAa,EAAE,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE,EAAE,QAAQ,EAAE,mBAAmB,EAAE,CAAC,CAAC;gBACzH,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAChC,CAAC;QACL,CAAC;IACL,CAAC;IAED,iBAAiB,CAAC,iBAA2B,EAAE,SAA2B,EAAE,cAA8B,EAAE,IAAgB,EAAE,OAAqB;QAC/I,MAAM,mBAAmB,GAAG,IAAI,0BAAqB,EAAE,CAAC;QACxD,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,QAAQ,EAAE,mBAAmB,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,CAAC;QAC1I,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,gBAAgB,CAAC,UAAoB,EAAE,IAAsB,EAAE,cAA8B,EAAE,OAA2B,EAAE,IAAgB;QACxI,OAAO,IAAI,iBAAiB,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACjG,CAAC;IAED,IAAc,QAAQ;QAClB,OAAO;YACH,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,iBAAiB,EAAE,IAAI;SAC1B,CAAC;IACN,CAAC;CAEJ,CAAA;AApFY,wDAAsB;AAGZ;IADlB,IAAA,kBAAM,EAAC,uCAAiB,CAAC;;iEAC8B;AAGrC;IADlB,IAAA,kBAAM,EAAC,yCAAkB,CAAC;sCACC,yCAAkB;uDAAC;AAG5B;IADlB,IAAA,kBAAM,EAAC,kCAAe,CAAC;;+DAC4B;AAGjC;IADlB,IAAA,kBAAM,EAAC,+BAAkB,CAAC;sCACY,+BAAkB;kEAAC;AAGvC;IADlB,IAAA,kBAAM,EAAC,uCAAiB,CAAC;sCACO,uCAAiB;4DAAC;iCAf1C,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CAoFlC;AAED,SAAgB,aAAa,CAAC,OAA2B;IACrD,OAAO,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AAC9D,CAAC;AAED,MAAa,oBAAqB,SAAQ,aAAa;IAOnD;QACI,KAAK,EAAE,CAAC;QACR,mFAAmF;QACnF,oBAAoB,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,GAAG,EAAE;YACpD,IAAI,IAAI,CAAC,UAAU,YAAY,iBAAiB,EAAE,CAAC;gBAC/C,qGAAqG;gBACrG,sGAAsG;gBACtG,6DAA6D;gBAC7D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;oBAClB,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,CAAC;oBACnC,2CAA2C;oBAC3C,IAAI,aAAa,YAAY,WAAW,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;wBACxE,IAAI,CAAC,sBAAsB,GAAG,aAAa,CAAC;oBAChD,CAAC;gBACL,CAAC;gBACD,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,sBAAsB,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAC;YACzF,CAAC;YACD,KAAK,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAC9B,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAa,EAAE,GAAG,MAAgB;QACjD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,KAAK,CAAC,mBAAmB,KAAK,QAAQ,CAAC,CAAC;QACtD,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,MAAM,IAAA,yBAAe,EAAC,IAAI,CAAC,CAAC;QAE5B,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,CAAC;QAEpC,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,KAAK,MAAM,SAAS,IAAI,MAAM,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC;YAC5D,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACzB,MAAM,IAAI,KAAK,CAAC,mBAAmB,SAAS,gBAAgB,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACtH,CAAC;YACD,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;YAC1B,OAAO,CAAC,iBAAiB,EAAE,CAAC;YAC5B,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YACvB,MAAM,IAAA,yBAAe,EAAC,OAAO,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,KAAa,EAAE,GAAG,MAAgB;QACpD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACxD,CAAC;QACD,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QAChE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACxE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,KAAK,CAAC,mBAAmB,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,aAAa,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACnI,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;CAEJ;AApED,oDAoEC;AAED,MAAa,YAAY;CAIxB;AAJD,oCAIC;AAMD;;GAEG;AACH,MAAa,iBAAkB,SAAQ,cAAU;aAC9B,mBAAc,GAAG,CAAC,CAAC;IAMlC,YACuB,iBAA2B,EACpC,IAAsB,EACtB,OAA2B,EAC3B,cAA8B,EAC9B,QAAsB,EACtB,IAAgB;QAE1B,KAAK,CAAC,OAAO,CAAC,CAAC;QAPI,sBAAiB,GAAjB,iBAAiB,CAAU;QACpC,SAAI,GAAJ,IAAI,CAAkB;QACtB,YAAO,GAAP,OAAO,CAAoB;QAC3B,mBAAc,GAAd,cAAc,CAAgB;QAC9B,aAAQ,GAAR,QAAQ,CAAc;QACtB,SAAI,GAAJ,IAAI,CAAY;QAG1B,IAAI,6BAAgB,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;gBAClB,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;YACvC,CAAC;YACD,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACjB,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YAC1C,CAAC;QACL,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACnI,CAAC;IAEkB,aAAa,CAAC,GAAY;QACzC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACxE,CAAC;IAEkB,cAAc,CAAC,GAAY;QAC1C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACvE,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAEQ,WAAW,CAAC,KAAY;QAC7B,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YAC/B,IAAI,CAAC,iBAAiB,CAAC,KAAqB,CAAC,CAAC;QAClD,CAAC;QACD,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,iBAAiB,CAAC,KAAmB;QACjC,wEAAwE;QACxE,mDAAmD;QACnD,IAAI,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YACtB,OAAO;QACX,CAAC;QAED,gEAAgE;QAChE,iEAAiE;QACjE,gEAAgE;QAChE,+CAA+C;QAC/C,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YACzD,IAAI,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,IAAU,EAAE,CAAS,EAAE,CAAS;QACjD,KAAK,IAAI,IAAI,GAAgB,IAAI,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAC7D,IAAI,qBAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;gBACtC,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,WAAW,CAAC,EAAE,sBAAsB,EAAuD;QAC9F,IAAI,CAAC,sBAAsB,CAAC,sBAAsB,CAAC,CAAC;QACpD,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,4BAA4B,CAAC,GAAG,EAAE;YACnC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACnI,CAAC,CAAC,CAAC;IACP,CAAC;IAEe,IAAI,CAAC,CAAS,EAAE,CAAS,EAAE,OAAiC;QACxE,MAAM,EAAE,GAAG,GAAG,EAAE;YACZ,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACrC,CAAC,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC9B,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC9B,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;IAC9B,CAAC;IAES,cAAc,CAAC,UAAoB,EAAE,MAAkB,EAAE,IAAsB,EAAE,QAA+B,EACtH,cAA8B,EAAE,OAAiC;QACjE,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;QAC7F,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,IAAI,KAAK,WAAW,EAAE,CAAC;YACnD,KAAK,CAAC,GAAG,EAAE,CAAC;QAChB,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;IACL,CAAC;IAES,WAAW,CAAC,UAAoB,EAAE,KAAiB,EAAE,iBAAwC,EACnG,cAA8B,EAAE,OAAqB;QACrD,MAAM,MAAM,GAA8B,EAAE,CAAC;QAE7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,IAAI,CAAC,GAAG,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YACpE,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;gBAC1E,IAAI,6BAAgB,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC5B,IAAI,6BAAgB,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC/H,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BAC3B,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;wBAC9C,CAAC;oBACL,CAAC;yBAAM,IAAI,IAAI,CAAC,EAAE,KAAK,QAAQ,EAAE,CAAC;wBAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,iBAAiB,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;wBACpG,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BACnB,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,IAAI,KAAK,WAAW,EAAE,CAAC;gCAClD,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;4BACvC,CAAC;4BACD,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;4BACtB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;wBACvC,CAAC;oBACL,CAAC;gBAEL,CAAC;qBAAM,IAAI,wBAAW,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC9B,MAAM,EAAE,GAAG,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,IAAI,iBAAiB,CAAC,cAAc,EAAE,EAAE,CAAC;oBACjH,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;oBAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;oBAC1F,iBAAiB,CAAC,UAAU,CAAC,EAAE,EAAE;wBAC7B,OAAO,EAAE,GAAG,EAAE;4BACV,mEAAmE;4BACnE,8DAA8D;4BAC9D,6DAA6D;4BAC7D,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;gCAC9B,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;4BAC/D,CAAC;4BACD,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;wBAC7C,CAAC;wBACD,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO;wBACxB,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO;wBACxB,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI;wBACrB,KAAK,EAAE,IAAI,CAAC,KAAK;wBACjB,SAAS,EAAE,IAAI,CAAC,IAAI;qBACvB,CAAC,CAAC;oBAEH,MAAM,WAAW,GAAG,CAAC,0BAAiB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBAClG,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACzB,iBAAiB,CAAC,aAAa,CAAC;4BAC5B,OAAO,EAAE,EAAE;4BACX,IAAI,EAAE,WAAW;4BACjB,QAAQ,EAAE,WAAW,CAAC,4CAA4C;yBACrE,CAAC,CAAC;oBACP,CAAC;oBACD,MAAM,CAAC,IAAI,CAAC;wBACR,OAAO,EAAE,EAAE;wBACX,IAAI,EAAE,SAAS;qBAClB,CAAC,CAAC;gBACP,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,sBAAsB,CAAC,yBAAyC,QAAQ,CAAC,aAAa;QAC5F,IAAI,CAAC,IAAI,CAAC,sBAAsB,IAAI,sBAAsB,YAAY,WAAW,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,EAAE,CAAC;YAC1H,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;YACrD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,qBAAqB;QAC3B,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC9B,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,IAAI,CAAC,sBAAsB,GAAG,SAAS,CAAC;YACxC,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,4BAA4B,CAAC,IAAgB;QACnD,IAAI,cAAc,GAA4B,SAAS,CAAC;QACxD,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,CAAC;QACnC,IAAI,IAAI,CAAC,sBAAsB;YAC3B,aAAa,YAAY,WAAW;YACpC,IAAI,CAAC,sBAAsB,KAAK,aAAa,EAAE,CAAC;YAChD,cAAc,GAAG,aAAa,CAAC;YAC/B,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,CAAC;QACD,IAAI,CAAC;YACD,IAAI,EAAE,CAAC;QACX,CAAC;gBAAS,CAAC;YACP,IAAI,cAAc,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,CAAC;gBACnD,cAAc,CAAC,KAAK,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YAClD,CAAC;QACL,CAAC;IACL,CAAC;;AAlML,8CAoMC;AAGM,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAQnC,YACuD,OAA+B;QAA/B,YAAO,GAAP,OAAO,CAAwB;IAClF,CAAC;IAEL,OAAO,CAAC,GAAwB;QAC5B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,aAAa,CAA8B,CAAC;IAC1G,CAAC;IAES,UAAU,CAAC,KAAuB;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAC/B,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAC1C,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACvC,gDAAgD;QAChD,6CAA6C;QAC7C,IAAI,oBAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC;YAC5B,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;gBACnC,IAAI,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YAC/G,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE;gBAChD,IAAI,MAAM,CAAC,cAAc,KAAK,0BAA0B,EAAE,CAAC;oBACvD,IAAI,CAAC,SAAS,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;gBACtH,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAES,UAAU;QAChB,MAAM,IAAI,GAAG,IAAI,gBAAM,EAAE,CAAC;QAC1B,IAAI,CAAC,EAAE,GAAG,YAAY,CAAC;QACvB,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;AA7CY,gEAA0B;AAGhB;IADlB,IAAA,kBAAM,EAAC,wBAAgB,CAAC;sCACC,wBAAgB;yDAAC;AAGxB;IADlB,IAAA,kBAAM,EAAC,0BAAiB,CAAC;;qEAC8B;qCAN/C,0BAA0B;IADtC,IAAA,sBAAU,GAAE;IAUJ,mBAAA,IAAA,kBAAM,EAAC,sBAAsB,CAAC,CAAA;6CAA6B,sBAAsB;GAT7E,0BAA0B,CA6CtC"}
+{"version":3,"file":"browser-menu-plugin.js","sourceRoot":"","sources":["../../../src/browser/menu/browser-menu-plugin.ts"],"names":[],"mappings":"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"}

package/lib/browser/messaging/connection-source.d.ts

@@ -1,4 +1,5 @@
-import { Channel, Event } from '../../common';
+import { Channel } from '../../common/message-rpc/channel';
+import { Event } from '../../common/event';
 export declare const ConnectionSource: unique symbol;
 /**
  * A ConnectionSource creates a Channel. The channel is valid until it sends a close event.

package/lib/browser/messaging/connection-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection-source.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/connection-source.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE9C,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAE3D;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B,mBAAmB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;CACvC"}
+{"version":3,"file":"connection-source.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/connection-source.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAE3C,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAE3D;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B,mBAAmB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;CACvC"}

package/lib/browser/messaging/connection-source.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection-source.js","sourceRoot":"","sources":["../../../src/browser/messaging/connection-source.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAInE,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC"}
+{"version":3,"file":"connection-source.js","sourceRoot":"","sources":["../../../src/browser/messaging/connection-source.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAKnE,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC"}

package/lib/browser/messaging/messaging-frontend-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messaging-frontend-module.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/messaging-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAU5C,eAAO,MAAM,uBAAuB,iBAclC,CAAC"}
+{"version":3,"file":"messaging-frontend-module.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/messaging-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAW5C,eAAO,MAAM,uBAAuB,iBAgBlC,CAAC"}

package/lib/browser/messaging/messaging-frontend-module.js

@@ -23,8 +23,11 @@ const service_connection_provider_1 = require("./service-connection-provider");
 const connection_source_1 = require("./connection-source");
 const connection_management_1 = require("../../common/messaging/connection-management");
 const ws_connection_provider_1 = require("./ws-connection-provider");
+const socket_write_buffer_1 = require("../../common/messaging/socket-write-buffer");
 const backendServiceProvider = Symbol('backendServiceProvider');
 exports.messagingFrontendModule = new inversify_1.ContainerModule(bind => {
+    // Transient: each connection source gets its own private buffer instance.
+    bind(socket_write_buffer_1.SocketWriteBuffer).toSelf();
     bind(connection_management_1.ConnectionCloseService).toDynamicValue(ctx => ws_connection_provider_1.WebSocketConnectionProvider.createProxy(ctx.container, connection_management_1.connectionCloseServicePath)).inSingletonScope();
     bind(frontend_id_provider_1.BrowserFrontendIdProvider).toSelf().inSingletonScope();
     bind(frontend_id_provider_1.FrontendIdProvider).toService(frontend_id_provider_1.BrowserFrontendIdProvider);

package/lib/browser/messaging/messaging-frontend-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"messaging-frontend-module.js","sourceRoot":"","sources":["../../../src/browser/messaging/messaging-frontend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,yCAA4C;AAC5C,iEAAuF;AACvF,iEAAmE;AACnE,+EAA6H;AAC7H,2DAAuD;AACvD,wFAAkH;AAClH,qEAAuE;AAEvE,MAAM,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAEnD,QAAA,uBAAuB,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IAC9D,IAAI,CAAC,8CAAsB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,oDAA2B,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,kDAA0B,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC1J,IAAI,CAAC,gDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,yCAAkB,CAAC,CAAC,SAAS,CAAC,gDAAyB,CAAC,CAAC;IAC9D,IAAI,CAAC,gDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,sBAAsB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC9C,IAAI,CAAC,uDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QAC5D,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QAC9C,SAAS,CAAC,IAAI,CAAC,oCAAgB,CAAC,CAAC,SAAS,CAAC,gDAAyB,CAAC,CAAC;QACtE,OAAO,SAAS,CAAC,GAAG,CAAC,uDAAyB,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,qDAAuB,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IAChE,IAAI,CAAC,sDAAwB,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IACjE,IAAI,CAAC,oDAA2B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AAClE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"messaging-frontend-module.js","sourceRoot":"","sources":["../../../src/browser/messaging/messaging-frontend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,yCAA4C;AAC5C,iEAAuF;AACvF,iEAAmE;AACnE,+EAA6H;AAC7H,2DAAuD;AACvD,wFAAkH;AAClH,qEAAuE;AACvE,oFAA+E;AAE/E,MAAM,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAEnD,QAAA,uBAAuB,GAAG,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IAC9D,0EAA0E;IAC1E,IAAI,CAAC,uCAAiB,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,IAAI,CAAC,8CAAsB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,oDAA2B,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,kDAA0B,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC1J,IAAI,CAAC,gDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,yCAAkB,CAAC,CAAC,SAAS,CAAC,gDAAyB,CAAC,CAAC;IAC9D,IAAI,CAAC,gDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,sBAAsB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC9C,IAAI,CAAC,uDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;QAC5D,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QAC9C,SAAS,CAAC,IAAI,CAAC,oCAAgB,CAAC,CAAC,SAAS,CAAC,gDAAyB,CAAC,CAAC;QACtE,OAAO,SAAS,CAAC,GAAG,CAAC,uDAAyB,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,qDAAuB,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IAChE,IAAI,CAAC,sDAAwB,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IACjE,IAAI,CAAC,oDAA2B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AAClE,CAAC,CAAC,CAAC"}

package/lib/browser/messaging/service-connection-provider.d.ts

@@ -1,7 +1,7 @@
 import { interfaces } from 'inversify';
-import { Channel, RpcProxy, RpcProxyFactory } from '../../common';
-import { ChannelMultiplexer } from '../../common/message-rpc/channel';
+import { Channel, ChannelMultiplexer } from '../../common/message-rpc/channel';
 import { ConnectionSource } from './connection-source';
+import { RpcProxy, RpcProxyFactory } from '../../common/messaging/proxy-factory';
 /**
  * Service id for the local connection provider
  */

package/lib/browser/messaging/service-connection-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-connection-provider.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/service-connection-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAsB,UAAU,EAAiB,MAAM,WAAW,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAEtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AACzE;;GAEG;AACH,eAAO,MAAM,wBAAwB,eAAqC,CAAC;AAE3E,yBAAiB,yBAAyB,CAAC;IACvC,KAAY,iBAAiB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;CAC5E;AAED;;;;;;;;;;GAUG;AACH,qBACa,yBAAyB;IAElC,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAI9G,MAAM,CAAC,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAInH,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IASvF,SAAS,CAAC,QAAQ,CAAC,eAAe,2DAAkE;IAEpG;;;OAGG;IACH,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;IACrF;;;;;;OAMG;IACH,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAOzE,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAEjD,OAAO,CAAC,oBAAoB,CAAwB;IACpD,SAAS,KAAK,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAE1C;IAGD,IAAI,IAAI,IAAI;IAKZ,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAE7C;;;OAGG;IACH,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAYtD,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAI3C;;OAEG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,yBAAyB,CAAC,iBAAiB,EAAE,SAAS,EAAE,OAAO,GAAG,IAAI;YAStF,WAAW;CAK5B"}
+{"version":3,"file":"service-connection-provider.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/service-connection-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAsB,UAAU,EAAiB,MAAM,WAAW,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAE/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAEjF;;GAEG;AACH,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AACzE;;GAEG;AACH,eAAO,MAAM,wBAAwB,eAAqC,CAAC;AAE3E,yBAAiB,yBAAyB,CAAC;IACvC,KAAY,iBAAiB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;CAC5E;AAED;;;;;;;;;;GAUG;AACH,qBACa,yBAAyB;IAElC,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAI9G,MAAM,CAAC,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAInH,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IASvF,SAAS,CAAC,QAAQ,CAAC,eAAe,2DAAkE;IAEpG;;;OAGG;IACH,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;IACrF;;;;;;OAMG;IACH,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAOzE,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAEjD,OAAO,CAAC,oBAAoB,CAAwB;IACpD,SAAS,KAAK,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAE1C;IAGD,IAAI,IAAI,IAAI;IAKZ,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAE7C;;;OAGG;IACH,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAYtD,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAI3C;;OAEG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,yBAAyB,CAAC,iBAAiB,EAAE,SAAS,EAAE,OAAO,GAAG,IAAI;YAStF,WAAW;CAK5B"}

package/lib/browser/messaging/service-connection-provider.js

@@ -18,10 +18,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceConnectionProvider = exports.RemoteConnectionProvider = exports.LocalConnectionProvider = void 0;
 const tslib_1 = require("tslib");
 const inversify_1 = require("inversify");
-const common_1 = require("../../common");
 const channel_1 = require("../../common/message-rpc/channel");
 const promise_util_1 = require("../../common/promise-util");
 const connection_source_1 = require("./connection-source");
+const proxy_factory_1 = require("../../common/messaging/proxy-factory");
 /**
  * Service id for the local connection provider
  */
@@ -61,7 +61,7 @@ let ServiceConnectionProvider = class ServiceConnectionProvider {
         }
     }
     createProxy(path, arg) {
-        const factory = arg instanceof common_1.RpcProxyFactory ? arg : new common_1.RpcProxyFactory(arg);
+        const factory = arg instanceof proxy_factory_1.RpcProxyFactory ? arg : new proxy_factory_1.RpcProxyFactory(arg);
         this.listen(path, (_, c) => factory.listen(c), true);
         return factory.createProxy();
     }

package/lib/browser/messaging/service-connection-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-connection-provider.js","sourceRoot":"","sources":["../../../src/browser/messaging/service-connection-provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service-connection-provider.js","sourceRoot":"","sources":["../../../src/browser/messaging/service-connection-provider.ts"],"names":[],"mappings":"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"}

package/lib/browser/messaging/ws-connection-provider.d.ts

@@ -1,5 +1,5 @@
 import { interfaces } from 'inversify';
-import { RpcProxy } from '../../common';
+import { RpcProxy } from '../../common/messaging/proxy-factory';
 /**
  * @deprecated This class serves to keep API compatibility for a while.
  * Use the {@linkcode RemoteConnectionProvider} as the injection symbol and {@linkcode ServiceConnectionProvider} as the type instead.

package/lib/browser/messaging/ws-connection-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws-connection-provider.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAc,UAAU,EAA+B,MAAM,WAAW,CAAC;AAChF,OAAO,EAAmB,QAAQ,EAAE,MAAM,cAAc,CAAC;AAMzD;;;GAGG;AACH,qBACa,2BAA2B;IAEpC,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA4B;IAErE,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAI9G,MAAM,CAAC,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAInH,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAIvF,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;CAI5E"}
+{"version":3,"file":"ws-connection-provider.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAc,UAAU,EAA+B,MAAM,WAAW,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAmB,MAAM,sCAAsC,CAAC;AAMjF;;;GAGG;AACH,qBACa,2BAA2B;IAEpC,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA4B;IAErE,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAI9G,MAAM,CAAC,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;IAInH,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAIvF,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;CAI5E"}

package/lib/browser/messaging/ws-connection-provider.js

@@ -18,10 +18,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketConnectionProvider = void 0;
 const tslib_1 = require("tslib");
 const inversify_1 = require("inversify");
-const common_1 = require("../../common");
+const proxy_factory_1 = require("../../common/messaging/proxy-factory");
 const service_connection_provider_1 = require("./service-connection-provider");
-(0, inversify_1.decorate)((0, inversify_1.injectable)(), common_1.RpcProxyFactory);
-(0, inversify_1.decorate)((0, inversify_1.unmanaged)(), common_1.RpcProxyFactory, 0);
+(0, inversify_1.decorate)((0, inversify_1.injectable)(), proxy_factory_1.RpcProxyFactory);
+(0, inversify_1.decorate)((0, inversify_1.unmanaged)(), proxy_factory_1.RpcProxyFactory, 0);
 /**
  * @deprecated This class serves to keep API compatibility for a while.
  * Use the {@linkcode RemoteConnectionProvider} as the injection symbol and {@linkcode ServiceConnectionProvider} as the type instead.

package/lib/browser/messaging/ws-connection-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ws-connection-provider.js","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-provider.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,yCAAgF;AAChF,yCAAyD;AACzD,+EAAoG;AAEpG,IAAA,oBAAQ,EAAC,IAAA,sBAAU,GAAE,EAAE,wBAAe,CAAC,CAAC;AACxC,IAAA,oBAAQ,EAAC,IAAA,qBAAS,GAAE,EAAE,wBAAe,EAAE,CAAC,CAAC,CAAC;AAE1C;;;GAGG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAIpC,MAAM,CAAC,WAAW,CAAmB,SAA+B,EAAE,IAAY,EAAE,GAAY;QAC5F,OAAO,uDAAyB,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAmB,SAA+B,EAAE,IAAY,EAAE,GAAY;QACjG,OAAO,uDAAyB,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,SAA+B,EAAE,IAAY,EAAE,GAAY;QAC5E,OAAO,uDAAyB,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACzE,CAAC;IAGD,WAAW,CAAmB,IAAY,EAAE,OAA2B;QACnE,OAAO,IAAI,CAAC,wBAAwB,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;CACJ,CAAA;AApBY,kEAA2B;AAEnB;IADhB,IAAA,kBAAM,EAAC,sDAAwB,CAAC;sCACU,uDAAyB;6EAAC;sCAF5D,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CAoBvC"}
+{"version":3,"file":"ws-connection-provider.js","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-provider.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,yCAAgF;AAChF,wEAAiF;AACjF,+EAAoG;AAEpG,IAAA,oBAAQ,EAAC,IAAA,sBAAU,GAAE,EAAE,+BAAe,CAAC,CAAC;AACxC,IAAA,oBAAQ,EAAC,IAAA,qBAAS,GAAE,EAAE,+BAAe,EAAE,CAAC,CAAC,CAAC;AAE1C;;;GAGG;AAEI,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IAIpC,MAAM,CAAC,WAAW,CAAmB,SAA+B,EAAE,IAAY,EAAE,GAAY;QAC5F,OAAO,uDAAyB,CAAC,WAAW,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAmB,SAA+B,EAAE,IAAY,EAAE,GAAY;QACjG,OAAO,uDAAyB,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,SAA+B,EAAE,IAAY,EAAE,GAAY;QAC5E,OAAO,uDAAyB,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACzE,CAAC;IAGD,WAAW,CAAmB,IAAY,EAAE,OAA2B;QACnE,OAAO,IAAI,CAAC,wBAAwB,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;CACJ,CAAA;AApBY,kEAA2B;AAEnB;IADhB,IAAA,kBAAM,EAAC,sDAAwB,CAAC;sCACU,uDAAyB;6EAAC;sCAF5D,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CAoBvC"}

package/lib/browser/messaging/ws-connection-source.d.ts

@@ -1,12 +1,14 @@
-import { AbstractChannel, Channel, Emitter, Event } from '../../common';
+import { Emitter, Event } from '../../common/event';
 import { ConnectionSource } from './connection-source';
 import { Socket } from 'socket.io-client';
 import { Endpoint } from '../endpoint';
+import { AbstractChannel, Channel } from '../../common/message-rpc/channel';
 import { FrontendIdProvider } from './frontend-id-provider';
+import { SocketWriteBuffer } from '../../common/messaging/socket-write-buffer';
 export declare class WebSocketConnectionSource implements ConnectionSource {
     static readonly NO_CONNECTION = "<none>";
     protected readonly frontendIdProvider: FrontendIdProvider;
-    private readonly writeBuffer;
+    protected readonly writeBuffer: SocketWriteBuffer;
     private _socket;
     get socket(): Socket;
     protected currentChannel: AbstractChannel;

package/lib/browser/messaging/ws-connection-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws-connection-source.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-source.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAoC,OAAO,EAAE,KAAK,EAAgB,MAAM,cAAc,CAAC;AACxH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAM,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAK5D,qBACa,yBAA0B,YAAW,gBAAgB;IAC9D,MAAM,CAAC,QAAQ,CAAC,aAAa,YAAY;IAGzC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAE1D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA2B;IAEvD,OAAO,CAAC,OAAO,CAAS;IACxB,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,SAAS,CAAC,cAAc,EAAE,eAAe,CAAC;IAE1C,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,OAAO,CAAC,OAAO,CAAC,CAAiB;IAChF,IAAI,mBAAmB,IAAI,KAAK,CAAC,OAAO,CAAC,CAExC;IAED,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACzE,IAAI,eAAe,IAAI,KAAK,CAAC,IAAI,CAAC,CAEjC;IAED,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IAC1E,IAAI,gBAAgB,IAAI,KAAK,CAAC,IAAI,CAAC,CAElC;IAED,SAAS,CAAC,QAAQ,CAAC,gCAAgC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACnF,IAAI,yBAAyB,IAAI,KAAK,CAAC,IAAI,CAAC,CAE3C;;IAMD,UAAU,IAAI,IAAI;IAqBlB,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAyBpC,SAAS,CAAC,uBAAuB,IAAI,IAAI;IAazC,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAQvC,iBAAiB,IAAI,IAAI;IAUzB,SAAS,CAAC,aAAa,IAAI,eAAe;IAoC1C;;OAEG;IACH,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAMlD,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAItD,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ;IAIhD;;OAEG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAe9C;;OAEG;IACH,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAUhE"}
+{"version":3,"file":"ws-connection-source.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-source.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAM,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAqB,MAAM,kCAAkC,CAAC;AAG/F,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAK/E,qBACa,yBAA0B,YAAW,gBAAgB;IAC9D,MAAM,CAAC,QAAQ,CAAC,aAAa,YAAY;IAGzC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAElD,OAAO,CAAC,OAAO,CAAS;IACxB,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,SAAS,CAAC,cAAc,EAAE,eAAe,CAAC;IAE1C,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,OAAO,CAAC,OAAO,CAAC,CAAiB;IAChF,IAAI,mBAAmB,IAAI,KAAK,CAAC,OAAO,CAAC,CAExC;IAED,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACzE,IAAI,eAAe,IAAI,KAAK,CAAC,IAAI,CAAC,CAEjC;IAED,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IAC1E,IAAI,gBAAgB,IAAI,KAAK,CAAC,IAAI,CAAC,CAElC;IAED,SAAS,CAAC,QAAQ,CAAC,gCAAgC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACnF,IAAI,yBAAyB,IAAI,KAAK,CAAC,IAAI,CAAC,CAE3C;;IAMD,UAAU,IAAI,IAAI;IAqBlB,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAyBpC,SAAS,CAAC,uBAAuB,IAAI,IAAI;IAazC,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAQvC,iBAAiB,IAAI,IAAI;IAUzB,SAAS,CAAC,aAAa,IAAI,eAAe;IAoC1C;;OAEG;IACH,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAMlD,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAItD,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ;IAIhD;;OAEG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAe9C;;OAEG;IACH,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAUhE"}

package/lib/browser/messaging/ws-connection-source.js

@@ -17,7 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketConnectionSource = void 0;
 const tslib_1 = require("tslib");
-const common_1 = require("../../common");
+const event_1 = require("../../common/event");
 const socket_io_client_1 = require("socket.io-client");
 const endpoint_1 = require("../endpoint");
 const channel_1 = require("../../common/message-rpc/channel");
@@ -27,6 +27,8 @@ const frontend_id_provider_1 = require("./frontend-id-provider");
 const frontend_application_config_provider_1 = require("../frontend-application-config-provider");
 const socket_write_buffer_1 = require("../../common/messaging/socket-write-buffer");
 const connection_management_1 = require("../../common/messaging/connection-management");
+const handler_1 = require("../../common/messaging/handler");
+const disposable_1 = require("../../common/disposable");
 let WebSocketConnectionSource = class WebSocketConnectionSource {
     static { this.NO_CONNECTION = '<none>'; }
     get socket() {
@@ -45,14 +47,13 @@ let WebSocketConnectionSource = class WebSocketConnectionSource {
         return this.onIncomingMessageActivityEmitter.event;
     }
     constructor() {
-        this.writeBuffer = new socket_write_buffer_1.SocketWriteBuffer();
-        this.onConnectionDidOpenEmitter = new common_1.Emitter();
-        this.onSocketDidOpenEmitter = new common_1.Emitter();
-        this.onSocketDidCloseEmitter = new common_1.Emitter();
-        this.onIncomingMessageActivityEmitter = new common_1.Emitter();
+        this.onConnectionDidOpenEmitter = new event_1.Emitter();
+        this.onSocketDidOpenEmitter = new event_1.Emitter();
+        this.onSocketDidCloseEmitter = new event_1.Emitter();
+        this.onIncomingMessageActivityEmitter = new event_1.Emitter();
     }
     openSocket() {
-        const url = this.createWebSocketUrl(common_1.servicesPath);
+        const url = this.createWebSocketUrl(handler_1.servicesPath);
         this._socket = this.createWebSocket(url);
         this._socket.on('connect', () => {
             this.onSocketDidOpenEmitter.fire();
@@ -115,15 +116,15 @@ let WebSocketConnectionSource = class WebSocketConnectionSource {
     }
     connectNewChannel() {
         if (this.currentChannel) {
-            this.currentChannel.close();
             this.currentChannel.onCloseEmitter.fire({ reason: 'reconnecting channel' });
+            this.currentChannel.close();
         }
         this.writeBuffer.drain();
         this.currentChannel = this.createChannel();
         this.onConnectionDidOpenEmitter.fire(this.currentChannel);
     }
     createChannel() {
-        const toDispose = new common_1.DisposableCollection();
+        const toDispose = new disposable_1.DisposableCollection();
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const messageHandler = (data) => {
             this.onIncomingMessageActivityEmitter.fire();
@@ -136,7 +137,7 @@ let WebSocketConnectionSource = class WebSocketConnectionSource {
             ;
         };
         this._socket.on('message', messageHandler);
-        toDispose.push(common_1.Disposable.create(() => {
+        toDispose.push(disposable_1.Disposable.create(() => {
             this.socket.off('message', messageHandler);
         }));
         const channel = new channel_1.ForwardingChannel('any', () => {
@@ -205,6 +206,10 @@ tslib_1.__decorate([
     (0, inversify_1.inject)(frontend_id_provider_1.FrontendIdProvider),
     tslib_1.__metadata("design:type", Object)
 ], WebSocketConnectionSource.prototype, "frontendIdProvider", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(socket_write_buffer_1.SocketWriteBuffer),
+    tslib_1.__metadata("design:type", socket_write_buffer_1.SocketWriteBuffer)
+], WebSocketConnectionSource.prototype, "writeBuffer", void 0);
 tslib_1.__decorate([
     (0, inversify_1.postConstruct)(),
     tslib_1.__metadata("design:type", Function),