dfx 0.0.5 → 0.1.0

package/DiscordShard/heartbeats.ts

@@ -1,9 +1,9 @@
 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 * as SC from "@effect-ts/core/Effect/Schedule"
 import { pipe } from "@effect-ts/core/Function"
 import * as O from "@effect-ts/core/Option"
+import * as CB from "callbag-effect-ts"
 import * as DWS from "../DiscordWS"
 import { GatewayOpcode, GatewayPayload, HelloEvent } from "../types"
 import { Reconnect } from "../WS"
@@ -14,7 +14,7 @@ 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))
+    T.tap(() => R.set_(ref, false)),
   )
 
 const maybeSend = (ref: R.Ref<boolean>, seqRef: R.Ref<O.Option<number>>) =>
@@ -22,49 +22,44 @@ const maybeSend = (ref: R.Ref<boolean>, seqRef: R.Ref<O.Option<number>>) =>
     R.get(ref),
     T.chain(
       (acked): T.UIO<DWS.Message> =>
-        acked ? send(ref, seqRef) : T.succeed(Reconnect)
-    )
+        acked ? send(ref, seqRef) : T.succeed(Reconnect),
+    ),
   )
 
-export const fromHub = (
-  hub: H.Hub<GatewayPayload>,
-  seqRef: R.Ref<O.Option<number>>
+export const fromRaw = <R, E>(
+  source: CB.EffectSource<R, E, GatewayPayload>,
+  seqRef: R.Ref<O.Option<number>>,
 ) =>
   pipe(
     R.makeRef(true),
 
     T.map((ackedRef) => {
       const heartbeats = pipe(
-        Utils.opCode(hub)<HelloEvent>(GatewayOpcode.HELLO),
+        Utils.opCode(source)<HelloEvent>(GatewayOpcode.HELLO),
 
         // Reset ack state for each hello
-        S.tap(() => R.set_(ackedRef, true)),
+        CB.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),
+        CB.switchMap((p) =>
+          CB.fromSchedule(
+            SC.duration(p.d!.heartbeat_interval * Math.random())["++"](
+              SC.spaced(p.d!.heartbeat_interval),
+            ),
+          ),
+        ),
 
         // Map to gateway message depending on ack state
-        S.mapEffect(() => maybeSend(ackedRef, seqRef))
+        CB.mapEffect(() => maybeSend(ackedRef, seqRef)),
       )
 
       const acks = pipe(
-        Utils.opCode(hub)(GatewayOpcode.HEARTBEAT_ACK),
-        S.tap(() => R.set_(ackedRef, true)),
-        S.drain
+        Utils.opCode(source)(GatewayOpcode.HEARTBEAT_ACK),
+        CB.tap(() => R.set_(ackedRef, true)),
+        CB.drain,
       )
 
-      return S.merge_(heartbeats, acks)
+      return CB.merge_(heartbeats, acks)
     }),
 
-    S.unwrap
+    CB.unwrap,
   )

package/DiscordShard/identify.d.ts

