dfx 0.0.3 → 0.0.4

package/DiscordShard/commands.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.presenceUpdate = exports.voiceStateUpdate = exports.requestGuildMembers = exports.resume = exports.identify = exports.heartbeat = void 0;
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "DiscordShard/commands.ts";
+const types_1 = require("../types");
+const heartbeat = (d) => ({
+    op: types_1.GatewayOpcode.HEARTBEAT,
+    d,
+});
+exports.heartbeat = heartbeat;
+const identify = (d) => ({
+    op: types_1.GatewayOpcode.IDENTIFY,
+    d,
+});
+exports.identify = identify;
+const resume = (d) => ({
+    op: types_1.GatewayOpcode.RESUME,
+    d,
+});
+exports.resume = resume;
+const requestGuildMembers = (d) => ({
+    op: types_1.GatewayOpcode.REQUEST_GUILD_MEMBERS,
+    d,
+});
+exports.requestGuildMembers = requestGuildMembers;
+const voiceStateUpdate = (d) => ({
+    op: types_1.GatewayOpcode.VOICE_STATE_UPDATE,
+    d,
+});
+exports.voiceStateUpdate = voiceStateUpdate;
+const presenceUpdate = (d) => ({
+    op: types_1.GatewayOpcode.PRESENCE_UPDATE,
+    d,
+});
+exports.presenceUpdate = presenceUpdate;
+//# sourceMappingURL=commands.js.map

package/DiscordShard/commands.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"commands.js","sourceRoot":"","sources":["commands.ts"],"names":[],"mappings":";;;;;;AAAA,oCASiB;AAEV,MAAM,SAAS,GAAG,CAAC,CAAY,EAAkB,EAAE,CAAC,CAAC;IAC1D,EAAE,EAAE,qBAAa,CAAC,SAAS;IAC3B,CAAC;CACF,CAAC,CAAA;AAHW,QAAA,SAAS,aAGpB;AAEK,MAAM,QAAQ,GAAG,CAAC,CAAW,EAAkB,EAAE,CAAC,CAAC;IACxD,EAAE,EAAE,qBAAa,CAAC,QAAQ;IAC1B,CAAC;CACF,CAAC,CAAA;AAHW,QAAA,QAAQ,YAGnB;AAEK,MAAM,MAAM,GAAG,CAAC,CAAS,EAAkB,EAAE,CAAC,CAAC;IACpD,EAAE,EAAE,qBAAa,CAAC,MAAM;IACxB,CAAC;CACF,CAAC,CAAA;AAHW,QAAA,MAAM,UAGjB;AAEK,MAAM,mBAAmB,GAAG,CAAC,CAAqB,EAAkB,EAAE,CAAC,CAAC;IAC7E,EAAE,EAAE,qBAAa,CAAC,qBAAqB;IACvC,CAAC;CACF,CAAC,CAAA;AAHW,QAAA,mBAAmB,uBAG9B;AAEK,MAAM,gBAAgB,GAAG,CAAC,CAAmB,EAAkB,EAAE,CAAC,CAAC;IACxE,EAAE,EAAE,qBAAa,CAAC,kBAAkB;IACpC,CAAC;CACF,CAAC,CAAA;AAHW,QAAA,gBAAgB,oBAG3B;AAEK,MAAM,cAAc,GAAG,CAAC,CAAiB,EAAkB,EAAE,CAAC,CAAC;IACpE,EAAE,EAAE,qBAAa,CAAC,eAAe;IACjC,CAAC;CACF,CAAC,CAAA;AAHW,QAAA,cAAc,kBAGzB"}

package/DiscordShard/commands.ts

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

package/DiscordShard/heartbeats.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fromHub = void 0;
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "DiscordShard/heartbeats.ts";
+const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
+const S = tslib_1.__importStar(require("@effect-ts/core/Effect/Experimental/Stream"));
+const R = tslib_1.__importStar(require("@effect-ts/core/Effect/Ref"));
+const Function_1 = require("@effect-ts/core/Function");
+const O = tslib_1.__importStar(require("@effect-ts/core/Option"));
+const types_1 = require("../types");
+const WS_1 = require("../WS");
+const Commands = tslib_1.__importStar(require("./commands"));
+const Utils = tslib_1.__importStar(require("./utils"));
+const send = (ref, seqRef) => (T.tap_(T.map_(R.get(seqRef), (o) => Commands.heartbeat(O.toNullable(o)), fileName_1 + ":16:10"), () => R.set_(ref, false), fileName_1 + ":17:10"));
+const maybeSend = (ref, seqRef) => (T.chain_(R.get(ref), (acked) => acked ? send(ref, seqRef) : T.succeed(WS_1.Reconnect, fileName_1 + ":25:46"), fileName_1 + ":23:12"));
+const fromHub = (hub, seqRef) => (S.unwrap(T.map_(R.makeRef(true), (ackedRef) => {
+    const heartbeats = (
+    // Map to gateway message depending on ack state
+    S.mapEffect_(S.chainParSwitch_(
+    // Reset ack state for each hello
+    S.tap_(Utils.opCode(hub)(types_1.GatewayOpcode.HELLO), () => R.set_(ackedRef, true)), (p) => {
+        const initial = p.d.heartbeat_interval * Math.random();
+        return S.merge_(
+        // First random heartbeat
+        S.fromEffect(T.sleep(initial, fileName_1 + ":47:33")), (S.chain_(S.fromEffect(T.sleep(initial, fileName_1 + ":50:35")), () => S.repeatEffect(T.sleep(p.d.heartbeat_interval, fileName_1 + ":51:51")))));
+    }, 1), () => maybeSend(ackedRef, seqRef)));
+    const acks = (S.drain(S.tap_(Utils.opCode(hub)(types_1.GatewayOpcode.HEARTBEAT_ACK), () => R.set_(ackedRef, true))));
+    return S.merge_(heartbeats, acks);
+}, fileName_1 + ":36:10")));
+exports.fromHub = fromHub;
+//# sourceMappingURL=heartbeats.js.map

package/DiscordShard/heartbeats.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"heartbeats.js","sourceRoot":"","sources":["heartbeats.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,sFAA+D;AAE/D,sEAA+C;AAC/C,uDAA+C;AAC/C,kEAA2C;AAE3C,oCAAoE;AACpE,8BAAiC;AACjC,6DAAsC;AACtC,uDAAgC;AAEhC,MAAM,IAAI,GAAG,CAAC,GAAmB,EAAE,MAA+B,EAAE,EAAE,EAIlE,CAAC,MADD,CAAC,MADD,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EACP,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,0BAC1C,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,yBAC/B,CAAA;AAEH,MAAM,SAAS,GAAG,CAAC,GAAmB,EAAE,MAA+B,EAAE,EAAE,EAGvE,CAAC,QADD,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAER,CAAC,KAAK,EAAsB,EAAE,CAC5B,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,cAAS,wBAAC,yBAErD,CAAA;AAEI,MAAM,OAAO,GAAG,CACrB,GAA0B,EAC1B,MAA+B,EAC/B,EAAE,EAqCA,CAAC,CAAC,MAAM,CAjCR,CAAC,MAFD,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAET,CAAC,QAAQ,EAAE,EAAE;IACjB,MAAM,UAAU;IAmBd,gDAAgD;IAChD,CAAC,YAdD,CAAC;IAHD,iCAAiC;IACjC,CAAC,MAHD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAa,qBAAa,CAAC,KAAK,CAAC,EAG5C,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAEjB,CAAC,CAAC,EAAE,EAAE;QACrB,MAAM,OAAO,GAAG,CAAC,CAAC,CAAE,CAAC,kBAAkB,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;QACvD,OAAO,CAAC,CAAC,MAAM;QACb,yBAAyB;QACzB,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAC,CAAC,GAI5B,CAAC,QADD,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAC,CAAC,EACtB,GAAG,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE,CAAC,kBAAkB,wBAAC,CAAC,GAEjE,CAAA;IACH,CAAC,EAAE,CAAC,GAGQ,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,EAC9C,CAAA;IAED,MAAM,IAAI,IAGR,CAAC,CAAC,KAAK,CADP,CAAC,MADD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,qBAAa,CAAC,aAAa,CAAC,EACxC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAEnC,CAAA;IAED,OAAO,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;AACnC,CAAC,0BAGF,CAAA;AAzCU,QAAA,OAAO,WAyCjB"}

