@effect/platform 0.55.7 → 0.57.0

package/src/internal/http/clientRequest.ts

@@ -5,6 +5,7 @@ import * as Effect from "effect/Effect"
 import * as Effectable from "effect/Effectable"
 import { dual } from "effect/Function"
 import * as Inspectable from "effect/Inspectable"
+import * as Option from "effect/Option"
 import type * as Stream from "effect/Stream"
 import type * as PlatformError from "../../Error.js"
 import type * as FileSystem from "../../FileSystem.js"
@@ -35,6 +36,7 @@ const Proto = {
       method: this.method,
       url: this.url,
       urlParams: this.urlParams,
+      hash: this.hash,
       headers: this.headers,
       body: this.body.toJSON()
     }
@@ -45,6 +47,7 @@ function makeInternal(
   method: Method,
   url: string,
   urlParams: UrlParams.UrlParams,
+  hash: Option.Option<string>,
   headers: Headers.Headers,
   body: Body.Body
 ): ClientRequest.ClientRequest {
@@ -52,6 +55,7 @@ function makeInternal(
   self.method = method
   self.url = url
   self.urlParams = urlParams
+  self.hash = hash
   self.headers = headers
   self.body = body
   return self
@@ -66,6 +70,7 @@ export const empty: ClientRequest.ClientRequest = makeInternal(
   "GET",
   "",
   UrlParams.empty,
+  Option.none(),
   Headers.empty,
   internalBody.empty
 )
@@ -78,7 +83,7 @@ export const make = <M extends Method>(method: M) =>
 ) =>
   modify(empty, {
     method,
-    url: url.toString(),
+    url,
     ...(options ?? undefined)
   })
 
@@ -122,6 +127,9 @@ export const modify = dual<
   if (options.urlParams) {
     result = setUrlParams(result, options.urlParams)
   }
+  if (options.hash) {
+    result = setHash(result, options.hash)
+  }
   if (options.body) {
     result = setBody(result, options.body)
   }
@@ -144,6 +152,7 @@ export const setHeader = dual<
     self.method,
     self.url,
     self.urlParams,
+    self.hash,
     Headers.set(self.headers, key, value),
     self.body
   ))
@@ -157,6 +166,7 @@ export const setHeaders = dual<
     self.method,
     self.url,
     self.urlParams,
+    self.hash,
     Headers.setAll(self.headers, input),
     self.body
   ))
@@ -191,6 +201,7 @@ export const setMethod = dual<
     method,
     self.url,
     self.urlParams,
+    self.hash,
     self.headers,
     self.body
   ))
@@ -198,15 +209,32 @@ export const setMethod = dual<
 /** @internal */
 export const setUrl = dual<
   (url: string | URL) => (self: ClientRequest.ClientRequest) => ClientRequest.ClientRequest,
-  (self: ClientRequest.ClientRequest, url: string) => ClientRequest.ClientRequest
->(2, (self, url) =>
-  makeInternal(
+  (self: ClientRequest.ClientRequest, url: string | URL) => ClientRequest.ClientRequest
+>(2, (self, url) => {
+  if (typeof url === "string") {
+    return makeInternal(
+      self.method,
+      url,
+      self.urlParams,
+      self.hash,
+      self.headers,
+      self.body
+    )
+  }
+  const clone = new URL(url.toString())
+  const urlParams = UrlParams.fromInput(clone.searchParams)
+  const hash = clone.hash ? Option.some(clone.hash.slice(1)) : Option.none()
+  clone.search = ""
+  clone.hash = ""
+  return makeInternal(
     self.method,
-    url.toString(),
-    self.urlParams,
+    clone.toString(),
+    urlParams,
+    hash,
     self.headers,
     self.body
-  ))
+  )
+})
 
 /** @internal */
 export const appendUrl = dual<
@@ -215,21 +243,27 @@ export const appendUrl = dual<
 >(2, (self, url) =>
   makeInternal(
     self.method,
-    self.url + url,
+    self.url.endsWith("/") && url.startsWith("/") ?
+      self.url + url.slice(1) :
+      self.url + url,
     self.urlParams,
+    self.hash,
     self.headers,
     self.body
   ))
 
 /** @internal */
 export const prependUrl = dual<
