dfx 0.48.3 → 0.50.0

package/DiscordGateway/Shard/identify.d.ts

@@ -9,5 +9,5 @@ export interface Requirements {
     latestReady: Ref<Maybe<Discord.ReadyEvent>>;
     latestSequence: Ref<Maybe<number>>;
 }
-export declare const identifyOrResume: (opts: Options, ready: Ref<Maybe<Discord.ReadyEvent>>, seq: Ref<Maybe<number>>) => import("@effect/io/Effect").Effect<never, never, import("../../types.js").GatewayPayload<any>>;
+export declare const identifyOrResume: (opts: Options, ready: Ref<Maybe<Discord.ReadyEvent>>, seq: Ref<Maybe<number>>) => import("@effect/io/Effect").Effect<never, never, import("../../types.js").GatewayPayload<import("../../types.js").Identify> | import("../../types.js").GatewayPayload<import("../../types.js").Resume>>;
 //# sourceMappingURL=identify.d.ts.map

package/DiscordGateway/Shard/identify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identify.d.ts","sourceRoot":"","sources":["../../src/DiscordGateway/Shard/identify.ts"],"names":[],"mappings":";AAGA,MAAM,WAAW,OAAO;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC,cAAc,CAAA;CAClC;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;IAC3C,cAAc,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;CACnC;AAsBD,eAAO,MAAM,gBAAgB,SACrB,OAAO,SACN,IAAI,MAAM,QAAQ,UAAU,CAAC,CAAC,OAChC,IAAI,MAAM,MAAM,CAAC,CAAC,mGAarB,CAAA"}
+{"version":3,"file":"identify.d.ts","sourceRoot":"","sources":["../../src/DiscordGateway/Shard/identify.ts"],"names":[],"mappings":";AAGA,MAAM,WAAW,OAAO;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC,cAAc,CAAA;CAClC;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;IAC3C,cAAc,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;CACnC;AAsBD,eAAO,MAAM,gBAAgB,SACrB,OAAO,SACN,IAAI,MAAM,QAAQ,UAAU,CAAC,CAAC,OAChC,IAAI,MAAM,MAAM,CAAC,CAAC,4MAarB,CAAA"}

package/DiscordGateway/Shard/sendEvents.d.ts

@@ -1,8 +1,8 @@
 import { Discord } from "dfx/_common";
-export declare const heartbeat: (d: Discord.Heartbeat) => Discord.GatewayPayload;
-export declare const identify: (d: Discord.Identify) => Discord.GatewayPayload;
-export declare const resume: (d: Discord.Resume) => Discord.GatewayPayload;
-export declare const requestGuildMembers: (d: Discord.RequestGuildMember) => Discord.GatewayPayload;
-export declare const voiceStateUpdate: (d: Discord.UpdateVoiceState) => Discord.GatewayPayload;
-export declare const presenceUpdate: (d: Discord.UpdatePresence) => Discord.GatewayPayload;
+export declare const heartbeat: (d: Discord.Heartbeat) => Discord.GatewayPayload<Discord.Heartbeat>;
+export declare const identify: (d: Discord.Identify) => Discord.GatewayPayload<Discord.Identify>;
+export declare const resume: (d: Discord.Resume) => Discord.GatewayPayload<Discord.Resume>;
+export declare const requestGuildMembers: (d: Discord.RequestGuildMember) => Discord.GatewayPayload<Discord.RequestGuildMember>;
+export declare const voiceStateUpdate: (d: Discord.UpdateVoiceState) => Discord.GatewayPayload<Discord.UpdateVoiceState>;
+export declare const presenceUpdate: (d: Discord.UpdatePresence) => Discord.GatewayPayload<Discord.UpdatePresence>;
 //# sourceMappingURL=sendEvents.d.ts.map

