dfx 0.127.0 → 1.0.1

package/mjs/DiscordGateway/Shard.mjs

@@ -1,20 +1,23 @@
-import { DiscordConfig } from "dfx/DiscordConfig";
-import { DiscordWS, DiscordWSLive, Reconnect } from "dfx/DiscordGateway/DiscordWS";
-import { Messaging, MesssagingLive } from "dfx/DiscordGateway/Messaging";
-import { ShardStateStore } from "dfx/DiscordGateway/Shard/StateStore";
-import * as Heartbeats from "dfx/DiscordGateway/Shard/heartbeats";
-import * as Identify from "dfx/DiscordGateway/Shard/identify";
-import { RateLimiter, RateLimiterLive } from "dfx/RateLimit";
-import * as Discord from "dfx/types";
-import { GenericTag } from "effect/Context";
+import { DiscordConfig } from "../DiscordConfig.js";
+import { DiscordWS, DiscordWSLive, Reconnect } from "./DiscordWS.js";
+import { Messaging, MesssagingLive } from "./Messaging.js";
+import { ShardStateStore } from "./Shard/StateStore.js";
+import * as Heartbeats from "./Shard/heartbeats.js";
+import * as Identify from "./Shard/identify.js";
+import { RateLimiter, RateLimiterLive } from "../RateLimit.js";
+import * as Discord from "../types.js";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
-import * as Mailbox from "effect/Mailbox";
 import * as Redacted from "effect/Redacted";
 import * as FiberHandle from "effect/FiberHandle";
 import { constant, constTrue, constVoid } from "effect/Function";
+import * as Queue from "effect/Queue";
+import * as ServiceMap from "effect/ServiceMap";
+import * as PubSub from "effect/PubSub";
+import * as LogLevel from "effect/LogLevel";
+import { MinimumLogLevel } from "effect/References";
 export const make = /*#__PURE__*/Effect.gen(function* () {
   const {
     gateway,
@@ -28,6 +31,7 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
   } = yield* Messaging;
   const shardState = yield* ShardStateStore;
   const connect = Effect.fnUntraced(function* (shard) {
+    const traceEnabled = LogLevel.isLessThanOrEqualTo(yield* MinimumLogLevel, "Trace");
     const reconnectHandle = yield* FiberHandle.make();
     let phase = 0 /* Phase.Connecting */;
     const stateStore = shardState.forShard(shard);
@@ -38,20 +42,21 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
     }));
     const setPhase = p => Effect.suspend(() => {
       phase = p;
+      if (!traceEnabled) return Effect.void;
       return Effect.annotateLogs(Effect.logTrace("phase transition"), "phase", p);
     });
     const heartbeatSend = p => Effect.suspend(() => {
       if (phase === 0 /* Phase.Connecting */) return Effect.void;
       return write(p);
     });
-    const resume = Effect.zipRight(FiberHandle.clear(reconnectHandle), setPhase(2 /* Phase.Connected */));
+    const resume = Effect.andThen(FiberHandle.clear(reconnectHandle), setPhase(2 /* Phase.Connected */));
     const onConnecting = setPhase(0 /* Phase.Connecting */);
     const socket = yield* dws.connect({
       onConnecting
     });
-    const write = p => Effect.zipRight(limiter.maybeWait("dfx.shard.send", Duration.minutes(1), 120), socket.write(p));
-    const hellos = yield* Effect.acquireRelease(Mailbox.make(), _ => _.shutdown);
-    const acks = yield* Effect.acquireRelease(Mailbox.make(), _ => _.shutdown);
+    const write = p => Effect.andThen(limiter.maybeWait("dfx.shard.send", Duration.minutes(1), 120), socket.write(p));
+    const hellos = yield* Effect.acquireRelease(Queue.make(), Queue.shutdown);
+    const acks = yield* Effect.acquireRelease(Queue.make(), Queue.shutdown);
     // heartbeats
     yield* Heartbeats.send(hellos, acks, stateStore.get, heartbeatSend).pipe(Effect.forkScoped, Effect.interruptible);
     // identify
@@ -81,13 +86,13 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
           {
             yield* write(yield* identify);
             yield* setPhase(1 /* Phase.Handshake */);
-            hellos.unsafeOffer(p.d);
+            Queue.offerUnsafe(hellos, p.d);
             yield* FiberHandle.run(reconnectHandle, delayedReconnect);
             return;
           }
         case Discord.GatewayOpcodes.HeartbeatAck:
           {
-            acks.unsafeOffer(void 0);
+            Queue.offerUnsafe(acks, void 0);
             return;
           }
         case Discord.GatewayOpcodes.InvalidSession:
@@ -104,7 +109,7 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
             if (p.t === "READY" || p.t === "RESUMED") {
               yield* resume;
             }
-            hub.unsafeOffer(p);
+            PubSub.publishUnsafe(hub, p);
             return;
           }
         case Discord.GatewayOpcodes.Reconnect:
@@ -116,14 +121,14 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
     }
     yield* Effect.whileLoop({
       while: constTrue,
-      body: constant(Effect.flatMap(sendMailbox.take, write)),
+      body: constant(Effect.flatMap(Queue.take(sendMailbox), write)),
       step: constVoid
-    }).pipe(Effect.forkScoped, Effect.interruptible);
+    }).pipe(Effect.forkScoped);
     yield* Effect.gen(function* () {
       while (true) {
         yield* onPayload(yield* socket.take);
       }
-    }).pipe(Effect.forkScoped, Effect.interruptible);
+    }).pipe(Effect.forkScoped);
     return {
       id: shard,
       write
@@ -137,6 +142,6 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
     connect
   };
 });
