dfx 0.60.0 → 0.61.1

package/src/gateway.ts

@@ -1,5 +1,3 @@
-import type { HttpRequestExecutor } from "@effect-http/client"
-import { LiveFetchRequestExecutor } from "@effect-http/client"
 import * as Config from "@effect/io/Config"
 import type * as ConfigError from "@effect/io/Config/Error"
 import * as Effect from "@effect/io/Effect"
@@ -16,10 +14,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"
 
@@ -49,10 +47,10 @@ export const MemoryBot = Layer.provide(
   ),
 )
 
-export const gatewayLayerWithoutHttp = (
+export const gatewayLayer = (
   config: Config.Config.Wrap<DiscordConfig.MakeOpts>,
 ): Layer.Layer<
-  HttpRequestExecutor,
+  never,
   ConfigError.ConfigError,
   | RateLimiter
   | Log.Log
@@ -71,16 +69,3 @@ export const gatewayLayerWithoutHttp = (
       }),
     ),
   )
-
-export const gatewayLayer = (
-  config: Config.Config.Wrap<DiscordConfig.MakeOpts>,
-): Layer.Layer<
-  never,
-  ConfigError.ConfigError,
-  | RateLimiter
-  | Log.Log
-  | InteractionsRegistry
-  | DiscordREST
-  | DiscordGateway
-  | DiscordConfig.DiscordConfig
-> => Layer.provide(LiveFetchRequestExecutor, gatewayLayerWithoutHttp(config))

package/src/index.ts

@@ -1,4 +1,3 @@
-import * as Http from "@effect-http/client"
 import * as Cache from "dfx/Cache"
 import * as DiscordConfig from "dfx/DiscordConfig"
 import * as Flags from "dfx/Helpers/flags"
@@ -17,8 +16,8 @@ export {
   BucketDetails,
   LiveMemoryRateLimitStore,
   LiveRateLimiter,
-  RateLimitStore,
   RateLimiter,
+  RateLimitStore,
 } from "dfx/RateLimit"
 
 export {
@@ -26,7 +25,6 @@ export {
   Discord,
   DiscordConfig,
   Flags,
-  Http,
   Intents,
   Ix,
   IxHelpers,

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.1";

package/src/webhooks.ts

@@ -1,5 +1,3 @@
-import type { HttpRequestExecutor } from "@effect-http/client"
-import { LiveFetchRequestExecutor } from "@effect-http/client"
 import * as Config from "@effect/io/Config"
 import type * as ConfigError from "@effect/io/Config/Error"
 import * as Effect from "@effect/io/Effect"
@@ -15,11 +13,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(
@@ -32,39 +30,13 @@ export const MemoryREST = Layer.provide(
   LiveDiscordREST,
 )
 
-export const webhookLayerWithoutHttp = (
-  options: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>,
-): Layer.Layer<
-  HttpRequestExecutor,
-  ConfigError.ConfigError,
-  RateLimiter | DiscordREST | WebhookConfig
-> =>
-  Layer.unwrapEffect(
-    Effect.map(Effect.config(Config.unwrap(options)), options => {
-      const config = DiscordConfig.make(options)
-      const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config)
-      const LiveWebhook = makeConfigLayer(options)
-      const LiveLog = config.debug ? Log.LiveLogDebug : Log.LiveLog
-      const LiveEnv = Layer.provide(
-        Layer.merge(LiveLog, LiveConfig),
-        Layer.mergeAll(MemoryREST, LiveWebhook, MemoryRateLimit),
-      )
-
-      return LiveEnv
-    }),
-  )
-
-export const webhookLayerConfig = (
-  config: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>,
+export const webhookLayer = (
+  options: DiscordConfig.MakeOpts & MakeConfigOpts,
 ): Layer.Layer<
   never,
   ConfigError.ConfigError,
   RateLimiter | DiscordREST | WebhookConfig
-> => Layer.provide(LiveFetchRequestExecutor, webhookLayerWithoutHttp(config))
-
-export const webhookLayer = (
-  options: DiscordConfig.MakeOpts & MakeConfigOpts,
-): Layer.Layer<never, never, RateLimiter | DiscordREST | WebhookConfig> => {
+> => {
   const config = DiscordConfig.make(options)
   const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config)
   const LiveWebhook = makeConfigLayer(options)
@@ -73,5 +45,20 @@ export const webhookLayer = (
     Layer.merge(LiveLog, LiveConfig),
     Layer.mergeAll(MemoryREST, LiveWebhook, MemoryRateLimit),
   )
-  return Layer.provide(LiveFetchRequestExecutor, LiveEnv)
+
+  return LiveEnv
 }
+
+export const webhookLayerConfig = (
+  config: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>,
+): Layer.Layer<
+  never,
+  ConfigError.ConfigError,
+  RateLimiter | DiscordREST | WebhookConfig
+> =>
+  Layer.unwrapEffect(
+    Effect.map(
+      Effect.config(Config.unwrap(config)),
+      webhookLayer,
+    ),
+  )

package/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"program":{"fileNames":[],"fileInfos":[],"root":[],"options":{"composite":true,"declaration":true,"declarationMap":true,"downlevelIteration":true,"emitDecoratorMetadata":true,"esModuleInterop":true,"experimentalDecorators":true,"module":7,"noEmitOnError":false,"noErrorTruncation":false,"noFallthroughCasesInSwitch":true,"noImplicitAny":true,"noImplicitReturns":false,"noImplicitThis":true,"noUncheckedIndexedAccess":false,"noUnusedLocals":true,"noUnusedParameters":false,"removeComments":false,"skipLibCheck":true,"sourceMap":true,"strict":true,"strictNullChecks":true,"stripInternal":true,"target":99},"referencedMap":[],"exportedModulesMap":[]},"version":"5.1.6"}