dfx 0.50.0 → 0.51.0

package/RateLimit.js

@@ -1,22 +1,24 @@
 import * as tsplus_module_1 from "dfx/_common";
 import * as tsplus_module_2 from "@effect/io/Layer";
-import * as tsplus_module_3 from "@effect/io/Effect";
+import * as tsplus_module_3 from "@effect/data/Duration";
+import * as tsplus_module_4 from "@effect/io/Effect";
+import * as tsplus_module_5 from "@effect/data/Function";
 import { delayFrom } from "./RateLimit/utils.js";
 import * as Memory from "./RateLimit/memory.js";
 import { Log } from "dfx/Log";
 export const RateLimitStore = tsplus_module_1.Tag();
 export const LiveMemoryRateLimitStore = tsplus_module_2.sync(RateLimitStore, Memory.make);
-const makeLimiter = tsplus_module_3.flatMap(RateLimitStore, store => tsplus_module_3.map(Log, log => {
+const makeLimiter = tsplus_module_4.flatMap(tsplus_module_4.map(RateLimitStore, tsplus_module_5.identity), store => tsplus_module_4.map(tsplus_module_4.map(Log, tsplus_module_5.identity), log => {
     const maybeWait = (key, window, limit, multiplier = 1.05) => {
-        const windowMs = window.millis * multiplier;
-        return tsplus_module_3.asUnit(tsplus_module_3.tap(tsplus_module_3.tap(tsplus_module_3.map(store
+        const windowMs = tsplus_module_3.toMillis(window) * multiplier;
+        return tsplus_module_4.asUnit(tsplus_module_4.tap(tsplus_module_4.tap(tsplus_module_4.map(store
             .incrementCounter(key, windowMs, limit), ([count, ttl]) => delayFrom(windowMs, limit, count, ttl)), d => log.debug("RateLimitStore maybeWait", {
             key,
-            window: window.millis,
+            window: tsplus_module_3.toMillis(window),
             windowMs,
             limit,
-            delay: d.millis,
-        })), _ => (_.millis === 0 ? tsplus_module_3.unit() : tsplus_module_3.sleep(_))));
+            delay: tsplus_module_3.toMillis(d),
+        })), _ => (tsplus_module_3.toMillis(_) === 0 ? tsplus_module_4.unit : tsplus_module_4.sleep(_))));
     };
     return { maybeWait };
 }));

package/RateLimit.js.map

@@ -1 +1 @@
-{"version":3,"file":"RateLimit.js","sourceRoot":"","sources":["src/RateLimit.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AA+B7B,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,wBAAwB,GAAG,qBAAW,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;AAE/E,MAAM,WAAW,2BACC,cAAc,EAAxB,KAAK,wBACG,GAAG,EAAX,GAAG;IAET,MAAM,SAAS,GAAG,CAChB,GAAW,EACX,MAAgB,EAChB,KAAa,EACb,UAAU,GAAG,IAAI,EACjB,EAAE;QACF,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,GAAG,UAAU,CAAA;QAE3C,8BAAO,oBAAA,oBAAA,oBAAA,KAAK;aACT,gBAAgB,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,EAClC,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,EACzD,CAAC,CAAC,EAAE,CACP,GAAG,CAAC,KAAK,CAAC,0BAA0B,EAAE;YACpC,GAAG;YACH,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,QAAQ;YACR,KAAK;YACL,KAAK,EAAE,CAAC,CAAC,MAAM;SAChB,CAAC,CACH,EACI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,sBAAa,CAAC,CAAC,CAAC,sBAAa,CAAC,CAAC,CAAC,CAAC,EAAO;IACxE,CAAC,CAAA;IAED,OAAO,EAAE,SAAS,EAAE,CAAA;GACpB,CAAA;AAGF,MAAM,CAAC,MAAM,WAAW,GAAG,gBAAA,GAAG,EAAe,CAAA;AAC7C,MAAM,CAAC,MAAM,eAAe,GAAG,uBAAa,WAAW,EAAE,WAAW,CAAC,CAAA"}
+{"version":3,"file":"RateLimit.js","sourceRoot":"","sources":["src/RateLimit.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AA+B7B,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,wBAAwB,GAAG,qBAAW,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;AAE/E,MAAM,WAAW,2BACC,oBAAA,cAAc,kBAAY,QAAQ,CAAC,EAA7C,KAAK,wBACG,oBAAA,GAAG,kBAAY,QAAQ,CAAC,EAAhC,GAAG;IAET,MAAM,SAAS,GAAG,CAChB,GAAW,EACX,MAAgB,EAChB,KAAa,EACb,UAAU,GAAG,IAAI,EACjB,EAAE;QACF,MAAM,QAAQ,GAAG,yBAAA,MAAM,IAAY,UAAU,CAAA;QAE7C,8BAAO,oBAAA,oBAAA,oBAAA,KAAK;aACT,gBAAgB,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,EAClC,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,EACzD,CAAC,CAAC,EAAE,CACP,GAAG,CAAC,KAAK,CAAC,0BAA0B,EAAE;YACpC,GAAG;YACH,MAAM,2BAAE,MAAM,CAAS;YACvB,QAAQ;YACR,KAAK;YACL,KAAK,2BAAE,CAAC,CAAS;SAClB,CAAC,CACH,EACI,CAAC,CAAC,EAAE,CAAC,CAAC,yBAAA,CAAC,MAAc,CAAC,CAAC,CAAC,sBAAa,CAAC,CAAC,sBAAa,CAAC,CAAC,CAAC,CAAC,EAAO;IACxE,CAAC,CAAA;IAED,OAAO,EAAE,SAAS,EAAE,CAAA;GACpB,CAAA;AAGF,MAAM,CAAC,MAAM,WAAW,GAAG,gBAAA,GAAG,EAAe,CAAA;AAC7C,MAAM,CAAC,MAAM,eAAe,GAAG,uBAAa,WAAW,EAAE,WAAW,CAAC,CAAA"}

package/global.d.ts

@@ -9,7 +9,7 @@ import { Tag, Discord } from "dfx/_common";
 /**
  * @tsplus global
  */
-import { pipe, flow, identity } from "@effect/data/Function";
+import { pipe, identity } from "@effect/data/Function";
 /**
  * @tsplus global
  */

package/global.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["src/global.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EACV,KAAK,EACL,MAAM,EACN,YAAY,EACZ,WAAW,EACX,QAAQ,EACR,MAAM,EACN,IAAI,EACJ,GAAG,EACH,KAAK,EACL,YAAY,EACZ,OAAO,EACP,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,MAAM,EACN,KAAK,EACL,OAAO,EACP,QAAQ,EACR,KAAK,EACL,MAAM,EACN,OAAO,EACP,KAAK,EACL,GAAG,EACH,OAAO,GACR,MAAM,aAAa,CAAA;AAEpB;;GAEG;AACH,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C;;GAEG;AACH,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAE5D;;GAEG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA"}
+{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["src/global.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EACV,KAAK,EACL,MAAM,EACN,YAAY,EACZ,WAAW,EACX,QAAQ,EACR,MAAM,EACN,IAAI,EACJ,GAAG,EACH,KAAK,EACL,YAAY,EACZ,OAAO,EACP,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,MAAM,EACN,KAAK,EACL,OAAO,EACP,QAAQ,EACR,KAAK,EACL,MAAM,EACN,OAAO,EACP,KAAK,EACL,GAAG,EACH,OAAO,GACR,MAAM,aAAa,CAAA;AAEpB;;GAEG;AACH,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C;;GAEG;AACH,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAEtD;;GAEG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dfx",
-    "version": "0.50.0",
+    "version": "0.51.0",
     "type": "module",
     "publishConfig": {
         "access": "public",
@@ -25,21 +25,21 @@
     },
     "devDependencies": {
         "@tim-smart/discord-api-docs-parser": "^0.5.5",
-        "@tsplus-types/effect__data": "0.12.5-11739c0",
-        "@tsplus-types/effect__io": "0.26.0-11739c0",
-        "@tsplus-types/effect__stream": "0.22.0-11739c0",
+        "@tsplus-types/effect__data": "0.13.5-11739c0",
+        "@tsplus-types/effect__io": "0.31.3-11739c0",
+        "@tsplus-types/effect__stream": "0.25.1-11739c0",
         "@types/ws": "^8.5.5",
-        "dotenv": "^16.1.4",
-        "lerna": "^7.0.0",
+        "dotenv": "^16.3.1",
+        "lerna": "^7.1.1",
         "madge": "^6.1.0",
         "typescript": "https://cdn.jsdelivr.net/npm/@tsplus/installer@0.0.177/compiler/typescript.tgz"
     },
     "dependencies": {
-        "@effect-http/client": "^0.27.0",
-        "@effect/data": "^0.12.5",
-        "@effect/io": "~0.26.0",
-        "@effect/stream": "~0.22.0",
-        "discord-verify": "^1.1.0"
+        "@effect-http/client": "^0.29.0",
+        "@effect/data": "^0.13.5",
+        "@effect/io": "~0.31.3",
+        "@effect/stream": "~0.25.1",
+        "discord-verify": "^1.2.0"
     },
     "optionalDependencies": {
         "bufferutil": "^4.0.7",
@@ -48,5 +48,5 @@
         "ws": "^8.13.0"
     },
     "sideEffects": false,
-    "gitHead": "68e33961a8d1e6e1cafa91837a24a7f537042006"
+    "gitHead": "7da97bf421f1b78e4d3ca866c3424f990db0e6e7"
 }

package/src/Cache/memory.ts

@@ -43,9 +43,9 @@ export const createWithParent = <T>() =>
           map.delete(parentId)
         }),
 
-      refreshTTL: () => Effect.unit(),
+      refreshTTL: () => Effect.unit,
 
-      run: Effect.never(),
+      run: Effect.never,
     })
   })
 