package/DiscordShard/heartbeats.ts

@@ -0,0 +1,70 @@
+import * as T from "@effect-ts/core/Effect"
+import * as S from "@effect-ts/core/Effect/Experimental/Stream"
+import * as H from "@effect-ts/core/Effect/Hub"
+import * as R from "@effect-ts/core/Effect/Ref"
+import { pipe } from "@effect-ts/core/Function"
+import * as O from "@effect-ts/core/Option"
+import * as DWS from "../DiscordWS"
+import { GatewayOpcode, GatewayPayload, HelloEvent } from "../types"
+import { Reconnect } from "../WS"
+import * as Commands from "./commands"
+import * as Utils from "./utils"
+
+const send = (ref: R.Ref<boolean>, seqRef: R.Ref<O.Option<number>>) =>
+  pipe(
+    R.get(seqRef),
+    T.map((o) => Commands.heartbeat(O.toNullable(o))),
+    T.tap(() => R.set_(ref, false))
+  )
+
+const maybeSend = (ref: R.Ref<boolean>, seqRef: R.Ref<O.Option<number>>) =>
+  pipe(
+    R.get(ref),
+    T.chain(
+      (acked): T.UIO<DWS.Message> =>
+        acked ? send(ref, seqRef) : T.succeed(Reconnect)
+    )
+  )
+
+export const fromHub = (
+  hub: H.Hub<GatewayPayload>,
+  seqRef: R.Ref<O.Option<number>>
+) =>
+  pipe(
+    R.makeRef(true),
+
+    T.map((ackedRef) => {
+      const heartbeats = pipe(
+        Utils.opCode(hub)<HelloEvent>(GatewayOpcode.HELLO),
+
+        // Reset ack state for each hello
+        S.tap(() => R.set_(ackedRef, true)),
+
+        S.chainParSwitch((p) => {
+          const initial = p.d!.heartbeat_interval * Math.random()
+          return S.merge_(
+            // First random heartbeat
+            S.fromEffect(T.sleep(initial)),
+            // Repeated heartbeat
+            pipe(
+              S.fromEffect(T.sleep(initial)),
+              S.chain(() => S.repeatEffect(T.sleep(p.d!.heartbeat_interval)))
+            )
+          )
+        }, 1),
+
+        // Map to gateway message depending on ack state
+        S.mapEffect(() => maybeSend(ackedRef, seqRef))
+      )
+
+      const acks = pipe(
+        Utils.opCode(hub)(GatewayOpcode.HEARTBEAT_ACK),
+        S.tap(() => R.set_(ackedRef, true)),
+        S.drain
+      )
+
+      return S.merge_(heartbeats, acks)
+    }),
+
+    S.unwrap
+  )

package/DiscordShard/identify.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fromHub = void 0;
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "DiscordShard/identify.ts";
+const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
+const S = tslib_1.__importStar(require("@effect-ts/core/Effect/Experimental/Stream"));
+const R = tslib_1.__importStar(require("@effect-ts/core/Effect/Ref"));
+const Function_1 = require("@effect-ts/core/Function");
+const O = tslib_1.__importStar(require("@effect-ts/core/Option"));
+const OS = tslib_1.__importStar(require("os"));
+const types_1 = require("../types");
+const Commands = tslib_1.__importStar(require("./commands"));
+const Utils = tslib_1.__importStar(require("./utils"));
+const identify = ({ token, intents, shard, presence }) => Commands.identify({
+    token,
+    intents,
+    properties: {
+        $os: OS.platform(),
+        $browser: "dfx",
+        $device: "dfx",
+    },
+    shard,
+    presence,
+});
+const resume = (token, ready, seq) => Commands.resume({
+    token,
+    session_id: ready.session_id,
+    seq,
+});
+const identifyOrResume = (opts, ready, seq) => (T.map_(T.zip_(R.get(ready), R.get(seq), fileName_1 + ":57:10"), ({ tuple }) => (O.fold_(O.zip_(...tuple), () => identify(opts), ({ tuple }) => resume(opts.token, ...tuple))), fileName_1 + ":58:10"));
+const fromHub = (hub, { latestReady, latestSequence, ...opts }) => (S.mapEffect_(Utils.opCode(hub)(types_1.GatewayOpcode.HELLO), () => identifyOrResume(opts, latestReady, latestSequence)));
+exports.fromHub = fromHub;
+//# sourceMappingURL=identify.js.map

package/DiscordShard/identify.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"identify.js","sourceRoot":"","sources":["identify.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,sFAA+D;AAE/D,sEAA+C;AAC/C,uDAA+C;AAC/C,kEAA2C;AAC3C,+CAAwB;AACxB,oCAMiB;AACjB,6DAAsC;AACtC,uDAAgC;AAchC,MAAM,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAW,EAAE,EAAE,CAChE,QAAQ,CAAC,QAAQ,CAAC;IAChB,KAAK;IACL,OAAO;IACP,UAAU,EAAE;QACV,GAAG,EAAE,EAAE,CAAC,QAAQ,EAAE;QAClB,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,KAAK;KACf;IACD,KAAK;IACL,QAAQ;CACT,CAAC,CAAA;AAEJ,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,KAAiB,EAAE,GAAW,EAAE,EAAE,CAC/D,QAAQ,CAAC,MAAM,CAAC;IACd,KAAK;IACL,UAAU,EAAE,KAAK,CAAC,UAAU;IAC5B,GAAG;CACJ,CAAC,CAAA;AAEJ,MAAM,gBAAgB,GAAG,CACvB,IAAa,EACb,KAAkC,EAClC,GAA4B,EAC5B,EAAE,EAIA,CAAC,MADD,CAAC,MADD,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EACN,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,0BACV,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAGhB,CAAC,OADD,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,EAEd,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EACpB,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,CAAC,EAE9C,yBAEJ,CAAA;AAEI,MAAM,OAAO,GAAG,CACrB,GAA0B,EAC1B,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,IAAI,EAA0B,EAChE,EAAE,EAGA,CAAC,YADD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAa,qBAAa,CAAC,KAAK,CAAC,EACtC,GAAG,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,EACtE,CAAA;AAPU,QAAA,OAAO,WAOjB"}

package/DiscordShard/identify.ts

