@gitpod/gitpod-protocol 0.1.5-wth-argo.0 → 0.1.5-wth-test.41

package/lib/messaging/connection-error-handler.js

@@ -5,42 +5,30 @@
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
  */
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionErrorHandler = void 0;
-var logging_1 = require("../util/logging");
-var ConnectionErrorHandler = /** @class */ (function () {
-    function ConnectionErrorHandler(options) {
+const logging_1 = require("../util/logging");
+class ConnectionErrorHandler {
+    constructor(options) {
         this.restarts = [];
-        this.options = __assign({ maxErrors: 3, maxRestarts: 5, restartInterval: 3 }, options);
+        this.options = Object.assign({ maxErrors: 3, maxRestarts: 5, restartInterval: 3 }, options);
     }
-    ConnectionErrorHandler.prototype.shouldStop = function (error, message, count) {
+    shouldStop(error, message, count) {
         return !count || count > this.options.maxErrors;
-    };
-    ConnectionErrorHandler.prototype.shouldRestart = function () {
+    }
+    shouldRestart() {
         this.restarts.push(Date.now());
         if (this.restarts.length <= this.options.maxRestarts) {
             return true;
         }
-        var diff = this.restarts[this.restarts.length - 1] - this.restarts[0];
+        const diff = this.restarts[this.restarts.length - 1] - this.restarts[0];
         if (diff <= this.options.restartInterval * 60 * 1000) {
-            logging_1.log.error("Server " + this.options.serverName + " crashed " + this.options.maxRestarts + " times in the last " + this.options.restartInterval + " minutes. Will not restart");
+            logging_1.log.error(`Server ${this.options.serverName} crashed ${this.options.maxRestarts} times in the last ${this.options.restartInterval} minutes. Will not restart`);
             return false;
         }
         this.restarts.shift();
         return true;
-    };
-    return ConnectionErrorHandler;
-}());
+    }
+}
 exports.ConnectionErrorHandler = ConnectionErrorHandler;
 //# sourceMappingURL=connection-error-handler.js.map

package/lib/messaging/connection-error-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection-error-handler.js","sourceRoot":"","sources":["../../src/messaging/connection-error-handler.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;AAGH,2CAAsC;AAsBtC;IAGI,gCAAY,OAAsC;QAa/B,aAAQ,GAAa,EAAE,CAAC;QAZvC,IAAI,CAAC,OAAO,cACR,SAAS,EAAE,CAAC,EACZ,WAAW,EAAE,CAAC,EACd,eAAe,EAAE,CAAC,IACf,OAAO,CACb,CAAC;IACN,CAAC;IAED,2CAAU,GAAV,UAAW,KAAY,EAAE,OAAiB,EAAE,KAAc;QACtD,OAAO,CAAC,KAAK,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IACpD,CAAC;IAGD,8CAAa,GAAb;QACI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAC/B,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YAClD,OAAO,IAAI,CAAC;SACf;QACD,IAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACxE,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,GAAG,EAAE,GAAG,IAAI,EAAE;YAClD,aAAG,CAAC,KAAK,CAAC,YAAU,IAAI,CAAC,OAAO,CAAC,UAAU,iBAAY,IAAI,CAAC,OAAO,CAAC,WAAW,2BAAsB,IAAI,CAAC,OAAO,CAAC,eAAe,+BAA4B,CAAC,CAAC;YAC/J,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IAChB,CAAC;IAEL,6BAAC;AAAD,CAAC,AA/BD,IA+BC;AA/BY,wDAAsB"}
+{"version":3,"file":"connection-error-handler.js","sourceRoot":"","sources":["../../src/messaging/connection-error-handler.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,6CAAsC;AAsBtC,MAAa,sBAAsB;IAG/B,YAAY,OAAsC;QAa/B,aAAQ,GAAa,EAAE,CAAC;QAZvC,IAAI,CAAC,OAAO,mBACR,SAAS,EAAE,CAAC,EACZ,WAAW,EAAE,CAAC,EACd,eAAe,EAAE,CAAC,IACf,OAAO,CACb,CAAC;IACN,CAAC;IAED,UAAU,CAAC,KAAY,EAAE,OAAiB,EAAE,KAAc;QACtD,OAAO,CAAC,KAAK,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IACpD,CAAC;IAGD,aAAa;QACT,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAC/B,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YAClD,OAAO,IAAI,CAAC;SACf;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACxE,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,GAAG,EAAE,GAAG,IAAI,EAAE;YAClD,aAAG,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,UAAU,YAAY,IAAI,CAAC,OAAO,CAAC,WAAW,sBAAsB,IAAI,CAAC,OAAO,CAAC,eAAe,4BAA4B,CAAC,CAAC;YAC/J,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IAChB,CAAC;CAEJ;AA/BD,wDA+BC"}

package/lib/messaging/error.d.ts

@@ -13,6 +13,7 @@ export declare namespace ErrorCodes {
     const TOO_MANY_REQUESTS = 429;
     const REPOSITORY_NOT_WHITELISTED = 430;
     const CONTEXT_PARSE_ERROR = 460;
+    const INVALID_GITPOD_YML = 461;
     const PAYMENT_ERROR = 450;
     const USER_BLOCKED = 470;
     const USER_DELETED = 471;
@@ -23,8 +24,9 @@ export declare namespace ErrorCodes {
     const TOO_MANY_RUNNING_WORKSPACES = 490;
     const EE_FEATURE = 501;
     const EE_LICENSE_REQUIRED = 555;
+    const SAAS_FEATURE = 601;
     const TEAM_SUBSCRIPTION_INVALID_QUANTITY = 610;
     const TEAM_SUBSCRIPTION_ASSIGNMENT_FAILED = 620;
-    const NOT_IMPLEMENTED = 666;
+    const SNAPSHOT_ERROR = 630;
 }
 //# sourceMappingURL=error.d.ts.map

package/lib/messaging/error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/messaging/error.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,yBAAiB,UAAU,CAAC;IAEjB,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,SAAS,MAAM,CAAC;IAGtB,MAAM,QAAQ,MAAM,CAAC;IAGrB,MAAM,cAAc,MAAM,CAAC;IAG3B,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,0BAA0B,MAAM,CAAC;IAGvC,MAAM,mBAAmB,MAAM,CAAC;IAGhC,MAAM,aAAa,MAAM,CAAC;IAG1B,MAAM,YAAY,MAAM,CAAC;IAGzB,MAAM,YAAY,MAAM,CAAC;IAGzB,MAAM,8BAA8B,MAAM,CAAC;IAG3C,MAAM,iCAAiC,MAAM,CAAC;IAG9C,MAAM,0BAA0B,MAAM,CAAC;IAGvC,MAAM,8BAA8B,MAAM,CAAC;IAG3C,MAAM,2BAA2B,MAAM,CAAC;IAGxC,MAAM,UAAU,MAAM,CAAC;IAGvB,MAAM,mBAAmB,MAAM,CAAC;IAGhC,MAAM,kCAAkC,MAAM,CAAC;IAG/C,MAAM,mCAAmC,MAAM,CAAC;IAGhD,MAAM,eAAe,MAAM,CAAC;CACtC"}
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../src/messaging/error.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,yBAAiB,UAAU,CAAC;IAEjB,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,SAAS,MAAM,CAAC;IAGtB,MAAM,QAAQ,MAAM,CAAC;IAGrB,MAAM,cAAc,MAAM,CAAC;IAG3B,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,0BAA0B,MAAM,CAAC;IAGvC,MAAM,mBAAmB,MAAM,CAAC;IAGhC,MAAM,kBAAkB,MAAM,CAAC;IAG/B,MAAM,aAAa,MAAM,CAAC;IAG1B,MAAM,YAAY,MAAM,CAAC;IAGzB,MAAM,YAAY,MAAM,CAAC;IAGzB,MAAM,8BAA8B,MAAM,CAAC;IAG3C,MAAM,iCAAiC,MAAM,CAAC;IAG9C,MAAM,0BAA0B,MAAM,CAAC;IAGvC,MAAM,8BAA8B,MAAM,CAAC;IAG3C,MAAM,2BAA2B,MAAM,CAAC;IAGxC,MAAM,UAAU,MAAM,CAAC;IAGvB,MAAM,mBAAmB,MAAM,CAAC;IAGhC,MAAM,YAAY,MAAM,CAAC;IAGzB,MAAM,kCAAkC,MAAM,CAAC;IAG/C,MAAM,mCAAmC,MAAM,CAAC;IAGhD,MAAM,cAAc,MAAM,CAAC;CACrC"}

package/lib/messaging/error.js

@@ -26,6 +26,8 @@ var ErrorCodes;
     ErrorCodes.REPOSITORY_NOT_WHITELISTED = 430;
     // 460 Context Parse Error (custom status code)
     ErrorCodes.CONTEXT_PARSE_ERROR = 460;
+    // 461 Invalid gitpod yml
+    ErrorCodes.INVALID_GITPOD_YML = 461;
     // 450 Payment error
     ErrorCodes.PAYMENT_ERROR = 450;
     // 470 User Blocked (custom status code)
@@ -46,11 +48,13 @@ var ErrorCodes;
     ErrorCodes.EE_FEATURE = 501;
     // 555 EE License Required
     ErrorCodes.EE_LICENSE_REQUIRED = 555;
+    // 601 SaaS Feature
+    ErrorCodes.SAAS_FEATURE = 601;
     // 610 Invalid Team Subscription Quantity
     ErrorCodes.TEAM_SUBSCRIPTION_INVALID_QUANTITY = 610;
     // 620 Team Subscription Assignment Failed
     ErrorCodes.TEAM_SUBSCRIPTION_ASSIGNMENT_FAILED = 620;
-    // 666 Not Implemented TODO IO-SPLIT remove
-    ErrorCodes.NOT_IMPLEMENTED = 666;
+    // 630 Snapshot Error
+    ErrorCodes.SNAPSHOT_ERROR = 630;
 })(ErrorCodes = exports.ErrorCodes || (exports.ErrorCodes = {}));
 //# sourceMappingURL=error.js.map

package/lib/messaging/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/messaging/error.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAIH,IAAiB,UAAU,CAkE1B;AAlED,WAAiB,UAAU;IACvB,mBAAmB;IACN,4BAAiB,GAAG,GAAG,CAAC;IAErC,uBAAuB;IACV,4BAAiB,GAAG,GAAG,CAAC;IAErC,gBAAgB;IACH,4BAAiB,GAAG,GAAG,CAAC;IAErC,gBAAgB;IACH,oBAAS,GAAG,GAAG,CAAC;IAE7B,uCAAuC;IAC1B,mBAAQ,GAAG,GAAG,CAAC;IAE5B,cAAc;IACD,yBAAc,GAAG,GAAG,CAAC;IAElC,wBAAwB;IACX,4BAAiB,GAAG,GAAG,CAAC;IAErC,sDAAsD;IACzC,qCAA0B,GAAG,GAAG,CAAC;IAE9C,+CAA+C;IAClC,8BAAmB,GAAG,GAAG,CAAC;IAEvC,oBAAoB;IACP,wBAAa,GAAG,GAAG,CAAC;IAEjC,wCAAwC;IAC3B,uBAAY,GAAG,GAAG,CAAC;IAEhC,wCAAwC;IAC3B,uBAAY,GAAG,GAAG,CAAC;IAEhC,qDAAqD;IACxC,yCAA8B,GAAG,GAAG,CAAC;IAElD,wCAAwC;IAC3B,4CAAiC,GAAG,GAAG,CAAC;IAErD,uDAAuD;IAC1C,qCAA0B,GAAG,GAAG,CAAC;IAE9C,wCAAwC;IAC3B,yCAA8B,GAAG,GAAG,CAAC;IAElD,iCAAiC;IACpB,sCAA2B,GAAG,GAAG,CAAC;IAE/C,iBAAiB;IACJ,qBAAU,GAAG,GAAG,CAAC;IAE9B,0BAA0B;IACb,8BAAmB,GAAG,GAAG,CAAC;IAEvC,yCAAyC;IAC5B,6CAAkC,GAAG,GAAG,CAAC;IAEtD,0CAA0C;IAC7B,8CAAmC,GAAG,GAAG,CAAC;IAEvD,2CAA2C;IAC9B,0BAAe,GAAG,GAAG,CAAC;AACvC,CAAC,EAlEgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAkE1B"}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/messaging/error.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAIH,IAAiB,UAAU,CAwE1B;AAxED,WAAiB,UAAU;IACvB,mBAAmB;IACN,4BAAiB,GAAG,GAAG,CAAC;IAErC,uBAAuB;IACV,4BAAiB,GAAG,GAAG,CAAC;IAErC,gBAAgB;IACH,4BAAiB,GAAG,GAAG,CAAC;IAErC,gBAAgB;IACH,oBAAS,GAAG,GAAG,CAAC;IAE7B,uCAAuC;IAC1B,mBAAQ,GAAG,GAAG,CAAC;IAE5B,cAAc;IACD,yBAAc,GAAG,GAAG,CAAC;IAElC,wBAAwB;IACX,4BAAiB,GAAG,GAAG,CAAC;IAErC,sDAAsD;IACzC,qCAA0B,GAAG,GAAG,CAAC;IAE9C,+CAA+C;IAClC,8BAAmB,GAAG,GAAG,CAAC;IAEvC,yBAAyB;IACZ,6BAAkB,GAAG,GAAG,CAAC;IAEtC,oBAAoB;IACP,wBAAa,GAAG,GAAG,CAAC;IAEjC,wCAAwC;IAC3B,uBAAY,GAAG,GAAG,CAAC;IAEhC,wCAAwC;IAC3B,uBAAY,GAAG,GAAG,CAAC;IAEhC,qDAAqD;IACxC,yCAA8B,GAAG,GAAG,CAAC;IAElD,wCAAwC;IAC3B,4CAAiC,GAAG,GAAG,CAAC;IAErD,uDAAuD;IAC1C,qCAA0B,GAAG,GAAG,CAAC;IAE9C,wCAAwC;IAC3B,yCAA8B,GAAG,GAAG,CAAC;IAElD,iCAAiC;IACpB,sCAA2B,GAAG,GAAG,CAAC;IAE/C,iBAAiB;IACJ,qBAAU,GAAG,GAAG,CAAC;IAE9B,0BAA0B;IACb,8BAAmB,GAAG,GAAG,CAAC;IAEvC,mBAAmB;IACN,uBAAY,GAAG,GAAG,CAAC;IAEhC,yCAAyC;IAC5B,6CAAkC,GAAG,GAAG,CAAC;IAEtD,0CAA0C;IAC7B,8CAAmC,GAAG,GAAG,CAAC;IAEvD,qBAAqB;IACR,yBAAc,GAAG,GAAG,CAAC;AACtC,CAAC,EAxEgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAwE1B"}

