@automerge/automerge-repo-network-websocket 2.0.0-alpha.20 → 2.0.0-alpha.23

package/dist/{BrowserWebSocketClientAdapter.d.ts → WebSocketClientAdapter.d.ts}

@@ -4,7 +4,7 @@ import { FromClientMessage } from "./messages.js";
 declare abstract class WebSocketNetworkAdapter extends NetworkAdapter {
     socket?: WebSocket;
 }
-export declare class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
+export declare class WebSocketClientAdapter extends WebSocketNetworkAdapter {
     #private;
     readonly url: string;
     readonly retryInterval: number;
@@ -25,4 +25,4 @@ export declare class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapt
     receiveMessage(messageBytes: Uint8Array): void;
 }
 export {};
-//# sourceMappingURL=BrowserWebSocketClientAdapter.d.ts.map
+//# sourceMappingURL=WebSocketClientAdapter.d.ts.map

package/dist/WebSocketClientAdapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WebSocketClientAdapter.d.ts","sourceRoot":"","sources":["../src/WebSocketClientAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,MAAM,EACN,YAAY,EAEb,MAAM,gCAAgC,CAAA;AACvC,OAAO,SAAS,MAAM,eAAe,CAAA;AAIrC,OAAO,EACL,iBAAiB,EAKlB,MAAM,eAAe,CAAA;AAKtB,uBAAe,uBAAwB,SAAQ,cAAc;IAC3D,MAAM,CAAC,EAAE,SAAS,CAAA;CACnB;AAED,qBAAa,sBAAuB,SAAQ,uBAAuB;;aA4B/C,GAAG,EAAE,MAAM;aACX,aAAa;IAtB/B,OAAO;IAIP,SAAS;IAcT,YAAY,CAAC,EAAE,MAAM,CAAA;gBAGH,GAAG,EAAE,MAAM,EACX,aAAa,SAAO;IAMtC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY;IAqCnD,MAAM,aAKL;IAGD,OAAO,aAWN;IAED,SAAS,UAAW,SAAS,CAAC,YAAY,UAEzC;IAED,mFAAmF;IACnF,OAAO,UAED,KAAK,GACL,SAAS,CAAC,UAAU,UAezB;IAED,IAAI;IAUJ,UAAU;IAiBV,IAAI,CAAC,OAAO,EAAE,iBAAiB;IAe/B,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;IAU9D,cAAc,CAAC,YAAY,EAAE,UAAU;CAiBxC"}

package/dist/{BrowserWebSocketClientAdapter.js → WebSocketClientAdapter.js}

@@ -8,7 +8,7 @@ import { toArrayBuffer } from "./toArrayBuffer.js";
 class WebSocketNetworkAdapter extends NetworkAdapter {
     socket;
 }
