@livestore/webmesh 0.4.0-dev.1 → 0.4.0-dev.11

package/src/node.test.ts

@@ -1,4 +1,4 @@
-import { IS_CI } from '@livestore/utils'
+import { IS_CI, omitUndefineds } from '@livestore/utils'
 import { Chunk, Deferred, Effect, Exit, Schema, Scope, Stream, WebChannel } from '@livestore/utils/effect'
 import { Vitest } from '@livestore/utils-dev/node-vitest'
 import { expect } from 'vitest'
@@ -25,12 +25,12 @@ const connectNodesViaMessageChannel = (nodeA: MeshNode, nodeB: MeshNode, options
     yield* nodeA.addEdge({
       target: nodeB.nodeName,
       edgeChannel: meshChannelAToB,
-      replaceIfExists: options?.replaceIfExists,
+      ...omitUndefineds({ replaceIfExists: options?.replaceIfExists }),
     })
     yield* nodeB.addEdge({
       target: nodeA.nodeName,
       edgeChannel: meshChannelBToA,
-      replaceIfExists: options?.replaceIfExists,
+      ...omitUndefineds({ replaceIfExists: options?.replaceIfExists }),
     })
   }).pipe(Effect.withSpan(`connectNodesViaMessageChannel:${nodeA.nodeName}↔${nodeB.nodeName}`))
 
@@ -50,12 +50,12 @@ const connectNodesViaBroadcastChannel = (nodeA: MeshNode, nodeB: MeshNode, optio
     yield* nodeA.addEdge({
       target: nodeB.nodeName,
       edgeChannel: broadcastWebChannelA,
-      replaceIfExists: options?.replaceIfExists,
+      ...omitUndefineds({ replaceIfExists: options?.replaceIfExists }),
     })
     yield* nodeB.addEdge({
       target: nodeA.nodeName,
       edgeChannel: broadcastWebChannelB,
-      replaceIfExists: options?.replaceIfExists,
+      ...omitUndefineds({ replaceIfExists: options?.replaceIfExists }),
     })
   }).pipe(Effect.withSpan(`connectNodesViaBroadcastChannel:${nodeA.nodeName}↔${nodeB.nodeName}`))
 
@@ -188,7 +188,13 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
               nodeX,
               nodeY,
               channelType,
-              delays: { x: delayX, y: delayY, connect: connectDelay },
+              delays: {
+                ...omitUndefineds({
+                  x: delayX,
+                  y: delayY,
+                  connect: connectDelay,
+                }),
+              },
             })
 
             yield* Effect.promise(() => nodeX.debug.requestTopology(100))

package/src/node.ts

@@ -171,10 +171,8 @@ export const makeMeshNode = <TName extends MeshNodeName>(
     const checkTransferableEdges = (packet: typeof WebmeshSchema.DirectChannelPacket.Type) => {
       if (
         (packet._tag === 'DirectChannelRequest' &&
-          (edgeChannels.size === 0 ||
-            // Either if direct edge does not support transferables ...
-            edgeChannels.get(packet.target)?.channel.supportsTransferables === false)) ||
-        // ... or if no forward-edges support transferables
+          (edgeChannels.size === 0 || // Either if direct edge does not support transferables ...
+            edgeChannels.get(packet.target)?.channel.supportsTransferables === false)) || // ... or if no forward-edges support transferables
         ![...edgeChannels.values()].some((c) => c.channel.supportsTransferables === true)
       ) {
         return WebmeshSchema.DirectChannelResponseNoTransferables.make({
@@ -458,7 +456,7 @@ export const makeMeshNode = <TName extends MeshNodeName>(
     const removeEdge: MeshNode['removeEdge'] = (targetNodeName) =>
       Effect.gen(function* () {
         if (!edgeChannels.has(targetNodeName)) {
-          yield* new Cause.NoSuchElementException(`No edge found for ${targetNodeName}`)
+          return yield* new Cause.NoSuchElementException(`No edge found for ${targetNodeName}`)
         }
 
         yield* Fiber.interrupt(edgeChannels.get(targetNodeName)!.listenFiber)

package/src/websocket-edge.ts

@@ -5,6 +5,7 @@ import {
   Either,
   Exit,
   Layer,
+  MsgPack,
   Queue,
   Schedule,
   Schema,
@@ -28,7 +29,7 @@ export class WSEdgePayload extends Schema.TaggedStruct('WSEdgePayload', {
 
 export class WSEdgeMessage extends Schema.Union(WSEdgeInit, WSEdgePayload) {}
 
-export const MessageMsgPack = Schema.MsgPack(WSEdgeMessage)
+export const MessageMsgPack = MsgPack.schema(WSEdgeMessage)
 
 export type SocketType =
   | {
@@ -77,7 +78,7 @@ export const makeWebSocketEdge = ({
 }: {
   socket: Socket.Socket
   socketType: SocketType
-  debug?: { id?: string }
+  debug?: { id?: string } | undefined
 }): Effect.Effect<
   {
     webChannel: WebChannel.WebChannel<typeof WebmeshSchema.Packet.Type, typeof WebmeshSchema.Packet.Type>