dfx 0.60.0 → 0.61.0

package/src/Interactions/handlers.ts

@@ -61,28 +61,28 @@ export const handlers = <R, E, TE, A, B>(
     [Discord.InteractionType.MODAL_SUBMIT]: i => {
       const data = i.data as Discord.ModalSubmitDatum
 
-      return Effect.findFirst(ModalSubmit, _ =>
-        _.predicate(data.custom_id),
-      ).pipe(
-        Effect.flatMap(
-          Option.match({
-            onNone: () => Effect.fail(new DefinitionNotFound(i)),
-            onSome: match =>
-              Effect.provideService(
-                match.handle(i),
-                Ctx.ModalSubmitData,
-                data,
-              ) as Handler<R, E, B>,
-          }),
-        ),
-      )
+      return Effect.findFirst(ModalSubmit, _ => _.predicate(data.custom_id))
+        .pipe(
+          Effect.flatMap(
+            Option.match({
+              onNone: () => Effect.fail(new DefinitionNotFound(i)),
+              onSome: match =>
+                Effect.provideService(
+                  match.handle(i),
+                  Ctx.ModalSubmitData,
+                  data,
+                ) as Handler<R, E, B>,
+            }),
+          ),
+        )
     },
 
     [Discord.InteractionType.MESSAGE_COMPONENT]: i => {
       const data = i.data as Discord.MessageComponentDatum
 
-      return Effect.findFirst(MessageComponent, _ =>
-        _.predicate(data.custom_id),
+      return Effect.findFirst(
+        MessageComponent,
+        _ => _.predicate(data.custom_id),
       ).pipe(
         Effect.flatMap(
           Option.match({
@@ -104,25 +104,24 @@ export const handlers = <R, E, TE, A, B>(
       return Option.match(IxHelpers.focusedOption(data), {
         onNone: () => Effect.fail(new DefinitionNotFound(i)),
         onSome: focusedOption =>
-          Effect.findFirst(Autocomplete, _ =>
-            _.predicate(data, focusedOption),
-          ).pipe(
-            Effect.flatMap(
-              Option.match({
-                onNone: () => Effect.fail(new DefinitionNotFound(i)),
-                onSome: match =>
-                  Effect.provideService(
-                    match.handle(i),
-                    Ctx.ApplicationCommand,
-                    data,
-                  ).pipe(
-                    Effect.provideService(Ctx.FocusedOptionContext, {
-                      focusedOption,
-                    }),
-                  ) as Handler<R, E, B>,
-              }),
+          Effect.findFirst(Autocomplete, _ => _.predicate(data, focusedOption))
+            .pipe(
+              Effect.flatMap(
+                Option.match({
+                  onNone: () => Effect.fail(new DefinitionNotFound(i)),
+                  onSome: match =>
+                    Effect.provideService(
+                      match.handle(i),
+                      Ctx.ApplicationCommand,
+                      data,
+                    ).pipe(
+                      Effect.provideService(Ctx.FocusedOptionContext, {
+                        focusedOption,
+                      }),
+                    ) as Handler<R, E, B>,
+                }),
+              ),
             ),
-          ),
       })
     },
   }

package/src/Interactions/index.ts

@@ -5,10 +5,10 @@ export { response } from "dfx/Helpers/interactions"
 export * from "dfx/Interactions/builder"
 export * from "dfx/Interactions/context"
 export {
-  InteractionDefinition,
   autocomplete,
   global,
   guild,
+  InteractionDefinition,
   messageComponent,
   modalSubmit,
 } from "dfx/Interactions/definitions"
@@ -23,24 +23,20 @@ export const idStartsWith = (query: string) => (customId: string) =>
 export const idRegex = (query: RegExp) => (customId: string) =>
   Effect.succeed(query.test(customId))
 
-export const option =
-  (command: string, optionName: string) =>
-  (
-    data: Pick<Discord.ApplicationCommandDatum, "name">,
-    focusedOption: Pick<
-      Discord.ApplicationCommandInteractionDataOption,
-      "name"
-    >,
-  ) =>
-    Effect.succeed(data.name === command && focusedOption.name === optionName)
+export const option = (command: string, optionName: string) =>
+(
+  data: Pick<Discord.ApplicationCommandDatum, "name">,
+  focusedOption: Pick<
+    Discord.ApplicationCommandInteractionDataOption,
+    "name"
+  >,
+) => Effect.succeed(data.name === command && focusedOption.name === optionName)
 
-export const optionOnly =
-  (optionName: string) =>
-  (
-    _: unknown,
-    focusedOption: Pick<
-      Discord.ApplicationCommandInteractionDataOption,
-      "name"
-    >,
-  ) =>
-    Effect.succeed(focusedOption.name === optionName)
+export const optionOnly = (optionName: string) =>
+(
+  _: unknown,
+  focusedOption: Pick<
+    Discord.ApplicationCommandInteractionDataOption,
+    "name"
+  >,
+) => Effect.succeed(focusedOption.name === optionName)

package/src/Interactions/utils.ts

@@ -7,12 +7,11 @@ import type * as Discord from "dfx/types"
 export type DefinitionFlattened<R, E, TE, A> = D.InteractionDefinition<
   R,
   E
-> extends infer D
-  ? {
-      [K in keyof D]: K extends "handle"
-        ? (_: Discord.Interaction) => Effect.Effect<R, TE, A>
-        : D[K]
-    }
+> extends infer D ? {
+    [K in keyof D]: K extends "handle"
+      ? (_: Discord.Interaction) => Effect.Effect<R, TE, A>
+      : D[K]
+  }
   : never
 
 export type DefinitionFlattenedCommand<R, E, TE, A> = Extract<
@@ -45,13 +44,11 @@ export const flattenDefinitions = <R, E, TE, A, B>(
     handle: (i: Discord.Interaction) =>
       Effect.isEffect(definition.handle)
         ? transform(
-            Effect.flatMap(definition.handle, _ => handleResponse(i, _)),
-          )
+          Effect.flatMap(definition.handle, _ => handleResponse(i, _)),
+        )
         : transform(
-            Effect.flatMap(definition.handle(context), _ =>
-              handleResponse(i, _),
-            ),
-          ),
+          Effect.flatMap(definition.handle(context), _ => handleResponse(i, _)),
+        ),
   }))
 
 export const splitDefinitions = <R, E, TE, A>(
@@ -82,11 +79,10 @@ export const splitDefinitions = <R, E, TE, A>(
   ).pipe(
     Chunk.reduce(
       {} as Record<string, DefinitionFlattenedCommand<R, E, TE, A>>,
-      (acc, d) =>
-        ({
-          ...acc,
-          [d.command.name]: d,
-        } as any),
+      (acc, d) => ({
+        ...acc,
+        [d.command.name]: d,
+      } as any),
     ),
   )
 

package/src/Interactions/webhook.ts

@@ -42,8 +42,8 @@ const checkSignature = (
           publicKey,
           crypto,
           algorithm,
-        ),
-      ),
+        )
+      )
     ),
     Effect.filterOrFail(identity, () => new BadWebhookSignature()),
     Effect.catchAllCause(() => Effect.fail(new BadWebhookSignature())),