-export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
+export class WebSocketClientAdapter extends WebSocketNetworkAdapter {
     url;
     retryInterval;
     #ready = false;

package/dist/{NodeWSServerAdapter.d.ts → WebSocketServerAdapter.d.ts}

@@ -2,7 +2,7 @@ import WebSocket from "isomorphic-ws";
 import { type WebSocketServer } from "isomorphic-ws";
 import { NetworkAdapter, type PeerMetadata, type PeerId } from "@automerge/automerge-repo/slim";
 import { FromServerMessage } from "./messages.js";
-export declare class NodeWSServerAdapter extends NetworkAdapter {
+export declare class WebSocketServerAdapter extends NetworkAdapter {
     #private;
     private server;
     private keepAliveInterval;
@@ -17,4 +17,4 @@ export declare class NodeWSServerAdapter extends NetworkAdapter {
     send(message: FromServerMessage): void;
     receiveMessage(messageBytes: Uint8Array, socket: WebSocket): void;
 }
-//# sourceMappingURL=NodeWSServerAdapter.d.ts.map
+//# sourceMappingURL=WebSocketServerAdapter.d.ts.map

package/dist/WebSocketServerAdapter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WebSocketServerAdapter.d.ts","sourceRoot":"","sources":["../src/WebSocketServerAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAA;AAKpD,OAAO,EAEL,cAAc,EACd,KAAK,YAAY,EACjB,KAAK,MAAM,EACZ,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAEL,iBAAiB,EAElB,MAAM,eAAe,CAAA;AAOtB,qBAAa,sBAAuB,SAAQ,cAAc;;IAyBtD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,iBAAiB;IAzB3B,OAAO,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAK;IAQ7C,OAAO;IAIP,SAAS;gBAYC,MAAM,EAAE,eAAe,EACvB,iBAAiB,SAAO;IAKlC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY;IAyCnD,UAAU;IAQV,IAAI,CAAC,OAAO,EAAE,iBAAiB;IAqB/B,cAAc,CAAC,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS;CA2E3D"}

package/dist/{NodeWSServerAdapter.js → WebSocketServerAdapter.js}

@@ -7,7 +7,7 @@ import { ProtocolV1 } from "./protocolVersion.js";
 import { assert } from "./assert.js";
 import { toArrayBuffer } from "./toArrayBuffer.js";
 const { encode, decode } = cborHelpers;
-export class NodeWSServerAdapter extends NetworkAdapter {
+export class WebSocketServerAdapter extends NetworkAdapter {
     server;
     keepAliveInterval;
     sockets = {};

package/dist/index.d.ts

@@ -2,9 +2,9 @@
  * A `NetworkAdapter` which connects to a remote host via WebSockets
  *
  * The websocket protocol requires a server to be listening and a client to
- * connect to the server. To that end the {@link NodeWSServerAdapter} does not
+ * connect to the server. To that end the {@link WebSocketServerAdapter} does not
  * make outbound connections and instead listens on the provided socket for
- * new connections whilst the {@link BrowserWebSocketClientAdapter} makes an
+ * new connections whilst the {@link WebSocketClientAdapter} makes an
  * outbound connection to the provided socket.
  *
  * Note that the "browser" and "node" naming is a bit misleading, both
@@ -12,8 +12,12 @@
  *
  * @module
  * */
-export { BrowserWebSocketClientAdapter } from "./BrowserWebSocketClientAdapter.js";
-export { NodeWSServerAdapter } from "./NodeWSServerAdapter.js";
+export { WebSocketClientAdapter } from "./WebSocketClientAdapter.js";
+export { WebSocketServerAdapter } from "./WebSocketServerAdapter.js";
+/** @hidden */
+export { WebSocketClientAdapter as BrowserWebSocketClientAdapter } from "./WebSocketClientAdapter.js";
+/** @hidden */
+export { WebSocketServerAdapter as NodeWSServerAdapter } from "./WebSocketServerAdapter.js";
 export type { FromClientMessage, FromServerMessage, JoinMessage, ErrorMessage, PeerMessage, } from "./messages.js";
 export type { ProtocolVersion } from "./protocolVersion.js";
 export { ProtocolV1 } from "./protocolVersion.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;KAaK;AACL,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAA;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,YAAY,EACV,iBAAiB,EACjB,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,WAAW,GACZ,MAAM,eAAe,CAAA;AACtB,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;KAaK;AACL,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAEpE,cAAc;AACd,OAAO,EAAE,sBAAsB,IAAI,6BAA6B,EAAE,MAAM,6BAA6B,CAAA;AAErG,cAAc;AACd,OAAO,EAAE,sBAAsB,IAAI,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAE3F,YAAY,EACV,iBAAiB,EACjB,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,WAAW,GACZ,MAAM,eAAe,CAAA;AACtB,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA"}

package/dist/index.js

@@ -2,9 +2,9 @@
  * A `NetworkAdapter` which connects to a remote host via WebSockets
  *
  * The websocket protocol requires a server to be listening and a client to
- * connect to the server. To that end the {@link NodeWSServerAdapter} does not
+ * connect to the server. To that end the {@link WebSocketServerAdapter} does not
  * make outbound connections and instead listens on the provided socket for
- * new connections whilst the {@link BrowserWebSocketClientAdapter} makes an
+ * new connections whilst the {@link WebSocketClientAdapter} makes an
  * outbound connection to the provided socket.
  *
  * Note that the "browser" and "node" naming is a bit misleading, both
@@ -12,6 +12,10 @@
  *
  * @module
  * */
-export { BrowserWebSocketClientAdapter } from "./BrowserWebSocketClientAdapter.js";
-export { NodeWSServerAdapter } from "./NodeWSServerAdapter.js";
+export { WebSocketClientAdapter } from "./WebSocketClientAdapter.js";
+export { WebSocketServerAdapter } from "./WebSocketServerAdapter.js";
+/** @hidden */
+export { WebSocketClientAdapter as BrowserWebSocketClientAdapter } from "./WebSocketClientAdapter.js";
+/** @hidden */
+export { WebSocketServerAdapter as NodeWSServerAdapter } from "./WebSocketServerAdapter.js";
 export { ProtocolV1 } from "./protocolVersion.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo-network-websocket",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.0-alpha.23",
   "description": "isomorphic node/browser Websocket network adapter for Automerge Repo",
   "repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo-network-websocket",
   "author": "Peter van Hardenberg <pvh@pvh.ca>",
@@ -13,7 +13,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@automerge/automerge-repo": "2.0.0-alpha.20",
+    "@automerge/automerge-repo": "2.0.0-alpha.23",
     "cbor-x": "^1.3.0",
     "debug": "^4.3.4",
     "eventemitter3": "^5.0.1",
@@ -31,5 +31,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d53bc37be0fd923ff40f3cf7e2bd06a0496ddb73"
+  "gitHead": "82a9bed7cc6a92940f3aa68167f6990123dda58e"
 }

package/src/{BrowserWebSocketClientAdapter.ts → WebSocketClientAdapter.ts}

@@ -23,7 +23,7 @@ abstract class WebSocketNetworkAdapter extends NetworkAdapter {
   socket?: WebSocket
 }
 
-export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
+export class WebSocketClientAdapter extends WebSocketNetworkAdapter {
   #ready = false
   #readyResolver?: () => void
   #readyPromise: Promise<void> = new Promise<void>(resolve => {

package/src/{NodeWSServerAdapter.ts → WebSocketServerAdapter.ts}

@@ -21,7 +21,7 @@ import { toArrayBuffer } from "./toArrayBuffer.js"
 
 const { encode, decode } = cborHelpers
 
-export class NodeWSServerAdapter extends NetworkAdapter {
+export class WebSocketServerAdapter extends NetworkAdapter {
   sockets: { [peerId: PeerId]: WebSocket } = {}
 
   #ready = false

package/src/index.ts

@@ -2,9 +2,9 @@
  * A `NetworkAdapter` which connects to a remote host via WebSockets
  *
  * The websocket protocol requires a server to be listening and a client to
- * connect to the server. To that end the {@link NodeWSServerAdapter} does not
+ * connect to the server. To that end the {@link WebSocketServerAdapter} does not
  * make outbound connections and instead listens on the provided socket for
- * new connections whilst the {@link BrowserWebSocketClientAdapter} makes an
+ * new connections whilst the {@link WebSocketClientAdapter} makes an
  * outbound connection to the provided socket.
  *
  * Note that the "browser" and "node" naming is a bit misleading, both
@@ -12,8 +12,15 @@
  *
  * @module
  * */
-export { BrowserWebSocketClientAdapter } from "./BrowserWebSocketClientAdapter.js"
-export { NodeWSServerAdapter } from "./NodeWSServerAdapter.js"
+export { WebSocketClientAdapter } from "./WebSocketClientAdapter.js"
+export { WebSocketServerAdapter } from "./WebSocketServerAdapter.js"
+
+/** @hidden */
+export { WebSocketClientAdapter as BrowserWebSocketClientAdapter } from "./WebSocketClientAdapter.js"
+
+/** @hidden */
+export { WebSocketServerAdapter as NodeWSServerAdapter } from "./WebSocketServerAdapter.js"
+
 export type {
   FromClientMessage,
   FromServerMessage,

package/test/Websocket.test.ts

@@ -20,8 +20,8 @@ import http from "http"
 import { getPortPromise as getAvailablePort } from "portfinder"
 import { describe, it } from "vitest"
 import WebSocket from "ws"
-import { BrowserWebSocketClientAdapter } from "../src/BrowserWebSocketClientAdapter.js"
-import { NodeWSServerAdapter } from "../src/NodeWSServerAdapter.js"
+import { WebSocketClientAdapter } from "../src/WebSocketClientAdapter.js"
+import { WebSocketServerAdapter } from "../src/WebSocketServerAdapter.js"
 import { encodeHeads } from "../../automerge-repo/dist/AutomergeUrl.js"
 
 describe("Websocket adapters", () => {
@@ -43,7 +43,7 @@ describe("Websocket adapters", () => {
     return { adapters: [aliceAdapter, serverAdapter, bobAdapter], teardown }
   })
 
-  describe("BrowserWebSocketClientAdapter", () => {
+  describe("WebSocketClientAdapter", () => {
     it("should advertise the protocol versions it supports in its join message", async () => {
       const {
         serverSocket: socket,
@@ -180,7 +180,7 @@ describe("Websocket adapters", () => {
       const serverUrl = `ws://localhost:${port}`
 
       const retry = 100
-      const browser = new BrowserWebSocketClientAdapter(serverUrl, retry)
+      const browser = new WebSocketClientAdapter(serverUrl, retry)
 
       const _browserRepo = new Repo({
         network: [browser],
@@ -191,7 +191,7 @@ describe("Websocket adapters", () => {
       const serverSocket = new WebSocket.Server({ server })
 
       await new Promise<void>(resolve => server.listen(port, resolve))
-      const serverAdapter = new NodeWSServerAdapter(serverSocket, retry)
+      const serverAdapter = new WebSocketServerAdapter(serverSocket, retry)
 
       const serverRepo = new Repo({
         network: [serverAdapter],
@@ -216,7 +216,7 @@ describe("Websocket adapters", () => {
     })
 
     it("should correctly clear event handlers on reconnect", async () => {
-      // This reproduces an issue where the BrowserWebSocketClientAdapter.connect
+      // This reproduces an issue where the WebSocketClientAdapter.connect
       // call registered event handlers on the websocket but didn't clear them
       // up again on a second call to connect. This combined with the reconnect
       // timer to produce the following sequence of events:
@@ -247,12 +247,12 @@ describe("Websocket adapters", () => {
     })
   })
 
-  describe("NodeWSServerAdapter", () => {
+  describe("WebSocketServerAdapter", () => {
     const serverResponse = async (clientHello: Object) => {
       const { serverSocket, serverUrl } = await setup({
         clientCount: 0,
       })
-      const server = new NodeWSServerAdapter(serverSocket)
+      const server = new WebSocketServerAdapter(serverSocket)
       const _serverRepo = new Repo({
         network: [server],
         peerId: serverPeerId,
@@ -314,13 +314,13 @@ describe("Websocket adapters", () => {
       const serverUrl = `ws://localhost:${port}`
 
       const retry = 100
-      const browserAdapter = new BrowserWebSocketClientAdapter(serverUrl, retry)
+      const browserAdapter = new WebSocketClientAdapter(serverUrl, retry)
 
       const server = http.createServer()
       const serverSocket = new WebSocket.Server({ server })
 
       await new Promise<void>(resolve => server.listen(port, resolve))
-      const serverAdapter = new NodeWSServerAdapter(serverSocket, retry)
+      const serverAdapter = new WebSocketServerAdapter(serverSocket, retry)
 
       const _browserRepo = new Repo({
         network: [browserAdapter],
@@ -349,7 +349,7 @@ describe("Websocket adapters", () => {
       await new Promise<void>(resolve => server.listen(port, resolve))
 
       // Create a repo listening on the socket
-      const serverAdapter = new NodeWSServerAdapter(serverSocket)
+      const serverAdapter = new WebSocketServerAdapter(serverSocket)
       const serverRepo = new Repo({
         network: [serverAdapter],
         peerId: serverPeerId,
@@ -512,7 +512,7 @@ describe("Websocket adapters", () => {
       clientDoc = A.change(clientDoc, d => (d.foo = "qux"))
 
       // Now create a websocket sync server with the original document in it's storage
-      const adapter = new NodeWSServerAdapter(socket)
+      const adapter = new WebSocketServerAdapter(socket)
       const repo = new Repo({
         network: [adapter],
         storage,
@@ -520,8 +520,7 @@ describe("Websocket adapters", () => {
       })
 
       // make a change to the handle on the sync server
-      const handle = repo.find<{ foo: string }>(url)
-      await handle.whenReady()
+      const handle = await repo.find<{ foo: string }>(url)
       handle.change(d => (d.foo = "baz"))
 
       // Okay, so now there is a document on both the client and the server
@@ -569,7 +568,7 @@ describe("Websocket adapters", () => {
       // Now, assume either the network or the server is going slow, so the
       // server thinks it has sent the response above, but for whatever reason
       // it never gets to the client. In that case the reconnect timer in the
-      // BrowserWebSocketClientAdapter will fire and we'll create a new
+      // WebSocketClientAdapter will fire and we'll create a new
       // websocket and connect it. To simulate this we drop the above response
       // on the floor and start connecting again.
 
@@ -661,7 +660,7 @@ const setupServer = async (options: SetupOptions = {}) => {
   const server = http.createServer()
   const serverSocket = new WebSocket.Server({ server })
   await new Promise<void>(resolve => server.listen(port, resolve))
-  const serverAdapter = new NodeWSServerAdapter(serverSocket, retryInterval)
+  const serverAdapter = new WebSocketServerAdapter(serverSocket, retryInterval)
   return { server, serverAdapter, serverSocket, serverUrl }
 }
 
@@ -672,7 +671,7 @@ const setupClient = async (options: SetupOptions = {}) => {
     port = await getPort(),
   } = options
   const serverUrl = `ws://localhost:${port}`
-  return new BrowserWebSocketClientAdapter(serverUrl, retryInterval)
+  return new WebSocketClientAdapter(serverUrl, retryInterval)
 }
 
 const pause = (t = 0) =>

package/dist/BrowserWebSocketClientAdapter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"BrowserWebSocketClientAdapter.d.ts","sourceRoot":"","sources":["../src/BrowserWebSocketClientAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,MAAM,EACN,YAAY,EAEb,MAAM,gCAAgC,CAAA;AACvC,OAAO,SAAS,MAAM,eAAe,CAAA;AAIrC,OAAO,EACL,iBAAiB,EAKlB,MAAM,eAAe,CAAA;AAKtB,uBAAe,uBAAwB,SAAQ,cAAc;IAC3D,MAAM,CAAC,EAAE,SAAS,CAAA;CACnB;AAED,qBAAa,6BAA8B,SAAQ,uBAAuB;;aA4BtD,GAAG,EAAE,MAAM;aACX,aAAa;IAtB/B,OAAO;IAIP,SAAS;IAcT,YAAY,CAAC,EAAE,MAAM,CAAA;gBAGH,GAAG,EAAE,MAAM,EACX,aAAa,SAAO;IAMtC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY;IAqCnD,MAAM,aAKL;IAGD,OAAO,aAWN;IAED,SAAS,UAAW,SAAS,CAAC,YAAY,UAEzC;IAED,mFAAmF;IACnF,OAAO,UAED,KAAK,GACL,SAAS,CAAC,UAAU,UAezB;IAED,IAAI;IAUJ,UAAU;IAiBV,IAAI,CAAC,OAAO,EAAE,iBAAiB;IAe/B,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;IAU9D,cAAc,CAAC,YAAY,EAAE,UAAU;CAiBxC"}

package/dist/NodeWSServerAdapter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"NodeWSServerAdapter.d.ts","sourceRoot":"","sources":["../src/NodeWSServerAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAA;AAKpD,OAAO,EAEL,cAAc,EACd,KAAK,YAAY,EACjB,KAAK,MAAM,EACZ,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAEL,iBAAiB,EAElB,MAAM,eAAe,CAAA;AAOtB,qBAAa,mBAAoB,SAAQ,cAAc;;IAyBnD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,iBAAiB;IAzB3B,OAAO,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAK;IAQ7C,OAAO;IAIP,SAAS;gBAYC,MAAM,EAAE,eAAe,EACvB,iBAAiB,SAAO;IAKlC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY;IAyCnD,UAAU;IAQV,IAAI,CAAC,OAAO,EAAE,iBAAiB;IAqB/B,cAAc,CAAC,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS;CA2E3D"}