dfx 0.42.8 → 0.43.0

package/DiscordConfig.d.ts

@@ -1,6 +1,7 @@
 import { ConfigSecret, Duration, Discord, Config } from "dfx/_common";
 export interface DiscordConfig {
     token: ConfigSecret;
+    debug: boolean;
     rest: {
         baseUrl: string;
         globalRateLimit: {
@@ -18,9 +19,10 @@ export interface DiscordConfig {
 export declare const DiscordConfig: import("@effect/data/Context").Tag<DiscordConfig, DiscordConfig>;
 export interface MakeOpts {
     token: ConfigSecret;
+    debug?: boolean;
     rest?: Partial<DiscordConfig["rest"]>;
     gateway?: Partial<DiscordConfig["gateway"]>;
 }
-export declare const make: ({ token, rest, gateway }: MakeOpts) => DiscordConfig;
+export declare const make: ({ token, debug, rest, gateway, }: MakeOpts) => DiscordConfig;
 export declare const makeLayer: (a_0: MakeOpts) => import("@effect-http/client/_common").Layer<never, never, DiscordConfig>;
 export declare const makeFromConfig: (_: Config.Wrap<MakeOpts>) => import("@effect-http/client/_common").Layer<never, import("./_common.js").ConfigError, DiscordConfig>;

package/DiscordConfig.js

@@ -6,8 +6,9 @@ import * as tsplus_module_5 from "@effect/io/Config";
 import * as tsplus_module_6 from "@effect/io/Effect";
 const VERSION = 10;
 export const DiscordConfig = tsplus_module_1.Tag();
-export const make = ({ token, rest, gateway }) => ({
+export const make = ({ token, debug = false, rest, gateway, }) => ({
     token,
+    debug,
     rest: {
         baseUrl: `https://discord.com/api/v${VERSION}`,
         ...(rest ?? {}),

package/DiscordConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"DiscordConfig.js","sourceRoot":"","sources":["src/DiscordConfig.ts"],"names":[],"mappings":";;;;;;AAAA,MAAM,OAAO,GAAG,EAAE,CAAA;AAmBlB,MAAM,CAAC,MAAM,aAAa,GAAG,gBAAA,GAAG,EAAiB,CAAA;AAQjD,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAY,EAAiB,EAAE,CAAC,CAAC;IAC1E,KAAK;IACL,IAAI,EAAE;QACJ,OAAO,EAAE,4BAA4B,OAAO,EAAE;QAC9C,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;QACf,eAAe,EAAE;YACf,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,wBAAiB,CAAC,CAAC;YAC3B,GAAG,CAAC,IAAI,EAAE,eAAe,IAAI,EAAE,CAAC;SACjC;KACF;IACD,OAAO,EAAE;QACP,OAAO,EAAE,gBAAA,OAAO,CAAC,cAAc,CAAC,MAAM;QACtC,iBAAiB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5B,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;KACnB;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,gBAAA,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,wBAAc,aAAa,EAAE,CAAC,CAAC,CAAC,CAAA;AACzE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAwB,EAAE,EAAE,CACzD,wBAAA,2CAAA,uBAAc,CAAC,CAAC,GAAY,IAAI,CAAC,EAAS,aAAa,CAAC,CAAA"}
+{"version":3,"file":"DiscordConfig.js","sourceRoot":"","sources":["src/DiscordConfig.ts"],"names":[],"mappings":";;;;;;AAAA,MAAM,OAAO,GAAG,EAAE,CAAA;AAoBlB,MAAM,CAAC,MAAM,aAAa,GAAG,gBAAA,GAAG,EAAiB,CAAA;AASjD,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EACnB,KAAK,EACL,KAAK,GAAG,KAAK,EACb,IAAI,EACJ,OAAO,GACE,EAAiB,EAAE,CAAC,CAAC;IAC9B,KAAK;IACL,KAAK;IACL,IAAI,EAAE;QACJ,OAAO,EAAE,4BAA4B,OAAO,EAAE;QAC9C,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;QACf,eAAe,EAAE;YACf,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,wBAAiB,CAAC,CAAC;YAC3B,GAAG,CAAC,IAAI,EAAE,eAAe,IAAI,EAAE,CAAC;SACjC;KACF;IACD,OAAO,EAAE;QACP,OAAO,EAAE,gBAAA,OAAO,CAAC,cAAc,CAAC,MAAM;QACtC,iBAAiB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5B,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;KACnB;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,gBAAA,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,wBAAc,aAAa,EAAE,CAAC,CAAC,CAAC,CAAA;AACzE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAwB,EAAE,EAAE,CACzD,wBAAA,2CAAA,uBAAc,CAAC,CAAC,GAAY,IAAI,CAAC,EAAS,aAAa,CAAC,CAAA"}

package/DiscordGateway/Shard.d.ts

@@ -2,10 +2,10 @@ import { Hub, Discord, Effect } from "dfx/_common";
 import { DiscordConfig } from "dfx/DiscordConfig";
 import { RateLimiter } from "dfx/RateLimit";
 import { DiscordWS } from "./DiscordWS.js";
-export declare const make: import("@effect/io/Effect").Effect<DiscordConfig | RateLimiter | DiscordWS, never, {
+import { Log } from "dfx/Log";
+export declare const make: import("@effect/io/Effect").Effect<DiscordConfig | Log | RateLimiter | DiscordWS, never, {
     readonly connect: (shard: [id: number, count: number], hub: Hub<Discord.GatewayPayload<Discord.ReceiveEvent>>) => import("@effect/io/Effect").Effect<never, never, {
         readonly run: import("@effect/io/Effect").Effect<never, import("./WS.js").WebSocketError | import("./WS.js").WebSocketCloseError, never>;
-        readonly connected: import("@effect/io/Effect").Effect<never, never, boolean>;
         readonly send: (p: Discord.GatewayPayload) => import("@effect/io/Effect").Effect<never, never, boolean>;
         readonly reconnect: import("@effect/io/Effect").Effect<never, never, boolean>;
     }>;
@@ -13,4 +13,4 @@ export declare const make: import("@effect/io/Effect").Effect<DiscordConfig | Ra
 export interface Shard extends Effect.Success<typeof make> {
 }
 export declare const Shard: import("@effect/data/Context").Tag<Shard, Shard>;
-export declare const LiveShard: import("@effect-http/client/_common").Layer<DiscordConfig | import("../Log.js").Log | import("dfx/RateLimit").RateLimitStore | import("./DiscordWS.js").DiscordWSCodec, never, Shard>;
+export declare const LiveShard: import("@effect-http/client/_common").Layer<DiscordConfig | Log | import("dfx/RateLimit").RateLimitStore | import("./DiscordWS.js").DiscordWSCodec, never, Shard>;

package/DiscordGateway/Shard.js

@@ -1,10 +1,10 @@
-import * as tsplus_module_1 from "@effect/io/Ref";
-import * as tsplus_module_2 from "@effect/io/Effect";
-import * as tsplus_module_3 from "dfx/_common";
-import * as tsplus_module_4 from "@effect/io/Config/Secret";
-import * as tsplus_module_5 from "@effect/io/Queue";
-import * as tsplus_module_6 from "@effect/data/Option";
-import * as tsplus_module_7 from "@effect/data/Chunk";
+import * as tsplus_module_1 from "@effect/io/Effect";
+import * as tsplus_module_2 from "dfx/_common";
+import * as tsplus_module_3 from "@effect/io/Config/Secret";
+import * as tsplus_module_4 from "@effect/io/Queue";
+import * as tsplus_module_5 from "@effect/data/Option";
+import * as tsplus_module_6 from "@effect/data/Chunk";
+import * as tsplus_module_7 from "@effect/io/Ref";
 import * as tsplus_module_8 from "@effect/data/Duration";
 import * as tsplus_module_9 from "@effect/io/Layer";
 import { DiscordConfig } from "dfx/DiscordConfig";
@@ -15,57 +15,63 @@ import * as Identify from "./Shard/identify.js";
 import * as InvalidSession from "./Shard/invalidSession.js";
 import * as Utils from "./Shard/utils.js";
 import { Reconnect } from "./WS.js";
-export const make = tsplus_module_2.flatMap(DiscordConfig, ({ token, gateway }) => tsplus_module_2.flatMap(RateLimiter, limiter => tsplus_module_2.map(DiscordWS, dws => {
-    const connect = (shard, hub) => tsplus_module_2.flatMap(tsplus_module_5.unbounded(), outboundQueue => tsplus_module_2.flatMap(tsplus_module_5.unbounded(), pendingQueue => tsplus_module_2.flatMap(tsplus_module_1.make(true), connecting => {
-        const outbound = tsplus_module_2.tap(outboundQueue
+import { Log } from "dfx/Log";
+export const make = tsplus_module_1.flatMap(DiscordConfig, ({ token, gateway }) => tsplus_module_1.flatMap(RateLimiter, limiter => tsplus_module_1.flatMap(DiscordWS, dws => tsplus_module_1.map(Log, log => {
+    const connect = (shard, hub) => tsplus_module_1.flatMap(tsplus_module_4.unbounded(), outboundQueue => tsplus_module_1.flatMap(tsplus_module_4.unbounded(), pendingQueue => tsplus_module_1.flatMap(tsplus_module_7.make(0 /* Phase.Connecting */), phase => {
+        const setPhase = (p) => tsplus_module_1.zipLeft(tsplus_module_7.set(phase, p), log.debug("Shard", shard, "phase", p));
+        const outbound = tsplus_module_1.tap(outboundQueue
             .take(), () => limiter.maybeWait("dfx.shard.send", tsplus_module_8.minutes(1), 120));
-        const send = (p) => tsplus_module_2.flatMap(tsplus_module_1.get(connecting), _ => _ ? pendingQueue.offer(p) : outboundQueue.offer(p));
+        const send = (p) => tsplus_module_1.flatMap(tsplus_module_7.get(phase), _ => _ === 2 /* Phase.Connected */
+            ? outboundQueue.offer(p)
+            : pendingQueue.offer(p));
+        const heartbeatSend = (p) => tsplus_module_1.flatMap(tsplus_module_7.get(phase), _ => _ !== 0 /* Phase.Connecting */
+            ? outboundQueue.offer(p)
+            : tsplus_module_1.succeed(false));
         const prioritySend = (p) => outboundQueue.offer(p);
-        const resume = tsplus_module_2.asUnit(tsplus_module_2.tap(tsplus_module_2.zipRight(tsplus_module_1.set(connecting, false), pendingQueue.takeAll()), _ => outboundQueue.offerAll(_)));
-        const onReconnect = tsplus_module_2.zipRight(tsplus_module_2.tap(outboundQueue
-            .takeAll(), _ => pendingQueue.offerAll(tsplus_module_7.filter(_, msg => msg !== Reconnect &&
+        const resume = tsplus_module_1.asUnit(tsplus_module_1.tap(tsplus_module_1.zipRight(setPhase(2 /* Phase.Connected */), pendingQueue.takeAll()), _ => outboundQueue.offerAll(_)));
+        const onReconnect = tsplus_module_1.zipRight(tsplus_module_1.tap(outboundQueue
+            .takeAll(), _ => pendingQueue.offerAll(tsplus_module_6.filter(_, msg => msg !== Reconnect &&
             msg.op !== 2 /* Discord.GatewayOpcode.IDENTIFY */ &&
             msg.op !== 6 /* Discord.GatewayOpcode.RESUME */ &&
-            msg.op !== 1 /* Discord.GatewayOpcode.HEARTBEAT */))), tsplus_module_1.set(connecting, true));
-        return tsplus_module_2.flatMap(dws.connect({ outbound, onReconnect }), socket => tsplus_module_2.flatMap(Utils.latest(p => tsplus_module_6.map(tsplus_module_6.filter((p) => p.op === 0 /* Discord.GatewayOpcode.DISPATCH */ && p.t === "READY")(tsplus_module_6.some(p)), p => p.d)), ([latestReady, updateLatestReady]) => tsplus_module_2.flatMap(Utils.latest(p => tsplus_module_6.fromNullable(p.s)), ([latestSequence, updateLatestSequence]) => {
-            const maybeUpdateUrl = (p) => tsplus_module_6.match(tsplus_module_6.map(tsplus_module_6.filter((p) => p.op === 0 /* Discord.GatewayOpcode.DISPATCH */ && p.t === "READY")(tsplus_module_6.some(p)), p => p.d), () => tsplus_module_2.unit(), a => socket.setUrl(a.resume_gateway_url));
-            return tsplus_module_2.flatMap(tsplus_module_5.unbounded(), hellos => tsplus_module_2.map(tsplus_module_5.unbounded(), acks => {
+            msg.op !== 1 /* Discord.GatewayOpcode.HEARTBEAT */))), setPhase(0 /* Phase.Connecting */));
+        return tsplus_module_1.flatMap(dws.connect({ outbound, onReconnect }), socket => tsplus_module_1.flatMap(Utils.latest(p => tsplus_module_5.map(tsplus_module_5.filter((p) => p.op === 0 /* Discord.GatewayOpcode.DISPATCH */ && p.t === "READY")(tsplus_module_5.some(p)), p => p.d)), ([latestReady, updateLatestReady]) => tsplus_module_1.flatMap(Utils.latest(p => tsplus_module_5.fromNullable(p.s)), ([latestSequence, updateLatestSequence]) => {
+            const maybeUpdateUrl = (p) => tsplus_module_5.match(tsplus_module_5.map(tsplus_module_5.filter((p) => p.op === 0 /* Discord.GatewayOpcode.DISPATCH */ && p.t === "READY")(tsplus_module_5.some(p)), p => p.d), () => tsplus_module_1.unit(), a => socket.setUrl(a.resume_gateway_url));
+            return tsplus_module_1.flatMap(tsplus_module_4.unbounded(), hellos => tsplus_module_1.map(tsplus_module_4.unbounded(), acks => {
                 // heartbeats
-                const heartbeats = Heartbeats.send(hellos, acks, latestSequence, send);
+                const heartbeats = Heartbeats.send(hellos, acks, latestSequence, heartbeatSend);
                 // identify
                 const identify = Identify.identifyOrResume({
-                    token: tsplus_module_4.value(token),
+                    token: tsplus_module_3.value(token),
                     shard,
                     intents: gateway.intents,
                     presence: gateway.presence,
                 }, latestReady, latestSequence);
-                const onPayload = (p) => tsplus_module_2.flatMap(tsplus_module_2.zipPar(tsplus_module_2.zipPar(updateLatestReady(p), updateLatestSequence(p)), maybeUpdateUrl(p)), () => {
-                    let effect = tsplus_module_2.unit();
+                const onPayload = (p) => tsplus_module_1.flatMap(tsplus_module_1.zipPar(tsplus_module_1.zipPar(updateLatestReady(p), updateLatestSequence(p)), maybeUpdateUrl(p)), () => {
+                    let effect = tsplus_module_1.unit();
                     switch (p.op) {
                         case 10 /* Discord.GatewayOpcode.HELLO */:
-                            effect = tsplus_module_2.zipPar(tsplus_module_2.tap(identify, prioritySend), hellos.offer(p));
+                            effect = tsplus_module_1.zipPar(tsplus_module_1.tap(identify, prioritySend), tsplus_module_1.zipRight(setPhase(1 /* Phase.Handshake */), hellos.offer(p)));
                             break;
                         case 11 /* Discord.GatewayOpcode.HEARTBEAT_ACK */:
                             effect = acks.offer(p);
                             break;
                         case 9 /* Discord.GatewayOpcode.INVALID_SESSION */:
-                            effect = tsplus_module_2.tap(InvalidSession.fromPayload(p, latestReady), send);
+                            effect = tsplus_module_1.tap(InvalidSession.fromPayload(p, latestReady), send);
                             break;
                         case 0 /* Discord.GatewayOpcode.DISPATCH */:
                             if (p.t === "READY" || p.t === "RESUMED") {
-                                effect = tsplus_module_2.zipRight(resume, hub.publish(p));
+                                effect = tsplus_module_1.zipRight(resume, hub.publish(p));
                             }
                             else {
                                 effect = hub.publish(p);
                             }
                             break;
                     }
-                    return tsplus_module_2.map(effect, () => void 0);
+                    return tsplus_module_1.map(effect, () => void 0);
                 });
-                const run = tsplus_module_2.zipParLeft(tsplus_module_2.zipParLeft(tsplus_module_2.forever(tsplus_module_2.flatMap(socket.take, onPayload)), heartbeats), socket.run);
+                const run = tsplus_module_1.zipParLeft(tsplus_module_1.zipParLeft(tsplus_module_1.forever(tsplus_module_1.flatMap(socket.take, onPayload)), heartbeats), socket.run);
                 return {
                     run,
-                    connected: tsplus_module_1.get(connecting),
                     send: (p) => send(p),
                     reconnect: send(Reconnect),
                 };
@@ -73,7 +79,7 @@ export const make = tsplus_module_2.flatMap(DiscordConfig, ({ token, gateway })
         })));
     })));
     return { connect };
-})));
-export const Shard = tsplus_module_3.Tag();
-export const LiveShard = tsplus_module_9.provide(tsplus_module_2.toLayer(make, Shard))((tsplus_module_9.merge(LiveRateLimiter)(LiveDiscordWS)));
+}))));
+export const Shard = tsplus_module_2.Tag();
+export const LiveShard = tsplus_module_9.provide(tsplus_module_1.toLayer(make, Shard))((tsplus_module_9.merge(LiveRateLimiter)(LiveDiscordWS)));
 //# sourceMappingURL=Shard.js.map

package/DiscordGateway/Shard.js.map

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

package/DiscordGateway/WS.js

@@ -1,8 +1,9 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
 import * as tsplus_module_2 from "@effect/io/Ref";
-import * as tsplus_module_3 from "@effect/data/Duration";
-import * as tsplus_module_4 from "@effect/io/Queue";
-import * as tsplus_module_5 from "dfx/_common";
+import * as tsplus_module_3 from "@effect/io/Runtime";
+import * as tsplus_module_4 from "@effect/data/Duration";
+import * as tsplus_module_5 from "@effect/io/Queue";
+import * as tsplus_module_6 from "dfx/_common";
 import { Log } from "dfx/Log";
 import WebSocket from "isomorphic-ws";
 export const Reconnect = Symbol();
@@ -30,9 +31,11 @@ const socket = (urlRef) => tsplus_module_1.acquireRelease(tsplus_module_1.map(ts
     ws.removeAllListeners?.();
     ws.close();
 }));
-const offer = (ws, queue, log) => tsplus_module_1.async(resume => {
+const offer = (ws, queue, log) => tsplus_module_1.flatMap(tsplus_module_1.runtime(), runtime => tsplus_module_1.async(resume => {
+    const run = tsplus_module_3.runFork(runtime);
     ws.addEventListener("message", message => {
-        tsplus_module_1.runFork(tsplus_module_1.zipLeft(queue.offer(message.data), log.debug("WS", "offer", message.data)));
+        run(tsplus_module_1.zipLeft(queue
+            .offer(message.data), log.debug("WS", "offer", message.data)));
     });
     ws.addEventListener("error", cause => {
         resume(tsplus_module_1.fail(new WebSocketError("error", cause)));
@@ -40,7 +43,7 @@ const offer = (ws, queue, log) => tsplus_module_1.async(resume => {
     ws.addEventListener("close", e => {
         resume(tsplus_module_1.fail(new WebSocketCloseError(e.code, e.reason)));
     });
-});
+}));
 const waitForOpen = (ws, timeout) => tsplus_module_1.timeoutFail(tsplus_module_1.suspend(() => {
     if (ws.readyState === WebSocket.OPEN) {
         return tsplus_module_1.unit();
@@ -63,12 +66,12 @@ const send = (ws, take, log) => tsplus_module_1.forever(tsplus_module_1.tap(tspl
     });
 }));
 const make = tsplus_module_1.map(Log, log => {
-    const connect = (url, takeOutbound, onReconnect = tsplus_module_1.unit(), openTimeout = tsplus_module_3.seconds(3)) => tsplus_module_1.map(tsplus_module_4.unbounded(), queue => {
+    const connect = (url, takeOutbound, onReconnect = tsplus_module_1.unit(), openTimeout = tsplus_module_4.seconds(3)) => tsplus_module_1.map(tsplus_module_5.unbounded(), queue => {
         const run = tsplus_module_1.retryWhile(tsplus_module_1.tapError(tsplus_module_1.scoped(tsplus_module_1.flatMap(socket(url), ws => tsplus_module_1.zipParLeft(offer(ws, queue, log), tsplus_module_1.zipRight(waitForOpen(ws, openTimeout), send(ws, takeOutbound, log))))), _ => (isReconnect(_) ? onReconnect : tsplus_module_1.unit())), isReconnect);
         return { run, take: queue.take() };
     });
     return { connect };
 });
-export const WS = tsplus_module_5.Tag();
+export const WS = tsplus_module_6.Tag();
 export const LiveWS = tsplus_module_1.toLayer(make, WS);
 //# sourceMappingURL=WS.js.map

package/DiscordGateway/WS.js.map

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

package/gateway.d.ts

@@ -9,5 +9,5 @@ export * as WS from "./DiscordGateway/WS.js";
 export { run as runIx } from "./Interactions/gateway.js";
 export declare const MemoryRateLimit: import("@effect-http/client/_common").Layer<Log.Log, never, import("dfx").RateLimiter>;
 export declare const MemoryBot: import("@effect-http/client/_common").Layer<DiscordConfig.DiscordConfig | Log.Log | import("@effect-http/client").HttpRequestExecutor, never, import("dfx").DiscordREST | import("dfx").RateLimiter | import("./DiscordGateway.js").DiscordGateway>;
-export declare const makeLiveWithoutFetch: (config: Config.Wrap<DiscordConfig.MakeOpts>, debug?: boolean) => import("@effect-http/client/_common").Layer<import("@effect-http/client").HttpRequestExecutor, import("./_common.js").ConfigError, import("dfx").DiscordREST | DiscordConfig.DiscordConfig | Log.Log | import("dfx").RateLimiter | import("./DiscordGateway.js").DiscordGateway>;
-export declare const makeLive: (config: Config.Wrap<DiscordConfig.MakeOpts>, debug?: boolean) => import("@effect-http/client/_common").Layer<never, import("./_common.js").ConfigError, import("dfx").DiscordREST | DiscordConfig.DiscordConfig | Log.Log | import("dfx").RateLimiter | import("./DiscordGateway.js").DiscordGateway>;
+export declare const makeLiveWithoutFetch: (config: Config.Wrap<DiscordConfig.MakeOpts>) => import("@effect-http/client/_common").Layer<import("@effect-http/client").HttpRequestExecutor, import("./_common.js").ConfigError, import("dfx").DiscordREST | DiscordConfig.DiscordConfig | Log.Log | import("dfx").RateLimiter | import("./DiscordGateway.js").DiscordGateway>;
+export declare const makeLive: (config: Config.Wrap<DiscordConfig.MakeOpts>) => import("@effect-http/client/_common").Layer<never, import("./_common.js").ConfigError, import("dfx").DiscordREST | DiscordConfig.DiscordConfig | Log.Log | import("dfx").RateLimiter | import("./DiscordGateway.js").DiscordGateway>;

package/gateway.js

@@ -1,5 +1,6 @@
 import * as tsplus_module_1 from "@effect/io/Layer";
 import * as tsplus_module_2 from "@effect/io/Config";
+import * as tsplus_module_3 from "@effect/io/Effect";
 import { LiveFetchRequestExecutor } from "@effect-http/client";
 import { DiscordConfig, LiveDiscordREST, Log } from "dfx";
 import { LiveDiscordGateway } from "./DiscordGateway.js";
@@ -15,13 +16,10 @@ export * as WS from "./DiscordGateway/WS.js";
 export { run as runIx } from "./Interactions/gateway.js";
 export const MemoryRateLimit = tsplus_module_1.provide(LiveRateLimiter)(LiveMemoryRateLimitStore);
 export const MemoryBot = tsplus_module_1.provide((tsplus_module_1.merge(MemoryRateLimit)((tsplus_module_1.provideMerge(LiveDiscordGateway)(LiveDiscordREST)))))((tsplus_module_1.merge(LiveJsonDiscordWSCodec)(tsplus_module_1.merge(LiveMemoryRateLimitStore)(LiveMemoryShardStore))));
-export const makeLiveWithoutFetch = (config, debug = false) => {
-    const LiveLog = debug ? Log.LiveLogDebug : Log.LiveLog;
-    const LiveConfig = DiscordConfig.makeFromConfig(tsplus_module_2.unwrap(config));
-    const LiveEnv = tsplus_module_1.provideMerge(MemoryBot)(tsplus_module_1.merge(LiveConfig)(LiveLog));
-    return LiveEnv;
-};
-export const makeLive = (config, debug = false) => {
-    return tsplus_module_1.provide(makeLiveWithoutFetch(config, debug))(LiveFetchRequestExecutor);
-};
+export const makeLiveWithoutFetch = (config) => tsplus_module_1.unwrapEffect(tsplus_module_3.map(tsplus_module_3.map(tsplus_module_3.config(tsplus_module_2.unwrap(config)), DiscordConfig.make), config => {
+    const LiveLog = config.debug ? Log.LiveLogDebug : Log.LiveLog;
+    const LiveConfig = tsplus_module_1.succeed(DiscordConfig.DiscordConfig, config);
+    return tsplus_module_1.provideMerge(MemoryBot)(tsplus_module_1.merge(LiveConfig)(LiveLog));
+}));
+export const makeLive = (config) => tsplus_module_1.provide(makeLiveWithoutFetch(config))(LiveFetchRequestExecutor);
 //# sourceMappingURL=gateway.js.map

package/gateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.js","sourceRoot":"","sources":["src/gateway.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,KAAK,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AACtE,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,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,KAAK,SAAS,MAAM,+BAA+B,CAAA;AAC1D,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,2BAA+B,eAAe,EAA3C,wBAAwB,CAAmB,CAAA;AAE1E,MAAM,CAAC,MAAM,SAAS,2BAEpB,uBAA0C,eAAe,EAAxD,8BAAmB,kBAAkB,EAApC,eAAe,EAAsB,EAAmB,EAD1D,uBAAmD,sBAAsB,wBAAjD,wBAAwB,EAA/C,oBAAoB,GAAqD,CAChB,CAAA;AAE5D,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,MAA2C,EAC3C,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,uBAAc,MAAM,CAAC,CAAC,CAAA;IACtE,MAAM,OAAO,gCAA0B,SAAS,wBAAtB,UAAU,EAApB,OAAO,EAAyB,CAAA;IAEhD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,MAA2C,EAC3C,KAAK,GAAG,KAAK,EACb,EAAE;IACF,+BAAmC,oBAAoB,CAAC,MAAM,EAAE,KAAK,CAAC,EAA/D,wBAAwB,EAAuC;AACxE,CAAC,CAAA"}
+{"version":3,"file":"gateway.js","sourceRoot":"","sources":["src/gateway.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,KAAK,CAAA;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AACtE,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,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,KAAK,SAAS,MAAM,+BAA+B,CAAA;AAC1D,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,2BAA+B,eAAe,EAA3C,wBAAwB,CAAmB,CAAA;AAE1E,MAAM,CAAC,MAAM,SAAS,2BAEpB,uBAA0C,eAAe,EAAxD,8BAAmB,kBAAkB,EAApC,eAAe,EAAsB,EAAmB,EAD1D,uBAAmD,sBAAsB,wBAAjD,wBAAwB,EAA/C,oBAAoB,GAAqD,CAChB,CAAA;AAE5D,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,MAA2C,EAC3C,EAAE,CACF,6BACE,oBAAA,2CAAA,uBAAc,MAAM,CAAC,GACP,aAAa,CAAC,IAAI,CAAC,EAC1B,MAAM,CAAC,EAAE;IACZ,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAA;IAC7D,MAAM,UAAU,GAAG,wBAAc,aAAa,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IACrE,oCAA8B,SAAS,wBAAtB,UAAU,EAApB,OAAO,GAAyB;AACzC,CAAC,CAAC,CACL,CAAA;AAEH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,MAA2C,EAAE,EAAE,yBAC1C,oBAAoB,CAAC,MAAM,CAAC,EAAxD,wBAAwB,CAAgC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dfx",
-    "version": "0.42.8",
+    "version": "0.43.0",
     "type": "module",
     "publishConfig": {
         "access": "public",
@@ -26,7 +26,7 @@
     "devDependencies": {
         "@tim-smart/discord-api-docs-parser": "^0.5.2",
         "@tsplus-types/effect__data": "0.12.2-3b576ba",
-        "@tsplus-types/effect__io": "0.25.8-3b576ba",
+        "@tsplus-types/effect__io": "0.25.8-11739c0",
         "@tsplus-types/effect__stream": "0.21.1-3b576ba",
         "@types/ws": "^8.5.4",
         "dotenv": "^16.0.3",
@@ -48,5 +48,5 @@
         "ws": "^8.13.0"
     },
     "sideEffects": false,
-    "gitHead": "ef6ca3dc83354e9ac53922de77a582957a94ee61"
+    "gitHead": "eb969e6b2d8ac1c0a5ab877898feae57728b5e3c"
 }

package/src/DiscordConfig.ts

@@ -2,6 +2,7 @@ const VERSION = 10
 
 export interface DiscordConfig {
   token: ConfigSecret
+  debug: boolean
   rest: {
     baseUrl: string
     globalRateLimit: {
@@ -21,12 +22,19 @@ export const DiscordConfig = Tag<DiscordConfig>()
 
 export interface MakeOpts {
   token: ConfigSecret
+  debug?: boolean
   rest?: Partial<DiscordConfig["rest"]>
   gateway?: Partial<DiscordConfig["gateway"]>
 }
 
-export const make = ({ token, rest, gateway }: MakeOpts): DiscordConfig => ({
+export const make = ({
   token,
+  debug = false,
+  rest,
+  gateway,
+}: MakeOpts): DiscordConfig => ({
+  token,
+  debug,
   rest: {
     baseUrl: `https://discord.com/api/v${VERSION}`,
     ...(rest ?? {}),

package/src/DiscordGateway/Shard.ts

@@ -6,11 +6,19 @@ import * as Identify from "./Shard/identify.js"
 import * as InvalidSession from "./Shard/invalidSession.js"
 import * as Utils from "./Shard/utils.js"
 import { Reconnect } from "./WS.js"
+import { Log } from "dfx/Log"
+
+const enum Phase {
+  Connecting,
+  Handshake,
+  Connected,
+}
 
 export const make = Do($ => {
   const { token, gateway } = $(DiscordConfig)
   const limiter = $(RateLimiter)
   const dws = $(DiscordWS)
+  const log = $(Log)
 
   const connect = (
     shard: [id: number, count: number],
@@ -19,7 +27,9 @@ export const make = Do($ => {
     Do($ => {
       const outboundQueue = $(Queue.unbounded<Message>())
       const pendingQueue = $(Queue.unbounded<Message>())
-      const connecting = $(Ref.make(true))
+      const phase = $(Ref.make(Phase.Connecting))
+      const setPhase = (p: Phase) =>
+        phase.set(p).zipLeft(log.debug("Shard", shard, "phase", p))
       const outbound = outboundQueue
         .take()
         .tap(() =>
@@ -27,14 +37,22 @@ export const make = Do($ => {
         )
 
       const send = (p: Message) =>
-        connecting.get.flatMap(_ =>
-          _ ? pendingQueue.offer(p) : outboundQueue.offer(p),
+        phase.get.flatMap(_ =>
+          _ === Phase.Connected
+            ? outboundQueue.offer(p)
+            : pendingQueue.offer(p),
+        )
+
+      const heartbeatSend = (p: Message) =>
+        phase.get.flatMap(_ =>
+          _ !== Phase.Connecting
+            ? outboundQueue.offer(p)
+            : Effect.succeed(false),
         )
 
       const prioritySend = (p: Message) => outboundQueue.offer(p)
 
-      const resume = connecting
-        .set(false)
+      const resume = setPhase(Phase.Connected)
         .zipRight(pendingQueue.takeAll())
         .tap(_ => outboundQueue.offerAll(_)).asUnit
 
@@ -51,7 +69,7 @@ export const make = Do($ => {
             ),
           ),
         )
-        .zipRight(connecting.set(true))
+        .zipRight(setPhase(Phase.Connecting))
 
       const socket = $(dws.connect({ outbound, onReconnect }))
 
@@ -84,7 +102,12 @@ export const make = Do($ => {
       const acks = $(Queue.unbounded<Discord.GatewayPayload>())
 
       // heartbeats
-      const heartbeats = Heartbeats.send(hellos, acks, latestSequence, send)
+      const heartbeats = Heartbeats.send(
+        hellos,
+        acks,
+        latestSequence,
+        heartbeatSend,
+      )
 
       // identify
       const identify = Identify.identifyOrResume(
@@ -110,7 +133,9 @@ export const make = Do($ => {
 
           switch (p.op) {
             case Discord.GatewayOpcode.HELLO:
-              effect = identify.tap(prioritySend).zipPar(hellos.offer(p))
+              effect = identify
+                .tap(prioritySend)
+                .zipPar(setPhase(Phase.Handshake).zipRight(hellos.offer(p)))
               break
             case Discord.GatewayOpcode.HEARTBEAT_ACK:
               effect = acks.offer(p)
@@ -137,7 +162,6 @@ export const make = Do($ => {
 
       return {
         run,
-        connected: connecting.get,
         send: (p: Discord.GatewayPayload) => send(p),
         reconnect: send(Reconnect),
       } as const

package/src/DiscordGateway/WS.ts

@@ -38,20 +38,26 @@ const offer = (
   queue: Enqueue<WebSocket.Data>,
   log: Log,
 ) =>
-  Effect.async<never, WebSocketError | WebSocketCloseError, never>(resume => {
-    ws.addEventListener("message", message => {
-      queue.offer(message.data).zipLeft(log.debug("WS", "offer", message.data))
-        .runFork
-    })
+  Effect.runtime<never>().flatMap(runtime =>
+    Effect.async<never, WebSocketError | WebSocketCloseError, never>(resume => {
+      const run = runtime.runFork
+      ws.addEventListener("message", message => {
+        run(
+          queue
+            .offer(message.data)
+            .zipLeft(log.debug("WS", "offer", message.data)),
+        )
+      })
 
-    ws.addEventListener("error", cause => {
-      resume(Effect.fail(new WebSocketError("error", cause)))
-    })
+      ws.addEventListener("error", cause => {
+        resume(Effect.fail(new WebSocketError("error", cause)))
+      })
 
-    ws.addEventListener("close", e => {
-      resume(Effect.fail(new WebSocketCloseError(e.code, e.reason)))
-    })
-  })
+      ws.addEventListener("close", e => {
+        resume(Effect.fail(new WebSocketCloseError(e.code, e.reason)))
+      })
+    }),
+  )
 
 const waitForOpen = (ws: globalThis.WebSocket, timeout: Duration) =>
   Effect.suspend(() => {

package/src/gateway.ts

@@ -21,18 +21,16 @@ export const MemoryBot =
 
 export const makeLiveWithoutFetch = (
   config: Config.Wrap<DiscordConfig.MakeOpts>,
-  debug = false,
-) => {
-  const LiveLog = debug ? Log.LiveLogDebug : Log.LiveLog
-  const LiveConfig = DiscordConfig.makeFromConfig(Config.unwrap(config))
-  const LiveEnv = LiveLog + LiveConfig > MemoryBot
+) =>
+  Layer.unwrapEffect(
+    Config.unwrap(config)
+      .config.map(DiscordConfig.make)
+      .map(config => {
+        const LiveLog = config.debug ? Log.LiveLogDebug : Log.LiveLog
+        const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config)
+        return LiveLog + LiveConfig > MemoryBot
+      }),
+  )
 
-  return LiveEnv
-}
-
-export const makeLive = (
-  config: Config.Wrap<DiscordConfig.MakeOpts>,
-  debug = false,
-) => {
-  return LiveFetchRequestExecutor >> makeLiveWithoutFetch(config, debug)
-}
+export const makeLive = (config: Config.Wrap<DiscordConfig.MakeOpts>) =>
+  LiveFetchRequestExecutor >> makeLiveWithoutFetch(config)

package/src/package.json

@@ -0,0 +1,52 @@
+{
+  "name": "dfx",
+  "version": "0.43.0",
+  "type": "module",
+  "publishConfig": {
+    "access": "public",
+    "directory": "dist"
+  },
+  "description": "Effect-TS discord library",
+  "author": "Tim Smart <hello@timsmart.co>",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tim-smart/dfx.git"
+  },
+  "license": "MIT",
+  "scripts": {
+    "prepublishOnly": "make build",
+    "types": "discord-api-codegen ./discord-api-docs -l typescript -o 'imports=RestResponse|dfx/DiscordREST/types' 'endpointReturnType=RestResponse' > src/types.ts && prettier -w src/types.ts"
+  },
+  "exports": {
+    ".": "./index.js",
+    "./gateway": "./gateway.js",
+    "./webhooks": "./webhooks.js",
+    "./*": "./*.js"
+  },
+  "devDependencies": {
+    "@tim-smart/discord-api-docs-parser": "^0.5.2",
+    "@tsplus-types/effect__data": "0.12.2-3b576ba",
+    "@tsplus-types/effect__io": "0.25.8-11739c0",
+    "@tsplus-types/effect__stream": "0.21.1-3b576ba",
+    "@types/ws": "^8.5.4",
+    "dotenv": "^16.0.3",
+    "lerna": "^6.6.1",
+    "madge": "^6.0.0",
+    "typescript": "https://cdn.jsdelivr.net/npm/@tsplus/installer@0.0.171/compiler/typescript.tgz"
+  },
+  "dependencies": {
+    "@effect-http/client": "^0.24.2",
+    "@effect/data": "^0.12.2",
+    "@effect/io": "~0.25.8",
+    "@effect/stream": "~0.21.1",
+    "tweetnacl": "^1.0.3"
+  },
+  "optionalDependencies": {
+    "bufferutil": "^4.0.7",
+    "isomorphic-ws": "^5.0.0",
+    "utf-8-validate": "^6.0.3",
+    "ws": "^8.13.0"
+  },
+  "sideEffects": false,
+  "gitHead": "eb969e6b2d8ac1c0a5ab877898feae57728b5e3c"
+}

package/src/webhooks.ts

@@ -1,6 +1,6 @@
 import { LiveFetchRequestExecutor } from "@effect-http/client"
 import { LiveDiscordREST } from "./DiscordREST.js"
-import { MakeConfigOpts, makeFromConfig } from "./Interactions/webhook.js"
+import { MakeConfigOpts, makeConfigLayer } from "./Interactions/webhook.js"
 import { LiveMemoryRateLimitStore, LiveRateLimiter } from "./RateLimit.js"
 import * as DiscordConfig from "dfx/DiscordConfig"
 import * as Log from "./Log.js"
@@ -20,22 +20,19 @@ export const MemoryREST = LiveMemoryRateLimitStore >> LiveDiscordREST
 
 export const makeLiveWithoutFetch = (
   options: Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>,
-  debug = false,
-) => {
-  const config = Config.unwrap(options)
-
-  const LiveWebhook = makeFromConfig(config)
-  const LiveLog = debug ? Log.LiveLogDebug : Log.LiveLog
-  const LiveConfig = DiscordConfig.makeFromConfig(config)
-  const LiveEnv =
-    (LiveLog + LiveConfig) >> (MemoryREST + LiveWebhook + MemoryRateLimit)
-
-  return LiveEnv
-}
+) =>
+  Layer.unwrapEffect(
+    Config.unwrap(options).config.map(options => {
+      const config = DiscordConfig.make(options)
+      const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config)
+      const LiveWebhook = makeConfigLayer(options)
+      const LiveLog = config.debug ? Log.LiveLogDebug : Log.LiveLog
+      const LiveEnv =
+        (LiveLog + LiveConfig) >> (MemoryREST + LiveWebhook + MemoryRateLimit)
+      return LiveEnv
+    }),
+  )
 
 export const makeLive = (
   config: Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>,
-  debug = false,
-) => {
-  return LiveFetchRequestExecutor >> makeLiveWithoutFetch(config, debug)
-}
+) => LiveFetchRequestExecutor >> makeLiveWithoutFetch(config)

package/webhooks.d.ts

@@ -5,5 +5,5 @@ import * as Log from "./Log.js";
 export { BadWebhookSignature, makeConfigLayer, makeHandler, makeSimpleHandler, WebhookConfig, WebhookParseError, } from "./Interactions/webhook.js";
 export declare const MemoryRateLimit: import("@effect-http/client/_common").Layer<Log.Log, never, import("./RateLimit.js").RateLimiter>;
 export declare const MemoryREST: import("@effect-http/client/_common").Layer<DiscordConfig.DiscordConfig | Log.Log | import("@effect-http/client").HttpRequestExecutor, never, import("./DiscordREST.js").DiscordREST>;
-export declare const makeLiveWithoutFetch: (options: Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>, debug?: boolean) => import("@effect-http/client/_common").Layer<import("@effect-http/client").HttpRequestExecutor, import("./_common.js").ConfigError, import("./DiscordREST.js").DiscordREST | import("./RateLimit.js").RateLimiter | import("./Interactions/webhook.js").WebhookConfig>;
-export declare const makeLive: (config: Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>, debug?: boolean) => import("@effect-http/client/_common").Layer<never, import("./_common.js").ConfigError, import("./DiscordREST.js").DiscordREST | import("./RateLimit.js").RateLimiter | import("./Interactions/webhook.js").WebhookConfig>;
+export declare const makeLiveWithoutFetch: (options: Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>) => import("@effect-http/client/_common").Layer<import("@effect-http/client").HttpRequestExecutor, import("./_common.js").ConfigError, import("./DiscordREST.js").DiscordREST | import("./RateLimit.js").RateLimiter | import("./Interactions/webhook.js").WebhookConfig>;
+export declare const makeLive: (config: Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>) => import("@effect-http/client/_common").Layer<never, import("./_common.js").ConfigError, import("./DiscordREST.js").DiscordREST | import("./RateLimit.js").RateLimiter | import("./Interactions/webhook.js").WebhookConfig>;

package/webhooks.js

@@ -1,23 +1,22 @@
 import * as tsplus_module_1 from "@effect/io/Layer";
 import * as tsplus_module_2 from "@effect/io/Config";
+import * as tsplus_module_3 from "@effect/io/Effect";
 import { LiveFetchRequestExecutor } from "@effect-http/client";
 import { LiveDiscordREST } from "./DiscordREST.js";
-import { makeFromConfig } from "./Interactions/webhook.js";
+import { makeConfigLayer } from "./Interactions/webhook.js";
 import { LiveMemoryRateLimitStore, LiveRateLimiter } from "./RateLimit.js";
 import * as DiscordConfig from "dfx/DiscordConfig";
 import * as Log from "./Log.js";
 export { BadWebhookSignature, makeConfigLayer, makeHandler, makeSimpleHandler, WebhookConfig, WebhookParseError, } from "./Interactions/webhook.js";
 export const MemoryRateLimit = tsplus_module_1.provide(LiveRateLimiter)(LiveMemoryRateLimitStore);
 export const MemoryREST = tsplus_module_1.provide(LiveDiscordREST)(LiveMemoryRateLimitStore);
-export const makeLiveWithoutFetch = (options, debug = false) => {
-    const config = tsplus_module_2.unwrap(options);
-    const LiveWebhook = makeFromConfig(config);
-    const LiveLog = debug ? Log.LiveLogDebug : Log.LiveLog;
-    const LiveConfig = DiscordConfig.makeFromConfig(config);
+export const makeLiveWithoutFetch = (options) => tsplus_module_1.unwrapEffect(tsplus_module_3.map(tsplus_module_3.config(tsplus_module_2.unwrap(options)), options => {
+    const config = DiscordConfig.make(options);
+    const LiveConfig = tsplus_module_1.succeed(DiscordConfig.DiscordConfig, config);
+    const LiveWebhook = makeConfigLayer(options);
+    const LiveLog = config.debug ? Log.LiveLogDebug : Log.LiveLog;
     const LiveEnv = tsplus_module_1.provide((tsplus_module_1.merge(MemoryRateLimit)(tsplus_module_1.merge(LiveWebhook)(MemoryREST))))((tsplus_module_1.merge(LiveConfig)(LiveLog)));
     return LiveEnv;
-};
-export const makeLive = (config, debug = false) => {
-    return tsplus_module_1.provide(makeLiveWithoutFetch(config, debug))(LiveFetchRequestExecutor);
-};
+}));
+export const makeLive = (config) => tsplus_module_1.provide(makeLiveWithoutFetch(config))(LiveFetchRequestExecutor);
 //# sourceMappingURL=webhooks.js.map

package/webhooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"webhooks.js","sourceRoot":"","sources":["src/webhooks.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAkB,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC1E,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAC1E,OAAO,KAAK,aAAa,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAE/B,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,aAAa,EACb,iBAAiB,GAClB,MAAM,2BAA2B,CAAA;AAElC,MAAM,CAAC,MAAM,eAAe,2BAA+B,eAAe,EAA3C,wBAAwB,CAAmB,CAAA;AAE1E,MAAM,CAAC,MAAM,UAAU,2BAA+B,eAAe,EAA3C,wBAAwB,CAAmB,CAAA;AAErE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,OAA6D,EAC7D,KAAK,GAAG,KAAK,EACb,EAAE;IACF,MAAM,MAAM,GAAG,uBAAc,OAAO,CAAC,CAAA;IAErC,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;IAC1C,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,MAAM,CAAC,CAAA;IACvD,MAAM,OAAO,2BACe,uBAA4B,eAAe,wBAA7B,WAAW,EAAxB,UAAU,GAAiC,EAAtE,uBAAW,UAAU,EAApB,OAAO,EAAc,CAAgD,CAAA;IAExE,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,MAA4D,EAC5D,KAAK,GAAG,KAAK,EACb,EAAE;IACF,+BAAmC,oBAAoB,CAAC,MAAM,EAAE,KAAK,CAAC,EAA/D,wBAAwB,EAAuC;AACxE,CAAC,CAAA"}
+{"version":3,"file":"webhooks.js","sourceRoot":"","sources":["src/webhooks.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAkB,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3E,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAC1E,OAAO,KAAK,aAAa,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAE/B,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,aAAa,EACb,iBAAiB,GAClB,MAAM,2BAA2B,CAAA;AAElC,MAAM,CAAC,MAAM,eAAe,2BAA+B,eAAe,EAA3C,wBAAwB,CAAmB,CAAA;AAE1E,MAAM,CAAC,MAAM,UAAU,2BAA+B,eAAe,EAA3C,wBAAwB,CAAmB,CAAA;AAErE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,OAA6D,EAC7D,EAAE,CACF,6BACE,2CAAA,uBAAc,OAAO,CAAC,GAAY,OAAO,CAAC,EAAE;IAC1C,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC1C,MAAM,UAAU,GAAG,wBAAc,aAAa,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;IACrE,MAAM,WAAW,GAAG,eAAe,CAAC,OAAO,CAAC,CAAA;IAC5C,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAA;IAC7D,MAAM,OAAO,2BACe,uBAA4B,eAAe,wBAA7B,WAAW,EAAxB,UAAU,GAAiC,EAAtE,uBAAW,UAAU,EAApB,OAAO,EAAc,CAAgD,CAAA;IACxE,OAAO,OAAO,CAAA;AAChB,CAAC,CAAC,CACH,CAAA;AAEH,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,MAA4D,EAC5D,EAAE,yBAA6B,oBAAoB,CAAC,MAAM,CAAC,EAAxD,wBAAwB,CAAgC,CAAA"}