dfx 0.36.4 → 0.38.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Interactions/context.d.ts +4 -6
- package/Interactions/context.js +13 -15
- package/Interactions/context.js.map +1 -1
- package/Interactions/gateway.d.ts +3 -3
- package/Interactions/gateway.js +5 -7
- package/Interactions/gateway.js.map +1 -1
- package/Interactions/handlers.js +4 -4
- package/Interactions/handlers.js.map +1 -1
- package/Interactions/webhook.js +2 -2
- package/Interactions/webhook.js.map +1 -1
- package/package.json +2 -2
- package/a.d.ts +0 -1
- package/a.js +0 -2
- package/a.js.map +0 -1
- package/d.d.ts +0 -1
- package/d.js +0 -3
- package/d.js.map +0 -1
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { Discord } from "dfx/_common";
|
|
2
2
|
import { Effect, EffectTypeId } from "@effect/io/Effect";
|
|
3
3
|
import { ModalSubmitDatum } from "dfx/types";
|
|
4
|
-
export declare const
|
|
5
|
-
export declare const
|
|
6
|
-
export declare const
|
|
7
|
-
export declare const
|
|
4
|
+
export declare const Interaction: import("@effect/data/Context").Tag<import("dfx/types").Interaction, import("dfx/types").Interaction>;
|
|
5
|
+
export declare const ApplicationCommand: import("@effect/data/Context").Tag<import("dfx/types").ApplicationCommandDatum, import("dfx/types").ApplicationCommandDatum>;
|
|
6
|
+
export declare const MessageComponentData: import("@effect/data/Context").Tag<import("dfx/types").MessageComponentDatum, import("dfx/types").MessageComponentDatum>;
|
|
7
|
+
export declare const ModalSubmitData: import("@effect/data/Context").Tag<ModalSubmitDatum, ModalSubmitDatum>;
|
|
8
8
|
export interface FocusedOptionContext {
|
|
9
9
|
readonly focusedOption: Discord.ApplicationCommandInteractionDataOption;
|
|
10
10
|
}
|
|
@@ -13,8 +13,6 @@ export interface SubCommandContext {
|
|
|
13
13
|
readonly command: Discord.ApplicationCommandInteractionDataOption;
|
|
14
14
|
}
|
|
15
15
|
export declare const SubCommandContext: import("@effect/data/Context").Tag<SubCommandContext, SubCommandContext>;
|
|
16
|
-
export declare const interaction: import("@effect/data/Context").Tag<import("dfx/types").Interaction, import("dfx/types").Interaction>;
|
|
17
|
-
export declare const command: import("@effect/data/Context").Tag<import("dfx/types").ApplicationCommandDatum, import("dfx/types").ApplicationCommandDatum>;
|
|
18
16
|
export declare class ResolvedDataNotFound {
|
|
19
17
|
readonly data: Discord.Interaction;
|
|
20
18
|
readonly name?: string | undefined;
|
package/Interactions/context.js
CHANGED
|
@@ -4,14 +4,12 @@ import * as tsplus_module_3 from "@effect/data/Option";
|
|
|
4
4
|
import * as Arr from "@effect/data/ReadonlyArray";
|
|
5
5
|
import { EffectTypeId } from "@effect/io/Effect";
|
|
6
6
|
import * as IxHelpers from "dfx/Helpers/interactions";
|
|
7
|
-
export const
|
|
8
|
-
export const
|
|
9
|
-
export const
|
|
10
|
-
export const
|
|
7
|
+
export const Interaction = tsplus_module_1.Tag();
|
|
8
|
+
export const ApplicationCommand = tsplus_module_1.Tag();
|
|
9
|
+
export const MessageComponentData = tsplus_module_1.Tag();
|
|
10
|
+
export const ModalSubmitData = tsplus_module_1.Tag();
|
|
11
11
|
export const FocusedOptionContext = tsplus_module_1.Tag();
|
|
12
12
|
export const SubCommandContext = tsplus_module_1.Tag();
|
|
13
|
-
export const interaction = InteractionContext;
|
|
14
|
-
export const command = ApplicationCommandContext;
|
|
15
13
|
export class ResolvedDataNotFound {
|
|
16
14
|
data;
|
|
17
15
|
name;
|
|
@@ -21,8 +19,8 @@ export class ResolvedDataNotFound {
|
|
|
21
19
|
this.name = name;
|
|
22
20
|
}
|
|
23
21
|
}
|
|
24
|
-
export const resolvedValues = (f) => tsplus_module_2.flatMap(
|
|
25
|
-
export const resolved = (name, f) => tsplus_module_2.flatMap(
|
|
22
|
+
export const resolvedValues = (f) => tsplus_module_2.flatMap(Interaction, ix => tsplus_module_2.mapError(IxHelpers.resolveValues(f)(ix), () => new ResolvedDataNotFound(ix)));
|
|
23
|
+
export const resolved = (name, f) => tsplus_module_2.flatMap(Interaction, ix => tsplus_module_2.mapError(IxHelpers.resolveOptionValue(name, f)(ix), () => new ResolvedDataNotFound(ix, name)));
|
|
26
24
|
export const focusedOptionValue = tsplus_module_2.map(FocusedOptionContext, _ => _.focusedOption.value ?? "");
|
|
27
25
|
export class SubCommandNotFound {
|
|
28
26
|
data;
|
|
@@ -31,11 +29,11 @@ export class SubCommandNotFound {
|
|
|
31
29
|
this.data = data;
|
|
32
30
|
}
|
|
33
31
|
}
|
|
34
|
-
export const handleSubCommands = (commands) => tsplus_module_2.flatMap(
|
|
32
|
+
export const handleSubCommands = (commands) => tsplus_module_2.flatMap(ApplicationCommand, data => tsplus_module_2.flatMap(tsplus_module_2.mapError(Arr.findFirst(IxHelpers.allSubCommands(data), _ => !!commands[_.name]), () => new SubCommandNotFound(data)), command => tsplus_module_2.provideService(commands[command.name], SubCommandContext, {
|
|
35
33
|
command,
|
|
36
34
|
})));
|
|
37
35
|
export const currentSubCommand = tsplus_module_2.map(SubCommandContext, _ => _.command);
|
|
38
|
-
export const optionsMap = tsplus_module_2.map(
|
|
36
|
+
export const optionsMap = tsplus_module_2.map(ApplicationCommand, IxHelpers.optionsMap);
|
|
39
37
|
export class RequiredOptionNotFound {
|
|
40
38
|
data;
|
|
41
39
|
name;
|
|
@@ -45,11 +43,11 @@ export class RequiredOptionNotFound {
|
|
|
45
43
|
this.name = name;
|
|
46
44
|
}
|
|
47
45
|
}
|
|
48
|
-
export const option = (name) => tsplus_module_2.map(
|
|
49
|
-
export const optionValue = (name) => tsplus_module_2.flatMap(option(name), _ => tsplus_module_3.match(tsplus_module_3.flatMapNullable(_, a => a.value), () => tsplus_module_2.flatMap(
|
|
46
|
+
export const option = (name) => tsplus_module_2.map(ApplicationCommand, IxHelpers.getOption(name));
|
|
47
|
+
export const optionValue = (name) => tsplus_module_2.flatMap(option(name), _ => tsplus_module_3.match(tsplus_module_3.flatMapNullable(_, a => a.value), () => tsplus_module_2.flatMap(ApplicationCommand, data => tsplus_module_2.fail(new RequiredOptionNotFound(data, name))), tsplus_module_2.succeed));
|
|
50
48
|
export const optionValueOptional = (name) => tsplus_module_2.map(option(name), o => tsplus_module_3.flatMapNullable(o, o => o.value));
|
|
51
|
-
export const modalValues = tsplus_module_2.map(
|
|
52
|
-
export const modalValueOption = (name) => tsplus_module_2.map(
|
|
49
|
+
export const modalValues = tsplus_module_2.map(ModalSubmitData, IxHelpers.componentsMap);
|
|
50
|
+
export const modalValueOption = (name) => tsplus_module_2.map(ModalSubmitData, IxHelpers.componentValue(name));
|
|
53
51
|
export class ModalValueNotFound {
|
|
54
52
|
data;
|
|
55
53
|
name;
|
|
@@ -59,5 +57,5 @@ export class ModalValueNotFound {
|
|
|
59
57
|
this.name = name;
|
|
60
58
|
}
|
|
61
59
|
}
|
|
62
|
-
export const modalValue = (name) => tsplus_module_2.flatMap(
|
|
60
|
+
export const modalValue = (name) => tsplus_module_2.flatMap(ModalSubmitData, data => tsplus_module_2.mapError(IxHelpers.componentValue(name)(data), () => new ModalValueNotFound(data, name)));
|
|
63
61
|
//# sourceMappingURL=context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/Interactions/context.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAA;AACjD,OAAO,EAAU,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAA;AAGrD,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/Interactions/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Effect, Discord } from "dfx/_common";
|
|
2
2
|
import * as Http from "@effect-http/client";
|
|
3
|
-
import { DefinitionNotFound } from "./handlers.js";
|
|
4
|
-
import { InteractionBuilder } from "./index.js";
|
|
5
|
-
import { DiscordREST, DiscordRESTError } from "dfx/DiscordREST";
|
|
6
3
|
import { DiscordGateway } from "dfx/DiscordGateway";
|
|
4
|
+
import { DiscordREST, DiscordRESTError } from "dfx/DiscordREST";
|
|
5
|
+
import { DefinitionNotFound } from "./handlers.js";
|
|
6
|
+
import { Interaction, InteractionBuilder } from "./index.js";
|
|
7
7
|
export interface RunOpts {
|
|
8
8
|
sync?: boolean;
|
|
9
9
|
}
|
package/Interactions/gateway.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import * as tsplus_module_1 from "@effect/io/Effect";
|
|
2
2
|
import * as tsplus_module_2 from "@effect/data/Function";
|
|
3
3
|
import * as Http from "@effect-http/client";
|
|
4
|
+
import { DiscordGateway } from "dfx/DiscordGateway";
|
|
5
|
+
import { DiscordREST } from "dfx/DiscordREST";
|
|
4
6
|
import { handlers } from "./handlers.js";
|
|
5
|
-
import {
|
|
7
|
+
import { Interaction } from "./index.js";
|
|
6
8
|
import { splitDefinitions } from "./utils.js";
|
|
7
|
-
import { DiscordREST } from "dfx/DiscordREST";
|
|
8
|
-
import { DiscordGateway } from "dfx/DiscordGateway";
|
|
9
9
|
/**
|
|
10
10
|
* @tsplus pipeable dfx/InteractionBuilder runGateway
|
|
11
11
|
*/
|
|
@@ -17,10 +17,8 @@ export const run = (postHandler, { sync = true } = {}) => (ix) => (() => {
|
|
|
17
17
|
? gateway.handleDispatch("GUILD_CREATE", a => rest.bulkOverwriteGuildApplicationCommands(application.id, a.id, GuildApplicationCommand.map(a => a.command)))
|
|
18
18
|
: tsplus_module_1.unit();
|
|
19
19
|
const handle = handlers(ix.definitions);
|
|
20
|
-
const run = gateway.handleDispatch("INTERACTION_CREATE", i => tsplus_module_1.provideService(tsplus_module_2.pipe(tsplus_module_1.tap(handle[i.type](i), r => rest.createInteractionResponse(i.id, i.token, r)), postHandler),
|
|
21
|
-
return tsplus_module_1.map(sync
|
|
22
|
-
? tsplus_module_1.zipPar(tsplus_module_1.zipPar(tsplus_module_1.zipPar(run, globalSync), guildSync), gateway.run)
|
|
23
|
-
: run, () => void 0);
|
|
20
|
+
const run = gateway.handleDispatch("INTERACTION_CREATE", i => tsplus_module_1.provideService(tsplus_module_2.pipe(tsplus_module_1.tap(handle[i.type](i), r => rest.createInteractionResponse(i.id, i.token, r)), postHandler), Interaction, i));
|
|
21
|
+
return tsplus_module_1.map(sync ? tsplus_module_1.allPar(run, globalSync, guildSync) : run, () => void 0);
|
|
24
22
|
})));
|
|
25
23
|
})();
|
|
26
24
|
//# sourceMappingURL=gateway.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../src/Interactions/gateway.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,IAAI,MAAM,qBAAqB,CAAA;AAC3C,OAAO,
|
|
1
|
+
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../src/Interactions/gateway.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,IAAI,MAAM,qBAAqB,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,WAAW,EAAoB,MAAM,iBAAiB,CAAA;AAC/D,OAAO,EAAsB,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,EAAE,WAAW,EAAsB,MAAM,YAAY,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAM7C;;GAEG;AACH,MAAM,CAAC,MAAM,GAAG,GACd,CACE,WAMyB,EACzB,EAAE,IAAI,GAAG,IAAI,KAAc,EAAE,EAC7B,EAAE,CACJ,CAAC,EAA4B,EAAE,EAAE;IAE7B,MAAM,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,GACzD,gBAAgB,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;mCAEhB,cAAc,EAA1B,OAAO,4BACE,WAAW,EAApB,IAAI,4BAGR,wBAAA,IAAI,CAAC,mCAAmC,EAAE,EAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAD3D,WAAW;QAIjB,MAAM,UAAU,GAAG,IAAI,CAAC,sCAAsC,CAC5D,WAAW,CAAC,EAAE,EACd,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CACvE,CAAA;QAED,MAAM,SAAS,GAAG,uBAAuB,CAAC,MAAM;YAC9C,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CACzC,IAAI,CAAC,qCAAqC,CACxC,WAAW,CAAC,EAAE,EACd,CAAC,CAAC,EAAE,EACJ,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAQ,CACnD,CACF;YACH,CAAC,CAAC,sBAAa,CAAA;QAEjB,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,WAAW,CAAC,CAAA;QAEvC,MAAM,GAAG,GAAG,OAAO,CAAC,cAAc,CAAC,oBAAoB,EAAE,CAAC,CAAC,EAAE,CAC3D,+BAAA,gBAAA,IAAI,CACF,oBAAA,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAK,CAAC,CAAC,EAAE,CACxB,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CACjD,EACD,WAAW,CACZ,EAAgB,WAAW,EAAE,CAAC,CAAC,CACjC,CAAA;mCAEC,IAAI,CAAC,CAAC,CAAC,uBAAc,GAAG,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG;;IACxD,CAAA"}
|
package/Interactions/handlers.js
CHANGED
|
@@ -30,28 +30,28 @@ export const handlers = (definitions) => {
|
|
|
30
30
|
const data = i.data;
|
|
31
31
|
return tsplus_module_2.provideService(tsplus_module_3.match(tsplus_module_3.fromNullable(Commands[data.name]), () => tsplus_module_2.fail(new DefinitionNotFound(i)), command => tsplus_module_2.isEffect(command.handle)
|
|
32
32
|
? command.handle
|
|
33
|
-
: command.handle(context)), Ctx.
|
|
33
|
+
: command.handle(context)), Ctx.ApplicationCommand, data);
|
|
34
34
|
},
|
|
35
35
|
[5 /* Discord.InteractionType.MODAL_SUBMIT */]: (i) => {
|
|
36
36
|
const data = i.data;
|
|
37
37
|
return tsplus_module_4.pipe(ModalSubmit, Arr.map(a => tsplus_module_2.all({
|
|
38
38
|
command: tsplus_module_2.succeed(a),
|
|
39
39
|
match: a.predicate(data.custom_id),
|
|
40
|
-
})), _ => tsplus_module_2.provideService(tsplus_module_2.flatMap(tsplus_module_2.allPar(_), _ => tsplus_module_3.match(Arr.findFirst(_, _ => _.match), () => tsplus_module_2.fail(new DefinitionNotFound(i)), a => a.command.handle)), Ctx.
|
|
40
|
+
})), _ => tsplus_module_2.provideService(tsplus_module_2.flatMap(tsplus_module_2.allPar(_), _ => tsplus_module_3.match(Arr.findFirst(_, _ => _.match), () => tsplus_module_2.fail(new DefinitionNotFound(i)), a => a.command.handle)), Ctx.ModalSubmitData, data));
|
|
41
41
|
},
|
|
42
42
|
[3 /* Discord.InteractionType.MESSAGE_COMPONENT */]: i => {
|
|
43
43
|
const data = i.data;
|
|
44
44
|
return tsplus_module_4.pipe(MessageComponent, Arr.map(a => tsplus_module_2.all({
|
|
45
45
|
command: tsplus_module_2.succeed(a),
|
|
46
46
|
match: a.predicate(data.custom_id),
|
|
47
|
-
})), _ => tsplus_module_2.provideService(tsplus_module_2.flatMap(tsplus_module_2.allPar(_), commands => tsplus_module_3.match(Arr.findFirst(commands, _ => _.match), () => tsplus_module_2.fail(new DefinitionNotFound(i)), _ => _.command.handle)), Ctx.
|
|
47
|
+
})), _ => tsplus_module_2.provideService(tsplus_module_2.flatMap(tsplus_module_2.allPar(_), commands => tsplus_module_3.match(Arr.findFirst(commands, _ => _.match), () => tsplus_module_2.fail(new DefinitionNotFound(i)), _ => _.command.handle)), Ctx.MessageComponentData, data));
|
|
48
48
|
},
|
|
49
49
|
[4 /* Discord.InteractionType.APPLICATION_COMMAND_AUTOCOMPLETE */]: i => {
|
|
50
50
|
const data = i.data;
|
|
51
51
|
return tsplus_module_3.getOrElse(tsplus_module_3.map(IxHelpers.focusedOption(data), focusedOption => tsplus_module_4.pipe(Autocomplete, Arr.map(_ => tsplus_module_2.all({
|
|
52
52
|
command: tsplus_module_2.succeed(_),
|
|
53
53
|
match: _.predicate(data, focusedOption),
|
|
54
|
-
})), _ => tsplus_module_2.provideService(tsplus_module_2.provideService(tsplus_module_2.flatMap(tsplus_module_2.allPar(_), _ => tsplus_module_3.match(Arr.findFirst(_, _ => _.match), () => tsplus_module_2.fail(new DefinitionNotFound(i)), _ => _.command.handle)), Ctx.
|
|
54
|
+
})), _ => tsplus_module_2.provideService(tsplus_module_2.provideService(tsplus_module_2.flatMap(tsplus_module_2.allPar(_), _ => tsplus_module_3.match(Arr.findFirst(_, _ => _.match), () => tsplus_module_2.fail(new DefinitionNotFound(i)), _ => _.command.handle)), Ctx.ApplicationCommand, data), Ctx.FocusedOptionContext, { focusedOption }))), () => tsplus_module_2.fail(new DefinitionNotFound(i)));
|
|
55
55
|
},
|
|
56
56
|
};
|
|
57
57
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handlers.js","sourceRoot":"","sources":["../../src/Interactions/handlers.ts"],"names":[],"mappings":";;;;AAAA,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAA;AACjD,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAA;AACrD,OAAO,KAAK,GAAG,MAAM,cAAc,CAAA;AAEnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7C,MAAM,OAAO,kBAAkB;IAER;IADZ,IAAI,GAAG,oBAAoB,CAAA;IACpC,YAAqB,WAAgC;QAAhC,gBAAW,GAAX,WAAW,CAAqB;IAAG,CAAC;CAC1D;AAQD,MAAM,OAAO,GAAyB;IACpC,OAAO,EAAE,GAAG,CAAC,QAAQ;IACrB,MAAM,EAAE,GAAG,CAAC,MAAM;IAClB,WAAW,EAAE,GAAG,CAAC,WAAW;IAC5B,mBAAmB,EAAE,GAAG,CAAC,mBAAmB;IAC5C,WAAW,EAAE,GAAG,CAAC,iBAAiB;CAC5B,CAAA;AAER,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,WAA4C,EAI5C,EAAE;IACF,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,GAC7D,gBAAgB,CAAC,WAAW,CAAC,CAAA;IAE/B,OAAO;QACL,sCAA8B,EAAE,GAAG,EAAE,CACnC,wBAAe;YACb,IAAI,8CAAsC;SACpC,CAAC;QAEX,qDAA6C,EAAE,CAAC,CAAC,EAAE;YACjD,MAAM,IAAI,GAAG,CAAC,CAAC,IAAuC,CAAA;YAEtD,OAAO,+BAAA,sBAAA,6BAAmB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAE1C,GAAG,EAAE,CAAC,qBAAY,IAAI,kBAAkB,CAAC,CAAC,CAAC,CAAkB,EAC7D,OAAO,CAAC,EAAE,CACR,yBAAgB,OAAO,CAAC,MAAM,CAAC;gBAC7B,CAAC,CAAC,OAAO,CAAC,MAAM;gBAChB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAC9B,EACe,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"handlers.js","sourceRoot":"","sources":["../../src/Interactions/handlers.ts"],"names":[],"mappings":"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"}
|
package/Interactions/webhook.js
CHANGED
|
@@ -7,7 +7,7 @@ import * as tsplus_module_6 from "@effect/data/Function";
|
|
|
7
7
|
import * as tsplus_module_7 from "@effect/io/Effect";
|
|
8
8
|
import Nacl from "tweetnacl";
|
|
9
9
|
import { handlers } from "./handlers.js";
|
|
10
|
-
import {
|
|
10
|
+
import { Interaction } from "./index.js";
|
|
11
11
|
import { fromHex } from "./utils.js";
|
|
12
12
|
export class BadWebhookSignature {
|
|
13
13
|
_tag = "BadWebhookSignature";
|
|
@@ -36,7 +36,7 @@ export class WebhookParseError {
|
|
|
36
36
|
const fromHeadersAndBody = (headers, body) => tsplus_module_7.flatMap(WebhookConfig, ({ publicKey }) => tsplus_module_7.flatMap(checkSignature(publicKey, headers, body), () => tsplus_module_7.tryCatch(() => JSON.parse(body), reason => new WebhookParseError(reason))));
|
|
37
37
|
const run = (definitions) => {
|
|
38
38
|
const handler = handlers(definitions);
|
|
39
|
-
return (headers, body) => tsplus_module_7.flatMap(fromHeadersAndBody(headers, body), interaction => tsplus_module_7.provideService(handler[interaction.type](interaction),
|
|
39
|
+
return (headers, body) => tsplus_module_7.flatMap(fromHeadersAndBody(headers, body), interaction => tsplus_module_7.provideService(handler[interaction.type](interaction), Interaction, interaction));
|
|
40
40
|
};
|
|
41
41
|
/**
|
|
42
42
|
* @tsplus getter dfx/InteractionBuilder webhookHandler
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../src/Interactions/webhook.ts"],"names":[],"mappings":";;;;;;;AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,OAAO,EAAsB,QAAQ,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,EAAsB,
|
|
1
|
+
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../src/Interactions/webhook.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dfx",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.38.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public",
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"ws": "^8.13.0"
|
|
51
51
|
},
|
|
52
52
|
"sideEffects": false,
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "43297dbbb1997156a736a57e3382c6e4f23ae9bc"
|
|
54
54
|
}
|
package/a.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
package/a.js
DELETED
package/a.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"a.js","sourceRoot":"","sources":["../src/a.ts"],"names":[],"mappings":""}
|
package/d.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
package/d.js
DELETED
package/d.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"d.js","sourceRoot":"","sources":["../src/d.ts"],"names":[],"mappings":";AAAA,OAAO,CAAC,GAAG,yBAAC,qBAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,wBAAe,CAAC,KAAK,CAAC,CAAC,CAAC,EAAS,CAAA"}
|