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

package/dist/node/mod.d.ts

@@ -5,6 +5,12 @@ export * as SocketServer from '@effect/platform/SocketServer';
 export * as PlatformNode from '@effect/platform-node';
 export * as ChildProcessRunner from './ChildProcessRunner/ChildProcessRunner.ts';
 export * as ChildProcessWorker from './ChildProcessRunner/ChildProcessWorker.ts';
-export declare const getFreePort: Effect.Effect<number, UnknownError, never>;
+export declare const getFreePort: Effect.Effect<number, UnknownError>;
 export declare const OtelLiveDummy: Layer.Layer<OtelTracer.OtelTracer>;
+/**
+ * Layer that enables recursive file watching by combining the Node filesystem implementation with
+ * the Parcel-based watch backend. Mirrored from Effect’s platform-node Parcel watcher layer:
+ * https://github.com/Effect-TS/effect/blob/main/packages/platform-node/src/NodeFileSystem/ParcelWatcher.ts
+ */
+export declare const NodeRecursiveWatchLayer: Layer.Layer<import("@effect/platform/FileSystem").FileSystem | import("@effect/platform/FileSystem").WatchBackend, never, never>;
 //# sourceMappingURL=mod.d.ts.map

package/dist/node/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/node/mod.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAEtC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAG7D,OAAO,KAAK,GAAG,MAAM,aAAa,CAAA;AAClC,OAAO,KAAK,YAAY,MAAM,+BAA+B,CAAA;AAC7D,OAAO,KAAK,YAAY,MAAM,uBAAuB,CAAA;AAErD,OAAO,KAAK,kBAAkB,MAAM,4CAA4C,CAAA;AAChF,OAAO,KAAK,kBAAkB,MAAM,4CAA4C,CAAA;AAOhF,eAAO,MAAM,WAAW,4CAuBtB,CAAA;AAEF,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAQ3D,CAAA"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/node/mod.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAG7D,OAAO,KAAK,GAAG,MAAM,aAAa,CAAA;AAClC,OAAO,KAAK,YAAY,MAAM,+BAA+B,CAAA;AAC7D,OAAO,KAAK,YAAY,MAAM,uBAAuB,CAAA;AAErD,OAAO,KAAK,kBAAkB,MAAM,4CAA4C,CAAA;AAChF,OAAO,KAAK,kBAAkB,MAAM,4CAA4C,CAAA;AAOhF,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAuB1D,CAAA;AAEF,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAQ3D,CAAA;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,kIAAwE,CAAA"}

package/dist/node/mod.js

@@ -1,4 +1,6 @@
 import * as http from 'node:http';
+import * as PlatformNode from '@effect/platform-node';
+import { layer as ParcelWatcherLayer } from '@effect/platform-node/NodeFileSystem/ParcelWatcher';
 import { Effect, Layer } from 'effect';
 import { OtelTracer, UnknownError } from "../effect/index.js";
 import { makeNoopTracer } from "../NoopTracer.js";
@@ -27,8 +29,8 @@ export const getFreePort = Effect.async((cb, signal) => {
         }
     });
     // Error handling in case the server encounters an error
