@dxos/websocket-rpc 0.1.29-next.0a9e245

package/LICENSE

@@ -0,0 +1,8 @@
+MIT License 
+Copyright (c) 2022 DXOS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/dist/lib/browser/index.mjs

@@ -0,0 +1,179 @@
+import "@dxos/node-std/globals"
+
+// packages/core/mesh/websocket-rpc/src/client.ts
+import WebSocket from "isomorphic-ws";
+import { Event, Trigger } from "@dxos/async";
+import { log, logInfo } from "@dxos/log";
+import { createProtoRpcPeer } from "@dxos/rpc";
+var __decorate = function(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var WebsocketRpcClient = class {
+  // prettier-ignore
+  constructor(_params) {
+    this._params = _params;
+    this._connectTrigger = new Trigger();
+    this.connected = new Event();
+    this.disconnected = new Event();
+    this.error = new Event();
+    this._rpc = createProtoRpcPeer({
+      requested: this._params.requested,
+      exposed: this._params.exposed,
+      handlers: this._params.handlers,
+      port: {
+        send: (msg) => {
+          this._socket.send(msg);
+        },
+        subscribe: (cb) => {
+          this._socket.onmessage = async (msg) => {
+            if (typeof Blob !== "undefined" && msg.data instanceof Blob) {
+              cb(Buffer.from(await msg.data.arrayBuffer()));
+            } else {
+              cb(msg.data);
+            }
+          };
+        }
+      }
+    });
+  }
+  get url() {
+    return this._params.url;
+  }
+  async open() {
+    this._socket = new WebSocket(this._params.url);
+    this._socket.onopen = async () => {
+      log("Socket open", {}, {
+        file: "client.ts",
+        line: 59,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      try {
+        await this._rpc.open();
+        log(`RPC open ${this._params.url}`, {}, {
+          file: "client.ts",
+          line: 62,
+          scope: this,
+          callSite: (f, a) => f(...a)
+        });
+        this.connected.emit();
+        this._connectTrigger.wake();
+      } catch (err) {
+        this.error.emit(err);
+      }
+    };
+    this._socket.onclose = async () => {
+      log(`Disconnected ${this._params.url}`, {}, {
+        file: "client.ts",
+        line: 71,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      this.disconnected.emit();
+      await this.close();
+    };
+    this._socket.onerror = (event) => {
+      var _a, _b;
+      log.error((_a = event.message) != null ? _a : "Socket error", {
+        url: this._params.url
+      }, {
+        file: "client.ts",
+        line: 77,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      const error = (_b = event.error) != null ? _b : new Error(event.message);
+      this.error.emit(error);
+      this._connectTrigger.throw(error);
+    };
+    await this._connectTrigger.wait();
+  }
+  async close() {
+    var _a, _b;
+    try {
+      await ((_a = this._rpc) == null ? void 0 : _a.close());
+    } catch (err) {
+      log.catch(err, {}, {
+        file: "client.ts",
+        line: 90,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+    }
+    (_b = this._socket) == null ? void 0 : _b.close();
+  }
+  get rpc() {
+    return this._rpc.rpc;
+  }
+};
+__decorate([
+  logInfo
+], WebsocketRpcClient.prototype, "url", null);
+
+// packages/core/mesh/websocket-rpc/src/server.ts
+import WebSocket2 from "isomorphic-ws";
+import { log as log2 } from "@dxos/log";
+import { createProtoRpcPeer as createProtoRpcPeer2 } from "@dxos/rpc";
+var WebsocketRpcServer = class {
+  constructor(_params) {
+    this._params = _params;
+  }
+  async open() {
+    this._server = new WebSocket2.Server({
+      ...this._params
+    });
+    this._server.on("connection", async (socket, request) => {
+      log2("connection", {
+        request
+      }, {
+        file: "server.ts",
+        line: 34,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      const info = {
+        request
+      };
+      const { onOpen, onClose, ...options } = await this._params.onConnection(info);
+      const rpc = createProtoRpcPeer2({
+        ...options,
+        port: {
+          send: (msg) => {
+            socket.send(msg);
+          },
+          subscribe: (cb) => {
+            socket.onmessage = async (msg) => {
+              if (typeof Blob !== "undefined" && msg.data instanceof Blob) {
+                cb(Buffer.from(await msg.data.arrayBuffer()));
+              } else {
+                cb(msg.data);
+              }
+            };
+          }
+        }
+      });
+      await rpc.open();
+      await (onOpen == null ? void 0 : onOpen(rpc));
+      socket.onclose = async () => {
+        await (onClose == null ? void 0 : onClose(rpc));
+        await rpc.close();
+      };
+    });
+  }
+  async close() {
+    var _a;
+    (_a = this._server) == null ? void 0 : _a.close();
+  }
+};
+export {
+  WebsocketRpcClient,
+  WebsocketRpcServer
+};
+//# sourceMappingURL=index.mjs.map

package/dist/lib/browser/index.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/client.ts", "../../../src/server.ts"],
+  "sourcesContent": ["//\n// Copyright 2022 DXOS.org\n//\n\nimport WebSocket from 'isomorphic-ws';\n\nimport { Event, Trigger } from '@dxos/async';\nimport { log, logInfo } from '@dxos/log';\nimport { createProtoRpcPeer, ProtoRpcPeer, ProtoRpcPeerOptions } from '@dxos/rpc';\n\nexport type WebsocketRpcClientParams<C, S> = {\n  url: string;\n} & Pick<ProtoRpcPeerOptions<C, S>, 'requested' | 'exposed' | 'handlers'>;\n\nexport class WebsocketRpcClient<C, S> {\n  private _socket?: WebSocket;\n  private _rpc?: ProtoRpcPeer<C>;\n  private readonly _connectTrigger = new Trigger();\n\n  readonly connected = new Event();\n  readonly disconnected = new Event();\n  readonly error = new Event<Error>();\n\n  // prettier-ignore\n  constructor(\n    private readonly _params: WebsocketRpcClientParams<C, S>\n  ) {\n\n    this._rpc = createProtoRpcPeer({\n      requested: this._params.requested,\n      exposed: this._params.exposed,\n      handlers: this._params.handlers,\n      port: {\n        send: (msg) => {\n          this._socket!.send(msg);\n        },\n        subscribe: (cb) => {\n          this._socket!.onmessage = async (msg: WebSocket.MessageEvent) => {\n            if (typeof Blob !== 'undefined' && msg.data instanceof Blob) {\n              cb(Buffer.from(await msg.data.arrayBuffer()));\n            } else {\n              cb(msg.data as any);\n            }\n          };\n        }\n      }\n    });\n  }\n\n  @logInfo\n  get url() {\n    return this._params.url;\n  }\n\n  async open() {\n    this._socket = new WebSocket(this._params.url);\n\n    this._socket.onopen = async () => {\n      log('Socket open');\n      try {\n        await this._rpc!.open();\n        log(`RPC open ${this._params.url}`);\n        this.connected.emit();\n        this._connectTrigger.wake();\n      } catch (err: any) {\n        this.error.emit(err);\n      }\n    };\n\n    this._socket.onclose = async () => {\n      log(`Disconnected ${this._params.url}`);\n      this.disconnected.emit();\n      await this.close();\n    };\n\n    this._socket.onerror = (event: WebSocket.ErrorEvent) => {\n      log.error(event.message ?? 'Socket error', { url: this._params.url });\n      const error = event.error ?? new Error(event.message);\n      this.error.emit(error);\n      this._connectTrigger.throw(error);\n    };\n\n    await this._connectTrigger.wait();\n  }\n\n  async close() {\n    try {\n      await this._rpc?.close();\n    } catch (err) {\n      log.catch(err);\n    }\n    this._socket?.close();\n  }\n\n  get rpc() {\n    return this._rpc!.rpc;\n  }\n}\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { IncomingMessage } from 'http';\nimport WebSocket from 'isomorphic-ws';\n\nimport { log } from '@dxos/log';\nimport { createProtoRpcPeer, ProtoRpcPeer, ProtoRpcPeerOptions } from '@dxos/rpc';\n\nexport type ConnectionInfo = {\n  request: IncomingMessage;\n};\n\nexport type ConnectionHandler<C, S> = {\n  onOpen?: (rpc: ProtoRpcPeer<C>) => Promise<void>;\n  onClose?: (rpc: ProtoRpcPeer<C>) => Promise<void>;\n} & Pick<ProtoRpcPeerOptions<C, S>, 'requested' | 'exposed' | 'handlers'>;\n\nexport type WebsocketRpcServerParams<C, S> = {\n  onConnection: (info: ConnectionInfo) => Promise<ConnectionHandler<C, S>>;\n} & WebSocket.ServerOptions;\n\nexport class WebsocketRpcServer<C, S> {\n  private _server?: WebSocket.Server;\n\n  constructor(private readonly _params: WebsocketRpcServerParams<C, S>) {}\n\n  async open() {\n    this._server = new WebSocket.Server({\n      ...this._params\n    });\n    this._server.on('connection', async (socket, request) => {\n      log('connection', { request });\n      const info: ConnectionInfo = {\n        request\n      };\n      const { onOpen, onClose, ...options } = await this._params.onConnection(info);\n      const rpc = createProtoRpcPeer<C, S>({\n        ...options,\n        port: {\n          send: (msg) => {\n            socket.send(msg);\n          },\n          subscribe: (cb) => {\n            socket.onmessage = async (msg: WebSocket.MessageEvent) => {\n              if (typeof Blob !== 'undefined' && msg.data instanceof Blob) {\n                cb(Buffer.from(await msg.data.arrayBuffer()));\n              } else {\n                cb(msg.data as any);\n              }\n            };\n          }\n        }\n      });\n      await rpc.open();\n      await onOpen?.(rpc);\n      socket.onclose = async () => {\n        await onClose?.(rpc);\n        await rpc.close();\n      };\n    });\n  }\n\n  async close() {\n    this._server?.close();\n  }\n}\n"],
+  "mappings": "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",
+  "names": ["WebSocket", "Event", "Trigger", "log", "logInfo", "createProtoRpcPeer", "WebsocketRpcClient", "constructor", "_params", "_connectTrigger", "connected", "disconnected", "error", "_rpc", "requested", "exposed", "handlers", "port", "send", "msg", "_socket", "subscribe", "cb", "onmessage", "Blob", "data", "Buffer", "from", "arrayBuffer", "url", "open", "onopen", "emit", "wake", "err", "onclose", "close", "onerror", "event", "message", "Error", "throw", "wait", "catch", "rpc", "WebSocket", "log", "createProtoRpcPeer", "WebsocketRpcServer", "constructor", "_params", "open", "_server", "Server", "on", "socket", "request", "info", "onOpen", "onClose", "options", "onConnection", "rpc", "port", "send", "msg", "subscribe", "cb", "onmessage", "Blob", "data", "Buffer", "from", "arrayBuffer", "onclose", "close"]
+}

package/dist/lib/browser/meta.json

@@ -0,0 +1 @@
+{"inputs":{"packages/core/mesh/websocket-rpc/src/client.ts":{"bytes":10713,"imports":[{"path":"isomorphic-ws","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/rpc","kind":"import-statement","external":true}]},"packages/core/mesh/websocket-rpc/src/server.ts":{"bytes":6257,"imports":[{"path":"isomorphic-ws","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/rpc","kind":"import-statement","external":true}]},"packages/core/mesh/websocket-rpc/src/index.ts":{"bytes":456,"imports":[{"path":"packages/core/mesh/websocket-rpc/src/client.ts","kind":"import-statement","original":"./client"},{"path":"packages/core/mesh/websocket-rpc/src/server.ts","kind":"import-statement","original":"./server"}]}},"outputs":{"packages/core/mesh/websocket-rpc/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":8103},"packages/core/mesh/websocket-rpc/dist/lib/browser/index.mjs":{"imports":[{"path":"isomorphic-ws","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/rpc","kind":"import-statement","external":true},{"path":"isomorphic-ws","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/rpc","kind":"import-statement","external":true}],"exports":["WebsocketRpcClient","WebsocketRpcServer"],"entryPoint":"packages/core/mesh/websocket-rpc/src/index.ts","inputs":{"packages/core/mesh/websocket-rpc/src/client.ts":{"bytesInOutput":3391},"packages/core/mesh/websocket-rpc/src/index.ts":{"bytesInOutput":0},"packages/core/mesh/websocket-rpc/src/server.ts":{"bytesInOutput":1484}},"bytes":5099}}}

package/dist/lib/node/index.cjs

@@ -0,0 +1,215 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// packages/core/mesh/websocket-rpc/src/index.ts
+var src_exports = {};
+__export(src_exports, {
+  WebsocketRpcClient: () => WebsocketRpcClient,
+  WebsocketRpcServer: () => WebsocketRpcServer
+});
+module.exports = __toCommonJS(src_exports);
+
+// packages/core/mesh/websocket-rpc/src/client.ts
+var import_isomorphic_ws = __toESM(require("isomorphic-ws"));
+var import_async = require("@dxos/async");
+var import_log = require("@dxos/log");
+var import_rpc = require("@dxos/rpc");
+var __decorate = function(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var WebsocketRpcClient = class {
+  // prettier-ignore
+  constructor(_params) {
+    this._params = _params;
+    this._connectTrigger = new import_async.Trigger();
+    this.connected = new import_async.Event();
+    this.disconnected = new import_async.Event();
+    this.error = new import_async.Event();
+    this._rpc = (0, import_rpc.createProtoRpcPeer)({
+      requested: this._params.requested,
+      exposed: this._params.exposed,
+      handlers: this._params.handlers,
+      port: {
+        send: (msg) => {
+          this._socket.send(msg);
+        },
+        subscribe: (cb) => {
+          this._socket.onmessage = async (msg) => {
+            if (typeof Blob !== "undefined" && msg.data instanceof Blob) {
+              cb(Buffer.from(await msg.data.arrayBuffer()));
+            } else {
+              cb(msg.data);
+            }
+          };
+        }
+      }
+    });
+  }
+  get url() {
+    return this._params.url;
+  }
+  async open() {
+    this._socket = new import_isomorphic_ws.default(this._params.url);
+    this._socket.onopen = async () => {
+      (0, import_log.log)("Socket open", {}, {
+        file: "client.ts",
+        line: 59,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      try {
+        await this._rpc.open();
+        (0, import_log.log)(`RPC open ${this._params.url}`, {}, {
+          file: "client.ts",
+          line: 62,
+          scope: this,
+          callSite: (f, a) => f(...a)
+        });
+        this.connected.emit();
+        this._connectTrigger.wake();
+      } catch (err) {
+        this.error.emit(err);
+      }
+    };
+    this._socket.onclose = async () => {
+      (0, import_log.log)(`Disconnected ${this._params.url}`, {}, {
+        file: "client.ts",
+        line: 71,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      this.disconnected.emit();
+      await this.close();
+    };
+    this._socket.onerror = (event) => {
+      var _a, _b;
+      import_log.log.error((_a = event.message) != null ? _a : "Socket error", {
+        url: this._params.url
+      }, {
+        file: "client.ts",
+        line: 77,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      const error = (_b = event.error) != null ? _b : new Error(event.message);
+      this.error.emit(error);
+      this._connectTrigger.throw(error);
+    };
+    await this._connectTrigger.wait();
+  }
+  async close() {
+    var _a, _b;
+    try {
+      await ((_a = this._rpc) == null ? void 0 : _a.close());
+    } catch (err) {
+      import_log.log.catch(err, {}, {
+        file: "client.ts",
+        line: 90,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+    }
+    (_b = this._socket) == null ? void 0 : _b.close();
+  }
+  get rpc() {
+    return this._rpc.rpc;
+  }
+};
+__decorate([
+  import_log.logInfo
+], WebsocketRpcClient.prototype, "url", null);
+
+// packages/core/mesh/websocket-rpc/src/server.ts
+var import_isomorphic_ws2 = __toESM(require("isomorphic-ws"));
+var import_log2 = require("@dxos/log");
+var import_rpc2 = require("@dxos/rpc");
+var WebsocketRpcServer = class {
+  constructor(_params) {
+    this._params = _params;
+  }
+  async open() {
+    this._server = new import_isomorphic_ws2.default.Server({
+      ...this._params
+    });
+    this._server.on("connection", async (socket, request) => {
+      (0, import_log2.log)("connection", {
+        request
+      }, {
+        file: "server.ts",
+        line: 34,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      const info = {
+        request
+      };
+      const { onOpen, onClose, ...options } = await this._params.onConnection(info);
+      const rpc = (0, import_rpc2.createProtoRpcPeer)({
+        ...options,
+        port: {
+          send: (msg) => {
+            socket.send(msg);
+          },
+          subscribe: (cb) => {
+            socket.onmessage = async (msg) => {
+              if (typeof Blob !== "undefined" && msg.data instanceof Blob) {
+                cb(Buffer.from(await msg.data.arrayBuffer()));
+              } else {
+                cb(msg.data);
+              }
+            };
+          }
+        }
+      });
+      await rpc.open();
+      await (onOpen == null ? void 0 : onOpen(rpc));
+      socket.onclose = async () => {
+        await (onClose == null ? void 0 : onClose(rpc));
+        await rpc.close();
+      };
+    });
+  }
+  async close() {
+    var _a;
+    (_a = this._server) == null ? void 0 : _a.close();
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  WebsocketRpcClient,
+  WebsocketRpcServer
+});
+//# sourceMappingURL=index.cjs.map

package/dist/lib/node/index.cjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/index.ts", "../../../src/client.ts", "../../../src/server.ts"],
+  "sourcesContent": ["//\n// Copyright 2022 DXOS.org\n//\n\nexport * from './client';\nexport * from './server';\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport WebSocket from 'isomorphic-ws';\n\nimport { Event, Trigger } from '@dxos/async';\nimport { log, logInfo } from '@dxos/log';\nimport { createProtoRpcPeer, ProtoRpcPeer, ProtoRpcPeerOptions } from '@dxos/rpc';\n\nexport type WebsocketRpcClientParams<C, S> = {\n  url: string;\n} & Pick<ProtoRpcPeerOptions<C, S>, 'requested' | 'exposed' | 'handlers'>;\n\nexport class WebsocketRpcClient<C, S> {\n  private _socket?: WebSocket;\n  private _rpc?: ProtoRpcPeer<C>;\n  private readonly _connectTrigger = new Trigger();\n\n  readonly connected = new Event();\n  readonly disconnected = new Event();\n  readonly error = new Event<Error>();\n\n  // prettier-ignore\n  constructor(\n    private readonly _params: WebsocketRpcClientParams<C, S>\n  ) {\n\n    this._rpc = createProtoRpcPeer({\n      requested: this._params.requested,\n      exposed: this._params.exposed,\n      handlers: this._params.handlers,\n      port: {\n        send: (msg) => {\n          this._socket!.send(msg);\n        },\n        subscribe: (cb) => {\n          this._socket!.onmessage = async (msg: WebSocket.MessageEvent) => {\n            if (typeof Blob !== 'undefined' && msg.data instanceof Blob) {\n              cb(Buffer.from(await msg.data.arrayBuffer()));\n            } else {\n              cb(msg.data as any);\n            }\n          };\n        }\n      }\n    });\n  }\n\n  @logInfo\n  get url() {\n    return this._params.url;\n  }\n\n  async open() {\n    this._socket = new WebSocket(this._params.url);\n\n    this._socket.onopen = async () => {\n      log('Socket open');\n      try {\n        await this._rpc!.open();\n        log(`RPC open ${this._params.url}`);\n        this.connected.emit();\n        this._connectTrigger.wake();\n      } catch (err: any) {\n        this.error.emit(err);\n      }\n    };\n\n    this._socket.onclose = async () => {\n      log(`Disconnected ${this._params.url}`);\n      this.disconnected.emit();\n      await this.close();\n    };\n\n    this._socket.onerror = (event: WebSocket.ErrorEvent) => {\n      log.error(event.message ?? 'Socket error', { url: this._params.url });\n      const error = event.error ?? new Error(event.message);\n      this.error.emit(error);\n      this._connectTrigger.throw(error);\n    };\n\n    await this._connectTrigger.wait();\n  }\n\n  async close() {\n    try {\n      await this._rpc?.close();\n    } catch (err) {\n      log.catch(err);\n    }\n    this._socket?.close();\n  }\n\n  get rpc() {\n    return this._rpc!.rpc;\n  }\n}\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { IncomingMessage } from 'http';\nimport WebSocket from 'isomorphic-ws';\n\nimport { log } from '@dxos/log';\nimport { createProtoRpcPeer, ProtoRpcPeer, ProtoRpcPeerOptions } from '@dxos/rpc';\n\nexport type ConnectionInfo = {\n  request: IncomingMessage;\n};\n\nexport type ConnectionHandler<C, S> = {\n  onOpen?: (rpc: ProtoRpcPeer<C>) => Promise<void>;\n  onClose?: (rpc: ProtoRpcPeer<C>) => Promise<void>;\n} & Pick<ProtoRpcPeerOptions<C, S>, 'requested' | 'exposed' | 'handlers'>;\n\nexport type WebsocketRpcServerParams<C, S> = {\n  onConnection: (info: ConnectionInfo) => Promise<ConnectionHandler<C, S>>;\n} & WebSocket.ServerOptions;\n\nexport class WebsocketRpcServer<C, S> {\n  private _server?: WebSocket.Server;\n\n  constructor(private readonly _params: WebsocketRpcServerParams<C, S>) {}\n\n  async open() {\n    this._server = new WebSocket.Server({\n      ...this._params\n    });\n    this._server.on('connection', async (socket, request) => {\n      log('connection', { request });\n      const info: ConnectionInfo = {\n        request\n      };\n      const { onOpen, onClose, ...options } = await this._params.onConnection(info);\n      const rpc = createProtoRpcPeer<C, S>({\n        ...options,\n        port: {\n          send: (msg) => {\n            socket.send(msg);\n          },\n          subscribe: (cb) => {\n            socket.onmessage = async (msg: WebSocket.MessageEvent) => {\n              if (typeof Blob !== 'undefined' && msg.data instanceof Blob) {\n                cb(Buffer.from(await msg.data.arrayBuffer()));\n              } else {\n                cb(msg.data as any);\n              }\n            };\n          }\n        }\n      });\n      await rpc.open();\n      await onOpen?.(rpc);\n      socket.onclose = async () => {\n        await onClose?.(rpc);\n        await rpc.close();\n      };\n    });\n  }\n\n  async close() {\n    this._server?.close();\n  }\n}\n"],
+  "mappings": "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",
+  "names": ["WebsocketRpcClient", "constructor", "_params", "_connectTrigger", "Trigger", "connected", "Event", "disconnected", "error", "_rpc", "createProtoRpcPeer", "requested", "exposed", "handlers", "port", "send", "msg", "_socket", "subscribe", "cb", "onmessage", "Blob", "data", "Buffer", "from", "arrayBuffer", "url", "open", "WebSocket", "onopen", "log", "emit", "wake", "err", "onclose", "close", "onerror", "event", "message", "Error", "throw", "wait", "catch", "rpc", "logInfo", "import_isomorphic_ws", "import_log", "import_rpc", "WebsocketRpcServer", "constructor", "_params", "open", "_server", "WebSocket", "Server", "on", "socket", "request", "log", "info", "onOpen", "onClose", "options", "onConnection", "rpc", "createProtoRpcPeer", "port", "send", "msg", "subscribe", "cb", "onmessage", "Blob", "data", "Buffer", "from", "arrayBuffer", "onclose", "close"]
+}

package/dist/lib/node/meta.json

@@ -0,0 +1 @@
+{"inputs":{"packages/core/mesh/websocket-rpc/src/client.ts":{"bytes":10713,"imports":[{"path":"isomorphic-ws","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/rpc","kind":"import-statement","external":true}]},"packages/core/mesh/websocket-rpc/src/server.ts":{"bytes":6257,"imports":[{"path":"isomorphic-ws","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/rpc","kind":"import-statement","external":true}]},"packages/core/mesh/websocket-rpc/src/index.ts":{"bytes":456,"imports":[{"path":"packages/core/mesh/websocket-rpc/src/client.ts","kind":"import-statement","original":"./client"},{"path":"packages/core/mesh/websocket-rpc/src/server.ts","kind":"import-statement","original":"./server"}]}},"outputs":{"packages/core/mesh/websocket-rpc/dist/lib/node/index.cjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":8293},"packages/core/mesh/websocket-rpc/dist/lib/node/index.cjs":{"imports":[{"path":"isomorphic-ws","kind":"require-call","external":true},{"path":"@dxos/async","kind":"require-call","external":true},{"path":"@dxos/log","kind":"require-call","external":true},{"path":"@dxos/rpc","kind":"require-call","external":true},{"path":"isomorphic-ws","kind":"require-call","external":true},{"path":"@dxos/log","kind":"require-call","external":true},{"path":"@dxos/rpc","kind":"require-call","external":true}],"exports":[],"entryPoint":"packages/core/mesh/websocket-rpc/src/index.ts","inputs":{"packages/core/mesh/websocket-rpc/src/index.ts":{"bytesInOutput":189},"packages/core/mesh/websocket-rpc/src/client.ts":{"bytesInOutput":3567},"packages/core/mesh/websocket-rpc/src/server.ts":{"bytesInOutput":1526}},"bytes":6999}}}

package/dist/types/src/client.d.ts

@@ -0,0 +1,20 @@
+import { Event } from '@dxos/async';
+import { ProtoRpcPeerOptions } from '@dxos/rpc';
+export declare type WebsocketRpcClientParams<C, S> = {
+    url: string;
+} & Pick<ProtoRpcPeerOptions<C, S>, 'requested' | 'exposed' | 'handlers'>;
+export declare class WebsocketRpcClient<C, S> {
+    private readonly _params;
+    private _socket?;
+    private _rpc?;
+    private readonly _connectTrigger;
+    readonly connected: Event<void>;
+    readonly disconnected: Event<void>;
+    readonly error: Event<Error>;
+    constructor(_params: WebsocketRpcClientParams<C, S>);
+    get url(): string;
+    open(): Promise<void>;
+    close(): Promise<void>;
+    get rpc(): C;
+}
+//# sourceMappingURL=client.d.ts.map

package/dist/types/src/client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/client.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAW,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAoC,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAElF,oBAAY,wBAAwB,CAAC,CAAC,EAAE,CAAC,IAAI;IAC3C,GAAG,EAAE,MAAM,CAAC;CACb,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,WAAW,GAAG,SAAS,GAAG,UAAU,CAAC,CAAC;AAE1E,qBAAa,kBAAkB,CAAC,CAAC,EAAE,CAAC;IAWhC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAV1B,OAAO,CAAC,OAAO,CAAC,CAAY;IAC5B,OAAO,CAAC,IAAI,CAAC,CAAkB;IAC/B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,YAAY,cAAe;IACpC,QAAQ,CAAC,KAAK,eAAsB;gBAIjB,OAAO,EAAE,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC;IAwB1D,IACI,GAAG,WAEN;IAEK,IAAI;IA+BJ,KAAK;IASX,IAAI,GAAG,MAEN;CACF"}

package/dist/types/src/e2e.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=e2e.test.d.ts.map

package/dist/types/src/e2e.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"e2e.test.d.ts","sourceRoot":"","sources":["../../../src/e2e.test.ts"],"names":[],"mappings":""}

package/dist/types/src/index.d.ts

@@ -0,0 +1,3 @@
+export * from './client';
+export * from './server';
+//# sourceMappingURL=index.d.ts.map

package/dist/types/src/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC"}

package/dist/types/src/server.d.ts

@@ -0,0 +1,22 @@
+/// <reference types="node" />
+import { IncomingMessage } from 'http';
+import WebSocket from 'isomorphic-ws';
+import { ProtoRpcPeer, ProtoRpcPeerOptions } from '@dxos/rpc';
+export declare type ConnectionInfo = {
+    request: IncomingMessage;
+};
+export declare type ConnectionHandler<C, S> = {
+    onOpen?: (rpc: ProtoRpcPeer<C>) => Promise<void>;
+    onClose?: (rpc: ProtoRpcPeer<C>) => Promise<void>;
+} & Pick<ProtoRpcPeerOptions<C, S>, 'requested' | 'exposed' | 'handlers'>;
+export declare type WebsocketRpcServerParams<C, S> = {
+    onConnection: (info: ConnectionInfo) => Promise<ConnectionHandler<C, S>>;
+} & WebSocket.ServerOptions;
+export declare class WebsocketRpcServer<C, S> {
+    private readonly _params;
+    private _server?;
+    constructor(_params: WebsocketRpcServerParams<C, S>);
+    open(): Promise<void>;
+    close(): Promise<void>;
+}
+//# sourceMappingURL=server.d.ts.map

package/dist/types/src/server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/server.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,SAAS,MAAM,eAAe,CAAC;AAGtC,OAAO,EAAsB,YAAY,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAElF,oBAAY,cAAc,GAAG;IAC3B,OAAO,EAAE,eAAe,CAAC;CAC1B,CAAC;AAEF,oBAAY,iBAAiB,CAAC,CAAC,EAAE,CAAC,IAAI;IACpC,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACnD,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,WAAW,GAAG,SAAS,GAAG,UAAU,CAAC,CAAC;AAE1E,oBAAY,wBAAwB,CAAC,CAAC,EAAE,CAAC,IAAI;IAC3C,YAAY,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;CAC1E,GAAG,SAAS,CAAC,aAAa,CAAC;AAE5B,qBAAa,kBAAkB,CAAC,CAAC,EAAE,CAAC;IAGtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAFpC,OAAO,CAAC,OAAO,CAAC,CAAmB;gBAEN,OAAO,EAAE,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC;IAE9D,IAAI;IAoCJ,KAAK;CAGZ"}

package/package.json

@@ -0,0 +1,39 @@
+{
+  "name": "@dxos/websocket-rpc",
+  "version": "0.1.29-next.0a9e245",
+  "description": "websocket-rpc",
+  "homepage": "https://dxos.org",
+  "bugs": "https://github.com/dxos/dxos/issues",
+  "license": "MIT",
+  "author": "DXOS.org",
+  "main": "dist/lib/node/index.cjs",
+  "browser": {
+    "./dist/lib/node/index.cjs": "./dist/lib/browser/index.mjs"
+  },
+  "types": "dist/types/src/index.d.ts",
+  "files": [
+    "dist",
+    "src",
+    "README.md"
+  ],
+  "dependencies": {
+    "isomorphic-ws": "^4.0.1",
+    "ws": "^7.4.4",
+    "@dxos/async": "0.1.29-next.0a9e245",
+    "@dxos/codec-protobuf": "0.1.29-next.0a9e245",
+    "@dxos/context": "0.1.29-next.0a9e245",
+    "@dxos/keys": "0.1.29-next.0a9e245",
+    "@dxos/log": "0.1.29-next.0a9e245",
+    "@dxos/node-std": "0.1.29-next.0a9e245",
+    "@dxos/protocols": "0.1.29-next.0a9e245",
+    "@dxos/rpc": "0.1.29-next.0a9e245",
+    "@dxos/util": "0.1.29-next.0a9e245"
+  },
+  "devDependencies": {
+    "@types/node": "^18.11.9",
+    "typescript": "^4.8.4"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}

package/src/client.ts

@@ -0,0 +1,98 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+import WebSocket from 'isomorphic-ws';
+
+import { Event, Trigger } from '@dxos/async';
+import { log, logInfo } from '@dxos/log';
+import { createProtoRpcPeer, ProtoRpcPeer, ProtoRpcPeerOptions } from '@dxos/rpc';
+
+export type WebsocketRpcClientParams<C, S> = {
+  url: string;
+} & Pick<ProtoRpcPeerOptions<C, S>, 'requested' | 'exposed' | 'handlers'>;
+
+export class WebsocketRpcClient<C, S> {
+  private _socket?: WebSocket;
+  private _rpc?: ProtoRpcPeer<C>;
+  private readonly _connectTrigger = new Trigger();
+
+  readonly connected = new Event();
+  readonly disconnected = new Event();
+  readonly error = new Event<Error>();
+
+  // prettier-ignore
+  constructor(
+    private readonly _params: WebsocketRpcClientParams<C, S>
+  ) {
+
+    this._rpc = createProtoRpcPeer({
+      requested: this._params.requested,
+      exposed: this._params.exposed,
+      handlers: this._params.handlers,
+      port: {
+        send: (msg) => {
+          this._socket!.send(msg);
+        },
+        subscribe: (cb) => {
+          this._socket!.onmessage = async (msg: WebSocket.MessageEvent) => {
+            if (typeof Blob !== 'undefined' && msg.data instanceof Blob) {
+              cb(Buffer.from(await msg.data.arrayBuffer()));
+            } else {
+              cb(msg.data as any);
+            }
+          };
+        }
+      }
+    });
+  }
+
+  @logInfo
+  get url() {
+    return this._params.url;
+  }
+
+  async open() {
+    this._socket = new WebSocket(this._params.url);
+
+    this._socket.onopen = async () => {
+      log('Socket open');
+      try {
+        await this._rpc!.open();
+        log(`RPC open ${this._params.url}`);
+        this.connected.emit();
+        this._connectTrigger.wake();
+      } catch (err: any) {
+        this.error.emit(err);
+      }
+    };
+
+    this._socket.onclose = async () => {
+      log(`Disconnected ${this._params.url}`);
+      this.disconnected.emit();
+      await this.close();
+    };
+
+    this._socket.onerror = (event: WebSocket.ErrorEvent) => {
+      log.error(event.message ?? 'Socket error', { url: this._params.url });
+      const error = event.error ?? new Error(event.message);
+      this.error.emit(error);
+      this._connectTrigger.throw(error);
+    };
+
+    await this._connectTrigger.wait();
+  }
+
+  async close() {
+    try {
+      await this._rpc?.close();
+    } catch (err) {
+      log.catch(err);
+    }
+    this._socket?.close();
+  }
+
+  get rpc() {
+    return this._rpc!.rpc;
+  }
+}

package/src/e2e.test.ts

@@ -0,0 +1,55 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { expect } from 'chai';
+
+import { schema } from '@dxos/protocols';
+import { createServiceBundle, ServiceTypesOf } from '@dxos/rpc';
+import { afterTest, describe, test } from '@dxos/test';
+
+import { WebsocketRpcClient } from './client';
+import { WebsocketRpcServer } from './server';
+
+const services = createServiceBundle({
+  TestService: schema.getService('example.testing.rpc.TestService')
+});
+
+describe('e2e', () => {
+  test('roundtrip', async () => {
+    const server = new WebsocketRpcServer<{}, ServiceTypesOf<typeof services>>({
+      port: 12342,
+      onConnection: async () => {
+        return {
+          exposed: services,
+          requested: {},
+          handlers: {
+            TestService: {
+              testCall: async (request) => {
+                return {
+                  data: request.data
+                };
+              },
+              voidCall: async () => {}
+            }
+          }
+        };
+      }
+    });
+
+    const client = new WebsocketRpcClient<ServiceTypesOf<typeof services>, {}>({
+      url: 'ws://localhost:12342',
+      requested: services,
+      exposed: {},
+      handlers: {}
+    });
+
+    await server.open();
+    afterTest(() => server.close());
+    await client.open();
+    afterTest(() => client.close());
+
+    const response = await client.rpc.TestService.testCall({ data: 'hello' });
+    expect(response.data).to.equal('hello');
+  });
+});

package/src/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+export * from './client';
+export * from './server';

package/src/server.ts

@@ -0,0 +1,68 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { IncomingMessage } from 'http';
+import WebSocket from 'isomorphic-ws';
+
+import { log } from '@dxos/log';
+import { createProtoRpcPeer, ProtoRpcPeer, ProtoRpcPeerOptions } from '@dxos/rpc';
+
+export type ConnectionInfo = {
+  request: IncomingMessage;
+};
+
+export type ConnectionHandler<C, S> = {
+  onOpen?: (rpc: ProtoRpcPeer<C>) => Promise<void>;
+  onClose?: (rpc: ProtoRpcPeer<C>) => Promise<void>;
+} & Pick<ProtoRpcPeerOptions<C, S>, 'requested' | 'exposed' | 'handlers'>;
+
+export type WebsocketRpcServerParams<C, S> = {
+  onConnection: (info: ConnectionInfo) => Promise<ConnectionHandler<C, S>>;
+} & WebSocket.ServerOptions;
+
+export class WebsocketRpcServer<C, S> {
+  private _server?: WebSocket.Server;
+
+  constructor(private readonly _params: WebsocketRpcServerParams<C, S>) {}
+
+  async open() {
+    this._server = new WebSocket.Server({
+      ...this._params
+    });
+    this._server.on('connection', async (socket, request) => {
+      log('connection', { request });
+      const info: ConnectionInfo = {
+        request
+      };
+      const { onOpen, onClose, ...options } = await this._params.onConnection(info);
+      const rpc = createProtoRpcPeer<C, S>({
+        ...options,
+        port: {
+          send: (msg) => {
+            socket.send(msg);
+          },
+          subscribe: (cb) => {
+            socket.onmessage = async (msg: WebSocket.MessageEvent) => {
+              if (typeof Blob !== 'undefined' && msg.data instanceof Blob) {
+                cb(Buffer.from(await msg.data.arrayBuffer()));
+              } else {
+                cb(msg.data as any);
+              }
+            };
+          }
+        }
+      });
+      await rpc.open();
+      await onOpen?.(rpc);
+      socket.onclose = async () => {
+        await onClose?.(rpc);
+        await rpc.close();
+      };
+    });
+  }
+
+  async close() {
+    this._server?.close();
+  }
+}