dfx 0.21.18 → 0.21.20

package/Cache/index.js

@@ -17,10 +17,10 @@ export const makeWithParent = ({ driver, ops = tsplus_module_1.empty, onMiss, on
     })(ops));
     return {
         ...driver,
-        get: (parentId, id) => tsplus_module_2.someOrElseEffect(() => tsplus_module_2.tap((a) => driver.set(parentId, id, a))(onMiss(parentId, id)))(driver
-            .get(parentId, id)),
-        getForParent: (parentId) => tsplus_module_2.someOrElseEffect(() => tsplus_module_2.map((entries) => new Map(entries))(tsplus_module_2.tap((entries) => tsplus_module_2.collectAllPar(entries.map(([id, a]) => driver.set(parentId, id, a))))(onParentMiss(parentId))))(driver.getForParent(parentId)),
-        run: tsplus_module_2.asUnit(tsplus_module_2.zipPar(driver.run)(sync)),
+        get: (parentId, id) => tsplus_module_2.someOrElseEffect(driver
+            .get(parentId, id), () => tsplus_module_2.tap(onMiss(parentId, id), (a) => driver.set(parentId, id, a))),
+        getForParent: (parentId) => tsplus_module_2.someOrElseEffect(driver.getForParent(parentId), () => tsplus_module_2.map(tsplus_module_2.tap(onParentMiss(parentId), (entries) => tsplus_module_2.collectAllPar(entries.map(([id, a]) => driver.set(parentId, id, a)))), (entries) => new Map(entries))),
+        run: tsplus_module_2.asUnit(tsplus_module_2.zipPar(sync, driver.run)),
     };
 };
 export const make = ({ driver, ops = tsplus_module_1.empty, onMiss, }) => {
@@ -35,9 +35,9 @@ export const make = ({ driver, ops = tsplus_module_1.empty, onMiss, }) => {
     })(ops));
     return {
         ...driver,
-        get: (id) => tsplus_module_2.someOrElseEffect(() => tsplus_module_2.tap((a) => driver.set(id, a))(onMiss(id)))(driver
-            .get(id)),
-        run: tsplus_module_2.asUnit(tsplus_module_2.zipPar(driver.run)(sync)),
+        get: (id) => tsplus_module_2.someOrElseEffect(driver
+            .get(id), () => tsplus_module_2.tap(onMiss(id), (a) => driver.set(id, a))),
+        run: tsplus_module_2.asUnit(tsplus_module_2.zipPar(sync, driver.run)),
     };
 };
 export class CacheMissError {

package/Cache/index.js.map

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

package/Cache/memory.js

@@ -1,5 +1,5 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
-import * as tsplus_module_2 from "@fp-ts/data/Option";
+import * as tsplus_module_2 from "@fp-ts/core/Option";
 import { createDriver, createParentDriver } from "./driver.js";
 export const createWithParent = () => tsplus_module_1.sync(() => {
     const map = new Map();

package/Cache/memoryTTL.js

@@ -1,6 +1,6 @@
 import * as tsplus_module_1 from "@fp-ts/data/Duration";
 import * as tsplus_module_2 from "@effect/io/Effect";
-import * as tsplus_module_3 from "@fp-ts/data/Option";
+import * as tsplus_module_3 from "@fp-ts/core/Option";
 import * as tsplus_module_4 from "@fp-ts/data/Chunk";
 import { createDriver, createParentDriver } from "./driver.js";
 const make = ({ ttl, resolution = tsplus_module_1.minutes(1), strategy = "usage", }) => {
@@ -66,7 +66,7 @@ const make = ({ ttl, resolution = tsplus_module_1.minutes(1), strategy = "usage"
         delete: (resourceId) => tsplus_module_2.sync(() => {
             items.delete(resourceId);
         }),
-        run: tsplus_module_2.forever(tsplus_module_2.delay(tsplus_module_1.times(0.5)(resolution))(tsplus_module_2.sync(sweep))),
+        run: tsplus_module_2.forever(tsplus_module_2.delay(tsplus_module_2.sync(sweep), tsplus_module_1.times(0.5)(resolution))),
     });
 };
 export const create = (opts) => tsplus_module_2.sync(() => make(opts));
@@ -81,30 +81,30 @@ export const createWithParent = (opts) => tsplus_module_2.sync(() => {
         getForParent: (parentId) => (() => {
             const ids = parentIds.get(parentId);
             if (!ids)
-                return tsplus_module_3.none;
+                return tsplus_module_3.none();
             const toGet = [];
             ids.forEach((id) => {
-                toGet.push(tsplus_module_2.map(item => {
+                toGet.push(tsplus_module_2.map(store.get(id), item => {
                     if (item._tag === "None") {
                         parentIds.delete(id);
                     }
                     return [id, item];
-                })(store.get(id)));
+                }));
             });
-            return tsplus_module_2.map(results => {
-                const map = tsplus_module_4.reduce(new Map(), (map, [id, a]) => a._tag === "Some" ? map.set(id, a.value) : map)(results);
+            return tsplus_module_2.map(tsplus_module_2.collectAllPar(toGet), results => {
+                const map = tsplus_module_4.reduce(results, new Map(), (map, [id, a]) => a._tag === "Some" ? map.set(id, a.value) : map);
                 return tsplus_module_3.some(map);
-            })(tsplus_module_2.collectAllPar(toGet));
+            });
         })(),
-        set: (parentId, resourceId, resource) => tsplus_module_2.map(() => {
+        set: (parentId, resourceId, resource) => tsplus_module_2.map(store.set(resourceId, resource), () => {
             if (!parentIds.has(parentId)) {
                 parentIds.set(parentId, new Set());
             }
             parentIds.get(parentId).add(resourceId);
-        })(store.set(resourceId, resource)),
-        delete: (parentId, resourceId) => tsplus_module_2.map(() => {
+        }),
+        delete: (parentId, resourceId) => tsplus_module_2.map(store.delete(resourceId), () => {
             parentIds.get(parentId)?.delete(resourceId);
-        })(store.delete(resourceId)),
+        }),
         parentDelete: (parentId) => (() => {
             const ids = parentIds.get(parentId);
             parentIds.delete(parentId);
@@ -114,7 +114,7 @@ export const createWithParent = (opts) => tsplus_module_2.sync(() => {
                     effects.push(store.delete(id));
                 });
             }
-            return tsplus_module_2.map(() => void 0)(tsplus_module_2.collectAllParDiscard(effects));
+            return tsplus_module_2.map(tsplus_module_2.collectAllParDiscard(effects), () => void 0);
         })(),
         run: store.run,
     });

package/Cache/memoryTTL.js.map

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

package/Cache/prelude.js

@@ -50,7 +50,7 @@ export const ops = ({ id, create, update, remove }) => {
     }))(remove);
     return tsplus_module_1.merge(removeOps)(tsplus_module_1.merge(updateOps)(createOps));
 };