@@ -86,14 +86,16 @@ export class WebhookParseError {
 }
 
 const fromHeadersAndBody = (headers: Headers, body: string) =>
-  Effect.tap(WebhookConfig, ({ algorithm, crypto, publicKey }) =>
-    checkSignature(publicKey, headers, body, crypto, algorithm),
+  Effect.tap(
+    WebhookConfig,
+    ({ algorithm, crypto, publicKey }) =>
+      checkSignature(publicKey, headers, body, crypto, algorithm),
   ).pipe(
     Effect.flatMap(() =>
       Effect.try({
         try: () => JSON.parse(body) as Discord.Interaction,
         catch: reason => new WebhookParseError(reason),
-      }),
+      })
     ),
   )
 
@@ -113,12 +115,14 @@ const run = <R, E>(
 ) => {
   const handler = handlers(definitions, handleResponse)
   return (headers: Headers, body: string) =>
-    Effect.flatMap(fromHeadersAndBody(headers, body), interaction =>
-      Effect.provideService(
-        handler[interaction.type](interaction),
-        Interaction,
-        interaction,
-      ),
+    Effect.flatMap(
+      fromHeadersAndBody(headers, body),
+      interaction =>
+        Effect.provideService(
+          handler[interaction.type](interaction),
+          Interaction,
+          interaction,
+        ),
     )
 }
 
@@ -134,14 +138,14 @@ export interface HandleWebhookOpts<E> {
  */
 export const makeHandler = <R, E, TE>(
   ix: InteractionBuilder<R, E, TE>,
-): (({
+): ({
   body,
   error,
   headers,
   success,
 }: HandleWebhookOpts<
   E | WebhookParseError | BadWebhookSignature | DefinitionNotFound
->) => Effect.Effect<WebhookConfig, never, void>) => {
+>) => Effect.Effect<WebhookConfig, never, void> => {
   const handle = run(
     Chunk.map(ix.definitions, ([d]) => [d, identity] as any),
     (_i, r) => Effect.succeed(r),
@@ -166,7 +170,7 @@ export const makeHandler = <R, E, TE>(
  */
 export const makeSimpleHandler = <R, E, TE>(
   ix: InteractionBuilder<R, E, TE>,
-): (({
+): ({
   body,
   headers,
 }: {
@@ -176,7 +180,7 @@ export const makeSimpleHandler = <R, E, TE>(
   WebhookConfig,
   BadWebhookSignature | WebhookParseError | DefinitionNotFound,
   Discord.InteractionResponse
->) => {
+> => {
   const handle = run(
     Chunk.map(ix.definitions, ([d]) => [d, identity] as any),
     (_i, r) => Effect.succeed(r),

package/src/Log.ts

@@ -1,6 +1,6 @@
+import { Tag } from "@effect/data/Context"
 import * as Effect from "@effect/io/Effect"
 import * as Layer from "@effect/io/Layer"
-import { Tag } from "@effect/data/Context"
 
 const make = (debug = false) => ({
   info: (...args: Array<any>) =>
@@ -10,8 +10,8 @@ const make = (debug = false) => ({
   debug: (...args: Array<any>) =>
     debug
       ? Effect.sync(() => {
-          console.error("DEBUG", ...args)
-        })
+        console.error("DEBUG", ...args)
+      })
       : Effect.unit,
 })
 

package/src/RateLimit.ts

@@ -43,7 +43,7 @@ export interface RateLimitStore {
 export const RateLimitStore = Tag<RateLimitStore>()
 export const LiveMemoryRateLimitStore = Layer.sync(RateLimitStore, Memory.make)
 
-const makeLimiter = Effect.gen(function* (_) {
+const makeLimiter = Effect.gen(function*(_) {
   const store = yield* _(RateLimitStore)
   const log = yield* _(Log)
 
@@ -64,10 +64,10 @@ const makeLimiter = Effect.gen(function* (_) {
           windowMs,
           limit,
           delay: Duration.toMillis(d),
-        }),
+        })
       ),
       Effect.tap(_ =>
-        Duration.toMillis(_) === 0 ? Effect.unit : Effect.sleep(_),
+        Duration.toMillis(_) === 0 ? Effect.unit : Effect.sleep(_)
       ),
       Effect.asUnit,
     )
@@ -77,6 +77,7 @@ const makeLimiter = Effect.gen(function* (_) {
 })
 
 export interface RateLimiter
-  extends Effect.Effect.Success<typeof makeLimiter> {}
+  extends Effect.Effect.Success<typeof makeLimiter>
+{}
 export const RateLimiter = Tag<RateLimiter>()
 export const LiveRateLimiter = Layer.effect(RateLimiter, makeLimiter)

package/src/gateway.ts

@@ -16,10 +16,10 @@ 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 type { RateLimiter } from "dfx/RateLimit"
-import { LiveMemoryRateLimitStore, LiveRateLimiter } from "dfx/RateLimit"
 import { InteractionsRegistryLive } from "dfx/gateway"
 import type { InteractionsRegistry } from "dfx/gateway"
+import type { RateLimiter } from "dfx/RateLimit"
+import { LiveMemoryRateLimitStore, LiveRateLimiter } from "dfx/RateLimit"
 
 export { DiscordGateway, LiveDiscordGateway } from "dfx/DiscordGateway"
 

package/src/index.ts

@@ -17,8 +17,8 @@ export {
   BucketDetails,
   LiveMemoryRateLimitStore,
   LiveRateLimiter,
-  RateLimitStore,
   RateLimiter,
+  RateLimitStore,
 } from "dfx/RateLimit"
 
 export {

package/src/types.ts

@@ -1173,7 +1173,8 @@ export function createRoutes<O = any>(
     batchEditApplicationCommandPermissions: (applicationId, guildId, options) =>
       fetch({
         method: "PUT",
-        url: `/applications/${applicationId}/guilds/${guildId}/commands/permissions`,
+        url:
+          `/applications/${applicationId}/guilds/${guildId}/commands/permissions`,
         options,
       }),
     beginGuildPrune: (guildId, params, options) =>
@@ -1342,7 +1343,8 @@ export function createRoutes<O = any>(
     createReaction: (channelId, messageId, emoji, options) =>
       fetch({
         method: "PUT",
-        url: `/channels/${channelId}/messages/${messageId}/reactions/${emoji}/@me`,
+        url:
+          `/channels/${channelId}/messages/${messageId}/reactions/${emoji}/@me`,
         options,
       }),
     createStageInstance: (params, options) =>
@@ -1403,7 +1405,8 @@ export function createRoutes<O = any>(
     ) =>
       fetch({
         method: "DELETE",
-        url: `/webhooks/${applicationId}/${interactionToken}/messages/${messageId}`,
+        url:
+          `/webhooks/${applicationId}/${interactionToken}/messages/${messageId}`,
         options,
       }),
     deleteGlobalApplicationCommand: (applicationId, commandId, options) =>
@@ -1426,7 +1429,8 @@ export function createRoutes<O = any>(
     ) =>
       fetch({
         method: "DELETE",
-        url: `/applications/${applicationId}/guilds/${guildId}/commands/${commandId}`,
+        url:
+          `/applications/${applicationId}/guilds/${guildId}/commands/${commandId}`,
         options,
       }),
     deleteGuildEmoji: (guildId, emojiId, options) =>
@@ -1484,13 +1488,15 @@ export function createRoutes<O = any>(
     ) =>
       fetch({
         method: "DELETE",
-        url: `/webhooks/${applicationId}/${interactionToken}/messages/@original`,
+        url:
+          `/webhooks/${applicationId}/${interactionToken}/messages/@original`,
         options,
       }),
     deleteOwnReaction: (channelId, messageId, emoji, options) =>
       fetch({
         method: "DELETE",
-        url: `/channels/${channelId}/messages/${messageId}/reactions/${emoji}/@me`,
+        url:
+          `/channels/${channelId}/messages/${messageId}/reactions/${emoji}/@me`,
         options,
       }),
     deleteStageInstance: (channelId, options) =>
@@ -1502,7 +1508,8 @@ export function createRoutes<O = any>(
     deleteUserReaction: (channelId, messageId, emoji, userId, options) =>
       fetch({
         method: "DELETE",
-        url: `/channels/${channelId}/messages/${messageId}/reactions/${emoji}/${userId}`,
+        url:
+          `/channels/${channelId}/messages/${messageId}/reactions/${emoji}/${userId}`,
         options,
       }),
     deleteWebhook: (webhookId, options) =>
@@ -1539,7 +1546,8 @@ export function createRoutes<O = any>(
     ) =>
       fetch({
         method: "PUT",
-        url: `/applications/${applicationId}/guilds/${guildId}/commands/${commandId}/permissions`,
+        url:
+          `/applications/${applicationId}/guilds/${guildId}/commands/${commandId}/permissions`,
         params,
         options,
       }),
@@ -1559,7 +1567,8 @@ export function createRoutes<O = any>(
     ) =>
       fetch({
         method: "PATCH",
-        url: `/webhooks/${applicationId}/${interactionToken}/messages/${messageId}`,
+        url:
+          `/webhooks/${applicationId}/${interactionToken}/messages/${messageId}`,
         params,
         options,
       }),
@@ -1579,7 +1588,8 @@ export function createRoutes<O = any>(
     ) =>
       fetch({
         method: "PATCH",
-        url: `/applications/${applicationId}/guilds/${guildId}/commands/${commandId}`,
+        url:
+          `/applications/${applicationId}/guilds/${guildId}/commands/${commandId}`,
         params,
         options,
       }),
@@ -1598,7 +1608,8 @@ export function createRoutes<O = any>(
     ) =>
       fetch({
         method: "PATCH",
-        url: `/webhooks/${applicationId}/${interactionToken}/messages/@original`,
+        url:
+          `/webhooks/${applicationId}/${interactionToken}/messages/@original`,
         params,
         options,
       }),
@@ -1643,7 +1654,8 @@ export function createRoutes<O = any>(
     ) =>
       fetch({
         method: "GET",
-        url: `/applications/${applicationId}/guilds/${guildId}/commands/${commandId}/permissions`,
+        url:
+          `/applications/${applicationId}/guilds/${guildId}/commands/${commandId}/permissions`,
         options,
       }),
     getApplicationRoleConnectionMetadataRecords: (applicationId, options) =>
@@ -1735,7 +1747,8 @@ export function createRoutes<O = any>(
     ) =>
       fetch({
         method: "GET",
-        url: `/webhooks/${applicationId}/${interactionToken}/messages/${messageId}`,
+        url:
+          `/webhooks/${applicationId}/${interactionToken}/messages/${messageId}`,
         params,
         options,
       }),
@@ -1774,13 +1787,15 @@ export function createRoutes<O = any>(
     getGuildApplicationCommand: (applicationId, guildId, commandId, options) =>
       fetch({
         method: "GET",
-        url: `/applications/${applicationId}/guilds/${guildId}/commands/${commandId}`,
+        url:
+          `/applications/${applicationId}/guilds/${guildId}/commands/${commandId}`,
         options,
       }),
     getGuildApplicationCommandPermissions: (applicationId, guildId, options) =>
       fetch({
         method: "GET",
-        url: `/applications/${applicationId}/guilds/${guildId}/commands/permissions`,
+        url:
+          `/applications/${applicationId}/guilds/${guildId}/commands/permissions`,
         options,
       }),
     getGuildApplicationCommands: (applicationId, guildId, params, options) =>
@@ -1880,7 +1895,8 @@ export function createRoutes<O = any>(
     ) =>
       fetch({
         method: "GET",
-        url: `/guilds/${guildId}/scheduled-events/${guildScheduledEventId}/users`,
+        url:
+          `/guilds/${guildId}/scheduled-events/${guildScheduledEventId}/users`,
         params,
         options,
       }),
@@ -1960,7 +1976,8 @@ export function createRoutes<O = any>(
     ) =>
       fetch({
         method: "GET",
-        url: `/webhooks/${applicationId}/${interactionToken}/messages/@original`,
+        url:
+          `/webhooks/${applicationId}/${interactionToken}/messages/@original`,
         params,
         options,
       }),
@@ -3195,7 +3212,7 @@ The emoji must be URL Encoded or the request will fail with 10014: Unknown Emoji
     guildId: string,
     options?: O,
   ) => RestResponse<GuildOnboarding>
-  /** Returns the guild preview object for the given id. 
+  /** Returns the guild preview object for the given id.
 If the user is not in the guild, then the guild must be discoverable. */
   getGuildPreview: (guildId: string, options?: O) => RestResponse<GuildPreview>
   /** Returns an object with one pruned key indicating the number of members that would be removed in a prune operation. Requires the KICK_MEMBERS permission. */
@@ -4087,7 +4104,8 @@ export const enum GuildFeature {
   /** guild is able to set role icons */
   ROLE_ICONS = "ROLE_ICONS",
   /** guild has role subscriptions that can be purchased */
-  ROLE_SUBSCRIPTIONS_AVAILABLE_FOR_PURCHASE = "ROLE_SUBSCRIPTIONS_AVAILABLE_FOR_PURCHASE",
+  ROLE_SUBSCRIPTIONS_AVAILABLE_FOR_PURCHASE =
+    "ROLE_SUBSCRIPTIONS_AVAILABLE_FOR_PURCHASE",
   /** guild has enabled role subscriptions */
   ROLE_SUBSCRIPTIONS_ENABLED = "ROLE_SUBSCRIPTIONS_ENABLED",
   /** guild has enabled ticketed events */
@@ -4470,8 +4488,9 @@ export interface IntegrationApplication {
   /** the bot associated with this application */
   readonly bot?: User
 }
-export type IntegrationCreateEvent = Integration &
-  IntegrationCreateEventAdditional
+export type IntegrationCreateEvent =
+  & Integration
+  & IntegrationCreateEventAdditional
 export interface IntegrationCreateEventAdditional {
   /** ID of the guild */
   readonly guild_id: Snowflake
@@ -4488,8 +4507,9 @@ export const enum IntegrationExpireBehavior {
   REMOVE_ROLE = 0,
   KICK = 1,
 }
-export type IntegrationUpdateEvent = Integration &
-  IntegrationUpdateEventAdditional
+export type IntegrationUpdateEvent =
+  & Integration
+  & IntegrationUpdateEventAdditional
 export interface IntegrationUpdateEventAdditional {
   /** ID of the guild */
   readonly guild_id: Snowflake
@@ -5226,7 +5246,9 @@ export interface ModifyGuildParams {
   /** verification level */
   readonly verification_level?: VerificationLevel | null
   /** default message notification level */
-  readonly default_message_notifications?: DefaultMessageNotificationLevel | null
+  readonly default_message_notifications?:
+    | DefaultMessageNotificationLevel
+    | null
   /** explicit content filter level */
   readonly explicit_content_filter?: ExplicitContentFilterLevel | null
   /** id for afk channel */
@@ -5368,7 +5390,8 @@ export const enum OAuth2Scope {
   /** allows your app to update its commands using a Bearer token - client credentials grant only */
   APPLICATIONS_COMMANDS_UPDATE = "applications.commands.update",
   /** allows your app to update permissions for its commands in a guild a user has permissions to */
-  APPLICATIONS_COMMANDS_PERMISSIONS_UPDATE = "applications.commands.permissions.update",
+  APPLICATIONS_COMMANDS_PERMISSIONS_UPDATE =
+    "applications.commands.permissions.update",
   /** allows your app to read entitlements for a user's applications */
   APPLICATIONS_ENTITLEMENTS = "applications.entitlements",
   /** allows your app to read and update store data (SKUs, store listings, achievements, etc.) for a user's applications */
@@ -5683,7 +5706,8 @@ export interface ReceiveEvents {
   RESUMED: ResumedEvent
   RECONNECT: ReconnectEvent
   INVALID_SESSION: InvalidSessionEvent
-  APPLICATION_COMMAND_PERMISSIONS_UPDATE: ApplicationCommandPermissionsUpdateEvent
+  APPLICATION_COMMAND_PERMISSIONS_UPDATE:
+    ApplicationCommandPermissionsUpdateEvent
   AUTO_MODERATION_RULE_CREATE: AutoModerationRuleCreateEvent
   AUTO_MODERATION_RULE_UPDATE: AutoModerationRuleUpdateEvent
   AUTO_MODERATION_RULE_DELETE: AutoModerationRuleDeleteEvent

package/src/utils/Effect.ts

@@ -1,10 +1,10 @@
-import * as Effect from "@effect/io/Effect"
 import * as Option from "@effect/data/Option"
-import * as Ref from "@effect/io/Ref"
-import * as Queue from "@effect/io/Queue"
-import * as Hub from "@effect/io/Hub"
 import * as Deferred from "@effect/io/Deferred"
+import * as Effect from "@effect/io/Effect"
 import * as Fiber from "@effect/io/Fiber"
+import * as Hub from "@effect/io/Hub"
+import * as Queue from "@effect/io/Queue"
+import * as Ref from "@effect/io/Ref"
 
 export const subscribeForEachPar = <R, E, A, X>(
   self: Hub.Hub<A>,
@@ -18,10 +18,10 @@ export const subscribeForEachPar = <R, E, A, X>(
             effect(_).pipe(
               Effect.catchAllCause(_ => Deferred.failCause(deferred, _)),
               Effect.fork,
-            ),
+            )
           ),
           Effect.forever,
-        ),
+        )
       ),
       Effect.scoped,
     )
@@ -49,17 +49,16 @@ export const foreverSwitch = <R, E, A, R1, E1, X>(
         f(_).pipe(
           Effect.tapErrorCause(_ => Deferred.failCause(causeDeferred, _)),
           Effect.fork,
-        ),
-      ).pipe(
-        Effect.flatMap(fiber => Ref.getAndSet(fiberRef, Option.some(fiber))),
-        Effect.tap(_ =>
-          Option.match(_, {
-            onNone: () => Effect.unit,
-            onSome: fiber => Fiber.interrupt(fiber),
-          }),
-        ),
-        Effect.forever,
-      )
+        )).pipe(
+          Effect.flatMap(fiber => Ref.getAndSet(fiberRef, Option.some(fiber))),
+          Effect.tap(_ =>
+            Option.match(_, {
+              onNone: () => Effect.unit,
+              onSome: fiber => Fiber.interrupt(fiber),
+            })
+          ),
+          Effect.forever,
+        )
 
       return Effect.all([run, Deferred.await(causeDeferred)], {
         concurrency: "unbounded",

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "0.60.0";
+export const LIB_VERSION = "0.61.0";

package/src/webhooks.ts

@@ -15,11 +15,11 @@ import { LiveMemoryRateLimitStore, LiveRateLimiter } from "dfx/RateLimit"
 
 export {
   BadWebhookSignature,
-  WebhookConfig,
-  WebhookParseError,
   makeConfigLayer,
   makeHandler,
   makeSimpleHandler,
+  WebhookConfig,
+  WebhookParseError,
 } from "dfx/Interactions/webhook"
 
 export const MemoryRateLimit = Layer.provide(