@@ -0,0 +1,76 @@
+import * as T from "@effect-ts/core/Effect"
+import * as S from "@effect-ts/core/Effect/Experimental/Stream"
+import * as H from "@effect-ts/core/Effect/Hub"
+import * as R from "@effect-ts/core/Effect/Ref"
+import { pipe } from "@effect-ts/core/Function"
+import * as O from "@effect-ts/core/Option"
+import * as OS from "os"
+import {
+  GatewayOpcode,
+  GatewayPayload,
+  HelloEvent,
+  ReadyEvent,
+  UpdatePresence,
+} from "../types"
+import * as Commands from "./commands"
+import * as Utils from "./utils"
+
+export interface Options {
+  token: string
+  intents: number
+  shard: [number, number]
+  presence?: UpdatePresence
+}
+
+export interface Requirements {
+  latestReady: R.Ref<O.Option<ReadyEvent>>
+  latestSequence: R.Ref<O.Option<number>>
+}
+
+const identify = ({ token, intents, shard, presence }: Options) =>
+  Commands.identify({
+    token,
+    intents,
+    properties: {
+      $os: OS.platform(),
+      $browser: "dfx",
+      $device: "dfx",
+    },
+    shard,
+    presence,
+  })
+
+const resume = (token: string, ready: ReadyEvent, seq: number) =>
+  Commands.resume({
+    token,
+    session_id: ready.session_id,
+    seq,
+  })
+
+const identifyOrResume = (
+  opts: Options,
+  ready: R.Ref<O.Option<ReadyEvent>>,
+  seq: R.Ref<O.Option<number>>
+) =>
+  pipe(
+    R.get(ready),
+    T.zip(R.get(seq)),
+    T.map(({ tuple }) =>
+      pipe(
+        O.zip_(...tuple),
+        O.fold(
+          () => identify(opts),
+          ({ tuple }) => resume(opts.token, ...tuple)
+        )
+      )
+    )
+  )
+
+export const fromHub = (
+  hub: H.Hub<GatewayPayload>,
+  { latestReady, latestSequence, ...opts }: Options & Requirements
+) =>
+  pipe(
+    Utils.opCode(hub)<HelloEvent>(GatewayOpcode.HELLO),
+    S.mapEffect(() => identifyOrResume(opts, latestReady, latestSequence))
+  )

package/DiscordShard/index.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.make = exports.LiveDiscordShard = exports.DiscordShard = void 0;
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "DiscordShard/index.ts";
+const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
+const L = tslib_1.__importStar(require("@effect-ts/core/Effect/Layer"));
+const S = tslib_1.__importStar(require("@effect-ts/core/Effect/Experimental/Stream"));
+const H = tslib_1.__importStar(require("@effect-ts/core/Effect/Hub"));
+const M = tslib_1.__importStar(require("@effect-ts/core/Effect/Managed"));
+const Q = tslib_1.__importStar(require("@effect-ts/core/Effect/Queue"));
+const Function_1 = require("@effect-ts/core/Function");
+const Has_1 = require("@effect-ts/core/Has");
+const O = tslib_1.__importStar(require("@effect-ts/core/Option"));
+const DWS = tslib_1.__importStar(require("../DiscordWS"));
+const types_1 = require("../types");
+const WS_1 = require("../WS");
+const Heartbeats = tslib_1.__importStar(require("./heartbeats"));
+const Identify = tslib_1.__importStar(require("./identify"));
+const Invalid = tslib_1.__importStar(require("./invalidSession"));
+const Utils = tslib_1.__importStar(require("./utils"));
+const makeImpl = (opts) => M.gen(function* (_) {
+    const outbound = yield* _(Q.makeUnbounded(), fileName_1 + ":27:30");
+    const [latestReady, updateLatestReady] = yield* _(Utils.latest((0, Function_1.flow)(O.fromPredicate((p) => p.op === types_1.GatewayOpcode.DISPATCH && p.t === "READY"), O.map((p) => p.d))), fileName_1 + ":29:54");
+    const [latestSequence, updateLatestSequence] = yield* _(Utils.latest((p) => O.fromNullable(p.s)), fileName_1 + ":40:60");
+    const hub = yield* _(H.makeUnbounded(), fileName_1 + ":44:25");
+    const publishToHub = (S.forEach_(updateLatestReady(updateLatestSequence(S.unwrap(DWS.open({
+        outgoing: S.fromQueue_(outbound),
+    })))), (p) => H.publish_(hub, p)));
+    const dispatch = (H.filterOutput_(hub, (p) => p.op === types_1.GatewayOpcode.DISPATCH));
+    const fromDispatch = Utils.fromDispatch(dispatch);
+    // heartbeats
+    const heartbeatEffects = (S.forEach_(Heartbeats.fromHub(hub, latestSequence), (p) => Q.offer_(outbound, p)));
+    // identify
+    const identifyEffects = (S.forEach_(Identify.fromHub(hub, {
+        ...opts,
+        latestSequence,
+        latestReady,
+    }), (p) => Q.offer_(outbound, p)));
+    // invalid session
+    const invalidEffects = (S.forEach_(Invalid.fromHub(hub, latestReady), (p) => Q.offer_(outbound, p)));
+    return {
+        run: (T.ignore(T.zipPar(invalidEffects, fileName_1 + ":88:17")(T.zipPar(identifyEffects, fileName_1 + ":87:17")(T.zipPar(heartbeatEffects, fileName_1 + ":86:17")(publishToHub))), fileName_1 + ":89:17")),
+        raw: hub,
+        dispatch,
+        fromDispatch,
+        send: (p) => Q.offer_(outbound, p),
+        reconnect: () => Q.offer_(outbound, WS_1.Reconnect),
+    };
+});
+const makeService = () => ({
+    _tag: "DiscordShardService",
+    make: makeImpl,
+});
+exports.DiscordShard = (0, Has_1.tag)();
+exports.LiveDiscordShard = L.fromValue(exports.DiscordShard)(makeService());
+const make = (opts) => M.accessServiceM(exports.DiscordShard)(({ make }) => make(opts));
+exports.make = make;
+//# sourceMappingURL=index.js.map

package/DiscordShard/index.js.map

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

package/DiscordShard/index.ts

@@ -0,0 +1,110 @@
+import * as T from "@effect-ts/core/Effect"
+import * as L from "@effect-ts/core/Effect/Layer"
+import * as S from "@effect-ts/core/Effect/Experimental/Stream"
+import * as SK from "@effect-ts/core/Effect/Experimental/Stream/Sink"
+import * as H from "@effect-ts/core/Effect/Hub"
+import * as M from "@effect-ts/core/Effect/Managed"
+import * as Q from "@effect-ts/core/Effect/Queue"
+import { flow, pipe } from "@effect-ts/core/Function"
+import { tag } from "@effect-ts/core/Has"
+import * as O from "@effect-ts/core/Option"
+import { _A } from "@effect-ts/core/Utils"
+import * as DWS from "../DiscordWS"
+import {
+  GatewayEvent,
+  GatewayOpcode,
+  GatewayPayload,
+  ReadyEvent,
+} from "../types"
+import { Reconnect } from "../WS"
+import * as Heartbeats from "./heartbeats"
+import * as Identify from "./identify"
+import * as Invalid from "./invalidSession"
+import * as Utils from "./utils"
+
+const makeImpl = (opts: Identify.Options) =>
+  M.gen(function* (_) {
+    const outbound = yield* _(Q.makeUnbounded<DWS.Message>())
+
+    const [latestReady, updateLatestReady] = yield* _(
+      Utils.latest(
+        flow(
+          O.fromPredicate(
+            (p): p is GatewayPayload<ReadyEvent> =>
+              p.op === GatewayOpcode.DISPATCH && p.t === "READY"
+          ),
+          O.map((p) => p.d!)
+        )
+      )
+    )
+    const [latestSequence, updateLatestSequence] = yield* _(
+      Utils.latest((p) => O.fromNullable(p.s))
+    )
+
+    const hub = yield* _(H.makeUnbounded<GatewayPayload>())
+    const publishToHub = pipe(
+      DWS.open({
+        outgoing: S.fromQueue_(outbound),
+      }),
+      S.unwrap,
+      updateLatestSequence,
+      updateLatestReady,
+      S.forEach((p) => H.publish_(hub, p))
+    )
+
+    const dispatch: H.Hub<GatewayPayload<GatewayEvent>> = pipe(
+      hub,
+      H.filterOutput((p) => p.op === GatewayOpcode.DISPATCH)
+    )
+    const fromDispatch = Utils.fromDispatch(dispatch)
+
+    // heartbeats
+    const heartbeatEffects = pipe(
+      Heartbeats.fromHub(hub, latestSequence),
+      S.forEach((p) => Q.offer_(outbound, p))
+    )
+
+    // identify
+    const identifyEffects = pipe(
+      Identify.fromHub(hub, {
+        ...opts,
+        latestSequence,
+        latestReady,
+      }),
+      S.forEach((p) => Q.offer_(outbound, p))
+    )
+
+    // invalid session
+    const invalidEffects = pipe(
+      Invalid.fromHub(hub, latestReady),
+      S.forEach((p) => Q.offer_(outbound, p))
+    )
+
+    return {
+      run: pipe(
+        publishToHub,
+        T.zipPar(heartbeatEffects),
+        T.zipPar(identifyEffects),
+        T.zipPar(invalidEffects),
+        T.ignore
+      ),
+      raw: hub,
+      dispatch,
+      fromDispatch,
+      send: (p: GatewayPayload) => Q.offer_(outbound, p),
+      reconnect: () => Q.offer_(outbound, Reconnect),
+    } as const
+  })
+
+const makeService = () =>
+  ({
+    _tag: "DiscordShardService",
+    make: makeImpl,
+  } as const)
+
+export interface DiscordShard extends ReturnType<typeof makeService> {}
+export const DiscordShard = tag<DiscordShard>()
+export const LiveDiscordShard = L.fromValue(DiscordShard)(makeService())
+
+export const make = (opts: Identify.Options) =>
+  M.accessServiceM(DiscordShard)(({ make }) => make(opts))