package/lib/messaging/handler.d.ts

@@ -4,4 +4,14 @@ export interface ConnectionHandler {
     readonly path: string;
     onConnection(connection: MessageConnection, session?: object): void;
 }
+export interface ConnectionEventHandler {
+    /**
+     * Called when the transport underpinning the connection got closed
+     */
+    onTransportDidClose(): void;
+    /**
+     * Called when the transport underpinning the connection is (re-)opened
+     */
+    onTransportDidOpen(): void;
+}
 //# sourceMappingURL=handler.d.ts.map

package/lib/messaging/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/messaging/handler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,eAAO,MAAM,iBAAiB,eAA8B,CAAC;AAE7D,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,UAAU,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvE"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/messaging/handler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,eAAO,MAAM,iBAAiB,eAA8B,CAAC;AAE7D,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,UAAU,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvE;AAED,MAAM,WAAW,sBAAsB;IACnC;;OAEG;IACF,mBAAmB,IAAI,IAAI,CAAC;IAE5B;;OAEG;IACH,kBAAkB,IAAI,IAAI,CAAC;CAC/B"}

package/lib/messaging/node/connection.js

@@ -7,40 +7,40 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toIWebSocket = exports.openSocket = exports.openJsonRpcSocket = exports.createServerWebSocketConnection = void 0;
-var ws = require("ws");
-var url = require("url");
-var vscode_ws_jsonrpc_1 = require("vscode-ws-jsonrpc");
-var logging_1 = require("../../util/logging");
+const ws = require("ws");
+const url = require("url");
+const vscode_ws_jsonrpc_1 = require("vscode-ws-jsonrpc");
+const logging_1 = require("../../util/logging");
 function createServerWebSocketConnection(options, onConnect) {
-    openJsonRpcSocket(options, function (socket) {
-        onConnect(vscode_ws_jsonrpc_1.createWebSocketConnection(socket, console));
+    openJsonRpcSocket(options, socket => {
+        onConnect((0, vscode_ws_jsonrpc_1.createWebSocketConnection)(socket, console));
     });
 }
 exports.createServerWebSocketConnection = createServerWebSocketConnection;
 function openJsonRpcSocket(options, onOpen) {
-    openSocket(options, function (socket) {
-        var webSocket = toIWebSocket(socket);
+    openSocket(options, socket => {
+        const webSocket = toIWebSocket(socket);
         onOpen(webSocket);
     });
 }
 exports.openJsonRpcSocket = openJsonRpcSocket;
 function openSocket(options, onOpen) {
-    var wss = new ws.Server({
+    const wss = new ws.Server({
         noServer: true,
         perMessageDeflate: {
             // don't compress if a message is less than 256kb
             threshold: 256 * 1024
         }
     });
-    options.server.on('upgrade', function (request, socket, head) {
-        var pathname = request.url ? url.parse(request.url).pathname : undefined;
+    options.server.on('upgrade', (request, socket, head) => {
+        const pathname = request.url ? url.parse(request.url).pathname : undefined;
         if (options.path && pathname === options.path || options.matches && options.matches(request)) {
-            wss.handleUpgrade(request, socket, head, function (webSocket) {
+            wss.handleUpgrade(request, socket, head, webSocket => {
                 if (webSocket.readyState === webSocket.OPEN) {
                     onOpen(webSocket, request, socket, head);
                 }
                 else {
-                    webSocket.on('open', function () { return onOpen(webSocket, request, socket, head); });
+                    webSocket.on('open', () => onOpen(webSocket, request, socket, head));
                 }
             });
         }
@@ -48,25 +48,25 @@ function openSocket(options, onOpen) {
 }
 exports.openSocket = openSocket;
 function toIWebSocket(webSocket) {
-    var sendsAfterOpen = 0;
+    let sendsAfterOpen = 0;
     return {
-        send: function (content) {
+        send: content => {
             if (webSocket.readyState !== ws.OPEN) {
                 if (sendsAfterOpen++ > 3) {
-                    logging_1.log.error("Repeated try to send on closed web socket (readyState was " + webSocket.readyState + ")", { ws: ws });
+                    //log.debug(`Repeated try to send on closed web socket (readyState was ${webSocket.readyState})`, { ws });
                 }
                 return;
             }
-            webSocket.send(content, function (err) {
+            webSocket.send(content, err => {
                 if (err) {
-                    logging_1.log.error('Error in ws.send()', err, { ws: ws });
+                    logging_1.log.error('error in ws.send()', err, { ws });
                 }
             });
         },
-        onMessage: function (cb) { return webSocket.on('message', cb); },
-        onError: function (cb) { return webSocket.on('error', cb); },
-        onClose: function (cb) { return webSocket.on('close', cb); },
-        dispose: function () {
+        onMessage: cb => webSocket.on('message', cb),
+        onError: cb => webSocket.on('error', cb),
+        onClose: cb => webSocket.on('close', cb),
+        dispose: () => {
             if (webSocket.readyState < ws.CLOSING) {
                 webSocket.close();
             }

package/lib/messaging/node/connection.js.map

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

package/lib/messaging/proxy-factory.d.ts

@@ -77,6 +77,8 @@ export declare class JsonRpcProxyFactory<T extends object> implements ProxyHandl
      */
     constructor(target?: any);
     protected waitForConnection(): void;
+    fireConnectionClosed(): void;
+    fireConnectionOpened(): void;
     /**
      * Connect a MessageConnection to the factory.
      *

package/lib/messaging/proxy-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy-factory.d.ts","sourceRoot":"","sources":["../../src/messaging/proxy-factory.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAiB,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAG9C,oBAAY,aAAa,CAAC,MAAM,IAAI,UAAU,GAAG;IAC7C;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CAC/C,CAAC;AAEF,MAAM,WAAW,6BAA6B;IAC1C,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1C,QAAQ,CAAC,oBAAoB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;CAC9C;AACD,oBAAY,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,6BAA6B,CAAC;AAEhE,qBAAa,wBAAwB,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,iBAAiB;IAE5E,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,GAAG;gBADhE,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,GAAG;IAG7E,YAAY,CAAC,UAAU,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;CAMtE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,qBAAa,mBAAmB,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,YAAY,CAAC,CAAC,CAAC;IActD,MAAM,CAAC;IAZ1B,SAAS,CAAC,QAAQ,CAAC,0BAA0B,gBAAuB;IACpE,SAAS,CAAC,QAAQ,CAAC,2BAA2B,gBAAuB;IAErE,SAAS,CAAC,wBAAwB,EAAE,CAAC,UAAU,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC5E,SAAS,CAAC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAExD;;;;;OAKG;gBACgB,MAAM,CAAC,KAAK;IAI/B,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAYnC;;;;;OAKG;IACH,MAAM,CAAC,UAAU,EAAE,iBAAiB;IAQpC;;;;;;;;;;;OAWG;cACa,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAavE;;;;;OAKG;IACH,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAI9D;;;;;;OAMG;IACH,WAAW,IAAI,YAAY,CAAC,CAAC,CAAC;IAK9B;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,GAAG,GAAG;IAiClD;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,CAAC,EAAE,WAAW,GAAG,OAAO;CAGpD"}
+{"version":3,"file":"proxy-factory.d.ts","sourceRoot":"","sources":["../../src/messaging/proxy-factory.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAiB,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAG9C,oBAAY,aAAa,CAAC,MAAM,IAAI,UAAU,GAAG;IAC7C;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CAC/C,CAAC;AAEF,MAAM,WAAW,6BAA6B;IAC1C,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1C,QAAQ,CAAC,oBAAoB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;CAC9C;AACD,oBAAY,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,6BAA6B,CAAC;AAEhE,qBAAa,wBAAwB,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,iBAAiB;IAE5E,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,GAAG;gBADhE,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,GAAG;IAG7E,YAAY,CAAC,UAAU,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;CAMtE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,qBAAa,mBAAmB,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,YAAY,CAAC,CAAC,CAAC;IActD,MAAM,CAAC;IAZ1B,SAAS,CAAC,QAAQ,CAAC,0BAA0B,gBAAuB;IACpE,SAAS,CAAC,QAAQ,CAAC,2BAA2B,gBAAuB;IAErE,SAAS,CAAC,wBAAwB,EAAE,CAAC,UAAU,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC5E,SAAS,CAAC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAExD;;;;;OAKG;gBACgB,MAAM,CAAC,KAAK;IAI/B,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAUnC,oBAAoB;IAIpB,oBAAoB;IAIpB;;;;;OAKG;IACH,MAAM,CAAC,UAAU,EAAE,iBAAiB;IAQpC;;;;;;;;;;;OAWG;cACa,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAavE;;;;;OAKG;IACH,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAM9D;;;;;;OAMG;IACH,WAAW,IAAI,YAAY,CAAC,CAAC,CAAC;IAK9B;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,GAAG,GAAG;IAiClD;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,CAAC,EAAE,WAAW,GAAG,OAAO;CAGpD"}

package/lib/messaging/proxy-factory.js

@@ -14,71 +14,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spread = (this && this.__spread) || function () {
-    for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
-    return ar;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonRpcProxyFactory = exports.JsonRpcConnectionHandler = void 0;
-var vscode_jsonrpc_1 = require("vscode-jsonrpc");
-var event_1 = require("../util/event");
-var logging_1 = require("../util/logging");
-var JsonRpcConnectionHandler = /** @class */ (function () {
-    function JsonRpcConnectionHandler(path, targetFactory) {
+const vscode_jsonrpc_1 = require("vscode-jsonrpc");
+const event_1 = require("../util/event");
+const logging_1 = require("../util/logging");
+class JsonRpcConnectionHandler {
+    constructor(path, targetFactory) {
         this.path = path;
         this.targetFactory = targetFactory;
     }
-    JsonRpcConnectionHandler.prototype.onConnection = function (connection, request) {
-        var factory = new JsonRpcProxyFactory();
-        var proxy = factory.createProxy();
+    onConnection(connection, request) {
+        const factory = new JsonRpcProxyFactory();
+        const proxy = factory.createProxy();
         factory.target = this.targetFactory(proxy, request);
         factory.listen(connection);
-    };
-    return JsonRpcConnectionHandler;
-}());
+    }
+}
 exports.JsonRpcConnectionHandler = JsonRpcConnectionHandler;
 /**
  * Factory for JSON-RPC proxy objects.
@@ -122,57 +74,45 @@ exports.JsonRpcConnectionHandler = JsonRpcConnectionHandler;
  *
  * @param <T> - The type of the object to expose to JSON-RPC.
  */
-var JsonRpcProxyFactory = /** @class */ (function () {
+class JsonRpcProxyFactory {
     /**
      * Build a new JsonRpcProxyFactory.
      *
      * @param target - The object to expose to JSON-RPC methods calls.  If this
      *   is omitted, the proxy won't be able to handle requests, only send them.
      */
-    function JsonRpcProxyFactory(target) {
+    constructor(target) {
         this.target = target;
         this.onDidOpenConnectionEmitter = new event_1.Emitter();
         this.onDidCloseConnectionEmitter = new event_1.Emitter();
         this.waitForConnection();
     }
-    JsonRpcProxyFactory.prototype.waitForConnection = function () {
-        var _this = this;
-        this.connectionPromise = new Promise(function (resolve) {
-            return _this.connectionPromiseResolve = resolve;
-        });
-        this.connectionPromise.then(function (connection) {
-            connection.onClose(function () {
-                return _this.onDidCloseConnectionEmitter.fire(undefined);
-            });
-            _this.onDidOpenConnectionEmitter.fire(undefined);
+    waitForConnection() {
+        this.connectionPromise = new Promise(resolve => this.connectionPromiseResolve = resolve);
+        this.connectionPromise.then(connection => {
+            connection.onClose(() => this.fireConnectionClosed());
+            this.fireConnectionOpened();
         });
-    };
+    }
+    fireConnectionClosed() {
+        this.onDidCloseConnectionEmitter.fire(undefined);
+    }
+    fireConnectionOpened() {
+        this.onDidOpenConnectionEmitter.fire(undefined);
+    }
     /**
      * Connect a MessageConnection to the factory.
      *
      * This connection will be used to send/receive JSON-RPC requests and
      * response.
      */
-    JsonRpcProxyFactory.prototype.listen = function (connection) {
-        var _this = this;
-        connection.onRequest(function (method) {
-            var params = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                params[_i - 1] = arguments[_i];
-            }
-            return _this.onRequest.apply(_this, __spread([method], params));
-        });
-        connection.onNotification(function (method) {
-            var params = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                params[_i - 1] = arguments[_i];
-            }
-            return _this.onNotification.apply(_this, __spread([method], params));
-        });
-        connection.onDispose(function () { return _this.waitForConnection(); });
+    listen(connection) {
+        connection.onRequest((method, ...params) => this.onRequest(method, ...params));
+        connection.onNotification((method, ...params) => this.onNotification(method, ...params));
+        connection.onDispose(() => this.waitForConnection());
         connection.listen();
         this.connectionPromiseResolve(connection);
-    };
+    }
     /**
      * Process an incoming JSON-RPC method call.
      *
@@ -185,48 +125,33 @@ var JsonRpcProxyFactory = /** @class */ (function () {
      *
      * @returns A promise of the method call completion.
      */
-    JsonRpcProxyFactory.prototype.onRequest = function (method) {
-        var args = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            args[_i - 1] = arguments[_i];
-        }
-        return __awaiter(this, void 0, void 0, function () {
-            var e_1;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _b.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, (_a = this.target)[method].apply(_a, __spread(args))];
-                    case 1: return [2 /*return*/, _b.sent()];
-                    case 2:
-                        e_1 = _b.sent();
-                        if (e_1 instanceof vscode_jsonrpc_1.ResponseError) {
-                            logging_1.log.info("Request " + method + " unsuccessful: " + e_1.code + "/\"" + e_1.message + "\"", { method: method, args: args });
-                        }
-                        else {
-                            logging_1.log.error("Request " + method + " failed with internal server error", e_1, { method: method, args: args });
-                        }
-                        throw e_1;
-                    case 3: return [2 /*return*/];
+    onRequest(method, ...args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                return yield this.target[method](...args);
+            }
+            catch (e) {
+                if (e instanceof vscode_jsonrpc_1.ResponseError) {
+                    logging_1.log.info(`Request ${method} unsuccessful: ${e.code}/"${e.message}"`, { method, args });
+                }
+                else {
+                    logging_1.log.error(`Request ${method} failed with internal server error`, e, { method, args });
                 }
-            });
+                throw e;
+            }
         });
-    };
+    }
     /**
      * Process an incoming JSON-RPC notification.
      *
      * Same as [[onRequest]], but called on incoming notifications rather than
      * methods calls.
      */
-    JsonRpcProxyFactory.prototype.onNotification = function (method) {
-        var _a;
-        var args = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            args[_i - 1] = arguments[_i];
+    onNotification(method, ...args) {
+        if (this.target[method]) {
+            this.target[method](...args);
         }
-        (_a = this.target)[method].apply(_a, __spread(args));
-    };
+    }
     /**
      * Create a Proxy exposing the interface of an object of type T.  This Proxy
      * can be used to do JSON-RPC method calls on the remote target object as
@@ -234,10 +159,10 @@ var JsonRpcProxyFactory = /** @class */ (function () {
      *
      * If `T` implements `JsonRpcServer` then a client is used as a target object for a remote target object.
      */
-    JsonRpcProxyFactory.prototype.createProxy = function () {
-        var result = new Proxy(this, this);
+    createProxy() {
+        const result = new Proxy(this, this);
         return result;
-    };
+    }
     /**
      * Get a callable object that executes a JSON-RPC method call.
      *
@@ -260,11 +185,10 @@ var JsonRpcProxyFactory = /** @class */ (function () {
      * @param receiver - unused.
      * @returns A callable that executes the JSON-RPC call.
      */
-    JsonRpcProxyFactory.prototype.get = function (target, p, receiver) {
-        var _this = this;
+    get(target, p, receiver) {
         if (p === 'setClient') {
-            return function (client) {
-                _this.target = client;
+            return (client) => {
+                this.target = client;
             };
         }
         if (p === 'onDidOpenConnection') {
@@ -273,33 +197,25 @@ var JsonRpcProxyFactory = /** @class */ (function () {
         if (p === 'onDidCloseConnection') {
             return this.onDidCloseConnectionEmitter.event;
         }
-        var isNotify = this.isNotification(p);
-        return function () {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
+        const isNotify = this.isNotification(p);
+        return (...args) => this.connectionPromise.then(connection => new Promise((resolve, reject) => {
+            try {
+                if (isNotify) {
+                    connection.sendNotification(p.toString(), ...args);
+                    resolve(undefined);
+                }
+                else {
+                    const resultPromise = connection.sendRequest(p.toString(), ...args);
+                    resultPromise
+                        .catch((err) => reject(err))
+                        .then((result) => resolve(result));
+                }
             }
-            return _this.connectionPromise.then(function (connection) {
-                return new Promise(function (resolve, reject) {
-                    try {
-                        if (isNotify) {
-                            connection.sendNotification.apply(connection, __spread([p.toString()], args));
-                            resolve();
-                        }
-                        else {
-                            var resultPromise = connection.sendRequest.apply(connection, __spread([p.toString()], args));
-                            resultPromise
-                                .catch(function (err) { return reject(err); })
-                                .then(function (result) { return resolve(result); });
-                        }
-                    }
-                    catch (err) {
-                        reject(err);
-                    }
-                });
-            });
-        };
-    };
+            catch (err) {
+                reject(err);
+            }
+        }));
+    }
     /**
      * Return whether the given property represents a notification.
      *
@@ -309,10 +225,9 @@ var JsonRpcProxyFactory = /** @class */ (function () {
      * @param p - The property being called on the proxy.
      * @return Whether `p` represents a notification.
      */
-    JsonRpcProxyFactory.prototype.isNotification = function (p) {
+    isNotification(p) {
         return p.toString().startsWith("notify") || p.toString().startsWith("on");
-    };
-    return JsonRpcProxyFactory;
-}());
+    }
+}
 exports.JsonRpcProxyFactory = JsonRpcProxyFactory;
 //# sourceMappingURL=proxy-factory.js.map

package/lib/messaging/proxy-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxy-factory.js","sourceRoot":"","sources":["../../src/messaging/proxy-factory.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,iDAAkE;AAClE,uCAA+C;AAG/C,2CAAsC;AAiBtC;IACI,kCACa,IAAY,EACZ,aAAgE;QADhE,SAAI,GAAJ,IAAI,CAAQ;QACZ,kBAAa,GAAb,aAAa,CAAmD;IACzE,CAAC;IAEL,+CAAY,GAAZ,UAAa,UAA6B,EAAE,OAAgB;QACxD,IAAM,OAAO,GAAG,IAAI,mBAAmB,EAAK,CAAC;QAC7C,IAAM,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;QACpC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACpD,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IACL,+BAAC;AAAD,CAAC,AAZD,IAYC;AAZY,4DAAwB;AAcrC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH;IAQI;;;;;OAKG;IACH,6BAAmB,MAAY;QAAZ,WAAM,GAAN,MAAM,CAAM;QAZZ,+BAA0B,GAAG,IAAI,eAAO,EAAQ,CAAC;QACjD,gCAA2B,GAAG,IAAI,eAAO,EAAQ,CAAC;QAYjE,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAES,+CAAiB,GAA3B;QAAA,iBAUC;QATG,IAAI,CAAC,iBAAiB,GAAG,IAAI,OAAO,CAAC,UAAA,OAAO;YACxC,OAAA,KAAI,CAAC,wBAAwB,GAAG,OAAO;QAAvC,CAAuC,CAC1C,CAAC;QACF,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAA,UAAU;YAClC,UAAU,CAAC,OAAO,CAAC;gBACf,OAAA,KAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,SAAS,CAAC;YAAhD,CAAgD,CACnD,CAAC;YACF,KAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;;OAKG;IACH,oCAAM,GAAN,UAAO,UAA6B;QAApC,iBAMC;QALG,UAAU,CAAC,SAAS,CAAC,UAAC,MAAc;YAAE,gBAAgB;iBAAhB,UAAgB,EAAhB,qBAAgB,EAAhB,IAAgB;gBAAhB,+BAAgB;;YAAK,OAAA,KAAI,CAAC,SAAS,OAAd,KAAI,YAAW,MAAM,GAAK,MAAM;QAAhC,CAAiC,CAAC,CAAC;QAC9F,UAAU,CAAC,cAAc,CAAC,UAAC,MAAc;YAAE,gBAAgB;iBAAhB,UAAgB,EAAhB,qBAAgB,EAAhB,IAAgB;gBAAhB,+BAAgB;;YAAK,OAAA,KAAI,CAAC,cAAc,OAAnB,KAAI,YAAgB,MAAM,GAAK,MAAM;QAArC,CAAsC,CAAC,CAAC;QACxG,UAAU,CAAC,SAAS,CAAC,cAAM,OAAA,KAAI,CAAC,iBAAiB,EAAE,EAAxB,CAAwB,CAAC,CAAC;QACrD,UAAU,CAAC,MAAM,EAAE,CAAC;QACpB,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;;;;;;;OAWG;IACa,uCAAS,GAAzB,UAA0B,MAAc;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;;;;;;;;wBAEzC,qBAAM,CAAA,KAAA,IAAI,CAAC,MAAM,CAAA,CAAC,MAAM,CAAC,oBAAI,IAAI,IAAC;4BAAzC,sBAAO,SAAkC,EAAC;;;wBAE1C,IAAI,GAAC,YAAY,8BAAa,EAAE;4BAC5B,aAAG,CAAC,IAAI,CAAC,aAAW,MAAM,uBAAkB,GAAC,CAAC,IAAI,WAAK,GAAC,CAAC,OAAO,OAAG,EAAE,EAAE,MAAM,QAAA,EAAE,IAAI,MAAA,EAAE,CAAC,CAAC;yBAC1F;6BAAM;4BACH,aAAG,CAAC,KAAK,CAAC,aAAW,MAAM,uCAAoC,EAAE,GAAC,EAAE,EAAE,MAAM,QAAA,EAAE,IAAI,MAAA,EAAE,CAAC,CAAC;yBACzF;wBACD,MAAM,GAAC,CAAC;;;;;KAEf;IAED;;;;;OAKG;IACO,4CAAc,GAAxB,UAAyB,MAAc;;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;QACnD,CAAA,KAAA,IAAI,CAAC,MAAM,CAAA,CAAC,MAAM,CAAC,oBAAI,IAAI,GAAE;IACjC,CAAC;IAED;;;;;;OAMG;IACH,yCAAW,GAAX;QACI,IAAM,MAAM,GAAG,IAAI,KAAK,CAAI,IAAW,EAAE,IAAI,CAAC,CAAC;QAC/C,OAAO,MAAa,CAAC;IACzB,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,iCAAG,GAAH,UAAI,MAAS,EAAE,CAAc,EAAE,QAAa;QAA5C,iBA+BC;QA9BG,IAAI,CAAC,KAAK,WAAW,EAAE;YACnB,OAAO,UAAC,MAAW;gBACf,KAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACzB,CAAC,CAAC;SACL;QACD,IAAI,CAAC,KAAK,qBAAqB,EAAE;YAC7B,OAAO,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;SAChD;QACD,IAAI,CAAC,KAAK,sBAAsB,EAAE;YAC9B,OAAO,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC;SACjD;QACD,IAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACxC,OAAO;YAAC,cAAc;iBAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;gBAAd,yBAAc;;YAClB,OAAA,KAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAA,UAAU;gBAClC,OAAA,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;oBACxB,IAAI;wBACA,IAAI,QAAQ,EAAE;4BACV,UAAU,CAAC,gBAAgB,OAA3B,UAAU,YAAkB,CAAC,CAAC,QAAQ,EAAE,GAAK,IAAI,GAAE;4BACnD,OAAO,EAAE,CAAC;yBACb;6BAAM;4BACH,IAAM,aAAa,GAAG,UAAU,CAAC,WAAW,OAAtB,UAAU,YAAa,CAAC,CAAC,QAAQ,EAAE,GAAK,IAAI,EAAiB,CAAC;4BACpF,aAAa;iCACR,KAAK,CAAC,UAAC,GAAQ,IAAK,OAAA,MAAM,CAAC,GAAG,CAAC,EAAX,CAAW,CAAC;iCAChC,IAAI,CAAC,UAAC,MAAW,IAAK,OAAA,OAAO,CAAC,MAAM,CAAC,EAAf,CAAe,CAAC,CAAC;yBAC/C;qBACJ;oBAAC,OAAO,GAAG,EAAE;wBACV,MAAM,CAAC,GAAG,CAAC,CAAC;qBACf;gBACL,CAAC,CAAC;YAdF,CAcE,CACL;QAhBD,CAgBC,CAAC;IACV,CAAC;IAED;;;;;;;;OAQG;IACO,4CAAc,GAAxB,UAAyB,CAAc;QACnC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9E,CAAC;IACL,0BAAC;AAAD,CAAC,AA9JD,IA8JC;AA9JY,kDAAmB"}
+{"version":3,"file":"proxy-factory.js","sourceRoot":"","sources":["../../src/messaging/proxy-factory.ts"],"names":[],"mappings":"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"}