@@ -1,7 +1,6 @@
-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 * as O from "@effect-ts/core/Option";
+import * as CB from "callbag-effect-ts";
 import { GatewayPayload, ReadyEvent, UpdatePresence } from "../types";
 export interface Options {
     token: string;
@@ -13,4 +12,4 @@ export interface Requirements {
     latestReady: R.Ref<O.Option<ReadyEvent>>;
     latestSequence: R.Ref<O.Option<number>>;
 }
-export declare const fromHub: (hub: H.Hub<GatewayPayload<any>>, { latestReady, latestSequence, ...opts }: Options & Requirements) => S.Stream<unknown, never, GatewayPayload<any>>;
+export declare const fromRaw: <R, E>(source: CB.EffectSource<R, E, GatewayPayload<any>>, { latestReady, latestSequence, ...opts }: Options & Requirements) => CB.EffectSource<R, E, GatewayPayload<any>>;

package/DiscordShard/identify.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromHub = void 0;
+exports.fromRaw = 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 CB = tslib_1.__importStar(require("callbag-effect-ts"));
 const OS = tslib_1.__importStar(require("os"));
 const types_1 = require("../types");
 const Commands = tslib_1.__importStar(require("./commands"));
@@ -29,7 +29,7 @@ const resume = (token, ready, seq) => Commands.resume({
     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;
+const identifyOrResume = (opts, ready, seq) => (T.map_(T.zip_(R.get(ready), R.get(seq), fileName_1 + ":56:10"), ({ tuple }) => (O.fold_(O.zip_(...tuple), () => identify(opts), ({ tuple }) => resume(opts.token, ...tuple))), fileName_1 + ":57:10"));
+const fromRaw = (source, { latestReady, latestSequence, ...opts }) => (CB.mapEffect_(Utils.opCode(source)(types_1.GatewayOpcode.HELLO), (_) => identifyOrResume(opts, latestReady, latestSequence)));
+exports.fromRaw = fromRaw;
 //# sourceMappingURL=identify.js.map

package/DiscordShard/identify.js.map

@@ -1 +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"}
+{"version":3,"file":"identify.js","sourceRoot":"","sources":["identify.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,sEAA+C;AAC/C,uDAA+C;AAC/C,kEAA2C;AAC3C,8DAAuC;AACvC,+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,MAA6C,EAC7C,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,IAAI,EAA0B,EAChE,EAAE,EAGA,EAAE,YADF,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAa,qBAAa,CAAC,KAAK,CAAC,EACxC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,EACxE,CAAA;AAPU,QAAA,OAAO,WAOjB"}

package/DiscordShard/identify.ts

@@ -1,9 +1,8 @@
 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 CB from "callbag-effect-ts"
 import * as OS from "os"
 import {
   GatewayOpcode,
@@ -50,7 +49,7 @@ const resume = (token: string, ready: ReadyEvent, seq: number) =>
 const identifyOrResume = (
   opts: Options,
   ready: R.Ref<O.Option<ReadyEvent>>,
-  seq: R.Ref<O.Option<number>>
+  seq: R.Ref<O.Option<number>>,
 ) =>
   pipe(
     R.get(ready),
@@ -60,17 +59,17 @@ const identifyOrResume = (
         O.zip_(...tuple),
         O.fold(
           () => identify(opts),
-          ({ tuple }) => resume(opts.token, ...tuple)
-        )
-      )
-    )
+          ({ tuple }) => resume(opts.token, ...tuple),
+        ),
+      ),
+    ),
   )
 
-export const fromHub = (
-  hub: H.Hub<GatewayPayload>,
-  { latestReady, latestSequence, ...opts }: Options & Requirements
+export const fromRaw = <R, E>(
+  source: CB.EffectSource<R, E, GatewayPayload>,
+  { latestReady, latestSequence, ...opts }: Options & Requirements,
 ) =>
   pipe(
-    Utils.opCode(hub)<HelloEvent>(GatewayOpcode.HELLO),
-    S.mapEffect(() => identifyOrResume(opts, latestReady, latestSequence))
+    Utils.opCode(source)<HelloEvent>(GatewayOpcode.HELLO),
+    CB.mapEffect((_) => identifyOrResume(opts, latestReady, latestSequence)),
   )

package/DiscordShard/index.d.ts

@@ -1,18 +1,19 @@
 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 H from "@effect-ts/core/Effect/Hub";
 import * as M from "@effect-ts/core/Effect/Managed";
+import * as CB from "callbag-effect-ts";
+import * as Config from "../DiscordConfig";
 import * as DWS from "../DiscordWS";
 import { GatewayEvent, GatewayPayload } from "../types";
-import * as Identify from "./identify";
+export interface Options {
+    shard: [number, number];
+}
 declare const makeService: () => {
     readonly _tag: "DiscordShardService";
-    readonly make: (opts: Identify.Options) => M.Managed<unknown, never, {
-        readonly run: T.RIO<import("@effect-ts/system/Has").Has<DWS.DiscordWS> & import("@effect-ts/system/Has").Has<import("../WS").WS> & import("@effect-ts/system/Clock").HasClock & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Has").Has<import("@effect-ts/system/Clock").Clock>, void>;
-        readonly raw: H.Hub<GatewayPayload<any>>;
-        readonly dispatch: H.Hub<GatewayPayload<GatewayEvent>>;
-        readonly fromDispatch: <K extends keyof import("../types").GatewayEvents>(event: K) => S.Stream<unknown, never, import("../types").GatewayEvents[K]>;
+    readonly make: (shard: [id: number, count: number]) => M.Managed<import("@effect-ts/system/Has").Has<Config.DiscordConfig>, never, {
+        readonly run: T.RIO<import("@effect-ts/system/Has").Has<DWS.DiscordWS> & import("@effect-ts/system/Has").Has<import("../WS").WS> & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, void>;
+        readonly raw: CB.EffectSource<import("@effect-ts/system/Has").Has<DWS.DiscordWS> & import("@effect-ts/system/Has").Has<import("../WS").WS> & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, unknown, GatewayPayload<any>>;
+        readonly dispatch: CB.EffectSource<import("@effect-ts/system/Has").Has<DWS.DiscordWS> & import("@effect-ts/system/Has").Has<import("../WS").WS> & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, unknown, GatewayPayload<GatewayEvent>>;
         readonly send: (p: GatewayPayload) => T.Effect<unknown, never, boolean>;
         readonly reconnect: () => T.Effect<unknown, never, boolean>;
     }>;
@@ -20,12 +21,11 @@ declare const makeService: () => {
 export interface DiscordShard extends ReturnType<typeof makeService> {
 }
 export declare const DiscordShard: import("@effect-ts/system/Has").Tag<DiscordShard>;
-export declare const LiveDiscordShard: L.Layer<{}, never, import("@effect-ts/system/Has").Has<DiscordShard>>;
-export declare const make: (opts: Identify.Options) => M.Managed<import("@effect-ts/system/Has").Has<DiscordShard>, never, {
-    readonly run: T.RIO<import("@effect-ts/system/Has").Has<DWS.DiscordWS> & import("@effect-ts/system/Has").Has<import("../WS").WS> & import("@effect-ts/system/Clock").HasClock & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Has").Has<import("@effect-ts/system/Clock").Clock>, void>;
-    readonly raw: H.Hub<GatewayPayload<any>>;
-    readonly dispatch: H.Hub<GatewayPayload<GatewayEvent>>;
-    readonly fromDispatch: <K extends keyof import("../types").GatewayEvents>(event: K) => S.Stream<unknown, never, import("../types").GatewayEvents[K]>;
+export declare const LiveDiscordShard: L.Layer<unknown, never, import("@effect-ts/system/Has").Has<DiscordShard>>;
+export declare const make: (shard: [number, number]) => M.Managed<import("@effect-ts/system/Has").Has<Config.DiscordConfig> & import("@effect-ts/system/Has").Has<DiscordShard>, never, {
+    readonly run: T.RIO<import("@effect-ts/system/Has").Has<DWS.DiscordWS> & import("@effect-ts/system/Has").Has<import("../WS").WS> & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, void>;
+    readonly raw: CB.EffectSource<import("@effect-ts/system/Has").Has<DWS.DiscordWS> & import("@effect-ts/system/Has").Has<import("../WS").WS> & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, unknown, GatewayPayload<any>>;
+    readonly dispatch: CB.EffectSource<import("@effect-ts/system/Has").Has<DWS.DiscordWS> & import("@effect-ts/system/Has").Has<import("../WS").WS> & import("@effect-ts/system/Has").Has<import("../Log").Log> & import("@effect-ts/system/Clock").HasClock, unknown, GatewayPayload<GatewayEvent>>;
     readonly send: (p: GatewayPayload) => T.Effect<unknown, never, boolean>;
     readonly reconnect: () => T.Effect<unknown, never, boolean>;
 }>;

package/DiscordShard/index.js

@@ -6,13 +6,13 @@ 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 CB = tslib_1.__importStar(require("callbag-effect-ts"));
+const Config = tslib_1.__importStar(require("../DiscordConfig"));
 const DWS = tslib_1.__importStar(require("../DiscordWS"));
 const types_1 = require("../types");
 const WS_1 = require("../WS");
@@ -20,31 +20,34 @@ 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);
+const makeImpl = (shard) => M.gen(function* (_) {
+    const token = yield* _(Config.token, fileName_1 + ":29:27");
+    const gateway = yield* _(Config.gateway, fileName_1 + ":30:29");
+    const outbound = yield* _(Q.makeUnbounded(), fileName_1 + ":31: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 + ":33:54");
+    const [latestSequence, updateLatestSequence] = yield* _(Utils.latest((p) => O.fromNullable(p.s)), fileName_1 + ":44:60");
+    const raw = (CB.share(CB.unwrap(DWS.open({
+        outgoingQueue: outbound,
+    }))));
+    const updateRefs = (CB.runDrain(updateLatestReady(updateLatestSequence(raw))));
+    const dispatch = (CB.share(CB.filter_(raw, (p) => p.op === types_1.GatewayOpcode.DISPATCH)));
     // heartbeats
-    const heartbeatEffects = (S.forEach_(Heartbeats.fromHub(hub, latestSequence), (p) => Q.offer_(outbound, p)));
+    const heartbeatEffects = (CB.forEach_(Heartbeats.fromRaw(raw, latestSequence), (p) => Q.offer_(outbound, p)));
     // identify
-    const identifyEffects = (S.forEach_(Identify.fromHub(hub, {
-        ...opts,
+    const identifyEffects = (CB.forEach_(Identify.fromRaw(raw, {
+        token,
+        shard,
+        intents: gateway.intents,
+        presence: gateway.presence,
         latestSequence,
         latestReady,
     }), (p) => Q.offer_(outbound, p)));
     // invalid session
-    const invalidEffects = (S.forEach_(Invalid.fromHub(hub, latestReady), (p) => Q.offer_(outbound, p)));
+    const invalidEffects = (CB.forEach_(Invalid.fromRaw(raw, 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,
+        run: (T.ignore(T.zipPar(invalidEffects, fileName_1 + ":101:17")(T.zipPar(identifyEffects, fileName_1 + ":100:17")(T.zipPar(heartbeatEffects, fileName_1 + ":99:17")(updateRefs))), fileName_1 + ":102:17")),
+        raw,
         dispatch,
-        fromDispatch,
         send: (p) => Q.offer_(outbound, p),
         reconnect: () => Q.offer_(outbound, WS_1.Reconnect),
     };
@@ -54,7 +57,7 @@ const makeService = () => ({
     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.LiveDiscordShard = L.fromFunction(exports.DiscordShard)(makeService);
+const make = (shard) => M.accessServiceM(exports.DiscordShard)(({ make }) => make(shard));
 exports.make = make;
 //# sourceMappingURL=index.js.map

package/DiscordShard/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/DiscordShard/index.ts

@@ -1,14 +1,12 @@
 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 CB from "callbag-effect-ts"
+import * as Config from "../DiscordConfig"
 import * as DWS from "../DiscordWS"
 import {
   GatewayEvent,
@@ -22,8 +20,14 @@ import * as Identify from "./identify"
 import * as Invalid from "./invalidSession"
 import * as Utils from "./utils"
 
-const makeImpl = (opts: Identify.Options) =>
+export interface Options {
+  shard: [number, number]
+}
+
+const makeImpl = (shard: [id: number, count: number]) =>
   M.gen(function* (_) {
+    const token = yield* _(Config.token)
+    const gateway = yield* _(Config.gateway)
     const outbound = yield* _(Q.makeUnbounded<DWS.Message>())
 
     const [latestReady, updateLatestReady] = yield* _(
@@ -31,66 +35,74 @@ const makeImpl = (opts: Identify.Options) =>
         flow(
           O.fromPredicate(
             (p): p is GatewayPayload<ReadyEvent> =>
-              p.op === GatewayOpcode.DISPATCH && p.t === "READY"
+              p.op === GatewayOpcode.DISPATCH && p.t === "READY",
           ),
-          O.map((p) => p.d!)
-        )
-      )
+          O.map((p) => p.d!),
+        ),
+      ),
     )
     const [latestSequence, updateLatestSequence] = yield* _(
-      Utils.latest((p) => O.fromNullable(p.s))
+      Utils.latest((p) => O.fromNullable(p.s)),
     )
 
-    const hub = yield* _(H.makeUnbounded<GatewayPayload>())
-    const publishToHub = pipe(
+    const raw = pipe(
       DWS.open({
-        outgoing: S.fromQueue_(outbound),
+        outgoingQueue: outbound,
       }),
-      S.unwrap,
+      CB.unwrap,
+      CB.share,
+    )
+    const updateRefs = pipe(
+      raw,
       updateLatestSequence,
       updateLatestReady,
-      S.forEach((p) => H.publish_(hub, p))
+      CB.runDrain,
     )
 
-    const dispatch: H.Hub<GatewayPayload<GatewayEvent>> = pipe(
-      hub,
-      H.filterOutput((p) => p.op === GatewayOpcode.DISPATCH)
+    const dispatch = pipe(
+      raw,
+      CB.filter(
+        (p): p is GatewayPayload<GatewayEvent> =>
+          p.op === GatewayOpcode.DISPATCH,
+      ),
+      CB.share,
     )
-    const fromDispatch = Utils.fromDispatch(dispatch)
 
     // heartbeats
     const heartbeatEffects = pipe(
-      Heartbeats.fromHub(hub, latestSequence),
-      S.forEach((p) => Q.offer_(outbound, p))
+      Heartbeats.fromRaw(raw, latestSequence),
+      CB.forEach((p) => Q.offer_(outbound, p)),
     )
 
     // identify
     const identifyEffects = pipe(
-      Identify.fromHub(hub, {
-        ...opts,
+      Identify.fromRaw(raw, {
+        token,
+        shard,
+        intents: gateway.intents,
+        presence: gateway.presence,
         latestSequence,
         latestReady,
       }),
-      S.forEach((p) => Q.offer_(outbound, p))
+      CB.forEach((p) => Q.offer_(outbound, p)),
     )
 
     // invalid session
     const invalidEffects = pipe(
-      Invalid.fromHub(hub, latestReady),
-      S.forEach((p) => Q.offer_(outbound, p))
+      Invalid.fromRaw(raw, latestReady),
+      CB.forEach((p) => Q.offer_(outbound, p)),
     )
 
     return {
       run: pipe(
-        publishToHub,
+        updateRefs,
         T.zipPar(heartbeatEffects),
         T.zipPar(identifyEffects),
         T.zipPar(invalidEffects),
-        T.ignore
+        T.ignore,
       ),
-      raw: hub,
+      raw,
       dispatch,
-      fromDispatch,
       send: (p: GatewayPayload) => Q.offer_(outbound, p),
       reconnect: () => Q.offer_(outbound, Reconnect),
     } as const
@@ -104,7 +116,7 @@ const makeService = () =>
 
 export interface DiscordShard extends ReturnType<typeof makeService> {}
 export const DiscordShard = tag<DiscordShard>()
-export const LiveDiscordShard = L.fromValue(DiscordShard)(makeService())
+export const LiveDiscordShard = L.fromFunction(DiscordShard)(makeService)
 
-export const make = (opts: Identify.Options) =>
-  M.accessServiceM(DiscordShard)(({ make }) => make(opts))
+export const make = (shard: [number, number]) =>
+  M.accessServiceM(DiscordShard)(({ make }) => make(shard))

package/DiscordShard/invalidSession.d.ts

@@ -1,7 +1,6 @@
-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 * as O from "@effect-ts/core/Option";
+import * as CB from "callbag-effect-ts";
 import { Message } from "../DiscordWS";
 import { GatewayPayload, ReadyEvent } from "../types";
-export declare const fromHub: (hub: H.Hub<GatewayPayload<any>>, latestReady: R.Ref<O.Option<ReadyEvent>>) => S.Stream<unknown, never, Message>;
+export declare const fromRaw: <R, E>(raw: CB.EffectSource<R, E, GatewayPayload<any>>, latestReady: R.Ref<O.Option<ReadyEvent>>) => CB.EffectSource<R, E, Message>;

package/DiscordShard/invalidSession.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromHub = void 0;
+exports.fromRaw = 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 CB = tslib_1.__importStar(require("callbag-effect-ts"));
 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;
+const fromRaw = (raw, latestReady) => (CB.map_(CB.tap_(Utils.opCode(raw)(types_1.GatewayOpcode.INVALID_SESSION), (p) => (p.d ? T.unit : R.set_(latestReady, O.none))), () => WS_1.Reconnect));
+exports.fromRaw = fromRaw;
 //# sourceMappingURL=invalidSession.js.map

package/DiscordShard/invalidSession.js.map

@@ -1 +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"}
+{"version":3,"file":"invalidSession.js","sourceRoot":"","sources":["invalidSession.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,sEAA+C;AAC/C,uDAA+C;AAC/C,kEAA2C;AAC3C,8DAAuC;AAEvC,oCAKiB;AACjB,8BAAiC;AACjC,uDAAgC;AAEzB,MAAM,OAAO,GAAG,CACrB,GAA0C,EAC1C,WAAwC,EACxC,EAAE,EAIA,EAAE,MADF,EAAE,MADF,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAsB,qBAAa,CAAC,eAAe,CAAC,EAC9D,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,EAChC,CAAA;AARU,QAAA,OAAO,WAQjB"}

package/DiscordShard/invalidSession.ts

@@ -1,9 +1,8 @@
 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 CB from "callbag-effect-ts"
 import { Message } from "../DiscordWS"
 import {
   GatewayOpcode,
@@ -14,12 +13,12 @@ import {
 import { Reconnect } from "../WS"
 import * as Utils from "./utils"
 
-export const fromHub = (
-  hub: H.Hub<GatewayPayload>,
-  latestReady: R.Ref<O.Option<ReadyEvent>>
+export const fromRaw = <R, E>(
+  raw: CB.EffectSource<R, E, 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)
+    Utils.opCode(raw)<InvalidSessionEvent>(GatewayOpcode.INVALID_SESSION),
+    CB.tap((p) => (p.d ? T.unit : R.set_(latestReady, O.none))),
+    CB.map((): Message => Reconnect),
   )

package/DiscordShard/utils.d.ts

@@ -1,9 +1,7 @@
 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 * as O from "@effect-ts/core/Option";
-import { GatewayEvent, GatewayEvents, GatewayOpcode, GatewayPayload } from "../types";
-export declare const opCode: (hub: H.Hub<GatewayPayload<any>>) => <T = any>(code: GatewayOpcode) => S.UIO<GatewayPayload<T>>;
-export declare const latest: <T>(f: (p: GatewayPayload) => O.Option<T>) => T.Effect<unknown, never, readonly [R.Ref<O.Option<T>>, <R, E>(self: S.Stream<R, E, GatewayPayload<any>>) => S.Stream<R, E, GatewayPayload<any>>]>;
-export declare const fromDispatch: (hub: H.Hub<GatewayPayload<GatewayEvent>>) => <K extends keyof GatewayEvents>(event: K) => S.Stream<unknown, never, GatewayEvents[K]>;
+import * as CB from "callbag-effect-ts";
+import { GatewayOpcode, GatewayPayload } from "../types";
+export declare const opCode: <R, E>(source: CB.EffectSource<R, E, GatewayPayload<any>>) => <T = any>(code: GatewayOpcode) => CB.EffectSource<R, E, GatewayPayload<T>>;
+export declare const latest: <T>(f: (p: GatewayPayload) => O.Option<T>) => T.Effect<unknown, never, readonly [R.Ref<O.Option<T>>, <R, E>(self: CB.EffectSource<R, E, GatewayPayload<any>>) => CB.EffectSource<R, E, GatewayPayload<any>>]>;

package/DiscordShard/utils.js

@@ -1,24 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromDispatch = exports.latest = exports.opCode = void 0;
+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));
+const CB = tslib_1.__importStar(require("callbag-effect-ts"));
+const opCode = (source) => (code) => (CB.filter_(source, (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");
+const maybeUpdateRef = (f, ref) => (0, Function_1.flow)(f, O.fold(() => T.unit, (a) => R.set_(ref, O.some(a))));
+const latest = (f) => (T.map_(R.makeRef(O.none), (ref) => [ref, CB.tap(maybeUpdateRef(f, ref))], fileName_1 + ":31:10"));
 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

@@ -1 +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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,sEAA+C;AAC/C,uDAAqD;AACrD,kEAA2C;AAC3C,8DAAuC;AAGhC,MAAM,MAAM,GACjB,CAAO,MAA6C,EAAE,EAAE,CACxD,CAAU,IAAmB,EAAE,EAAE,EAG7B,EAAE,SADF,MAAM,EACI,CAAC,CAAC,EAA0B,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,EACvD,CAAA;AANQ,QAAA,MAAM,UAMd;AAEL,MAAM,cAAc,GAAG,CACrB,CAAqC,EACrC,GAAuB,EACvB,EAAE,CACF,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,CAAA;AAEI,MAAM,MAAM,GAAG,CAAI,CAAqC,EAAE,EAAE,EAG/D,CAAC,MADD,CAAC,CAAC,OAAO,CAAc,CAAC,CAAC,IAAI,CAAC,EACxB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAU,yBAC9D,CAAA;AAJU,QAAA,MAAM,UAIhB"}