@livestore/webmesh 0.4.0 → 0.5.0-dev.0

package/src/common.ts

@@ -23,14 +23,17 @@ export type ChannelKey = `target:${MeshNodeName}, channelName:${ChannelName}`
 //   '~@livestore/webmesh/NoConnectionRouteSignal',
 // )('NoConnectionRouteSignal', {}) {}
 
-export class EdgeAlreadyExistsError extends Schema.TaggedError<EdgeAlreadyExistsError>('~@livestore/webmesh/EdgeAlreadyExistsError')('EdgeAlreadyExistsError', {
+export class EdgeAlreadyExistsError extends Schema.TaggedError<EdgeAlreadyExistsError>(
+  '~@livestore/webmesh/EdgeAlreadyExistsError',
+)('EdgeAlreadyExistsError', {
   target: Schema.String,
 }) {}
 
 export const packetAsOtelAttributes = (packet: typeof Packet.Type) => ({
   packetId: packet.id,
   'span.label':
-    packet.id + (Predicate.hasProperty(packet, 'reqId') === true && packet.reqId !== undefined ? ` for ${packet.reqId}` : ''),
+    packet.id +
+    (Predicate.hasProperty(packet, 'reqId') === true && packet.reqId !== undefined ? ` for ${packet.reqId}` : ''),
   ...omitUndefineds({
     packet:
       packet._tag !== 'DirectChannelResponseSuccess' && packet._tag !== 'ProxyChannelPayload' ? packet : undefined,
@@ -40,7 +43,7 @@ export const packetAsOtelAttributes = (packet: typeof Packet.Type) => ({
 export const ListenForChannelResult = Schema.Struct({
   channelName: Schema.String,
   source: Schema.String,
-  mode: Schema.Literal('proxy', 'direct'),
+  mode: Schema.Literals(['proxy', 'direct']),
 })
 
 export type ListenForChannelResult = typeof ListenForChannelResult.Type

package/src/mesh-schema.ts

@@ -1,9 +1,9 @@
-import { Schema, Transferable } from '@livestore/utils/effect'
+import { Effect, Schema, Transferable } from '@livestore/utils/effect'
 import { nanoid } from '@livestore/utils/nanoid'
 
 const id = Schema.String.pipe(
-  Schema.optional,
-  Schema.withDefaults({ constructor: () => nanoid(10), decoding: () => nanoid(10) }),
+  Schema.withDecodingDefaultType(Effect.sync(() => nanoid(10))),
+  Schema.withConstructorDefault(Effect.sync(() => nanoid(10))),
 )
 
 const defaultPacketFields = {
@@ -23,10 +23,10 @@ const remainingHopsUndefined = Schema.Undefined.pipe(Schema.optional)
  * We need a clear path back to the sender to avoid this, thus we respond with a separate
  * `DirectChannelResponseSuccess` which contains the `port`.
  */
-export class DirectChannelRequest extends Schema.TaggedStruct('DirectChannelRequest', {
+export const DirectChannelRequest = Schema.TaggedStruct('DirectChannelRequest', {
   ...defaultPacketFields,
   remainingHops: Schema.Array(Schema.String).pipe(Schema.optional),
-  channelVersion: Schema.Number,
+  channelVersion: Schema.Finite,
   /** Only set if the request is in response to an incoming request */
   reqId: Schema.UndefinedOr(Schema.String),
   /**
@@ -34,70 +34,70 @@ export class DirectChannelRequest extends Schema.TaggedStruct('DirectChannelRequ
    * source has changed.
    */
   sourceId: Schema.String,
-}) {}
+})
 
-export class DirectChannelResponseSuccess extends Schema.TaggedStruct('DirectChannelResponseSuccess', {
+export const DirectChannelResponseSuccess = Schema.TaggedStruct('DirectChannelResponseSuccess', {
   ...defaultPacketFields,
   reqId: Schema.String,
   port: Transferable.MessagePort,
   // Since we can't copy this message, we need to follow the exact route back to the sender
   remainingHops: Schema.Array(Schema.String),
-  channelVersion: Schema.Number,
-}) {}
+  channelVersion: Schema.Finite,
+})
 
-export class DirectChannelResponseNoTransferables extends Schema.TaggedStruct('DirectChannelResponseNoTransferables', {
+export const DirectChannelResponseNoTransferables = Schema.TaggedStruct('DirectChannelResponseNoTransferables', {
   ...defaultPacketFields,
   reqId: Schema.String,
   remainingHops: Schema.Array(Schema.String),
-}) {}
+})
 
-export class ProxyChannelRequest extends Schema.TaggedStruct('ProxyChannelRequest', {
+export const ProxyChannelRequest = Schema.TaggedStruct('ProxyChannelRequest', {
   ...defaultPacketFields,
   remainingHops: remainingHopsUndefined,
   channelIdCandidate: Schema.String,
-}) {}
+})
 
-export class ProxyChannelResponseSuccess extends Schema.TaggedStruct('ProxyChannelResponseSuccess', {
+export const ProxyChannelResponseSuccess = Schema.TaggedStruct('ProxyChannelResponseSuccess', {
   ...defaultPacketFields,
   reqId: Schema.String,
   remainingHops: Schema.Array(Schema.String),
   combinedChannelId: Schema.String,
   channelIdCandidate: Schema.String,
-}) {}
+})
 
-export class ProxyChannelPayload extends Schema.TaggedStruct('ProxyChannelPayload', {
+export const ProxyChannelPayload = Schema.TaggedStruct('ProxyChannelPayload', {
   ...defaultPacketFields,
   remainingHops: remainingHopsUndefined,
   payload: Schema.Any,
   combinedChannelId: Schema.String,
-}) {}
+})
 
-export class ProxyChannelPayloadAck extends Schema.TaggedStruct('ProxyChannelPayloadAck', {
+export const ProxyChannelPayloadAck = Schema.TaggedStruct('ProxyChannelPayloadAck', {
   ...defaultPacketFields,
   reqId: Schema.String,
   remainingHops: Schema.Array(Schema.String),
   combinedChannelId: Schema.String,
-}) {}
+})
 
 /**
  * Broadcast to all nodes when a new edge is added.
  * Mostly used for auto-reconnect purposes.
  */
-export class NetworkEdgeAdded extends Schema.TaggedStruct('NetworkEdgeAdded', {
+export const NetworkEdgeAdded = Schema.TaggedStruct('NetworkEdgeAdded', {
   id,
   source: Schema.String,
   target: Schema.String,
-}) {}
+})
 
-export class NetworkTopologyRequest extends Schema.TaggedStruct('NetworkTopologyRequest', {
+export const NetworkTopologyRequest = Schema.TaggedStruct('NetworkTopologyRequest', {
   id,
   hops: Schema.Array(Schema.String),
   /** Always fixed to who requested the topology */
   source: Schema.String,
   target: Schema.Literal('-'),
-}) {}
+})
 
-export class NetworkTopologyResponse extends Schema.TaggedStruct('NetworkTopologyResponse', {
+export const NetworkTopologyResponse = Schema.TaggedStruct('NetworkTopologyResponse', {
   id,
   reqId: Schema.String,
   remainingHops: Schema.Array(Schema.String),
@@ -106,7 +106,7 @@ export class NetworkTopologyResponse extends Schema.TaggedStruct('NetworkTopolog
   /** Always fixed to who requested the topology */
   source: Schema.String,
   target: Schema.Literal('-'),
-}) {}
+})
 
 export const BroadcastChannelPacket = Schema.TaggedStruct('BroadcastChannelPacket', {
   id,
@@ -121,27 +121,28 @@ export const BroadcastChannelPacket = Schema.TaggedStruct('BroadcastChannelPacke
   target: Schema.Literal('-'),
 })
 
-export class DirectChannelPacket extends Schema.Union(
+export const DirectChannelPacket = Schema.Union([
   DirectChannelRequest,
   DirectChannelResponseSuccess,
   DirectChannelResponseNoTransferables,
-) {}
+])
 
-export class ProxyChannelPacket extends Schema.Union(
+export const ProxyChannelPacket = Schema.Union([
   ProxyChannelRequest,
   ProxyChannelResponseSuccess,
   ProxyChannelPayload,
   ProxyChannelPayloadAck,
-) {}
+])
 
-export class Packet extends Schema.Union(
+export const Packet = Schema.Union([
   DirectChannelPacket,
   ProxyChannelPacket,
   NetworkEdgeAdded,
   NetworkTopologyRequest,
   NetworkTopologyResponse,
   BroadcastChannelPacket,
-) {}
+])
+
+export const DirectChannelPing = Schema.TaggedStruct('DirectChannelPing', {})
 
-export class DirectChannelPing extends Schema.TaggedStruct('DirectChannelPing', {}) {}
-export class DirectChannelPong extends Schema.TaggedStruct('DirectChannelPong', {}) {}
+export const DirectChannelPong = Schema.TaggedStruct('DirectChannelPong', {})