package/DiscordShard/invalidSession.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fromHub = void 0;
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "DiscordShard/invalidSession.ts";
+const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
+const S = tslib_1.__importStar(require("@effect-ts/core/Effect/Experimental/Stream"));
+const R = tslib_1.__importStar(require("@effect-ts/core/Effect/Ref"));
+const Function_1 = require("@effect-ts/core/Function");
+const O = tslib_1.__importStar(require("@effect-ts/core/Option"));
+const types_1 = require("../types");
+const WS_1 = require("../WS");
+const Utils = tslib_1.__importStar(require("./utils"));
+const fromHub = (hub, latestReady) => (S.map_(S.tap_(Utils.opCode(hub)(types_1.GatewayOpcode.INVALID_SESSION), (p) => (p.d ? T.unit : R.set_(latestReady, O.none))), () => WS_1.Reconnect));
+exports.fromHub = fromHub;
+//# sourceMappingURL=invalidSession.js.map

package/DiscordShard/invalidSession.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"invalidSession.js","sourceRoot":"","sources":["invalidSession.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,sFAA+D;AAE/D,sEAA+C;AAC/C,uDAA+C;AAC/C,kEAA2C;AAE3C,oCAKiB;AACjB,8BAAiC;AACjC,uDAAgC;AAEzB,MAAM,OAAO,GAAG,CACrB,GAA0B,EAC1B,WAAwC,EACxC,EAAE,EAIA,CAAC,MADD,CAAC,MADD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAsB,qBAAa,CAAC,eAAe,CAAC,EAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GACnD,GAAY,EAAE,CAAC,cAAS,EAC/B,CAAA;AARU,QAAA,OAAO,WAQjB"}

package/DiscordShard/invalidSession.ts

@@ -0,0 +1,25 @@
+import * as T from "@effect-ts/core/Effect"
+import * as S from "@effect-ts/core/Effect/Experimental/Stream"
+import * as H from "@effect-ts/core/Effect/Hub"
+import * as R from "@effect-ts/core/Effect/Ref"
+import { pipe } from "@effect-ts/core/Function"
+import * as O from "@effect-ts/core/Option"
+import { Message } from "../DiscordWS"
+import {
+  GatewayOpcode,
+  GatewayPayload,
+  InvalidSessionEvent,
+  ReadyEvent,
+} from "../types"
+import { Reconnect } from "../WS"
+import * as Utils from "./utils"
+
+export const fromHub = (
+  hub: H.Hub<GatewayPayload>,
+  latestReady: R.Ref<O.Option<ReadyEvent>>
+) =>
+  pipe(
+    Utils.opCode(hub)<InvalidSessionEvent>(GatewayOpcode.INVALID_SESSION),
+    S.tap((p) => (p.d ? T.unit : R.set_(latestReady, O.none))),
+    S.map((): Message => Reconnect)
+  )

package/DiscordShard/utils.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fromDispatch = exports.latest = exports.opCode = void 0;
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "DiscordShard/utils.ts";
+const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
+const S = tslib_1.__importStar(require("@effect-ts/core/Effect/Experimental/Stream"));
+const R = tslib_1.__importStar(require("@effect-ts/core/Effect/Ref"));
+const Function_1 = require("@effect-ts/core/Function");
+const O = tslib_1.__importStar(require("@effect-ts/core/Option"));
+const opCode = (hub) => (code) => (S.filter_(S.fromHub_(hub), (p) => p.op === code));
+exports.opCode = opCode;
+const latest = (f) => T.gen(function* (_) {
+    const ref = yield* _(R.makeRef(O.none), fileName_1 + ":24:25");
+    return [
+        ref,
+        S.tap((0, Function_1.flow)(f, O.fold(() => T.unit, (a) => R.set_(ref, O.some(a))))),
+    ];
+}, fileName_1 + ":23:8");
+exports.latest = latest;
+const fromDispatch = (hub) => (event) => (S.map_(S.filter_(S.fromHub_(hub), (p) => p.t === event), (p) => p.d));
+exports.fromDispatch = fromDispatch;
+//# sourceMappingURL=utils.js.map

package/DiscordShard/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,sFAA+D;AAE/D,sEAA+C;AAC/C,uDAAqD;AACrD,kEAA2C;AAQpC,MAAM,MAAM,GACjB,CAAC,GAA0B,EAAE,EAAE,CAC/B,CAAU,IAAmB,EAA4B,EAAE,EAGvD,CAAC,SADD,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACN,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,EAC9B,CAAA;AANQ,QAAA,MAAM,UAMd;AAEE,MAAM,MAAM,GAAG,CAAI,CAAqC,EAAE,EAAE,CACjE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;IAChB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAc,CAAC,CAAC,IAAI,CAAC,wBAAC,CAAA;IAEpD,OAAO;QACL,GAAG;QACH,CAAC,CAAC,GAAG,CACH,IAAA,eAAI,EACF,CAAC,EACD,CAAC,CAAC,IAAI,CACJ,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,EACZ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAC9B,CACF,CACF;KACO,CAAA;AACZ,CAAC,uBAAC,CAAA;AAhBS,QAAA,MAAM,UAgBf;AAEG,MAAM,YAAY,GACvB,CAAC,GAAwC,EAAE,EAAE,CAC7C,CAAgC,KAAQ,EAAE,EAAE,EAIxC,CAAC,MADD,CAAC,SADD,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACN,CAAC,CAAC,EAAyC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,GAC9D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAqB,EACrC,CAAA;AAPQ,QAAA,YAAY,gBAOpB"}

package/DiscordShard/utils.ts

