dfx 0.21.22 → 0.22.0

package/Interactions/gateway.d.ts

@@ -1,7 +1,9 @@
 import { Effect, Discord } from "dfx/_common";
-import { DiscordREST, FetchError, StatusCodeError, JsonParseError } from "dfx";
+import { DiscordREST } from "dfx";
+import * as Http from "@effect-http/client";
 import { DefinitionNotFound } from "./handlers.js";
 import { InteractionBuilder } from "./index.js";
+import { DiscordRESTError } from "dfx/DiscordREST";
 export interface RunOpts {
     sync?: boolean;
 }
@@ -9,4 +11,4 @@ export interface RunOpts {
  * @tsplus pipeable dfx/InteractionBuilder runGateway
  * @tsplus location "dfx/Interactions/gateway"
  */
-export declare const run: <R, R2, E, E2>(postHandler: (effect: import("../_common.js").Effect<R | import("../index.js").DiscordREST | import("../types.js").Interaction, E | import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError | DefinitionNotFound, void>) => import("../_common.js").Effect<R2, E2, void>, { sync }?: RunOpts) => (ix: InteractionBuilder<R, E>) => import("../_common.js").Effect<import("../index.js").DiscordREST | import("../DiscordGateway/index.js").DiscordGateway | Exclude<R2, import("../types.js").Interaction>, E2 | import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError, void>;
+export declare const run: <R, R2, E, E2>(postHandler: (effect: import("@effect-http/client/_common").Effect<R | import("dfx/DiscordREST").DiscordREST | import("../types.js").Interaction, E | DiscordRESTError | DefinitionNotFound, void>) => import("@effect-http/client/_common").Effect<R2, E2, void>, { sync }?: RunOpts) => (ix: InteractionBuilder<R, E>) => import("@effect-http/client/_common").Effect<import("dfx/DiscordREST").DiscordREST | import("../DiscordGateway.js").DiscordGateway | Exclude<R2, import("../types.js").Interaction>, E2 | DiscordRESTError | Http.HttpClientError, void>;

package/Interactions/gateway.js

@@ -2,6 +2,7 @@ import * as tsplus_module_1 from "@effect/io/Effect";
 import * as tsplus_module_2 from "@fp-ts/core/Function";
 import * as tsplus_module_3 from "dfx";
 import * as tsplus_module_4 from "dfx/gateway";
+import * as Http from "@effect-http/client";
 import { handlers } from "./handlers.js";
 import { InteractionContext } from "./index.js";
 import { splitDefinitions } from "./utils.js";
@@ -10,16 +11,14 @@ import { splitDefinitions } from "./utils.js";
  */
 export const run = (postHandler, { sync = true } = {}) => (ix) => (() => {
     const { GlobalApplicationCommand, GuildApplicationCommand } = splitDefinitions(ix.definitions);
-    return tsplus_module_1.flatMap(gateway => tsplus_module_1.flatMap(rest => tsplus_module_1.flatMap(application => {
-        const globalSync = rest.bulkOverwriteGlobalApplicationCommands(application.id, {
-            body: JSON.stringify(GlobalApplicationCommand.map(a => a.command)),
-        });
+    return tsplus_module_1.flatMap(tsplus_module_1.service(tsplus_module_4.Gateway.DiscordGateway), gateway => tsplus_module_1.flatMap(tsplus_module_1.service(tsplus_module_3.DiscordREST), rest => tsplus_module_1.flatMap(tsplus_module_1.flatMap(rest.getCurrentBotApplicationInformation(), a => a.json), application => {
+        const globalSync = rest.bulkOverwriteGlobalApplicationCommands(application.id, { body: Http.body.json(GlobalApplicationCommand.map(a => a.command)) });
         const guildSync = GuildApplicationCommand.length
             ? gateway.handleDispatch("GUILD_CREATE", a => rest.bulkOverwriteGuildApplicationCommands(application.id, a.id, GuildApplicationCommand.map(a => a.command)))
             : tsplus_module_1.unit();
         const handle = handlers(ix.definitions);
-        const run = gateway.handleDispatch("INTERACTION_CREATE", i => tsplus_module_1.provideService(InteractionContext, i)(tsplus_module_2.pipe(tsplus_module_1.tap(r => rest.createInteractionResponse(i.id, i.token, r))(handle[i.type](i)), postHandler)));
-        return tsplus_module_1.map(() => void 0)(sync ? tsplus_module_1.zipPar(guildSync)(tsplus_module_1.zipPar(globalSync)(run)) : run);
-    })(tsplus_module_1.flatMap(a => a.json)(rest.getCurrentBotApplicationInformation())))(tsplus_module_1.service(tsplus_module_3.DiscordREST)))(tsplus_module_1.service(tsplus_module_4.Gateway.DiscordGateway));
+        const run = gateway.handleDispatch("INTERACTION_CREATE", i => tsplus_module_1.provideService(tsplus_module_2.pipe(tsplus_module_1.tap(handle[i.type](i), r => rest.createInteractionResponse(i.id, i.token, r)), postHandler), InteractionContext, i));
+        return tsplus_module_1.map(sync ? tsplus_module_1.zipPar(tsplus_module_1.zipPar(run, globalSync), guildSync) : run, () => void 0);
+    })));
 })();
 //# sourceMappingURL=gateway.js.map

package/Interactions/gateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../src/Interactions/gateway.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAsB,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,EAAsB,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAM7C;;GAEG;AACH,MAAM,CAAC,MAAM,GAAG,GACd,CACE,WAMyB,EACzB,EAAE,IAAI,GAAG,IAAI,KAAc,EAAE,EAC7B,EAAE,CACJ,CAAC,EAA4B,EAAE,EAAE;IAE7B,MAAM,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,GACzD,gBAAgB,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;mCAE5B,OAAO,4BACP,IAAI,4BAEJ,WAAW;QAIjB,MAAM,UAAU,GAAG,IAAI,CAAC,sCAAsC,CAC5D,WAAW,CAAC,EAAE,EACd;YACE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;SACnE,CACF,CAAA;QAED,MAAM,SAAS,GAAG,uBAAuB,CAAC,MAAM;YAC9C,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CACzC,IAAI,CAAC,qCAAqC,CACxC,WAAW,CAAC,EAAE,EACd,CAAC,CAAC,EAAE,EACJ,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAQ,CACnD,CACF;YACH,CAAC,CAAC,sBAAa,CAAA;QAEjB,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QAEvC,MAAM,GAAG,GAAG,OAAO,CAAC,cAAc,CAAC,oBAAoB,EAAE,CAAC,CAAC,EAAE,CAC3D,+BAKiB,kBAAkB,EAAE,CAAC,EALtC,gBAAA,IAAI,CACF,oBAAsB,CAAC,CAAC,EAAE,CACxB,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,EADlD,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAEhB,EACD,WAAW,CACZ,CAAsC,CACxC,CAAA;iDAEC,IAAI,CAAC,CAAC,CAAC,uBAA8B,SAAS,EAAvC,uBAAW,UAAU,EAArB,GAAG,CAAmB,CAAkB,CAAC,CAAC,CAAC,GAAG;OA/BrD,wBAAmD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAA9D,IAAI,CAAC,mCAAmC,EAAE,CAAqB,GAHlD,wCAAe,WAAW,CAAC,GADxB,wBAAe,gBAAA,OAAO,CAAC,cAAc,CAAC;IAoCxD,CAAA"}
+{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../src/Interactions/gateway.ts"],"names":[],"mappings":";;;;AAAA,OAAO,KAAK,IAAI,MAAM,qBAAqB,CAAA;AAC3C,OAAO,EAAsB,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,EAAsB,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAO7C;;GAEG;AACH,MAAM,CAAC,MAAM,GAAG,GACd,CACE,WAMyB,EACzB,EAAE,IAAI,GAAG,IAAI,KAAc,EAAE,EAC7B,EAAE,CACJ,CAAC,EAA4B,EAAE,EAAE;IAE7B,MAAM,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,GACzD,gBAAgB,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;mCAEhB,wBAAe,gBAAA,OAAO,CAAC,cAAc,CAAC,EAAlD,OAAO,4BACE,wCAAe,WAAW,CAAC,EAApC,IAAI,4BAGR,wBAAA,IAAI,CAAC,mCAAmC,EAAE,EAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAD3D,WAAW;QAIjB,MAAM,UAAU,GAAG,IAAI,CAAC,sCAAsC,CAC5D,WAAW,CAAC,EAAE,EACd,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CACvE,CAAA;QAED,MAAM,SAAS,GAAG,uBAAuB,CAAC,MAAM;YAC9C,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CACzC,IAAI,CAAC,qCAAqC,CACxC,WAAW,CAAC,EAAE,EACd,CAAC,CAAC,EAAE,EACJ,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAQ,CACnD,CACF;YACH,CAAC,CAAC,sBAAa,CAAA;QAEjB,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QAEvC,MAAM,GAAG,GAAG,OAAO,CAAC,cAAc,CAAC,oBAAoB,EAAE,CAAC,CAAC,EAAE,CAC3D,+BAAA,gBAAA,IAAI,CACF,oBAAA,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAK,CAAC,CAAC,EAAE,CACxB,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CACjD,EACD,WAAW,CACZ,EAAgB,kBAAkB,EAAE,CAAC,CAAC,CACxC,CAAA;mCAEC,IAAI,CAAC,CAAC,CAAC,uBAAA,uBAAA,GAAG,EAAQ,UAAU,CAAC,EAAQ,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG;;IACvD,CAAA"}

package/Interactions/handlers.js

@@ -29,30 +29,30 @@ export const handlers = (definitions) => {
         }),
         [2 /* Discord.InteractionType.APPLICATION_COMMAND */]: i => {
             const data = i.data;
-            return tsplus_module_2.provideService(Ctx.ApplicationCommandContext, data)(tsplus_module_3.match(() => tsplus_module_2.fail(new DefinitionNotFound(i)), command => tsplus_module_2.isEffect(command.handle)
+            return tsplus_module_2.provideService(tsplus_module_3.match(tsplus_module_3.fromNullable(Commands[data.name]), () => tsplus_module_2.fail(new DefinitionNotFound(i)), command => tsplus_module_2.isEffect(command.handle)
                 ? command.handle
-                : command.handle(context))(tsplus_module_3.fromNullable(Commands[data.name])));
+                : command.handle(context)), Ctx.ApplicationCommandContext, data);
         },
         [5 /* Discord.InteractionType.MODAL_SUBMIT */]: (i) => {
             const data = i.data;
             return tsplus_module_5.pipe(ModalSubmit, Arr.map(a => tsplus_module_2.struct({
                 command: tsplus_module_2.succeed(a),
                 match: a.predicate(data.custom_id),
-            })), _ => tsplus_module_2.provideService(Ctx.ModalSubmitContext, data)(tsplus_module_2.flatMap(a => tsplus_module_3.match(() => tsplus_module_2.fail(new DefinitionNotFound(i)), a => a.command.handle)(tsplus_module_4.findFirst(a => a.match)(a)))(tsplus_module_2.collectAllPar(_))));
+            })), _ => tsplus_module_2.provideService(tsplus_module_2.flatMap(tsplus_module_2.collectAllPar(_), a => tsplus_module_3.match(tsplus_module_4.findFirst(a, a => a.match), () => tsplus_module_2.fail(new DefinitionNotFound(i)), a => a.command.handle)), Ctx.ModalSubmitContext, data));
         },
         [3 /* Discord.InteractionType.MESSAGE_COMPONENT */]: i => {
             const data = i.data;
             return tsplus_module_5.pipe(MessageComponent, Arr.map(a => tsplus_module_2.struct({
                 command: tsplus_module_2.succeed(a),
                 match: a.predicate(data.custom_id),
-            })), a => tsplus_module_2.provideService(Ctx.MessageComponentContext, data)(tsplus_module_2.flatMap(a => tsplus_module_3.match(() => tsplus_module_2.fail(new DefinitionNotFound(i)), a => a.command.handle)(tsplus_module_4.findFirst(a => a.match)(a)))(tsplus_module_2.collectAllPar(a))));
+            })), a => tsplus_module_2.provideService(tsplus_module_2.flatMap(tsplus_module_2.collectAllPar(a), a => tsplus_module_3.match(tsplus_module_4.findFirst(a, a => a.match), () => tsplus_module_2.fail(new DefinitionNotFound(i)), a => a.command.handle)), Ctx.MessageComponentContext, data));
         },
         [4 /* Discord.InteractionType.APPLICATION_COMMAND_AUTOCOMPLETE */]: i => {
             const data = i.data;
-            return tsplus_module_3.getOrElse(() => tsplus_module_2.fail(new DefinitionNotFound(i)))(tsplus_module_3.map(focusedOption => tsplus_module_5.pipe(Autocomplete, Arr.map(_ => tsplus_module_2.struct({
+            return tsplus_module_3.getOrElse(tsplus_module_3.map(tsplus_module_6.IxHelpers.focusedOption(data), focusedOption => tsplus_module_5.pipe(Autocomplete, Arr.map(_ => tsplus_module_2.struct({
                 command: tsplus_module_2.succeed(_),
                 match: _.predicate(data, focusedOption),
-            })), a => tsplus_module_2.provideService(Ctx.FocusedOptionContext, { focusedOption })(tsplus_module_2.provideService(Ctx.ApplicationCommandContext, data)(tsplus_module_2.flatMap(_ => tsplus_module_3.match(() => tsplus_module_2.fail(new DefinitionNotFound(i)), _ => _.command.handle)(tsplus_module_4.findFirst(_ => _.match)(_)))(tsplus_module_2.collectAllPar(a))))))(tsplus_module_6.IxHelpers.focusedOption(data)));
+            })), a => tsplus_module_2.provideService(tsplus_module_2.provideService(tsplus_module_2.flatMap(tsplus_module_2.collectAllPar(a), _ => tsplus_module_3.match(tsplus_module_4.findFirst(_, _ => _.match), () => tsplus_module_2.fail(new DefinitionNotFound(i)), _ => _.command.handle)), Ctx.ApplicationCommandContext, data), Ctx.FocusedOptionContext, { focusedOption }))), () => tsplus_module_2.fail(new DefinitionNotFound(i)));
         },
     };
 };

