dfx 0.50.0 → 0.51.0

package/src/RateLimit.ts

@@ -35,8 +35,8 @@ export const RateLimitStore = Tag<RateLimitStore>()
 export const LiveMemoryRateLimitStore = Layer.sync(RateLimitStore, Memory.make)
 
 const makeLimiter = Do($ => {
-  const store = $(RateLimitStore)
-  const log = $(Log)
+  const store = $(RateLimitStore.accessWith(identity))
+  const log = $(Log.accessWith(identity))
 
   const maybeWait = (
     key: string,
@@ -44,7 +44,7 @@ const makeLimiter = Do($ => {
     limit: number,
     multiplier = 1.05,
   ) => {
-    const windowMs = window.millis * multiplier
+    const windowMs = window.toMillis * multiplier
 
     return store
       .incrementCounter(key, windowMs, limit)
@@ -52,13 +52,13 @@ const makeLimiter = Do($ => {
       .tap(d =>
         log.debug("RateLimitStore maybeWait", {
           key,
-          window: window.millis,
+          window: window.toMillis,
           windowMs,
           limit,
-          delay: d.millis,
+          delay: d.toMillis,
         }),
       )
-      .tap(_ => (_.millis === 0 ? Effect.unit() : Effect.sleep(_))).asUnit
+      .tap(_ => (_.toMillis === 0 ? Effect.unit : Effect.sleep(_))).asUnit
   }
 
   return { maybeWait }

package/src/global.ts

@@ -37,7 +37,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/src/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/utils/hub.ts

@@ -19,7 +19,7 @@ export const subscribeForEachPar = <R, E, A, X>(
             ).forever,
       ).scoped
 
-    return $(run.zipParLeft(deferred.await))
+    return $(run.zipLeft(deferred.await, { parallel: true }))
   })
 
 /**
@@ -37,11 +37,11 @@ export const foreverSwitch = <R, E, A, R1, E1, X>(
       .flatMap(_ => f(_).tapErrorCause(_ => causeDeferred.failCause(_)).fork)
       .flatMap(fiber => fiberRef.getAndSet(Maybe.some(fiber)))
       .tap(_ =>
-        _.match(
-          () => Effect.unit(),
-          fiber => fiber.interrupt,
-        ),
+        _.match({
+          onNone: () => Effect.unit,
+          onSome: fiber => fiber.interrupt,
+        }),
       ).forever
 
-    return $(run.zipParLeft(causeDeferred.await))
+    return $(run.zipLeft(causeDeferred.await, { parallel: true }))
   })

package/utils/hub.js

@@ -11,13 +11,16 @@ export const subscribeForEachPar = (self, effect) => tsplus_module_2.flatMap(tsp
     const run = tsplus_module_2.scoped(tsplus_module_2.flatMap(self
         .subscribe(), queue => tsplus_module_2.forever(tsplus_module_2.flatMap(queue
         .take(), _ => tsplus_module_2.fork(tsplus_module_2.catchAllCause(effect(_), _ => tsplus_module_3.failCause(deferred, _)))))));
-    return tsplus_module_2.zipParLeft(run, tsplus_module_1.deferredAwait(deferred));
+    return tsplus_module_2.zipLeft(run, tsplus_module_1.deferredAwait(deferred), { parallel: true });
 });
 /**
  * @tsplus fluent effect/io/Effect foreverSwitch
  */
 export const foreverSwitch = (self, f) => tsplus_module_2.flatMap(tsplus_module_3.make(), causeDeferred => tsplus_module_2.flatMap(tsplus_module_6.make(tsplus_module_5.none()), fiberRef => {
-    const run = tsplus_module_2.forever(tsplus_module_2.tap(tsplus_module_2.flatMap(tsplus_module_2.flatMap(self, _ => tsplus_module_2.fork(tsplus_module_2.tapErrorCause(f(_), _ => tsplus_module_3.failCause(causeDeferred, _)))), fiber => tsplus_module_6.getAndSet(fiberRef, tsplus_module_5.some(fiber))), _ => tsplus_module_5.match(_, () => tsplus_module_2.unit(), fiber => tsplus_module_4.interrupt(fiber))));
-    return tsplus_module_2.zipParLeft(run, tsplus_module_1.deferredAwait(causeDeferred));
+    const run = tsplus_module_2.forever(tsplus_module_2.tap(tsplus_module_2.flatMap(tsplus_module_2.flatMap(self, _ => tsplus_module_2.fork(tsplus_module_2.tapErrorCause(f(_), _ => tsplus_module_3.failCause(causeDeferred, _)))), fiber => tsplus_module_6.getAndSet(fiberRef, tsplus_module_5.some(fiber))), _ => tsplus_module_5.match(_, {
+        onNone: () => tsplus_module_2.unit,
+        onSome: fiber => tsplus_module_4.interrupt(fiber),
+    })));
+    return tsplus_module_2.zipLeft(run, tsplus_module_1.deferredAwait(causeDeferred), { parallel: true });
 }));
 //# sourceMappingURL=hub.js.map

package/utils/hub.js.map

@@ -1 +1 @@
-{"version":3,"file":"hub.js","sourceRoot":"","sources":["../src/utils/hub.ts"],"names":[],"mappings":";;;;;;AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,IAAY,EACZ,MAAiC,EACjC,EAAE,yBAEmB,sBAAyB,EAAtC,QAAQ;IAEd,MAAM,GAAG,0BAAG,wBAAA,IAAI;SACb,SAAS,EAAE,EAEV,KAAK,CAAC,EAAE,yBACN,wBAAA,KAAK;SACF,IAAI,EAAE,EAEL,CAAC,CAAC,EAAE,sBAAC,8BAAA,MAAM,CAAC,CAAC,CAAC,EAAe,CAAC,CAAC,EAAE,CAAC,0BAAA,QAAQ,EAAW,CAAC,CAAC,CAAC,CAAK,CAC9D,CAAQ,CACd,CAAO,CAAA;WAED,2BAAA,GAAG,gCAAY,QAAQ,EAAO;EACvC,CAAA;AAEJ;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,IAAqB,EACrB,CAA8B,EACC,EAAE,yBAEP,sBAA0B,EAA5C,aAAa,4BACA,qBAAqC,sBAAY,CAAC,EAA/D,QAAQ;IAEd,MAAM,GAAG,2BAAG,oBAAA,wBAAA,wBAAA,IAAI,EACL,CAAC,CAAC,EAAE,sBAAC,8BAAA,CAAC,CAAC,CAAC,CAAC,EAAe,CAAC,CAAC,EAAE,CAAC,0BAAA,aAAa,EAAW,CAAC,CAAC,CAAC,CAAK,CAAC,EAC9D,KAAK,CAAC,EAAE,CAAC,0BAAA,QAAQ,EAAW,qBAAW,KAAK,CAAC,CAAC,CAAC,EACnD,CAAC,CAAC,EAAE,CACP,sBAAA,CAAC,EACC,GAAG,EAAE,CAAC,sBAAa,EACnB,KAAK,CAAC,EAAE,2BAAC,KAAK,CAAU,CACzB,CACF,CAAQ,CAAA;WAEF,2BAAA,GAAG,gCAAY,aAAa,EAAO;GAC5C,CAAA"}
+{"version":3,"file":"hub.js","sourceRoot":"","sources":["../src/utils/hub.ts"],"names":[],"mappings":";;;;;;AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,IAAY,EACZ,MAAiC,EACjC,EAAE,yBAEmB,sBAAyB,EAAtC,QAAQ;IAEd,MAAM,GAAG,0BAAG,wBAAA,IAAI;SACb,SAAS,EAAE,EAEV,KAAK,CAAC,EAAE,yBACN,wBAAA,KAAK;SACF,IAAI,EAAE,EAEL,CAAC,CAAC,EAAE,sBAAC,8BAAA,MAAM,CAAC,CAAC,CAAC,EAAe,CAAC,CAAC,EAAE,CAAC,0BAAA,QAAQ,EAAW,CAAC,CAAC,CAAC,CAAK,CAC9D,CAAQ,CACd,CAAO,CAAA;WAED,wBAAA,GAAG,gCAAS,QAAQ,GAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;EACxD,CAAA;AAEJ;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,IAAqB,EACrB,CAA8B,EACC,EAAE,yBAEP,sBAA0B,EAA5C,aAAa,4BACA,qBAAqC,sBAAY,CAAC,EAA/D,QAAQ;IAEd,MAAM,GAAG,2BAAG,oBAAA,wBAAA,wBAAA,IAAI,EACL,CAAC,CAAC,EAAE,sBAAC,8BAAA,CAAC,CAAC,CAAC,CAAC,EAAe,CAAC,CAAC,EAAE,CAAC,0BAAA,aAAa,EAAW,CAAC,CAAC,CAAC,CAAK,CAAC,EAC9D,KAAK,CAAC,EAAE,CAAC,0BAAA,QAAQ,EAAW,qBAAW,KAAK,CAAC,CAAC,CAAC,EACnD,CAAC,CAAC,EAAE,CACP,sBAAA,CAAC,EAAO;QACN,MAAM,EAAE,GAAG,EAAE,qBAAY;QACzB,MAAM,EAAE,KAAK,CAAC,EAAE,2BAAC,KAAK,CAAU;KACjC,CAAC,CACH,CAAQ,CAAA;WAEF,wBAAA,GAAG,gCAAS,aAAa,GAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;GAC7D,CAAA"}