-    server.on('error', (err) => {
-        server.close(() => cb(Effect.fail(new UnknownError({ cause: err }))));
+    server.on('error', (cause) => {
+        server.close(() => cb(Effect.fail(new UnknownError({ cause, payload: 'Failed to get a free port' }))));
     });
 });
 export const OtelLiveDummy = Layer.suspend(() => {
@@ -36,4 +38,10 @@ export const OtelLiveDummy = Layer.suspend(() => {
     const TracingLive = Layer.unwrapEffect(Effect.map(OtelTracer.make, Layer.setTracer)).pipe(Layer.provideMerge(OtelTracerLive));
     return TracingLive;
 });
+/**
+ * Layer that enables recursive file watching by combining the Node filesystem implementation with
+ * the Parcel-based watch backend. Mirrored from Effect’s platform-node Parcel watcher layer:
+ * https://github.com/Effect-TS/effect/blob/main/packages/platform-node/src/NodeFileSystem/ParcelWatcher.ts
+ */
+export const NodeRecursiveWatchLayer = Layer.mergeAll(PlatformNode.NodeFileSystem.layer, ParcelWatcherLayer);
 //# sourceMappingURL=mod.js.map

package/dist/node/mod.js.map

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/node/mod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AAEjC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAEtC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,KAAK,GAAG,MAAM,aAAa,CAAA;AAClC,OAAO,KAAK,YAAY,MAAM,+BAA+B,CAAA;AAC7D,OAAO,KAAK,YAAY,MAAM,uBAAuB,CAAA;AAErD,OAAO,KAAK,kBAAkB,MAAM,4CAA4C,CAAA;AAChF,OAAO,KAAK,kBAAkB,MAAM,4CAA4C,CAAA;AAEhF,yCAAyC;AACzC,6EAA6E;AAE7E,6EAA6E;AAE7E,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAuB,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE;IAC3E,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAA;IAElC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;QACpC,MAAM,CAAC,KAAK,EAAE,CAAA;IAChB,CAAC,CAAC,CAAA;IAEF,4CAA4C;IAC5C,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE;QACpB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAA;QAEhC,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;YACzB,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAC9C,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,EAAE,KAAK,EAAE,2BAA2B,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/F,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,wDAAwD;IACxD,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;QACzB,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;IACvE,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,aAAa,GAAuC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;IAClF,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,cAAc,EAAE,CAAC,CAAA;IAE7E,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CACvF,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,CACnC,CAAA;IAED,OAAO,WAAW,CAAA;AACpB,CAAC,CAAC,CAAA"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/node/mod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,YAAY,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,KAAK,IAAI,kBAAkB,EAAE,MAAM,oDAAoD,CAAA;AAChG,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AACtC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,KAAK,GAAG,MAAM,aAAa,CAAA;AAClC,OAAO,KAAK,YAAY,MAAM,+BAA+B,CAAA;AAC7D,OAAO,KAAK,YAAY,MAAM,uBAAuB,CAAA;AAErD,OAAO,KAAK,kBAAkB,MAAM,4CAA4C,CAAA;AAChF,OAAO,KAAK,kBAAkB,MAAM,4CAA4C,CAAA;AAEhF,yCAAyC;AACzC,6EAA6E;AAE7E,6EAA6E;AAE7E,MAAM,CAAC,MAAM,WAAW,GAAwC,MAAM,CAAC,KAAK,CAAuB,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE;IAChH,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAA;IAElC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;QACpC,MAAM,CAAC,KAAK,EAAE,CAAA;IAChB,CAAC,CAAC,CAAA;IAEF,4CAA4C;IAC5C,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE;QACpB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAA;QAEhC,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;YACzB,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAC9C,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,EAAE,KAAK,EAAE,2BAA2B,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/F,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,wDAAwD;IACxD,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QAC3B,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,2BAA2B,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;IACxG,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,aAAa,GAAuC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;IAClF,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,cAAc,EAAE,CAAC,CAAA;IAE7E,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CACvF,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,CACnC,CAAA;IAED,OAAO,WAAW,CAAA;AACpB,CAAC,CAAC,CAAA;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,cAAc,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAA"}

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@livestore/utils",
-  "version": "0.4.0-dev.1",
+  "version": "0.4.0-dev.11",
   "type": "module",
   "sideEffects": [
-    "./src/global.ts"
+    "./src/global.ts",
+    "./dist/global.js"
   ],
   "exports": {
     ".": {
@@ -34,33 +35,35 @@
     }
   },
   "dependencies": {
+    "@effect/platform-node": "0.98.0",
     "@standard-schema/spec": "1.0.0",
-    "msgpackr": "1.11.5",
     "nanoid": "5.1.5",
-    "pretty-bytes": "7.0.0"
+    "pretty-bytes": "7.0.1"
   },
   "devDependencies": {
-    "@effect/cli": "^0.69.0",
-    "@effect/cluster": "^0.46.2",
-    "@effect/experimental": "^0.54.3",
-    "@effect/opentelemetry": "^0.56.1",
-    "@effect/platform": "^0.90.0",
-    "@effect/platform-browser": "^0.70.0",
-    "@effect/platform-bun": "^0.77.0",
-    "@effect/platform-node": "^0.94.1",
-    "@effect/printer": "^0.45.0",
-    "@effect/printer-ansi": "^0.45.0",
-    "@effect/rpc": "^0.68.3",
-    "@effect/sql": "^0.44.0",
-    "@effect/typeclass": "^0.36.0",
-    "@effect/vitest": "^0.25.0",
-    "@opentelemetry/api": "^1.9.0",
+    "@effect/ai": "^0.29.0",
+    "@effect/cli": "^0.71.0",
+    "@effect/cluster": "^0.50.0",
+    "@effect/experimental": "^0.56.0",
+    "@effect/opentelemetry": "0.58.0",
+    "@effect/platform": "^0.92.0",
+    "@effect/platform-browser": "^0.72.0",
+    "@effect/platform-bun": "^0.81.0",
+    "@effect/platform-node": "^0.98.0",
+    "@effect/printer": "^0.46.0",
+    "@effect/printer-ansi": "^0.46.0",
+    "@effect/rpc": "^0.71.0",
+    "@effect/sql": "^0.46.0",
+    "@effect/typeclass": "^0.37.0",
+    "@effect/vitest": "^0.26.0",
+    "@effect/workflow": "^0.11.0",
+    "@opentelemetry/api": "1.9.0",
     "@opentelemetry/resources": "^2.0.1",
-    "@types/bun": "^1.2.19",
+    "@types/bun": "^1.2.21",
     "@types/jsdom": "^21.1.7",
-    "@types/node": "24.2.0",
-    "@types/web": "^0.0.260",
-    "effect": "^3.17.6",
+    "@types/node": "24.5.2",
+    "@types/web": "^0.0.264",
+    "effect": "3.18.0",
     "jsdom": "^26.1.0",
     "vitest": "3.2.4"
   },
@@ -71,28 +74,26 @@
   ],
   "license": "Apache-2.0",
   "peerDependencies": {
-    "@effect/cli": "^0.69.0",
-    "@effect/cluster": "^0.46.2",
-    "@effect/experimental": "^0.54.3",
-    "@effect/opentelemetry": "^0.56.1",
-    "@effect/platform": "^0.90.0",
-    "@effect/platform-browser": "^0.70.0",
-    "@effect/platform-bun": "^0.77.0",
-    "@effect/platform-node": "^0.94.1",
-    "@effect/printer": "^0.45.0",
-    "@effect/printer-ansi": "^0.45.0",
-    "@effect/rpc": "^0.68.3",
-    "@effect/sql": "^0.44.0",
-    "@effect/typeclass": "^0.36.0",
+    "@effect/ai": "^0.29.0",
+    "@effect/cli": "^0.71.0",
+    "@effect/cluster": "^0.50.0",
+    "@effect/experimental": "^0.56.0",
+    "@effect/opentelemetry": "^0.58.0",
+    "@effect/platform": "^0.92.0",
+    "@effect/platform-browser": "^0.72.0",
+    "@effect/platform-bun": "^0.81.0",
+    "@effect/platform-node": "^0.98.0",
+    "@effect/printer": "^0.46.0",
+    "@effect/printer-ansi": "^0.46.0",
+    "@effect/rpc": "^0.71.0",
+    "@effect/sql": "^0.46.0",
+    "@effect/typeclass": "^0.37.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/resources": "^2.0.1",
-    "effect": "^3.17.6"
+    "effect": "^3.18.0"
   },
   "publishConfig": {
-    "access": "public",
-    "sideEffects": [
-      "./dist/global.js"
-    ]
+    "access": "public"
   },
   "react-native": "./dist/index.js",
   "scripts": {

package/src/NoopTracer.ts

@@ -9,6 +9,7 @@ export const makeNoopSpan = () => {
     setAttribute: () => null,
     setAttributes: () => null,
     addEvent: () => null,
+    addLink: () => null,
     setStatus: () => null,
     updateName: () => null,
     recordException: () => null,

package/src/effect/Effect.ts

@@ -1,9 +1,22 @@
 import * as OtelTracer from '@effect/opentelemetry/Tracer'
-import type { Context, Duration, Stream } from 'effect'
-import { Cause, Deferred, Effect, Fiber, FiberRef, HashSet, Logger, pipe, Scope } from 'effect'
+import {
+  Cause,
+  type Context,
+  Deferred,
+  Duration,
+  Effect,
+  Fiber,
+  FiberRef,
+  HashSet,
+  Logger,
+  pipe,
+  Scope,
+  type Stream,
+} from 'effect'
 import type { UnknownException } from 'effect/Cause'
 import { log } from 'effect/Console'
-import type { LazyArg } from 'effect/Function'
+import { dual, type LazyArg } from 'effect/Function'
+import type { Predicate, Refinement } from 'effect/Predicate'
 
 import { isPromise } from '../mod.ts'
 import { UnknownError } from './Error.ts'
@@ -94,6 +107,20 @@ export const tapCauseLogPretty = <R, E, A>(eff: Effect.Effect<A, E, R>): Effect.
     }),
   )
 
