(ml5717) Added compressed parameter to p2pmesh send/broadcast methods

src/p2p-mesh.js

@@ -57,6 +57,7 @@ export default class P2PMesh {
               uid,
               channel: "tw-ml",
               message: "ml",
+              compressed: false,
             })
           } else if (message == "ml") {
             // Handshake completed
@@ -111,6 +112,7 @@ export default class P2PMesh {
           uid,
           channel: "tw-ml",
           message: "tw",
+          compressed: false,
         })
 
         setTimeout(handshake.bind(this, peer), this.options.handshake.interval)
@@ -267,11 +269,22 @@ export default class P2PMesh {
     this.crdt = null
   }
 
-  send(uid, message) {
-    this.queue.postMessage({ method: "send", uid, channel: "crdt", message })
+  send(uid, message, compressed = true) {
+    this.queue.postMessage({
+      method: "send",
+      uid,
+      channel: "crdt",
+      message,
+      compressed,
+    })
   }
 
-  broadcast(message) {
-    this.queue.postMessage({ method: "broadcast", channel: "crdt", message })
+  broadcast(message, compressed = true) {
+    this.queue.postMessage({
+      method: "broadcast",
+      channel: "crdt",
+      message,
+      compressed,
+    })
   }
 }

src/queue.js

@@ -19,11 +19,8 @@ onmessage = (event) => {
   if (event.data.method == "send" || event.data.method == "broadcast") {
     let message = event.data.message
 
-    const compressed = !(
-      message == undefined ||
-      message instanceof String ||
-      typeof message == "string"
-    )
+    const compressed =
+      event.data.compressed != null ? event.data.compressed : true
 
     const uuid = uuidv4()
 

src/wasm-crdt.js

@@ -45,14 +45,18 @@ export default class WasmCRDTWrapper {
           }),
         )
       },
-      on_deltas: (deltas) => this.mesh.broadcast(deltas),
+      on_deltas: (deltas) => this.mesh.broadcast(deltas, true),
       on_deltas_from_state: (uid, deltas) => {
-        this.mesh.send(uid, {
-          type: "sync step 2",
-          message: deltas,
-        })
+        this.mesh.send(
+          uid,
+          {
+            type: "sync step 2",
+            message: deltas,
+          },
+          true,
+        )
 
-        this.mesh.send(uid, { type: "sync done" })
+        this.mesh.send(uid, { type: "sync done" }, false)
 
         this.room.dispatchEvent(
           new CustomEvent("weSyncedWithPeer", { detail: uid }),
@@ -184,10 +188,10 @@ export default class WasmCRDTWrapper {
 
         if (this.users.check) {
           this.users.synced.forEach((user) =>
-            this.mesh.send(user, { type: "sync check" }),
+            this.mesh.send(user, { type: "sync check" }, false),
           )
           this.users.waiting.forEach((user) =>
-            this.mesh.send(user, { type: "sync check" }),
+            this.mesh.send(user, { type: "sync check" }, false),
           )
         }
 
@@ -224,10 +228,14 @@ export default class WasmCRDTWrapper {
     this.users.syncing = this.users.waiting.shift()
     this.users.check = false
 
-    this.mesh.send(this.users.syncing, {
-      type: "sync step 1",
-      message: this.crdt.get_state_vector(),
-    })
+    this.mesh.send(
+      this.users.syncing,
+      {
+        type: "sync step 1",
+        message: this.crdt.get_state_vector(),
+      },
+      false,
+    )
 
     this.room.dispatchEvent(
       new CustomEvent("waitingForSyncStep", { detail: this.users.syncing }),

src/y-crdt.js

@@ -225,21 +225,29 @@ export default class YjsCRDTWrapper extends Y.AbstractConnector {
   }
 
   send(uid, message) {
+    let compressed = true
+
     if (message.type === "sync step 1") {
+      compressed = false
+
       this.room.dispatchEvent(
         new CustomEvent("waitingForSyncStep", { detail: uid }),
       )
     } else if (message.type === "sync done") {
+      compressed = false
+
       this.room.dispatchEvent(
         new CustomEvent("weSyncedWithPeer", { detail: uid }),
       )
+    } else if (message.type === "sync check") {
+      compressed = false
     }
 
-    this.mesh.send(uid, message)
+    this.mesh.send(uid, message, compressed)
   }
 
   broadcast(message) {
-    this.mesh.broadcast(message)
+    this.mesh.broadcast(message, true)
   }
 
   isDisconnected() {
@@ -252,106 +260,94 @@ Y.extend("y-crdt", YjsCRDTWrapper)
 export const syncStep1 = {
   uuid: "6e20b20d-e1d8-405d-8a61-d56cb1c47a24",
   message: Uint8Array.of(
-    120,
-    156,
-    107,
-    93,
-    82,
-    82,
-    89,
-    144,
-    186,
-    186,
-    184,
-    50,
-    47,
-    89,
-    161,
-    184,
-    36,
-    181,
-    64,
-    193,
+    133,
+    164,
+    116,
+    121,
     112,
-    69,
-    113,
-    73,
-    98,
-    73,
-    106,
+    101,
+    171,
+    115,
+    121,
+    110,
+    99,
+    32,
+    115,
+    116,
+    101,
     112,
-    106,
-    73,
-    195,
-    202,
-    148,
-    212,
-    156,
-    84,
-    8,
+    32,
+    49,
+    168,
     115,
-    125,
-    65,
-    81,
-    126,
-    73,
-    126,
+    116,
+    97,
+    116,
+    101,
+    83,
+    101,
+    116,
+    128,
+    169,
+    100,
+    101,
+    108,
+    101,
+    116,
+    101,
+    83,
+    101,
+    116,
+    128,
+    175,
+    112,
+    114,
+    111,
+    116,
+    111,
+    99,
+    111,
+    108,
+    86,
+    101,
     114,
-    126,
-    78,
-    88,
-    106,
-    81,
-    113,
-    102,
-    126,
-    30,
-    247,
-    146,
-    196,
-    210,
-    146,
-    140,
-    3,
-    0,
-    80,
-    113,
-    26,
-    230,
+    115,
+    105,
+    111,
+    110,
+    11,
+    164,
+    97,
+    117,
+    116,
+    104,
+    192,
   ),
   slice: 0,
   length: 1,
-  compressed: true,
+  compressed: false,
 }
 
 export const syncDone = {
   message: Uint8Array.of(
-    120,
-    156,
-    107,
-    92,
-    82,
-    82,
-    89,
-    144,
-    186,
-    178,
-    184,
-    50,
-    47,
-    89,
-    33,
-    37,
-    63,
-    47,
-    21,
-    0,
-    64,
-    79,
-    7,
-    20,
+    129,
+    164,
+    116,
+    121,
+    112,
+    101,
+    169,
+    115,
+    121,
+    110,
+    99,
+    32,
+    100,
+    111,
+    110,
+    101,
   ),
   slice: 0,
   length: 1,
-  compressed: true,
+  compressed: false,
 }