@@ -69,8 +69,8 @@ export const create = <T>() =>
           map.delete(resourceId)
         }),
 
-      refreshTTL: () => Effect.unit(),
+      refreshTTL: () => Effect.unit,
 
-      run: Effect.never(),
+      run: Effect.never,
     })
   })

package/src/Cache/memoryTTL.ts

@@ -35,14 +35,14 @@ const make = <T>({
   strategy = "usage",
 }: MemoryTTLOpts) => {
   const additionalMilliseconds =
-    (Math.floor(ttl.millis / resolution.millis) + 1) * resolution.millis
+    (Math.floor(ttl.toMillis / resolution.toMillis) + 1) * resolution.toMillis
 
   const items = new Map<string, WeakRef<CacheItem<T>>>()
   const buckets: TTLBucket<T>[] = []
 
   const refreshTTL = (item: CacheItem<T>) => {
     const now = Date.now()
-    const remainder = now % resolution.millis
+    const remainder = now % resolution.toMillis
     const expires = now - remainder + additionalMilliseconds
     let currentBucket = buckets[buckets.length - 1]
 
@@ -59,7 +59,7 @@ const make = <T>({
 
   const sweep = () => {
     const now = Date.now()
-    const remainder = now % resolution.millis
+    const remainder = now % resolution.toMillis
     const currentExpires = now - remainder
 
     while (buckets.length && buckets[0].expires <= currentExpires) {
@@ -156,7 +156,7 @@ export const createWithParent = <T>(opts: MemoryTTLOpts) =>
             )
           })
 
-          const results = $(Effect.allPar(toGet))
+          const results = $(Effect.all(toGet, { concurrency: "unbounded" }))
           const map = results.reduce(
             (map, [id, a]) => (a._tag === "Some" ? map.set(id, a.value) : map),
             new Map<string, T>(),
@@ -193,7 +193,7 @@ export const createWithParent = <T>(opts: MemoryTTLOpts) =>
             })
           }
 
-          $(Effect.allParDiscard(effects))
+          $(Effect.all(effects, { concurrency: "unbounded", discard: true }))
         }),
 
       run: store.run,

