dfx 0.52.0 → 0.53.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/DiscordGateway/DiscordWS.d.ts +1 -1
- package/DiscordGateway/Shard.d.ts +2 -2
- package/DiscordGateway/Shard.d.ts.map +1 -1
- package/DiscordGateway/Shard.js +3 -7
- package/DiscordGateway/Shard.js.map +1 -1
- package/DiscordGateway/WS.d.ts +1 -0
- package/DiscordGateway/WS.d.ts.map +1 -1
- package/DiscordREST.js +2 -8
- package/DiscordREST.js.map +1 -1
- package/Interactions/context.d.ts +1 -1
- package/Interactions/definitions.d.ts +3 -3
- package/Interactions/webhook.d.ts +1 -1
- package/RateLimit.d.ts +2 -2
- package/gateway.d.ts +4 -3
- package/gateway.d.ts.map +1 -1
- package/gateway.js +11 -10
- package/gateway.js.map +1 -1
- package/index.d.ts +2 -1
- package/index.d.ts.map +1 -1
- package/index.js +3 -1
- package/index.js.map +1 -1
- package/mjs/DiscordGateway/Shard.mjs +3 -7
- package/mjs/DiscordGateway/Shard.mjs.map +1 -1
- package/mjs/DiscordREST.mjs +2 -8
- package/mjs/DiscordREST.mjs.map +1 -1
- package/mjs/gateway.mjs +4 -3
- package/mjs/gateway.mjs.map +1 -1
- package/mjs/index.mjs +2 -1
- package/mjs/index.mjs.map +1 -1
- package/mjs/version.mjs +1 -1
- package/mjs/webhooks.mjs +3 -3
- package/mjs/webhooks.mjs.map +1 -1
- package/package.json +4 -4
- package/src/DiscordGateway/Shard.ts +8 -14
- package/src/DiscordREST.ts +18 -18
- package/src/gateway.ts +14 -6
- package/src/index.ts +3 -0
- package/src/version.ts +1 -1
- package/src/webhooks.ts +4 -4
- package/version.d.ts +1 -1
- package/version.js +1 -1
- package/webhooks.d.ts +3 -3
- package/webhooks.d.ts.map +1 -1
- package/webhooks.js +7 -7
- package/webhooks.js.map +1 -1
|
@@ -20,7 +20,7 @@ export interface DiscordWSCodec {
|
|
|
20
20
|
}
|
|
21
21
|
export declare const DiscordWSCodec: Tag<DiscordWSCodec, DiscordWSCodec>;
|
|
22
22
|
export declare const LiveJsonDiscordWSCodec: Layer.Layer<never, never, DiscordWSCodec>;
|
|
23
|
-
declare const make: Effect.Effect<
|
|
23
|
+
declare const make: Effect.Effect<WS | DiscordWSCodec, never, {
|
|
24
24
|
readonly connect: ({ url, version, outbound, onConnecting, }: OpenOpts) => Effect.Effect<never, never, {
|
|
25
25
|
readonly run: Effect.Effect<never, import("dfx/DiscordGateway/WS").WebSocketError | import("dfx/DiscordGateway/WS").WebSocketCloseError, void>;
|
|
26
26
|
readonly take: Effect.Effect<never, never, Discord.GatewayPayload<any>>;
|
|
@@ -9,7 +9,7 @@ import * as Layer from "@effect/io/Layer";
|
|
|
9
9
|
import { Tag } from "@effect/data/Context";
|
|
10
10
|
import * as Hub from "@effect/io/Hub";
|
|
11
11
|
import * as Queue from "@effect/io/Queue";
|
|
12
|
-
export declare const make: Effect.Effect<
|
|
12
|
+
export declare const make: Effect.Effect<Log | RateLimiter | DiscordConfig | DiscordWS, never, {
|
|
13
13
|
readonly connect: (shard: [id: number, count: number], hub: Hub.Hub<Discord.GatewayPayload<Discord.ReceiveEvent>>, sendQueue: Queue.Dequeue<Discord.GatewayPayload<Discord.SendEvent>>) => Effect.Effect<never, never, {
|
|
14
14
|
readonly id: [id: number, count: number];
|
|
15
15
|
readonly send: (p: Message) => Effect.Effect<never, never, boolean>;
|
|
@@ -19,7 +19,7 @@ export declare const make: Effect.Effect<RateLimiter | Log | DiscordConfig | Dis
|
|
|
19
19
|
export interface Shard extends Effect.Effect.Success<typeof make> {
|
|
20
20
|
}
|
|
21
21
|
export declare const Shard: Tag<Shard, Shard>;
|
|
22
|
-
export declare const LiveShard: Layer.Layer<import("dfx/RateLimit").RateLimitStore |
|
|
22
|
+
export declare const LiveShard: Layer.Layer<Log | import("dfx/RateLimit").RateLimitStore | DiscordConfig | import("dfx/DiscordGateway/DiscordWS").DiscordWSCodec, never, Shard>;
|
|
23
23
|
export interface RunningShard extends Effect.Effect.Success<ReturnType<Shard["connect"]>> {
|
|
24
24
|
}
|
|
25
25
|
//# sourceMappingURL=Shard.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Shard.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/Shard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAmB,WAAW,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAiB,MAAM,8BAA8B,CAAA;AAMvE,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAE1C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAYzC,eAAO,MAAM,IAAI;8BAON,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,OAC7B,OAAO,CAAC,QAAQ,cAAc,CAAC,QAAQ,YAAY,CAAC,CAAC,aAC/C,MAAM,OAAO,CAAC,QAAQ,cAAc,CAAC,QAAQ,SAAS,CAAC,CAAC;;2BAahD,OAAO;;;
|
|
1
|
+
{"version":3,"file":"Shard.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/Shard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAmB,WAAW,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAiB,MAAM,8BAA8B,CAAA;AAMvE,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AACpC,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAE1C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAYzC,eAAO,MAAM,IAAI;8BAON,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,OAC7B,OAAO,CAAC,QAAQ,cAAc,CAAC,QAAQ,YAAY,CAAC,CAAC,aAC/C,MAAM,OAAO,CAAC,QAAQ,cAAc,CAAC,QAAQ,SAAS,CAAC,CAAC;;2BAahD,OAAO;;;EA4I5B,CAAA;AAEF,MAAM,WAAW,KAAM,SAAQ,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC;CAAG;AACpE,eAAO,MAAM,KAAK,mBAAe,CAAA;AACjC,eAAO,MAAM,SAAS,iJAGrB,CAAA;AAED,MAAM,WAAW,YACf,SAAQ,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;CAAG"}
|
package/DiscordGateway/Shard.js
CHANGED
|
@@ -67,14 +67,10 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
67
67
|
intents: gateway.intents,
|
|
68
68
|
presence: gateway.presence
|
|
69
69
|
}, latestReady, latestSequence);
|
|
70
|
-
const onPayload = p =>
|
|
71
|
-
discard: true
|
|
72
|
-
}), () => {
|
|
70
|
+
const onPayload = p => updateLatestReady(p).pipe(Effect.zipRight(updateLatestSequence(p)), Effect.zipRight(maybeUpdateUrl(p)), Effect.tap(() => {
|
|
73
71
|
switch (p.op) {
|
|
74
72
|
case 10 /* Discord.GatewayOpcode.HELLO */:
|
|
75
|
-
return Effect.
|
|
76
|
-
discard: true
|
|
77
|
-
});
|
|
73
|
+
return Effect.tap(identify, prioritySend).pipe(Effect.zipRight(setPhase(1 /* Phase.Handshake */)), Effect.zipRight(Queue.offer(hellos, p)));
|
|
78
74
|
case 11 /* Discord.GatewayOpcode.HEARTBEAT_ACK */:
|
|
79
75
|
return Queue.offer(acks, p);
|
|
80
76
|
case 9 /* Discord.GatewayOpcode.INVALID_SESSION */:
|
|
@@ -86,7 +82,7 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
86
82
|
return Hub.publish(hub, p);
|
|
87
83
|
}
|
|
88
84
|
return Effect.unit;
|
|
89
|
-
});
|
|
85
|
+
}));
|
|
90
86
|
const drainSendQueue = Queue.take(sendQueue).pipe(Effect.tap(send), Effect.forever);
|
|
91
87
|
const run = Effect.all([socket.take.pipe(Effect.flatMap(onPayload), Effect.forever), heartbeats, drainSendQueue, socket.run], {
|
|
92
88
|
discard: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Shard.js","names":["_DiscordConfig","require","_RateLimit","_DiscordWS","Heartbeats","_interopRequireWildcard","Identify","InvalidSession","Utils","_WS","_Log","Effect","Layer","_Context","Option","Hub","Queue","Ref","Duration","Chunk","ConfigSecret","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","make","gen","_","gateway","token","DiscordConfig","limiter","RateLimiter","dws","DiscordWS","log","Log","connect","shard","hub","sendQueue","outboundQueue","unbounded","pendingQueue","phase","setPhase","p","zipLeft","debug","outbound","take","maybeWait","minutes","send","flatMap","offer","heartbeatSend","succeed","prioritySend","resume","pipe","zipRight","takeAll","tap","offerAll","asUnit","onConnecting","msgs","filter","msg","Reconnect","op","socket","latestReady","updateLatestReady","latest","some","t","map","d","latestSequence","updateLatestSequence","fromNullable","s","maybeUpdateUrl","match","onNone","unit","onSome","resume_gateway_url","setUrl","hellos","acks","heartbeats","identify","identifyOrResume","value","intents","presence","onPayload","
|
|
1
|
+
{"version":3,"file":"Shard.js","names":["_DiscordConfig","require","_RateLimit","_DiscordWS","Heartbeats","_interopRequireWildcard","Identify","InvalidSession","Utils","_WS","_Log","Effect","Layer","_Context","Option","Hub","Queue","Ref","Duration","Chunk","ConfigSecret","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","make","gen","_","gateway","token","DiscordConfig","limiter","RateLimiter","dws","DiscordWS","log","Log","connect","shard","hub","sendQueue","outboundQueue","unbounded","pendingQueue","phase","setPhase","p","zipLeft","debug","outbound","take","maybeWait","minutes","send","flatMap","offer","heartbeatSend","succeed","prioritySend","resume","pipe","zipRight","takeAll","tap","offerAll","asUnit","onConnecting","msgs","filter","msg","Reconnect","op","socket","latestReady","updateLatestReady","latest","some","t","map","d","latestSequence","updateLatestSequence","fromNullable","s","maybeUpdateUrl","match","onNone","unit","onSome","resume_gateway_url","setUrl","hellos","acks","heartbeats","identify","identifyOrResume","value","intents","presence","onPayload","fromPayload","publish","drainSendQueue","forever","run","all","discard","concurrency","id","exports","Shard","Tag","LiveShard","provide","merge","LiveDiscordWS","LiveRateLimiter","effect"],"sources":["../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/DiscordGateway/WS.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WS.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/WS.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,SAAS,MAAM,eAAe,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC1C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AAGrC,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAA;AAEjD,eAAO,MAAM,SAAS,eAAW,CAAA;AACjC,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAA;AACxC,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,CAAA;AAEnE,qBAAa,cAAc;IAGvB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO;IACzC,QAAQ,CAAC,KAAK,CAAC;IAHjB,QAAQ,CAAC,IAAI,oBAAmB;gBAErB,MAAM,EAAE,cAAc,GAAG,OAAO,EAChC,KAAK,CAAC,SAAS;CAE3B;AAED,qBAAa,mBAAmB;IAElB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM;IAD1D,QAAQ,CAAC,IAAI,yBAAwB;gBAChB,IAAI,EAAE,MAAM,EAAW,MAAM,EAAE,MAAM;CAC3D;AA8FD,QAAA,MAAM,IAAI;4BAID,OAAO,CAAC,MAAM,CAAC,gBACN,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC;;;;EA4BpD,CAAA;AAEF,MAAM,WAAW,EAAG,SAAQ,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC;CAAG;AACjE,eAAO,MAAM,EAAE,aAAY,CAAA;AAC3B,eAAO,MAAM,MAAM,6BAAyB,CAAA"}
|
|
1
|
+
{"version":3,"file":"WS.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/WS.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,SAAS,MAAM,eAAe,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC1C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AAGrC,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAA;AAEjD,eAAO,MAAM,SAAS,eAAW,CAAA;AACjC,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAA;AACxC,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,CAAA;AAEnE,qBAAa,cAAc;IAGvB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO;IACzC,QAAQ,CAAC,KAAK,CAAC;IAHjB,QAAQ,CAAC,IAAI,oBAAmB;gBAErB,MAAM,EAAE,cAAc,GAAG,OAAO,EAChC,KAAK,CAAC,SAAS;CAE3B;AAED,qBAAa,mBAAmB;IAElB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM;IAD1D,QAAQ,CAAC,IAAI,yBAAwB;gBAChB,IAAI,EAAE,MAAM,EAAW,MAAM,EAAE,MAAM;CAC3D;AA8FD,QAAA,MAAM,IAAI;4BAID,OAAO,CAAC,MAAM,CAAC,gBACN,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC;;;;EA4BpD,CAAA;AAEF,MAAM,WAAW,EAAG,SAAQ,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC;CAAG;AACjE,eAAO,MAAM,EAAE,aAAY,CAAA;AAC3B,eAAO,MAAM,MAAM,6BAAyB,CAAA"}
|
package/DiscordREST.js
CHANGED
|
@@ -52,10 +52,7 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
52
52
|
// Invalid route handling (40x)
|
|
53
53
|
const badRoutesRef = yield* _(Ref.make(HashSet.empty()));
|
|
54
54
|
const tenMinutes = Duration.toMillis(Duration.minutes(10));
|
|
55
|
-
const addBadRoute = route =>
|
|
56
|
-
discard: true,
|
|
57
|
-
concurrency: "unbounded"
|
|
58
|
-
});
|
|
55
|
+
const addBadRoute = route => log.info("DiscordREST", "addBadRoute", route).pipe(Effect.zipRight(Ref.update(badRoutesRef, HashSet.add(route))), Effect.zipRight(store.incrementCounter("dfx.rest.invalid", tenMinutes, 10000)));
|
|
59
56
|
const isBadRoute = route => Effect.map(Ref.get(badRoutesRef), HashSet.has(route));
|
|
60
57
|
const removeBadRoute = route => Ref.update(badRoutesRef, HashSet.remove(route));
|
|
61
58
|
const invalidRateLimit = route => isBadRoute(route).pipe(Effect.tap(invalid => invalid ? maybeWait("dfx.rest.invalid", Duration.minutes(10), 10000) : Effect.unit), Effect.asUnit);
|
|
@@ -106,10 +103,7 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
106
103
|
discard: true
|
|
107
104
|
}), Effect.fail(e));
|
|
108
105
|
case 429:
|
|
109
|
-
return
|
|
110
|
-
concurrency: "unbounded",
|
|
111
|
-
discard: true
|
|
112
|
-
}), executor(request));
|
|
106
|
+
return log.info("DiscordREST", "429", request.url).pipe(Effect.zipRight(addBadRoute((0, _utils.routeFromConfig)(request.url, request.method))), Effect.zipRight(updateBuckets(request, response)), Effect.zipRight(Effect.sleep(Option.getOrElse((0, _utils.retryAfter)(response.headers), () => Duration.seconds(5)))), Effect.zipRight(executor(request)));
|
|
113
107
|
}
|
|
114
108
|
return Effect.fail(e);
|
|
115
109
|
}));
|
package/DiscordREST.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordREST.js","names":["Http","_interopRequireWildcard","require","_Context","Duration","HashSet","Option","ConfigSecret","Effect","Layer","Ref","_DiscordConfig","_utils","_Log","_RateLimit","Discord","_version","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","DiscordRESTError","error","body","_tag","constructor","exports","make","gen","_","rest","token","DiscordConfig","http","HttpRequestExecutor","log","Log","store","RateLimitStore","maybeWait","RateLimiter","globalRateLimit","decode","window","limit","badRoutesRef","empty","tenMinutes","toMillis","minutes","addBadRoute","route","all","info","update","add","incrementCounter","discard","concurrency","isBadRoute","map","removeBadRoute","remove","invalidRateLimit","pipe","tap","invalid","unit","asUnit","requestRateLimit","path","request","Do","let","routeFromConfig","method","bind","getBucketForRoute","flatMap","maybeBucket","match","onNone","onSome","bucket","zipRight","millis","resetAfter","updateBuckets","response","url","rateLimitFromHeaders","headers","rateLimit","hasBucket","effectsToRun","putBucketRoute","remaining","push","removeCounter","putBucket","retryAfter","ignore","httpExecutor","executor","catchAll","json","mapError","fail","contramap","req","setHeaders","Authorization","value","LIB_VERSION","updateUrl","baseUrl","filterStatusOk","execute","zipLeft","catchTag","e","status","sleep","getOrElse","seconds","routes","createRoutes","options","params","hasBody","appendParams","append","JSON","stringify","jsonBody","DiscordREST","Tag","LiveDiscordREST","provide","LiveRateLimiter","effect"],"sources":["./src/DiscordREST.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DiscordREST.js","names":["Http","_interopRequireWildcard","require","_Context","Duration","HashSet","Option","ConfigSecret","Effect","Layer","Ref","_DiscordConfig","_utils","_Log","_RateLimit","Discord","_version","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","DiscordRESTError","error","body","_tag","constructor","exports","make","gen","_","rest","token","DiscordConfig","http","HttpRequestExecutor","log","Log","store","RateLimitStore","maybeWait","RateLimiter","globalRateLimit","decode","window","limit","badRoutesRef","empty","tenMinutes","toMillis","minutes","addBadRoute","route","info","pipe","zipRight","update","add","incrementCounter","isBadRoute","map","removeBadRoute","remove","invalidRateLimit","tap","invalid","unit","asUnit","requestRateLimit","path","request","Do","let","routeFromConfig","method","bind","getBucketForRoute","flatMap","maybeBucket","match","onNone","onSome","bucket","millis","resetAfter","updateBuckets","response","url","rateLimitFromHeaders","headers","rateLimit","hasBucket","effectsToRun","putBucketRoute","remaining","push","removeCounter","putBucket","retryAfter","all","concurrency","discard","ignore","httpExecutor","executor","catchAll","json","mapError","fail","contramap","req","setHeaders","Authorization","value","LIB_VERSION","updateUrl","baseUrl","filterStatusOk","execute","zipLeft","catchTag","e","status","sleep","getOrElse","seconds","routes","createRoutes","options","params","hasBody","appendParams","append","JSON","stringify","jsonBody","DiscordREST","Tag","LiveDiscordREST","provide","LiveRateLimiter","effect"],"sources":["./src/DiscordREST.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ export declare class SubCommandNotFound {
|
|
|
30
30
|
readonly _tag = "SubCommandNotFound";
|
|
31
31
|
constructor(data: Discord.ApplicationCommandDatum);
|
|
32
32
|
}
|
|
33
|
-
export declare const handleSubCommands: <NER extends Record<string, Effect.Effect<any, any, Discord.InteractionResponse>>>(commands: NER) => Effect.Effect<Discord.
|
|
33
|
+
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 [{
|
|
34
34
|
[Effect.EffectTypeId]: {
|
|
35
35
|
_R: (_: never) => infer R;
|
|
36
36
|
};
|
|
@@ -9,14 +9,14 @@ export declare class GlobalApplicationCommand<R, E> {
|
|
|
9
9
|
readonly _tag = "GlobalApplicationCommand";
|
|
10
10
|
constructor(command: Discord.CreateGlobalApplicationCommandParams, handle: CommandHandler<R, E>);
|
|
11
11
|
}
|
|
12
|
-
export declare const global: <R, E, const A extends DeepReadonlyObject<Discord.CreateGlobalApplicationCommandParams>>(command: A, handle: CommandHandler<R, E, A>) => GlobalApplicationCommand<Exclude<R, Discord.
|
|
12
|
+
export declare const global: <R, E, const A extends DeepReadonlyObject<Discord.CreateGlobalApplicationCommandParams>>(command: A, handle: CommandHandler<R, E, A>) => GlobalApplicationCommand<Exclude<R, Discord.ApplicationCommandDatum | Discord.Interaction>, E>;
|
|
13
13
|
export declare class GuildApplicationCommand<R, E> {
|
|
14
14
|
readonly command: Discord.CreateGuildApplicationCommandParams;
|
|
15
15
|
readonly handle: CommandHandler<R, E>;
|
|
16
16
|
readonly _tag = "GuildApplicationCommand";
|
|
17
17
|
constructor(command: Discord.CreateGuildApplicationCommandParams, handle: CommandHandler<R, E>);
|
|
18
18
|
}
|
|
19
|
-
export declare const guild: <R, E, const A extends DeepReadonlyObject<Discord.CreateGuildApplicationCommandParams>>(command: A, handle: CommandHandler<R, E, A>) => GuildApplicationCommand<Exclude<R, Discord.
|
|
19
|
+
export declare const guild: <R, E, const A extends DeepReadonlyObject<Discord.CreateGuildApplicationCommandParams>>(command: A, handle: CommandHandler<R, E, A>) => GuildApplicationCommand<Exclude<R, Discord.ApplicationCommandDatum | Discord.Interaction>, E>;
|
|
20
20
|
export declare class MessageComponent<R, E> {
|
|
21
21
|
readonly predicate: (customId: string) => Effect.Effect<R, E, boolean>;
|
|
22
22
|
readonly handle: Effect.Effect<R, E, Discord.InteractionResponse>;
|
|
@@ -37,7 +37,7 @@ export declare class Autocomplete<R, E> {
|
|
|
37
37
|
readonly _tag = "Autocomplete";
|
|
38
38
|
constructor(predicate: (data: Discord.ApplicationCommandDatum, focusedOption: Discord.ApplicationCommandInteractionDataOption) => Effect.Effect<R, E, boolean>, handle: Effect.Effect<R, E, Discord.InteractionResponse>);
|
|
39
39
|
}
|
|
40
|
-
export declare const autocomplete: <R1, R2, E1, E2>(pred: (data: Discord.ApplicationCommandDatum, focusedOption: Discord.ApplicationCommandInteractionDataOption) => Effect.Effect<R1, E1, boolean>, handle: Effect.Effect<R2, E2, Discord.InteractionResponse>) => Autocomplete<Exclude<R1, Discord.
|
|
40
|
+
export declare const autocomplete: <R1, R2, E1, E2>(pred: (data: Discord.ApplicationCommandDatum, focusedOption: Discord.ApplicationCommandInteractionDataOption) => Effect.Effect<R1, E1, boolean>, handle: Effect.Effect<R2, E2, Discord.InteractionResponse>) => Autocomplete<Exclude<R1, Discord.ApplicationCommandDatum | Discord.Interaction | FocusedOptionContext> | Exclude<R2, Discord.ApplicationCommandDatum | Discord.Interaction | FocusedOptionContext>, E1 | E2>;
|
|
41
41
|
type DeepReadonly<T> = T extends (infer R)[] ? ReadonlyArray<DeepReadonly<R>> : T extends Function ? T : T extends object ? DeepReadonlyObject<T> : T;
|
|
42
42
|
type DeepReadonlyObject<T> = {
|
|
43
43
|
readonly [P in keyof T]: DeepReadonly<T[P]>;
|
|
@@ -59,7 +59,7 @@ export interface HandleWebhookOpts<E> {
|
|
|
59
59
|
/**
|
|
60
60
|
* @tsplus getter dfx/InteractionBuilder webhookHandler
|
|
61
61
|
*/
|
|
62
|
-
export declare const makeHandler: <R, E, TE>(ix: InteractionBuilder<R, E, TE>) => ({ headers, body, success, error, }: HandleWebhookOpts<BadWebhookSignature | WebhookParseError | E
|
|
62
|
+
export declare const makeHandler: <R, E, TE>(ix: InteractionBuilder<R, E, TE>) => ({ headers, body, success, error, }: HandleWebhookOpts<DefinitionNotFound | BadWebhookSignature | WebhookParseError | E>) => Effect.Effect<WebhookConfig, never, void>;
|
|
63
63
|
/**
|
|
64
64
|
* @tsplus getter dfx/InteractionBuilder simpleWebhookHandler
|
|
65
65
|
*/
|
package/RateLimit.d.ts
CHANGED
|
@@ -19,12 +19,12 @@ export interface RateLimitStore {
|
|
|
19
19
|
}
|
|
20
20
|
export declare const RateLimitStore: Tag<RateLimitStore, RateLimitStore>;
|
|
21
21
|
export declare const LiveMemoryRateLimitStore: Layer.Layer<never, never, RateLimitStore>;
|
|
22
|
-
declare const makeLimiter: Effect.Effect<
|
|
22
|
+
declare const makeLimiter: Effect.Effect<Log | RateLimitStore, never, {
|
|
23
23
|
maybeWait: (key: string, window: Duration.Duration, limit: number, multiplier?: number) => Effect.Effect<never, never, void>;
|
|
24
24
|
}>;
|
|
25
25
|
export interface RateLimiter extends Effect.Effect.Success<typeof makeLimiter> {
|
|
26
26
|
}
|
|
27
27
|
export declare const RateLimiter: Tag<RateLimiter, RateLimiter>;
|
|
28
|
-
export declare const LiveRateLimiter: Layer.Layer<
|
|
28
|
+
export declare const LiveRateLimiter: Layer.Layer<Log | RateLimitStore, never, RateLimiter>;
|
|
29
29
|
export {};
|
|
30
30
|
//# sourceMappingURL=RateLimit.d.ts.map
|
package/gateway.d.ts
CHANGED
|
@@ -12,11 +12,12 @@ import * as SendEvent from "dfx/DiscordGateway/Shard/sendEvents";
|
|
|
12
12
|
import * as ShardStore from "dfx/DiscordGateway/ShardStore";
|
|
13
13
|
import * as WS from "dfx/DiscordGateway/WS";
|
|
14
14
|
import type { RateLimiter } from "dfx/RateLimit";
|
|
15
|
+
import type { InteractionsRegistry } from "dfx/gateway";
|
|
15
16
|
export { DiscordGateway, LiveDiscordGateway } from "dfx/DiscordGateway";
|
|
16
17
|
export { InteractionsRegistry, InteractionsRegistryLive, run as runIx, } from "dfx/Interactions/gateway";
|
|
17
18
|
export { CachePrelude, DiscordWS, SendEvent, Shard, ShardStore, WS };
|
|
18
19
|
export declare const MemoryRateLimit: Layer.Layer<Log.Log, never, RateLimiter>;
|
|
19
|
-
export declare const MemoryBot: Layer.Layer<DiscordConfig.DiscordConfig | HttpRequestExecutor | Log.Log, never, RateLimiter | DiscordREST | DiscordGateway>;
|
|
20
|
-
export declare const
|
|
21
|
-
export declare const
|
|
20
|
+
export declare const MemoryBot: Layer.Layer<DiscordConfig.DiscordConfig | HttpRequestExecutor | Log.Log, never, RateLimiter | DiscordREST | InteractionsRegistry | DiscordGateway>;
|
|
21
|
+
export declare const gatewayLayerWithoutHttp: (config: Config.Config.Wrap<DiscordConfig.MakeOpts>) => Layer.Layer<HttpRequestExecutor, ConfigError.ConfigError, RateLimiter | Log.Log | InteractionsRegistry | DiscordREST | DiscordGateway | DiscordConfig.DiscordConfig>;
|
|
22
|
+
export declare const gatewayLayer: (config: Config.Config.Wrap<DiscordConfig.MakeOpts>) => Layer.Layer<never, ConfigError.ConfigError, RateLimiter | Log.Log | InteractionsRegistry | DiscordREST | DiscordGateway | DiscordConfig.DiscordConfig>;
|
|
22
23
|
//# sourceMappingURL=gateway.d.ts.map
|
package/gateway.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["./src/gateway.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAE9D,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,yBAAyB,CAAA;AAE3D,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,KAAK,CAAA;AACtC,OAAO,EAAE,aAAa,EAAmB,GAAG,EAAE,MAAM,KAAK,CAAA;AACzD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,OAAO,KAAK,SAAS,MAAM,8BAA8B,CAAA;AAEzD,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAA;AACjD,OAAO,KAAK,SAAS,MAAM,qCAAqC,CAAA;AAChE,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAA;AAE3D,OAAO,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAGhD,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["./src/gateway.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAE9D,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,yBAAyB,CAAA;AAE3D,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,KAAK,CAAA;AACtC,OAAO,EAAE,aAAa,EAAmB,GAAG,EAAE,MAAM,KAAK,CAAA;AACzD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,OAAO,KAAK,SAAS,MAAM,8BAA8B,CAAA;AAEzD,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAA;AACjD,OAAO,KAAK,SAAS,MAAM,qCAAqC,CAAA;AAChE,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAA;AAE3D,OAAO,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAC3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAGhD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAEvD,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAEvE,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,GAAG,IAAI,KAAK,GACb,MAAM,0BAA0B,CAAA;AAEjC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,CAAA;AAEpE,eAAO,MAAM,eAAe,0CAG3B,CAAA;AAED,eAAO,MAAM,SAAS,oJAWrB,CAAA;AAED,eAAO,MAAM,uBAAuB,WAC1B,aAAa,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,KACjD,WAAW,CACZ,mBAAmB,EACnB,uBAAuB,EACrB,WAAW,GACX,OAAO,GACP,oBAAoB,GACpB,WAAW,GACX,cAAc,GACd,2BAA2B,CAW5B,CAAA;AAEH,eAAO,MAAM,YAAY,WACf,aAAa,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,KACjD,WAAW,CACZ,KAAK,EACL,uBAAuB,EACrB,WAAW,GACX,OAAO,GACP,oBAAoB,GACpB,WAAW,GACX,cAAc,GACd,2BAA2B,CAC8C,CAAA"}
|
package/gateway.js
CHANGED
|
@@ -14,13 +14,13 @@ exports.DiscordWS = void 0;
|
|
|
14
14
|
Object.defineProperty(exports, "InteractionsRegistry", {
|
|
15
15
|
enumerable: true,
|
|
16
16
|
get: function () {
|
|
17
|
-
return
|
|
17
|
+
return _gateway2.InteractionsRegistry;
|
|
18
18
|
}
|
|
19
19
|
});
|
|
20
20
|
Object.defineProperty(exports, "InteractionsRegistryLive", {
|
|
21
21
|
enumerable: true,
|
|
22
22
|
get: function () {
|
|
23
|
-
return
|
|
23
|
+
return _gateway2.InteractionsRegistryLive;
|
|
24
24
|
}
|
|
25
25
|
});
|
|
26
26
|
Object.defineProperty(exports, "LiveDiscordGateway", {
|
|
@@ -29,11 +29,11 @@ Object.defineProperty(exports, "LiveDiscordGateway", {
|
|
|
29
29
|
return _DiscordGateway.LiveDiscordGateway;
|
|
30
30
|
}
|
|
31
31
|
});
|
|
32
|
-
exports.
|
|
32
|
+
exports.gatewayLayerWithoutHttp = exports.gatewayLayer = exports.WS = exports.ShardStore = exports.Shard = exports.SendEvent = exports.MemoryRateLimit = exports.MemoryBot = void 0;
|
|
33
33
|
Object.defineProperty(exports, "runIx", {
|
|
34
34
|
enumerable: true,
|
|
35
35
|
get: function () {
|
|
36
|
-
return
|
|
36
|
+
return _gateway2.run;
|
|
37
37
|
}
|
|
38
38
|
});
|
|
39
39
|
var _client = /*#__PURE__*/require("@effect-http/client");
|
|
@@ -55,19 +55,20 @@ exports.ShardStore = ShardStore;
|
|
|
55
55
|
var WS = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/DiscordGateway/WS"));
|
|
56
56
|
exports.WS = WS;
|
|
57
57
|
var _RateLimit = /*#__PURE__*/require("dfx/RateLimit");
|
|
58
|
-
var _gateway = /*#__PURE__*/require("dfx/
|
|
58
|
+
var _gateway = /*#__PURE__*/require("dfx/gateway");
|
|
59
|
+
var _gateway2 = /*#__PURE__*/require("dfx/Interactions/gateway");
|
|
59
60
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
60
61
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
61
62
|
const MemoryRateLimit = /*#__PURE__*/Layer.provide(_RateLimit.LiveMemoryRateLimitStore, _RateLimit.LiveRateLimiter);
|
|
62
63
|
exports.MemoryRateLimit = MemoryRateLimit;
|
|
63
|
-
const MemoryBot = /*#__PURE__*/Layer.provide( /*#__PURE__*/Layer.mergeAll(ShardStore.LiveMemoryShardStore, _RateLimit.LiveMemoryRateLimitStore, DiscordWS.LiveJsonDiscordWSCodec), /*#__PURE__*/Layer.
|
|
64
|
+
const MemoryBot = /*#__PURE__*/Layer.provide( /*#__PURE__*/Layer.mergeAll(ShardStore.LiveMemoryShardStore, _RateLimit.LiveMemoryRateLimitStore, DiscordWS.LiveJsonDiscordWSCodec), /*#__PURE__*/Layer.mergeAll( /*#__PURE__*/Layer.provideMerge(_dfx.LiveDiscordREST, _DiscordGateway.LiveDiscordGateway), MemoryRateLimit, _gateway.InteractionsRegistryLive));
|
|
64
65
|
exports.MemoryBot = MemoryBot;
|
|
65
|
-
const
|
|
66
|
+
const gatewayLayerWithoutHttp = config => Layer.unwrapEffect(Effect.config(Config.unwrap(config)).pipe(Effect.map(_dfx.DiscordConfig.make), Effect.map(config => {
|
|
66
67
|
const LiveLog = config.debug ? _dfx.Log.LiveLogDebug : _dfx.Log.LiveLog;
|
|
67
68
|
const LiveConfig = Layer.succeed(_dfx.DiscordConfig.DiscordConfig, config);
|
|
68
69
|
return Layer.provideMerge(Layer.merge(LiveLog, LiveConfig), MemoryBot);
|
|
69
70
|
})));
|
|
70
|
-
exports.
|
|
71
|
-
const
|
|
72
|
-
exports.
|
|
71
|
+
exports.gatewayLayerWithoutHttp = gatewayLayerWithoutHttp;
|
|
72
|
+
const gatewayLayer = config => Layer.provide(_client.LiveFetchRequestExecutor, gatewayLayerWithoutHttp(config));
|
|
73
|
+
exports.gatewayLayer = gatewayLayer;
|
|
73
74
|
//# sourceMappingURL=gateway.js.map
|
package/gateway.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.js","names":["_client","require","Config","_interopRequireWildcard","Effect","Layer","_dfx","CachePrelude","exports","_DiscordGateway","DiscordWS","Shard","SendEvent","ShardStore","WS","_RateLimit","_gateway","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","MemoryRateLimit","provide","LiveMemoryRateLimitStore","LiveRateLimiter","MemoryBot","mergeAll","LiveMemoryShardStore","LiveJsonDiscordWSCodec","
|
|
1
|
+
{"version":3,"file":"gateway.js","names":["_client","require","Config","_interopRequireWildcard","Effect","Layer","_dfx","CachePrelude","exports","_DiscordGateway","DiscordWS","Shard","SendEvent","ShardStore","WS","_RateLimit","_gateway","_gateway2","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","MemoryRateLimit","provide","LiveMemoryRateLimitStore","LiveRateLimiter","MemoryBot","mergeAll","LiveMemoryShardStore","LiveJsonDiscordWSCodec","provideMerge","LiveDiscordREST","LiveDiscordGateway","InteractionsRegistryLive","gatewayLayerWithoutHttp","config","unwrapEffect","unwrap","pipe","map","DiscordConfig","make","LiveLog","debug","Log","LiveLogDebug","LiveConfig","succeed","merge","gatewayLayer","LiveFetchRequestExecutor"],"sources":["./src/gateway.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/index.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as Http from "@effect-http/client";
|
|
1
2
|
import * as Cache from "dfx/Cache";
|
|
2
3
|
import * as DiscordConfig from "dfx/DiscordConfig";
|
|
3
4
|
import * as Flags from "dfx/Helpers/flags";
|
|
@@ -11,5 +12,5 @@ import * as Log from "dfx/Log";
|
|
|
11
12
|
import * as Discord from "dfx/types";
|
|
12
13
|
export { DiscordREST, LiveDiscordREST } from "dfx/DiscordREST";
|
|
13
14
|
export { BucketDetails, LiveMemoryRateLimitStore, LiveRateLimiter, RateLimitStore, RateLimiter, } from "dfx/RateLimit";
|
|
14
|
-
export { Cache, Discord, DiscordConfig, Flags, Intents, Ix, IxHelpers, Log, Members, Perms, UI, };
|
|
15
|
+
export { Cache, Discord, DiscordConfig, Flags, Http, Intents, Ix, IxHelpers, Log, Members, Perms, UI, };
|
|
15
16
|
//# sourceMappingURL=index.d.ts.map
|
package/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["./src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,WAAW,CAAA;AAClC,OAAO,KAAK,aAAa,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAA;AAC1C,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAA;AACrD,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,yBAAyB,CAAA;AAChD,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,KAAK,GAAG,MAAM,SAAS,CAAA;AAC9B,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AAEpC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["./src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,qBAAqB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,WAAW,CAAA;AAClC,OAAO,KAAK,aAAa,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAA;AAC1C,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAA;AACrD,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,yBAAyB,CAAA;AAChD,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,KAAK,GAAG,MAAM,SAAS,CAAA;AAC9B,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AAEpC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAE9D,OAAO,EACL,aAAa,EACb,wBAAwB,EACxB,eAAe,EACf,cAAc,EACd,WAAW,GACZ,MAAM,eAAe,CAAA;AAEtB,OAAO,EACL,KAAK,EACL,OAAO,EACP,aAAa,EACb,KAAK,EACL,IAAI,EACJ,OAAO,EACP,EAAE,EACF,SAAS,EACT,GAAG,EACH,OAAO,EACP,KAAK,EACL,EAAE,GACH,CAAA"}
|
package/index.js
CHANGED
|
@@ -10,7 +10,7 @@ Object.defineProperty(exports, "DiscordREST", {
|
|
|
10
10
|
return _DiscordREST.DiscordREST;
|
|
11
11
|
}
|
|
12
12
|
});
|
|
13
|
-
exports.IxHelpers = exports.Ix = exports.Intents = exports.Flags = void 0;
|
|
13
|
+
exports.IxHelpers = exports.Ix = exports.Intents = exports.Http = exports.Flags = void 0;
|
|
14
14
|
Object.defineProperty(exports, "LiveDiscordREST", {
|
|
15
15
|
enumerable: true,
|
|
16
16
|
get: function () {
|
|
@@ -43,6 +43,8 @@ Object.defineProperty(exports, "RateLimiter", {
|
|
|
43
43
|
}
|
|
44
44
|
});
|
|
45
45
|
exports.UI = void 0;
|
|
46
|
+
var Http = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect-http/client"));
|
|
47
|
+
exports.Http = Http;
|
|
46
48
|
var Cache = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/Cache"));
|
|
47
49
|
exports.Cache = Cache;
|
|
48
50
|
var DiscordConfig = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/DiscordConfig"));
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["
|
|
1
|
+
{"version":3,"file":"index.js","names":["Http","_interopRequireWildcard","require","exports","Cache","DiscordConfig","Flags","Intents","IxHelpers","Members","Perms","UI","Ix","Log","Discord","_DiscordREST","_RateLimit","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set"],"sources":["./src/index.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,IAAA,gBAAAC,uBAAA,eAAAC,OAAA;AAA2CC,OAAA,CAAAH,IAAA,GAAAA,IAAA;AAC3C,IAAAI,KAAA,gBAAAH,uBAAA,eAAAC,OAAA;AAAkCC,OAAA,CAAAC,KAAA,GAAAA,KAAA;AAClC,IAAAC,aAAA,gBAAAJ,uBAAA,eAAAC,OAAA;AAAkDC,OAAA,CAAAE,aAAA,GAAAA,aAAA;AAClD,IAAAC,KAAA,gBAAAL,uBAAA,eAAAC,OAAA;AAA0CC,OAAA,CAAAG,KAAA,GAAAA,KAAA;AAC1C,IAAAC,OAAA,gBAAAN,uBAAA,eAAAC,OAAA;AAA8CC,OAAA,CAAAI,OAAA,GAAAA,OAAA;AAC9C,IAAAC,SAAA,gBAAAP,uBAAA,eAAAC,OAAA;AAAqDC,OAAA,CAAAK,SAAA,GAAAA,SAAA;AACrD,IAAAC,OAAA,gBAAAR,uBAAA,eAAAC,OAAA;AAA8CC,OAAA,CAAAM,OAAA,GAAAA,OAAA;AAC9C,IAAAC,KAAA,gBAAAT,uBAAA,eAAAC,OAAA;AAAgDC,OAAA,CAAAO,KAAA,GAAAA,KAAA;AAChD,IAAAC,EAAA,gBAAAV,uBAAA,eAAAC,OAAA;AAAoCC,OAAA,CAAAQ,EAAA,GAAAA,EAAA;AACpC,IAAAC,EAAA,gBAAAX,uBAAA,eAAAC,OAAA;AAA4CC,OAAA,CAAAS,EAAA,GAAAA,EAAA;AAC5C,IAAAC,GAAA,gBAAAZ,uBAAA,eAAAC,OAAA;AAA8BC,OAAA,CAAAU,GAAA,GAAAA,GAAA;AAC9B,IAAAC,OAAA,gBAAAb,uBAAA,eAAAC,OAAA;AAAoCC,OAAA,CAAAW,OAAA,GAAAA,OAAA;AAEpC,IAAAC,YAAA,gBAAAb,OAAA;AAEA,IAAAc,UAAA,gBAAAd,OAAA;AAMsB,SAAAe,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAjB,wBAAAqB,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA"}
|
|
@@ -59,14 +59,10 @@ export const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
59
59
|
intents: gateway.intents,
|
|
60
60
|
presence: gateway.presence
|
|
61
61
|
}, latestReady, latestSequence);
|
|
62
|
-
const onPayload = p =>
|
|
63
|
-
discard: true
|
|
64
|
-
}), () => {
|
|
62
|
+
const onPayload = p => updateLatestReady(p).pipe(Effect.zipRight(updateLatestSequence(p)), Effect.zipRight(maybeUpdateUrl(p)), Effect.tap(() => {
|
|
65
63
|
switch (p.op) {
|
|
66
64
|
case 10 /* Discord.GatewayOpcode.HELLO */:
|
|
67
|
-
return Effect.
|
|
68
|
-
discard: true
|
|
69
|
-
});
|
|
65
|
+
return Effect.tap(identify, prioritySend).pipe(Effect.zipRight(setPhase(1 /* Phase.Handshake */)), Effect.zipRight(Queue.offer(hellos, p)));
|
|
70
66
|
case 11 /* Discord.GatewayOpcode.HEARTBEAT_ACK */:
|
|
71
67
|
return Queue.offer(acks, p);
|
|
72
68
|
case 9 /* Discord.GatewayOpcode.INVALID_SESSION */:
|
|
@@ -78,7 +74,7 @@ export const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
78
74
|
return Hub.publish(hub, p);
|
|
79
75
|
}
|
|
80
76
|
return Effect.unit;
|
|
81
|
-
});
|
|
77
|
+
}));
|
|
82
78
|
const drainSendQueue = Queue.take(sendQueue).pipe(Effect.tap(send), Effect.forever);
|
|
83
79
|
const run = Effect.all([socket.take.pipe(Effect.flatMap(onPayload), Effect.forever), heartbeats, drainSendQueue, socket.run], {
|
|
84
80
|
discard: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Shard.mjs","names":["DiscordConfig","LiveRateLimiter","RateLimiter","DiscordWS","LiveDiscordWS","Heartbeats","Identify","InvalidSession","Utils","Reconnect","Log","Effect","Layer","Tag","Option","Hub","Queue","Ref","Duration","Chunk","ConfigSecret","make","gen","_","gateway","token","limiter","dws","log","connect","shard","hub","sendQueue","outboundQueue","unbounded","pendingQueue","phase","setPhase","p","zipLeft","set","debug","outbound","take","maybeWait","minutes","send","flatMap","get","offer","heartbeatSend","succeed","prioritySend","resume","pipe","zipRight","takeAll","tap","offerAll","asUnit","onConnecting","msgs","filter","msg","op","socket","latestReady","updateLatestReady","latest","some","t","map","d","latestSequence","updateLatestSequence","fromNullable","s","maybeUpdateUrl","match","onNone","unit","onSome","resume_gateway_url","setUrl","hellos","acks","heartbeats","identify","identifyOrResume","value","intents","presence","onPayload","
|
|
1
|
+
{"version":3,"file":"Shard.mjs","names":["DiscordConfig","LiveRateLimiter","RateLimiter","DiscordWS","LiveDiscordWS","Heartbeats","Identify","InvalidSession","Utils","Reconnect","Log","Effect","Layer","Tag","Option","Hub","Queue","Ref","Duration","Chunk","ConfigSecret","make","gen","_","gateway","token","limiter","dws","log","connect","shard","hub","sendQueue","outboundQueue","unbounded","pendingQueue","phase","setPhase","p","zipLeft","set","debug","outbound","take","maybeWait","minutes","send","flatMap","get","offer","heartbeatSend","succeed","prioritySend","resume","pipe","zipRight","takeAll","tap","offerAll","asUnit","onConnecting","msgs","filter","msg","op","socket","latestReady","updateLatestReady","latest","some","t","map","d","latestSequence","updateLatestSequence","fromNullable","s","maybeUpdateUrl","match","onNone","unit","onSome","resume_gateway_url","setUrl","hellos","acks","heartbeats","identify","identifyOrResume","value","intents","presence","onPayload","fromPayload","publish","drainSendQueue","forever","run","all","discard","concurrency","id","Shard","LiveShard","provide","merge","effect"],"sources":["../../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/mjs/DiscordREST.mjs
CHANGED
|
@@ -39,10 +39,7 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
39
39
|
// Invalid route handling (40x)
|
|
40
40
|
const badRoutesRef = yield* _(Ref.make(HashSet.empty()));
|
|
41
41
|
const tenMinutes = Duration.toMillis(Duration.minutes(10));
|
|
42
|
-
const addBadRoute = route =>
|
|
43
|
-
discard: true,
|
|
44
|
-
concurrency: "unbounded"
|
|
45
|
-
});
|
|
42
|
+
const addBadRoute = route => log.info("DiscordREST", "addBadRoute", route).pipe(Effect.zipRight(Ref.update(badRoutesRef, HashSet.add(route))), Effect.zipRight(store.incrementCounter("dfx.rest.invalid", tenMinutes, 10000)));
|
|
46
43
|
const isBadRoute = route => Effect.map(Ref.get(badRoutesRef), HashSet.has(route));
|
|
47
44
|
const removeBadRoute = route => Ref.update(badRoutesRef, HashSet.remove(route));
|
|
48
45
|
const invalidRateLimit = route => isBadRoute(route).pipe(Effect.tap(invalid => invalid ? maybeWait("dfx.rest.invalid", Duration.minutes(10), 10000) : Effect.unit), Effect.asUnit);
|
|
@@ -93,10 +90,7 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
93
90
|
discard: true
|
|
94
91
|
}), Effect.fail(e));
|
|
95
92
|
case 429:
|
|
96
|
-
return
|
|
97
|
-
concurrency: "unbounded",
|
|
98
|
-
discard: true
|
|
99
|
-
}), executor(request));
|
|
93
|
+
return log.info("DiscordREST", "429", request.url).pipe(Effect.zipRight(addBadRoute(routeFromConfig(request.url, request.method))), Effect.zipRight(updateBuckets(request, response)), Effect.zipRight(Effect.sleep(Option.getOrElse(retryAfter(response.headers), () => Duration.seconds(5)))), Effect.zipRight(executor(request)));
|
|
100
94
|
}
|
|
101
95
|
return Effect.fail(e);
|
|
102
96
|
}));
|
package/mjs/DiscordREST.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordREST.mjs","names":["Http","Tag","Duration","millis","HashSet","Option","ConfigSecret","Effect","Layer","Ref","DiscordConfig","rateLimitFromHeaders","retryAfter","routeFromConfig","Log","LiveRateLimiter","RateLimitStore","RateLimiter","Discord","LIB_VERSION","DiscordRESTError","error","body","_tag","constructor","ResponseDecodeError","make","gen","_","rest","token","http","HttpRequestExecutor","log","store","maybeWait","globalRateLimit","decode","window","limit","badRoutesRef","empty","tenMinutes","toMillis","minutes","addBadRoute","route","
|
|
1
|
+
{"version":3,"file":"DiscordREST.mjs","names":["Http","Tag","Duration","millis","HashSet","Option","ConfigSecret","Effect","Layer","Ref","DiscordConfig","rateLimitFromHeaders","retryAfter","routeFromConfig","Log","LiveRateLimiter","RateLimitStore","RateLimiter","Discord","LIB_VERSION","DiscordRESTError","error","body","_tag","constructor","ResponseDecodeError","make","gen","_","rest","token","http","HttpRequestExecutor","log","store","maybeWait","globalRateLimit","decode","window","limit","badRoutesRef","empty","tenMinutes","toMillis","minutes","addBadRoute","route","info","pipe","zipRight","update","add","incrementCounter","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","executor","catchAll","json","mapError","fail","contramap","req","setHeaders","Authorization","value","updateUrl","baseUrl","filterStatusOk","execute","zipLeft","catchTag","e","status","sleep","getOrElse","seconds","routes","createRoutes","options","params","hasBody","appendParams","append","JSON","stringify","jsonBody","DiscordREST","LiveDiscordREST","provide","effect"],"sources":["../src/DiscordREST.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,IAAI,MAAM,qBAAqB;AAC3C,SAASC,GAAG,QAAQ,sBAAsB;AAC1C,OAAO,KAAKC,QAAQ,MAAM,uBAAuB;AACjD,SAASC,MAAM,QAAQ,uBAAuB;AAE9C,OAAO,KAAKC,OAAO,MAAM,sBAAsB;AAC/C,OAAO,KAAKC,MAAM,MAAM,qBAAqB;AAC7C,OAAO,KAAKC,YAAY,MAAM,0BAA0B;AACxD,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,KAAK,MAAM,kBAAkB;AACzC,OAAO,KAAKC,GAAG,MAAM,gBAAgB;AACrC,SAASC,aAAa,QAAQ,mBAAmB;AAEjD,SACEC,oBAAoB,EACpBC,UAAU,EACVC,eAAe,QACV,uBAAuB;AAC9B,SAASC,GAAG,QAAQ,SAAS;AAC7B,SAASC,eAAe,EAAEC,cAAc,EAAEC,WAAW,QAAQ,eAAe;AAC5E,OAAO,KAAKC,OAAO,MAAM,WAAW;AACpC,SAASC,WAAW,QAAQ,aAAa;AAEzC,OAAM,MAAOC,gBAAgB;EAENC,KAAA;EAAsCC,IAAA;EADlDC,IAAI,GAAG,kBAAkB;EAClCC,YAAqBH,KAA2B,EAAWC,IAAc;IAApD,KAAAD,KAAK,GAALA,KAAK;IAAiC,KAAAC,IAAI,GAAJA,IAAI;EAAa;;AAG9E,SAASG,mBAAmB,QAAQ,qBAAqB;AAEzD,MAAMC,IAAI,gBAAGnB,MAAM,CAACoB,GAAG,CAAC,WAAWC,CAAC;EAClC,MAAM;IAAEC,IAAI;IAAEC;EAAK,CAAE,GAAG,OAAOF,CAAC,CAAClB,aAAa,CAAC;EAE/C,MAAMqB,IAAI,GAAG,OAAOH,CAAC,CAAC5B,IAAI,CAACgC,mBAAmB,CAAC;EAC/C,MAAMC,GAAG,GAAG,OAAOL,CAAC,CAACd,GAAG,CAAC;EACzB,MAAMoB,KAAK,GAAG,OAAON,CAAC,CAACZ,cAAc,CAAC;EACtC,MAAM;IAAEmB;EAAS,CAAE,GAAG,OAAOP,CAAC,CAACX,WAAW,CAAC;EAE3C,MAAMmB,eAAe,GAAGD,SAAS,CAC/B,iBAAiB,EACjBjC,QAAQ,CAACmC,MAAM,CAACR,IAAI,CAACO,eAAe,CAACE,MAAM,CAAC,EAC5CT,IAAI,CAACO,eAAe,CAACG,KAAK,CAC3B;EAED;EACA,MAAMC,YAAY,GAAG,OAAOZ,CAAC,CAACnB,GAAG,CAACiB,IAAI,CAACtB,OAAO,CAACqC,KAAK,EAAU,CAAC,CAAC;EAChE,MAAMC,UAAU,GAAGxC,QAAQ,CAACyC,QAAQ,CAACzC,QAAQ,CAAC0C,OAAO,CAAC,EAAE,CAAC,CAAC;EAC1D,MAAMC,WAAW,GAAIC,KAAa,IAChCb,GAAG,CACAc,IAAI,CAAC,aAAa,EAAE,aAAa,EAAED,KAAK,CAAC,CACzCE,IAAI,CACHzC,MAAM,CAAC0C,QAAQ,CAACxC,GAAG,CAACyC,MAAM,CAACV,YAAY,EAAEpC,OAAO,CAAC+C,GAAG,CAACL,KAAK,CAAC,CAAC,CAAC,EAC7DvC,MAAM,CAAC0C,QAAQ,CACbf,KAAK,CAACkB,gBAAgB,CAAC,kBAAkB,EAAEV,UAAU,EAAE,KAAK,CAAC,CAC9D,CACF;EACL,MAAMW,UAAU,GAAIP,KAAa,IAC/BvC,MAAM,CAAC+C,GAAG,CAAC7C,GAAG,CAAC8C,GAAG,CAACf,YAAY,CAAC,EAAEpC,OAAO,CAACoD,GAAG,CAACV,KAAK,CAAC,CAAC;EACvD,MAAMW,cAAc,GAAIX,KAAa,IACnCrC,GAAG,CAACyC,MAAM,CAACV,YAAY,EAAEpC,OAAO,CAACsD,MAAM,CAACZ,KAAK,CAAC,CAAC;EAEjD,MAAMa,gBAAgB,GAAIb,KAAa,IACrCO,UAAU,CAACP,KAAK,CAAC,CAACE,IAAI,CACpBzC,MAAM,CAACqD,GAAG,CAACC,OAAO,IAChBA,OAAO,GACH1B,SAAS,CAAC,kBAAkB,EAAEjC,QAAQ,CAAC0C,OAAO,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,GAC1DrC,MAAM,CAACuD,IAAI,CAChB,EACDvD,MAAM,CAACwD,MAAM,CACd;EAEH;EACA,MAAMC,gBAAgB,GAAGA,CAACC,IAAY,EAAEC,OAAqB,KAC3D3D,MAAM,CAAC4D,EAAE,CAACnB,IAAI,CACZzC,MAAM,CAAC6D,GAAG,CAAC,OAAO,EAAE,MAAMvD,eAAe,CAACoD,IAAI,EAAEC,OAAO,CAACG,MAAM,CAAC,CAAC,EAChE9D,MAAM,CAAC+D,IAAI,CAAC,aAAa,EAAE,CAAC;IAAExB;EAAK,CAAE,KAAKZ,KAAK,CAACqC,iBAAiB,CAACzB,KAAK,CAAC,CAAC,EACzEvC,MAAM,CAACiE,OAAO,CAAC,CAAC;IAAEC,WAAW;IAAE3B;EAAK,CAAE,KACpCzC,MAAM,CAACqE,KAAK,CAACD,WAAW,EAAE;IACxBE,MAAM,EAAEA,CAAA,KAAMhB,gBAAgB,CAACb,KAAK,CAAC;IACrC8B,MAAM,EAAEC,MAAM,IACZtE,MAAM,CAAC0C,QAAQ,CACbU,gBAAgB,CAACb,KAAK,CAAC,EACvBX,SAAS,CACP,YAAY0C,MAAM,CAACC,GAAG,EAAE,EACxB3E,MAAM,CAAC0E,MAAM,CAACE,UAAU,CAAC,EACzBF,MAAM,CAACtC,KAAK,CACb;GAEN,CAAC,CACH,CACF;EAEH;EACA,MAAMyC,aAAa,GAAGA,CAACd,OAAqB,EAAEe,QAAuB,KACnE1E,MAAM,CAAC4D,EAAE,CAACnB,IAAI,CACZzC,MAAM,CAAC6D,GAAG,CAAC,OAAO,EAAE,MAAMvD,eAAe,CAACqD,OAAO,CAACgB,GAAG,EAAEhB,OAAO,CAACG,MAAM,CAAC,CAAC,EACvE9D,MAAM,CAAC+D,IAAI,CAAC,WAAW,EAAE,MAAM3D,oBAAoB,CAACsE,QAAQ,CAACE,OAAO,CAAC,CAAC,EACtE5E,MAAM,CAAC+D,IAAI,CAAC,WAAW,EAAE,CAAC;IAAEc;EAAS,CAAE,KACrClD,KAAK,CAACmD,SAAS,CAACD,SAAS,CAACP,MAAM,CAAC,CAClC,EACDtE,MAAM,CAACiE,OAAO,CAAC,CAAC;IAAEa,SAAS;IAAED,SAAS;IAAEtC;EAAK,CAAE,KAAI;IACjD,MAAMwC,YAAY,GAAG,CACnB7B,cAAc,CAACX,KAAK,CAAC,EACrBZ,KAAK,CAACqD,cAAc,CAACzC,KAAK,EAAEsC,SAAS,CAACP,MAAM,CAAC,CAC9C;IAED,IAAI,CAACQ,SAAS,IAAID,SAAS,CAAC7C,KAAK,GAAG,CAAC,KAAK6C,SAAS,CAACI,SAAS,EAAE;MAC7DF,YAAY,CAACG,IAAI,CACfvD,KAAK,CAACwD,aAAa,CAAC,cAAc5C,KAAK,EAAE,CAAC,EAC1CZ,KAAK,CAACyD,SAAS,CAAC;QACdb,GAAG,EAAEM,SAAS,CAACP,MAAM;QACrBE,UAAU,EAAE7E,QAAQ,CAACyC,QAAQ,CAACyC,SAAS,CAACxE,UAAU,CAAC;QACnD2B,KAAK,EACH,CAAC8C,SAAS,IAAID,SAAS,CAACI,SAAS,GAAG,CAAC,GACjCJ,SAAS,CAACI,SAAS,GACnBJ,SAAS,CAAC7C;OACjB,CAAC,CACH;;IAGH,OAAOhC,MAAM,CAACqF,GAAG,CAACN,YAAY,EAAE;MAC9BO,WAAW,EAAE,WAAW;MACxBC,OAAO,EAAE;KACV,CAAC;EACJ,CAAC,CAAC,EACFvF,MAAM,CAACwF,MAAM,CACd;EAEH,MAAMC,YAAY,GAYhBhG,IAAI,CAACiG,QAAQ,CAACC,QAAQ,CAAC7E,KAAK,IAC1BA,KAAK,CAACE,IAAI,KAAK,iBAAiB,GAC5BF,KAAK,CAAC4D,QAAQ,CAACkB,IAAI,CAACnD,IAAI,CACtBzC,MAAM,CAAC6F,QAAQ,CAACxE,CAAC,IAAI,IAAIR,gBAAgB,CAACQ,CAAC,CAAC,CAAC,EAC7CrB,MAAM,CAACiE,OAAO,CAAClD,IAAI,IACjBf,MAAM,CAAC8F,IAAI,CAAC,IAAIjF,gBAAgB,CAACC,KAAK,EAAEC,IAAI,CAAC,CAAC,CAC/C,CACF,GACDf,MAAM,CAAC8F,IAAI,CAAC,IAAIjF,gBAAgB,CAACC,KAAK,CAAC,CAAC,CAC7C,CAlBDrB,IAAI,CAACiG,QAAQ,CAACK,SAAS,CAACC,GAAG,IAGvBvG,IAAI,CAACwG,UAAU,CAAC;IACdC,aAAa,EAAE,OAAOnG,YAAY,CAACoG,KAAK,CAAC5E,KAAK,CAAC,EAAE;IACjD,YAAY,EAAE,iDAAiDX,WAAW;GAC3E,CAAC,CAJFnB,IAAI,CAAC2G,SAAS,CAACJ,GAAG,EAAE3E,CAAC,IAAI,GAAGC,IAAI,CAAC+E,OAAO,GAAGhF,CAAC,EAAE,CAAC,CAKhD,CACF,CATD5B,IAAI,CAACiG,QAAQ,CAACY,cAAc,CAD5B9E,IAAI,CAAC+E,OAAO,GAqBb;EAED,MAAMb,QAAQ,GACZ/B,OAAqB,IAErBF,gBAAgB,CAACE,OAAO,CAACgB,GAAG,EAAEhB,OAAO,CAAC,CAAClB,IAAI,CACzCzC,MAAM,CAACwG,OAAO,CAAC3E,eAAe,CAAC,EAC/B7B,MAAM,CAAC0C,QAAQ,CACb+C,YAAY,CAAC9B,OAAO,CAInB,CACF,EACD3D,MAAM,CAACqD,GAAG,CAACqB,QAAQ,IAAID,aAAa,CAACd,OAAO,EAAEe,QAAQ,CAAC,CAAC,EACxD1E,MAAM,CAACyG,QAAQ,CAAC,kBAAkB,EAAEC,CAAC,IAAG;IACtC,IAAIA,CAAC,CAAC5F,KAAK,CAACE,IAAI,KAAK,iBAAiB,EAAE;MACtC,OAAOhB,MAAM,CAAC8F,IAAI,CAACY,CAAC,CAAC;;IAGvB,MAAMhC,QAAQ,GAAGgC,CAAC,CAAC5F,KAAK,CAAC4D,QAAQ;IAEjC,QAAQgC,CAAC,CAAC5F,KAAK,CAAC6F,MAAM;MACpB,KAAK,GAAG;QACN,OAAO3G,MAAM,CAAC0C,QAAQ,CACpB1C,MAAM,CAACqF,GAAG,CACR,CACE3D,GAAG,CAACc,IAAI,CAAC,aAAa,EAAE,KAAK,EAAEmB,OAAO,CAACgB,GAAG,CAAC,EAC3CrC,WAAW,CAAChC,eAAe,CAACqD,OAAO,CAACgB,GAAG,EAAEhB,OAAO,CAACG,MAAM,CAAC,CAAC,EACzDW,aAAa,CAACd,OAAO,EAAEe,QAAQ,CAAC,CACjC,EACD;UAAEY,WAAW,EAAE,WAAW;UAAEC,OAAO,EAAE;QAAI,CAAE,CAC5C,EACDvF,MAAM,CAAC8F,IAAI,CAACY,CAAC,CAAC,CACf;MAEH,KAAK,GAAG;QACN,OAAOhF,GAAG,CACPc,IAAI,CAAC,aAAa,EAAE,KAAK,EAAEmB,OAAO,CAACgB,GAAG,CAAC,CACvClC,IAAI,CACHzC,MAAM,CAAC0C,QAAQ,CACbJ,WAAW,CAAChC,eAAe,CAACqD,OAAO,CAACgB,GAAG,EAAEhB,OAAO,CAACG,MAAM,CAAC,CAAC,CAC1D,EACD9D,MAAM,CAAC0C,QAAQ,CAAC+B,aAAa,CAACd,OAAO,EAAEe,QAAQ,CAAC,CAAC,EACjD1E,MAAM,CAAC0C,QAAQ,CACb1C,MAAM,CAAC4G,KAAK,CACV9G,MAAM,CAAC+G,SAAS,CAACxG,UAAU,CAACqE,QAAQ,CAACE,OAAO,CAAC,EAAE,MAC7CjF,QAAQ,CAACmH,OAAO,CAAC,CAAC,CAAC,CACpB,CACF,CACF,EACD9G,MAAM,CAAC0C,QAAQ,CAACgD,QAAQ,CAAI/B,OAAO,CAAC,CAAC,CACtC;;IAGP,OAAO3D,MAAM,CAAC8F,IAAI,CAACY,CAAC,CAAC;EACvB,CAAC,CAAC,CACH;EAEH,MAAMK,MAAM,GAAGpG,OAAO,CAACqG,YAAY,CACjC,CAAO;IACLlD,MAAM;IACNmD,OAAO,GAAG,EAAE;IACZC,MAAM;IACNvC;EAAG,CACyC,KAAqB;IACjE,MAAMwC,OAAO,GAAGrD,MAAM,KAAK,KAAK,IAAIA,MAAM,KAAK,QAAQ;IACvD,IAAIH,OAAO,GAAGlE,IAAI,CAAC0B,IAAI,CAAC2C,MAAa,CAAC,CAACa,GAAG,EAAEsC,OAAO,CAAC;IAEpD,IAAI,CAACE,OAAO,EAAE;MACZ,IAAID,MAAM,EAAE;QACVvD,OAAO,GAAGlE,IAAI,CAAC2H,YAAY,CAACzD,OAAO,EAAEuD,MAAa,CAAC;;KAEtD,MAAM,IACLA,MAAM,IACNvD,OAAO,CAAC5C,IAAI,CAACC,IAAI,KAAK,MAAM,IAC5B2C,OAAO,CAAC5C,IAAI,CAACoF,KAAK,CAACnF,IAAI,KAAK,cAAc,EAC1C;MACA2C,OAAO,CAAC5C,IAAI,CAACoF,KAAK,CAACA,KAAK,CAACkB,MAAM,CAAC,cAAc,EAAEC,IAAI,CAACC,SAAS,CAACL,MAAM,CAAC,CAAC;KACxE,MAAM,IAAIA,MAAM,EAAE;MACjBvD,OAAO,GAAGlE,IAAI,CAAC+H,QAAQ,CAAC7D,OAAO,EAAEuD,MAAM,CAAC;;IAG1C,OAAOxB,QAAQ,CAAC/B,OAAO,CAAC;EAC1B,CAAC,CACF;EAED,OAAO;IACL,GAAGoD,MAAM;IACTrB;GACD;AACH,CAAC,CAAC;AASF,OAAO,MAAM+B,WAAW,gBAAG/H,GAAG,EAAe;AAC7C,OAAO,MAAMgI,eAAe,gBAAGzH,KAAK,CAAC0H,OAAO,CAC1CnH,eAAe,eACfP,KAAK,CAAC2H,MAAM,CAACH,WAAW,EAAEtG,IAAI,CAAC,CAChC"}
|
package/mjs/gateway.mjs
CHANGED
|
@@ -13,15 +13,16 @@ import * as ShardStore from "dfx/DiscordGateway/ShardStore";
|
|
|
13
13
|
import { LiveMemoryShardStore } from "dfx/DiscordGateway/ShardStore";
|
|
14
14
|
import * as WS from "dfx/DiscordGateway/WS";
|
|
15
15
|
import { LiveMemoryRateLimitStore, LiveRateLimiter } from "dfx/RateLimit";
|
|
16
|
+
import { InteractionsRegistryLive } from "dfx/gateway";
|
|
16
17
|
export { DiscordGateway, LiveDiscordGateway } from "dfx/DiscordGateway";
|
|
17
18
|
export { InteractionsRegistry, InteractionsRegistryLive, run as runIx } from "dfx/Interactions/gateway";
|
|
18
19
|
export { CachePrelude, DiscordWS, SendEvent, Shard, ShardStore, WS };
|
|
19
20
|
export const MemoryRateLimit = /*#__PURE__*/Layer.provide(LiveMemoryRateLimitStore, LiveRateLimiter);
|
|
20
|
-
export const MemoryBot = /*#__PURE__*/Layer.provide( /*#__PURE__*/Layer.mergeAll(LiveMemoryShardStore, LiveMemoryRateLimitStore, LiveJsonDiscordWSCodec), /*#__PURE__*/Layer.
|
|
21
|
-
export const
|
|
21
|
+
export const MemoryBot = /*#__PURE__*/Layer.provide( /*#__PURE__*/Layer.mergeAll(LiveMemoryShardStore, LiveMemoryRateLimitStore, LiveJsonDiscordWSCodec), /*#__PURE__*/Layer.mergeAll( /*#__PURE__*/Layer.provideMerge(LiveDiscordREST, LiveDiscordGateway), MemoryRateLimit, InteractionsRegistryLive));
|
|
22
|
+
export const gatewayLayerWithoutHttp = config => Layer.unwrapEffect(Effect.config(Config.unwrap(config)).pipe(Effect.map(DiscordConfig.make), Effect.map(config => {
|
|
22
23
|
const LiveLog = config.debug ? Log.LiveLogDebug : Log.LiveLog;
|
|
23
24
|
const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config);
|
|
24
25
|
return Layer.provideMerge(Layer.merge(LiveLog, LiveConfig), MemoryBot);
|
|
25
26
|
})));
|
|
26
|
-
export const
|
|
27
|
+
export const gatewayLayer = config => Layer.provide(LiveFetchRequestExecutor, gatewayLayerWithoutHttp(config));
|
|
27
28
|
//# sourceMappingURL=gateway.mjs.map
|
package/mjs/gateway.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.mjs","names":["LiveFetchRequestExecutor","Config","Effect","Layer","DiscordConfig","LiveDiscordREST","Log","CachePrelude","LiveDiscordGateway","DiscordWS","LiveJsonDiscordWSCodec","Shard","SendEvent","ShardStore","LiveMemoryShardStore","WS","LiveMemoryRateLimitStore","LiveRateLimiter","
|
|
1
|
+
{"version":3,"file":"gateway.mjs","names":["LiveFetchRequestExecutor","Config","Effect","Layer","DiscordConfig","LiveDiscordREST","Log","CachePrelude","LiveDiscordGateway","DiscordWS","LiveJsonDiscordWSCodec","Shard","SendEvent","ShardStore","LiveMemoryShardStore","WS","LiveMemoryRateLimitStore","LiveRateLimiter","InteractionsRegistryLive","DiscordGateway","InteractionsRegistry","run","runIx","MemoryRateLimit","provide","MemoryBot","mergeAll","provideMerge","gatewayLayerWithoutHttp","config","unwrapEffect","unwrap","pipe","map","make","LiveLog","debug","LiveLogDebug","LiveConfig","succeed","merge","gatewayLayer"],"sources":["../src/gateway.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,wBAAwB,QAAQ,qBAAqB;AAC9D,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAE3C,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,KAAK,MAAM,kBAAkB;AAEzC,SAASC,aAAa,EAAEC,eAAe,EAAEC,GAAG,QAAQ,KAAK;AACzD,OAAO,KAAKC,YAAY,MAAM,mBAAmB;AAEjD,SAASC,kBAAkB,QAAQ,oBAAoB;AACvD,OAAO,KAAKC,SAAS,MAAM,8BAA8B;AACzD,SAASC,sBAAsB,QAAQ,8BAA8B;AACrE,OAAO,KAAKC,KAAK,MAAM,0BAA0B;AACjD,OAAO,KAAKC,SAAS,MAAM,qCAAqC;AAChE,OAAO,KAAKC,UAAU,MAAM,+BAA+B;AAC3D,SAASC,oBAAoB,QAAQ,+BAA+B;AACpE,OAAO,KAAKC,EAAE,MAAM,uBAAuB;AAE3C,SAASC,wBAAwB,EAAEC,eAAe,QAAQ,eAAe;AACzE,SAASC,wBAAwB,QAAQ,aAAa;AAGtD,SAASC,cAAc,EAAEX,kBAAkB,QAAQ,oBAAoB;AAEvE,SACEY,oBAAoB,EACpBF,wBAAwB,EACxBG,GAAG,IAAIC,KAAK,QACP,0BAA0B;AAEjC,SAASf,YAAY,EAAEE,SAAS,EAAEG,SAAS,EAAED,KAAK,EAAEE,UAAU,EAAEE,EAAE;AAElE,OAAO,MAAMQ,eAAe,gBAAGpB,KAAK,CAACqB,OAAO,CAC1CR,wBAAwB,EACxBC,eAAe,CAChB;AAED,OAAO,MAAMQ,SAAS,gBAAGtB,KAAK,CAACqB,OAAO,eACpCrB,KAAK,CAACuB,QAAQ,CACZZ,oBAAoB,EACpBE,wBAAwB,EACxBN,sBAAsB,CACvB,eACDP,KAAK,CAACuB,QAAQ,eACZvB,KAAK,CAACwB,YAAY,CAACtB,eAAe,EAAEG,kBAAkB,CAAC,EACvDe,eAAe,EACfL,wBAAwB,CACzB,CACF;AAED,OAAO,MAAMU,uBAAuB,GAClCC,MAAkD,IAWlD1B,KAAK,CAAC2B,YAAY,CAChB5B,MAAM,CAAC2B,MAAM,CAAC5B,MAAM,CAAC8B,MAAM,CAACF,MAAM,CAAC,CAAC,CAACG,IAAI,CACvC9B,MAAM,CAAC+B,GAAG,CAAC7B,aAAa,CAAC8B,IAAI,CAAC,EAC9BhC,MAAM,CAAC+B,GAAG,CAACJ,MAAM,IAAG;EAClB,MAAMM,OAAO,GAAGN,MAAM,CAACO,KAAK,GAAG9B,GAAG,CAAC+B,YAAY,GAAG/B,GAAG,CAAC6B,OAAO;EAC7D,MAAMG,UAAU,GAAGnC,KAAK,CAACoC,OAAO,CAACnC,aAAa,CAACA,aAAa,EAAEyB,MAAM,CAAC;EACrE,OAAO1B,KAAK,CAACwB,YAAY,CAACxB,KAAK,CAACqC,KAAK,CAACL,OAAO,EAAEG,UAAU,CAAC,EAAEb,SAAS,CAAC;AACxE,CAAC,CAAC,CACH,CACF;AAEH,OAAO,MAAMgB,YAAY,GACvBZ,MAAkD,IAU/C1B,KAAK,CAACqB,OAAO,CAACxB,wBAAwB,EAAE4B,uBAAuB,CAACC,MAAM,CAAC,CAAC"}
|
package/mjs/index.mjs
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as Http from "@effect-http/client";
|
|
1
2
|
import * as Cache from "dfx/Cache";
|
|
2
3
|
import * as DiscordConfig from "dfx/DiscordConfig";
|
|
3
4
|
import * as Flags from "dfx/Helpers/flags";
|
|
@@ -11,5 +12,5 @@ import * as Log from "dfx/Log";
|
|
|
11
12
|
import * as Discord from "dfx/types";
|
|
12
13
|
export { DiscordREST, LiveDiscordREST } from "dfx/DiscordREST";
|
|
13
14
|
export { LiveMemoryRateLimitStore, LiveRateLimiter, RateLimitStore, RateLimiter } from "dfx/RateLimit";
|
|
14
|
-
export { Cache, Discord, DiscordConfig, Flags, Intents, Ix, IxHelpers, Log, Members, Perms, UI };
|
|
15
|
+
export { Cache, Discord, DiscordConfig, Flags, Http, Intents, Ix, IxHelpers, Log, Members, Perms, UI };
|
|
15
16
|
//# sourceMappingURL=index.mjs.map
|
package/mjs/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.mjs","names":["Cache","DiscordConfig","Flags","Intents","IxHelpers","Members","Perms","UI","Ix","Log","Discord","DiscordREST","LiveDiscordREST","LiveMemoryRateLimitStore","LiveRateLimiter","RateLimitStore","RateLimiter"],"sources":["../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,KAAK,MAAM,WAAW;AAClC,OAAO,KAAKC,aAAa,MAAM,mBAAmB;AAClD,OAAO,KAAKC,KAAK,MAAM,mBAAmB;AAC1C,OAAO,KAAKC,OAAO,MAAM,qBAAqB;AAC9C,OAAO,KAAKC,SAAS,MAAM,0BAA0B;AACrD,OAAO,KAAKC,OAAO,MAAM,qBAAqB;AAC9C,OAAO,KAAKC,KAAK,MAAM,yBAAyB;AAChD,OAAO,KAAKC,EAAE,MAAM,gBAAgB;AACpC,OAAO,KAAKC,EAAE,MAAM,wBAAwB;AAC5C,OAAO,KAAKC,GAAG,MAAM,SAAS;AAC9B,OAAO,KAAKC,OAAO,MAAM,WAAW;AAEpC,SAASC,WAAW,EAAEC,eAAe,QAAQ,iBAAiB;
|
|
1
|
+
{"version":3,"file":"index.mjs","names":["Http","Cache","DiscordConfig","Flags","Intents","IxHelpers","Members","Perms","UI","Ix","Log","Discord","DiscordREST","LiveDiscordREST","LiveMemoryRateLimitStore","LiveRateLimiter","RateLimitStore","RateLimiter"],"sources":["../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,IAAI,MAAM,qBAAqB;AAC3C,OAAO,KAAKC,KAAK,MAAM,WAAW;AAClC,OAAO,KAAKC,aAAa,MAAM,mBAAmB;AAClD,OAAO,KAAKC,KAAK,MAAM,mBAAmB;AAC1C,OAAO,KAAKC,OAAO,MAAM,qBAAqB;AAC9C,OAAO,KAAKC,SAAS,MAAM,0BAA0B;AACrD,OAAO,KAAKC,OAAO,MAAM,qBAAqB;AAC9C,OAAO,KAAKC,KAAK,MAAM,yBAAyB;AAChD,OAAO,KAAKC,EAAE,MAAM,gBAAgB;AACpC,OAAO,KAAKC,EAAE,MAAM,wBAAwB;AAC5C,OAAO,KAAKC,GAAG,MAAM,SAAS;AAC9B,OAAO,KAAKC,OAAO,MAAM,WAAW;AAEpC,SAASC,WAAW,EAAEC,eAAe,QAAQ,iBAAiB;AAE9D,SAEEC,wBAAwB,EACxBC,eAAe,EACfC,cAAc,EACdC,WAAW,QACN,eAAe;AAEtB,SACEhB,KAAK,EACLU,OAAO,EACPT,aAAa,EACbC,KAAK,EACLH,IAAI,EACJI,OAAO,EACPK,EAAE,EACFJ,SAAS,EACTK,GAAG,EACHJ,OAAO,EACPC,KAAK,EACLC,EAAE"}
|
package/mjs/version.mjs
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const LIB_VERSION = "0.
|
|
1
|
+
export const LIB_VERSION = "0.53.0";
|
|
2
2
|
//# sourceMappingURL=version.mjs.map
|
package/mjs/webhooks.mjs
CHANGED
|
@@ -10,7 +10,7 @@ import { LiveMemoryRateLimitStore, LiveRateLimiter } from "dfx/RateLimit";
|
|
|
10
10
|
export { BadWebhookSignature, WebhookConfig, WebhookParseError, makeConfigLayer, makeHandler, makeSimpleHandler } from "dfx/Interactions/webhook";
|
|
11
11
|
export const MemoryRateLimit = /*#__PURE__*/Layer.provide(LiveMemoryRateLimitStore, LiveRateLimiter);
|
|
12
12
|
export const MemoryREST = /*#__PURE__*/Layer.provide(LiveMemoryRateLimitStore, LiveDiscordREST);
|
|
13
|
-
export const
|
|
13
|
+
export const webhookLayerWithoutHttp = options => Layer.unwrapEffect(Effect.map(Effect.config(Config.unwrap(options)), options => {
|
|
14
14
|
const config = DiscordConfig.make(options);
|
|
15
15
|
const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config);
|
|
16
16
|
const LiveWebhook = makeConfigLayer(options);
|
|
@@ -18,8 +18,8 @@ export const makeLiveWithoutFetch = options => Layer.unwrapEffect(Effect.map(Eff
|
|
|
18
18
|
const LiveEnv = Layer.provide(Layer.merge(LiveLog, LiveConfig), Layer.mergeAll(MemoryREST, LiveWebhook, MemoryRateLimit));
|
|
19
19
|
return LiveEnv;
|
|
20
20
|
}));
|
|
21
|
-
export const
|
|
22
|
-
export const
|
|
21
|
+
export const webhookLayerConfig = config => Layer.provide(LiveFetchRequestExecutor, webhookLayerWithoutHttp(config));
|
|
22
|
+
export const webhookLayer = options => {
|
|
23
23
|
const config = DiscordConfig.make(options);
|
|
24
24
|
const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config);
|
|
25
25
|
const LiveWebhook = makeConfigLayer(options);
|
package/mjs/webhooks.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhooks.mjs","names":["LiveFetchRequestExecutor","Config","Effect","Layer","DiscordConfig","LiveDiscordREST","makeConfigLayer","Log","LiveMemoryRateLimitStore","LiveRateLimiter","BadWebhookSignature","WebhookConfig","WebhookParseError","makeHandler","makeSimpleHandler","MemoryRateLimit","provide","MemoryREST","
|
|
1
|
+
{"version":3,"file":"webhooks.mjs","names":["LiveFetchRequestExecutor","Config","Effect","Layer","DiscordConfig","LiveDiscordREST","makeConfigLayer","Log","LiveMemoryRateLimitStore","LiveRateLimiter","BadWebhookSignature","WebhookConfig","WebhookParseError","makeHandler","makeSimpleHandler","MemoryRateLimit","provide","MemoryREST","webhookLayerWithoutHttp","options","unwrapEffect","map","config","unwrap","make","LiveConfig","succeed","LiveWebhook","LiveLog","debug","LiveLogDebug","LiveEnv","merge","mergeAll","webhookLayerConfig","webhookLayer"],"sources":["../src/webhooks.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,wBAAwB,QAAQ,qBAAqB;AAC9D,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAE3C,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,KAAK,MAAM,kBAAkB;AACzC,OAAO,KAAKC,aAAa,MAAM,mBAAmB;AAElD,SAASC,eAAe,QAAQ,iBAAiB;AAEjD,SAASC,eAAe,QAAQ,0BAA0B;AAC1D,OAAO,KAAKC,GAAG,MAAM,SAAS;AAE9B,SAASC,wBAAwB,EAAEC,eAAe,QAAQ,eAAe;AAEzE,SACEC,mBAAmB,EACnBC,aAAa,EACbC,iBAAiB,EACjBN,eAAe,EACfO,WAAW,EACXC,iBAAiB,QACZ,0BAA0B;AAEjC,OAAO,MAAMC,eAAe,gBAAGZ,KAAK,CAACa,OAAO,CAC1CR,wBAAwB,EACxBC,eAAe,CAChB;AAED,OAAO,MAAMQ,UAAU,gBAAGd,KAAK,CAACa,OAAO,CACrCR,wBAAwB,EACxBH,eAAe,CAChB;AAED,OAAO,MAAMa,uBAAuB,GAClCC,OAAoE,IAMpEhB,KAAK,CAACiB,YAAY,CAChBlB,MAAM,CAACmB,GAAG,CAACnB,MAAM,CAACoB,MAAM,CAACrB,MAAM,CAACsB,MAAM,CAACJ,OAAO,CAAC,CAAC,EAAEA,OAAO,IAAG;EAC1D,MAAMG,MAAM,GAAGlB,aAAa,CAACoB,IAAI,CAACL,OAAO,CAAC;EAC1C,MAAMM,UAAU,GAAGtB,KAAK,CAACuB,OAAO,CAACtB,aAAa,CAACA,aAAa,EAAEkB,MAAM,CAAC;EACrE,MAAMK,WAAW,GAAGrB,eAAe,CAACa,OAAO,CAAC;EAC5C,MAAMS,OAAO,GAAGN,MAAM,CAACO,KAAK,GAAGtB,GAAG,CAACuB,YAAY,GAAGvB,GAAG,CAACqB,OAAO;EAC7D,MAAMG,OAAO,GAAG5B,KAAK,CAACa,OAAO,CAC3Bb,KAAK,CAAC6B,KAAK,CAACJ,OAAO,EAAEH,UAAU,CAAC,EAChCtB,KAAK,CAAC8B,QAAQ,CAAChB,UAAU,EAAEU,WAAW,EAAEZ,eAAe,CAAC,CACzD;EAED,OAAOgB,OAAO;AAChB,CAAC,CAAC,CACH;AAEH,OAAO,MAAMG,kBAAkB,GAC7BZ,MAAmE,IAKhEnB,KAAK,CAACa,OAAO,CAAChB,wBAAwB,EAAEkB,uBAAuB,CAACI,MAAM,CAAC,CAAC;AAE7E,OAAO,MAAMa,YAAY,GACvBhB,OAAgD,IACwB;EACxE,MAAMG,MAAM,GAAGlB,aAAa,CAACoB,IAAI,CAACL,OAAO,CAAC;EAC1C,MAAMM,UAAU,GAAGtB,KAAK,CAACuB,OAAO,CAACtB,aAAa,CAACA,aAAa,EAAEkB,MAAM,CAAC;EACrE,MAAMK,WAAW,GAAGrB,eAAe,CAACa,OAAO,CAAC;EAC5C,MAAMS,OAAO,GAAGN,MAAM,CAACO,KAAK,GAAGtB,GAAG,CAACuB,YAAY,GAAGvB,GAAG,CAACqB,OAAO;EAC7D,MAAMG,OAAO,GAAG5B,KAAK,CAACa,OAAO,CAC3Bb,KAAK,CAAC6B,KAAK,CAACJ,OAAO,EAAEH,UAAU,CAAC,EAChCtB,KAAK,CAAC8B,QAAQ,CAAChB,UAAU,EAAEU,WAAW,EAAEZ,eAAe,CAAC,CACzD;EACD,OAAOZ,KAAK,CAACa,OAAO,CAAChB,wBAAwB,EAAE+B,OAAO,CAAC;AACzD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dfx",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.53.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
7
7
|
"url": "https://github.com/tim-smart/dfx.git"
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
|
-
"@effect-http/client": "^0.
|
|
10
|
+
"@effect-http/client": "^0.31.0",
|
|
11
11
|
"@effect/data": "^0.14.1",
|
|
12
|
-
"@effect/io": "~0.32.
|
|
12
|
+
"@effect/io": "~0.32.2",
|
|
13
13
|
"@effect/stream": "~0.26.0",
|
|
14
14
|
"bufferutil": "^4.0.7",
|
|
15
15
|
"discord-verify": "^1.2.0",
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"utf-8-validate": "^6.0.3",
|
|
18
18
|
"ws": "^8.13.0"
|
|
19
19
|
},
|
|
20
|
-
"gitHead": "
|
|
20
|
+
"gitHead": "1ea80463c960ded2699659218dddb12022c4d2ce",
|
|
21
21
|
"main": "./index.js",
|
|
22
22
|
"publishConfig": {
|
|
23
23
|
"access": "public"
|
|
@@ -141,21 +141,15 @@ export const make = Effect.gen(function* (_) {
|
|
|
141
141
|
)
|
|
142
142
|
|
|
143
143
|
const onPayload = (p: Discord.GatewayPayload) =>
|
|
144
|
-
|
|
145
|
-
Effect.
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
),
|
|
149
|
-
() => {
|
|
144
|
+
updateLatestReady(p).pipe(
|
|
145
|
+
Effect.zipRight(updateLatestSequence(p)),
|
|
146
|
+
Effect.zipRight(maybeUpdateUrl(p)),
|
|
147
|
+
Effect.tap(() => {
|
|
150
148
|
switch (p.op) {
|
|
151
149
|
case Discord.GatewayOpcode.HELLO:
|
|
152
|
-
return Effect.
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
setPhase(Phase.Handshake),
|
|
156
|
-
Queue.offer(hellos, p),
|
|
157
|
-
],
|
|
158
|
-
{ discard: true },
|
|
150
|
+
return Effect.tap(identify, prioritySend).pipe(
|
|
151
|
+
Effect.zipRight(setPhase(Phase.Handshake)),
|
|
152
|
+
Effect.zipRight(Queue.offer(hellos, p)),
|
|
159
153
|
)
|
|
160
154
|
case Discord.GatewayOpcode.HEARTBEAT_ACK:
|
|
161
155
|
return Queue.offer(acks, p)
|
|
@@ -172,7 +166,7 @@ export const make = Effect.gen(function* (_) {
|
|
|
172
166
|
}
|
|
173
167
|
|
|
174
168
|
return Effect.unit
|
|
175
|
-
},
|
|
169
|
+
}),
|
|
176
170
|
)
|
|
177
171
|
|
|
178
172
|
const drainSendQueue = Queue.take(sendQueue).pipe(
|
package/src/DiscordREST.ts
CHANGED
|
@@ -46,14 +46,14 @@ const make = Effect.gen(function* (_) {
|
|
|
46
46
|
const badRoutesRef = yield* _(Ref.make(HashSet.empty<string>()))
|
|
47
47
|
const tenMinutes = Duration.toMillis(Duration.minutes(10))
|
|
48
48
|
const addBadRoute = (route: string) =>
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
Ref.update(badRoutesRef, HashSet.add(route)),
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
49
|
+
log
|
|
50
|
+
.info("DiscordREST", "addBadRoute", route)
|
|
51
|
+
.pipe(
|
|
52
|
+
Effect.zipRight(Ref.update(badRoutesRef, HashSet.add(route))),
|
|
53
|
+
Effect.zipRight(
|
|
54
|
+
store.incrementCounter("dfx.rest.invalid", tenMinutes, 10000),
|
|
55
|
+
),
|
|
56
|
+
)
|
|
57
57
|
const isBadRoute = (route: string) =>
|
|
58
58
|
Effect.map(Ref.get(badRoutesRef), HashSet.has(route))
|
|
59
59
|
const removeBadRoute = (route: string) =>
|
|
@@ -185,22 +185,22 @@ const make = Effect.gen(function* (_) {
|
|
|
185
185
|
)
|
|
186
186
|
|
|
187
187
|
case 429:
|
|
188
|
-
return
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
188
|
+
return log
|
|
189
|
+
.info("DiscordREST", "429", request.url)
|
|
190
|
+
.pipe(
|
|
191
|
+
Effect.zipRight(
|
|
192
192
|
addBadRoute(routeFromConfig(request.url, request.method)),
|
|
193
|
-
|
|
193
|
+
),
|
|
194
|
+
Effect.zipRight(updateBuckets(request, response)),
|
|
195
|
+
Effect.zipRight(
|
|
194
196
|
Effect.sleep(
|
|
195
197
|
Option.getOrElse(retryAfter(response.headers), () =>
|
|
196
198
|
Duration.seconds(5),
|
|
197
199
|
),
|
|
198
200
|
),
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
)
|
|
202
|
-
executor<A>(request),
|
|
203
|
-
)
|
|
201
|
+
),
|
|
202
|
+
Effect.zipRight(executor<A>(request)),
|
|
203
|
+
)
|
|
204
204
|
}
|
|
205
205
|
|
|
206
206
|
return Effect.fail(e)
|
package/src/gateway.ts
CHANGED
|
@@ -18,13 +18,17 @@ import { LiveMemoryShardStore } from "dfx/DiscordGateway/ShardStore"
|
|
|
18
18
|
import * as WS from "dfx/DiscordGateway/WS"
|
|
19
19
|
import type { RateLimiter } from "dfx/RateLimit"
|
|
20
20
|
import { LiveMemoryRateLimitStore, LiveRateLimiter } from "dfx/RateLimit"
|
|
21
|
+
import { InteractionsRegistryLive } from "dfx/gateway"
|
|
22
|
+
import type { InteractionsRegistry } from "dfx/gateway"
|
|
21
23
|
|
|
22
24
|
export { DiscordGateway, LiveDiscordGateway } from "dfx/DiscordGateway"
|
|
25
|
+
|
|
23
26
|
export {
|
|
24
27
|
InteractionsRegistry,
|
|
25
28
|
InteractionsRegistryLive,
|
|
26
29
|
run as runIx,
|
|
27
30
|
} from "dfx/Interactions/gateway"
|
|
31
|
+
|
|
28
32
|
export { CachePrelude, DiscordWS, SendEvent, Shard, ShardStore, WS }
|
|
29
33
|
|
|
30
34
|
export const MemoryRateLimit = Layer.provide(
|
|
@@ -38,21 +42,24 @@ export const MemoryBot = Layer.provide(
|
|
|
38
42
|
LiveMemoryRateLimitStore,
|
|
39
43
|
LiveJsonDiscordWSCodec,
|
|
40
44
|
),
|
|
41
|
-
Layer.
|
|
45
|
+
Layer.mergeAll(
|
|
42
46
|
Layer.provideMerge(LiveDiscordREST, LiveDiscordGateway),
|
|
43
47
|
MemoryRateLimit,
|
|
48
|
+
InteractionsRegistryLive,
|
|
44
49
|
),
|
|
45
50
|
)
|
|
46
|
-
|
|
51
|
+
|
|
52
|
+
export const gatewayLayerWithoutHttp = (
|
|
47
53
|
config: Config.Config.Wrap<DiscordConfig.MakeOpts>,
|
|
48
54
|
): Layer.Layer<
|
|
49
55
|
HttpRequestExecutor,
|
|
50
56
|
ConfigError.ConfigError,
|
|
51
57
|
| RateLimiter
|
|
52
58
|
| Log.Log
|
|
59
|
+
| InteractionsRegistry
|
|
53
60
|
| DiscordREST
|
|
54
|
-
| DiscordConfig.DiscordConfig
|
|
55
61
|
| DiscordGateway
|
|
62
|
+
| DiscordConfig.DiscordConfig
|
|
56
63
|
> =>
|
|
57
64
|
Layer.unwrapEffect(
|
|
58
65
|
Effect.config(Config.unwrap(config)).pipe(
|
|
@@ -65,14 +72,15 @@ export const makeLiveWithoutFetch = (
|
|
|
65
72
|
),
|
|
66
73
|
)
|
|
67
74
|
|
|
68
|
-
export const
|
|
75
|
+
export const gatewayLayer = (
|
|
69
76
|
config: Config.Config.Wrap<DiscordConfig.MakeOpts>,
|
|
70
77
|
): Layer.Layer<
|
|
71
78
|
never,
|
|
72
79
|
ConfigError.ConfigError,
|
|
73
80
|
| RateLimiter
|
|
74
81
|
| Log.Log
|
|
82
|
+
| InteractionsRegistry
|
|
75
83
|
| DiscordREST
|
|
76
|
-
| DiscordConfig.DiscordConfig
|
|
77
84
|
| DiscordGateway
|
|
78
|
-
|
|
85
|
+
| DiscordConfig.DiscordConfig
|
|
86
|
+
> => Layer.provide(LiveFetchRequestExecutor, gatewayLayerWithoutHttp(config))
|
package/src/index.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as Http from "@effect-http/client"
|
|
1
2
|
import * as Cache from "dfx/Cache"
|
|
2
3
|
import * as DiscordConfig from "dfx/DiscordConfig"
|
|
3
4
|
import * as Flags from "dfx/Helpers/flags"
|
|
@@ -11,6 +12,7 @@ import * as Log from "dfx/Log"
|
|
|
11
12
|
import * as Discord from "dfx/types"
|
|
12
13
|
|
|
13
14
|
export { DiscordREST, LiveDiscordREST } from "dfx/DiscordREST"
|
|
15
|
+
|
|
14
16
|
export {
|
|
15
17
|
BucketDetails,
|
|
16
18
|
LiveMemoryRateLimitStore,
|
|
@@ -24,6 +26,7 @@ export {
|
|
|
24
26
|
Discord,
|
|
25
27
|
DiscordConfig,
|
|
26
28
|
Flags,
|
|
29
|
+
Http,
|
|
27
30
|
Intents,
|
|
28
31
|
Ix,
|
|
29
32
|
IxHelpers,
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const LIB_VERSION = "0.
|
|
1
|
+
export const LIB_VERSION = "0.53.0";
|
package/src/webhooks.ts
CHANGED
|
@@ -32,7 +32,7 @@ export const MemoryREST = Layer.provide(
|
|
|
32
32
|
LiveDiscordREST,
|
|
33
33
|
)
|
|
34
34
|
|
|
35
|
-
export const
|
|
35
|
+
export const webhookLayerWithoutHttp = (
|
|
36
36
|
options: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>,
|
|
37
37
|
): Layer.Layer<
|
|
38
38
|
HttpRequestExecutor,
|
|
@@ -54,15 +54,15 @@ export const makeLiveWithoutFetch = (
|
|
|
54
54
|
}),
|
|
55
55
|
)
|
|
56
56
|
|
|
57
|
-
export const
|
|
57
|
+
export const webhookLayerConfig = (
|
|
58
58
|
config: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>,
|
|
59
59
|
): Layer.Layer<
|
|
60
60
|
never,
|
|
61
61
|
ConfigError.ConfigError,
|
|
62
62
|
RateLimiter | DiscordREST | WebhookConfig
|
|
63
|
-
> => Layer.provide(LiveFetchRequestExecutor,
|
|
63
|
+
> => Layer.provide(LiveFetchRequestExecutor, webhookLayerWithoutHttp(config))
|
|
64
64
|
|
|
65
|
-
export const
|
|
65
|
+
export const webhookLayer = (
|
|
66
66
|
options: DiscordConfig.MakeOpts & MakeConfigOpts,
|
|
67
67
|
): Layer.Layer<never, never, RateLimiter | DiscordREST | WebhookConfig> => {
|
|
68
68
|
const config = DiscordConfig.make(options)
|
package/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const LIB_VERSION = "0.
|
|
1
|
+
export declare const LIB_VERSION = "0.53.0";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/version.js
CHANGED
package/webhooks.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ import type { RateLimiter } from "dfx/RateLimit";
|
|
|
10
10
|
export { BadWebhookSignature, WebhookConfig, WebhookParseError, makeConfigLayer, makeHandler, makeSimpleHandler, } from "dfx/Interactions/webhook";
|
|
11
11
|
export declare const MemoryRateLimit: Layer.Layer<Log.Log, never, RateLimiter>;
|
|
12
12
|
export declare const MemoryREST: Layer.Layer<DiscordConfig.DiscordConfig | HttpRequestExecutor | Log.Log, never, DiscordREST>;
|
|
13
|
-
export declare const
|
|
14
|
-
export declare const
|
|
15
|
-
export declare const
|
|
13
|
+
export declare const webhookLayerWithoutHttp: (options: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>) => Layer.Layer<HttpRequestExecutor, ConfigError.ConfigError, RateLimiter | DiscordREST | WebhookConfig>;
|
|
14
|
+
export declare const webhookLayerConfig: (config: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>) => Layer.Layer<never, ConfigError.ConfigError, RateLimiter | DiscordREST | WebhookConfig>;
|
|
15
|
+
export declare const webhookLayer: (options: DiscordConfig.MakeOpts & MakeConfigOpts) => Layer.Layer<never, never, RateLimiter | DiscordREST | WebhookConfig>;
|
|
16
16
|
//# sourceMappingURL=webhooks.d.ts.map
|
package/webhooks.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhooks.d.ts","sourceRoot":"","sources":["./src/webhooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAE9D,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,yBAAyB,CAAA;AAE3D,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,aAAa,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAE7E,OAAO,KAAK,GAAG,MAAM,SAAS,CAAA;AAC9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAGhD,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,WAAW,EACX,iBAAiB,GAClB,MAAM,0BAA0B,CAAA;AAEjC,eAAO,MAAM,eAAe,0CAG3B,CAAA;AAED,eAAO,MAAM,UAAU,8FAGtB,CAAA;AAED,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"webhooks.d.ts","sourceRoot":"","sources":["./src/webhooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAE9D,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,yBAAyB,CAAA;AAE3D,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,aAAa,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAE7E,OAAO,KAAK,GAAG,MAAM,SAAS,CAAA;AAC9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAGhD,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,WAAW,EACX,iBAAiB,GAClB,MAAM,0BAA0B,CAAA;AAEjC,eAAO,MAAM,eAAe,0CAG3B,CAAA;AAED,eAAO,MAAM,UAAU,8FAGtB,CAAA;AAED,eAAO,MAAM,uBAAuB,YACzB,aAAa,CAAC,IAAI,CAAC,cAAc,QAAQ,GAAG,cAAc,CAAC,KACnE,WAAW,CACZ,mBAAmB,EACnB,uBAAuB,EACvB,WAAW,GAAG,WAAW,GAAG,aAAa,CAexC,CAAA;AAEH,eAAO,MAAM,kBAAkB,WACrB,aAAa,CAAC,IAAI,CAAC,cAAc,QAAQ,GAAG,cAAc,CAAC,KAClE,WAAW,CACZ,KAAK,EACL,uBAAuB,EACvB,WAAW,GAAG,WAAW,GAAG,aAAa,CACkC,CAAA;AAE7E,eAAO,MAAM,YAAY,YACd,cAAc,QAAQ,GAAG,cAAc,KAC/C,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,WAAW,GAAG,WAAW,GAAG,aAAa,CAUrE,CAAA"}
|
package/webhooks.js
CHANGED
|
@@ -34,13 +34,13 @@ Object.defineProperty(exports, "makeHandler", {
|
|
|
34
34
|
return _webhook.makeHandler;
|
|
35
35
|
}
|
|
36
36
|
});
|
|
37
|
-
exports.makeLiveWithoutFetch = exports.makeLiveWithoutConfig = exports.makeLive = void 0;
|
|
38
37
|
Object.defineProperty(exports, "makeSimpleHandler", {
|
|
39
38
|
enumerable: true,
|
|
40
39
|
get: function () {
|
|
41
40
|
return _webhook.makeSimpleHandler;
|
|
42
41
|
}
|
|
43
42
|
});
|
|
43
|
+
exports.webhookLayerWithoutHttp = exports.webhookLayerConfig = exports.webhookLayer = void 0;
|
|
44
44
|
var _client = /*#__PURE__*/require("@effect-http/client");
|
|
45
45
|
var Config = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Config"));
|
|
46
46
|
var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
|
|
@@ -56,7 +56,7 @@ const MemoryRateLimit = /*#__PURE__*/Layer.provide(_RateLimit.LiveMemoryRateLimi
|
|
|
56
56
|
exports.MemoryRateLimit = MemoryRateLimit;
|
|
57
57
|
const MemoryREST = /*#__PURE__*/Layer.provide(_RateLimit.LiveMemoryRateLimitStore, _DiscordREST.LiveDiscordREST);
|
|
58
58
|
exports.MemoryREST = MemoryREST;
|
|
59
|
-
const
|
|
59
|
+
const webhookLayerWithoutHttp = options => Layer.unwrapEffect(Effect.map(Effect.config(Config.unwrap(options)), options => {
|
|
60
60
|
const config = DiscordConfig.make(options);
|
|
61
61
|
const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config);
|
|
62
62
|
const LiveWebhook = (0, _webhook.makeConfigLayer)(options);
|
|
@@ -64,10 +64,10 @@ const makeLiveWithoutFetch = options => Layer.unwrapEffect(Effect.map(Effect.con
|
|
|
64
64
|
const LiveEnv = Layer.provide(Layer.merge(LiveLog, LiveConfig), Layer.mergeAll(MemoryREST, LiveWebhook, MemoryRateLimit));
|
|
65
65
|
return LiveEnv;
|
|
66
66
|
}));
|
|
67
|
-
exports.
|
|
68
|
-
const
|
|
69
|
-
exports.
|
|
70
|
-
const
|
|
67
|
+
exports.webhookLayerWithoutHttp = webhookLayerWithoutHttp;
|
|
68
|
+
const webhookLayerConfig = config => Layer.provide(_client.LiveFetchRequestExecutor, webhookLayerWithoutHttp(config));
|
|
69
|
+
exports.webhookLayerConfig = webhookLayerConfig;
|
|
70
|
+
const webhookLayer = options => {
|
|
71
71
|
const config = DiscordConfig.make(options);
|
|
72
72
|
const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config);
|
|
73
73
|
const LiveWebhook = (0, _webhook.makeConfigLayer)(options);
|
|
@@ -75,5 +75,5 @@ const makeLiveWithoutConfig = options => {
|
|
|
75
75
|
const LiveEnv = Layer.provide(Layer.merge(LiveLog, LiveConfig), Layer.mergeAll(MemoryREST, LiveWebhook, MemoryRateLimit));
|
|
76
76
|
return Layer.provide(_client.LiveFetchRequestExecutor, LiveEnv);
|
|
77
77
|
};
|
|
78
|
-
exports.
|
|
78
|
+
exports.webhookLayer = webhookLayer;
|
|
79
79
|
//# sourceMappingURL=webhooks.js.map
|
package/webhooks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhooks.js","names":["_client","require","Config","_interopRequireWildcard","Effect","Layer","DiscordConfig","_DiscordREST","_webhook","Log","_RateLimit","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","MemoryRateLimit","provide","LiveMemoryRateLimitStore","LiveRateLimiter","exports","MemoryREST","LiveDiscordREST","
|
|
1
|
+
{"version":3,"file":"webhooks.js","names":["_client","require","Config","_interopRequireWildcard","Effect","Layer","DiscordConfig","_DiscordREST","_webhook","Log","_RateLimit","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","MemoryRateLimit","provide","LiveMemoryRateLimitStore","LiveRateLimiter","exports","MemoryREST","LiveDiscordREST","webhookLayerWithoutHttp","options","unwrapEffect","map","config","unwrap","make","LiveConfig","succeed","LiveWebhook","makeConfigLayer","LiveLog","debug","LiveLogDebug","LiveEnv","merge","mergeAll","webhookLayerConfig","LiveFetchRequestExecutor","webhookLayer"],"sources":["./src/webhooks.ts"],"sourcesContent":[null],"mappings":"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"}
|