@livestore/common 0.3.0-dev.19 → 0.3.0-dev.21

package/dist/devtools/devtools-sessioninfo.js

@@ -0,0 +1,34 @@
+import { Data, Duration, Effect, FiberMap, HashSet, Schedule, Schema, Stream, Subscribable, SubscriptionRef, } from '@livestore/utils/effect';
+export const RequestSessions = Schema.TaggedStruct('RequestSessions', {});
+export const SessionInfo = Schema.TaggedStruct('SessionInfo', {
+    storeId: Schema.String,
+    clientId: Schema.String,
+    sessionId: Schema.String,
+});
+export const Message = Schema.Union(RequestSessions, SessionInfo);
+/** Usually called in client session */
+export const provideSessionInfo = ({ webChannel, sessionInfo, }) => Effect.gen(function* () {
+    yield* webChannel.send(sessionInfo);
+    yield* webChannel.listen.pipe(Stream.flatten(), Stream.filter(Schema.is(RequestSessions)), Stream.tap(() => webChannel.send(sessionInfo)), Stream.runDrain);
+});
+/** Usually called in devtools */
+export const requestSessionInfoSubscription = ({ webChannel, pollInterval = Duration.seconds(1), staleTimeout = Duration.seconds(5), }) => Effect.gen(function* () {
+    yield* webChannel
+        .send(RequestSessions.make({}))
+        .pipe(Effect.repeat(Schedule.spaced(pollInterval)), Effect.interruptible, Effect.tapCauseLogPretty, Effect.forkScoped);
+    const timeoutFiberMap = yield* FiberMap.make();
+    const sessionInfoSubRef = yield* SubscriptionRef.make(HashSet.empty());
+    yield* webChannel.listen.pipe(Stream.flatten(), Stream.filter(Schema.is(SessionInfo)), Stream.map(Data.struct), Stream.tap(Effect.fn(function* (sessionInfo) {
+        yield* SubscriptionRef.getAndUpdate(sessionInfoSubRef, HashSet.add(sessionInfo));
+        // Remove sessionInfo from cache after staleTimeout (unless a new identical item resets the timeout)
+        yield* FiberMap.run(timeoutFiberMap, sessionInfo, Effect.gen(function* () {
+            yield* Effect.sleep(staleTimeout);
+            yield* SubscriptionRef.getAndUpdate(sessionInfoSubRef, HashSet.remove(sessionInfo));
+        }));
+    })), Stream.runDrain, Effect.tapCauseLogPretty, Effect.forkScoped);
+    return Subscribable.make({
+        get: sessionInfoSubRef.get.pipe(Effect.map((sessionInfos) => new Set(sessionInfos))),
+        changes: sessionInfoSubRef.changes.pipe(Stream.map((sessionInfos) => new Set(sessionInfos))),
+    });
+});
+//# sourceMappingURL=devtools-sessioninfo.js.map

package/dist/devtools/devtools-sessioninfo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"devtools-sessioninfo.js","sourceRoot":"","sources":["../../src/devtools/devtools-sessioninfo.ts"],"names":[],"mappings":"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"}

package/dist/devtools/devtools-sessions-channel.d.ts

@@ -0,0 +1,28 @@
+import type { ParseResult, Scope, WebChannel } from '@livestore/utils/effect';
+import { Duration, Effect, Schema, Subscribable } from '@livestore/utils/effect';
+export declare const RequestSessions: Schema.TaggedStruct<"RequestSessions", {}>;
+export type RequestSessions = typeof RequestSessions.Type;
+export declare const SessionInfo: Schema.TaggedStruct<"SessionInfo", {
+    storeId: typeof Schema.String;
+    clientId: typeof Schema.String;
+    sessionId: typeof Schema.String;
+}>;
+export type SessionInfo = typeof SessionInfo.Type;
+export declare const Message: Schema.Union<[Schema.TaggedStruct<"RequestSessions", {}>, Schema.TaggedStruct<"SessionInfo", {
+    storeId: typeof Schema.String;
+    clientId: typeof Schema.String;
+    sessionId: typeof Schema.String;
+}>]>;
+export type Message = typeof Message.Type;
+/** Usually called in client session */
+export declare const provideSessionInfo: ({ webChannel, sessionInfo, }: {
+    webChannel: WebChannel.WebChannel<Message, Message>;
+    sessionInfo: SessionInfo;
+}) => Effect.Effect<void, ParseResult.ParseError>;
+/** Usually called in devtools */
+export declare const requestSessionInfoSubscription: ({ webChannel, pollInterval, staleTimeout, }: {
+    webChannel: WebChannel.WebChannel<Message, Message>;
+    pollInterval?: Duration.DurationInput;
+    staleTimeout?: Duration.DurationInput;
+}) => Effect.Effect<Subscribable.Subscribable<Set<SessionInfo>>, ParseResult.ParseError, Scope.Scope>;
+//# sourceMappingURL=devtools-sessions-channel.d.ts.map

package/dist/devtools/devtools-sessions-channel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"devtools-sessions-channel.d.ts","sourceRoot":"","sources":["../../src/devtools/devtools-sessions-channel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAC7E,OAAO,EAEL,QAAQ,EACR,MAAM,EAIN,MAAM,EAEN,YAAY,EAEb,MAAM,yBAAyB,CAAA;AAEhC,eAAO,MAAM,eAAe,4CAA6C,CAAA;AACzE,MAAM,MAAM,eAAe,GAAG,OAAO,eAAe,CAAC,IAAI,CAAA;AAEzD,eAAO,MAAM,WAAW;;;;EAItB,CAAA;AACF,MAAM,MAAM,WAAW,GAAG,OAAO,WAAW,CAAC,IAAI,CAAA;AAEjD,eAAO,MAAM,OAAO;;;;IAA6C,CAAA;AACjE,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAEzC,uCAAuC;AACvC,eAAO,MAAM,kBAAkB,GAAI,8BAGhC;IACD,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACnD,WAAW,EAAE,WAAW,CAAA;CACzB,KAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,UAAU,CAU1C,CAAA;AAEJ,iCAAiC;AACjC,eAAO,MAAM,8BAA8B,GAAI,6CAI5C;IACD,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACnD,YAAY,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAA;IACrC,YAAY,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAA;CACtC,KAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,EAAE,WAAW,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,CA2C9F,CAAA"}