package/src/Cache/prelude.ts

@@ -120,8 +120,8 @@ export const guilds = <RM, EM, E>(
 ) =>
   Do($ => {
     const driver = $(makeDriver)
-    const gateway = $(DiscordGateway)
-    const rest = $(DiscordREST)
+    const gateway = $(DiscordGateway.accessWith(identity))
+    const rest = $(DiscordREST.accessWith(identity))
 
     return make({
       driver,
@@ -147,8 +147,8 @@ export const channels = <RM, EM, E>(
 ) =>
   Do($ => {
     const driver = $(makeDriver)
-    const gateway = $(DiscordGateway)
-    const rest = $(DiscordREST)
+    const gateway = $(DiscordGateway.accessWith(identity))
+    const rest = $(DiscordREST.accessWith(identity))
 
     return makeWithParent({
       driver,
@@ -186,8 +186,8 @@ export const roles = <RM, EM, E>(
 ) =>
   Do($ => {
     const driver = $(makeDriver)
-    const gateway = $(DiscordGateway)
-    const rest = $(DiscordREST)
+    const gateway = $(DiscordGateway.accessWith(identity))
+    const rest = $(DiscordREST.accessWith(identity))
 
     return makeWithParent({
       driver,

package/src/Cache.ts

@@ -51,11 +51,13 @@ export const makeWithParent = <EOps, EDriver, EMiss, EPMiss, A>({
   }).runDrain
 
   const get = (parentId: string, id: string) =>
-    driver
-      .get(parentId, id)
-      .someOrElseEffect(() =>
-        onMiss(parentId, id).tap(a => driver.set(parentId, id, a)),
-      )
+    driver.get(parentId, id).flatMap(_ =>
+      _.match({
+        onNone: () =>
+          onMiss(parentId, id).tap(a => driver.set(parentId, id, a)),
+        onSome: Effect.succeed,
+      }),
+    )
 
   const put = (_: A) =>
     id(_).flatMap(([parentId, id]) => driver.set(parentId, id, _))
@@ -77,17 +79,22 @@ export const makeWithParent = <EOps, EDriver, EMiss, EPMiss, A>({
     update,
 
     getForParent: (parentId: string) =>
-      driver.getForParent(parentId).someOrElseEffect(() =>
-        onParentMiss(parentId)
-          .tap(entries =>
-            Effect.allPar(
-              entries.map(([id, a]) => driver.set(parentId, id, a)),
-            ),
-          )
-          .map(entries => new Map(entries) as ReadonlyMap<string, A>),
+      driver.getForParent(parentId).flatMap(_ =>
+        _.match({
+          onNone: () =>
+            onParentMiss(parentId)
+              .tap(entries =>
+                Effect.all(
+                  entries.map(([id, a]) => driver.set(parentId, id, a)),
+                  { concurrency: "unbounded" },
+                ),
+              )
+              .map(entries => new Map(entries) as ReadonlyMap<string, A>),
+          onSome: Effect.succeed,
+        }),
       ),
 
-    run: sync.zipParRight(driver.run),
+    run: sync.zipRight(driver.run, { parallel: true }),
   }
 }
 
@@ -114,9 +121,12 @@ export const make = <EOps, EDriver, EMiss, A>({
   }).runDrain
 
   const get = (id: string) =>
-    driver
-      .get(id)
-      .someOrElseEffect(() => onMiss(id).tap(a => driver.set(id, a)))
+    driver.get(id).flatMap(_ =>
+      _.match({
+        onNone: () => onMiss(id).tap(a => driver.set(id, a)),
+        onSome: Effect.succeed,
+      }),
+    )
 
   const put = (_: A) => driver.set(id(_), _)
 
@@ -130,7 +140,7 @@ export const make = <EOps, EDriver, EMiss, A>({
     get,
     put,
     update,
-    run: sync.zipParRight(driver.run),
+    run: sync.zipRight(driver.run, { parallel: true }),
   }
 }
 

package/src/DiscordConfig.ts

@@ -51,6 +51,7 @@ export const make = ({
   },
 })
 
-export const makeLayer = flow(make, _ => Layer.succeed(DiscordConfig, _))
+export const makeLayer = (opts: MakeOpts) =>
+  Layer.succeed(DiscordConfig, make(opts))
 export const makeFromConfig = (_: Config.Wrap<MakeOpts>) =>
-  Config.unwrap(_).config.map(make).toLayer(DiscordConfig)
+  Layer.effect(DiscordConfig, Config.unwrap(_).config.map(make))

package/src/DiscordGateway/DiscordWS.ts

@@ -30,8 +30,8 @@ export const LiveJsonDiscordWSCodec = Layer.succeed(DiscordWSCodec, {
 })
 
 const make = Do($ => {
-  const ws = $(WS)
-  const encoding = $(DiscordWSCodec)
+  const ws = $(WS.accessWith(identity))
+  const encoding = $(DiscordWSCodec.accessWith(identity))
 
   const connect = ({
     url = "wss://gateway.discord.gg/",
@@ -69,4 +69,4 @@ const make = Do($ => {
 
 export interface DiscordWS extends Effect.Success<typeof make> {}
 export const DiscordWS = Tag<DiscordWS>()
-export const LiveDiscordWS = LiveWS >> make.toLayer(DiscordWS)
+export const LiveDiscordWS = LiveWS >> Layer.effect(DiscordWS, make)

package/src/DiscordGateway/Shard/heartbeats.ts

@@ -38,5 +38,10 @@ export const send = (
 
     const run = acks.take().tap(() => ackedRef.set(true)).forever
 
-    return $(run.zipParLeft(heartbeats))
+    return $(
+      Effect.all(run, heartbeats, {
+        concurrency: "unbounded",
+        discard: true,
+      }),
+    )
   })

package/src/DiscordGateway/Shard/identify.ts

@@ -1,5 +1,6 @@
 import * as SendEvents from "./sendEvents.js"
 import * as OS from "os"
+import * as Option from "@effect/data/Option"
 
 export interface Options {
   token: string
@@ -42,11 +43,12 @@ export const identifyOrResume = (
     const readyEvent = $(ready.get)
     const seqNumber = $(seq.get)
 
-    return Maybe.struct({
+    return Option.all({
       readyEvent,
       seqNumber,
-    }).match(
-      () => identify(opts),
-      ({ readyEvent, seqNumber }) => resume(opts.token, readyEvent, seqNumber),
-    )
+    }).match({
+      onNone: () => identify(opts),
+      onSome: ({ readyEvent, seqNumber }) =>
+        resume(opts.token, readyEvent, seqNumber),
+    })
   })

package/src/DiscordGateway/Shard/invalidSession.ts

@@ -5,6 +5,6 @@ export const fromPayload = (
   p: Discord.GatewayPayload,
   latestReady: Ref<Maybe<Discord.ReadyEvent>>,
 ) =>
-  (p.d ? Effect.unit() : latestReady.set(Maybe.none())).map(
+  (p.d ? Effect.unit : latestReady.set(Maybe.none())).map(
     (): Message => Reconnect,
   )

package/src/DiscordGateway/Shard/utils.ts

@@ -3,10 +3,13 @@ export const opCode =
   <T = any>(code: Discord.GatewayOpcode) =>
     source.filter((p): p is Discord.GatewayPayload<T> => p.op === code)
 
-const maybeUpdateRef = <T>(
-  f: (p: Discord.GatewayPayload) => Maybe<T>,
-  ref: Ref<Maybe<T>>,
-) => flow(f, o => o.match(Effect.unit, a => ref.set(Maybe.some(a))))
+const maybeUpdateRef =
+  <T>(f: (p: Discord.GatewayPayload) => Maybe<T>, ref: Ref<Maybe<T>>) =>
+  (_: Discord.GatewayPayload) =>
+    f(_).match({
+      onNone: () => Effect.unit,
+      onSome: a => ref.set(Maybe.some(a)),
+    })
 
 export const latest = <T>(f: (p: Discord.GatewayPayload) => Maybe<T>) =>
   Ref.make<Maybe<T>>(Maybe.none()).map(

package/src/DiscordGateway/Shard.ts

@@ -15,10 +15,10 @@ const enum Phase {
 }
 
 export const make = Do($ => {
-  const { token, gateway } = $(DiscordConfig)
-  const limiter = $(RateLimiter)
-  const dws = $(DiscordWS)
-  const log = $(Log)
+  const { token, gateway } = $(DiscordConfig.accessWith(identity))
+  const limiter = $(RateLimiter.accessWith(identity))
+  const dws = $(DiscordWS.accessWith(identity))
+  const log = $(Log.accessWith(identity))
 
   const connect = (
     shard: [id: number, count: number],
@@ -94,10 +94,11 @@ export const make = Do($ => {
               p.op === Discord.GatewayOpcode.DISPATCH && p.t === "READY",
           )
           .map(p => p.d!)
-          .match(
-            () => Effect.unit(),
-            a => socket.setUrl(a.resume_gateway_url),
-          )
+          .match({
+            onNone: () => Effect.unit,
+            onSome: ({ resume_gateway_url }) =>
+              socket.setUrl(resume_gateway_url),
+          })
 
       const hellos = $(Queue.unbounded<Discord.GatewayPayload>())
       const acks = $(Queue.unbounded<Discord.GatewayPayload>())
@@ -126,17 +127,19 @@ export const make = Do($ => {
         Do($ => {
           $(
             updateLatestReady(p)
-              .zipPar(updateLatestSequence(p))
-              .zipPar(maybeUpdateUrl(p)),
+              .zip(updateLatestSequence(p), { parallel: true })
+              .zip(maybeUpdateUrl(p)),
           )
 
-          let effect = Effect.unit()
+          let effect = Effect.unit
 
           switch (p.op) {
             case Discord.GatewayOpcode.HELLO:
               effect = identify
                 .tap(prioritySend)
-                .zipPar(setPhase(Phase.Handshake).zipRight(hellos.offer(p)))
+                .zip(setPhase(Phase.Handshake).zipRight(hellos.offer(p)), {
+                  parallel: true,
+                })
               break
             case Discord.GatewayOpcode.HEARTBEAT_ACK:
               effect = acks.offer(p)
@@ -158,13 +161,15 @@ export const make = Do($ => {
 
       const drainSendQueue = sendQueue.take().tap(send).forever
 
-      const run = socket.take
-        .flatMap(onPayload)
-        .forever.zipParLeft(heartbeats)
-        .zipParLeft(drainSendQueue)
-        .zipParLeft(socket.run)
+      const run = Effect.all(
+        socket.take.flatMap(onPayload).forever,
+        heartbeats,
+        drainSendQueue,
+        socket.run,
+        { discard: true, concurrency: "unbounded" },
+      )
 
-      return { send, run } as const
+      return { id: shard, send, run } as const
     })
 
   return { connect } as const
@@ -173,7 +178,7 @@ export const make = Do($ => {
 export interface Shard extends Effect.Success<typeof make> {}
 export const Shard = Tag<Shard>()
 export const LiveShard =
-  (LiveDiscordWS + LiveRateLimiter) >> make.toLayer(Shard)
+  (LiveDiscordWS + LiveRateLimiter) >> Layer.effect(Shard, make)
 
 export interface RunningShard
   extends Effect.Success<ReturnType<Shard["connect"]>> {}

package/src/DiscordGateway/Sharder.ts

@@ -12,11 +12,11 @@ const claimRepeatPolicy = Schedule.fixed(Duration.minutes(3)).whileInput(
 ).passthrough as Schedule<never, Maybe<number>, Some<number>>
 
 const make = Do($ => {
-  const store = $(ShardStore)
-  const rest = $(DiscordREST)
-  const { gateway: config } = $(DiscordConfig)
-  const limiter = $(RateLimiter)
-  const shard = $(Shard)
+  const store = $(ShardStore.accessWith(identity))
+  const rest = $(DiscordREST.accessWith(identity))
+  const { gateway: config } = $(DiscordConfig.accessWith(identity))
+  const limiter = $(RateLimiter.accessWith(identity))
+  const shard = $(Shard.accessWith(identity))
   const currentShards = $(Ref.make(HashSet.empty<RunningShard>()))
 
   const takeConfig = (totalCount: number) =>
@@ -97,11 +97,11 @@ const make = Do($ => {
       ).map(() => spawner)
 
       return $(
-        Effect.allParDiscard(spawners).zipParLeft(deferred.await) as Effect<
-          never,
-          WebSocketError | WebSocketCloseError,
-          never
-        >,
+        Effect.all(
+          Effect.all(spawners, { concurrency: "unbounded", discard: true }),
+          deferred.await,
+          { concurrency: "unbounded", discard: true },
+        ) as Effect<never, WebSocketError | WebSocketCloseError, never>,
       )
     })
 
@@ -111,4 +111,4 @@ const make = Do($ => {
 export interface Sharder extends Effect.Success<typeof make> {}
 export const Sharder = Tag<Sharder>()
 export const LiveSharder =
-  (LiveRateLimiter + LiveShard) >> make.toLayer(Sharder)
+  (LiveRateLimiter + LiveShard) >> Layer.effect(Sharder, make)

package/src/DiscordGateway/WS.ts

@@ -45,7 +45,7 @@ const offer = (
         run(
           queue
             .offer(message.data)
-            .zipLeft(log.debug("WS", "offer", message.data)),
+            .zipLeft(log.debug("WS", "offer", message.data), {}),
         )
       })
 
@@ -62,15 +62,18 @@ const offer = (
 const waitForOpen = (ws: globalThis.WebSocket, timeout: Duration) =>
   Effect.suspend(() => {
     if (ws.readyState === WebSocket.OPEN) {
-      return Effect.unit()
+      return Effect.unit
     }
 
     return Effect.async<never, never, void>(resume => {
-      ws.addEventListener("open", () => resume(Effect.unit()), {
+      ws.addEventListener("open", () => resume(Effect.unit), {
         once: true,
       })
     })
-  }).timeoutFail(() => new WebSocketError("open-timeout"), timeout)
+  }).timeoutFail({
+    onTimeout: () => new WebSocketError("open-timeout"),
+    duration: timeout,
+  })
 
 const send = (
   ws: globalThis.WebSocket,
@@ -93,12 +96,12 @@ const send = (
     }).forever
 
 const make = Do($ => {
-  const log = $(Log)
+  const log = $(Log.accessWith(identity))
 
   const connect = (
     url: Ref<string>,
     takeOutbound: Effect<never, never, Message>,
-    onConnecting = Effect.unit(),
+    onConnecting = Effect.unit,
     openTimeout = Duration.seconds(3),
   ) =>
     Do($ => {
@@ -107,8 +110,9 @@ const make = Do($ => {
       const run = onConnecting
         .zipRight(socket(url))
         .flatMap(ws =>
-          offer(ws, queue, log).zipParLeft(
+          offer(ws, queue, log).zipLeft(
             waitForOpen(ws, openTimeout).zipRight(send(ws, takeOutbound, log)),
+            { parallel: true },
           ),
         )
         .scoped.retryWhile(isReconnect)
@@ -121,4 +125,4 @@ const make = Do($ => {
 
 export interface WS extends Effect.Success<typeof make> {}
 export const WS = Tag<WS>()
-export const LiveWS = make.toLayer(WS)
+export const LiveWS = Layer.effect(WS, make)

package/src/DiscordGateway.ts

@@ -17,11 +17,11 @@ const handleDispatchFactory =
       if (_.t === event) {
         return handle(_.d as any)
       }
-      return Effect.unit()
+      return Effect.unit
     })
 
 export const make = Do($ => {
-  const sharder = $(Sharder)
+  const sharder = $(Sharder.accessWith(identity))
   const hub = $(Hub.unbounded<Discord.GatewayPayload<Discord.ReceiveEvent>>())
 
   const sendQueue = $(
@@ -48,4 +48,5 @@ export const make = Do($ => {
 
 export interface DiscordGateway extends Effect.Success<typeof make> {}
 export const DiscordGateway = Tag<DiscordGateway>()
-export const LiveDiscordGateway = LiveSharder >> make.toLayer(DiscordGateway)
+export const LiveDiscordGateway =
+  LiveSharder >> Layer.effect(DiscordGateway, make)

package/src/DiscordREST/utils.ts

@@ -1,3 +1,5 @@
+import * as Option from "@effect/data/Option"
+
 const majorResources = ["channels", "guilds", "webhooks"] as const
 
 export const routeFromConfig = (path: string, method: string) => {
@@ -24,7 +26,7 @@ export const retryAfter = (headers: Headers) =>
     .map(Duration.seconds)
 
 export const rateLimitFromHeaders = (headers: Headers) =>
-  Maybe.struct({
+  Option.all({
     bucket: Maybe.fromNullable(headers.get("x-ratelimit-bucket")),
     retryAfter: retryAfter(headers),
     limit: numberHeader(headers)("x-ratelimit-limit"),