dfx 0.20.5 → 0.21.0

package/DiscordGateway/Shard/invalidSession.js

@@ -1,10 +1,7 @@
-import * as tsplus_module_1 from "dfx/gateway";
-import * as tsplus_module_2 from "@effect/io/Effect";
-import * as tsplus_module_3 from "@fp-ts/data/Option";
-import * as tsplus_module_4 from "@effect/io/Ref";
-import * as tsplus_module_5 from "dfx";
-import * as tsplus_module_6 from "callbag-effect-ts/Source/tap";
-import * as tsplus_module_7 from "callbag-effect-ts/Source/map";
+import * as tsplus_module_1 from "@effect/io/Ref";
+import * as tsplus_module_2 from "@effect/stream/Stream";
+import { WS } from "dfx/gateway";
+import { Discord, Effect, Option } from "dfx/_common";
 import { opCode } from "./utils.js";
-export const fromRaw = (raw, latestReady) => tsplus_module_7.map(() => tsplus_module_1.WS.Reconnect)(tsplus_module_6.tap((p) => (p.d ? tsplus_module_2.unit() : tsplus_module_4.set(tsplus_module_3.none)(latestReady)))(opCode(raw)(tsplus_module_5.Discord.GatewayOpcode.INVALID_SESSION)));
+export const fromRaw = (raw, latestReady) => tsplus_module_2.map(() => WS.Reconnect)(tsplus_module_2.tap((p) => (p.d ? Effect.unit() : tsplus_module_1.set(Option.none)(latestReady)))(opCode(raw)(Discord.GatewayOpcode.INVALID_SESSION)));
 //# sourceMappingURL=invalidSession.js.map

package/DiscordGateway/Shard/invalidSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"invalidSession.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/invalidSession.ts"],"names":[],"mappings":";;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAEnC,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,GAA+C,EAC/C,WAA2C,EAC3C,EAAE,CACF,oBAIO,GAAsB,EAAE,CAAC,gBAAA,EAAE,CAAC,SAAS,EAJ5C,oBAGO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAa,CAAC,CAAC,CAAC,0CAAA,WAAW,CAAgB,CAAC,EAHjE,MAAM,CAAC,GAAG,CAAC,CACT,gBAAA,OAAO,CAAC,aAAa,CAAC,eAAe,CACtC,CACiE,CACrB,CAAA"}
+{"version":3,"file":"invalidSession.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/invalidSession.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAa,EAAE,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAe,MAAM,aAAa,CAAA;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAEnC,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,GAAgD,EAChD,WAAuD,EACvD,EAAE,CACF,oBAIO,GAAsB,EAAE,CAAC,EAAE,CAAC,SAAS,EAJ5C,oBAGO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,oBAAgB,MAAM,CAAC,IAAI,EAA3B,WAAW,CAAiB,CAAC,EAHlE,MAAM,CAAC,GAAG,CAAC,CACT,OAAO,CAAC,aAAa,CAAC,eAAe,CACtC,CACkE,CACtB,CAAA"}

package/DiscordGateway/Shard/sendEvents.d.ts

@@ -1,4 +1,4 @@
-import { Discord } from "dfx";
+import { Discord } from "dfx/_common";
 export declare const heartbeat: (d: Discord.Heartbeat) => Discord.GatewayPayload;
 export declare const identify: (d: Discord.Identify) => Discord.GatewayPayload;
 export declare const resume: (d: Discord.Resume) => Discord.GatewayPayload;

package/DiscordGateway/Shard/sendEvents.js

@@ -1,26 +1,26 @@
-import * as tsplus_module_1 from "dfx";
+import { Discord } from "dfx/_common";
 export const heartbeat = (d) => ({
-    op: tsplus_module_1.Discord.GatewayOpcode.HEARTBEAT,
+    op: Discord.GatewayOpcode.HEARTBEAT,
     d,
 });
 export const identify = (d) => ({
-    op: tsplus_module_1.Discord.GatewayOpcode.IDENTIFY,
+    op: Discord.GatewayOpcode.IDENTIFY,
     d,
 });
 export const resume = (d) => ({
-    op: tsplus_module_1.Discord.GatewayOpcode.RESUME,
+    op: Discord.GatewayOpcode.RESUME,
     d,
 });
 export const requestGuildMembers = (d) => ({
-    op: tsplus_module_1.Discord.GatewayOpcode.REQUEST_GUILD_MEMBERS,
+    op: Discord.GatewayOpcode.REQUEST_GUILD_MEMBERS,
     d,
 });
 export const voiceStateUpdate = (d) => ({
-    op: tsplus_module_1.Discord.GatewayOpcode.VOICE_STATE_UPDATE,
+    op: Discord.GatewayOpcode.VOICE_STATE_UPDATE,
     d,
 });
 export const presenceUpdate = (d) => ({
-    op: tsplus_module_1.Discord.GatewayOpcode.PRESENCE_UPDATE,
+    op: Discord.GatewayOpcode.PRESENCE_UPDATE,
     d,
 });
 //# sourceMappingURL=sendEvents.js.map

package/DiscordGateway/Shard/sendEvents.js.map