package/dist/devtools/devtools-sessions-channel.js

@@ -0,0 +1,34 @@
+import { Data, Duration, Effect, FiberMap, HashSet, Schedule, Schema, Stream, Subscribable, SubscriptionRef, } from '@livestore/utils/effect';
+export const RequestSessions = Schema.TaggedStruct('RequestSessions', {});
+export const SessionInfo = Schema.TaggedStruct('SessionInfo', {
+    storeId: Schema.String,
+    clientId: Schema.String,
+    sessionId: Schema.String,
+});
+export const Message = Schema.Union(RequestSessions, SessionInfo);
+/** Usually called in client session */
+export const provideSessionInfo = ({ webChannel, sessionInfo, }) => Effect.gen(function* () {
+    yield* webChannel.send(sessionInfo);
+    yield* webChannel.listen.pipe(Stream.flatten(), Stream.filter(Schema.is(RequestSessions)), Stream.tap(() => webChannel.send(sessionInfo)), Stream.runDrain);
+});
+/** Usually called in devtools */
+export const requestSessionInfoSubscription = ({ webChannel, pollInterval = Duration.seconds(1), staleTimeout = Duration.seconds(5), }) => Effect.gen(function* () {
+    yield* webChannel
+        .send(RequestSessions.make({}))
+        .pipe(Effect.repeat(Schedule.spaced(pollInterval)), Effect.interruptible, Effect.tapCauseLogPretty, Effect.forkScoped);
+    const timeoutFiberMap = yield* FiberMap.make();
+    const sessionInfoSubRef = yield* SubscriptionRef.make(HashSet.empty());
+    yield* webChannel.listen.pipe(Stream.flatten(), Stream.filter(Schema.is(SessionInfo)), Stream.map(Data.struct), Stream.tap(Effect.fn(function* (sessionInfo) {
+        yield* SubscriptionRef.getAndUpdate(sessionInfoSubRef, HashSet.add(sessionInfo));
+        // Remove sessionInfo from cache after staleTimeout (unless a new identical item resets the timeout)
+        yield* FiberMap.run(timeoutFiberMap, sessionInfo, Effect.gen(function* () {
+            yield* Effect.sleep(staleTimeout);
+            yield* SubscriptionRef.getAndUpdate(sessionInfoSubRef, HashSet.remove(sessionInfo));
+        }));
+    })), Stream.runDrain, Effect.tapCauseLogPretty, Effect.forkScoped);
+    return Subscribable.make({
+        get: sessionInfoSubRef.get.pipe(Effect.map((sessionInfos) => new Set(sessionInfos))),
+        changes: sessionInfoSubRef.changes.pipe(Stream.map((sessionInfos) => new Set(sessionInfos))),
+    });
+});
+//# sourceMappingURL=devtools-sessions-channel.js.map

package/dist/devtools/devtools-sessions-channel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"devtools-sessions-channel.js","sourceRoot":"","sources":["../../src/devtools/devtools-sessions-channel.ts"],"names":[],"mappings":"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"}

package/dist/devtools/index.d.ts

@@ -1,61 +1,39 @@
-import type { Effect, Scope } from '@livestore/utils/effect';
-import { Schema, WebChannel } from '@livestore/utils/effect';
+import { Schema } from '@livestore/utils/effect';
 export * from './devtools-messages.js';
 export * from './devtools-window-message.js';