@@ -0,0 +1,47 @@
+import * as T from "@effect-ts/core/Effect"
+import * as S from "@effect-ts/core/Effect/Experimental/Stream"
+import * as H from "@effect-ts/core/Effect/Hub"
+import * as R from "@effect-ts/core/Effect/Ref"
+import { flow, pipe } from "@effect-ts/core/Function"
+import * as O from "@effect-ts/core/Option"
+import {
+  GatewayEvent,
+  GatewayEvents,
+  GatewayOpcode,
+  GatewayPayload,
+} from "../types"
+
+export const opCode =
+  (hub: H.Hub<GatewayPayload>) =>
+  <T = any>(code: GatewayOpcode): S.UIO<GatewayPayload<T>> =>
+    pipe(
+      S.fromHub_(hub),
+      S.filter((p) => p.op === code)
+    )
+
+export const latest = <T>(f: (p: GatewayPayload) => O.Option<T>) =>
+  T.gen(function* (_) {
+    const ref = yield* _(R.makeRef<O.Option<T>>(O.none))
+
+    return [
+      ref,
+      S.tap(
+        flow(
+          f,
+          O.fold(
+            () => T.unit,
+            (a) => R.set_(ref, O.some(a))
+          )
+        )
+      ),
+    ] as const
+  })
+
+export const fromDispatch =
+  (hub: H.Hub<GatewayPayload<GatewayEvent>>) =>
+  <K extends keyof GatewayEvents>(event: K) =>
+    pipe(
+      S.fromHub_(hub),
+      S.filter((p): p is GatewayPayload<GatewayEvents[K]> => p.t === event),
+      S.map((p) => p.d as GatewayEvents[K])
+    )

package/DiscordWS/index.js

@@ -1,2 +1,37 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.open = exports.LiveDiscordWS = exports.DiscordWS = exports.jsonEncoding = void 0;
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "DiscordWS/index.ts";
+const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
+const S = tslib_1.__importStar(require("@effect-ts/core/Effect/Experimental/Stream"));
+const SC = tslib_1.__importStar(require("@effect-ts/core/Effect/Schedule"));
+const Function_1 = require("@effect-ts/core/Function");
+const Has_1 = require("@effect-ts/core/Has");
+const Log_1 = require("../Log");
+const WS = tslib_1.__importStar(require("../WS"));
+exports.jsonEncoding = {
+    type: "json",
+    encode: (p) => JSON.stringify(p),
+    decode: (p) => JSON.parse(p.toString("utf8")),
+};
+const makeOutgoing = (s, e) => (S.map_(s, (data) => {
+    if (data === WS.Reconnect) {
+        return data;
+    }
+    return e.encode(data);
+}));
+const openImpl = ({ url = "wss://gateway.discord.gg/", version = 9, encoding = exports.jsonEncoding, outgoing, }) => (S.map_(S.retry_(S.onError_(S.unwrap(WS.open(`${url}?v=${version}&encoding=${encoding.type}`, makeOutgoing(outgoing, encoding))), (e) => e._tag === "Fail" ? (0, Log_1.log)(serviceTag, "error", e.value) : T.unit), SC.exponential(250)), encoding.decode));
+// Service definition
+const serviceTag = "DiscordWSService";
+const service = {
+    _tag: serviceTag,
+    open: openImpl,
+};
+exports.DiscordWS = (0, Has_1.tag)();
+exports.LiveDiscordWS = T.toLayer(exports.DiscordWS)(T.succeed(service, fileName_1 + ":75:60"));
+// Helpers
+const open = (opts) => T.accessService(exports.DiscordWS)(({ open }) => open(opts), fileName_1 + ":79:29");
+exports.open = open;
 //# sourceMappingURL=index.js.map

package/DiscordWS/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,sFAA+D;AAC/D,4EAAqD;AACrD,uDAA+C;AAC/C,6CAAyC;AAGzC,gCAA4B;AAE5B,kDAA2B;AAiBd,QAAA,YAAY,GAAa;IACpC,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,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,CAAiB,EAAE,CAAW,EAAqB,EAAE,EAGvE,CAAC,MADD,CAAC,EACK,CAAC,IAAI,EAAE,EAAE;IACb,IAAI,IAAI,KAAK,EAAE,CAAC,SAAS,EAAE;QACzB,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AACvB,CAAC,EACF,CAAA;AAEH,MAAM,QAAQ,GAAG,CAAC,EAChB,GAAG,GAAG,2BAA2B,EACjC,OAAO,GAAG,CAAC,EACX,QAAQ,GAAG,oBAAY,EACvB,QAAQ,GACC,EAAE,EAAE,EAWX,CAAC,MADD,CAAC,QAHD,CAAC,UADD,CAAC,CAAC,MAAM,CAJR,EAAE,CAAC,IAAI,CACL,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,EAC/C,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CACjC,GAES,CAAC,CAAC,EAAE,EAAE,CACd,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,IAAA,SAAG,EAAC,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAExD,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,GACrB,QAAQ,CAAC,MAAM,EACtB,CAAA;AAIH,qBAAqB;AACrB,MAAM,UAAU,GAAG,kBAA2B,CAAA;AAC9C,MAAM,OAAO,GAAG;IACd,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,QAAQ;CACN,CAAA;AAGG,QAAA,SAAS,GAAG,IAAA,SAAG,GAAa,CAAA;AAC5B,QAAA,aAAa,GAAG,CAAC,CAAC,OAAO,CAAC,iBAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,wBAAC,CAAC,CAAA;AAErE,UAAU;AACH,MAAM,IAAI,GAAG,CAAC,IAAc,EAAE,EAAE,CACrC,CAAC,CAAC,aAAa,CAAC,iBAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAC,CAAA;AADzC,QAAA,IAAI,QACqC"}

package/DiscordWS/index.ts

@@ -0,0 +1,79 @@
+import * as T from "@effect-ts/core/Effect"
+import * as S from "@effect-ts/core/Effect/Experimental/Stream"
+import * as SC from "@effect-ts/core/Effect/Schedule"
+import { pipe } from "@effect-ts/core/Function"
+import { tag } from "@effect-ts/core/Has"
+import { _A } from "@effect-ts/core/Utils"
+import { RawData } from "ws"
+import { log } from "../Log"
+import { GatewayPayload } from "../types"
+import * as WS from "../WS"
+
+export type Message = GatewayPayload | WS.Reconnect
+
+export interface OpenOpts {
+  url?: string
+  version?: number
+  encoding?: Encoding
+  outgoing: WS.OutboundStream<Message>
+}
+
+export interface Encoding {
+  type: "json" | "etf"
+  encode: (p: GatewayPayload) => string | Buffer | ArrayBuffer
+  decode: (p: RawData) => GatewayPayload
+}
+
+export const jsonEncoding: Encoding = {
+  type: "json",
+  encode: (p) => JSON.stringify(p),
+  decode: (p) => JSON.parse(p.toString("utf8")),
+}
+
+const makeOutgoing = (s: S.UIO<Message>, e: Encoding): WS.OutboundStream =>
+  pipe(
+    s,
+    S.map((data) => {
+      if (data === WS.Reconnect) {
+        return data
+      }
+
+      return e.encode(data)
+    })
+  )
+
+const openImpl = ({
+  url = "wss://gateway.discord.gg/",
+  version = 9,
+  encoding = jsonEncoding,
+  outgoing,
+}: OpenOpts) =>
+  pipe(
+    WS.open(
+      `${url}?v=${version}&encoding=${encoding.type}`,
+      makeOutgoing(outgoing, encoding)
+    ),
+    S.unwrap,
+    S.onError((e) =>
+      e._tag === "Fail" ? log(serviceTag, "error", e.value) : T.unit
+    ),
+    S.retry(SC.exponential(250)),
+    S.map(encoding.decode)
+  )
+
+export type Connection = ReturnType<typeof openImpl>
+
+// Service definition
+const serviceTag = "DiscordWSService" as const
+const service = {
+  _tag: serviceTag,
+  open: openImpl,
+} as const
+type Service = typeof service
+export interface DiscordWS extends Service {}
+export const DiscordWS = tag<DiscordWS>()
+export const LiveDiscordWS = T.toLayer(DiscordWS)(T.succeed(service))
+
+// Helpers
+export const open = (opts: OpenOpts) =>
+  T.accessService(DiscordWS)(({ open }) => open(opts))