+export const ignoreIf: {
+  <E, EB extends E>(
+    refinement: Refinement<NoInfer<E>, EB>,
+  ): <A, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<void, Exclude<E, EB>, R>
+  <E>(predicate: Predicate<NoInfer<E>>): <A, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<void, E, R>
+  <A, E, R, EB extends E>(
+    self: Effect.Effect<A, E, R>,
+    refinement: Refinement<E, EB>,
+  ): Effect.Effect<void, Exclude<E, EB>, R>
+  <A, E, R>(self: Effect.Effect<A, E, R>, predicate: Predicate<E>): Effect.Effect<void, E, R>
+} = dual(2, <A, E, R>(self: Effect.Effect<A, E, R>, predicate: Predicate<E>) =>
+  self.pipe(Effect.catchIf(predicate, () => Effect.void)),
+)
+
 export const eventListener = <TEvent = unknown>(
   target: Stream.EventListener<TEvent>,
   type: string,
@@ -166,7 +193,7 @@ export const logDuration =
       const start = Date.now()
       const res = yield* eff
       const end = Date.now()
-      yield* Effect.log(`${label}: ${end - start}ms`)
+      yield* Effect.log(`${label}: ${Duration.format(end - start)}`)
       return res
     })
 

package/src/effect/Error.ts

