dfx 0.101.1 → 0.102.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 +2 -1
- package/DiscordGateway/DiscordWS.d.ts.map +1 -1
- package/DiscordGateway/DiscordWS.js +11 -6
- package/DiscordGateway/DiscordWS.js.map +1 -1
- package/DiscordGateway/Messaging.d.ts +3 -3
- package/DiscordGateway/Messaging.d.ts.map +1 -1
- package/DiscordGateway/Messaging.js +4 -4
- package/DiscordGateway/Messaging.js.map +1 -1
- package/DiscordGateway/Shard/heartbeats.d.ts +2 -2
- package/DiscordGateway/Shard/heartbeats.d.ts.map +1 -1
- package/DiscordGateway/Shard/heartbeats.js +2 -3
- package/DiscordGateway/Shard/heartbeats.js.map +1 -1
- package/DiscordGateway/Shard.d.ts.map +1 -1
- package/DiscordGateway/Shard.js +15 -15
- package/DiscordGateway/Shard.js.map +1 -1
- package/DiscordGateway/Sharder.d.ts +1 -1
- package/DiscordGateway.d.ts +1 -1
- package/DiscordREST.d.ts +1 -1
- package/DiscordREST.js +3 -3
- package/DiscordREST.js.map +1 -1
- package/gateway.d.ts +2 -2
- package/index.d.ts +1 -1
- package/mjs/DiscordGateway/DiscordWS.mjs +11 -6
- package/mjs/DiscordGateway/DiscordWS.mjs.map +1 -1
- package/mjs/DiscordGateway/Messaging.mjs +4 -4
- package/mjs/DiscordGateway/Messaging.mjs.map +1 -1
- package/mjs/DiscordGateway/Shard/heartbeats.mjs +2 -3
- package/mjs/DiscordGateway/Shard/heartbeats.mjs.map +1 -1
- package/mjs/DiscordGateway/Shard.mjs +15 -15
- package/mjs/DiscordGateway/Shard.mjs.map +1 -1
- package/mjs/DiscordREST.mjs +3 -3
- package/mjs/DiscordREST.mjs.map +1 -1
- package/mjs/version.mjs +1 -1
- package/package.json +4 -4
- package/src/DiscordGateway/DiscordWS.ts +14 -10
- package/src/DiscordGateway/Messaging.ts +6 -6
- package/src/DiscordGateway/Shard/heartbeats.ts +5 -5
- package/src/DiscordGateway/Shard.ts +26 -23
- package/src/DiscordREST.ts +3 -3
- package/src/version.ts +1 -1
- package/version.d.ts +1 -1
- package/version.js +1 -1
- package/webhooks.d.ts +1 -1
|
@@ -2,6 +2,7 @@ import * as Effect from "effect/Effect";
|
|
|
2
2
|
import * as Layer from "effect/Layer";
|
|
3
3
|
import type * as Discord from "dfx/types";
|
|
4
4
|
import * as Socket from "@effect/platform/Socket";
|
|
5
|
+
import * as Cause from "effect/Cause";
|
|
5
6
|
export type Message = Discord.GatewayPayload | Reconnect;
|
|
6
7
|
export declare const Reconnect: unique symbol;
|
|
7
8
|
export type Reconnect = typeof Reconnect;
|
|
@@ -27,7 +28,7 @@ export interface DiscordWS {
|
|
|
27
28
|
}
|
|
28
29
|
export declare const DiscordWS: import("effect/Context").Tag<DiscordWS, {
|
|
29
30
|
readonly connect: ({ onConnecting, outbound, url, version, }: OpenOpts) => Effect.Effect<{
|
|
30
|
-
readonly take: Effect.Effect<Discord.GatewayPayload<any>,
|
|
31
|
+
readonly take: Effect.Effect<Discord.GatewayPayload<any>, Cause.NoSuchElementException, never>;
|
|
31
32
|
readonly setUrl: (url: string) => Effect.Effect<void, never, never>;
|
|
32
33
|
}, never, import("effect/Scope").Scope | Socket.WebSocketConstructor>;
|
|
33
34
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordWS.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/DiscordWS.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"DiscordWS.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/DiscordWS.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,yBAAyB,CAAA;AAGjD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAIrC,MAAM,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAA;AAExD,eAAO,MAAM,SAAS,eAAgD,CAAA;AACtE,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAA;AAExC,MAAM,WAAW,QAAQ;IACvB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAChC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;CAClC;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAA;IACpB,MAAM,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,cAAc,KAAK,UAAU,GAAG,MAAM,CAAA;IAC1D,MAAM,EAAE,CAAC,CAAC,EAAE,UAAU,GAAG,MAAM,KAAK,OAAO,CAAC,cAAc,CAAA;CAC3D;AACD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AAKD,eAAO,MAAM,cAAc,qEAE1B,CAAA;AACD,eAAO,MAAM,sBAAsB,2CAIjC,CAAA;AA6EF,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AACD,eAAO,MAAM,SAAS;kEAtEjB,QAAQ;;+BAKc,MAAM;;EAoEA,CAAA;AACjC,eAAO,MAAM,aAAa,+CAAgC,CAAA"}
|
|
@@ -9,12 +9,16 @@ var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/
|
|
|
9
9
|
var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
|
|
10
10
|
var Ref = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Ref"));
|
|
11
11
|
var Socket = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/platform/Socket"));
|
|
12
|
-
var
|
|
12
|
+
var Mailbox = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Mailbox"));
|
|
13
13
|
var Schedule = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Schedule"));
|
|
14
|
+
var Cause = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Cause"));
|
|
15
|
+
var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Option"));
|
|
16
|
+
var LogLevel = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/LogLevel"));
|
|
14
17
|
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); }
|
|
15
18
|
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 && {}.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; }
|
|
16
19
|
const Reconnect = exports.Reconnect = /*#__PURE__*/Symbol.for("dfx/DiscordGateway/WS/Reconnect");
|
|
17
20
|
const decoder = /*#__PURE__*/new TextDecoder();
|
|
21
|
+
const logLevelDebug = /*#__PURE__*/Option.some(LogLevel.Debug);
|
|
18
22
|
const DiscordWSCodec = exports.DiscordWSCodec = /*#__PURE__*/(0, _Context.GenericTag)("dfx/DiscordGateway/DiscordWS/Codec");
|
|
19
23
|
const JsonDiscordWSCodecLive = exports.JsonDiscordWSCodecLive = /*#__PURE__*/Layer.succeed(DiscordWSCodec, {
|
|
20
24
|
type: "json",
|
|
@@ -31,7 +35,7 @@ const make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
31
35
|
}) => Effect.gen(function* () {
|
|
32
36
|
const urlRef = yield* Ref.make(`${url}?v=${version}&encoding=${encoding.type}`);
|
|
33
37
|
const setUrl = url => Ref.set(urlRef, `${url}?v=${version}&encoding=${encoding.type}`);
|
|
34
|
-
const messages = yield*
|
|
38
|
+
const messages = yield* Mailbox.make();
|
|
35
39
|
const socket = yield* Socket.makeWebSocket(Ref.get(urlRef), {
|
|
36
40
|
closeCodeIsError: _ => true,
|
|
37
41
|
openTimeout: 5000
|
|
@@ -43,14 +47,15 @@ const make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
43
47
|
}
|
|
44
48
|
return Effect.zipRight(Effect.logTrace(_), write(encoding.encode(_)));
|
|
45
49
|
}), Effect.forever, Effect.annotateLogs("channel", "outbound"), Effect.forkScoped, Effect.interruptible);
|
|
46
|
-
yield* onConnecting.pipe(Effect.zipRight(socket.runRaw(_ => {
|
|
50
|
+
yield* onConnecting.pipe(Effect.zipRight(Effect.withFiberRuntime(fiber => socket.runRaw(_ => {
|
|
47
51
|
const message = encoding.decode(_);
|
|
48
|
-
|
|
49
|
-
|
|
52
|
+
messages.unsafeOffer(message);
|
|
53
|
+
fiber.log([message], Cause.empty, logLevelDebug);
|
|
54
|
+
}))), Effect.retry({
|
|
50
55
|
while: e => e.reason === "Close" && e.code === 1012
|
|
51
56
|
}), Effect.catchAllCause(cause => Effect.logDebug("Got socket error, reconnecting", cause)), Effect.repeat(Schedule.exponential(500).pipe(Schedule.union(Schedule.spaced(10000)))), Effect.annotateLogs("channel", "inbound"), Effect.forkScoped, Effect.interruptible);
|
|
52
57
|
return {
|
|
53
|
-
take:
|
|
58
|
+
take: messages.take,
|
|
54
59
|
setUrl
|
|
55
60
|
};
|
|
56
61
|
}).pipe(Effect.annotateLogs({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordWS.js","names":["_Context","require","Effect","_interopRequireWildcard","Layer","Ref","Socket","
|
|
1
|
+
{"version":3,"file":"DiscordWS.js","names":["_Context","require","Effect","_interopRequireWildcard","Layer","Ref","Socket","Mailbox","Schedule","Cause","Option","LogLevel","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","Reconnect","exports","Symbol","for","decoder","TextDecoder","logLevelDebug","some","Debug","DiscordWSCodec","GenericTag","JsonDiscordWSCodecLive","succeed","type","encode","p","JSON","stringify","decode","parse","make","gen","encoding","connect","onConnecting","outbound","url","version","urlRef","setUrl","messages","socket","makeWebSocket","closeCodeIsError","_","openTimeout","write","writer","pipe","flatMap","zipRight","logTrace","CloseEvent","forever","annotateLogs","forkScoped","interruptible","withFiberRuntime","fiber","runRaw","message","unsafeOffer","log","empty","retry","while","reason","code","catchAllCause","cause","logDebug","repeat","exponential","union","spaced","take","module","DiscordWS","DiscordWSLive","effect"],"sources":["../src/DiscordGateway/DiscordWS.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import * as Effect from "effect/Effect";
|
|
2
2
|
import * as PubSub from "effect/PubSub";
|
|
3
3
|
import * as Layer from "effect/Layer";
|
|
4
|
-
import * as
|
|
4
|
+
import * as Mailbox from "effect/Mailbox";
|
|
5
5
|
import * as Stream from "effect/Stream";
|
|
6
6
|
import type * as Discord from "dfx/types";
|
|
7
7
|
export declare const make: Effect.Effect<{
|
|
8
8
|
readonly hub: PubSub.PubSub<Discord.GatewayPayload<Discord.ReceiveEvent>>;
|
|
9
|
-
readonly
|
|
9
|
+
readonly sendMailbox: Mailbox.Mailbox<Discord.GatewayPayload<Discord.SendEvent>, never>;
|
|
10
10
|
readonly dispatch: Stream.Stream<Discord.GatewayPayload<Discord.ReceiveEvent>, never, never>;
|
|
11
11
|
readonly fromDispatch: <K extends keyof Discord.ReceiveEvents>(event: K) => Stream.Stream<Discord.ReceiveEvents[K], never, never>;
|
|
12
12
|
readonly handleDispatch: <K extends keyof Discord.ReceiveEvents, R, E, A>(event: K, handle: (event: Discord.ReceiveEvents[K]) => Effect.Effect<A, E, R>) => Effect.Effect<never, E, R>;
|
|
@@ -17,7 +17,7 @@ export interface Messsaging {
|
|
|
17
17
|
}
|
|
18
18
|
export declare const Messaging: import("effect/Context").Tag<Messsaging, {
|
|
19
19
|
readonly hub: PubSub.PubSub<Discord.GatewayPayload<Discord.ReceiveEvent>>;
|
|
20
|
-
readonly
|
|
20
|
+
readonly sendMailbox: Mailbox.Mailbox<Discord.GatewayPayload<Discord.SendEvent>, never>;
|
|
21
21
|
readonly dispatch: Stream.Stream<Discord.GatewayPayload<Discord.ReceiveEvent>, never, never>;
|
|
22
22
|
readonly fromDispatch: <K extends keyof Discord.ReceiveEvents>(event: K) => Stream.Stream<Discord.ReceiveEvents[K], never, never>;
|
|
23
23
|
readonly handleDispatch: <K extends keyof Discord.ReceiveEvents, R, E, A>(event: K, handle: (event: Discord.ReceiveEvents[K]) => Effect.Effect<A, E, R>) => Effect.Effect<never, E, R>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Messaging.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/Messaging.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"Messaging.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/Messaging.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;AA4BzC,eAAO,MAAM,IAAI;;;;4BArBd,CAAC,SAAS,MAAM,OAAO,CAAC,aAAa;8BAUrC,CAAC,SAAS,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SACtC,CAAC,UACA,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAClE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;6BAkBN,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC;uCAehE,CAAA;AAEF,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AACD,eAAO,MAAM,SAAS;;;;4BAnDnB,CAAC,SAAS,MAAM,OAAO,CAAC,aAAa;8BAUrC,CAAC,SAAS,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SACtC,CAAC,UACA,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAClE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;6BAkBN,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC;EAuBjC,CAAA;AACjC,eAAO,MAAM,cAAc,uCAAgC,CAAA"}
|
|
@@ -8,7 +8,7 @@ var _Context = /*#__PURE__*/require("effect/Context");
|
|
|
8
8
|
var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
|
|
9
9
|
var PubSub = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/PubSub"));
|
|
10
10
|
var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
|
|
11
|
-
var
|
|
11
|
+
var Mailbox = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Mailbox"));
|
|
12
12
|
var Stream = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Stream"));
|
|
13
13
|
var EffectUtils = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/utils/Effect"));
|
|
14
14
|
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); }
|
|
@@ -22,14 +22,14 @@ const handleDispatchFactory = hub => (event, handle) => EffectUtils.subscribeFor
|
|
|
22
22
|
});
|
|
23
23
|
const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
|
|
24
24
|
const hub = yield* Effect.acquireRelease(PubSub.unbounded(), PubSub.shutdown);
|
|
25
|
-
const
|
|
26
|
-
const send = payload =>
|
|
25
|
+
const sendMailbox = yield* Effect.acquireRelease(Mailbox.make(), _ => _.shutdown);
|
|
26
|
+
const send = payload => sendMailbox.offer(payload);
|
|
27
27
|
const dispatch = Stream.fromPubSub(hub);
|
|
28
28
|
const fromDispatch = fromDispatchFactory(dispatch);
|
|
29
29
|
const handleDispatch = handleDispatchFactory(hub);
|
|
30
30
|
return {
|
|
31
31
|
hub,
|
|
32
|
-
|
|
32
|
+
sendMailbox,
|
|
33
33
|
dispatch,
|
|
34
34
|
fromDispatch,
|
|
35
35
|
handleDispatch,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Messaging.js","names":["_Context","require","Effect","_interopRequireWildcard","PubSub","Layer","
|
|
1
|
+
{"version":3,"file":"Messaging.js","names":["_Context","require","Effect","_interopRequireWildcard","PubSub","Layer","Mailbox","Stream","EffectUtils","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","fromDispatchFactory","source","event","map","filter","p","d","handleDispatchFactory","hub","handle","subscribeForEachPar","_","void","make","exports","gen","acquireRelease","unbounded","shutdown","sendMailbox","send","payload","offer","dispatch","fromPubSub","fromDispatch","handleDispatch","Messaging","GenericTag","MesssagingLive","scoped"],"sources":["../src/DiscordGateway/Messaging.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as Option from "effect/Option";
|
|
2
2
|
import * as Effect from "effect/Effect";
|
|
3
|
-
import * as Queue from "effect/Queue";
|
|
4
3
|
import * as DiscordWS from "dfx/DiscordGateway/DiscordWS";
|
|
5
4
|
import type * as Discord from "dfx/types";
|
|
6
5
|
import type { ShardState } from "dfx/DiscordGateway/Shard/StateStore";
|
|
7
|
-
|
|
6
|
+
import type * as Mailbox from "effect/Mailbox";
|
|
7
|
+
export declare const send: (hellos: Mailbox.ReadonlyMailbox<Discord.GatewayPayload>, acks: Mailbox.ReadonlyMailbox<Discord.GatewayPayload>, state: Effect.Effect<Option.Option<ShardState>>, send: (p: DiscordWS.Message) => Effect.Effect<boolean>) => Effect.Effect<void, import("effect/Cause").NoSuchElementException, never>;
|
|
8
8
|
//# sourceMappingURL=heartbeats.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heartbeats.d.ts","sourceRoot":"","sources":["../../src/DiscordGateway/Shard/heartbeats.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"heartbeats.d.ts","sourceRoot":"","sources":["../../src/DiscordGateway/Shard/heartbeats.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,KAAK,SAAS,MAAM,8BAA8B,CAAA;AAEzD,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;AAEzC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AACrE,OAAO,KAAK,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAiB9C,eAAO,MAAM,IAAI,WACP,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,QACjD,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,SAC9C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QACzC,CAAC,CAAC,EAAE,SAAS,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,8EA6BpD,CAAA"}
|
|
@@ -7,7 +7,6 @@ exports.send = void 0;
|
|
|
7
7
|
var Duration = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Duration"));
|
|
8
8
|
var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Option"));
|
|
9
9
|
var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
|
|
10
|
-
var Queue = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Queue"));
|
|
11
10
|
var Ref = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Ref"));
|
|
12
11
|
var Schedule = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Schedule"));
|
|
13
12
|
var DiscordWS = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/DiscordGateway/DiscordWS"));
|
|
@@ -18,8 +17,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
|
|
|
18
17
|
const payload = state => Effect.map(state, state => SendEvents.heartbeat(Option.getOrNull(Option.map(state, s => s.sequence))));
|
|
19
18
|
const payloadOrReconnect = (ref, state) => Effect.flatMap(Ref.get(ref), acked => acked ? payload(state) : Effect.succeed(DiscordWS.Reconnect));
|
|
20
19
|
const send = (hellos, acks, state, send) => Effect.flatMap(Ref.make(true), ackedRef => {
|
|
21
|
-
const heartbeats = EffectU.foreverSwitch(Effect.zipLeft(
|
|
22
|
-
const run =
|
|
20
|
+
const heartbeats = EffectU.foreverSwitch(Effect.zipLeft(hellos.take, Ref.set(ackedRef, true)), p => payloadOrReconnect(ackedRef, state).pipe(Effect.zipLeft(Ref.set(ackedRef, false)), Effect.tap(send), Effect.schedule(Schedule.andThen(Schedule.duration(Duration.millis(p.d.heartbeat_interval * Math.random())), Schedule.spaced(Duration.millis(p.d.heartbeat_interval))))));
|
|
21
|
+
const run = acks.take.pipe(Effect.zipLeft(Ref.set(ackedRef, true)), Effect.forever);
|
|
23
22
|
return Effect.all([run, heartbeats], {
|
|
24
23
|
concurrency: "unbounded",
|
|
25
24
|
discard: true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heartbeats.js","names":["Duration","_interopRequireWildcard","require","Option","Effect","
|
|
1
|
+
{"version":3,"file":"heartbeats.js","names":["Duration","_interopRequireWildcard","require","Option","Effect","Ref","Schedule","DiscordWS","SendEvents","EffectU","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","payload","state","map","heartbeat","getOrNull","s","sequence","payloadOrReconnect","ref","flatMap","acked","succeed","Reconnect","send","hellos","acks","make","ackedRef","heartbeats","foreverSwitch","zipLeft","take","p","pipe","tap","schedule","andThen","duration","millis","d","heartbeat_interval","Math","random","spaced","run","forever","all","concurrency","discard","exports"],"sources":["../../src/DiscordGateway/Shard/heartbeats.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -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,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EACL,SAAS,EAGV,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAA;AAGrE,OAAO,EAAE,WAAW,EAAmB,MAAM,eAAe,CAAA;AAK5D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;
|
|
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,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,EACL,SAAS,EAGV,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAA;AAGrE,OAAO,EAAE,WAAW,EAAmB,MAAM,eAAe,CAAA;AAK5D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAerC,eAAO,MAAM,IAAI;8BAOS,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC;;2BA0B9B,OAAO;;wHAmJ5B,CAAA;AAEF,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,CAAA;AAEtD,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AACD,eAAO,MAAM,KAAK;8BApLQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC;;2BA0B9B,OAAO;;EA0JkD,CAAA;AAChF,eAAO,MAAM,SAAS,6JAIrB,CAAA;AAGD,MAAM,WAAW,YACf,SAAQ,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;CAAG"}
|
package/DiscordGateway/Shard.js
CHANGED
|
@@ -20,7 +20,7 @@ var _Function = /*#__PURE__*/require("effect/Function");
|
|
|
20
20
|
var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
|
|
21
21
|
var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Option"));
|
|
22
22
|
var PubSub = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/PubSub"));
|
|
23
|
-
var
|
|
23
|
+
var Mailbox = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Mailbox"));
|
|
24
24
|
var Redacted = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Redacted"));
|
|
25
25
|
var Ref = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Ref"));
|
|
26
26
|
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); }
|
|
@@ -34,12 +34,12 @@ const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
34
34
|
const dws = yield* _DiscordWS.DiscordWS;
|
|
35
35
|
const {
|
|
36
36
|
hub,
|
|
37
|
-
|
|
37
|
+
sendMailbox
|
|
38
38
|
} = yield* _Messaging.Messaging;
|
|
39
39
|
const shardState = yield* _StateStore.ShardStateStore;
|
|
40
40
|
const connect = shard => Effect.gen(function* (_) {
|
|
41
|
-
const outboundQueue = yield*
|
|
42
|
-
const pendingQueue = yield*
|
|
41
|
+
const outboundQueue = yield* Mailbox.make();
|
|
42
|
+
const pendingQueue = yield* Mailbox.make();
|
|
43
43
|
const phase = yield* Ref.make(0 /* Phase.Connecting */);
|
|
44
44
|
const stateStore = shardState.forShard(shard);
|
|
45
45
|
const resumeState = Option.getOrElse(yield* stateStore.get, () => ({
|
|
@@ -48,18 +48,18 @@ const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
48
48
|
sequence: 0
|
|
49
49
|
}));
|
|
50
50
|
const setPhase = p => Effect.zipLeft(Ref.set(phase, p), Effect.annotateLogs(Effect.logTrace("phase transition"), "phase", p));
|
|
51
|
-
const outbound = Effect.zipLeft(
|
|
52
|
-
const send = p => Effect.flatMap(Ref.get(phase), phase => phase === 2 /* Phase.Connected */ ?
|
|
53
|
-
const heartbeatSend = p => Effect.flatMap(Ref.get(phase), phase => phase !== 0 /* Phase.Connecting */ ?
|
|
54
|
-
const prioritySend = p =>
|
|
55
|
-
const resume = (0, _Function.pipe)(setPhase(2 /* Phase.Connected */), Effect.zipRight(
|
|
56
|
-
const onConnecting = (0, _Function.pipe)(
|
|
51
|
+
const outbound = Effect.orDie(Effect.zipLeft(outboundQueue.take, limiter.maybeWait("dfx.shard.send", Duration.minutes(1), 120)));
|
|
52
|
+
const send = p => Effect.flatMap(Ref.get(phase), phase => phase === 2 /* Phase.Connected */ ? outboundQueue.offer(p) : pendingQueue.offer(p));
|
|
53
|
+
const heartbeatSend = p => Effect.flatMap(Ref.get(phase), phase => phase !== 0 /* Phase.Connecting */ ? outboundQueue.offer(p) : Effect.succeed(false));
|
|
54
|
+
const prioritySend = p => outboundQueue.offer(p);
|
|
55
|
+
const resume = (0, _Function.pipe)(setPhase(2 /* Phase.Connected */), Effect.zipRight(pendingQueue.clear), Effect.tap(_ => outboundQueue.offerAll(_)), Effect.asVoid);
|
|
56
|
+
const onConnecting = (0, _Function.pipe)(outboundQueue.clear, Effect.tap(msgs => pendingQueue.offerAll(Chunk.filter(msgs, msg => msg !== _DiscordWS.Reconnect && msg.op !== Discord.GatewayOpcode.IDENTIFY && msg.op !== Discord.GatewayOpcode.RESUME && msg.op !== Discord.GatewayOpcode.HEARTBEAT))), Effect.zipRight(setPhase(0 /* Phase.Connecting */)));
|
|
57
57
|
const socket = yield* dws.connect({
|
|
58
58
|
outbound,
|
|
59
59
|
onConnecting
|
|
60
60
|
});
|
|
61
|
-
const hellos = yield* Effect.acquireRelease(
|
|
62
|
-
const acks = yield* Effect.acquireRelease(
|
|
61
|
+
const hellos = yield* Effect.acquireRelease(Mailbox.make(), _ => _.shutdown);
|
|
62
|
+
const acks = yield* Effect.acquireRelease(Mailbox.make(), _ => _.shutdown);
|
|
63
63
|
// heartbeats
|
|
64
64
|
yield* Heartbeats.send(hellos, acks, stateStore.get, heartbeatSend).pipe(Effect.forkScoped, Effect.interruptible);
|
|
65
65
|
// identify
|
|
@@ -87,11 +87,11 @@ const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
87
87
|
switch (p.op) {
|
|
88
88
|
case Discord.GatewayOpcode.HELLO:
|
|
89
89
|
{
|
|
90
|
-
return (0, _Function.pipe)(Effect.tap(identify, prioritySend), Effect.zipRight(setPhase(1 /* Phase.Handshake */)), Effect.zipRight(
|
|
90
|
+
return (0, _Function.pipe)(Effect.tap(identify, prioritySend), Effect.zipRight(setPhase(1 /* Phase.Handshake */)), Effect.zipRight(hellos.offer(p)));
|
|
91
91
|
}
|
|
92
92
|
case Discord.GatewayOpcode.HEARTBEAT_ACK:
|
|
93
93
|
{
|
|
94
|
-
return
|
|
94
|
+
return acks.offer(p);
|
|
95
95
|
}
|
|
96
96
|
case Discord.GatewayOpcode.INVALID_SESSION:
|
|
97
97
|
{
|
|
@@ -118,7 +118,7 @@ const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
118
118
|
}
|
|
119
119
|
}
|
|
120
120
|
}));
|
|
121
|
-
yield*
|
|
121
|
+
yield* sendMailbox.take.pipe(Effect.tap(send), Effect.forever, Effect.forkScoped, Effect.interruptible);
|
|
122
122
|
yield* socket.take.pipe(Effect.flatMap(onPayload), Effect.forever, Effect.forkScoped, Effect.interruptible);
|
|
123
123
|
return {
|
|
124
124
|
id: shard,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Shard.js","names":["_DiscordConfig","require","_DiscordWS","_Messaging","_StateStore","Heartbeats","_interopRequireWildcard","Identify","_RateLimit","Discord","Chunk","_Context","Duration","Effect","_Function","Layer","Option","PubSub","
|
|
1
|
+
{"version":3,"file":"Shard.js","names":["_DiscordConfig","require","_DiscordWS","_Messaging","_StateStore","Heartbeats","_interopRequireWildcard","Identify","_RateLimit","Discord","Chunk","_Context","Duration","Effect","_Function","Layer","Option","PubSub","Mailbox","Redacted","Ref","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","make","exports","gen","gateway","token","DiscordConfig","limiter","RateLimiter","dws","DiscordWS","hub","sendMailbox","Messaging","shardState","ShardStateStore","connect","shard","_","outboundQueue","pendingQueue","phase","stateStore","forShard","resumeState","getOrElse","resumeUrl","sessionId","sequence","setPhase","p","zipLeft","annotateLogs","logTrace","outbound","orDie","take","maybeWait","minutes","send","flatMap","offer","heartbeatSend","succeed","prioritySend","resume","pipe","zipRight","clear","tap","offerAll","asVoid","onConnecting","msgs","filter","msg","Reconnect","op","GatewayOpcode","IDENTIFY","RESUME","HEARTBEAT","socket","hellos","acquireRelease","shutdown","acks","forkScoped","interruptible","identify","identifyOrResume","value","intents","presence","onPayload","suspend","s","DISPATCH","payload","d","session_id","resume_gateway_url","setUrl","void","HELLO","HEARTBEAT_ACK","INVALID_SESSION","publish","RECONNECT","forever","id","package","module","Shard","GenericTag","ShardLive","effect","provide","DiscordWSLive","MesssagingLive","RateLimiterLive"],"sources":["../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -10,5 +10,5 @@ export interface Sharder {
|
|
|
10
10
|
export declare const Sharder: import("effect/Context").Tag<Sharder, {
|
|
11
11
|
readonly shards: Effect.Effect<HashSet.HashSet<RunningShard>, never, never>;
|
|
12
12
|
}>;
|
|
13
|
-
export declare const SharderLive: Layer.Layer<Sharder, never, DiscordConfig | import("@effect/platform/HttpClient").HttpClient.
|
|
13
|
+
export declare const SharderLive: Layer.Layer<Sharder, never, DiscordConfig | import("@effect/platform/HttpClient").HttpClient.Service | import("dfx/RateLimit").RateLimitStore | ShardStore | import("./DiscordWS").DiscordWSCodec | import("./Shard/StateStore").ShardStateStore | import("@effect/platform/Socket").WebSocketConstructor>;
|
|
14
14
|
//# sourceMappingURL=Sharder.d.ts.map
|
package/DiscordGateway.d.ts
CHANGED
|
@@ -17,5 +17,5 @@ export interface DiscordGateway {
|
|
|
17
17
|
}
|
|
18
18
|
export declare const DiscordGateway: import("effect/Context").Tag<DiscordGateway, DiscordGateway>;
|
|
19
19
|
export declare const make: Effect.Effect<DiscordGateway, never, import("dfx/DiscordGateway/Messaging").Messsaging | Sharder>;
|
|
20
|
-
export declare const DiscordGatewayLive: Layer.Layer<DiscordGateway, never, import("./DiscordConfig").DiscordConfig | import("@effect/platform/HttpClient").HttpClient.
|
|
20
|
+
export declare const DiscordGatewayLive: Layer.Layer<DiscordGateway, never, import("./DiscordConfig").DiscordConfig | import("@effect/platform/HttpClient").HttpClient.Service | import("./RateLimit").RateLimitStore | import("./DiscordGateway/ShardStore").ShardStore | import("./DiscordGateway/DiscordWS").DiscordWSCodec | import("./DiscordGateway/Shard/StateStore").ShardStateStore | import("@effect/platform/Socket").WebSocketConstructor>;
|
|
21
21
|
//# sourceMappingURL=DiscordGateway.d.ts.map
|
package/DiscordREST.d.ts
CHANGED
|
@@ -25,6 +25,6 @@ export interface DiscordRESTService extends Discord.Endpoints<Partial<HttpReques
|
|
|
25
25
|
readonly executor: <A = unknown>(request: HttpRequest.HttpClientRequest) => Effect.Effect<ResponseWithData<A>, DiscordRESTError, Scope>;
|
|
26
26
|
}
|
|
27
27
|
export declare const DiscordREST: import("effect/Context").Tag<DiscordREST, DiscordRESTService>;
|
|
28
|
-
export declare const DiscordRESTLive: Layer.Layer<DiscordREST, never, DiscordConfig | HttpClient.HttpClient.
|
|
28
|
+
export declare const DiscordRESTLive: Layer.Layer<DiscordREST, never, DiscordConfig | HttpClient.HttpClient.Service | RateLimitStore>;
|
|
29
29
|
export {};
|
|
30
30
|
//# sourceMappingURL=DiscordREST.d.ts.map
|
package/DiscordREST.js
CHANGED
|
@@ -82,7 +82,7 @@ const make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
82
82
|
discard: true
|
|
83
83
|
});
|
|
84
84
|
}), Effect.ignore);
|
|
85
|
-
const
|
|
85
|
+
const httpClient = (0, _Function.pipe)(HttpClient.filterStatusOk(http), HttpClient.mapRequest(req => (0, _Function.pipe)(HttpRequest.prependUrl(req, rest.baseUrl), HttpRequest.setHeaders({
|
|
86
86
|
Authorization: `Bot ${Redacted.value(token)}`,
|
|
87
87
|
"User-Agent": `DiscordBot (https://github.com/tim-smart/dfx, ${_version.LIB_VERSION})`
|
|
88
88
|
}))), HttpClient.catchAll(cause => cause.reason === "StatusCode" ? cause.response.json.pipe(Effect.mapError(_ => new DiscordRESTError({
|
|
@@ -93,7 +93,7 @@ const make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
93
93
|
})))) : Effect.fail(new DiscordRESTError({
|
|
94
94
|
cause
|
|
95
95
|
}))));
|
|
96
|
-
const executor = request => requestRateLimit(request.url, request).pipe(Effect.zipLeft(globalRateLimit), Effect.zipRight(
|
|
96
|
+
const executor = request => requestRateLimit(request.url, request).pipe(Effect.zipLeft(globalRateLimit), Effect.zipRight(httpClient.execute(request)), Effect.tap(response => updateBuckets(request, response)), Effect.catchTag("DiscordRESTError", e => {
|
|
97
97
|
if (e.cause.reason !== "StatusCode") {
|
|
98
98
|
return Effect.fail(e);
|
|
99
99
|
}
|
|
@@ -127,7 +127,7 @@ const make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
127
127
|
} else if (params && request.body._tag === "FormData") {
|
|
128
128
|
request.body.formData.append("payload_json", JSON.stringify(params));
|
|
129
129
|
} else if (params) {
|
|
130
|
-
request = HttpRequest.
|
|
130
|
+
request = HttpRequest.bodyUnsafeJson(request, params);
|
|
131
131
|
}
|
|
132
132
|
return new RestResponseImpl(executor(request));
|
|
133
133
|
});
|
package/DiscordREST.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordREST.js","names":["_Error","require","HttpClient","_interopRequireWildcard","HttpRequest","_DiscordConfig","_utils","_RateLimit","Discord","_version","_Context","_Duration","Duration","Effect","Effectable","_Function","HashSet","Layer","Option","Ref","Redacted","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","DiscordRESTErrorTypeId","exports","Symbol","for","DiscordRESTError","TypeIdError","message","httpMessage","cause","body","undefined","JSON","stringify","make","gen","rest","token","DiscordConfig","http","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","void","asVoid","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","_tag","formData","append","unsafeJsonBody","RestResponseImpl","Class","effect","constructor","commit","scoped","DiscordREST","GenericTag","DiscordRESTLive","provide","RateLimiterLive"],"sources":["./src/DiscordREST.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"DiscordREST.js","names":["_Error","require","HttpClient","_interopRequireWildcard","HttpRequest","_DiscordConfig","_utils","_RateLimit","Discord","_version","_Context","_Duration","Duration","Effect","Effectable","_Function","HashSet","Layer","Option","Ref","Redacted","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","DiscordRESTErrorTypeId","exports","Symbol","for","DiscordRESTError","TypeIdError","message","httpMessage","cause","body","undefined","JSON","stringify","make","gen","rest","token","DiscordConfig","http","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","void","asVoid","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","httpClient","filterStatusOk","mapRequest","req","prependUrl","baseUrl","setHeaders","Authorization","value","LIB_VERSION","catchAll","reason","json","mapError","_","fail","executor","zipLeft","execute","catchTag","status","sleep","getOrElse","seconds","package","module","routes","createRoutes","options","params","hasBody","appendUrlParams","_tag","formData","append","bodyUnsafeJson","RestResponseImpl","Class","effect","constructor","commit","scoped","DiscordREST","GenericTag","DiscordRESTLive","provide","RateLimiterLive"],"sources":["./src/DiscordREST.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/gateway.d.ts
CHANGED
|
@@ -7,6 +7,6 @@ import * as Layer from "effect/Layer";
|
|
|
7
7
|
export { DiscordGateway, DiscordGatewayLive } from "dfx/DiscordGateway";
|
|
8
8
|
export { InteractionsRegistry, InteractionsRegistryLive, interactionsSync, run as runIx, setInteractionsSync, } from "dfx/Interactions/gateway";
|
|
9
9
|
export { CachePrelude, DiscordWS, SendEvent, Shard, ShardStore };
|
|
10
|
-
export declare const DiscordLive: Layer.Layer<import("dfx/DiscordREST").DiscordREST | import("dfx/RateLimit").RateLimiter | import("dfx/DiscordGateway").DiscordGateway, never, import("./DiscordConfig").DiscordConfig | import("@effect/platform/HttpClient").HttpClient.
|
|
11
|
-
export declare const DiscordIxLive: Layer.Layer<import("dfx/DiscordREST").DiscordREST | import("dfx/RateLimit").RateLimiter | import("dfx/DiscordGateway").DiscordGateway | import("dfx/Interactions/gateway").InteractionsRegistry, never, import("./DiscordConfig").DiscordConfig | import("@effect/platform/HttpClient").HttpClient.
|
|
10
|
+
export declare const DiscordLive: Layer.Layer<import("dfx/DiscordREST").DiscordREST | import("dfx/RateLimit").RateLimiter | import("dfx/DiscordGateway").DiscordGateway, never, import("./DiscordConfig").DiscordConfig | import("@effect/platform/HttpClient").HttpClient.Service | import("@effect/platform/Socket").WebSocketConstructor>;
|
|
11
|
+
export declare const DiscordIxLive: Layer.Layer<import("dfx/DiscordREST").DiscordREST | import("dfx/RateLimit").RateLimiter | import("dfx/DiscordGateway").DiscordGateway | import("dfx/Interactions/gateway").InteractionsRegistry, never, import("./DiscordConfig").DiscordConfig | import("@effect/platform/HttpClient").HttpClient.Service | import("@effect/platform/Socket").WebSocketConstructor>;
|
|
12
12
|
//# sourceMappingURL=gateway.d.ts.map
|
package/index.d.ts
CHANGED
|
@@ -12,5 +12,5 @@ import * as Layer from "effect/Layer";
|
|
|
12
12
|
export { DiscordREST, DiscordRESTLive } from "dfx/DiscordREST";
|
|
13
13
|
export { BucketDetails, MemoryRateLimitStoreLive, RateLimitStore, RateLimiter, RateLimiterLive, } from "dfx/RateLimit";
|
|
14
14
|
export { Cache, Discord, DiscordConfig, Flags, Intents, Ix, IxHelpers, Members, Perms, UI, };
|
|
15
|
-
export declare const DiscordRESTMemoryLive: Layer.Layer<import("dfx/DiscordREST").DiscordREST, never, DiscordConfig.DiscordConfig | import("@effect/platform/HttpClient").HttpClient.
|
|
15
|
+
export declare const DiscordRESTMemoryLive: Layer.Layer<import("dfx/DiscordREST").DiscordREST, never, DiscordConfig.DiscordConfig | import("@effect/platform/HttpClient").HttpClient.Service>;
|
|
16
16
|
//# sourceMappingURL=index.d.ts.map
|