@@ -1 +1 @@
-{"version":3,"file":"sendEvents.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/sendEvents.ts"],"names":[],"mappings":";AAAA,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAoB,EAA0B,EAAE,CAAC,CAAC;IAC1E,EAAE,EAAE,gBAAA,OAAO,CAAC,aAAa,CAAC,SAAS;IACnC,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAmB,EAA0B,EAAE,CAAC,CAAC;IACxE,EAAE,EAAE,gBAAA,OAAO,CAAC,aAAa,CAAC,QAAQ;IAClC,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,CAAiB,EAA0B,EAAE,CAAC,CAAC;IACpE,EAAE,EAAE,gBAAA,OAAO,CAAC,aAAa,CAAC,MAAM;IAChC,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,CAA6B,EACL,EAAE,CAAC,CAAC;IAC5B,EAAE,EAAE,gBAAA,OAAO,CAAC,aAAa,CAAC,qBAAqB;IAC/C,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,CAA2B,EACH,EAAE,CAAC,CAAC;IAC5B,EAAE,EAAE,gBAAA,OAAO,CAAC,aAAa,CAAC,kBAAkB;IAC5C,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,CAAyB,EACD,EAAE,CAAC,CAAC;IAC5B,EAAE,EAAE,gBAAA,OAAO,CAAC,aAAa,CAAC,eAAe;IACzC,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"sendEvents.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/sendEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAErC,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAoB,EAA0B,EAAE,CAAC,CAAC;IAC1E,EAAE,EAAE,OAAO,CAAC,aAAa,CAAC,SAAS;IACnC,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAmB,EAA0B,EAAE,CAAC,CAAC;IACxE,EAAE,EAAE,OAAO,CAAC,aAAa,CAAC,QAAQ;IAClC,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,CAAiB,EAA0B,EAAE,CAAC,CAAC;IACpE,EAAE,EAAE,OAAO,CAAC,aAAa,CAAC,MAAM;IAChC,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,CAA6B,EACL,EAAE,CAAC,CAAC;IAC5B,EAAE,EAAE,OAAO,CAAC,aAAa,CAAC,qBAAqB;IAC/C,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,CAA2B,EACH,EAAE,CAAC,CAAC;IAC5B,EAAE,EAAE,OAAO,CAAC,aAAa,CAAC,kBAAkB;IAC5C,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,CAAyB,EACD,EAAE,CAAC,CAAC;IAC5B,EAAE,EAAE,OAAO,CAAC,aAAa,CAAC,eAAe;IACzC,CAAC;CACF,CAAC,CAAA"}

package/DiscordGateway/Shard/utils.d.ts

@@ -1,4 +1,3 @@
-import { EffectSource, Maybe, Ref } from "dfx/utils/common";
-import { Discord } from "dfx";
-export declare const opCode: <R, E>(source: import("callbag-effect-ts/Source").EffectSource<R, E, import("../../types.js").GatewayPayload<any>>) => <T = any>(code: Discord.GatewayOpcode) => import("callbag-effect-ts/Source").EffectSource<R, E, import("../../types.js").GatewayPayload<T>>;
-export declare const latest: <T>(f: (p: Discord.GatewayPayload) => import("../../index.js").Maybe<T>) => import("../../utils/common.js").Effect<never, never, readonly [import("../../utils/common.js").Ref<import("../../index.js").Maybe<T>>, (p: import("../../types.js").GatewayPayload<any>) => import("../../utils/common.js").Effect<never, never, void>]>;
+import { Discord, Effect, Option, Ref, Stream } from "dfx/_common";
+export declare const opCode: <R, E>(source: Stream.Stream<R, E, Discord.GatewayPayload<any>>) => <T = any>(code: Discord.GatewayOpcode) => Stream.Stream<R, E, Discord.GatewayPayload<T>>;
+export declare const latest: <T>(f: (p: Discord.GatewayPayload) => Option.Option<T>) => Effect.Effect<never, never, readonly [Ref.Ref<Option.Option<T>>, (p: Discord.GatewayPayload<any>) => Effect.Effect<never, never, void>]>;

package/DiscordGateway/Shard/utils.js

@@ -1,9 +1,9 @@
-import * as tsplus_module_1 from "callbag-effect-ts/Source/filter";
-import * as tsplus_module_2 from "@effect/io/Effect";
+import * as tsplus_module_1 from "@effect/stream/Stream";
+import * as tsplus_module_2 from "@effect/io/Ref";
 import * as tsplus_module_3 from "@fp-ts/data/Option";
-import * as tsplus_module_4 from "@effect/io/Ref";
-import * as tsplus_module_5 from "dfx/utils/common";
+import * as tsplus_module_4 from "@effect/io/Effect";
+import { Effect, flow, Option, Ref } from "dfx/_common";
 export const opCode = (source) => (code) => tsplus_module_1.filter((p) => p.op === code)(source);
-const maybeUpdateRef = (f, ref) => tsplus_module_5.flow(f, (o) => tsplus_module_3.match(tsplus_module_2.unit, (a) => tsplus_module_4.set(tsplus_module_3.some(a))(ref))(o));
-export const latest = (f) => tsplus_module_2.map((ref) => [ref, maybeUpdateRef(f, ref)])(tsplus_module_4.make(tsplus_module_3.none));
+const maybeUpdateRef = (f, ref) => flow(f, (o) => tsplus_module_3.match(Effect.unit, (a) => tsplus_module_2.set(Option.some(a))(ref))(o));
+export const latest = (f) => tsplus_module_4.map((ref) => [ref, maybeUpdateRef(f, ref)])(Ref.make(Option.none));
 //# sourceMappingURL=utils.js.map

