dfx 0.20.5 → 0.21.1

package/Cache/prelude.js

@@ -1,63 +1,61 @@
-import * as tsplus_module_1 from "callbag-effect-ts/Source/fromIterable";
-import * as tsplus_module_2 from "callbag-effect-ts/Source/chain";
-import * as tsplus_module_3 from "callbag-effect-ts/Source/map";
-import * as tsplus_module_4 from "callbag-effect-ts/Source/merge";
-import * as tsplus_module_5 from "@effect/io/Effect";
-import * as tsplus_module_6 from "dfx";
-import * as tsplus_module_7 from "dfx/gateway";
-import { make, makeWithParent, CacheMissError, } from "./index.js";
+import * as tsplus_module_1 from "@effect/stream/Stream";
+import * as tsplus_module_2 from "@effect/io/Effect";
+import { DiscordREST } from "dfx";
+import { Gateway } from "dfx/gateway";
+import { Effect, Stream } from "dfx/_common";
+import { CacheMissError, make, makeWithParent, } from "./index.js";
 export const opsWithParent = ({ id, fromParent, create, update, remove, parentRemove, }) => {
-    const fromParentOps = tsplus_module_2.chain(([parentId, a]) => tsplus_module_1.fromIterable(a.map((resource) => ({
+    const fromParentOps = tsplus_module_1.flatMap(([parentId, a]) => Stream.fromIterable(a.map((resource) => ({
         op: "create",
         parentId,
         resourceId: id(resource),
         resource,
     }))))(fromParent);
-    const createOps = tsplus_module_3.map(([parentId, resource]) => ({
+    const createOps = tsplus_module_1.map(([parentId, resource]) => ({
         op: "create",
         parentId,
         resourceId: id(resource),
         resource,
     }))(create);
-    const updateOps = tsplus_module_3.map(([parentId, resource]) => ({
+    const updateOps = tsplus_module_1.map(([parentId, resource]) => ({
         op: "update",
         parentId,
         resourceId: id(resource),
         resource,
     }))(update);
-    const removeOps = tsplus_module_3.map(([parentId, resourceId]) => ({
+    const removeOps = tsplus_module_1.map(([parentId, resourceId]) => ({
         op: "delete",
         parentId,
         resourceId,
     }))(remove);
-    const parentRemoveOps = tsplus_module_3.map((parentId) => ({
+    const parentRemoveOps = tsplus_module_1.map((parentId) => ({
         op: "parentDelete",
         parentId,
     }))(parentRemove);
-    return tsplus_module_4.merge(parentRemoveOps)(tsplus_module_4.merge(removeOps)(tsplus_module_4.merge(updateOps)(tsplus_module_4.merge(createOps)(fromParentOps))));
+    return tsplus_module_1.merge(parentRemoveOps)(tsplus_module_1.merge(removeOps)(tsplus_module_1.merge(updateOps)(tsplus_module_1.merge(createOps)(fromParentOps))));
 };
 export const ops = ({ id, create, update, remove }) => {
-    const createOps = tsplus_module_3.map((resource) => ({
+    const createOps = tsplus_module_1.map((resource) => ({
         op: "create",
         resourceId: id(resource),
         resource,
     }))(create);
-    const updateOps = tsplus_module_3.map((resource) => ({
+    const updateOps = tsplus_module_1.map((resource) => ({
         op: "update",
         resourceId: id(resource),
         resource,
     }))(update);
-    const removeOps = tsplus_module_3.map((resourceId) => ({
+    const removeOps = tsplus_module_1.map((resourceId) => ({
         op: "delete",
         resourceId,
     }))(remove);
-    return tsplus_module_4.merge(removeOps)(tsplus_module_4.merge(updateOps)(createOps));
+    return tsplus_module_1.merge(removeOps)(tsplus_module_1.merge(updateOps)(createOps));
 };
-export const guilds = (makeDriver) => tsplus_module_5.flatMap(driver => tsplus_module_5.flatMap(gateway => tsplus_module_5.map(rest => make({
+export const guilds = (makeDriver) => tsplus_module_2.flatMap(driver => tsplus_module_2.flatMap(gateway => tsplus_module_2.map(rest => make({
     driver,
     ops: ops({
         id: (g) => g.id,
-        create: tsplus_module_3.map((g) => ({
+        create: tsplus_module_1.map((g) => ({
             ...g,
             channels: [],
             roles: [],
@@ -65,44 +63,44 @@ export const guilds = (makeDriver) => tsplus_module_5.flatMap(driver => tsplus_m
             members: [],
         }))(gateway.fromDispatch("GUILD_CREATE")),
         update: gateway.fromDispatch("GUILD_UPDATE"),
-        remove: tsplus_module_3.map((a) => a.id)(gateway.fromDispatch("GUILD_DELETE")),
+        remove: tsplus_module_1.map((a) => a.id)(gateway.fromDispatch("GUILD_DELETE")),
     }),
-    onMiss: (id) => tsplus_module_5.flatMap((r) => r.json)(rest.getGuild(id)),
-}))(tsplus_module_5.service(tsplus_module_6.DiscordREST)))(tsplus_module_5.service(tsplus_module_7.Gateway.DiscordGateway)))(makeDriver);
-export const channels = (makeDriver) => tsplus_module_5.flatMap(driver => tsplus_module_5.flatMap(gateway => tsplus_module_5.map(rest => makeWithParent({
+    onMiss: (id) => tsplus_module_2.flatMap((r) => r.json)(rest.getGuild(id)),
+}))(Effect.service(DiscordREST)))(Effect.service(Gateway.DiscordGateway)))(makeDriver);
+export const channels = (makeDriver) => tsplus_module_2.flatMap(driver => tsplus_module_2.flatMap(gateway => tsplus_module_2.map(rest => makeWithParent({
     driver,
     ops: opsWithParent({
         id: (a) => a.id,
-        fromParent: tsplus_module_3.map((g) => [g.id, g.channels])(gateway
+        fromParent: tsplus_module_1.map((g) => [g.id, g.channels])(gateway
             .fromDispatch("GUILD_CREATE")),
-        create: tsplus_module_3.map((c) => [c.guild_id, c])(gateway
+        create: tsplus_module_1.map((c) => [c.guild_id, c])(gateway
             .fromDispatch("CHANNEL_CREATE")),
-        update: tsplus_module_3.map((c) => [c.guild_id, c])(gateway
+        update: tsplus_module_1.map((c) => [c.guild_id, c])(gateway
             .fromDispatch("CHANNEL_UPDATE")),
-        remove: tsplus_module_3.map((a) => [a.guild_id, a.id])(gateway
+        remove: tsplus_module_1.map((a) => [a.guild_id, a.id])(gateway
             .fromDispatch("CHANNEL_DELETE")),
-        parentRemove: tsplus_module_3.map((g) => g.id)(gateway.fromDispatch("GUILD_DELETE")),
+        parentRemove: tsplus_module_1.map((g) => g.id)(gateway.fromDispatch("GUILD_DELETE")),
     }),
-    onMiss: (id) => tsplus_module_5.flatMap((r) => r.json)(rest.getChannel(id)),
-    onParentMiss: (guildId) => tsplus_module_5.map((a) => a.map((a) => [a.id, a]))(tsplus_module_5.flatMap((r) => r.json)(rest
+    onMiss: (id) => tsplus_module_2.flatMap((r) => r.json)(rest.getChannel(id)),
+    onParentMiss: (guildId) => tsplus_module_2.map((a) => a.map((a) => [a.id, a]))(tsplus_module_2.flatMap((r) => r.json)(rest
         .getGuildChannels(guildId))),
-}))(tsplus_module_5.service(tsplus_module_6.DiscordREST)))(tsplus_module_5.service(tsplus_module_7.Gateway.DiscordGateway)))(makeDriver);
-export const roles = (makeDriver) => tsplus_module_5.flatMap(driver => tsplus_module_5.flatMap(gateway => tsplus_module_5.map(rest => makeWithParent({
+}))(Effect.service(DiscordREST)))(Effect.service(Gateway.DiscordGateway)))(makeDriver);
+export const roles = (makeDriver) => tsplus_module_2.flatMap(driver => tsplus_module_2.flatMap(gateway => tsplus_module_2.map(rest => makeWithParent({
     driver,
     ops: opsWithParent({
         id: (a) => a.id,
-        fromParent: tsplus_module_3.map((g) => [g.id, g.roles])(gateway
+        fromParent: tsplus_module_1.map((g) => [g.id, g.roles])(gateway
             .fromDispatch("GUILD_CREATE")),
-        create: tsplus_module_3.map((r) => [r.guild_id, r.role])(gateway
+        create: tsplus_module_1.map((r) => [r.guild_id, r.role])(gateway
             .fromDispatch("GUILD_ROLE_CREATE")),
-        update: tsplus_module_3.map((r) => [r.guild_id, r.role])(gateway
+        update: tsplus_module_1.map((r) => [r.guild_id, r.role])(gateway
             .fromDispatch("GUILD_ROLE_UPDATE")),
-        remove: tsplus_module_3.map((a) => [a.guild_id, a.role_id])(gateway
+        remove: tsplus_module_1.map((a) => [a.guild_id, a.role_id])(gateway
             .fromDispatch("GUILD_ROLE_DELETE")),
-        parentRemove: tsplus_module_3.map((g) => g.id)(gateway.fromDispatch("GUILD_DELETE")),
+        parentRemove: tsplus_module_1.map((g) => g.id)(gateway.fromDispatch("GUILD_DELETE")),
     }),
-    onMiss: (id) => tsplus_module_5.fail(new CacheMissError("RolesCache", id)),
-    onParentMiss: (guildId) => tsplus_module_5.map((a) => a.map((a) => [a.id, a]))(tsplus_module_5.flatMap((r) => r.json)(rest
+    onMiss: (id) => Effect.fail(new CacheMissError("RolesCache", id)),
+    onParentMiss: (guildId) => tsplus_module_2.map((a) => a.map((a) => [a.id, a]))(tsplus_module_2.flatMap((r) => r.json)(rest
         .getGuildRoles(guildId))),
-}))(tsplus_module_5.service(tsplus_module_6.DiscordREST)))(tsplus_module_5.service(tsplus_module_7.Gateway.DiscordGateway)))(makeDriver);
+}))(Effect.service(DiscordREST)))(Effect.service(Gateway.DiscordGateway)))(makeDriver);
 //# sourceMappingURL=prelude.js.map

package/Cache/prelude.js.map

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

package/DiscordConfig/index.d.ts

@@ -1,12 +1,11 @@
-import { Duration } from "dfx/utils/common";
-import { Discord } from "dfx";
+import { Context, Discord, Duration, Layer } from "dfx/_common";
 export interface DiscordConfig {
     token: string;
     rest: {
         baseUrl: string;
         globalRateLimit: {
             limit: number;
-            window: Duration;
+            window: Duration.Duration;
         };
     };
     gateway: {
@@ -16,25 +15,11 @@ export interface DiscordConfig {
         identifyRateLimit: readonly [window: number, limit: number];
     };
 }
-export declare const DiscordConfig: import("../utils/common.js").Tag<DiscordConfig>;
+export declare const DiscordConfig: Context.Tag<DiscordConfig>;
 export interface MakeOpts {
     token: string;
     rest?: Partial<DiscordConfig["rest"]>;
     gateway?: Partial<DiscordConfig["gateway"]>;
 }
 export declare const make: ({ token, rest, gateway }: MakeOpts) => DiscordConfig;
-export declare const makeLayer: (a_0: MakeOpts) => import("../utils/common.js").Layer<never, never, DiscordConfig>;
-export declare const token: import("../utils/common.js").Effect<DiscordConfig, never, string>;
-export declare const rest: import("../utils/common.js").Effect<DiscordConfig, never, {
-    baseUrl: string;
-    globalRateLimit: {
-        limit: number;
-        window: Duration;
-    };
-}>;
-export declare const gateway: import("../utils/common.js").Effect<DiscordConfig, never, {
-    intents: number;
-    presence?: import("../types.js").UpdatePresence | undefined;
-    shardCount?: number | undefined;
-    identifyRateLimit: readonly [window: number, limit: number];
-}>;
+export declare const makeLayer: (a_0: MakeOpts) => Layer.Layer<never, never, DiscordConfig>;

package/DiscordConfig/index.js

@@ -1,10 +1,6 @@
-import * as tsplus_module_1 from "dfx/utils/common";
-import * as tsplus_module_2 from "@fp-ts/data/Duration";
-import * as tsplus_module_3 from "dfx";
-import * as tsplus_module_4 from "@effect/io/Layer";
-import * as tsplus_module_5 from "@effect/io/Effect";
+import { Context, Discord, Duration, flow, Layer } from "dfx/_common";
 const VERSION = 10;
-export const DiscordConfig = tsplus_module_1.Tag();
+export const DiscordConfig = Context.Tag();
 export const make = ({ token, rest, gateway }) => ({
     token,
     rest: {
@@ -12,18 +8,15 @@ export const make = ({ token, rest, gateway }) => ({
         ...(rest ?? {}),
         globalRateLimit: {
             limit: 50,
-            window: tsplus_module_2.seconds(1),
+            window: Duration.seconds(1),
             ...(rest?.globalRateLimit ?? {}),
         },
     },
     gateway: {
-        intents: tsplus_module_3.Discord.GatewayIntents.GUILDS,
+        intents: Discord.GatewayIntents.GUILDS,
         identifyRateLimit: [5000, 1],
         ...(gateway ?? {}),
     },
 });
-export const makeLayer = tsplus_module_1.flow(make, tsplus_module_4.succeed(DiscordConfig));
-export const token = tsplus_module_5.serviceWith(DiscordConfig)(({ token }) => token);
-export const rest = tsplus_module_5.serviceWith(DiscordConfig)(({ rest }) => rest);
-export const gateway = tsplus_module_5.serviceWith(DiscordConfig)(({ gateway }) => gateway);
+export const makeLayer = flow(make, Layer.succeed(DiscordConfig));
 //# sourceMappingURL=index.js.map

package/DiscordConfig/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/DiscordConfig/index.ts"],"names":[],"mappings":";;;;;AAAA,MAAM,OAAO,GAAG,EAAE,CAAA;AAmBlB,MAAM,CAAC,MAAM,aAAa,GAAG,gBAAA,GAAG,EAAiB,CAAA;AAQjD,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAY,EAAiB,EAAE,CAAC,CAAC;IAC1E,KAAK;IACL,IAAI,EAAE;QACJ,OAAO,EAAE,4BAA4B,OAAO,EAAE;QAC9C,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;QACf,eAAe,EAAE;YACf,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,wBAAiB,CAAC,CAAC;YAC3B,GAAG,CAAC,IAAI,EAAE,eAAe,IAAI,EAAE,CAAC;SACjC;KACF;IACD,OAAO,EAAE;QACP,OAAO,EAAE,gBAAA,OAAO,CAAC,cAAc,CAAC,MAAM;QACtC,iBAAiB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5B,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;KACnB;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,gBAAA,IAAI,CAAC,IAAI,EAAE,wBAAc,aAAa,CAAC,CAAC,CAAA;AAEjE,MAAM,CAAC,MAAM,KAAK,GAAG,4BAAmB,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;AAC5E,MAAM,CAAC,MAAM,IAAI,GAAG,4BAAmB,aAAa,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAA;AACzE,MAAM,CAAC,MAAM,OAAO,GAAG,4BAAmB,aAAa,CAAC,CACtD,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CACzB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/DiscordConfig/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAU,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAE7E,MAAM,OAAO,GAAG,EAAE,CAAA;AAmBlB,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,EAAiB,CAAA;AAQzD,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAY,EAAiB,EAAE,CAAC,CAAC;IAC1E,KAAK;IACL,IAAI,EAAE;QACJ,OAAO,EAAE,4BAA4B,OAAO,EAAE;QAC9C,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;QACf,eAAe,EAAE;YACf,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;YAC3B,GAAG,CAAC,IAAI,EAAE,eAAe,IAAI,EAAE,CAAC;SACjC;KACF;IACD,OAAO,EAAE;QACP,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,MAAM;QACtC,iBAAiB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5B,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;KACnB;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAA"}

package/DiscordGateway/DiscordWS/index.d.ts

@@ -1,23 +1,23 @@
 /// <reference types="ws" />
-import { Discord } from "dfx";
-import { WS } from "dfx/gateway";
-import { Effect, EffectSource } from "dfx/utils/common";
+import { Log } from "dfx/Log/index";
+import { Context, Discord, Effect, Layer, Stream } from "dfx/_common";
 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<never, never, Message>;
+    outbound: Effect.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: import("../../utils/common.js").Tag<DiscordWSCodec>;
-export declare const LiveJsonDiscordWSCodec: import("../../utils/common.js").Layer<never, never, DiscordWSCodec>;
-export declare const make: ({ url, version, outbound, }: OpenOpts) => import("../../utils/common.js").Effect<DiscordWSCodec | import("../../Log/index.js").Log, never, {
-    source: import("callbag-effect-ts/Source").EffectSource<never, never, import("../../types.js").GatewayPayload<any>>;
-    setUrl: (url: string) => import("../../utils/common.js").Effect<never, never, void>;
+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>;
 }>;

package/DiscordGateway/DiscordWS/index.js

@@ -1,26 +1,22 @@
-import * as tsplus_module_1 from "dfx/utils/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 "callbag-effect-ts/Source/tapError";
-import * as tsplus_module_6 from "callbag-effect-ts/Source/retry";
-import * as tsplus_module_7 from "callbag-effect-ts/Source/map";
-import * as tsplus_module_8 from "dfx";
-import * as tsplus_module_9 from "@effect/io/Effect";
-import * as tsplus_module_10 from "dfx/gateway";
-import * as tsplus_module_11 from "@effect/io/Ref";
-export const DiscordWSCodec = tsplus_module_1.Tag();
-export const LiveJsonDiscordWSCodec = tsplus_module_2.succeed(DiscordWSCodec)({
+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)({
     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_9.flatMap(encoding => tsplus_module_9.flatMap(urlRef => {
-    const setUrl = (url) => tsplus_module_11.set(`${url}?v=${version}&encoding=${encoding.type}`)(urlRef);
-    const take = tsplus_module_9.map((a) => a === tsplus_module_10.WS.Reconnect ? a : encoding.encode(a))(outbound);
-    return tsplus_module_9.flatMap(ws => tsplus_module_9.map(log => {
-        const source = tsplus_module_7.map(encoding.decode)(tsplus_module_6.retry(tsplus_module_4.exponential(tsplus_module_3.seconds(0.5)))(tsplus_module_5.tapError((e) => log.info("DiscordWS", "ERROR", e))(ws)));
+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)));
         return { source, setUrl };
-    })(tsplus_module_9.service(tsplus_module_8.Log.Log)))(tsplus_module_10.WS.make(urlRef, take));
-})(tsplus_module_11.make(`${url}?v=${version}&encoding=${encoding.type}`)))(tsplus_module_9.service(DiscordWSCodec));
+    })(Effect.service(Log));
+})(Ref.make(`${url}?v=${version}&encoding=${encoding.type}`)))(Effect.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":";;;;;;;;;;;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,qBAAW,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,iBAAA,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EADhC,QAAQ,CAEpB,CAAA;mCACK,EAAE,wBAEF,GAAG;QACT,MAAM,MAAM,GAAG,oBAGR,QAAQ,CAAC,MAAM,EAHP,sBAEN,4BAAqB,wBAAiB,GAAG,CAAC,CAAC,EAFrC,yBACH,CAAC,CAAM,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC,EAD1C,EAAE,CACyC,CACL,CAKpD,CAAA;QAED,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;OAVX,wBAAe,gBAAA,GAAG,CAAC,GAAG,CAAC,GAFxB,iBAAA,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC;GANjB,sBAAS,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,GADvD,wBAAe,cAAc,CAAC,CAoBjD,CAAA"}
+{"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"}

package/DiscordGateway/Shard/heartbeats.d.ts

@@ -1,4 +1,3 @@
-import { Ref, Maybe, Effect, EffectSource } from "dfx/utils/common";
-import { DiscordWS } from "dfx/gateway";
-import { Discord } from "dfx";
-export declare const fromRaw: <R, E>(source: import("callbag-effect-ts/Source").EffectSource<R, E, import("../../types.js").GatewayPayload<any>>, seqRef: Ref<Maybe<number>>) => import("callbag-effect-ts/Source").EffectSource<R, E, import("../DiscordWS/index.js").Message>;
+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>;

package/DiscordGateway/Shard/heartbeats.js

@@ -1,24 +1,17 @@
 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 "dfx/gateway";
+import * as tsplus_module_4 from "@effect/stream/Stream";
 import * as tsplus_module_5 from "@effect/io/Schedule";
-import * as tsplus_module_6 from "callbag-effect-ts/Source/fromSchedule";
-import * as tsplus_module_7 from "dfx";
-import * as tsplus_module_8 from "callbag-effect-ts/Source/tap";
-import * as tsplus_module_9 from "callbag-effect-ts/Source/switchMap";
-import * as tsplus_module_10 from "callbag-effect-ts/Source/mapEffect";
-import * as tsplus_module_11 from "callbag-effect-ts/Source/drain";
-import * as tsplus_module_12 from "callbag-effect-ts/Source/merge";
-import * as tsplus_module_13 from "callbag-effect-ts/Source/unwrap";
-import { millis } from "@fp-ts/data/Duration";
+import { Discord, Duration, Effect, pipe, Ref, Schedule, Stream, } from "dfx/_common";
+import * as WS from "../WS/index.js";
 import * as SendEvents from "./sendEvents.js";
 import * as Utils from "./utils.js";
 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) : tsplus_module_3.succeed(tsplus_module_4.WS.Reconnect))(tsplus_module_1.get(ref));
-export const fromRaw = (source, seqRef) => tsplus_module_13.unwrap(tsplus_module_3.map((ackedRef) => {
-    const heartbeats = tsplus_module_10.mapEffect(() => maybeSend(ackedRef, seqRef))(tsplus_module_9.switchMap((p) => tsplus_module_6.fromSchedule(tsplus_module_5.andThen(tsplus_module_5.spaced(millis(p.d.heartbeat_interval)))(tsplus_module_5.duration(millis(p.d.heartbeat_interval * Math.random())))))(tsplus_module_8.tap(() => tsplus_module_1.set(true)(ackedRef))(Utils.opCode(source)(tsplus_module_7.Discord.GatewayOpcode.HELLO))));
-    const acks = tsplus_module_11.drain(tsplus_module_8.tap(() => tsplus_module_1.set(true)(ackedRef))(Utils.opCode(source)(tsplus_module_7.Discord.GatewayOpcode.HEARTBEAT_ACK)));
-    return tsplus_module_12.merge(acks)(heartbeats);
-})(tsplus_module_1.make(true)));
+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)(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)(Discord.GatewayOpcode.HEARTBEAT_ACK)));
+    return tsplus_module_4.merge(acks)(heartbeats);
+})(Ref.make(true)), Stream.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,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC,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,MAAkD,EAClD,MAA0B,EAC1B,EAAE,yBACF,oBAAmB,CAAC,QAAQ,EAAE,EAAE;IAC9B,MAAM,UAAU,GAAG,2BAWN,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,EAX3B,0BAIN,CAAC,CAAC,EAAE,EAAE,CACf,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,EATc,oBAGZ,GAAG,EAAE,CAAC,oBAAa,IAAI,EAAjB,QAAQ,CAAU,EAHZ,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CACrC,gBAAA,OAAO,CAAC,aAAa,CAAC,KAAK,CAC5B,CAC+B,CAO7B,CAC4C,CAAA;IAE/C,MAAM,IAAI,0BAAG,oBACX,GAAG,EAAE,CAAC,oBAAa,IAAI,EAAjB,QAAQ,CAAU,EADb,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,gBAAA,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAErE,CAAM,CAAA;IAEP,OAAO,uBAAiB,IAAI,EAArB,UAAU,CAAY,CAAA;AAC/B,CAAC,EAnBD,qBAAS,IAAI,CAAC,CAmBZ,CAAO,CAAA"}
+{"version":3,"file":"heartbeats.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/heartbeats.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EACL,OAAO,EACP,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,CAClB,OAAO,CAAC,aAAa,CAAC,KAAK,CAC5B,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,CAC/B,OAAO,CAAC,aAAa,CAAC,aAAa,CACpC,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"}

package/DiscordGateway/Shard/identify.d.ts

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

package/DiscordGateway/Shard/identify.js

@@ -1,11 +1,12 @@
 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 "dfx";
-import * as tsplus_module_5 from "callbag-effect-ts/Source/mapEffect";
+import * as tsplus_module_4 from "@effect/stream/Stream";
 import * as SendEvents from "./sendEvents.js";
 import * as OS from "os";
 import { opCode } from "./utils.js";
+import { Discord } from "dfx";
+import { Option } from "dfx/_common";
 const identify = ({ token, intents, shard, presence }) => SendEvents.identify({
     token,
     intents,
@@ -22,9 +23,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))(tsplus_module_1.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))(Option.struct({
     readyEvent,
     seqNumber,
 })))(tsplus_module_2.get(seq)))(tsplus_module_2.get(ready));
-export const fromRaw = (source, { latestReady, latestSequence, ...opts }) => tsplus_module_5.mapEffect(() => identifyOrResume(opts, latestReady, latestSequence))(opCode(source)(tsplus_module_4.Discord.GatewayOpcode.HELLO));
+export const fromRaw = (source, { latestReady, latestSequence, ...opts }) => tsplus_module_4.mapEffect(() => identifyOrResume(opts, latestReady, latestSequence))(opCode(source)(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;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,MAAkD,EAClD,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,CAAqB,gBAAA,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,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,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,CAAA;AAC7B,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,CAAqB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAE9D,CAAA"}

package/DiscordGateway/Shard/index.d.ts

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

package/DiscordGateway/Shard/index.js

@@ -1,30 +1,27 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
-import * as tsplus_module_2 from "dfx/gateway";
-import * as tsplus_module_3 from "callbag-effect-ts/Source/forEach";
-import * as tsplus_module_4 from "dfx";
-import * as tsplus_module_5 from "callbag-effect-ts/Source/filter";
-import * as tsplus_module_6 from "callbag-effect-ts/Source/tap";
-import * as tsplus_module_7 from "callbag-effect-ts/Source/run";
-import * as tsplus_module_8 from "@fp-ts/data/Option";
-import * as tsplus_module_9 from "callbag-effect-ts/Source/share";
-import * as tsplus_module_10 from "@fp-ts/data/Duration";
-import * as tsplus_module_11 from "@effect/io/Queue";
+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 { Discord, Duration, Effect, Option, Queue, Scope, Stream, } from "dfx/_common";
 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", tsplus_module_10.minutes(1), 120))(outboundQueue
+    const outbound = tsplus_module_1.tap(() => limiter.maybeWait("dfx.shard.send", Duration.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_8.match(() => tsplus_module_1.unit(), (a) => socket.setUrl(a.resume_gateway_url))(tsplus_module_8.map((p) => p.d)(tsplus_module_8.filter((p) => p.op === tsplus_module_4.Discord.GatewayOpcode.DISPATCH && p.t === "READY")(tsplus_module_8.some(p))));
-        const updateRefs = tsplus_module_7.runDrain(tsplus_module_6.tap(maybeUpdateUrl)(tsplus_module_6.tap(updateLatestSequence)(tsplus_module_6.tap(updateLatestReady)(raw))));
+        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 === 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))));
         // heartbeats
-        const heartbeatEffects = tsplus_module_3.forEach(send)(Heartbeats.fromRaw(raw, latestSequence));
-        const dispatch = tsplus_module_5.filter((p) => p.op === tsplus_module_4.Discord.GatewayOpcode.DISPATCH)(raw);
+        const heartbeatEffects = tsplus_module_2.runForEach(send)(Heartbeats.fromRaw(raw, latestSequence));
+        const dispatch = tsplus_module_2.filter((p) => p.op === Discord.GatewayOpcode.DISPATCH)(raw);
         // identify
-        const identifyEffects = tsplus_module_3.forEach(send)(Identify.fromRaw(raw, {
+        const identifyEffects = tsplus_module_2.runForEach(send)(Identify.fromRaw(raw, {
             token,
             shard,
             intents: gateway.intents,
@@ -33,14 +30,14 @@ export const make = (shard) => tsplus_module_1.flatMap(({ token, gateway }) => t
             latestReady,
         }));
         // invalid session
-        const invalidEffects = tsplus_module_3.forEach(send)(InvalidSession.fromRaw(raw, latestReady));
+        const invalidEffects = tsplus_module_2.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(tsplus_module_2.WS.Reconnect),
+            reconnect: send(WS.Reconnect),
         };
-    })(Utils.latest((p) => tsplus_module_8.fromNullable(p.s))))(Utils.latest((p) => tsplus_module_8.map((p) => p.d)(tsplus_module_8.filter((p) => p.op === tsplus_module_4.Discord.GatewayOpcode.DISPATCH && p.t === "READY")(tsplus_module_8.some(p))))))(tsplus_module_9.share(socket.source)))(tsplus_module_2.DiscordWS.make({ outbound }));
-})(tsplus_module_11.unbounded()))(tsplus_module_1.service(tsplus_module_4.RateLimiter)))(tsplus_module_1.service(tsplus_module_4.Config.DiscordConfig));
+    })(Utils.latest((p) => Option.fromNullable(p.s))))(Utils.latest((p) => tsplus_module_3.map((p) => p.d)(tsplus_module_3.filter((p) => p.op === 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));
 //# 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,4 +1,3 @@
-import { EffectSource, Ref, Maybe } from "dfx/utils/common";
-import { Discord } from "dfx";
 import { DiscordWS } from "dfx/gateway";
-export declare const fromRaw: <R, E>(raw: import("callbag-effect-ts/Source").EffectSource<R, E, import("../../types.js").GatewayPayload<any>>, latestReady: Ref<Maybe<Discord.ReadyEvent>>) => import("callbag-effect-ts/Source").EffectSource<R, E, import("../DiscordWS/index.js").Message>;
+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>;