-export * from './devtools-bridge.js';
-export declare namespace WebBridge {
-    const AppHostReady_base: Schema.TaggedStruct<"LSD.WebBridge.AppHostReady", {
-        appHostId: typeof Schema.String;
-        isLeader: typeof Schema.Boolean;
-    }>;
-    export class AppHostReady extends AppHostReady_base {
-    }
-    const DevtoolsReady_base: Schema.TaggedStruct<"LSD.WebBridge.DevtoolsReady", {
-        devtoolsId: typeof Schema.String;
-    }>;
-    export class DevtoolsReady extends DevtoolsReady_base {
-    }
-    const ConnectToDevtools_base: Schema.TaggedStruct<"LSD.WebBridge.ConnectToDevtools", {
-        devtoolsId: typeof Schema.String;
-        appHostId: typeof Schema.String;
-        /**
-         * Given the m:n relationship between devtools and app hosts and the fact that appHostIds are usually
-         * sticky, we generate a new unique id for the lifetime of the web bridge.
-         */
-        webBridgeId: typeof Schema.String;
-        isLeader: typeof Schema.Boolean;
-        storeId: typeof Schema.String;
-    }>;
-    export class ConnectToDevtools extends ConnectToDevtools_base {
-    }
-    const AppHostWillDisconnect_base: Schema.TaggedStruct<"LSD.WebBridge.AppHostWillDisconnect", {
-        appHostId: typeof Schema.String;
-    }>;
-    export class AppHostWillDisconnect extends AppHostWillDisconnect_base {
-    }
-    const All_base: Schema.Union<[typeof AppHostReady, typeof DevtoolsReady, typeof ConnectToDevtools, typeof AppHostWillDisconnect]>;
-    export class All extends All_base {
-    }
-    export const makeBroadcastChannel: (key?: string) => Effect.Effect<WebChannel.WebChannel<typeof All.Type, typeof All.Type>, never, Scope.Scope>;
-    export {};
-}
-export declare const DevtoolsMode: Schema.Union<[Schema.TaggedStruct<"from-search-params", {}>, Schema.TaggedStruct<"expo", {
+export * as SessionsChannel from './devtools-sessions-channel.js';
+export declare const ClientSessionInfo: Schema.Struct<{
     storeId: typeof Schema.String;
     clientId: typeof Schema.String;
     sessionId: typeof Schema.String;
+}>;
+export declare const DevtoolsMode: Schema.Union<[Schema.TaggedStruct<"expo", {
+    clientSessionInfo: Schema.UndefinedOr<Schema.Struct<{
+        storeId: typeof Schema.String;
+        clientId: typeof Schema.String;
+        sessionId: typeof Schema.String;
+    }>>;
 }>, Schema.TaggedStruct<"node", {
-    storeId: typeof Schema.String;
-    clientId: typeof Schema.String;
-    sessionId: typeof Schema.String;
+    clientSessionInfo: Schema.UndefinedOr<Schema.Struct<{
+        storeId: typeof Schema.String;
+        clientId: typeof Schema.String;
+        sessionId: typeof Schema.String;
+    }>>;
     url: typeof Schema.String;
 }>, Schema.TaggedStruct<"web", {
-    storeId: typeof Schema.String;
-    clientId: typeof Schema.String;
-    sessionId: typeof Schema.String;
+    clientSessionInfo: Schema.UndefinedOr<Schema.Struct<{
+        storeId: typeof Schema.String;
+        clientId: typeof Schema.String;
+        sessionId: typeof Schema.String;
+    }>>;
 }>, Schema.TaggedStruct<"browser-extension", {
-    storeId: typeof Schema.String;
-    clientId: typeof Schema.String;
-    sessionId: typeof Schema.String;
+    clientSessionInfo: Schema.UndefinedOr<Schema.Struct<{
+        storeId: typeof Schema.String;
+        clientId: typeof Schema.String;
+        sessionId: typeof Schema.String;
+    }>>;
 }>]>;
 export type DevtoolsMode = typeof DevtoolsMode.Type;
+export declare const DevtoolsModeTag: Schema.SchemaClass<"expo" | "node" | "web" | "browser-extension", "expo" | "node" | "web" | "browser-extension", never>;
+export type DevtoolsModeTag = typeof DevtoolsModeTag.Type;
 //# sourceMappingURL=index.d.ts.map

package/dist/devtools/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/devtools/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAE5D,cAAc,wBAAwB,CAAA;AACtC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,sBAAsB,CAAA;AAEpC,yBAAiB,SAAS,CAAC;;;;;IACzB,MAAM,OAAO,YAAa,SAAQ,iBAIhC;KAAG;;;;IAEL,MAAM,OAAO,aAAc,SAAQ,kBAEjC;KAAG;;;;QAKH;;;WAGG;;;;;IANL,MAAM,OAAO,iBAAkB,SAAQ,sBAUrC;KAAG;;;;IAEL,MAAM,OAAO,qBAAsB,SAAQ,0BAEzC;KAAG;;IAML,MAAM,OAAO,GAAI,SAAQ,QAAmF;KAAG;IAE/G,MAAM,CAAC,MAAM,oBAAoB,GAC/B,MAAM,MAAM,KACX,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,GAAG,CAAC,IAAI,EAAE,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAIxF,CAAA;;CACL;AAED,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;IAwBxB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC,IAAI,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/devtools/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,cAAc,wBAAwB,CAAA;AACtC,cAAc,8BAA8B,CAAA;AAC5C,OAAO,KAAK,eAAe,MAAM,gCAAgC,CAAA;AACjE,eAAO,MAAM,iBAAiB;;;;EAI5B,CAAA;AAEF,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;IAexB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC,IAAI,CAAA;AAEnD,eAAO,MAAM,eAAe,yHAA6D,CAAA;AACzF,MAAM,MAAM,eAAe,GAAG,OAAO,eAAe,CAAC,IAAI,CAAA"}

package/dist/devtools/index.js

@@ -1,68 +1,23 @@
-import { Schema, WebChannel } from '@livestore/utils/effect';
+import { Schema } from '@livestore/utils/effect';
 export * from './devtools-messages.js';
 export * from './devtools-window-message.js';
-export * from './devtools-bridge.js';
-export var WebBridge;
-(function (WebBridge) {
-    class AppHostReady extends Schema.TaggedStruct('LSD.WebBridge.AppHostReady', {
-        appHostId: Schema.String,
-        // storeId: Schema.String,
-        isLeader: Schema.Boolean,
-    }) {
-    }
-    WebBridge.AppHostReady = AppHostReady;
-    class DevtoolsReady extends Schema.TaggedStruct('LSD.WebBridge.DevtoolsReady', {
-        devtoolsId: Schema.String,
-    }) {
-    }
-    WebBridge.DevtoolsReady = DevtoolsReady;
-    class ConnectToDevtools extends Schema.TaggedStruct('LSD.WebBridge.ConnectToDevtools', {
-        devtoolsId: Schema.String,
-        appHostId: Schema.String,
-        /**
-         * Given the m:n relationship between devtools and app hosts and the fact that appHostIds are usually
-         * sticky, we generate a new unique id for the lifetime of the web bridge.
-         */
-        webBridgeId: Schema.String,
-        isLeader: Schema.Boolean,
-        storeId: Schema.String,
-    }) {
-    }
-    WebBridge.ConnectToDevtools = ConnectToDevtools;
-    class AppHostWillDisconnect extends Schema.TaggedStruct('LSD.WebBridge.AppHostWillDisconnect', {
-        appHostId: Schema.String,
-    }) {
-    }
-    WebBridge.AppHostWillDisconnect = AppHostWillDisconnect;
-    // export class DevtoolsWillDisconnect extends Schema.TaggedStruct('LSD.WebBridge.DevtoolsWillDisconnect', {
-    //   appHostId: Schema.String,
-    // }) {}
-    class All extends Schema.Union(AppHostReady, DevtoolsReady, ConnectToDevtools, AppHostWillDisconnect) {
-    }
-    WebBridge.All = All;
-    WebBridge.makeBroadcastChannel = (key) => WebChannel.broadcastChannel({
-        channelName: `livestore-web-bridge-devtools${key ? `-${key}` : ''}`,
-        schema: All,
-    });
-})(WebBridge || (WebBridge = {}));
-export const DevtoolsMode = Schema.Union(Schema.TaggedStruct('from-search-params', {}), Schema.TaggedStruct('expo', {
+export * as SessionsChannel from './devtools-sessions-channel.js';
+export const ClientSessionInfo = Schema.Struct({
     storeId: Schema.String,
     clientId: Schema.String,
     sessionId: Schema.String,
+});
+export const DevtoolsMode = Schema.Union(Schema.TaggedStruct('expo', {
+    clientSessionInfo: Schema.UndefinedOr(ClientSessionInfo),
 }), 
 // TODO add storeId, clientId and sessionId for Node
 Schema.TaggedStruct('node', {
-    storeId: Schema.String,
-    clientId: Schema.String,
-    sessionId: Schema.String,
+    clientSessionInfo: Schema.UndefinedOr(ClientSessionInfo),
     url: Schema.String,
 }), Schema.TaggedStruct('web', {
-    storeId: Schema.String,
-    clientId: Schema.String,
-    sessionId: Schema.String,
+    clientSessionInfo: Schema.UndefinedOr(ClientSessionInfo),
 }), Schema.TaggedStruct('browser-extension', {
-    storeId: Schema.String,
-    clientId: Schema.String,
-    sessionId: Schema.String,
+    clientSessionInfo: Schema.UndefinedOr(ClientSessionInfo),
 }));
+export const DevtoolsModeTag = DevtoolsMode.pipe(Schema.pluck('_tag'), Schema.typeSchema);
 //# sourceMappingURL=index.js.map

package/dist/devtools/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/devtools/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAE5D,cAAc,wBAAwB,CAAA;AACtC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,sBAAsB,CAAA;AAEpC,MAAM,KAAW,SAAS,CAwCzB;AAxCD,WAAiB,SAAS;IACxB,MAAa,YAAa,SAAQ,MAAM,CAAC,YAAY,CAAC,4BAA4B,EAAE;QAClF,SAAS,EAAE,MAAM,CAAC,MAAM;QACxB,0BAA0B;QAC1B,QAAQ,EAAE,MAAM,CAAC,OAAO;KACzB,CAAC;KAAG;IAJQ,sBAAY,eAIpB,CAAA;IAEL,MAAa,aAAc,SAAQ,MAAM,CAAC,YAAY,CAAC,6BAA6B,EAAE;QACpF,UAAU,EAAE,MAAM,CAAC,MAAM;KAC1B,CAAC;KAAG;IAFQ,uBAAa,gBAErB,CAAA;IAEL,MAAa,iBAAkB,SAAQ,MAAM,CAAC,YAAY,CAAC,iCAAiC,EAAE;QAC5F,UAAU,EAAE,MAAM,CAAC,MAAM;QACzB,SAAS,EAAE,MAAM,CAAC,MAAM;QACxB;;;WAGG;QACH,WAAW,EAAE,MAAM,CAAC,MAAM;QAC1B,QAAQ,EAAE,MAAM,CAAC,OAAO;QACxB,OAAO,EAAE,MAAM,CAAC,MAAM;KACvB,CAAC;KAAG;IAVQ,2BAAiB,oBAUzB,CAAA;IAEL,MAAa,qBAAsB,SAAQ,MAAM,CAAC,YAAY,CAAC,qCAAqC,EAAE;QACpG,SAAS,EAAE,MAAM,CAAC,MAAM;KACzB,CAAC;KAAG;IAFQ,+BAAqB,wBAE7B,CAAA;IAEL,4GAA4G;IAC5G,8BAA8B;IAC9B,QAAQ;IAER,MAAa,GAAI,SAAQ,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,qBAAqB,CAAC;KAAG;IAAlG,aAAG,MAA+F,CAAA;IAElG,8BAAoB,GAAG,CAClC,GAAY,EACgF,EAAE,CAC9F,UAAU,CAAC,gBAAgB,CAAC;QAC1B,WAAW,EAAE,gCAAgC,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;QACnE,MAAM,EAAE,GAAG;KACZ,CAAC,CAAA;AACN,CAAC,EAxCgB,SAAS,KAAT,SAAS,QAwCzB;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CACtC,MAAM,CAAC,YAAY,CAAC,oBAAoB,EAAE,EAAE,CAAC,EAC7C,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE;IAC1B,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,QAAQ,EAAE,MAAM,CAAC,MAAM;IACvB,SAAS,EAAE,MAAM,CAAC,MAAM;CACzB,CAAC;AACF,oDAAoD;AACpD,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE;IAC1B,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,QAAQ,EAAE,MAAM,CAAC,MAAM;IACvB,SAAS,EAAE,MAAM,CAAC,MAAM;IACxB,GAAG,EAAE,MAAM,CAAC,MAAM;CACnB,CAAC,EACF,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE;IACzB,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,QAAQ,EAAE,MAAM,CAAC,MAAM;IACvB,SAAS,EAAE,MAAM,CAAC,MAAM;CACzB,CAAC,EACF,MAAM,CAAC,YAAY,CAAC,mBAAmB,EAAE;IACvC,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,QAAQ,EAAE,MAAM,CAAC,MAAM;IACvB,SAAS,EAAE,MAAM,CAAC,MAAM;CACzB,CAAC,CACH,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/devtools/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,cAAc,wBAAwB,CAAA;AACtC,cAAc,8BAA8B,CAAA;AAC5C,OAAO,KAAK,eAAe,MAAM,gCAAgC,CAAA;AACjE,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7C,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,QAAQ,EAAE,MAAM,CAAC,MAAM;IACvB,SAAS,EAAE,MAAM,CAAC,MAAM;CACzB,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CACtC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE;IAC1B,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC;CACzD,CAAC;AACF,oDAAoD;AACpD,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE;IAC1B,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC;IACxD,GAAG,EAAE,MAAM,CAAC,MAAM;CACnB,CAAC,EACF,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE;IACzB,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC;CACzD,CAAC,EACF,MAAM,CAAC,YAAY,CAAC,mBAAmB,EAAE;IACvC,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC;CACzD,CAAC,CACH,CAAA;AAID,MAAM,CAAC,MAAM,eAAe,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA"}

package/dist/devtools/mod.d.ts

@@ -0,0 +1,39 @@
+import { Schema } from '@livestore/utils/effect';
+export * from './devtools-messages.js';
+export * from './devtools-window-message.js';
+export * as SessionInfo from './devtools-sessioninfo.js';
+export declare const ClientSessionInfo: Schema.Struct<{
+    storeId: typeof Schema.String;
+    clientId: typeof Schema.String;
+    sessionId: typeof Schema.String;
+}>;
+export declare const DevtoolsMode: Schema.Union<[Schema.TaggedStruct<"expo", {
+    clientSessionInfo: Schema.optional<Schema.Struct<{
+        storeId: typeof Schema.String;
+        clientId: typeof Schema.String;
+        sessionId: typeof Schema.String;
+    }>>;
+}>, Schema.TaggedStruct<"node", {
+    clientSessionInfo: Schema.UndefinedOr<Schema.Struct<{
+        storeId: typeof Schema.String;
+        clientId: typeof Schema.String;
+        sessionId: typeof Schema.String;
+    }>>;
+    url: typeof Schema.String;
+}>, Schema.TaggedStruct<"web", {
+    clientSessionInfo: Schema.UndefinedOr<Schema.Struct<{
+        storeId: typeof Schema.String;
+        clientId: typeof Schema.String;
+        sessionId: typeof Schema.String;
+    }>>;
+}>, Schema.TaggedStruct<"browser-extension", {
+    clientSessionInfo: Schema.UndefinedOr<Schema.Struct<{
+        storeId: typeof Schema.String;
+        clientId: typeof Schema.String;
+        sessionId: typeof Schema.String;
+    }>>;
+}>]>;
+export type DevtoolsMode = typeof DevtoolsMode.Type;
+export declare const DevtoolsModeTag: Schema.SchemaClass<"expo" | "node" | "web" | "browser-extension", "expo" | "node" | "web" | "browser-extension", never>;
+export type DevtoolsModeTag = typeof DevtoolsModeTag.Type;
+//# sourceMappingURL=mod.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/devtools/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,cAAc,wBAAwB,CAAA;AACtC,cAAc,8BAA8B,CAAA;AAC5C,OAAO,KAAK,WAAW,MAAM,2BAA2B,CAAA;AACxD,eAAO,MAAM,iBAAiB;;;;EAI5B,CAAA;AAEF,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;IAmBxB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC,IAAI,CAAA;AAEnD,eAAO,MAAM,eAAe,yHAA6D,CAAA;AACzF,MAAM,MAAM,eAAe,GAAG,OAAO,eAAe,CAAC,IAAI,CAAA"}

package/dist/devtools/mod.js

@@ -0,0 +1,27 @@
+import { Schema } from '@livestore/utils/effect';
+export * from './devtools-messages.js';
+export * from './devtools-window-message.js';
+export * as SessionInfo from './devtools-sessioninfo.js';
+export const ClientSessionInfo = Schema.Struct({
+    storeId: Schema.String,
+    clientId: Schema.String,
+    sessionId: Schema.String,
+});
+export const DevtoolsMode = Schema.Union(Schema.TaggedStruct('expo', {
+    // TODO get rid of embedded `clientSessionInfo`
+    clientSessionInfo: Schema.optional(ClientSessionInfo),
+}), 
+// TODO add storeId, clientId and sessionId for Node
+Schema.TaggedStruct('node', {
+    // TODO get rid of embedded `clientSessionInfo`
+    clientSessionInfo: Schema.UndefinedOr(ClientSessionInfo),
+    url: Schema.String,
+}), Schema.TaggedStruct('web', {
+    // TODO get rid of embedded `clientSessionInfo`
+    clientSessionInfo: Schema.UndefinedOr(ClientSessionInfo),
+}), Schema.TaggedStruct('browser-extension', {
+    // TODO get rid of embedded `clientSessionInfo`
+    clientSessionInfo: Schema.UndefinedOr(ClientSessionInfo),
+}));
+export const DevtoolsModeTag = DevtoolsMode.pipe(Schema.pluck('_tag'), Schema.typeSchema);
+//# sourceMappingURL=mod.js.map

package/dist/devtools/mod.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/devtools/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,cAAc,wBAAwB,CAAA;AACtC,cAAc,8BAA8B,CAAA;AAC5C,OAAO,KAAK,WAAW,MAAM,2BAA2B,CAAA;AACxD,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7C,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,QAAQ,EAAE,MAAM,CAAC,MAAM;IACvB,SAAS,EAAE,MAAM,CAAC,MAAM;CACzB,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CACtC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE;IAC1B,+CAA+C;IAC/C,iBAAiB,EAAE,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC;CACtD,CAAC;AACF,oDAAoD;AACpD,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE;IAC1B,+CAA+C;IAC/C,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC;IACxD,GAAG,EAAE,MAAM,CAAC,MAAM;CACnB,CAAC,EACF,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE;IACzB,+CAA+C;IAC/C,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC;CACzD,CAAC,EACF,MAAM,CAAC,YAAY,CAAC,mBAAmB,EAAE;IACvC,+CAA+C;IAC/C,iBAAiB,EAAE,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC;CACzD,CAAC,CACH,CAAA;AAID,MAAM,CAAC,MAAM,eAAe,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA"}

package/dist/index.d.ts

@@ -8,7 +8,7 @@ export * from './rehydrate-from-mutationlog.js';
 export * from './query-info.js';
 export * from './derived-mutations.js';
 export * from './sync/index.js';
-export * as Devtools from './devtools/index.js';
+export * as Devtools from './devtools/mod.js';
 export * from './debug-info.js';
 export * from './bounded-collections.js';
 export * from './version.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAA;AACzC,cAAc,WAAW,CAAA;AACzB,cAAc,oBAAoB,CAAA;AAClC,cAAc,mCAAmC,CAAA;AACjD,cAAc,eAAe,CAAA;AAC7B,cAAc,4BAA4B,CAAA;AAC1C,cAAc,iCAAiC,CAAA;AAC/C,cAAc,iBAAiB,CAAA;AAC/B,cAAc,wBAAwB,CAAA;AACtC,cAAc,iBAAiB,CAAA;AAC/B,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,cAAc,iBAAiB,CAAA;AAC/B,cAAc,0BAA0B,CAAA;AACxC,cAAc,cAAc,CAAA;AAC5B,cAAc,wBAAwB,CAAA;AACtC,OAAO,KAAK,SAAS,MAAM,qBAAqB,CAAA;AAChD,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAA;AACzC,cAAc,WAAW,CAAA;AACzB,cAAc,oBAAoB,CAAA;AAClC,cAAc,mCAAmC,CAAA;AACjD,cAAc,eAAe,CAAA;AAC7B,cAAc,4BAA4B,CAAA;AAC1C,cAAc,iCAAiC,CAAA;AAC/C,cAAc,iBAAiB,CAAA;AAC/B,cAAc,wBAAwB,CAAA;AACtC,cAAc,iBAAiB,CAAA;AAC/B,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAC7C,cAAc,iBAAiB,CAAA;AAC/B,cAAc,0BAA0B,CAAA;AACxC,cAAc,cAAc,CAAA;AAC5B,cAAc,wBAAwB,CAAA;AACtC,OAAO,KAAK,SAAS,MAAM,qBAAqB,CAAA;AAChD,cAAc,WAAW,CAAA"}

package/dist/index.js

@@ -8,7 +8,7 @@ export * from './rehydrate-from-mutationlog.js';
 export * from './query-info.js';
 export * from './derived-mutations.js';
 export * from './sync/index.js';
-export * as Devtools from './devtools/index.js';
+export * as Devtools from './devtools/mod.js';
 export * from './debug-info.js';
 export * from './bounded-collections.js';
 export * from './version.js';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAA;AACzC,cAAc,WAAW,CAAA;AACzB,cAAc,oBAAoB,CAAA;AAClC,cAAc,mCAAmC,CAAA;AACjD,cAAc,eAAe,CAAA;AAC7B,cAAc,4BAA4B,CAAA;AAC1C,cAAc,iCAAiC,CAAA;AAC/C,cAAc,iBAAiB,CAAA;AAC/B,cAAc,wBAAwB,CAAA;AACtC,cAAc,iBAAiB,CAAA;AAC/B,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,cAAc,iBAAiB,CAAA;AAC/B,cAAc,0BAA0B,CAAA;AACxC,cAAc,cAAc,CAAA;AAC5B,cAAc,wBAAwB,CAAA;AACtC,OAAO,KAAK,SAAS,MAAM,qBAAqB,CAAA;AAChD,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAA;AACzC,cAAc,WAAW,CAAA;AACzB,cAAc,oBAAoB,CAAA;AAClC,cAAc,mCAAmC,CAAA;AACjD,cAAc,eAAe,CAAA;AAC7B,cAAc,4BAA4B,CAAA;AAC1C,cAAc,iCAAiC,CAAA;AAC/C,cAAc,iBAAiB,CAAA;AAC/B,cAAc,wBAAwB,CAAA;AACtC,cAAc,iBAAiB,CAAA;AAC/B,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAC7C,cAAc,iBAAiB,CAAA;AAC/B,cAAc,0BAA0B,CAAA;AACxC,cAAc,cAAc,CAAA;AAC5B,cAAc,wBAAwB,CAAA;AACtC,OAAO,KAAK,SAAS,MAAM,qBAAqB,CAAA;AAChD,cAAc,WAAW,CAAA"}

package/dist/leader-thread/leader-worker-devtools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"leader-worker-devtools.d.ts","sourceRoot":"","sources":["../../src/leader-thread/leader-worker-devtools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA6C,MAAM,yBAAyB,CAAA;AAE3F,OAAO,EAAwD,eAAe,EAAE,MAAM,aAAa,CAAA;AAEnG,OAAO,KAAK,EAAE,eAAe,EAAuB,MAAM,YAAY,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAK5C,eAAO,MAAM,YAAY,GAAI,SAAS,eAAe,4IAwCsB,CAAA"}
+{"version":3,"file":"leader-worker-devtools.d.ts","sourceRoot":"","sources":["../../src/leader-thread/leader-worker-devtools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA6C,MAAM,yBAAyB,CAAA;AAG3F,OAAO,EAAwD,eAAe,EAAE,MAAM,aAAa,CAAA;AAEnG,OAAO,KAAK,EAAE,eAAe,EAAuB,MAAM,YAAY,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAK5C,eAAO,MAAM,YAAY,GAAI,SAAS,eAAe,4IAwCsB,CAAA"}

package/dist/leader-thread/leader-worker-devtools.js

@@ -1,4 +1,5 @@
 import { Effect, FiberMap, Option, Stream, SubscriptionRef } from '@livestore/utils/effect';
+import { nanoid } from '@livestore/utils/nanoid';
 import { Devtools, IntentionalShutdownCause, liveStoreVersion, UnexpectedError } from '../index.js';
 import { MUTATION_LOG_META_TABLE, SCHEMA_META_TABLE, SCHEMA_MUTATIONS_META_TABLE } from '../schema/mod.js';
 import { LeaderThreadCtx } from './types.js';
@@ -29,13 +30,26 @@ export const bootDevtools = (options) => Effect.gen(function* () {
 const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) => Effect.gen(function* () {
     const { syncBackend, makeSqliteDb, dbReadModel, dbMutationLog, shutdownStateSubRef, shutdownChannel, syncProcessor, clientId, devtools, } = yield* LeaderThreadCtx;
     const subscriptionFiberMap = yield* FiberMap.make();
+    const handledRequestIds = new Set();
     yield* incomingMessages.pipe(Stream.tap((decodedEvent) => Effect.gen(function* () {
-        // yield* Effect.logDebug('[@livestore/common:leader-thread:devtools] incomingMessage', decodedEvent)
+        const { requestId } = decodedEvent;
+        const reqPayload = { requestId, liveStoreVersion, clientId };
+        // yield* Effect.logDebug(
+        //   `[@livestore/common:leader-thread:devtools] incomingMessage: ${decodedEvent._tag} (${requestId})`,
+        //   decodedEvent,
+        // )
         if (decodedEvent._tag === 'LSD.Leader.Disconnect') {
             return;
         }
-        const { requestId } = decodedEvent;
-        const reqPayload = { requestId, liveStoreVersion, clientId };
+        // TODO we should try to move the duplicate message handling on the webmesh layer
+        // So far I could only observe this problem with webmesh proxy channels (e.g. for Expo)
+        // Proof: https://share.cleanshot.com/V9G87B0B
+        // Also see `store/devtools.ts` for same problem
+        if (handledRequestIds.has(requestId)) {
+            // yield* Effect.logWarning(`Duplicate message`, decodedEvent)
+            return;
+        }
+        handledRequestIds.add(requestId);
         switch (decodedEvent._tag) {
             case 'LSD.Leader.Ping': {
                 yield* sendMessage(Devtools.Leader.Pong.make({ ...reqPayload }));
@@ -46,7 +60,7 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
                 yield* sendMessage(Devtools.Leader.SnapshotRes.make({ snapshot, ...reqPayload }));
                 return;
             }
-            case 'LSD.Leader.LoadDatabaseFileReq': {
+            case 'LSD.Leader.LoadDatabaseFile.Request': {
                 const { data } = decodedEvent;
                 let tableNames;
                 try {
@@ -56,28 +70,46 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
                     tableNames = new Set(tableNameResults.map((_) => _.name));
                     tmpDb.close();
                 }
-                catch (e) {
-                    yield* Effect.logError(`Error importing database file`, e);
-                    yield* sendMessage(Devtools.Leader.LoadDatabaseFileRes.make({ ...reqPayload, status: 'unsupported-file' }));
+                catch (cause) {
+                    yield* Effect.logError(`Error importing database file`, cause);
+                    yield* sendMessage(Devtools.Leader.LoadDatabaseFile.Error.make({
+                        ...reqPayload,
+                        cause: { _tag: 'unexpected-error', cause },
+                    }));
                     return;
                 }
-                if (tableNames.has(MUTATION_LOG_META_TABLE)) {
-                    yield* SubscriptionRef.set(shutdownStateSubRef, 'shutting-down');
-                    dbMutationLog.import(data);
-                    dbReadModel.destroy();
-                }
-                else if (tableNames.has(SCHEMA_META_TABLE) && tableNames.has(SCHEMA_MUTATIONS_META_TABLE)) {
-                    yield* SubscriptionRef.set(shutdownStateSubRef, 'shutting-down');
-                    dbReadModel.import(data);
-                    dbMutationLog.destroy();
+                try {
+                    if (tableNames.has(MUTATION_LOG_META_TABLE)) {
+                        // Is mutation log
+                        yield* SubscriptionRef.set(shutdownStateSubRef, 'shutting-down');
+                        dbMutationLog.import(data);
+                        dbReadModel.destroy();
+                    }
+                    else if (tableNames.has(SCHEMA_META_TABLE) && tableNames.has(SCHEMA_MUTATIONS_META_TABLE)) {
+                        // Is read model
+                        yield* SubscriptionRef.set(shutdownStateSubRef, 'shutting-down');
+                        dbReadModel.import(data);
+                        dbMutationLog.destroy();
+                    }
+                    else {
+                        yield* sendMessage(Devtools.Leader.LoadDatabaseFile.Error.make({
+                            ...reqPayload,
+                            cause: { _tag: 'unsupported-database' },
+                        }));
+                        return;
+                    }
+                    yield* sendMessage(Devtools.Leader.LoadDatabaseFile.Success.make({ ...reqPayload }));
+                    yield* shutdownChannel.send(IntentionalShutdownCause.make({ reason: 'devtools-import' })) ?? Effect.void;
+                    return;
                 }
-                else {
-                    yield* sendMessage(Devtools.Leader.LoadDatabaseFileRes.make({ ...reqPayload, status: 'unsupported-database' }));
+                catch (cause) {
+                    yield* Effect.logError(`Error importing database file`, cause);
+                    yield* sendMessage(Devtools.Leader.LoadDatabaseFile.Error.make({
+                        ...reqPayload,
+                        cause: { _tag: 'unexpected-error', cause },
+                    }));
                     return;
                 }
-                yield* sendMessage(Devtools.Leader.LoadDatabaseFileRes.make({ ...reqPayload, status: 'ok' }));
-                yield* shutdownChannel.send(IntentionalShutdownCause.make({ reason: 'devtools-import' })) ?? Effect.void;
-                return;
             }
             case 'LSD.Leader.ResetAllData.Request': {
                 const { mode } = decodedEvent;
@@ -86,7 +118,7 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
                 if (mode === 'all-data') {
                     dbMutationLog.destroy();
                 }
-                yield* sendMessage(Devtools.Leader.ResetAllData.Response.make({ ...reqPayload }));
+                yield* sendMessage(Devtools.Leader.ResetAllData.Success.make({ ...reqPayload }));
                 yield* shutdownChannel.send(IntentionalShutdownCause.make({ reason: 'devtools-reset' })) ?? Effect.void;
                 return;
             }
@@ -120,10 +152,16 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
                 return;
             }
             case 'LSD.Leader.SyncHistorySubscribe': {
-                const { requestId } = decodedEvent;
+                const { subscriptionId } = decodedEvent;
                 if (syncBackend !== undefined) {
                     // TODO consider piggybacking on the existing leader-thread sync-pulling
-                    yield* syncBackend.pull(Option.none()).pipe(Stream.map((_) => _.batch), Stream.flattenIterables, Stream.tap(({ mutationEventEncoded, metadata }) => sendMessage(Devtools.Leader.SyncHistoryRes.make({ mutationEventEncoded, metadata, ...reqPayload }))), Stream.runDrain, Effect.acquireRelease(() => Effect.log('syncHistorySubscribe done')), Effect.interruptible, Effect.tapCauseLogPretty, FiberMap.run(subscriptionFiberMap, requestId));
+                    yield* syncBackend.pull(Option.none()).pipe(Stream.map((_) => _.batch), Stream.flattenIterables, Stream.tap(({ mutationEventEncoded, metadata }) => sendMessage(Devtools.Leader.SyncHistoryRes.make({
+                        mutationEventEncoded,
+                        metadata,
+                        subscriptionId,
+                        ...reqPayload,
+                        requestId: nanoid(10),
+                    }))), Stream.runDrain, Effect.interruptible, Effect.tapCauseLogPretty, FiberMap.run(subscriptionFiberMap, subscriptionId));
                 }
                 return;
             }
@@ -143,15 +181,17 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
             }
             case 'LSD.Leader.NetworkStatusSubscribe': {
                 if (syncBackend !== undefined) {
-                    const { requestId } = decodedEvent;
+                    const { subscriptionId } = decodedEvent;
                     // TODO investigate and fix bug. seems that when sending messages right after
                     // the devtools have connected get sometimes lost
                     // This is probably the same "flaky databrowser loading" bug as we're seeing in the playwright tests
                     yield* Effect.sleep(1000);
                     yield* Stream.zipLatest(syncBackend.isConnected.changes, devtools.enabled ? devtools.syncBackendLatchState.changes : Stream.make({ latchClosed: false })).pipe(Stream.tap(([isConnected, { latchClosed }]) => sendMessage(Devtools.Leader.NetworkStatusRes.make({
                         networkStatus: { isConnected, timestampMs: Date.now(), latchClosed },
+                        subscriptionId,
                         ...reqPayload,
-                    }))), Stream.runDrain, Effect.interruptible, Effect.tapCauseLogPretty, FiberMap.run(subscriptionFiberMap, requestId));
+                        requestId: nanoid(10),
+                    }))), Stream.runDrain, Effect.interruptible, Effect.tapCauseLogPretty, FiberMap.run(subscriptionFiberMap, subscriptionId));
                 }
                 return;
             }
@@ -161,17 +201,19 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
                 return;
             }
             case 'LSD.Leader.SyncHeadSubscribe': {
-                const { requestId } = decodedEvent;
+                const { subscriptionId } = decodedEvent;
                 yield* syncProcessor.syncState.changes.pipe(Stream.tap((syncState) => sendMessage(Devtools.Leader.SyncHeadRes.make({
                     local: syncState.localHead,
                     upstream: syncState.upstreamHead,
+                    subscriptionId,
                     ...reqPayload,
-                }))), Stream.runDrain, Effect.interruptible, Effect.tapCauseLogPretty, FiberMap.run(subscriptionFiberMap, requestId));
+                    requestId: nanoid(10),
+                }))), Stream.runDrain, Effect.interruptible, Effect.tapCauseLogPretty, FiberMap.run(subscriptionFiberMap, subscriptionId));
                 return;
             }
             case 'LSD.Leader.SyncHeadUnsubscribe': {
-                const { requestId } = decodedEvent;
-                yield* FiberMap.remove(subscriptionFiberMap, requestId);
+                const { subscriptionId } = decodedEvent;
+                yield* FiberMap.remove(subscriptionFiberMap, subscriptionId);
                 return;
             }
             case 'LSD.Leader.SetSyncLatch.Request': {
@@ -185,7 +227,7 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
                     yield* devtools.syncBackendLatch.open;
                 }
                 yield* SubscriptionRef.set(devtools.syncBackendLatchState, { latchClosed: closeLatch });
-                yield* sendMessage(Devtools.Leader.SetSyncLatch.Response.make({ ...reqPayload }));
+                yield* sendMessage(Devtools.Leader.SetSyncLatch.Success.make({ ...reqPayload }));
                 return;
             }
             default: {