dfx 0.77.3 → 0.78.0

package/DiscordGateway/Sharder.js

@@ -3,22 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SharedLive = exports.Sharder = void 0;
-var Chunk = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Chunk"));
+exports.SharderLive = exports.Sharder = void 0;
+var _DiscordConfig = /*#__PURE__*/require("dfx/DiscordConfig");
+var _Shard = /*#__PURE__*/require("dfx/DiscordGateway/Shard");
+var _ShardStore = /*#__PURE__*/require("dfx/DiscordGateway/ShardStore");
+var _DiscordREST = /*#__PURE__*/require("dfx/DiscordREST");
+var _RateLimit = /*#__PURE__*/require("dfx/RateLimit");
 var _Context = /*#__PURE__*/require("effect/Context");
 var Duration = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Duration"));
+var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
 var _Function = /*#__PURE__*/require("effect/Function");
 var HashSet = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/HashSet"));
-var Deferred = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Deferred"));
-var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
 var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
 var Ref = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Ref"));
 var Schedule = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Schedule"));
-var _DiscordConfig = /*#__PURE__*/require("dfx/DiscordConfig");
-var _Shard = /*#__PURE__*/require("dfx/DiscordGateway/Shard");
-var _ShardStore = /*#__PURE__*/require("dfx/DiscordGateway/ShardStore");
-var _DiscordREST = /*#__PURE__*/require("dfx/DiscordREST");
-var _RateLimit = /*#__PURE__*/require("dfx/RateLimit");
 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 claimRepeatPolicy = /*#__PURE__*/Schedule.spaced("3 minutes").pipe( /*#__PURE__*/Schedule.whileInput(_ => _._tag === "None"), Schedule.passthrough);
@@ -31,17 +29,6 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
   const limiter = yield* _(_RateLimit.RateLimiter);
   const shard = yield* _(_Shard.Shard);
   const currentShards = yield* _(Ref.make(HashSet.empty()));
-  const takeConfig = totalCount => Effect.gen(function* (_) {
-    const currentCount = yield* _(Ref.make(0));
-    const claimId = sharderCount => (0, _Function.pipe)(store.claimId({
-      totalCount,
-      sharderCount
-    }), Effect.repeat(claimRepeatPolicy), Effect.map(_ => _.value));
-    return (0, _Function.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,
@@ -52,31 +39,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 = (0, _Function.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 => (0, _Function.pipe)(store.claimId({
+    totalCount,
+    sharderCount
+  }), Effect.repeat(claimRepeatPolicy), Effect.map(_ => _.value));
+  const takeConfig = (0, _Function.pipe)(Ref.getAndUpdate(currentCount, _ => _ + 1), Effect.flatMap(claimId), Effect.map(id => ({
+    id,
+    totalCount
+  })));
+  const spawner = (0, _Function.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)
   };
-});
-const Sharder = exports.Sharder = /*#__PURE__*/(0, _Context.Tag)();
-const SharedLive = exports.SharedLive = /*#__PURE__*/Layer.provide( /*#__PURE__*/Layer.effect(Sharder, make), /*#__PURE__*/Layer.merge(_RateLimit.RateLimiterLive, _Shard.ShardLive));
+}).pipe( /*#__PURE__*/Effect.annotateLogs({
+  package: "dfx",
+  module: "DiscordGateway/Sharder"
+}));
+const Sharder = exports.Sharder = /*#__PURE__*/(0, _Context.Tag)("dfx/DiscordGateway/Sharder");
+const SharderLive = exports.SharderLive = /*#__PURE__*/Layer.scoped(Sharder, make).pipe( /*#__PURE__*/Layer.provide(_DiscordREST.DiscordRESTLive), /*#__PURE__*/Layer.provide(_RateLimit.RateLimiterLive), /*#__PURE__*/Layer.provide(_Shard.ShardLive));
 //# sourceMappingURL=Sharder.js.map

package/DiscordGateway/Sharder.js.map

