@automerge/automerge-repo-network-websocket 1.0.0-alpha.0 → 1.0.0-alpha.2

package/dist/BrowserWebSocketClientAdapter.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /// <reference types="ws" />
 import { ChannelId, NetworkAdapter, PeerId } from "@automerge/automerge-repo";
 import WebSocket from "isomorphic-ws";
@@ -6,7 +5,7 @@ declare abstract class WebSocketNetworkAdapter extends NetworkAdapter {
     socket?: WebSocket;
 }
 export declare class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
-    timerId?: NodeJS.Timer;
+    timerId?: ReturnType<typeof setTimeout>;
     url: string;
     constructor(url: string);
     connect(peerId: PeerId): void;

package/dist/BrowserWebSocketClientAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BrowserWebSocketClientAdapter.d.ts","sourceRoot":"","sources":["../src/BrowserWebSocketClientAdapter.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,SAAS,EAET,cAAc,EACd,MAAM,EACP,MAAM,2BAA2B,CAAA;AAElC,OAAO,SAAS,MAAM,eAAe,CAAA;AAOrC,uBAAe,uBAAwB,SAAQ,cAAc;IAC3D,MAAM,CAAC,EAAE,SAAS,CAAA;CACnB;AAED,qBAAa,6BAA8B,SAAQ,uBAAuB;IACxE,OAAO,CAAC,EAAE,MAAM,CAAC,KAAK,CAAA;IACtB,GAAG,EAAE,MAAM,CAAA;gBAEC,GAAG,EAAE,MAAM;IAKvB,OAAO,CAAC,MAAM,EAAE,MAAM;IA8BtB,IAAI;IAwBJ,KAAK;IAOL,WAAW,CACT,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,OAAO;IAgCpB,kBAAkB,CAAC,MAAM,EAAE,MAAM;IAUjC,cAAc,CAAC,OAAO,EAAE,UAAU;CAsCnC"}
+{"version":3,"file":"BrowserWebSocketClientAdapter.d.ts","sourceRoot":"","sources":["../src/BrowserWebSocketClientAdapter.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,SAAS,EAET,cAAc,EACd,MAAM,EACP,MAAM,2BAA2B,CAAA;AAElC,OAAO,SAAS,MAAM,eAAe,CAAA;AAOrC,uBAAe,uBAAwB,SAAQ,cAAc;IAC3D,MAAM,CAAC,EAAE,SAAS,CAAA;CACnB;AAED,qBAAa,6BAA8B,SAAQ,uBAAuB;IAGxE,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAA;IACvC,GAAG,EAAE,MAAM,CAAA;gBAEC,GAAG,EAAE,MAAM;IAKvB,OAAO,CAAC,MAAM,EAAE,MAAM;IA8BtB,IAAI;IAwBJ,KAAK;IAOL,WAAW,CACT,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,OAAO;IAgCpB,kBAAkB,CAAC,MAAM,EAAE,MAAM;IAUjC,cAAc,CAAC,OAAO,EAAE,UAAU;CAsCnC"}

package/dist/BrowserWebSocketClientAdapter.js

@@ -2,12 +2,14 @@ import { NetworkAdapter, } from "@automerge/automerge-repo";
 import * as CBOR from "cbor-x";
 import WebSocket from "isomorphic-ws";
 import debug from "debug";
-import { ProtocolV1 } from "./protocolVersion";
+import { ProtocolV1 } from "./protocolVersion.js";
 const log = debug("WebsocketClient");
 class WebSocketNetworkAdapter extends NetworkAdapter {
     socket;
 }
 export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
+    // Type trickery required for platform independence, 
+    // see https://stackoverflow.com/questions/45802988/typescript-use-correct-version-of-settimeout-node-vs-window
     timerId;
     url;
     constructor(url) {

package/dist/NodeWSServerAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NodeWSServerAdapter.d.ts","sourceRoot":"","sources":["../src/NodeWSServerAdapter.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAA;AAK/D,OAAO,EACL,SAAS,EAET,cAAc,EACd,MAAM,EACP,MAAM,2BAA2B,CAAA;AAIlC,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAK;gBAEjC,MAAM,EAAE,eAAe;IAKnC,OAAO,CAAC,MAAM,EAAE,MAAM;IAmBtB,IAAI;IAIJ,KAAK;IAIL,WAAW,CACT,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,OAAO;IAsCpB,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS;CAoEtD"}
+{"version":3,"file":"NodeWSServerAdapter.d.ts","sourceRoot":"","sources":["../src/NodeWSServerAdapter.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAA;AAK/D,OAAO,EACL,SAAS,EAET,cAAc,EACd,MAAM,EACP,MAAM,2BAA2B,CAAA;AAIlC,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAK;gBAEjC,MAAM,EAAE,eAAe;IAKnC,OAAO,CAAC,MAAM,EAAE,MAAM;IAmBtB,IAAI;IAIJ,KAAK;IAIL,WAAW,CACT,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,OAAO;IAsCpB,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS;CA2EtD"}

package/dist/NodeWSServerAdapter.js

@@ -2,7 +2,7 @@ import * as CBOR from "cbor-x";
 import debug from "debug";
 const log = debug("WebsocketServer");
 import { NetworkAdapter, } from "@automerge/automerge-repo";
-import { ProtocolV1 } from "./protocolVersion";
+import { ProtocolV1 } from "./protocolVersion.js";
 export class NodeWSServerAdapter extends NetworkAdapter {
     server;
     sockets = {};
@@ -75,7 +75,10 @@ export class NodeWSServerAdapter extends NetworkAdapter {
                 // (and we pretend to be joined to every channel)
                 const selectedProtocolVersion = selectProtocol(supportedProtocolVersions);
                 if (selectedProtocolVersion === null) {
-                    socket.send(CBOR.encode({ type: "error", errorMessage: "unsupported protocol version" }));
+                    socket.send(CBOR.encode({
+                        type: "error",
+                        errorMessage: "unsupported protocol version",
+                    }));
                     this.sockets[senderId].close();
                     delete this.sockets[senderId];
                 }

package/dist/message.d.ts

@@ -1,5 +1,5 @@
 import { type InboundMessagePayload } from "@automerge/automerge-repo";
-import { ProtocolVersion } from "./protocolVersion";
+import { ProtocolVersion } from "./protocolVersion.js";
 export interface InboundWebSocketMessage extends InboundMessagePayload {
     supportedProtocolVersions?: ProtocolVersion[];
 }

package/dist/message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../src/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,qBAAqB,EAAC,MAAM,2BAA2B,CAAA;AACpE,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAA;AAEjD,MAAM,WAAW,uBAAwB,SAAQ,qBAAqB;IACpE,yBAAyB,CAAC,EAAE,eAAe,EAAE,CAAA;CAC9C;AAED,MAAM,WAAW,wBAAyB,SAAQ,qBAAqB;IACrE,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB"}
+{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../src/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,MAAM,WAAW,uBAAwB,SAAQ,qBAAqB;IACpE,yBAAyB,CAAC,EAAE,eAAe,EAAE,CAAA;CAC9C;AAED,MAAM,WAAW,wBAAyB,SAAQ,qBAAqB;IACrE,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB"}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@automerge/automerge-repo-network-websocket",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.0-alpha.2",
   "description": "isomorphic node/browser Websocket network adapter for Automerge Repo",
   "peerDependencies": {
-    "@automerge/automerge": "^2.1.0-alpha.9"
+    "@automerge/automerge": "^2.1.0-alpha.10"
   },
   "repository": "https://github.com/automerge/automerge-repo",
   "author": "Peter van Hardenberg <pvh@pvh.ca>",
@@ -17,7 +17,7 @@
     "test": "mocha --no-warnings --experimental-specifier-resolution=node --exit"
   },
   "dependencies": {
-    "@automerge/automerge-repo": "^1.0.0-alpha.0",
+    "@automerge/automerge-repo": "^1.0.0-alpha.2",
     "cbor-x": "^1.3.0",
     "eventemitter3": "^4.0.7",
     "isomorphic-ws": "^5.0.0",
@@ -34,5 +34,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "38c0c32796ddca5f86a2e55ab0f1202a2ce107c8"
+  "gitHead": "b5830dde8f135b694809698aaad2a9fdc79a9898"
 }

package/src/BrowserWebSocketClientAdapter.ts

@@ -8,8 +8,8 @@ import * as CBOR from "cbor-x"
 import WebSocket from "isomorphic-ws"
 
 import debug from "debug"
-import {ProtocolV1} from "./protocolVersion"
-import {InboundWebSocketMessage, OutboundWebSocketMessage} from "./message"
+import {ProtocolV1} from "./protocolVersion.js"
+import {InboundWebSocketMessage, OutboundWebSocketMessage} from "./message.js"
 const log = debug("WebsocketClient")
 
 abstract class WebSocketNetworkAdapter extends NetworkAdapter {
@@ -17,7 +17,9 @@ abstract class WebSocketNetworkAdapter extends NetworkAdapter {
 }
 
 export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
-  timerId?: NodeJS.Timer
+  // Type trickery required for platform independence, 
+  // see https://stackoverflow.com/questions/45802988/typescript-use-correct-version-of-settimeout-node-vs-window
+  timerId?: ReturnType<typeof setTimeout>
   url: string
 
   constructor(url: string) {

package/src/NodeWSServerAdapter.ts

@@ -10,8 +10,8 @@ import {
   NetworkAdapter,
   PeerId,
 } from "@automerge/automerge-repo"
-import {ProtocolV1, ProtocolVersion} from "./protocolVersion"
-import {InboundWebSocketMessage} from "./message"
+import { ProtocolV1, ProtocolVersion } from "./protocolVersion.js"
+import { InboundWebSocketMessage } from "./message.js"
 
 export class NodeWSServerAdapter extends NetworkAdapter {
   server: WebSocketServer
@@ -119,9 +119,16 @@ export class NodeWSServerAdapter extends NetworkAdapter {
 
         // In this client-server connection, there's only ever one peer: us!
         // (and we pretend to be joined to every channel)
-        const selectedProtocolVersion = selectProtocol(supportedProtocolVersions)
+        const selectedProtocolVersion = selectProtocol(
+          supportedProtocolVersions
+        )
         if (selectedProtocolVersion === null) {
-          socket.send(CBOR.encode({ type: "error", errorMessage: "unsupported protocol version"}))
+          socket.send(
+            CBOR.encode({
+              type: "error",
+              errorMessage: "unsupported protocol version",
+            })
+          )
           this.sockets[senderId].close()
           delete this.sockets[senderId]
         } else {

package/src/message.ts

@@ -1,5 +1,5 @@
-import {type InboundMessagePayload} from "@automerge/automerge-repo"
-import {ProtocolVersion} from "./protocolVersion"
+import { type InboundMessagePayload } from "@automerge/automerge-repo"
+import { ProtocolVersion } from "./protocolVersion.js"
 
 export interface InboundWebSocketMessage extends InboundMessagePayload {
   supportedProtocolVersions?: ProtocolVersion[]