dfx 0.91.3 → 0.93.0

package/mjs/Interactions/handlers.mjs

@@ -1,4 +1,3 @@
-import * as Option from "effect/Option";
 import * as Effect from "effect/Effect";
 import * as IxHelpers from "dfx/Helpers/interactions";
 import * as Ctx from "dfx/Interactions/context";
@@ -20,41 +19,44 @@ export const handlers = (definitions, handleResponse) => {
     ModalSubmit
   } = splitDefinitions(flattened);
   return {
-    [Discord.InteractionType.PING]: () => Effect.succeed({
+    [Discord.InteractionType.PING]: _ => Effect.succeed({
       type: Discord.InteractionCallbackType.PONG
     }),
     [Discord.InteractionType.APPLICATION_COMMAND]: i => {
       const data = i.data;
-      return Option.match(Option.fromNullable(Commands[data.name]), {
-        onNone: () => Effect.fail(new DefinitionNotFound(i)),
-        onSome: command => Effect.provideService(command.handle(i), Ctx.ApplicationCommand, data)
-      });
+      const command = Commands[data.name];
+      if (command === undefined) {
+        return Effect.fail(new DefinitionNotFound(i));
+      }
+      return Effect.provideService(command.handle(i), Ctx.ApplicationCommand, data);
     },
     [Discord.InteractionType.MODAL_SUBMIT]: i => {
       const data = i.data;
-      return Effect.findFirst(ModalSubmit, _ => _.predicate(data.custom_id)).pipe(Effect.flatMap(Option.match({
-        onNone: () => Effect.fail(new DefinitionNotFound(i)),
-        onSome: match => Effect.provideService(match.handle(i), Ctx.ModalSubmitData, data)
-      })));
+      const match = ModalSubmit.find(_ => _.predicate(data.custom_id));
+      if (match === undefined) {
+        return Effect.fail(new DefinitionNotFound(i));
+      }
+      return Effect.provideService(match.handle(i), Ctx.ModalSubmitData, data);
     },
     [Discord.InteractionType.MESSAGE_COMPONENT]: i => {
       const data = i.data;
-      return Effect.findFirst(MessageComponent, _ => _.predicate(data.custom_id)).pipe(Effect.flatMap(Option.match({
-        onNone: () => Effect.fail(new DefinitionNotFound(i)),
-        onSome: match => Effect.provideService(match.handle(i), Ctx.MessageComponentData, data)
-      })));
+      const match = MessageComponent.find(_ => _.predicate(data.custom_id));
+      if (match === undefined) {
+        return Effect.fail(new DefinitionNotFound(i));
+      }
+      return Effect.provideService(match.handle(i), Ctx.MessageComponentData, data);
     },
     [Discord.InteractionType.APPLICATION_COMMAND_AUTOCOMPLETE]: i => {
       const data = i.data;
-      return Option.match(IxHelpers.focusedOption(data), {
-        onNone: () => Effect.fail(new DefinitionNotFound(i)),
-        onSome: focusedOption => Effect.findFirst(Autocomplete, _ => _.predicate(data, focusedOption)).pipe(Effect.flatMap(Option.match({
-          onNone: () => Effect.fail(new DefinitionNotFound(i)),
-          onSome: match => Effect.provideService(match.handle(i), Ctx.ApplicationCommand, data).pipe(Effect.provideService(Ctx.FocusedOptionContext, {
-            focusedOption
-          }))
-        })))
-      });
+      const option = IxHelpers.focusedOption(data);
+      if (option._tag === "None") {
+        return Effect.fail(new DefinitionNotFound(i));
+      }
+      const match = Autocomplete.find(_ => _.predicate(data, option.value));
+      if (match === undefined) {
+        return Effect.fail(new DefinitionNotFound(i));
+      }
+      return match.handle(i).pipe(Effect.provideService(Ctx.ApplicationCommand, data), Effect.provideService(Ctx.FocusedOptionContext, option.value));
     }
   };
 };

package/mjs/Interactions/handlers.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"handlers.mjs","names":["Option","Effect","IxHelpers","Ctx","flattenDefinitions","splitDefinitions","Discord","DefinitionNotFound","interaction","_tag","constructor","handlers","definitions","handleResponse","flattened","Autocomplete","Commands","MessageComponent","ModalSubmit","InteractionType","PING","succeed","type","InteractionCallbackType","PONG","APPLICATION_COMMAND","i","data","match","fromNullable","name","onNone","fail","onSome","command","provideService","handle","ApplicationCommand","MODAL_SUBMIT","findFirst","_","predicate","custom_id","pipe","flatMap","ModalSubmitData","MESSAGE_COMPONENT","MessageComponentData","APPLICATION_COMMAND_AUTOCOMPLETE","focusedOption","FocusedOptionContext"],"sources":["../../src/Interactions/handlers.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"handlers.mjs","names":["Effect","IxHelpers","Ctx","flattenDefinitions","splitDefinitions","Discord","DefinitionNotFound","interaction","_tag","constructor","handlers","definitions","handleResponse","flattened","Autocomplete","Commands","MessageComponent","ModalSubmit","InteractionType","PING","_","succeed","type","InteractionCallbackType","PONG","APPLICATION_COMMAND","i","data","command","name","undefined","fail","provideService","handle","ApplicationCommand","MODAL_SUBMIT","match","find","predicate","custom_id","ModalSubmitData","MESSAGE_COMPONENT","MessageComponentData","APPLICATION_COMMAND_AUTOCOMPLETE","option","focusedOption","value","pipe","FocusedOptionContext"],"sources":["../../src/Interactions/handlers.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/mjs/Interactions/index.mjs

@@ -1,12 +1,11 @@
-import * as Effect from "effect/Effect";
 export { response } from "dfx/Helpers/interactions";
 export * from "dfx/Interactions/builder";
 export * from "dfx/Interactions/context";
 export { autocomplete, global, guild, messageComponent, modalSubmit } from "dfx/Interactions/definitions";
 // Filters
-export const id = query => customId => Effect.succeed(query === customId);
-export const idStartsWith = query => customId => Effect.succeed(customId.startsWith(query));
-export const idRegex = query => customId => Effect.succeed(query.test(customId));
-export const option = (command, optionName) => (data, focusedOption) => Effect.succeed(data.name === command && focusedOption.name === optionName);
-export const optionOnly = optionName => (_, focusedOption) => Effect.succeed(focusedOption.name === optionName);
+export const id = query => customId => query === customId;
+export const idStartsWith = query => customId => customId.startsWith(query);
+export const idRegex = query => customId => query.test(customId);
+export const option = (command, optionName) => (data, focusedOption) => data.name === command && focusedOption.name === optionName;
+export const optionOnly = optionName => (_, focusedOption) => focusedOption.name === optionName;
 //# sourceMappingURL=index.mjs.map

package/mjs/Interactions/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":["Effect","response","autocomplete","global","guild","messageComponent","modalSubmit","id","query","customId","succeed","idStartsWith","startsWith","idRegex","test","option","command","optionName","data","focusedOption","name","optionOnly","_"],"sources":["../../src/Interactions/index.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,MAAM,MAAM,eAAe;AAGvC,SAASC,QAAQ,QAAQ,0BAA0B;AACnD,cAAc,0BAA0B;AACxC,cAAc,0BAA0B;AACxC,SACEC,YAAY,EACZC,MAAM,EACNC,KAAK,EAELC,gBAAgB,EAChBC,WAAW,QACN,8BAA8B;AAErC;AACA,OAAO,MAAMC,EAAE,GAAIC,KAAa,IAAMC,QAAgB,IACpDT,MAAM,CAACU,OAAO,CAACF,KAAK,KAAKC,QAAQ,CAAC;AAEpC,OAAO,MAAME,YAAY,GAAIH,KAAa,IAAMC,QAAgB,IAC9DT,MAAM,CAACU,OAAO,CAACD,QAAQ,CAACG,UAAU,CAACJ,KAAK,CAAC,CAAC;AAE5C,OAAO,MAAMK,OAAO,GAAIL,KAAa,IAAMC,QAAgB,IACzDT,MAAM,CAACU,OAAO,CAACF,KAAK,CAACM,IAAI,CAACL,QAAQ,CAAC,CAAC;AAEtC,OAAO,MAAMM,MAAM,GACjBA,CAACC,OAAe,EAAEC,UAAkB,KACpC,CACEC,IAAmD,EACnDC,aAGC,KAEDnB,MAAM,CAACU,OAAO,CAACQ,IAAI,CAACE,IAAI,KAAKJ,OAAO,IAAIG,aAAa,CAACC,IAAI,KAAKH,UAAU,CAAC;AAE9E,OAAO,MAAMI,UAAU,GACpBJ,UAAkB,IACnB,CACEK,CAAU,EACVH,aAGC,KAEDnB,MAAM,CAACU,OAAO,CAACS,aAAa,CAACC,IAAI,KAAKH,UAAU,CAAC","ignoreList":[]}
+{"version":3,"file":"index.mjs","names":["response","autocomplete","global","guild","messageComponent","modalSubmit","id","query","customId","idStartsWith","startsWith","idRegex","test","option","command","optionName","data","focusedOption","name","optionOnly","_"],"sources":["../../src/Interactions/index.ts"],"sourcesContent":[null],"mappings":"AAEA,SAASA,QAAQ,QAAQ,0BAA0B;AACnD,cAAc,0BAA0B;AACxC,cAAc,0BAA0B;AACxC,SACEC,YAAY,EACZC,MAAM,EACNC,KAAK,EAELC,gBAAgB,EAChBC,WAAW,QACN,8BAA8B;AAErC;AACA,OAAO,MAAMC,EAAE,GAAIC,KAAa,IAAMC,QAAgB,IAAKD,KAAK,KAAKC,QAAQ;AAE7E,OAAO,MAAMC,YAAY,GAAIF,KAAa,IAAMC,QAAgB,IAC9DA,QAAQ,CAACE,UAAU,CAACH,KAAK,CAAC;AAE5B,OAAO,MAAMI,OAAO,GAAIJ,KAAa,IAAMC,QAAgB,IACzDD,KAAK,CAACK,IAAI,CAACJ,QAAQ,CAAC;AAEtB,OAAO,MAAMK,MAAM,GACjBA,CAACC,OAAe,EAAEC,UAAkB,KACpC,CACEC,IAAmD,EACnDC,aAGC,KAEDD,IAAI,CAACE,IAAI,KAAKJ,OAAO,IAAIG,aAAa,CAACC,IAAI,KAAKH,UAAU;AAE9D,OAAO,MAAMI,UAAU,GACpBJ,UAAkB,IACnB,CACEK,CAAU,EACVH,aAGC,KAEDA,aAAa,CAACC,IAAI,KAAKH,UAAU","ignoreList":[]}

package/mjs/Interactions/utils.mjs

@@ -1,6 +1,7 @@
 import * as Chunk from "effect/Chunk";
 import * as Effect from "effect/Effect";
 import * as Ctx from "dfx/Interactions/context";
+import * as Array from "effect/Array";
 const context = {
   resolve: Ctx.resolved,
   option: Ctx.option,
@@ -8,28 +9,25 @@ const context = {
   optionValueOptional: Ctx.optionValueOptional,
   subCommands: Ctx.handleSubCommands
 };
-export const flattenDefinitions = (definitions, handleResponse) => Chunk.map(definitions, ([definition, transform]) => ({
+export const flattenDefinitions = (definitions, handleResponse) => Array.map(Chunk.toReadonlyArray(definitions), ([definition, transform]) => ({
   ...definition,
-  handle: i => Effect.scoped(Effect.isEffect(definition.handle) ? transform(Effect.flatMap(definition.handle, _ => handleResponse(i, _))) : transform(Effect.flatMap(definition.handle(context), _ => handleResponse(i, _))))
+  handle: Effect.isEffect(definition.handle) ? i => Effect.scoped(transform(Effect.flatMap(definition.handle, _ => handleResponse(i, _)))) : i => Effect.scoped(transform(Effect.flatMap(definition.handle(context), _ => handleResponse(i, _))))
 }));
 export const splitDefinitions = definitions => {
-  const grouped = Chunk.reduce(definitions, {
-    Autocomplete: Chunk.empty(),
-    GlobalApplicationCommand: Chunk.empty(),
-    GuildApplicationCommand: Chunk.empty(),
-    MessageComponent: Chunk.empty(),
-    ModalSubmit: Chunk.empty()
-  }, (acc, d) => ({
-    ...acc,
-    [d._tag]: Chunk.append(acc[d._tag], d)
-  }));
-  const Commands = Chunk.appendAll(grouped.GlobalApplicationCommand, grouped.GuildApplicationCommand).pipe(Chunk.reduce({}, (acc, d) => ({
-    ...acc,
-    [d.command.name]: d
-  })));
-  return {
-    ...grouped,
-    Commands
-  };
+  const grouped = Array.reduce(definitions, {
+    Autocomplete: [],
+    GlobalApplicationCommand: [],
+    GuildApplicationCommand: [],
+    MessageComponent: [],
+    ModalSubmit: [],
+    Commands: {}
+  }, (acc, d) => {
+    acc[d._tag].push(d);
+    if (d._tag === "GlobalApplicationCommand" || d._tag === "GuildApplicationCommand") {
+      acc.Commands[d.command.name] = d;
+    }
+    return acc;
+  });
+  return grouped;
 };
 //# sourceMappingURL=utils.mjs.map

package/mjs/Interactions/utils.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.mjs","names":["Chunk","Effect","Ctx","context","resolve","resolved","option","optionValue","optionValueOptional","subCommands","handleSubCommands","flattenDefinitions","definitions","handleResponse","map","definition","transform","handle","i","scoped","isEffect","flatMap","_","splitDefinitions","grouped","reduce","Autocomplete","empty","GlobalApplicationCommand","GuildApplicationCommand","MessageComponent","ModalSubmit","acc","d","_tag","append","Commands","appendAll","pipe","command","name"],"sources":["../../src/Interactions/utils.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,GAAG,MAAM,0BAA0B;AAkB/C,MAAMC,OAAO,GAAyB;EACpCC,OAAO,EAAEF,GAAG,CAACG,QAAQ;EACrBC,MAAM,EAAEJ,GAAG,CAACI,MAAM;EAClBC,WAAW,EAAEL,GAAG,CAACK,WAAW;EAC5BC,mBAAmB,EAAEN,GAAG,CAACM,mBAAmB;EAC5CC,WAAW,EAAEP,GAAG,CAACQ;CACX;AAER,OAAO,MAAMC,kBAAkB,GAAGA,CAChCC,WAKC,EACDC,cAG2B,KAE3Bb,KAAK,CAACc,GAAG,CAACF,WAAW,EAAE,CAAC,CAACG,UAAU,EAAEC,SAAS,CAAC,MAAM;EACnD,GAAGD,UAAU;EACbE,MAAM,EAAGC,CAAsB,IAC7BjB,MAAM,CAACkB,MAAM,CACXlB,MAAM,CAACmB,QAAQ,CAACL,UAAU,CAACE,MAAM,CAAC,GAC9BD,SAAS,CACPf,MAAM,CAACoB,OAAO,CAACN,UAAU,CAACE,MAAM,EAAEK,CAAC,IAAIT,cAAc,CAACK,CAAC,EAAEI,CAAC,CAAC,CAAC,CAC7D,GACDN,SAAS,CACPf,MAAM,CAACoB,OAAO,CAACN,UAAU,CAACE,MAAM,CAACd,OAAO,CAAC,EAAEmB,CAAC,IAC1CT,cAAc,CAACK,CAAC,EAAEI,CAAC,CAAC,CACrB,CACF;CAEV,CAAC,CAAC;AAEL,OAAO,MAAMC,gBAAgB,GAC3BX,WAA0D,IACxD;EACF,MAAMY,OAAO,GAAGxB,KAAK,CAACyB,MAAM,CAC1Bb,WAAW,EACX;IACEc,YAAY,EAAE1B,KAAK,CAAC2B,KAAK,EAAE;IAC3BC,wBAAwB,EAAE5B,KAAK,CAAC2B,KAAK,EAAE;IACvCE,uBAAuB,EAAE7B,KAAK,CAAC2B,KAAK,EAAE;IACtCG,gBAAgB,EAAE9B,KAAK,CAAC2B,KAAK,EAAE;IAC/BI,WAAW,EAAE/B,KAAK,CAAC2B,KAAK;GAKzB,EACD,CAACK,GAAG,EAAEC,CAAC,MAAM;IACX,GAAGD,GAAG;IACN,CAACC,CAAC,CAACC,IAAI,GAAGlC,KAAK,CAACmC,MAAM,CAACH,GAAG,CAACC,CAAC,CAACC,IAAI,CAAqB,EAAED,CAAC;GAC1D,CAAC,CACH;EAED,MAAMG,QAAQ,GAAGpC,KAAK,CAACqC,SAAS,CAC9Bb,OAAO,CAACI,wBAAwB,EAChCJ,OAAO,CAACK,uBAAuB,CAChC,CAACS,IAAI,CACJtC,KAAK,CAACyB,MAAM,CACV,EAA6D,EAC7D,CAACO,GAAG,EAAEC,CAAC,MACJ;IACC,GAAGD,GAAG;IACN,CAACC,CAAC,CAACM,OAAO,CAACC,IAAI,GAAGP;GACnB,CAAQ,CACZ,CACF;EAED,OAAO;IACL,GAAGT,OAAO;IACVY;GACD;AACH,CAAC","ignoreList":[]}
+{"version":3,"file":"utils.mjs","names":["Chunk","Effect","Ctx","Array","context","resolve","resolved","option","optionValue","optionValueOptional","subCommands","handleSubCommands","flattenDefinitions","definitions","handleResponse","map","toReadonlyArray","definition","transform","handle","isEffect","i","scoped","flatMap","_","splitDefinitions","grouped","reduce","Autocomplete","GlobalApplicationCommand","GuildApplicationCommand","MessageComponent","ModalSubmit","Commands","acc","d","_tag","push","command","name"],"sources":["../../src/Interactions/utils.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,GAAG,MAAM,0BAA0B;AAG/C,OAAO,KAAKC,KAAK,MAAM,cAAc;AAgBrC,MAAMC,OAAO,GAAyB;EACpCC,OAAO,EAAEH,GAAG,CAACI,QAAQ;EACrBC,MAAM,EAAEL,GAAG,CAACK,MAAM;EAClBC,WAAW,EAAEN,GAAG,CAACM,WAAW;EAC5BC,mBAAmB,EAAEP,GAAG,CAACO,mBAAmB;EAC5CC,WAAW,EAAER,GAAG,CAACS;CACX;AAER,OAAO,MAAMC,kBAAkB,GAAGA,CAChCC,WAKC,EACDC,cAG2B,KAE3BX,KAAK,CAACY,GAAG,CAACf,KAAK,CAACgB,eAAe,CAACH,WAAW,CAAC,EAAE,CAAC,CAACI,UAAU,EAAEC,SAAS,CAAC,MAAM;EAC1E,GAAGD,UAAU;EACbE,MAAM,EAAElB,MAAM,CAACmB,QAAQ,CAACH,UAAU,CAACE,MAAM,CAAC,GACrCE,CAAsB,IACrBpB,MAAM,CAACqB,MAAM,CACXJ,SAAS,CACPjB,MAAM,CAACsB,OAAO,CACZN,UAAU,CAACE,MAAoD,EAC/DK,CAAC,IAAIV,cAAc,CAACO,CAAC,EAAEG,CAAC,CAAC,CAC1B,CACF,CACF,GACFH,CAAsB,IACrBpB,MAAM,CAACqB,MAAM,CACXJ,SAAS,CACPjB,MAAM,CAACsB,OAAO,CAEVN,UAAU,CAACE,MAGZ,CAACf,OAAO,CAAC,EACVoB,CAAC,IAAIV,cAAc,CAACO,CAAC,EAAEG,CAAC,CAAC,CAC1B,CACF;CAEV,CAAC,CAAC;AAEL,OAAO,MAAMC,gBAAgB,GAC3BZ,WAA4D,IAC1D;EACF,MAAMa,OAAO,GAAGvB,KAAK,CAACwB,MAAM,CAC1Bd,WAAW,EACX;IACEe,YAAY,EAAE,EAAE;IAChBC,wBAAwB,EAAE,EAAE;IAC5BC,uBAAuB,EAAE,EAAE;IAC3BC,gBAAgB,EAAE,EAAE;IACpBC,WAAW,EAAE,EAAE;IACfC,QAAQ,EAAE;GAOX,EACD,CAACC,GAAG,EAAEC,CAAC,KAAI;IACTD,GAAG,CAACC,CAAC,CAACC,IAAI,CAAC,CAACC,IAAI,CAACF,CAAQ,CAAC;IAC1B,IACEA,CAAC,CAACC,IAAI,KAAK,0BAA0B,IACrCD,CAAC,CAACC,IAAI,KAAK,yBAAyB,EACpC;MACAF,GAAG,CAACD,QAAQ,CAACE,CAAC,CAACG,OAAO,CAACC,IAAI,CAAC,GAAGJ,CAAQ;IACzC;IACA,OAAOD,GAAG;EACZ,CAAC,CACF;EAED,OAAOR,OAAO;AAChB,CAAC","ignoreList":[]}

package/mjs/Interactions/webhook.mjs

@@ -16,7 +16,7 @@ export class BadWebhookSignature {
 const checkSignature = (publicKey, headers, body, crypto, algorithm) => Option.all({
   signature: Option.fromNullable(headers["x-signature-ed25519"]),
   timestamp: Option.fromNullable(headers["x-signature-timestamp"])
-}).pipe(Effect.flatMap(_ => Effect.promise(() => Verify.verify(body, _.signature, _.timestamp, publicKey, crypto, algorithm))), Effect.filterOrFail(identity, () => new BadWebhookSignature()), Effect.catchAllCause(() => Effect.fail(new BadWebhookSignature())), Effect.asUnit);
+}).pipe(Effect.flatMap(_ => Effect.promise(() => Verify.verify(body, _.signature, _.timestamp, publicKey, crypto, algorithm))), Effect.filterOrFail(identity, () => new BadWebhookSignature()), Effect.catchAllCause(() => Effect.fail(new BadWebhookSignature())), Effect.asVoid);
 const makeConfig = ({
   algorithm,
   applicationId,

package/mjs/Interactions/webhook.mjs.map

@@ -1 +1 @@
-{"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","withSpan","provideService","type","attributes","interactionId","id","makeHandler","ix","handle","d","_i","r","success","makeSimpleHandler"],"sources":["../../src/Interactions/webhook.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,KAAK,MAAM,cAAc;AACrC,SAASC,UAAU,QAAQ,gBAAgB;AAC3C,SAASC,QAAQ,QAAQ,iBAAiB;AAC1C,OAAO,KAAKC,MAAM,MAAM,eAAe;AAIvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAGrC,SAASC,QAAQ,QAAQ,2BAA2B;AAKpD,SAASC,WAAW,QAAQ,wBAAwB;AAEpD,OAAO,KAAKC,MAAM,MAAM,gBAAgB;AACxC,SAASC,WAAW,QAAQ,wBAAwB;AACpD,SAASC,uBAAuB,QAAQ,wBAAwB;AAEhE,OAAM,MAAOC,mBAAmB;EACrBC,IAAI,GAAG,qBAAqB;;AAKvC,MAAMC,cAAc,GAAGA,CACrBC,SAAiB,EACjBC,OAAgB,EAChBC,IAAY,EACZC,MAAoB,EACpBC,SAAc,KAEdhB,MAAM,CAACiB,GAAG,CAAC;EACTC,SAAS,EAAElB,MAAM,CAACmB,YAAY,CAACN,OAAO,CAAC,qBAAqB,CAAC,CAAC;EAC9DO,SAAS,EAAEpB,MAAM,CAACmB,YAAY,CAACN,OAAO,CAAC,uBAAuB,CAAC;CAChE,CAAC,CAACQ,IAAI,CACLnB,MAAM,CAACoB,OAAO,CAACC,CAAC,IACdrB,MAAM,CAACsB,OAAO,CAAC,MACblB,MAAM,CAACmB,MAAM,CACXX,IAAI,EACJS,CAAC,CAACL,SAAmB,EACrBK,CAAC,CAACH,SAAmB,EACrBR,SAAS,EACTG,MAAM,EACNC,SAAS,CACV,CACF,CACF,EACDd,MAAM,CAACwB,YAAY,CAAC3B,QAAQ,EAAE,MAAM,IAAIU,mBAAmB,EAAE,CAAC,EAC9DP,MAAM,CAACyB,aAAa,CAAC,MAAMzB,MAAM,CAAC0B,IAAI,CAAC,IAAInB,mBAAmB,EAAE,CAAC,CAAC,EAClEP,MAAM,CAAC2B,MAAM,CACd;AAQH,MAAMC,UAAU,GAAGA,CAAC;EAClBd,SAAS;EACTe,aAAa;EACbhB,MAAM;EACNH;AAAS,CACM,MAAM;EACrBmB,aAAa;EACbnB,SAAS,EAAEX,MAAM,CAAC+B,KAAK,CAACpB,SAAS,CAAC;EAClCG,MAAM;EACNC,SAAS,EAAEV,MAAM,CAAC2B,iBAAiB,CAACjB,SAAS;CAC9C,CAAC;AAKF,OAAO,MAAMkB,aAAa,gBAAGpC,UAAU,CAGrC,gCAAgC,CAAC;AAEnC,OAAO,MAAMqC,KAAK,GAAIC,IAAoB,IACxCjC,KAAK,CAACkC,OAAO,CAACH,aAAa,EAAEJ,UAAU,CAACM,IAAI,CAAC,CAAC;AAEhD,OAAO,MAAME,WAAW,GAGtBC,MAAqC,IAClCpC,KAAK,CAACqC,MAAM,CAACN,aAAa,EAAEhC,MAAM,CAACuC,GAAG,CAACF,MAAM,EAAET,UAAU,CAAC,CAAC;AAEhE,OAAM,MAAOY,iBAAkB,SAAQnC,WAAW,CAChDC,uBAAuB,EACvB,mBAAmB,CAChB;AAEL,MAAMmC,kBAAkB,GAAGA,CAAC9B,OAAgB,EAAEC,IAAY,KACxDZ,MAAM,CAAC0C,GAAG,CAACV,aAAa,EAAE,CAAC;EAAElB,SAAS;EAAED,MAAM;EAAEH;AAAS,CAAE,KACzDD,cAAc,CAACC,SAAS,EAAEC,OAAO,EAAEC,IAAI,EAAEC,MAAM,EAAEC,SAAS,CAAC,CAC5D,CAACK,IAAI,CACJnB,MAAM,CAACoB,OAAO,CAAC,MACbpB,MAAM,CAAC2C,GAAG,CAAC;EACTA,GAAG,EAAEA,CAAA,KAAMC,IAAI,CAACC,KAAK,CAACjC,IAAI,CAAwB;EAClDkC,KAAK,EAAEC,KAAK,IAAI,IAAIP,iBAAiB,CAAC;IAAEO;EAAK,CAAE;CAChD,CAAC,CACH,CACF;AAEH,MAAMC,GAAG,GAAGA,CACVC,WAOC,EACDC,cAGqD,KACnD;EACF,MAAMC,OAAO,GAAGjD,QAAQ,CAAC+C,WAAW,EAAEC,cAAc,CAAC;EACrD,OAAO,CACLvC,OAAgB,EAChBC,IAAY,KAMZZ,MAAM,CAACoB,OAAO,CAACqB,kBAAkB,CAAC9B,OAAO,EAAEC,IAAI,CAAC,EAAEwC,WAAW,IAC3DpD,MAAM,CAACqD,QAAQ,CACbrD,MAAM,CAACsD,cAAc,CACnBH,OAAO,CAACC,WAAW,CAACG,IAAI,CAAC,CAACH,WAAW,CAAC,EACtCjD,WAAW,EACXiD,WAAW,CACZ,EACD,iBAAiB,EACjB;IAAEI,UAAU,EAAE;MAAEC,aAAa,EAAEL,WAAW,CAACM;IAAE;EAAE,CAAE,CAClD,CACF;AACL,CAAC;AASD;;;AAGA,OAAO,MAAMC,WAAW,GACtBC,EAAgC,IAQiB;EACjD,MAAMC,MAAM,GAAGb,GAAG,CAChBrD,KAAK,CAAC4C,GAAG,CAACqB,EAAE,CAACX,WAAW,EAAE,CAAC,CAACa,CAAC,CAAC,KAAK,CAACA,CAAC,EAAEjE,QAAQ,CAAQ,CAAC,EACxD,CAACkE,EAAE,EAAEC,CAAC,KAAKhE,MAAM,CAACmC,OAAO,CAAC6B,CAAC,CAAC,CAC7B;EAED,OAAO,CAAC;IACNpD,IAAI;IACJmC,KAAK;IACLpC,OAAO;IACPsD;EAAO,CAGR,KACCJ,MAAM,CAAClD,OAAO,EAAEC,IAAI,CAAC,CAACO,IAAI,CACxBnB,MAAM,CAACoB,OAAO,CAAC6C,OAAO,CAAC,EACvBjE,MAAM,CAACyB,aAAa,CAACsB,KAAK,CAAC,CAC5B;AACL,CAAC;AAED;;;AAGA,OAAO,MAAMmB,iBAAiB,GAC5BN,EAAgC,IAW7B;EACH,MAAMC,MAAM,GAAGb,GAAG,CAChBrD,KAAK,CAAC4C,GAAG,CAACqB,EAAE,CAACX,WAAW,EAAE,CAAC,CAACa,CAAC,CAAC,KAAK,CAACA,CAAC,EAAEjE,QAAQ,CAAQ,CAAC,EACxD,CAACkE,EAAE,EAAEC,CAAC,KAAKhE,MAAM,CAACmC,OAAO,CAAC6B,CAAC,CAAC,CAC7B;EAED,OAAO,CAAC;IAAEpD,IAAI;IAAED;EAAO,CAAsC,KAC3DkD,MAAM,CAAClD,OAAO,EAAEC,IAAI,CAAC;AACzB,CAAC","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","asVoid","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","withSpan","provideService","type","attributes","interactionId","id","makeHandler","ix","handle","d","_i","r","success","makeSimpleHandler"],"sources":["../../src/Interactions/webhook.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/mjs/RateLimit.mjs

@@ -17,7 +17,7 @@ const makeLimiter = /*#__PURE__*/Effect.gen(function* (_) {
       windowMs,
       limit,
       delay: Duration.toMillis(d)
-    })), Effect.tap(_ => Duration.toMillis(_) === 0 ? Effect.unit : Effect.sleep(_)), Effect.asUnit);
+    })), Effect.tap(_ => Duration.toMillis(_) === 0 ? Effect.void : Effect.sleep(_)), Effect.asVoid);
   };
   return {
     maybeWait

package/mjs/RateLimit.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"RateLimit.mjs","names":["GenericTag","Duration","Effect","Layer","Memory","delayFrom","RateLimitStore","MemoryRateLimitStoreLive","sync","make","makeLimiter","gen","_","store","maybeWait","key","window","limit","multiplier","windowMs","toMillis","incrementCounter","pipe","map","count","ttl","tap","d","annotateLogs","logTrace","service","delay","unit","sleep","asUnit","RateLimiter","RateLimiterLive","effect"],"sources":["../src/RateLimit.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,UAAU,QAAQ,gBAAgB;AAC3C,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAE3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,sBAAsB;AAC9C,SAASC,SAAS,QAAQ,qBAAqB;AAuC/C,OAAO,MAAMC,cAAc,gBAAGN,UAAU,CACtC,8BAA8B,CAC/B;AACD,OAAO,MAAMO,wBAAwB,gBAAGJ,KAAK,CAACK,IAAI,CAACF,cAAc,EAAEF,MAAM,CAACK,IAAI,CAAC;AAE/E,MAAMC,WAAW,gBAAGR,MAAM,CAACS,GAAG,CAAC,WAAWC,CAAC;EACzC,MAAMC,KAAK,GAAG,OAAOD,CAAC,CAACN,cAAc,CAAC;EAEtC,MAAMQ,SAAS,GAAGA,CAChBC,GAAW,EACXC,MAAyB,EACzBC,KAAa,EACbC,UAAU,GAAG,IAAI,KACf;IACF,MAAMC,QAAQ,GAAGlB,QAAQ,CAACmB,QAAQ,CAACJ,MAAM,CAAC,GAAGE,UAAU;IAEvD,OAAOL,KAAK,CAACQ,gBAAgB,CAACN,GAAG,EAAEI,QAAQ,EAAEF,KAAK,CAAC,CAACK,IAAI,CACtDpB,MAAM,CAACqB,GAAG,CAAC,CAAC,CAACC,KAAK,EAAEC,GAAG,CAAC,KAAKpB,SAAS,CAACc,QAAQ,EAAEF,KAAK,EAAEO,KAAK,EAAEC,GAAG,CAAC,CAAC,EACpEvB,MAAM,CAACwB,GAAG,CAACC,CAAC,IACVzB,MAAM,CAAC0B,YAAY,CAAC1B,MAAM,CAAC2B,QAAQ,CAAC,WAAW,CAAC,EAAE;MAChDC,OAAO,EAAE,WAAW;MACpBf,GAAG;MACHC,MAAM,EAAEf,QAAQ,CAACmB,QAAQ,CAACJ,MAAM,CAAC;MACjCG,QAAQ;MACRF,KAAK;MACLc,KAAK,EAAE9B,QAAQ,CAACmB,QAAQ,CAACO,CAAC;KAC3B,CAAC,CACH,EACDzB,MAAM,CAACwB,GAAG,CAACd,CAAC,IACVX,QAAQ,CAACmB,QAAQ,CAACR,CAAC,CAAC,KAAK,CAAC,GAAGV,MAAM,CAAC8B,IAAI,GAAG9B,MAAM,CAAC+B,KAAK,CAACrB,CAAC,CAAC,CAC3D,EACDV,MAAM,CAACgC,MAAM,CACd;EACH,CAAC;EAED,OAAO;IAAEpB;EAAS,CAAE;AACtB,CAAC,CAAC;AAKF,OAAO,MAAMqB,WAAW,gBAAGnC,UAAU,CAGnC,2BAA2B,CAAC;AAC9B,OAAO,MAAMoC,eAAe,gBAAGjC,KAAK,CAACkC,MAAM,CAACF,WAAW,EAAEzB,WAAW,CAAC","ignoreList":[]}
+{"version":3,"file":"RateLimit.mjs","names":["GenericTag","Duration","Effect","Layer","Memory","delayFrom","RateLimitStore","MemoryRateLimitStoreLive","sync","make","makeLimiter","gen","_","store","maybeWait","key","window","limit","multiplier","windowMs","toMillis","incrementCounter","pipe","map","count","ttl","tap","d","annotateLogs","logTrace","service","delay","void","sleep","asVoid","RateLimiter","RateLimiterLive","effect"],"sources":["../src/RateLimit.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,UAAU,QAAQ,gBAAgB;AAC3C,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAE3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,sBAAsB;AAC9C,SAASC,SAAS,QAAQ,qBAAqB;AAmC/C,OAAO,MAAMC,cAAc,gBAAGN,UAAU,CACtC,8BAA8B,CAC/B;AACD,OAAO,MAAMO,wBAAwB,gBAAGJ,KAAK,CAACK,IAAI,CAACF,cAAc,EAAEF,MAAM,CAACK,IAAI,CAAC;AAE/E,MAAMC,WAAW,gBAAGR,MAAM,CAACS,GAAG,CAAC,WAAWC,CAAC;EACzC,MAAMC,KAAK,GAAG,OAAOD,CAAC,CAACN,cAAc,CAAC;EAEtC,MAAMQ,SAAS,GAAGA,CAChBC,GAAW,EACXC,MAAyB,EACzBC,KAAa,EACbC,UAAU,GAAG,IAAI,KACf;IACF,MAAMC,QAAQ,GAAGlB,QAAQ,CAACmB,QAAQ,CAACJ,MAAM,CAAC,GAAGE,UAAU;IAEvD,OAAOL,KAAK,CAACQ,gBAAgB,CAACN,GAAG,EAAEI,QAAQ,EAAEF,KAAK,CAAC,CAACK,IAAI,CACtDpB,MAAM,CAACqB,GAAG,CAAC,CAAC,CAACC,KAAK,EAAEC,GAAG,CAAC,KAAKpB,SAAS,CAACc,QAAQ,EAAEF,KAAK,EAAEO,KAAK,EAAEC,GAAG,CAAC,CAAC,EACpEvB,MAAM,CAACwB,GAAG,CAACC,CAAC,IACVzB,MAAM,CAAC0B,YAAY,CAAC1B,MAAM,CAAC2B,QAAQ,CAAC,WAAW,CAAC,EAAE;MAChDC,OAAO,EAAE,WAAW;MACpBf,GAAG;MACHC,MAAM,EAAEf,QAAQ,CAACmB,QAAQ,CAACJ,MAAM,CAAC;MACjCG,QAAQ;MACRF,KAAK;MACLc,KAAK,EAAE9B,QAAQ,CAACmB,QAAQ,CAACO,CAAC;KAC3B,CAAC,CACH,EACDzB,MAAM,CAACwB,GAAG,CAACd,CAAC,IACVX,QAAQ,CAACmB,QAAQ,CAACR,CAAC,CAAC,KAAK,CAAC,GAAGV,MAAM,CAAC8B,IAAI,GAAG9B,MAAM,CAAC+B,KAAK,CAACrB,CAAC,CAAC,CAC3D,EACDV,MAAM,CAACgC,MAAM,CACd;EACH,CAAC;EAED,OAAO;IAAEpB;EAAS,CAAE;AACtB,CAAC,CAAC;AAKF,OAAO,MAAMqB,WAAW,gBAAGnC,UAAU,CAGnC,2BAA2B,CAAC;AAC9B,OAAO,MAAMoC,eAAe,gBAAGjC,KAAK,CAACkC,MAAM,CAACF,WAAW,EAAEzB,WAAW,CAAC","ignoreList":[]}

package/mjs/utils/Effect.mjs

@@ -12,7 +12,7 @@ export const subscribeForEachPar = (self, effect) => Effect.flatMap(Deferred.mak
 });
 export const foreverSwitch = (self, f) => pipe(Effect.all([Deferred.make(), Effect.fiberId]), Effect.flatMap(([causeDeferred, fiberId]) => {
   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(() => {
+  const run = pipe(self, Effect.tap(() => fiber ? fiber.interruptAsFork(fiberId) : Effect.void), Effect.flatMap(_ => pipe(f(_), Effect.tapErrorCause(_ => Deferred.failCause(causeDeferred, _)), Effect.fork)), Effect.tap(fiber_ => Effect.sync(() => {
     fiber = fiber_;
   })), Effect.forever, Effect.interruptible);
   return Effect.all([run, Deferred.await(causeDeferred)], {

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","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":[]}
+{"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","void","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.91.3";
+export const LIB_VERSION = "0.93.0";
 //# sourceMappingURL=version.mjs.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.91.3",
+  "version": "0.93.0",
   "description": "Effect-TS discord library",
   "license": "MIT",
   "repository": {
@@ -35,8 +35,8 @@
   "sideEffects": [],
   "author": "Tim Smart <hello@timsmart.co>",
   "peerDependencies": {
-    "@effect/platform": "^0.48.27",
-    "effect": "^2.4.18"
+    "@effect/platform": "^0.49.0",
+    "effect": "^3.0.0"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.8",
@@ -44,6 +44,6 @@
     "utf-8-validate": "^6.0.3",
     "zlib-sync": "^0.1.9"
   },
-  "gitHead": "372f842c1e1debf397ac330245eb3bcd263ff1e9",
+  "gitHead": "79dc159fdce009f2b34d3aa5ad46655d8851c7c8",
   "main": "./index.js"
 }

package/src/Cache/memory.ts

@@ -48,7 +48,7 @@ export const createWithParent = <T>(): Effect.Effect<
           map.delete(parentId)
         }),
 
-      refreshTTL: () => Effect.unit,
+      refreshTTL: () => Effect.void,
 
       run: Effect.never,
     })
@@ -76,7 +76,7 @@ export const create = <T>(): Effect.Effect<CacheDriver<never, T>> =>
           map.delete(resourceId)
         }),
 
-      refreshTTL: () => Effect.unit,
+      refreshTTL: () => Effect.void,
 
       run: Effect.never,
     })

package/src/Cache/memoryTTL.ts

@@ -1,9 +1,9 @@
-import * as Duration from "effect/Duration"
-import * as Option from "effect/Option"
-import * as ReadonlyArray from "effect/ReadonlyArray"
-import * as Effect from "effect/Effect"
 import type { CacheDriver, ParentCacheDriver } from "dfx/Cache/driver"
 import { createDriver, createParentDriver } from "dfx/Cache/driver"
+import * as Array from "effect/Array"
+import * as Duration from "effect/Duration"
+import * as Effect from "effect/Effect"
+import * as Option from "effect/Option"
 
 export interface MemoryTTLOpts {
   /** The approx. number of milliseconds to keep items */
@@ -172,7 +172,7 @@ export const createWithParent = <T>(
             ),
           ),
           Effect.map(
-            ReadonlyArray.reduce(new Map<string, T>(), (acc, [id, item]) =>
+            Array.reduce(new Map<string, T>(), (acc, [id, item]) =>
               item._tag === "Some" ? acc.set(id, item.value) : acc,
             ),
           ),

package/src/DiscordGateway/Messaging.ts

@@ -29,7 +29,7 @@ const handleDispatchFactory =
       if (_.t === event) {
         return handle(_.d as any)
       }
-      return Effect.unit as any
+      return Effect.void as any
     })
 
 export const make = Effect.gen(function* (_) {

package/src/DiscordGateway/Shard/invalidSession.ts

@@ -8,4 +8,4 @@ export const fromPayload = (
   p: Discord.GatewayPayload,
   latestReady: Ref.Ref<Option.Option<Discord.ReadyEvent>>,
 ): Effect.Effect<Message> =>
-  Effect.as(p.d ? Effect.unit : Ref.set(latestReady, Option.none()), Reconnect)
+  Effect.as(p.d ? Effect.void : Ref.set(latestReady, Option.none()), Reconnect)

package/src/DiscordGateway/Shard/utils.ts

@@ -20,7 +20,7 @@ const maybeUpdateRef =
   ) =>
   (_: Discord.GatewayPayload): Effect.Effect<void> =>
     Option.match(f(_), {
-      onNone: () => Effect.unit,
+      onNone: () => Effect.void,
       onSome: a => Ref.set(ref, Option.some(a)),
     })
 

package/src/DiscordGateway/Shard.ts

@@ -71,7 +71,7 @@ export const make = Effect.gen(function* (_) {
         setPhase(Phase.Connected),
         Effect.zipRight(Queue.takeAll(pendingQueue)),
         Effect.tap(_ => Queue.offerAll(outboundQueue, _)),
-        Effect.asUnit,
+        Effect.asVoid,
       )
 
       const onConnecting = pipe(
@@ -111,7 +111,7 @@ export const make = Effect.gen(function* (_) {
         Option.match(
           Option.map(isReady(p), p => p.d!),
           {
-            onNone: () => Effect.unit,
+            onNone: () => Effect.void,
             onSome: ({ resume_gateway_url }) =>
               socket.setUrl(resume_gateway_url),
           },
@@ -182,7 +182,7 @@ export const make = Effect.gen(function* (_) {
                 return prioritySend(Reconnect)
               }
               default: {
-                return Effect.unit
+                return Effect.void
               }
             }
           }),

package/src/DiscordREST.ts

@@ -1,13 +1,4 @@
-import { GenericTag } from "effect/Context"
-import * as Duration from "effect/Duration"
-import { millis } from "effect/Duration"
-import { pipe } from "effect/Function"
-import * as HashSet from "effect/HashSet"
-import * as Option from "effect/Option"
-import * as Secret from "effect/Secret"
-import * as Effect from "effect/Effect"
-import * as Layer from "effect/Layer"
-import * as Ref from "effect/Ref"
+import { TypeIdError } from "@effect/platform/Error"
 import * as Http from "@effect/platform/HttpClient"
 import { DiscordConfig } from "dfx/DiscordConfig"
 import type { ResponseWithData, RestResponse } from "dfx/DiscordREST/types"
@@ -16,12 +7,21 @@ import {
   retryAfter,
   routeFromConfig,
 } from "dfx/DiscordREST/utils"
-import { RateLimiterLive, RateLimiter, RateLimitStore } from "dfx/RateLimit"
+import { RateLimitStore, RateLimiter, RateLimiterLive } from "dfx/RateLimit"
 import * as Discord from "dfx/types"
 import { LIB_VERSION } from "dfx/version"
-import type { Scope } from "effect/Scope"
+import { GenericTag } from "effect/Context"
+import * as Duration from "effect/Duration"
+import { millis } from "effect/Duration"
+import * as Effect from "effect/Effect"
 import * as Effectable from "effect/Effectable"
-import { TypeIdError } from "@effect/platform/Error"
+import { pipe } from "effect/Function"
+import * as HashSet from "effect/HashSet"
+import * as Layer from "effect/Layer"
+import * as Option from "effect/Option"
+import * as Ref from "effect/Ref"
+import type { Scope } from "effect/Scope"
+import * as Secret from "effect/Secret"
 
 export const DiscordRESTErrorTypeId = Symbol.for(
   "dfx/DiscordREST/DiscordRESTError",
@@ -76,9 +76,9 @@ const make = Effect.gen(function* (_) {
       Effect.tap(invalid =>
         invalid
           ? maybeWait("dfx.rest.invalid", Duration.minutes(10), 10000)
-          : Effect.unit,
+          : Effect.void,
       ),
-      Effect.asUnit,
+      Effect.asVoid,
     )
 
   // Request rate limiting

package/src/Helpers/interactions.ts

@@ -1,8 +1,8 @@
+import * as Discord from "dfx/types"
+import * as Arr from "effect/Array"
 import { identity, pipe } from "effect/Function"
 import * as HashMap from "effect/HashMap"
 import * as Option from "effect/Option"
-import * as Arr from "effect/ReadonlyArray"
-import * as Discord from "dfx/types"
 
 /**
  * Option find a sub-command within the interaction options.

package/src/Interactions/context.ts

@@ -7,7 +7,7 @@ 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 Arr from "effect/Array"
 
 export interface DiscordInteraction {
   readonly _: unique symbol
@@ -43,12 +43,9 @@ export const ModalSubmitData = GenericTag<
 export interface DiscordFocusedOption {
   readonly _: unique symbol
 }
-export interface FocusedOptionContext {
-  readonly focusedOption: Discord.ApplicationCommandInteractionDataOption
-}
 export const FocusedOptionContext = GenericTag<
   DiscordFocusedOption,
-  FocusedOptionContext
+  Discord.ApplicationCommandInteractionDataOption
 >("dfx/Interactions/FocusedOptionContext")
 
 export interface DiscordSubCommand {
@@ -78,7 +75,7 @@ export const resolved = <A>(
 
 export const focusedOptionValue = Effect.map(
   FocusedOptionContext,
-  _ => _.focusedOption.value ?? "",
+  _ => _.value ?? "",
 )
 
 export class SubCommandNotFound extends TypeIdError(