dfx 0.74.0 → 0.75.0

package/src/Interactions/gateway.ts

@@ -2,7 +2,6 @@ import * as Chunk from "effect/Chunk"
 import { Tag } from "effect/Context"
 import * as Duration from "effect/Duration"
 import { pipe } from "effect/Function"
-import type { Cause } from "effect/Cause"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
 import * as Queue from "effect/Queue"
@@ -21,6 +20,7 @@ import type { InteractionBuilder } from "dfx/Interactions/index"
 import { builder, Interaction } from "dfx/Interactions/index"
 import type * as Discord from "dfx/types"
 import * as EffectUtils from "dfx/utils/Effect"
+import * as Schedule from "effect/Schedule"
 
 export interface RunOpts {
   sync?: boolean
@@ -112,55 +112,55 @@ export const run =
       )
     })
 
-const makeRegistry = Effect.gen(function* (_) {
-  const ref = yield* _(
-    Ref.make(builder as InteractionBuilder<never, never, never>),
-  )
-  const queue = yield* _(
-    Queue.sliding<InteractionBuilder<never, never, never>>(1),
-  )
-
-  const register = <E>(ix: InteractionBuilder<never, E, never>) =>
-    Effect.flatMap(
-      Ref.updateAndGet(ref, _ => _.concat(ix as any)),
-      _ => Queue.offer(queue, _),
+const makeRegistry = (options?: RunOpts) =>
+  Effect.gen(function* (_) {
+    const ref = yield* _(
+      Ref.make(builder as InteractionBuilder<never, never, never>),
+    )
+    const queue = yield* _(
+      Queue.sliding<InteractionBuilder<never, never, never>>(1),
     )
 
-  const run_ = <R, E>(
-    onError: (
-      _: Cause<DiscordRESTError | DefinitionNotFound>,
-    ) => Effect.Effect<R, E, void>,
-    opts?: RunOpts,
-  ) =>
-    EffectUtils.foreverSwitch(Queue.take(queue), ix =>
-      Effect.delay(
-        pipe(ix, run(Effect.catchAllCause(onError), opts)),
-        Duration.seconds(0.1),
+    const register = <E>(ix: InteractionBuilder<never, E, never>) =>
+      Effect.flatMap(
+        Ref.updateAndGet(ref, _ => _.concat(ix as any)),
+        _ => Queue.offer(queue, _),
+      )
+
+    yield* _(
+      EffectUtils.foreverSwitch(Queue.take(queue), ix =>
+        pipe(
+          ix,
+          run(
+            Effect.catchAllCause(_ => Effect.logError("unhandled error", _)),
+            options,
+          ),
+          Effect.delay(Duration.seconds(0.1)),
+        ),
+      ),
+      Effect.tapErrorCause(_ => Effect.logError("registry error", _)),
+      Effect.retry(
+        Schedule.exponential("1 seconds").pipe(
+          Schedule.union(Schedule.spaced("20 seconds")),
+        ),
       ),
+      Effect.forkScoped,
     )
 
-  return { register, run: run_ } as const
-})
+    return { register } as const
+  }).pipe(
+    Effect.annotateLogs({
+      package: "dfx",
+      service: "InteractionsRegistry",
+    }),
+  )
 
 export interface InteractionsRegistry {
   readonly register: <E>(
     ix: InteractionBuilder<never, E, never>,
   ) => Effect.Effect<never, never, void>
-
-  readonly run: <R, E>(
-    onError: (
-      _: Cause<DiscordRESTError | DefinitionNotFound>,
-    ) => Effect.Effect<R, E, void>,
-    opts?: RunOpts,
-  ) => Effect.Effect<
-    DiscordREST | DiscordGateway | Exclude<R, Discord.Interaction>,
-    DiscordRESTError | Http.error.ResponseError | E,
-    never
-  >
 }
 
 export const InteractionsRegistry = Tag<InteractionsRegistry>()
-export const InteractionsRegistryLive = Layer.effect(
-  InteractionsRegistry,
-  makeRegistry,
-)
+export const InteractionsRegistryLive = (options?: RunOpts) =>
+  Layer.scoped(InteractionsRegistry, makeRegistry(options))

package/src/gateway.ts

@@ -14,8 +14,6 @@ import * as SendEvent from "dfx/DiscordGateway/Shard/sendEvents"
 import * as ShardStore from "dfx/DiscordGateway/ShardStore"
 import { LiveMemoryShardStore } from "dfx/DiscordGateway/ShardStore"
 import * as WS from "dfx/DiscordGateway/WS"
-import { InteractionsRegistryLive } from "dfx/gateway"
-import type { InteractionsRegistry } from "dfx/gateway"
 import type { RateLimiter } from "dfx/RateLimit"
 import { LiveMemoryRateLimitStore, LiveRateLimiter } from "dfx/RateLimit"
 
@@ -43,7 +41,6 @@ export const MemoryBot = Layer.provide(
   Layer.mergeAll(
     Layer.provideMerge(LiveDiscordREST, LiveDiscordGateway),
     MemoryRateLimit,
-    InteractionsRegistryLive,
   ),
 )
 
@@ -54,7 +51,6 @@ export const gatewayLayer = (
   ConfigError.ConfigError,
   | RateLimiter
   | Log.Log
-  | InteractionsRegistry
   | DiscordREST
   | DiscordGateway
   | DiscordConfig.DiscordConfig

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "0.74.0";
+export const LIB_VERSION = "0.75.0";

package/version.d.ts

@@ -1,2 +1,2 @@
-export declare const LIB_VERSION = "0.74.0";
+export declare const LIB_VERSION = "0.75.0";
 //# sourceMappingURL=version.d.ts.map

package/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LIB_VERSION = void 0;
-const LIB_VERSION = exports.LIB_VERSION = "0.74.0";
+const LIB_VERSION = exports.LIB_VERSION = "0.75.0";
 //# sourceMappingURL=version.js.map