dfx 0.52.1 → 0.53.0

package/DiscordGateway/DiscordWS.d.ts

@@ -20,7 +20,7 @@ export interface DiscordWSCodec {
 }
 export declare const DiscordWSCodec: Tag<DiscordWSCodec, DiscordWSCodec>;
 export declare const LiveJsonDiscordWSCodec: Layer.Layer<never, never, DiscordWSCodec>;
-declare const make: Effect.Effect<DiscordWSCodec | WS, never, {
+declare const make: Effect.Effect<WS | DiscordWSCodec, never, {
     readonly connect: ({ url, version, outbound, onConnecting, }: OpenOpts) => Effect.Effect<never, never, {
         readonly run: Effect.Effect<never, import("dfx/DiscordGateway/WS").WebSocketError | import("dfx/DiscordGateway/WS").WebSocketCloseError, void>;
         readonly take: Effect.Effect<never, never, Discord.GatewayPayload<any>>;

package/DiscordGateway/Shard.d.ts

@@ -9,7 +9,7 @@ import * as Layer from "@effect/io/Layer";
 import { Tag } from "@effect/data/Context";
 import * as Hub from "@effect/io/Hub";
 import * as Queue from "@effect/io/Queue";
-export declare const make: Effect.Effect<DiscordConfig | Log | RateLimiter | DiscordWS, never, {
+export declare const make: Effect.Effect<Log | RateLimiter | DiscordConfig | DiscordWS, never, {
     readonly connect: (shard: [id: number, count: number], hub: Hub.Hub<Discord.GatewayPayload<Discord.ReceiveEvent>>, sendQueue: Queue.Dequeue<Discord.GatewayPayload<Discord.SendEvent>>) => Effect.Effect<never, never, {
         readonly id: [id: number, count: number];
         readonly send: (p: Message) => Effect.Effect<never, never, boolean>;
@@ -19,7 +19,7 @@ export declare const make: Effect.Effect<DiscordConfig | Log | RateLimiter | Dis
 export interface Shard extends Effect.Effect.Success<typeof make> {
 }
 export declare const Shard: Tag<Shard, Shard>;
-export declare const LiveShard: Layer.Layer<DiscordConfig | Log | import("dfx/RateLimit").RateLimitStore | import("dfx/DiscordGateway/DiscordWS").DiscordWSCodec, never, Shard>;
+export declare const LiveShard: Layer.Layer<Log | import("dfx/RateLimit").RateLimitStore | DiscordConfig | import("dfx/DiscordGateway/DiscordWS").DiscordWSCodec, never, Shard>;
 export interface RunningShard extends Effect.Effect.Success<ReturnType<Shard["connect"]>> {
 }
 //# sourceMappingURL=Shard.d.ts.map

package/DiscordGateway/Sharder.d.ts

@@ -12,13 +12,13 @@ import type { WebSocketCloseError, WebSocketError } from "dfx/DiscordGateway/WS"
 import { DiscordREST } from "dfx/DiscordREST";
 import { RateLimiter } from "dfx/RateLimit";
 import type * as Discord from "dfx/types";
-declare const make: Effect.Effect<DiscordConfig | RateLimiter | DiscordREST | Shard | ShardStore, never, {
+declare const make: Effect.Effect<DiscordConfig | RateLimiter | DiscordREST | ShardStore | Shard, never, {
     readonly shards: Effect.Effect<never, never, HashSet.HashSet<RunningShard>>;
     readonly run: (hub: Hub.Hub<Discord.GatewayPayload<Discord.ReceiveEvent>>, sendQueue: Queue.Dequeue<Discord.GatewayPayload<Discord.SendEvent>>) => Effect.Effect<never, WebSocketError | WebSocketCloseError, never>;
 }>;
 export interface Sharder extends Effect.Effect.Success<typeof make> {
 }
 export declare const Sharder: Tag<Sharder, Sharder>;
-export declare const LiveSharder: Layer.Layer<DiscordConfig | import("../Log").Log | import("dfx/RateLimit").RateLimitStore | DiscordREST | import("./DiscordWS").DiscordWSCodec | ShardStore, never, Sharder>;
+export declare const LiveSharder: Layer.Layer<DiscordConfig | import("../Log").Log | import("dfx/RateLimit").RateLimitStore | DiscordREST | ShardStore | import("./DiscordWS").DiscordWSCodec, never, Sharder>;
 export {};
 //# sourceMappingURL=Sharder.d.ts.map

package/DiscordGateway/WS.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="ws" />
 import { Log } from "dfx/Log";
 import WebSocket from "isomorphic-ws";
 import * as Effect from "@effect/io/Effect";

package/DiscordGateway/WS.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WS.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/WS.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,SAAS,MAAM,eAAe,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC1C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AAGrC,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAA;AAEjD,eAAO,MAAM,SAAS,eAAW,CAAA;AACjC,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAA;AACxC,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,CAAA;AAEnE,qBAAa,cAAc;IAGvB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO;IACzC,QAAQ,CAAC,KAAK,CAAC;IAHjB,QAAQ,CAAC,IAAI,oBAAmB;gBAErB,MAAM,EAAE,cAAc,GAAG,OAAO,EAChC,KAAK,CAAC,SAAS;CAE3B;AAED,qBAAa,mBAAmB;IAElB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM;IAD1D,QAAQ,CAAC,IAAI,yBAAwB;gBAChB,IAAI,EAAE,MAAM,EAAW,MAAM,EAAE,MAAM;CAC3D;AA8FD,QAAA,MAAM,IAAI;4BAID,OAAO,CAAC,MAAM,CAAC,gBACN,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC;;;;EA4BpD,CAAA;AAEF,MAAM,WAAW,EAAG,SAAQ,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC;CAAG;AACjE,eAAO,MAAM,EAAE,aAAY,CAAA;AAC3B,eAAO,MAAM,MAAM,6BAAyB,CAAA"}
+{"version":3,"file":"WS.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/WS.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,SAAS,MAAM,eAAe,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC1C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AAGrC,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAA;AAEjD,eAAO,MAAM,SAAS,eAAW,CAAA;AACjC,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAA;AACxC,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,CAAA;AAEnE,qBAAa,cAAc;IAGvB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO;IACzC,QAAQ,CAAC,KAAK,CAAC;IAHjB,QAAQ,CAAC,IAAI,oBAAmB;gBAErB,MAAM,EAAE,cAAc,GAAG,OAAO,EAChC,KAAK,CAAC,SAAS;CAE3B;AAED,qBAAa,mBAAmB;IAElB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM;IAD1D,QAAQ,CAAC,IAAI,yBAAwB;gBAChB,IAAI,EAAE,MAAM,EAAW,MAAM,EAAE,MAAM;CAC3D;AA8FD,QAAA,MAAM,IAAI;4BAID,OAAO,CAAC,MAAM,CAAC,gBACN,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC;;;;EA4BpD,CAAA;AAEF,MAAM,WAAW,EAAG,SAAQ,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC;CAAG;AACjE,eAAO,MAAM,EAAE,aAAY,CAAA;AAC3B,eAAO,MAAM,MAAM,6BAAyB,CAAA"}

package/DiscordGateway.d.ts

@@ -17,5 +17,5 @@ export interface DiscordGateway {
 }
 export declare const DiscordGateway: Tag<DiscordGateway, DiscordGateway>;
 export declare const make: Effect.Effect<Sharder, never, DiscordGateway>;
-export declare const LiveDiscordGateway: Layer.Layer<import("./DiscordConfig").DiscordConfig | import("./Log").Log | import("./RateLimit").RateLimitStore | import("./DiscordREST").DiscordREST | import("./DiscordGateway/DiscordWS").DiscordWSCodec | import("./DiscordGateway/ShardStore").ShardStore, never, DiscordGateway>;
+export declare const LiveDiscordGateway: Layer.Layer<import("./DiscordConfig").DiscordConfig | import("./Log").Log | import("./RateLimit").RateLimitStore | import("./DiscordREST").DiscordREST | import("./DiscordGateway/ShardStore").ShardStore | import("./DiscordGateway/DiscordWS").DiscordWSCodec, never, DiscordGateway>;
 //# sourceMappingURL=DiscordGateway.d.ts.map

package/Interactions/context.d.ts

@@ -30,7 +30,7 @@ export declare class SubCommandNotFound {
     readonly _tag = "SubCommandNotFound";
     constructor(data: Discord.ApplicationCommandDatum);
 }
-export declare const handleSubCommands: <NER extends Record<string, Effect.Effect<any, any, Discord.InteractionResponse>>>(commands: NER) => Effect.Effect<Discord.Interaction | Discord.ApplicationCommandDatum | Exclude<[NER[keyof NER]] extends [{
+export declare const handleSubCommands: <NER extends Record<string, Effect.Effect<any, any, Discord.InteractionResponse>>>(commands: NER) => Effect.Effect<Discord.ApplicationCommandDatum | Discord.Interaction | Exclude<[NER[keyof NER]] extends [{
     [Effect.EffectTypeId]: {
         _R: (_: never) => infer R;
     };

package/Interactions/definitions.d.ts

@@ -9,14 +9,14 @@ export declare class GlobalApplicationCommand<R, E> {
     readonly _tag = "GlobalApplicationCommand";
     constructor(command: Discord.CreateGlobalApplicationCommandParams, handle: CommandHandler<R, E>);
 }
-export declare const global: <R, E, const A extends DeepReadonlyObject<Discord.CreateGlobalApplicationCommandParams>>(command: A, handle: CommandHandler<R, E, A>) => GlobalApplicationCommand<Exclude<R, Discord.Interaction | Discord.ApplicationCommandDatum>, E>;
+export declare const global: <R, E, const A extends DeepReadonlyObject<Discord.CreateGlobalApplicationCommandParams>>(command: A, handle: CommandHandler<R, E, A>) => GlobalApplicationCommand<Exclude<R, Discord.ApplicationCommandDatum | Discord.Interaction>, E>;
 export declare class GuildApplicationCommand<R, E> {
     readonly command: Discord.CreateGuildApplicationCommandParams;
     readonly handle: CommandHandler<R, E>;
     readonly _tag = "GuildApplicationCommand";
     constructor(command: Discord.CreateGuildApplicationCommandParams, handle: CommandHandler<R, E>);
 }
-export declare const guild: <R, E, const A extends DeepReadonlyObject<Discord.CreateGuildApplicationCommandParams>>(command: A, handle: CommandHandler<R, E, A>) => GuildApplicationCommand<Exclude<R, Discord.Interaction | Discord.ApplicationCommandDatum>, E>;
+export declare const guild: <R, E, const A extends DeepReadonlyObject<Discord.CreateGuildApplicationCommandParams>>(command: A, handle: CommandHandler<R, E, A>) => GuildApplicationCommand<Exclude<R, Discord.ApplicationCommandDatum | Discord.Interaction>, E>;
 export declare class MessageComponent<R, E> {
     readonly predicate: (customId: string) => Effect.Effect<R, E, boolean>;
     readonly handle: Effect.Effect<R, E, Discord.InteractionResponse>;
@@ -37,7 +37,7 @@ export declare class Autocomplete<R, E> {
     readonly _tag = "Autocomplete";
     constructor(predicate: (data: Discord.ApplicationCommandDatum, focusedOption: Discord.ApplicationCommandInteractionDataOption) => Effect.Effect<R, E, boolean>, handle: Effect.Effect<R, E, Discord.InteractionResponse>);
 }
-export declare const autocomplete: <R1, R2, E1, E2>(pred: (data: Discord.ApplicationCommandDatum, focusedOption: Discord.ApplicationCommandInteractionDataOption) => Effect.Effect<R1, E1, boolean>, handle: Effect.Effect<R2, E2, Discord.InteractionResponse>) => Autocomplete<Exclude<R1, Discord.Interaction | Discord.ApplicationCommandDatum | FocusedOptionContext> | Exclude<R2, Discord.Interaction | Discord.ApplicationCommandDatum | FocusedOptionContext>, E1 | E2>;
+export declare const autocomplete: <R1, R2, E1, E2>(pred: (data: Discord.ApplicationCommandDatum, focusedOption: Discord.ApplicationCommandInteractionDataOption) => Effect.Effect<R1, E1, boolean>, handle: Effect.Effect<R2, E2, Discord.InteractionResponse>) => Autocomplete<Exclude<R1, Discord.ApplicationCommandDatum | Discord.Interaction | FocusedOptionContext> | Exclude<R2, Discord.ApplicationCommandDatum | Discord.Interaction | FocusedOptionContext>, E1 | E2>;
 type DeepReadonly<T> = T extends (infer R)[] ? ReadonlyArray<DeepReadonly<R>> : T extends Function ? T : T extends object ? DeepReadonlyObject<T> : T;
 type DeepReadonlyObject<T> = {
     readonly [P in keyof T]: DeepReadonly<T[P]>;

package/Interactions/gateway.d.ts

@@ -16,7 +16,7 @@ export interface RunOpts {
 /**
  * @tsplus pipeable dfx/InteractionBuilder runGateway
  */
-export declare const run: <R, R2, E, TE, E2>(postHandler: (effect: Effect.Effect<DiscordREST | Discord.Interaction | R, DiscordRESTError | TE | DefinitionNotFound, void>) => Effect.Effect<R2, E2, void>, { sync }?: RunOpts) => (ix: InteractionBuilder<R, E, TE>) => Effect.Effect<DiscordREST | DiscordGateway | Exclude<R2, Discord.Interaction>, DiscordRESTError | Http.ResponseDecodeError | E2, never>;
+export declare const run: <R, R2, E, TE, E2>(postHandler: (effect: Effect.Effect<DiscordREST | R | Discord.Interaction, DiscordRESTError | TE | DefinitionNotFound, void>) => Effect.Effect<R2, E2, void>, { sync }?: RunOpts) => (ix: InteractionBuilder<R, E, TE>) => Effect.Effect<DiscordREST | DiscordGateway | Exclude<R2, Discord.Interaction>, DiscordRESTError | Http.ResponseDecodeError | E2, never>;
 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.ResponseDecodeError | E, never>;

package/Interactions/webhook.d.ts

@@ -59,7 +59,7 @@ export interface HandleWebhookOpts<E> {
 /**
  * @tsplus getter dfx/InteractionBuilder webhookHandler
  */
-export declare const makeHandler: <R, E, TE>(ix: InteractionBuilder<R, E, TE>) => ({ headers, body, success, error, }: HandleWebhookOpts<BadWebhookSignature | WebhookParseError | E | DefinitionNotFound>) => Effect.Effect<WebhookConfig, never, void>;
+export declare const makeHandler: <R, E, TE>(ix: InteractionBuilder<R, E, TE>) => ({ headers, body, success, error, }: HandleWebhookOpts<DefinitionNotFound | BadWebhookSignature | WebhookParseError | E>) => Effect.Effect<WebhookConfig, never, void>;
 /**
  * @tsplus getter dfx/InteractionBuilder simpleWebhookHandler
  */

package/RateLimit.d.ts

@@ -19,12 +19,12 @@ export interface RateLimitStore {
 }
 export declare const RateLimitStore: Tag<RateLimitStore, RateLimitStore>;
 export declare const LiveMemoryRateLimitStore: Layer.Layer<never, never, RateLimitStore>;
-declare const makeLimiter: Effect.Effect<RateLimitStore | Log, never, {
+declare const makeLimiter: Effect.Effect<Log | RateLimitStore, never, {
     maybeWait: (key: string, window: Duration.Duration, limit: number, multiplier?: number) => Effect.Effect<never, never, void>;
 }>;
 export interface RateLimiter extends Effect.Effect.Success<typeof makeLimiter> {
 }
 export declare const RateLimiter: Tag<RateLimiter, RateLimiter>;
-export declare const LiveRateLimiter: Layer.Layer<RateLimitStore | Log, never, RateLimiter>;
+export declare const LiveRateLimiter: Layer.Layer<Log | RateLimitStore, never, RateLimiter>;
 export {};
 //# sourceMappingURL=RateLimit.d.ts.map

package/gateway.d.ts

@@ -12,11 +12,12 @@ import * as SendEvent from "dfx/DiscordGateway/Shard/sendEvents";
 import * as ShardStore from "dfx/DiscordGateway/ShardStore";
 import * as WS from "dfx/DiscordGateway/WS";
 import type { RateLimiter } from "dfx/RateLimit";
+import type { InteractionsRegistry } from "dfx/gateway";
 export { DiscordGateway, LiveDiscordGateway } from "dfx/DiscordGateway";
 export { InteractionsRegistry, InteractionsRegistryLive, run as runIx, } from "dfx/Interactions/gateway";
 export { CachePrelude, DiscordWS, SendEvent, Shard, ShardStore, WS };
 export declare const MemoryRateLimit: Layer.Layer<Log.Log, never, RateLimiter>;
-export declare const MemoryBot: Layer.Layer<DiscordConfig.DiscordConfig | HttpRequestExecutor | Log.Log, never, RateLimiter | DiscordREST | DiscordGateway>;
-export declare const makeLiveWithoutFetch: (config: Config.Config.Wrap<DiscordConfig.MakeOpts>) => Layer.Layer<HttpRequestExecutor, ConfigError.ConfigError, RateLimiter | Log.Log | DiscordREST | DiscordConfig.DiscordConfig | DiscordGateway>;
-export declare const makeLive: (config: Config.Config.Wrap<DiscordConfig.MakeOpts>) => Layer.Layer<never, ConfigError.ConfigError, RateLimiter | Log.Log | DiscordREST | DiscordConfig.DiscordConfig | DiscordGateway>;
+export declare const MemoryBot: Layer.Layer<DiscordConfig.DiscordConfig | HttpRequestExecutor | Log.Log, never, RateLimiter | DiscordREST | InteractionsRegistry | DiscordGateway>;
+export declare const gatewayLayerWithoutHttp: (config: Config.Config.Wrap<DiscordConfig.MakeOpts>) => Layer.Layer<HttpRequestExecutor, ConfigError.ConfigError, RateLimiter | Log.Log | InteractionsRegistry | DiscordREST | DiscordGateway | DiscordConfig.DiscordConfig>;
+export declare const gatewayLayer: (config: Config.Config.Wrap<DiscordConfig.MakeOpts>) => Layer.Layer<never, ConfigError.ConfigError, RateLimiter | Log.Log | InteractionsRegistry | DiscordREST | DiscordGateway | DiscordConfig.DiscordConfig>;
 //# sourceMappingURL=gateway.d.ts.map

package/gateway.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["./src/gateway.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAE9D,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,yBAAyB,CAAA;AAE3D,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,KAAK,CAAA;AACtC,OAAO,EAAE,aAAa,EAAmB,GAAG,EAAE,MAAM,KAAK,CAAA;AACzD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,OAAO,KAAK,SAAS,MAAM,8BAA8B,CAAA;AAEzD,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAA;AACjD,OAAO,KAAK,SAAS,MAAM,qCAAqC,CAAA;AAChE,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAA;AAE3D,OAAO,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAGhD,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACvE,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,GAAG,IAAI,KAAK,GACb,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,CAAA;AAEpE,eAAO,MAAM,eAAe,0CAG3B,CAAA;AAED,eAAO,MAAM,SAAS,6HAUrB,CAAA;AACD,eAAO,MAAM,oBAAoB,WACvB,aAAa,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,KACjD,WAAW,CACZ,mBAAmB,EACnB,uBAAuB,EACrB,WAAW,GACX,OAAO,GACP,WAAW,GACX,2BAA2B,GAC3B,cAAc,CAWf,CAAA;AAEH,eAAO,MAAM,QAAQ,WACX,aAAa,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,KACjD,WAAW,CACZ,KAAK,EACL,uBAAuB,EACrB,WAAW,GACX,OAAO,GACP,WAAW,GACX,2BAA2B,GAC3B,cAAc,CACwD,CAAA"}
+{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["./src/gateway.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAE9D,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,yBAAyB,CAAA;AAE3D,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,KAAK,CAAA;AACtC,OAAO,EAAE,aAAa,EAAmB,GAAG,EAAE,MAAM,KAAK,CAAA;AACzD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,OAAO,KAAK,SAAS,MAAM,8BAA8B,CAAA;AAEzD,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAA;AACjD,OAAO,KAAK,SAAS,MAAM,qCAAqC,CAAA;AAChE,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAA;AAE3D,OAAO,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAGhD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAEvD,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAEvE,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,GAAG,IAAI,KAAK,GACb,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,CAAA;AAEpE,eAAO,MAAM,eAAe,0CAG3B,CAAA;AAED,eAAO,MAAM,SAAS,oJAWrB,CAAA;AAED,eAAO,MAAM,uBAAuB,WAC1B,aAAa,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,KACjD,WAAW,CACZ,mBAAmB,EACnB,uBAAuB,EACrB,WAAW,GACX,OAAO,GACP,oBAAoB,GACpB,WAAW,GACX,cAAc,GACd,2BAA2B,CAW5B,CAAA;AAEH,eAAO,MAAM,YAAY,WACf,aAAa,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,KACjD,WAAW,CACZ,KAAK,EACL,uBAAuB,EACrB,WAAW,GACX,OAAO,GACP,oBAAoB,GACpB,WAAW,GACX,cAAc,GACd,2BAA2B,CAC8C,CAAA"}

package/gateway.js

@@ -14,13 +14,13 @@ exports.DiscordWS = void 0;
 Object.defineProperty(exports, "InteractionsRegistry", {
   enumerable: true,
   get: function () {
-    return _gateway.InteractionsRegistry;
+    return _gateway2.InteractionsRegistry;
   }
 });
 Object.defineProperty(exports, "InteractionsRegistryLive", {
   enumerable: true,
   get: function () {
-    return _gateway.InteractionsRegistryLive;
+    return _gateway2.InteractionsRegistryLive;
   }
 });
 Object.defineProperty(exports, "LiveDiscordGateway", {
@@ -29,11 +29,11 @@ Object.defineProperty(exports, "LiveDiscordGateway", {
     return _DiscordGateway.LiveDiscordGateway;
   }
 });
-exports.makeLiveWithoutFetch = exports.makeLive = exports.WS = exports.ShardStore = exports.Shard = exports.SendEvent = exports.MemoryRateLimit = exports.MemoryBot = void 0;
+exports.gatewayLayerWithoutHttp = exports.gatewayLayer = exports.WS = exports.ShardStore = exports.Shard = exports.SendEvent = exports.MemoryRateLimit = exports.MemoryBot = void 0;
 Object.defineProperty(exports, "runIx", {
   enumerable: true,
   get: function () {
-    return _gateway.run;
+    return _gateway2.run;
   }
 });
 var _client = /*#__PURE__*/require("@effect-http/client");
@@ -55,19 +55,20 @@ exports.ShardStore = ShardStore;
 var WS = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/DiscordGateway/WS"));
 exports.WS = WS;
 var _RateLimit = /*#__PURE__*/require("dfx/RateLimit");
-var _gateway = /*#__PURE__*/require("dfx/Interactions/gateway");
+var _gateway = /*#__PURE__*/require("dfx/gateway");
+var _gateway2 = /*#__PURE__*/require("dfx/Interactions/gateway");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const MemoryRateLimit = /*#__PURE__*/Layer.provide(_RateLimit.LiveMemoryRateLimitStore, _RateLimit.LiveRateLimiter);
 exports.MemoryRateLimit = MemoryRateLimit;
-const MemoryBot = /*#__PURE__*/Layer.provide( /*#__PURE__*/Layer.mergeAll(ShardStore.LiveMemoryShardStore, _RateLimit.LiveMemoryRateLimitStore, DiscordWS.LiveJsonDiscordWSCodec), /*#__PURE__*/Layer.merge( /*#__PURE__*/Layer.provideMerge(_dfx.LiveDiscordREST, _DiscordGateway.LiveDiscordGateway), MemoryRateLimit));
+const MemoryBot = /*#__PURE__*/Layer.provide( /*#__PURE__*/Layer.mergeAll(ShardStore.LiveMemoryShardStore, _RateLimit.LiveMemoryRateLimitStore, DiscordWS.LiveJsonDiscordWSCodec), /*#__PURE__*/Layer.mergeAll( /*#__PURE__*/Layer.provideMerge(_dfx.LiveDiscordREST, _DiscordGateway.LiveDiscordGateway), MemoryRateLimit, _gateway.InteractionsRegistryLive));
 exports.MemoryBot = MemoryBot;
-const makeLiveWithoutFetch = config => Layer.unwrapEffect(Effect.config(Config.unwrap(config)).pipe(Effect.map(_dfx.DiscordConfig.make), Effect.map(config => {
+const gatewayLayerWithoutHttp = config => Layer.unwrapEffect(Effect.config(Config.unwrap(config)).pipe(Effect.map(_dfx.DiscordConfig.make), Effect.map(config => {
   const LiveLog = config.debug ? _dfx.Log.LiveLogDebug : _dfx.Log.LiveLog;
   const LiveConfig = Layer.succeed(_dfx.DiscordConfig.DiscordConfig, config);
   return Layer.provideMerge(Layer.merge(LiveLog, LiveConfig), MemoryBot);
 })));
-exports.makeLiveWithoutFetch = makeLiveWithoutFetch;
-const makeLive = config => Layer.provide(_client.LiveFetchRequestExecutor, makeLiveWithoutFetch(config));
-exports.makeLive = makeLive;
+exports.gatewayLayerWithoutHttp = gatewayLayerWithoutHttp;
+const gatewayLayer = config => Layer.provide(_client.LiveFetchRequestExecutor, gatewayLayerWithoutHttp(config));
+exports.gatewayLayer = gatewayLayer;
 //# sourceMappingURL=gateway.js.map

package/gateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.js","names":["_client","require","Config","_interopRequireWildcard","Effect","Layer","_dfx","CachePrelude","exports","_DiscordGateway","DiscordWS","Shard","SendEvent","ShardStore","WS","_RateLimit","_gateway","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","MemoryRateLimit","provide","LiveMemoryRateLimitStore","LiveRateLimiter","MemoryBot","mergeAll","LiveMemoryShardStore","LiveJsonDiscordWSCodec","merge","provideMerge","LiveDiscordREST","LiveDiscordGateway","makeLiveWithoutFetch","config","unwrapEffect","unwrap","pipe","map","DiscordConfig","make","LiveLog","debug","Log","LiveLogDebug","LiveConfig","succeed","makeLive","LiveFetchRequestExecutor"],"sources":["./src/gateway.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"gateway.js","names":["_client","require","Config","_interopRequireWildcard","Effect","Layer","_dfx","CachePrelude","exports","_DiscordGateway","DiscordWS","Shard","SendEvent","ShardStore","WS","_RateLimit","_gateway","_gateway2","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","MemoryRateLimit","provide","LiveMemoryRateLimitStore","LiveRateLimiter","MemoryBot","mergeAll","LiveMemoryShardStore","LiveJsonDiscordWSCodec","provideMerge","LiveDiscordREST","LiveDiscordGateway","InteractionsRegistryLive","gatewayLayerWithoutHttp","config","unwrapEffect","unwrap","pipe","map","DiscordConfig","make","LiveLog","debug","Log","LiveLogDebug","LiveConfig","succeed","merge","gatewayLayer","LiveFetchRequestExecutor"],"sources":["./src/gateway.ts"],"sourcesContent":[null],"mappings":"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"}

package/index.d.ts

@@ -1,3 +1,4 @@
+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";
@@ -11,5 +12,5 @@ import * as Log from "dfx/Log";
 import * as Discord from "dfx/types";
 export { DiscordREST, LiveDiscordREST } from "dfx/DiscordREST";
 export { BucketDetails, LiveMemoryRateLimitStore, LiveRateLimiter, RateLimitStore, RateLimiter, } from "dfx/RateLimit";
-export { Cache, Discord, DiscordConfig, Flags, Intents, Ix, IxHelpers, Log, Members, Perms, UI, };
+export { Cache, Discord, DiscordConfig, Flags, Http, Intents, Ix, IxHelpers, Log, Members, Perms, UI, };
 //# sourceMappingURL=index.d.ts.map

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["./src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,WAAW,CAAA;AAClC,OAAO,KAAK,aAAa,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAA;AAC1C,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAA;AACrD,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,yBAAyB,CAAA;AAChD,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,KAAK,GAAG,MAAM,SAAS,CAAA;AAC9B,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AAEpC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EACL,aAAa,EACb,wBAAwB,EACxB,eAAe,EACf,cAAc,EACd,WAAW,GACZ,MAAM,eAAe,CAAA;AAEtB,OAAO,EACL,KAAK,EACL,OAAO,EACP,aAAa,EACb,KAAK,EACL,OAAO,EACP,EAAE,EACF,SAAS,EACT,GAAG,EACH,OAAO,EACP,KAAK,EACL,EAAE,GACH,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["./src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,qBAAqB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,WAAW,CAAA;AAClC,OAAO,KAAK,aAAa,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAA;AAC1C,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAA;AACrD,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,yBAAyB,CAAA;AAChD,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,KAAK,GAAG,MAAM,SAAS,CAAA;AAC9B,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AAEpC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAE9D,OAAO,EACL,aAAa,EACb,wBAAwB,EACxB,eAAe,EACf,cAAc,EACd,WAAW,GACZ,MAAM,eAAe,CAAA;AAEtB,OAAO,EACL,KAAK,EACL,OAAO,EACP,aAAa,EACb,KAAK,EACL,IAAI,EACJ,OAAO,EACP,EAAE,EACF,SAAS,EACT,GAAG,EACH,OAAO,EACP,KAAK,EACL,EAAE,GACH,CAAA"}

package/index.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "DiscordREST", {
     return _DiscordREST.DiscordREST;
   }
 });
-exports.IxHelpers = exports.Ix = exports.Intents = exports.Flags = void 0;
+exports.IxHelpers = exports.Ix = exports.Intents = exports.Http = exports.Flags = void 0;
 Object.defineProperty(exports, "LiveDiscordREST", {
   enumerable: true,
   get: function () {
@@ -43,6 +43,8 @@ Object.defineProperty(exports, "RateLimiter", {
   }
 });
 exports.UI = void 0;
+var Http = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect-http/client"));
+exports.Http = Http;
 var Cache = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/Cache"));
 exports.Cache = Cache;
 var DiscordConfig = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/DiscordConfig"));

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["Cache","_interopRequireWildcard","require","exports","DiscordConfig","Flags","Intents","IxHelpers","Members","Perms","UI","Ix","Log","Discord","_DiscordREST","_RateLimit","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set"],"sources":["./src/index.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,KAAA,gBAAAC,uBAAA,eAAAC,OAAA;AAAkCC,OAAA,CAAAH,KAAA,GAAAA,KAAA;AAClC,IAAAI,aAAA,gBAAAH,uBAAA,eAAAC,OAAA;AAAkDC,OAAA,CAAAC,aAAA,GAAAA,aAAA;AAClD,IAAAC,KAAA,gBAAAJ,uBAAA,eAAAC,OAAA;AAA0CC,OAAA,CAAAE,KAAA,GAAAA,KAAA;AAC1C,IAAAC,OAAA,gBAAAL,uBAAA,eAAAC,OAAA;AAA8CC,OAAA,CAAAG,OAAA,GAAAA,OAAA;AAC9C,IAAAC,SAAA,gBAAAN,uBAAA,eAAAC,OAAA;AAAqDC,OAAA,CAAAI,SAAA,GAAAA,SAAA;AACrD,IAAAC,OAAA,gBAAAP,uBAAA,eAAAC,OAAA;AAA8CC,OAAA,CAAAK,OAAA,GAAAA,OAAA;AAC9C,IAAAC,KAAA,gBAAAR,uBAAA,eAAAC,OAAA;AAAgDC,OAAA,CAAAM,KAAA,GAAAA,KAAA;AAChD,IAAAC,EAAA,gBAAAT,uBAAA,eAAAC,OAAA;AAAoCC,OAAA,CAAAO,EAAA,GAAAA,EAAA;AACpC,IAAAC,EAAA,gBAAAV,uBAAA,eAAAC,OAAA;AAA4CC,OAAA,CAAAQ,EAAA,GAAAA,EAAA;AAC5C,IAAAC,GAAA,gBAAAX,uBAAA,eAAAC,OAAA;AAA8BC,OAAA,CAAAS,GAAA,GAAAA,GAAA;AAC9B,IAAAC,OAAA,gBAAAZ,uBAAA,eAAAC,OAAA;AAAoCC,OAAA,CAAAU,OAAA,GAAAA,OAAA;AAEpC,IAAAC,YAAA,gBAAAZ,OAAA;AACA,IAAAa,UAAA,gBAAAb,OAAA;AAMsB,SAAAc,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAhB,wBAAAoB,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA"}
+{"version":3,"file":"index.js","names":["Http","_interopRequireWildcard","require","exports","Cache","DiscordConfig","Flags","Intents","IxHelpers","Members","Perms","UI","Ix","Log","Discord","_DiscordREST","_RateLimit","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set"],"sources":["./src/index.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,IAAA,gBAAAC,uBAAA,eAAAC,OAAA;AAA2CC,OAAA,CAAAH,IAAA,GAAAA,IAAA;AAC3C,IAAAI,KAAA,gBAAAH,uBAAA,eAAAC,OAAA;AAAkCC,OAAA,CAAAC,KAAA,GAAAA,KAAA;AAClC,IAAAC,aAAA,gBAAAJ,uBAAA,eAAAC,OAAA;AAAkDC,OAAA,CAAAE,aAAA,GAAAA,aAAA;AAClD,IAAAC,KAAA,gBAAAL,uBAAA,eAAAC,OAAA;AAA0CC,OAAA,CAAAG,KAAA,GAAAA,KAAA;AAC1C,IAAAC,OAAA,gBAAAN,uBAAA,eAAAC,OAAA;AAA8CC,OAAA,CAAAI,OAAA,GAAAA,OAAA;AAC9C,IAAAC,SAAA,gBAAAP,uBAAA,eAAAC,OAAA;AAAqDC,OAAA,CAAAK,SAAA,GAAAA,SAAA;AACrD,IAAAC,OAAA,gBAAAR,uBAAA,eAAAC,OAAA;AAA8CC,OAAA,CAAAM,OAAA,GAAAA,OAAA;AAC9C,IAAAC,KAAA,gBAAAT,uBAAA,eAAAC,OAAA;AAAgDC,OAAA,CAAAO,KAAA,GAAAA,KAAA;AAChD,IAAAC,EAAA,gBAAAV,uBAAA,eAAAC,OAAA;AAAoCC,OAAA,CAAAQ,EAAA,GAAAA,EAAA;AACpC,IAAAC,EAAA,gBAAAX,uBAAA,eAAAC,OAAA;AAA4CC,OAAA,CAAAS,EAAA,GAAAA,EAAA;AAC5C,IAAAC,GAAA,gBAAAZ,uBAAA,eAAAC,OAAA;AAA8BC,OAAA,CAAAU,GAAA,GAAAA,GAAA;AAC9B,IAAAC,OAAA,gBAAAb,uBAAA,eAAAC,OAAA;AAAoCC,OAAA,CAAAW,OAAA,GAAAA,OAAA;AAEpC,IAAAC,YAAA,gBAAAb,OAAA;AAEA,IAAAc,UAAA,gBAAAd,OAAA;AAMsB,SAAAe,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAjB,wBAAAqB,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA"}

package/mjs/gateway.mjs

@@ -13,15 +13,16 @@ import * as ShardStore from "dfx/DiscordGateway/ShardStore";
 import { LiveMemoryShardStore } from "dfx/DiscordGateway/ShardStore";
 import * as WS from "dfx/DiscordGateway/WS";
 import { LiveMemoryRateLimitStore, LiveRateLimiter } from "dfx/RateLimit";
+import { InteractionsRegistryLive } from "dfx/gateway";
 export { DiscordGateway, LiveDiscordGateway } from "dfx/DiscordGateway";
 export { InteractionsRegistry, InteractionsRegistryLive, run as runIx } from "dfx/Interactions/gateway";
 export { CachePrelude, DiscordWS, SendEvent, Shard, ShardStore, WS };
 export const MemoryRateLimit = /*#__PURE__*/Layer.provide(LiveMemoryRateLimitStore, LiveRateLimiter);
-export const MemoryBot = /*#__PURE__*/Layer.provide( /*#__PURE__*/Layer.mergeAll(LiveMemoryShardStore, LiveMemoryRateLimitStore, LiveJsonDiscordWSCodec), /*#__PURE__*/Layer.merge( /*#__PURE__*/Layer.provideMerge(LiveDiscordREST, LiveDiscordGateway), MemoryRateLimit));
-export const makeLiveWithoutFetch = config => Layer.unwrapEffect(Effect.config(Config.unwrap(config)).pipe(Effect.map(DiscordConfig.make), Effect.map(config => {
+export const MemoryBot = /*#__PURE__*/Layer.provide( /*#__PURE__*/Layer.mergeAll(LiveMemoryShardStore, LiveMemoryRateLimitStore, LiveJsonDiscordWSCodec), /*#__PURE__*/Layer.mergeAll( /*#__PURE__*/Layer.provideMerge(LiveDiscordREST, LiveDiscordGateway), MemoryRateLimit, InteractionsRegistryLive));
+export const gatewayLayerWithoutHttp = config => Layer.unwrapEffect(Effect.config(Config.unwrap(config)).pipe(Effect.map(DiscordConfig.make), Effect.map(config => {
   const LiveLog = config.debug ? Log.LiveLogDebug : Log.LiveLog;
   const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config);
   return Layer.provideMerge(Layer.merge(LiveLog, LiveConfig), MemoryBot);
 })));
-export const makeLive = config => Layer.provide(LiveFetchRequestExecutor, makeLiveWithoutFetch(config));
+export const gatewayLayer = config => Layer.provide(LiveFetchRequestExecutor, gatewayLayerWithoutHttp(config));
 //# sourceMappingURL=gateway.mjs.map

package/mjs/gateway.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.mjs","names":["LiveFetchRequestExecutor","Config","Effect","Layer","DiscordConfig","LiveDiscordREST","Log","CachePrelude","LiveDiscordGateway","DiscordWS","LiveJsonDiscordWSCodec","Shard","SendEvent","ShardStore","LiveMemoryShardStore","WS","LiveMemoryRateLimitStore","LiveRateLimiter","DiscordGateway","InteractionsRegistry","InteractionsRegistryLive","run","runIx","MemoryRateLimit","provide","MemoryBot","mergeAll","merge","provideMerge","makeLiveWithoutFetch","config","unwrapEffect","unwrap","pipe","map","make","LiveLog","debug","LiveLogDebug","LiveConfig","succeed","makeLive"],"sources":["../src/gateway.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,wBAAwB,QAAQ,qBAAqB;AAC9D,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAE3C,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,KAAK,MAAM,kBAAkB;AAEzC,SAASC,aAAa,EAAEC,eAAe,EAAEC,GAAG,QAAQ,KAAK;AACzD,OAAO,KAAKC,YAAY,MAAM,mBAAmB;AAEjD,SAASC,kBAAkB,QAAQ,oBAAoB;AACvD,OAAO,KAAKC,SAAS,MAAM,8BAA8B;AACzD,SAASC,sBAAsB,QAAQ,8BAA8B;AACrE,OAAO,KAAKC,KAAK,MAAM,0BAA0B;AACjD,OAAO,KAAKC,SAAS,MAAM,qCAAqC;AAChE,OAAO,KAAKC,UAAU,MAAM,+BAA+B;AAC3D,SAASC,oBAAoB,QAAQ,+BAA+B;AACpE,OAAO,KAAKC,EAAE,MAAM,uBAAuB;AAE3C,SAASC,wBAAwB,EAAEC,eAAe,QAAQ,eAAe;AAEzE,SAASC,cAAc,EAAEV,kBAAkB,QAAQ,oBAAoB;AACvE,SACEW,oBAAoB,EACpBC,wBAAwB,EACxBC,GAAG,IAAIC,KAAK,QACP,0BAA0B;AACjC,SAASf,YAAY,EAAEE,SAAS,EAAEG,SAAS,EAAED,KAAK,EAAEE,UAAU,EAAEE,EAAE;AAElE,OAAO,MAAMQ,eAAe,gBAAGpB,KAAK,CAACqB,OAAO,CAC1CR,wBAAwB,EACxBC,eAAe,CAChB;AAED,OAAO,MAAMQ,SAAS,gBAAGtB,KAAK,CAACqB,OAAO,eACpCrB,KAAK,CAACuB,QAAQ,CACZZ,oBAAoB,EACpBE,wBAAwB,EACxBN,sBAAsB,CACvB,eACDP,KAAK,CAACwB,KAAK,eACTxB,KAAK,CAACyB,YAAY,CAACvB,eAAe,EAAEG,kBAAkB,CAAC,EACvDe,eAAe,CAChB,CACF;AACD,OAAO,MAAMM,oBAAoB,GAC/BC,MAAkD,IAUlD3B,KAAK,CAAC4B,YAAY,CAChB7B,MAAM,CAAC4B,MAAM,CAAC7B,MAAM,CAAC+B,MAAM,CAACF,MAAM,CAAC,CAAC,CAACG,IAAI,CACvC/B,MAAM,CAACgC,GAAG,CAAC9B,aAAa,CAAC+B,IAAI,CAAC,EAC9BjC,MAAM,CAACgC,GAAG,CAACJ,MAAM,IAAG;EAClB,MAAMM,OAAO,GAAGN,MAAM,CAACO,KAAK,GAAG/B,GAAG,CAACgC,YAAY,GAAGhC,GAAG,CAAC8B,OAAO;EAC7D,MAAMG,UAAU,GAAGpC,KAAK,CAACqC,OAAO,CAACpC,aAAa,CAACA,aAAa,EAAE0B,MAAM,CAAC;EACrE,OAAO3B,KAAK,CAACyB,YAAY,CAACzB,KAAK,CAACwB,KAAK,CAACS,OAAO,EAAEG,UAAU,CAAC,EAAEd,SAAS,CAAC;AACxE,CAAC,CAAC,CACH,CACF;AAEH,OAAO,MAAMgB,QAAQ,GACnBX,MAAkD,IAS/C3B,KAAK,CAACqB,OAAO,CAACxB,wBAAwB,EAAE6B,oBAAoB,CAACC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"gateway.mjs","names":["LiveFetchRequestExecutor","Config","Effect","Layer","DiscordConfig","LiveDiscordREST","Log","CachePrelude","LiveDiscordGateway","DiscordWS","LiveJsonDiscordWSCodec","Shard","SendEvent","ShardStore","LiveMemoryShardStore","WS","LiveMemoryRateLimitStore","LiveRateLimiter","InteractionsRegistryLive","DiscordGateway","InteractionsRegistry","run","runIx","MemoryRateLimit","provide","MemoryBot","mergeAll","provideMerge","gatewayLayerWithoutHttp","config","unwrapEffect","unwrap","pipe","map","make","LiveLog","debug","LiveLogDebug","LiveConfig","succeed","merge","gatewayLayer"],"sources":["../src/gateway.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,wBAAwB,QAAQ,qBAAqB;AAC9D,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAE3C,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,KAAK,MAAM,kBAAkB;AAEzC,SAASC,aAAa,EAAEC,eAAe,EAAEC,GAAG,QAAQ,KAAK;AACzD,OAAO,KAAKC,YAAY,MAAM,mBAAmB;AAEjD,SAASC,kBAAkB,QAAQ,oBAAoB;AACvD,OAAO,KAAKC,SAAS,MAAM,8BAA8B;AACzD,SAASC,sBAAsB,QAAQ,8BAA8B;AACrE,OAAO,KAAKC,KAAK,MAAM,0BAA0B;AACjD,OAAO,KAAKC,SAAS,MAAM,qCAAqC;AAChE,OAAO,KAAKC,UAAU,MAAM,+BAA+B;AAC3D,SAASC,oBAAoB,QAAQ,+BAA+B;AACpE,OAAO,KAAKC,EAAE,MAAM,uBAAuB;AAE3C,SAASC,wBAAwB,EAAEC,eAAe,QAAQ,eAAe;AACzE,SAASC,wBAAwB,QAAQ,aAAa;AAGtD,SAASC,cAAc,EAAEX,kBAAkB,QAAQ,oBAAoB;AAEvE,SACEY,oBAAoB,EACpBF,wBAAwB,EACxBG,GAAG,IAAIC,KAAK,QACP,0BAA0B;AAEjC,SAASf,YAAY,EAAEE,SAAS,EAAEG,SAAS,EAAED,KAAK,EAAEE,UAAU,EAAEE,EAAE;AAElE,OAAO,MAAMQ,eAAe,gBAAGpB,KAAK,CAACqB,OAAO,CAC1CR,wBAAwB,EACxBC,eAAe,CAChB;AAED,OAAO,MAAMQ,SAAS,gBAAGtB,KAAK,CAACqB,OAAO,eACpCrB,KAAK,CAACuB,QAAQ,CACZZ,oBAAoB,EACpBE,wBAAwB,EACxBN,sBAAsB,CACvB,eACDP,KAAK,CAACuB,QAAQ,eACZvB,KAAK,CAACwB,YAAY,CAACtB,eAAe,EAAEG,kBAAkB,CAAC,EACvDe,eAAe,EACfL,wBAAwB,CACzB,CACF;AAED,OAAO,MAAMU,uBAAuB,GAClCC,MAAkD,IAWlD1B,KAAK,CAAC2B,YAAY,CAChB5B,MAAM,CAAC2B,MAAM,CAAC5B,MAAM,CAAC8B,MAAM,CAACF,MAAM,CAAC,CAAC,CAACG,IAAI,CACvC9B,MAAM,CAAC+B,GAAG,CAAC7B,aAAa,CAAC8B,IAAI,CAAC,EAC9BhC,MAAM,CAAC+B,GAAG,CAACJ,MAAM,IAAG;EAClB,MAAMM,OAAO,GAAGN,MAAM,CAACO,KAAK,GAAG9B,GAAG,CAAC+B,YAAY,GAAG/B,GAAG,CAAC6B,OAAO;EAC7D,MAAMG,UAAU,GAAGnC,KAAK,CAACoC,OAAO,CAACnC,aAAa,CAACA,aAAa,EAAEyB,MAAM,CAAC;EACrE,OAAO1B,KAAK,CAACwB,YAAY,CAACxB,KAAK,CAACqC,KAAK,CAACL,OAAO,EAAEG,UAAU,CAAC,EAAEb,SAAS,CAAC;AACxE,CAAC,CAAC,CACH,CACF;AAEH,OAAO,MAAMgB,YAAY,GACvBZ,MAAkD,IAU/C1B,KAAK,CAACqB,OAAO,CAACxB,wBAAwB,EAAE4B,uBAAuB,CAACC,MAAM,CAAC,CAAC"}

package/mjs/index.mjs

@@ -1,3 +1,4 @@
+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";
@@ -11,5 +12,5 @@ import * as Log from "dfx/Log";
 import * as Discord from "dfx/types";
 export { DiscordREST, LiveDiscordREST } from "dfx/DiscordREST";
 export { LiveMemoryRateLimitStore, LiveRateLimiter, RateLimitStore, RateLimiter } from "dfx/RateLimit";
-export { Cache, Discord, DiscordConfig, Flags, Intents, Ix, IxHelpers, Log, Members, Perms, UI };
+export { Cache, Discord, DiscordConfig, Flags, Http, Intents, Ix, IxHelpers, Log, Members, Perms, UI };
 //# sourceMappingURL=index.mjs.map

package/mjs/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":["Cache","DiscordConfig","Flags","Intents","IxHelpers","Members","Perms","UI","Ix","Log","Discord","DiscordREST","LiveDiscordREST","LiveMemoryRateLimitStore","LiveRateLimiter","RateLimitStore","RateLimiter"],"sources":["../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,KAAK,MAAM,WAAW;AAClC,OAAO,KAAKC,aAAa,MAAM,mBAAmB;AAClD,OAAO,KAAKC,KAAK,MAAM,mBAAmB;AAC1C,OAAO,KAAKC,OAAO,MAAM,qBAAqB;AAC9C,OAAO,KAAKC,SAAS,MAAM,0BAA0B;AACrD,OAAO,KAAKC,OAAO,MAAM,qBAAqB;AAC9C,OAAO,KAAKC,KAAK,MAAM,yBAAyB;AAChD,OAAO,KAAKC,EAAE,MAAM,gBAAgB;AACpC,OAAO,KAAKC,EAAE,MAAM,wBAAwB;AAC5C,OAAO,KAAKC,GAAG,MAAM,SAAS;AAC9B,OAAO,KAAKC,OAAO,MAAM,WAAW;AAEpC,SAASC,WAAW,EAAEC,eAAe,QAAQ,iBAAiB;AAC9D,SAEEC,wBAAwB,EACxBC,eAAe,EACfC,cAAc,EACdC,WAAW,QACN,eAAe;AAEtB,SACEhB,KAAK,EACLU,OAAO,EACPT,aAAa,EACbC,KAAK,EACLC,OAAO,EACPK,EAAE,EACFJ,SAAS,EACTK,GAAG,EACHJ,OAAO,EACPC,KAAK,EACLC,EAAE"}
+{"version":3,"file":"index.mjs","names":["Http","Cache","DiscordConfig","Flags","Intents","IxHelpers","Members","Perms","UI","Ix","Log","Discord","DiscordREST","LiveDiscordREST","LiveMemoryRateLimitStore","LiveRateLimiter","RateLimitStore","RateLimiter"],"sources":["../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,IAAI,MAAM,qBAAqB;AAC3C,OAAO,KAAKC,KAAK,MAAM,WAAW;AAClC,OAAO,KAAKC,aAAa,MAAM,mBAAmB;AAClD,OAAO,KAAKC,KAAK,MAAM,mBAAmB;AAC1C,OAAO,KAAKC,OAAO,MAAM,qBAAqB;AAC9C,OAAO,KAAKC,SAAS,MAAM,0BAA0B;AACrD,OAAO,KAAKC,OAAO,MAAM,qBAAqB;AAC9C,OAAO,KAAKC,KAAK,MAAM,yBAAyB;AAChD,OAAO,KAAKC,EAAE,MAAM,gBAAgB;AACpC,OAAO,KAAKC,EAAE,MAAM,wBAAwB;AAC5C,OAAO,KAAKC,GAAG,MAAM,SAAS;AAC9B,OAAO,KAAKC,OAAO,MAAM,WAAW;AAEpC,SAASC,WAAW,EAAEC,eAAe,QAAQ,iBAAiB;AAE9D,SAEEC,wBAAwB,EACxBC,eAAe,EACfC,cAAc,EACdC,WAAW,QACN,eAAe;AAEtB,SACEhB,KAAK,EACLU,OAAO,EACPT,aAAa,EACbC,KAAK,EACLH,IAAI,EACJI,OAAO,EACPK,EAAE,EACFJ,SAAS,EACTK,GAAG,EACHJ,OAAO,EACPC,KAAK,EACLC,EAAE"}

package/mjs/version.mjs

@@ -1,2 +1,2 @@
-export const LIB_VERSION = "0.52.1";
+export const LIB_VERSION = "0.53.0";
 //# sourceMappingURL=version.mjs.map

package/mjs/webhooks.mjs

@@ -10,7 +10,7 @@ import { LiveMemoryRateLimitStore, LiveRateLimiter } from "dfx/RateLimit";
 export { BadWebhookSignature, WebhookConfig, WebhookParseError, makeConfigLayer, makeHandler, makeSimpleHandler } from "dfx/Interactions/webhook";
 export const MemoryRateLimit = /*#__PURE__*/Layer.provide(LiveMemoryRateLimitStore, LiveRateLimiter);
 export const MemoryREST = /*#__PURE__*/Layer.provide(LiveMemoryRateLimitStore, LiveDiscordREST);
-export const makeLiveWithoutFetch = options => Layer.unwrapEffect(Effect.map(Effect.config(Config.unwrap(options)), options => {
+export const webhookLayerWithoutHttp = options => 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);
@@ -18,8 +18,8 @@ export const makeLiveWithoutFetch = options => Layer.unwrapEffect(Effect.map(Eff
   const LiveEnv = Layer.provide(Layer.merge(LiveLog, LiveConfig), Layer.mergeAll(MemoryREST, LiveWebhook, MemoryRateLimit));
   return LiveEnv;
 }));
-export const makeLive = config => Layer.provide(LiveFetchRequestExecutor, makeLiveWithoutFetch(config));
-export const makeLiveWithoutConfig = options => {
+export const webhookLayerConfig = config => Layer.provide(LiveFetchRequestExecutor, webhookLayerWithoutHttp(config));
+export const webhookLayer = options => {
   const config = DiscordConfig.make(options);
   const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config);
   const LiveWebhook = makeConfigLayer(options);

package/mjs/webhooks.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"webhooks.mjs","names":["LiveFetchRequestExecutor","Config","Effect","Layer","DiscordConfig","LiveDiscordREST","makeConfigLayer","Log","LiveMemoryRateLimitStore","LiveRateLimiter","BadWebhookSignature","WebhookConfig","WebhookParseError","makeHandler","makeSimpleHandler","MemoryRateLimit","provide","MemoryREST","makeLiveWithoutFetch","options","unwrapEffect","map","config","unwrap","make","LiveConfig","succeed","LiveWebhook","LiveLog","debug","LiveLogDebug","LiveEnv","merge","mergeAll","makeLive","makeLiveWithoutConfig"],"sources":["../src/webhooks.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,wBAAwB,QAAQ,qBAAqB;AAC9D,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAE3C,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,KAAK,MAAM,kBAAkB;AACzC,OAAO,KAAKC,aAAa,MAAM,mBAAmB;AAElD,SAASC,eAAe,QAAQ,iBAAiB;AAEjD,SAASC,eAAe,QAAQ,0BAA0B;AAC1D,OAAO,KAAKC,GAAG,MAAM,SAAS;AAE9B,SAASC,wBAAwB,EAAEC,eAAe,QAAQ,eAAe;AAEzE,SACEC,mBAAmB,EACnBC,aAAa,EACbC,iBAAiB,EACjBN,eAAe,EACfO,WAAW,EACXC,iBAAiB,QACZ,0BAA0B;AAEjC,OAAO,MAAMC,eAAe,gBAAGZ,KAAK,CAACa,OAAO,CAC1CR,wBAAwB,EACxBC,eAAe,CAChB;AAED,OAAO,MAAMQ,UAAU,gBAAGd,KAAK,CAACa,OAAO,CACrCR,wBAAwB,EACxBH,eAAe,CAChB;AAED,OAAO,MAAMa,oBAAoB,GAC/BC,OAAoE,IAMpEhB,KAAK,CAACiB,YAAY,CAChBlB,MAAM,CAACmB,GAAG,CAACnB,MAAM,CAACoB,MAAM,CAACrB,MAAM,CAACsB,MAAM,CAACJ,OAAO,CAAC,CAAC,EAAEA,OAAO,IAAG;EAC1D,MAAMG,MAAM,GAAGlB,aAAa,CAACoB,IAAI,CAACL,OAAO,CAAC;EAC1C,MAAMM,UAAU,GAAGtB,KAAK,CAACuB,OAAO,CAACtB,aAAa,CAACA,aAAa,EAAEkB,MAAM,CAAC;EACrE,MAAMK,WAAW,GAAGrB,eAAe,CAACa,OAAO,CAAC;EAC5C,MAAMS,OAAO,GAAGN,MAAM,CAACO,KAAK,GAAGtB,GAAG,CAACuB,YAAY,GAAGvB,GAAG,CAACqB,OAAO;EAC7D,MAAMG,OAAO,GAAG5B,KAAK,CAACa,OAAO,CAC3Bb,KAAK,CAAC6B,KAAK,CAACJ,OAAO,EAAEH,UAAU,CAAC,EAChCtB,KAAK,CAAC8B,QAAQ,CAAChB,UAAU,EAAEU,WAAW,EAAEZ,eAAe,CAAC,CACzD;EAED,OAAOgB,OAAO;AAChB,CAAC,CAAC,CACH;AAEH,OAAO,MAAMG,QAAQ,GACnBZ,MAAmE,IAKhEnB,KAAK,CAACa,OAAO,CAAChB,wBAAwB,EAAEkB,oBAAoB,CAACI,MAAM,CAAC,CAAC;AAE1E,OAAO,MAAMa,qBAAqB,GAChChB,OAAgD,IACwB;EACxE,MAAMG,MAAM,GAAGlB,aAAa,CAACoB,IAAI,CAACL,OAAO,CAAC;EAC1C,MAAMM,UAAU,GAAGtB,KAAK,CAACuB,OAAO,CAACtB,aAAa,CAACA,aAAa,EAAEkB,MAAM,CAAC;EACrE,MAAMK,WAAW,GAAGrB,eAAe,CAACa,OAAO,CAAC;EAC5C,MAAMS,OAAO,GAAGN,MAAM,CAACO,KAAK,GAAGtB,GAAG,CAACuB,YAAY,GAAGvB,GAAG,CAACqB,OAAO;EAC7D,MAAMG,OAAO,GAAG5B,KAAK,CAACa,OAAO,CAC3Bb,KAAK,CAAC6B,KAAK,CAACJ,OAAO,EAAEH,UAAU,CAAC,EAChCtB,KAAK,CAAC8B,QAAQ,CAAChB,UAAU,EAAEU,WAAW,EAAEZ,eAAe,CAAC,CACzD;EACD,OAAOZ,KAAK,CAACa,OAAO,CAAChB,wBAAwB,EAAE+B,OAAO,CAAC;AACzD,CAAC"}
+{"version":3,"file":"webhooks.mjs","names":["LiveFetchRequestExecutor","Config","Effect","Layer","DiscordConfig","LiveDiscordREST","makeConfigLayer","Log","LiveMemoryRateLimitStore","LiveRateLimiter","BadWebhookSignature","WebhookConfig","WebhookParseError","makeHandler","makeSimpleHandler","MemoryRateLimit","provide","MemoryREST","webhookLayerWithoutHttp","options","unwrapEffect","map","config","unwrap","make","LiveConfig","succeed","LiveWebhook","LiveLog","debug","LiveLogDebug","LiveEnv","merge","mergeAll","webhookLayerConfig","webhookLayer"],"sources":["../src/webhooks.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,wBAAwB,QAAQ,qBAAqB;AAC9D,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAE3C,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,KAAK,MAAM,kBAAkB;AACzC,OAAO,KAAKC,aAAa,MAAM,mBAAmB;AAElD,SAASC,eAAe,QAAQ,iBAAiB;AAEjD,SAASC,eAAe,QAAQ,0BAA0B;AAC1D,OAAO,KAAKC,GAAG,MAAM,SAAS;AAE9B,SAASC,wBAAwB,EAAEC,eAAe,QAAQ,eAAe;AAEzE,SACEC,mBAAmB,EACnBC,aAAa,EACbC,iBAAiB,EACjBN,eAAe,EACfO,WAAW,EACXC,iBAAiB,QACZ,0BAA0B;AAEjC,OAAO,MAAMC,eAAe,gBAAGZ,KAAK,CAACa,OAAO,CAC1CR,wBAAwB,EACxBC,eAAe,CAChB;AAED,OAAO,MAAMQ,UAAU,gBAAGd,KAAK,CAACa,OAAO,CACrCR,wBAAwB,EACxBH,eAAe,CAChB;AAED,OAAO,MAAMa,uBAAuB,GAClCC,OAAoE,IAMpEhB,KAAK,CAACiB,YAAY,CAChBlB,MAAM,CAACmB,GAAG,CAACnB,MAAM,CAACoB,MAAM,CAACrB,MAAM,CAACsB,MAAM,CAACJ,OAAO,CAAC,CAAC,EAAEA,OAAO,IAAG;EAC1D,MAAMG,MAAM,GAAGlB,aAAa,CAACoB,IAAI,CAACL,OAAO,CAAC;EAC1C,MAAMM,UAAU,GAAGtB,KAAK,CAACuB,OAAO,CAACtB,aAAa,CAACA,aAAa,EAAEkB,MAAM,CAAC;EACrE,MAAMK,WAAW,GAAGrB,eAAe,CAACa,OAAO,CAAC;EAC5C,MAAMS,OAAO,GAAGN,MAAM,CAACO,KAAK,GAAGtB,GAAG,CAACuB,YAAY,GAAGvB,GAAG,CAACqB,OAAO;EAC7D,MAAMG,OAAO,GAAG5B,KAAK,CAACa,OAAO,CAC3Bb,KAAK,CAAC6B,KAAK,CAACJ,OAAO,EAAEH,UAAU,CAAC,EAChCtB,KAAK,CAAC8B,QAAQ,CAAChB,UAAU,EAAEU,WAAW,EAAEZ,eAAe,CAAC,CACzD;EAED,OAAOgB,OAAO;AAChB,CAAC,CAAC,CACH;AAEH,OAAO,MAAMG,kBAAkB,GAC7BZ,MAAmE,IAKhEnB,KAAK,CAACa,OAAO,CAAChB,wBAAwB,EAAEkB,uBAAuB,CAACI,MAAM,CAAC,CAAC;AAE7E,OAAO,MAAMa,YAAY,GACvBhB,OAAgD,IACwB;EACxE,MAAMG,MAAM,GAAGlB,aAAa,CAACoB,IAAI,CAACL,OAAO,CAAC;EAC1C,MAAMM,UAAU,GAAGtB,KAAK,CAACuB,OAAO,CAACtB,aAAa,CAACA,aAAa,EAAEkB,MAAM,CAAC;EACrE,MAAMK,WAAW,GAAGrB,eAAe,CAACa,OAAO,CAAC;EAC5C,MAAMS,OAAO,GAAGN,MAAM,CAACO,KAAK,GAAGtB,GAAG,CAACuB,YAAY,GAAGvB,GAAG,CAACqB,OAAO;EAC7D,MAAMG,OAAO,GAAG5B,KAAK,CAACa,OAAO,CAC3Bb,KAAK,CAAC6B,KAAK,CAACJ,OAAO,EAAEH,UAAU,CAAC,EAChCtB,KAAK,CAAC8B,QAAQ,CAAChB,UAAU,EAAEU,WAAW,EAAEZ,eAAe,CAAC,CACzD;EACD,OAAOZ,KAAK,CAACa,OAAO,CAAChB,wBAAwB,EAAE+B,OAAO,CAAC;AACzD,CAAC"}

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "dfx",
-  "version": "0.52.1",
+  "version": "0.53.0",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/tim-smart/dfx.git"
   },
   "dependencies": {
-    "@effect-http/client": "^0.30.0",
+    "@effect-http/client": "^0.31.0",
     "@effect/data": "^0.14.1",
-    "@effect/io": "~0.32.1",
+    "@effect/io": "~0.32.2",
     "@effect/stream": "~0.26.0",
     "bufferutil": "^4.0.7",
     "discord-verify": "^1.2.0",
@@ -17,7 +17,7 @@
     "utf-8-validate": "^6.0.3",
     "ws": "^8.13.0"
   },
-  "gitHead": "fedd1ba05f574a1b2009215ddd482e4b6dfcd48d",
+  "gitHead": "1ea80463c960ded2699659218dddb12022c4d2ce",
   "main": "./index.js",
   "publishConfig": {
     "access": "public"

package/src/gateway.ts

@@ -18,13 +18,17 @@ 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"
 
 export { DiscordGateway, LiveDiscordGateway } from "dfx/DiscordGateway"
+
 export {
   InteractionsRegistry,
   InteractionsRegistryLive,
   run as runIx,
 } from "dfx/Interactions/gateway"
+
 export { CachePrelude, DiscordWS, SendEvent, Shard, ShardStore, WS }
 
 export const MemoryRateLimit = Layer.provide(
@@ -38,21 +42,24 @@ export const MemoryBot = Layer.provide(
     LiveMemoryRateLimitStore,
     LiveJsonDiscordWSCodec,
   ),
-  Layer.merge(
+  Layer.mergeAll(
     Layer.provideMerge(LiveDiscordREST, LiveDiscordGateway),
     MemoryRateLimit,
+    InteractionsRegistryLive,
   ),
 )
-export const makeLiveWithoutFetch = (
+
+export const gatewayLayerWithoutHttp = (
   config: Config.Config.Wrap<DiscordConfig.MakeOpts>,
 ): Layer.Layer<
   HttpRequestExecutor,
   ConfigError.ConfigError,
   | RateLimiter
   | Log.Log
+  | InteractionsRegistry
   | DiscordREST
-  | DiscordConfig.DiscordConfig
   | DiscordGateway
+  | DiscordConfig.DiscordConfig
 > =>
   Layer.unwrapEffect(
     Effect.config(Config.unwrap(config)).pipe(
@@ -65,14 +72,15 @@ export const makeLiveWithoutFetch = (
     ),
   )
 
-export const makeLive = (
+export const gatewayLayer = (
   config: Config.Config.Wrap<DiscordConfig.MakeOpts>,
 ): Layer.Layer<
   never,
   ConfigError.ConfigError,
   | RateLimiter
   | Log.Log
+  | InteractionsRegistry
   | DiscordREST
-  | DiscordConfig.DiscordConfig
   | DiscordGateway
-> => Layer.provide(LiveFetchRequestExecutor, makeLiveWithoutFetch(config))
+  | DiscordConfig.DiscordConfig
+> => Layer.provide(LiveFetchRequestExecutor, gatewayLayerWithoutHttp(config))

package/src/index.ts

@@ -1,3 +1,4 @@
+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"
@@ -11,6 +12,7 @@ import * as Log from "dfx/Log"
 import * as Discord from "dfx/types"
 
 export { DiscordREST, LiveDiscordREST } from "dfx/DiscordREST"
+
 export {
   BucketDetails,
   LiveMemoryRateLimitStore,
@@ -24,6 +26,7 @@ export {
   Discord,
   DiscordConfig,
   Flags,
+  Http,
   Intents,
   Ix,
   IxHelpers,

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "0.52.1";
+export const LIB_VERSION = "0.53.0";

package/src/webhooks.ts

@@ -32,7 +32,7 @@ export const MemoryREST = Layer.provide(
   LiveDiscordREST,
 )
 
-export const makeLiveWithoutFetch = (
+export const webhookLayerWithoutHttp = (
   options: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>,
 ): Layer.Layer<
   HttpRequestExecutor,
@@ -54,15 +54,15 @@ export const makeLiveWithoutFetch = (
     }),
   )
 
-export const makeLive = (
+export const webhookLayerConfig = (
   config: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>,
 ): Layer.Layer<
   never,
   ConfigError.ConfigError,
   RateLimiter | DiscordREST | WebhookConfig
-> => Layer.provide(LiveFetchRequestExecutor, makeLiveWithoutFetch(config))
+> => Layer.provide(LiveFetchRequestExecutor, webhookLayerWithoutHttp(config))
 
-export const makeLiveWithoutConfig = (
+export const webhookLayer = (
   options: DiscordConfig.MakeOpts & MakeConfigOpts,
 ): Layer.Layer<never, never, RateLimiter | DiscordREST | WebhookConfig> => {
   const config = DiscordConfig.make(options)

package/version.d.ts

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

package/version.js

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

package/webhooks.d.ts

@@ -10,7 +10,7 @@ import type { RateLimiter } from "dfx/RateLimit";
 export { BadWebhookSignature, WebhookConfig, WebhookParseError, makeConfigLayer, makeHandler, makeSimpleHandler, } from "dfx/Interactions/webhook";
 export declare const MemoryRateLimit: Layer.Layer<Log.Log, never, RateLimiter>;
 export declare const MemoryREST: Layer.Layer<DiscordConfig.DiscordConfig | HttpRequestExecutor | Log.Log, never, DiscordREST>;
-export declare const makeLiveWithoutFetch: (options: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>) => Layer.Layer<HttpRequestExecutor, ConfigError.ConfigError, RateLimiter | DiscordREST | WebhookConfig>;
-export declare const makeLive: (config: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>) => Layer.Layer<never, ConfigError.ConfigError, RateLimiter | DiscordREST | WebhookConfig>;
-export declare const makeLiveWithoutConfig: (options: DiscordConfig.MakeOpts & MakeConfigOpts) => Layer.Layer<never, never, RateLimiter | DiscordREST | WebhookConfig>;
+export declare const webhookLayerWithoutHttp: (options: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>) => Layer.Layer<HttpRequestExecutor, ConfigError.ConfigError, RateLimiter | DiscordREST | WebhookConfig>;
+export declare const webhookLayerConfig: (config: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>) => Layer.Layer<never, ConfigError.ConfigError, RateLimiter | DiscordREST | WebhookConfig>;
+export declare const webhookLayer: (options: DiscordConfig.MakeOpts & MakeConfigOpts) => Layer.Layer<never, never, RateLimiter | DiscordREST | WebhookConfig>;
 //# sourceMappingURL=webhooks.d.ts.map

package/webhooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhooks.d.ts","sourceRoot":"","sources":["./src/webhooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAE9D,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,yBAAyB,CAAA;AAE3D,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,aAAa,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAE7E,OAAO,KAAK,GAAG,MAAM,SAAS,CAAA;AAC9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAGhD,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,WAAW,EACX,iBAAiB,GAClB,MAAM,0BAA0B,CAAA;AAEjC,eAAO,MAAM,eAAe,0CAG3B,CAAA;AAED,eAAO,MAAM,UAAU,8FAGtB,CAAA;AAED,eAAO,MAAM,oBAAoB,YACtB,aAAa,CAAC,IAAI,CAAC,cAAc,QAAQ,GAAG,cAAc,CAAC,KACnE,WAAW,CACZ,mBAAmB,EACnB,uBAAuB,EACvB,WAAW,GAAG,WAAW,GAAG,aAAa,CAexC,CAAA;AAEH,eAAO,MAAM,QAAQ,WACX,aAAa,CAAC,IAAI,CAAC,cAAc,QAAQ,GAAG,cAAc,CAAC,KAClE,WAAW,CACZ,KAAK,EACL,uBAAuB,EACvB,WAAW,GAAG,WAAW,GAAG,aAAa,CAC+B,CAAA;AAE1E,eAAO,MAAM,qBAAqB,YACvB,cAAc,QAAQ,GAAG,cAAc,KAC/C,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,WAAW,GAAG,WAAW,GAAG,aAAa,CAUrE,CAAA"}
+{"version":3,"file":"webhooks.d.ts","sourceRoot":"","sources":["./src/webhooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAE9D,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,yBAAyB,CAAA;AAE3D,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,aAAa,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAE7E,OAAO,KAAK,GAAG,MAAM,SAAS,CAAA;AAC9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAGhD,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,WAAW,EACX,iBAAiB,GAClB,MAAM,0BAA0B,CAAA;AAEjC,eAAO,MAAM,eAAe,0CAG3B,CAAA;AAED,eAAO,MAAM,UAAU,8FAGtB,CAAA;AAED,eAAO,MAAM,uBAAuB,YACzB,aAAa,CAAC,IAAI,CAAC,cAAc,QAAQ,GAAG,cAAc,CAAC,KACnE,WAAW,CACZ,mBAAmB,EACnB,uBAAuB,EACvB,WAAW,GAAG,WAAW,GAAG,aAAa,CAexC,CAAA;AAEH,eAAO,MAAM,kBAAkB,WACrB,aAAa,CAAC,IAAI,CAAC,cAAc,QAAQ,GAAG,cAAc,CAAC,KAClE,WAAW,CACZ,KAAK,EACL,uBAAuB,EACvB,WAAW,GAAG,WAAW,GAAG,aAAa,CACkC,CAAA;AAE7E,eAAO,MAAM,YAAY,YACd,cAAc,QAAQ,GAAG,cAAc,KAC/C,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,WAAW,GAAG,WAAW,GAAG,aAAa,CAUrE,CAAA"}

package/webhooks.js

@@ -34,13 +34,13 @@ Object.defineProperty(exports, "makeHandler", {
     return _webhook.makeHandler;
   }
 });
-exports.makeLiveWithoutFetch = exports.makeLiveWithoutConfig = exports.makeLive = void 0;
 Object.defineProperty(exports, "makeSimpleHandler", {
   enumerable: true,
   get: function () {
     return _webhook.makeSimpleHandler;
   }
 });
+exports.webhookLayerWithoutHttp = exports.webhookLayerConfig = exports.webhookLayer = void 0;
 var _client = /*#__PURE__*/require("@effect-http/client");
 var Config = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Config"));
 var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
@@ -56,7 +56,7 @@ const MemoryRateLimit = /*#__PURE__*/Layer.provide(_RateLimit.LiveMemoryRateLimi
 exports.MemoryRateLimit = MemoryRateLimit;
 const MemoryREST = /*#__PURE__*/Layer.provide(_RateLimit.LiveMemoryRateLimitStore, _DiscordREST.LiveDiscordREST);
 exports.MemoryREST = MemoryREST;
-const makeLiveWithoutFetch = options => Layer.unwrapEffect(Effect.map(Effect.config(Config.unwrap(options)), options => {
+const webhookLayerWithoutHttp = options => Layer.unwrapEffect(Effect.map(Effect.config(Config.unwrap(options)), options => {
   const config = DiscordConfig.make(options);
   const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config);
   const LiveWebhook = (0, _webhook.makeConfigLayer)(options);
@@ -64,10 +64,10 @@ const makeLiveWithoutFetch = options => Layer.unwrapEffect(Effect.map(Effect.con
   const LiveEnv = Layer.provide(Layer.merge(LiveLog, LiveConfig), Layer.mergeAll(MemoryREST, LiveWebhook, MemoryRateLimit));
   return LiveEnv;
 }));
-exports.makeLiveWithoutFetch = makeLiveWithoutFetch;
-const makeLive = config => Layer.provide(_client.LiveFetchRequestExecutor, makeLiveWithoutFetch(config));
-exports.makeLive = makeLive;
-const makeLiveWithoutConfig = options => {
+exports.webhookLayerWithoutHttp = webhookLayerWithoutHttp;
+const webhookLayerConfig = config => Layer.provide(_client.LiveFetchRequestExecutor, webhookLayerWithoutHttp(config));
+exports.webhookLayerConfig = webhookLayerConfig;
+const webhookLayer = options => {
   const config = DiscordConfig.make(options);
   const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config);
   const LiveWebhook = (0, _webhook.makeConfigLayer)(options);
@@ -75,5 +75,5 @@ const makeLiveWithoutConfig = options => {
   const LiveEnv = Layer.provide(Layer.merge(LiveLog, LiveConfig), Layer.mergeAll(MemoryREST, LiveWebhook, MemoryRateLimit));
   return Layer.provide(_client.LiveFetchRequestExecutor, LiveEnv);
 };
-exports.makeLiveWithoutConfig = makeLiveWithoutConfig;
+exports.webhookLayer = webhookLayer;
 //# sourceMappingURL=webhooks.js.map

package/webhooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"webhooks.js","names":["_client","require","Config","_interopRequireWildcard","Effect","Layer","DiscordConfig","_DiscordREST","_webhook","Log","_RateLimit","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","MemoryRateLimit","provide","LiveMemoryRateLimitStore","LiveRateLimiter","exports","MemoryREST","LiveDiscordREST","makeLiveWithoutFetch","options","unwrapEffect","map","config","unwrap","make","LiveConfig","succeed","LiveWebhook","makeConfigLayer","LiveLog","debug","LiveLogDebug","LiveEnv","merge","mergeAll","makeLive","LiveFetchRequestExecutor","makeLiveWithoutConfig"],"sources":["./src/webhooks.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"webhooks.js","names":["_client","require","Config","_interopRequireWildcard","Effect","Layer","DiscordConfig","_DiscordREST","_webhook","Log","_RateLimit","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","MemoryRateLimit","provide","LiveMemoryRateLimitStore","LiveRateLimiter","exports","MemoryREST","LiveDiscordREST","webhookLayerWithoutHttp","options","unwrapEffect","map","config","unwrap","make","LiveConfig","succeed","LiveWebhook","makeConfigLayer","LiveLog","debug","LiveLogDebug","LiveEnv","merge","mergeAll","webhookLayerConfig","LiveFetchRequestExecutor","webhookLayer"],"sources":["./src/webhooks.ts"],"sourcesContent":[null],"mappings":"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"}