dfx 0.77.2 → 0.78.0

package/RateLimit.d.ts

@@ -3,13 +3,12 @@ import * as Duration from "effect/Duration";
 import type * as Option from "effect/Option";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import { Log } from "dfx/Log";
 export type BucketDetails = {
     key: "global" | string;
     resetAfter: number;
     limit: number;
 };
-export interface RateLimitStore {
+export interface RateLimitStoreService {
     readonly hasBucket: (bucketKey: string) => Effect.Effect<never, never, boolean>;
     readonly putBucket: (bucket: BucketDetails) => Effect.Effect<never, never, void>;
     readonly getBucketForRoute: (route: string) => Effect.Effect<never, never, Option.Option<BucketDetails>>;
@@ -17,14 +16,16 @@ export interface RateLimitStore {
     readonly incrementCounter: (key: string, window: number, limit: number) => Effect.Effect<never, never, readonly [count: number, ttl: number]>;
     readonly removeCounter: (key: string) => Effect.Effect<never, never, void>;
 }
-export declare const RateLimitStore: Tag<RateLimitStore, RateLimitStore>;
+export interface RateLimitStore {
+    readonly _: unique symbol;
+}
+export declare const RateLimitStore: Tag<RateLimitStore, RateLimitStoreService>;
 export declare const MemoryRateLimitStoreLive: Layer.Layer<never, never, RateLimitStore>;
-declare const makeLimiter: Effect.Effect<Log | RateLimitStore, never, {
+export interface RateLimiter {
+    readonly _: unique symbol;
+}
+export declare const RateLimiter: Tag<RateLimiter, {
     maybeWait: (key: string, window: Duration.Duration, limit: number, multiplier?: number) => Effect.Effect<never, never, void>;
 }>;
-export interface RateLimiter extends Effect.Effect.Success<typeof makeLimiter> {
-}
-export declare const RateLimiter: Tag<RateLimiter, RateLimiter>;
-export declare const RateLimiterLive: Layer.Layer<Log | RateLimitStore, never, RateLimiter>;
-export {};
+export declare const RateLimiterLive: Layer.Layer<RateLimitStore, never, RateLimiter>;
 //# sourceMappingURL=RateLimit.d.ts.map

package/RateLimit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RateLimit.d.ts","sourceRoot":"","sources":["./src/RateLimit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAI7B,MAAM,MAAM,aAAa,GAAG;IAC1B,GAAG,EAAE,QAAQ,GAAG,MAAM,CAAA;IACtB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,SAAS,EAAE,CAClB,SAAS,EAAE,MAAM,KACd,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IAEzC,QAAQ,CAAC,SAAS,EAAE,CAClB,MAAM,EAAE,aAAa,KAClB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAEtC,QAAQ,CAAC,iBAAiB,EAAE,CAC1B,KAAK,EAAE,MAAM,KACV,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAA;IAE9D,QAAQ,CAAC,cAAc,EAAE,CACvB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,KACd,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAEtC,QAAQ,CAAC,gBAAgB,EAAE,CACzB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,KACV,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;IAEvE,QAAQ,CAAC,aAAa,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CAC3E;AAED,eAAO,MAAM,cAAc,qCAAwB,CAAA;AACnD,eAAO,MAAM,wBAAwB,2CAA0C,CAAA;AAE/E,QAAA,MAAM,WAAW;qBAKR,MAAM,UACH,iBAAiB,SAClB,MAAM;EAwBf,CAAA;AAEF,MAAM,WAAW,WACf,SAAQ,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,WAAW,CAAC;CAAG;AACtD,eAAO,MAAM,WAAW,+BAAqB,CAAA;AAC7C,eAAO,MAAM,eAAe,uDAAyC,CAAA"}
+{"version":3,"file":"RateLimit.d.ts","sourceRoot":"","sources":["./src/RateLimit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAIrC,MAAM,MAAM,aAAa,GAAG;IAC1B,GAAG,EAAE,QAAQ,GAAG,MAAM,CAAA;IACtB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,SAAS,EAAE,CAClB,SAAS,EAAE,MAAM,KACd,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IAEzC,QAAQ,CAAC,SAAS,EAAE,CAClB,MAAM,EAAE,aAAa,KAClB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAEtC,QAAQ,CAAC,iBAAiB,EAAE,CAC1B,KAAK,EAAE,MAAM,KACV,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAA;IAE9D,QAAQ,CAAC,cAAc,EAAE,CACvB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,KACd,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAEtC,QAAQ,CAAC,gBAAgB,EAAE,CACzB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,KACV,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;IAEvE,QAAQ,CAAC,aAAa,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CAC3E;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AAED,eAAO,MAAM,cAAc,4CAE1B,CAAA;AACD,eAAO,MAAM,wBAAwB,2CAA0C,CAAA;AAmC/E,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AACD,eAAO,MAAM,WAAW;qBAhCf,MAAM,UACH,iBAAiB,SAClB,MAAM;EAiCa,CAAA;AAC9B,eAAO,MAAM,eAAe,iDAAyC,CAAA"}

package/RateLimit.js

@@ -8,19 +8,18 @@ var _Context = /*#__PURE__*/require("effect/Context");
 var Duration = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Duration"));
 var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
 var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
-var _Log = /*#__PURE__*/require("dfx/Log");
 var Memory = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/RateLimit/memory"));
 var _utils = /*#__PURE__*/require("dfx/RateLimit/utils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const RateLimitStore = exports.RateLimitStore = /*#__PURE__*/(0, _Context.Tag)();
+const RateLimitStore = exports.RateLimitStore = /*#__PURE__*/(0, _Context.Tag)("dfx/RateLimit/RateLimitStore");
 const MemoryRateLimitStoreLive = exports.MemoryRateLimitStoreLive = /*#__PURE__*/Layer.sync(RateLimitStore, Memory.make);
 const makeLimiter = /*#__PURE__*/Effect.gen(function* (_) {
   const store = yield* _(RateLimitStore);
-  const log = yield* _(_Log.Log);
   const maybeWait = (key, window, limit, multiplier = 1.05) => {
     const windowMs = Duration.toMillis(window) * multiplier;
-    return store.incrementCounter(key, windowMs, limit).pipe(Effect.map(([count, ttl]) => (0, _utils.delayFrom)(windowMs, limit, count, ttl)), Effect.tap(d => log.debug("RateLimitStore maybeWait", {
+    return store.incrementCounter(key, windowMs, limit).pipe(Effect.map(([count, ttl]) => (0, _utils.delayFrom)(windowMs, limit, count, ttl)), Effect.tap(d => Effect.annotateLogs(Effect.logTrace("maybeWait"), {
+      service: "RateLimit",
       key,
       window: Duration.toMillis(window),
       windowMs,
@@ -32,6 +31,6 @@ const makeLimiter = /*#__PURE__*/Effect.gen(function* (_) {
     maybeWait
   };
 });
-const RateLimiter = exports.RateLimiter = /*#__PURE__*/(0, _Context.Tag)();
+const RateLimiter = exports.RateLimiter = /*#__PURE__*/(0, _Context.Tag)("dfx/RateLimit/RateLimiter");
 const RateLimiterLive = exports.RateLimiterLive = /*#__PURE__*/Layer.effect(RateLimiter, makeLimiter);
 //# sourceMappingURL=RateLimit.js.map

package/RateLimit.js.map

@@ -1 +1 @@
-{"version":3,"file":"RateLimit.js","names":["_Context","require","Duration","_interopRequireWildcard","Effect","Layer","_Log","Memory","_utils","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","RateLimitStore","exports","Tag","MemoryRateLimitStoreLive","sync","make","makeLimiter","gen","_","store","log","Log","maybeWait","key","window","limit","multiplier","windowMs","toMillis","incrementCounter","pipe","map","count","ttl","delayFrom","tap","d","debug","delay","unit","sleep","asUnit","RateLimiter","RateLimiterLive","effect"],"sources":["./src/RateLimit.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,QAAA,gBAAAC,OAAA;AACA,IAAAC,QAAA,gBAAAC,uBAAA,eAAAF,OAAA;AAEA,IAAAG,MAAA,gBAAAD,uBAAA,eAAAF,OAAA;AACA,IAAAI,KAAA,gBAAAF,uBAAA,eAAAF,OAAA;AACA,IAAAK,IAAA,gBAAAL,OAAA;AACA,IAAAM,MAAA,gBAAAJ,uBAAA,eAAAF,OAAA;AACA,IAAAO,MAAA,gBAAAP,OAAA;AAA+C,SAAAQ,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAP,wBAAAO,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAmCxC,MAAMY,cAAc,GAAAC,OAAA,CAAAD,cAAA,gBAAG,IAAAE,YAAG,GAAkB;AAC5C,MAAMC,wBAAwB,GAAAF,OAAA,CAAAE,wBAAA,gBAAG5B,KAAK,CAAC6B,IAAI,CAACJ,cAAc,EAAEvB,MAAM,CAAC4B,IAAI,CAAC;AAE/E,MAAMC,WAAW,gBAAGhC,MAAM,CAACiC,GAAG,CAAC,WAAWC,CAAC;EACzC,MAAMC,KAAK,GAAG,OAAOD,CAAC,CAACR,cAAc,CAAC;EACtC,MAAMU,GAAG,GAAG,OAAOF,CAAC,CAACG,QAAG,CAAC;EAEzB,MAAMC,SAAS,GAAGA,CAChBC,GAAW,EACXC,MAAyB,EACzBC,KAAa,EACbC,UAAU,GAAG,IAAI,KACf;IACF,MAAMC,QAAQ,GAAG7C,QAAQ,CAAC8C,QAAQ,CAACJ,MAAM,CAAC,GAAGE,UAAU;IAEvD,OAAOP,KAAK,CAACU,gBAAgB,CAACN,GAAG,EAAEI,QAAQ,EAAEF,KAAK,CAAC,CAACK,IAAI,CACtD9C,MAAM,CAAC+C,GAAG,CAAC,CAAC,CAACC,KAAK,EAAEC,GAAG,CAAC,KAAK,IAAAC,gBAAS,EAACP,QAAQ,EAAEF,KAAK,EAAEO,KAAK,EAAEC,GAAG,CAAC,CAAC,EACpEjD,MAAM,CAACmD,GAAG,CAACC,CAAC,IACVhB,GAAG,CAACiB,KAAK,CAAC,0BAA0B,EAAE;MACpCd,GAAG;MACHC,MAAM,EAAE1C,QAAQ,CAAC8C,QAAQ,CAACJ,MAAM,CAAC;MACjCG,QAAQ;MACRF,KAAK;MACLa,KAAK,EAAExD,QAAQ,CAAC8C,QAAQ,CAACQ,CAAC;KAC3B,CAAC,CACH,EACDpD,MAAM,CAACmD,GAAG,CAACjB,CAAC,IACVpC,QAAQ,CAAC8C,QAAQ,CAACV,CAAC,CAAC,KAAK,CAAC,GAAGlC,MAAM,CAACuD,IAAI,GAAGvD,MAAM,CAACwD,KAAK,CAACtB,CAAC,CAAC,CAC3D,EACDlC,MAAM,CAACyD,MAAM,CACd;EACH,CAAC;EAED,OAAO;IAAEnB;EAAS,CAAE;AACtB,CAAC,CAAC;AAIK,MAAMoB,WAAW,GAAA/B,OAAA,CAAA+B,WAAA,gBAAG,IAAA9B,YAAG,GAAe;AACtC,MAAM+B,eAAe,GAAAhC,OAAA,CAAAgC,eAAA,gBAAG1D,KAAK,CAAC2D,MAAM,CAACF,WAAW,EAAE1B,WAAW,CAAC"}
+{"version":3,"file":"RateLimit.js","names":["_Context","require","Duration","_interopRequireWildcard","Effect","Layer","Memory","_utils","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","RateLimitStore","exports","Tag","MemoryRateLimitStoreLive","sync","make","makeLimiter","gen","_","store","maybeWait","key","window","limit","multiplier","windowMs","toMillis","incrementCounter","pipe","map","count","ttl","delayFrom","tap","d","annotateLogs","logTrace","service","delay","unit","sleep","asUnit","RateLimiter","RateLimiterLive","effect"],"sources":["./src/RateLimit.ts"],"sourcesContent":[null],"mappings":"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"}

package/gateway.d.ts

@@ -8,6 +8,6 @@ import * as Layer from "effect/Layer";
 export { DiscordGateway, DiscordGatewayLive } from "dfx/DiscordGateway";
 export { InteractionsRegistry, InteractionsRegistryLive, interactionsSync, run as runIx, setInteractionsSync, } from "dfx/Interactions/gateway";
 export { CachePrelude, DiscordWS, SendEvent, Shard, ShardStore, WS };
-export declare const DiscordLive: Layer.Layer<import("./DiscordConfig").DiscordConfig, never, import("dfx/Log").Log | import("dfx/RateLimit").RateLimiter | import("dfx/DiscordREST").DiscordREST | import("dfx/DiscordGateway").DiscordGateway>;
-export declare const DiscordIxLive: Layer.Layer<import("./DiscordConfig").DiscordConfig, never, import("dfx/Log").Log | import("dfx/RateLimit").RateLimiter | import("dfx/DiscordREST").DiscordREST | import("dfx/DiscordGateway").DiscordGateway | import("dfx/Interactions/gateway").InteractionsRegistry>;
+export declare const DiscordLive: Layer.Layer<import("./DiscordConfig").DiscordConfig, never, import("dfx/RateLimit").RateLimiter | import("dfx/DiscordREST").DiscordREST | import("dfx/DiscordGateway").DiscordGateway>;
+export declare const DiscordIxLive: Layer.Layer<import("./DiscordConfig").DiscordConfig, never, import("dfx/RateLimit").RateLimiter | import("dfx/DiscordREST").DiscordREST | import("dfx/DiscordGateway").DiscordGateway | import("dfx/Interactions/gateway").InteractionsRegistry>;
 //# sourceMappingURL=gateway.d.ts.map

package/gateway.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["./src/gateway.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AAEjD,OAAO,KAAK,SAAS,MAAM,8BAA8B,CAAA;AAEzD,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAA;AACjD,OAAO,KAAK,SAAS,MAAM,qCAAqC,CAAA;AAChE,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAA;AAE3D,OAAO,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAK3C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAEvE,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,gBAAgB,EAChB,GAAG,IAAI,KAAK,EACZ,mBAAmB,GACpB,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,CAAA;AAEpE,eAAO,MAAM,WAAW,gNASvB,CAAA;AAED,eAAO,MAAM,aAAa,0QAEzB,CAAA"}
+{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["./src/gateway.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AAEjD,OAAO,KAAK,SAAS,MAAM,8BAA8B,CAAA;AAEzD,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAA;AACjD,OAAO,KAAK,SAAS,MAAM,qCAAqC,CAAA;AAChE,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAA;AAE3D,OAAO,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAI3C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAEvE,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,gBAAgB,EAChB,GAAG,IAAI,KAAK,EACZ,mBAAmB,GACpB,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,CAAA;AAEpE,eAAO,MAAM,WAAW,wLAQvB,CAAA;AAED,eAAO,MAAM,aAAa,kPAEzB,CAAA"}

package/gateway.js

@@ -65,11 +65,10 @@ var WS = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/Discord
 exports.WS = WS;
 var _DiscordREST = /*#__PURE__*/require("dfx/DiscordREST");
 var _gateway = /*#__PURE__*/require("dfx/Interactions/gateway");
-var _Log = /*#__PURE__*/require("dfx/Log");
 var _RateLimit = /*#__PURE__*/require("dfx/RateLimit");
 var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const DiscordLive = exports.DiscordLive = /*#__PURE__*/Layer.mergeAll(_RateLimit.RateLimiterLive, _DiscordGateway.DiscordGatewayLive).pipe( /*#__PURE__*/Layer.provideMerge(_DiscordREST.DiscordRESTLive), /*#__PURE__*/Layer.provide(_DiscordWS.JsonDiscordWSCodecLive), /*#__PURE__*/Layer.provide(_RateLimit.MemoryRateLimitStoreLive), /*#__PURE__*/Layer.provide(_ShardStore.MemoryShardStoreLive), /*#__PURE__*/Layer.provideMerge(_Log.LogLive));
+const DiscordLive = exports.DiscordLive = /*#__PURE__*/Layer.mergeAll(_RateLimit.RateLimiterLive, _DiscordGateway.DiscordGatewayLive).pipe( /*#__PURE__*/Layer.provideMerge(_DiscordREST.DiscordRESTLive), /*#__PURE__*/Layer.provide(_DiscordWS.JsonDiscordWSCodecLive), /*#__PURE__*/Layer.provide(_RateLimit.MemoryRateLimitStoreLive), /*#__PURE__*/Layer.provide(_ShardStore.MemoryShardStoreLive));
 const DiscordIxLive = exports.DiscordIxLive = /*#__PURE__*/_gateway.InteractionsRegistryLive.pipe( /*#__PURE__*/Layer.provideMerge(DiscordLive));
 //# sourceMappingURL=gateway.js.map

package/gateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.js","names":["CachePrelude","_interopRequireWildcard","require","exports","_DiscordGateway","_DiscordWS","DiscordWS","Shard","SendEvent","_ShardStore","ShardStore","WS","_DiscordREST","_gateway","_Log","_RateLimit","Layer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","DiscordLive","mergeAll","RateLimiterLive","DiscordGatewayLive","pipe","provideMerge","DiscordRESTLive","provide","JsonDiscordWSCodecLive","MemoryRateLimitStoreLive","MemoryShardStoreLive","LogLive","DiscordIxLive","InteractionsRegistryLive"],"sources":["./src/gateway.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"gateway.js","names":["CachePrelude","_interopRequireWildcard","require","exports","_DiscordGateway","_DiscordWS","DiscordWS","Shard","SendEvent","_ShardStore","ShardStore","WS","_DiscordREST","_gateway","_RateLimit","Layer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","DiscordLive","mergeAll","RateLimiterLive","DiscordGatewayLive","pipe","provideMerge","DiscordRESTLive","provide","JsonDiscordWSCodecLive","MemoryRateLimitStoreLive","MemoryShardStoreLive","DiscordIxLive","InteractionsRegistryLive"],"sources":["./src/gateway.ts"],"sourcesContent":[null],"mappings":"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"}

package/index.d.ts

@@ -7,9 +7,8 @@ import * as Members from "dfx/Helpers/members";
 import * as Perms from "dfx/Helpers/permissions";
 import * as UI from "dfx/Helpers/ui";
 import * as Ix from "dfx/Interactions/index";
-import * as Log from "dfx/Log";
 import * as Discord from "dfx/types";
 export { DiscordREST, DiscordRESTLive } from "dfx/DiscordREST";
 export { BucketDetails, MemoryRateLimitStoreLive, RateLimiterLive, RateLimiter, RateLimitStore, } from "dfx/RateLimit";
-export { Cache, Discord, DiscordConfig, Flags, Intents, Ix, IxHelpers, Log, Members, Perms, UI, };
+export { Cache, Discord, DiscordConfig, Flags, Intents, Ix, IxHelpers, Members, Perms, UI, };
 //# sourceMappingURL=index.d.ts.map

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["./src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,WAAW,CAAA;AAClC,OAAO,KAAK,aAAa,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAA;AAC1C,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAA;AACrD,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,yBAAyB,CAAA;AAChD,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,KAAK,GAAG,MAAM,SAAS,CAAA;AAC9B,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AAEpC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAE9D,OAAO,EACL,aAAa,EACb,wBAAwB,EACxB,eAAe,EACf,WAAW,EACX,cAAc,GACf,MAAM,eAAe,CAAA;AAEtB,OAAO,EACL,KAAK,EACL,OAAO,EACP,aAAa,EACb,KAAK,EACL,OAAO,EACP,EAAE,EACF,SAAS,EACT,GAAG,EACH,OAAO,EACP,KAAK,EACL,EAAE,GACH,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["./src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,WAAW,CAAA;AAClC,OAAO,KAAK,aAAa,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAA;AAC1C,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAA;AACrD,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,yBAAyB,CAAA;AAChD,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AAEpC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAE9D,OAAO,EACL,aAAa,EACb,wBAAwB,EACxB,eAAe,EACf,WAAW,EACX,cAAc,GACf,MAAM,eAAe,CAAA;AAEtB,OAAO,EACL,KAAK,EACL,OAAO,EACP,aAAa,EACb,KAAK,EACL,OAAO,EACP,EAAE,EACF,SAAS,EACT,OAAO,EACP,KAAK,EACL,EAAE,GACH,CAAA"}

package/index.js

@@ -16,7 +16,7 @@ Object.defineProperty(exports, "DiscordRESTLive", {
     return _DiscordREST.DiscordRESTLive;
   }
 });
-exports.Members = exports.Log = exports.IxHelpers = exports.Ix = exports.Intents = exports.Flags = void 0;
+exports.Members = exports.IxHelpers = exports.Ix = exports.Intents = exports.Flags = void 0;
 Object.defineProperty(exports, "MemoryRateLimitStoreLive", {
   enumerable: true,
   get: function () {
@@ -61,8 +61,6 @@ var UI = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/Helpers
 exports.UI = UI;
 var Ix = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/Interactions/index"));
 exports.Ix = Ix;
-var Log = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/Log"));
-exports.Log = Log;
 var Discord = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/types"));
 exports.Discord = Discord;
 var _DiscordREST = /*#__PURE__*/require("dfx/DiscordREST");

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["Cache","_interopRequireWildcard","require","exports","DiscordConfig","Flags","Intents","IxHelpers","Members","Perms","UI","Ix","Log","Discord","_DiscordREST","_RateLimit","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set"],"sources":["./src/index.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,KAAA,gBAAAC,uBAAA,eAAAC,OAAA;AAAkCC,OAAA,CAAAH,KAAA,GAAAA,KAAA;AAClC,IAAAI,aAAA,gBAAAH,uBAAA,eAAAC,OAAA;AAAkDC,OAAA,CAAAC,aAAA,GAAAA,aAAA;AAClD,IAAAC,KAAA,gBAAAJ,uBAAA,eAAAC,OAAA;AAA0CC,OAAA,CAAAE,KAAA,GAAAA,KAAA;AAC1C,IAAAC,OAAA,gBAAAL,uBAAA,eAAAC,OAAA;AAA8CC,OAAA,CAAAG,OAAA,GAAAA,OAAA;AAC9C,IAAAC,SAAA,gBAAAN,uBAAA,eAAAC,OAAA;AAAqDC,OAAA,CAAAI,SAAA,GAAAA,SAAA;AACrD,IAAAC,OAAA,gBAAAP,uBAAA,eAAAC,OAAA;AAA8CC,OAAA,CAAAK,OAAA,GAAAA,OAAA;AAC9C,IAAAC,KAAA,gBAAAR,uBAAA,eAAAC,OAAA;AAAgDC,OAAA,CAAAM,KAAA,GAAAA,KAAA;AAChD,IAAAC,EAAA,gBAAAT,uBAAA,eAAAC,OAAA;AAAoCC,OAAA,CAAAO,EAAA,GAAAA,EAAA;AACpC,IAAAC,EAAA,gBAAAV,uBAAA,eAAAC,OAAA;AAA4CC,OAAA,CAAAQ,EAAA,GAAAA,EAAA;AAC5C,IAAAC,GAAA,gBAAAX,uBAAA,eAAAC,OAAA;AAA8BC,OAAA,CAAAS,GAAA,GAAAA,GAAA;AAC9B,IAAAC,OAAA,gBAAAZ,uBAAA,eAAAC,OAAA;AAAoCC,OAAA,CAAAU,OAAA,GAAAA,OAAA;AAEpC,IAAAC,YAAA,gBAAAZ,OAAA;AAEA,IAAAa,UAAA,gBAAAb,OAAA;AAMsB,SAAAc,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAhB,wBAAAgB,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA"}
+{"version":3,"file":"index.js","names":["Cache","_interopRequireWildcard","require","exports","DiscordConfig","Flags","Intents","IxHelpers","Members","Perms","UI","Ix","Discord","_DiscordREST","_RateLimit","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set"],"sources":["./src/index.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,KAAA,gBAAAC,uBAAA,eAAAC,OAAA;AAAkCC,OAAA,CAAAH,KAAA,GAAAA,KAAA;AAClC,IAAAI,aAAA,gBAAAH,uBAAA,eAAAC,OAAA;AAAkDC,OAAA,CAAAC,aAAA,GAAAA,aAAA;AAClD,IAAAC,KAAA,gBAAAJ,uBAAA,eAAAC,OAAA;AAA0CC,OAAA,CAAAE,KAAA,GAAAA,KAAA;AAC1C,IAAAC,OAAA,gBAAAL,uBAAA,eAAAC,OAAA;AAA8CC,OAAA,CAAAG,OAAA,GAAAA,OAAA;AAC9C,IAAAC,SAAA,gBAAAN,uBAAA,eAAAC,OAAA;AAAqDC,OAAA,CAAAI,SAAA,GAAAA,SAAA;AACrD,IAAAC,OAAA,gBAAAP,uBAAA,eAAAC,OAAA;AAA8CC,OAAA,CAAAK,OAAA,GAAAA,OAAA;AAC9C,IAAAC,KAAA,gBAAAR,uBAAA,eAAAC,OAAA;AAAgDC,OAAA,CAAAM,KAAA,GAAAA,KAAA;AAChD,IAAAC,EAAA,gBAAAT,uBAAA,eAAAC,OAAA;AAAoCC,OAAA,CAAAO,EAAA,GAAAA,EAAA;AACpC,IAAAC,EAAA,gBAAAV,uBAAA,eAAAC,OAAA;AAA4CC,OAAA,CAAAQ,EAAA,GAAAA,EAAA;AAC5C,IAAAC,OAAA,gBAAAX,uBAAA,eAAAC,OAAA;AAAoCC,OAAA,CAAAS,OAAA,GAAAA,OAAA;AAEpC,IAAAC,YAAA,gBAAAX,OAAA;AAEA,IAAAY,UAAA,gBAAAZ,OAAA;AAMsB,SAAAa,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAf,wBAAAe,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA"}

package/mjs/DiscordConfig.mjs

@@ -5,15 +5,13 @@ import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Discord from "dfx/types";
 const VERSION = 10;
-export const DiscordConfig = /*#__PURE__*/Tag();
+export const DiscordConfig = /*#__PURE__*/Tag("dfx/DiscordConfig");
 export const make = ({
-  debug = false,
   gateway,
   rest,
   token
 }) => ({
   token,
-  debug,
   rest: {
     baseUrl: `https://discord.com/api/v${VERSION}`,
     ...(rest ?? {}),

package/mjs/DiscordConfig.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"DiscordConfig.mjs","names":["Tag","Duration","Config","Effect","Layer","Discord","VERSION","DiscordConfig","make","debug","gateway","rest","token","baseUrl","globalRateLimit","limit","window","seconds","intents","GatewayIntents","GUILDS","identifyRateLimit","layer","opts","succeed","layerConfig","_","effect","map","config","unwrap"],"sources":["../src/DiscordConfig.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,GAAG,QAAQ,gBAAgB;AACpC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AAGvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,OAAO,MAAM,WAAW;AAEpC,MAAMC,OAAO,GAAG,EAAE;AAoBlB,OAAO,MAAMC,aAAa,gBAAGP,GAAG,EAAiB;AASjD,OAAO,MAAMQ,IAAI,GAAGA,CAAC;EACnBC,KAAK,GAAG,KAAK;EACbC,OAAO;EACPC,IAAI;EACJC;AAAK,CACI,MAAqB;EAC9BA,KAAK;EACLH,KAAK;EACLE,IAAI,EAAE;IACJE,OAAO,EAAE,4BAA4BP,OAAO,EAAE;IAC9C,IAAIK,IAAI,IAAI,EAAE,CAAC;IACfG,eAAe,EAAE;MACfC,KAAK,EAAE,EAAE;MACTC,MAAM,EAAEf,QAAQ,CAACgB,OAAO,CAAC,CAAC,CAAC;MAC3B,IAAIN,IAAI,EAAEG,eAAe,IAAI,EAAE;;GAElC;EACDJ,OAAO,EAAE;IACPQ,OAAO,EAAEb,OAAO,CAACc,cAAc,CAACC,MAAM;IACtCC,iBAAiB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5B,IAAIX,OAAO,IAAI,EAAE;;CAEpB,CAAC;AAEF,OAAO,MAAMY,KAAK,GAChBC,IAAc,IAEdnB,KAAK,CAACoB,OAAO,CAACjB,aAAa,EAAEC,IAAI,CAACe,IAAI,CAAC,CAAC;AAE1C,OAAO,MAAME,WAAW,GACtBC,CAA+B,IAE/BtB,KAAK,CAACuB,MAAM,CAACpB,aAAa,EAAEJ,MAAM,CAACyB,GAAG,CAACzB,MAAM,CAAC0B,MAAM,CAAC3B,MAAM,CAAC4B,MAAM,CAACJ,CAAC,CAAC,CAAC,EAAElB,IAAI,CAAC,CAAC"}
+{"version":3,"file":"DiscordConfig.mjs","names":["Tag","Duration","Config","Effect","Layer","Discord","VERSION","DiscordConfig","make","gateway","rest","token","baseUrl","globalRateLimit","limit","window","seconds","intents","GatewayIntents","GUILDS","identifyRateLimit","layer","opts","succeed","layerConfig","_","effect","map","config","unwrap"],"sources":["../src/DiscordConfig.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,GAAG,QAAQ,gBAAgB;AACpC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AAGvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,OAAO,MAAM,WAAW;AAEpC,MAAMC,OAAO,GAAG,EAAE;AAuBlB,OAAO,MAAMC,aAAa,gBAAGP,GAAG,CAC9B,mBAAmB,CACpB;AAQD,OAAO,MAAMQ,IAAI,GAAGA,CAAC;EACnBC,OAAO;EACPC,IAAI;EACJC;AAAK,CACI,MAA4B;EACrCA,KAAK;EACLD,IAAI,EAAE;IACJE,OAAO,EAAE,4BAA4BN,OAAO,EAAE;IAC9C,IAAII,IAAI,IAAI,EAAE,CAAC;IACfG,eAAe,EAAE;MACfC,KAAK,EAAE,EAAE;MACTC,MAAM,EAAEd,QAAQ,CAACe,OAAO,CAAC,CAAC,CAAC;MAC3B,IAAIN,IAAI,EAAEG,eAAe,IAAI,EAAE;;GAElC;EACDJ,OAAO,EAAE;IACPQ,OAAO,EAAEZ,OAAO,CAACa,cAAc,CAACC,MAAM;IACtCC,iBAAiB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5B,IAAIX,OAAO,IAAI,EAAE;;CAEpB,CAAC;AAEF,OAAO,MAAMY,KAAK,GAChBC,IAAc,IAEdlB,KAAK,CAACmB,OAAO,CAAChB,aAAa,EAAEC,IAAI,CAACc,IAAI,CAAC,CAAC;AAE1C,OAAO,MAAME,WAAW,GACtBC,CAA+B,IAE/BrB,KAAK,CAACsB,MAAM,CAACnB,aAAa,EAAEJ,MAAM,CAACwB,GAAG,CAACxB,MAAM,CAACyB,MAAM,CAAC1B,MAAM,CAAC2B,MAAM,CAACJ,CAAC,CAAC,CAAC,EAAEjB,IAAI,CAAC,CAAC"}

package/mjs/DiscordGateway/DiscordWS.mjs

@@ -3,7 +3,7 @@ import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Ref from "effect/Ref";
 import { WSLive, Reconnect, WS } from "dfx/DiscordGateway/WS";
-export const DiscordWSCodec = /*#__PURE__*/Tag();
+export const DiscordWSCodec = /*#__PURE__*/Tag("dfx/DiscordGateway/DiscordWS/Codec");
 export const JsonDiscordWSCodecLive = /*#__PURE__*/Layer.succeed(DiscordWSCodec, {
   type: "json",
   encode: p => JSON.stringify(p),
@@ -21,11 +21,14 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
     const urlRef = yield* _(Ref.make(`${url}?v=${version}&encoding=${encoding.type}`));
     const setUrl = url => Ref.set(urlRef, `${url}?v=${version}&encoding=${encoding.type}`);
     const takeOutbound = Effect.map(outbound, msg => msg === Reconnect ? msg : encoding.encode(msg));
-    const socket = yield* _(ws.connect(urlRef, takeOutbound, onConnecting));
+    const socket = yield* _(ws.connect({
+      urlRef,
+      takeOutbound,
+      onConnecting,
+      reconnectWhen: e => e._tag === "WebSocketCloseError" && e.code < 2000 || e._tag === "WebSocketError" && e.reason === "open-timeout"
+    }));
     const take = Effect.map(socket.take, encoding.decode);
-    const run = Effect.retryWhile(socket.run, e => e._tag === "WebSocketCloseError" && e.code < 2000 || e._tag === "WebSocketError" && e.reason === "open-timeout");
     return {
-      run,
       take,
       setUrl
     };
@@ -34,6 +37,6 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
     connect
   };
 });
-export const DiscordWS = /*#__PURE__*/Tag();
+export const DiscordWS = /*#__PURE__*/Tag("dfx/DiscordGateway/DiscordWS");
 export const DiscordWSLive = /*#__PURE__*/Layer.provide( /*#__PURE__*/Layer.effect(DiscordWS, make), WSLive);
 //# sourceMappingURL=DiscordWS.mjs.map

package/mjs/DiscordGateway/DiscordWS.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"DiscordWS.mjs","names":["Tag","Effect","Layer","Ref","WSLive","Reconnect","WS","DiscordWSCodec","JsonDiscordWSCodecLive","succeed","type","encode","p","JSON","stringify","decode","parse","toString","make","gen","_","ws","encoding","connect","onConnecting","outbound","url","version","urlRef","setUrl","set","takeOutbound","map","msg","socket","take","run","retryWhile","e","_tag","code","reason","DiscordWS","DiscordWSLive","provide","effect"],"sources":["../../src/DiscordGateway/DiscordWS.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,GAAG,QAAQ,gBAAgB;AACpC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,GAAG,MAAM,YAAY;AACjC,SAASC,MAAM,EAAEC,SAAS,EAAEC,EAAE,QAAQ,uBAAuB;AAmB7D,OAAO,MAAMC,cAAc,gBAAGP,GAAG,EAAkB;AACnD,OAAO,MAAMQ,sBAAsB,gBAAGN,KAAK,CAACO,OAAO,CAACF,cAAc,EAAE;EAClEG,IAAI,EAAE,MAAM;EACZC,MAAM,EAAEC,CAAC,IAAIC,IAAI,CAACC,SAAS,CAACF,CAAC,CAAC;EAC9BG,MAAM,EAAEH,CAAC,IAAIC,IAAI,CAACG,KAAK,CAACJ,CAAC,CAACK,QAAQ,CAAC,MAAM,CAAC;CAC3C,CAAC;AAEF,MAAMC,IAAI,gBAAGjB,MAAM,CAACkB,GAAG,CAAC,WAAWC,CAAC;EAClC,MAAMC,EAAE,GAAG,OAAOD,CAAC,CAACd,EAAE,CAAC;EACvB,MAAMgB,QAAQ,GAAG,OAAOF,CAAC,CAACb,cAAc,CAAC;EAEzC,MAAMgB,OAAO,GAAGA,CAAC;IACfC,YAAY;IACZC,QAAQ;IACRC,GAAG,GAAG,2BAA2B;IACjCC,OAAO,GAAG;EAAE,CACH,KACT1B,MAAM,CAACkB,GAAG,CAAC,WAAWC,CAAC;IACrB,MAAMQ,MAAM,GAAG,OAAOR,CAAC,CACrBjB,GAAG,CAACe,IAAI,CAAC,GAAGQ,GAAG,MAAMC,OAAO,aAAaL,QAAQ,CAACZ,IAAI,EAAE,CAAC,CAC1D;IACD,MAAMmB,MAAM,GAAIH,GAAW,IACzBvB,GAAG,CAAC2B,GAAG,CAACF,MAAM,EAAE,GAAGF,GAAG,MAAMC,OAAO,aAAaL,QAAQ,CAACZ,IAAI,EAAE,CAAC;IAClE,MAAMqB,YAAY,GAAG9B,MAAM,CAAC+B,GAAG,CAACP,QAAQ,EAAEQ,GAAG,IAC3CA,GAAG,KAAK5B,SAAS,GAAG4B,GAAG,GAAGX,QAAQ,CAACX,MAAM,CAACsB,GAAG,CAAC,CAC/C;IACD,MAAMC,MAAM,GAAG,OAAOd,CAAC,CAACC,EAAE,CAACE,OAAO,CAACK,MAAM,EAAEG,YAAY,EAAEP,YAAY,CAAC,CAAC;IACvE,MAAMW,IAAI,GAAGlC,MAAM,CAAC+B,GAAG,CAACE,MAAM,CAACC,IAAI,EAAEb,QAAQ,CAACP,MAAM,CAAC;IAErD,MAAMqB,GAAG,GAAGnC,MAAM,CAACoC,UAAU,CAC3BH,MAAM,CAACE,GAAG,EACVE,CAAC,IACEA,CAAC,CAACC,IAAI,KAAK,qBAAqB,IAAID,CAAC,CAACE,IAAI,GAAG,IAAI,IACjDF,CAAC,CAACC,IAAI,KAAK,gBAAgB,IAAID,CAAC,CAACG,MAAM,KAAK,cAAe,CAC/D;IAED,OAAO;MACLL,GAAG;MACHD,IAAI;MACJN;KACQ;EACZ,CAAC,CAAC;EAEJ,OAAO;IAAEN;EAAO,CAAW;AAC7B,CAAC,CAAC;AAGF,OAAO,MAAMmB,SAAS,gBAAG1C,GAAG,EAAa;AACzC,OAAO,MAAM2C,aAAa,gBAAGzC,KAAK,CAAC0C,OAAO,eACxC1C,KAAK,CAAC2C,MAAM,CAACH,SAAS,EAAExB,IAAI,CAAC,EAC7Bd,MAAM,CACP"}
+{"version":3,"file":"DiscordWS.mjs","names":["Tag","Effect","Layer","Ref","WSLive","Reconnect","WS","DiscordWSCodec","JsonDiscordWSCodecLive","succeed","type","encode","p","JSON","stringify","decode","parse","toString","make","gen","_","ws","encoding","connect","onConnecting","outbound","url","version","urlRef","setUrl","set","takeOutbound","map","msg","socket","reconnectWhen","e","_tag","code","reason","take","DiscordWS","DiscordWSLive","provide","effect"],"sources":["../../src/DiscordGateway/DiscordWS.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,GAAG,QAAQ,gBAAgB;AACpC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,GAAG,MAAM,YAAY;AACjC,SAASC,MAAM,EAAEC,SAAS,EAAEC,EAAE,QAAQ,uBAAuB;AAsB7D,OAAO,MAAMC,cAAc,gBAAGP,GAAG,CAC/B,oCAAoC,CACrC;AACD,OAAO,MAAMQ,sBAAsB,gBAAGN,KAAK,CAACO,OAAO,CAACF,cAAc,EAAE;EAClEG,IAAI,EAAE,MAAM;EACZC,MAAM,EAAEC,CAAC,IAAIC,IAAI,CAACC,SAAS,CAACF,CAAC,CAAC;EAC9BG,MAAM,EAAEH,CAAC,IAAIC,IAAI,CAACG,KAAK,CAACJ,CAAC,CAACK,QAAQ,CAAC,MAAM,CAAC;CAC3C,CAAC;AAEF,MAAMC,IAAI,gBAAGjB,MAAM,CAACkB,GAAG,CAAC,WAAWC,CAAC;EAClC,MAAMC,EAAE,GAAG,OAAOD,CAAC,CAACd,EAAE,CAAC;EACvB,MAAMgB,QAAQ,GAAG,OAAOF,CAAC,CAACb,cAAc,CAAC;EAEzC,MAAMgB,OAAO,GAAGA,CAAC;IACfC,YAAY;IACZC,QAAQ;IACRC,GAAG,GAAG,2BAA2B;IACjCC,OAAO,GAAG;EAAE,CACH,KACT1B,MAAM,CAACkB,GAAG,CAAC,WAAWC,CAAC;IACrB,MAAMQ,MAAM,GAAG,OAAOR,CAAC,CACrBjB,GAAG,CAACe,IAAI,CAAC,GAAGQ,GAAG,MAAMC,OAAO,aAAaL,QAAQ,CAACZ,IAAI,EAAE,CAAC,CAC1D;IACD,MAAMmB,MAAM,GAAIH,GAAW,IACzBvB,GAAG,CAAC2B,GAAG,CAACF,MAAM,EAAE,GAAGF,GAAG,MAAMC,OAAO,aAAaL,QAAQ,CAACZ,IAAI,EAAE,CAAC;IAClE,MAAMqB,YAAY,GAAG9B,MAAM,CAAC+B,GAAG,CAACP,QAAQ,EAAEQ,GAAG,IAC3CA,GAAG,KAAK5B,SAAS,GAAG4B,GAAG,GAAGX,QAAQ,CAACX,MAAM,CAACsB,GAAG,CAAC,CAC/C;IACD,MAAMC,MAAM,GAAG,OAAOd,CAAC,CACrBC,EAAE,CAACE,OAAO,CAAC;MACTK,MAAM;MACNG,YAAY;MACZP,YAAY;MACZW,aAAa,EAAEC,CAAC,IACbA,CAAC,CAACC,IAAI,KAAK,qBAAqB,IAAID,CAAC,CAACE,IAAI,GAAG,IAAI,IACjDF,CAAC,CAACC,IAAI,KAAK,gBAAgB,IAAID,CAAC,CAACG,MAAM,KAAK;KAChD,CAAC,CACH;IACD,MAAMC,IAAI,GAAGvC,MAAM,CAAC+B,GAAG,CAACE,MAAM,CAACM,IAAI,EAAElB,QAAQ,CAACP,MAAM,CAAC;IAErD,OAAO;MACLyB,IAAI;MACJX;KACQ;EACZ,CAAC,CAAC;EAEJ,OAAO;IAAEN;EAAO,CAAW;AAC7B,CAAC,CAAC;AAKF,OAAO,MAAMkB,SAAS,gBAAGzC,GAAG,CAC1B,8BAA8B,CAC/B;AACD,OAAO,MAAM0C,aAAa,gBAAGxC,KAAK,CAACyC,OAAO,eACxCzC,KAAK,CAAC0C,MAAM,CAACH,SAAS,EAAEvB,IAAI,CAAC,EAC7Bd,MAAM,CACP"}

package/mjs/DiscordGateway/Messaging.mjs

@@ -0,0 +1,33 @@
+import { Tag } from "effect/Context";
+import * as Effect from "effect/Effect";
+import * as PubSub from "effect/PubSub";
+import * as Layer from "effect/Layer";
+import * as Queue from "effect/Queue";
+import * as Stream from "effect/Stream";
+import * as EffectUtils from "dfx/utils/Effect";
+const fromDispatchFactory = source => event => Stream.map(Stream.filter(source, p => p.t === event), p => p.d);
+const handleDispatchFactory = hub => (event, handle) => EffectUtils.subscribeForEachPar(hub, _ => {
+  if (_.t === event) {
+    return handle(_.d);
+  }
+  return Effect.unit;
+});
+export const make = /*#__PURE__*/Effect.gen(function* (_) {
+  const hub = yield* _(Effect.acquireRelease(PubSub.unbounded(), PubSub.shutdown));
+  const sendQueue = yield* _(Effect.acquireRelease(Queue.unbounded(), Queue.shutdown));
+  const send = payload => sendQueue.offer(payload);
+  const dispatch = Stream.fromPubSub(hub);
+  const fromDispatch = fromDispatchFactory(dispatch);
+  const handleDispatch = handleDispatchFactory(hub);
+  return {
+    hub,
+    sendQueue,
+    dispatch,
+    fromDispatch,
+    handleDispatch,
+    send
+  };
+});
+export const Messaging = /*#__PURE__*/Tag("dfx/DiscordGateway/Messaging");
+export const MesssagingLive = /*#__PURE__*/Layer.scoped(Messaging, make);
+//# sourceMappingURL=Messaging.mjs.map

package/mjs/DiscordGateway/Messaging.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"Messaging.mjs","names":["Tag","Effect","PubSub","Layer","Queue","Stream","EffectUtils","fromDispatchFactory","source","event","map","filter","p","t","d","handleDispatchFactory","hub","handle","subscribeForEachPar","_","unit","make","gen","acquireRelease","unbounded","shutdown","sendQueue","send","payload","offer","dispatch","fromPubSub","fromDispatch","handleDispatch","Messaging","MesssagingLive","scoped"],"sources":["../../src/DiscordGateway/Messaging.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,GAAG,QAAQ,gBAAgB;AACpC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,eAAe;AAEvC,OAAO,KAAKC,WAAW,MAAM,kBAAkB;AAE/C,MAAMC,mBAAmB,GAErBC,MAAyE,IAGzEC,KAAQ,IAERJ,MAAM,CAACK,GAAG,CACRL,MAAM,CAACM,MAAM,CAACH,MAAM,EAAEI,CAAC,IAAIA,CAAC,CAACC,CAAC,KAAKJ,KAAK,CAAC,EACzCG,CAAC,IAAIA,CAAC,CAACE,CAAS,CACjB;AAEL,MAAMC,qBAAqB,GACxBC,GAAgE,IACjE,CACEP,KAAQ,EACRQ,MAAmE,KAEnEX,WAAW,CAACY,mBAAmB,CAACF,GAAG,EAAEG,CAAC,IAAG;EACvC,IAAIA,CAAC,CAACN,CAAC,KAAKJ,KAAK,EAAE;IACjB,OAAOQ,MAAM,CAACE,CAAC,CAACL,CAAQ,CAAC;EAC3B;EACA,OAAOb,MAAM,CAACmB,IAAW;AAC3B,CAAC,CAAC;AAEN,OAAO,MAAMC,IAAI,gBAAGpB,MAAM,CAACqB,GAAG,CAAC,WAAWH,CAAC;EACzC,MAAMH,GAAG,GAAG,OAAOG,CAAC,CAClBlB,MAAM,CAACsB,cAAc,CACnBrB,MAAM,CAACsB,SAAS,EAAgD,EAChEtB,MAAM,CAACuB,QAAQ,CAChB,CACF;EAED,MAAMC,SAAS,GAAG,OAAOP,CAAC,CACxBlB,MAAM,CAACsB,cAAc,CACnBnB,KAAK,CAACoB,SAAS,EAA6C,EAC5DpB,KAAK,CAACqB,QAAQ,CACf,CACF;EACD,MAAME,IAAI,GAAIC,OAAkD,IAC9DF,SAAS,CAACG,KAAK,CAACD,OAAO,CAAC;EAE1B,MAAME,QAAQ,GAAGzB,MAAM,CAAC0B,UAAU,CAACf,GAAG,CAAC;EACvC,MAAMgB,YAAY,GAAGzB,mBAAmB,CAACuB,QAAQ,CAAC;EAClD,MAAMG,cAAc,GAAGlB,qBAAqB,CAACC,GAAG,CAAC;EAEjD,OAAO;IACLA,GAAG;IACHU,SAAS;IACTI,QAAQ;IACRE,YAAY;IACZC,cAAc;IACdN;GACQ;AACZ,CAAC,CAAC;AAKF,OAAO,MAAMO,SAAS,gBAAGlC,GAAG,CAC1B,8BAA8B,CAC/B;AACD,OAAO,MAAMmC,cAAc,gBAAGhC,KAAK,CAACiC,MAAM,CAACF,SAAS,EAAEb,IAAI,CAAC"}

package/mjs/DiscordGateway/Shard.mjs

@@ -16,9 +16,9 @@ import * as Identify from "dfx/DiscordGateway/Shard/identify";
 import * as InvalidSession from "dfx/DiscordGateway/Shard/invalidSession";
 import * as Utils from "dfx/DiscordGateway/Shard/utils";
 import { Reconnect } from "dfx/DiscordGateway/WS";
-import { Log } from "dfx/Log";
 import { RateLimiterLive, RateLimiter } from "dfx/RateLimit";
 import * as Discord from "dfx/types";
+import { Messaging, MesssagingLive } from "dfx/DiscordGateway/Messaging";
 export const make = /*#__PURE__*/Effect.gen(function* (_) {
   const {
     gateway,
@@ -26,12 +26,15 @@ export const make = /*#__PURE__*/Effect.gen(function* (_) {
   } = yield* _(DiscordConfig);
   const limiter = yield* _(RateLimiter);
   const dws = yield* _(DiscordWS);
-  const log = yield* _(Log);
-  const connect = (shard, hub, sendQueue) => Effect.gen(function* (_) {
+  const {
+    hub,
+    sendQueue
+  } = yield* _(Messaging);
+  const connect = shard => Effect.gen(function* (_) {
     const outboundQueue = yield* _(Queue.unbounded());
     const pendingQueue = yield* _(Queue.unbounded());
     const phase = yield* _(Ref.make(0 /* Phase.Connecting */));
-    const setPhase = p => Effect.zipLeft(Ref.set(phase, p), log.debug("Shard", shard, "phase", p));
+    const setPhase = p => Effect.zipLeft(Ref.set(phase, p), Effect.annotateLogs(Effect.logTrace("phase transition"), "phase", p));
     const outbound = Effect.zipLeft(Queue.take(outboundQueue), limiter.maybeWait("dfx.shard.send", Duration.minutes(1), 120));
     const send = p => Effect.flatMap(Ref.get(phase), phase => phase === 2 /* Phase.Connected */ ? Queue.offer(outboundQueue, p) : Queue.offer(pendingQueue, p));
     const heartbeatSend = p => Effect.flatMap(Ref.get(phase), phase => phase !== 0 /* Phase.Connecting */ ? Queue.offer(outboundQueue, p) : Effect.succeed(false));
@@ -51,10 +54,10 @@ export const make = /*#__PURE__*/Effect.gen(function* (_) {
         resume_gateway_url
       }) => socket.setUrl(resume_gateway_url)
     });
-    const hellos = yield* _(Queue.unbounded());
-    const acks = yield* _(Queue.unbounded());
+    const hellos = yield* _(Effect.acquireRelease(Queue.unbounded(), Queue.shutdown));
+    const acks = yield* _(Effect.acquireRelease(Queue.unbounded(), Queue.shutdown));
     // heartbeats
-    const heartbeats = Heartbeats.send(hellos, acks, latestSequence, heartbeatSend);
+    yield* _(Heartbeats.send(hellos, acks, latestSequence, heartbeatSend), Effect.forkScoped);
     // identify
     const identify = Identify.identifyOrResume({
       token: ConfigSecret.value(token),
@@ -79,21 +82,21 @@ export const make = /*#__PURE__*/Effect.gen(function* (_) {
           return Effect.unit;
       }
     }));
-    const drainSendQueue = Effect.forever(Effect.tap(Queue.take(sendQueue), send));
-    const run = Effect.all([Effect.forever(Effect.flatMap(socket.take, onPayload)), heartbeats, drainSendQueue, socket.run], {
-      discard: true,
-      concurrency: "unbounded"
-    });
+    yield* _(Queue.take(sendQueue), Effect.tap(send), Effect.forever, Effect.forkScoped);
+    yield* _(socket.take, Effect.flatMap(onPayload), Effect.forever, Effect.forkScoped);
     return {
       id: shard,
-      send,
-      run
+      send
     };
-  });
+  }).pipe(Effect.annotateLogs({
+    package: "dfx",
+    module: "DiscordGateway/Shard",
+    shard
+  }));
   return {
     connect
   };
 });
-export const Shard = /*#__PURE__*/Tag();
-export const ShardLive = /*#__PURE__*/Layer.provide( /*#__PURE__*/Layer.effect(Shard, make), /*#__PURE__*/Layer.merge(DiscordWSLive, RateLimiterLive));
+export const Shard = /*#__PURE__*/Tag("dfx/DiscordGateway/Shard");
+export const ShardLive = /*#__PURE__*/Layer.effect(Shard, make).pipe( /*#__PURE__*/Layer.provide(DiscordWSLive), /*#__PURE__*/Layer.provide(MesssagingLive), /*#__PURE__*/Layer.provide(RateLimiterLive));
 //# sourceMappingURL=Shard.mjs.map

package/mjs/DiscordGateway/Shard.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"Shard.mjs","names":["Chunk","Tag","Duration","pipe","Option","ConfigSecret","Effect","PubSub","Layer","Queue","Ref","DiscordConfig","DiscordWS","DiscordWSLive","Heartbeats","Identify","InvalidSession","Utils","Reconnect","Log","RateLimiterLive","RateLimiter","Discord","make","gen","_","gateway","token","limiter","dws","log","connect","shard","hub","sendQueue","outboundQueue","unbounded","pendingQueue","phase","setPhase","p","zipLeft","set","debug","outbound","take","maybeWait","minutes","send","flatMap","get","offer","heartbeatSend","succeed","prioritySend","resume","zipRight","takeAll","tap","offerAll","asUnit","onConnecting","msgs","filter","msg","op","GatewayOpcode","IDENTIFY","RESUME","HEARTBEAT","socket","isReady","liftPredicate","DISPATCH","t","latestReady","updateLatestReady","latest","map","d","latestSequence","updateLatestSequence","fromNullable","s","maybeUpdateUrl","match","onNone","unit","onSome","resume_gateway_url","setUrl","hellos","acks","heartbeats","identify","identifyOrResume","value","intents","presence","onPayload","HELLO","HEARTBEAT_ACK","INVALID_SESSION","fromPayload","publish","drainSendQueue","forever","run","all","discard","concurrency","id","Shard","ShardLive","provide","effect","merge"],"sources":["../../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"Shard.mjs","names":["Chunk","Tag","Duration","pipe","Option","ConfigSecret","Effect","PubSub","Layer","Queue","Ref","DiscordConfig","DiscordWS","DiscordWSLive","Heartbeats","Identify","InvalidSession","Utils","Reconnect","RateLimiterLive","RateLimiter","Discord","Messaging","MesssagingLive","make","gen","_","gateway","token","limiter","dws","hub","sendQueue","connect","shard","outboundQueue","unbounded","pendingQueue","phase","setPhase","p","zipLeft","set","annotateLogs","logTrace","outbound","take","maybeWait","minutes","send","flatMap","get","offer","heartbeatSend","succeed","prioritySend","resume","zipRight","takeAll","tap","offerAll","asUnit","onConnecting","msgs","filter","msg","op","GatewayOpcode","IDENTIFY","RESUME","HEARTBEAT","socket","isReady","liftPredicate","DISPATCH","t","latestReady","updateLatestReady","latest","map","d","latestSequence","updateLatestSequence","fromNullable","s","maybeUpdateUrl","match","onNone","unit","onSome","resume_gateway_url","setUrl","hellos","acquireRelease","shutdown","acks","forkScoped","identify","identifyOrResume","value","intents","presence","onPayload","HELLO","HEARTBEAT_ACK","INVALID_SESSION","fromPayload","publish","forever","id","package","module","Shard","ShardLive","effect","provide"],"sources":["../../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":"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"}

package/mjs/DiscordGateway/ShardStore.mjs

@@ -2,7 +2,7 @@ import { Tag } from "effect/Context";
 import * as Option from "effect/Option";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-export const ShardStore = /*#__PURE__*/Tag();
+export const ShardStore = /*#__PURE__*/Tag("dfx/DiscordGateway/ShardStore");
 // Very basic shard id store, that does no health checks
 const memoryStore = () => {
   let currentId = 0;

package/mjs/DiscordGateway/ShardStore.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"ShardStore.mjs","names":["Tag","Option","Effect","Layer","ShardStore","memoryStore","currentId","claimId","totalCount","sync","none","id","some","allClaimed","MemoryShardStoreLive"],"sources":["../../src/DiscordGateway/ShardStore.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,GAAG,QAAQ,gBAAgB;AACpC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAcrC,OAAO,MAAMC,UAAU,gBAAGJ,GAAG,EAAc;AAE3C;AACA,MAAMK,WAAW,GAAGA,CAAA,KAAiB;EACnC,IAAIC,SAAS,GAAG,CAAC;EAEjB,OAAO;IACLC,OAAO,EAAEA,CAAC;MAAEC;IAAU,CAAE,KACtBN,MAAM,CAACO,IAAI,CAAC,MAAK;MACf,IAAIH,SAAS,IAAIE,UAAU,EAAE;QAC3B,OAAOP,MAAM,CAACS,IAAI,EAAE;MACtB;MAEA,MAAMC,EAAE,GAAGL,SAAS;MACpBA,SAAS,EAAE;MACX,OAAOL,MAAM,CAACW,IAAI,CAACD,EAAE,CAAC;IACxB,CAAC,CAAC;IAEJE,UAAU,EAAEL,UAAU,IAAIN,MAAM,CAACO,IAAI,CAAC,MAAMH,SAAS,IAAIE,UAAU;GACpE;AACH,CAAC;AAED,OAAO,MAAMM,oBAAoB,gBAAGX,KAAK,CAACM,IAAI,CAACL,UAAU,EAAEC,WAAW,CAAC"}
+{"version":3,"file":"ShardStore.mjs","names":["Tag","Option","Effect","Layer","ShardStore","memoryStore","currentId","claimId","totalCount","sync","none","id","some","allClaimed","MemoryShardStoreLive"],"sources":["../../src/DiscordGateway/ShardStore.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,GAAG,QAAQ,gBAAgB;AACpC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAiBrC,OAAO,MAAMC,UAAU,gBAAGJ,GAAG,CAC3B,+BAA+B,CAChC;AAED;AACA,MAAMK,WAAW,GAAGA,CAAA,KAAwB;EAC1C,IAAIC,SAAS,GAAG,CAAC;EAEjB,OAAO;IACLC,OAAO,EAAEA,CAAC;MAAEC;IAAU,CAAE,KACtBN,MAAM,CAACO,IAAI,CAAC,MAAK;MACf,IAAIH,SAAS,IAAIE,UAAU,EAAE;QAC3B,OAAOP,MAAM,CAACS,IAAI,EAAE;MACtB;MAEA,MAAMC,EAAE,GAAGL,SAAS;MACpBA,SAAS,EAAE;MACX,OAAOL,MAAM,CAACW,IAAI,CAACD,EAAE,CAAC;IACxB,CAAC,CAAC;IAEJE,UAAU,EAAEL,UAAU,IAAIN,MAAM,CAACO,IAAI,CAAC,MAAMH,SAAS,IAAIE,UAAU;GACpE;AACH,CAAC;AAED,OAAO,MAAMM,oBAAoB,gBAAGX,KAAK,CAACM,IAAI,CAACL,UAAU,EAAEC,WAAW,CAAC"}

package/mjs/DiscordGateway/Sharder.mjs

@@ -1,18 +1,16 @@
-import * as Chunk from "effect/Chunk";
+import { DiscordConfig } from "dfx/DiscordConfig";
+import { Shard, ShardLive } from "dfx/DiscordGateway/Shard";
+import { ShardStore } from "dfx/DiscordGateway/ShardStore";
+import { DiscordREST, DiscordRESTLive } from "dfx/DiscordREST";
+import { RateLimiter, RateLimiterLive } from "dfx/RateLimit";
 import { Tag } from "effect/Context";
 import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
 import { pipe } from "effect/Function";
 import * as HashSet from "effect/HashSet";
-import * as Deferred from "effect/Deferred";
-import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Ref from "effect/Ref";
 import * as Schedule from "effect/Schedule";
-import { DiscordConfig } from "dfx/DiscordConfig";
-import { ShardLive, Shard } from "dfx/DiscordGateway/Shard";
-import { ShardStore } from "dfx/DiscordGateway/ShardStore";
-import { DiscordREST } from "dfx/DiscordREST";
-import { RateLimiterLive, RateLimiter } from "dfx/RateLimit";
 const claimRepeatPolicy = /*#__PURE__*/Schedule.spaced("3 minutes").pipe( /*#__PURE__*/Schedule.whileInput(_ => _._tag === "None"), Schedule.passthrough);
 const make = /*#__PURE__*/Effect.gen(function* (_) {
   const store = yield* _(ShardStore);
@@ -23,17 +21,6 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
   const limiter = yield* _(RateLimiter);
   const shard = yield* _(Shard);
   const currentShards = yield* _(Ref.make(HashSet.empty()));
-  const takeConfig = totalCount => Effect.gen(function* (_) {
-    const currentCount = yield* _(Ref.make(0));
-    const claimId = sharderCount => pipe(store.claimId({
-      totalCount,
-      sharderCount
-    }), Effect.repeat(claimRepeatPolicy), Effect.map(_ => _.value));
-    return pipe(Ref.getAndUpdate(currentCount, _ => _ + 1), Effect.flatMap(claimId), Effect.map(id => ({
-      id,
-      totalCount
-    })));
-  });
   const gateway = yield* _(rest.getGatewayBot(), Effect.flatMap(r => r.json), Effect.catchAll(() => Effect.succeed({
     url: "wss://gateway.discord.gg/",
     shards: 1,
@@ -44,31 +31,35 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
       max_concurrency: 1
     }
   })));
-  const run = (hub, sendQueue) => Effect.gen(function* (_) {
-    const deferred = yield* _(Deferred.make());
-    const take = yield* _(takeConfig(config.shardCount ?? gateway.shards));
-    const spawner = pipe(take, Effect.map(config => ({
-      ...config,
-      url: gateway.url,
-      concurrency: gateway.session_start_limit.max_concurrency
-    })), Effect.tap(({
-      concurrency,
-      id
-    }) => limiter.maybeWait(`dfx.sharder.${id % concurrency}`, Duration.millis(config.identifyRateLimit[0]), config.identifyRateLimit[1])), Effect.flatMap(c => shard.connect([c.id, c.totalCount], hub, sendQueue)), Effect.flatMap(shard => Effect.acquireUseRelease(Ref.update(currentShards, HashSet.add(shard)), () => shard.run, () => Ref.update(currentShards, HashSet.remove(shard))).pipe(Effect.catchAllCause(_ => Deferred.failCause(deferred, _)), Effect.fork)), Effect.forever);
-    const spawners = Chunk.map(Chunk.range(1, gateway.session_start_limit.max_concurrency), () => spawner);
-    return yield* _(Effect.all([Effect.all(spawners, {
-      concurrency: "unbounded",
-      discard: true
-    }), Deferred.await(deferred)], {
-      concurrency: "unbounded",
-      discard: true
-    }));
-  });
+  const totalCount = config.shardCount ?? gateway.shards;
+  const currentCount = yield* _(Ref.make(0));
+  const claimId = sharderCount => pipe(store.claimId({
+    totalCount,
+    sharderCount
+  }), Effect.repeat(claimRepeatPolicy), Effect.map(_ => _.value));
+  const takeConfig = pipe(Ref.getAndUpdate(currentCount, _ => _ + 1), Effect.flatMap(claimId), Effect.map(id => ({
+    id,
+    totalCount
+  })));
+  const spawner = pipe(takeConfig, Effect.map(config => ({
+    ...config,
+    url: gateway.url,
+    concurrency: gateway.session_start_limit.max_concurrency
+  })), Effect.tap(({
+    concurrency,
+    id
+  }) => limiter.maybeWait(`dfx.sharder.${id % concurrency}`, Duration.millis(config.identifyRateLimit[0]), config.identifyRateLimit[1])), Effect.flatMap(c => shard.connect([c.id, c.totalCount])), Effect.flatMap(shard => Ref.update(currentShards, HashSet.add(shard))), Effect.forever);
+  yield* _(Effect.replicateEffect(spawner, gateway.session_start_limit.max_concurrency, {
+    concurrency: "unbounded",
+    discard: true
+  }), Effect.scoped, Effect.catchAllCause(Effect.logError), Effect.ensuring(Ref.set(currentShards, HashSet.empty())), Effect.forever, Effect.forkScoped);
   return {
-    shards: Ref.get(currentShards),
-    run
+    shards: Ref.get(currentShards)
   };
-});
-export const Sharder = /*#__PURE__*/Tag();
-export const SharedLive = /*#__PURE__*/Layer.provide( /*#__PURE__*/Layer.effect(Sharder, make), /*#__PURE__*/Layer.merge(RateLimiterLive, ShardLive));
+}).pipe( /*#__PURE__*/Effect.annotateLogs({
+  package: "dfx",
+  module: "DiscordGateway/Sharder"
+}));
+export const Sharder = /*#__PURE__*/Tag("dfx/DiscordGateway/Sharder");
+export const SharderLive = /*#__PURE__*/Layer.scoped(Sharder, make).pipe( /*#__PURE__*/Layer.provide(DiscordRESTLive), /*#__PURE__*/Layer.provide(RateLimiterLive), /*#__PURE__*/Layer.provide(ShardLive));
 //# sourceMappingURL=Sharder.mjs.map