-export const Shard = /*#__PURE__*/GenericTag("dfx/DiscordGateway/Shard");
+export class Shard extends /*#__PURE__*/ServiceMap.Service()("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":["DiscordConfig","DiscordWS","DiscordWSLive","Reconnect","Messaging","MesssagingLive","ShardStateStore","Heartbeats","Identify","RateLimiter","RateLimiterLive","Discord","GenericTag","Duration","Effect","Layer","Option","Mailbox","Redacted","FiberHandle","constant","constTrue","constVoid","make","gen","gateway","token","limiter","dws","hub","sendMailbox","shardState","connect","fnUntraced","shard","reconnectHandle","phase","stateStore","forShard","resumeState","getOrElse","get","resumeUrl","sessionId","sequence","setPhase","p","suspend","annotateLogs","logTrace","heartbeatSend","void","write","resume","zipRight","clear","onConnecting","socket","maybeWait","minutes","hellos","acquireRelease","_","shutdown","acks","send","pipe","forkScoped","interruptible","identify","identifyOrResume","value","intents","presence","delayedReconnect","delay","onPayload","s","op","GatewayOpcodes","Dispatch","t","payload","d","session_id","resume_gateway_url","set","setUrl","Hello","unsafeOffer","run","HeartbeatAck","InvalidSession","whileLoop","while","body","flatMap","take","step","id","effect","package","module","Shard","ShardLive","provide"],"sources":["../../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Shard.mjs","names":["DiscordConfig","DiscordWS","DiscordWSLive","Reconnect","Messaging","MesssagingLive","ShardStateStore","Heartbeats","Identify","RateLimiter","RateLimiterLive","Discord","Duration","Effect","Layer","Option","Redacted","FiberHandle","constant","constTrue","constVoid","Queue","ServiceMap","PubSub","LogLevel","MinimumLogLevel","make","gen","gateway","token","limiter","dws","hub","sendMailbox","shardState","connect","fnUntraced","shard","traceEnabled","isLessThanOrEqualTo","reconnectHandle","phase","stateStore","forShard","resumeState","getOrElse","get","resumeUrl","sessionId","sequence","setPhase","p","suspend","void","annotateLogs","logTrace","heartbeatSend","write","resume","andThen","clear","onConnecting","socket","maybeWait","minutes","hellos","acquireRelease","shutdown","acks","send","pipe","forkScoped","interruptible","identify","identifyOrResume","value","intents","presence","delayedReconnect","delay","onPayload","s","op","GatewayOpcodes","Dispatch","t","payload","d","session_id","resume_gateway_url","set","setUrl","Hello","offerUnsafe","run","HeartbeatAck","InvalidSession","publishUnsafe","whileLoop","while","body","flatMap","take","step","id","effect","package","module","Shard","Service","ShardLive","provide"],"sources":["../../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,aAAa,QAAQ,qBAAqB;AAEnD,SAASC,SAAS,EAAEC,aAAa,EAAEC,SAAS,QAAQ,gBAAgB;AACpE,SAASC,SAAS,EAAEC,cAAc,QAAQ,gBAAgB;AAE1D,SAASC,eAAe,QAAQ,uBAAuB;AACvD,OAAO,KAAKC,UAAU,MAAM,uBAAuB;AACnD,OAAO,KAAKC,QAAQ,MAAM,qBAAqB;AAC/C,SAASC,WAAW,EAAEC,eAAe,QAAQ,iBAAiB;AAC9D,OAAO,KAAKC,OAAO,MAAM,aAAa;AACtC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAE3C,OAAO,KAAKC,WAAW,MAAM,oBAAoB;AACjD,SAASC,QAAQ,EAAEC,SAAS,EAAEC,SAAS,QAAQ,iBAAiB;AAChE,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,UAAU,MAAM,mBAAmB;AAC/C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,SAASC,eAAe,QAAQ,mBAAmB;AAQnD,OAAO,MAAMC,IAAI,gBAAGb,MAAM,CAACc,GAAG,CAAC,aAAS;EACtC,MAAM;IAAEC,OAAO;IAAEC;EAAK,CAAE,GAAG,OAAO7B,aAAa;EAC/C,MAAM8B,OAAO,GAAG,OAAOrB,WAAW;EAClC,MAAMsB,GAAG,GAAG,OAAO9B,SAAS;EAC5B,MAAM;IAAE+B,GAAG;IAAEC;EAAW,CAAE,GAAG,OAAO7B,SAAS;EAC7C,MAAM8B,UAAU,GAAG,OAAO5B,eAAe;EAEzC,MAAM6B,OAAO,GAAGtB,MAAM,CAACuB,UAAU,CAC/B,WAAWC,KAAkC;IAC3C,MAAMC,YAAY,GAAGd,QAAQ,CAACe,mBAAmB,CAC/C,OAAOd,eAAe,EACtB,OAAO,CACR;IACD,MAAMe,eAAe,GAAG,OAAOvB,WAAW,CAACS,IAAI,EAAE;IACjD,IAAIe,KAAK;IACT,MAAMC,UAAU,GAAGR,UAAU,CAACS,QAAQ,CAACN,KAAK,CAAC;IAC7C,MAAMO,WAAW,GAA8B7B,MAAM,CAAC8B,SAAS,CAC7D,OAAOH,UAAU,CAACI,GAAG,EACrB,OAAO;MACLC,SAAS,EAAE,EAAE;MACbC,SAAS,EAAE,EAAE;MACbC,QAAQ,EAAE;KACX,CAAC,CACH;IACD,MAAMC,QAAQ,GAAIC,CAAQ,IACxBtC,MAAM,CAACuC,OAAO,CAAC,MAAK;MAClBX,KAAK,GAAGU,CAAC;MACT,IAAI,CAACb,YAAY,EAAE,OAAOzB,MAAM,CAACwC,IAAI;MACrC,OAAOxC,MAAM,CAACyC,YAAY,CACxBzC,MAAM,CAAC0C,QAAQ,CAAC,kBAAkB,CAAC,EACnC,OAAO,EACPJ,CAAC,CACF;IACH,CAAC,CAAC;IAEJ,MAAMK,aAAa,GAAIL,CAAc,IACnCtC,MAAM,CAACuC,OAAO,CAAC,MAAK;MAClB,IAAIX,KAAK,+BAAuB,OAAO5B,MAAM,CAACwC,IAAI;MAClD,OAAOI,KAAK,CAACN,CAAC,CAAC;IACjB,CAAC,CAAC;IAEJ,MAAMO,MAAM,GAAG7C,MAAM,CAAC8C,OAAO,CAC3B1C,WAAW,CAAC2C,KAAK,CAACpB,eAAe,CAAC,EAClCU,QAAQ,yBAAiB,CAC1B;IAED,MAAMW,YAAY,GAAGX,QAAQ,0BAAkB;IAE/C,MAAMY,MAAM,GAAG,OAAO/B,GAAG,CAACI,OAAO,CAAC;MAAE0B;IAAY,CAAE,CAAC;IACnD,MAAMJ,KAAK,GAAIN,CAAc,IAC3BtC,MAAM,CAAC8C,OAAO,CACZ7B,OAAO,CAACiC,SAAS,CAAC,gBAAgB,EAAEnD,QAAQ,CAACoD,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7DF,MAAM,CAACL,KAAK,CAACN,CAAC,CAAC,CAChB;IAEH,MAAMc,MAAM,GAAG,OAAOpD,MAAM,CAACqD,cAAc,CACzC7C,KAAK,CAACK,IAAI,EAA4B,EACtCL,KAAK,CAAC8C,QAAQ,CACf;IACD,MAAMC,IAAI,GAAG,OAAOvD,MAAM,CAACqD,cAAc,CACvC7C,KAAK,CAACK,IAAI,EAAQ,EAClBL,KAAK,CAAC8C,QAAQ,CACf;IAED;IACA,OAAO5D,UAAU,CAAC8D,IAAI,CAACJ,MAAM,EAAEG,IAAI,EAAE1B,UAAU,CAACI,GAAG,EAAEU,aAAa,CAAC,CAACc,IAAI,CACtEzD,MAAM,CAAC0D,UAAU,EACjB1D,MAAM,CAAC2D,aAAa,CACrB;IAED;IACA,MAAMC,QAAQ,GAAGjE,QAAQ,CAACkE,gBAAgB,CACxC;MACE7C,KAAK,EAAEb,QAAQ,CAAC2D,KAAK,CAAC9C,KAAK,CAAC;MAC5BQ,KAAK;MACLuC,OAAO,EAAEhD,OAAO,CAACgD,OAAO;MACxBC,QAAQ,EAAEjD,OAAO,CAACiD;KACnB,EACDnC,UAAU,CAACI,GAAG,CACf;IAED;IACA,MAAMgC,gBAAgB,GAAGjE,MAAM,CAACkE,KAAK,CAACjB,MAAM,CAACL,KAAK,CAACtD,SAAS,CAAC,EAAE,MAAM,CAAC;IAEtE,UAAU6E,SAASA,CAAC7B,CAAgC;MAClD,IAAI,OAAOA,CAAC,CAAC8B,CAAC,KAAK,QAAQ,EAAE;QAC3BrC,WAAW,CAACK,QAAQ,GAAGE,CAAC,CAAC8B,CAAC;MAC5B;MACA,IAAI9B,CAAC,CAAC+B,EAAE,KAAKvE,OAAO,CAACwE,cAAc,CAACC,QAAQ,IAAIjC,CAAC,CAACkC,CAAC,KAAK,OAAO,EAAE;QAC/D,MAAMC,OAAO,GAAGnC,CAAC,CAACoC,CAAC;QACnB3C,WAAW,CAACI,SAAS,GAAGsC,OAAO,CAACE,UAAU;QAC1C5C,WAAW,CAACG,SAAS,GAAGuC,OAAO,CAACG,kBAAkB;QAClD,OAAO/C,UAAU,CAACgD,GAAG,CAAC9C,WAAW,CAAC;QAClC,OAAOkB,MAAM,CAAC6B,MAAM,CAACL,OAAO,CAACG,kBAAkB,CAAC;MAClD,CAAC,MAAM,IACL7C,WAAW,CAACG,SAAS,KAAK,EAAE,IAC5BH,WAAW,CAACI,SAAS,KAAK,EAAE,EAC5B;QACA,OAAON,UAAU,CAACgD,GAAG,CAAC9C,WAAW,CAAC;MACpC;MAEA,QAAQO,CAAC,CAAC+B,EAAE;QACV,KAAKvE,OAAO,CAACwE,cAAc,CAACS,KAAK;UAAE;YACjC,OAAOnC,KAAK,CAAC,OAAOgB,QAAQ,CAAC;YAC7B,OAAOvB,QAAQ,yBAAiB;YAChC7B,KAAK,CAACwE,WAAW,CAAC5B,MAAM,EAAEd,CAAC,CAACoC,CAAC,CAAC;YAC9B,OAAOtE,WAAW,CAAC6E,GAAG,CAACtD,eAAe,EAAEsC,gBAAgB,CAAC;YACzD;UACF;QACA,KAAKnE,OAAO,CAACwE,cAAc,CAACY,YAAY;UAAE;YACxC1E,KAAK,CAACwE,WAAW,CAACzB,IAAI,EAAE,KAAK,CAAC,CAAC;YAC/B;UACF;QACA,KAAKzD,OAAO,CAACwE,cAAc,CAACa,cAAc;UAAE;YAC1C,IAAI,CAAC7C,CAAC,CAACoC,CAAC,EAAE;cACR3C,WAAW,CAACI,SAAS,GAAG,EAAE;cAC1B,OAAON,UAAU,CAACkB,KAAK;YACzB;YACA,OAAOE,MAAM,CAACL,KAAK,CAACtD,SAAS,CAAC;YAC9B;UACF;QACA,KAAKQ,OAAO,CAACwE,cAAc,CAACC,QAAQ;UAAE;YACpC,IAAIjC,CAAC,CAACkC,CAAC,KAAK,OAAO,IAAIlC,CAAC,CAACkC,CAAC,KAAK,SAAS,EAAE;cACxC,OAAO3B,MAAM;YACf;YACAnC,MAAM,CAAC0E,aAAa,CAACjE,GAAG,EAAEmB,CAAC,CAAC;YAC5B;UACF;QACA,KAAKxC,OAAO,CAACwE,cAAc,CAAChF,SAAS;UAAE;YACrC,OAAO2D,MAAM,CAACL,KAAK,CAACtD,SAAS,CAAC;YAC9B;UACF;MACF;IACF;IAEA,OAAOU,MAAM,CAACqF,SAAS,CAAC;MACtBC,KAAK,EAAEhF,SAAS;MAChBiF,IAAI,EAAElF,QAAQ,CAACL,MAAM,CAACwF,OAAO,CAAChF,KAAK,CAACiF,IAAI,CAACrE,WAAW,CAAC,EAAEwB,KAAK,CAAC,CAAC;MAC9D8C,IAAI,EAAEnF;KACP,CAAC,CAACkD,IAAI,CAACzD,MAAM,CAAC0D,UAAU,CAAC;IAE1B,OAAO1D,MAAM,CAACc,GAAG,CAAC,aAAS;MACzB,OAAO,IAAI,EAAE;QACX,OAAOqD,SAAS,CAAC,OAAOlB,MAAM,CAACwC,IAAI,CAAC;MACtC;IACF,CAAC,CAAC,CAAChC,IAAI,CAACzD,MAAM,CAAC0D,UAAU,CAAC;IAE1B,OAAO;MAAEiC,EAAE,EAAEnE,KAAK;MAAEoB;IAAK,CAAW;EACtC,CAAC,EACD,CAACgD,MAAM,EAAEpE,KAAK,KACZxB,MAAM,CAACyC,YAAY,CAACmD,MAAM,EAAE;IAC1BC,OAAO,EAAE,KAAK;IACdC,MAAM,EAAE,sBAAsB;IAC9BtE;GACD,CAAC,CACL;EAED,OAAO;IAAEF;EAAO,CAAW;AAC7B,CAAC,CAAC;AAIF,OAAM,MAAOyE,KAAM,sBAAQtF,UAAU,CAACuF,OAAO,EAAuB,CAClE,0BAA0B,CAC3B;AACD,OAAO,MAAMC,SAAS,gBAAGhG,KAAK,CAAC2F,MAAM,CAACG,KAAK,EAAElF,IAAI,CAAC,CAAC4C,IAAI,cACrDxD,KAAK,CAACiG,OAAO,CAAC7G,aAAa,CAAC,eAC5BY,KAAK,CAACiG,OAAO,CAAC1G,cAAc,CAAC,eAC7BS,KAAK,CAACiG,OAAO,CAACrG,eAAe,CAAC,CAC/B","ignoreList":[]}

package/mjs/DiscordGateway/ShardStore.mjs

@@ -1,8 +1,8 @@
-import { GenericTag } 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__*/GenericTag("dfx/DiscordGateway/ShardStore");
+import * as ServiceMap from "effect/ServiceMap";
+export class ShardStore extends /*#__PURE__*/ServiceMap.Service()("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":["GenericTag","Option","Effect","Layer","ShardStore","memoryStore","currentId","claimId","totalCount","sync","none","id","some","allClaimed","MemoryShardStoreLive"],"sources":["../../src/DiscordGateway/ShardStore.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,UAAU,QAAQ,gBAAgB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAerC,OAAO,MAAMC,UAAU,gBAAGJ,UAAU,CAClC,+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","ignoreList":[]}
+{"version":3,"file":"ShardStore.mjs","names":["Option","Effect","Layer","ServiceMap","ShardStore","Service","memoryStore","currentId","claimId","totalCount","sync","none","id","some","allClaimed","MemoryShardStoreLive"],"sources":["../../src/DiscordGateway/ShardStore.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,UAAU,MAAM,mBAAmB;AAa/C,OAAM,MAAOC,UAAW,sBAAQD,UAAU,CAACE,OAAO,EAG/C,CAAC,+BAA+B,CAAC;AAEpC;AACA,MAAMC,WAAW,GAAGA,CAAA,KAAwB;EAC1C,IAAIC,SAAS,GAAG,CAAC;EAEjB,OAAO;IACLC,OAAO,EAAEA,CAAC;MAAEC;IAAU,CAAE,KACtBR,MAAM,CAACS,IAAI,CAAC,MAAK;MACf,IAAIH,SAAS,IAAIE,UAAU,EAAE;QAC3B,OAAOT,MAAM,CAACW,IAAI,EAAE;MACtB;MAEA,MAAMC,EAAE,GAAGL,SAAS;MACpBA,SAAS,EAAE;MACX,OAAOP,MAAM,CAACa,IAAI,CAACD,EAAE,CAAC;IACxB,CAAC,CAAC;IAEJE,UAAU,EAAEL,UAAU,IAAIR,MAAM,CAACS,IAAI,CAAC,MAAMH,SAAS,IAAIE,UAAU;GACpE;AACH,CAAC;AAED,OAAO,MAAMM,oBAAoB,gBAAGb,KAAK,CAACQ,IAAI,CAACN,UAAU,EAAEE,WAAW,CAAC","ignoreList":[]}

package/mjs/DiscordGateway/Sharder.mjs

@@ -1,26 +1,26 @@
-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 { GenericTag } from "effect/Context";
+import { DiscordConfig } from "../DiscordConfig.js";
+import { Shard, ShardLive } from "./Shard.js";
+import { ShardStore } from "./ShardStore.js";
+import { DiscordREST, DiscordRESTLive } from "../DiscordREST.js";
+import { RateLimiter, RateLimiterLive } from "../RateLimit.js";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import { pipe } from "effect/Function";
 import * as Layer from "effect/Layer";
 import * as Ref from "effect/Ref";
 import * as Schedule from "effect/Schedule";
-const claimRepeatPolicy = /*#__PURE__*/Schedule.spaced("3 minutes").pipe(/*#__PURE__*/Schedule.whileInput(_ => _._tag === "None"), Schedule.passthrough);
+import * as ServiceMap from "effect/ServiceMap";
+const claimRepeatPolicy = /*#__PURE__*/Schedule.identity().pipe(/*#__PURE__*/Schedule.either(/*#__PURE__*/Schedule.spaced("3 minutes")), /*#__PURE__*/Schedule.while(_ => Effect.succeed(_.input._tag === "None")), Schedule.passthrough);
 const make = /*#__PURE__*/Effect.gen(function* () {
   const store = yield* ShardStore;
   const rest = yield* DiscordREST;
   const {
-    gateway: config
+    gateway: gatewayConfig
   } = yield* DiscordConfig;
   const limiter = yield* RateLimiter;
   const shard = yield* Shard;
   const currentShards = new Set();
-  const gateway = yield* rest.getBotGateway().pipe(Effect.catchAll(() => Effect.succeed({
+  const gateway = yield* rest.getBotGateway().pipe(Effect.catch(() => Effect.succeed({
     url: "wss://gateway.discord.gg/",
     shards: 1,
     session_start_limit: {
@@ -30,7 +30,7 @@ const make = /*#__PURE__*/Effect.gen(function* () {
       max_concurrency: 1
     }
   })));
-  const totalCount = config.shardCount ?? gateway.shards;
+  const totalCount = gatewayConfig.shardCount ?? gateway.shards;
   const currentCount = yield* Ref.make(0);
   const claimId = sharderCount => pipe(store.claimId({
     totalCount,
@@ -40,20 +40,21 @@ const make = /*#__PURE__*/Effect.gen(function* () {
     id,
     totalCount
   })));
-  const spawner = pipe(takeConfig, Effect.map(config => ({
-    ...config,
+  const spawner = pipe(takeConfig, Effect.map(shardConfig => ({
+    ...shardConfig,
     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.tap(shard => {
-    currentShards.add(shard);
+  }) => limiter.maybeWait(`dfx.sharder.${id % concurrency}`, Duration.millis(gatewayConfig.identifyRateLimit[0]), gatewayConfig.identifyRateLimit[1])), Effect.flatMap(c => shard.connect([c.id, c.totalCount])), Effect.tap(runningShard => {
+    currentShards.add(runningShard);
+    return Effect.void;
   }), Effect.forever);
   yield* Effect.replicateEffect(spawner, gateway.session_start_limit.max_concurrency, {
     concurrency: "unbounded",
     discard: true
-  }).pipe(Effect.scoped, Effect.catchAllCause(Effect.logError), Effect.ensuring(Effect.sync(() => currentShards.clear())), Effect.forever, Effect.forkScoped, Effect.interruptible);
+  }).pipe(Effect.scoped, Effect.catchCause(Effect.logError), Effect.ensuring(Effect.sync(() => currentShards.clear())), Effect.forever, Effect.forkScoped);
   return {
     shards: Effect.sync(() => currentShards)
   };
@@ -61,6 +62,6 @@ const make = /*#__PURE__*/Effect.gen(function* () {
   package: "dfx",
   module: "DiscordGateway/Sharder"
 }));
-export const Sharder = /*#__PURE__*/GenericTag("dfx/DiscordGateway/Sharder");
-export const SharderLive = /*#__PURE__*/Layer.scoped(Sharder, make).pipe(/*#__PURE__*/Layer.provide(DiscordRESTLive), /*#__PURE__*/Layer.provide(RateLimiterLive), /*#__PURE__*/Layer.provide(ShardLive));
+export class Sharder extends /*#__PURE__*/ServiceMap.Service()("dfx/DiscordGateway/Sharder") {}
+export const SharderLive = /*#__PURE__*/Layer.effect(Sharder, make).pipe(/*#__PURE__*/Layer.provide(DiscordRESTLive), /*#__PURE__*/Layer.provide(RateLimiterLive), /*#__PURE__*/Layer.provide(ShardLive));
 //# sourceMappingURL=Sharder.mjs.map

package/mjs/DiscordGateway/Sharder.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"Sharder.mjs","names":["DiscordConfig","Shard","ShardLive","ShardStore","DiscordREST","DiscordRESTLive","RateLimiter","RateLimiterLive","GenericTag","Duration","Effect","pipe","Layer","Ref","Schedule","claimRepeatPolicy","spaced","whileInput","_","_tag","passthrough","make","gen","store","rest","gateway","config","limiter","shard","currentShards","Set","getBotGateway","catchAll","succeed","url","shards","session_start_limit","total","remaining","reset_after","max_concurrency","totalCount","shardCount","currentCount","claimId","sharderCount","repeat","map","value","takeConfig","getAndUpdate","flatMap","id","spawner","concurrency","tap","maybeWait","millis","identifyRateLimit","c","connect","add","forever","replicateEffect","discard","scoped","catchAllCause","logError","ensuring","sync","clear","forkScoped","interruptible","annotateLogs","package","module","Sharder","SharderLive","provide"],"sources":["../../src/DiscordGateway/Sharder.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,aAAa,QAAQ,mBAAmB;AAEjD,SAASC,KAAK,EAAEC,SAAS,QAAQ,0BAA0B;AAC3D,SAASC,UAAU,QAAQ,+BAA+B;AAC1D,SAASC,WAAW,EAAEC,eAAe,QAAQ,iBAAiB;AAC9D,SAASC,WAAW,EAAEC,eAAe,QAAQ,eAAe;AAE5D,SAASC,UAAU,QAAQ,gBAAgB;AAC3C,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,SAASC,IAAI,QAAQ,iBAAiB;AACtC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAErC,OAAO,KAAKC,GAAG,MAAM,YAAY;AACjC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAE3C,MAAMC,iBAAiB,gBAAGD,QAAQ,CAACE,MAAM,CAAC,WAAW,CAAC,CAACL,IAAI,cACzDG,QAAQ,CAACG,UAAU,CAAEC,CAAwB,IAAKA,CAAC,CAACC,IAAI,KAAK,MAAM,CAAC,EACpEL,QAAQ,CAACM,WAAW,CAC4C;AAElE,MAAMC,IAAI,gBAAGX,MAAM,CAACY,GAAG,CAAC,aAAS;EAC/B,MAAMC,KAAK,GAAG,OAAOpB,UAAU;EAC/B,MAAMqB,IAAI,GAAG,OAAOpB,WAAW;EAC/B,MAAM;IAAEqB,OAAO,EAAEC;EAAM,CAAE,GAAG,OAAO1B,aAAa;EAChD,MAAM2B,OAAO,GAAG,OAAOrB,WAAW;EAClC,MAAMsB,KAAK,GAAG,OAAO3B,KAAK;EAC1B,MAAM4B,aAAa,GAAG,IAAIC,GAAG,EAAgB;EAE7C,MAAML,OAAO,GAAG,OAAOD,IAAI,CAACO,aAAa,EAAE,CAACpB,IAAI,CAC9CD,MAAM,CAACsB,QAAQ,CAAC,MACdtB,MAAM,CAACuB,OAAO,CAA6B;IACzCC,GAAG,EAAE,2BAA2B;IAChCC,MAAM,EAAE,CAAC;IACTC,mBAAmB,EAAE;MACnBC,KAAK,EAAE,CAAC;MACRC,SAAS,EAAE,CAAC;MACZC,WAAW,EAAE,CAAC;MACdC,eAAe,EAAE;;GAEpB,CAAC,CACH,CACF;EAED,MAAMC,UAAU,GAAGf,MAAM,CAACgB,UAAU,IAAIjB,OAAO,CAACU,MAAM;EACtD,MAAMQ,YAAY,GAAG,OAAO9B,GAAG,CAACQ,IAAI,CAAC,CAAC,CAAC;EACvC,MAAMuB,OAAO,GAAIC,YAAoB,IACnClC,IAAI,CACFY,KAAK,CAACqB,OAAO,CAAC;IACZH,UAAU;IACVI;GACD,CAAC,EACFnC,MAAM,CAACoC,MAAM,CAAC/B,iBAAiB,CAAC,EAChCL,MAAM,CAACqC,GAAG,CAAC7B,CAAC,IAAIA,CAAC,CAAC8B,KAAK,CAAC,CACzB;EACH,MAAMC,UAAU,GAAGtC,IAAI,CACrBE,GAAG,CAACqC,YAAY,CAACP,YAAY,EAAEzB,CAAC,IAAIA,CAAC,GAAG,CAAC,CAAC,EAC1CR,MAAM,CAACyC,OAAO,CAACP,OAAO,CAAC,EACvBlC,MAAM,CAACqC,GAAG,CAACK,EAAE,KAAK;IAAEA,EAAE;IAAEX;EAAU,CAAE,CAAU,CAAC,CAChD;EAED,MAAMY,OAAO,GAAG1C,IAAI,CAClBsC,UAAU,EACVvC,MAAM,CAACqC,GAAG,CAACrB,MAAM,KAAK;IACpB,GAAGA,MAAM;IACTQ,GAAG,EAAET,OAAO,CAACS,GAAG;IAChBoB,WAAW,EAAE7B,OAAO,CAACW,mBAAmB,CAACI;GAC1C,CAAC,CAAC,EACH9B,MAAM,CAAC6C,GAAG,CAAC,CAAC;IAAED,WAAW;IAAEF;EAAE,CAAE,KAC7BzB,OAAO,CAAC6B,SAAS,CACf,eAAeJ,EAAE,GAAGE,WAAW,EAAE,EACjC7C,QAAQ,CAACgD,MAAM,CAAC/B,MAAM,CAACgC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAC5ChC,MAAM,CAACgC,iBAAiB,CAAC,CAAC,CAAC,CAC5B,CACF,EACDhD,MAAM,CAACyC,OAAO,CAACQ,CAAC,IAAI/B,KAAK,CAACgC,OAAO,CAAC,CAACD,CAAC,CAACP,EAAE,EAAEO,CAAC,CAAClB,UAAU,CAAC,CAAC,CAAC,EACxD/B,MAAM,CAAC6C,GAAG,CAAC3B,KAAK,IAAG;IACjBC,aAAa,CAACgC,GAAG,CAACjC,KAAK,CAAC;EAC1B,CAAC,CAAC,EACFlB,MAAM,CAACoD,OAAO,CACf;EAED,OAAOpD,MAAM,CAACqD,eAAe,CAC3BV,OAAO,EACP5B,OAAO,CAACW,mBAAmB,CAACI,eAAe,EAC3C;IAAEc,WAAW,EAAE,WAAW;IAAEU,OAAO,EAAE;EAAI,CAAE,CAC5C,CAACrD,IAAI,CACJD,MAAM,CAACuD,MAAM,EACbvD,MAAM,CAACwD,aAAa,CAACxD,MAAM,CAACyD,QAAQ,CAAC,EACrCzD,MAAM,CAAC0D,QAAQ,CAAC1D,MAAM,CAAC2D,IAAI,CAAC,MAAMxC,aAAa,CAACyC,KAAK,EAAE,CAAC,CAAC,EACzD5D,MAAM,CAACoD,OAAO,EACdpD,MAAM,CAAC6D,UAAU,EACjB7D,MAAM,CAAC8D,aAAa,CACrB;EAED,OAAO;IACLrC,MAAM,EAAEzB,MAAM,CAAC2D,IAAI,CAAC,MAAMxC,aAA0C;GAC5D;AACZ,CAAC,CAAC,CAAClB,IAAI,cACLD,MAAM,CAAC+D,YAAY,CAAC;EAClBC,OAAO,EAAE,KAAK;EACdC,MAAM,EAAE;CACT,CAAC,CACH;AAKD,OAAO,MAAMC,OAAO,gBAAGpE,UAAU,CAC/B,4BAA4B,CAC7B;AACD,OAAO,MAAMqE,WAAW,gBAAGjE,KAAK,CAACqD,MAAM,CAACW,OAAO,EAAEvD,IAAI,CAAC,CAACV,IAAI,cACzDC,KAAK,CAACkE,OAAO,CAACzE,eAAe,CAAC,eAC9BO,KAAK,CAACkE,OAAO,CAACvE,eAAe,CAAC,eAC9BK,KAAK,CAACkE,OAAO,CAAC5E,SAAS,CAAC,CACzB","ignoreList":[]}
+{"version":3,"file":"Sharder.mjs","names":["DiscordConfig","Shard","ShardLive","ShardStore","DiscordREST","DiscordRESTLive","RateLimiter","RateLimiterLive","Duration","Effect","pipe","Layer","Ref","Schedule","ServiceMap","claimRepeatPolicy","identity","either","spaced","while","_","succeed","input","_tag","passthrough","make","gen","store","rest","gateway","gatewayConfig","limiter","shard","currentShards","Set","getBotGateway","catch","url","shards","session_start_limit","total","remaining","reset_after","max_concurrency","totalCount","shardCount","currentCount","claimId","sharderCount","repeat","map","value","takeConfig","getAndUpdate","flatMap","id","spawner","shardConfig","concurrency","tap","maybeWait","millis","identifyRateLimit","c","connect","runningShard","add","void","forever","replicateEffect","discard","scoped","catchCause","logError","ensuring","sync","clear","forkScoped","annotateLogs","package","module","Sharder","Service","SharderLive","effect","provide"],"sources":["../../src/DiscordGateway/Sharder.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/mjs/DiscordGateway.mjs

@@ -1,10 +1,10 @@
-import { Messaging, MesssagingLive } from "dfx/DiscordGateway/Messaging";
-import { Sharder, SharderLive } from "dfx/DiscordGateway/Sharder";
-import { GenericTag } from "effect/Context";
+import { Messaging, MesssagingLive } from "./DiscordGateway/Messaging.js";
+import { Sharder, SharderLive } from "./DiscordGateway/Sharder.js";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import * as ServiceMap from "effect/ServiceMap";
 export const TypeId = /*#__PURE__*/Symbol.for("dfx/DiscordGateway");
-export const DiscordGateway = /*#__PURE__*/GenericTag("dfx/DiscordGateway");
+export const DiscordGateway = /*#__PURE__*/ServiceMap.Service("dfx/DiscordGateway");
 export const make = /*#__PURE__*/Effect.gen(function* () {
   const sharder = yield* Sharder;
   const messaging = yield* Messaging;

package/mjs/DiscordGateway.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"DiscordGateway.mjs","names":["Messaging","MesssagingLive","Sharder","SharderLive","GenericTag","Effect","Layer","TypeId","Symbol","for","DiscordGateway","make","gen","sharder","messaging","of","dispatch","fromDispatch","handleDispatch","send","shards","DiscordGatewayLive","effect","pipe","provide"],"sources":["../src/DiscordGateway.ts"],"sourcesContent":[null],"mappings":"AAKA,SAASA,SAAS,EAAEC,cAAc,QAAQ,8BAA8B;AAGxE,SAASC,OAAO,EAAEC,WAAW,QAAQ,4BAA4B;AAIjE,SAASC,UAAU,QAAQ,gBAAgB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAGrC,OAAO,MAAMC,MAAM,gBAAGC,MAAM,CAACC,GAAG,CAAC,oBAAoB,CAAC;AA8BtD,OAAO,MAAMC,cAAc,gBAAGN,UAAU,CAAiB,oBAAoB,CAAC;AAE9E,OAAO,MAAMO,IAAI,gBACfN,MAAM,CAACO,GAAG,CAAC,aAAS;EAClB,MAAMC,OAAO,GAAG,OAAOX,OAAO;EAC9B,MAAMY,SAAS,GAAG,OAAOd,SAAS;EAElC,OAAOU,cAAc,CAACK,EAAE,CAAC;IACvB,CAACR,MAAM,GAAGA,MAAM;IAChBS,QAAQ,EAAEF,SAAS,CAACE,QAAQ;IAC5BC,YAAY,EAAEH,SAAS,CAACG,YAAmB;IAC3CC,cAAc,EAAEJ,SAAS,CAACI,cAAqB;IAC/CC,IAAI,EAAEL,SAAS,CAACK,IAAI;IACpBC,MAAM,EAAEP,OAAO,CAACO;GACjB,CAAC;AACJ,CAAC,CAAC;AAEJ,OAAO,MAAMC,kBAAkB,gBAU3Bf,KAAK,CAACgB,MAAM,CAACZ,cAAc,EAAEC,IAAI,CAAC,CAACY,IAAI,cACzCjB,KAAK,CAACkB,OAAO,CAACvB,cAAc,CAAC,eAC7BK,KAAK,CAACkB,OAAO,CAACrB,WAAW,CAAC,CAC3B","ignoreList":[]}
+{"version":3,"file":"DiscordGateway.mjs","names":["Messaging","MesssagingLive","Sharder","SharderLive","Effect","Layer","ServiceMap","TypeId","Symbol","for","DiscordGateway","Service","make","gen","sharder","messaging","of","dispatch","fromDispatch","handleDispatch","send","shards","DiscordGatewayLive","effect","pipe","provide"],"sources":["../src/DiscordGateway.ts"],"sourcesContent":[null],"mappings":"AAIA,SAASA,SAAS,EAAEC,cAAc,QAAQ,+BAA+B;AAGzE,SAASC,OAAO,EAAEC,WAAW,QAAQ,6BAA6B;AAIlE,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAGrC,OAAO,KAAKC,UAAU,MAAM,mBAAmB;AAE/C,OAAO,MAAMC,MAAM,gBAAGC,MAAM,CAACC,GAAG,CAAC,oBAAoB,CAAC;AA8BtD,OAAO,MAAMC,cAAc,gBACzBJ,UAAU,CAACK,OAAO,CAAiB,oBAAoB,CAAC;AAE1D,OAAO,MAAMC,IAAI,gBACfR,MAAM,CAACS,GAAG,CAAC,aAAS;EAClB,MAAMC,OAAO,GAAG,OAAOZ,OAAO;EAC9B,MAAMa,SAAS,GAAG,OAAOf,SAAS;EAElC,OAAOU,cAAc,CAACM,EAAE,CAAC;IACvB,CAACT,MAAM,GAAGA,MAAM;IAChBU,QAAQ,EAAEF,SAAS,CAACE,QAAQ;IAC5BC,YAAY,EAAEH,SAAS,CAACG,YAAmB;IAC3CC,cAAc,EAAEJ,SAAS,CAACI,cAAqB;IAC/CC,IAAI,EAAEL,SAAS,CAACK,IAAI;IACpBC,MAAM,EAAEP,OAAO,CAACO;GACjB,CAAC;AACJ,CAAC,CAAC;AAEJ,OAAO,MAAMC,kBAAkB,gBAU3BjB,KAAK,CAACkB,MAAM,CAACb,cAAc,EAAEE,IAAI,CAAC,CAACY,IAAI,cACzCnB,KAAK,CAACoB,OAAO,CAACxB,cAAc,CAAC,eAC7BI,KAAK,CAACoB,OAAO,CAACtB,WAAW,CAAC,CAC3B","ignoreList":[]}