@livestore/common 0.0.0-snapshot-250bcd09ab7aa1c7d69c8f38fb52d12e06e8143a → 0.0.0-snapshot-0d29af8992dee74607cd7767e35f9b1338444edd

package/src/index.ts

@@ -12,3 +12,4 @@ export * from './version.js'
 export * from './schema/state/sqlite/query-builder/mod.js'
 export * as SyncState from './sync/syncstate.js'
 export * from './otel.js'
+export * from './make-client-session.js'

package/src/leader-thread/leader-worker-devtools.ts

@@ -15,38 +15,56 @@ export const bootDevtools = (options: DevtoolsOptions) =>
       return
     }
 
-    const { syncProcessor, extraIncomingMessagesQueue } = yield* LeaderThreadCtx
+    const { syncProcessor, extraIncomingMessagesQueue, clientId, storeId } = yield* LeaderThreadCtx
 
     yield* listenToDevtools({
       incomingMessages: Stream.fromQueue(extraIncomingMessagesQueue),
       sendMessage: () => Effect.void,
     }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped)
 
-    const { persistenceInfo, devtoolsWebChannel } = yield* options.makeBootContext
+    const { node, persistenceInfo, mode } = yield* options.boot
 
-    const sendMessage: SendMessageToDevtools = (message) =>
-      devtoolsWebChannel
-        .send(message)
-        .pipe(
-          Effect.withSpan('@livestore/common:leader-thread:devtools:sendToDevtools'),
-          Effect.interruptible,
-          Effect.ignoreLogged,
-        )
-
-    const syncState = yield* syncProcessor.syncState
-    const mergeCounter = syncProcessor.getMergeCounter()
+    yield* node.listenForChannel.pipe(
+      Stream.filter(
+        (res) =>
+          Devtools.isChannelName.devtoolsClientLeader(res.channelName, { storeId, clientId }) && res.mode === mode,
+      ),
+      Stream.tap(({ channelName, source }) =>
+        Effect.gen(function* () {
+          const channel = yield* node.makeChannel({
+            target: source,
+            channelName,
+            schema: { listen: Devtools.Leader.MessageToApp, send: Devtools.Leader.MessageFromApp },
+            mode,
+          })
+
+          const sendMessage: SendMessageToDevtools = (message) =>
+            channel
+              .send(message)
+              .pipe(
+                Effect.withSpan('@livestore/common:leader-thread:devtools:sendToDevtools'),
+                Effect.interruptible,
+                Effect.ignoreLogged,
+              )
 
-    yield* syncProcessor.pull({ cursor: { mergeCounter, eventId: syncState.localHead } }).pipe(
-      Stream.tap(({ payload }) => sendMessage(Devtools.Leader.SyncPull.make({ payload, liveStoreVersion }))),
+          const syncState = yield* syncProcessor.syncState
+          const mergeCounter = syncProcessor.getMergeCounter()
+
+          yield* syncProcessor.pull({ cursor: { mergeCounter, eventId: syncState.localHead } }).pipe(
+            Stream.tap(({ payload }) => sendMessage(Devtools.Leader.SyncPull.make({ payload, liveStoreVersion }))),
+            Stream.runDrain,
+            Effect.forkScoped,
+          )
+
+          yield* listenToDevtools({
+            incomingMessages: channel.listen.pipe(Stream.flatten(), Stream.orDie),
+            sendMessage,
+            persistenceInfo,
+          })
+        }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped),
+      ),
       Stream.runDrain,
-      Effect.forkScoped,
     )
-
-    yield* listenToDevtools({
-      incomingMessages: devtoolsWebChannel.listen.pipe(Stream.flatten(), Stream.orDie),
-      sendMessage,
-      persistenceInfo,
-    }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped)
   }).pipe(Effect.withSpan('@livestore/common:leader-thread:devtools:boot'))
 
 const listenToDevtools = ({

package/src/leader-thread/types.ts

@@ -8,9 +8,9 @@ import type {
   Stream,
   Subscribable,
   SubscriptionRef,
-  WebChannel,
 } from '@livestore/utils/effect'
 import { Context, Schema } from '@livestore/utils/effect'
+import type { MeshNode } from '@livestore/webmesh'
 
 import type { LeaderPullCursor, SqliteError } from '../adapter-types.js'
 import type {
@@ -60,13 +60,14 @@ export type DevtoolsOptions =
     }
   | {
       enabled: true
-      makeBootContext: Effect.Effect<
+      boot: Effect.Effect<
         {
-          devtoolsWebChannel: WebChannel.WebChannel<Devtools.Leader.MessageToApp, Devtools.Leader.MessageFromApp>
+          node: MeshNode
           persistenceInfo: PersistenceInfoPair
+          mode: 'proxy' | 'direct'
         },
         UnexpectedError,
-        Scope.Scope
+        Scope.Scope | HttpClient.HttpClient | LeaderThreadCtx
       >
     }
 

package/src/make-client-session.ts

@@ -0,0 +1,119 @@
+import type { Scope, SubscriptionRef } from '@livestore/utils/effect'
+import { Effect, Stream } from '@livestore/utils/effect'
+import * as Webmesh from '@livestore/webmesh'
+
+import type {
+  AdapterArgs,
+  ClientSession,
+  ClientSessionLeaderThreadProxy,
+  LockStatus,
+  SqliteDb,
+  UnexpectedError,
+} from './adapter-types.js'
+import * as Devtools from './devtools/mod.js'
+
+declare global {
+  // eslint-disable-next-line no-var
+  var __debugWebmeshNode: any
+}
+
+export const makeClientSession = <R>({
+  storeId,
+  clientId,
+  sessionId,
+  devtoolsEnabled,
+  connectDevtoolsToStore,
+  lockStatus,
+  leaderThread,
+  schema,
+  sqliteDb,
+  shutdown,
+  connectWebmeshNode,
+  webmeshMode,
+}: AdapterArgs & {
+  clientId: string
+  sessionId: string
+  lockStatus: SubscriptionRef.SubscriptionRef<LockStatus>
+  leaderThread: ClientSessionLeaderThreadProxy
+  sqliteDb: SqliteDb
+  connectWebmeshNode: (args: {
+    webmeshNode: Webmesh.MeshNode
+    sessionInfo: Devtools.SessionInfo.SessionInfo
+  }) => Effect.Effect<void, UnexpectedError, Scope.Scope | R>
+  webmeshMode: 'direct' | 'proxy'
+}): Effect.Effect<ClientSession, never, Scope.Scope | R> =>
+  Effect.gen(function* () {
+    const devtools: ClientSession['devtools'] = devtoolsEnabled
+      ? { enabled: true, pullLatch: yield* Effect.makeLatch(true), pushLatch: yield* Effect.makeLatch(true) }
+      : { enabled: false }
+
+    if (devtoolsEnabled) {
+      yield* Effect.gen(function* () {
+        const webmeshNode = yield* Webmesh.makeMeshNode(
+          Devtools.makeNodeName.client.session({ storeId, clientId, sessionId }),
+        )
+
+        globalThis.__debugWebmeshNode = webmeshNode
+
+        const schemaAlias = schema.devtools.alias
+        const sessionInfo = Devtools.SessionInfo.SessionInfo.make({
+          storeId,
+          clientId,
+          sessionId,
+          schemaAlias,
+          isLeader: true, // TODO actually check if we are leader
+        })
+
+        yield* connectWebmeshNode({ webmeshNode, sessionInfo })
+
+        const sessionInfoBroadcastChannel = yield* Devtools.makeSessionInfoBroadcastChannel(webmeshNode)
+
+        yield* Devtools.SessionInfo.provideSessionInfo({
+          webChannel: sessionInfoBroadcastChannel,
+          sessionInfo,
+        }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped)
+
+        yield* webmeshNode.listenForChannel.pipe(
+          Stream.filter(
+            (res) =>
+              Devtools.isChannelName.devtoolsClientSession(res.channelName, { storeId, clientId, sessionId }) &&
+              res.mode === webmeshMode,
+          ),
+          Stream.tap(
+            Effect.fnUntraced(
+              function* ({ channelName, source }) {
+                const clientSessionDevtoolsChannel = yield* webmeshNode.makeChannel({
+                  target: source,
+                  channelName,
+                  schema: {
+                    listen: Devtools.ClientSession.MessageToApp,
+                    send: Devtools.ClientSession.MessageFromApp,
+                  },
+                  mode: webmeshMode,
+                })
+
+                yield* connectDevtoolsToStore(clientSessionDevtoolsChannel)
+              },
+              Effect.tapCauseLogPretty,
+              Effect.forkScoped,
+            ),
+          ),
+          Stream.runDrain,
+        )
+      }).pipe(
+        Effect.withSpan('@livestore/common:make-client-session:devtools'),
+        Effect.tapCauseLogPretty,
+        Effect.forkScoped,
+      )
+    }
+
+    return {
+      sqliteDb,
+      leaderThread,
+      devtools,
+      lockStatus,
+      clientId,
+      sessionId,
+      shutdown,
+    } satisfies ClientSession
+  })

package/src/materializer-helper.ts

@@ -38,7 +38,6 @@ export const getExecArgsFromEvent = ({
 }> => {
   const eventArgsDecoded =
     event.decoded === undefined ? Schema.decodeUnknownSync(eventDef.schema)(event.encoded!.args) : event.decoded.args
-  const eventArgsEncoded = event.encoded?.args ?? Schema.encodeUnknownSync(eventDef.schema)(event.decoded!.args)
 
   const query: MaterializerContextQuery = (
     rawQueryOrQueryBuilder:
@@ -71,6 +70,7 @@ export const getExecArgsFromEvent = ({
   return statementRes.map((statementRes) => {
     const statementSql = statementRes.sql
 
+    const eventArgsEncoded = event.encoded?.args ?? Schema.encodeUnknownSync(eventDef.schema)(event.decoded!.args)
     const bindValues = typeof statementRes === 'string' ? eventArgsEncoded : statementRes.bindValues
 
     const writeTables = typeof statementRes === 'string' ? undefined : statementRes.writeTables

package/src/version.ts

@@ -2,7 +2,7 @@
 // import packageJson from '../package.json' with { type: 'json' }
 // export const liveStoreVersion = packageJson.version
 
-export const liveStoreVersion = '0.3.0-dev.37' as const
+export const liveStoreVersion = '0.3.0-dev.39' as const
 
 /**
  * This version number is incremented whenever the internal storage format changes in a breaking way.

package/dist/devtools/devtools-window-message.d.ts

@@ -1,29 +0,0 @@
-import { Schema } from '@livestore/utils/effect';
-export declare namespace DevtoolsWindowMessage {
-    const MessagePortReady_base: Schema.TaggedStruct<"LSD.WindowMessage.MessagePortReady", {
-        port: Schema.Schema<MessagePort, MessagePort, never>;
-        appHostId: typeof Schema.String;
-    }>;
-    /** Message is being created in contentscript-iframe, sent to contentscript and then sent to Store */
-    export class MessagePortReady extends MessagePortReady_base {
-    }
-    const ContentscriptListening_base: Schema.TaggedStruct<"LSD.WindowMessage.ContentscriptListening", {}>;
-    export class ContentscriptListening extends ContentscriptListening_base {
-    }
-    const LoadIframe_base: Schema.TaggedStruct<"LSD.WindowMessage.LoadIframe", {}>;
-    export class LoadIframe extends LoadIframe_base {
-    }
-    const StoreReady_base: Schema.TaggedStruct<"LSD.WindowMessage.StoreReady", {
-        appHostId: typeof Schema.String;
-    }>;
-    export class StoreReady extends StoreReady_base {
-    }
-    const MessageForStore_base: Schema.Union<[typeof MessagePortReady, typeof ContentscriptListening]>;
-    export class MessageForStore extends MessageForStore_base {
-    }
-    const MessageForContentscript_base: Schema.Union<[typeof StoreReady, typeof LoadIframe]>;
-    export class MessageForContentscript extends MessageForContentscript_base {
-    }
-    export {};
-}
-//# sourceMappingURL=devtools-window-message.d.ts.map

package/dist/devtools/devtools-window-message.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"devtools-window-message.d.ts","sourceRoot":"","sources":["../../src/devtools/devtools-window-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAgB,MAAM,yBAAyB,CAAA;AAI9D,yBAAiB,qBAAqB,CAAC;;;;;IACrC,qGAAqG;IACrG,MAAM,OAAO,gBAAiB,SAAQ,qBAGpC;KAAG;;IAEL,MAAM,OAAO,sBAAuB,SAAQ,2BAAmE;KAAG;;IAMlH,MAAM,OAAO,UAAW,SAAQ,eAAuD;KAAG;;;;IAE1F,MAAM,OAAO,UAAW,SAAQ,eAE9B;KAAG;;IAEL,MAAM,OAAO,eAAgB,SAAQ,oBAAsD;KAAG;;IAE9F,MAAM,OAAO,uBAAwB,SAAQ,4BAAoC;KAAG;;CACrF"}

package/dist/devtools/devtools-window-message.js

@@ -1,33 +0,0 @@
-import { Schema, Transferable } from '@livestore/utils/effect';
-const appHostId = Schema.String;
-export var DevtoolsWindowMessage;
-(function (DevtoolsWindowMessage) {
-    /** Message is being created in contentscript-iframe, sent to contentscript and then sent to Store */
-    class MessagePortReady extends Schema.TaggedStruct('LSD.WindowMessage.MessagePortReady', {
-        port: Transferable.MessagePort,
-        appHostId,
-    }) {
-    }
-    DevtoolsWindowMessage.MessagePortReady = MessagePortReady;
-    class ContentscriptListening extends Schema.TaggedStruct('LSD.WindowMessage.ContentscriptListening', {}) {
-    }
-    DevtoolsWindowMessage.ContentscriptListening = ContentscriptListening;
-    // export class ContentscriptReady extends Schema.TaggedStruct('LSD.WindowMessage.ContentscriptReady', {
-    // 	appHostId,
-    // }) {}
-    class LoadIframe extends Schema.TaggedStruct('LSD.WindowMessage.LoadIframe', {}) {
-    }
-    DevtoolsWindowMessage.LoadIframe = LoadIframe;
-    class StoreReady extends Schema.TaggedStruct('LSD.WindowMessage.StoreReady', {
-        appHostId,
-    }) {
-    }
-    DevtoolsWindowMessage.StoreReady = StoreReady;
-    class MessageForStore extends Schema.Union(MessagePortReady, ContentscriptListening) {
-    }
-    DevtoolsWindowMessage.MessageForStore = MessageForStore;
-    class MessageForContentscript extends Schema.Union(StoreReady, LoadIframe) {
-    }
-    DevtoolsWindowMessage.MessageForContentscript = MessageForContentscript;
-})(DevtoolsWindowMessage || (DevtoolsWindowMessage = {}));
-//# sourceMappingURL=devtools-window-message.js.map

package/dist/devtools/devtools-window-message.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"devtools-window-message.js","sourceRoot":"","sources":["../../src/devtools/devtools-window-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAE9D,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAA;AAE/B,MAAM,KAAW,qBAAqB,CAsBrC;AAtBD,WAAiB,qBAAqB;IACpC,qGAAqG;IACrG,MAAa,gBAAiB,SAAQ,MAAM,CAAC,YAAY,CAAC,oCAAoC,EAAE;QAC9F,IAAI,EAAE,YAAY,CAAC,WAAW;QAC9B,SAAS;KACV,CAAC;KAAG;IAHQ,sCAAgB,mBAGxB,CAAA;IAEL,MAAa,sBAAuB,SAAQ,MAAM,CAAC,YAAY,CAAC,0CAA0C,EAAE,EAAE,CAAC;KAAG;IAArG,4CAAsB,yBAA+E,CAAA;IAElH,wGAAwG;IACxG,cAAc;IACd,QAAQ;IAER,MAAa,UAAW,SAAQ,MAAM,CAAC,YAAY,CAAC,8BAA8B,EAAE,EAAE,CAAC;KAAG;IAA7E,gCAAU,aAAmE,CAAA;IAE1F,MAAa,UAAW,SAAQ,MAAM,CAAC,YAAY,CAAC,8BAA8B,EAAE;QAClF,SAAS;KACV,CAAC;KAAG;IAFQ,gCAAU,aAElB,CAAA;IAEL,MAAa,eAAgB,SAAQ,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;KAAG;IAAjF,qCAAe,kBAAkE,CAAA;IAE9F,MAAa,uBAAwB,SAAQ,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC;KAAG;IAAvE,6CAAuB,0BAAgD,CAAA;AACtF,CAAC,EAtBgB,qBAAqB,KAArB,qBAAqB,QAsBrC"}

package/src/devtools/devtools-window-message.ts

@@ -1,27 +0,0 @@
-import { Schema, Transferable } from '@livestore/utils/effect'
-
-const appHostId = Schema.String
-
-export namespace DevtoolsWindowMessage {
-  /** Message is being created in contentscript-iframe, sent to contentscript and then sent to Store */
-  export class MessagePortReady extends Schema.TaggedStruct('LSD.WindowMessage.MessagePortReady', {
-    port: Transferable.MessagePort,
-    appHostId,
-  }) {}
-
-  export class ContentscriptListening extends Schema.TaggedStruct('LSD.WindowMessage.ContentscriptListening', {}) {}
-
-  // export class ContentscriptReady extends Schema.TaggedStruct('LSD.WindowMessage.ContentscriptReady', {
-  // 	appHostId,
-  // }) {}
-
-  export class LoadIframe extends Schema.TaggedStruct('LSD.WindowMessage.LoadIframe', {}) {}
-
-  export class StoreReady extends Schema.TaggedStruct('LSD.WindowMessage.StoreReady', {
-    appHostId,
-  }) {}
-
-  export class MessageForStore extends Schema.Union(MessagePortReady, ContentscriptListening) {}
-
-  export class MessageForContentscript extends Schema.Union(StoreReady, LoadIframe) {}
-}