package/Log/index.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.log = exports.LiveLog = exports.Log = void 0;
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "Log/index.ts";
+const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
+const Has_1 = require("@effect-ts/core/Has");
+const service = {
+    _tag: "LogService",
+    log: (...args) => T.succeedWith(() => {
+        console.error(...args);
+    }, fileName_1 + ":8:18"),
+};
+exports.Log = (0, Has_1.tag)();
+exports.LiveLog = T.toLayer(exports.Log)(T.succeed(service, fileName_1 + ":17:48"));
+const log = (...args) => T.accessServiceM(exports.Log)(({ log }) => log(...args), fileName_1 + ":20:24");
+exports.log = log;
+//# sourceMappingURL=index.js.map

package/Log/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,6CAAyC;AAGzC,MAAM,OAAO,GAAG;IACd,IAAI,EAAE,YAAY;IAClB,GAAG,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,CACtB,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE;QACjB,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA;IACxB,CAAC,uBAAC;CACI,CAAA;AAKG,QAAA,GAAG,GAAG,IAAA,SAAG,GAAO,CAAA;AAChB,QAAA,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,WAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,wBAAC,CAAC,CAAA;AAElD,MAAM,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CACpC,CAAC,CAAC,cAAc,CAAC,WAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,wBAAC,CAAA;AADrC,QAAA,GAAG,OACkC"}

package/Log/index.ts

@@ -0,0 +1,20 @@
+import * as T from "@effect-ts/core/Effect"
+import { tag } from "@effect-ts/core/Has"
+import { _A } from "@effect-ts/core/Utils"
+
+const service = {
+  _tag: "LogService",
+  log: (...args: any[]) =>
+    T.succeedWith(() => {
+      console.error(...args)
+    }),
+} as const
+
+type Service = typeof service
+
+export interface Log extends Service {}
+export const Log = tag<Log>()
+export const LiveLog = T.toLayer(Log)(T.succeed(service))
+
+export const log = (...args: any[]) =>
+  T.accessServiceM(Log)(({ log }) => log(...args))

package/WS/index.js

@@ -1,22 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LiveWS = exports.WS = exports.Reconnect = void 0;
+exports.open = exports.LiveWS = exports.WS = exports.Reconnect = void 0;
 const tslib_1 = require("tslib");
 const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
 const fileName_1 = "WS/index.ts";
 const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
 const S = tslib_1.__importStar(require("@effect-ts/core/Effect/Experimental/Stream"));
 const M = tslib_1.__importStar(require("@effect-ts/core/Effect/Managed"));
-const Q = tslib_1.__importStar(require("@effect-ts/core/Effect/Queue"));
 const SC = tslib_1.__importStar(require("@effect-ts/core/Effect/Schedule"));
 const Function_1 = require("@effect-ts/core/Function");
 const Has_1 = require("@effect-ts/core/Has");
 const Ws = tslib_1.__importStar(require("ws"));
 exports.Reconnect = Symbol();
-const open = (url, options) => (M.makeExit_(T.succeedWith(() => new Ws.WebSocket(url, options), fileName_1 + ":29:18"), (ws) => T.succeedWith(() => {
+const openSocket = (url, options) => (M.makeExit_(T.succeedWith(() => new Ws.WebSocket(url, options), fileName_1 + ":25:18"), (ws) => T.succeedWith(() => {
     ws.removeAllListeners();
     ws.close();
-}, fileName_1 + ":31:20"), fileName_1 + ":30:15"));
+}, fileName_1 + ":27:20"), fileName_1 + ":26:15"));
 const recv = (ws) => S.async((emit) => {
     ws.on("message", (message) => emit.single(message));
     ws.on("error", (cause) => {
@@ -40,32 +39,32 @@ const send = (out) => (ws) => (S.drain(S.tap_(S.unwrap(T.map_(T.effectAsync((cb)
             cb(T.unit);
         });
     }
-}, fileName_1 + ":58:18"), () => S.fromQueue()(out), fileName_1 + ":67:10")), (data) => T.effectAsync((cb) => {
+}, fileName_1 + ":54:18"), () => out, fileName_1 + ":63:10")), (data) => T.effectAsync((cb) => {
     if (data === exports.Reconnect) {
         ws.close(1012, "reconnecting");
         cb(T.unit);
     }
     else {
+        console.error(data);
         ws.send(data, (err) => {
             if (err) {
-                cb(T.fail({ _tag: "write", cause: err }, fileName_1 + ":77:24"));
+                cb(T.fail({ _tag: "write", cause: err }, fileName_1 + ":74:24"));
             }
             else {
                 cb(T.unit);
             }
         });
     }
-}, fileName_1 + ":70:20"))));
+}, fileName_1 + ":66:20"))));
 const duplex = (out) => (ws) => (S.mergeTerminateLeft_(recv(ws), send(out)(ws)));
-const openDuplexWithQueue = (url, out, options) => (S.retry_(S.unwrapManaged(M.map_(open(url, options), duplex(out), fileName_1 + ":98:10")), SC.recurWhile((e) => e._tag === "close" && e.code === 1012)));
-const openDuplex = (url, options) => (T.map_(Q.makeUnbounded(), (write) => ({
-    read: openDuplexWithQueue(url, write, options),
-    write,
-}), fileName_1 + ":109:10"));
+const openDuplex = (url, out, options) => (S.retry_(S.unwrapManaged(M.map_(openSocket(url, options), duplex(out), fileName_1 + ":95:10")), SC.recurWhile((e) => e._tag === "close" && e.code === 1012)));
 const makeWS = T.succeed({
     _tag: "WSService",
     open: openDuplex,
-}, fileName_1 + ":115:25");
+}, fileName_1 + ":100:25");
 exports.WS = (0, Has_1.tag)();
 exports.LiveWS = T.toLayer(exports.WS)(makeWS);
+// Helpers
+const open = (url, out, options) => T.accessService(exports.WS)(({ open }) => open(url, out, options), fileName_1 + ":114:25");
+exports.open = open;
 //# sourceMappingURL=index.js.map

package/WS/index.js.map

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

package/WS/index.ts

@@ -1,7 +1,6 @@
 import * as T from "@effect-ts/core/Effect"
 import * as S from "@effect-ts/core/Effect/Experimental/Stream"
 import * as M from "@effect-ts/core/Effect/Managed"
-import * as Q from "@effect-ts/core/Effect/Queue"
 import * as SC from "@effect-ts/core/Effect/Schedule"
 import { pipe } from "@effect-ts/core/Function"
 import { tag } from "@effect-ts/core/Has"
@@ -14,17 +13,14 @@ export type WsError =
   | { _tag: "error"; cause: unknown }
   | { _tag: "write"; cause: unknown }
 
-type WebSocketStream = S.Stream<HasClock, WsError, Ws.RawData>
+export type WebSocketStream<T = Ws.RawData> = S.Stream<HasClock, WsError, T>
 
 export const Reconnect = Symbol()
-export type Message = Ws.RawData | typeof Reconnect
+export type Reconnect = typeof Reconnect
+export type Message = string | Buffer | ArrayBuffer | Reconnect
+export type OutboundStream<T = Message> = S.UIO<T>
 
