dfx 0.90.1 → 0.90.3

package/mjs/Interactions/webhook.mjs

@@ -8,6 +8,8 @@ import * as Layer from "effect/Layer";
 import { handlers } from "dfx/Interactions/handlers";
 import { Interaction } from "dfx/Interactions/index";
 import * as Verify from "discord-verify";
+import { RefailError } from "@effect/platform/Error";
+import { InteractionsErrorTypeId } from "dfx/Interactions/error";
 export class BadWebhookSignature {
   _tag = "BadWebhookSignature";
 }
@@ -29,20 +31,16 @@ const makeConfig = ({
 export const WebhookConfig = /*#__PURE__*/GenericTag("dfx/Interactions/WebhookConfig");
 export const layer = opts => Layer.succeed(WebhookConfig, makeConfig(opts));
 export const layerConfig = config => Layer.effect(WebhookConfig, Effect.map(config, makeConfig));
-export class WebhookParseError {
-  reason;
-  _tag = "WebhookParseError";
-  constructor(reason) {
-    this.reason = reason;
-  }
-}
+export class WebhookParseError extends RefailError(InteractionsErrorTypeId, "WebhookParseError") {}
 const fromHeadersAndBody = (headers, body) => Effect.tap(WebhookConfig, ({
   algorithm,
   crypto,
   publicKey
 }) => checkSignature(publicKey, headers, body, crypto, algorithm)).pipe(Effect.flatMap(() => Effect.try({
   try: () => JSON.parse(body),
-  catch: reason => new WebhookParseError(reason)
+  catch: error => new WebhookParseError({
+    error
+  })
 })));
 const run = (definitions, handleResponse) => {
   const handler = handlers(definitions, handleResponse);

package/mjs/Interactions/webhook.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"webhook.mjs","names":["Chunk","GenericTag","identity","Option","Secret","Effect","Layer","handlers","Interaction","Verify","BadWebhookSignature","_tag","checkSignature","publicKey","headers","body","crypto","algorithm","all","signature","fromNullable","timestamp","pipe","flatMap","_","promise","verify","filterOrFail","catchAllCause","fail","asUnit","makeConfig","applicationId","value","PlatformAlgorithm","WebhookConfig","layer","opts","succeed","layerConfig","config","effect","map","WebhookParseError","reason","constructor","fromHeadersAndBody","tap","try","JSON","parse","catch","run","definitions","handleResponse","handler","interaction","provideService","type","makeHandler","ix","handle","d","_i","r","error","success","makeSimpleHandler"],"sources":["../../src/Interactions/webhook.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"webhook.mjs","names":["Chunk","GenericTag","identity","Option","Secret","Effect","Layer","handlers","Interaction","Verify","RefailError","InteractionsErrorTypeId","BadWebhookSignature","_tag","checkSignature","publicKey","headers","body","crypto","algorithm","all","signature","fromNullable","timestamp","pipe","flatMap","_","promise","verify","filterOrFail","catchAllCause","fail","asUnit","makeConfig","applicationId","value","PlatformAlgorithm","WebhookConfig","layer","opts","succeed","layerConfig","config","effect","map","WebhookParseError","fromHeadersAndBody","tap","try","JSON","parse","catch","error","run","definitions","handleResponse","handler","interaction","provideService","type","makeHandler","ix","handle","d","_i","r","success","makeSimpleHandler"],"sources":["../../src/Interactions/webhook.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/mjs/utils/Effect.mjs

@@ -4,7 +4,7 @@ import * as Effect from "effect/Effect";
 import * as PubSub from "effect/PubSub";
 import * as Queue from "effect/Queue";
 export const subscribeForEachPar = (self, effect) => Effect.flatMap(Deferred.make(), deferred => {
-  const run = pipe(PubSub.subscribe(self), Effect.flatMap(queue => Effect.forever(Effect.flatMap(Queue.take(queue), _ => Effect.fork(Effect.catchAllCause(effect(_), _ => Deferred.failCause(deferred, _)))))), Effect.scoped);
+  const run = pipe(PubSub.subscribe(self), Effect.flatMap(queue => Effect.forever(Effect.flatMap(Queue.take(queue), _ => Effect.fork(Effect.catchAllCause(effect(_), _ => Deferred.failCause(deferred, _)))))), Effect.scoped, Effect.interruptible);
   return Effect.all([run, Deferred.await(deferred)], {
     concurrency: "unbounded",
     discard: true
@@ -14,7 +14,7 @@ export const foreverSwitch = (self, f) => pipe(Effect.all([Deferred.make(), Effe
   let fiber;
   const run = pipe(self, Effect.tap(() => fiber ? fiber.interruptAsFork(fiberId) : Effect.unit), Effect.flatMap(_ => pipe(f(_), Effect.tapErrorCause(_ => Deferred.failCause(causeDeferred, _)), Effect.fork)), Effect.tap(fiber_ => Effect.sync(() => {
     fiber = fiber_;
-  })), Effect.forever);
+  })), Effect.forever, Effect.interruptible);
   return Effect.all([run, Deferred.await(causeDeferred)], {
     concurrency: "unbounded",
     discard: true

package/mjs/utils/Effect.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"Effect.mjs","names":["pipe","Deferred","Effect","PubSub","Queue","subscribeForEachPar","self","effect","flatMap","make","deferred","run","subscribe","queue","forever","take","_","fork","catchAllCause","failCause","scoped","all","await","concurrency","discard","foreverSwitch","f","fiberId","causeDeferred","fiber","tap","interruptAsFork","unit","tapErrorCause","fiber_","sync"],"sources":["../../src/utils/Effect.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAI,QAAQ,iBAAiB;AACtC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AAEvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAErC,OAAO,MAAMC,mBAAmB,GAAGA,CACjCC,IAAsB,EACtBC,MAAwC,KAExCL,MAAM,CAACM,OAAO,CAACP,QAAQ,CAACQ,IAAI,EAAY,EAAEC,QAAQ,IAAG;EACnD,MAAMC,GAAG,GAAGX,IAAI,CACdG,MAAM,CAACS,SAAS,CAACN,IAAI,CAAC,EACtBJ,MAAM,CAACM,OAAO,CAACK,KAAK,IAClBX,MAAM,CAACY,OAAO,CACZZ,MAAM,CAACM,OAAO,CAACJ,KAAK,CAACW,IAAI,CAACF,KAAK,CAAC,EAAEG,CAAC,IACjCd,MAAM,CAACe,IAAI,CACTf,MAAM,CAACgB,aAAa,CAACX,MAAM,CAACS,CAAC,CAAC,EAAEA,CAAC,IAC/Bf,QAAQ,CAACkB,SAAS,CAACT,QAAQ,EAAEM,CAAC,CAAC,CAChC,CACF,CACF,CACF,CACF,EACDd,MAAM,CAACkB,MAAM,CACd;EAED,OAAOlB,MAAM,CAACmB,GAAG,CAAC,CAACV,GAAG,EAAEV,QAAQ,CAACqB,KAAK,CAACZ,QAAQ,CAAC,CAAC,EAAE;IACjDa,WAAW,EAAE,WAAW;IACxBC,OAAO,EAAE;GACV,CAA+B;AAClC,CAAC,CAAC;AAEJ,OAAO,MAAMC,aAAa,GAAGA,CAC3BnB,IAA4B,EAC5BoB,CAAqC,KAErC1B,IAAI,CACFE,MAAM,CAACmB,GAAG,CAAC,CAACpB,QAAQ,CAACQ,IAAI,EAAa,EAAEP,MAAM,CAACyB,OAAO,CAAC,CAAC,EACxDzB,MAAM,CAACM,OAAO,CAAC,CAAC,CAACoB,aAAa,EAAED,OAAO,CAAC,KAAI;EAC1C,IAAIE,KAAuD;EAE3D,MAAMlB,GAAG,GAAGX,IAAI,CACdM,IAAI,EACJJ,MAAM,CAAC4B,GAAG,CAAC,MACTD,KAAK,GAAGA,KAAK,CAACE,eAAe,CAACJ,OAAO,CAAC,GAAGzB,MAAM,CAAC8B,IAAI,CACrD,EACD9B,MAAM,CAACM,OAAO,CAACQ,CAAC,IACdhB,IAAI,CACF0B,CAAC,CAACV,CAAC,CAAC,EACJd,MAAM,CAAC+B,aAAa,CAACjB,CAAC,IAAIf,QAAQ,CAACkB,SAAS,CAACS,aAAa,EAAEZ,CAAC,CAAC,CAAC,EAC/Dd,MAAM,CAACe,IAAI,CACZ,CACF,EACDf,MAAM,CAAC4B,GAAG,CAACI,MAAM,IACfhC,MAAM,CAACiC,IAAI,CAAC,MAAK;IACfN,KAAK,GAAGK,MAAM;EAChB,CAAC,CAAC,CACH,EACDhC,MAAM,CAACY,OAAO,CACf;EAED,OAAOZ,MAAM,CAACmB,GAAG,CAAC,CAACV,GAAG,EAAEV,QAAQ,CAACqB,KAAK,CAACM,aAAa,CAAC,CAAC,EAAE;IACtDL,WAAW,EAAE,WAAW;IACxBC,OAAO,EAAE;GACV,CAAyC;AAC5C,CAAC,CAAC,CACH","ignoreList":[]}
+{"version":3,"file":"Effect.mjs","names":["pipe","Deferred","Effect","PubSub","Queue","subscribeForEachPar","self","effect","flatMap","make","deferred","run","subscribe","queue","forever","take","_","fork","catchAllCause","failCause","scoped","interruptible","all","await","concurrency","discard","foreverSwitch","f","fiberId","causeDeferred","fiber","tap","interruptAsFork","unit","tapErrorCause","fiber_","sync"],"sources":["../../src/utils/Effect.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAI,QAAQ,iBAAiB;AACtC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AAEvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAErC,OAAO,MAAMC,mBAAmB,GAAGA,CACjCC,IAAsB,EACtBC,MAAwC,KAExCL,MAAM,CAACM,OAAO,CAACP,QAAQ,CAACQ,IAAI,EAAY,EAAEC,QAAQ,IAAG;EACnD,MAAMC,GAAG,GAAGX,IAAI,CACdG,MAAM,CAACS,SAAS,CAACN,IAAI,CAAC,EACtBJ,MAAM,CAACM,OAAO,CAACK,KAAK,IAClBX,MAAM,CAACY,OAAO,CACZZ,MAAM,CAACM,OAAO,CAACJ,KAAK,CAACW,IAAI,CAACF,KAAK,CAAC,EAAEG,CAAC,IACjCd,MAAM,CAACe,IAAI,CACTf,MAAM,CAACgB,aAAa,CAACX,MAAM,CAACS,CAAC,CAAC,EAAEA,CAAC,IAC/Bf,QAAQ,CAACkB,SAAS,CAACT,QAAQ,EAAEM,CAAC,CAAC,CAChC,CACF,CACF,CACF,CACF,EACDd,MAAM,CAACkB,MAAM,EACblB,MAAM,CAACmB,aAAa,CACrB;EAED,OAAOnB,MAAM,CAACoB,GAAG,CAAC,CAACX,GAAG,EAAEV,QAAQ,CAACsB,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,KAErC3B,IAAI,CACFE,MAAM,CAACoB,GAAG,CAAC,CAACrB,QAAQ,CAACQ,IAAI,EAAa,EAAEP,MAAM,CAAC0B,OAAO,CAAC,CAAC,EACxD1B,MAAM,CAACM,OAAO,CAAC,CAAC,CAACqB,aAAa,EAAED,OAAO,CAAC,KAAI;EAC1C,IAAIE,KAAuD;EAE3D,MAAMnB,GAAG,GAAGX,IAAI,CACdM,IAAI,EACJJ,MAAM,CAAC6B,GAAG,CAAC,MACTD,KAAK,GAAGA,KAAK,CAACE,eAAe,CAACJ,OAAO,CAAC,GAAG1B,MAAM,CAAC+B,IAAI,CACrD,EACD/B,MAAM,CAACM,OAAO,CAACQ,CAAC,IACdhB,IAAI,CACF2B,CAAC,CAACX,CAAC,CAAC,EACJd,MAAM,CAACgC,aAAa,CAAClB,CAAC,IAAIf,QAAQ,CAACkB,SAAS,CAACU,aAAa,EAAEb,CAAC,CAAC,CAAC,EAC/Dd,MAAM,CAACe,IAAI,CACZ,CACF,EACDf,MAAM,CAAC6B,GAAG,CAACI,MAAM,IACfjC,MAAM,CAACkC,IAAI,CAAC,MAAK;IACfN,KAAK,GAAGK,MAAM;EAChB,CAAC,CAAC,CACH,EACDjC,MAAM,CAACY,OAAO,EACdZ,MAAM,CAACmB,aAAa,CACrB;EAED,OAAOnB,MAAM,CAACoB,GAAG,CAAC,CAACX,GAAG,EAAEV,QAAQ,CAACsB,KAAK,CAACM,aAAa,CAAC,CAAC,EAAE;IACtDL,WAAW,EAAE,WAAW;IACxBC,OAAO,EAAE;GACV,CAAyC;AAC5C,CAAC,CAAC,CACH","ignoreList":[]}

package/mjs/version.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.90.1",
+  "version": "0.90.3",
   "description": "Effect-TS discord library",
   "license": "MIT",
   "repository": {
@@ -35,8 +35,8 @@
   "sideEffects": [],
   "author": "Tim Smart <hello@timsmart.co>",
   "peerDependencies": {
-    "@effect/platform": "^0.48.2",
-    "effect": "^2.4.6"
+    "@effect/platform": "^0.48.7",
+    "effect": "^2.4.7"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.8",
@@ -44,6 +44,6 @@
     "utf-8-validate": "^6.0.3",
     "zlib-sync": "^0.1.9"
   },
-  "gitHead": "a0646af3c95517d380611a89d8981b80cfc1ebe0",
+  "gitHead": "848c3faff6aa1455f3c919677506ef1a9dd72273",
   "main": "./index.js"
 }

package/src/Cache/prelude.ts

@@ -238,7 +238,10 @@ export const roles = <RM, EM, E>(
     return yield* _(
       makeWithParent({
         driver,
-        id: _ => Effect.fail(new CacheMissError("RolesCache/id", _.id)),
+        id: _ =>
+          Effect.fail(
+            new CacheMissError({ cacheName: "RolesCache/id", id: _.id }),
+          ),
         ops: opsWithParent({
           id: (a: Discord.Role) => a.id,
           fromParent: Stream.map(gateway.fromDispatch("GUILD_CREATE"), g => [
@@ -262,7 +265,8 @@ export const roles = <RM, EM, E>(
             g => g.id,
           ),
         }),
-        onMiss: (_, id) => Effect.fail(new CacheMissError("RolesCache", id)),
+        onMiss: (_, id) =>
+          Effect.fail(new CacheMissError({ cacheName: "RolesCache", id })),
         onParentMiss: guildId =>
           rest
             .getGuildRoles(guildId)

package/src/Cache.ts

@@ -1,9 +1,10 @@
+import { TypeIdError } from "@effect/platform/Error"
+import type { CacheDriver, ParentCacheDriver } from "dfx/Cache/driver"
+import * as Effect from "effect/Effect"
 import * as Option from "effect/Option"
 import * as Schedule from "effect/Schedule"
 import type * as Scope from "effect/Scope"
-import * as Effect from "effect/Effect"
 import * as Stream from "effect/Stream"
-import type { CacheDriver, ParentCacheDriver } from "dfx/Cache/driver"
 
 export * from "dfx/Cache/driver"
 export {
@@ -97,6 +98,7 @@ export const makeWithParent = <EOps, EDriver, EMiss, EPMiss, A>({
       Effect.tapErrorCause(_ => Effect.logError("ops error, restarting", _)),
       Effect.retry(retryPolicy),
       Effect.forkScoped,
+      Effect.interruptible,
     )
     yield* _(
       driver.run,
@@ -105,6 +107,7 @@ export const makeWithParent = <EOps, EDriver, EMiss, EPMiss, A>({
       ),
       Effect.retry(retryPolicy),
       Effect.forkScoped,
+      Effect.interruptible,
     )
 
     const get = (parentId: string, id: string) =>
@@ -208,6 +211,7 @@ export const make = <EOps, EDriver, EMiss, A>({
       Effect.tapErrorCause(_ => Effect.logError("ops error, restarting", _)),
       Effect.retry(retryPolicy),
       Effect.forkScoped,
+      Effect.interruptible,
     )
 
     yield* _(
@@ -217,6 +221,7 @@ export const make = <EOps, EDriver, EMiss, A>({
       ),
       Effect.retry(retryPolicy),
       Effect.forkScoped,
+      Effect.interruptible,
     )
 
     const get = (id: string) =>
@@ -249,10 +254,16 @@ export const make = <EOps, EDriver, EMiss, A>({
     }),
   )
 
-export class CacheMissError {
-  readonly _tag = "CacheMissError"
-  constructor(
-    readonly cacheName: string,
-    readonly id: string,
-  ) {}
+export const CacheErrorTypeId = Symbol.for("dfx/Cache/CacheError")
+
+export class CacheMissError extends TypeIdError(
+  CacheErrorTypeId,
+  "CacheMissError",
+)<{
+  cacheName: string
+  id: string
+}> {
+  get message() {
+    return `Cache miss for "${this.cacheName}" with id: ${this.id}`
+  }
 }

package/src/DiscordGateway/DiscordWS.ts

@@ -78,6 +78,7 @@ const make = Effect.gen(function* (_) {
         Effect.forever,
         Effect.annotateLogs("channel", "outbound"),
         Effect.forkScoped,
+        Effect.interruptible,
       )
       yield* _(
         onConnecting,
@@ -103,6 +104,7 @@ const make = Effect.gen(function* (_) {
         ),
         Effect.annotateLogs("channel", "inbound"),
         Effect.forkScoped,
+        Effect.interruptible,
       )
 
       return {

package/src/DiscordGateway/Shard.ts

@@ -60,7 +60,7 @@ export const make = Effect.gen(function* (_) {
 
       const heartbeatSend = (p: Message) =>
         Effect.flatMap(Ref.get(phase), phase =>
-          phase === Phase.Connected
+          phase !== Phase.Connecting
             ? Queue.offer(outboundQueue, p)
             : Effect.succeed(false),
         )
@@ -134,6 +134,7 @@ export const make = Effect.gen(function* (_) {
       yield* _(
         Heartbeats.send(hellos, acks, latestSequence, heartbeatSend),
         Effect.forkScoped,
+        Effect.interruptible,
       )
 
       // identify
@@ -155,26 +156,34 @@ export const make = Effect.gen(function* (_) {
           Effect.zipRight(maybeUpdateUrl(p)),
           Effect.tap(() => {
             switch (p.op) {
-              case Discord.GatewayOpcode.HELLO:
+              case Discord.GatewayOpcode.HELLO: {
                 return pipe(
                   Effect.tap(identify, prioritySend),
                   Effect.zipRight(setPhase(Phase.Handshake)),
                   Effect.zipRight(Queue.offer(hellos, p)),
                 )
-              case Discord.GatewayOpcode.HEARTBEAT_ACK:
+              }
+              case Discord.GatewayOpcode.HEARTBEAT_ACK: {
                 return Queue.offer(acks, p)
-              case Discord.GatewayOpcode.INVALID_SESSION:
+              }
+              case Discord.GatewayOpcode.INVALID_SESSION: {
                 return Effect.tap(
                   InvalidSession.fromPayload(p, latestReady),
                   send,
                 )
-              case Discord.GatewayOpcode.DISPATCH:
+              }
+              case Discord.GatewayOpcode.DISPATCH: {
                 if (p.t === "READY" || p.t === "RESUMED") {
                   return Effect.zipRight(resume, PubSub.publish(hub, p))
                 }
                 return PubSub.publish(hub, p)
-              default:
+              }
+              case Discord.GatewayOpcode.RECONNECT: {
+                return prioritySend(Reconnect)
+              }
+              default: {
                 return Effect.unit
+              }
             }
           }),
         )
@@ -184,6 +193,7 @@ export const make = Effect.gen(function* (_) {
         Effect.tap(send),
         Effect.forever,
         Effect.forkScoped,
+        Effect.interruptible,
       )
 
       yield* _(
@@ -191,6 +201,7 @@ export const make = Effect.gen(function* (_) {
         Effect.flatMap(onPayload),
         Effect.forever,
         Effect.forkScoped,
+        Effect.interruptible,
       )
 
       return { id: shard, send } as const

package/src/DiscordGateway/Sharder.ts

@@ -92,6 +92,7 @@ const make = Effect.gen(function* (_) {
     Effect.ensuring(Ref.set(currentShards, HashSet.empty())),
     Effect.forever,
     Effect.forkScoped,
+    Effect.interruptible,
   )
 
   return { shards: Ref.get(currentShards) } as const

package/src/DiscordREST.ts

@@ -21,13 +21,25 @@ import * as Discord from "dfx/types"
 import { LIB_VERSION } from "dfx/version"
 import type { Scope } from "effect/Scope"
 import * as Effectable from "effect/Effectable"
+import { TypeIdError } from "@effect/platform/Error"
 
-export class DiscordRESTError {
-  readonly _tag = "DiscordRESTError"
-  constructor(
-    readonly error: Http.error.HttpClientError,
-    readonly body?: unknown,
-  ) {}
+export const DiscordRESTErrorTypeId = Symbol.for(
+  "dfx/DiscordREST/DiscordRESTError",
+)
+
+export class DiscordRESTError extends TypeIdError(
+  DiscordRESTErrorTypeId,
+  "DiscordRESTError",
+)<{
+  error: Http.error.HttpClientError
+  body?: unknown
+}> {
+  get message() {
+    const httpMessage = this.error.message
+    return this.body !== undefined
+      ? `${httpMessage}: ${JSON.stringify(this.body)}`
+      : httpMessage
+  }
 }
 
 const make = Effect.gen(function* (_) {
@@ -146,12 +158,12 @@ const make = Effect.gen(function* (_) {
     Http.client.catchAll(error =>
       error.reason === "StatusCode"
         ? error.response.json.pipe(
-            Effect.mapError(_ => new DiscordRESTError(_)),
+            Effect.mapError(_ => new DiscordRESTError({ error })),
             Effect.flatMap(body =>
-              Effect.fail(new DiscordRESTError(error, body)),
+              Effect.fail(new DiscordRESTError({ error, body })),
             ),
           )
-        : Effect.fail(new DiscordRESTError(error)),
+        : Effect.fail(new DiscordRESTError({ error })),
     ),
   )
 

package/src/Interactions/context.ts

@@ -1,10 +1,13 @@
+import { TypeIdError } from "@effect/platform/Error"
+import * as IxHelpers from "dfx/Helpers/interactions"
+import { InteractionsErrorTypeId } from "dfx/Interactions/error"
+import type * as Discord from "dfx/types"
+import type { NoSuchElementException } from "effect/Cause"
 import { GenericTag } from "effect/Context"
+import * as Effect from "effect/Effect"
 import type * as HashMap from "effect/HashMap"
 import * as Option from "effect/Option"
 import * as Arr from "effect/ReadonlyArray"
-import * as Effect from "effect/Effect"
-import * as IxHelpers from "dfx/Helpers/interactions"
-import type * as Discord from "dfx/types"
 
 export interface DiscordInteraction {
   readonly _: unique symbol
@@ -59,44 +62,31 @@ export const SubCommandContext = GenericTag<
   SubCommandContext
 >("dfx/Interactions/SubCommandContext")
 
-export class ResolvedDataNotFound {
-  readonly _tag = "ResolvedDataNotFound"
-  constructor(
-    readonly data: Discord.Interaction,
-    readonly name?: string,
-  ) {}
-}
-
 export const resolvedValues = <A>(
   f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => A | undefined,
-): Effect.Effect<ReadonlyArray<A>, ResolvedDataNotFound, DiscordInteraction> =>
-  Effect.flatMap(Interaction, ix =>
-    Effect.mapError(
-      IxHelpers.resolveValues(f)(ix),
-      () => new ResolvedDataNotFound(ix),
-    ),
-  )
+): Effect.Effect<
+  ReadonlyArray<A>,
+  NoSuchElementException,
+  DiscordInteraction
+> => Effect.flatMap(Interaction, ix => IxHelpers.resolveValues(f)(ix))
 
 export const resolved = <A>(
   name: string,
   f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => A | undefined,
-): Effect.Effect<A, ResolvedDataNotFound, DiscordInteraction> =>
-  Effect.flatMap(Interaction, ix =>
-    Effect.mapError(
-      IxHelpers.resolveOptionValue(name, f)(ix),
-      () => new ResolvedDataNotFound(ix, name),
-    ),
-  )
+): Effect.Effect<A, NoSuchElementException, DiscordInteraction> =>
+  Effect.flatMap(Interaction, ix => IxHelpers.resolveOptionValue(name, f)(ix))
 
 export const focusedOptionValue = Effect.map(
   FocusedOptionContext,
   _ => _.focusedOption.value ?? "",
 )
 
-export class SubCommandNotFound {
-  readonly _tag = "SubCommandNotFound"
-  constructor(readonly data: Discord.ApplicationCommandDatum) {}
-}
+export class SubCommandNotFound extends TypeIdError(
+  InteractionsErrorTypeId,
+  "SubCommandNotFound",
+)<{
+  data: Discord.ApplicationCommandDatum
+}> {}
 
 export const handleSubCommands = <
   NER extends Record<
@@ -128,7 +118,7 @@ export const handleSubCommands = <
     Effect.flatMap(data =>
       Effect.mapError(
         Arr.findFirst(IxHelpers.allSubCommands(data), _ => !!commands[_.name]),
-        () => new SubCommandNotFound(data),
+        () => new SubCommandNotFound({ data }),
       ),
     ),
     Effect.flatMap(command =>
@@ -188,18 +178,7 @@ export const modalValues = Effect.map(ModalSubmitData, IxHelpers.componentsMap)
 export const modalValueOption = (name: string) =>
   Effect.map(ModalSubmitData, IxHelpers.componentValue(name))
 
-export class ModalValueNotFound {
-  readonly _tag = "ModalValueNotFound"
-  constructor(
-    readonly data: Discord.ModalSubmitDatum,
-    readonly name: string,
-  ) {}
-}
-
-export const modalValue = (name: string) =>
-  Effect.flatMap(ModalSubmitData, data =>
-    Effect.mapError(
-      IxHelpers.componentValue(name)(data),
-      () => new ModalValueNotFound(data, name),
-    ),
-  )
+export const modalValue = (
+  name: string,
+): Effect.Effect<string, NoSuchElementException, DiscordModalSubmit> =>
+  Effect.flatMap(ModalSubmitData, data => IxHelpers.componentValue(name)(data))

package/src/Interactions/definitions.ts

@@ -6,10 +6,10 @@ import type {
   DiscordInteraction,
   DiscordMessageComponent,
   DiscordModalSubmit,
-  ResolvedDataNotFound,
   SubCommandContext,
 } from "dfx/Interactions/context"
 import type * as Discord from "dfx/types"
+import type { NoSuchElementException } from "effect/Cause"
 
 export type InteractionDefinition<R, E> =
   | GlobalApplicationCommand<R, E>
@@ -143,7 +143,7 @@ export interface CommandHelper<A> {
   resolve: <T>(
     name: AllResolvables<A>["name"],
     f: (id: Discord.Snowflake, data: Discord.ResolvedDatum) => T | undefined,
-  ) => Effect.Effect<T, ResolvedDataNotFound, DiscordInteraction>
+  ) => Effect.Effect<T, NoSuchElementException, DiscordInteraction>
 
   option: (
     name: AllCommandOptions<A>["name"],

package/src/Interactions/error.ts

@@ -0,0 +1,3 @@
+export const InteractionsErrorTypeId = Symbol.for(
+  "dfx/Interactions/InteractionsError",
+)

package/src/Interactions/gateway.ts

@@ -146,6 +146,7 @@ const makeRegistry = Effect.gen(function* (_) {
       ),
     ),
     Effect.forkScoped,
+    Effect.interruptible,
   )
 
   return { register } as const

package/src/Interactions/webhook.ts

@@ -18,6 +18,8 @@ import type {
 import { Interaction } from "dfx/Interactions/index"
 import type * as Discord from "dfx/types"
 import * as Verify from "discord-verify"
+import { RefailError } from "@effect/platform/Error"
+import { InteractionsErrorTypeId } from "dfx/Interactions/error"
 
 export class BadWebhookSignature {
   readonly _tag = "BadWebhookSignature"
@@ -88,10 +90,10 @@ export const layerConfig: (
   config: Config.Config<MakeConfigOpts>,
 ) => Layer.effect(WebhookConfig, Effect.map(config, makeConfig))
 
-export class WebhookParseError {
-  readonly _tag = "WebhookParseError"
-  constructor(readonly reason: unknown) {}
-}
+export class WebhookParseError extends RefailError(
+  InteractionsErrorTypeId,
+  "WebhookParseError",
+)<{}> {}
 
 const fromHeadersAndBody = (headers: Headers, body: string) =>
   Effect.tap(WebhookConfig, ({ algorithm, crypto, publicKey }) =>
@@ -100,7 +102,7 @@ const fromHeadersAndBody = (headers: Headers, body: string) =>
     Effect.flatMap(() =>
       Effect.try({
         try: () => JSON.parse(body) as Discord.Interaction,
-        catch: reason => new WebhookParseError(reason),
+        catch: error => new WebhookParseError({ error }),
       }),
     ),
   )

package/src/utils/Effect.ts

@@ -24,6 +24,7 @@ export const subscribeForEachPar = <R, E, A, X>(
         ),
       ),
       Effect.scoped,
+      Effect.interruptible,
     )
 
     return Effect.all([run, Deferred.await(deferred)], {
@@ -59,6 +60,7 @@ export const foreverSwitch = <R, E, A, R1, E1, X>(
           }),
         ),
         Effect.forever,
+        Effect.interruptible,
       )
 
       return Effect.all([run, Deferred.await(causeDeferred)], {

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "0.90.1";
+export const LIB_VERSION = "0.90.3";

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,eAAe,CAAA;AAEvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,eAAO,MAAM,mBAAmB,qBACxB,aAAa,CAAC,CAAC,CAAC,cACV,CAAC,KAAK,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACvC,aAAa,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAsBxB,CAAA;AAEJ,eAAO,MAAM,aAAa,6BAClB,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,SACrB,CAAC,KAAK,aAAa,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,KACpC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CA+BnC,CAAA"}
+{"version":3,"file":"Effect.d.ts","sourceRoot":"","sources":["../src/utils/Effect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,eAAO,MAAM,mBAAmB,qBACxB,aAAa,CAAC,CAAC,CAAC,cACV,CAAC,KAAK,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KACvC,aAAa,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAuBxB,CAAA;AAEJ,eAAO,MAAM,aAAa,6BAClB,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,SACrB,CAAC,KAAK,aAAa,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,KACpC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAgCnC,CAAA"}

package/utils/Effect.js

@@ -12,7 +12,7 @@ var Queue = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Q
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const subscribeForEachPar = (self, effect) => Effect.flatMap(Deferred.make(), deferred => {
-  const run = (0, _Function.pipe)(PubSub.subscribe(self), Effect.flatMap(queue => Effect.forever(Effect.flatMap(Queue.take(queue), _ => Effect.fork(Effect.catchAllCause(effect(_), _ => Deferred.failCause(deferred, _)))))), Effect.scoped);
+  const run = (0, _Function.pipe)(PubSub.subscribe(self), Effect.flatMap(queue => Effect.forever(Effect.flatMap(Queue.take(queue), _ => Effect.fork(Effect.catchAllCause(effect(_), _ => Deferred.failCause(deferred, _)))))), Effect.scoped, Effect.interruptible);
   return Effect.all([run, Deferred.await(deferred)], {
     concurrency: "unbounded",
     discard: true
@@ -23,7 +23,7 @@ const foreverSwitch = (self, f) => (0, _Function.pipe)(Effect.all([Deferred.make
   let fiber;
   const run = (0, _Function.pipe)(self, Effect.tap(() => fiber ? fiber.interruptAsFork(fiberId) : Effect.unit), Effect.flatMap(_ => (0, _Function.pipe)(f(_), Effect.tapErrorCause(_ => Deferred.failCause(causeDeferred, _)), Effect.fork)), Effect.tap(fiber_ => Effect.sync(() => {
     fiber = fiber_;
-  })), Effect.forever);
+  })), Effect.forever, Effect.interruptible);
   return Effect.all([run, Deferred.await(causeDeferred)], {
     concurrency: "unbounded",
     discard: true

package/utils/Effect.js.map

@@ -1 +1 @@
-{"version":3,"file":"Effect.js","names":["_Function","require","Deferred","_interopRequireWildcard","Effect","PubSub","Queue","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","subscribeForEachPar","self","effect","flatMap","make","deferred","run","pipe","subscribe","queue","forever","take","_","fork","catchAllCause","failCause","scoped","all","await","concurrency","discard","exports","foreverSwitch","f","fiberId","causeDeferred","fiber","tap","interruptAsFork","unit","tapErrorCause","fiber_","sync"],"sources":["../src/utils/Effect.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Effect.js","names":["_Function","require","Deferred","_interopRequireWildcard","Effect","PubSub","Queue","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","subscribeForEachPar","self","effect","flatMap","make","deferred","run","pipe","subscribe","queue","forever","take","_","fork","catchAllCause","failCause","scoped","interruptible","all","await","concurrency","discard","exports","foreverSwitch","f","fiberId","causeDeferred","fiber","tap","interruptAsFork","unit","tapErrorCause","fiber_","sync"],"sources":["../src/utils/Effect.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/version.d.ts

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

package/version.js

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