dfx 0.61.1 → 0.61.2

package/DiscordGateway/DiscordWS.d.ts

@@ -20,7 +20,7 @@ export interface DiscordWSCodec {
 }
 export declare const DiscordWSCodec: Tag<DiscordWSCodec, DiscordWSCodec>;
 export declare const LiveJsonDiscordWSCodec: Layer.Layer<never, never, DiscordWSCodec>;
-declare const make: Effect.Effect<DiscordWSCodec | WS, never, {
+declare const make: Effect.Effect<WS | DiscordWSCodec, never, {
     readonly connect: ({ onConnecting, outbound, url, version, }: OpenOpts) => Effect.Effect<never, never, {
         readonly run: Effect.Effect<never, import("dfx/DiscordGateway/WS").WebSocketError | import("dfx/DiscordGateway/WS").WebSocketCloseError, void>;
         readonly take: Effect.Effect<never, never, Discord.GatewayPayload<any>>;

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,qBAAqB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AAErC,OAAO,KAAK,KAAK,SAAS,MAAM,8BAA8B,CAAA;AAG9D,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;AAsBzC,eAAO,MAAM,IAAI,WACP,MAAM,OAAO,CAAC,QAAQ,cAAc,CAAC,QACvC,MAAM,OAAO,CAAC,QAAQ,cAAc,CAAC,UACnC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,YAC5B,UAAU,OAAO,KAAK,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,sCA+BlE,CAAA"}
+{"version":3,"file":"heartbeats.d.ts","sourceRoot":"","sources":["../../src/DiscordGateway/Shard/heartbeats.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AAErC,OAAO,KAAK,KAAK,SAAS,MAAM,8BAA8B,CAAA;AAG9D,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;AAmBzC,eAAO,MAAM,IAAI,WACP,MAAM,OAAO,CAAC,QAAQ,cAAc,CAAC,QACvC,MAAM,OAAO,CAAC,QAAQ,cAAc,CAAC,UACnC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,YAC5B,UAAU,OAAO,KAAK,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,sCA6BlE,CAAA"}

package/DiscordGateway/Shard/heartbeats.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.send = void 0;
-var _Duration = /*#__PURE__*/require("@effect/data/Duration");
+var Duration = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/data/Duration"));
 var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/data/Option"));
 var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
 var Queue = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Queue"));
@@ -15,16 +15,15 @@ var _WS = /*#__PURE__*/require("dfx/DiscordGateway/WS");
 var EffectU = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/utils/Effect"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-const payload = (ref, seqRef) => Ref.get(seqRef).pipe(Effect.map(o => SendEvents.heartbeat(Option.getOrNull(o))), Effect.tap(() => Ref.set(ref, false)));
-const payloadOrReconnect = (ref, seqRef) => Effect.flatMap(Ref.get(ref), acked => acked ? payload(ref, seqRef) : Effect.succeed(_WS.Reconnect));
-const send = (hellos, acks, seqRef, send) => Effect.gen(function* (_) {
-  const ackedRef = yield* _(Ref.make(true));
-  const heartbeats = EffectU.foreverSwitch(Queue.take(hellos).pipe(Effect.tap(() => Ref.set(ackedRef, true))), p => payloadOrReconnect(ackedRef, seqRef).pipe(Effect.tap(send), Effect.schedule(Schedule.duration((0, _Duration.millis)(p.d.heartbeat_interval * Math.random())).pipe(Schedule.andThen(Schedule.fixed((0, _Duration.millis)(p.d.heartbeat_interval)))))));
-  const run = Queue.take(acks).pipe(Effect.tap(() => Ref.set(ackedRef, true)), Effect.forever);
-  return yield* _(Effect.all([run, heartbeats], {
+const payload = seqRef => Effect.map(Ref.get(seqRef), seq => SendEvents.heartbeat(Option.getOrNull(seq)));
+const payloadOrReconnect = (ref, seqRef) => Effect.flatMap(Ref.get(ref), acked => acked ? payload(seqRef) : Effect.succeed(_WS.Reconnect));
+const send = (hellos, acks, seqRef, send) => Effect.flatMap(Ref.make(true), ackedRef => {
+  const heartbeats = EffectU.foreverSwitch(Effect.zipLeft(Queue.take(hellos), Ref.set(ackedRef, true)), p => payloadOrReconnect(ackedRef, seqRef).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 run = Queue.take(acks).pipe(Effect.zipLeft(Ref.set(ackedRef, true)), Effect.forever);
+  return Effect.all([run, heartbeats], {
     concurrency: "unbounded",
     discard: true
-  }));
+  });
 });
 exports.send = send;
 //# sourceMappingURL=heartbeats.js.map

package/DiscordGateway/Shard/heartbeats.js.map

@@ -1 +1 @@
-{"version":3,"file":"heartbeats.js","names":["_Duration","require","Option","_interopRequireWildcard","Effect","Queue","Ref","Schedule","SendEvents","_WS","EffectU","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","payload","ref","seqRef","pipe","map","o","heartbeat","getOrNull","tap","payloadOrReconnect","flatMap","acked","succeed","Reconnect","send","hellos","acks","gen","_","ackedRef","make","heartbeats","foreverSwitch","take","p","schedule","duration","millis","d","heartbeat_interval","Math","random","andThen","fixed","run","forever","all","concurrency","discard","exports"],"sources":["../../src/DiscordGateway/Shard/heartbeats.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"heartbeats.js","names":["Duration","_interopRequireWildcard","require","Option","Effect","Queue","Ref","Schedule","SendEvents","_WS","EffectU","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","payload","seqRef","map","seq","heartbeat","getOrNull","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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"}

package/DiscordGateway/Shard.d.ts

@@ -9,7 +9,7 @@ import { DiscordWS } from "dfx/DiscordGateway/DiscordWS";
 import { Log } from "dfx/Log";
 import { RateLimiter } from "dfx/RateLimit";
 import * as Discord from "dfx/types";
-export declare const make: Effect.Effect<RateLimiter | Log | DiscordConfig | DiscordWS, never, {
+export declare const make: Effect.Effect<DiscordConfig | RateLimiter | Log | DiscordWS, never, {
     readonly connect: (shard: [id: number, count: number], hub: Hub.Hub<Discord.GatewayPayload<Discord.ReceiveEvent>>, sendQueue: Queue.Dequeue<Discord.GatewayPayload<Discord.SendEvent>>) => Effect.Effect<never, never, {
         readonly id: [id: number, count: number];
         readonly send: (p: Message) => Effect.Effect<never, never, boolean>;
@@ -19,7 +19,7 @@ export declare const make: Effect.Effect<RateLimiter | Log | DiscordConfig | Dis
 export interface Shard extends Effect.Effect.Success<typeof make> {
 }
 export declare const Shard: Tag<Shard, Shard>;
-export declare const LiveShard: Layer.Layer<import("dfx/RateLimit").RateLimitStore | Log | import("dfx/DiscordGateway/DiscordWS").DiscordWSCodec | DiscordConfig, never, Shard>;
+export declare const LiveShard: Layer.Layer<DiscordConfig | import("dfx/RateLimit").RateLimitStore | Log | import("dfx/DiscordGateway/DiscordWS").DiscordWSCodec, never, Shard>;
 export interface RunningShard extends Effect.Effect.Success<ReturnType<Shard["connect"]>> {
 }
 //# sourceMappingURL=Shard.d.ts.map

package/DiscordGateway/Sharder.d.ts

@@ -12,13 +12,13 @@ import type { WebSocketCloseError, WebSocketError } from "dfx/DiscordGateway/WS"
 import { DiscordREST } from "dfx/DiscordREST";
 import { RateLimiter } from "dfx/RateLimit";
 import type * as Discord from "dfx/types";
-declare const make: Effect.Effect<DiscordREST | RateLimiter | ShardStore | DiscordConfig | Shard, never, {
+declare const make: Effect.Effect<DiscordConfig | RateLimiter | DiscordREST | ShardStore | Shard, never, {
     readonly shards: Effect.Effect<never, never, HashSet.HashSet<RunningShard>>;
     readonly run: (hub: Hub.Hub<Discord.GatewayPayload<Discord.ReceiveEvent>>, sendQueue: Queue.Dequeue<Discord.GatewayPayload<Discord.SendEvent>>) => Effect.Effect<never, WebSocketError | WebSocketCloseError, never>;
 }>;
 export interface Sharder extends Effect.Effect.Success<typeof make> {
 }
 export declare const Sharder: Tag<Sharder, Sharder>;
-export declare const LiveSharder: Layer.Layer<DiscordREST | import("dfx/RateLimit").RateLimitStore | import("../Log").Log | ShardStore | import("./DiscordWS").DiscordWSCodec | DiscordConfig, never, Sharder>;
+export declare const LiveSharder: Layer.Layer<DiscordConfig | import("../Log").Log | import("dfx/RateLimit").RateLimitStore | DiscordREST | ShardStore | import("./DiscordWS").DiscordWSCodec, never, Sharder>;
 export {};
 //# sourceMappingURL=Sharder.d.ts.map

package/DiscordGateway.d.ts

@@ -17,5 +17,5 @@ export interface DiscordGateway {
 }
 export declare const DiscordGateway: Tag<DiscordGateway, DiscordGateway>;
 export declare const make: Effect.Effect<Sharder, never, DiscordGateway>;
-export declare const LiveDiscordGateway: Layer.Layer<import("./DiscordREST").DiscordREST | import("./RateLimit").RateLimitStore | import("./Log").Log | import("./DiscordGateway/ShardStore").ShardStore | import("./DiscordGateway/DiscordWS").DiscordWSCodec | import("./DiscordConfig").DiscordConfig, never, DiscordGateway>;
+export declare const LiveDiscordGateway: Layer.Layer<import("./DiscordConfig").DiscordConfig | import("./Log").Log | import("./RateLimit").RateLimitStore | import("./DiscordREST").DiscordREST | import("./DiscordGateway/ShardStore").ShardStore | import("./DiscordGateway/DiscordWS").DiscordWSCodec, never, DiscordGateway>;
 //# sourceMappingURL=DiscordGateway.d.ts.map

package/Interactions/gateway.d.ts

@@ -16,7 +16,7 @@ export interface RunOpts {
 /**
  * @tsplus pipeable dfx/InteractionBuilder runGateway
  */
-export declare const run: <R, R2, E, TE, E2>(postHandler: (effect: Effect.Effect<Discord.Interaction | DiscordREST | R, DiscordRESTError | TE | DefinitionNotFound, void>) => Effect.Effect<R2, E2, void>, { sync }?: RunOpts) => (ix: InteractionBuilder<R, E, TE>) => Effect.Effect<DiscordREST | DiscordGateway | Exclude<R2, Discord.Interaction>, DiscordRESTError | Http.error.ResponseError | E2, never>;
+export declare const run: <R, R2, E, TE, E2>(postHandler: (effect: Effect.Effect<DiscordREST | R | Discord.Interaction, DiscordRESTError | TE | DefinitionNotFound, void>) => Effect.Effect<R2, E2, void>, { sync }?: RunOpts) => (ix: InteractionBuilder<R, E, TE>) => Effect.Effect<DiscordREST | DiscordGateway | Exclude<R2, Discord.Interaction>, DiscordRESTError | Http.error.ResponseError | E2, never>;
 export interface InteractionsRegistry {
     readonly register: <E>(ix: InteractionBuilder<never, E, never>) => Effect.Effect<never, never, void>;
     readonly run: <R, E>(onError: (_: Cause<DiscordRESTError | DefinitionNotFound>) => Effect.Effect<R, E, void>, opts?: RunOpts) => Effect.Effect<DiscordREST | DiscordGateway | Exclude<R, Discord.Interaction>, DiscordRESTError | Http.error.ResponseError | E, never>;

package/gateway.d.ts

@@ -16,6 +16,6 @@ export { DiscordGateway, LiveDiscordGateway } from "dfx/DiscordGateway";
 export { InteractionsRegistry, InteractionsRegistryLive, run as runIx, } from "dfx/Interactions/gateway";
 export { CachePrelude, DiscordWS, SendEvent, Shard, ShardStore, WS };
 export declare const MemoryRateLimit: Layer.Layer<Log.Log, never, RateLimiter>;
-export declare const MemoryBot: Layer.Layer<Log.Log | DiscordConfig.DiscordConfig, never, DiscordREST | InteractionsRegistry | DiscordGateway | RateLimiter>;
+export declare const MemoryBot: Layer.Layer<DiscordConfig.DiscordConfig | Log.Log, never, RateLimiter | DiscordREST | InteractionsRegistry | DiscordGateway>;
 export declare const gatewayLayer: (config: Config.Config.Wrap<DiscordConfig.MakeOpts>) => Layer.Layer<never, ConfigError.ConfigError, RateLimiter | Log.Log | InteractionsRegistry | DiscordREST | DiscordGateway | DiscordConfig.DiscordConfig>;
 //# sourceMappingURL=gateway.d.ts.map

package/mjs/DiscordGateway/Shard/heartbeats.mjs

@@ -1,4 +1,4 @@
-import { millis } from "@effect/data/Duration";
+import * as Duration from "@effect/data/Duration";
 import * as Option from "@effect/data/Option";
 import * as Effect from "@effect/io/Effect";
 import * as Queue from "@effect/io/Queue";
@@ -7,15 +7,14 @@ import * as Schedule from "@effect/io/Schedule";
 import * as SendEvents from "dfx/DiscordGateway/Shard/sendEvents";
 import { Reconnect } from "dfx/DiscordGateway/WS";
 import * as EffectU from "dfx/utils/Effect";
-const payload = (ref, seqRef) => Ref.get(seqRef).pipe(Effect.map(o => SendEvents.heartbeat(Option.getOrNull(o))), Effect.tap(() => Ref.set(ref, false)));
-const payloadOrReconnect = (ref, seqRef) => Effect.flatMap(Ref.get(ref), acked => acked ? payload(ref, seqRef) : Effect.succeed(Reconnect));
-export const send = (hellos, acks, seqRef, send) => Effect.gen(function* (_) {
-  const ackedRef = yield* _(Ref.make(true));
-  const heartbeats = EffectU.foreverSwitch(Queue.take(hellos).pipe(Effect.tap(() => Ref.set(ackedRef, true))), p => payloadOrReconnect(ackedRef, seqRef).pipe(Effect.tap(send), Effect.schedule(Schedule.duration(millis(p.d.heartbeat_interval * Math.random())).pipe(Schedule.andThen(Schedule.fixed(millis(p.d.heartbeat_interval)))))));
-  const run = Queue.take(acks).pipe(Effect.tap(() => Ref.set(ackedRef, true)), Effect.forever);
-  return yield* _(Effect.all([run, heartbeats], {
+const payload = seqRef => Effect.map(Ref.get(seqRef), seq => SendEvents.heartbeat(Option.getOrNull(seq)));
+const payloadOrReconnect = (ref, seqRef) => Effect.flatMap(Ref.get(ref), acked => acked ? payload(seqRef) : Effect.succeed(Reconnect));
+export const send = (hellos, acks, seqRef, send) => Effect.flatMap(Ref.make(true), ackedRef => {
+  const heartbeats = EffectU.foreverSwitch(Effect.zipLeft(Queue.take(hellos), Ref.set(ackedRef, true)), p => payloadOrReconnect(ackedRef, seqRef).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 run = Queue.take(acks).pipe(Effect.zipLeft(Ref.set(ackedRef, true)), Effect.forever);
+  return Effect.all([run, heartbeats], {
     concurrency: "unbounded",
     discard: true
-  }));
+  });
 });
 //# sourceMappingURL=heartbeats.mjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"heartbeats.mjs","names":["millis","Option","Effect","Queue","Ref","Schedule","SendEvents","Reconnect","EffectU","payload","ref","seqRef","get","pipe","map","o","heartbeat","getOrNull","tap","set","payloadOrReconnect","flatMap","acked","succeed","send","hellos","acks","gen","_","ackedRef","make","heartbeats","foreverSwitch","take","p","schedule","duration","d","heartbeat_interval","Math","random","andThen","fixed","run","forever","all","concurrency","discard"],"sources":["../../../src/DiscordGateway/Shard/heartbeats.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,MAAM,QAAQ,uBAAuB;AAC9C,OAAO,KAAKC,MAAM,MAAM,qBAAqB;AAC7C,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,KAAK,MAAM,kBAAkB;AACzC,OAAO,KAAKC,GAAG,MAAM,gBAAgB;AACrC,OAAO,KAAKC,QAAQ,MAAM,qBAAqB;AAE/C,OAAO,KAAKC,UAAU,MAAM,qCAAqC;AACjE,SAASC,SAAS,QAAQ,uBAAuB;AAEjD,OAAO,KAAKC,OAAO,MAAM,kBAAkB;AAE3C,MAAMC,OAAO,GAAGA,CACdC,GAAqB,EACrBC,MAAsC,KAEtCP,GAAG,CAACQ,GAAG,CAACD,MAAM,CAAC,CAACE,IAAI,CAClBX,MAAM,CAACY,GAAG,CAACC,CAAC,IAAIT,UAAU,CAACU,SAAS,CAACf,MAAM,CAACgB,SAAS,CAACF,CAAC,CAAC,CAAC,CAAC,EAC1Db,MAAM,CAACgB,GAAG,CAAC,MAAMd,GAAG,CAACe,GAAG,CAACT,GAAG,EAAE,KAAK,CAAC,CAAC,CACtC;AAEH,MAAMU,kBAAkB,GAAGA,CACzBV,GAAqB,EACrBC,MAAsC,KAEtCT,MAAM,CAACmB,OAAO,CACZjB,GAAG,CAACQ,GAAG,CAACF,GAAG,CAAC,EACXY,KAAK,IACJA,KAAK,GAAGb,OAAO,CAACC,GAAG,EAAEC,MAAM,CAAC,GAAGT,MAAM,CAACqB,OAAO,CAAChB,SAAS,CAAC,CAC3D;AAEH,OAAO,MAAMiB,IAAI,GAAGA,CAClBC,MAA6C,EAC7CC,IAA2C,EAC3Cf,MAAsC,EACtCa,IAAoE,KAEpEtB,MAAM,CAACyB,GAAG,CAAC,WAAUC,CAAC;EACpB,MAAMC,QAAQ,GAAG,OAAOD,CAAC,CAACxB,GAAG,CAAC0B,IAAI,CAAC,IAAI,CAAC,CAAC;EAEzC,MAAMC,UAAU,GAAGvB,OAAO,CAACwB,aAAa,CACtC7B,KAAK,CAAC8B,IAAI,CAACR,MAAM,CAAC,CAACZ,IAAI,CAACX,MAAM,CAACgB,GAAG,CAAC,MAAMd,GAAG,CAACe,GAAG,CAACU,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,EAClEK,CAAC,IACCd,kBAAkB,CAACS,QAAQ,EAAElB,MAAM,CAAC,CAACE,IAAI,CACvCX,MAAM,CAACgB,GAAG,CAACM,IAAI,CAAC,EAChBtB,MAAM,CAACiC,QAAQ,CACb9B,QAAQ,CAAC+B,QAAQ,CACfpC,MAAM,CAACkC,CAAC,CAACG,CAAE,CAACC,kBAAkB,GAAGC,IAAI,CAACC,MAAM,EAAE,CAAC,CAChD,CAAC3B,IAAI,CACJR,QAAQ,CAACoC,OAAO,CAACpC,QAAQ,CAACqC,KAAK,CAAC1C,MAAM,CAACkC,CAAC,CAACG,CAAE,CAACC,kBAAkB,CAAC,CAAC,CAAC,CAClE,CACF,CACF,CACJ;EAED,MAAMK,GAAG,GAAGxC,KAAK,CAAC8B,IAAI,CAACP,IAAI,CAAC,CAACb,IAAI,CAC/BX,MAAM,CAACgB,GAAG,CAAC,MAAMd,GAAG,CAACe,GAAG,CAACU,QAAQ,EAAE,IAAI,CAAC,CAAC,EACzC3B,MAAM,CAAC0C,OAAO,CACf;EAED,OAAO,OAAOhB,CAAC,CACb1B,MAAM,CAAC2C,GAAG,CAAC,CAACF,GAAG,EAAEZ,UAAU,CAAC,EAAE;IAC5Be,WAAW,EAAE,WAAW;IACxBC,OAAO,EAAE;GACV,CAAC,CACH;AACH,CAAC,CAAC"}
+{"version":3,"file":"heartbeats.mjs","names":["Duration","Option","Effect","Queue","Ref","Schedule","SendEvents","Reconnect","EffectU","payload","seqRef","map","get","seq","heartbeat","getOrNull","payloadOrReconnect","ref","flatMap","acked","succeed","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,uBAAuB;AACjD,OAAO,KAAKC,MAAM,MAAM,qBAAqB;AAC7C,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,KAAK,MAAM,kBAAkB;AACzC,OAAO,KAAKC,GAAG,MAAM,gBAAgB;AACrC,OAAO,KAAKC,QAAQ,MAAM,qBAAqB;AAE/C,OAAO,KAAKC,UAAU,MAAM,qCAAqC;AACjE,SAASC,SAAS,QAAQ,uBAAuB;AAEjD,OAAO,KAAKC,OAAO,MAAM,kBAAkB;AAE3C,MAAMC,OAAO,GAAIC,MAAsC,IACrDR,MAAM,CAACS,GAAG,CACRP,GAAG,CAACQ,GAAG,CAACF,MAAM,CAAC,EACfG,GAAG,IAAIP,UAAU,CAACQ,SAAS,CAACb,MAAM,CAACc,SAAS,CAACF,GAAG,CAAC,CAAC,CACnD;AAEH,MAAMG,kBAAkB,GAAGA,CACzBC,GAAqB,EACrBP,MAAsC,KAEtCR,MAAM,CAACgB,OAAO,CACZd,GAAG,CAACQ,GAAG,CAACK,GAAG,CAAC,EACXE,KAAK,IACJA,KAAK,GAAGV,OAAO,CAACC,MAAM,CAAC,GAAGR,MAAM,CAACkB,OAAO,CAACb,SAAS,CAAC,CACtD;AAEH,OAAO,MAAMc,IAAI,GAAGA,CAClBC,MAA6C,EAC7CC,IAA2C,EAC3Cb,MAAsC,EACtCW,IAAoE,KAEpEnB,MAAM,CAACgB,OAAO,CAACd,GAAG,CAACoB,IAAI,CAAC,IAAI,CAAC,EAAEC,QAAQ,IAAG;EACxC,MAAMC,UAAU,GAAGlB,OAAO,CAACmB,aAAa,CACtCzB,MAAM,CAAC0B,OAAO,CAACzB,KAAK,CAAC0B,IAAI,CAACP,MAAM,CAAC,EAAElB,GAAG,CAAC0B,GAAG,CAACL,QAAQ,EAAE,IAAI,CAAC,CAAC,EAC3DM,CAAC,IACCf,kBAAkB,CAACS,QAAQ,EAAEf,MAAM,CAAC,CAACsB,IAAI,CACvC9B,MAAM,CAAC0B,OAAO,CAACxB,GAAG,CAAC0B,GAAG,CAACL,QAAQ,EAAE,KAAK,CAAC,CAAC,EACxCvB,MAAM,CAAC+B,GAAG,CAACZ,IAAI,CAAC,EAChBnB,MAAM,CAACgC,QAAQ,CACb7B,QAAQ,CAAC8B,OAAO,CACd9B,QAAQ,CAAC+B,QAAQ,CACfpC,QAAQ,CAACqC,MAAM,CAACN,CAAC,CAACO,CAAE,CAACC,kBAAkB,GAAGC,IAAI,CAACC,MAAM,EAAE,CAAC,CACzD,EACDpC,QAAQ,CAACqC,MAAM,CAAC1C,QAAQ,CAACqC,MAAM,CAACN,CAAC,CAACO,CAAE,CAACC,kBAAkB,CAAC,CAAC,CAC1D,CACF,CACF,CACJ;EAED,MAAMI,GAAG,GAAGxC,KAAK,CAAC0B,IAAI,CAACN,IAAI,CAAC,CAACS,IAAI,CAC/B9B,MAAM,CAAC0B,OAAO,CAACxB,GAAG,CAAC0B,GAAG,CAACL,QAAQ,EAAE,IAAI,CAAC,CAAC,EACvCvB,MAAM,CAAC0C,OAAO,CACf;EAED,OAAO1C,MAAM,CAAC2C,GAAG,CAAC,CAACF,GAAG,EAAEjB,UAAU,CAAC,EAAE;IACnCoB,WAAW,EAAE,WAAW;IACxBC,OAAO,EAAE;GACV,CAAC;AACJ,CAAC,CAAC"}

package/mjs/utils/Effect.mjs

@@ -1,28 +1,20 @@
-import * as Option from "@effect/data/Option";
 import * as Deferred from "@effect/io/Deferred";
 import * as Effect from "@effect/io/Effect";
-import * as Fiber from "@effect/io/Fiber";
 import * as Hub from "@effect/io/Hub";
 import * as Queue from "@effect/io/Queue";
-import * as Ref from "@effect/io/Ref";
+import * as ScopedRef from "@effect/io/ScopedRef";
 export const subscribeForEachPar = (self, effect) => Effect.flatMap(Deferred.make(), deferred => {
-  const run = Hub.subscribe(self).pipe(Effect.flatMap(queue => Queue.take(queue).pipe(Effect.flatMap(_ => effect(_).pipe(Effect.catchAllCause(_ => Deferred.failCause(deferred, _)), Effect.fork)), Effect.forever)), Effect.scoped);
+  const run = Hub.subscribe(self).pipe(Effect.flatMap(queue => Queue.take(queue).pipe(Effect.flatMap(_ => effect(_).pipe(Effect.catchAllCause(_ => Deferred.failCause(deferred, _)), Effect.forkScoped)), Effect.forever)), Effect.scoped);
   return Effect.all([run, Deferred.await(deferred)], {
     concurrency: "unbounded",
     discard: true
-  }).pipe(Effect.forever);
+  });
 });
-/**
- * @tsplus fluent effect/io/Effect foreverSwitch
- */
-export const foreverSwitch = (self, f) => Effect.flatMap(Effect.all([Deferred.make(), Ref.make(Option.none())]), ([causeDeferred, fiberRef]) => {
-  const run = Effect.flatMap(self, _ => f(_).pipe(Effect.tapErrorCause(_ => Deferred.failCause(causeDeferred, _)), Effect.fork)).pipe(Effect.flatMap(fiber => Ref.getAndSet(fiberRef, Option.some(fiber))), Effect.tap(_ => Option.match(_, {
-    onNone: () => Effect.unit,
-    onSome: fiber => Fiber.interrupt(fiber)
-  })), Effect.forever);
+export const foreverSwitch = (self, f) => Effect.all([Deferred.make(), ScopedRef.fromAcquire(Effect.fork(Effect.unit))]).pipe(Effect.flatMap(([causeDeferred, fiberRef]) => {
+  const run = self.pipe(Effect.flatMap(_ => ScopedRef.set(fiberRef, f(_).pipe(Effect.tapErrorCause(_ => Deferred.failCause(causeDeferred, _)), Effect.forkScoped))), Effect.forever);
   return Effect.all([run, Deferred.await(causeDeferred)], {
     concurrency: "unbounded",
     discard: true
-  }).pipe(Effect.forever);
-});
+  });
+}), Effect.scoped);
 //# sourceMappingURL=Effect.mjs.map

package/mjs/utils/Effect.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"Effect.mjs","names":["Option","Deferred","Effect","Fiber","Hub","Queue","Ref","subscribeForEachPar","self","effect","flatMap","make","deferred","run","subscribe","pipe","queue","take","_","catchAllCause","failCause","fork","forever","scoped","all","await","concurrency","discard","foreverSwitch","f","none","causeDeferred","fiberRef","tapErrorCause","fiber","getAndSet","some","tap","match","onNone","unit","onSome","interrupt"],"sources":["../../src/utils/Effect.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"Effect.mjs","names":["Deferred","Effect","Hub","Queue","ScopedRef","subscribeForEachPar","self","effect","flatMap","make","deferred","run","subscribe","pipe","queue","take","_","catchAllCause","failCause","forkScoped","forever","scoped","all","await","concurrency","discard","foreverSwitch","f","fromAcquire","fork","unit","causeDeferred","fiberRef","set","tapErrorCause"],"sources":["../../src/utils/Effect.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,QAAQ,MAAM,qBAAqB;AAC/C,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAE3C,OAAO,KAAKC,GAAG,MAAM,gBAAgB;AACrC,OAAO,KAAKC,KAAK,MAAM,kBAAkB;AACzC,OAAO,KAAKC,SAAS,MAAM,sBAAsB;AAEjD,OAAO,MAAMC,mBAAmB,GAAGA,CACjCC,IAAgB,EAChBC,MAAwC,KAExCN,MAAM,CAACO,OAAO,CAACR,QAAQ,CAACS,IAAI,EAAY,EAAEC,QAAQ,IAAG;EACnD,MAAMC,GAAG,GAAGT,GAAG,CAACU,SAAS,CAACN,IAAI,CAAC,CAACO,IAAI,CAClCZ,MAAM,CAACO,OAAO,CAACM,KAAK,IAClBX,KAAK,CAACY,IAAI,CAACD,KAAK,CAAC,CAACD,IAAI,CACpBZ,MAAM,CAACO,OAAO,CAACQ,CAAC,IACdT,MAAM,CAACS,CAAC,CAAC,CAACH,IAAI,CACZZ,MAAM,CAACgB,aAAa,CAACD,CAAC,IAAIhB,QAAQ,CAACkB,SAAS,CAACR,QAAQ,EAAEM,CAAC,CAAC,CAAC,EAC1Df,MAAM,CAACkB,UAAU,CAClB,CACF,EACDlB,MAAM,CAACmB,OAAO,CACf,CACF,EACDnB,MAAM,CAACoB,MAAM,CACd;EAED,OAAOpB,MAAM,CAACqB,GAAG,CAAC,CAACX,GAAG,EAAEX,QAAQ,CAACuB,KAAK,CAACb,QAAQ,CAAC,CAAC,EAAE;IACjDc,WAAW,EAAE,WAAW;IACxBC,OAAO,EAAE;GACV,CAA+B;AAClC,CAAC,CAAC;AAEJ,OAAO,MAAMC,aAAa,GAAGA,CAC3BpB,IAA4B,EAC5BqB,CAAqC,KAErC1B,MAAM,CAACqB,GAAG,CAAC,CACTtB,QAAQ,CAACS,IAAI,EAAa,EAC1BL,SAAS,CAACwB,WAAW,CACnB3B,MAAM,CAAC4B,IAAI,CAAC5B,MAAM,CAAC6B,IAAI,CAAC,CACzB,CACF,CAAC,CAACjB,IAAI,CACLZ,MAAM,CAACO,OAAO,CACZ,CAAC,CAACuB,aAAa,EAAEC,QAAQ,CAAC,KAAI;EAC5B,MAAMrB,GAAG,GAAGL,IAAI,CAACO,IAAI,CACnBZ,MAAM,CAACO,OAAO,CAACQ,CAAC,IACdZ,SAAS,CAAC6B,GAAG,CACXD,QAAQ,EACRL,CAAC,CAACX,CAAC,CAAC,CAACH,IAAI,CACPZ,MAAM,CAACiC,aAAa,CAAClB,CAAC,IAAIhB,QAAQ,CAACkB,SAAS,CAACa,aAAa,EAAEf,CAAC,CAAC,CAAC,EAC/Df,MAAM,CAACkB,UAAU,CAClB,CACF,CACF,EACDlB,MAAM,CAACmB,OAAO,CACf;EAED,OAAOnB,MAAM,CAACqB,GAAG,CAAC,CAACX,GAAG,EAAEX,QAAQ,CAACuB,KAAK,CAACQ,aAAa,CAAC,CAAC,EAAE;IACtDP,WAAW,EAAE,WAAW;IACxBC,OAAO,EAAE;GACV,CAAyC;AAC5C,CAAC,CACF,EACDxB,MAAM,CAACoB,MAAM,CACd"}

package/mjs/version.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.61.1",
+  "version": "0.61.2",
   "description": "Effect-TS discord library",
   "license": "MIT",
   "repository": {
@@ -49,6 +49,6 @@
     "discord-verify": "^1.2.0",
     "utf-8-validate": "^6.0.3"
   },
-  "gitHead": "b95ee2fb2af9eb2e523f8717970d49aebebafaf6",
+  "gitHead": "5178b6ea4342980e335c9caea337d8324f06d531",
   "main": "./index.js"
 }

package/src/DiscordGateway/Shard/heartbeats.ts

@@ -1,4 +1,4 @@
-import { millis } from "@effect/data/Duration"
+import * as Duration from "@effect/data/Duration"
 import * as Option from "@effect/data/Option"
 import * as Effect from "@effect/io/Effect"
 import * as Queue from "@effect/io/Queue"
@@ -10,13 +10,10 @@ import { Reconnect } from "dfx/DiscordGateway/WS"
 import type * as Discord from "dfx/types"
 import * as EffectU from "dfx/utils/Effect"
 
-const payload = (
-  ref: Ref.Ref<boolean>,
-  seqRef: Ref.Ref<Option.Option<number>>,
-) =>
-  Ref.get(seqRef).pipe(
-    Effect.map(o => SendEvents.heartbeat(Option.getOrNull(o))),
-    Effect.tap(() => Ref.set(ref, false)),
+const payload = (seqRef: Ref.Ref<Option.Option<number>>) =>
+  Effect.map(
+    Ref.get(seqRef),
+    seq => SendEvents.heartbeat(Option.getOrNull(seq)),
   )
 
 const payloadOrReconnect = (
@@ -26,7 +23,7 @@ const payloadOrReconnect = (
   Effect.flatMap(
     Ref.get(ref),
     (acked): Effect.Effect<never, never, DiscordWS.Message> =>
-      acked ? payload(ref, seqRef) : Effect.succeed(Reconnect),
+      acked ? payload(seqRef) : Effect.succeed(Reconnect),
   )
 
 export const send = (
@@ -35,33 +32,31 @@ export const send = (
   seqRef: Ref.Ref<Option.Option<number>>,
   send: (p: DiscordWS.Message) => Effect.Effect<never, never, boolean>,
 ) =>
-  Effect.gen(function*(_) {
-    const ackedRef = yield* _(Ref.make(true))
-
+  Effect.flatMap(Ref.make(true), ackedRef => {
     const heartbeats = EffectU.foreverSwitch(
-      Queue.take(hellos).pipe(Effect.tap(() => Ref.set(ackedRef, true))),
+      Effect.zipLeft(Queue.take(hellos), Ref.set(ackedRef, true)),
       p =>
         payloadOrReconnect(ackedRef, seqRef).pipe(
+          Effect.zipLeft(Ref.set(ackedRef, false)),
           Effect.tap(send),
           Effect.schedule(
-            Schedule.duration(
-              millis(p.d!.heartbeat_interval * Math.random()),
-            ).pipe(
-              Schedule.andThen(Schedule.fixed(millis(p.d!.heartbeat_interval))),
+            Schedule.andThen(
+              Schedule.duration(
+                Duration.millis(p.d!.heartbeat_interval * Math.random()),
+              ),
+              Schedule.spaced(Duration.millis(p.d!.heartbeat_interval)),
             ),
           ),
         ),
     )
 
     const run = Queue.take(acks).pipe(
-      Effect.tap(() => Ref.set(ackedRef, true)),
+      Effect.zipLeft(Ref.set(ackedRef, true)),
       Effect.forever,
     )
 
-    return yield* _(
-      Effect.all([run, heartbeats], {
-        concurrency: "unbounded",
-        discard: true,
-      }),
-    )
+    return Effect.all([run, heartbeats], {
+      concurrency: "unbounded",
+      discard: true,
+    })
   })

package/src/utils/Effect.ts

@@ -1,10 +1,9 @@
-import * as Option from "@effect/data/Option"
 import * as Deferred from "@effect/io/Deferred"
 import * as Effect from "@effect/io/Effect"
-import * as Fiber from "@effect/io/Fiber"
+import type * as Fiber from "@effect/io/Fiber"
 import * as Hub from "@effect/io/Hub"
 import * as Queue from "@effect/io/Queue"
-import * as Ref from "@effect/io/Ref"
+import * as ScopedRef from "@effect/io/ScopedRef"
 
 export const subscribeForEachPar = <R, E, A, X>(
   self: Hub.Hub<A>,
@@ -17,7 +16,7 @@ export const subscribeForEachPar = <R, E, A, X>(
           Effect.flatMap(_ =>
             effect(_).pipe(
               Effect.catchAllCause(_ => Deferred.failCause(deferred, _)),
-              Effect.fork,
+              Effect.forkScoped,
             )
           ),
           Effect.forever,
@@ -29,40 +28,39 @@ export const subscribeForEachPar = <R, E, A, X>(
     return Effect.all([run, Deferred.await(deferred)], {
       concurrency: "unbounded",
       discard: true,
-    }).pipe(Effect.forever)
+    }) as Effect.Effect<R, E, never>
   })
 
-/**
- * @tsplus fluent effect/io/Effect foreverSwitch
- */
 export const foreverSwitch = <R, E, A, R1, E1, X>(
   self: Effect.Effect<R, E, A>,
   f: (_: A) => Effect.Effect<R1, E1, X>,
 ): Effect.Effect<R | R1, E | E1, never> =>
-  Effect.flatMap(
-    Effect.all([
-      Deferred.make<E1, never>(),
-      Ref.make<Option.Option<Fiber.RuntimeFiber<E1, X>>>(Option.none()),
-    ]),
-    ([causeDeferred, fiberRef]) => {
-      const run = Effect.flatMap(self, _ =>
-        f(_).pipe(
-          Effect.tapErrorCause(_ => Deferred.failCause(causeDeferred, _)),
-          Effect.fork,
-        )).pipe(
-          Effect.flatMap(fiber => Ref.getAndSet(fiberRef, Option.some(fiber))),
-          Effect.tap(_ =>
-            Option.match(_, {
-              onNone: () => Effect.unit,
-              onSome: fiber => Fiber.interrupt(fiber),
-            })
+  Effect.all([
+    Deferred.make<E1, never>(),
+    ScopedRef.fromAcquire<R1, never, Fiber.RuntimeFiber<unknown, unknown>>(
+      Effect.fork(Effect.unit),
+    ),
+  ]).pipe(
+    Effect.flatMap(
+      ([causeDeferred, fiberRef]) => {
+        const run = self.pipe(
+          Effect.flatMap(_ =>
+            ScopedRef.set(
+              fiberRef,
+              f(_).pipe(
+                Effect.tapErrorCause(_ => Deferred.failCause(causeDeferred, _)),
+                Effect.forkScoped,
+              ),
+            )
           ),
           Effect.forever,
         )
 
-      return Effect.all([run, Deferred.await(causeDeferred)], {
-        concurrency: "unbounded",
-        discard: true,
-      }).pipe(Effect.forever)
-    },
+        return Effect.all([run, Deferred.await(causeDeferred)], {
+          concurrency: "unbounded",
+          discard: true,
+        }) as Effect.Effect<R | R1, E | E1, never>
+      },
+    ),
+    Effect.scoped,
   )

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "0.61.1";
+export const LIB_VERSION = "0.61.2";

package/utils/Effect.d.ts

@@ -1,8 +1,5 @@
 import * as Effect from "@effect/io/Effect";
 import * as Hub from "@effect/io/Hub";
 export declare const subscribeForEachPar: <R, E, A, X>(self: Hub.Hub<A>, effect: (_: A) => Effect.Effect<R, E, X>) => Effect.Effect<R, E, never>;
-/**
- * @tsplus fluent effect/io/Effect foreverSwitch
- */
 export declare const foreverSwitch: <R, E, A, R1, E1, X>(self: Effect.Effect<R, E, A>, f: (_: A) => Effect.Effect<R1, E1, X>) => Effect.Effect<R | R1, E | E1, never>;
 //# sourceMappingURL=Effect.d.ts.map

package/utils/Effect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Effect.d.ts","sourceRoot":"","sources":["../src/utils/Effect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAE3C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AAIrC,eAAO,MAAM,mBAAmB,wGAwB5B,CAAA;AAEJ;;GAEG;AACH,eAAO,MAAM,aAAa,mIA8BvB,CAAA"}
+{"version":3,"file":"Effect.d.ts","sourceRoot":"","sources":["../src/utils/Effect.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAE3C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AAIrC,eAAO,MAAM,mBAAmB,wGAwB5B,CAAA;AAEJ,eAAO,MAAM,aAAa,mIAgCvB,CAAA"}

package/utils/Effect.js

@@ -4,35 +4,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.subscribeForEachPar = exports.foreverSwitch = void 0;
-var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/data/Option"));
 var Deferred = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Deferred"));
 var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
-var Fiber = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Fiber"));
 var Hub = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Hub"));
 var Queue = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Queue"));
-var Ref = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Ref"));
+var ScopedRef = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/ScopedRef"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const subscribeForEachPar = (self, effect) => Effect.flatMap(Deferred.make(), deferred => {
-  const run = Hub.subscribe(self).pipe(Effect.flatMap(queue => Queue.take(queue).pipe(Effect.flatMap(_ => effect(_).pipe(Effect.catchAllCause(_ => Deferred.failCause(deferred, _)), Effect.fork)), Effect.forever)), Effect.scoped);
+  const run = Hub.subscribe(self).pipe(Effect.flatMap(queue => Queue.take(queue).pipe(Effect.flatMap(_ => effect(_).pipe(Effect.catchAllCause(_ => Deferred.failCause(deferred, _)), Effect.forkScoped)), Effect.forever)), Effect.scoped);
   return Effect.all([run, Deferred.await(deferred)], {
     concurrency: "unbounded",
     discard: true
-  }).pipe(Effect.forever);
+  });
 });
-/**
- * @tsplus fluent effect/io/Effect foreverSwitch
- */
 exports.subscribeForEachPar = subscribeForEachPar;
-const foreverSwitch = (self, f) => Effect.flatMap(Effect.all([Deferred.make(), Ref.make(Option.none())]), ([causeDeferred, fiberRef]) => {
-  const run = Effect.flatMap(self, _ => f(_).pipe(Effect.tapErrorCause(_ => Deferred.failCause(causeDeferred, _)), Effect.fork)).pipe(Effect.flatMap(fiber => Ref.getAndSet(fiberRef, Option.some(fiber))), Effect.tap(_ => Option.match(_, {
-    onNone: () => Effect.unit,
-    onSome: fiber => Fiber.interrupt(fiber)
-  })), Effect.forever);
+const foreverSwitch = (self, f) => Effect.all([Deferred.make(), ScopedRef.fromAcquire(Effect.fork(Effect.unit))]).pipe(Effect.flatMap(([causeDeferred, fiberRef]) => {
+  const run = self.pipe(Effect.flatMap(_ => ScopedRef.set(fiberRef, f(_).pipe(Effect.tapErrorCause(_ => Deferred.failCause(causeDeferred, _)), Effect.forkScoped))), Effect.forever);
   return Effect.all([run, Deferred.await(causeDeferred)], {
     concurrency: "unbounded",
     discard: true
-  }).pipe(Effect.forever);
-});
+  });
+}), Effect.scoped);
 exports.foreverSwitch = foreverSwitch;
 //# sourceMappingURL=Effect.js.map

package/utils/Effect.js.map

@@ -1 +1 @@
-{"version":3,"file":"Effect.js","names":["Option","_interopRequireWildcard","require","Deferred","Effect","Fiber","Hub","Queue","Ref","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","subscribeForEachPar","self","effect","flatMap","make","deferred","run","subscribe","pipe","queue","take","_","catchAllCause","failCause","fork","forever","scoped","all","await","concurrency","discard","exports","foreverSwitch","f","none","causeDeferred","fiberRef","tapErrorCause","fiber","getAndSet","some","tap","match","onNone","unit","onSome","interrupt"],"sources":["../src/utils/Effect.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"Effect.js","names":["Deferred","_interopRequireWildcard","require","Effect","Hub","Queue","ScopedRef","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","subscribeForEachPar","self","effect","flatMap","make","deferred","run","subscribe","pipe","queue","take","_","catchAllCause","failCause","forkScoped","forever","scoped","all","await","concurrency","discard","exports","foreverSwitch","f","fromAcquire","fork","unit","causeDeferred","fiberRef","tapErrorCause"],"sources":["../src/utils/Effect.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,QAAA,gBAAAC,uBAAA,eAAAC,OAAA;AACA,IAAAC,MAAA,gBAAAF,uBAAA,eAAAC,OAAA;AAEA,IAAAE,GAAA,gBAAAH,uBAAA,eAAAC,OAAA;AACA,IAAAG,KAAA,gBAAAJ,uBAAA,eAAAC,OAAA;AACA,IAAAI,SAAA,gBAAAL,uBAAA,eAAAC,OAAA;AAAiD,SAAAK,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAP,wBAAAW,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAE1C,MAAMW,mBAAmB,GAAGA,CACjCC,IAAgB,EAChBC,MAAwC,KAExC5B,MAAM,CAAC6B,OAAO,CAAChC,QAAQ,CAACiC,IAAI,EAAY,EAAEC,QAAQ,IAAG;EACnD,MAAMC,GAAG,GAAG/B,GAAG,CAACgC,SAAS,CAACN,IAAI,CAAC,CAACO,IAAI,CAClClC,MAAM,CAAC6B,OAAO,CAACM,KAAK,IAClBjC,KAAK,CAACkC,IAAI,CAACD,KAAK,CAAC,CAACD,IAAI,CACpBlC,MAAM,CAAC6B,OAAO,CAACQ,CAAC,IACdT,MAAM,CAACS,CAAC,CAAC,CAACH,IAAI,CACZlC,MAAM,CAACsC,aAAa,CAACD,CAAC,IAAIxC,QAAQ,CAAC0C,SAAS,CAACR,QAAQ,EAAEM,CAAC,CAAC,CAAC,EAC1DrC,MAAM,CAACwC,UAAU,CAClB,CACF,EACDxC,MAAM,CAACyC,OAAO,CACf,CACF,EACDzC,MAAM,CAAC0C,MAAM,CACd;EAED,OAAO1C,MAAM,CAAC2C,GAAG,CAAC,CAACX,GAAG,EAAEnC,QAAQ,CAAC+C,KAAK,CAACb,QAAQ,CAAC,CAAC,EAAE;IACjDc,WAAW,EAAE,WAAW;IACxBC,OAAO,EAAE;GACV,CAA+B;AAClC,CAAC,CAAC;AAAAC,OAAA,CAAArB,mBAAA,GAAAA,mBAAA;AAEG,MAAMsB,aAAa,GAAGA,CAC3BrB,IAA4B,EAC5BsB,CAAqC,KAErCjD,MAAM,CAAC2C,GAAG,CAAC,CACT9C,QAAQ,CAACiC,IAAI,EAAa,EAC1B3B,SAAS,CAAC+C,WAAW,CACnBlD,MAAM,CAACmD,IAAI,CAACnD,MAAM,CAACoD,IAAI,CAAC,CACzB,CACF,CAAC,CAAClB,IAAI,CACLlC,MAAM,CAAC6B,OAAO,CACZ,CAAC,CAACwB,aAAa,EAAEC,QAAQ,CAAC,KAAI;EAC5B,MAAMtB,GAAG,GAAGL,IAAI,CAACO,IAAI,CACnBlC,MAAM,CAAC6B,OAAO,CAACQ,CAAC,IACdlC,SAAS,CAACsB,GAAG,CACX6B,QAAQ,EACRL,CAAC,CAACZ,CAAC,CAAC,CAACH,IAAI,CACPlC,MAAM,CAACuD,aAAa,CAAClB,CAAC,IAAIxC,QAAQ,CAAC0C,SAAS,CAACc,aAAa,EAAEhB,CAAC,CAAC,CAAC,EAC/DrC,MAAM,CAACwC,UAAU,CAClB,CACF,CACF,EACDxC,MAAM,CAACyC,OAAO,CACf;EAED,OAAOzC,MAAM,CAAC2C,GAAG,CAAC,CAACX,GAAG,EAAEnC,QAAQ,CAAC+C,KAAK,CAACS,aAAa,CAAC,CAAC,EAAE;IACtDR,WAAW,EAAE,WAAW;IACxBC,OAAO,EAAE;GACV,CAAyC;AAC5C,CAAC,CACF,EACD9C,MAAM,CAAC0C,MAAM,CACd;AAAAK,OAAA,CAAAC,aAAA,GAAAA,aAAA"}

package/version.d.ts

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

package/version.js

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

package/webhooks.d.ts

@@ -8,7 +8,7 @@ import * as Log from "dfx/Log";
 import type { RateLimiter } from "dfx/RateLimit";
 export { BadWebhookSignature, makeConfigLayer, makeHandler, makeSimpleHandler, WebhookConfig, WebhookParseError, } from "dfx/Interactions/webhook";
 export declare const MemoryRateLimit: Layer.Layer<Log.Log, never, RateLimiter>;
-export declare const MemoryREST: Layer.Layer<Log.Log | DiscordConfig.DiscordConfig, never, DiscordREST>;
+export declare const MemoryREST: Layer.Layer<DiscordConfig.DiscordConfig | Log.Log, never, DiscordREST>;
 export declare const webhookLayer: (options: DiscordConfig.MakeOpts & MakeConfigOpts) => Layer.Layer<never, ConfigError.ConfigError, RateLimiter | DiscordREST | WebhookConfig>;
 export declare const webhookLayerConfig: (config: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>) => Layer.Layer<never, ConfigError.ConfigError, RateLimiter | DiscordREST | WebhookConfig>;
 //# sourceMappingURL=webhooks.d.ts.map