package/DiscordGateway/Shard/sendEvents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sendEvents.d.ts","sourceRoot":"","sources":["../../src/DiscordGateway/Shard/sendEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAErC,eAAO,MAAM,SAAS,MAAO,QAAQ,SAAS,KAAG,QAAQ,cAGvD,CAAA;AAEF,eAAO,MAAM,QAAQ,MAAO,QAAQ,QAAQ,KAAG,QAAQ,cAGrD,CAAA;AAEF,eAAO,MAAM,MAAM,MAAO,QAAQ,MAAM,KAAG,QAAQ,cAGjD,CAAA;AAEF,eAAO,MAAM,mBAAmB,MAC3B,QAAQ,kBAAkB,KAC5B,QAAQ,cAGT,CAAA;AAEF,eAAO,MAAM,gBAAgB,MACxB,QAAQ,gBAAgB,KAC1B,QAAQ,cAGT,CAAA;AAEF,eAAO,MAAM,cAAc,MACtB,QAAQ,cAAc,KACxB,QAAQ,cAGT,CAAA"}
+{"version":3,"file":"sendEvents.d.ts","sourceRoot":"","sources":["../../src/DiscordGateway/Shard/sendEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAErC,eAAO,MAAM,SAAS,MACjB,QAAQ,SAAS,KACnB,QAAQ,cAAc,CAAC,QAAQ,SAAS,CAGzC,CAAA;AAEF,eAAO,MAAM,QAAQ,MAChB,QAAQ,QAAQ,KAClB,QAAQ,cAAc,CAAC,QAAQ,QAAQ,CAGxC,CAAA;AAEF,eAAO,MAAM,MAAM,MACd,QAAQ,MAAM,KAChB,QAAQ,cAAc,CAAC,QAAQ,MAAM,CAGtC,CAAA;AAEF,eAAO,MAAM,mBAAmB,MAC3B,QAAQ,kBAAkB,KAC5B,QAAQ,cAAc,CAAC,QAAQ,kBAAkB,CAGlD,CAAA;AAEF,eAAO,MAAM,gBAAgB,MACxB,QAAQ,gBAAgB,KAC1B,QAAQ,cAAc,CAAC,QAAQ,gBAAgB,CAGhD,CAAA;AAEF,eAAO,MAAM,cAAc,MACtB,QAAQ,cAAc,KACxB,QAAQ,cAAc,CAAC,QAAQ,cAAc,CAG9C,CAAA"}

package/DiscordGateway/Shard/sendEvents.js.map

@@ -1 +1 @@
-{"version":3,"file":"sendEvents.js","sourceRoot":"","sources":["../../src/DiscordGateway/Shard/sendEvents.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAoB,EAA0B,EAAE,CAAC,CAAC;IAC1E,EAAE,yCAAiC;IACnC,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAmB,EAA0B,EAAE,CAAC,CAAC;IACxE,EAAE,wCAAgC;IAClC,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,CAAiB,EAA0B,EAAE,CAAC,CAAC;IACpE,EAAE,sCAA8B;IAChC,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,CAA6B,EACL,EAAE,CAAC,CAAC;IAC5B,EAAE,qDAA6C;IAC/C,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,CAA2B,EACH,EAAE,CAAC,CAAC;IAC5B,EAAE,kDAA0C;IAC5C,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,CAAyB,EACD,EAAE,CAAC,CAAC;IAC5B,EAAE,+CAAuC;IACzC,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"sendEvents.js","sourceRoot":"","sources":["../../src/DiscordGateway/Shard/sendEvents.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,CAAoB,EACuB,EAAE,CAAC,CAAC;IAC/C,EAAE,yCAAiC;IACnC,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,CAAmB,EACuB,EAAE,CAAC,CAAC;IAC9C,EAAE,wCAAgC;IAClC,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG,CACpB,CAAiB,EACuB,EAAE,CAAC,CAAC;IAC5C,EAAE,sCAA8B;IAChC,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,CAA6B,EACuB,EAAE,CAAC,CAAC;IACxD,EAAE,qDAA6C;IAC/C,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,CAA2B,EACuB,EAAE,CAAC,CAAC;IACtD,EAAE,kDAA0C;IAC5C,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,CAAyB,EACuB,EAAE,CAAC,CAAC;IACpD,EAAE,+CAAuC;IACzC,CAAC;CACF,CAAC,CAAA"}

package/DiscordGateway/Shard.d.ts

@@ -1,17 +1,18 @@
-import { Hub, Discord, Effect } from "dfx/_common";
+import { Hub, Discord, Dequeue, Effect } from "dfx/_common";
 import { DiscordConfig } from "dfx/DiscordConfig";
 import { RateLimiter } from "dfx/RateLimit";
-import { DiscordWS } from "./DiscordWS.js";
+import { DiscordWS, Message } from "./DiscordWS.js";
 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 connect: (shard: [id: number, count: number], hub: Hub<Discord.GatewayPayload<Discord.ReceiveEvent>>, sendQueue: Dequeue<Discord.GatewayPayload<Discord.SendEvent>>) => import("@effect/io/Effect").Effect<never, never, {
+        readonly send: (p: Message) => import("@effect/io/Effect").Effect<never, never, boolean>;
         readonly run: import("@effect/io/Effect").Effect<never, import("./WS.js").WebSocketError | import("./WS.js").WebSocketCloseError, never>;
-        readonly send: (p: Discord.GatewayPayload) => import("@effect/io/Effect").Effect<never, never, boolean>;
-        readonly reconnect: import("@effect/io/Effect").Effect<never, never, boolean>;
     }>;
 }>;
 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 | Log | import("dfx/RateLimit").RateLimitStore | import("./DiscordWS.js").DiscordWSCodec, never, Shard>;
+export interface RunningShard extends Effect.Success<ReturnType<Shard["connect"]>> {
+}
 //# sourceMappingURL=Shard.d.ts.map

package/DiscordGateway/Shard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Shard.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/Shard.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAmB,WAAW,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,EAAE,SAAS,EAA0B,MAAM,gBAAgB,CAAA;AAMlE,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAQ7B,eAAO,MAAM,IAAI;8BAON,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,OAC7B,IAAI,QAAQ,cAAc,CAAC,QAAQ,YAAY,CAAC,CAAC;;2BA4IxC,QAAQ,cAAc;;;EAMtC,CAAA;AAEF,MAAM,WAAW,KAAM,SAAQ,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC;CAAG;AAC7D,eAAO,MAAM,KAAK,kDAAe,CAAA;AACjC,eAAO,MAAM,SAAS,mKACoC,CAAA"}
+{"version":3,"file":"Shard.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/Shard.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAmB,WAAW,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,EAAE,SAAS,EAAiB,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAMlE,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAQ7B,eAAO,MAAM,IAAI;8BAON,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,OAC7B,IAAI,QAAQ,cAAc,CAAC,QAAQ,YAAY,CAAC,CAAC,aAC3C,QAAQ,QAAQ,cAAc,CAAC,QAAQ,SAAS,CAAC,CAAC;2BAc1C,OAAO;;;EAmI5B,CAAA;AAEF,MAAM,WAAW,KAAM,SAAQ,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC;CAAG;AAC7D,eAAO,MAAM,KAAK,kDAAe,CAAA;AACjC,eAAO,MAAM,SAAS,mKACoC,CAAA;AAE1D,MAAM,WAAW,YACf,SAAQ,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;CAAG"}

package/DiscordGateway/Shard.js

@@ -17,7 +17,7 @@ import * as Utils from "./Shard/utils.js";
 import { Reconnect } from "./WS.js";
 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 connect = (shard, hub, sendQueue) => 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));
