Cleanup

packages/example/src/routes/streams/pull.tsx

@@ -1,8 +1,8 @@
 import { R } from "@/reffuse"
 import { Button, Flex, Text } from "@radix-ui/themes"
 import { createFileRoute } from "@tanstack/react-router"
-import { Option, Random, Stream } from "effect"
-import { useMemo } from "react"
+import { Chunk, Effect, Exit, Option, Queue, Random, Scope, Stream } from "effect"
+import { useMemo, useState } from "react"
 
 
 export const Route = createFileRoute("/streams/pull")({
@@ -11,13 +11,24 @@ export const Route = createFileRoute("/streams/pull")({
 
 function RouteComponent() {
     const stream = useMemo(() => Stream.repeatEffect(Random.nextInt), [])
-    const [value, pull] = R.usePullStream(stream)
-    const pullNext = R.useCallbackSync(() => pull, [pull])
+    const streamScope = R.useScope([stream])
+
+    const queue = R.useMemo(() => Effect.provideService(Stream.toQueueOfElements(stream), Scope.Scope, streamScope), [streamScope])
+
+    const [value, setValue] = useState(Option.none<number>())
+    const pullLatest = R.useCallbackSync(() => Queue.takeAll(queue).pipe(
+        Effect.flatMap(Chunk.last),
+        Effect.flatMap(Exit.matchEffect({
+            onSuccess: Effect.succeed,
+            onFailure: Effect.fail,
+        })),
+        Effect.tap(v => Effect.sync(() => setValue(Option.some(v)))),
+    ), [queue])
 
     return (
         <Flex direction="column" align="center" gap="2">
             {Option.isSome(value) && <Text>{value.value}</Text>}
-            <Button onClick={pullNext}>Pull next</Button>
+            <Button onClick={pullLatest}>Pull latest</Button>
         </Flex>
     )
 }

packages/example/src/routes/tests.tsx

@@ -15,7 +15,6 @@ export const Route = createFileRoute("/tests")({
 
 function RouteComponent() {
     const runSync = R.useRunSync()
-    const runPromise = R.useRunPromise()
 
     const [uuid, setUuid] = useState(R.useMemo(() => makeUuid, []))
     const generateUuid = R.useCallbackSync(() => makeUuid.pipe(
@@ -23,7 +22,7 @@ function RouteComponent() {
     ), [])
 
     const uuidStream = R.useStreamFromReactiveValues([uuid])
-    const [uuidStreamLatestValue, pullUuidStream] = R.usePullStream(uuidStream)
+    const uuidStreamLatestValue = R.useSubscribeStream(uuidStream)
 
     const scope = R.useScope([uuid])
 
@@ -43,7 +42,6 @@ function RouteComponent() {
                     onNone: () => <></>,
                 })}
             </Text>
-            <Button onClick={() => runPromise(pullUuidStream)}>Pull UUID</Button>
         </Flex>
     )
 }