package/DiscordGateway/Shard/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/utils.ts"],"names":[],"mappings":";;;;;AAAA,MAAM,CAAC,MAAM,MAAM,GACjB,CAAO,MAAkD,EAAE,EAAE,CAC7D,CAAU,IAA2B,EAAE,EAAE,CACvC,uBAAc,CAAC,CAAC,EAAkC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,EAAlE,MAAM,CAA6D,CAAA;AAEvE,MAAM,cAAc,GAAG,CACrB,CAA0C,EAC1C,GAAkB,EAClB,EAAE,CAAC,gBAAA,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,4CAAqB,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAQ,qBAAW,CAAC,CAAC,EAArB,GAAG,CAAmB,EAAlD,CAAC,CAAkD,CAAC,CAAA;AAExE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAI,CAA0C,EAAE,EAAE,CACtE,oBACE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,EAAE,GAAG,CAAC,CAAU,EADjD,0CAA8B,CAE7B,CAAA"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/utils.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAW,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAU,MAAM,aAAa,CAAA;AAExE,MAAM,CAAC,MAAM,MAAM,GACjB,CAAO,MAAmD,EAAE,EAAE,CAC9D,CAAU,IAA2B,EAAE,EAAE,CACvC,uBAAc,CAAC,CAAC,EAAkC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,EAAlE,MAAM,CAA6D,CAAA;AAEvE,MAAM,cAAc,GAAG,CACrB,CAAkD,EAClD,GAA8B,EAC9B,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,sBAAQ,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAQ,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAtB,GAAG,CAAoB,EAAnD,CAAC,CAAmD,CAAC,CAAA;AAEzE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAI,CAAkD,EAAE,EAAE,CAC9E,oBACE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,EAAE,GAAG,CAAC,CAAU,EADjD,GAAG,CAAC,IAAI,CAAmB,MAAM,CAAC,IAAI,CAAC,CAEtC,CAAA"}

package/DiscordGateway/ShardStore/index.d.ts

@@ -1,12 +1,12 @@
-import { Effect, Maybe } from "dfx/utils/common";
+import { Context, Effect, Layer, Option } from "dfx/_common";
 export interface ClaimIdContext {
     sharderCount: number;
     totalCount: number;
 }
 export interface ShardStore {
-    claimId: (ctx: ClaimIdContext) => Effect<never, never, Maybe<number>>;
-    allClaimed: (totalCount: number) => Effect<never, never, boolean>;
-    heartbeat?: (shardId: number) => Effect<never, never, void>;
+    claimId: (ctx: ClaimIdContext) => Effect.Effect<never, never, Option.Option<number>>;
+    allClaimed: (totalCount: number) => Effect.Effect<never, never, boolean>;
+    heartbeat?: (shardId: number) => Effect.Effect<never, never, void>;
 }
-export declare const ShardStore: import("../../utils/common.js").Tag<ShardStore>;
-export declare const LiveMemoryShardStore: import("../../utils/common.js").Layer<never, never, ShardStore>;
+export declare const ShardStore: Context.Tag<ShardStore>;
+export declare const LiveMemoryShardStore: Layer.Layer<never, never, ShardStore>;

package/DiscordGateway/ShardStore/index.js

