dfx 0.78.0 → 0.79.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/DiscordConfig.d.ts +3 -3
- package/DiscordConfig.d.ts.map +1 -1
- package/DiscordGateway/Shard.js +2 -2
- package/DiscordGateway/Shard.js.map +1 -1
- package/DiscordREST.js +2 -2
- package/DiscordREST.js.map +1 -1
- package/Interactions/context.d.ts +1 -1
- package/Interactions/webhook.d.ts +2 -2
- package/Interactions/webhook.d.ts.map +1 -1
- package/Interactions/webhook.js +2 -2
- package/Interactions/webhook.js.map +1 -1
- package/README.md +37 -29
- package/mjs/DiscordGateway/Shard.mjs +2 -2
- package/mjs/DiscordGateway/Shard.mjs.map +1 -1
- package/mjs/DiscordREST.mjs +2 -2
- package/mjs/DiscordREST.mjs.map +1 -1
- package/mjs/Interactions/webhook.mjs +2 -2
- package/mjs/Interactions/webhook.mjs.map +1 -1
- package/mjs/version.mjs +1 -1
- package/package.json +4 -4
- package/src/DiscordConfig.ts +3 -3
- package/src/DiscordGateway/Shard.ts +2 -2
- package/src/DiscordREST.ts +2 -2
- package/src/Interactions/webhook.ts +3 -3
- package/src/version.ts +1 -1
- package/version.d.ts +1 -1
- package/version.js +1 -1
- package/Log.d.ts +0 -14
- package/Log.d.ts.map +0 -1
- package/Log.js +0 -23
- package/Log.js.map +0 -1
- package/mjs/Log.mjs +0 -15
- package/mjs/Log.mjs.map +0 -1
package/DiscordConfig.d.ts
CHANGED
|
@@ -2,14 +2,14 @@ import { Tag } from "effect/Context";
|
|
|
2
2
|
import * as Duration from "effect/Duration";
|
|
3
3
|
import * as Config from "effect/Config";
|
|
4
4
|
import type * as ConfigError from "effect/ConfigError";
|
|
5
|
-
import type * as
|
|
5
|
+
import type * as Secret from "effect/Secret";
|
|
6
6
|
import * as Layer from "effect/Layer";
|
|
7
7
|
import * as Discord from "dfx/types";
|
|
8
8
|
export interface DiscordConfig {
|
|
9
9
|
readonly _: unique symbol;
|
|
10
10
|
}
|
|
11
11
|
export interface DiscordConfigService {
|
|
12
|
-
readonly token:
|
|
12
|
+
readonly token: Secret.Secret;
|
|
13
13
|
readonly rest: {
|
|
14
14
|
readonly baseUrl: string;
|
|
15
15
|
readonly globalRateLimit: {
|
|
@@ -26,7 +26,7 @@ export interface DiscordConfigService {
|
|
|
26
26
|
}
|
|
27
27
|
export declare const DiscordConfig: Tag<DiscordConfig, DiscordConfigService>;
|
|
28
28
|
export interface MakeOpts {
|
|
29
|
-
readonly token:
|
|
29
|
+
readonly token: Secret.Secret;
|
|
30
30
|
readonly rest?: Partial<DiscordConfigService["rest"]>;
|
|
31
31
|
readonly gateway?: Partial<DiscordConfigService["gateway"]>;
|
|
32
32
|
}
|
package/DiscordConfig.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordConfig.d.ts","sourceRoot":"","sources":["./src/DiscordConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,WAAW,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,KAAK,
|
|
1
|
+
{"version":3,"file":"DiscordConfig.d.ts","sourceRoot":"","sources":["./src/DiscordConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,WAAW,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAE5C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AAIpC,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAA;IAC7B,QAAQ,CAAC,IAAI,EAAE;QACb,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,eAAe,EAAE;YACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;YACtB,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAA;SACxC,CAAA;KACF,CAAA;IACD,QAAQ,CAAC,OAAO,EAAE;QAChB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,cAAc,CAAA;QAC1C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;QAE5B,QAAQ,CAAC,iBAAiB,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;KACrE,CAAA;CACF;AACD,eAAO,MAAM,aAAa,0CAEzB,CAAA;AAED,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAA;IAC7B,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAA;IACrD,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAA;CAC5D;AAED,eAAO,MAAM,IAAI,8BAId,QAAQ,KAAG,oBAgBZ,CAAA;AAEF,eAAO,MAAM,KAAK,SACV,QAAQ,KACb,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,aAAa,CACA,CAAA;AAE1C,eAAO,MAAM,WAAW,MACnB,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,KAC9B,WAAW,CAAC,KAAK,EAAE,uBAAuB,EAAE,aAAa,CACoB,CAAA"}
|
package/DiscordGateway/Shard.js
CHANGED
|
@@ -9,7 +9,7 @@ var _Context = /*#__PURE__*/require("effect/Context");
|
|
|
9
9
|
var Duration = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Duration"));
|
|
10
10
|
var _Function = /*#__PURE__*/require("effect/Function");
|
|
11
11
|
var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Option"));
|
|
12
|
-
var
|
|
12
|
+
var Secret = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Secret"));
|
|
13
13
|
var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
|
|
14
14
|
var PubSub = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/PubSub"));
|
|
15
15
|
var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
|
|
@@ -68,7 +68,7 @@ const make = exports.make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
68
68
|
yield* _(Heartbeats.send(hellos, acks, latestSequence, heartbeatSend), Effect.forkScoped);
|
|
69
69
|
// identify
|
|
70
70
|
const identify = Identify.identifyOrResume({
|
|
71
|
-
token:
|
|
71
|
+
token: Secret.value(token),
|
|
72
72
|
shard,
|
|
73
73
|
intents: gateway.intents,
|
|
74
74
|
presence: gateway.presence
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Shard.js","names":["Chunk","_interopRequireWildcard","require","_Context","Duration","_Function","Option","
|
|
1
|
+
{"version":3,"file":"Shard.js","names":["Chunk","_interopRequireWildcard","require","_Context","Duration","_Function","Option","Secret","Effect","PubSub","Layer","Queue","Ref","_DiscordConfig","_DiscordWS","Heartbeats","Identify","InvalidSession","Utils","_WS","_RateLimit","Discord","_Messaging","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","make","exports","gen","_","gateway","token","DiscordConfig","limiter","RateLimiter","dws","DiscordWS","hub","sendQueue","Messaging","connect","shard","outboundQueue","unbounded","pendingQueue","phase","setPhase","p","zipLeft","annotateLogs","logTrace","outbound","take","maybeWait","minutes","send","flatMap","offer","heartbeatSend","succeed","prioritySend","resume","pipe","zipRight","takeAll","tap","offerAll","asUnit","onConnecting","msgs","filter","msg","Reconnect","op","GatewayOpcode","IDENTIFY","RESUME","HEARTBEAT","socket","isReady","liftPredicate","DISPATCH","latestReady","updateLatestReady","latest","map","d","latestSequence","updateLatestSequence","fromNullable","s","maybeUpdateUrl","match","onNone","unit","onSome","resume_gateway_url","setUrl","hellos","acquireRelease","shutdown","acks","forkScoped","identify","identifyOrResume","value","intents","presence","onPayload","HELLO","HEARTBEAT_ACK","INVALID_SESSION","fromPayload","publish","forever","id","package","module","Shard","Tag","ShardLive","effect","provide","DiscordWSLive","MesssagingLive","RateLimiterLive"],"sources":["../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/DiscordREST.js
CHANGED
|
@@ -10,7 +10,7 @@ var Duration = _Duration;
|
|
|
10
10
|
var _Function = /*#__PURE__*/require("effect/Function");
|
|
11
11
|
var HashSet = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/HashSet"));
|
|
12
12
|
var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Option"));
|
|
13
|
-
var
|
|
13
|
+
var Secret = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Secret"));
|
|
14
14
|
var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
|
|
15
15
|
var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
|
|
16
16
|
var Ref = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Ref"));
|
|
@@ -82,7 +82,7 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
82
82
|
});
|
|
83
83
|
}), Effect.ignore);
|
|
84
84
|
const httpExecutor = (0, _Function.pipe)(Http.client.filterStatusOk(http), Http.client.mapRequest(req => (0, _Function.pipe)(Http.request.prependUrl(req, rest.baseUrl), Http.request.setHeaders({
|
|
85
|
-
Authorization: `Bot ${
|
|
85
|
+
Authorization: `Bot ${Secret.value(token)}`,
|
|
86
86
|
"User-Agent": `DiscordBot (https://github.com/tim-smart/dfx, ${_version.LIB_VERSION})`
|
|
87
87
|
}))), Http.client.catchAll(error => error.reason === "StatusCode" ? error.response.json.pipe(Effect.mapError(_ => new DiscordRESTError(_)), Effect.flatMap(body => Effect.fail(new DiscordRESTError(error, body)))) : Effect.fail(new DiscordRESTError(error))));
|
|
88
88
|
const executor = request => requestRateLimit(request.url, request).pipe(Effect.zipLeft(globalRateLimit), Effect.zipRight(httpExecutor(request)), Effect.tap(response => updateBuckets(request, response)), Effect.catchTag("DiscordRESTError", e => {
|
package/DiscordREST.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordREST.js","names":["_Context","require","_Duration","_interopRequireWildcard","Duration","_Function","HashSet","Option","ConfigSecret","Effect","Layer","Ref","Http","_DiscordConfig","_utils","_RateLimit","Discord","_version","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","DiscordRESTError","error","body","_tag","constructor","exports","make","gen","_","rest","token","DiscordConfig","http","client","Client","store","RateLimitStore","maybeWait","RateLimiter","globalRateLimit","decode","window","limit","badRoutesRef","empty","tenMinutes","toMillis","minutes","addBadRoute","route","logDebug","pipe","zipRight","update","add","incrementCounter","annotateLogs","isBadRoute","map","removeBadRoute","remove","invalidRateLimit","tap","invalid","unit","asUnit","requestRateLimit","path","request","Do","let","routeFromConfig","method","bind","getBucketForRoute","flatMap","maybeBucket","match","onNone","onSome","bucket","key","millis","resetAfter","updateBuckets","response","url","rateLimitFromHeaders","headers","rateLimit","hasBucket","effectsToRun","putBucketRoute","remaining","push","removeCounter","putBucket","retryAfter","all","concurrency","discard","ignore","httpExecutor","filterStatusOk","mapRequest","req","prependUrl","baseUrl","setHeaders","Authorization","value","LIB_VERSION","catchAll","reason","json","mapError","fail","executor","zipLeft","catchTag","status","sleep","getOrElse","seconds","package","module","routes","createRoutes","options","params","hasBody","appendUrlParams","formData","append","JSON","stringify","unsafeJsonBody","DiscordREST","Tag","DiscordRESTLive","effect","provide","RateLimiterLive","layer"],"sources":["./src/DiscordREST.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DiscordREST.js","names":["_Context","require","_Duration","_interopRequireWildcard","Duration","_Function","HashSet","Option","Secret","Effect","Layer","Ref","Http","_DiscordConfig","_utils","_RateLimit","Discord","_version","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","DiscordRESTError","error","body","_tag","constructor","exports","make","gen","_","rest","token","DiscordConfig","http","client","Client","store","RateLimitStore","maybeWait","RateLimiter","globalRateLimit","decode","window","limit","badRoutesRef","empty","tenMinutes","toMillis","minutes","addBadRoute","route","logDebug","pipe","zipRight","update","add","incrementCounter","annotateLogs","isBadRoute","map","removeBadRoute","remove","invalidRateLimit","tap","invalid","unit","asUnit","requestRateLimit","path","request","Do","let","routeFromConfig","method","bind","getBucketForRoute","flatMap","maybeBucket","match","onNone","onSome","bucket","key","millis","resetAfter","updateBuckets","response","url","rateLimitFromHeaders","headers","rateLimit","hasBucket","effectsToRun","putBucketRoute","remaining","push","removeCounter","putBucket","retryAfter","all","concurrency","discard","ignore","httpExecutor","filterStatusOk","mapRequest","req","prependUrl","baseUrl","setHeaders","Authorization","value","LIB_VERSION","catchAll","reason","json","mapError","fail","executor","zipLeft","catchTag","status","sleep","getOrElse","seconds","package","module","routes","createRoutes","options","params","hasBody","appendUrlParams","formData","append","JSON","stringify","unsafeJsonBody","DiscordREST","Tag","DiscordRESTLive","effect","provide","RateLimiterLive","layer"],"sources":["./src/DiscordREST.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -47,7 +47,7 @@ export declare class SubCommandNotFound {
|
|
|
47
47
|
readonly _tag = "SubCommandNotFound";
|
|
48
48
|
constructor(data: Discord.ApplicationCommandDatum);
|
|
49
49
|
}
|
|
50
|
-
export declare const handleSubCommands: <NER extends Record<string, Effect.Effect<any, any, Discord.InteractionResponse>>>(commands: NER) => Effect.Effect<Discord.
|
|
50
|
+
export declare const handleSubCommands: <NER extends Record<string, Effect.Effect<any, any, Discord.InteractionResponse>>>(commands: NER) => Effect.Effect<Discord.ApplicationCommandDatum | Discord.Interaction | Exclude<[NER[keyof NER]] extends [{
|
|
51
51
|
[Effect.EffectTypeId]: {
|
|
52
52
|
_R: (_: never) => infer R;
|
|
53
53
|
};
|
|
@@ -2,7 +2,7 @@ import { Tag } from "effect/Context";
|
|
|
2
2
|
import type * as Cause from "effect/Cause";
|
|
3
3
|
import type * as Config from "effect/Config";
|
|
4
4
|
import type * as ConfigError from "effect/ConfigError";
|
|
5
|
-
import * as
|
|
5
|
+
import * as Secret from "effect/Secret";
|
|
6
6
|
import * as Effect from "effect/Effect";
|
|
7
7
|
import * as Layer from "effect/Layer";
|
|
8
8
|
import type { DefinitionNotFound } from "dfx/Interactions/handlers";
|
|
@@ -15,7 +15,7 @@ export declare class BadWebhookSignature {
|
|
|
15
15
|
export type Headers = Record<string, string | Array<string> | undefined>;
|
|
16
16
|
export interface MakeConfigOpts {
|
|
17
17
|
readonly applicationId: string;
|
|
18
|
-
readonly publicKey:
|
|
18
|
+
readonly publicKey: Secret.Secret;
|
|
19
19
|
readonly crypto: SubtleCrypto;
|
|
20
20
|
readonly algorithm: keyof typeof Verify.PlatformAlgorithm;
|
|
21
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../src/Interactions/webhook.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAGpC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,KAAK,WAAW,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../src/Interactions/webhook.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAGpC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,KAAK,WAAW,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAEnE,OAAO,KAAK,EAEV,kBAAkB,EACnB,MAAM,wBAAwB,CAAA;AAE/B,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAA;AAExC,qBAAa,mBAAmB;IAC9B,QAAQ,CAAC,IAAI,yBAAwB;CACtC;AAED,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,CAAA;AA8BxE,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAA;IACjC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAA;IAC7B,QAAQ,CAAC,SAAS,EAAE,MAAM,OAAO,MAAM,CAAC,iBAAiB,CAAA;CAC1D;AAaD,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AACD,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;EAEzB,CAAA;AAED,eAAO,MAAM,KAAK,SAAU,cAAc,6CACM,CAAA;AAEhD,eAAO,MAAM,WAAW,EAAE,CACxB,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,KAC7B,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,WAAW,EAAE,aAAa,CAEY,CAAA;AAE1E,qBAAa,iBAAiB;IAEhB,QAAQ,CAAC,MAAM,EAAE,OAAO;IADpC,QAAQ,CAAC,IAAI,uBAAsB;gBACd,MAAM,EAAE,OAAO;CACrC;AA8CD,MAAM,WAAW,iBAAiB,CAAC,CAAC;IAClC,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,mBAAmB,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC9E,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CAChE;AAED;;GAEG;AACH,eAAO,MAAM,WAAW,+KASlB,aAAa,CAAC,aAAa,EAAE,KAAK,EAAE,IAAI,CAkB7C,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB;aAMnB,OAAO;UACV,MAAM;MACR,aAAa,CACjB,aAAa,EACb,mBAAmB,GAAG,iBAAiB,GAAG,kBAAkB,EAC5D,QAAQ,mBAAmB,CAS5B,CAAA"}
|
package/Interactions/webhook.js
CHANGED
|
@@ -8,7 +8,7 @@ var Chunk = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/C
|
|
|
8
8
|
var _Context = /*#__PURE__*/require("effect/Context");
|
|
9
9
|
var _Function = /*#__PURE__*/require("effect/Function");
|
|
10
10
|
var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Option"));
|
|
11
|
-
var
|
|
11
|
+
var Secret = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Secret"));
|
|
12
12
|
var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
|
|
13
13
|
var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
|
|
14
14
|
var _handlers = /*#__PURE__*/require("dfx/Interactions/handlers");
|
|
@@ -31,7 +31,7 @@ const makeConfig = ({
|
|
|
31
31
|
publicKey
|
|
32
32
|
}) => ({
|
|
33
33
|
applicationId,
|
|
34
|
-
publicKey:
|
|
34
|
+
publicKey: Secret.value(publicKey),
|
|
35
35
|
crypto,
|
|
36
36
|
algorithm: Verify.PlatformAlgorithm[algorithm]
|
|
37
37
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.js","names":["Chunk","_interopRequireWildcard","require","_Context","_Function","Option","
|
|
1
|
+
{"version":3,"file":"webhook.js","names":["Chunk","_interopRequireWildcard","require","_Context","_Function","Option","Secret","Effect","Layer","_handlers","_index","Verify","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","BadWebhookSignature","_tag","exports","checkSignature","publicKey","headers","body","crypto","algorithm","all","signature","fromNullable","timestamp","pipe","flatMap","_","promise","verify","filterOrFail","identity","catchAllCause","fail","asUnit","makeConfig","applicationId","value","PlatformAlgorithm","WebhookConfig","Tag","layer","opts","succeed","layerConfig","effect","map","config","WebhookParseError","reason","constructor","fromHeadersAndBody","tap","try","JSON","parse","catch","run","definitions","handleResponse","handler","handlers","interaction","provideService","type","Interaction","makeHandler","ix","handle","d","_i","error","success","makeSimpleHandler"],"sources":["../src/Interactions/webhook.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,KAAA,gBAAAC,uBAAA,eAAAC,OAAA;AACA,IAAAC,QAAA,gBAAAD,OAAA;AACA,IAAAE,SAAA,gBAAAF,OAAA;AACA,IAAAG,MAAA,gBAAAJ,uBAAA,eAAAC,OAAA;AAIA,IAAAI,MAAA,gBAAAL,uBAAA,eAAAC,OAAA;AACA,IAAAK,MAAA,gBAAAN,uBAAA,eAAAC,OAAA;AACA,IAAAM,KAAA,gBAAAP,uBAAA,eAAAC,OAAA;AAGA,IAAAO,SAAA,gBAAAP,OAAA;AAKA,IAAAQ,MAAA,gBAAAR,OAAA;AAEA,IAAAS,MAAA,gBAAAV,uBAAA,eAAAC,OAAA;AAAwC,SAAAU,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAZ,wBAAAY,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAElC,MAAOY,mBAAmB;EACrBC,IAAI,GAAG,qBAAqB;;AACtCC,OAAA,CAAAF,mBAAA,GAAAA,mBAAA;AAID,MAAMG,cAAc,GAAGA,CACrBC,SAAiB,EACjBC,OAAgB,EAChBC,IAAY,EACZC,MAAoB,EACpBC,SAAc,KAEdpC,MAAM,CAACqC,GAAG,CAAC;EACTC,SAAS,EAAEtC,MAAM,CAACuC,YAAY,CAACN,OAAO,CAAC,qBAAqB,CAAC,CAAC;EAC9DO,SAAS,EAAExC,MAAM,CAACuC,YAAY,CAACN,OAAO,CAAC,uBAAuB,CAAC;CAChE,CAAC,CAACQ,IAAI,CACLvC,MAAM,CAACwC,OAAO,CAACC,CAAC,IACdzC,MAAM,CAAC0C,OAAO,CAAC,MACbtC,MAAM,CAACuC,MAAM,CACXX,IAAI,EACJS,CAAC,CAACL,SAAmB,EACrBK,CAAC,CAACH,SAAmB,EACrBR,SAAS,EACTG,MAAM,EACNC,SAAS,CACV,CACF,CACF,EACDlC,MAAM,CAAC4C,YAAY,CAACC,kBAAQ,EAAE,MAAM,IAAInB,mBAAmB,EAAE,CAAC,EAC9D1B,MAAM,CAAC8C,aAAa,CAAC,MAAM9C,MAAM,CAAC+C,IAAI,CAAC,IAAIrB,mBAAmB,EAAE,CAAC,CAAC,EAClE1B,MAAM,CAACgD,MAAM,CACd;AAQH,MAAMC,UAAU,GAAGA,CAAC;EAClBf,SAAS;EACTgB,aAAa;EACbjB,MAAM;EACNH;AAAS,CACM,MAAM;EACrBoB,aAAa;EACbpB,SAAS,EAAE/B,MAAM,CAACoD,KAAK,CAACrB,SAAS,CAAC;EAClCG,MAAM;EACNC,SAAS,EAAE9B,MAAM,CAACgD,iBAAiB,CAAClB,SAAS;CAC9C,CAAC;AAKK,MAAMmB,aAAa,GAAAzB,OAAA,CAAAyB,aAAA,gBAAG,IAAAC,YAAG,EAC9B,gCAAgC,CACjC;AAEM,MAAMC,KAAK,GAAIC,IAAoB,IACxCvD,KAAK,CAACwD,OAAO,CAACJ,aAAa,EAAEJ,UAAU,CAACO,IAAI,CAAC,CAAC;AAAA5B,OAAA,CAAA2B,KAAA,GAAAA,KAAA;AAEzC,MAAMG,WAAW,GAGtB1C,CAAgC,IAC7Bf,KAAK,CAAC0D,MAAM,CAACN,aAAa,EAAErD,MAAM,CAAC4D,GAAG,CAAC5D,MAAM,CAAC6D,MAAM,CAAC7C,CAAC,CAAC,EAAEiC,UAAU,CAAC,CAAC;AAAArB,OAAA,CAAA8B,WAAA,GAAAA,WAAA;AAEpE,MAAOI,iBAAiB;EAEPC,MAAA;EADZpC,IAAI,GAAG,mBAAmB;EACnCqC,YAAqBD,MAAe;IAAf,KAAAA,MAAM,GAANA,MAAM;EAAY;;AACxCnC,OAAA,CAAAkC,iBAAA,GAAAA,iBAAA;AAED,MAAMG,kBAAkB,GAAGA,CAAClC,OAAgB,EAAEC,IAAY,KACxDhC,MAAM,CAACkE,GAAG,CAACb,aAAa,EAAE,CAAC;EAAEnB,SAAS;EAAED,MAAM;EAAEH;AAAS,CAAE,KACzDD,cAAc,CAACC,SAAS,EAAEC,OAAO,EAAEC,IAAI,EAAEC,MAAM,EAAEC,SAAS,CAAC,CAC5D,CAACK,IAAI,CACJvC,MAAM,CAACwC,OAAO,CAAC,MACbxC,MAAM,CAACmE,GAAG,CAAC;EACTA,GAAG,EAAEA,CAAA,KAAMC,IAAI,CAACC,KAAK,CAACrC,IAAI,CAAwB;EAClDsC,KAAK,EAAEP,MAAM,IAAI,IAAID,iBAAiB,CAACC,MAAM;CAC9C,CAAC,CACH,CACF;AAEH,MAAMQ,GAAG,GAAGA,CACVC,WAOC,EACDC,cAGqD,KACnD;EACF,MAAMC,OAAO,GAAG,IAAAC,kBAAQ,EAACH,WAAW,EAAEC,cAAc,CAAC;EACrD,OAAO,CACL1C,OAAgB,EAChBC,IAAY,KAMZhC,MAAM,CAACwC,OAAO,CAACyB,kBAAkB,CAAClC,OAAO,EAAEC,IAAI,CAAC,EAAE4C,WAAW,IAC3D5E,MAAM,CAAC6E,cAAc,CACnBH,OAAO,CAACE,WAAW,CAACE,IAAI,CAAC,CAACF,WAAW,CAAC,EACtCG,kBAAW,EACXH,WAAW,CACZ,CACF;AACL,CAAC;AASD;;;AAGO,MAAMI,WAAW,GACtBC,EAAgC,IAQiB;EACjD,MAAMC,MAAM,GAAGX,GAAG,CAChB9E,KAAK,CAACmE,GAAG,CAACqB,EAAE,CAACT,WAAW,EAAE,CAAC,CAACW,CAAC,CAAC,KAAK,CAACA,CAAC,EAAEtC,kBAAQ,CAAQ,CAAC,EACxD,CAACuC,EAAE,EAAE5E,CAAC,KAAKR,MAAM,CAACyD,OAAO,CAACjD,CAAC,CAAC,CAC7B;EAED,OAAO,CAAC;IACNwB,IAAI;IACJqD,KAAK;IACLtD,OAAO;IACPuD;EAAO,CAGR,KACCJ,MAAM,CAACnD,OAAO,EAAEC,IAAI,CAAC,CAACO,IAAI,CACxBvC,MAAM,CAACwC,OAAO,CAAC8C,OAAO,CAAC,EACvBtF,MAAM,CAAC8C,aAAa,CAACuC,KAAK,CAAC,CAC5B;AACL,CAAC;AAED;;;AAAAzD,OAAA,CAAAoD,WAAA,GAAAA,WAAA;AAGO,MAAMO,iBAAiB,GAC5BN,EAAgC,IAW7B;EACH,MAAMC,MAAM,GAAGX,GAAG,CAChB9E,KAAK,CAACmE,GAAG,CAACqB,EAAE,CAACT,WAAW,EAAE,CAAC,CAACW,CAAC,CAAC,KAAK,CAACA,CAAC,EAAEtC,kBAAQ,CAAQ,CAAC,EACxD,CAACuC,EAAE,EAAE5E,CAAC,KAAKR,MAAM,CAACyD,OAAO,CAACjD,CAAC,CAAC,CAC7B;EAED,OAAO,CAAC;IAAEwB,IAAI;IAAED;EAAO,CAAsC,KAC3DmD,MAAM,CAACnD,OAAO,EAAEC,IAAI,CAAC;AACzB,CAAC;AAAAJ,OAAA,CAAA2D,iBAAA,GAAAA,iBAAA"}
|
package/README.md
CHANGED
|
@@ -10,40 +10,48 @@ A Discord library built on top of effect
|
|
|
10
10
|
## Example
|
|
11
11
|
|
|
12
12
|
```typescript
|
|
13
|
-
import {
|
|
14
|
-
import { Ix } from "dfx"
|
|
15
|
-
import {
|
|
13
|
+
import { runMain } from "@effect/platform-node/Runtime"
|
|
14
|
+
import { DiscordConfig, Ix } from "dfx"
|
|
15
|
+
import { DiscordIxLive, InteractionsRegistry } from "dfx/gateway"
|
|
16
|
+
import { Config, Effect, Layer } from "effect"
|
|
16
17
|
|
|
17
|
-
// Create
|
|
18
|
-
const
|
|
18
|
+
// Create a config layer
|
|
19
|
+
const DiscordConfigLive = DiscordConfig.layerConfig({
|
|
19
20
|
token: Config.secret("DISCORD_BOT_TOKEN"),
|
|
20
21
|
})
|
|
21
22
|
|
|
22
|
-
// Create hello
|
|
23
|
-
const
|
|
24
|
-
{
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
23
|
+
// Create hello service
|
|
24
|
+
const HelloLive = Layer.effectDiscard(
|
|
25
|
+
Effect.gen(function* (_) {
|
|
26
|
+
const registry = yield* _(InteractionsRegistry)
|
|
27
|
+
|
|
28
|
+
// Create hello command that responds with "Hello!"
|
|
29
|
+
const hello = Ix.global(
|
|
30
|
+
{
|
|
31
|
+
name: "hello",
|
|
32
|
+
description: "A basic command",
|
|
33
|
+
},
|
|
34
|
+
Effect.succeed({
|
|
35
|
+
type: 4,
|
|
36
|
+
data: {
|
|
37
|
+
content: "Hello!",
|
|
38
|
+
},
|
|
39
|
+
}),
|
|
40
|
+
)
|
|
41
|
+
|
|
42
|
+
// register the command(s) and handle errors
|
|
43
|
+
yield* _(
|
|
44
|
+
registry.register(Ix.builder.add(hello).catchAllCause(Effect.logError)),
|
|
45
|
+
)
|
|
33
46
|
}),
|
|
47
|
+
).pipe(
|
|
48
|
+
// provide discord interactions layer
|
|
49
|
+
Layer.provide(DiscordIxLive),
|
|
34
50
|
)
|
|
35
51
|
|
|
36
|
-
//
|
|
37
|
-
pipe(
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
Effect.sync(() => {
|
|
42
|
-
console.error("CAUGHT ERROR", e)
|
|
43
|
-
}),
|
|
44
|
-
),
|
|
45
|
-
),
|
|
46
|
-
Effect.provide(Dependencies),
|
|
47
|
-
Effect.runFork,
|
|
48
|
-
)
|
|
52
|
+
// Construct the main layer
|
|
53
|
+
const MainLive = HelloLive.pipe(Layer.provide(DiscordConfigLive))
|
|
54
|
+
|
|
55
|
+
// run it
|
|
56
|
+
runMain(Layer.launch(MainLive))
|
|
49
57
|
```
|
|
@@ -3,7 +3,7 @@ import { Tag } from "effect/Context";
|
|
|
3
3
|
import * as Duration from "effect/Duration";
|
|
4
4
|
import { pipe } from "effect/Function";
|
|
5
5
|
import * as Option from "effect/Option";
|
|
6
|
-
import * as
|
|
6
|
+
import * as Secret from "effect/Secret";
|
|
7
7
|
import * as Effect from "effect/Effect";
|
|
8
8
|
import * as PubSub from "effect/PubSub";
|
|
9
9
|
import * as Layer from "effect/Layer";
|
|
@@ -60,7 +60,7 @@ export const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
60
60
|
yield* _(Heartbeats.send(hellos, acks, latestSequence, heartbeatSend), Effect.forkScoped);
|
|
61
61
|
// identify
|
|
62
62
|
const identify = Identify.identifyOrResume({
|
|
63
|
-
token:
|
|
63
|
+
token: Secret.value(token),
|
|
64
64
|
shard,
|
|
65
65
|
intents: gateway.intents,
|
|
66
66
|
presence: gateway.presence
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Shard.mjs","names":["Chunk","Tag","Duration","pipe","Option","
|
|
1
|
+
{"version":3,"file":"Shard.mjs","names":["Chunk","Tag","Duration","pipe","Option","Secret","Effect","PubSub","Layer","Queue","Ref","DiscordConfig","DiscordWS","DiscordWSLive","Heartbeats","Identify","InvalidSession","Utils","Reconnect","RateLimiterLive","RateLimiter","Discord","Messaging","MesssagingLive","make","gen","_","gateway","token","limiter","dws","hub","sendQueue","connect","shard","outboundQueue","unbounded","pendingQueue","phase","setPhase","p","zipLeft","set","annotateLogs","logTrace","outbound","take","maybeWait","minutes","send","flatMap","get","offer","heartbeatSend","succeed","prioritySend","resume","zipRight","takeAll","tap","offerAll","asUnit","onConnecting","msgs","filter","msg","op","GatewayOpcode","IDENTIFY","RESUME","HEARTBEAT","socket","isReady","liftPredicate","DISPATCH","t","latestReady","updateLatestReady","latest","map","d","latestSequence","updateLatestSequence","fromNullable","s","maybeUpdateUrl","match","onNone","unit","onSome","resume_gateway_url","setUrl","hellos","acquireRelease","shutdown","acks","forkScoped","identify","identifyOrResume","value","intents","presence","onPayload","HELLO","HEARTBEAT_ACK","INVALID_SESSION","fromPayload","publish","forever","id","package","module","Shard","ShardLive","effect","provide"],"sources":["../../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/mjs/DiscordREST.mjs
CHANGED
|
@@ -4,7 +4,7 @@ import { millis } from "effect/Duration";
|
|
|
4
4
|
import { pipe } from "effect/Function";
|
|
5
5
|
import * as HashSet from "effect/HashSet";
|
|
6
6
|
import * as Option from "effect/Option";
|
|
7
|
-
import * as
|
|
7
|
+
import * as Secret from "effect/Secret";
|
|
8
8
|
import * as Effect from "effect/Effect";
|
|
9
9
|
import * as Layer from "effect/Layer";
|
|
10
10
|
import * as Ref from "effect/Ref";
|
|
@@ -73,7 +73,7 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
73
73
|
});
|
|
74
74
|
}), Effect.ignore);
|
|
75
75
|
const httpExecutor = pipe(Http.client.filterStatusOk(http), Http.client.mapRequest(req => pipe(Http.request.prependUrl(req, rest.baseUrl), Http.request.setHeaders({
|
|
76
|
-
Authorization: `Bot ${
|
|
76
|
+
Authorization: `Bot ${Secret.value(token)}`,
|
|
77
77
|
"User-Agent": `DiscordBot (https://github.com/tim-smart/dfx, ${LIB_VERSION})`
|
|
78
78
|
}))), Http.client.catchAll(error => error.reason === "StatusCode" ? error.response.json.pipe(Effect.mapError(_ => new DiscordRESTError(_)), Effect.flatMap(body => Effect.fail(new DiscordRESTError(error, body)))) : Effect.fail(new DiscordRESTError(error))));
|
|
79
79
|
const executor = request => requestRateLimit(request.url, request).pipe(Effect.zipLeft(globalRateLimit), Effect.zipRight(httpExecutor(request)), Effect.tap(response => updateBuckets(request, response)), Effect.catchTag("DiscordRESTError", e => {
|
package/mjs/DiscordREST.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordREST.mjs","names":["Tag","Duration","millis","pipe","HashSet","Option","
|
|
1
|
+
{"version":3,"file":"DiscordREST.mjs","names":["Tag","Duration","millis","pipe","HashSet","Option","Secret","Effect","Layer","Ref","Http","DiscordConfig","rateLimitFromHeaders","retryAfter","routeFromConfig","RateLimiterLive","RateLimiter","RateLimitStore","Discord","LIB_VERSION","DiscordRESTError","error","body","_tag","constructor","make","gen","_","rest","token","http","client","Client","store","maybeWait","globalRateLimit","decode","window","limit","badRoutesRef","empty","tenMinutes","toMillis","minutes","addBadRoute","route","logDebug","zipRight","update","add","incrementCounter","annotateLogs","isBadRoute","map","get","has","removeBadRoute","remove","invalidRateLimit","tap","invalid","unit","asUnit","requestRateLimit","path","request","Do","let","method","bind","getBucketForRoute","flatMap","maybeBucket","match","onNone","onSome","bucket","key","resetAfter","updateBuckets","response","url","headers","rateLimit","hasBucket","effectsToRun","putBucketRoute","remaining","push","removeCounter","putBucket","all","concurrency","discard","ignore","httpExecutor","filterStatusOk","mapRequest","req","prependUrl","baseUrl","setHeaders","Authorization","value","catchAll","reason","json","mapError","fail","executor","zipLeft","catchTag","e","status","sleep","getOrElse","seconds","package","module","routes","createRoutes","options","params","hasBody","appendUrlParams","formData","append","JSON","stringify","unsafeJsonBody","DiscordREST","DiscordRESTLive","effect","provide","layer"],"sources":["../src/DiscordREST.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import * as Chunk from "effect/Chunk";
|
|
|
2
2
|
import { Tag } from "effect/Context";
|
|
3
3
|
import { identity } from "effect/Function";
|
|
4
4
|
import * as Option from "effect/Option";
|
|
5
|
-
import * as
|
|
5
|
+
import * as Secret from "effect/Secret";
|
|
6
6
|
import * as Effect from "effect/Effect";
|
|
7
7
|
import * as Layer from "effect/Layer";
|
|
8
8
|
import { handlers } from "dfx/Interactions/handlers";
|
|
@@ -22,7 +22,7 @@ const makeConfig = ({
|
|
|
22
22
|
publicKey
|
|
23
23
|
}) => ({
|
|
24
24
|
applicationId,
|
|
25
|
-
publicKey:
|
|
25
|
+
publicKey: Secret.value(publicKey),
|
|
26
26
|
crypto,
|
|
27
27
|
algorithm: Verify.PlatformAlgorithm[algorithm]
|
|
28
28
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.mjs","names":["Chunk","Tag","identity","Option","
|
|
1
|
+
{"version":3,"file":"webhook.mjs","names":["Chunk","Tag","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","a","effect","map","config","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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"}
|
package/mjs/version.mjs
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const LIB_VERSION = "0.
|
|
1
|
+
export const LIB_VERSION = "0.79.0";
|
|
2
2
|
//# sourceMappingURL=version.mjs.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dfx",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.79.0",
|
|
4
4
|
"description": "Effect-TS discord library",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -39,8 +39,8 @@
|
|
|
39
39
|
"ws": "^8.14.2"
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
42
|
-
"@effect/platform": "^0.
|
|
43
|
-
"effect": "2.0.0-next.
|
|
42
|
+
"@effect/platform": "^0.33.0",
|
|
43
|
+
"effect": "2.0.0-next.59"
|
|
44
44
|
},
|
|
45
45
|
"optionalDependencies": {
|
|
46
46
|
"bufferutil": "^4.0.8",
|
|
@@ -48,6 +48,6 @@
|
|
|
48
48
|
"utf-8-validate": "^6.0.3",
|
|
49
49
|
"zlib-sync": "^0.1.9"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "2af196016b783473399f19f2359e8fed443e76c7",
|
|
52
52
|
"main": "./index.js"
|
|
53
53
|
}
|
package/src/DiscordConfig.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { Tag } from "effect/Context"
|
|
|
2
2
|
import * as Duration from "effect/Duration"
|
|
3
3
|
import * as Config from "effect/Config"
|
|
4
4
|
import type * as ConfigError from "effect/ConfigError"
|
|
5
|
-
import type * as
|
|
5
|
+
import type * as Secret from "effect/Secret"
|
|
6
6
|
import * as Effect from "effect/Effect"
|
|
7
7
|
import * as Layer from "effect/Layer"
|
|
8
8
|
import * as Discord from "dfx/types"
|
|
@@ -14,7 +14,7 @@ export interface DiscordConfig {
|
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
export interface DiscordConfigService {
|
|
17
|
-
readonly token:
|
|
17
|
+
readonly token: Secret.Secret
|
|
18
18
|
readonly rest: {
|
|
19
19
|
readonly baseUrl: string
|
|
20
20
|
readonly globalRateLimit: {
|
|
@@ -35,7 +35,7 @@ export const DiscordConfig = Tag<DiscordConfig, DiscordConfigService>(
|
|
|
35
35
|
)
|
|
36
36
|
|
|
37
37
|
export interface MakeOpts {
|
|
38
|
-
readonly token:
|
|
38
|
+
readonly token: Secret.Secret
|
|
39
39
|
readonly rest?: Partial<DiscordConfigService["rest"]>
|
|
40
40
|
readonly gateway?: Partial<DiscordConfigService["gateway"]>
|
|
41
41
|
}
|
|
@@ -3,7 +3,7 @@ import { Tag } from "effect/Context"
|
|
|
3
3
|
import * as Duration from "effect/Duration"
|
|
4
4
|
import { pipe } from "effect/Function"
|
|
5
5
|
import * as Option from "effect/Option"
|
|
6
|
-
import * as
|
|
6
|
+
import * as Secret from "effect/Secret"
|
|
7
7
|
import * as Effect from "effect/Effect"
|
|
8
8
|
import * as PubSub from "effect/PubSub"
|
|
9
9
|
import * as Layer from "effect/Layer"
|
|
@@ -136,7 +136,7 @@ export const make = Effect.gen(function* (_) {
|
|
|
136
136
|
// identify
|
|
137
137
|
const identify = Identify.identifyOrResume(
|
|
138
138
|
{
|
|
139
|
-
token:
|
|
139
|
+
token: Secret.value(token),
|
|
140
140
|
shard,
|
|
141
141
|
intents: gateway.intents,
|
|
142
142
|
presence: gateway.presence,
|
package/src/DiscordREST.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { millis } from "effect/Duration"
|
|
|
4
4
|
import { pipe } from "effect/Function"
|
|
5
5
|
import * as HashSet from "effect/HashSet"
|
|
6
6
|
import * as Option from "effect/Option"
|
|
7
|
-
import * as
|
|
7
|
+
import * as Secret from "effect/Secret"
|
|
8
8
|
import * as Effect from "effect/Effect"
|
|
9
9
|
import * as Layer from "effect/Layer"
|
|
10
10
|
import * as Ref from "effect/Ref"
|
|
@@ -136,7 +136,7 @@ const make = Effect.gen(function* (_) {
|
|
|
136
136
|
pipe(
|
|
137
137
|
Http.request.prependUrl(req, rest.baseUrl),
|
|
138
138
|
Http.request.setHeaders({
|
|
139
|
-
Authorization: `Bot ${
|
|
139
|
+
Authorization: `Bot ${Secret.value(token)}`,
|
|
140
140
|
"User-Agent": `DiscordBot (https://github.com/tim-smart/dfx, ${LIB_VERSION})`,
|
|
141
141
|
}),
|
|
142
142
|
),
|
|
@@ -5,7 +5,7 @@ import * as Option from "effect/Option"
|
|
|
5
5
|
import type * as Cause from "effect/Cause"
|
|
6
6
|
import type * as Config from "effect/Config"
|
|
7
7
|
import type * as ConfigError from "effect/ConfigError"
|
|
8
|
-
import * as
|
|
8
|
+
import * as Secret from "effect/Secret"
|
|
9
9
|
import * as Effect from "effect/Effect"
|
|
10
10
|
import * as Layer from "effect/Layer"
|
|
11
11
|
import type * as D from "dfx/Interactions/definitions"
|
|
@@ -55,7 +55,7 @@ const checkSignature = (
|
|
|
55
55
|
|
|
56
56
|
export interface MakeConfigOpts {
|
|
57
57
|
readonly applicationId: string
|
|
58
|
-
readonly publicKey:
|
|
58
|
+
readonly publicKey: Secret.Secret
|
|
59
59
|
readonly crypto: SubtleCrypto
|
|
60
60
|
readonly algorithm: keyof typeof Verify.PlatformAlgorithm
|
|
61
61
|
}
|
|
@@ -66,7 +66,7 @@ const makeConfig = ({
|
|
|
66
66
|
publicKey,
|
|
67
67
|
}: MakeConfigOpts) => ({
|
|
68
68
|
applicationId,
|
|
69
|
-
publicKey:
|
|
69
|
+
publicKey: Secret.value(publicKey),
|
|
70
70
|
crypto,
|
|
71
71
|
algorithm: Verify.PlatformAlgorithm[algorithm],
|
|
72
72
|
})
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const LIB_VERSION = "0.
|
|
1
|
+
export const LIB_VERSION = "0.79.0";
|
package/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const LIB_VERSION = "0.
|
|
1
|
+
export declare const LIB_VERSION = "0.79.0";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/version.js
CHANGED
package/Log.d.ts
DELETED
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import { DiscordConfig } from "dfx/DiscordConfig";
|
|
2
|
-
import { Tag } from "effect/Context";
|
|
3
|
-
import * as Effect from "effect/Effect";
|
|
4
|
-
import * as Layer from "effect/Layer";
|
|
5
|
-
declare const make: (debug?: boolean) => {
|
|
6
|
-
info: (...args: Array<any>) => Effect.Effect<never, never, void>;
|
|
7
|
-
debug: (...args: Array<any>) => Effect.Effect<never, never, void>;
|
|
8
|
-
};
|
|
9
|
-
export interface Log extends ReturnType<typeof make> {
|
|
10
|
-
}
|
|
11
|
-
export declare const Log: Tag<Log, Log>;
|
|
12
|
-
export declare const LogLive: Layer.Layer<DiscordConfig, never, Log>;
|
|
13
|
-
export {};
|
|
14
|
-
//# sourceMappingURL=Log.d.ts.map
|
package/Log.d.ts.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"Log.d.ts","sourceRoot":"","sources":["./src/Log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,QAAA,MAAM,IAAI;oBACQ,MAAM,GAAG,CAAC;qBAIT,MAAM,GAAG,CAAC;CAM3B,CAAA;AAEF,MAAM,WAAW,GAAI,SAAQ,UAAU,CAAC,OAAO,IAAI,CAAC;CAAG;AACvD,eAAO,MAAM,GAAG,eAAa,CAAA;AAC7B,eAAO,MAAM,OAAO,wCAGnB,CAAA"}
|
package/Log.js
DELETED
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.LogLive = exports.Log = void 0;
|
|
7
|
-
var _DiscordConfig = /*#__PURE__*/require("dfx/DiscordConfig");
|
|
8
|
-
var _Context = /*#__PURE__*/require("effect/Context");
|
|
9
|
-
var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
|
|
10
|
-
var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
|
|
11
|
-
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); }
|
|
12
|
-
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; }
|
|
13
|
-
const make = (debug = false) => ({
|
|
14
|
-
info: (...args) => Effect.sync(() => {
|
|
15
|
-
console.error("INFO", ...args);
|
|
16
|
-
}),
|
|
17
|
-
debug: (...args) => debug ? Effect.sync(() => {
|
|
18
|
-
console.error("DEBUG", ...args);
|
|
19
|
-
}) : Effect.unit
|
|
20
|
-
});
|
|
21
|
-
const Log = exports.Log = /*#__PURE__*/(0, _Context.Tag)();
|
|
22
|
-
const LogLive = exports.LogLive = /*#__PURE__*/Layer.effect(Log, /*#__PURE__*/Effect.map(_DiscordConfig.DiscordConfig, config => make(config.debug)));
|
|
23
|
-
//# sourceMappingURL=Log.js.map
|
package/Log.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"Log.js","names":["_DiscordConfig","require","_Context","Effect","_interopRequireWildcard","Layer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","make","debug","info","args","sync","console","error","unit","Log","exports","Tag","LogLive","effect","map","DiscordConfig","config"],"sources":["./src/Log.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,cAAA,gBAAAC,OAAA;AACA,IAAAC,QAAA,gBAAAD,OAAA;AACA,IAAAE,MAAA,gBAAAC,uBAAA,eAAAH,OAAA;AACA,IAAAI,KAAA,gBAAAD,uBAAA,eAAAH,OAAA;AAAqC,SAAAK,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAH,wBAAAG,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAErC,MAAMY,IAAI,GAAGA,CAACC,KAAK,GAAG,KAAK,MAAM;EAC/BC,IAAI,EAAEA,CAAC,GAAGC,IAAgB,KACxB3B,MAAM,CAAC4B,IAAI,CAAC,MAAK;IACfC,OAAO,CAACC,KAAK,CAAC,MAAM,EAAE,GAAGH,IAAI,CAAC;EAChC,CAAC,CAAC;EACJF,KAAK,EAAEA,CAAC,GAAGE,IAAgB,KACzBF,KAAK,GACDzB,MAAM,CAAC4B,IAAI,CAAC,MAAK;IACfC,OAAO,CAACC,KAAK,CAAC,OAAO,EAAE,GAAGH,IAAI,CAAC;EACjC,CAAC,CAAC,GACF3B,MAAM,CAAC+B;CACd,CAAC;AAGK,MAAMC,GAAG,GAAAC,OAAA,CAAAD,GAAA,gBAAG,IAAAE,YAAG,GAAO;AACtB,MAAMC,OAAO,GAAAF,OAAA,CAAAE,OAAA,gBAAGjC,KAAK,CAACkC,MAAM,CACjCJ,GAAG,eACHhC,MAAM,CAACqC,GAAG,CAACC,4BAAa,EAAEC,MAAM,IAAIf,IAAI,CAACe,MAAM,CAACd,KAAK,CAAC,CAAC,CACxD"}
|
package/mjs/Log.mjs
DELETED
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import { DiscordConfig } from "dfx/DiscordConfig";
|
|
2
|
-
import { Tag } from "effect/Context";
|
|
3
|
-
import * as Effect from "effect/Effect";
|
|
4
|
-
import * as Layer from "effect/Layer";
|
|
5
|
-
const make = (debug = false) => ({
|
|
6
|
-
info: (...args) => Effect.sync(() => {
|
|
7
|
-
console.error("INFO", ...args);
|
|
8
|
-
}),
|
|
9
|
-
debug: (...args) => debug ? Effect.sync(() => {
|
|
10
|
-
console.error("DEBUG", ...args);
|
|
11
|
-
}) : Effect.unit
|
|
12
|
-
});
|
|
13
|
-
export const Log = /*#__PURE__*/Tag();
|
|
14
|
-
export const LogLive = /*#__PURE__*/Layer.effect(Log, /*#__PURE__*/Effect.map(DiscordConfig, config => make(config.debug)));
|
|
15
|
-
//# sourceMappingURL=Log.mjs.map
|
package/mjs/Log.mjs.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"Log.mjs","names":["DiscordConfig","Tag","Effect","Layer","make","debug","info","args","sync","console","error","unit","Log","LogLive","effect","map","config"],"sources":["../src/Log.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,aAAa,QAAQ,mBAAmB;AACjD,SAASC,GAAG,QAAQ,gBAAgB;AACpC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAErC,MAAMC,IAAI,GAAGA,CAACC,KAAK,GAAG,KAAK,MAAM;EAC/BC,IAAI,EAAEA,CAAC,GAAGC,IAAgB,KACxBL,MAAM,CAACM,IAAI,CAAC,MAAK;IACfC,OAAO,CAACC,KAAK,CAAC,MAAM,EAAE,GAAGH,IAAI,CAAC;EAChC,CAAC,CAAC;EACJF,KAAK,EAAEA,CAAC,GAAGE,IAAgB,KACzBF,KAAK,GACDH,MAAM,CAACM,IAAI,CAAC,MAAK;IACfC,OAAO,CAACC,KAAK,CAAC,OAAO,EAAE,GAAGH,IAAI,CAAC;EACjC,CAAC,CAAC,GACFL,MAAM,CAACS;CACd,CAAC;AAGF,OAAO,MAAMC,GAAG,gBAAGX,GAAG,EAAO;AAC7B,OAAO,MAAMY,OAAO,gBAAGV,KAAK,CAACW,MAAM,CACjCF,GAAG,eACHV,MAAM,CAACa,GAAG,CAACf,aAAa,EAAEgB,MAAM,IAAIZ,IAAI,CAACY,MAAM,CAACX,KAAK,CAAC,CAAC,CACxD"}
|