@@ -1 +1 @@
-{"version":3,"file":"Sharder.js","names":["Chunk","_interopRequireWildcard","require","_Context","Duration","_Function","HashSet","Deferred","Effect","Layer","Ref","Schedule","_DiscordConfig","_Shard","_ShardStore","_DiscordREST","_RateLimit","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","claimRepeatPolicy","spaced","pipe","whileInput","_","_tag","passthrough","make","gen","store","ShardStore","rest","DiscordREST","gateway","config","DiscordConfig","limiter","RateLimiter","shard","Shard","currentShards","empty","takeConfig","totalCount","currentCount","claimId","sharderCount","repeat","map","value","getAndUpdate","flatMap","id","getGatewayBot","json","catchAll","succeed","url","shards","session_start_limit","total","remaining","reset_after","max_concurrency","run","hub","sendQueue","deferred","take","shardCount","spawner","concurrency","tap","maybeWait","millis","identifyRateLimit","c","connect","acquireUseRelease","update","add","remove","catchAllCause","failCause","fork","forever","spawners","range","all","discard","await","Sharder","exports","Tag","SharedLive","provide","effect","merge","RateLimiterLive","ShardLive"],"sources":["../src/DiscordGateway/Sharder.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"Sharder.js","names":["_DiscordConfig","require","_Shard","_ShardStore","_DiscordREST","_RateLimit","_Context","Duration","_interopRequireWildcard","Effect","_Function","HashSet","Layer","Ref","Schedule","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","claimRepeatPolicy","spaced","pipe","whileInput","_","_tag","passthrough","make","gen","store","ShardStore","rest","DiscordREST","gateway","config","DiscordConfig","limiter","RateLimiter","shard","Shard","currentShards","empty","getGatewayBot","flatMap","json","catchAll","succeed","url","shards","session_start_limit","total","remaining","reset_after","max_concurrency","totalCount","shardCount","currentCount","claimId","sharderCount","repeat","map","value","takeConfig","getAndUpdate","id","spawner","concurrency","tap","maybeWait","millis","identifyRateLimit","c","connect","update","add","forever","replicateEffect","discard","scoped","catchAllCause","logError","ensuring","forkScoped","annotateLogs","package","module","Sharder","exports","Tag","SharderLive","provide","DiscordRESTLive","RateLimiterLive","ShardLive"],"sources":["../src/DiscordGateway/Sharder.ts"],"sourcesContent":[null],"mappings":"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"}

package/DiscordGateway/WS.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="ws" />
 import { Tag } from "effect/Context";
-import * as Duration from "effect/Duration";
+import type * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Ref from "effect/Ref";
-import { Log } from "dfx/Log";
 import WebSocket from "isomorphic-ws";
+import type { Predicate } from "effect/Predicate";
 export declare const Reconnect: unique symbol;
 export type Reconnect = typeof Reconnect;
 export type Message = string | Uint8Array | ArrayBuffer | Reconnect;
@@ -21,15 +21,19 @@ export declare class WebSocketCloseError {
     readonly _tag = "WebSocketCloseError";
     constructor(code: number, reason: string);
 }
-declare const make: Effect.Effect<Log, never, {
-    readonly connect: (url: Ref.Ref<string>, takeOutbound: Effect.Effect<never, never, Message>, onConnecting?: Effect.Effect<never, never, void>, openTimeout?: Duration.Duration) => Effect.Effect<never, never, {
-        readonly run: Effect.Effect<never, WebSocketError | WebSocketCloseError, void>;
+export interface WS {
+    readonly _: unique symbol;
+}
+export declare const WS: Tag<WS, {
+    readonly connect: ({ onConnecting, openTimeout, reconnectWhen, takeOutbound, urlRef, }: {
+        readonly urlRef: Ref.Ref<string>;
+        readonly takeOutbound: Effect.Effect<never, never, Message>;
+        readonly onConnecting?: Effect.Effect<never, never, void> | undefined;
+        readonly openTimeout?: Duration.DurationInput | undefined;
+        readonly reconnectWhen?: Predicate<WebSocketError | WebSocketCloseError> | undefined;
+    }) => Effect.Effect<import("effect/Scope").Scope, never, {
         readonly take: Effect.Effect<never, never, WebSocket.Data>;
     }>;
 }>;
-export interface WS extends Effect.Effect.Success<typeof make> {
-}
-export declare const WS: Tag<WS, WS>;
-export declare const WSLive: Layer.Layer<Log, never, WS>;
-export {};
+export declare const WSLive: Layer.Layer<never, never, WS>;
 //# sourceMappingURL=WS.d.ts.map

package/DiscordGateway/WS.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WS.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/WS.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAE3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,GAAG,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,SAAS,MAAM,eAAe,CAAA;AAErC,eAAO,MAAM,SAAS,eAAW,CAAA;AACjC,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAA;AACxC,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,CAAA;AAEnE,qBAAa,cAAc;IAGvB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO;IACzC,QAAQ,CAAC,KAAK,CAAC;IAHjB,QAAQ,CAAC,IAAI,oBAAmB;gBAErB,MAAM,EAAE,cAAc,GAAG,OAAO,EAChC,KAAK,CAAC,SAAS;CAE3B;AAED,qBAAa,mBAAmB;IAG5B,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM;IAHzB,QAAQ,CAAC,IAAI,yBAAwB;gBAE1B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM;CAE1B;AAsFD,QAAA,MAAM,IAAI;4BAID,OAAO,CAAC,MAAM,CAAC,gBACN,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC;;;;EA8BpD,CAAA;AAEF,MAAM,WAAW,EAAG,SAAQ,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC;CAAG;AACjE,eAAO,MAAM,EAAE,aAAY,CAAA;AAC3B,eAAO,MAAM,MAAM,6BAAyB,CAAA"}
+{"version":3,"file":"WS.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/WS.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAEhD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,GAAG,MAAM,YAAY,CAAA;AACjC,OAAO,SAAS,MAAM,eAAe,CAAA;AACrC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAGjD,eAAO,MAAM,SAAS,eAAW,CAAA;AACjC,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAA;AACxC,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,CAAA;AAEnE,qBAAa,cAAc;IAGvB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO;IACzC,QAAQ,CAAC,KAAK,CAAC;IAHjB,QAAQ,CAAC,IAAI,oBAAmB;gBAErB,MAAM,EAAE,cAAc,GAAG,OAAO,EAChC,KAAK,CAAC,SAAS;CAE3B;AAED,qBAAa,mBAAmB;IAG5B,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM;IAHzB,QAAQ,CAAC,IAAI,yBAAwB;gBAE1B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM;CAE1B;AAwJD,MAAM,WAAW,EAAE;IACjB,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AACD,eAAO,MAAM,EAAE;;yBAhEM,OAAO,CAAC,MAAM,CAAC;+BACT,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC;;;;;;;EA+DE,CAAA;AACjE,eAAO,MAAM,MAAM,+BAA4B,CAAA"}

package/DiscordGateway/WS.js

@@ -5,14 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.WebSocketError = exports.WebSocketCloseError = exports.WSLive = exports.WS = exports.Reconnect = void 0;
 var _Context = /*#__PURE__*/require("effect/Context");
-var Duration = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Duration"));
 var _Function = /*#__PURE__*/require("effect/Function");
 var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
 var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
 var Queue = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Queue"));
 var Ref = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Ref"));
-var _Log = /*#__PURE__*/require("dfx/Log");
 var _isomorphicWs = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("isomorphic-ws"));
+var Schedule = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Schedule"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -44,9 +43,9 @@ const socket = urlRef => (0, _Function.pipe)(Ref.get(urlRef), Effect.map(_ => ne
   ws.removeAllListeners?.();
   ws.close();
 })));