@@ -1,22 +1,19 @@
-import * as tsplus_module_1 from "dfx/utils/common";
-import * as tsplus_module_2 from "@fp-ts/data/Option";
-import * as tsplus_module_3 from "@effect/io/Effect";
-import * as tsplus_module_4 from "@effect/io/Layer";
-export const ShardStore = tsplus_module_1.Tag();
+import { Context, Effect, Layer, Option } from "dfx/_common";
+export const ShardStore = Context.Tag();
 // Very basic shard id store, that does no health checks
 const memoryStore = () => {
     let currentId = 0;
     return {
-        claimId: ({ totalCount }) => tsplus_module_3.sync(() => {
+        claimId: ({ totalCount }) => Effect.sync(() => {
             if (currentId >= totalCount) {
-                return tsplus_module_2.none;
+                return Option.none;
             }
             const id = currentId;
             currentId++;
-            return tsplus_module_2.some(id);
+            return Option.some(id);
         }),
-        allClaimed: (totalCount) => tsplus_module_3.sync(() => currentId >= totalCount),
+        allClaimed: (totalCount) => Effect.sync(() => currentId >= totalCount),
     };
 };
-export const LiveMemoryShardStore = tsplus_module_4.sync(ShardStore)(memoryStore);
+export const LiveMemoryShardStore = Layer.sync(ShardStore)(memoryStore);
 //# sourceMappingURL=index.js.map

package/DiscordGateway/ShardStore/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/ShardStore/index.ts"],"names":[],"mappings":";;;;AAUA,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAA,GAAG,EAAc,CAAA;AAE3C,wDAAwD;AACxD,MAAM,WAAW,GAAG,GAAe,EAAE;IACnC,IAAI,SAAS,GAAG,CAAC,CAAA;IAEjB,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAC1B,qBAAY,GAAG,EAAE;YACf,IAAI,SAAS,IAAI,UAAU,EAAE;gBAC3B,4BAAiB;aAClB;YAED,MAAM,EAAE,GAAG,SAAS,CAAA;YACpB,SAAS,EAAE,CAAA;YACX,OAAO,qBAAW,EAAE,CAAC,CAAA;QACvB,CAAC,CAAC;QAEJ,UAAU,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,qBAAY,GAAG,EAAE,CAAC,SAAS,IAAI,UAAU,CAAC;KACvE,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,qBAAW,UAAU,CAAC,CAAC,WAAW,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/ShardStore/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAc5D,MAAM,CAAC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAc,CAAA;AAEnD,wDAAwD;AACxD,MAAM,WAAW,GAAG,GAAe,EAAE;IACnC,IAAI,SAAS,GAAG,CAAC,CAAA;IAEjB,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YACf,IAAI,SAAS,IAAI,UAAU,EAAE;gBAC3B,OAAO,MAAM,CAAC,IAAI,CAAA;aACnB;YAED,MAAM,EAAE,GAAG,SAAS,CAAA;YACpB,SAAS,EAAE,CAAA;YACX,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACxB,CAAC,CAAC;QAEJ,UAAU,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,IAAI,UAAU,CAAC;KACvE,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC,CAAA"}

package/DiscordGateway/Sharder/index.d.ts

@@ -1,18 +1,18 @@
-import { Effect, Maybe, EffectSource } from "dfx/utils/common";
-import { Discord } from "dfx";
+import { Config, DiscordREST, RateLimiter } from "dfx";
 import { Success } from "dfx/utils/effect";
+import { Context, Discord, Effect, Layer, Scope, Stream } from "dfx/_common";
 import { ShardStore } from "../ShardStore/index.js";
-declare const make: import("../../utils/common.js").Effect<import("../../index.js").DiscordREST | import("../DiscordWS/index.js").DiscordWSCodec | import("../../Log/index.js").Log | ShardStore | import("../../DiscordConfig/index.js").DiscordConfig | import("../../index.js").RateLimiter, never, {
-    shards: import("callbag-effect-ts/Source").EffectSource<never, never, {
-        run: import("../../utils/common.js").Effect<never, never, void>;
-        raw: import("callbag-effect-ts/Source").EffectSource<never, never, import("../../types.js").GatewayPayload<any>>;
-        dispatch: import("callbag-effect-ts/Source").EffectSource<never, never, import("../../types.js").GatewayPayload<import("../../types.js").ReceiveEvent>>;
-        send: (p: import("../../types.js").GatewayPayload<any>) => import("../../utils/common.js").Effect<never, never, boolean>;
-        reconnect: import("../../utils/common.js").Effect<never, never, boolean>;
+declare const make: Effect.Effect<Scope.Scope | DiscordREST | Config.DiscordConfig | import("../../Log/index.js").Log | RateLimiter | import("../DiscordWS/index.js").DiscordWSCodec | ShardStore, never, {
+    shards: Stream.Stream<never, never, {
+        run: Effect.Effect<never, never, void>;
+        raw: Stream.Stream<never, never, Discord.GatewayPayload<any>>;
+        dispatch: Stream.Stream<never, never, Discord.GatewayPayload<Discord.ReceiveEvent>>;
+        send: (p: Discord.GatewayPayload<any>) => Effect.Effect<never, never, boolean>;
+        reconnect: Effect.Effect<never, never, boolean>;
     }>;
 }>;
 export interface Sharder extends Success<typeof make> {
 }
-export declare const Sharder: import("../../utils/common.js").Tag<Sharder>;
-export declare const LiveSharder: import("../../utils/common.js").Layer<import("../../index.js").DiscordREST | import("../DiscordWS/index.js").DiscordWSCodec | import("../../Log/index.js").Log | ShardStore | import("../../DiscordConfig/index.js").DiscordConfig | import("../../index.js").RateLimiter, never, Sharder>;
+export declare const Sharder: Context.Tag<Sharder>;
+export declare const LiveSharder: Layer.Layer<DiscordREST | Config.DiscordConfig | import("../../Log/index.js").Log | RateLimiter | import("../DiscordWS/index.js").DiscordWSCodec | ShardStore, never, Sharder>;
 export {};

package/DiscordGateway/Sharder/index.js

@@ -1,50 +1,29 @@
-import * as tsplus_module_1 from "callbag-effect-ts/Source/fromEffect";
-import * as tsplus_module_2 from "callbag-effect-ts/Source/drain";
-import * as tsplus_module_3 from "callbag-effect-ts/Source/of";
-import * as tsplus_module_4 from "callbag-effect-ts/Source/merge";
-import * as tsplus_module_5 from "@effect/io/Effect";
-import * as tsplus_module_6 from "dfx/gateway";
-import * as tsplus_module_7 from "callbag-effect-ts/Source/tap";
-import * as tsplus_module_8 from "callbag-effect-ts/Source/mapEffect";
-import * as tsplus_module_9 from "callbag-effect-ts/Source/map";
-import * as tsplus_module_10 from "callbag-effect-ts/Source/groupBy";
-import * as tsplus_module_11 from "callbag-effect-ts/Source/chainPar";
-import * as tsplus_module_12 from "callbag-effect-ts/Source/share";
-import * as tsplus_module_13 from "@fp-ts/data/Duration";
-import * as tsplus_module_14 from "@fp-ts/data/Option";
-import * as tsplus_module_15 from "callbag-effect-ts/Source/empty";
-import * as tsplus_module_16 from "callbag-effect-ts/Source/resource";
-import * as tsplus_module_17 from "dfx";
-import * as tsplus_module_18 from "dfx/utils/common";
-import { millis } from "@fp-ts/data/Duration";
-import { overridePull } from "callbag-effect-ts/Source";
+import * as tsplus_module_1 from "@effect/stream/Stream";
+import * as tsplus_module_2 from "@effect/stream/GroupBy";
+import * as tsplus_module_3 from "@effect/io/Effect";
+import * as tsplus_module_4 from "@fp-ts/data/Option";
+import { Config, DiscordREST, RateLimiter } from "dfx";
+import { Shard } from "dfx/gateway";
+import { Context, Duration, Effect, Layer, Option, Scope, Stream, } from "dfx/_common";
 import { ShardStore } from "../ShardStore/index.js";
-const make = tsplus_module_5.flatMap(store => tsplus_module_5.flatMap(rest => tsplus_module_5.flatMap(({ gateway: config }) => tsplus_module_5.flatMap(limiter => {
+const _scope = Scope.ScopeTypeId;
+const make = tsplus_module_3.flatMap(store => tsplus_module_3.flatMap(rest => tsplus_module_3.flatMap(({ gateway: config }) => tsplus_module_3.flatMap(limiter => {
     const configs = (totalCount) => {
-        const claimId = (sharderCount) => tsplus_module_5.flatMap((a) => tsplus_module_14.match(() => tsplus_module_5.delay(tsplus_module_13.minutes(3))(tsplus_module_5.succeed([
-            tsplus_module_14.some(sharderCount),
-            tsplus_module_15.empty,
-        ])), (id) => tsplus_module_5.succeed([
-            tsplus_module_14.some(sharderCount + 1),
-            tsplus_module_3.of(id),
-        ]))(a))(store
+        const claimId = (sharderCount) => tsplus_module_3.flatMap((a) => tsplus_module_4.match(() => tsplus_module_3.delay(Duration.minutes(3))(claimId(sharderCount)), (id) => Effect.succeed(id))(a))(store
             .claimId({
             totalCount,
             sharderCount,
         }));
-        return tsplus_module_9.map((id) => ({
+        return tsplus_module_1.map((id) => ({
             id,
             totalCount,
-        }))(tsplus_module_16.resource(0, (sharderCount) => tsplus_module_1.fromEffect(claimId(sharderCount))));
+        }))(Stream.unfoldEffect(0, (sharderCount) => tsplus_module_3.map((id) => Option.some([id, sharderCount + 1]))(claimId(sharderCount))));
     };
-    return tsplus_module_5.flatMap(gateway => {
-        const [source, pull] = overridePull(configs(config.shardCount ?? gateway.shards), gateway.session_start_limit.max_concurrency);
-        return tsplus_module_5.map(shards => ({ shards }))(tsplus_module_12.share(tsplus_module_11.chainPar((shard) => tsplus_module_4.merge(tsplus_module_2.drain(tsplus_module_1.fromEffect(shard.run)))(tsplus_module_3.of(shard)))(tsplus_module_7.tap(() => tsplus_module_5.sync(pull))(tsplus_module_11.chainPar(([shardConfig, key]) => tsplus_module_8.mapEffect((c) => tsplus_module_6.Shard.make([c.id, c.totalCount]))(tsplus_module_7.tap(() => limiter.maybeWait(`dfx.sharder.${key}`, millis(config.identifyRateLimit[0]), config.identifyRateLimit[1]))(shardConfig)))(tsplus_module_10.groupBy((c) => c.id % c.concurrency)(tsplus_module_9.map((config) => ({
-            ...config,
-            url: gateway.url,
-            concurrency: gateway.session_start_limit.max_concurrency,
-        }))(source)))))));
-    })(tsplus_module_5.catchAll(() => tsplus_module_5.succeed({
+    return tsplus_module_3.flatMap(gateway => tsplus_module_3.map(shards => ({ shards }))(tsplus_module_1.broadcastDynamic(1)(tsplus_module_1.flatMap((shard) => tsplus_module_1.merge(tsplus_module_1.drain(Stream.fromEffect(shard.run)))(Stream.succeed(shard)))(tsplus_module_2.evaluate((key, shardConfig) => tsplus_module_1.mapEffect((c) => Shard.make([c.id, c.totalCount]))(tsplus_module_1.tap(() => limiter.maybeWait(`dfx.sharder.${key}`, Duration.millis(config.identifyRateLimit[0]), config.identifyRateLimit[1]))(shardConfig)))(tsplus_module_1.groupBy((c) => Effect.succeed([c.id % c.concurrency, c]))(tsplus_module_1.map((config) => ({
+        ...config,
+        url: gateway.url,
+        concurrency: gateway.session_start_limit.max_concurrency,
+    }))(configs(config.shardCount ?? gateway.shards))))))))(tsplus_module_3.catchAll(() => Effect.succeed({
         url: "wss://gateway.discord.gg/",
         shards: 1,
         session_start_limit: {
@@ -53,9 +32,9 @@ const make = tsplus_module_5.flatMap(store => tsplus_module_5.flatMap(rest => ts
             reset_after: 0,
             max_concurrency: 1,
         },
-    }))(tsplus_module_5.flatMap((r) => r.json)(rest
+    }))(tsplus_module_3.flatMap((r) => r.json)(rest
         .getGatewayBot())));
-})(tsplus_module_5.service(tsplus_module_17.RateLimiter)))(tsplus_module_5.service(tsplus_module_17.Config.DiscordConfig)))(tsplus_module_5.service(tsplus_module_17.DiscordREST)))(tsplus_module_5.service(ShardStore));
-export const Sharder = tsplus_module_18.Tag();
-export const LiveSharder = tsplus_module_5.toLayer(Sharder)(make);
+})(Effect.service(RateLimiter)))(Effect.service(Config.DiscordConfig)))(Effect.service(DiscordREST)))(Effect.service(ShardStore));
+export const Sharder = Context.Tag();
+export const LiveSharder = Layer.scoped(Sharder)(make);
 //# sourceMappingURL=index.js.map

package/DiscordGateway/Sharder/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Sharder/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Sharder/index.ts"],"names":[],"mappings":"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"}

package/DiscordGateway/WS/index.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="ws" />
-import { Ref, Effect, EffectSource } from "dfx/utils/common";
+import { Log } from "dfx/Log/index";
+import { Effect, Ref, Stream } from "dfx/_common";
 import WebSocket from "isomorphic-ws";
 export declare const Reconnect: unique symbol;
 export type Reconnect = typeof Reconnect;
@@ -16,4 +17,4 @@ export declare class WebSocketCloseError {
     readonly _tag = "WebSocketCloseError";
     constructor(code: number, reason: string);
 }
-export declare const make: (url: Ref<string>, takeOutbound: Effect<never, never, Message>) => import("../../utils/common.js").Effect<import("../../Log/index.js").Log, never, import("callbag-effect-ts/Source").EffectSource<never, WebSocketError | WebSocketCloseError, WebSocket.Data>>;
+export declare const make: (url: Ref.Ref<string>, takeOutbound: Effect.Effect<never, never, Message>) => Stream.Stream<Log, WebSocketError | WebSocketCloseError, WebSocket.Data>;

package/DiscordGateway/WS/index.js

@@ -1,20 +1,10 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
 import * as tsplus_module_2 from "@effect/io/Ref";
-import * as tsplus_module_3 from "callbag-effect-ts/Source/async";
-import * as tsplus_module_4 from "callbag-effect-ts/Source/repeatEffectOption";
-import * as tsplus_module_5 from "callbag-effect-ts/Source/unwrap";
-import * as tsplus_module_6 from "callbag-effect-ts/Source/tap";
-import * as tsplus_module_7 from "callbag-effect-ts/Source/drain";
-import * as tsplus_module_8 from "dfx";
-import * as tsplus_module_9 from "@effect/io/Schedule";
-import * as tsplus_module_10 from "callbag-effect-ts/Source/merge";
-import * as tsplus_module_11 from "callbag-effect-ts/Source/unwrapScope";
-import * as tsplus_module_12 from "callbag-effect-ts/Source/retry";
+import * as tsplus_module_3 from "@effect/stream/Stream";
+import { Log } from "dfx/Log/index";
+import { Effect, pipe, Schedule, Stream } from "dfx/_common";
 import WebSocket from "isomorphic-ws";
 export const Reconnect = Symbol();
-const socket = (urlRef) => tsplus_module_1.acquireRelease(tsplus_module_1.map(url => new WebSocket(url))(tsplus_module_2.get(urlRef)), (ws) => tsplus_module_1.sync(() => {
-    ws.close();
-}));
 export class WebSocketError {
     reason;
     _tag = "WebSocketError";
@@ -31,9 +21,21 @@ export class WebSocketCloseError {
         this.reason = reason;
     }
 }
-const recv = (ws) => tsplus_module_3.async((emit) => {
+const socket = (urlRef) => tsplus_module_1.acquireRelease(tsplus_module_1.flatMap(url => {
+    const ws = new WebSocket(url);
+    return tsplus_module_1.map(() => ws)(Effect.async((resume) => {
+        ws.addEventListener("open", () => resume(Effect.unit()), {
+            once: true,
+        });
+    }));
+})(tsplus_module_2.get(urlRef)), (ws) => Effect.sync(() => {
+    ;
+    ws.removeAllListeners?.();
+    ws.close();
+}));
+const recv = (ws) => Stream.asyncEffect((emit) => Effect.sync(() => {
     ws.addEventListener("message", (message) => {
-        emit.data(message.data);
+        emit.single(message.data);
     });
     ws.addEventListener("error", (cause) => {
         emit.fail(new WebSocketError(cause));
@@ -41,32 +43,20 @@ const recv = (ws) => tsplus_module_3.async((emit) => {
     ws.addEventListener("close", (e) => {
         emit.fail(new WebSocketCloseError(e.code, e.reason));
     });
-    return () => {
-        ;
-        ws.removeAllListeners?.();
-    };
-});
-const send = (ws, take) => tsplus_module_1.map(log => tsplus_module_7.drain(tsplus_module_6.tap((data) => tsplus_module_1.async((resume) => {
+}));
+const send = (ws, take, log) => tsplus_module_1.forever(tsplus_module_1.tap((data) => {
     if (data === Reconnect) {
-        ws.close(1012, "reconnecting");
-        resume(tsplus_module_1.fail(new WebSocketCloseError(1012, "reconnecting")));
+        return Effect.failSync(() => {
+            ws.close(1012, "reconnecting");
+            return new WebSocketCloseError(1012, "reconnecting");
+        });
     }
-    else {
+    return Effect.sync(() => {
         ws.send(data);
-        resume(tsplus_module_1.unit());
-    }
-}))(tsplus_module_6.tap((p) => log.debug("WS", "send", p))(tsplus_module_5.unwrap(tsplus_module_1.map(() => tsplus_module_4.repeatEffectOption(take))(tsplus_module_1.async((resume) => {
-    if (ws.readyState & ws.OPEN) {
-        resume(tsplus_module_1.unit());
-    }
-    else {
-        ws.addEventListener("open", () => {
-            resume(tsplus_module_1.unit());
-        }, { once: true });
-    }
-})))))))(tsplus_module_1.service(tsplus_module_8.Log.Log));
-export const make = (url, takeOutbound) => tsplus_module_1.map(log => {
-    const withLog = tsplus_module_1.provideService(tsplus_module_8.Log.Log)(log);
-    return tsplus_module_12.retry(tsplus_module_9.recurWhile((e) => e._tag === "WebSocketCloseError" && e.code === 1012))(tsplus_module_11.unwrapScope(tsplus_module_1.flatMap(ws => tsplus_module_1.map(sendEffect => tsplus_module_10.merge(sendEffect)(recv(ws)))(withLog(send(ws, takeOutbound))))(socket(url))));
-})(tsplus_module_1.service(tsplus_module_8.Log.Log));
+    });
+})(tsplus_module_1.tap((data) => log.debug("WS", "send", data))(take)));
+export const make = (url, takeOutbound) => pipe(tsplus_module_1.flatMap(log => tsplus_module_1.map(ws => {
+    const sendEffect = send(ws, takeOutbound, log);
+    return tsplus_module_3.retry(Schedule.recurWhile((e) => e._tag === "WebSocketCloseError" && e.code === 1012))(tsplus_module_3.merge(Stream.fromEffect(sendEffect))(recv(ws)));
+})(socket(url)))(Effect.service(Log)), Stream.unwrapScoped);
 //# sourceMappingURL=index.js.map

package/DiscordGateway/WS/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/WS/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/WS/index.ts"],"names":[],"mappings":"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"}

package/DiscordGateway/index.d.ts

@@ -1,14 +1,13 @@
-import { EffectSource, Effect } from "dfx/utils/common";
-import { Discord } from "dfx";
 import { Success } from "dfx/utils/effect";
+import { Context, Discord, Effect, Layer, Scope, Stream } from "dfx/_common";
 import { Sharder } from "./Sharder/index.js";
-export declare const make: import("../utils/common.js").Effect<Sharder, never, {
-    raw: import("callbag-effect-ts/Source").EffectSource<never, never, import("../types.js").GatewayPayload<any>>;
-    dispatch: import("callbag-effect-ts/Source").EffectSource<never, never, import("../types.js").GatewayPayload<import("../types.js").ReceiveEvent>>;
-    fromDispatch: <K extends keyof import("../types.js").ReceiveEvents>(event: K) => import("callbag-effect-ts/Source").EffectSource<never, never, import("../types.js").ReceiveEvents[K]>;
-    handleDispatch: <K_1 extends keyof import("../types.js").ReceiveEvents, R1, E1, A>(event: K_1, handle: (event: import("../types.js").ReceiveEvents[K_1]) => import("../utils/common.js").Effect<R1, E1, A>) => import("../utils/common.js").Effect<R1, E1, void>;
+export declare const make: Effect.Effect<Scope.Scope | Sharder, never, {
+    raw: Stream.Stream<never, never, Discord.GatewayPayload<any>>;
+    dispatch: Stream.Stream<never, never, Discord.GatewayPayload<Discord.ReceiveEvent>>;
+    fromDispatch: <K extends keyof Discord.ReceiveEvents>(event: K) => Stream.Stream<never, never, Discord.ReceiveEvents[K]>;
+    handleDispatch: <K_1 extends keyof Discord.ReceiveEvents, R1, E1, A>(event: K_1, handle: (event: Discord.ReceiveEvents[K_1]) => Effect.Effect<R1, E1, A>) => Effect.Effect<R1, E1, void>;
 }>;
 export interface DiscordGateway extends Success<typeof make> {
 }
-export declare const DiscordGateway: import("../utils/common.js").Tag<DiscordGateway>;
-export declare const LiveDiscordGateway: import("../utils/common.js").Layer<Sharder, never, DiscordGateway>;
+export declare const DiscordGateway: Context.Tag<DiscordGateway>;
+export declare const LiveDiscordGateway: Layer.Layer<Sharder, never, DiscordGateway>;

package/DiscordGateway/index.js

@@ -1,16 +1,11 @@
-import * as tsplus_module_1 from "callbag-effect-ts/Source/filter";
-import * as tsplus_module_2 from "callbag-effect-ts/Source/map";
-import * as tsplus_module_3 from "callbag-effect-ts/Source/fromEffect";
-import * as tsplus_module_4 from "callbag-effect-ts/Source/chainPar";
-import * as tsplus_module_5 from "callbag-effect-ts/Source/run";
-import * as tsplus_module_6 from "callbag-effect-ts/Source/share";
-import * as tsplus_module_7 from "@effect/io/Effect";
-import * as tsplus_module_8 from "dfx/utils/common";
-import * as tsplus_module_9 from "@effect/io/Layer";
+import * as tsplus_module_1 from "@effect/stream/Stream";
+import * as tsplus_module_2 from "@effect/io/Effect";
+import { Context, Effect, Layer, pipe, Scope, Stream, } from "dfx/_common";
 import { Sharder } from "./Sharder/index.js";
-const fromDispatchFactory = (source) => (event) => tsplus_module_2.map((p) => p.d)(tsplus_module_1.filter((p) => p.t === event)(source));
-const handleDispatchFactory = (source) => (event, handle) => tsplus_module_5.runDrain(tsplus_module_4.chainPar((a) => tsplus_module_3.fromEffect(handle(a.d)))(tsplus_module_1.filter((p) => p.t === event)(source)));
-export const make = tsplus_module_7.flatMap(sharder => tsplus_module_7.flatMap(raw => tsplus_module_7.map(dispatch => {
+const _scope = Scope.ScopeTypeId;
+const fromDispatchFactory = (source) => (event) => tsplus_module_1.map((p) => p.d)(tsplus_module_1.filter((p) => p.t === event)(source));
+const handleDispatchFactory = (source) => (event, handle) => tsplus_module_1.runDrain(pipe(tsplus_module_1.filter((p) => p.t === event)(source), Stream.flatMapPar(128)((a) => Stream.fromEffect(handle(a.d)))));
+export const make = tsplus_module_2.flatMap(sharder => tsplus_module_2.flatMap(raw => tsplus_module_2.map(dispatch => {
     const fromDispatch = fromDispatchFactory(dispatch);
     const handleDispatch = handleDispatchFactory(dispatch);
     return {
@@ -19,7 +14,7 @@ export const make = tsplus_module_7.flatMap(sharder => tsplus_module_7.flatMap(r
         fromDispatch,
         handleDispatch,
     };
-})(tsplus_module_6.share(tsplus_module_4.chainPar((s) => s.dispatch)(sharder.shards))))(tsplus_module_6.share(tsplus_module_4.chainPar((s) => s.raw)(sharder.shards))))(tsplus_module_7.service(Sharder));
-export const DiscordGateway = tsplus_module_8.Tag();
-export const LiveDiscordGateway = tsplus_module_9.fromEffect(DiscordGateway)(make);
+})(tsplus_module_1.broadcastDynamic(1)(pipe(sharder.shards, Stream.flatMapPar(1024)((s) => s.dispatch)))))(tsplus_module_1.broadcastDynamic(1)(pipe(sharder.shards, Stream.flatMapPar(1024)((s) => s.raw)))))(Effect.service(Sharder));
+export const DiscordGateway = Context.Tag();
+export const LiveDiscordGateway = Layer.scoped(DiscordGateway)(make);
 //# sourceMappingURL=index.js.map

package/DiscordGateway/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/DiscordGateway/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAE5C,MAAM,mBAAmB,GACvB,CACE,MAAwE,EACxE,EAAE,CACJ,CACE,KAAQ,EACsC,EAAE,CAChD,oBAAwC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAS,EAA1D,uBAAc,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,EAAlC,MAAM,CAA6B,CAAwB,CAAA;AAE/D,MAAM,qBAAqB,GACzB,CACE,MAAwE,EACxE,EAAE,CACJ,CACE,KAAQ,EACR,MAA8D,EAChC,EAAE,0BAChC,yBAEY,CAAC,CAAC,EAAE,EAAE,CAAC,2BAAwB,MAAM,CAAC,CAAC,CAAC,CAAQ,CAAC,CAAC,EAF9D,uBACU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,EAD9B,MAAM,CACyB,CACgC,CAAS,CAAA;AAE5E,MAAM,CAAC,MAAM,IAAI,2BACT,OAAO,4BACP,GAAG,wBACH,QAAQ;IACd,MAAM,YAAY,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAA;IAClD,MAAM,cAAc,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAA;IAEtD,OAAO;QACL,GAAG;QACH,QAAQ;QACR,YAAY;QACZ,cAAc;KACf,CAAA;yBATkB,yBAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAzC,OAAO,CAAC,MAAM,CAA4B,0BAD/C,yBAAwB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,EAApC,OAAO,CAAC,MAAM,CAAuB,IADjC,wBAAe,OAAO,CAAC,CAYzC,CAAA;AAGF,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,kBAAkB,GAAG,2BAAiB,cAAc,CAAC,CAAC,IAAI,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/DiscordGateway/index.ts"],"names":[],"mappings":";;AACA,OAAO,EACL,OAAO,EAEP,MAAM,EACN,KAAK,EACL,IAAI,EACJ,KAAK,EACL,MAAM,GACP,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAE5C,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,CAAA;AAEhC,MAAM,mBAAmB,GACvB,CACE,MAAyE,EACzE,EAAE,CACJ,CACE,KAAQ,EACuC,EAAE,CACjD,oBAAwC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAS,EAA1D,uBAAc,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,EAAlC,MAAM,CAA6B,CAAwB,CAAA;AAE/D,MAAM,qBAAqB,GACzB,CACE,MAAyE,EACzE,EAAE,CACJ,CACE,KAAQ,EACR,MAAqE,EAChC,EAAE,0BACvC,IAAI,CACF,uBAAc,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,EAAlC,MAAM,CAA6B,EACnC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAQ,CAAC,CAAC,CAAC,CACrE,CAAS,CAAA;AAEd,MAAM,CAAC,MAAM,IAAI,2BACT,OAAO,4BACP,GAAG,wBAMH,QAAQ;IAMd,MAAM,YAAY,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAA;IAClD,MAAM,cAAc,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAA;IAEtD,OAAO;QACL,GAAG;QACH,QAAQ;QACR,YAAY;QACZ,cAAc;KACf,CAAA;GAbC,iCAGmB,CAAC,EAHpB,IAAI,CACF,OAAO,CAAC,MAAM,EACd,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAC3C,CAAoB,GATrB,iCAGmB,CAAC,EAHpB,IAAI,CACF,OAAO,CAAC,MAAM,EACd,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CACtC,CAAoB,GALL,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAsBzC,CAAA;AAGF,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,EAAkB,CAAA;AAC3D,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAA"}