light9 Changeset - ac55319a2eac

Changeset - ac55319a2eac

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

drewp@bigasterisk.com - 8 months ago 2024-05-21 23:10:39
drewp@bigasterisk.com

don't drop patches that arrive before we get WS connected

3 files changed with 19 insertions and 19 deletions:

web/RdfDbChannel.ts

web/SyncedGraph.ts

web/rdfdbclient.ts

0 comments (0 inline, 0 general)

web/RdfDbChannel.ts

➞

Show inline comments

@@ @@ -45,12 +45,13 @@ export class RdfDbChannel { @@
   constructor(public patchSenderUrl: string) {
     this.openConnection();
+  }
   sendMessage(body: string): boolean {
     // one try, best effort, true if we think it worked
     if (!this.ws || this.ws.readyState !== this.ws.OPEN) {
       log("dropping message: " + body);
       return false;
+    }
     log("send patch to server, " + body.length + " bytes");
     this.ws.send(body);
     this.messagesSent++;
     this.updateStatus();

web/SyncedGraph.ts

➞

Show inline comments

@@ @@ -148,28 +148,25 @@ export class SyncedGraph { @@
   quads(): any {
     // for debugging
     return Array.from(this.graph.getQuads(null, null, null, null)).map((q: Quad) => [q.subject, q.predicate, q.object, q.graph]);
+  }
   applyAndSendPatch(patch: Patch) {
     console.time("applyAndSendPatch");
     if (!this.client) {
       log("not connected-- dropping patch");
       throw new Error("no client yet");
+    }
     if (patch.isEmpty()) {
       return;
+    }
     if (!patch.isEmpty()) {
       this._applyPatch(patch);
       // // chaos delay
       //       setTimeout(()=>{
       if (this.client) {
         log("sending patch:\n", patch.dump());
         this.client.sendPatch(patch);
+      }
       // },300*Math.random())
+    }
     console.timeEnd("applyAndSendPatch");
     this._applyPatch(patch);
     // // chaos delay
     //       setTimeout(()=>{
     log("sending patch:\n", patch.dump());
     this.client.sendPatch(patch);
     // },300*Math.random())
+  }
   _applyPatch(patch: Patch) {
     // In most cases you want applyAndSendPatch.
     //
     // This is the only method that writes to this.graph!

web/rdfdbclient.ts

➞

Show inline comments

@@ @@ -2,13 +2,13 @@ import debug from "debug"; @@
 import { parseJsonPatch, Patch } from "./patch";
 import { RdfDbChannel } from "./RdfDbChannel";
 const log = debug("rdfdbclient");
 export class RdfDbClient {
   private channel: RdfDbChannel;
-  _patchesToSend: Patch[];
+  private patchesToSend: Patch[];
   // Send and receive patches from rdfdb. Primarily used in SyncedGraph.
   //
   // What this should do, and does not yet, is keep the graph
   // 'coasting' over a reconnect, applying only the diffs from the old
   // contents to the new ones once they're in. Then, remove all the
   // clearGraph stuff in graph.coffee that doesn't even work right.
@@ @@ -16,16 +16,16 @@ export class RdfDbClient { @@
   constructor(
     patchSenderUrl: string,
     private clearGraphOnNewConnection: () => void,
     private applyPatch: (p: Patch) => void,
     setStatus: (status: string) => void
   ) {
-    this._patchesToSend = [];
+    this.patchesToSend = [];
     this.channel = new RdfDbChannel(patchSenderUrl);
     this.channel.statusDisplay.subscribe((st: string) => {
-      setStatus(st + `; ${this._patchesToSend.length} pending `);
+      setStatus(st + `; ${this.patchesToSend.length} pending `);
     });
     this.channel.newConnection.subscribe(() => {
       this.clearGraphOnNewConnection();
     });
     this.channel.serverMessage.subscribe((m) => {
       parseJsonPatch(m.body, (p: Patch) => {
@@ @@ -37,28 +37,30 @@ export class RdfDbClient { @@
       });
     });
+  }
   sendPatch(patch: Patch) {
     log("queue patch to server ", patch.summary());
-    this._patchesToSend.push(patch);
+    this.patchesToSend.push(patch);
     this._continueSending();
+  }
   disconnect(why:string) {
     this.channel.disconnect(why);
+  }
   async _continueSending() {
     // we could call this less often and coalesce patches together to optimize
     // the dragging cases. See rdfdb 'compactPatches' and 'processInbox'.
     while (this._patchesToSend.length) {
       const patch = this._patchesToSend.splice(0, 1)[0];
     while (this.patchesToSend.length) {
       const patch = this.patchesToSend.splice(0, 1)[0];
       const json = await patch.toJsonPatch();
       const ret = this.channel.sendMessage(json);
       if (!ret) {
         log('sendMessage failed- retrying')
         this.patchesToSend.unshift(patch);
         setTimeout(this._continueSending.bind(this), 500);
         // this.disconnect()
         return;
+      }
+    }

0 comments (0 inline, 0 general)