package/Interactions/handlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"handlers.js","sourceRoot":"","sources":["../../src/Interactions/handlers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handlers.js","sourceRoot":"","sources":["../../src/Interactions/handlers.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,KAAK,GAAG,MAAM,2BAA2B,CAAA;AAChD,OAAO,KAAK,GAAG,MAAM,cAAc,CAAA;AAEnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7C,MAAM,OAAO,kBAAkB;IAER;IADZ,IAAI,GAAG,oBAAoB,CAAA;IACpC,YAAqB,WAAgC;QAAhC,gBAAW,GAAX,WAAW,CAAqB;IAAG,CAAC;CAC1D;AAQD,MAAM,OAAO,GAAyB;IACpC,OAAO,EAAE,GAAG,CAAC,QAAQ;IACrB,MAAM,EAAE,GAAG,CAAC,MAAM;IAClB,WAAW,EAAE,GAAG,CAAC,WAAW;IAC5B,mBAAmB,EAAE,GAAG,CAAC,mBAAmB;IAC5C,WAAW,EAAE,GAAG,CAAC,iBAAiB;CAC5B,CAAA;AAER,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,WAA4C,EAI5C,EAAE;IACF,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,GAC7D,gBAAgB,CAAC,WAAW,CAAC,CAAA;IAE/B,OAAO;QACL,sCAA8B,EAAE,GAAG,EAAE,CACnC,wBAAe;YACb,IAAI,8CAAsC;SACpC,CAAC;QAEX,qDAA6C,EAAE,CAAC,CAAC,EAAE;YACjD,MAAM,IAAI,GAAG,CAAC,CAAC,IAAuC,CAAA;YAEtD,OAAO,+BAAA,sBAAA,6BAAmB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAE1C,GAAG,EAAE,CAAC,qBAAY,IAAI,kBAAkB,CAAC,CAAC,CAAC,CAAkB,EAC7D,OAAO,CAAC,EAAE,CACR,yBAAgB,OAAO,CAAC,MAAM,CAAC;gBAC7B,CAAC,CAAC,OAAO,CAAC,MAAM;gBAChB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAC9B,EACe,GAAG,CAAC,yBAAyB,EAAE,IAAI,CAAC,CAAA;QACxD,CAAC;QAED,8CAAsC,EAAE,CAAC,CAAsB,EAAE,EAAE;YACjE,MAAM,IAAI,GAAG,CAAC,CAAC,IAAgC,CAAA;YAE/C,OAAO,gBAAA,IAAI,CACT,WAAW,EACX,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACV,uBAAc;gBACZ,OAAO,EAAE,wBAAe,CAAC,CAAC;gBAC1B,KAAK,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC;aACnC,CAAC,CACH,EACD,CAAC,CAAC,EAAE,CACF,+BAAA,sDAAA,CAAC,GACU,CAAC,CAAC,EAAE,CACX,sBAAA,0BAAA,CAAC,EACY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAEtB,GAAG,EAAE,CAAC,qBAAY,IAAI,kBAAkB,CAAC,CAAC,CAAC,CAAkB,EAC7D,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CACtB,CACJ,EACe,GAAG,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAClD,CAAA;QACH,CAAC;QAED,mDAA2C,EAAE,CAAC,CAAC,EAAE;YAC/C,MAAM,IAAI,GAAG,CAAC,CAAC,IAAqC,CAAA;YAEpD,OAAO,gBAAA,IAAI,CACT,gBAAgB,EAChB,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACV,uBAAc;gBACZ,OAAO,EAAE,wBAAe,CAAC,CAAC;gBAC1B,KAAK,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC;aACnC,CAAC,CACH,EACD,CAAC,CAAC,EAAE,CACF,+BAAA,sDAAA,CAAC,GACU,CAAC,CAAC,EAAE,CACX,sBAAA,0BAAA,CAAC,EACY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAEtB,GAAG,EAAE,CAAC,qBAAY,IAAI,kBAAkB,CAAC,CAAC,CAAC,CAAkB,EAC7D,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CACtB,CACJ,EACe,GAAG,CAAC,uBAAuB,EAAE,IAAI,CAAC,CACvD,CAAA;QACH,CAAC;QAED,kEAA0D,EAAE,CAAC,CAAC,EAAE;YAC9D,MAAM,IAAI,GAAG,CAAC,CAAC,IAAuC,CAAA;YAEtD,OAAO,0BAAA,oBAAA,gBAAA,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,EAC7B,aAAa,CAAC,EAAE,CACnB,gBAAA,IAAI,CACF,YAAY,EACZ,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACV,uBAAc;gBACZ,OAAO,EAAE,wBAAe,CAAC,CAAC;gBAC1B,KAAK,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC;aACxC,CAAC,CACH,EACD,CAAC,CAAC,EAAE,CACF,+BAAA,+BAAA,sDAAA,CAAC,GACU,CAAC,CAAC,EAAE,CACX,sBAAA,0BAAA,CAAC,EAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EACvB,GAAG,EAAE,CACH,qBAAY,IAAI,kBAAkB,CAAC,CAAC,CAAC,CAAkB,EACzD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CACtB,CACF,EACe,GAAG,CAAC,yBAAyB,EAAE,IAAI,CAAC,EACpC,GAAG,CAAC,oBAAoB,EAAE,EAAE,aAAa,EAAE,CAAC,CACjE,CACF,EACU,GAAG,EAAE,CAAC,qBAAY,IAAI,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC5D,CAAC;KACF,CAAA;AACH,CAAC,CAAA"}

package/Interactions/index.d.ts

@@ -1,6 +1,7 @@
 import { DiscordREST } from "dfx";
 import { Discord, Effect } from "dfx/_common";
 import * as D from "./definitions.js";
+import * as Http from "@effect-http/client";
 export { response as r } from "../Helpers/interactions.js";
 export * from "./context.js";
 export { autocomplete, global, guild, InteractionDefinition, messageComponent, modalSubmit, } from "./definitions.js";
@@ -12,8 +13,8 @@ export declare class InteractionBuilder<R, E> {
     constructor(definitions: D.InteractionDefinition<R, E>[]);
     add<R1, E1>(definition: D.InteractionDefinition<R1, E1>): InteractionBuilder<R | R1, E | E1>;
     concat<R1, E1>(builder: InteractionBuilder<R1, E1>): InteractionBuilder<R | R1, E | E1>;
-    get syncGlobal(): Effect<DiscordREST, import("dfx").FetchError | import("dfx").StatusCodeError | import("dfx").JsonParseError, import("../DiscordREST/types.js").ResponseWithData<Discord.ApplicationCommand[]>>;
-    syncGuild(appId: Discord.Snowflake, guildId: Discord.Snowflake): Effect<DiscordREST, import("dfx").FetchError | import("dfx").StatusCodeError | import("dfx").JsonParseError, import("../DiscordREST/types.js").ResponseWithData<Discord.ApplicationCommand[]>>;
+    get syncGlobal(): Effect<DiscordREST, import("../DiscordREST.js").DiscordRESTError | Http.HttpClientError, import("../DiscordREST/types.js").ResponseWithData<Discord.ApplicationCommand[]>>;
+    syncGuild(appId: Discord.Snowflake, guildId: Discord.Snowflake): Effect<DiscordREST, import("../DiscordREST.js").DiscordRESTError, import("../DiscordREST/types.js").ResponseWithData<Discord.ApplicationCommand[]>>;
 }
 export declare const builder: InteractionBuilder<never, never>;
 export declare const id: (query: string) => (customId: string) => Effect<never, never, boolean>;

package/Interactions/index.js

@@ -1,5 +1,6 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
 import { DiscordREST } from "dfx";
+import * as Http from "@effect-http/client";
 export { response as r } from "../Helpers/interactions.js";
 export * from "./context.js";
 export { autocomplete, global, guild, messageComponent, modalSubmit, } from "./definitions.js";
@@ -27,10 +28,10 @@ export class InteractionBuilder {
         const commands = this.definitions
             .filter((c) => c._tag === "GlobalApplicationCommand")
             .map(c => c.command);
-        return tsplus_module_1.serviceWithEffect(DiscordREST, rest => tsplus_module_1.flatMap(app => rest.bulkOverwriteGlobalApplicationCommands(app.id, {
-            body: JSON.stringify(commands),
-        }))(tsplus_module_1.flatMap(r => r.json)(rest
-            .getCurrentBotApplicationInformation())));
+        return tsplus_module_1.serviceWithEffect(DiscordREST, rest => tsplus_module_1.flatMap(tsplus_module_1.flatMap(rest
+            .getCurrentBotApplicationInformation(), r => r.json), app => rest.bulkOverwriteGlobalApplicationCommands(app.id, {
+            body: Http.body.json(commands),
+        })));
     }
     syncGuild(appId, guildId) {
         const commands = this.definitions

package/Interactions/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Interactions/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Interactions/index.ts"],"names":[],"mappings":"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"}

package/Interactions/webhook.d.ts

@@ -15,7 +15,7 @@ declare const makeConfig: ({ applicationId, publicKey }: MakeConfigOpts) => {
 };
 export interface WebhookConfig extends ReturnType<typeof makeConfig> {
 }
-export declare const WebhookConfig: import("../_common.js").Tag<WebhookConfig>;
+export declare const WebhookConfig: import("@effect-http/client/_common").Tag<WebhookConfig>;
 export declare const makeConfigLayer: (a_0: MakeConfigOpts) => import("../_common.js").Layer<never, never, WebhookConfig>;
 export declare const makeFromConfig: (a: Config<MakeConfigOpts>) => import("../_common.js").Layer<never, import("../_common.js").ConfigError, WebhookConfig>;
 export declare class WebhookParseError {
@@ -33,7 +33,7 @@ export interface HandleWebhookOpts<E> {
  * @tsplus getter dfx/InteractionBuilder webhookHandler
  * @tsplus location "dfx/Interactions/webhook"
  */
-export declare const makeHandler: <R, E>(ix: InteractionBuilder<R, E>) => ({ headers, body, success, error, }: HandleWebhookOpts<DefinitionNotFound | BadWebhookSignature | WebhookParseError | E>) => import("../_common.js").Effect<WebhookConfig | Exclude<R, import("../types.js").Interaction>, never, void>;
+export declare const makeHandler: <R, E>(ix: InteractionBuilder<R, E>) => ({ headers, body, success, error, }: HandleWebhookOpts<DefinitionNotFound | BadWebhookSignature | WebhookParseError | E>) => import("@effect-http/client/_common").Effect<WebhookConfig | Exclude<R, import("../types.js").Interaction>, never, void>;
 /**
  * @tsplus getter dfx/InteractionBuilder simpleWebhookHandler
  * @tsplus location "dfx/Interactions/webhook"
@@ -41,5 +41,5 @@ export declare const makeHandler: <R, E>(ix: InteractionBuilder<R, E>) => ({ hea
 export declare const makeSimpleHandler: <R, E>(ix: InteractionBuilder<R, E>) => ({ headers, body }: {
     headers: Headers;
     body: string;
-}) => import("../_common.js").Effect<WebhookConfig | Exclude<R, import("../types.js").Interaction>, DefinitionNotFound | BadWebhookSignature | WebhookParseError | E, import("../types.js").InteractionResponse>;
+}) => import("@effect-http/client/_common").Effect<WebhookConfig | Exclude<R, import("../types.js").Interaction>, DefinitionNotFound | BadWebhookSignature | WebhookParseError | E, import("../types.js").InteractionResponse>;
 export {};

package/Interactions/webhook.js

@@ -12,20 +12,20 @@ import { fromHex } from "./utils.js";
 export class BadWebhookSignature {
     _tag = "BadWebhookSignature";
 }
-const checkSignature = (publicKey, headers, body) => tsplus_module_2.asUnit(tsplus_module_1.toEither(tsplus_module_1.filter(tsplus_module_1.struct({
-    signature: tsplus_module_1.fromNullable(headers["x-signature-ed25519"]),
-    timestamp: tsplus_module_1.fromNullable(headers["x-signature-timestamp"]),
-}), a => {
+const checkSignature = (publicKey, headers, body) => tsplus_module_2.asUnit(tsplus_module_1.toEither(() => new BadWebhookSignature())(tsplus_module_1.filter(a => {
     const enc = new TextEncoder();
     return Nacl.sign.detached.verify(enc.encode(a.timestamp + body), fromHex(`${a.signature}`), publicKey);
-}), () => new BadWebhookSignature()));
+})(tsplus_module_1.struct({
+    signature: tsplus_module_1.fromNullable(headers["x-signature-ed25519"]),
+    timestamp: tsplus_module_1.fromNullable(headers["x-signature-timestamp"]),
+}))));
 const makeConfig = ({ applicationId, publicKey }) => ({
     applicationId,
     publicKey: fromHex(tsplus_module_3.value(publicKey)),
 });
 export const WebhookConfig = tsplus_module_4.Tag();
 export const makeConfigLayer = tsplus_module_6.flow(makeConfig, _ => tsplus_module_5.succeed(WebhookConfig, _));
-export const makeFromConfig = (a) => tsplus_module_7.toLayer(WebhookConfig)(tsplus_module_7.map(makeConfig)(tsplus_module_7.config(a)));
+export const makeFromConfig = (a) => tsplus_module_7.toLayer(tsplus_module_7.map(tsplus_module_7.config(a), makeConfig), WebhookConfig);
 export class WebhookParseError {
     reason;
     _tag = "WebhookParseError";
@@ -33,17 +33,17 @@ export class WebhookParseError {
         this.reason = reason;
     }
 }
-const fromHeadersAndBody = (headers, body) => tsplus_module_7.flatMap(({ publicKey }) => tsplus_module_7.flatMap(() => tsplus_module_7.tryCatch(() => JSON.parse(body), reason => new WebhookParseError(reason)))(tsplus_module_7.fromEither(checkSignature(publicKey, headers, body))))(tsplus_module_7.service(WebhookConfig));
+const fromHeadersAndBody = (headers, body) => tsplus_module_7.flatMap(tsplus_module_7.service(WebhookConfig), ({ publicKey }) => tsplus_module_7.flatMap(tsplus_module_7.fromEither(checkSignature(publicKey, headers, body)), () => tsplus_module_7.tryCatch(() => JSON.parse(body), reason => new WebhookParseError(reason))));
 const run = (definitions) => {
     const handler = handlers(definitions);
-    return (headers, body) => tsplus_module_7.flatMap(interaction => tsplus_module_7.provideService(InteractionContext, interaction)(handler[interaction.type](interaction)))(fromHeadersAndBody(headers, body));
+    return (headers, body) => tsplus_module_7.flatMap(fromHeadersAndBody(headers, body), interaction => tsplus_module_7.provideService(handler[interaction.type](interaction), InteractionContext, interaction));
 };
 /**
  * @tsplus getter dfx/InteractionBuilder webhookHandler
  */
 export const makeHandler = (ix) => {
     const handle = run(ix.definitions);
-    return ({ headers, body, success, error, }) => tsplus_module_7.catchAllCause(error)(tsplus_module_7.flatMap(success)(handle(headers, body)));
+    return ({ headers, body, success, error, }) => tsplus_module_7.catchAllCause(tsplus_module_7.flatMap(handle(headers, body), success), error);
 };
 /**
  * @tsplus getter dfx/InteractionBuilder simpleWebhookHandler

package/Interactions/webhook.js.map

@@ -1 +1 @@
-{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../src/Interactions/webhook.ts"],"names":[],"mappings":";;;;;;;AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,OAAO,EAAsB,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,EAAsB,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEpC,MAAM,OAAO,mBAAmB;IACrB,IAAI,GAAG,qBAAqB,CAAA;CACtC;AAID,MAAM,cAAc,GAAG,CACrB,SAAqB,EACrB,OAAgB,EAChB,IAAY,EACZ,EAAE,wBACF,yBAAA,uBAAA,uBAAa;IACX,SAAS,EAAE,6BAAmB,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC7D,SAAS,EAAE,6BAAmB,OAAO,CAAC,uBAAuB,CAAC,CAAC;CAChE,CAAC,EACQ,CAAC,CAAC,EAAE;IACV,MAAM,GAAG,GAAG,IAAI,WAAW,EAAE,CAAA;IAC7B,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAC9B,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,EAC9B,OAAO,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC,EACzB,SAAS,CACV,CAAA;AACH,CAAC,CAAC,EACQ,GAAG,EAAE,CAAC,IAAI,mBAAmB,EAAE,CAAC,CAAO,CAAA;AAMrD,MAAM,UAAU,GAAG,CAAC,EAAE,aAAa,EAAE,SAAS,EAAkB,EAAE,EAAE,CAAC,CAAC;IACpE,aAAa;IACb,SAAS,EAAE,OAAO,uBAAC,SAAS,EAAO;CACpC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,gBAAA,GAAG,EAAiB,CAAA;AACjD,MAAM,CAAC,MAAM,eAAe,GAAG,gBAAA,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAClD,wBAAc,aAAa,EAAE,CAAC,CAAC,CAChC,CAAA;AACD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAyB,EAAE,EAAE,CAC1D,wBAAiC,aAAa,EAA9C,oBAAa,UAAU,yBAAvB,CAAC,EAAuB,CAAuB,CAAA;AAEjD,MAAM,OAAO,iBAAiB;IAEP;IADZ,IAAI,GAAG,mBAAmB,CAAA;IACnC,YAAqB,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;CACzC;AAED,MAAM,kBAAkB,GAAG,CAAC,OAAgB,EAAE,IAAY,EAAE,EAAE,0BAEpD,EAAE,SAAS,EAAE,mCAGjB,yBACE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAwB,EAC7C,MAAM,CAAC,EAAE,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,CACxC,EALD,2BAAkB,cAAc,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,GADrC,wBAAe,aAAa,CAAC,CAQrD,CAAA;AAEJ,MAAM,GAAG,GAAG,CAAO,WAA4C,EAAE,EAAE;IACjE,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAA;IACrC,OAAO,CAAC,OAAgB,EAAE,IAAY,EAAE,EAAE,yBAEhC,WAAW,IAEf,+BACE,kBAAkB,EAClB,WAAW,EAFb,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAGrC,EALmB,kBAAkB,CAAC,OAAO,EAAE,IAAI,CAAC,CAOvD,CAAA;AACN,CAAC,CAAA;AASD;;GAEG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAO,EAA4B,EAAE,EAAE;IAChE,MAAM,MAAM,GAAG,GAAG,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;IAElC,OAAO,CAAC,EACN,OAAO,EACP,IAAI,EACJ,OAAO,EACP,KAAK,GAGN,EAAE,EAAE,CAAC,8BAAqD,KAAK,EAA1D,wBAA8B,OAAO,EAArC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAiB,CAAqB,CAAA;AACnE,CAAC,CAAA;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAO,EAA4B,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,GAAG,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;IAElC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAsC,EAAE,EAAE,CAC/D,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AACzB,CAAC,CAAA"}
+{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../src/Interactions/webhook.ts"],"names":[],"mappings":"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"}

package/Log.d.ts

@@ -0,0 +1,12 @@
+declare const make: (debug?: boolean) => {
+    info: (...args: any[]) => import("@effect-http/client/_common").Effect<never, never, void>;
+    debug: (...args: any[]) => import("@effect-http/client/_common").Effect<never, never, void>;
+};
+export interface Log extends ReturnType<typeof make> {
+}
+export declare const Log: import("@effect-http/client/_common").Tag<Log>;
+export declare const LiveLog: import("./_common.js").Layer<never, never, Log>;
+export declare const LiveLogDebug: import("./_common.js").Layer<never, never, Log>;
+export declare const info: (...args: any[]) => import("@effect-http/client/_common").Effect<Log, never, void>;
+export declare const debug: (...args: any[]) => import("@effect-http/client/_common").Effect<Log, never, void>;
+export {};

package/{Log/index.js → Log.js}

@@ -16,4 +16,4 @@ export const LiveLog = tsplus_module_3.succeed(Log, make(false));
 export const LiveLogDebug = tsplus_module_3.succeed(Log, make(true));
 export const info = (...args) => tsplus_module_1.serviceWithEffect(Log, ({ info: log }) => log(...args));
 export const debug = (...args) => tsplus_module_1.serviceWithEffect(Log, ({ debug }) => debug(...args));
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=Log.js.map

package/Log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Log.js","sourceRoot":"","sources":["../src/Log.ts"],"names":[],"mappings":";;;AAAA,MAAM,IAAI,GAAG,CAAC,KAAK,GAAG,KAAK,EAAE,EAAE,CAAC,CAAC;IAC/B,IAAI,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,CACvB,qBAAY,GAAG,EAAE;QACf,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAA;IAChC,CAAC,CAAC;IACJ,KAAK,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,CACxB,KAAK;QACH,CAAC,CAAC,qBAAY,GAAG,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAA;QACjC,CAAC,CAAC;QACJ,CAAC,CAAC,sBAAa;CACpB,CAAC,CAAA;AAGF,MAAM,CAAC,MAAM,GAAG,GAAG,gBAAA,GAAG,EAAO,CAAA;AAC7B,MAAM,CAAC,MAAM,OAAO,GAAG,wBAAc,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;AACtD,MAAM,CAAC,MAAM,YAAY,GAAG,wBAAc,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;AAE1D,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CACrC,kCAAyB,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;AAEhE,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CACtC,kCAAyB,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA"}

package/RateLimit/memory.d.ts

@@ -1,2 +1,2 @@
-import { RateLimitStore } from "./index.js";
+import { RateLimitStore } from "../RateLimit.js";
 export declare const make: () => RateLimitStore;

package/RateLimit/memory.js

@@ -4,7 +4,7 @@ export const make = () => {
     const buckets = new Map();
     const routes = new Map();
     const counters = new Map();
-    const getCounter = (key) => tsplus_module_1.filter(tsplus_module_1.fromNullable(counters.get(key)), c => c.expires > Date.now());
+    const getCounter = (key) => tsplus_module_1.filter(c => c.expires > Date.now())(tsplus_module_1.fromNullable(counters.get(key)));
     const getBucketForRoute = (route) => tsplus_module_2.sync(() => tsplus_module_1.fromNullable(buckets.get(routes.get(route))));
     return {
         hasBucket: key => tsplus_module_2.sync(() => buckets.has(key)),
@@ -21,10 +21,10 @@ export const make = () => {
         incrementCounter: (key, window, limit) => tsplus_module_2.sync(() => {
             const now = Date.now();
             const perRequest = Math.ceil(window / limit);
-            const counter = tsplus_module_1.getOrElse(() => ({
+            const counter = tsplus_module_1.getOrElse(getCounter(key), () => ({
                 expires: now,
                 count: 0,
-            }))(getCounter(key));
+            }));
             const count = counter.count + 1;
             const expires = counter.expires + perRequest;
             counters.set(key, { ...counter, count, expires });

package/RateLimit/memory.js.map

@@ -1 +1 @@
-{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/RateLimit/memory.ts"],"names":[],"mappings":";;AAOA,MAAM,CAAC,MAAM,IAAI,GAAG,GAAmB,EAAE;IACvC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAyB,CAAA;IAChD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAA;IACxC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAmB,CAAA;IAE3C,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE,CACjC,uBAAA,6BAAmB,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;IAE3E,MAAM,iBAAiB,GAAG,CAAC,KAAa,EAAE,EAAE,CAC1C,qBAAY,GAAG,EAAE,CAAC,6BAAmB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,CAAC,CAAC,CAAA;IAExE,OAAO;QACL,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,qBAAY,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAErD,SAAS,EAAE,MAAM,CAAC,EAAE,CAClB,qBAAY,GAAG,EAAE;YACf,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QACjC,CAAC,CAAC;QAEJ,iBAAiB;QAEjB,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAChC,qBAAY,GAAG,EAAE;YACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC3B,CAAC,CAAC;QAEJ,aAAa,EAAE,GAAG,CAAC,EAAE,CACnB,qBAAY,GAAG,EAAE;YACf,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACtB,CAAC,CAAC;QAEJ,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CACvC,qBAAY,GAAG,EAAE;YACf,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YACtB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,CAAA;YAC5C,MAAM,OAAO,GAAG,0BACd,GAAY,EAAE,CAAC,CAAC;gBACd,OAAO,EAAE,GAAG;gBACZ,KAAK,EAAE,CAAC;aACT,CAAC,EAJY,UAAU,CAAC,GAAG,CAAC,CAK9B,CAAA;YAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,CAAC,CAAA;YAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG,UAAU,CAAA;YAC5C,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAA;YAEjD,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,GAAG,CAAC,CAAA;QAC/B,CAAC,CAAC;KACL,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/RateLimit/memory.ts"],"names":[],"mappings":";;AAOA,MAAM,CAAC,MAAM,IAAI,GAAG,GAAmB,EAAE;IACvC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAyB,CAAA;IAChD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAA;IACxC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAmB,CAAA;IAE3C,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE,CACjC,uBAA6C,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,EAAxE,6BAAmB,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAoC,CAAA;IAE3E,MAAM,iBAAiB,GAAG,CAAC,KAAa,EAAE,EAAE,CAC1C,qBAAY,GAAG,EAAE,CAAC,6BAAmB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,CAAC,CAAC,CAAA;IAExE,OAAO;QACL,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,qBAAY,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAErD,SAAS,EAAE,MAAM,CAAC,EAAE,CAClB,qBAAY,GAAG,EAAE;YACf,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QACjC,CAAC,CAAC;QAEJ,iBAAiB;QAEjB,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAChC,qBAAY,GAAG,EAAE;YACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC3B,CAAC,CAAC;QAEJ,aAAa,EAAE,GAAG,CAAC,EAAE,CACnB,qBAAY,GAAG,EAAE;YACf,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACtB,CAAC,CAAC;QAEJ,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CACvC,qBAAY,GAAG,EAAE;YACf,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YACtB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,CAAA;YAC5C,MAAM,OAAO,GAAG,0BAAA,UAAU,CAAC,GAAG,CAAC,EAC7B,GAAY,EAAE,CAAC,CAAC;gBACd,OAAO,EAAE,GAAG;gBACZ,KAAK,EAAE,CAAC;aACT,CAAC,CACH,CAAA;YAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,CAAC,CAAA;YAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG,UAAU,CAAA;YAC5C,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAA;YAEjD,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,GAAG,CAAC,CAAA;QAC/B,CAAC,CAAC;KACL,CAAA;AACH,CAAC,CAAA"}

package/{RateLimit/index.d.ts → RateLimit.d.ts}

@@ -12,13 +12,13 @@ export interface RateLimitStore {
     incrementCounter: (key: string, window: number, limit: number) => Effect<never, never, readonly [count: number, ttl: number]>;
     removeCounter: (key: string) => Effect<never, never, void>;
 }
-export declare const RateLimitStore: import("../_common.js").Tag<RateLimitStore>;
-export declare const LiveMemoryRateLimitStore: import("../_common.js").Layer<never, never, RateLimitStore>;
-declare const makeLimiter: import("../_common.js").Effect<import("../Log/index.js").Log | RateLimitStore, never, {
-    maybeWait: (key: string, window: Duration, limit: number, multiplier?: number) => import("../_common.js").Effect<never, never, void>;
+export declare const RateLimitStore: import("@effect-http/client/_common").Tag<RateLimitStore>;
+export declare const LiveMemoryRateLimitStore: import("./_common.js").Layer<never, never, RateLimitStore>;
+declare const makeLimiter: import("@effect-http/client/_common").Effect<import("./Log.js").Log | RateLimitStore, never, {
+    maybeWait: (key: string, window: Duration, limit: number, multiplier?: number) => import("@effect-http/client/_common").Effect<never, never, void>;
 }>;
 export interface RateLimiter extends Effect.Success<typeof makeLimiter> {
 }
-export declare const RateLimiter: import("../_common.js").Tag<RateLimiter>;
-export declare const LiveRateLimiter: import("../_common.js").Layer<import("../Log/index.js").Log | RateLimitStore, never, RateLimiter>;
+export declare const RateLimiter: import("@effect-http/client/_common").Tag<RateLimiter>;
+export declare const LiveRateLimiter: import("./_common.js").Layer<import("./Log.js").Log | RateLimitStore, never, RateLimiter>;
 export {};

package/{RateLimit/index.js → RateLimit.js}

@@ -2,24 +2,24 @@ import * as tsplus_module_1 from "dfx/_common";
 import * as tsplus_module_2 from "@effect/io/Layer";
 import * as tsplus_module_3 from "@effect/io/Effect";
 import * as tsplus_module_4 from "dfx";
-import { delayFrom } from "./utils.js";
-import * as Memory from "./memory.js";
+import { delayFrom } from "./RateLimit/utils.js";
+import * as Memory from "./RateLimit/memory.js";
 export const RateLimitStore = tsplus_module_1.Tag();
 export const LiveMemoryRateLimitStore = tsplus_module_2.sync(RateLimitStore, Memory.make);
-const makeLimiter = tsplus_module_3.flatMap(store => tsplus_module_3.map(log => {
+const makeLimiter = tsplus_module_3.flatMap(tsplus_module_3.service(RateLimitStore), store => tsplus_module_3.map(tsplus_module_3.service(tsplus_module_4.Log.Log), log => {
     const maybeWait = (key, window, limit, multiplier = 1.05) => {
         const windowMs = window.millis * multiplier;
-        return tsplus_module_3.asUnit(tsplus_module_3.tap(tsplus_module_3.sleep)(tsplus_module_3.tap(d => log.debug("RateLimitStore maybeWait", {
+        return tsplus_module_3.asUnit(tsplus_module_3.tap(tsplus_module_3.tap(tsplus_module_3.map(store
+            .incrementCounter(key, windowMs, limit), ([count, ttl]) => delayFrom(windowMs, limit, count, ttl)), d => log.debug("RateLimitStore maybeWait", {
             key,
             window: window.millis,
             windowMs,
             limit,
             delay: d.millis,
-        }))(tsplus_module_3.map(([count, ttl]) => delayFrom(windowMs, limit, count, ttl))(store
-            .incrementCounter(key, windowMs, limit)))));
+        })), tsplus_module_3.sleep));
     };
     return { maybeWait };
-})(tsplus_module_3.service(tsplus_module_4.Log.Log)))(tsplus_module_3.service(RateLimitStore));
+}));
 export const RateLimiter = tsplus_module_1.Tag();
 export const LiveRateLimiter = tsplus_module_2.effect(RateLimiter, makeLimiter);
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=RateLimit.js.map

package/RateLimit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RateLimit.js","sourceRoot":"","sources":["../src/RateLimit.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAA;AA+B/C,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,wBAAwB,GAAG,qBAAW,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;AAE/E,MAAM,WAAW,2BACC,wBAAe,cAAc,CAAC,EAAxC,KAAK,wBACG,wBAAe,gBAAA,GAAG,CAAC,GAAG,CAAC,EAA/B,GAAG;IAET,MAAM,SAAS,GAAG,CAChB,GAAW,EACX,MAAgB,EAChB,KAAa,EACb,UAAU,GAAG,IAAI,EACjB,EAAE;QACF,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,GAAG,UAAU,CAAA;QAE3C,8BAAO,oBAAA,oBAAA,oBAAA,KAAK;aACT,gBAAgB,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,EAClC,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,EACzD,CAAC,CAAC,EAAE,CACP,GAAG,CAAC,KAAK,CAAC,0BAA0B,EAAE;YACpC,GAAG;YACH,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,QAAQ;YACR,KAAK;YACL,KAAK,EAAE,CAAC,CAAC,MAAM;SAChB,CAAC,CACH,wBACiB,EAAO;IAC7B,CAAC,CAAA;IAED,OAAO,EAAE,SAAS,EAAE,CAAA;GACpB,CAAA;AAGF,MAAM,CAAC,MAAM,WAAW,GAAG,gBAAA,GAAG,EAAe,CAAA;AAC7C,MAAM,CAAC,MAAM,eAAe,GAAG,uBAAa,WAAW,EAAE,WAAW,CAAC,CAAA"}

package/gateway.d.ts

@@ -1,16 +1,16 @@
 import { ConfigWrap } from "dfx/_common";
 import { DiscordConfig, Log } from "dfx";
 export * as CachePrelude from "./Cache/prelude.js";
-export * as DiscordWS from "./DiscordGateway/DiscordWS/index.js";
-export * as Gateway from "./DiscordGateway/index.js";
-export * as Shard from "./DiscordGateway/Shard/index.js";
-export * as ShardStore from "./DiscordGateway/ShardStore/index.js";
-export * as WS from "./DiscordGateway/WS/index.js";
+export * as DiscordWS from "./DiscordGateway/DiscordWS.js";
+export * as Gateway from "./DiscordGateway.js";
+export * as Shard from "./DiscordGateway/Shard.js";
+export * as ShardStore from "./DiscordGateway/ShardStore.js";
+export * as WS from "./DiscordGateway/WS.js";
 export { run as runIx } from "./Interactions/gateway.js";
 export declare const MemoryRateLimit: import("./_common.js").Layer<Log.Log, never, import("dfx").RateLimitStore | import("dfx").RateLimiter>;
 export declare const MemoryREST: import("./_common.js").Layer<DiscordConfig.DiscordConfig | Log.Log, never, import("dfx").DiscordREST>;
-export declare const MemorySharder: import("./_common.js").Layer<DiscordConfig.DiscordConfig | Log.Log, never, import("./DiscordGateway/Sharder/index.js").Sharder>;
-export declare const MemoryGateway: import("./_common.js").Layer<DiscordConfig.DiscordConfig | Log.Log, never, import("./DiscordGateway/index.js").DiscordGateway>;
-export declare const MemoryBot: import("./_common.js").Layer<DiscordConfig.DiscordConfig | Log.Log, never, import("dfx").DiscordREST | import("dfx").RateLimitStore | import("dfx").RateLimiter | import("./DiscordGateway/index.js").DiscordGateway>;
-export declare const make: (config: DiscordConfig.MakeOpts, debug?: boolean) => import("./_common.js").Layer<never, never, import("dfx").DiscordREST | DiscordConfig.DiscordConfig | Log.Log | import("dfx").RateLimitStore | import("dfx").RateLimiter | import("./DiscordGateway/index.js").DiscordGateway>;
-export declare const makeFromConfig: (config: ConfigWrap.Wrap<DiscordConfig.MakeOpts>, debug?: boolean) => import("./_common.js").Layer<never, import("./_common.js").ConfigError, import("dfx").DiscordREST | DiscordConfig.DiscordConfig | Log.Log | import("dfx").RateLimitStore | import("dfx").RateLimiter | import("./DiscordGateway/index.js").DiscordGateway>;
+export declare const MemorySharder: import("./_common.js").Layer<DiscordConfig.DiscordConfig | Log.Log, never, import("./DiscordGateway/Sharder.js").Sharder>;
+export declare const MemoryGateway: import("./_common.js").Layer<DiscordConfig.DiscordConfig | Log.Log, never, import("./DiscordGateway.js").DiscordGateway>;
+export declare const MemoryBot: import("./_common.js").Layer<DiscordConfig.DiscordConfig | Log.Log, never, import("dfx").DiscordREST | import("dfx").RateLimitStore | import("dfx").RateLimiter | import("./DiscordGateway.js").DiscordGateway>;
+export declare const make: (config: DiscordConfig.MakeOpts, debug?: boolean) => import("./_common.js").Layer<never, never, import("dfx").DiscordREST | DiscordConfig.DiscordConfig | Log.Log | import("dfx").RateLimitStore | import("dfx").RateLimiter | import("./DiscordGateway.js").DiscordGateway>;
+export declare const makeFromConfig: (config: ConfigWrap.Wrap<DiscordConfig.MakeOpts>, debug?: boolean) => import("./_common.js").Layer<never, import("./_common.js").ConfigError, import("dfx").DiscordREST | DiscordConfig.DiscordConfig | Log.Log | import("dfx").RateLimitStore | import("dfx").RateLimiter | import("./DiscordGateway.js").DiscordGateway>;

package/gateway.js

@@ -1,21 +1,20 @@
 import * as tsplus_module_1 from "@effect/io/Layer";
 import * as tsplus_module_2 from "dfx/_common";
 import { DiscordConfig, LiveDiscordREST, Log } from "dfx";
-import { LiveJsonDiscordWSCodec } from "./DiscordGateway/DiscordWS/index.js";
-import { LiveDiscordGateway } from "./DiscordGateway/index.js";
-import { LiveSharder } from "./DiscordGateway/Sharder/index.js";
-import { LiveMemoryShardStore } from "./DiscordGateway/ShardStore/index.js";
-import { LiveHttp } from "./Http/index.js";
-import { LiveMemoryRateLimitStore, LiveRateLimiter } from "./RateLimit/index.js";
+import { LiveJsonDiscordWSCodec } from "./DiscordGateway/DiscordWS.js";
+import { LiveDiscordGateway } from "./DiscordGateway.js";
+import { LiveSharder } from "./DiscordGateway/Sharder.js";
+import { LiveMemoryShardStore } from "./DiscordGateway/ShardStore.js";
+import { LiveMemoryRateLimitStore, LiveRateLimiter } from "./RateLimit.js";
 export * as CachePrelude from "./Cache/prelude.js";
-export * as DiscordWS from "./DiscordGateway/DiscordWS/index.js";
-export * as Gateway from "./DiscordGateway/index.js";
-export * as Shard from "./DiscordGateway/Shard/index.js";
-export * as ShardStore from "./DiscordGateway/ShardStore/index.js";
-export * as WS from "./DiscordGateway/WS/index.js";
+export * as DiscordWS from "./DiscordGateway/DiscordWS.js";
+export * as Gateway from "./DiscordGateway.js";
+export * as Shard from "./DiscordGateway/Shard.js";
+export * as ShardStore from "./DiscordGateway/ShardStore.js";
+export * as WS from "./DiscordGateway/WS.js";
 export { run as runIx } from "./Interactions/gateway.js";
 export const MemoryRateLimit = tsplus_module_1.provideMerge(LiveRateLimiter)(LiveMemoryRateLimitStore);
-export const MemoryREST = tsplus_module_1.provide(LiveDiscordREST)((tsplus_module_1.merge(MemoryRateLimit)(LiveHttp)));
+export const MemoryREST = tsplus_module_1.provide(LiveDiscordREST)(MemoryRateLimit);
 export const MemorySharder = tsplus_module_1.provide(LiveSharder)((tsplus_module_1.merge(LiveJsonDiscordWSCodec)(tsplus_module_1.merge(MemoryRateLimit)(tsplus_module_1.merge(LiveMemoryShardStore)(MemoryREST)))));
 export const MemoryGateway = tsplus_module_1.provide(LiveDiscordGateway)(MemorySharder);
 export const MemoryBot = tsplus_module_1.provideMerge(tsplus_module_1.merge(MemoryRateLimit)(MemoryGateway))(MemoryREST);

package/gateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../src/gateway.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,KAAK,CAAA;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAA;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAA;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAA;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEhF,OAAO,KAAK,YAAY,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,SAAS,MAAM,qCAAqC,CAAA;AAChE,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAA;AACpD,OAAO,KAAK,KAAK,MAAM,iCAAiC,CAAA;AACxD,OAAO,KAAK,UAAU,MAAM,sCAAsC,CAAA;AAClE,OAAO,KAAK,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EAAE,GAAG,IAAI,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAExD,MAAM,CAAC,MAAM,eAAe,gCAA8B,eAAe,EAA1C,wBAAwB,CAAkB,CAAA;AAEzE,MAAM,CAAC,MAAM,UAAU,2BAAmC,eAAe,EAA/C,uBAAY,eAAe,EAA1B,QAAQ,EAAmB,CAAmB,CAAA;AAEzE,MAAM,CAAC,MAAM,aAAa,2BAKxB,WAAW,EAJX,uBAGE,sBAAsB,wBADtB,eAAe,wBADf,oBAAoB,EADrB,UAAU,IAGc,CACd,CAAA;AAEb,MAAM,CAAC,MAAM,aAAa,2BAAoB,kBAAkB,EAAnC,aAAa,CAAsB,CAAA;AAEhE,MAAM,CAAC,MAAM,SAAS,sDAAgC,eAAe,EAA/B,aAAa,GAA1B,UAAU,CAAkC,CAAA;AAErE,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,MAA8B,EAAE,KAAK,GAAG,KAAK,EAAE,EAAE;IACpE,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAA;IACtD,MAAM,UAAU,GAAG,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAClD,MAAM,OAAO,gCAA0B,SAAS,wBAAtB,UAAU,EAApB,OAAO,EAAyB,CAAA;IAEhD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,MAA+C,EAC/C,KAAK,GAAG,KAAK,EACb,EAAE;IACF,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAA;IACtD,MAAM,UAAU,GAAG,aAAa,CAAC,cAAc,CAAC,gBAAA,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IAC1E,MAAM,OAAO,gCAA0B,SAAS,wBAAtB,UAAU,EAApB,OAAO,EAAyB,CAAA;IAEhD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}
+{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../src/gateway.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,KAAK,CAAA;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AACrE,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAE1E,OAAO,KAAK,YAAY,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,SAAS,MAAM,+BAA+B,CAAA;AAC1D,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,2BAA2B,CAAA;AAClD,OAAO,KAAK,UAAU,MAAM,gCAAgC,CAAA;AAC5D,OAAO,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,EAAE,GAAG,IAAI,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAExD,MAAM,CAAC,MAAM,eAAe,gCAA8B,eAAe,EAA1C,wBAAwB,CAAkB,CAAA;AAEzE,MAAM,CAAC,MAAM,UAAU,2BAAsB,eAAe,EAAlC,eAAe,CAAmB,CAAA;AAE5D,MAAM,CAAC,MAAM,aAAa,2BAKxB,WAAW,EAJX,uBAGE,sBAAsB,wBADtB,eAAe,wBADf,oBAAoB,EADrB,UAAU,IAGc,CACd,CAAA;AAEb,MAAM,CAAC,MAAM,aAAa,2BAAoB,kBAAkB,EAAnC,aAAa,CAAsB,CAAA;AAEhE,MAAM,CAAC,MAAM,SAAS,sDAAgC,eAAe,EAA/B,aAAa,GAA1B,UAAU,CAAkC,CAAA;AAErE,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,MAA8B,EAAE,KAAK,GAAG,KAAK,EAAE,EAAE;IACpE,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAA;IACtD,MAAM,UAAU,GAAG,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAClD,MAAM,OAAO,gCAA0B,SAAS,wBAAtB,UAAU,EAApB,OAAO,EAAyB,CAAA;IAEhD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,MAA+C,EAC/C,KAAK,GAAG,KAAK,EACb,EAAE;IACF,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAA;IACtD,MAAM,UAAU,GAAG,aAAa,CAAC,cAAc,CAAC,gBAAA,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IAC1E,MAAM,OAAO,gCAA0B,SAAS,wBAAtB,UAAU,EAApB,OAAO,EAAyB,CAAA;IAEhD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}

package/global.d.ts

@@ -13,7 +13,7 @@ import { pipe, flow, identity } from "@fp-ts/core/Function";
 /**
  * @tsplus global
  */
-import { DiscordConfig, RateLimiter, Log, DiscordREST, BucketDetails, FetchError, Http, Intents, Ix, JsonParseError, RateLimitStore, LiveDiscordREST, LiveMemoryRateLimitStore, LiveHttp, LiveRateLimiter, StatusCodeError, Flags, Members, IxHelpers, Perms, } from "dfx";
+import { DiscordConfig, RateLimiter, Log, DiscordREST, BucketDetails, Intents, Ix, RateLimitStore, LiveDiscordREST, LiveMemoryRateLimitStore, LiveRateLimiter, Flags, Members, IxHelpers, Perms, } from "dfx";
 /**
  * @tsplus global
  */

package/index.d.ts

@@ -1,11 +1,10 @@
 export * as Discord from "./types.js";
-export * as DiscordConfig from "./DiscordConfig/index.js";
-export { Http, LiveHttp, FetchError, StatusCodeError, JsonParseError, BlobError, } from "./Http/index.js";
-export { DiscordREST, LiveDiscordREST } from "./DiscordREST/index.js";
+export * as DiscordConfig from "./DiscordConfig.js";
+export { DiscordREST, LiveDiscordREST } from "./DiscordREST.js";
 export * as Ix from "./Interactions/index.js";
-export * as Log from "./Log/index.js";
-export { BucketDetails, RateLimitStore, LiveMemoryRateLimitStore, RateLimiter, LiveRateLimiter, } from "./RateLimit/index.js";
-export * as Cache from "./Cache/index.js";
+export * as Log from "./Log.js";
+export { BucketDetails, RateLimitStore, LiveMemoryRateLimitStore, RateLimiter, LiveRateLimiter, } from "./RateLimit.js";
+export * as Cache from "./Cache.js";
 export * as Flags from "./Helpers/flags.js";
 export * as Intents from "./Helpers/intents.js";
 export * as IxHelpers from "./Helpers/interactions.js";

package/index.js

@@ -1,11 +1,10 @@
 export * as Discord from "./types.js";
-export * as DiscordConfig from "./DiscordConfig/index.js";
-export { Http, LiveHttp, FetchError, StatusCodeError, JsonParseError, BlobError, } from "./Http/index.js";
-export { DiscordREST, LiveDiscordREST } from "./DiscordREST/index.js";
+export * as DiscordConfig from "./DiscordConfig.js";
+export { DiscordREST, LiveDiscordREST } from "./DiscordREST.js";
 export * as Ix from "./Interactions/index.js";
-export * as Log from "./Log/index.js";
-export { RateLimitStore, LiveMemoryRateLimitStore, RateLimiter, LiveRateLimiter, } from "./RateLimit/index.js";
-export * as Cache from "./Cache/index.js";
+export * as Log from "./Log.js";
+export { RateLimitStore, LiveMemoryRateLimitStore, RateLimiter, LiveRateLimiter, } from "./RateLimit.js";
+export * as Cache from "./Cache.js";
 export * as Flags from "./Helpers/flags.js";
 export * as Intents from "./Helpers/intents.js";
 export * as IxHelpers from "./Helpers/interactions.js";

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,YAAY,CAAA;AACrC,OAAO,KAAK,aAAa,MAAM,0BAA0B,CAAA;AACzD,OAAO,EACL,IAAI,EACJ,QAAQ,EACR,UAAU,EACV,eAAe,EACf,cAAc,EACd,SAAS,GACV,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACrE,OAAO,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC7C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AACrC,OAAO,EAEL,cAAc,EACd,wBAAwB,EACxB,WAAW,EACX,eAAe,GAChB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAEzC,OAAO,KAAK,KAAK,MAAM,oBAAoB,CAAA;AAC3C,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,SAAS,MAAM,2BAA2B,CAAA;AACtD,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAA;AACjD,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,YAAY,CAAA;AACrC,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAC/D,OAAO,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC7C,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAC/B,OAAO,EAEL,cAAc,EACd,wBAAwB,EACxB,WAAW,EACX,eAAe,GAChB,MAAM,gBAAgB,CAAA;AACvB,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC,OAAO,KAAK,KAAK,MAAM,oBAAoB,CAAA;AAC3C,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,SAAS,MAAM,2BAA2B,CAAA;AACtD,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAA;AACjD,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.21.22",
+  "version": "0.22.0",
   "type": "module",
   "publishConfig": {
     "access": "public",
@@ -27,16 +27,18 @@
   },
   "devDependencies": {
     "@tim-smart/discord-api-docs-parser": "^0.5.0",
-    "@tsplus-types/effect__data": "0.1.0-cf9876a",
-    "@tsplus-types/effect__io": "0.1.11-cf9876a",
-    "@tsplus-types/effect__stream": "0.3.0-cf9876a",
-    "@tsplus-types/fp-ts__core": "0.2.0-cf9876a",
+    "@tsplus-types/effect__data": "0.1.0-bbebbef",
+    "@tsplus-types/effect__io": "0.1.11-bbebbef",
+    "@tsplus-types/effect__stream": "0.3.0-bbebbef",
+    "@tsplus-types/fp-ts__core": "0.2.1-bbebbef",
+    "@tsplus-types/fp-ts__schema": "0.1.3-bbebbef",
     "@types/ws": "^8.5.4",
     "dotenv": "^16.0.3",
     "lerna": "^6.4.1",
     "typescript": "https://cdn.jsdelivr.net/npm/@tsplus/installer@0.0.168/compiler/typescript.tgz"
   },
   "dependencies": {
+    "@effect-http/client": "^0.1.16",
     "@effect/data": "^0.1.0",
     "@effect/io": "~0.1.11",
     "@effect/stream": "~0.3.0",
@@ -50,5 +52,5 @@
     "ws": "^8.12.0"
   },
   "sideEffects": false,
-  "gitHead": "b5361fa2d065bd8ff77d0055c495e47f4995be37"
+  "gitHead": "f55e7b932853fcca59ed727bf537f53d06d14ca2"
 }