-  (path: string | URL) => (self: ClientRequest.ClientRequest) => ClientRequest.ClientRequest,
+  (path: string) => (self: ClientRequest.ClientRequest) => ClientRequest.ClientRequest,
   (self: ClientRequest.ClientRequest, path: string) => ClientRequest.ClientRequest
 >(2, (self, url) =>
   makeInternal(
     self.method,
-    url.toString() + self.url,
+    url.endsWith("/") && self.url.startsWith("/") ?
+      url + self.url.slice(1) :
+      url + self.url,
     self.urlParams,
+    self.hash,
     self.headers,
     self.body
   ))
@@ -243,6 +277,7 @@ export const updateUrl = dual<
     self.method,
     f(self.url),
     self.urlParams,
+    self.hash,
     self.headers,
     self.body
   ))
@@ -256,6 +291,7 @@ export const appendUrlParam = dual<
     self.method,
     self.url,
     UrlParams.append(self.urlParams, key, value),
+    self.hash,
     self.headers,
     self.body
   ))
@@ -269,6 +305,7 @@ export const appendUrlParams = dual<
     self.method,
     self.url,
     UrlParams.appendAll(self.urlParams, input),
+    self.hash,
     self.headers,
     self.body
   ))
@@ -282,6 +319,7 @@ export const setUrlParam = dual<
     self.method,
     self.url,
     UrlParams.set(self.urlParams, key, value),
+    self.hash,
     self.headers,
     self.body
   ))
@@ -295,10 +333,36 @@ export const setUrlParams = dual<
     self.method,
     self.url,
     UrlParams.setAll(self.urlParams, input),
+    self.hash,
     self.headers,
     self.body
   ))
 
+/** @internal */
+export const setHash = dual<
+  (hash: string) => (self: ClientRequest.ClientRequest) => ClientRequest.ClientRequest,
+  (self: ClientRequest.ClientRequest, hash: string) => ClientRequest.ClientRequest
+>(2, (self, hash) =>
+  makeInternal(
+    self.method,
+    self.url,
+    self.urlParams,
+    Option.some(hash),
+    self.headers,
+    self.body
+  ))
+
+/** @internal */
+export const removeHash = (self: ClientRequest.ClientRequest): ClientRequest.ClientRequest =>
+  makeInternal(
+    self.method,
+    self.url,
+    self.urlParams,
+    Option.none(),
+    self.headers,
+    self.body
+  )
+
 /** @internal */
 export const setBody = dual<
   (body: Body.Body) => (self: ClientRequest.ClientRequest) => ClientRequest.ClientRequest,
@@ -322,6 +386,7 @@ export const setBody = dual<
     self.method,
     self.url,
     self.urlParams,
+    self.hash,
     headers,
     body
   )

package/src/internal/keyValueStore.ts

@@ -1,6 +1,7 @@
 import * as Schema from "@effect/schema/Schema"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
+import type { LazyArg } from "effect/Function"
 import { dual, pipe } from "effect/Function"
 import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
@@ -185,10 +186,10 @@ const storageError = (props: Omit<Parameters<typeof PlatformError.SystemError>[0
   })
 
 /** @internal */
-export const layerStorage = (storage: Storage) =>
-  Layer.succeed(
-    keyValueStoreTag,
-    make({
+export const layerStorage = (evaluate: LazyArg<Storage>) =>
+  Layer.sync(keyValueStoreTag, () => {
+    const storage = evaluate()
+    return make({
       get: (key: string) =>
         Effect.try({
           try: () => Option.fromNullable(storage.getItem(key)),
@@ -242,4 +243,4 @@ export const layerStorage = (storage: Storage) =>
           })
       })
     })
-  )
+  })

package/src/internal/worker.ts

