effect 4.0.0-beta.94 → 4.0.0-beta.97

package/src/unstable/rpc/RpcMessage.ts

@@ -40,7 +40,7 @@ export type FromClientEncoded = RequestEncoded | AckEncoded | InterruptEncoded |
  * @category request
  * @since 4.0.0
  */
-export type RequestId = Branded<bigint, "~effect/rpc/RpcMessage/RequestId">
+export type RequestId = Branded<string | number, "~effect/rpc/RpcMessage/RequestId">
 
 /**
  * Converts a bigint or string request id into the branded `RequestId` type.
@@ -48,8 +48,7 @@ export type RequestId = Branded<bigint, "~effect/rpc/RpcMessage/RequestId">
  * @category request
  * @since 4.0.0
  */
-export const RequestId = (id: bigint | string): RequestId =>
-  typeof id === "bigint" ? id as RequestId : BigInt(id) as RequestId
+export const RequestId = (id: string | number): RequestId => id as RequestId
 
 /**
  * The transport-encoded RPC request envelope, including the string request id,
@@ -60,7 +59,7 @@ export const RequestId = (id: bigint | string): RequestId =>
  */
 export interface RequestEncoded {
   readonly _tag: "Request"
-  readonly id: string
+  readonly id: string | number
   readonly tag: string
   readonly payload: unknown
   readonly headers: ReadonlyArray<[string, string]>
@@ -119,7 +118,7 @@ export interface Interrupt {
  */
 export interface AckEncoded {
   readonly _tag: "Ack"
-  readonly requestId: string
+  readonly requestId: string | number
 }
 
 /**
@@ -130,7 +129,7 @@ export interface AckEncoded {
  */
 export interface InterruptEncoded {
   readonly _tag: "Interrupt"
-  readonly requestId: string
+  readonly requestId: string | number
 }
 
 /**
@@ -229,7 +228,7 @@ export type ResponseId = Branded<number, ResponseIdTypeId>
  */
 export interface ResponseChunkEncoded {
   readonly _tag: "Chunk"
-  readonly requestId: string
+  readonly requestId: string | number
   readonly values: NonEmptyReadonlyArray<unknown>
 }
 
@@ -282,7 +281,7 @@ export type ExitEncoded<A, E> = {
  */
 export interface ResponseExitEncoded {
   readonly _tag: "Exit"
-  readonly requestId: string
+  readonly requestId: string | number
   readonly exit: ExitEncoded<unknown, unknown>
 }
 
@@ -338,7 +337,7 @@ export const ResponseExitDieEncoded = (options: {
   readonly defect: unknown
 }): ResponseExitEncoded => ({
   _tag: "Exit",
-  requestId: options.requestId.toString(),
+  requestId: options.requestId,
   exit: {
     _tag: "Failure",
     cause: [{

package/src/unstable/rpc/RpcSerialization.ts

@@ -128,9 +128,9 @@ export const jsonRpc = (options?: {
     includesFraming: false,
     makeUnsafe: () => {
       const decoder = new TextDecoder()
-      const batches = new Map<string, {
+      const batches = new Map<string | number, {
         readonly size: number
-        readonly responses: Map<string, RpcMessage.FromServerEncoded>
+        readonly responses: Map<string | number, RpcMessage.FromServerEncoded>
       }>()
       return {
         decode: (bytes) => {
@@ -187,9 +187,9 @@ export const ndJsonRpc = (options?: {
 
 function decodeJsonRpcRaw(
   decoded: JsonRpcMessage | Array<JsonRpcMessage>,
-  batches: Map<string, {
+  batches: Map<string | number, {
     readonly size: number
-    readonly responses: Map<string, RpcMessage.FromServerEncoded>
+    readonly responses: Map<string | number, RpcMessage.FromServerEncoded>
   }>
 ) {
   if (Array.isArray(decoded)) {
@@ -221,13 +221,13 @@ function decodeJsonRpcMessage(decoded: JsonRpcMessage): RpcMessage.FromClientEnc
       return requestId ?
         {
           _tag: tag,
-          requestId: String(requestId)
+          requestId
         } as any :
         { _tag: tag } as any
     }
     return {
       _tag: "Request",
-      id: Predicate.isNotNullish(decoded.id) ? String(decoded.id) : "",
+      id: decoded.id ?? "",
       tag: decoded.method,
       payload: decoded.params ?? null,
       headers: decoded.headers ?? [],
@@ -247,13 +247,13 @@ function decodeJsonRpcMessage(decoded: JsonRpcMessage): RpcMessage.FromClientEnc
   } else if (decoded.chunk === true) {
     return {
       _tag: "Chunk",
-      requestId: String(decoded.id),
+      requestId: decoded.id ?? "",
       values: decoded.result as any
     }
   }
   return {
     _tag: "Exit",
-    requestId: String(decoded.id),
+    requestId: decoded.id ?? "",
     exit: decoded.error != null ?
       {
         _tag: "Failure",
@@ -273,9 +273,9 @@ function decodeJsonRpcMessage(decoded: JsonRpcMessage): RpcMessage.FromClientEnc
 
 function encodeJsonRpcRaw(
   response: RpcMessage.FromServerEncoded | RpcMessage.FromClientEncoded,
-  batches: Map<string, {
+  batches: Map<string | number, {
     readonly size: number
-    readonly responses: Map<string, RpcMessage.FromServerEncoded>
+    readonly responses: Map<string | number, RpcMessage.FromServerEncoded>
   }>
 ) {
   if (!("requestId" in response)) {
@@ -298,9 +298,9 @@ function encodeJsonRpcResponse(
     | RpcMessage.FromServerEncoded
     | RpcMessage.FromClientEncoded
     | Array<RpcMessage.FromServerEncoded | RpcMessage.FromClientEncoded>,
-  batches: Map<string, {
+  batches: Map<string | number, {
     readonly size: number
-    readonly responses: Map<string, RpcMessage.FromServerEncoded>
+    readonly responses: Map<string | number, RpcMessage.FromServerEncoded>
   }>
 ) {
   if (Array.isArray(response) === false) {
@@ -341,7 +341,7 @@ function encodeJsonRpcMessage(response: RpcMessage.FromServerEncoded | RpcMessag
         jsonrpc: "2.0",
         method: response.tag,
         params: response.payload,
-        id: response.id !== "" ? Number(response.id) : "",
+        id: response.id,
         headers: response.headers,
         traceId: response.traceId,
         spanId: response.spanId,
@@ -361,21 +361,21 @@ function encodeJsonRpcMessage(response: RpcMessage.FromServerEncoded | RpcMessag
       return {
         jsonrpc: "2.0",
         chunk: true,
-        id: Number(response.requestId),
+        id: response.requestId,
         result: response.values
       }
     case "Exit": {
       if (response.exit._tag === "Success") {
         return {
           jsonrpc: "2.0",
-          id: response.requestId !== "" ? Number(response.requestId) : undefined,
+          id: response.requestId ?? undefined,
           result: response.exit.value
         } as any
       }
       const error = response.exit.cause.find((failure) => failure._tag === "Fail")
       return {
         jsonrpc: "2.0",
-        id: response.requestId !== "" ? Number(response.requestId) : undefined,
+        id: response.requestId ?? undefined,
         error: response.exit._tag === "Failure" ?
           {
             _tag: "Cause",

package/src/unstable/rpc/RpcServer.ts

@@ -537,7 +537,7 @@ export const make: <Rpcs extends Rpc.Any>(
             schemas.encodeDefect,
             schemas.collector,
             Effect.provideContext(schemas.encodeChunk(response.values), schemas.context),
-            (values) => ({ _tag: "Chunk", requestId: String(response.requestId), values })
+            (values) => ({ _tag: "Chunk", requestId: response.requestId, values })
           )
         }
         case "Exit": {
@@ -550,7 +550,7 @@ export const make: <Rpcs extends Rpc.Any>(
             schemas.encodeDefect,
             schemas.collector,
             Effect.provideContext(schemas.encodeExit(response.exit), schemas.context),
-            (exit) => ({ _tag: "Exit", requestId: String(response.requestId), exit })
+            (exit) => ({ _tag: "Exit", requestId: response.requestId, exit })
           )
         }
         case "Defect": {
@@ -647,7 +647,7 @@ export const make: <Rpcs extends Rpc.Any>(
       Effect.flatMap(encodeDefect(defect), (encodedDefect) =>
         send(client.id, {
           _tag: "Exit",
-          requestId: String(requestId),
+          requestId,
           exit: {
             _tag: "Failure",
             cause: [{
@@ -685,7 +685,7 @@ export const make: <Rpcs extends Rpc.Any>(
         const tag = Predicate.hasProperty(request, "tag") ? (request.tag as string) : ""
         let requestId: RequestId
         switch (typeof request.id) {
-          case "bigint":
+          case "number":
           case "string": {
             requestId = RequestId(request.id)
             break
@@ -1036,7 +1036,7 @@ export const makeProtocolWithHttpEffect: Effect.Effect<
       if (queue.state._tag === "Done") return Effect.void
       return Effect.forEach(
         requestIds,
-        (requestId) => writeRequest(id, { _tag: "Interrupt", requestId: String(requestId) }),
+        (requestId) => writeRequest(id, { _tag: "Interrupt", requestId }),
         { discard: true }
       )
     })

package/src/unstable/workflow/Activity.ts

@@ -178,11 +178,12 @@ export const make = <
   return self
 }
 
-const interruptRetryPolicy = Schedule.exponential(4.0, 1.5).pipe(
-  Schedule.either(Schedule.spaced("10 seconds")),
-  Schedule.either(Schedule.recurs(10)),
-  Schedule.satisfiesInputType<Cause.Cause<unknown>>(),
-  Schedule.while((meta) => Effect.succeed(Cause.hasInterrupts(meta.input)))
+const interruptRetryPolicy = Schedule.min([
+  Schedule.exponential(400, 1.5),
+  Schedule.spaced("10 seconds")
+]).pipe(
+  Schedule.setInputType<Cause.Cause<unknown>>(),
+  Schedule.while((meta) => meta.attempt <= 10 && Cause.hasInterrupts(meta.input))
 )
 
 const retryOnInterrupt = (

package/src/unstable/workflow/DurableQueue.ts

@@ -239,9 +239,10 @@ export const process: <
   return yield* DurableDeferred.await(deferred)
 })
 
-const defaultRetrySchedule = Schedule.exponential(500, 1.5).pipe(
-  Schedule.either(Schedule.spaced("1 minute"))
-)
+const defaultRetrySchedule = Schedule.min([
+  Schedule.exponential(500, 1.5),
+  Schedule.spaced("1 minute")
+])
 
 /**
  * Create a worker effect that processes items from the durable queue.

package/src/unstable/workflow/WorkflowEngine.ts

@@ -552,9 +552,10 @@ export const makeUnsafe = (options: Encoded): WorkflowEngine["Service"] =>
       )
   })
 
-const defaultRetrySchedule = Schedule.exponential(200, 1.5).pipe(
-  Schedule.either(Schedule.spaced(30000))
-)
+const defaultRetrySchedule = Schedule.min([
+  Schedule.exponential(200, 1.5),
+  Schedule.spaced(30000)
+])
 
 /**
  * Layer that provides an in-memory `WorkflowEngine`.