@livestore/webmesh 0.4.0-dev.22 → 0.4.0-dev.23

package/src/websocket-edge.ts

@@ -50,7 +50,7 @@ export const connectViaWebSocket = ({
   openTimeout?: number
 }): Effect.Effect<void, never, Scope.Scope | HttpClient.HttpClient> =>
   Effect.gen(function* () {
-    const socket = yield* Socket.makeWebSocket(url, { openTimeout })
+    const socket = yield* Socket.makeWebSocket(url, openTimeout !== undefined ? { openTimeout } : undefined)
 
     const edgeChannel = yield* makeWebSocketEdge({
       socket,
@@ -78,7 +78,7 @@ export const makeWebSocketEdge = ({
 }: {
   socket: Socket.Socket
   socketType: SocketType
-  debug?: { id?: string } | undefined
+  debug?: { id?: string | undefined } | undefined
 }): Effect.Effect<
   {
     webChannel: WebChannel.WebChannel<typeof WebmeshSchema.Packet.Type, typeof WebmeshSchema.Packet.Type>
@@ -105,12 +105,13 @@ export const makeWebSocketEdge = ({
         Schedule.whileInput((_: Socket.SocketError) => _.reason === 'OpenTimeout' || _.reason === 'Open'),
       )
 
+      const sendToSocket = yield* socket.writer
+
       yield* Stream.never.pipe(
         Stream.pipeThroughChannel(Socket.toChannel(socket)),
         Stream.catchTag(
           'SocketError',
           Effect.fnUntraced(function* (error) {
-            // yield* Effect.logError(`[websocket-edge] Socket error`, error, { socketType, debugId: debugInfo?.id })
             // In the case of the socket being closed, we're interrupting the stream
             // and close the WebChannel (which can be observed from the outside)
             if (error.reason === 'Close') {
@@ -118,7 +119,7 @@ export const makeWebSocketEdge = ({
               yield* isConnectedLatch.close
               return yield* Effect.interrupt
             } else {
-              return yield* Effect.fail(error)
+              return yield* error
             }
           }),
         ),
@@ -130,7 +131,6 @@ export const makeWebSocketEdge = ({
               yield* Deferred.succeed(fromDeferred, msg.from)
             } else {
               const decodedPayload = yield* Schema.decode(schema.listen)(msg.payload)
-              // yield* Effect.logDebug(`[websocket-edge] recv from ${msg.from}: ${decodedPayload._tag}`, decodedPayload)
               yield* Queue.offer(listenQueue, decodedPayload)
             }
           }),
@@ -148,8 +148,6 @@ export const makeWebSocketEdge = ({
         Effect.forkScoped,
       )
 
-      const sendToSocket = yield* socket.writer
-
       const initHandshake = (from: string) =>
         sendToSocket(Schema.encodeSync(MessageMsgPack)({ _tag: 'WSEdgeInit', from }))
 
@@ -168,7 +166,7 @@ export const makeWebSocketEdge = ({
         Effect.gen(function* () {
           yield* isConnectedLatch.await
           const payload = yield* Schema.encode(schema.send)(message)
-          yield* sendToSocket(Schema.encodeSync(MessageMsgPack)({ _tag: 'WSEdgePayload', payload, from }))
+          yield* sendToSocket(yield* Schema.encode(MessageMsgPack)({ _tag: 'WSEdgePayload', payload, from }))
         }).pipe(Effect.orDie)
 
       const listen = Stream.fromQueue(listenQueue).pipe(
@@ -184,7 +182,7 @@ export const makeWebSocketEdge = ({
         schema,
         supportsTransferables: false,
         shutdown: Scope.close(scope, Exit.void),
-        debugInfo,
+        ...(debugInfo !== undefined ? { debugInfo } : {}),
       } satisfies WebChannel.WebChannel<typeof WebmeshSchema.Packet.Type, typeof WebmeshSchema.Packet.Type>
 
       return { webChannel, from }