@gitpod/gitpod-protocol 0.1.5-sh-ace-test.0 → 0.1.5-siddhant-k-code-allow-github-prebuilds-10358.2

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,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,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;AAEH,yBAAiB,UAAU,CAAC;IAEjB,MAAM,WAAW,MAAM,CAAC;IAGxB,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,kBAAkB,MAAM,CAAC;IAG/B,MAAM,iBAAiB,MAAM,CAAC;IAG9B,MAAM,0BAA0B,MAAM,CAAC;IAGvC,MAAM,gBAAgB,MAAM,CAAC;IAG7B,MAAM,aAAa,MAAM,CAAC;IAG1B,MAAM,8BAA8B,MAAM,CAAC;IAG3C,MAAM,kBAAkB,MAAM,CAAC;IAG/B,MAAM,mBAAmB,MAAM,CAAC;IAGhC,MAAM,mBAAmB,MAAM,CAAC;IAGhC,MAAM,kBAAkB,MAAM,CAAC;IAG/B,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,qBAAqB,MAAM,CAAC;IAGlC,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;IAG3B,MAAM,8BAA8B,MAAM,CAAC;IAG3C,MAAM,aAAa,MAAM,CAAC;CACpC"}

package/lib/messaging/error.js

@@ -1,12 +1,15 @@
 "use strict";
 /**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Copyright (c) 2020 Gitpod GmbH. All rights reserved.
  * Licensed under the GNU Affero General Public License (AGPL).
- * See License-AGPL.txt in the project root for license information.
+ * See License.AGPL.txt in the project root for license information.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ErrorCodes = void 0;
 var ErrorCodes;
 (function (ErrorCodes) {
+    // 400 Unauthorized
+    ErrorCodes.BAD_REQUEST = 400;
     // 401 Unauthorized
     ErrorCodes.NOT_AUTHENTICATED = 401;
     // 402 Payment Required
@@ -19,16 +22,32 @@ var ErrorCodes;
     ErrorCodes.CONFLICT = 409;
     // 410 No User
     ErrorCodes.SETUP_REQUIRED = 410;
+    // 411 No User
+    ErrorCodes.NEEDS_VERIFICATION = 411;
+    // 429 Too Many Requests
+    ErrorCodes.TOO_MANY_REQUESTS = 429;
     // 430 Repository not whitelisted (custom status code)
     ErrorCodes.REPOSITORY_NOT_WHITELISTED = 430;
-    // 460 Context Parse Error (custom status code)
-    ErrorCodes.CONTEXT_PARSE_ERROR = 460;
+    // 440 Prebuilds now always require a project (custom status code)
+    ErrorCodes.PROJECT_REQUIRED = 440;
     // 450 Payment error
     ErrorCodes.PAYMENT_ERROR = 450;
+    // 451 Out of credits
+    ErrorCodes.PAYMENT_SPENDING_LIMIT_REACHED = 451;
+    // 451 Error creating a subscription
+    ErrorCodes.SUBSCRIPTION_ERROR = 452;
+    // 455 Invalid cost center (custom status code)
+    ErrorCodes.INVALID_COST_CENTER = 455;
+    // 460 Context Parse Error (custom status code)
+    ErrorCodes.CONTEXT_PARSE_ERROR = 460;
+    // 461 Invalid gitpod yml (custom status code)
+    ErrorCodes.INVALID_GITPOD_YML = 461;
     // 470 User Blocked (custom status code)
     ErrorCodes.USER_BLOCKED = 470;
-    // 471 User Blocked (custom status code)
+    // 471 User Deleted (custom status code)
     ErrorCodes.USER_DELETED = 471;
+    // 472 Terms Acceptance Required (custom status code)
+    ErrorCodes.USER_TERMS_ACCEPTANCE_REQUIRED = 472;
     // 480 Plan does not allow private repos
     ErrorCodes.PLAN_DOES_NOT_ALLOW_PRIVATE_REPOS = 480;
     // 481 Professional plan is required for this operation
@@ -37,15 +56,23 @@ var ErrorCodes;
     ErrorCodes.PLAN_ONLY_ALLOWED_FOR_STUDENTS = 485;
     // 490 Too Many Running Workspace
     ErrorCodes.TOO_MANY_RUNNING_WORKSPACES = 490;
+    // 500 Internal Server Error
+    ErrorCodes.INTERNAL_SERVER_ERROR = 500;
     // 501 EE Feature
     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;
+    // 640 Headless logs are not available (yet)
+    ErrorCodes.HEADLESS_LOG_NOT_YET_AVAILABLE = 640;
+    // 650 Invalid Value
+    ErrorCodes.INVALID_VALUE = 650;
 })(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,CA4D1B;AA5DD,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,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,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,EA5DgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QA4D1B"}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/messaging/error.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,IAAiB,UAAU,CAmG1B;AAnGD,WAAiB,UAAU;IACvB,mBAAmB;IACN,sBAAW,GAAG,GAAG,CAAC;IAE/B,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,cAAc;IACD,6BAAkB,GAAG,GAAG,CAAC;IAEtC,wBAAwB;IACX,4BAAiB,GAAG,GAAG,CAAC;IAErC,sDAAsD;IACzC,qCAA0B,GAAG,GAAG,CAAC;IAE9C,kEAAkE;IACrD,2BAAgB,GAAG,GAAG,CAAC;IAEpC,oBAAoB;IACP,wBAAa,GAAG,GAAG,CAAC;IAEjC,qBAAqB;IACR,yCAA8B,GAAG,GAAG,CAAC;IAElD,oCAAoC;IACvB,6BAAkB,GAAG,GAAG,CAAC;IAEtC,+CAA+C;IAClC,8BAAmB,GAAG,GAAG,CAAC;IAEvC,+CAA+C;IAClC,8BAAmB,GAAG,GAAG,CAAC;IAEvC,8CAA8C;IACjC,6BAAkB,GAAG,GAAG,CAAC;IAEtC,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,4BAA4B;IACf,gCAAqB,GAAG,GAAG,CAAC;IAEzC,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;IAElC,4CAA4C;IAC/B,yCAA8B,GAAG,GAAG,CAAC;IAElD,oBAAoB;IACP,wBAAa,GAAG,GAAG,CAAC;AACrC,CAAC,EAnGgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAmG1B"}

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;IACH,mBAAmB,IAAI,IAAI,CAAC;IAE5B;;OAEG;IACH,kBAAkB,IAAI,IAAI,CAAC;CAC9B"}

package/lib/messaging/handler.js

@@ -6,5 +6,6 @@
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectionHandler = Symbol('ConnectionHandler');
+exports.ConnectionHandler = void 0;
+exports.ConnectionHandler = Symbol("ConnectionHandler");
 //# sourceMappingURL=handler.js.map

package/lib/messaging/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/messaging/handler.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAIU,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC"}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/messaging/handler.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIU,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC"}

package/lib/messaging/node/connection.d.ts

@@ -1,20 +1,4 @@
-/// <reference types="node" />
 import * as ws from "ws";
-import * as http from "http";
-import * as https from "https";
-import * as net from "net";
-import { MessageConnection } from "vscode-jsonrpc";
 import { IWebSocket } from "vscode-ws-jsonrpc";
-export interface IServerOptions {
-    readonly server: http.Server | https.Server;
-    readonly path?: string;
-    matches?(request: http.IncomingMessage): boolean;
-}
-export declare function createServerWebSocketConnection(options: IServerOptions, onConnect: (connection: MessageConnection) => void): void;
-export declare function openJsonRpcSocket(options: IServerOptions, onOpen: (socket: IWebSocket) => void): void;
-export interface OnOpen {
-    (webSocket: ws, request: http.IncomingMessage, socket: net.Socket, head: Buffer): void;
-}
-export declare function openSocket(options: IServerOptions, onOpen: OnOpen): void;
-export declare function toIWebSocket(webSocket: ws): IWebSocket;
+export declare function toIWebSocket(ws: ws): IWebSocket;
 //# sourceMappingURL=connection.d.ts.map

package/lib/messaging/node/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../src/messaging/node/connection.ts"],"names":[],"mappings":";AAOA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAA6B,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAG1E,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC;CACpD;AAED,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,KAAK,IAAI,GAAG,IAAI,CAIjI;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAKrG;AAED,MAAM,WAAW,MAAM;IACnB,CAAC,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1F;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAoBxE;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,EAAE,cAyBzC"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../src/messaging/node/connection.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,wBAAgB,YAAY,CAAC,EAAE,EAAE,EAAE,cA6BlC"}

package/lib/messaging/node/connection.js

@@ -6,70 +6,35 @@
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-var ws = require("ws");
-var url = require("url");
-var vscode_ws_jsonrpc_1 = require("vscode-ws-jsonrpc");
-var logging_1 = require("../../util/logging");
-function createServerWebSocketConnection(options, onConnect) {
-    openJsonRpcSocket(options, function (socket) {
-        onConnect(vscode_ws_jsonrpc_1.createWebSocketConnection(socket, console));
-    });
-}
-exports.createServerWebSocketConnection = createServerWebSocketConnection;
-function openJsonRpcSocket(options, onOpen) {
-    openSocket(options, function (socket) {
-        var webSocket = toIWebSocket(socket);
-        onOpen(webSocket);
-    });
-}
-exports.openJsonRpcSocket = openJsonRpcSocket;
-function openSocket(options, onOpen) {
-    var 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;
-        if (options.path && pathname === options.path || options.matches && options.matches(request)) {
-            wss.handleUpgrade(request, socket, head, function (webSocket) {
-                if (webSocket.readyState === webSocket.OPEN) {
-                    onOpen(webSocket, request, socket, head);
-                }
-                else {
-                    webSocket.on('open', function () { return onOpen(webSocket, request, socket, head); });
-                }
-            });
-        }
-    });
-}
-exports.openSocket = openSocket;
-function toIWebSocket(webSocket) {
-    var sendsAfterOpen = 0;
+exports.toIWebSocket = void 0;
+function toIWebSocket(ws) {
     return {
-        send: function (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 });
-                }
+        send: (content) => {
+            if (ws.readyState >= ws.CLOSING) {
+                // ws is already CLOSING/CLOSED, send() would just return an error.
                 return;
             }
-            webSocket.send(content, function (err) {
-                if (err) {
-                    logging_1.log.error('Error in ws.send()', err, { ws: ws });
-                }
-            });
+            // in general send-errors should trigger an 'error' event already, we just make sure it actually happens.
+            try {
+                ws.send(content, (err) => {
+                    if (!err) {
+                        return;
+                    }
+                    ws.emit("error", err);
+                });
+            }
+            catch (err) {
+                ws.emit("error", err);
+            }
         },
-        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 () {
-            if (webSocket.readyState < ws.CLOSING) {
-                webSocket.close();
+        onMessage: (cb) => ws.on("message", cb),
+        onError: (cb) => ws.on("error", cb),
+        onClose: (cb) => ws.on("close", cb),
+        dispose: () => {
+            if (ws.readyState < ws.CLOSING) {
+                ws.close();
             }
-        }
+        },
     };
 }
 exports.toIWebSocket = toIWebSocket;

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":";AAAA;;;;;GAKG;;;AAKH,SAAgB,YAAY,CAAC,EAAM;IAC/B,OAAmB;QACf,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE;YACd,IAAI,EAAE,CAAC,UAAU,IAAI,EAAE,CAAC,OAAO,EAAE;gBAC7B,mEAAmE;gBACnE,OAAO;aACV;YAED,yGAAyG;YACzG,IAAI;gBACA,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;oBACrB,IAAI,CAAC,GAAG,EAAE;wBACN,OAAO;qBACV;oBACD,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;gBAC1B,CAAC,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;aACzB;QACL,CAAC;QACD,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC;QACvC,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC;QACnC,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC;QACnC,OAAO,EAAE,GAAG,EAAE;YACV,IAAI,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,OAAO,EAAE;gBAC5B,EAAE,CAAC,KAAK,EAAE,CAAC;aACd;QACL,CAAC;KACJ,CAAC;AACN,CAAC;AA7BD,oCA6BC"}

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

@@ -1,7 +1,7 @@
 import { MessageConnection } from "vscode-jsonrpc";
 import { Event, Emitter } from "../util/event";
 import { Disposable } from "../util/disposable";
-import { ConnectionHandler } from './handler';
+import { ConnectionHandler } from "./handler";
 export declare type JsonRpcServer<Client> = Disposable & {
     /**
      * If this server is a proxy to a remote server then
@@ -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;IACpE,QAAQ,CAAC,IAAI,EAAE,MAAM;IAAE,QAAQ,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,GAAG;gBAAvF,IAAI,EAAE,MAAM,EAAW,aAAa,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,GAAG;IAE5G,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;IAatD,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;IAQnC,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;IAgClD;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,CAAC,EAAE,WAAW,GAAG,OAAO;CAGpD"}

package/lib/messaging/proxy-factory.js

@@ -14,70 +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 });
-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) {
+exports.JsonRpcProxyFactory = exports.JsonRpcConnectionHandler = void 0;
+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.
@@ -121,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.
      *
@@ -184,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
@@ -233,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.
      *
@@ -259,46 +185,35 @@ 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;
-        if (p === 'setClient') {
-            return function (client) {
-                _this.target = client;
+    get(target, p, receiver) {
+        if (p === "setClient") {
+            return (client) => {
+                this.target = client;
             };
         }
-        if (p === 'onDidOpenConnection') {
+        if (p === "onDidOpenConnection") {
             return this.onDidOpenConnectionEmitter.event;
         }
-        if (p === 'onDidCloseConnection') {
+        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.
      *
@@ -308,10 +223,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