@@ -67,7 +67,6 @@ export const makeManager = Effect.gen(function*() {
     spawn<I, O, E>({
       encode,
       initialMessage,
-      permits = 1,
       queue,
       transfers = (_) => []
     }: Worker.Worker.Options<I>) {
@@ -75,7 +74,6 @@ export const makeManager = Effect.gen(function*() {
         const spawn = yield* _(Spawner)
         const id = idCounter++
         let requestIdCounter = 0
-        const semaphore = Effect.unsafeMakeSemaphore(permits)
         const requestMap = new Map<
           number,
           readonly [Queue.Queue<Exit.Exit<ReadonlyArray<O>, E | WorkerError>>, Deferred.Deferred<void>]
@@ -237,10 +235,9 @@ export const makeManager = Effect.gen(function*() {
             executeRelease
           )
 
-        yield* semaphore.take(1).pipe(
-          Effect.andThen(outbound.take),
+        yield* outbound.take.pipe(
           Effect.flatMap(([id, request, span]) =>
-            pipe(
+            Effect.fork(
               Effect.suspend(() => {
                 const result = requestMap.get(id)
                 if (!result) return Effect.void
@@ -260,14 +257,12 @@ export const makeManager = Effect.gen(function*() {
                   Effect.catchAllCause((cause) => Queue.offer(result[0], Exit.failCause(cause))),
                   Effect.zipRight(Deferred.await(result[1]))
                 )
-              }),
-              Effect.ensuring(semaphore.release(1)),
-              Effect.fork
+              })
             )
           ),
           Effect.forever,
-          Effect.interruptible,
-          Effect.forkScoped
+          Effect.forkScoped,
+          Effect.interruptible
         )
 
         if (initialMessage) {
@@ -299,11 +294,21 @@ export const makePool = <I, O, E>(
       Effect.tap((worker) => Effect.addFinalizer(() => Effect.sync(() => workers.delete(worker)))),
       options.onCreate ? Effect.tap(options.onCreate) : identity
     )
-    const backing = yield* Pool.make({
-      acquire,
-      size: options.size
-    })
-    const get = Effect.scoped(backing.get)
+    const backing = "minSize" in options ?
+      yield* Pool.makeWithTTL({
+        acquire,
+        min: options.minSize,
+        max: options.maxSize,
+        concurrency: options.concurrency,
+        targetUtilization: options.targetUtilization,
+        timeToLive: options.timeToLive
+      }) :
+      yield* Pool.make({
+        acquire,
+        size: options.size,
+        concurrency: options.concurrency,
+        targetUtilization: options.targetUtilization
+      })
     const pool: Worker.WorkerPool<I, O, E> = {
       backing,
       broadcast: (message: I) =>
@@ -311,12 +316,20 @@ export const makePool = <I, O, E>(
           concurrency: "unbounded",
           discard: true
         }),
-      execute: (message: I) => Stream.unwrap(Effect.map(get, (worker) => worker.execute(message))),
-      executeEffect: (message: I) => Effect.flatMap(get, (worker) => worker.executeEffect(message))
+      execute: (message: I) =>
+        Stream.unwrapScoped(Effect.map(
+          backing.get,
+          (worker) => worker.execute(message)
+        )),
+      executeEffect: (message: I) =>
+        Effect.scoped(Effect.flatMap(
+          backing.get,
+          (worker) => worker.executeEffect(message)
+        ))
     }
 
     // report any spawn errors
-    yield* get
+    yield* Effect.scoped(backing.get)
 
     return pool
   })
@@ -391,13 +404,16 @@ export const makePoolSerialized = <I extends Schema.TaggedRequest.Any>(
         acquire,
         min: options.minSize,
         max: options.maxSize,
+        concurrency: options.concurrency,
+        targetUtilization: options.targetUtilization,
         timeToLive: options.timeToLive
       }) :
       Pool.make({
         acquire,
-        size: options.size
+        size: options.size,
+        concurrency: options.concurrency,
+        targetUtilization: options.targetUtilization
       })
-    const get = Effect.scoped(backing.get)
     const pool: Worker.SerializedWorkerPool<I> = {
       backing,
       broadcast: <Req extends I>(message: Req) =>
@@ -406,13 +422,13 @@ export const makePoolSerialized = <I extends Schema.TaggedRequest.Any>(
           discard: true
         }) as any,
       execute: <Req extends I>(message: Req) =>
-        Stream.unwrap(Effect.map(get, (worker) => worker.execute(message))) as any,
+        Stream.unwrapScoped(Effect.map(backing.get, (worker) => worker.execute(message))) as any,
       executeEffect: <Req extends I>(message: Req) =>
-        Effect.flatMap(get, (worker) => worker.executeEffect(message)) as any
+        Effect.scoped(Effect.flatMap(backing.get, (worker) => worker.executeEffect(message))) as any
     }
 
     // report any spawn errors
-    yield* get
+    yield* Effect.scoped(backing.get)
 
     return pool
   })