dfx 0.21.4 → 0.21.6

package/DiscordGateway/DiscordWS/index.d.ts

@@ -1,23 +1,22 @@
 /// <reference types="ws" />
-import { Log } from "dfx/Log/index";
-import { Context, Discord, Effect, Layer, Stream } from "dfx/_common";
+import { Discord, Effect, Stream } from "dfx/_common";
+import { WS } from "dfx/gateway";
 import WebSocket from "isomorphic-ws";
-import * as WS from "../WS/index.js";
 export type Message = Discord.GatewayPayload | WS.Reconnect;
 export interface OpenOpts {
     url?: string;
     version?: number;
     encoding?: DiscordWSCodec;
-    outbound: Effect.Effect<never, never, Message>;
+    outbound: Effect<never, never, Message>;
 }
 export interface DiscordWSCodec {
     type: "json" | "etf";
     encode: (p: Discord.GatewayPayload) => string;
     decode: (p: WebSocket.Data) => Discord.GatewayPayload;
 }
-export declare const DiscordWSCodec: Context.Tag<DiscordWSCodec>;
-export declare const LiveJsonDiscordWSCodec: Layer.Layer<never, never, DiscordWSCodec>;
-export declare const make: ({ url, version, outbound, }: OpenOpts) => Effect.Effect<Log | DiscordWSCodec, never, {
-    source: Stream.Stream<never, never, Discord.GatewayPayload<any>>;
-    setUrl: (url: string) => Effect.Effect<never, never, void>;
+export declare const DiscordWSCodec: import("../../_common.js").Tag<DiscordWSCodec>;
+export declare const LiveJsonDiscordWSCodec: import("../../_common.js").Layer<never, never, DiscordWSCodec>;
+export declare const make: ({ url, version, outbound, }: OpenOpts) => import("../../_common.js").Effect<import("../../Log/index.js").Log | DiscordWSCodec, never, {
+    source: import("../../_common.js").Stream<never, never, import("../../types.js").GatewayPayload<any>>;
+    setUrl: (url: string) => import("../../_common.js").Effect<never, never, void>;
 }>;

package/DiscordGateway/DiscordWS/index.js

@@ -1,22 +1,25 @@
-import * as tsplus_module_1 from "@effect/stream/Stream";
-import * as tsplus_module_2 from "@effect/io/Effect";
-import * as tsplus_module_3 from "@effect/io/Ref";
-import { Log } from "dfx/Log/index";
-import { Context, Duration, Effect, Layer, Ref, Schedule, Stream, } from "dfx/_common";
-import * as WS from "../WS/index.js";
-export const DiscordWSCodec = Context.Tag();
-export const LiveJsonDiscordWSCodec = Layer.succeed(DiscordWSCodec)({
+import * as tsplus_module_1 from "dfx/_common";
+import * as tsplus_module_2 from "@effect/io/Layer";
+import * as tsplus_module_3 from "@fp-ts/data/Duration";
+import * as tsplus_module_4 from "@effect/io/Schedule";
+import * as tsplus_module_5 from "@effect/stream/Stream";
+import * as tsplus_module_6 from "dfx/gateway";
+import * as tsplus_module_7 from "dfx";
+import * as tsplus_module_8 from "@effect/io/Effect";
+import * as tsplus_module_9 from "@effect/io/Ref";
+export const DiscordWSCodec = tsplus_module_1.Tag();
+export const LiveJsonDiscordWSCodec = tsplus_module_2.succeed(DiscordWSCodec)({
     type: "json",
     encode: (p) => JSON.stringify(p),
     decode: (p) => JSON.parse(p.toString("utf8")),
 });
-export const make = ({ url = "wss://gateway.discord.gg/", version = 10, outbound, }) => tsplus_module_2.flatMap(encoding => tsplus_module_2.flatMap(urlRef => {
-    const setUrl = (url) => tsplus_module_3.set(`${url}?v=${version}&encoding=${encoding.type}`)(urlRef);
-    const take = tsplus_module_2.map((a) => a === WS.Reconnect ? a : encoding.encode(a))(outbound);
-    return tsplus_module_2.map(log => {
-        const ws = Stream.provideService(Log)(log)(WS.make(urlRef, take));
-        const source = tsplus_module_1.map(encoding.decode)(tsplus_module_1.retry(Schedule.exponential(Duration.seconds(0.5)))(tsplus_module_1.tapError((e) => log.info("DiscordWS", "ERROR", e))(ws)));
+export const make = ({ url = "wss://gateway.discord.gg/", version = 10, outbound, }) => tsplus_module_8.flatMap(encoding => tsplus_module_8.flatMap(urlRef => {
+    const setUrl = (url) => tsplus_module_9.set(`${url}?v=${version}&encoding=${encoding.type}`)(urlRef);
+    const take = tsplus_module_8.map((a) => a === tsplus_module_6.WS.Reconnect ? a : encoding.encode(a))(outbound);
+    return tsplus_module_8.map(log => {
+        const ws = tsplus_module_5.provideService(tsplus_module_7.Log.Log)(log)(tsplus_module_6.WS.make(urlRef, take));
+        const source = tsplus_module_5.map(encoding.decode)(tsplus_module_5.retry(tsplus_module_4.exponential(tsplus_module_3.seconds(0.5)))(tsplus_module_5.tapError((e) => log.info("DiscordWS", "ERROR", e))(ws)));
         return { source, setUrl };
-    })(Effect.service(Log));
-})(Ref.make(`${url}?v=${version}&encoding=${encoding.type}`)))(Effect.service(DiscordWSCodec));
+    })(tsplus_module_8.service(tsplus_module_7.Log.Log));
+})(tsplus_module_9.make(`${url}?v=${version}&encoding=${encoding.type}`)))(tsplus_module_8.service(DiscordWSCodec));
 //# sourceMappingURL=index.js.map

package/DiscordGateway/DiscordWS/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/DiscordWS/index.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACnC,OAAO,EACL,OAAO,EAEP,QAAQ,EACR,MAAM,EACN,KAAK,EACL,GAAG,EACH,QAAQ,EACR,MAAM,GACP,MAAM,aAAa,CAAA;AAEpB,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAgBpC,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,EAAkB,CAAA;AAC3D,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAClE,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAChC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC9C,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EACnB,GAAG,GAAG,2BAA2B,EACjC,OAAO,GAAG,EAAE,EACZ,QAAQ,GACC,EAAE,EAAE,yBAEL,QAAQ,4BACR,MAAM;IACZ,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE,CAC7B,oBAAW,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,EAA1D,MAAM,CAAqD,CAAA;IAC7D,MAAM,IAAI,GAAG,oBAAa,CAAC,CAAC,EAAE,EAAE,CAC9B,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EADhC,QAAQ,CAEpB,CAAA;+BACK,GAAG;QACT,MAAM,EAAE,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;QACjE,MAAM,MAAM,GAAG,oBAGR,QAAQ,CAAC,MAAM,EAHP,sBAEN,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAFrC,yBACH,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC,EADrC,EAAE,CACoC,CACA,CAKpD,CAAA;QAED,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;OAXX,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;GANhB,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,GADvD,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAmBjD,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/DiscordWS/index.ts"],"names":[],"mappings":";;;;;;;;;AAgBA,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,sBAAsB,GAAG,wBAAc,cAAc,CAAC,CAAC;IAClE,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAChC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC9C,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EACnB,GAAG,GAAG,2BAA2B,EACjC,OAAO,GAAG,EAAE,EACZ,QAAQ,GACC,EAAE,EAAE,yBAEL,QAAQ,4BACR,MAAM;IACZ,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE,CAC7B,oBAAW,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,EAA1D,MAAM,CAAqD,CAAA;IAC7D,MAAM,IAAI,GAAG,oBAAa,CAAC,CAAC,EAAE,EAAE,CAC9B,CAAC,KAAK,gBAAA,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EADhC,QAAQ,CAEpB,CAAA;+BACK,GAAG;QACT,MAAM,EAAE,GAAG,+BAAsB,gBAAA,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,gBAAA,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;QACrE,MAAM,MAAM,GAAG,oBAGR,QAAQ,CAAC,MAAM,EAHP,sBAEN,4BAAqB,wBAAiB,GAAG,CAAC,CAAC,EAFrC,yBACH,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC,EADrC,EAAE,CACoC,CACA,CACkB,CAAA;QAEvE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;OAPX,wBAAe,gBAAA,GAAG,CAAC,GAAG,CAAC;GANpB,qBAAS,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,GADvD,wBAAe,cAAc,CAAC,CAejD,CAAA"}

package/DiscordGateway/Shard/heartbeats.d.ts

@@ -1,3 +1,3 @@
-import { Discord, Option, Ref, Stream } from "dfx/_common";
-import * as DiscordWS from "../DiscordWS/index.js";
-export declare const fromRaw: <R, E>(source: Stream.Stream<R, E, Discord.GatewayPayload<any>>, seqRef: Ref.Ref<Option.Option<number>>) => Stream.Stream<R, E, DiscordWS.Message>;
+import { Ref, Maybe, Effect, Stream, Discord } from "dfx/_common";
+import { DiscordWS } from "dfx/gateway";
+export declare const fromRaw: <R, E>(source: import("../../_common.js").Stream<R, E, import("../../types.js").GatewayPayload<any>>, seqRef: Ref<Maybe<number>>) => import("../../_common.js").Stream<R, E, import("../DiscordWS/index.js").Message>;

package/DiscordGateway/Shard/heartbeats.js

@@ -1,17 +1,19 @@
 import * as tsplus_module_1 from "@effect/io/Ref";
 import * as tsplus_module_2 from "@fp-ts/data/Option";
 import * as tsplus_module_3 from "@effect/io/Effect";
-import * as tsplus_module_4 from "@effect/stream/Stream";
-import * as tsplus_module_5 from "@effect/io/Schedule";
-import { Duration, Effect, pipe, Ref, Schedule, Stream, } from "dfx/_common";
-import * as WS from "../WS/index.js";
+import * as tsplus_module_4 from "dfx/gateway";
+import * as tsplus_module_5 from "dfx/_common";
+import * as tsplus_module_6 from "@effect/stream/Stream";
+import * as tsplus_module_7 from "@effect/io/Schedule";
+import * as tsplus_module_8 from "@fp-ts/data/Function";
 import * as SendEvents from "./sendEvents.js";
 import * as Utils from "./utils.js";
+import { millis } from "@fp-ts/data/Duration";
 const send = (ref, seqRef) => tsplus_module_3.tap(() => tsplus_module_1.set(false)(ref))(tsplus_module_3.map((a) => SendEvents.heartbeat(tsplus_module_2.getOrNull(a)))(tsplus_module_1.get(seqRef)));
-const maybeSend = (ref, seqRef) => tsplus_module_3.flatMap((acked) => acked ? send(ref, seqRef) : Effect.succeed(WS.Reconnect))(tsplus_module_1.get(ref));
-export const fromRaw = (source, seqRef) => pipe(tsplus_module_3.map((ackedRef) => {
-    const heartbeats = tsplus_module_4.mapEffect(() => maybeSend(ackedRef, seqRef))(pipe(tsplus_module_4.tap(() => tsplus_module_1.set(true)(ackedRef))(Utils.opCode(source)(10 /* Discord.GatewayOpcode.HELLO */)), Stream.flatMapParSwitch(1)((p) => Stream.fromSchedule(tsplus_module_5.andThen(Schedule.spaced(Duration.millis(p.d.heartbeat_interval)))(Schedule.duration(Duration.millis(p.d.heartbeat_interval * Math.random())))))));
-    const acks = tsplus_module_4.drain(tsplus_module_4.tap(() => tsplus_module_1.set(true)(ackedRef))(Utils.opCode(source)(11 /* Discord.GatewayOpcode.HEARTBEAT_ACK */)));
-    return tsplus_module_4.merge(acks)(heartbeats);
-})(Ref.make(true)), Stream.unwrap);
+const maybeSend = (ref, seqRef) => tsplus_module_3.flatMap((acked) => acked ? send(ref, seqRef) : tsplus_module_3.succeed(tsplus_module_4.WS.Reconnect))(tsplus_module_1.get(ref));
+export const fromRaw = (source, seqRef) => tsplus_module_8.pipe(tsplus_module_3.map((ackedRef) => {
+    const heartbeats = tsplus_module_6.mapEffect(() => maybeSend(ackedRef, seqRef))(tsplus_module_8.pipe(tsplus_module_6.tap(() => tsplus_module_1.set(true)(ackedRef))(Utils.opCode(source)(10 /* Discord.GatewayOpcode.HELLO */)), tsplus_module_6.flatMapParSwitch(1)((p) => tsplus_module_6.fromSchedule(tsplus_module_7.andThen(tsplus_module_7.spaced(millis(p.d.heartbeat_interval)))(tsplus_module_7.duration(millis(p.d.heartbeat_interval * Math.random())))))));
+    const acks = tsplus_module_6.drain(tsplus_module_6.tap(() => tsplus_module_1.set(true)(ackedRef))(Utils.opCode(source)(11 /* Discord.GatewayOpcode.HEARTBEAT_ACK */)));
+    return tsplus_module_6.merge(acks)(heartbeats);
+})(tsplus_module_1.make(true)), tsplus_module_6.unwrap);
 //# sourceMappingURL=heartbeats.js.map

package/DiscordGateway/Shard/heartbeats.js.map

@@ -1 +1 @@
-{"version":3,"file":"heartbeats.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/heartbeats.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EAEL,QAAQ,EACR,MAAM,EAEN,IAAI,EACJ,GAAG,EACH,QAAQ,EACR,MAAM,GACP,MAAM,aAAa,CAAA;AAEpB,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC,MAAM,IAAI,GAAG,CAAC,GAAqB,EAAE,MAAsC,EAAE,EAAE,CAC7E,oBAEO,GAAG,EAAE,CAAC,oBAAQ,KAAK,EAAb,GAAG,CAAW,EAF3B,oBACO,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,2BAAC,CAAC,EAAW,sBAD/C,MAAM,EAC0C,CACpB,CAAA;AAE9B,MAAM,SAAS,GAAG,CAChB,GAAqB,EACrB,MAAsC,EACtC,EAAE,CACF,wBACE,CAAC,KAAK,EAAkD,EAAE,CACxD,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,sBAF5D,GAAG,EAGF,CAAA;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,MAAmD,EACnD,MAAsC,EACtC,EAAE,CACF,IAAI,CACF,oBAAmB,CAAC,QAAQ,EAAE,EAAE;IAC9B,MAAM,UAAU,GAAG,0BAaP,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,EAb1B,IAAI,CACrB,oBAEM,GAAG,EAAE,CAAC,oBAAa,IAAI,EAAjB,QAAQ,CAAU,EAF9B,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,sCAEnB,CAA8B,EAC/B,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/B,MAAM,CAAC,YAAY,CACjB,wBAGE,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,kBAAkB,CAAC,CAAC,EAH3D,QAAQ,CAAC,QAAQ,CACf,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,kBAAkB,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CACzD,CAEA,CACF,CACF,CACF,CAA6C,CAAA;IAE9C,MAAM,IAAI,yBAAG,oBAEP,GAAG,EAAE,CAAC,oBAAa,IAAI,EAAjB,QAAQ,CAAU,EAFjB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,8CAEhC,CAA8B,CAAM,CAAA;IAErC,OAAO,sBAAiB,IAAI,EAArB,UAAU,CAAY,CAAA;AAC/B,CAAC,EArBD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAqBZ,EACF,MAAM,CAAC,MAAM,CACd,CAAA"}
+{"version":3,"file":"heartbeats.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/heartbeats.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAE7C,MAAM,IAAI,GAAG,CAAC,GAAiB,EAAE,MAA0B,EAAE,EAAE,CAC7D,oBAEO,GAAG,EAAE,CAAC,oBAAQ,KAAK,EAAb,GAAG,CAAW,EAF3B,oBACO,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,2BAAC,CAAC,EAAW,sBAD/C,MAAM,EAC0C,CACpB,CAAA;AAE9B,MAAM,SAAS,GAAG,CAAC,GAAiB,EAAE,MAA0B,EAAE,EAAE,CAClE,wBACE,CAAC,KAAK,EAA2C,EAAE,CACjD,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,wBAAe,gBAAA,EAAE,CAAC,SAAS,CAAC,sBAF5D,GAAG,EAGF,CAAA;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,MAA4C,EAC5C,MAA0B,EAC1B,EAAE,CACF,gBAAA,IAAI,CACF,oBAAmB,CAAC,QAAQ,EAAE,EAAE;IAC9B,MAAM,UAAU,GAAG,0BAWP,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,EAX1B,gBAAA,IAAI,CACrB,oBAEM,GAAG,EAAE,CAAC,oBAAa,IAAI,EAAjB,QAAQ,CAAU,EAF9B,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,sCAEnB,CAA8B,EAC/B,iCAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/B,6BACE,wBAEU,uBAAgB,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,kBAAkB,CAAC,CAAC,EAF1D,yBACE,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,kBAAkB,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAChD,CAA0D,CAC5D,CACF,CACF,CAA6C,CAAA;IAE9C,MAAM,IAAI,yBAAG,oBAEP,GAAG,EAAE,CAAC,oBAAa,IAAI,EAAjB,QAAQ,CAAU,EAFjB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,8CAEhC,CAA8B,CAAM,CAAA;IAErC,OAAO,sBAAiB,IAAI,EAArB,UAAU,CAAY,CAAA;AAC/B,CAAC,EAnBD,qBAAS,IAAI,CAAC,CAmBZ,yBAEH,CAAA"}

package/DiscordGateway/Shard/identify.d.ts

@@ -1,5 +1,4 @@
-import { Discord } from "dfx";
-import { Option, Ref, Stream } from "dfx/_common";
+import { Discord, Ref, Maybe, Stream } from "dfx/_common";
 export interface Options {
     token: string;
     intents: number;
@@ -7,7 +6,7 @@ export interface Options {
     presence?: Discord.UpdatePresence;
 }
 export interface Requirements {
-    latestReady: Ref.Ref<Option.Option<Discord.ReadyEvent>>;
-    latestSequence: Ref.Ref<Option.Option<number>>;
+    latestReady: Ref<Maybe<Discord.ReadyEvent>>;
+    latestSequence: Ref<Maybe<number>>;
 }
-export declare const fromRaw: <R, E>(source: Stream.Stream<R, E, Discord.GatewayPayload<any>>, { latestReady, latestSequence, ...opts }: Options & Requirements) => Stream.Stream<R, E, Discord.GatewayPayload<any>>;
+export declare const fromRaw: <R, E>(source: import("../../_common.js").Stream<R, E, import("../../types.js").GatewayPayload<any>>, { latestReady, latestSequence, ...opts }: Options & Requirements) => import("../../_common.js").Stream<R, E, import("../../types.js").GatewayPayload<any>>;

package/DiscordGateway/Shard/identify.js

@@ -1,11 +1,11 @@
 import * as tsplus_module_1 from "@fp-ts/data/Option";
 import * as tsplus_module_2 from "@effect/io/Ref";
 import * as tsplus_module_3 from "@effect/io/Effect";
-import * as tsplus_module_4 from "@effect/stream/Stream";
+import * as tsplus_module_4 from "dfx/_common";
+import * as tsplus_module_5 from "@effect/stream/Stream";
 import * as SendEvents from "./sendEvents.js";
 import * as OS from "os";
 import { opCode } from "./utils.js";
-import { Option } from "dfx/_common";
 const identify = ({ token, intents, shard, presence }) => SendEvents.identify({
     token,
     intents,
@@ -22,9 +22,9 @@ const resume = (token, ready, seq) => SendEvents.resume({
     session_id: ready.session_id,
     seq,
 });
-const identifyOrResume = (opts, ready, seq) => tsplus_module_3.flatMap(readyEvent => tsplus_module_3.map(seqNumber => tsplus_module_1.match(() => identify(opts), ({ readyEvent, seqNumber }) => resume(opts.token, readyEvent, seqNumber))(Option.struct({
+const identifyOrResume = (opts, ready, seq) => tsplus_module_3.flatMap(readyEvent => tsplus_module_3.map(seqNumber => tsplus_module_1.match(() => identify(opts), ({ readyEvent, seqNumber }) => resume(opts.token, readyEvent, seqNumber))(tsplus_module_1.struct({
     readyEvent,
     seqNumber,
 })))(tsplus_module_2.get(seq)))(tsplus_module_2.get(ready));
-export const fromRaw = (source, { latestReady, latestSequence, ...opts }) => tsplus_module_4.mapEffect(() => identifyOrResume(opts, latestReady, latestSequence))(opCode(source)(10 /* Discord.GatewayOpcode.HELLO */));
+export const fromRaw = (source, { latestReady, latestSequence, ...opts }) => tsplus_module_5.mapEffect(() => identifyOrResume(opts, latestReady, latestSequence))(opCode(source)(10 /* Discord.GatewayOpcode.HELLO */));
 //# sourceMappingURL=identify.js.map

package/DiscordGateway/Shard/identify.js.map

@@ -1 +1 @@
-{"version":3,"file":"identify.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/identify.ts"],"names":[],"mappings":";;;;AAAA,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAEnC,OAAO,EAAE,MAAM,EAAe,MAAM,aAAa,CAAA;AAcjD,MAAM,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAW,EAAE,EAAE,CAChE,UAAU,CAAC,QAAQ,CAAC;IAClB,KAAK;IACL,OAAO;IACP,UAAU,EAAE;QACV,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE;QACjB,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,KAAK;KACd;IACD,KAAK;IACL,QAAQ;CACT,CAAC,CAAA;AAEJ,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,KAAyB,EAAE,GAAW,EAAE,EAAE,CACvE,UAAU,CAAC,MAAM,CAAC;IAChB,KAAK;IACL,UAAU,EAAE,KAAK,CAAC,UAAU;IAC5B,GAAG;CACJ,CAAC,CAAA;AAEJ,MAAM,gBAAgB,GAAG,CACvB,IAAa,EACb,KAAiD,EACjD,GAAmC,EACnC,EAAE,yBAEM,UAAU,wBACV,SAAS,IAER,sBAIL,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EACpB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,CAAC,EALnE,MAAM,CAAC,MAAM,CAAC;IACnB,UAAU;IACV,SAAS;CACV,CAAC,CAGD,sBARmB,GAAG,wBADF,KAAK,EAU1B,CAAA;AAEJ,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,MAAmD,EACnD,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,IAAI,EAA0B,EAChE,EAAE,CACF,0BACE,GAAG,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,EAD3D,MAAM,CAAC,MAAM,CAAC,sCAAiD,CAE9D,CAAA"}
+{"version":3,"file":"identify.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/identify.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAcnC,MAAM,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAW,EAAE,EAAE,CAChE,UAAU,CAAC,QAAQ,CAAC;IAClB,KAAK;IACL,OAAO;IACP,UAAU,EAAE;QACV,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE;QACjB,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,KAAK;KACd;IACD,KAAK;IACL,QAAQ;CACT,CAAC,CAAA;AAEJ,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,KAAyB,EAAE,GAAW,EAAE,EAAE,CACvE,UAAU,CAAC,MAAM,CAAC;IAChB,KAAK;IACL,UAAU,EAAE,KAAK,CAAC,UAAU;IAC5B,GAAG;CACJ,CAAC,CAAA;AAEJ,MAAM,gBAAgB,GAAG,CACvB,IAAa,EACb,KAAqC,EACrC,GAAuB,EACvB,EAAE,yBAEM,UAAU,wBACV,SAAS,IAER,sBAIL,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EACpB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,CAAC,EALnE,uBAAa;IAClB,UAAU;IACV,SAAS;CACV,CAAC,CAGD,sBARmB,GAAG,wBADF,KAAK,EAU1B,CAAA;AAEJ,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,MAA4C,EAC5C,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,IAAI,EAA0B,EAChE,EAAE,CACF,0BACE,GAAG,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,EAD3D,MAAM,CAAC,MAAM,CAAC,sCAAiD,CAE9D,CAAA"}

package/DiscordGateway/Shard/index.d.ts

@@ -1,10 +1,9 @@
-import { Config, RateLimiter } from "dfx";
 import { DiscordWS } from "dfx/gateway";
-import { Discord, Effect, Scope, Stream } from "dfx/_common";
-export declare const make: (shard: [id: number, count: number]) => Effect.Effect<Scope.Scope | Config.DiscordConfig | import("../../Log/index.js").Log | RateLimiter | DiscordWS.DiscordWSCodec, never, {
-    run: Effect.Effect<never, never, void>;
-    raw: Stream.Stream<never, never, Discord.GatewayPayload<any>>;
-    dispatch: Stream.Stream<never, never, Discord.GatewayPayload<Discord.ReceiveEvent>>;
-    send: (p: Discord.GatewayPayload) => Effect.Effect<never, never, boolean>;
-    reconnect: Effect.Effect<never, never, boolean>;
+import { Discord } from "dfx/_common";
+export declare const make: (shard: [id: number, count: number]) => import("../../_common.js").Effect<import("../../_common.js").Scope | import("../../DiscordConfig/index.js").DiscordConfig | import("../../Log/index.js").Log | import("../../index.js").RateLimiter | import("../DiscordWS/index.js").DiscordWSCodec, never, {
+    run: import("../../_common.js").Effect<never, never, void>;
+    raw: import("../../_common.js").Stream<never, never, import("../../types.js").GatewayPayload<any>>;
+    dispatch: import("../../_common.js").Stream<never, never, import("../../types.js").GatewayPayload<import("../../types.js").ReceiveEvent>>;
+    send: (p: Discord.GatewayPayload) => import("../../_common.js").Effect<never, never, boolean>;
+    reconnect: import("../../_common.js").Effect<never, never, boolean>;
 }>;

package/DiscordGateway/Shard/index.js

@@ -1,27 +1,27 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
-import * as tsplus_module_2 from "@effect/stream/Stream";
-import * as tsplus_module_3 from "@fp-ts/data/Option";
-import { Config, RateLimiter } from "dfx";
-import { DiscordWS, WS } from "dfx/gateway";
-import { Duration, Effect, Option, Queue, Scope, Stream, } from "dfx/_common";
+import * as tsplus_module_2 from "dfx/gateway";
+import * as tsplus_module_3 from "@effect/stream/Stream";
+import * as tsplus_module_4 from "dfx/_common";
+import * as tsplus_module_5 from "@fp-ts/data/Option";
+import * as tsplus_module_6 from "@fp-ts/data/Duration";
+import * as tsplus_module_7 from "@effect/io/Queue";
+import * as tsplus_module_8 from "dfx";
 import * as Heartbeats from "./heartbeats.js";
 import * as Identify from "./identify.js";
 import * as InvalidSession from "./invalidSession.js";
 import * as Utils from "./utils.js";
-const _scope = Scope.Tag;
-const _stream = Stream.StreamTypeId;
 export const make = (shard) => tsplus_module_1.flatMap(({ token, gateway }) => tsplus_module_1.flatMap(limiter => tsplus_module_1.flatMap(outboundQueue => {
-    const outbound = tsplus_module_1.tap(() => limiter.maybeWait("dfx.shard.send", Duration.minutes(1), 120))(outboundQueue
+    const outbound = tsplus_module_1.tap(() => limiter.maybeWait("dfx.shard.send", tsplus_module_6.minutes(1), 120))(outboundQueue
         .take());
     const send = (p) => outboundQueue.offer(p);
     return tsplus_module_1.flatMap(socket => tsplus_module_1.flatMap(raw => tsplus_module_1.flatMap(([latestReady, updateLatestReady]) => tsplus_module_1.map(([latestSequence, updateLatestSequence]) => {
-        const maybeUpdateUrl = (p) => tsplus_module_3.match(() => Effect.unit(), (a) => socket.setUrl(a.resume_gateway_url))(tsplus_module_3.map((p) => p.d)(tsplus_module_3.filter((p) => p.op === 0 /* Discord.GatewayOpcode.DISPATCH */ && p.t === "READY")(Option.some(p))));
-        const updateRefs = tsplus_module_2.runDrain(tsplus_module_2.tap(maybeUpdateUrl)(tsplus_module_2.tap(updateLatestSequence)(tsplus_module_2.tap(updateLatestReady)(raw))));
+        const maybeUpdateUrl = (p) => tsplus_module_5.match(() => tsplus_module_1.unit(), (a) => socket.setUrl(a.resume_gateway_url))(tsplus_module_5.map((p) => p.d)(tsplus_module_5.filter((p) => p.op === 0 /* Discord.GatewayOpcode.DISPATCH */ && p.t === "READY")(tsplus_module_5.some(p))));
+        const updateRefs = tsplus_module_3.runDrain(tsplus_module_3.tap(maybeUpdateUrl)(tsplus_module_3.tap(updateLatestSequence)(tsplus_module_3.tap(updateLatestReady)(raw))));
         // heartbeats
-        const heartbeatEffects = tsplus_module_2.runForEach(send)(Heartbeats.fromRaw(raw, latestSequence));
-        const dispatch = tsplus_module_2.filter((p) => p.op === 0 /* Discord.GatewayOpcode.DISPATCH */)(raw);
+        const heartbeatEffects = tsplus_module_3.runForEach(send)(Heartbeats.fromRaw(raw, latestSequence));
+        const dispatch = tsplus_module_3.filter((p) => p.op === 0 /* Discord.GatewayOpcode.DISPATCH */)(raw);
         // identify
-        const identifyEffects = tsplus_module_2.runForEach(send)(Identify.fromRaw(raw, {
+        const identifyEffects = tsplus_module_3.runForEach(send)(Identify.fromRaw(raw, {
             token,
             shard,
             intents: gateway.intents,
@@ -30,14 +30,14 @@ export const make = (shard) => tsplus_module_1.flatMap(({ token, gateway }) => t
             latestReady,
         }));
         // invalid session
-        const invalidEffects = tsplus_module_2.runForEach(send)(InvalidSession.fromRaw(raw, latestReady));
+        const invalidEffects = tsplus_module_3.runForEach(send)(InvalidSession.fromRaw(raw, latestReady));
         return {
             run: tsplus_module_1.asUnit(tsplus_module_1.zipPar(invalidEffects)(tsplus_module_1.zipPar(identifyEffects)(tsplus_module_1.zipPar(heartbeatEffects)(updateRefs)))),
             raw,
             dispatch,
             send: (p) => send(p),
-            reconnect: send(WS.Reconnect),
+            reconnect: send(tsplus_module_2.WS.Reconnect),
         };
-    })(Utils.latest((p) => Option.fromNullable(p.s))))(Utils.latest((p) => tsplus_module_3.map((p) => p.d)(tsplus_module_3.filter((p) => p.op === 0 /* Discord.GatewayOpcode.DISPATCH */ && p.t === "READY")(Option.some(p))))))(tsplus_module_2.broadcastDynamic(1)(socket.source)))(DiscordWS.make({ outbound }));
-})(Queue.unbounded()))(Effect.service(RateLimiter)))(Effect.service(Config.DiscordConfig));
+    })(Utils.latest((p) => tsplus_module_5.fromNullable(p.s))))(Utils.latest((p) => tsplus_module_5.map((p) => p.d)(tsplus_module_5.filter((p) => p.op === 0 /* Discord.GatewayOpcode.DISPATCH */ && p.t === "READY")(tsplus_module_5.some(p))))))(tsplus_module_3.broadcastDynamic(1)(socket.source)))(tsplus_module_2.DiscordWS.make({ outbound }));
+})(tsplus_module_7.unbounded()))(tsplus_module_1.service(tsplus_module_8.RateLimiter)))(tsplus_module_1.service(tsplus_module_8.Config.DiscordConfig));
 //# sourceMappingURL=index.js.map

package/DiscordGateway/Shard/index.js.map

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

package/DiscordGateway/Shard/invalidSession.d.ts

@@ -1,3 +1,3 @@
+import { Stream, Discord, Ref, Maybe } from "dfx/_common";
 import { DiscordWS } from "dfx/gateway";
-import { Discord, Option, Ref, Stream } from "dfx/_common";
-export declare const fromRaw: <R, E>(raw: Stream.Stream<R, E, Discord.GatewayPayload<any>>, latestReady: Ref.Ref<Option.Option<Discord.ReadyEvent>>) => Stream.Stream<R, E, DiscordWS.Message>;
+export declare const fromRaw: <R, E>(raw: import("../../_common.js").Stream<R, E, import("../../types.js").GatewayPayload<any>>, latestReady: Ref<Maybe<Discord.ReadyEvent>>) => import("../../_common.js").Stream<R, E, import("../DiscordWS/index.js").Message>;

package/DiscordGateway/Shard/invalidSession.js

@@ -1,7 +1,9 @@
-import * as tsplus_module_1 from "@effect/io/Ref";
-import * as tsplus_module_2 from "@effect/stream/Stream";
-import { WS } from "dfx/gateway";
-import { Effect, Option } from "dfx/_common";
+import * as tsplus_module_1 from "dfx/gateway";
+import * as tsplus_module_2 from "@effect/io/Effect";
+import * as tsplus_module_3 from "@fp-ts/data/Option";
+import * as tsplus_module_4 from "@effect/io/Ref";
+import * as tsplus_module_5 from "dfx/_common";
+import * as tsplus_module_6 from "@effect/stream/Stream";
 import { opCode } from "./utils.js";
-export const fromRaw = (raw, latestReady) => tsplus_module_2.map(() => WS.Reconnect)(tsplus_module_2.tap((p) => (p.d ? Effect.unit() : tsplus_module_1.set(Option.none)(latestReady)))(opCode(raw)(9 /* Discord.GatewayOpcode.INVALID_SESSION */)));
+export const fromRaw = (raw, latestReady) => tsplus_module_6.map(() => tsplus_module_1.WS.Reconnect)(tsplus_module_6.tap((p) => (p.d ? tsplus_module_2.unit() : tsplus_module_4.set(tsplus_module_3.none)(latestReady)))(opCode(raw)(9 /* Discord.GatewayOpcode.INVALID_SESSION */)));
 //# sourceMappingURL=invalidSession.js.map

package/DiscordGateway/Shard/invalidSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"invalidSession.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/invalidSession.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAa,EAAE,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAW,MAAM,EAAE,MAAM,EAAe,MAAM,aAAa,CAAA;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAEnC,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,GAAgD,EAChD,WAAuD,EACvD,EAAE,CACF,oBAIO,GAAsB,EAAE,CAAC,EAAE,CAAC,SAAS,EAJ5C,oBAGO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,oBAAgB,MAAM,CAAC,IAAI,EAA3B,WAAW,CAAiB,CAAC,EAHlE,MAAM,CAAC,GAAG,CAAC,+CAEV,CACkE,CACtB,CAAA"}
+{"version":3,"file":"invalidSession.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/invalidSession.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAEnC,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,GAAyC,EACzC,WAA2C,EAC3C,EAAE,CACF,oBAIO,GAAsB,EAAE,CAAC,gBAAA,EAAE,CAAC,SAAS,EAJ5C,oBAGO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAa,CAAC,CAAC,CAAC,0CAAA,WAAW,CAAgB,CAAC,EAHjE,MAAM,CAAC,GAAG,CAAC,+CAEV,CACiE,CACrB,CAAA"}

package/DiscordGateway/Shard/utils.d.ts

@@ -1,3 +1,3 @@
-import { Discord, Effect, Option, Ref, Stream } from "dfx/_common";
-export declare const opCode: <R, E>(source: Stream.Stream<R, E, Discord.GatewayPayload<any>>) => <T = any>(code: Discord.GatewayOpcode) => Stream.Stream<R, E, Discord.GatewayPayload<T>>;
-export declare const latest: <T>(f: (p: Discord.GatewayPayload) => Option.Option<T>) => Effect.Effect<never, never, readonly [Ref.Ref<Option.Option<T>>, (p: Discord.GatewayPayload<any>) => Effect.Effect<never, never, void>]>;
+import { Stream, Discord, Maybe, Ref } from "dfx/_common";
+export declare const opCode: <R, E>(source: import("../../_common.js").Stream<R, E, import("../../types.js").GatewayPayload<any>>) => <T = any>(code: Discord.GatewayOpcode) => import("../../_common.js").Stream<R, E, import("../../types.js").GatewayPayload<T>>;
+export declare const latest: <T>(f: (p: Discord.GatewayPayload) => import("../../index.js").Maybe<T>) => import("../../_common.js").Effect<never, never, readonly [import("../../_common.js").Ref<import("../../index.js").Maybe<T>>, (p: import("../../types.js").GatewayPayload<any>) => import("../../_common.js").Effect<never, never, void>]>;

package/DiscordGateway/Shard/utils.js

@@ -1,9 +1,9 @@
 import * as tsplus_module_1 from "@effect/stream/Stream";
-import * as tsplus_module_2 from "@effect/io/Ref";
+import * as tsplus_module_2 from "@effect/io/Effect";
 import * as tsplus_module_3 from "@fp-ts/data/Option";
-import * as tsplus_module_4 from "@effect/io/Effect";
-import { Effect, flow, Option, Ref } from "dfx/_common";
+import * as tsplus_module_4 from "@effect/io/Ref";
+import * as tsplus_module_5 from "@fp-ts/data/Function";
 export const opCode = (source) => (code) => tsplus_module_1.filter((p) => p.op === code)(source);
-const maybeUpdateRef = (f, ref) => flow(f, (o) => tsplus_module_3.match(Effect.unit, (a) => tsplus_module_2.set(Option.some(a))(ref))(o));
-export const latest = (f) => tsplus_module_4.map((ref) => [ref, maybeUpdateRef(f, ref)])(Ref.make(Option.none));
+const maybeUpdateRef = (f, ref) => tsplus_module_5.flow(f, (o) => tsplus_module_3.match(tsplus_module_2.unit, (a) => tsplus_module_4.set(tsplus_module_3.some(a))(ref))(o));
+export const latest = (f) => tsplus_module_2.map((ref) => [ref, maybeUpdateRef(f, ref)])(tsplus_module_4.make(tsplus_module_3.none));
 //# sourceMappingURL=utils.js.map

package/DiscordGateway/Shard/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/utils.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAW,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAU,MAAM,aAAa,CAAA;AAExE,MAAM,CAAC,MAAM,MAAM,GACjB,CAAO,MAAmD,EAAE,EAAE,CAC9D,CAAU,IAA2B,EAAE,EAAE,CACvC,uBAAc,CAAC,CAAC,EAAkC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,EAAlE,MAAM,CAA6D,CAAA;AAEvE,MAAM,cAAc,GAAG,CACrB,CAAkD,EAClD,GAA8B,EAC9B,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,sBAAQ,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAQ,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAtB,GAAG,CAAoB,EAAnD,CAAC,CAAmD,CAAC,CAAA;AAEzE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAI,CAAkD,EAAE,EAAE,CAC9E,oBACE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,EAAE,GAAG,CAAC,CAAU,EADjD,GAAG,CAAC,IAAI,CAAmB,MAAM,CAAC,IAAI,CAAC,CAEtC,CAAA"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/utils.ts"],"names":[],"mappings":";;;;;AAAA,MAAM,CAAC,MAAM,MAAM,GACjB,CAAO,MAA4C,EAAE,EAAE,CACvD,CAAU,IAA2B,EAAE,EAAE,CACvC,uBAAc,CAAC,CAAC,EAAkC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,EAAlE,MAAM,CAA6D,CAAA;AAEvE,MAAM,cAAc,GAAG,CACrB,CAA0C,EAC1C,GAAkB,EAClB,EAAE,CAAC,gBAAA,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,4CAAqB,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAQ,qBAAW,CAAC,CAAC,EAArB,GAAG,CAAmB,EAAlD,CAAC,CAAkD,CAAC,CAAA;AAExE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAI,CAA0C,EAAE,EAAE,CACtE,oBACE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,EAAE,GAAG,CAAC,CAAU,EADjD,0CAA8B,CAE7B,CAAA"}

package/DiscordGateway/ShardStore/index.d.ts

@@ -1,12 +1,12 @@
-import { Context, Effect, Layer, Option } from "dfx/_common";
+import { Effect, Maybe } from "dfx/_common";
 export interface ClaimIdContext {
     sharderCount: number;
     totalCount: number;
 }
 export interface ShardStore {
-    claimId: (ctx: ClaimIdContext) => Effect.Effect<never, never, Option.Option<number>>;
-    allClaimed: (totalCount: number) => Effect.Effect<never, never, boolean>;
-    heartbeat?: (shardId: number) => Effect.Effect<never, never, void>;
+    claimId: (ctx: ClaimIdContext) => Effect<never, never, Maybe<number>>;
+    allClaimed: (totalCount: number) => Effect<never, never, boolean>;
+    heartbeat?: (shardId: number) => Effect<never, never, void>;
 }
-export declare const ShardStore: Context.Tag<ShardStore>;
-export declare const LiveMemoryShardStore: Layer.Layer<never, never, ShardStore>;
+export declare const ShardStore: import("../../_common.js").Tag<ShardStore>;
+export declare const LiveMemoryShardStore: import("../../_common.js").Layer<never, never, ShardStore>;

package/DiscordGateway/ShardStore/index.js

@@ -1,19 +1,22 @@
-import { Context, Effect, Layer, Option } from "dfx/_common";
-export const ShardStore = Context.Tag();
+import * as tsplus_module_1 from "dfx/_common";
+import * as tsplus_module_2 from "@fp-ts/data/Option";
+import * as tsplus_module_3 from "@effect/io/Effect";
+import * as tsplus_module_4 from "@effect/io/Layer";
+export const ShardStore = tsplus_module_1.Tag();
 // Very basic shard id store, that does no health checks
 const memoryStore = () => {
     let currentId = 0;
     return {
-        claimId: ({ totalCount }) => Effect.sync(() => {
+        claimId: ({ totalCount }) => tsplus_module_3.sync(() => {
             if (currentId >= totalCount) {
-                return Option.none;
+                return tsplus_module_2.none;
             }
             const id = currentId;
             currentId++;
-            return Option.some(id);
+            return tsplus_module_2.some(id);
         }),
-        allClaimed: (totalCount) => Effect.sync(() => currentId >= totalCount),
+        allClaimed: (totalCount) => tsplus_module_3.sync(() => currentId >= totalCount),
     };
 };
-export const LiveMemoryShardStore = Layer.sync(ShardStore)(memoryStore);
+export const LiveMemoryShardStore = tsplus_module_4.sync(ShardStore)(memoryStore);
 //# sourceMappingURL=index.js.map

package/DiscordGateway/ShardStore/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/ShardStore/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAc5D,MAAM,CAAC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAc,CAAA;AAEnD,wDAAwD;AACxD,MAAM,WAAW,GAAG,GAAe,EAAE;IACnC,IAAI,SAAS,GAAG,CAAC,CAAA;IAEjB,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YACf,IAAI,SAAS,IAAI,UAAU,EAAE;gBAC3B,OAAO,MAAM,CAAC,IAAI,CAAA;aACnB;YAED,MAAM,EAAE,GAAG,SAAS,CAAA;YACpB,SAAS,EAAE,CAAA;YACX,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACxB,CAAC,CAAC;QAEJ,UAAU,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,IAAI,UAAU,CAAC;KACvE,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/ShardStore/index.ts"],"names":[],"mappings":";;;;AAUA,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAA,GAAG,EAAc,CAAA;AAE3C,wDAAwD;AACxD,MAAM,WAAW,GAAG,GAAe,EAAE;IACnC,IAAI,SAAS,GAAG,CAAC,CAAA;IAEjB,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAC1B,qBAAY,GAAG,EAAE;YACf,IAAI,SAAS,IAAI,UAAU,EAAE;gBAC3B,4BAAiB;aAClB;YAED,MAAM,EAAE,GAAG,SAAS,CAAA;YACpB,SAAS,EAAE,CAAA;YACX,OAAO,qBAAW,EAAE,CAAC,CAAA;QACvB,CAAC,CAAC;QAEJ,UAAU,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,qBAAY,GAAG,EAAE,CAAC,SAAS,IAAI,UAAU,CAAC;KACvE,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,qBAAW,UAAU,CAAC,CAAC,WAAW,CAAC,CAAA"}

package/DiscordGateway/Sharder/index.d.ts

@@ -1,18 +1,16 @@
-import { Config, DiscordREST, RateLimiter } from "dfx";
+import { Effect, Discord } from "dfx/_common";
 import { Success } from "dfx/utils/effect";
-import { Context, Discord, Effect, Layer, Scope, Stream } from "dfx/_common";
-import { ShardStore } from "../ShardStore/index.js";
-declare const make: Effect.Effect<Scope.Scope | DiscordREST | Config.DiscordConfig | import("../../Log/index.js").Log | RateLimiter | import("../DiscordWS/index.js").DiscordWSCodec | ShardStore, never, {
-    shards: Stream.Stream<never, never, {
-        run: Effect.Effect<never, never, void>;
-        raw: Stream.Stream<never, never, Discord.GatewayPayload<any>>;
-        dispatch: Stream.Stream<never, never, Discord.GatewayPayload<Discord.ReceiveEvent>>;
-        send: (p: Discord.GatewayPayload<any>) => Effect.Effect<never, never, boolean>;
-        reconnect: Effect.Effect<never, never, boolean>;
+declare const make: import("../../_common.js").Effect<import("../../_common.js").Scope | import("../../index.js").DiscordREST | import("../../DiscordConfig/index.js").DiscordConfig | import("../../Log/index.js").Log | import("../../index.js").RateLimiter | import("../DiscordWS/index.js").DiscordWSCodec | import("../ShardStore/index.js").ShardStore, never, {
+    shards: import("../../_common.js").Stream<never, never, {
+        run: import("../../_common.js").Effect<never, never, void>;
+        raw: import("../../_common.js").Stream<never, never, import("../../types.js").GatewayPayload<any>>;
+        dispatch: import("../../_common.js").Stream<never, never, import("../../types.js").GatewayPayload<import("../../types.js").ReceiveEvent>>;
+        send: (p: import("../../types.js").GatewayPayload<any>) => import("../../_common.js").Effect<never, never, boolean>;
+        reconnect: import("../../_common.js").Effect<never, never, boolean>;
     }>;
 }>;
 export interface Sharder extends Success<typeof make> {
 }
-export declare const Sharder: Context.Tag<Sharder>;
-export declare const LiveSharder: Layer.Layer<DiscordREST | Config.DiscordConfig | import("../../Log/index.js").Log | RateLimiter | import("../DiscordWS/index.js").DiscordWSCodec | ShardStore, never, Sharder>;
+export declare const Sharder: import("../../_common.js").Tag<Sharder>;
+export declare const LiveSharder: import("../../_common.js").Layer<import("../../index.js").DiscordREST | import("../../DiscordConfig/index.js").DiscordConfig | import("../../Log/index.js").Log | import("../../index.js").RateLimiter | import("../DiscordWS/index.js").DiscordWSCodec | import("../ShardStore/index.js").ShardStore, never, Sharder>;
 export {};

package/DiscordGateway/Sharder/index.js

@@ -1,15 +1,16 @@
 import * as tsplus_module_1 from "@effect/stream/Stream";
-import * as tsplus_module_2 from "@effect/stream/GroupBy";
+import * as tsplus_module_2 from "dfx/gateway";
 import * as tsplus_module_3 from "@effect/io/Effect";
-import * as tsplus_module_4 from "@fp-ts/data/Option";
-import { Config, DiscordREST, RateLimiter } from "dfx";
-import { Shard } from "dfx/gateway";
-import { Context, Duration, Effect, Layer, Option, Scope, Stream, } from "dfx/_common";
-import { ShardStore } from "../ShardStore/index.js";
-const _scope = Scope.ScopeTypeId;
+import * as tsplus_module_4 from "@effect/stream/GroupBy";
+import * as tsplus_module_5 from "@fp-ts/data/Duration";
+import * as tsplus_module_6 from "@fp-ts/data/Option";
+import * as tsplus_module_7 from "dfx";
+import * as tsplus_module_8 from "dfx/_common";
+import * as tsplus_module_9 from "@effect/io/Layer";
+import { millis } from "@fp-ts/data/Duration";
 const make = tsplus_module_3.flatMap(store => tsplus_module_3.flatMap(rest => tsplus_module_3.flatMap(({ gateway: config }) => tsplus_module_3.flatMap(limiter => {
     const configs = (totalCount) => {
-        const claimId = (sharderCount) => tsplus_module_3.flatMap((a) => tsplus_module_4.match(() => tsplus_module_3.delay(Duration.minutes(3))(claimId(sharderCount)), (id) => Effect.succeed(id))(a))(store
+        const claimId = (sharderCount) => tsplus_module_3.flatMap((a) => tsplus_module_6.match(() => tsplus_module_3.delay(tsplus_module_5.minutes(3))(claimId(sharderCount)), (id) => tsplus_module_3.succeed(id))(a))(store
             .claimId({
             totalCount,
             sharderCount,
@@ -17,13 +18,13 @@ const make = tsplus_module_3.flatMap(store => tsplus_module_3.flatMap(rest => ts
         return tsplus_module_1.map((id) => ({
             id,
             totalCount,
-        }))(Stream.unfoldEffect(0, (sharderCount) => tsplus_module_3.map((id) => Option.some([id, sharderCount + 1]))(claimId(sharderCount))));
+        }))(tsplus_module_1.unfoldEffect(0, (sharderCount) => tsplus_module_3.map((id) => tsplus_module_6.some([id, sharderCount + 1]))(claimId(sharderCount))));
     };
-    return tsplus_module_3.flatMap(gateway => tsplus_module_3.map(shards => ({ shards }))(tsplus_module_1.broadcastDynamic(1)(tsplus_module_1.flatMap((shard) => tsplus_module_1.merge(tsplus_module_1.drain(Stream.fromEffect(shard.run)))(Stream.succeed(shard)))(tsplus_module_2.evaluate((key, shardConfig) => tsplus_module_1.mapEffect((c) => Shard.make([c.id, c.totalCount]))(tsplus_module_1.tap(() => limiter.maybeWait(`dfx.sharder.${key}`, Duration.millis(config.identifyRateLimit[0]), config.identifyRateLimit[1]))(shardConfig)))(tsplus_module_1.groupBy((c) => Effect.succeed([c.id % c.concurrency, c]))(tsplus_module_1.map((config) => ({
+    return tsplus_module_3.flatMap(gateway => tsplus_module_3.map(shards => ({ shards }))(tsplus_module_1.broadcastDynamic(1)(tsplus_module_1.flatMap((shard) => tsplus_module_1.merge(tsplus_module_1.drain(tsplus_module_1.fromEffect(shard.run)))(tsplus_module_1.succeed(shard)))(tsplus_module_4.evaluate((key, shardConfig) => tsplus_module_1.mapEffect((c) => tsplus_module_2.Shard.make([c.id, c.totalCount]))(tsplus_module_1.tap(() => limiter.maybeWait(`dfx.sharder.${key}`, millis(config.identifyRateLimit[0]), config.identifyRateLimit[1]))(shardConfig)))(tsplus_module_1.groupBy((c) => tsplus_module_3.succeed([c.id % c.concurrency, c]))(tsplus_module_1.map((config) => ({
         ...config,
         url: gateway.url,
         concurrency: gateway.session_start_limit.max_concurrency,
-    }))(configs(config.shardCount ?? gateway.shards))))))))(tsplus_module_3.catchAll(() => Effect.succeed({
+    }))(configs(config.shardCount ?? gateway.shards))))))))(tsplus_module_3.catchAll(() => tsplus_module_3.succeed({
         url: "wss://gateway.discord.gg/",
         shards: 1,
         session_start_limit: {
@@ -34,7 +35,7 @@ const make = tsplus_module_3.flatMap(store => tsplus_module_3.flatMap(rest => ts
         },
     }))(tsplus_module_3.flatMap((r) => r.json)(rest
         .getGatewayBot())));
-})(Effect.service(RateLimiter)))(Effect.service(Config.DiscordConfig)))(Effect.service(DiscordREST)))(Effect.service(ShardStore));
-export const Sharder = Context.Tag();
-export const LiveSharder = Layer.scoped(Sharder)(make);
+})(tsplus_module_3.service(tsplus_module_7.RateLimiter)))(tsplus_module_3.service(tsplus_module_7.Config.DiscordConfig)))(tsplus_module_3.service(tsplus_module_7.DiscordREST)))(tsplus_module_3.service(tsplus_module_2.ShardStore.ShardStore));
+export const Sharder = tsplus_module_8.Tag();
+export const LiveSharder = tsplus_module_9.scoped(Sharder)(make);
 //# sourceMappingURL=index.js.map

package/DiscordGateway/Sharder/index.js.map

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

package/DiscordGateway/WS/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="ws" />
-import { Log } from "dfx/Log/index";
-import { Effect, Ref, Stream } from "dfx/_common";
+import { Ref, Effect } from "dfx/_common";
+import { Log } from "dfx";
 import WebSocket from "isomorphic-ws";
 export declare const Reconnect: unique symbol;
 export type Reconnect = typeof Reconnect;
@@ -17,4 +17,4 @@ export declare class WebSocketCloseError {
     readonly _tag = "WebSocketCloseError";
     constructor(code: number, reason: string);
 }
-export declare const make: (url: Ref.Ref<string>, takeOutbound: Effect.Effect<never, never, Message>) => Stream.Stream<Log, WebSocketError | WebSocketCloseError, WebSocket.Data>;
+export declare const make: (url: Ref<string>, takeOutbound: Effect<never, never, Message>) => import("../../_common.js").Stream<import("../../Log/index.js").Log, WebSocketError | WebSocketCloseError, WebSocket.Data>;