@livestore/webmesh 0.3.2-dev.9 → 0.4.0-dev.1

package/src/node.test.ts

@@ -1,21 +1,5 @@
-import '@livestore/utils-dev/node-vitest-polyfill'
-
 import { IS_CI } from '@livestore/utils'
-import {
-  Chunk,
-  Deferred,
-  Effect,
-  Exit,
-  identity,
-  Layer,
-  Logger,
-  LogLevel,
-  Schema,
-  Scope,
-  Stream,
-  WebChannel,
-} from '@livestore/utils/effect'
-import { OtelLiveHttp } from '@livestore/utils-dev/node'
+import { Chunk, Deferred, Effect, Exit, Schema, Scope, Stream, WebChannel } from '@livestore/utils/effect'
 import { Vitest } from '@livestore/utils-dev/node-vitest'
 import { expect } from 'vitest'
 
@@ -209,8 +193,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
 
             yield* Effect.promise(() => nodeX.debug.requestTopology(100))
           }).pipe(
-            withCtx(test, {
-              skipOtel: true,
+            Vitest.withTestCtx(test, {
               suffix: `delayX=${delayX} delayY=${delayY} connectDelay=${connectDelay} channelType=${channelType} nodeNames=${nodeNames}`,
             }),
           ),
@@ -290,8 +273,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
 
             yield* Effect.all([nodeACode, nodeBCode], { concurrency: 'unbounded' }).pipe(Effect.withSpan('test'))
           }).pipe(
-            withCtx(test, {
-              skipOtel: true,
+            Vitest.withTestCtx(test, {
               suffix: `waitForOfflineDelay=${waitForOfflineDelay} sleepDelay=${sleepDelay} channelType=${channelType}`,
             }),
           ),
@@ -338,7 +320,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
           yield* Effect.all([nodeACode, nodeBCode(nodeBgen2)], { concurrency: 'unbounded' }).pipe(
             Effect.withSpan('test2'),
           )
-        }).pipe(withCtx(test)),
+        }).pipe(Vitest.withTestCtx(test)),
       )
 
       const ChannelTypeWithoutMessageChannelProxy = Schema.Literal('proxy', 'direct')
@@ -403,8 +385,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
 
             yield* Effect.all([nodeXCode, nodeYCode], { concurrency: 'unbounded' })
           }).pipe(
-            withCtx(test, {
-              skipOtel: true,
+            Vitest.withTestCtx(test, {
               suffix: `channelType=${channelType} nodeNames=${nodeNames}`,
             }),
           ),
@@ -459,8 +440,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
                 concurrency: 'unbounded',
               })
             }).pipe(
-              withCtx(test, {
-                skipOtel: true,
+              Vitest.withTestCtx(test, {
                 suffix: `channelType=${channelType} count=${count}`,
                 timeout: testTimeout * 2,
               }),
@@ -500,7 +480,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
           }).pipe(Effect.scoped, Effect.repeatN(messageCount))
 
           yield* bFiber
-        }).pipe(withCtx(test)),
+        }).pipe(Vitest.withTestCtx(test)),
       )
     })
 
@@ -529,7 +509,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
         yield* Effect.all([nodeACode, nodeBCode, connectNodes(nodeA, nodeB).pipe(Effect.delay(100))], {
           concurrency: 'unbounded',
         })
-      }).pipe(withCtx(test)),
+      }).pipe(Vitest.withTestCtx(test)),
     )
 
     Vitest.scopedLive('broadcast edge with message channel', (test) =>
@@ -541,7 +521,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
 
         const err = yield* createChannel(nodeA, 'B', { mode: 'direct' }).pipe(Effect.timeout(200), Effect.flip)
         expect(err._tag).toBe('TimeoutException')
-      }).pipe(withCtx(test)),
+      }).pipe(Vitest.withTestCtx(test)),
     )
   })
 
@@ -573,7 +553,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
         })
 
         yield* Effect.all([nodeACode, nodeCCode], { concurrency: 'unbounded' })
-      }).pipe(withCtx(test)),
+      }).pipe(Vitest.withTestCtx(test)),
     )
 
     Vitest.scopedLive('should work - delayed edge', (test) =>
@@ -608,7 +588,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
           ],
           { concurrency: 'unbounded' },
         )
-      }).pipe(withCtx(test)),
+      }).pipe(Vitest.withTestCtx(test)),
     )
 
     Vitest.scopedLive('proxy channel', (test) =>
@@ -633,7 +613,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
         })
 
         yield* Effect.all([nodeACode, nodeCCode], { concurrency: 'unbounded' })