@@ -69,12 +69,9 @@ export const make = tsplus_module_1.flatMap(DiscordConfig, ({ token, gateway })
                     }
                     return tsplus_module_1.map(effect, () => void 0);
                 });
-                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,
-                    send: (p) => send(p),
-                    reconnect: send(Reconnect),
-                };
+                const drainSendQueue = tsplus_module_1.forever(tsplus_module_1.tap(sendQueue.take(), send));
+                const run = tsplus_module_1.zipParLeft(tsplus_module_1.zipParLeft(tsplus_module_1.zipParLeft(tsplus_module_1.forever(tsplus_module_1.flatMap(socket.take, onPayload)), heartbeats), drainSendQueue), socket.run);
+                return { send, run };
             }));
         })));
     })));

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/Sharder.d.ts

@@ -1,12 +1,13 @@
-import { Maybe, Schedule, Effect, Discord, Hub } from "dfx/_common";
+import { Maybe, Schedule, Effect, Discord, Hub, Dequeue } from "dfx/_common";
 import { DiscordConfig } from "dfx/DiscordConfig";
 import { DiscordREST } from "dfx/DiscordREST";
 import { RateLimiter } from "../RateLimit.js";
-import { Shard } from "./Shard.js";
+import { RunningShard, Shard } from "./Shard.js";
 import { ShardStore } from "./ShardStore.js";
 import { WebSocketCloseError, WebSocketError } from "./WS.js";
 declare const make: import("@effect/io/Effect").Effect<DiscordREST | DiscordConfig | RateLimiter | Shard | ShardStore, never, {
-    readonly run: (hub: Hub<Discord.GatewayPayload<Discord.ReceiveEvent>>) => import("@effect/io/Effect").Effect<never, WebSocketError | WebSocketCloseError, never>;
+    readonly shards: import("@effect/io/Effect").Effect<never, never, import("../_common.js").HashSet<RunningShard>>;
+    readonly run: (hub: Hub<Discord.GatewayPayload<Discord.ReceiveEvent>>, sendQueue: Dequeue<Discord.GatewayPayload<Discord.SendEvent>>) => import("@effect/io/Effect").Effect<never, WebSocketError | WebSocketCloseError, never>;
 }>;
 export interface Sharder extends Effect.Success<typeof make> {
 }

package/DiscordGateway/Sharder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Sharder.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/Sharder.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAmB,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAa,KAAK,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAO7D,QAAA,MAAM,IAAI;wBA4CU,IAAI,QAAQ,cAAc,CAAC,QAAQ,YAAY,CAAC,CAAC;EAwCnE,CAAA;AAEF,MAAM,WAAW,OAAQ,SAAQ,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC;CAAG;AAC/D,eAAO,MAAM,OAAO,sDAAiB,CAAA;AACrC,eAAO,MAAM,WAAW,sNACgC,CAAA"}
+{"version":3,"file":"Sharder.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/Sharder.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAmB,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAa,YAAY,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAO7D,QAAA,MAAM,IAAI;;wBA8CD,IAAI,QAAQ,cAAc,CAAC,QAAQ,YAAY,CAAC,CAAC,aAC3C,QAAQ,QAAQ,cAAc,CAAC,QAAQ,SAAS,CAAC,CAAC;EAgD/D,CAAA;AAEF,MAAM,WAAW,OAAQ,SAAQ,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC;CAAG;AAC/D,eAAO,MAAM,OAAO,sDAAiB,CAAA;AACrC,eAAO,MAAM,WAAW,sNACgC,CAAA"}

package/DiscordGateway/Sharder.js

@@ -1,12 +1,13 @@
 import * as tsplus_module_1 from "@effect/data/Option";
 import * as tsplus_module_2 from "@effect/data/Duration";
 import * as tsplus_module_3 from "@effect/io/Schedule";
-import * as tsplus_module_4 from "dfx/_common";
-import * as tsplus_module_5 from "@effect/io/Effect";
-import * as tsplus_module_6 from "@effect/data/Chunk";
-import * as tsplus_module_7 from "@effect/io/Deferred";
-import * as tsplus_module_8 from "@effect/io/Ref";
-import * as tsplus_module_9 from "@effect/io/Layer";
+import * as tsplus_module_4 from "@effect/io/Ref";
+import * as tsplus_module_5 from "dfx/_common";
+import * as tsplus_module_6 from "@effect/io/Effect";
+import * as tsplus_module_7 from "@effect/data/Chunk";
+import * as tsplus_module_8 from "@effect/io/Deferred";
+import * as tsplus_module_9 from "@effect/data/HashSet";
+import * as tsplus_module_10 from "@effect/io/Layer";
 import { millis } from "@effect/data/Duration";
 import { DiscordConfig } from "dfx/DiscordConfig";
 import { DiscordREST } from "dfx/DiscordREST";
@@ -14,17 +15,17 @@ import { LiveRateLimiter, RateLimiter } from "../RateLimit.js";
 import { LiveShard, Shard } from "./Shard.js";
 import { ShardStore } from "./ShardStore.js";
 const claimRepeatPolicy = tsplus_module_3.passthrough(tsplus_module_3.whileInput(tsplus_module_3.fixed(tsplus_module_2.minutes(3)), (_) => tsplus_module_1.isNone(_)));