-export interface WebSocketConnection {
-  read: WebSocketStream
-  write: Q.Queue<Message>
-}
-
-const open = (url: string, options?: Ws.ClientOptions) =>
+const openSocket = (url: string, options?: Ws.ClientOptions) =>
   pipe(
     T.succeedWith(() => new Ws.WebSocket(url, options)),
     M.makeExit((ws) =>
@@ -53,7 +49,7 @@ const recv = (ws: Ws.WebSocket): WebSocketStream =>
     )
   })
 
-const send = (out: Q.Queue<Message>) => (ws: Ws.WebSocket) =>
+const send = (out: OutboundStream) => (ws: Ws.WebSocket) =>
   pipe(
     T.effectAsync<unknown, WsError, void>((cb) => {
       if (ws.readyState & ws.OPEN) {
@@ -64,7 +60,7 @@ const send = (out: Q.Queue<Message>) => (ws: Ws.WebSocket) =>
         })
       }
     }),
-    T.map(() => S.fromQueue()(out)),
+    T.map(() => out),
     S.unwrap,
     S.tap((data) =>
       T.effectAsync<unknown, WsError, void>((cb) => {
@@ -72,6 +68,7 @@ const send = (out: Q.Queue<Message>) => (ws: Ws.WebSocket) =>
           ws.close(1012, "reconnecting")
           cb(T.unit)
         } else {
+          console.error(data)
           ws.send(data, (err) => {
             if (err) {
               cb(T.fail({ _tag: "write", cause: err }))
@@ -85,33 +82,21 @@ const send = (out: Q.Queue<Message>) => (ws: Ws.WebSocket) =>
     S.drain
   )
 
-const duplex = (out: Q.Queue<Message>) => (ws: Ws.WebSocket) =>
+const duplex = (out: OutboundStream) => (ws: Ws.WebSocket) =>
   pipe(recv(ws), S.mergeTerminateLeft(send(out)(ws)))
 
-const openDuplexWithQueue = (
+const openDuplex = (
   url: string,
-  out: Q.Queue<Message>,
+  out: OutboundStream,
   options?: Ws.ClientOptions
 ): WebSocketStream =>
   pipe(
-    open(url, options),
+    openSocket(url, options),
     M.map(duplex(out)),
     S.unwrapManaged,
     S.retry(SC.recurWhile((e) => e._tag === "close" && e.code === 1012))
   )
 
-const openDuplex = (
-  url: string,
-  options?: Ws.ClientOptions
-): T.UIO<WebSocketConnection> =>
-  pipe(
-    Q.makeUnbounded<Message>(),
-    T.map((write) => ({
-      read: openDuplexWithQueue(url, write, options),
-      write,
-    }))
-  )
-
 const makeWS = T.succeed({
   _tag: "WSService",
   open: openDuplex,
@@ -120,3 +105,10 @@ const makeWS = T.succeed({
 export interface WS extends _A<typeof makeWS> {}
 export const WS = tag<WS>()
 export const LiveWS = T.toLayer(WS)(makeWS)
+
+// Helpers
+export const open = (
+  url: string,
+  out: OutboundStream,
+  options?: Ws.ClientOptions
+) => T.accessService(WS)(({ open }) => open(url, out, options))

package/bot.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
+const fileName_1 = "bot.ts";
+const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
+const S = tslib_1.__importStar(require("@effect-ts/core/Effect/Experimental/Stream"));
+const M = tslib_1.__importStar(require("@effect-ts/core/Effect/Managed"));
+const Function_1 = require("@effect-ts/core/Function");
+const Has_1 = require("@effect-ts/core/Has");
+const R = tslib_1.__importStar(require("@effect-ts/node/Runtime"));
+const Dotemv = tslib_1.__importStar(require("dotenv"));
+const _1 = require(".");
+const Shard = tslib_1.__importStar(require("./DiscordShard"));
+const Log_1 = require("./Log");
+const types_1 = require("./types");
+Dotemv.config();
+const makeBot = (M.map_(Shard.make({
+    token: process.env.DISCORD_BOT_TOKEN,
+    intents: types_1.GatewayIntents.GUILDS | types_1.GatewayIntents.GUILD_MESSAGES,
+    shard: [0, 1],
+}), (bot) => ({
+    _tag: "BotService",
+    bot,
+}), fileName_1 + ":22:8"));
+const Bot = (0, Has_1.tag)();
+const LiveBot = M.toLayer_(makeBot, Bot);
+const bot = T.accessService(Bot)(({ bot }) => bot, fileName_1 + ":34:33");
+const runBot = T.accessServiceM(Bot)(({ bot }) => bot.run, fileName_1 + ":35:37");
+// logger
+const logger = T.chain_(bot, ({ raw }) => (S.forEach_(S.fromHub_(raw), (p) => (0, Log_1.log)(p))), fileName_1 + ":38:24");
+(R.runMain(T.provideSomeLayer(_1.DefaultEnv[">+>"](LiveBot))(T.zipPar(runBot, fileName_1 + ":47:11")(logger))));
+//# sourceMappingURL=bot.js.map

package/bot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bot.js","sourceRoot":"","sources":["bot.ts"],"names":[],"mappings":";;;;;AAAA,kEAA2C;AAC3C,sFAA+D;AAC/D,0EAAmD;AACnD,uDAA+C;AAC/C,6CAAyC;AAEzC,mEAA4C;AAC5C,uDAAgC;AAChC,wBAA8B;AAC9B,8DAAuC;AACvC,+BAA2B;AAC3B,mCAAwC;AAExC,MAAM,CAAC,MAAM,EAAE,CAAA;AAEf,MAAM,OAAO,IAMX,CAAC,MALD,KAAK,CAAC,IAAI,CAAC;IACT,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAkB;IACrC,OAAO,EAAE,sBAAc,CAAC,MAAM,GAAG,sBAAc,CAAC,cAAc;IAC9D,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;CACd,CAAC,EAEA,CAAC,GAAG,EAAE,EAAE,CACN,CAAC;IACC,IAAI,EAAE,YAAY;IAClB,GAAG;CACM,CAAA,wBAEhB,CAAA;AAGD,MAAM,GAAG,GAAG,IAAA,SAAG,GAAO,CAAA;AACtB,MAAM,OAAO,GAAG,CAAC,UAAc,OAAO,EAAZ,GAAG,CAAU,CAAA;AACvC,MAAM,GAAG,GAAG,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,wBAAC,CAAA;AAClD,MAAM,MAAM,GAAG,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,wBAAC,CAAA;AAE1D,SAAS;AACT,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAGrC,CAAC,UADD,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EACL,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,SAAG,EAAC,CAAC,CAAC,EACxB,wBACF,CAAA;AAED,CAKE,CAAC,CAAC,OAAO,CADT,CAAC,CAAC,gBAAgB,CAAC,aAAU,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAF9C,CAAC,CAAC,MAAM,CAAC,MAAM,wBAAC,CADhB,MAAM,KAKP"}

package/bot.ts

@@ -0,0 +1,51 @@
+import * as T from "@effect-ts/core/Effect"
+import * as S from "@effect-ts/core/Effect/Experimental/Stream"
+import * as M from "@effect-ts/core/Effect/Managed"
+import { pipe } from "@effect-ts/core/Function"
+import { tag } from "@effect-ts/core/Has"
+import { _A } from "@effect-ts/core/Utils"
+import * as R from "@effect-ts/node/Runtime"
+import * as Dotemv from "dotenv"
+import { DefaultEnv } from "."
+import * as Shard from "./DiscordShard"
+import { log } from "./Log"
+import { GatewayIntents } from "./types"
+
+Dotemv.config()
+
+const makeBot = pipe(
+  Shard.make({
+    token: process.env.DISCORD_BOT_TOKEN!,
+    intents: GatewayIntents.GUILDS | GatewayIntents.GUILD_MESSAGES,
+    shard: [0, 1],
+  }),
+  M.map(
+    (bot) =>
+      ({
+        _tag: "BotService",
+        bot,
+      } as const)
+  )
+)
+
+interface Bot extends _A<typeof makeBot> {}
+const Bot = tag<Bot>()
+const LiveBot = M.toLayer(Bot)(makeBot)
+const bot = T.accessService(Bot)(({ bot }) => bot)
+const runBot = T.accessServiceM(Bot)(({ bot }) => bot.run)
+
+// logger
+const logger = T.chain_(bot, ({ raw }) =>
+  pipe(
+    S.fromHub_(raw),
+    S.forEach((p) => log(p))
+  )
+)
+
+pipe(
+  logger,
+  T.zipPar(runBot),
+
+  T.provideSomeLayer(DefaultEnv[">+>"](LiveBot)),
+  R.runMain
+)

package/mod.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultEnv = void 0;
 const tslib_1 = require("tslib");
 const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
 const fileName_1 = "mod.ts";
-const core_1 = require("@effect-ts/core");
-const S = tslib_1.__importStar(require("@effect-ts/core/Effect/Experimental/Stream"));
-const Schedule_1 = require("@effect-ts/core/Effect/Schedule");
-const R = tslib_1.__importStar(require("@effect-ts/node/Runtime"));
+const Shard = tslib_1.__importStar(require("./DiscordShard"));
+const DiscordWS_1 = require("./DiscordWS");
+const Log_1 = require("./Log");
 const WS = tslib_1.__importStar(require("./WS"));
-(R.runMain(core_1.Effect.provideSomeLayer(WS.LiveWS)(core_1.Effect.chain_(core_1.Effect.accessServiceM(WS.WS)(({ open }) => open("wss://gateway.discord.gg/?v=9&encoding=json"), fileName_1 + ":8:26"), ({ read, write }) => (S.forEach_(S.retry_(read, (0, Schedule_1.exponential)(10)), (data) => core_1.Effect.succeedWith(() => {
-    console.error(data.toString("utf8"));
-}, fileName_1 + ":16:22"))), fileName_1 + ":11:10"))));
+exports.DefaultEnv = WS.LiveWS[">+>"](DiscordWS_1.LiveDiscordWS)[">+>"](Shard.LiveDiscordShard)["+++"](Log_1.LiveLog);
 //# sourceMappingURL=mod.js.map

package/mod.js.map

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["mod.ts"],"names":[],"mappings":";;;;;AAAA,0CAAmD;AACnD,sFAA+D;AAC/D,8DAA6D;AAC7D,mEAA4C;AAC5C,iDAA0B;AAE1B,CAgBE,CAAC,CAAC,OAAO,CADT,aAAC,CAAC,gBAAgB,CAAC,EAAE,CAAC,MAAM,CAAC,CAX7B,aAAC,QAHD,aAAC,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CACnC,IAAI,CAAC,6CAA6C,CAAC,uBACpD,EACO,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,EAIxB,CAAC,UADD,CAAC,QADD,IAAI,EACI,IAAA,sBAAW,EAAC,EAAE,CAAC,GACb,CAAC,IAAI,EAAE,EAAE,CACjB,aAAC,CAAC,WAAW,CAAC,GAAG,EAAE;IACjB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;AACtC,CAAC,wBAAC,EAEL,4BAIJ"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["mod.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAuC;AACvC,2CAA2C;AAC3C,+BAA+B;AAC/B,iDAA0B;AAEb,QAAA,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,yBAAa,CAAC,CACtD,KAAK,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAC9B,KAAK,CAAC,CAAC,aAAO,CAAC,CAAA"}

package/mod.ts

@@ -1,24 +1,8 @@
-import { Effect as T, pipe } from "@effect-ts/core"
-import * as S from "@effect-ts/core/Effect/Experimental/Stream"
-import { exponential } from "@effect-ts/core/Effect/Schedule"
-import * as R from "@effect-ts/node/Runtime"
+import * as Shard from "./DiscordShard"
+import { LiveDiscordWS } from "./DiscordWS"
+import { LiveLog } from "./Log"
 import * as WS from "./WS"
 
-pipe(
-  T.accessServiceM(WS.WS)(({ open }) =>
-    open("wss://gateway.discord.gg/?v=9&encoding=json")
-  ),
-  T.chain(({ read, write }) =>
-    pipe(
-      read,
-      S.retry(exponential(10)),
-      S.forEach((data) =>
-        T.succeedWith(() => {
-          console.error(data.toString("utf8"))
-        })
-      )
-    )
-  ),
-  T.provideSomeLayer(WS.LiveWS),
-  R.runMain
-)
+export const DefaultEnv = WS.LiveWS[">+>"](LiveDiscordWS)
+  [">+>"](Shard.LiveDiscordShard)
+  ["+++"](LiveLog)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Effect-TS discord library",
   "main": "mod.js",
   "author": "Tim Smart <tim.smart@arisechurch.com>",
@@ -8,7 +8,8 @@
   "scripts": {
     "prepare": "ttsc",
     "types": "discord-api-codegen ./discord-api-docs -l typescript -o 'imports=Response|./DiscordREST/types' 'endpointReturnType=Response' > types.ts && prettier -w types.ts",
-    "clean": "git clean -fxd -e node_modules/ -e .env"
+    "clean": "git clean -fxd -e node_modules/ -e .env",
+    "dev": "ts-node -C ttypescript mod.ts"
   },
   "files": [
     "**/*.ts",
@@ -21,6 +22,7 @@
     "@tim-smart/discord-api-docs-parser": "^0.3.0",
     "@types/ws": "^8.5.3",
     "prettier": "^2.5.1",
+    "ts-node": "^10.7.0",
     "ttypescript": "^1.5.13",
     "typescript": "^4.6.2"
   },
@@ -28,7 +30,22 @@
     "@effect-ts/core": "^0.58.0",
     "@effect-ts/node": "^0.38.3",
     "@effect-ts/system": "^0.55.0",
+    "dotenv": "^16.0.0",
     "tslib": "^2.3.1",
     "ws": "^8.5.0"
+  },
+  "exports": {
+    ".": {
+      "require": "./mod.js"
+    },
+    "./WS": {
+      "require": "./WS/index.js"
+    },
+    "./DiscordShard": {
+      "require": "./DiscordShard/index.js"
+    },
+    "./DiscordWS": {
+      "require": "./DiscordWS/index.js"
+    }
   }
 }

package/websocket.js

@@ -1,11 +0,0 @@
-import * as tracing_1 from "@effect-ts/core/Tracing";
-const fileName_1 = "websocket.ts";
-import * as Ws from "ws";
-import * as H from "@effect-ts/core/Effect/Hub";
-import * as S from "@effect-ts/core/Effect/Experimental/Stream";
-export const create = (url, options) => {
-    const ws = new Ws.WebSocket(url, options);
-    const hub = H.makeUnbounded();
-    S.fromHub;
-};
-//# sourceMappingURL=websocket.js.map

package/websocket.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"websocket.js","sourceRoot":"","sources":["websocket.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AAExB,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAA;AAC/C,OAAO,KAAK,CAAC,MAAM,4CAA4C,CAAA;AAE/D,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,OAA0B,EAAE,EAAE;IAChE,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAEzC,MAAM,GAAG,GAAG,CAAC,CAAC,aAAa,EAAI,CAAA;IAE/B,CAAC,CAAC,OAAO,CAAA;AACX,CAAC,CAAA"}