dfx 0.107.2 → 0.107.3

package/DiscordGateway/DiscordWS.d.ts

@@ -10,7 +10,6 @@ export interface OpenOpts {
     url?: string;
     version?: number;
     encoding?: DiscordWSCodec;
-    outbound: Effect.Effect<Message>;
     onConnecting: Effect.Effect<void>;
 }
 export interface DiscordWSCodecService {
@@ -27,9 +26,10 @@ export interface DiscordWS {
     readonly _: unique symbol;
 }
 export declare const DiscordWS: import("effect/Context").Tag<DiscordWS, {
-    readonly connect: ({ onConnecting, outbound, url, version, }: OpenOpts) => Effect.Effect<{
+    readonly connect: ({ onConnecting, url, version, }: OpenOpts) => Effect.Effect<{
         readonly take: Effect.Effect<Discord.GatewayPayload<any>, Cause.NoSuchElementException, never>;
         readonly setUrl: (url: string) => Effect.Effect<void, never, never>;
+        readonly write: (message: Discord.GatewayPayload | Reconnect) => Effect.Effect<void>;
     }, never, import("effect/Scope").Scope | Socket.WebSocketConstructor>;
 }>;
 export declare const DiscordWSLive: Layer.Layer<DiscordWS, never, DiscordWSCodec>;

package/DiscordGateway/DiscordWS.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DiscordWS.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/DiscordWS.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,yBAAyB,CAAA;AAGjD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAKrC,MAAM,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAA;AAExD,eAAO,MAAM,SAAS,eAAgD,CAAA;AACtE,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAA;AAExC,MAAM,WAAW,QAAQ;IACvB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAChC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CAClC;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAA;IACpB,MAAM,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,cAAc,KAAK,UAAU,GAAG,MAAM,CAAA;IAC1D,MAAM,EAAE,CAAC,CAAC,EAAE,UAAU,GAAG,MAAM,KAAK,OAAO,CAAC,cAAc,CAAA;CAC3D;AACD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AAMD,eAAO,MAAM,cAAc,qEAE1B,CAAA;AACD,eAAO,MAAM,sBAAsB,2CAIjC,CAAA;AA+EF,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AACD,eAAO,MAAM,SAAS;kEAxEjB,QAAQ;;+BAKc,MAAM;;EAsEA,CAAA;AACjC,eAAO,MAAM,aAAa,+CAAgC,CAAA"}
+{"version":3,"file":"DiscordWS.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/DiscordWS.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,yBAAyB,CAAA;AAGjD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAIrC,MAAM,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAA;AAExD,eAAO,MAAM,SAAS,eAAgD,CAAA;AACtE,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAA;AAExC,MAAM,WAAW,QAAQ;IACvB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CAClC;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAA;IACpB,MAAM,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,cAAc,KAAK,UAAU,GAAG,MAAM,CAAA;IAC1D,MAAM,EAAE,CAAC,CAAC,EAAE,UAAU,GAAG,MAAM,KAAK,OAAO,CAAC,cAAc,CAAA;CAC3D;AACD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AAKD,eAAO,MAAM,cAAc,qEAE1B,CAAA;AACD,eAAO,MAAM,sBAAsB,2CAIjC,CAAA;AAiFF,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AACD,eAAO,MAAM,SAAS;wDA3EjB,QAAQ;;+BAKc,MAAM;kCAchB,OAAO,CAAC,cAAc,GAAG,SAAS,KAC1C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;;EA0DK,CAAA;AACjC,eAAO,MAAM,aAAa,+CAAgC,CAAA"}

package/DiscordGateway/DiscordWS.js

@@ -14,12 +14,10 @@ var Schedule = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect
 var Cause = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/Cause"));
 var Option = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/Option"));
 var LogLevel = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/LogLevel"));
-var Fiber = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/Fiber"));
 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 && {}.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 Reconnect = exports.Reconnect = /*#__PURE__*/Symbol.for("dfx/DiscordGateway/WS/Reconnect");
 const decoder = /*#__PURE__*/new TextDecoder();
-const logLevelDebug = /*#__PURE__*/Option.some(LogLevel.Debug);
 const logLevelTrace = /*#__PURE__*/Option.some(LogLevel.Trace);
 const DiscordWSCodec = exports.DiscordWSCodec = /*#__PURE__*/(0, _Context.GenericTag)("dfx/DiscordGateway/DiscordWS/Codec");
 const JsonDiscordWSCodecLive = exports.JsonDiscordWSCodecLive = /*#__PURE__*/Layer.succeed(DiscordWSCodec, {
@@ -31,7 +29,6 @@ const make = /*#__PURE__*/Effect.gen(function* () {
   const encoding = yield* DiscordWSCodec;
   const connect = ({
     onConnecting,
-    outbound,
     url = "wss://gateway.discord.gg/",
     version = 10
   }) => Effect.gen(function* () {
@@ -42,32 +39,28 @@ const make = /*#__PURE__*/Effect.gen(function* () {
       closeCodeIsError: _ => true,
       openTimeout: 5000
     });
-    const write = yield* socket.writer;
-    yield* Effect.gen(function* () {
-      const fiber = Option.getOrThrow(Fiber.getCurrentFiber());
-      while (true) {
-        const message = yield* outbound;
-        if (message === Reconnect) {
-          ;
-          fiber.log(["Reconnecting"], Cause.empty, logLevelTrace);
-          yield* write(new Socket.CloseEvent(1012, "reconnecting"));
-        } else {
-          ;
-          fiber.log([message], Cause.empty, logLevelTrace);
-          yield* write(encoding.encode(message));
-        }
+    const writeRaw = yield* socket.writer;
+    const logWriteError = cause => Effect.annotateLogs(Effect.logDebug(cause), {
+      module: "DiscordGateway/DiscordWS",
+      channel: "outbound"
+    });
+    const write = message => {
+      if (message === Reconnect) {
+        return Effect.catchAllCause(writeRaw(new Socket.CloseEvent(1012, "reconnecting")), logWriteError);
       }
-    }).pipe(Effect.annotateLogs("channel", "outbound"), Effect.forkScoped, Effect.interruptible);
+      return Effect.catchAllCause(writeRaw(encoding.encode(message)), logWriteError);
+    };
     yield* onConnecting.pipe(Effect.zipRight(Effect.withFiberRuntime(fiber => socket.runRaw(_ => {
       const message = encoding.decode(_);
       messages.unsafeOffer(message);
-      fiber.log([message], Cause.empty, logLevelDebug);
+      fiber.log([message], Cause.empty, logLevelTrace);
     }))), Effect.retry({
       while: e => e.reason === "Close" && e.code === 1012
     }), Effect.catchAllCause(cause => Effect.logDebug("Got socket error, reconnecting", cause)), Effect.repeat(Schedule.exponential(500).pipe(Schedule.union(Schedule.spaced(10000)))), Effect.annotateLogs("channel", "inbound"), Effect.forkScoped, Effect.interruptible);
     return {
       take: messages.take,
-      setUrl
+      setUrl,
+      write
     };
   }).pipe(Effect.annotateLogs({
     module: "DiscordGateway/DiscordWS"

package/DiscordGateway/DiscordWS.js.map

@@ -1 +1 @@
-{"version":3,"file":"DiscordWS.js","names":["_Context","require","Effect","_interopRequireWildcard","Layer","Ref","Socket","Mailbox","Schedule","Cause","Option","LogLevel","Fiber","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","Reconnect","exports","Symbol","for","decoder","TextDecoder","logLevelDebug","some","Debug","logLevelTrace","Trace","DiscordWSCodec","GenericTag","JsonDiscordWSCodecLive","succeed","type","encode","p","JSON","stringify","decode","parse","make","gen","encoding","connect","onConnecting","outbound","url","version","urlRef","setUrl","messages","socket","makeWebSocket","closeCodeIsError","_","openTimeout","write","writer","fiber","getOrThrow","getCurrentFiber","message","log","empty","CloseEvent","pipe","annotateLogs","forkScoped","interruptible","zipRight","withFiberRuntime","runRaw","unsafeOffer","retry","while","reason","code","catchAllCause","cause","logDebug","repeat","exponential","union","spaced","take","module","DiscordWS","DiscordWSLive","effect"],"sources":["../src/DiscordGateway/DiscordWS.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"DiscordWS.js","names":["_Context","require","Effect","_interopRequireWildcard","Layer","Ref","Socket","Mailbox","Schedule","Cause","Option","LogLevel","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","Reconnect","exports","Symbol","for","decoder","TextDecoder","logLevelTrace","some","Trace","DiscordWSCodec","GenericTag","JsonDiscordWSCodecLive","succeed","type","encode","p","JSON","stringify","decode","parse","make","gen","encoding","connect","onConnecting","url","version","urlRef","setUrl","messages","socket","makeWebSocket","closeCodeIsError","_","openTimeout","writeRaw","writer","logWriteError","cause","annotateLogs","logDebug","module","channel","write","message","catchAllCause","CloseEvent","pipe","zipRight","withFiberRuntime","fiber","runRaw","unsafeOffer","log","empty","retry","while","reason","code","repeat","exponential","union","spaced","forkScoped","interruptible","take","DiscordWS","DiscordWSLive","effect"],"sources":["../src/DiscordGateway/DiscordWS.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/DiscordGateway/Shard/heartbeats.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"heartbeats.d.ts","sourceRoot":"","sources":["../../src/DiscordGateway/Shard/heartbeats.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,KAAK,SAAS,MAAM,8BAA8B,CAAA;AAEzD,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;AAEzC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AACrE,OAAO,KAAK,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAiB9C,eAAO,MAAM,IAAI,WACP,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,QACjD,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,SAC9C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QACzC,CAAC,CAAC,EAAE,SAAS,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,8EA6BpD,CAAA"}
+{"version":3,"file":"heartbeats.d.ts","sourceRoot":"","sources":["../../src/DiscordGateway/Shard/heartbeats.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,KAAK,SAAS,MAAM,8BAA8B,CAAA;AAEzD,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;AAEzC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AACrE,OAAO,KAAK,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAiB9C,eAAO,MAAM,IAAI,WACP,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,QACjD,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,SAC9C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QACzC,CAAC,CAAC,EAAE,SAAS,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,8EA+BpD,CAAA"}

package/DiscordGateway/Shard/heartbeats.js

@@ -17,7 +17,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 const payload = state => Effect.map(state, state => SendEvents.heartbeat(Option.getOrNull(Option.map(state, s => s.sequence))));
 const payloadOrReconnect = (ref, state) => Effect.flatMap(Ref.get(ref), acked => acked ? payload(state) : Effect.succeed(DiscordWS.Reconnect));
 const send = (hellos, acks, state, send) => Effect.flatMap(Ref.make(true), ackedRef => {
-  const heartbeats = EffectU.foreverSwitch(Effect.zipLeft(hellos.take, Ref.set(ackedRef, true)), p => payloadOrReconnect(ackedRef, state).pipe(Effect.zipLeft(Ref.set(ackedRef, false)), Effect.tap(send), Effect.schedule(Schedule.andThen(Schedule.duration(Duration.millis(p.d.heartbeat_interval * Math.random())), Schedule.spaced(Duration.millis(p.d.heartbeat_interval))))));
+  const sendPayload = payloadOrReconnect(ackedRef, state).pipe(Effect.zipLeft(Ref.set(ackedRef, false)), Effect.flatMap(send));
+  const heartbeats = EffectU.foreverSwitch(Effect.zipLeft(hellos.take, Ref.set(ackedRef, true)), p => Effect.schedule(sendPayload, Schedule.andThen(Schedule.duration(Duration.millis(p.d.heartbeat_interval * Math.random())), Schedule.spaced(Duration.millis(p.d.heartbeat_interval)))));
   const run = acks.take.pipe(Effect.zipLeft(Ref.set(ackedRef, true)), Effect.forever);
   return Effect.all([run, heartbeats], {
     concurrency: "unbounded",

package/DiscordGateway/Shard/heartbeats.js.map

@@ -1 +1 @@
-{"version":3,"file":"heartbeats.js","names":["Duration","_interopRequireWildcard","require","Option","Effect","Ref","Schedule","DiscordWS","SendEvents","EffectU","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","payload","state","map","heartbeat","getOrNull","s","sequence","payloadOrReconnect","ref","flatMap","acked","succeed","Reconnect","send","hellos","acks","make","ackedRef","heartbeats","foreverSwitch","zipLeft","take","p","pipe","tap","schedule","andThen","duration","millis","d","heartbeat_interval","Math","random","spaced","run","forever","all","concurrency","discard","exports"],"sources":["../../src/DiscordGateway/Shard/heartbeats.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"heartbeats.js","names":["Duration","_interopRequireWildcard","require","Option","Effect","Ref","Schedule","DiscordWS","SendEvents","EffectU","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","payload","state","map","heartbeat","getOrNull","s","sequence","payloadOrReconnect","ref","flatMap","acked","succeed","Reconnect","send","hellos","acks","make","ackedRef","sendPayload","pipe","zipLeft","heartbeats","foreverSwitch","take","p","schedule","andThen","duration","millis","d","heartbeat_interval","Math","random","spaced","run","forever","all","concurrency","discard","exports"],"sources":["../../src/DiscordGateway/Shard/heartbeats.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/DiscordGateway/Shard.d.ts

@@ -1,19 +1,12 @@
 import { DiscordConfig } from "dfx/DiscordConfig";
-import type { Message } from "dfx/DiscordGateway/DiscordWS";
 import { DiscordWS } from "dfx/DiscordGateway/DiscordWS";
 import { ShardStateStore } from "dfx/DiscordGateway/Shard/StateStore";
 import { RateLimiter } from "dfx/RateLimit";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-declare const enum Phase {
-    Connecting = 0,
-    Handshake = 1,
-    Connected = 2
-}
 export declare const make: Effect.Effect<{
     readonly connect: (shard: [id: number, count: number]) => Effect.Effect<{
         readonly id: [id: number, count: number];
-        readonly send: (p: Message) => Generator<import("effect/Utils").YieldWrap<Effect.Effect<Phase, never, never>>, void, any>;
     }, never, import("effect/Scope").Scope | import("@effect/platform/Socket").WebSocketConstructor>;
 }, never, DiscordConfig | RateLimiter | DiscordWS | ShardStateStore | import("dfx/DiscordGateway/Messaging").Messsaging>;
 type ShardService = Effect.Effect.Success<typeof make>;
@@ -23,7 +16,6 @@ export interface Shard {
 export declare const Shard: import("effect/Context").Tag<Shard, {
     readonly connect: (shard: [id: number, count: number]) => Effect.Effect<{
         readonly id: [id: number, count: number];
-        readonly send: (p: Message) => Generator<import("effect/Utils").YieldWrap<Effect.Effect<Phase, never, never>>, void, any>;
     }, never, import("effect/Scope").Scope | import("@effect/platform/Socket").WebSocketConstructor>;
 }>;
 export declare const ShardLive: Layer.Layer<Shard, never, DiscordConfig | import("dfx/RateLimit").RateLimitStore | import("dfx/DiscordGateway/DiscordWS").DiscordWSCodec | ShardStateStore>;

package/DiscordGateway/Shard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Shard.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/Shard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EACL,SAAS,EAGV,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAA;AAGrE,OAAO,EAAE,WAAW,EAAmB,MAAM,eAAe,CAAA;AAK5D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AASrC,mBAAW,KAAK;IACd,UAAU,IAAA;IACV,SAAS,IAAA;IACT,SAAS,IAAA;CACV;AAED,eAAO,MAAM,IAAI;8BAOS,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC;;2BA2B7B,OAAO;;wHA4J7B,CAAA;AAEF,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,CAAA;AAEtD,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AACD,eAAO,MAAM,KAAK;8BA9LQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC;;2BA2B7B,OAAO;;EAmKiD,CAAA;AAChF,eAAO,MAAM,SAAS,6JAIrB,CAAA;AAGD,MAAM,WAAW,YACf,SAAQ,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;CAAG"}
+{"version":3,"file":"Shard.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/Shard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EACL,SAAS,EAGV,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAA;AAGrE,OAAO,EAAE,WAAW,EAAmB,MAAM,eAAe,CAAA;AAI5D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAerC,eAAO,MAAM,IAAI;8BAOS,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC;;;wHAkJnD,CAAA;AAEF,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,CAAA;AAEtD,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AACD,eAAO,MAAM,KAAK;8BAzJQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC;;;EAyJ2B,CAAA;AAChF,eAAO,MAAM,SAAS,6JAIrB,CAAA;AAGD,MAAM,WAAW,YACf,SAAQ,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;CAAG"}

package/DiscordGateway/Shard.js

@@ -12,7 +12,6 @@ var Heartbeats = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("dfx/
 var Identify = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("dfx/DiscordGateway/Shard/identify"));
 var _RateLimit = /*#__PURE__*/require("dfx/RateLimit");
 var Discord = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("dfx/types"));
-var Chunk = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/Chunk"));
 var _Context = /*#__PURE__*/require("effect/Context");
 var Duration = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/Duration"));
 var Effect = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/Effect"));
@@ -38,8 +37,6 @@ const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
   } = yield* _Messaging.Messaging;
   const shardState = yield* _StateStore.ShardStateStore;
   const connect = shard => Effect.gen(function* (_) {
-    const outboundQueue = yield* Mailbox.make();
-    const pendingQueue = yield* Mailbox.make();
     const reconnectHandle = yield* FiberHandle.make();
     const phase = yield* Ref.make(0 /* Phase.Connecting */);
     const stateStore = shardState.forShard(shard);
@@ -49,37 +46,22 @@ const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
       sequence: 0
     }));
     const setPhase = p => Effect.zipLeft(Ref.set(phase, p), Effect.annotateLogs(Effect.logTrace("phase transition"), "phase", p));
-    const outbound = Effect.orDie(Effect.zipLeft(outboundQueue.take, limiter.maybeWait("dfx.shard.send", Duration.minutes(1), 120)));
-    function* send(p) {
-      if ((yield* Ref.get(phase)) === 2 /* Phase.Connected */) {
-        outboundQueue.unsafeOffer(p);
-      } else {
-        pendingQueue.unsafeOffer(p);
-      }
-    }
     const heartbeatSend = (0, _Effect2.genFn)(function* (p) {
-      if ((yield* Ref.get(phase)) !== 0 /* Phase.Connecting */) {
-        outboundQueue.unsafeOffer(p);
-        return true;
-      }
-      return false;
+      if ((yield* Ref.get(phase)) === 0 /* Phase.Connecting */) return false;
+      yield* write(p);
+      return true;
     });
-    const prioritySend = p => outboundQueue.offer(p);
     const resume = Effect.gen(function* () {
       yield* FiberHandle.clear(reconnectHandle);
       yield* setPhase(2 /* Phase.Connected */);
-      const msgs = yield* pendingQueue.clear;
-      outboundQueue.unsafeOfferAll(Chunk.filter(msgs, msg => msg !== _DiscordWS.Reconnect && msg.op !== Discord.GatewayOpcode.IDENTIFY && msg.op !== Discord.GatewayOpcode.RESUME && msg.op !== Discord.GatewayOpcode.HEARTBEAT));
     });
     const onConnecting = Effect.gen(function* () {
-      const msgs = yield* outboundQueue.clear;
-      pendingQueue.unsafeOfferAll(Chunk.filter(msgs, msg => msg !== _DiscordWS.Reconnect && msg.op !== Discord.GatewayOpcode.IDENTIFY && msg.op !== Discord.GatewayOpcode.RESUME && msg.op !== Discord.GatewayOpcode.HEARTBEAT));
       yield* setPhase(0 /* Phase.Connecting */);
     });
     const socket = yield* dws.connect({
-      outbound,
       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);
     // heartbeats
@@ -94,7 +76,7 @@ const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
     // delayed reconnect
     const delayedReconnect = Effect.gen(function* () {
       yield* Effect.sleep(30_000);
-      yield* prioritySend(_DiscordWS.Reconnect);
+      yield* socket.write(_DiscordWS.Reconnect);
     });
     function* onPayload(p) {
       if (typeof p.s === "number") {
@@ -112,7 +94,7 @@ const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
       switch (p.op) {
         case Discord.GatewayOpcode.HELLO:
           {
-            yield* prioritySend(yield* identify);
+            yield* write(yield* identify);
             yield* setPhase(1 /* Phase.Handshake */);
             hellos.unsafeOffer(p);
             yield* FiberHandle.run(reconnectHandle, delayedReconnect);
@@ -129,7 +111,7 @@ const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
               resumeState.sessionId = "";
               yield* stateStore.clear;
             }
-            yield* send(_DiscordWS.Reconnect);
+            yield* socket.write(_DiscordWS.Reconnect);
             break;
           }
         case Discord.GatewayOpcode.DISPATCH:
@@ -142,14 +124,14 @@ const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
           }
         case Discord.GatewayOpcode.RECONNECT:
           {
-            yield* prioritySend(_DiscordWS.Reconnect);
+            yield* socket.write(_DiscordWS.Reconnect);
             break;
           }
       }
     }
     yield* Effect.gen(function* () {
       while (true) {
-        yield* send(yield* sendMailbox.take);
+        yield* write(yield* sendMailbox.take);
       }
     }).pipe(Effect.forkScoped, Effect.interruptible);
     yield* Effect.gen(function* () {
@@ -158,8 +140,7 @@ const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
       }
     }).pipe(Effect.forkScoped, Effect.interruptible);
     return {
-      id: shard,
-      send
+      id: shard
     };
   }).pipe(Effect.annotateLogs({
     package: "dfx",

package/DiscordGateway/Shard.js.map

@@ -1 +1 @@
-{"version":3,"file":"Shard.js","names":["_DiscordConfig","require","_DiscordWS","_Messaging","_StateStore","Heartbeats","_interopRequireWildcard","Identify","_RateLimit","Discord","Chunk","_Context","Duration","Effect","Layer","Option","Mailbox","Redacted","Ref","_Effect2","FiberHandle","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","make","exports","gen","gateway","token","DiscordConfig","limiter","RateLimiter","dws","DiscordWS","hub","sendMailbox","Messaging","shardState","ShardStateStore","connect","shard","_","outboundQueue","pendingQueue","reconnectHandle","phase","stateStore","forShard","resumeState","getOrElse","resumeUrl","sessionId","sequence","setPhase","p","zipLeft","annotateLogs","logTrace","outbound","orDie","take","maybeWait","minutes","send","unsafeOffer","heartbeatSend","genFn","prioritySend","offer","resume","clear","msgs","unsafeOfferAll","filter","msg","Reconnect","op","GatewayOpcode","IDENTIFY","RESUME","HEARTBEAT","onConnecting","socket","hellos","acquireRelease","shutdown","acks","pipe","forkScoped","interruptible","identify","identifyOrResume","value","intents","presence","delayedReconnect","sleep","onPayload","s","DISPATCH","payload","d","session_id","resume_gateway_url","setUrl","HELLO","run","HEARTBEAT_ACK","INVALID_SESSION","RECONNECT","id","package","module","Shard","GenericTag","ShardLive","effect","provide","DiscordWSLive","MesssagingLive","RateLimiterLive"],"sources":["../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Shard.js","names":["_DiscordConfig","require","_DiscordWS","_Messaging","_StateStore","Heartbeats","_interopRequireWildcard","Identify","_RateLimit","Discord","_Context","Duration","Effect","Layer","Option","Mailbox","Redacted","Ref","_Effect2","FiberHandle","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","make","exports","gen","gateway","token","DiscordConfig","limiter","RateLimiter","dws","DiscordWS","hub","sendMailbox","Messaging","shardState","ShardStateStore","connect","shard","_","reconnectHandle","phase","stateStore","forShard","resumeState","getOrElse","resumeUrl","sessionId","sequence","setPhase","p","zipLeft","annotateLogs","logTrace","heartbeatSend","genFn","write","resume","clear","onConnecting","socket","zipRight","maybeWait","minutes","hellos","acquireRelease","shutdown","acks","send","pipe","forkScoped","interruptible","identify","identifyOrResume","value","intents","presence","delayedReconnect","sleep","Reconnect","onPayload","s","op","GatewayOpcode","DISPATCH","payload","d","session_id","resume_gateway_url","setUrl","HELLO","unsafeOffer","run","HEARTBEAT_ACK","INVALID_SESSION","RECONNECT","take","id","package","module","Shard","GenericTag","ShardLive","effect","provide","DiscordWSLive","MesssagingLive","RateLimiterLive"],"sources":["../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/mjs/DiscordGateway/DiscordWS.mjs

@@ -8,10 +8,8 @@ import * as Schedule from "effect/Schedule";
 import * as Cause from "effect/Cause";
 import * as Option from "effect/Option";
 import * as LogLevel from "effect/LogLevel";
-import * as Fiber from "effect/Fiber";
 export const Reconnect = /*#__PURE__*/Symbol.for("dfx/DiscordGateway/WS/Reconnect");
 const decoder = /*#__PURE__*/new TextDecoder();
-const logLevelDebug = /*#__PURE__*/Option.some(LogLevel.Debug);
 const logLevelTrace = /*#__PURE__*/Option.some(LogLevel.Trace);
 export const DiscordWSCodec = /*#__PURE__*/GenericTag("dfx/DiscordGateway/DiscordWS/Codec");
 export const JsonDiscordWSCodecLive = /*#__PURE__*/Layer.succeed(DiscordWSCodec, {
@@ -23,7 +21,6 @@ const make = /*#__PURE__*/Effect.gen(function* () {
   const encoding = yield* DiscordWSCodec;
   const connect = ({
     onConnecting,
-    outbound,
     url = "wss://gateway.discord.gg/",
     version = 10
   }) => Effect.gen(function* () {
@@ -34,32 +31,28 @@ const make = /*#__PURE__*/Effect.gen(function* () {
       closeCodeIsError: _ => true,
       openTimeout: 5000
     });
-    const write = yield* socket.writer;
-    yield* Effect.gen(function* () {
-      const fiber = Option.getOrThrow(Fiber.getCurrentFiber());
-      while (true) {
-        const message = yield* outbound;
-        if (message === Reconnect) {
-          ;
-          fiber.log(["Reconnecting"], Cause.empty, logLevelTrace);
-          yield* write(new Socket.CloseEvent(1012, "reconnecting"));
-        } else {
-          ;
-          fiber.log([message], Cause.empty, logLevelTrace);
-          yield* write(encoding.encode(message));
-        }
+    const writeRaw = yield* socket.writer;
+    const logWriteError = cause => Effect.annotateLogs(Effect.logDebug(cause), {
+      module: "DiscordGateway/DiscordWS",
+      channel: "outbound"
+    });
+    const write = message => {
+      if (message === Reconnect) {
+        return Effect.catchAllCause(writeRaw(new Socket.CloseEvent(1012, "reconnecting")), logWriteError);
       }
-    }).pipe(Effect.annotateLogs("channel", "outbound"), Effect.forkScoped, Effect.interruptible);
+      return Effect.catchAllCause(writeRaw(encoding.encode(message)), logWriteError);
+    };
     yield* onConnecting.pipe(Effect.zipRight(Effect.withFiberRuntime(fiber => socket.runRaw(_ => {
       const message = encoding.decode(_);
       messages.unsafeOffer(message);
-      fiber.log([message], Cause.empty, logLevelDebug);
+      fiber.log([message], Cause.empty, logLevelTrace);
     }))), Effect.retry({
       while: e => e.reason === "Close" && e.code === 1012
     }), Effect.catchAllCause(cause => Effect.logDebug("Got socket error, reconnecting", cause)), Effect.repeat(Schedule.exponential(500).pipe(Schedule.union(Schedule.spaced(10000)))), Effect.annotateLogs("channel", "inbound"), Effect.forkScoped, Effect.interruptible);
     return {
       take: messages.take,
-      setUrl
+      setUrl,
+      write
     };
   }).pipe(Effect.annotateLogs({
     module: "DiscordGateway/DiscordWS"

package/mjs/DiscordGateway/DiscordWS.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"DiscordWS.mjs","names":["GenericTag","Effect","Layer","Ref","Socket","Mailbox","Schedule","Cause","Option","LogLevel","Fiber","Reconnect","Symbol","for","decoder","TextDecoder","logLevelDebug","some","Debug","logLevelTrace","Trace","DiscordWSCodec","JsonDiscordWSCodecLive","succeed","type","encode","p","JSON","stringify","decode","parse","make","gen","encoding","connect","onConnecting","outbound","url","version","urlRef","setUrl","set","messages","socket","makeWebSocket","get","closeCodeIsError","_","openTimeout","write","writer","fiber","getOrThrow","getCurrentFiber","message","log","empty","CloseEvent","pipe","annotateLogs","forkScoped","interruptible","zipRight","withFiberRuntime","runRaw","unsafeOffer","retry","while","e","reason","code","catchAllCause","cause","logDebug","repeat","exponential","union","spaced","take","module","DiscordWS","DiscordWSLive","effect"],"sources":["../../src/DiscordGateway/DiscordWS.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"DiscordWS.mjs","names":["GenericTag","Effect","Layer","Ref","Socket","Mailbox","Schedule","Cause","Option","LogLevel","Reconnect","Symbol","for","decoder","TextDecoder","logLevelTrace","some","Trace","DiscordWSCodec","JsonDiscordWSCodecLive","succeed","type","encode","p","JSON","stringify","decode","parse","make","gen","encoding","connect","onConnecting","url","version","urlRef","setUrl","set","messages","socket","makeWebSocket","get","closeCodeIsError","_","openTimeout","writeRaw","writer","logWriteError","cause","annotateLogs","logDebug","module","channel","write","message","catchAllCause","CloseEvent","pipe","zipRight","withFiberRuntime","fiber","runRaw","unsafeOffer","log","empty","retry","while","e","reason","code","repeat","exponential","union","spaced","forkScoped","interruptible","take","DiscordWS","DiscordWSLive","effect"],"sources":["../../src/DiscordGateway/DiscordWS.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/mjs/DiscordGateway/Shard/heartbeats.mjs

@@ -9,7 +9,8 @@ import * as EffectU from "dfx/utils/Effect";
 const payload = state => Effect.map(state, state => SendEvents.heartbeat(Option.getOrNull(Option.map(state, s => s.sequence))));
 const payloadOrReconnect = (ref, state) => Effect.flatMap(Ref.get(ref), acked => acked ? payload(state) : Effect.succeed(DiscordWS.Reconnect));
 export const send = (hellos, acks, state, send) => Effect.flatMap(Ref.make(true), ackedRef => {
-  const heartbeats = EffectU.foreverSwitch(Effect.zipLeft(hellos.take, Ref.set(ackedRef, true)), p => payloadOrReconnect(ackedRef, state).pipe(Effect.zipLeft(Ref.set(ackedRef, false)), Effect.tap(send), Effect.schedule(Schedule.andThen(Schedule.duration(Duration.millis(p.d.heartbeat_interval * Math.random())), Schedule.spaced(Duration.millis(p.d.heartbeat_interval))))));
+  const sendPayload = payloadOrReconnect(ackedRef, state).pipe(Effect.zipLeft(Ref.set(ackedRef, false)), Effect.flatMap(send));
+  const heartbeats = EffectU.foreverSwitch(Effect.zipLeft(hellos.take, Ref.set(ackedRef, true)), p => Effect.schedule(sendPayload, Schedule.andThen(Schedule.duration(Duration.millis(p.d.heartbeat_interval * Math.random())), Schedule.spaced(Duration.millis(p.d.heartbeat_interval)))));
   const run = acks.take.pipe(Effect.zipLeft(Ref.set(ackedRef, true)), Effect.forever);
   return Effect.all([run, heartbeats], {
     concurrency: "unbounded",

package/mjs/DiscordGateway/Shard/heartbeats.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"heartbeats.mjs","names":["Duration","Option","Effect","Ref","Schedule","DiscordWS","SendEvents","EffectU","payload","state","map","heartbeat","getOrNull","s","sequence","payloadOrReconnect","ref","flatMap","get","acked","succeed","Reconnect","send","hellos","acks","make","ackedRef","heartbeats","foreverSwitch","zipLeft","take","set","p","pipe","tap","schedule","andThen","duration","millis","d","heartbeat_interval","Math","random","spaced","run","forever","all","concurrency","discard"],"sources":["../../../src/DiscordGateway/Shard/heartbeats.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,GAAG,MAAM,YAAY;AACjC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,SAAS,MAAM,8BAA8B;AACzD,OAAO,KAAKC,UAAU,MAAM,qCAAqC;AAEjE,OAAO,KAAKC,OAAO,MAAM,kBAAkB;AAI3C,MAAMC,OAAO,GAAIC,KAA+C,IAC9DP,MAAM,CAACQ,GAAG,CAACD,KAAK,EAAEA,KAAK,IACrBH,UAAU,CAACK,SAAS,CAACV,MAAM,CAACW,SAAS,CAACX,MAAM,CAACS,GAAG,CAACD,KAAK,EAAEI,CAAC,IAAIA,CAAC,CAACC,QAAQ,CAAC,CAAC,CAAC,CAC3E;AAEH,MAAMC,kBAAkB,GAAGA,CACzBC,GAAqB,EACrBP,KAA+C,KAE/CP,MAAM,CAACe,OAAO,CACZd,GAAG,CAACe,GAAG,CAACF,GAAG,CAAC,EACXG,KAAK,IACJA,KAAK,GAAGX,OAAO,CAACC,KAAK,CAAC,GAAGP,MAAM,CAACkB,OAAO,CAACf,SAAS,CAACgB,SAAS,CAAC,CAC/D;AAEH,OAAO,MAAMC,IAAI,GAAGA,CAClBC,MAAuD,EACvDC,IAAqD,EACrDf,KAA+C,EAC/Ca,IAAsD,KAEtDpB,MAAM,CAACe,OAAO,CAACd,GAAG,CAACsB,IAAI,CAAC,IAAI,CAAC,EAAEC,QAAQ,IAAG;EACxC,MAAMC,UAAU,GAAGpB,OAAO,CAACqB,aAAa,CACtC1B,MAAM,CAAC2B,OAAO,CAACN,MAAM,CAACO,IAAI,EAAE3B,GAAG,CAAC4B,GAAG,CAACL,QAAQ,EAAE,IAAI,CAAC,CAAC,EACpDM,CAAC,IACCjB,kBAAkB,CAACW,QAAQ,EAAEjB,KAAK,CAAC,CAACwB,IAAI,CACtC/B,MAAM,CAAC2B,OAAO,CAAC1B,GAAG,CAAC4B,GAAG,CAACL,QAAQ,EAAE,KAAK,CAAC,CAAC,EACxCxB,MAAM,CAACgC,GAAG,CAACZ,IAAI,CAAC,EAChBpB,MAAM,CAACiC,QAAQ,CACb/B,QAAQ,CAACgC,OAAO,CACdhC,QAAQ,CAACiC,QAAQ,CACfrC,QAAQ,CAACsC,MAAM,CAACN,CAAC,CAACO,CAAE,CAACC,kBAAkB,GAAGC,IAAI,CAACC,MAAM,EAAE,CAAC,CACzD,EACDtC,QAAQ,CAACuC,MAAM,CAAC3C,QAAQ,CAACsC,MAAM,CAACN,CAAC,CAACO,CAAE,CAACC,kBAAkB,CAAC,CAAC,CAC1D,CACF,CACF,CACJ;EAED,MAAMI,GAAG,GAAGpB,IAAI,CAACM,IAAI,CAACG,IAAI,CACxB/B,MAAM,CAAC2B,OAAO,CAAC1B,GAAG,CAAC4B,GAAG,CAACL,QAAQ,EAAE,IAAI,CAAC,CAAC,EACvCxB,MAAM,CAAC2C,OAAO,CACf;EAED,OAAO3C,MAAM,CAAC4C,GAAG,CAAC,CAACF,GAAG,EAAEjB,UAAU,CAAC,EAAE;IACnCoB,WAAW,EAAE,WAAW;IACxBC,OAAO,EAAE;GACV,CAAC;AACJ,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"heartbeats.mjs","names":["Duration","Option","Effect","Ref","Schedule","DiscordWS","SendEvents","EffectU","payload","state","map","heartbeat","getOrNull","s","sequence","payloadOrReconnect","ref","flatMap","get","acked","succeed","Reconnect","send","hellos","acks","make","ackedRef","sendPayload","pipe","zipLeft","set","heartbeats","foreverSwitch","take","p","schedule","andThen","duration","millis","d","heartbeat_interval","Math","random","spaced","run","forever","all","concurrency","discard"],"sources":["../../../src/DiscordGateway/Shard/heartbeats.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,GAAG,MAAM,YAAY;AACjC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,SAAS,MAAM,8BAA8B;AACzD,OAAO,KAAKC,UAAU,MAAM,qCAAqC;AAEjE,OAAO,KAAKC,OAAO,MAAM,kBAAkB;AAI3C,MAAMC,OAAO,GAAIC,KAA+C,IAC9DP,MAAM,CAACQ,GAAG,CAACD,KAAK,EAAEA,KAAK,IACrBH,UAAU,CAACK,SAAS,CAACV,MAAM,CAACW,SAAS,CAACX,MAAM,CAACS,GAAG,CAACD,KAAK,EAAEI,CAAC,IAAIA,CAAC,CAACC,QAAQ,CAAC,CAAC,CAAC,CAC3E;AAEH,MAAMC,kBAAkB,GAAGA,CACzBC,GAAqB,EACrBP,KAA+C,KAE/CP,MAAM,CAACe,OAAO,CACZd,GAAG,CAACe,GAAG,CAACF,GAAG,CAAC,EACXG,KAAK,IACJA,KAAK,GAAGX,OAAO,CAACC,KAAK,CAAC,GAAGP,MAAM,CAACkB,OAAO,CAACf,SAAS,CAACgB,SAAS,CAAC,CAC/D;AAEH,OAAO,MAAMC,IAAI,GAAGA,CAClBC,MAAuD,EACvDC,IAAqD,EACrDf,KAA+C,EAC/Ca,IAAsD,KAEtDpB,MAAM,CAACe,OAAO,CAACd,GAAG,CAACsB,IAAI,CAAC,IAAI,CAAC,EAAEC,QAAQ,IAAG;EACxC,MAAMC,WAAW,GAAGZ,kBAAkB,CAACW,QAAQ,EAAEjB,KAAK,CAAC,CAACmB,IAAI,CAC1D1B,MAAM,CAAC2B,OAAO,CAAC1B,GAAG,CAAC2B,GAAG,CAACJ,QAAQ,EAAE,KAAK,CAAC,CAAC,EACxCxB,MAAM,CAACe,OAAO,CAACK,IAAI,CAAC,CACrB;EAED,MAAMS,UAAU,GAAGxB,OAAO,CAACyB,aAAa,CACtC9B,MAAM,CAAC2B,OAAO,CAACN,MAAM,CAACU,IAAI,EAAE9B,GAAG,CAAC2B,GAAG,CAACJ,QAAQ,EAAE,IAAI,CAAC,CAAC,EACpDQ,CAAC,IACChC,MAAM,CAACiC,QAAQ,CACbR,WAAW,EACXvB,QAAQ,CAACgC,OAAO,CACdhC,QAAQ,CAACiC,QAAQ,CACfrC,QAAQ,CAACsC,MAAM,CAACJ,CAAC,CAACK,CAAE,CAACC,kBAAkB,GAAGC,IAAI,CAACC,MAAM,EAAE,CAAC,CACzD,EACDtC,QAAQ,CAACuC,MAAM,CAAC3C,QAAQ,CAACsC,MAAM,CAACJ,CAAC,CAACK,CAAE,CAACC,kBAAkB,CAAC,CAAC,CAC1D,CACF,CACJ;EAED,MAAMI,GAAG,GAAGpB,IAAI,CAACS,IAAI,CAACL,IAAI,CACxB1B,MAAM,CAAC2B,OAAO,CAAC1B,GAAG,CAAC2B,GAAG,CAACJ,QAAQ,EAAE,IAAI,CAAC,CAAC,EACvCxB,MAAM,CAAC2C,OAAO,CACf;EAED,OAAO3C,MAAM,CAAC4C,GAAG,CAAC,CAACF,GAAG,EAAEb,UAAU,CAAC,EAAE;IACnCgB,WAAW,EAAE,WAAW;IACxBC,OAAO,EAAE;GACV,CAAC;AACJ,CAAC,CAAC","ignoreList":[]}

package/mjs/DiscordGateway/Shard.mjs

@@ -6,7 +6,6 @@ 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 * as Chunk from "effect/Chunk";
 import { GenericTag } from "effect/Context";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
@@ -30,8 +29,6 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
   } = yield* Messaging;
   const shardState = yield* ShardStateStore;
   const connect = shard => Effect.gen(function* (_) {
-    const outboundQueue = yield* Mailbox.make();
-    const pendingQueue = yield* Mailbox.make();
     const reconnectHandle = yield* FiberHandle.make();
     const phase = yield* Ref.make(0 /* Phase.Connecting */);
     const stateStore = shardState.forShard(shard);
@@ -41,37 +38,22 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
       sequence: 0
     }));
     const setPhase = p => Effect.zipLeft(Ref.set(phase, p), Effect.annotateLogs(Effect.logTrace("phase transition"), "phase", p));
-    const outbound = Effect.orDie(Effect.zipLeft(outboundQueue.take, limiter.maybeWait("dfx.shard.send", Duration.minutes(1), 120)));
-    function* send(p) {
-      if ((yield* Ref.get(phase)) === 2 /* Phase.Connected */) {
-        outboundQueue.unsafeOffer(p);
-      } else {
-        pendingQueue.unsafeOffer(p);
-      }
-    }
     const heartbeatSend = genFn(function* (p) {
-      if ((yield* Ref.get(phase)) !== 0 /* Phase.Connecting */) {
-        outboundQueue.unsafeOffer(p);
-        return true;
-      }
-      return false;
+      if ((yield* Ref.get(phase)) === 0 /* Phase.Connecting */) return false;
+      yield* write(p);
+      return true;
     });
-    const prioritySend = p => outboundQueue.offer(p);
     const resume = Effect.gen(function* () {
       yield* FiberHandle.clear(reconnectHandle);
       yield* setPhase(2 /* Phase.Connected */);
-      const msgs = yield* pendingQueue.clear;
-      outboundQueue.unsafeOfferAll(Chunk.filter(msgs, msg => msg !== Reconnect && msg.op !== Discord.GatewayOpcode.IDENTIFY && msg.op !== Discord.GatewayOpcode.RESUME && msg.op !== Discord.GatewayOpcode.HEARTBEAT));
     });
     const onConnecting = Effect.gen(function* () {
-      const msgs = yield* outboundQueue.clear;
-      pendingQueue.unsafeOfferAll(Chunk.filter(msgs, msg => msg !== Reconnect && msg.op !== Discord.GatewayOpcode.IDENTIFY && msg.op !== Discord.GatewayOpcode.RESUME && msg.op !== Discord.GatewayOpcode.HEARTBEAT));
       yield* setPhase(0 /* Phase.Connecting */);
     });
     const socket = yield* dws.connect({
-      outbound,
       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);
     // heartbeats
@@ -86,7 +68,7 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
     // delayed reconnect
     const delayedReconnect = Effect.gen(function* () {
       yield* Effect.sleep(30_000);
-      yield* prioritySend(Reconnect);
+      yield* socket.write(Reconnect);
     });
     function* onPayload(p) {
       if (typeof p.s === "number") {
@@ -104,7 +86,7 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
       switch (p.op) {
         case Discord.GatewayOpcode.HELLO:
           {
-            yield* prioritySend(yield* identify);
+            yield* write(yield* identify);
             yield* setPhase(1 /* Phase.Handshake */);
             hellos.unsafeOffer(p);
             yield* FiberHandle.run(reconnectHandle, delayedReconnect);
@@ -121,7 +103,7 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
               resumeState.sessionId = "";
               yield* stateStore.clear;
             }
-            yield* send(Reconnect);
+            yield* socket.write(Reconnect);
             break;
           }
         case Discord.GatewayOpcode.DISPATCH:
@@ -134,14 +116,14 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
           }
         case Discord.GatewayOpcode.RECONNECT:
           {
-            yield* prioritySend(Reconnect);
+            yield* socket.write(Reconnect);
             break;
           }
       }
     }
     yield* Effect.gen(function* () {
       while (true) {
-        yield* send(yield* sendMailbox.take);
+        yield* write(yield* sendMailbox.take);
       }
     }).pipe(Effect.forkScoped, Effect.interruptible);
     yield* Effect.gen(function* () {
@@ -150,8 +132,7 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
       }
     }).pipe(Effect.forkScoped, Effect.interruptible);
     return {
-      id: shard,
-      send
+      id: shard
     };
   }).pipe(Effect.annotateLogs({
     package: "dfx",

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","Chunk","GenericTag","Duration","Effect","Layer","Option","Mailbox","Redacted","Ref","genFn","FiberHandle","make","gen","gateway","token","limiter","dws","hub","sendMailbox","shardState","connect","shard","_","outboundQueue","pendingQueue","reconnectHandle","phase","stateStore","forShard","resumeState","getOrElse","get","resumeUrl","sessionId","sequence","setPhase","p","zipLeft","set","annotateLogs","logTrace","outbound","orDie","take","maybeWait","minutes","send","unsafeOffer","heartbeatSend","prioritySend","offer","resume","clear","msgs","unsafeOfferAll","filter","msg","op","GatewayOpcode","IDENTIFY","RESUME","HEARTBEAT","onConnecting","socket","hellos","acquireRelease","shutdown","acks","pipe","forkScoped","interruptible","identify","identifyOrResume","value","intents","presence","delayedReconnect","sleep","onPayload","s","DISPATCH","t","payload","d","session_id","resume_gateway_url","setUrl","HELLO","run","HEARTBEAT_ACK","INVALID_SESSION","RECONNECT","id","package","module","Shard","ShardLive","effect","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","GenericTag","Duration","Effect","Layer","Option","Mailbox","Redacted","Ref","genFn","FiberHandle","make","gen","gateway","token","limiter","dws","hub","sendMailbox","shardState","connect","shard","_","reconnectHandle","phase","stateStore","forShard","resumeState","getOrElse","get","resumeUrl","sessionId","sequence","setPhase","p","zipLeft","set","annotateLogs","logTrace","heartbeatSend","write","resume","clear","onConnecting","socket","zipRight","maybeWait","minutes","hellos","acquireRelease","shutdown","acks","send","pipe","forkScoped","interruptible","identify","identifyOrResume","value","intents","presence","delayedReconnect","sleep","onPayload","s","op","GatewayOpcode","DISPATCH","t","payload","d","session_id","resume_gateway_url","setUrl","HELLO","unsafeOffer","run","HEARTBEAT_ACK","INVALID_SESSION","RECONNECT","take","id","package","module","Shard","ShardLive","effect","provide"],"sources":["../../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/mjs/version.mjs

@@ -1,2 +1,2 @@
-export const LIB_VERSION = "0.107.2";
+export const LIB_VERSION = "0.107.3";
 //# sourceMappingURL=version.mjs.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.107.2",
+  "version": "0.107.3",
   "description": "Effect-TS discord library",
   "license": "MIT",
   "repository": {
@@ -41,6 +41,6 @@
   "optionalDependencies": {
     "discord-verify": "^1.2.0"
   },
-  "gitHead": "e3f97c4879726deefc98860806eb77c2bfe6c3a3",
+  "gitHead": "c73dfab1ce202f32392ce8e655b9ebd1d62bb6bd",
   "main": "./index.js"
 }

package/src/DiscordGateway/DiscordWS.ts

@@ -9,7 +9,6 @@ import * as Schedule from "effect/Schedule"
 import * as Cause from "effect/Cause"
 import * as Option from "effect/Option"
 import * as LogLevel from "effect/LogLevel"
-import * as Fiber from "effect/Fiber"
 
 export type Message = Discord.GatewayPayload | Reconnect
 
@@ -20,7 +19,6 @@ export interface OpenOpts {
   url?: string
   version?: number
   encoding?: DiscordWSCodec
-  outbound: Effect.Effect<Message>
   onConnecting: Effect.Effect<void>
 }
 
@@ -34,7 +32,6 @@ export interface DiscordWSCodec {
 }
 
 const decoder = new TextDecoder()
-const logLevelDebug = Option.some(LogLevel.Debug)
 const logLevelTrace = Option.some(LogLevel.Trace)
 
 export const DiscordWSCodec = GenericTag<DiscordWSCodec, DiscordWSCodecService>(
@@ -51,7 +48,6 @@ const make = Effect.gen(function* () {
 
   const connect = ({
     onConnecting,
-    outbound,
     url = "wss://gateway.discord.gg/",
     version = 10,
   }: OpenOpts) =>
@@ -66,31 +62,33 @@ const make = Effect.gen(function* () {
         closeCodeIsError: _ => true,
         openTimeout: 5000,
       })
-      const write = yield* socket.writer
-      yield* Effect.gen(function* () {
-        const fiber = Option.getOrThrow(Fiber.getCurrentFiber())
-        while (true) {
-          const message = yield* outbound
-          if (message === Reconnect) {
-            ;(fiber as any).log(["Reconnecting"], Cause.empty, logLevelTrace)
-            yield* write(new Socket.CloseEvent(1012, "reconnecting"))
-          } else {
-            ;(fiber as any).log([message], Cause.empty, logLevelTrace)
-            yield* write(encoding.encode(message))
-          }
+      const writeRaw = yield* socket.writer
+      const logWriteError = (cause: Cause.Cause<Socket.SocketError>) =>
+        Effect.annotateLogs(Effect.logDebug(cause), {
+          module: "DiscordGateway/DiscordWS",
+          channel: "outbound",
+        })
+      const write = (
+        message: Discord.GatewayPayload | Reconnect,
+      ): Effect.Effect<void> => {
+        if (message === Reconnect) {
+          return Effect.catchAllCause(
+            writeRaw(new Socket.CloseEvent(1012, "reconnecting")),
+            logWriteError,
+          )
         }
-      }).pipe(
-        Effect.annotateLogs("channel", "outbound"),
-        Effect.forkScoped,
-        Effect.interruptible,
-      )
+        return Effect.catchAllCause(
+          writeRaw(encoding.encode(message)),
+          logWriteError,
+        )
+      }
       yield* onConnecting.pipe(
         Effect.zipRight(
           Effect.withFiberRuntime<void, Socket.SocketError>(fiber =>
             socket.runRaw(_ => {
               const message = encoding.decode(_)
               messages.unsafeOffer(message)
-              ;(fiber as any).log([message], Cause.empty, logLevelDebug)
+              ;(fiber as any).log([message], Cause.empty, logLevelTrace)
             }),
           ),
         ),
@@ -113,6 +111,7 @@ const make = Effect.gen(function* () {
       return {
         take: messages.take,
         setUrl,
+        write,
       } as const
     }).pipe(
       Effect.annotateLogs({

package/src/DiscordGateway/Shard/heartbeats.ts

@@ -32,19 +32,21 @@ export const send = (
   send: (p: DiscordWS.Message) => Effect.Effect<boolean>,
 ) =>
   Effect.flatMap(Ref.make(true), ackedRef => {
+    const sendPayload = payloadOrReconnect(ackedRef, state).pipe(
+      Effect.zipLeft(Ref.set(ackedRef, false)),
+      Effect.flatMap(send),
+    )
+
     const heartbeats = EffectU.foreverSwitch(
       Effect.zipLeft(hellos.take, Ref.set(ackedRef, true)),
       p =>
-        payloadOrReconnect(ackedRef, state).pipe(
-          Effect.zipLeft(Ref.set(ackedRef, false)),
-          Effect.tap(send),
-          Effect.schedule(
-            Schedule.andThen(
-              Schedule.duration(
-                Duration.millis(p.d!.heartbeat_interval * Math.random()),
-              ),
-              Schedule.spaced(Duration.millis(p.d!.heartbeat_interval)),
+        Effect.schedule(
+          sendPayload,
+          Schedule.andThen(
+            Schedule.duration(
+              Duration.millis(p.d!.heartbeat_interval * Math.random()),
             ),
+            Schedule.spaced(Duration.millis(p.d!.heartbeat_interval)),
           ),
         ),
     )

package/src/DiscordGateway/Shard.ts

@@ -12,7 +12,6 @@ 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 * as Chunk from "effect/Chunk"
 import { GenericTag } from "effect/Context"
 import * as Duration from "effect/Duration"
 import * as Effect from "effect/Effect"
@@ -40,8 +39,6 @@ export const make = Effect.gen(function* () {
 
   const connect = (shard: [id: number, count: number]) =>
     Effect.gen(function* (_) {
-      const outboundQueue = yield* Mailbox.make<Message>()
-      const pendingQueue = yield* Mailbox.make<Message>()
       const reconnectHandle = yield* FiberHandle.make()
       const phase = yield* Ref.make(Phase.Connecting)
       const stateStore = shardState.forShard(shard)
@@ -58,63 +55,28 @@ export const make = Effect.gen(function* () {
           Ref.set(phase, p),
           Effect.annotateLogs(Effect.logTrace("phase transition"), "phase", p),
         )
-      const outbound = Effect.orDie(
-        Effect.zipLeft(
-          outboundQueue.take,
-          limiter.maybeWait("dfx.shard.send", Duration.minutes(1), 120),
-        ),
-      )
-
-      function* send(p: Message) {
-        if ((yield* Ref.get(phase)) === Phase.Connected) {
-          outboundQueue.unsafeOffer(p)
-        } else {
-          pendingQueue.unsafeOffer(p)
-        }
-      }
 
       const heartbeatSend = genFn(function* (p: Message) {
-        if ((yield* Ref.get(phase)) !== Phase.Connecting) {
-          outboundQueue.unsafeOffer(p)
-          return true
-        }
-        return false
+        if ((yield* Ref.get(phase)) === Phase.Connecting) return false
+        yield* write(p)
+        return true
       })
 
-      const prioritySend = (p: Message) => outboundQueue.offer(p)
-
       const resume = Effect.gen(function* () {
         yield* FiberHandle.clear(reconnectHandle)
         yield* setPhase(Phase.Connected)
-        const msgs = yield* pendingQueue.clear
-        outboundQueue.unsafeOfferAll(
-          Chunk.filter(
-            msgs,
-            msg =>
-              msg !== Reconnect &&
-              msg.op !== Discord.GatewayOpcode.IDENTIFY &&
-              msg.op !== Discord.GatewayOpcode.RESUME &&
-              msg.op !== Discord.GatewayOpcode.HEARTBEAT,
-          ),
-        )
       })
 
       const onConnecting = Effect.gen(function* () {
-        const msgs = yield* outboundQueue.clear
-        pendingQueue.unsafeOfferAll(
-          Chunk.filter(
-            msgs,
-            msg =>
-              msg !== Reconnect &&
-              msg.op !== Discord.GatewayOpcode.IDENTIFY &&
-              msg.op !== Discord.GatewayOpcode.RESUME &&
-              msg.op !== Discord.GatewayOpcode.HEARTBEAT,
-          ),
-        )
         yield* setPhase(Phase.Connecting)
       })
 
-      const socket = yield* dws.connect({ outbound, onConnecting })
+      const socket = yield* dws.connect({ onConnecting })
+      const write = (p: Message) =>
+        Effect.zipRight(
+          limiter.maybeWait("dfx.shard.send", Duration.minutes(1), 120),
+          socket.write(p),
+        )
 
       const hellos = yield* Effect.acquireRelease(
         Mailbox.make<Discord.GatewayPayload>(),
@@ -145,7 +107,7 @@ export const make = Effect.gen(function* () {
       // delayed reconnect
       const delayedReconnect = Effect.gen(function* () {
         yield* Effect.sleep(30_000)
-        yield* prioritySend(Reconnect)
+        yield* socket.write(Reconnect)
       })
 
       function* onPayload(p: Discord.GatewayPayload) {
@@ -167,7 +129,7 @@ export const make = Effect.gen(function* () {
 
         switch (p.op) {
           case Discord.GatewayOpcode.HELLO: {
-            yield* prioritySend(yield* identify)
+            yield* write(yield* identify)
             yield* setPhase(Phase.Handshake)
             hellos.unsafeOffer(p)
             yield* FiberHandle.run(reconnectHandle, delayedReconnect)
@@ -182,7 +144,7 @@ export const make = Effect.gen(function* () {
               resumeState.sessionId = ""
               yield* stateStore.clear
             }
-            yield* send(Reconnect)
+            yield* socket.write(Reconnect)
             break
           }
           case Discord.GatewayOpcode.DISPATCH: {
@@ -193,7 +155,7 @@ export const make = Effect.gen(function* () {
             break
           }
           case Discord.GatewayOpcode.RECONNECT: {
-            yield* prioritySend(Reconnect)
+            yield* socket.write(Reconnect)
             break
           }
         }
@@ -201,7 +163,7 @@ export const make = Effect.gen(function* () {
 
       yield* Effect.gen(function* () {
         while (true) {
-          yield* send(yield* sendMailbox.take)
+          yield* write(yield* sendMailbox.take)
         }
       }).pipe(Effect.forkScoped, Effect.interruptible)
 
@@ -211,7 +173,7 @@ export const make = Effect.gen(function* () {
         }
       }).pipe(Effect.forkScoped, Effect.interruptible)
 
-      return { id: shard, send } as const
+      return { id: shard } as const
     }).pipe(
       Effect.annotateLogs({
         package: "dfx",

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "0.107.2";
+export const LIB_VERSION = "0.107.3";

package/version.d.ts

@@ -1,2 +1,2 @@
-export declare const LIB_VERSION = "0.107.2";
+export declare const LIB_VERSION = "0.107.3";
 //# sourceMappingURL=version.d.ts.map

package/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LIB_VERSION = void 0;
-const LIB_VERSION = exports.LIB_VERSION = "0.107.2";
+const LIB_VERSION = exports.LIB_VERSION = "0.107.3";
 //# sourceMappingURL=version.js.map