@livestore/adapter-node 0.0.0-snapshot-04bc235dd721238cb10c060705672376b6e06dd3 → 0.0.0-snapshot-13a84f2057a5823fa045fade064685c25519837a

package/src/leader-thread-shared.ts

@@ -139,25 +139,27 @@ const makeDevtoolsOptions = ({
         const { startDevtoolsServer } = yield* Effect.promise(() => import('./devtools/devtools-server.js'))
 
         // TODO instead of failing when the port is already in use, we should try to use that WS server instead of starting a new one
-        yield* startDevtoolsServer({
-          schemaPath: devtools.schemaPath,
-          clientSessionInfo: Devtools.SessionInfo.SessionInfo.make({
-            storeId,
-            clientId,
-            sessionId: 'static', // TODO make this dynamic
-            schemaAlias: devtools.schemaAlias,
-            isLeader: true,
-          }),
-          port: devtools.port,
-          host: devtools.host,
-        }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped)
+        if (devtools.useExistingDevtoolsServer === false) {
+          yield* startDevtoolsServer({
+            schemaPath: devtools.schemaPath,
+            clientSessionInfo: Devtools.SessionInfo.SessionInfo.make({
+              storeId,
+              clientId,
+              sessionId: 'static', // TODO make this dynamic
+              schemaAlias: devtools.schemaAlias,
+              isLeader: true,
+            }),
+            port: devtools.port,
+            host: devtools.host,
+          }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped)
+        }
 
         const node = yield* Webmesh.makeMeshNode(Devtools.makeNodeName.client.leader({ storeId, clientId }))
 
         yield* Webmesh.connectViaWebSocket({
           node,
           url: `http://${devtools.host}:${devtools.port}`,
-          openTimeout: 50,
+          openTimeout: 500,
         }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped)
 
         const persistenceInfo = {

package/src/worker-schema.ts

@@ -7,7 +7,7 @@ import {
   SyncState,
   UnexpectedError,
 } from '@livestore/common'
-import { EventId, LiveStoreEvent } from '@livestore/common/schema'
+import { EventSequenceNumber, LiveStoreEvent } from '@livestore/common/schema'
 import { Schema, Transferable } from '@livestore/utils/effect'
 
 export const WorkerArgv = Schema.parseJson(
@@ -74,6 +74,7 @@ export namespace LeaderWorkerInner {
           port: Schema.Number,
           host: Schema.String,
           schemaAlias: Schema.String,
+          useExistingDevtoolsServer: Schema.Boolean,
         }),
         Schema.Struct({ enabled: Schema.Literal(false) }),
       ),
@@ -130,7 +131,7 @@ export namespace LeaderWorkerInner {
 
   export class GetLeaderHead extends Schema.TaggedRequest<GetLeaderHead>()('GetLeaderHead', {
     payload: {},
-    success: EventId.EventId,
+    success: EventSequenceNumber.EventSequenceNumber,
     failure: UnexpectedError,
   }) {}