-export const guilds = (makeDriver) => tsplus_module_2.flatMap(driver => tsplus_module_2.flatMap(gateway => tsplus_module_2.map(rest => make({
+export const guilds = (makeDriver) => tsplus_module_2.flatMap(makeDriver, driver => tsplus_module_2.flatMap(tsplus_module_2.service(Gateway.DiscordGateway), gateway => tsplus_module_2.map(tsplus_module_2.service(DiscordREST), rest => make({
     driver,
     ops: ops({
         id: (g) => g.id,
@@ -64,9 +64,9 @@ export const guilds = (makeDriver) => tsplus_module_2.flatMap(driver => tsplus_m
         update: gateway.fromDispatch("GUILD_UPDATE"),
         remove: tsplus_module_1.map((a) => a.id)(gateway.fromDispatch("GUILD_DELETE")),
     }),
-    onMiss: (id) => tsplus_module_2.flatMap((r) => r.json)(rest.getGuild(id)),
-}))(tsplus_module_2.service(DiscordREST)))(tsplus_module_2.service(Gateway.DiscordGateway)))(makeDriver);
-export const channels = (makeDriver) => tsplus_module_2.flatMap(driver => tsplus_module_2.flatMap(gateway => tsplus_module_2.map(rest => makeWithParent({
+    onMiss: (id) => tsplus_module_2.flatMap(rest.getGuild(id), (r) => r.json),
+}))));
+export const channels = (makeDriver) => tsplus_module_2.flatMap(makeDriver, driver => tsplus_module_2.flatMap(tsplus_module_2.service(Gateway.DiscordGateway), gateway => tsplus_module_2.map(tsplus_module_2.service(DiscordREST), rest => makeWithParent({
     driver,
     ops: opsWithParent({
         id: (a) => a.id,
@@ -80,11 +80,11 @@ export const channels = (makeDriver) => tsplus_module_2.flatMap(driver => tsplus
             .fromDispatch("CHANNEL_DELETE")),
         parentRemove: tsplus_module_1.map((g) => g.id)(gateway.fromDispatch("GUILD_DELETE")),
     }),
-    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_2.service(DiscordREST)))(tsplus_module_2.service(Gateway.DiscordGateway)))(makeDriver);
-export const roles = (makeDriver) => tsplus_module_2.flatMap(driver => tsplus_module_2.flatMap(gateway => tsplus_module_2.map(rest => makeWithParent({
+    onMiss: (id) => tsplus_module_2.flatMap(rest.getChannel(id), (r) => r.json),
+    onParentMiss: (guildId) => tsplus_module_2.map(tsplus_module_2.flatMap(rest
+        .getGuildChannels(guildId), (r) => r.json), (a) => a.map((a) => [a.id, a])),
+}))));
+export const roles = (makeDriver) => tsplus_module_2.flatMap(makeDriver, driver => tsplus_module_2.flatMap(tsplus_module_2.service(Gateway.DiscordGateway), gateway => tsplus_module_2.map(tsplus_module_2.service(DiscordREST), rest => makeWithParent({
     driver,
     ops: opsWithParent({
         id: (a) => a.id,
@@ -99,7 +99,7 @@ export const roles = (makeDriver) => tsplus_module_2.flatMap(driver => tsplus_mo
         parentRemove: tsplus_module_1.map((g) => g.id)(gateway.fromDispatch("GUILD_DELETE")),
     }),
     onMiss: (id) => tsplus_module_2.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_2.service(DiscordREST)))(tsplus_module_2.service(Gateway.DiscordGateway)))(makeDriver);
+    onParentMiss: (guildId) => tsplus_module_2.map(tsplus_module_2.flatMap(rest
+        .getGuildRoles(guildId), (r) => r.json), (a) => a.map((a) => [a.id, a])),
+}))));
 //# 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.js

@@ -1,7 +1,7 @@
 import * as tsplus_module_1 from "dfx/_common";
 import * as tsplus_module_2 from "@fp-ts/data/Duration";
 import * as tsplus_module_3 from "@effect/io/Layer";
-import * as tsplus_module_4 from "@fp-ts/data/Function";
+import * as tsplus_module_4 from "@fp-ts/core/Function";
 import * as tsplus_module_5 from "@effect/io/Effect";
 const VERSION = 10;
 export const DiscordConfig = tsplus_module_1.Tag();
@@ -23,5 +23,5 @@ export const make = ({ token, rest, gateway }) => ({
     },
 });
 export const makeLayer = tsplus_module_4.flow(make, (_) => tsplus_module_3.succeed(DiscordConfig, _));
-export const makeFromConfig = (a) => tsplus_module_5.toLayer(DiscordConfig)(tsplus_module_5.map(make)(tsplus_module_5.config(a)));
+export const makeFromConfig = (a) => tsplus_module_5.toLayer(tsplus_module_5.map(tsplus_module_5.config(a), make), 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,CAAC,CAAC,EAAE,EAAE,CAAC,wBAAc,aAAa,EAAE,CAAC,CAAC,CAAC,CAAA;AAC3E,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAmB,EAAE,EAAE,CACpD,wBAA2B,aAAa,EAAxC,oBAAa,IAAI,yBAAjB,CAAC,EAAiB,CAAuB,CAAA"}
+{"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,CAAC,CAAC,EAAE,EAAE,CAAC,wBAAc,aAAa,EAAE,CAAC,CAAC,CAAC,CAAA;AAC3E,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAmB,EAAE,EAAE,CACpD,wBAAA,2CAAA,CAAC,GAAY,IAAI,CAAC,EAAS,aAAa,CAAC,CAAA"}

package/DiscordGateway/DiscordWS/index.js

@@ -13,13 +13,13 @@ export const LiveJsonDiscordWSCodec = tsplus_module_2.succeed(DiscordWSCodec, {
     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_8.flatMap(encoding => tsplus_module_8.flatMap(urlRef => {
+export const make = ({ url = "wss://gateway.discord.gg/", version = 10, outbound, }) => tsplus_module_8.flatMap(tsplus_module_8.service(DiscordWSCodec), encoding => tsplus_module_8.flatMap(tsplus_module_9.make(`${url}?v=${version}&encoding=${encoding.type}`), urlRef => {
     const setUrl = (url) => tsplus_module_9.set(urlRef, `${url}?v=${version}&encoding=${encoding.type}`);
-    const take = tsplus_module_8.map((a) => a === tsplus_module_6.WS.Reconnect ? a : encoding.encode(a))(outbound);
-    return tsplus_module_8.map(log => {
+    const take = tsplus_module_8.map(outbound, (a) => a === tsplus_module_6.WS.Reconnect ? a : encoding.encode(a));
+    return tsplus_module_8.map(tsplus_module_8.service(tsplus_module_7.Log.Log), log => {
         const ws = tsplus_module_5.provideService(tsplus_module_7.Log.Log)(log)(tsplus_module_6.WS.make(urlRef, take));
         const source = tsplus_module_5.map(encoding.decode)(tsplus_module_5.retry(tsplus_module_4.exponential(tsplus_module_3.seconds(0.5)))(tsplus_module_5.tapError((e) => log.info("DiscordWS", "ERROR", e))(ws)));
         return { source, setUrl };
-    })(tsplus_module_8.service(tsplus_module_7.Log.Log));
-})(tsplus_module_9.make(`${url}?v=${version}&encoding=${encoding.type}`)))(tsplus_module_8.service(DiscordWSCodec));
+    });
+}));
 //# sourceMappingURL=index.js.map

package/DiscordGateway/DiscordWS/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/DiscordWS/index.ts"],"names":[],"mappings":";;;;;;;;;AAgBA,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,sBAAsB,GAAG,wBAAc,cAAc,EAAE;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,oBAAA,MAAM,EAAK,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;IAC7D,MAAM,IAAI,GAAG,oBAAa,CAAC,CAAC,EAAE,EAAE,CAC9B,CAAC,KAAK,gBAAA,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EADhC,QAAQ,CAEpB,CAAA;+BACK,GAAG;QACT,MAAM,EAAE,GAAG,+BAAsB,gBAAA,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,gBAAA,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;QACrE,MAAM,MAAM,GAAG,oBAGR,QAAQ,CAAC,MAAM,EAHP,sBAEN,4BAAqB,wBAAiB,GAAG,CAAC,CAAC,EAFrC,yBACH,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC,EADrC,EAAE,CACoC,CACA,CACkB,CAAA;QAEvE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;OAPX,wBAAe,gBAAA,GAAG,CAAC,GAAG,CAAC;GANpB,qBAAS,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,GADvD,wBAAe,cAAc,CAAC,CAejD,CAAA"}
+{"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,EAAE;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,yBAEQ,wBAAe,cAAc,CAAC,EAA3C,QAAQ,4BACG,qBAAS,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,EAApE,MAAM;IACZ,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE,CAC7B,oBAAA,MAAM,EAAK,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;IAC7D,MAAM,IAAI,GAAG,oBAAA,QAAQ,EAAK,CAAC,CAAC,EAAE,EAAE,CAC9B,CAAC,KAAK,gBAAA,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAC5C,CAAA;+BACa,wBAAe,gBAAA,GAAG,CAAC,GAAG,CAAC,EAA/B,GAAG;QACT,MAAM,EAAE,GAAG,+BAAsB,gBAAA,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,gBAAA,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;QACrE,MAAM,MAAM,GAAG,oBAGR,QAAQ,CAAC,MAAM,EAHP,sBAEN,4BAAqB,wBAAiB,GAAG,CAAC,CAAC,EAFrC,yBACH,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC,EADrC,EAAE,CACoC,CACA,CACkB,CAAA;QAEvE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;;GACzB,CAAA"}

package/DiscordGateway/Shard/heartbeats.js

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

package/DiscordGateway/Shard/heartbeats.js.map

@@ -1 +1 @@
-{"version":3,"file":"heartbeats.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/heartbeats.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAE7C,MAAM,IAAI,GAAG,CAAC,GAAiB,EAAE,MAA0B,EAAE,EAAE,CAC7D,oBAEO,GAAG,EAAE,CAAC,oBAAA,GAAG,EAAK,KAAK,CAAC,EAF3B,oBACO,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,2BAAC,CAAC,EAAW,sBAD/C,MAAM,EAC0C,CACpB,CAAA;AAE9B,MAAM,SAAS,GAAG,CAAC,GAAiB,EAAE,MAA0B,EAAE,EAAE,CAClE,wBACE,CAAC,KAAK,EAA2C,EAAE,CACjD,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,wBAAe,gBAAA,EAAE,CAAC,SAAS,CAAC,sBAF5D,GAAG,EAGF,CAAA;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,MAA4C,EAC5C,MAA0B,EAC1B,EAAE,CACF,gBAAA,IAAI,CACF,oBAAmB,CAAC,QAAQ,EAAE,EAAE;IAC9B,MAAM,UAAU,GAAG,0BAWP,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,EAX1B,gBAAA,IAAI,CACrB,oBAEM,GAAG,EAAE,CAAC,oBAAA,QAAQ,EAAK,IAAI,CAAC,EAF9B,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,sCAEnB,CAA8B,EAC/B,iCAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/B,6BACE,wBAEU,uBAAgB,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,kBAAkB,CAAC,CAAC,EAF1D,yBACE,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,kBAAkB,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAChD,CAA0D,CAC5D,CACF,CACF,CAA6C,CAAA;IAE9C,MAAM,IAAI,yBAAG,oBAEP,GAAG,EAAE,CAAC,oBAAA,QAAQ,EAAK,IAAI,CAAC,EAFjB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,8CAEhC,CAA8B,CAAM,CAAA;IAErC,OAAO,sBAAiB,IAAI,EAArB,UAAU,CAAY,CAAA;AAC/B,CAAC,EAnBD,qBAAS,IAAI,CAAC,CAmBZ,yBAEH,CAAA"}
+{"version":3,"file":"heartbeats.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/heartbeats.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAE7C,MAAM,IAAI,GAAG,CAAC,GAAiB,EAAE,MAA0B,EAAE,EAAE,CAC7D,oBAAA,wCAAA,MAAM,GACC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,2BAAC,CAAC,EAAW,CAAC,EACzC,GAAG,EAAE,CAAC,oBAAA,GAAG,EAAK,KAAK,CAAC,CAAC,CAAA;AAE9B,MAAM,SAAS,GAAG,CAAC,GAAiB,EAAE,MAA0B,EAAE,EAAE,CAClE,4CAAA,GAAG,GACD,CAAC,KAAK,EAA2C,EAAE,CACjD,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,wBAAe,gBAAA,EAAE,CAAC,SAAS,CAAC,CAC3D,CAAA;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,MAA4C,EAC5C,MAA0B,EAC1B,EAAE,CACF,gBAAA,IAAI,CACF,oBAAA,qBAAS,IAAI,CAAC,EAAK,CAAC,QAAQ,EAAE,EAAE;IAC9B,MAAM,UAAU,GAAG,0BAWP,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,EAX1B,gBAAA,IAAI,CACrB,oBAEM,GAAG,EAAE,CAAC,oBAAA,QAAQ,EAAK,IAAI,CAAC,EAF9B,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,sCAEnB,CAA8B,EAC/B,iCAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/B,6BACE,wBAAA,yBACE,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,kBAAkB,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAChD,EAAS,uBAAgB,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAC5D,CACF,CACF,CAA6C,CAAA;IAE9C,MAAM,IAAI,yBAAG,oBAEP,GAAG,EAAE,CAAC,oBAAA,QAAQ,EAAK,IAAI,CAAC,EAFjB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,8CAEhC,CAA8B,CAAM,CAAA;IAErC,OAAO,sBAAiB,IAAI,EAArB,UAAU,CAAY,CAAA;AAC/B,CAAC,CAAC,yBAEH,CAAA"}

package/DiscordGateway/Shard/identify.js

@@ -1,4 +1,4 @@
-import * as tsplus_module_1 from "@fp-ts/data/Option";
+import * as tsplus_module_1 from "@fp-ts/core/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/_common";
@@ -22,9 +22,9 @@ const resume = (token, ready, seq) => SendEvents.resume({
     session_id: ready.session_id,
     seq,
 });
-const identifyOrResume = (opts, ready, seq) => tsplus_module_3.flatMap(readyEvent => tsplus_module_3.map(seqNumber => tsplus_module_1.match(() => identify(opts), ({ readyEvent, seqNumber }) => resume(opts.token, readyEvent, seqNumber))(tsplus_module_1.struct({
+const identifyOrResume = (opts, ready, seq) => tsplus_module_3.flatMap(tsplus_module_2.get(ready), readyEvent => tsplus_module_3.map(tsplus_module_2.get(seq), seqNumber => tsplus_module_1.match(() => identify(opts), ({ readyEvent, seqNumber }) => resume(opts.token, readyEvent, seqNumber))(tsplus_module_1.struct({
     readyEvent,
     seqNumber,
-})))(tsplus_module_2.get(seq)))(tsplus_module_2.get(ready));
+}))));
 export const fromRaw = (source, { latestReady, latestSequence, ...opts }) => tsplus_module_5.mapEffect(() => identifyOrResume(opts, latestReady, latestSequence))(opCode(source)(10 /* Discord.GatewayOpcode.HELLO */));
 //# sourceMappingURL=identify.js.map

package/DiscordGateway/Shard/identify.js.map

@@ -1 +1 @@
-{"version":3,"file":"identify.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/identify.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAcnC,MAAM,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAW,EAAE,EAAE,CAChE,UAAU,CAAC,QAAQ,CAAC;IAClB,KAAK;IACL,OAAO;IACP,UAAU,EAAE;QACV,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE;QACjB,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,KAAK;KACd;IACD,KAAK;IACL,QAAQ;CACT,CAAC,CAAA;AAEJ,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,KAAyB,EAAE,GAAW,EAAE,EAAE,CACvE,UAAU,CAAC,MAAM,CAAC;IAChB,KAAK;IACL,UAAU,EAAE,KAAK,CAAC,UAAU;IAC5B,GAAG;CACJ,CAAC,CAAA;AAEJ,MAAM,gBAAgB,GAAG,CACvB,IAAa,EACb,KAAqC,EACrC,GAAuB,EACvB,EAAE,yBAEM,UAAU,wBACV,SAAS,IAER,sBAIL,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EACpB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,CAAC,EALnE,uBAAa;IAClB,UAAU;IACV,SAAS;CACV,CAAC,CAGD,sBARmB,GAAG,wBADF,KAAK,EAU1B,CAAA;AAEJ,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,MAA4C,EAC5C,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,IAAI,EAA0B,EAChE,EAAE,CACF,0BACE,GAAG,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,EAD3D,MAAM,CAAC,MAAM,CAAC,sCAAiD,CAE9D,CAAA"}
+{"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,6CAEqB,KAAK,GAApB,UAAU,4CACI,GAAG,GAAjB,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,EACD,CAAA;AAEJ,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,MAA4C,EAC5C,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,IAAI,EAA0B,EAChE,EAAE,CACF,0BACE,GAAG,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,EAD3D,MAAM,CAAC,MAAM,CAAC,sCAAiD,CAE9D,CAAA"}

package/DiscordGateway/Shard/index.js

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

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

package/DiscordGateway/Shard/invalidSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"invalidSession.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/invalidSession.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAEnC,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,GAAyC,EACzC,WAA2C,EAC3C,EAAE,CACF,oBAIO,GAAsB,EAAE,CAAC,gBAAA,EAAE,CAAC,SAAS,EAJ5C,oBAGO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAa,CAAC,CAAC,CAAC,oBAAA,WAAW,uBAAgB,CAAC,EAHjE,MAAM,CAAC,GAAG,CAAC,+CAEV,CACiE,CACrB,CAAA"}
+{"version":3,"file":"invalidSession.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/invalidSession.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAEnC,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,GAAyC,EACzC,WAA2C,EAC3C,EAAE,CACF,oBAIO,GAAsB,EAAE,CAAC,gBAAA,EAAE,CAAC,SAAS,EAJ5C,oBAGO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAa,CAAC,CAAC,CAAC,oBAAA,WAAW,EAAK,sBAAY,CAAC,CAAC,EAHnE,MAAM,CAAC,GAAG,CAAC,+CAEV,CACmE,CACvB,CAAA"}

package/DiscordGateway/Shard/utils.d.ts

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

package/DiscordGateway/Shard/utils.js

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

package/DiscordGateway/Shard/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/utils.ts"],"names":[],"mappings":";;;;;AAAA,MAAM,CAAC,MAAM,MAAM,GACjB,CAAO,MAA4C,EAAE,EAAE,CACvD,CAAU,IAA2B,EAAE,EAAE,CACvC,uBAAc,CAAC,CAAC,EAAkC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,EAAlE,MAAM,CAA6D,CAAA;AAEvE,MAAM,cAAc,GAAG,CACrB,CAA0C,EAC1C,GAAkB,EAClB,EAAE,CAAC,gBAAA,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,4CAAqB,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAA,GAAG,EAAK,qBAAW,CAAC,CAAC,CAAC,EAAlD,CAAC,CAAkD,CAAC,CAAA;AAExE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAI,CAA0C,EAAE,EAAE,CACtE,oBACE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,EAAE,GAAG,CAAC,CAAU,EADjD,0CAA8B,CAE7B,CAAA"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/utils.ts"],"names":[],"mappings":";;;;;AAAA,MAAM,CAAC,MAAM,MAAM,GACjB,CAAO,MAA4C,EAAE,EAAE,CACvD,CAAU,IAA2B,EAAE,EAAE,CACvC,uBAAc,CAAC,CAAC,EAAkC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,EAAlE,MAAM,CAA6D,CAAA;AAEvE,MAAM,cAAc,GAAG,CACrB,CAA0C,EAC1C,GAAkB,EAClB,EAAE,CAAC,gBAAA,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,4CAAqB,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAA,GAAG,EAAK,qBAAW,CAAC,CAAC,CAAC,EAAlD,CAAC,CAAkD,CAAC,CAAA;AAExE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAI,CAA0C,EAAE,EAAE,CACtE,oBAAA,qBAAmB,sBAAY,CAAC,EAC9B,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,EAAE,GAAG,CAAC,CAAU,CAChD,CAAA"}

package/DiscordGateway/ShardStore/index.js

@@ -1,5 +1,5 @@
 import * as tsplus_module_1 from "dfx/_common";
-import * as tsplus_module_2 from "@fp-ts/data/Option";
+import * as tsplus_module_2 from "@fp-ts/core/Option";
 import * as tsplus_module_3 from "@effect/io/Effect";
 import * as tsplus_module_4 from "@effect/io/Layer";
 export const ShardStore = tsplus_module_1.Tag();
@@ -9,7 +9,7 @@ const memoryStore = () => {
     return {
         claimId: ({ totalCount }) => tsplus_module_3.sync(() => {
             if (currentId >= totalCount) {
-                return tsplus_module_2.none;
+                return tsplus_module_2.none();
             }
             const id = currentId;
             currentId++;

package/DiscordGateway/ShardStore/index.js.map

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

package/DiscordGateway/Sharder/index.js

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

package/DiscordGateway/Sharder/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Sharder/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Sharder/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAEnD,MAAM,IAAI,2BACQ,wBAAe,UAAU,CAAC,EAApC,KAAK,4BACI,wCAAe,WAAW,CAAC,EAApC,IAAI,4BACoB,wBAAe,gBAAA,aAAa,CAAC,aAAa,CAAC,GAAnE,EAAE,OAAO,EAAE,MAAM,EAAE,6BACP,wCAAe,WAAW,CAAC,EAAvC,OAAO;IAEb,MAAM,OAAO,GAAG,CAAC,UAAkB,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,CAAC,YAAoB,EAAgC,EAAE,CACrE,wBAAA,KAAK;aACF,OAAO,CAAC;YACP,UAAU;YACV,YAAY;SACb,CAAC,EACO,CAAC,CAAC,EAAE,EAAE,CACb,sBACE,GAAG,EAAE,CAAC,sBAAA,OAAO,CAAC,YAAY,CAAC,EAAO,wBAAiB,CAAC,CAAC,CAAC,EACtD,CAAC,EAAE,EAAE,EAAE,CAAC,wBAAe,EAAE,CAAC,EAF5B,CAAC,CAGA,CACF,CAAA;QAEL,OAAO,oBAID,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACb,EAAE;YACF,UAAU;SACX,CAAC,EAPK,6BAAoB,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,CAC7C,oBAAA,OAAO,CAAC,YAAY,CAAC,EAAK,CAAC,EAAE,EAAE,EAAE,CAC/B,qBAAW,CAAC,EAAE,EAAE,YAAY,GAAG,CAAC,CAAU,CAAC,CAC5C,CACF,CAGE,CAAA;IACL,CAAC,CAAA;mCAGC,yBAAA,wBAAA,IAAI;SACD,aAAa,EAAE,EACP,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EACb,GAAG,EAAE,CACb,wBAA8C;QAC5C,GAAG,EAAE,2BAA2B;QAChC,MAAM,EAAE,CAAC;QACT,mBAAmB,EAAE;YACnB,KAAK,EAAE,CAAC;YACR,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;YACd,eAAe,EAAE,CAAC;SACnB;KACF,CAAC,CACH,EAfC,OAAO,wBAmBX,iCAqBoB,CAAC,EArBrB,wBAkBW,CAAC,KAAK,EAAE,EAAE,CACjB,4CAA4B,2BAAkB,KAAK,CAAC,GAAG,CAAC,GAAxD,wBAAe,KAAK,CAAC,CAA0C,EAnBnE,yBAOY,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE,CAC7B,0BAQa,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAA,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,EARpD,oBACO,GAAG,EAAE,CACR,OAAO,CAAC,SAAS,CACf,eAAe,GAAG,EAAE,EACpB,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EACnC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAC5B,EANL,WAAW,CAOR,CACkD,EAhBzD,wBAMW,CAAC,CAAC,EAAE,EAAE,CAAC,wBAAe,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAN3D,oBACO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAChB,GAAG,MAAM;QACT,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,WAAW,EAAE,OAAO,CAAC,mBAAmB,CAAC,eAAe;KACzD,CAAC,EALJ,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAKvC,CACuD,CAWzD,CAGA,CACmB,EAtBlB,MAAM,IAyBL,CAAA,EAAE,MAAM,EAAE,CAAA;KACjB,CAAA;AAGF,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAA,GAAG,EAAW,CAAA;AACrC,MAAM,CAAC,MAAM,WAAW,GAAG,uBAAa,OAAO,EAAE,IAAI,CAAC,CAAA"}