-const make = tsplus_module_5.flatMap(ShardStore, store => tsplus_module_5.flatMap(DiscordREST, rest => tsplus_module_5.flatMap(DiscordConfig, ({ gateway: config }) => tsplus_module_5.flatMap(RateLimiter, limiter => tsplus_module_5.flatMap(Shard, shard => {
-    const takeConfig = (totalCount) => tsplus_module_5.map(tsplus_module_8.make(0), currentCount => {
-        const claimId = (sharderCount) => tsplus_module_5.map(tsplus_module_5.repeat(store
+const make = tsplus_module_6.flatMap(ShardStore, store => tsplus_module_6.flatMap(DiscordREST, rest => tsplus_module_6.flatMap(DiscordConfig, ({ gateway: config }) => tsplus_module_6.flatMap(RateLimiter, limiter => tsplus_module_6.flatMap(Shard, shard => tsplus_module_6.flatMap(tsplus_module_4.make(tsplus_module_9.empty()), currentShards => {
+    const takeConfig = (totalCount) => tsplus_module_6.map(tsplus_module_4.make(0), currentCount => {
+        const claimId = (sharderCount) => tsplus_module_6.map(tsplus_module_6.repeat(store
             .claimId({
             totalCount,
             sharderCount,
         }), claimRepeatPolicy), _ => _.value);
-        return tsplus_module_5.map(tsplus_module_5.flatMap(tsplus_module_8.getAndUpdate(currentCount, _ => _ + 1), claimId), id => ({ id, totalCount }));
+        return tsplus_module_6.map(tsplus_module_6.flatMap(tsplus_module_4.getAndUpdate(currentCount, _ => _ + 1), claimId), id => ({ id, totalCount }));
     });
-    return tsplus_module_5.map(tsplus_module_5.catchAll(tsplus_module_5.flatMap(rest
-        .getGatewayBot(), r => r.json), () => tsplus_module_5.succeed({
+    return tsplus_module_6.map(tsplus_module_6.catchAll(tsplus_module_6.flatMap(rest
+        .getGatewayBot(), r => r.json), () => tsplus_module_6.succeed({
         url: "wss://gateway.discord.gg/",
         shards: 1,
         session_start_limit: {
@@ -34,18 +35,18 @@ const make = tsplus_module_5.flatMap(ShardStore, store => tsplus_module_5.flatMa
             max_concurrency: 1,
         },
     })), gateway => {
-        const run = (hub) => tsplus_module_5.flatMap(tsplus_module_7.make(), deferred => tsplus_module_5.flatMap(takeConfig(config.shardCount ?? gateway.shards), take => {
-            const spawner = tsplus_module_5.forever(tsplus_module_5.flatMap(tsplus_module_5.flatMap(tsplus_module_5.tap(tsplus_module_5.map(take, config => ({
+        const run = (hub, sendQueue) => tsplus_module_6.flatMap(tsplus_module_8.make(), deferred => tsplus_module_6.flatMap(takeConfig(config.shardCount ?? gateway.shards), take => {
+            const spawner = tsplus_module_6.forever(tsplus_module_6.flatMap(tsplus_module_6.flatMap(tsplus_module_6.tap(tsplus_module_6.map(take, config => ({
                 ...config,
                 url: gateway.url,
                 concurrency: gateway.session_start_limit.max_concurrency,
-            })), ({ id, concurrency }) => limiter.maybeWait(`dfx.sharder.${id % concurrency}`, millis(config.identifyRateLimit[0]), config.identifyRateLimit[1])), c => shard.connect([c.id, c.totalCount], hub)), shard => tsplus_module_5.fork(tsplus_module_5.catchAllCause(shard.run, _ => tsplus_module_7.failCause(deferred, _)))));
-            const spawners = tsplus_module_6.map(tsplus_module_6.range(1, gateway.session_start_limit.max_concurrency), () => spawner);
-            return tsplus_module_5.zipParLeft(tsplus_module_5.allParDiscard(spawners), tsplus_module_4.deferredAwait(deferred));
+            })), ({ id, concurrency }) => limiter.maybeWait(`dfx.sharder.${id % concurrency}`, millis(config.identifyRateLimit[0]), config.identifyRateLimit[1])), c => shard.connect([c.id, c.totalCount], hub, sendQueue)), shard => tsplus_module_6.fork(tsplus_module_6.catchAllCause(tsplus_module_6.acquireUseRelease(tsplus_module_4.update(currentShards, _ => tsplus_module_9.add(_, shard)), () => shard.run, () => tsplus_module_4.update(currentShards, _ => tsplus_module_9.remove(_, shard))), _ => tsplus_module_8.failCause(deferred, _)))));
+            const spawners = tsplus_module_7.map(tsplus_module_7.range(1, gateway.session_start_limit.max_concurrency), () => spawner);
+            return tsplus_module_6.zipParLeft(tsplus_module_6.allParDiscard(spawners), tsplus_module_5.deferredAwait(deferred));
         }));
-        return { run };
+        return { shards: tsplus_module_4.get(currentShards), run };
     });
-})))));
-export const Sharder = tsplus_module_4.Tag();
-export const LiveSharder = tsplus_module_9.provide(tsplus_module_5.toLayer(make, Sharder))((tsplus_module_9.merge(LiveShard)(LiveRateLimiter)));
+}))))));
+export const Sharder = tsplus_module_5.Tag();
+export const LiveSharder = tsplus_module_10.provide(tsplus_module_6.toLayer(make, Sharder))((tsplus_module_10.merge(LiveShard)(LiveRateLimiter)));
 //# sourceMappingURL=Sharder.js.map

package/DiscordGateway/Sharder.js.map

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

package/DiscordGateway.d.ts

@@ -1,10 +1,12 @@
 import { Stream, Discord, Hub, Effect } from "dfx/_common";
 import { Sharder } from "./DiscordGateway/Sharder.js";
 export declare const make: import("@effect/io/Effect").Effect<Sharder, never, {
-    run: import("@effect/io/Effect").Effect<never, import("./DiscordGateway/WS.js").WebSocketError | import("./DiscordGateway/WS.js").WebSocketCloseError, never>;
-    dispatch: import("@effect-http/client/_common").Stream<never, never, import("./types.js").GatewayPayload<import("./types.js").ReceiveEvent>>;
-    fromDispatch: <K extends keyof import("./types.js").ReceiveEvents>(event: K) => import("@effect-http/client/_common").Stream<never, never, import("./types.js").ReceiveEvents[K]>;
-    handleDispatch: <K_1 extends keyof import("./types.js").ReceiveEvents, R, E, A>(event: K_1, handle: (event: import("./types.js").ReceiveEvents[K_1]) => import("@effect/io/Effect").Effect<R, E, A>) => import("@effect/io/Effect").Effect<R, E, never>;
+    readonly run: import("@effect/io/Effect").Effect<never, import("./DiscordGateway/WS.js").WebSocketError | import("./DiscordGateway/WS.js").WebSocketCloseError, never>;
+    readonly dispatch: import("@effect-http/client/_common").Stream<never, never, import("./types.js").GatewayPayload<import("./types.js").ReceiveEvent>>;
+    readonly fromDispatch: <K extends keyof import("./types.js").ReceiveEvents>(event: K) => import("@effect-http/client/_common").Stream<never, never, import("./types.js").ReceiveEvents[K]>;
+    readonly handleDispatch: <K_1 extends keyof import("./types.js").ReceiveEvents, R, E, A>(event: K_1, handle: (event: import("./types.js").ReceiveEvents[K_1]) => import("@effect/io/Effect").Effect<R, E, A>) => import("@effect/io/Effect").Effect<R, E, never>;
+    readonly send: (payload: Discord.GatewayPayload<Discord.SendEvent>) => import("@effect/io/Effect").Effect<never, never, boolean>;
+    readonly shards: import("@effect/io/Effect").Effect<never, never, import("./_common.js").HashSet<import("./DiscordGateway/Shard.js").RunningShard>>;
 }>;
 export interface DiscordGateway extends Effect.Success<typeof make> {
 }

package/DiscordGateway.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DiscordGateway.d.ts","sourceRoot":"","sources":["src/DiscordGateway.ts"],"names":[],"mappings":";AAAA,OAAO,EAAe,OAAO,EAAE,MAAM,6BAA6B,CAAA;AAsBlE,eAAO,MAAM,IAAI;;;;;EAgBf,CAAA;AAEF,MAAM,WAAW,cAAe,SAAQ,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC;CAAG;AACtE,eAAO,MAAM,cAAc,oEAAwB,CAAA;AACnD,eAAO,MAAM,kBAAkB,2UAA8C,CAAA"}
+{"version":3,"file":"DiscordGateway.d.ts","sourceRoot":"","sources":["src/DiscordGateway.ts"],"names":[],"mappings":";AAAA,OAAO,EAAe,OAAO,EAAE,MAAM,6BAA6B,CAAA;AAsBlE,eAAO,MAAM,IAAI;;;;;6BAOQ,QAAQ,cAAc,CAAC,QAAQ,SAAS,CAAC;;EAiBhE,CAAA;AAEF,MAAM,WAAW,cAAe,SAAQ,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC;CAAG;AACtE,eAAO,MAAM,cAAc,oEAAwB,CAAA;AACnD,eAAO,MAAM,kBAAkB,2UAA8C,CAAA"}

package/DiscordGateway.js

@@ -1,9 +1,10 @@
 import * as tsplus_module_1 from "@effect/stream/Stream";
 import * as tsplus_module_2 from "@effect/io/Effect";
 import * as tsplus_module_3 from "dfx/utils/hub";
-import * as tsplus_module_4 from "@effect/io/Hub";
-import * as tsplus_module_5 from "dfx/_common";
-import * as tsplus_module_6 from "@effect/io/Layer";
+import * as tsplus_module_4 from "@effect/io/Queue";
+import * as tsplus_module_5 from "@effect/io/Hub";
+import * as tsplus_module_6 from "dfx/_common";
+import * as tsplus_module_7 from "@effect/io/Layer";
 import { LiveSharder, Sharder } from "./DiscordGateway/Sharder.js";
 const fromDispatchFactory = (source) => (event) => tsplus_module_1.map(tsplus_module_1.filter(source, p => p.t === event), p => p.d);
 const handleDispatchFactory = (hub) => (event, handle) => tsplus_module_3.subscribeForEachPar(hub, _ => {
@@ -12,18 +13,21 @@ const handleDispatchFactory = (hub) => (event, handle) => tsplus_module_3.subscr
     }
     return tsplus_module_2.unit();
 });
-export const make = tsplus_module_2.flatMap(Sharder, sharder => tsplus_module_2.map(tsplus_module_4.unbounded(), hub => {
+export const make = tsplus_module_2.flatMap(Sharder, sharder => tsplus_module_2.flatMap(tsplus_module_5.unbounded(), hub => tsplus_module_2.map(tsplus_module_4.unbounded(), sendQueue => {
+    const send = (payload) => sendQueue.offer(payload);
     const dispatch = tsplus_module_1.fromHub(hub);
     const fromDispatch = fromDispatchFactory(dispatch);
     const handleDispatch = handleDispatchFactory(hub);
-    const run = sharder.run(hub);
+    const run = sharder.run(hub, sendQueue);
     return {
         run,
         dispatch,
         fromDispatch,
         handleDispatch,
+        send,
+        shards: sharder.shards,
     };
-}));
-export const DiscordGateway = tsplus_module_5.Tag();
-export const LiveDiscordGateway = tsplus_module_6.provide(tsplus_module_2.toLayer(make, DiscordGateway))(LiveSharder);
+})));
+export const DiscordGateway = tsplus_module_6.Tag();
+export const LiveDiscordGateway = tsplus_module_7.provide(tsplus_module_2.toLayer(make, DiscordGateway))(LiveSharder);
 //# sourceMappingURL=DiscordGateway.js.map

package/DiscordGateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"DiscordGateway.js","sourceRoot":"","sources":["src/DiscordGateway.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AAElE,MAAM,mBAAmB,GACvB,CAAO,MAAkE,EAAE,EAAE,CAC7E,CACE,KAAQ,EACgC,EAAE,CAC1C,oBAAA,uBAAA,MAAM,EAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,EAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAS,CAAC,CAAA;AAE3D,MAAM,qBAAqB,GACzB,CAAC,GAAsD,EAAE,EAAE,CAC3D,CACE,KAAQ,EACR,MAA4D,EACvC,EAAE,CACvB,oCAAA,GAAG,EAAqB,CAAC,CAAC,EAAE;IAC1B,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE;QACjB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAQ,CAAC,CAAA;KAC1B;IACD,OAAO,sBAAa,CAAA;AACtB,CAAC,CAAC,CAAA;AAEN,MAAM,CAAC,MAAM,IAAI,2BACG,OAAO,EAAnB,OAAO,wBACC,2BAA6D,EAArE,GAAG;IAET,MAAM,QAAQ,GAAG,wBAAe,GAAG,CAAC,CAAA;IACpC,MAAM,YAAY,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAA;IAClD,MAAM,cAAc,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAA;IAEjD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAE5B,OAAO;QACL,GAAG;QACH,QAAQ;QACR,YAAY;QACZ,cAAc;KACf,CAAA;GACD,CAAA;AAGF,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,kBAAkB,2BAAkB,wBAAA,IAAI,EAAS,cAAc,CAAC,EAA3C,WAAW,CAAgC,CAAA"}
+{"version":3,"file":"DiscordGateway.js","sourceRoot":"","sources":["src/DiscordGateway.ts"],"names":[],"mappings":";;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AAElE,MAAM,mBAAmB,GACvB,CAAO,MAAkE,EAAE,EAAE,CAC7E,CACE,KAAQ,EACgC,EAAE,CAC1C,oBAAA,uBAAA,MAAM,EAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,EAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAS,CAAC,CAAA;AAE3D,MAAM,qBAAqB,GACzB,CAAC,GAAsD,EAAE,EAAE,CAC3D,CACE,KAAQ,EACR,MAA4D,EACvC,EAAE,CACvB,oCAAA,GAAG,EAAqB,CAAC,CAAC,EAAE;IAC1B,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE;QACjB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAQ,CAAC,CAAA;KAC1B;IACD,OAAO,sBAAa,CAAA;AACtB,CAAC,CAAC,CAAA;AAEN,MAAM,CAAC,MAAM,IAAI,2BACG,OAAO,EAAnB,OAAO,4BACC,2BAA6D,EAArE,GAAG,wBAGP,2BAA4D,EADxD,SAAS;IAGf,MAAM,IAAI,GAAG,CAAC,OAAkD,EAAE,EAAE,CAClE,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAE1B,MAAM,QAAQ,GAAG,wBAAe,GAAG,CAAC,CAAA;IACpC,MAAM,YAAY,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAA;IAClD,MAAM,cAAc,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAA;IAEjD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IAEvC,OAAO;QACL,GAAG;QACH,QAAQ;QACR,YAAY;QACZ,cAAc;QACd,IAAI;QACJ,MAAM,EAAE,OAAO,CAAC,MAAM;KACd,CAAA;IACV,CAAA;AAGF,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,kBAAkB,2BAAkB,wBAAA,IAAI,EAAS,cAAc,CAAC,EAA3C,WAAW,CAAgC,CAAA"}

package/gateway.d.ts

@@ -5,6 +5,7 @@ export { DiscordGateway, LiveDiscordGateway } from "./DiscordGateway.js";
 export * as DiscordWS from "./DiscordGateway/DiscordWS.js";
 export * as Shard from "./DiscordGateway/Shard.js";
 export * as ShardStore from "./DiscordGateway/ShardStore.js";
+export * as SendEvent from "./DiscordGateway/Shard/sendEvents.js";
 export * as WS from "./DiscordGateway/WS.js";
 export { InteractionsRegistry, InteractionsRegistryLive, run as runIx, } from "./Interactions/gateway.js";
 export declare const MemoryRateLimit: import("@effect-http/client/_common").Layer<Log.Log, never, import("dfx").RateLimiter>;

package/gateway.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["src/gateway.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,aAAa,EAAmB,GAAG,EAAE,MAAM,KAAK,CAAA;AAMzD,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,EACL,oBAAoB,EACpB,wBAAwB,EACxB,GAAG,IAAI,KAAK,GACb,MAAM,2BAA2B,CAAA;AAElC,eAAO,MAAM,eAAe,wFAA8C,CAAA;AAE1E,eAAO,MAAM,SAAS,qPAEsC,CAAA;AAE5D,eAAO,MAAM,oBAAoB,WACvB,OAAO,IAAI,CAAC,cAAc,QAAQ,CAAC,qRAU1C,CAAA;AAEH,eAAO,MAAM,QAAQ,WAAY,OAAO,IAAI,CAAC,cAAc,QAAQ,CAAC,yOACV,CAAA"}
+{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["src/gateway.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,aAAa,EAAmB,GAAG,EAAE,MAAM,KAAK,CAAA;AAMzD,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,SAAS,MAAM,sCAAsC,CAAA;AACjE,OAAO,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,GAAG,IAAI,KAAK,GACb,MAAM,2BAA2B,CAAA;AAElC,eAAO,MAAM,eAAe,wFAA8C,CAAA;AAE1E,eAAO,MAAM,SAAS,qPAEsC,CAAA;AAE5D,eAAO,MAAM,oBAAoB,WACvB,OAAO,IAAI,CAAC,cAAc,QAAQ,CAAC,qRAU1C,CAAA;AAEH,eAAO,MAAM,QAAQ,WAAY,OAAO,IAAI,CAAC,cAAc,QAAQ,CAAC,yOACV,CAAA"}

package/gateway.js

@@ -12,6 +12,7 @@ export { DiscordGateway, LiveDiscordGateway } from "./DiscordGateway.js";
 export * as DiscordWS from "./DiscordGateway/DiscordWS.js";
 export * as Shard from "./DiscordGateway/Shard.js";
 export * as ShardStore from "./DiscordGateway/ShardStore.js";
+export * as SendEvent from "./DiscordGateway/Shard/sendEvents.js";
 export * as WS from "./DiscordGateway/WS.js";
 export { InteractionsRegistry, InteractionsRegistryLive, run as runIx, } from "./Interactions/gateway.js";
 export const MemoryRateLimit = tsplus_module_1.provide(LiveRateLimiter)(LiveMemoryRateLimitStore);

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,EACL,oBAAoB,EACpB,wBAAwB,EACxB,GAAG,IAAI,KAAK,GACb,MAAM,2BAA2B,CAAA;AAElC,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"}
+{"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,SAAS,MAAM,sCAAsC,CAAA;AACjE,OAAO,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,GAAG,IAAI,KAAK,GACb,MAAM,2BAA2B,CAAA;AAElC,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.48.3",
+    "version": "0.50.0",
     "type": "module",
     "publishConfig": {
         "access": "public",
@@ -32,7 +32,7 @@
         "dotenv": "^16.1.4",
         "lerna": "^7.0.0",
         "madge": "^6.1.0",
-        "typescript": "https://cdn.jsdelivr.net/npm/@tsplus/installer@0.0.171/compiler/typescript.tgz"
+        "typescript": "https://cdn.jsdelivr.net/npm/@tsplus/installer@0.0.177/compiler/typescript.tgz"
     },
     "dependencies": {
         "@effect-http/client": "^0.27.0",
@@ -48,5 +48,5 @@
         "ws": "^8.13.0"
     },
     "sideEffects": false,
-    "gitHead": "b0bd6d7e3f28fe212fcd4b4f3d7d24e7d7cfcf6c"
+    "gitHead": "68e33961a8d1e6e1cafa91837a24a7f537042006"
 }

package/src/DiscordGateway/Shard/sendEvents.ts

@@ -1,37 +1,43 @@
 import { Discord } from "dfx/_common"
 
-export const heartbeat = (d: Discord.Heartbeat): Discord.GatewayPayload => ({
+export const heartbeat = (
+  d: Discord.Heartbeat,
+): Discord.GatewayPayload<Discord.Heartbeat> => ({
   op: Discord.GatewayOpcode.HEARTBEAT,
   d,
 })
 
-export const identify = (d: Discord.Identify): Discord.GatewayPayload => ({
+export const identify = (
+  d: Discord.Identify,
+): Discord.GatewayPayload<Discord.Identify> => ({
   op: Discord.GatewayOpcode.IDENTIFY,
   d,
 })
 
-export const resume = (d: Discord.Resume): Discord.GatewayPayload => ({
+export const resume = (
+  d: Discord.Resume,
+): Discord.GatewayPayload<Discord.Resume> => ({
   op: Discord.GatewayOpcode.RESUME,
   d,
 })
 
 export const requestGuildMembers = (
   d: Discord.RequestGuildMember,
-): Discord.GatewayPayload => ({
+): Discord.GatewayPayload<Discord.RequestGuildMember> => ({
   op: Discord.GatewayOpcode.REQUEST_GUILD_MEMBERS,
   d,
 })
 
 export const voiceStateUpdate = (
   d: Discord.UpdateVoiceState,
-): Discord.GatewayPayload => ({
+): Discord.GatewayPayload<Discord.UpdateVoiceState> => ({
   op: Discord.GatewayOpcode.VOICE_STATE_UPDATE,
   d,
 })
 
 export const presenceUpdate = (
   d: Discord.UpdatePresence,
-): Discord.GatewayPayload => ({
+): Discord.GatewayPayload<Discord.UpdatePresence> => ({
   op: Discord.GatewayOpcode.PRESENCE_UPDATE,
   d,
 })

package/src/DiscordGateway/Shard.ts

@@ -23,6 +23,7 @@ export const make = Do($ => {
   const connect = (
     shard: [id: number, count: number],
     hub: Hub<Discord.GatewayPayload<Discord.ReceiveEvent>>,
+    sendQueue: Dequeue<Discord.GatewayPayload<Discord.SendEvent>>,
   ) =>
     Do($ => {
       const outboundQueue = $(Queue.unbounded<Message>())
@@ -155,16 +156,15 @@ export const make = Do($ => {
           $(effect)
         })
 
+      const drainSendQueue = sendQueue.take().tap(send).forever
+
       const run = socket.take
         .flatMap(onPayload)
         .forever.zipParLeft(heartbeats)
+        .zipParLeft(drainSendQueue)
         .zipParLeft(socket.run)
 
-      return {
-        run,
-        send: (p: Discord.GatewayPayload) => send(p),
-        reconnect: send(Reconnect),
-      } as const
+      return { send, run } as const
     })
 
   return { connect } as const
@@ -174,3 +174,6 @@ export interface Shard extends Effect.Success<typeof make> {}
 export const Shard = Tag<Shard>()
 export const LiveShard =
   (LiveDiscordWS + LiveRateLimiter) >> make.toLayer(Shard)
+
+export interface RunningShard
+  extends Effect.Success<ReturnType<Shard["connect"]>> {}

package/src/DiscordGateway/Sharder.ts

@@ -2,7 +2,7 @@ import { millis } from "@effect/data/Duration"
 import { DiscordConfig } from "dfx/DiscordConfig"
 import { DiscordREST } from "dfx/DiscordREST"
 import { LiveRateLimiter, RateLimiter } from "../RateLimit.js"
-import { LiveShard, Shard } from "./Shard.js"
+import { LiveShard, RunningShard, Shard } from "./Shard.js"
 import { ShardStore } from "./ShardStore.js"
 import { WebSocketCloseError, WebSocketError } from "./WS.js"
 import { Some } from "@effect/data/Option"
@@ -17,6 +17,7 @@ const make = Do($ => {
   const { gateway: config } = $(DiscordConfig)
   const limiter = $(RateLimiter)
   const shard = $(Shard)
+  const currentShards = $(Ref.make(HashSet.empty<RunningShard>()))
 
   const takeConfig = (totalCount: number) =>
     Do($ => {
@@ -55,7 +56,10 @@ const make = Do($ => {
       ),
   )
 
-  const run = (hub: Hub<Discord.GatewayPayload<Discord.ReceiveEvent>>) =>
+  const run = (
+    hub: Hub<Discord.GatewayPayload<Discord.ReceiveEvent>>,
+    sendQueue: Dequeue<Discord.GatewayPayload<Discord.SendEvent>>,
+  ) =>
     Do($ => {
       const deferred = $(
         Deferred.make<WebSocketError | WebSocketCloseError, never>(),
@@ -75,9 +79,16 @@ const make = Do($ => {
             config.identifyRateLimit[1],
           ),
         )
-        .flatMap(c => shard.connect([c.id, c.totalCount], hub))
+        .flatMap(c => shard.connect([c.id, c.totalCount], hub, sendQueue))
         .flatMap(
-          shard => shard.run.catchAllCause(_ => deferred.failCause(_)).fork,
+          shard =>
+            currentShards
+              .update(_ => _.add(shard))
+              .acquireUseRelease(
+                () => shard.run,
+                () => currentShards.update(_ => _.remove(shard)),
+              )
+              .catchAllCause(_ => deferred.failCause(_)).fork,
         ).forever
 
       const spawners = Chunk.range(
@@ -94,7 +105,7 @@ const make = Do($ => {
       )
     })
 
-  return { run } as const
+  return { shards: currentShards.get, run } as const
 })
 
 export interface Sharder extends Effect.Success<typeof make> {}

package/src/DiscordGateway.ts

@@ -24,18 +24,26 @@ export const make = Do($ => {
   const sharder = $(Sharder)
   const hub = $(Hub.unbounded<Discord.GatewayPayload<Discord.ReceiveEvent>>())
 
+  const sendQueue = $(
+    Queue.unbounded<Discord.GatewayPayload<Discord.SendEvent>>(),
+  )
+  const send = (payload: Discord.GatewayPayload<Discord.SendEvent>) =>
+    sendQueue.offer(payload)
+
   const dispatch = Stream.fromHub(hub)
   const fromDispatch = fromDispatchFactory(dispatch)
   const handleDispatch = handleDispatchFactory(hub)
 
-  const run = sharder.run(hub)
+  const run = sharder.run(hub, sendQueue)
 
   return {
     run,
     dispatch,
     fromDispatch,
     handleDispatch,
-  }
+    send,
+    shards: sharder.shards,
+  } as const
 })
 
 export interface DiscordGateway extends Effect.Success<typeof make> {}

package/src/gateway.ts

@@ -10,6 +10,7 @@ export { DiscordGateway, LiveDiscordGateway } from "./DiscordGateway.js"
 export * as DiscordWS from "./DiscordGateway/DiscordWS.js"
 export * as Shard from "./DiscordGateway/Shard.js"
 export * as ShardStore from "./DiscordGateway/ShardStore.js"
+export * as SendEvent from "./DiscordGateway/Shard/sendEvents.js"
 export * as WS from "./DiscordGateway/WS.js"
 export {
   InteractionsRegistry,

package/src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.48.3",
+  "version": "0.50.0",
   "type": "module",
   "publishConfig": {
     "access": "public",
@@ -32,7 +32,7 @@
     "dotenv": "^16.1.4",
     "lerna": "^7.0.0",
     "madge": "^6.1.0",
-    "typescript": "https://cdn.jsdelivr.net/npm/@tsplus/installer@0.0.171/compiler/typescript.tgz"
+    "typescript": "https://cdn.jsdelivr.net/npm/@tsplus/installer@0.0.177/compiler/typescript.tgz"
   },
   "dependencies": {
     "@effect-http/client": "^0.27.0",
@@ -48,5 +48,5 @@
     "ws": "^8.13.0"
   },
   "sideEffects": false,
-  "gitHead": "b0bd6d7e3f28fe212fcd4b4f3d7d24e7d7cfcf6c"
+  "gitHead": "68e33961a8d1e6e1cafa91837a24a7f537042006"
 }