-const offer = (ws, queue, log) => Effect.async(resume => {
+const offer = (ws, queue) => Effect.async(resume => {
   ws.addEventListener("message", message => {
-    Effect.runFork(Effect.zipRight(log.debug("WS", "receive", message.data), Queue.offer(queue, message.data)));
+    Queue.unsafeOffer(queue, message.data);
   });
   ws.addEventListener("error", cause => {
     resume(Effect.fail(new WebSocketError("error", cause)));
@@ -68,7 +67,7 @@ const waitForOpen = (ws, timeout) => Effect.timeoutFail(Effect.suspend(() => {
   onTimeout: () => new WebSocketError("open-timeout"),
   duration: timeout
 });
-const send = (ws, take, log) => (0, _Function.pipe)(take, Effect.tap(data => log.debug("WS", "send", data)), Effect.tap(data => {
+const send = (ws, take) => (0, _Function.pipe)(take, Effect.tap(data => Effect.logTrace(data)), Effect.tap(data => {
   if (data === Reconnect) {
     return Effect.failSync(() => {
       ws.close(1012, "reconnecting");
@@ -78,24 +77,35 @@ const send = (ws, take, log) => (0, _Function.pipe)(take, Effect.tap(data => log
   return Effect.sync(() => {
     ws.send(data);
   });
-}), Effect.forever);
-const make = /*#__PURE__*/Effect.gen(function* (_) {
-  const log = yield* _(_Log.Log);
-  const connect = (url, takeOutbound, onConnecting = Effect.unit, openTimeout = Duration.seconds(3)) => Effect.gen(function* (_) {
-    const queue = yield* _(Queue.unbounded());
-    const run = (0, _Function.pipe)(onConnecting, Effect.zipRight(socket(url)), Effect.flatMap(ws => Effect.all([offer(ws, queue, log), Effect.zipRight(waitForOpen(ws, openTimeout), send(ws, takeOutbound, log))], {
+}), Effect.forever, Effect.annotateLogs("method", "send"));
+const wsImpl = {
+  connect: ({
+    onConnecting = Effect.unit,
+    openTimeout = "3 seconds",
+    reconnectWhen,
+    takeOutbound,
+    urlRef
+  }) => Effect.gen(function* (_) {
+    const scope = yield* _(Effect.scope);
+    const queue = yield* _(Effect.acquireRelease(Queue.unbounded(), Queue.shutdown));
+    const take = Effect.annotateLogs(Effect.tap(Queue.take(queue), data => Effect.logTrace(data)), {
+      package: "dfx",
+      module: "DiscordGateway/WS",
+      method: "take"
+    });
+    const run = (0, _Function.pipe)(onConnecting, Effect.zipRight(socket(urlRef)), Effect.flatMap(ws => Effect.all([offer(ws, queue), Effect.zipRight(waitForOpen(ws, openTimeout), send(ws, takeOutbound))], {
       concurrency: "unbounded",
       discard: true
-    })), Effect.scoped, Effect.retryWhile(isReconnect));
+    })), Effect.scoped, Effect.retryWhile(isReconnect), reconnectWhen ? Effect.retryWhile(reconnectWhen) : _Function.identity, Effect.catchAllCause(Effect.logError), Effect.repeat(Schedule.exponential("500 millis").pipe(Schedule.union(Schedule.spaced("30 seconds")))), Effect.forkIn(scope));
+    yield* _(run);
     return {
-      run,
-      take: Queue.take(queue)
+      take
     };
-  });
-  return {
-    connect
-  };
-});
-const WS = exports.WS = /*#__PURE__*/(0, _Context.Tag)();
-const WSLive = exports.WSLive = /*#__PURE__*/Layer.effect(WS, make);
+  }).pipe(Effect.annotateLogs({
+    package: "dfx",
+    module: "DiscordGateway/WS"
+  }))
+};
+const WS = exports.WS = /*#__PURE__*/(0, _Context.Tag)("dfx/DiscordGateway/WS");
+const WSLive = exports.WSLive = /*#__PURE__*/Layer.succeed(WS, wsImpl);
 //# sourceMappingURL=WS.js.map

package/DiscordGateway/WS.js.map

@@ -1 +1 @@
-{"version":3,"file":"WS.js","names":["_Context","require","Duration","_interopRequireWildcard","_Function","Effect","Layer","Queue","Ref","_Log","_isomorphicWs","_interopRequireDefault","obj","__esModule","default","_getRequireWildcardCache","e","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","Reconnect","exports","Symbol","WebSocketError","reason","error","_tag","constructor","WebSocketCloseError","code","isReconnect","socket","urlRef","pipe","map","_","WebSocket","acquireRelease","ws","sync","removeAllListeners","close","offer","queue","log","async","resume","addEventListener","message","runFork","zipRight","debug","data","cause","fail","waitForOpen","timeout","timeoutFail","suspend","readyState","OPEN","unit","once","onTimeout","duration","send","take","tap","failSync","forever","make","gen","Log","connect","url","takeOutbound","onConnecting","openTimeout","seconds","unbounded","run","flatMap","all","concurrency","discard","scoped","retryWhile","WS","Tag","WSLive","effect"],"sources":["../src/DiscordGateway/WS.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"WS.js","names":["_Context","require","_Function","Effect","_interopRequireWildcard","Layer","Queue","Ref","_isomorphicWs","_interopRequireDefault","Schedule","obj","__esModule","default","_getRequireWildcardCache","e","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","Reconnect","exports","Symbol","WebSocketError","reason","error","_tag","constructor","WebSocketCloseError","code","isReconnect","socket","urlRef","pipe","map","_","WebSocket","acquireRelease","ws","sync","removeAllListeners","close","offer","queue","async","resume","addEventListener","message","unsafeOffer","data","cause","fail","waitForOpen","timeout","timeoutFail","suspend","readyState","OPEN","unit","once","onTimeout","duration","send","take","tap","logTrace","failSync","forever","annotateLogs","wsImpl","connect","onConnecting","openTimeout","reconnectWhen","takeOutbound","gen","scope","unbounded","shutdown","package","module","method","run","zipRight","flatMap","all","concurrency","discard","scoped","retryWhile","identity","catchAllCause","logError","repeat","exponential","union","spaced","forkIn","WS","Tag","WSLive","succeed"],"sources":["../src/DiscordGateway/WS.ts"],"sourcesContent":[null],"mappings":"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"}

package/DiscordGateway.d.ts

@@ -1,12 +1,15 @@
-import { Tag } from "effect/Context";
-import type * as HashSet from "effect/HashSet";
-import * as Effect from "effect/Effect";
-import * as Layer from "effect/Layer";
-import * as Stream from "effect/Stream";
 import type { RunningShard } from "dfx/DiscordGateway/Shard";
 import { Sharder } from "dfx/DiscordGateway/Sharder";
 import type * as Discord from "dfx/types";
+import { Tag } from "effect/Context";
+import * as Effect from "effect/Effect";
+import type * as HashSet from "effect/HashSet";
+import * as Layer from "effect/Layer";
+import type * as Stream from "effect/Stream";
+export declare const TypeId: unique symbol;
+export type TypeId = typeof TypeId;
 export interface DiscordGateway {
+    readonly [TypeId]: TypeId;
     readonly dispatch: Stream.Stream<never, never, Discord.GatewayPayload<Discord.ReceiveEvent>>;
     readonly fromDispatch: <K extends keyof Discord.ReceiveEvents>(event: K) => Stream.Stream<never, never, Discord.ReceiveEvents[K]>;
     readonly handleDispatch: <K extends keyof Discord.ReceiveEvents, R, E, A>(event: K, handle: (event: Discord.ReceiveEvents[K]) => Effect.Effect<R, E, A>) => Effect.Effect<R, E, never>;
@@ -14,6 +17,6 @@ export interface DiscordGateway {
     readonly shards: Effect.Effect<never, never, HashSet.HashSet<RunningShard>>;
 }
 export declare const DiscordGateway: Tag<DiscordGateway, DiscordGateway>;
-export declare const make: Effect.Effect<Sharder | import("effect/Scope").Scope, never, DiscordGateway>;
-export declare const DiscordGatewayLive: Layer.Layer<import("./DiscordConfig").DiscordConfig | import("./Log").Log | import("./RateLimit").RateLimitStore | import("./DiscordREST").DiscordREST | import("./DiscordGateway/ShardStore").ShardStore | import("./DiscordGateway/DiscordWS").DiscordWSCodec, never, DiscordGateway>;
+export declare const make: Effect.Effect<import("dfx/DiscordGateway/Messaging").Messsaging | Sharder, never, DiscordGateway>;
+export declare const DiscordGatewayLive: Layer.Layer<import("./DiscordConfig").DiscordConfig | import("./RateLimit").RateLimitStore | import("./DiscordGateway/ShardStore").ShardStore | import("./DiscordGateway/DiscordWS").DiscordWSCodec, never, DiscordGateway>;
 //# sourceMappingURL=DiscordGateway.d.ts.map

package/DiscordGateway.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DiscordGateway.d.ts","sourceRoot":"","sources":["./src/DiscordGateway.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAC9C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAc,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;AA6BzC,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAC9B,KAAK,EACL,KAAK,EACL,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,CAC7C,CAAA;IACD,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,SAAS,MAAM,OAAO,CAAC,aAAa,EAC3D,KAAK,EAAE,CAAC,KACL,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IAC1D,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,SAAS,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EACtE,KAAK,EAAE,CAAC,EACR,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAChE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAA;IAC/B,QAAQ,CAAC,IAAI,EAAE,CACb,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,KAC/C,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAA;CAC5E;AACD,eAAO,MAAM,cAAc,qCAAwB,CAAA;AAEnD,eAAO,MAAM,IAAI,8EAuChB,CAAA;AAED,eAAO,MAAM,kBAAkB,yRAG9B,CAAA"}
+{"version":3,"file":"DiscordGateway.d.ts","sourceRoot":"","sources":["./src/DiscordGateway.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,OAAO,EAAe,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAE5C,eAAO,MAAM,MAAM,eAAmC,CAAA;AACtD,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAA;AAElC,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IAEzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAC9B,KAAK,EACL,KAAK,EACL,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,CAC7C,CAAA;IACD,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,SAAS,MAAM,OAAO,CAAC,aAAa,EAC3D,KAAK,EAAE,CAAC,KACL,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IAC1D,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,SAAS,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EACtE,KAAK,EAAE,CAAC,EACR,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAChE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAA;IAC/B,QAAQ,CAAC,IAAI,EAAE,CACb,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,KAC/C,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAA;CAC5E;AAED,eAAO,MAAM,cAAc,qCAA8B,CAAA;AAEzD,eAAO,MAAM,IAAI,mGAYf,CAAA;AAEF,eAAO,MAAM,kBAAkB,6NAG9B,CAAA"}

package/DiscordGateway.js

@@ -3,45 +3,27 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.make = exports.DiscordGatewayLive = exports.DiscordGateway = void 0;
+exports.make = exports.TypeId = exports.DiscordGatewayLive = exports.DiscordGateway = void 0;
+var _Messaging = /*#__PURE__*/require("dfx/DiscordGateway/Messaging");
+var _Sharder = /*#__PURE__*/require("dfx/DiscordGateway/Sharder");
 var _Context = /*#__PURE__*/require("effect/Context");
 var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
-var PubSub = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/PubSub"));
 var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
-var Queue = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Queue"));
-var Stream = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Stream"));
-var _Sharder = /*#__PURE__*/require("dfx/DiscordGateway/Sharder");
-var EffectUtils = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/utils/Effect"));
-var Schedule = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Schedule"));
 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 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;
-});
-const DiscordGateway = exports.DiscordGateway = /*#__PURE__*/(0, _Context.Tag)();
+const TypeId = exports.TypeId = /*#__PURE__*/Symbol.for("dfx/DiscordGateway");
+const DiscordGateway = exports.DiscordGateway = /*#__PURE__*/(0, _Context.Tag)(TypeId);
 const make = exports.make = /*#__PURE__*/Effect.gen(function* (_) {
   const sharder = yield* _(_Sharder.Sharder);
-  const hub = yield* _(PubSub.unbounded());
-  const sendQueue = yield* _(Queue.unbounded());
-  const send = payload => sendQueue.offer(payload);
-  const dispatch = Stream.fromPubSub(hub);
-  const fromDispatch = fromDispatchFactory(dispatch);
-  const handleDispatch = handleDispatchFactory(hub);
-  yield* _(sharder.run(hub, sendQueue), Effect.tapErrorCause(_ => Effect.logError("fatal error, restarting", _)), Effect.retry(Schedule.exponential("1 seconds").pipe(Schedule.union(Schedule.spaced("30 seconds")))), Effect.forkScoped);
+  const messaging = yield* _(_Messaging.Messaging);
   return DiscordGateway.of({
-    dispatch,
-    fromDispatch,
-    handleDispatch,
-    send,
+    [TypeId]: TypeId,
+    dispatch: messaging.dispatch,
+    fromDispatch: messaging.fromDispatch,
+    handleDispatch: messaging.handleDispatch,
+    send: messaging.send,
     shards: sharder.shards
   });
-}).pipe( /*#__PURE__*/Effect.annotateLogs({
-  package: "dfx",
-  service: "DiscordGateway"
-}));
-const DiscordGatewayLive = exports.DiscordGatewayLive = /*#__PURE__*/Layer.provide( /*#__PURE__*/Layer.scoped(DiscordGateway, make), _Sharder.SharedLive);
+});
+const DiscordGatewayLive = exports.DiscordGatewayLive = /*#__PURE__*/Layer.effect(DiscordGateway, make).pipe( /*#__PURE__*/Layer.provide(_Messaging.MesssagingLive), /*#__PURE__*/Layer.provide(_Sharder.SharderLive));
 //# sourceMappingURL=DiscordGateway.js.map

package/DiscordGateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"DiscordGateway.js","names":["_Context","require","Effect","_interopRequireWildcard","PubSub","Layer","Queue","Stream","_Sharder","EffectUtils","Schedule","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","fromDispatchFactory","source","event","map","filter","p","d","handleDispatchFactory","hub","handle","subscribeForEachPar","_","unit","DiscordGateway","exports","Tag","make","gen","sharder","Sharder","unbounded","sendQueue","send","payload","offer","dispatch","fromPubSub","fromDispatch","handleDispatch","run","tapErrorCause","logError","retry","exponential","pipe","union","spaced","forkScoped","of","shards","annotateLogs","package","service","DiscordGatewayLive","provide","scoped","SharedLive"],"sources":["./src/DiscordGateway.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,QAAA,gBAAAC,OAAA;AAEA,IAAAC,MAAA,gBAAAC,uBAAA,eAAAF,OAAA;AACA,IAAAG,MAAA,gBAAAD,uBAAA,eAAAF,OAAA;AACA,IAAAI,KAAA,gBAAAF,uBAAA,eAAAF,OAAA;AACA,IAAAK,KAAA,gBAAAH,uBAAA,eAAAF,OAAA;AACA,IAAAM,MAAA,gBAAAJ,uBAAA,eAAAF,OAAA;AAEA,IAAAO,QAAA,gBAAAP,OAAA;AAEA,IAAAQ,WAAA,gBAAAN,uBAAA,eAAAF,OAAA;AACA,IAAAS,QAAA,gBAAAP,uBAAA,eAAAF,OAAA;AAA2C,SAAAU,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,SAAAT,wBAAAS,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;AAE3C,MAAMY,mBAAmB,GAErBC,MAAyE,IAGzEC,KAAQ,IAER3B,MAAM,CAAC4B,GAAG,CACR5B,MAAM,CAAC6B,MAAM,CAACH,MAAM,EAAEI,CAAC,IAAIA,CAAC,CAACtB,CAAC,KAAKmB,KAAK,CAAC,EACzCG,CAAC,IAAIA,CAAC,CAACC,CAAS,CACjB;AAEL,MAAMC,qBAAqB,GACxBC,GAAgE,IACjE,CACEN,KAAQ,EACRO,MAAmE,KAEnEhC,WAAW,CAACiC,mBAAmB,CAACF,GAAG,EAAEG,CAAC,IAAG;EACvC,IAAIA,CAAC,CAAC5B,CAAC,KAAKmB,KAAK,EAAE;IACjB,OAAOO,MAAM,CAACE,CAAC,CAACL,CAAQ,CAAC;EAC3B;EACA,OAAOpC,MAAM,CAAC0C,IAAW;AAC3B,CAAC,CAAC;AAoBC,MAAMC,cAAc,GAAAC,OAAA,CAAAD,cAAA,gBAAG,IAAAE,YAAG,GAAkB;AAE5C,MAAMC,IAAI,GAAAF,OAAA,CAAAE,IAAA,gBAAG9C,MAAM,CAAC+C,GAAG,CAAC,WAAWN,CAAC;EACzC,MAAMO,OAAO,GAAG,OAAOP,CAAC,CAACQ,gBAAO,CAAC;EACjC,MAAMX,GAAG,GAAG,OAAOG,CAAC,CAClBvC,MAAM,CAACgD,SAAS,EAAgD,CACjE;EAED,MAAMC,SAAS,GAAG,OAAOV,CAAC,CACxBrC,KAAK,CAAC8C,SAAS,EAA6C,CAC7D;EACD,MAAME,IAAI,GAAIC,OAAkD,IAC9DF,SAAS,CAACG,KAAK,CAACD,OAAO,CAAC;EAE1B,MAAME,QAAQ,GAAGlD,MAAM,CAACmD,UAAU,CAAClB,GAAG,CAAC;EACvC,MAAMmB,YAAY,GAAG3B,mBAAmB,CAACyB,QAAQ,CAAC;EAClD,MAAMG,cAAc,GAAGrB,qBAAqB,CAACC,GAAG,CAAC;EAEjD,OAAOG,CAAC,CACNO,OAAO,CAACW,GAAG,CAACrB,GAAG,EAAEa,SAAS,CAAC,EAC3BnD,MAAM,CAAC4D,aAAa,CAACnB,CAAC,IAAIzC,MAAM,CAAC6D,QAAQ,CAAC,yBAAyB,EAAEpB,CAAC,CAAC,CAAC,EACxEzC,MAAM,CAAC8D,KAAK,CACVtD,QAAQ,CAACuD,WAAW,CAAC,WAAW,CAAC,CAACC,IAAI,CACpCxD,QAAQ,CAACyD,KAAK,CAACzD,QAAQ,CAAC0D,MAAM,CAAC,YAAY,CAAC,CAAC,CAC9C,CACF,EACDlE,MAAM,CAACmE,UAAU,CAClB;EAED,OAAOxB,cAAc,CAACyB,EAAE,CAAC;IACvBb,QAAQ;IACRE,YAAY;IACZC,cAAc;IACdN,IAAI;IACJiB,MAAM,EAAErB,OAAO,CAACqB;GACjB,CAAC;AACJ,CAAC,CAAC,CAACL,IAAI,eACLhE,MAAM,CAACsE,YAAY,CAAC;EAClBC,OAAO,EAAE,KAAK;EACdC,OAAO,EAAE;CACV,CAAC,CACH;AAEM,MAAMC,kBAAkB,GAAA7B,OAAA,CAAA6B,kBAAA,gBAAGtE,KAAK,CAACuE,OAAO,eAC7CvE,KAAK,CAACwE,MAAM,CAAChC,cAAc,EAAEG,IAAI,CAAC,EAClC8B,mBAAU,CACX"}
+{"version":3,"file":"DiscordGateway.js","names":["_Messaging","require","_Sharder","_Context","Effect","_interopRequireWildcard","Layer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","TypeId","exports","Symbol","for","DiscordGateway","Tag","make","gen","_","sharder","Sharder","messaging","Messaging","of","dispatch","fromDispatch","handleDispatch","send","shards","DiscordGatewayLive","effect","pipe","provide","MesssagingLive","SharderLive"],"sources":["./src/DiscordGateway.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,gBAAAC,OAAA;AAEA,IAAAC,QAAA,gBAAAD,OAAA;AAEA,IAAAE,QAAA,gBAAAF,OAAA;AACA,IAAAG,MAAA,gBAAAC,uBAAA,eAAAJ,OAAA;AAEA,IAAAK,KAAA,gBAAAD,uBAAA,eAAAJ,OAAA;AAAqC,SAAAM,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,SAAAH,wBAAAG,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;AAG9B,MAAMY,MAAM,GAAAC,OAAA,CAAAD,MAAA,gBAAGE,MAAM,CAACC,GAAG,CAAC,oBAAoB,CAAC;AAwB/C,MAAMC,cAAc,GAAAH,OAAA,CAAAG,cAAA,gBAAG,IAAAC,YAAG,EAAiBL,MAAM,CAAC;AAElD,MAAMM,IAAI,GAAAL,OAAA,CAAAK,IAAA,gBAAG9B,MAAM,CAAC+B,GAAG,CAAC,WAAWC,CAAC;EACzC,MAAMC,OAAO,GAAG,OAAOD,CAAC,CAACE,gBAAO,CAAC;EACjC,MAAMC,SAAS,GAAG,OAAOH,CAAC,CAACI,oBAAS,CAAC;EAErC,OAAOR,cAAc,CAACS,EAAE,CAAC;IACvB,CAACb,MAAM,GAAGA,MAAM;IAChBc,QAAQ,EAAEH,SAAS,CAACG,QAAQ;IAC5BC,YAAY,EAAEJ,SAAS,CAACI,YAAY;IACpCC,cAAc,EAAEL,SAAS,CAACK,cAAc;IACxCC,IAAI,EAAEN,SAAS,CAACM,IAAI;IACpBC,MAAM,EAAET,OAAO,CAACS;GACjB,CAAC;AACJ,CAAC,CAAC;AAEK,MAAMC,kBAAkB,GAAAlB,OAAA,CAAAkB,kBAAA,gBAAGzC,KAAK,CAAC0C,MAAM,CAAChB,cAAc,EAAEE,IAAI,CAAC,CAACe,IAAI,eACvE3C,KAAK,CAAC4C,OAAO,CAACC,yBAAc,CAAC,eAC7B7C,KAAK,CAAC4C,OAAO,CAACE,oBAAW,CAAC,CAC3B"}

package/DiscordREST.d.ts

@@ -4,7 +4,6 @@ import * as Layer from "effect/Layer";
 import * as Http from "@effect/platform/HttpClient";
 import { DiscordConfig } from "dfx/DiscordConfig";
 import type { ResponseWithData } from "dfx/DiscordREST/types";
-import { Log } from "dfx/Log";
 import { RateLimitStore } from "dfx/RateLimit";
 import * as Discord from "dfx/types";
 export declare class DiscordRESTError {
@@ -13,9 +12,12 @@ export declare class DiscordRESTError {
     readonly _tag = "DiscordRESTError";
     constructor(error: Http.error.HttpClientError, body?: unknown);
 }
-export interface DiscordREST extends Discord.Endpoints<Partial<Http.request.Options.NoUrl>> {
+export interface DiscordREST {
+    readonly _: unique symbol;
+}
+export interface DiscordRESTService extends Discord.Endpoints<Partial<Http.request.Options.NoUrl>> {
     readonly executor: <A = unknown>(request: Http.request.ClientRequest) => Effect.Effect<never, DiscordRESTError, ResponseWithData<A>>;
 }
-export declare const DiscordREST: Tag<DiscordREST, DiscordREST>;
-export declare const DiscordRESTLive: Layer.Layer<DiscordConfig | Log | RateLimitStore, never, DiscordREST>;
+export declare const DiscordREST: Tag<DiscordREST, DiscordRESTService>;
+export declare const DiscordRESTLive: Layer.Layer<DiscordConfig | RateLimitStore, never, DiscordREST>;
 //# sourceMappingURL=DiscordREST.d.ts.map

package/DiscordREST.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DiscordREST.d.ts","sourceRoot":"","sources":["./src/DiscordREST.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAOpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,IAAI,MAAM,6BAA6B,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,EAAE,gBAAgB,EAAgB,MAAM,uBAAuB,CAAA;AAM3E,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAgC,cAAc,EAAE,MAAM,eAAe,CAAA;AAC5E,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AAGpC,qBAAa,gBAAgB;IAGzB,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe;IAC1C,QAAQ,CAAC,IAAI,CAAC;IAHhB,QAAQ,CAAC,IAAI,sBAAqB;gBAEvB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,EACjC,IAAI,CAAC,SAAS;CAE1B;AA2ND,MAAM,WAAW,WACf,SAAQ,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC9D,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,OAAO,EAC7B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,KAChC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;CACjE;AAED,eAAO,MAAM,WAAW,+BAAqB,CAAA;AAC7C,eAAO,MAAM,eAAe,uEAG3B,CAAA"}
+{"version":3,"file":"DiscordREST.d.ts","sourceRoot":"","sources":["./src/DiscordREST.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAOpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,IAAI,MAAM,6BAA6B,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,EAAE,gBAAgB,EAAgB,MAAM,uBAAuB,CAAA;AAM3E,OAAO,EAAgC,cAAc,EAAE,MAAM,eAAe,CAAA;AAC5E,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AAGpC,qBAAa,gBAAgB;IAGzB,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe;IAC1C,QAAQ,CAAC,IAAI,CAAC;IAHhB,QAAQ,CAAC,IAAI,sBAAqB;gBAEvB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,EACjC,IAAI,CAAC,SAAS;CAE1B;AAmOD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AAED,MAAM,WAAW,kBACf,SAAQ,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC9D,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,OAAO,EAC7B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,KAChC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;CACjE;AAED,eAAO,MAAM,WAAW,sCAEvB,CAAA;AACD,eAAO,MAAM,eAAe,iEAG3B,CAAA"}

package/DiscordREST.js

@@ -17,7 +17,6 @@ var Ref = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Ref
 var Http = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/platform/HttpClient"));
 var _DiscordConfig = /*#__PURE__*/require("dfx/DiscordConfig");
 var _utils = /*#__PURE__*/require("dfx/DiscordREST/utils");
-var _Log = /*#__PURE__*/require("dfx/Log");
 var _RateLimit = /*#__PURE__*/require("dfx/RateLimit");
 var Discord = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/types"));
 var _version = /*#__PURE__*/require("dfx/version");
@@ -39,7 +38,6 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
     token
   } = yield* _(_DiscordConfig.DiscordConfig);
   const http = yield* _(Http.client.Client);
-  const log = yield* _(_Log.Log);
   const store = yield* _(_RateLimit.RateLimitStore);
   const {
     maybeWait
@@ -48,7 +46,7 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
   // Invalid route handling (40x)
   const badRoutesRef = yield* _(Ref.make(HashSet.empty()));
   const tenMinutes = Duration.toMillis(Duration.minutes(10));
-  const addBadRoute = route => log.info("DiscordREST", "addBadRoute", route).pipe(Effect.zipRight(Ref.update(badRoutesRef, HashSet.add(route))), Effect.zipRight(store.incrementCounter("dfx.rest.invalid", tenMinutes, 10000)));
+  const addBadRoute = route => Effect.logDebug("bad route").pipe(Effect.zipRight(Ref.update(badRoutesRef, HashSet.add(route))), Effect.zipRight(store.incrementCounter("dfx.rest.invalid", tenMinutes, 10000)), Effect.annotateLogs("route", route));
   const isBadRoute = route => Effect.map(Ref.get(badRoutesRef), HashSet.has(route));
   const removeBadRoute = route => Ref.update(badRoutesRef, HashSet.remove(route));
   const invalidRateLimit = route => isBadRoute(route).pipe(Effect.tap(invalid => invalid ? maybeWait("dfx.rest.invalid", Duration.minutes(10), 10000) : Effect.unit), Effect.asUnit);
@@ -94,14 +92,17 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
     const response = e.error.response;
     switch (response.status) {
       case 403:
-        return Effect.zipRight(Effect.all([log.info("DiscordREST", "403", request.url), addBadRoute((0, _utils.routeFromConfig)(request.url, request.method)), updateBuckets(request, response)], {
+        return Effect.zipRight(Effect.all([Effect.annotateLogs(Effect.logDebug("403"), "url", request.url), addBadRoute((0, _utils.routeFromConfig)(request.url, request.method)), updateBuckets(request, response)], {
           concurrency: "unbounded",
           discard: true
         }), Effect.fail(e));
       case 429:
-        return log.info("DiscordREST", "429", request.url).pipe(Effect.zipRight(addBadRoute((0, _utils.routeFromConfig)(request.url, request.method))), Effect.zipRight(updateBuckets(request, response)), Effect.zipRight(Effect.sleep(Option.getOrElse((0, _utils.retryAfter)(response.headers), () => Duration.seconds(5)))), Effect.zipRight(executor(request)));
+        return Effect.annotateLogs(Effect.logDebug("429"), "url", request.url).pipe(Effect.zipRight(addBadRoute((0, _utils.routeFromConfig)(request.url, request.method))), Effect.zipRight(updateBuckets(request, response)), Effect.zipRight(Effect.sleep(Option.getOrElse((0, _utils.retryAfter)(response.headers), () => Duration.seconds(5)))), Effect.zipRight(executor(request)));
     }
     return Effect.fail(e);
+  }), Effect.annotateLogs({
+    package: "dfx",
+    module: "DiscordREST"
   }));
   const routes = Discord.createRoutes(({
     method,
@@ -127,6 +128,6 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
     executor
   };
 });
-const DiscordREST = exports.DiscordREST = /*#__PURE__*/(0, _Context.Tag)();
+const DiscordREST = exports.DiscordREST = /*#__PURE__*/(0, _Context.Tag)("dfx/DiscordREST");
 const DiscordRESTLive = exports.DiscordRESTLive = /*#__PURE__*/Layer.effect(DiscordREST, make).pipe( /*#__PURE__*/Layer.provide(_RateLimit.RateLimiterLive), /*#__PURE__*/Layer.provide(Http.client.layer));
 //# sourceMappingURL=DiscordREST.js.map