@@ -1,6 +1,6 @@
 import { Schema } from 'effect'
 
-export class UnknownError extends Schema.TaggedError<'UnknownError'>()('UnknownError', {
+export class UnknownError extends Schema.TaggedError<UnknownError>()('UnknownError', {
   cause: Schema.Any,
   payload: Schema.optional(Schema.Any),
 }) {}

package/src/effect/Logger.ts

@@ -8,20 +8,24 @@ const defaultDateFormat = (date: Date): string =>
     .toString()
     .padStart(2, '0')}.${date.getMilliseconds().toString().padStart(3, '0')}`
 
-export const prettyWithThread = (threadName: string) =>
+export const prettyWithThread = (threadName: string, options: { mode?: 'tty' | 'browser' } = {}) =>
   Logger.replace(
     Logger.defaultLogger,
     Logger.prettyLogger({
       formatDate: (date) => `${defaultDateFormat(date)} ${threadName}`,
+      mode: options.mode,
     }),
-    // consoleLogger(threadName),
   )
 
 export const consoleLogger = (threadName: string) =>
   Logger.make(({ message, annotations, date, logLevel, cause }) => {
+    const isCloudflareWorker = typeof navigator !== 'undefined' && navigator.userAgent === 'Cloudflare-Workers'
     const consoleFn =
       logLevel === LogLevel.Debug
-        ? console.debug
+        ? // Cloudflare Workers doesn't support console.debug 🤷
+          isCloudflareWorker
+          ? console.log
+          : console.debug
         : logLevel === LogLevel.Info
           ? console.info
           : logLevel === LogLevel.Warning
@@ -35,5 +39,11 @@ export const consoleLogger = (threadName: string) =>
       messages.push(Cause.pretty(cause, { renderErrorCause: true }))
     }
 
-    consoleFn(`[${defaultDateFormat(date)} ${threadName}]`, ...messages, annotationsObj)
+    if (Object.keys(annotationsObj).length > 0) {
+      messages.push(annotationsObj)
+    }
+
+    consoleFn(`[${defaultDateFormat(date)} ${threadName}]`, ...messages)
   })
+
+export const consoleWithThread = (threadName: string) => Logger.replace(Logger.defaultLogger, consoleLogger(threadName))

package/src/effect/OtelTracer.ts

@@ -0,0 +1,11 @@
+import { makeExternalSpan } from '@effect/opentelemetry/Tracer'
+import type { Link as OtelSpanLink } from '@opentelemetry/api'
+import type { SpanLink as EffectSpanLink } from 'effect/Tracer'
+
+export * from '@effect/opentelemetry/Tracer'
+
+export const makeSpanLink = (otelSpanLink: OtelSpanLink): EffectSpanLink => ({
+  _tag: 'SpanLink',
+  span: makeExternalSpan(otelSpanLink.context),
+  attributes: otelSpanLink.attributes ?? {},
+})

package/src/effect/RpcClient.ts

@@ -0,0 +1,212 @@
+export * from '@effect/rpc/RpcClient'
+
+import { Socket } from '@effect/platform'
+import { RpcClient, RpcClientError, RpcSerialization } from '@effect/rpc'
+import { Protocol } from '@effect/rpc/RpcClient'
+import { constPing, type FromServerEncoded } from '@effect/rpc/RpcMessage'
+import { Cause, Deferred, Effect, Layer, Option, Schedule, type Scope } from 'effect'
+import { constVoid, identity } from 'effect/Function'
+import * as SubscriptionRef from './SubscriptionRef.ts'
+
+// This is based on `makeProtocolSocket` / `layerProtocolSocket` from `@effect/rpc` in order to:
+// - Add a `isConnected` subscription ref to track the connection state
+// - Add a ping schedule to the socket
+// - Add a retry schedule to the socket
+
+export const layerProtocolSocketWithIsConnected = (options: {
+  readonly url: string
+  readonly retryTransientErrors?: Schedule.Schedule<unknown> | undefined
+  readonly isConnected: SubscriptionRef.SubscriptionRef<boolean>
+  readonly pingSchedule?: Schedule.Schedule<unknown> | undefined
+}): Layer.Layer<Protocol, never, RpcSerialization.RpcSerialization | Socket.Socket> =>
+  Layer.scoped(Protocol, makeProtocolSocketWithIsConnected(options))
+
+export const makeProtocolSocketWithIsConnected = (options: {
+  readonly url: string
+  readonly retryTransientErrors?: Schedule.Schedule<unknown> | undefined
+  // CHANGED: add isConnected subscription ref
+  readonly isConnected: SubscriptionRef.SubscriptionRef<boolean>
+  // CHANGED: add ping schedule
+  readonly pingSchedule?: Schedule.Schedule<unknown> | undefined
+}): Effect.Effect<Protocol['Type'], never, Scope.Scope | RpcSerialization.RpcSerialization | Socket.Socket> =>
+  Protocol.make(
+    Effect.fnUntraced(function* (writeResponse) {
+      const socket = yield* Socket.Socket
+      const serialization = yield* RpcSerialization.RpcSerialization
+
+      const write = yield* socket.writer
+      const parser = serialization.unsafeMake()
+
+      const pinger = yield* makePinger(write(parser.encode(constPing)!), options?.pingSchedule)
+
+      yield* Effect.suspend(() => {
+        // We rely on the heartbeat watchdog while streaming arbitrarily long payloads.
+        // Reset the timer as soon as _any_ frame arrives so that large batches which
+        // don't contain explicit `Pong` messages don't trigger the open-timeout defect.
+        // (The actual pong handler still calls `onPong()` to resolve manual pings.)
+        // CHANGED: don't reset parser on every message
+        // parser = serialization.unsafeMake()
+        pinger.reset()
+        return socket
+          .runRaw((message) => {
+            try {
+              const responses = parser.decode(message) as Array<FromServerEncoded>
+              if (responses.length === 0) return
+              let i = 0
+              return Effect.whileLoop({
+                while: () => i < responses.length,
+                body: () => {
+                  const response = responses[i++]!
+                  // Keep extending the watchdog for each data frame to avoid
+                  // disconnecting mid-stream when the server is busy sending batches.
+                  pinger.reset()
+                  if (response._tag === 'Pong') {
+                    pinger.onPong()
+                  }
+                  return writeResponse(response).pipe(
+                    // CHANGED: set isConnected to true on pong
+                    Effect.tap(
+                      Effect.fn(function* () {
+                        if (options?.isConnected !== undefined) {
+                          yield* SubscriptionRef.set(options.isConnected, true)
+                        }
+                      }),
+                    ),
+                  )
+                },
+                step: constVoid,
+              })
+            } catch (defect) {
+              return writeResponse({
+                _tag: 'ClientProtocolError',
+                error: new RpcClientError.RpcClientError({
+                  reason: 'Protocol',
+                  message: 'Error decoding message',
+                  cause: Cause.fail(defect),
+                }),
+              })
+            }
+          })
+          .pipe(
+            Effect.raceFirst(
+              Effect.zipRight(
+                pinger.timeout,
+                Effect.fail(
+                  new Socket.SocketGenericError({
+                    reason: 'OpenTimeout',
+                    cause: new Error('ping timeout'),
+                  }),
+                ),
+              ),
+            ),
+          )
+      }).pipe(
+        Effect.zipRight(
+          Effect.fail(
+            new Socket.SocketCloseError({
+              reason: 'Close',
+              code: 1000,
+              closeReason: 'Closing connection',
+            }),
+          ),
+        ),
+        Effect.tapErrorCause(
+          Effect.fn(function* (cause) {
+            // CHANGED: set isConnected to false on error
+            if (options?.isConnected !== undefined) {
+              yield* SubscriptionRef.set(options.isConnected, false)
+            }
+
+            const error = Cause.failureOption(cause)
+            if (
+              options?.retryTransientErrors &&
+              Option.isSome(error) &&
+              (error.value.reason === 'Open' || error.value.reason === 'OpenTimeout')
+            ) {
+              return
+            }
+            // yield* Effect.logError('Error in socket', cause)
+            return yield* writeResponse({
+              _tag: 'ClientProtocolError',
+              error: new RpcClientError.RpcClientError({
+                reason: 'Protocol',
+                message: 'Error in socket',
+                cause: Cause.squash(cause),
+              }),
+            })
+          }),
+        ),
+        // CHANGED: make configurable via schedule
+        options?.retryTransientErrors ? Effect.retry(options.retryTransientErrors) : identity,
+        Effect.annotateLogs({
+          module: 'RpcClient',
+          method: 'makeProtocolSocket',
+        }),
+        Effect.interruptible,
+        Effect.ignore, // Errors are already handled
+        Effect.provide(Layer.setUnhandledErrorLogLevel(Option.none())),
+        Effect.forkScoped,
+      )
+
+      return {
+        send: (request) => {
+          const encoded = parser.encode(request)
+          if (encoded === undefined) return Effect.void
+
+          return Effect.orDie(write(encoded))
+        },
+        supportsAck: true,
+        supportsTransferables: false,
+        pinger,
+      }
+    }),
+  )
+
+export const SocketPinger = Effect.map(RpcClient.Protocol, (protocol) => (protocol as any).pinger as SocketPinger)
+
+export type SocketPinger = Effect.Effect.Success<ReturnType<typeof makePinger>>
+
+const makePinger = Effect.fnUntraced(function* <A, E, R>(
+  writePing: Effect.Effect<A, E, R>,
+  pingSchedule: Schedule.Schedule<unknown> = Schedule.spaced(10000).pipe(Schedule.addDelay(() => 5000)),
+) {
+  // CHANGED: add manual ping deferreds
+  const manualPingDeferreds = new Set<Deferred.Deferred<void, never>>()
+
+  let recievedPong = true
+  const latch = Effect.unsafeMakeLatch()
+  const reset = () => {
+    recievedPong = true
+    latch.unsafeClose()
+  }
+  const onPong = () => {
+    recievedPong = true
+    // CHANGED: mark all manual ping deferreds as done
+    for (const deferred of manualPingDeferreds) {
+      Deferred.unsafeDone(deferred, Effect.void)
+    }
+  }
+  yield* Effect.suspend(() => {
+    // Starting new ping
+    if (!recievedPong) return latch.open
+    recievedPong = false
+    return writePing
+  }).pipe(
+    // CHANGED: make configurable via schedule
+    Effect.schedule(pingSchedule),
+    Effect.ignore,
+    Effect.forever,
+    Effect.interruptible,
+    Effect.forkScoped,
+  )
+
+  // CHANGED: add manual ping
+  const ping = Effect.gen(function* () {
+    const deferred = yield* Deferred.make<void, never>()
+    manualPingDeferreds.add(deferred)
+    yield* deferred
+    manualPingDeferreds.delete(deferred)
+  })
+
+  return { timeout: latch.await, reset, onPong, ping } as const
+})

package/src/effect/Schema/index.ts

@@ -1,14 +1,13 @@
 import { Transferable } from '@effect/platform'
-import type { SchemaAST } from 'effect'
 import { Effect, Hash, ParseResult, Schema } from 'effect'
 import type { ParseError } from 'effect/ParseResult'
 import type { ParseOptions } from 'effect/SchemaAST'
+import * as SchemaAST from 'effect/SchemaAST'
 
 import { shouldNeverHappen } from '../../mod.ts'
 
 export * from 'effect/Schema'
 export * from './debug-diff.ts'
-export * from './msgpack.ts'
 
 // NOTE this is a temporary workaround until Effect schema has a better way to hash schemas
 // https://github.com/Effect-TS/effect/issues/2719
@@ -24,6 +23,21 @@ export const hash = (schema: Schema.Schema<any>) => {
   }
 }
 
+const resolveStructAst = (ast: SchemaAST.AST): SchemaAST.AST => {
+  if (SchemaAST.isTransformation(ast)) {
+    return resolveStructAst(ast.from)
+  }
+
+  return ast
+}
+
+export const getResolvedPropertySignatures = (
+  schema: Schema.Schema.AnyNoContext,
+): ReadonlyArray<SchemaAST.PropertySignature> => {
+  const resolvedAst = resolveStructAst(schema.ast)
+  return SchemaAST.getPropertySignatures(resolvedAst)
+}
+
 export const encodeWithTransferables =
   <A, I, R>(schema: Schema.Schema<A, I, R>, options?: ParseOptions | undefined) =>
   (a: A, overrideOptions?: ParseOptions | undefined): Effect.Effect<[I, Transferable[]], ParseError, R> =>
@@ -82,4 +96,4 @@ export const JsonValue: Schema.Schema<JsonValue> = Schema.Union(
   Schema.Null,
   Schema.Array(Schema.suspend(() => JsonValue)),
   Schema.Record({ key: Schema.String, value: Schema.suspend(() => JsonValue) }),
-).annotations({ title: 'JsonValue' })
+).annotations({ identifier: 'JsonValue' })