-      }).pipe(withCtx(test)),
+      }).pipe(Vitest.withTestCtx(test)),
     )
 
     Vitest.scopedLive('should fail with timeout due to missing edge', (test) =>
@@ -656,7 +636,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
         })
 
         yield* Effect.all([nodeACode, nodeCCode], { concurrency: 'unbounded' })
-      }).pipe(withCtx(test)),
+      }).pipe(Vitest.withTestCtx(test)),
     )
 
     Vitest.scopedLive('should fail with timeout due no transferable', (test) =>
@@ -677,7 +657,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
         })
 
         yield* Effect.all([nodeACode, nodeBCode], { concurrency: 'unbounded' })
-      }).pipe(withCtx(test)),
+      }).pipe(Vitest.withTestCtx(test)),
     )
 
     Vitest.scopedLive('reconnect with re-created node', (test) =>
@@ -719,7 +699,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
         yield* Effect.all([nodeACode, nodeCCode(nodeCgen2)], { concurrency: 'unbounded' }).pipe(
           Effect.withSpan('test2'),
         )
-      }).pipe(withCtx(test)),
+      }).pipe(Vitest.withTestCtx(test)),
     )
   })
 
@@ -756,7 +736,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
         })
 
         yield* Effect.all([nodeACode, nodeDCode], { concurrency: 'unbounded' })
-      }).pipe(withCtx(test)),
+      }).pipe(Vitest.withTestCtx(test)),
     )
   })
 
@@ -800,7 +780,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
         })
 
         yield* Effect.all([nodeACode, nodeECode], { concurrency: 'unbounded' })
-      }).pipe(withCtx(test)),
+      }).pipe(Vitest.withTestCtx(test)),
     )
   })
 
@@ -816,7 +796,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
         const err = yield* connectNodesViaBroadcastChannel(nodeA, nodeB).pipe(Effect.flip)
 
         expect(err._tag).toBe('EdgeAlreadyExistsError')
-      }).pipe(withCtx(test)),
+      }).pipe(Vitest.withTestCtx(test)),
     )
 
     Vitest.scopedLive('should work for directs', (test) =>
@@ -841,7 +821,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
         })
 
         yield* Effect.all([nodeACode, nodeCCode], { concurrency: 'unbounded' })
-      }).pipe(withCtx(test)),
+      }).pipe(Vitest.withTestCtx(test)),
     )
   })
 
@@ -881,7 +861,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
         })
 
         yield* Effect.all([nodeACode, nodeBCode.pipe(Effect.delay(500))], { concurrency: 'unbounded' })
-      }).pipe(withCtx(test)),
+      }).pipe(Vitest.withTestCtx(test)),
     )
 
     // TODO provide a way to allow for reconnecting in the `listenForChannel` case
@@ -945,7 +925,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
         )
 
         yield* Effect.all([nodeACode, nodeBCode], { concurrency: 'unbounded' })
-      }).pipe(withCtx(test)),
+      }).pipe(Vitest.withTestCtx(test)),
     )
 
     Vitest.describe('prop tests', { timeout: propTestTimeout }, () => {
@@ -999,8 +979,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
               { concurrency: 'unbounded' },
             )
           }).pipe(
-            withCtx(test, {
-              skipOtel: true,
+            Vitest.withTestCtx(test, {
               suffix: `delayNodeA=${delayNodeA} delayNodeC=${delayNodeC} delayConnectAB=${delayConnectAB} delayConnectBC=${delayConnectBC} channelType=${channelType}`,
               timeout: testTimeout * 2,
             }),
@@ -1041,24 +1020,7 @@ Vitest.describe('webmesh node', { timeout: testTimeout }, () => {
 
         expect(yield* listenOnAFiber).toEqual('C1')
         expect(yield* listenOnCFiber).toEqual('A1')
-      }).pipe(withCtx(test)),
+      }).pipe(Vitest.withTestCtx(test)),
     )
   })
 })
-
-const otelLayer = IS_CI ? Layer.empty : OtelLiveHttp({ serviceName: 'webmesh-node-test', skipLogUrl: false })
-
-const withCtx =
-  (
-    testContext: Vitest.TaskContext,
-    { suffix, skipOtel = false, timeout = testTimeout }: { suffix?: string; skipOtel?: boolean; timeout?: number } = {},
-  ) =>
-  <A, E, R>(self: Effect.Effect<A, E, R>) =>
-    self.pipe(
-      Effect.timeout(timeout),
-      Effect.provide(Logger.pretty),
-      Logger.withMinimumLogLevel(LogLevel.Debug),
-      Effect.scoped, // We need to scope the effect manually here because otherwise the span is not closed
-      Effect.withSpan(`${testContext.task.suite?.name}:${testContext.task.name}${suffix ? `:${suffix}` : ''}`),
-      skipOtel ? identity : Effect.provide(otelLayer),
-    )