dfx 0.61.6 → 0.62.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/DiscordConfig.d.ts +2 -2
- package/DiscordConfig.d.ts.map +1 -1
- package/DiscordGateway/Shard.d.ts.map +1 -1
- package/DiscordGateway/Shard.js +14 -12
- package/DiscordGateway/Shard.js.map +1 -1
- package/DiscordGateway/Sharder.d.ts.map +1 -1
- package/DiscordGateway/Sharder.js +9 -9
- package/DiscordGateway/Sharder.js.map +1 -1
- package/DiscordGateway/WS.d.ts.map +1 -1
- package/DiscordGateway/WS.js +9 -14
- package/DiscordGateway/WS.js.map +1 -1
- package/DiscordGateway.d.ts.map +1 -1
- package/DiscordGateway.js +1 -1
- package/DiscordGateway.js.map +1 -1
- package/DiscordREST.js +1 -1
- package/Interactions/webhook.d.ts +2 -2
- package/Interactions/webhook.d.ts.map +1 -1
- package/Interactions/webhook.js +1 -1
- package/gateway.d.ts +1 -1
- package/gateway.d.ts.map +1 -1
- package/mjs/DiscordGateway/Shard.mjs +14 -12
- package/mjs/DiscordGateway/Shard.mjs.map +1 -1
- package/mjs/DiscordGateway/Sharder.mjs +9 -9
- package/mjs/DiscordGateway/Sharder.mjs.map +1 -1
- package/mjs/DiscordGateway/WS.mjs +9 -14
- package/mjs/DiscordGateway/WS.mjs.map +1 -1
- package/mjs/DiscordGateway.mjs +1 -1
- package/mjs/DiscordGateway.mjs.map +1 -1
- package/mjs/DiscordREST.mjs +1 -1
- package/mjs/DiscordREST.mjs.map +1 -1
- package/mjs/Interactions/webhook.mjs +1 -1
- package/mjs/Interactions/webhook.mjs.map +1 -1
- package/mjs/utils/Effect.mjs +4 -4
- package/mjs/utils/Effect.mjs.map +1 -1
- package/mjs/version.mjs +1 -1
- package/package.json +6 -6
- package/src/DiscordConfig.ts +2 -2
- package/src/DiscordGateway/Shard.ts +27 -28
- package/src/DiscordGateway/Sharder.ts +11 -9
- package/src/DiscordGateway/WS.ts +28 -34
- package/src/DiscordGateway.ts +4 -1
- package/src/DiscordREST.ts +1 -1
- package/src/Interactions/webhook.ts +2 -2
- package/src/gateway.ts +1 -1
- package/src/utils/Effect.ts +22 -19
- package/src/version.ts +1 -1
- package/src/webhooks.ts +1 -1
- package/utils/Effect.d.ts.map +1 -1
- package/utils/Effect.js +4 -4
- package/utils/Effect.js.map +1 -1
- package/version.d.ts +1 -1
- package/version.js +1 -1
- package/webhooks.d.ts +1 -1
- package/webhooks.d.ts.map +1 -1
package/DiscordConfig.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Tag } from "@effect/data/Context";
|
|
2
2
|
import * as Duration from "@effect/data/Duration";
|
|
3
3
|
import * as Config from "@effect/io/Config";
|
|
4
|
-
import type * as ConfigError from "@effect/io/
|
|
5
|
-
import type * as ConfigSecret from "@effect/io/
|
|
4
|
+
import type * as ConfigError from "@effect/io/ConfigError";
|
|
5
|
+
import type * as ConfigSecret from "@effect/io/ConfigSecret";
|
|
6
6
|
import * as Layer from "@effect/io/Layer";
|
|
7
7
|
import * as Discord from "dfx/types";
|
|
8
8
|
export interface DiscordConfig {
|
package/DiscordConfig.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordConfig.d.ts","sourceRoot":"","sources":["./src/DiscordConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC1C,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAA;AACjD,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,
|
|
1
|
+
{"version":3,"file":"DiscordConfig.d.ts","sourceRoot":"","sources":["./src/DiscordConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC1C,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAA;AACjD,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,wBAAwB,CAAA;AAC1D,OAAO,KAAK,KAAK,YAAY,MAAM,yBAAyB,CAAA;AAE5D,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AAIpC,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAA;IACzC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;IACvB,QAAQ,CAAC,IAAI,EAAE;QACb,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,eAAe,EAAE;YACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;YACtB,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAA;SACxC,CAAA;KACF,CAAA;IACD,QAAQ,CAAC,OAAO,EAAE;QAChB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,cAAc,CAAA;QAC1C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;QAE5B,QAAQ,CAAC,iBAAiB,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;KACrE,CAAA;CACF;AACD,eAAO,MAAM,aAAa,mCAAuB,CAAA;AAEjD,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAA;IACzC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;IAC9C,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAA;CACrD;AAED,eAAO,MAAM,IAAI,qCAKd,QAAQ,KAAG,aAiBZ,CAAA;AAEF,eAAO,MAAM,SAAS,SACd,QAAQ,KACb,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,aAAa,CACA,CAAA;AAE1C,eAAO,MAAM,cAAc,MACtB,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,KAC9B,WAAW,CAAC,KAAK,EAAE,uBAAuB,EAAE,aAAa,CACoB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Shard.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/Shard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"Shard.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/Shard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAK1C,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,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,EAAmB,WAAW,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,KAAK,OAAO,MAAM,WAAW,CAAA;AAQpC,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;;;EA0I5B,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
|
@@ -8,7 +8,7 @@ var Chunk = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/
|
|
|
8
8
|
var _Context = /*#__PURE__*/require("@effect/data/Context");
|
|
9
9
|
var Duration = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/data/Duration"));
|
|
10
10
|
var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/data/Option"));
|
|
11
|
-
var ConfigSecret = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/
|
|
11
|
+
var ConfigSecret = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/ConfigSecret"));
|
|
12
12
|
var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
|
|
13
13
|
var Hub = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Hub"));
|
|
14
14
|
var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Layer"));
|
|
@@ -43,20 +43,21 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
43
43
|
const send = p => Effect.flatMap(Ref.get(phase), phase => phase === 2 /* Phase.Connected */ ? Queue.offer(outboundQueue, p) : Queue.offer(pendingQueue, p));
|
|
44
44
|
const heartbeatSend = p => Effect.flatMap(Ref.get(phase), phase => phase !== 0 /* Phase.Connecting */ ? Queue.offer(outboundQueue, p) : Effect.succeed(false));
|
|
45
45
|
const prioritySend = p => Queue.offer(outboundQueue, p);
|
|
46
|
-
const resume =
|
|
47
|
-
const onConnecting =
|
|
46
|
+
const resume = Effect.asUnit(Effect.tap(_ => Queue.offerAll(outboundQueue, _))(Effect.zipRight(Queue.takeAll(pendingQueue))(setPhase(2 /* Phase.Connected */))));
|
|
47
|
+
const onConnecting = Effect.zipRight(setPhase(0 /* Phase.Connecting */))(Effect.tap(msgs => Queue.offerAll(pendingQueue, Chunk.filter(msgs, msg => msg !== _WS.Reconnect && msg.op !== Discord.GatewayOpcode.IDENTIFY && msg.op !== Discord.GatewayOpcode.RESUME && msg.op !== Discord.GatewayOpcode.HEARTBEAT)))(Queue.takeAll(outboundQueue)));
|
|
48
48
|
const socket = yield* _(dws.connect({
|
|
49
49
|
outbound,
|
|
50
50
|
onConnecting
|
|
51
51
|
}));
|
|
52
|
-
const
|
|
52
|
+
const isReady = Option.liftPredicate(p => p.op === Discord.GatewayOpcode.DISPATCH && p.t === "READY");
|
|
53
|
+
const [latestReady, updateLatestReady] = yield* _(Utils.latest(p => Option.map(isReady(p), p => p.d)));
|
|
53
54
|
const [latestSequence, updateLatestSequence] = yield* _(Utils.latest(p => Option.fromNullable(p.s)));
|
|
54
|
-
const maybeUpdateUrl = p => Option.
|
|
55
|
+
const maybeUpdateUrl = p => Option.match(Option.map(isReady(p), p => p.d), {
|
|
55
56
|
onNone: () => Effect.unit,
|
|
56
57
|
onSome: ({
|
|
57
58
|
resume_gateway_url
|
|
58
59
|
}) => socket.setUrl(resume_gateway_url)
|
|
59
|
-
})
|
|
60
|
+
});
|
|
60
61
|
const hellos = yield* _(Queue.unbounded());
|
|
61
62
|
const acks = yield* _(Queue.unbounded());
|
|
62
63
|
// heartbeats
|
|
@@ -68,10 +69,10 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
68
69
|
intents: gateway.intents,
|
|
69
70
|
presence: gateway.presence
|
|
70
71
|
}, latestReady, latestSequence);
|
|
71
|
-
const onPayload = p =>
|
|
72
|
+
const onPayload = p => Effect.tap(() => {
|
|
72
73
|
switch (p.op) {
|
|
73
74
|
case Discord.GatewayOpcode.HELLO:
|
|
74
|
-
return Effect.
|
|
75
|
+
return Effect.zipRight(Queue.offer(hellos, p))(Effect.zipRight(setPhase(1 /* Phase.Handshake */))(Effect.tap(identify, prioritySend)));
|
|
75
76
|
case Discord.GatewayOpcode.HEARTBEAT_ACK:
|
|
76
77
|
return Queue.offer(acks, p);
|
|
77
78
|
case Discord.GatewayOpcode.INVALID_SESSION:
|
|
@@ -81,11 +82,12 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
81
82
|
return Effect.zipRight(resume, Hub.publish(hub, p));
|
|
82
83
|
}
|
|
83
84
|
return Hub.publish(hub, p);
|
|
85
|
+
default:
|
|
86
|
+
return Effect.unit;
|
|
84
87
|
}
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
const
|
|
88
|
-
const run = Effect.all([socket.take.pipe(Effect.flatMap(onPayload), Effect.forever), heartbeats, drainSendQueue, socket.run], {
|
|
88
|
+
})(Effect.zipRight(maybeUpdateUrl(p))(Effect.zipRight(updateLatestSequence(p))(updateLatestReady(p))));
|
|
89
|
+
const drainSendQueue = Effect.forever(Effect.tap(Queue.take(sendQueue), send));
|
|
90
|
+
const run = Effect.all([Effect.forever(Effect.flatMap(socket.take, onPayload)), heartbeats, drainSendQueue, socket.run], {
|
|
89
91
|
discard: true,
|
|
90
92
|
concurrency: "unbounded"
|
|
91
93
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Shard.js","names":["Chunk","_interopRequireWildcard","require","_Context","Duration","Option","ConfigSecret","Effect","Hub","Layer","Queue","Ref","_DiscordConfig","_DiscordWS","Heartbeats","Identify","InvalidSession","Utils","_WS","_Log","_RateLimit","Discord","_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","
|
|
1
|
+
{"version":3,"file":"Shard.js","names":["Chunk","_interopRequireWildcard","require","_Context","Duration","Option","ConfigSecret","Effect","Hub","Layer","Queue","Ref","_DiscordConfig","_DiscordWS","Heartbeats","Identify","InvalidSession","Utils","_WS","_Log","_RateLimit","Discord","_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","asUnit","tap","offerAll","zipRight","takeAll","onConnecting","msgs","filter","msg","Reconnect","op","GatewayOpcode","IDENTIFY","RESUME","HEARTBEAT","socket","isReady","liftPredicate","DISPATCH","t","latestReady","updateLatestReady","latest","map","d","latestSequence","updateLatestSequence","fromNullable","s","maybeUpdateUrl","match","onNone","unit","onSome","resume_gateway_url","setUrl","hellos","acks","heartbeats","identify","identifyOrResume","value","intents","presence","onPayload","HELLO","HEARTBEAT_ACK","INVALID_SESSION","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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Sharder.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/Sharder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"Sharder.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/Sharder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAG1C,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAG/C,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,GAAG,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAG9C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAa,KAAK,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAC1D,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAmB,WAAW,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;AAOzC,QAAA,MAAM,IAAI;;wBAiDD,OAAO,CAAC,QAAQ,cAAc,CAAC,QAAQ,YAAY,CAAC,CAAC,aAC/C,MAAM,OAAO,CAAC,QAAQ,cAAc,CAAC,QAAQ,SAAS,CAAC,CAAC;EAuDrE,CAAA;AAEF,MAAM,WAAW,OAAQ,SAAQ,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC;CAAG;AACtE,eAAO,MAAM,OAAO,uBAAiB,CAAA;AACrC,eAAO,MAAM,WAAW,8KAGvB,CAAA"}
|
|
@@ -32,14 +32,14 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
32
32
|
const currentShards = yield* _(Ref.make(HashSet.empty()));
|
|
33
33
|
const takeConfig = totalCount => Effect.gen(function* (_) {
|
|
34
34
|
const currentCount = yield* _(Ref.make(0));
|
|
35
|
-
const claimId = sharderCount => store.claimId({
|
|
35
|
+
const claimId = sharderCount => Effect.map(_ => _.value)(Effect.repeat(claimRepeatPolicy)(store.claimId({
|
|
36
36
|
totalCount,
|
|
37
37
|
sharderCount
|
|
38
|
-
})
|
|
39
|
-
return
|
|
38
|
+
})));
|
|
39
|
+
return Effect.map(id => ({
|
|
40
40
|
id,
|
|
41
41
|
totalCount
|
|
42
|
-
})));
|
|
42
|
+
}))(Effect.flatMap(claimId)(Ref.getAndUpdate(currentCount, _ => _ + 1)));
|
|
43
43
|
});
|
|
44
44
|
const gateway = yield* _(rest.getGatewayBot(), Effect.flatMap(r => r.json), Effect.catchAll(() => Effect.succeed({
|
|
45
45
|
url: "wss://gateway.discord.gg/",
|
|
@@ -54,14 +54,14 @@ const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
54
54
|
const run = (hub, sendQueue) => Effect.gen(function* (_) {
|
|
55
55
|
const deferred = yield* _(Deferred.make());
|
|
56
56
|
const take = yield* _(takeConfig(config.shardCount ?? gateway.shards));
|
|
57
|
-
const spawner =
|
|
57
|
+
const spawner = Effect.forever(Effect.flatMap(shard => Effect.acquireUseRelease(Ref.update(currentShards, HashSet.add(shard)), () => shard.run, () => Ref.update(currentShards, HashSet.remove(shard))).pipe(Effect.catchAllCause(_ => Deferred.failCause(deferred, _)), Effect.fork))(Effect.flatMap(c => shard.connect([c.id, c.totalCount], hub, sendQueue))(Effect.tap(({
|
|
58
|
+
concurrency,
|
|
59
|
+
id
|
|
60
|
+
}) => limiter.maybeWait(`dfx.sharder.${id % concurrency}`, Duration.millis(config.identifyRateLimit[0]), config.identifyRateLimit[1]))(Effect.map(config => ({
|
|
58
61
|
...config,
|
|
59
62
|
url: gateway.url,
|
|
60
63
|
concurrency: gateway.session_start_limit.max_concurrency
|
|
61
|
-
}))
|
|
62
|
-
concurrency,
|
|
63
|
-
id
|
|
64
|
-
}) => limiter.maybeWait(`dfx.sharder.${id % concurrency}`, Duration.millis(config.identifyRateLimit[0]), config.identifyRateLimit[1])), Effect.flatMap(c => shard.connect([c.id, c.totalCount], hub, sendQueue)), Effect.flatMap(shard => Effect.acquireUseRelease(Ref.update(currentShards, HashSet.add(shard)), () => shard.run, () => Ref.update(currentShards, HashSet.remove(shard))).pipe(Effect.catchAllCause(_ => Deferred.failCause(deferred, _)), Effect.fork)), Effect.forever);
|
|
64
|
+
}))(take)))));
|
|
65
65
|
const spawners = Chunk.map(Chunk.range(1, gateway.session_start_limit.max_concurrency), () => spawner);
|
|
66
66
|
return yield* _(Effect.all([Effect.all(spawners, {
|
|
67
67
|
concurrency: "unbounded",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Sharder.js","names":["Chunk","_interopRequireWildcard","require","_Context","Duration","HashSet","Deferred","Effect","Layer","Ref","Schedule","_DiscordConfig","_Shard","_ShardStore","_DiscordREST","_RateLimit","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","claimRepeatPolicy","spaced","pipe","whileInput","_","_tag","passthrough","make","gen","store","ShardStore","rest","DiscordREST","gateway","config","DiscordConfig","limiter","RateLimiter","shard","Shard","currentShards","empty","takeConfig","totalCount","currentCount","claimId","sharderCount","
|
|
1
|
+
{"version":3,"file":"Sharder.js","names":["Chunk","_interopRequireWildcard","require","_Context","Duration","HashSet","Deferred","Effect","Layer","Ref","Schedule","_DiscordConfig","_Shard","_ShardStore","_DiscordREST","_RateLimit","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","claimRepeatPolicy","spaced","pipe","whileInput","_","_tag","passthrough","make","gen","store","ShardStore","rest","DiscordREST","gateway","config","DiscordConfig","limiter","RateLimiter","shard","Shard","currentShards","empty","takeConfig","totalCount","currentCount","claimId","sharderCount","map","value","repeat","id","flatMap","getAndUpdate","getGatewayBot","r","json","catchAll","succeed","url","shards","session_start_limit","total","remaining","reset_after","max_concurrency","run","hub","sendQueue","deferred","take","shardCount","spawner","forever","acquireUseRelease","update","add","remove","catchAllCause","failCause","fork","c","connect","tap","concurrency","maybeWait","millis","identifyRateLimit","spawners","range","all","discard","await","Sharder","Tag","exports","LiveSharder","provide","merge","LiveRateLimiter","LiveShard","effect"],"sources":["../src/DiscordGateway/Sharder.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WS.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/WS.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC1C,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"WS.d.ts","sourceRoot":"","sources":["../src/DiscordGateway/WS.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC1C,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAA;AAEjD,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAEzC,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,SAAS,MAAM,eAAe,CAAA;AAErC,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;IAG5B,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM;IAHzB,QAAQ,CAAC,IAAI,yBAAwB;gBAE1B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM;CAE1B;AAsFD,QAAA,MAAM,IAAI;4BAID,OAAO,CAAC,MAAM,CAAC,gBACN,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC;;;;EA8BpD,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/DiscordGateway/WS.js
CHANGED
|
@@ -10,7 +10,6 @@ var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect
|
|
|
10
10
|
var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Layer"));
|
|
11
11
|
var Queue = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Queue"));
|
|
12
12
|
var Ref = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Ref"));
|
|
13
|
-
var Runtime = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Runtime"));
|
|
14
13
|
var _Log = /*#__PURE__*/require("dfx/Log");
|
|
15
14
|
var _isomorphicWs = /*#__PURE__*/_interopRequireDefault( /*#__PURE__*/require("isomorphic-ws"));
|
|
16
15
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
@@ -39,19 +38,15 @@ class WebSocketCloseError {
|
|
|
39
38
|
}
|
|
40
39
|
exports.WebSocketCloseError = WebSocketCloseError;
|
|
41
40
|
const isReconnect = e => e._tag === "WebSocketCloseError" && e.code === 1012;
|
|
42
|
-
const socket = urlRef =>
|
|
41
|
+
const socket = urlRef => Effect.acquireRelease(ws => Effect.sync(() => {
|
|
43
42
|
// eslint-disable-next-line no-extra-semi
|
|
44
43
|
;
|
|
45
44
|
ws.removeAllListeners?.();
|
|
46
45
|
ws.close();
|
|
47
|
-
})));
|
|
48
|
-
const offer = (ws, queue, log) => Effect.
|
|
49
|
-
const run = Runtime.runFork(runtime);
|
|
46
|
+
}))(Effect.map(_ => new _isomorphicWs.default(_))(Ref.get(urlRef)));
|
|
47
|
+
const offer = (ws, queue, log) => Effect.async(resume => {
|
|
50
48
|
ws.addEventListener("message", message => {
|
|
51
|
-
|
|
52
|
-
concurrency: "unbounded",
|
|
53
|
-
discard: true
|
|
54
|
-
}));
|
|
49
|
+
Effect.runFork(Effect.zipRight(log.debug("WS", "receive", message.data), Queue.offer(queue, message.data)));
|
|
55
50
|
});
|
|
56
51
|
ws.addEventListener("error", cause => {
|
|
57
52
|
resume(Effect.fail(new WebSocketError("error", cause)));
|
|
@@ -59,7 +54,7 @@ const offer = (ws, queue, log) => Effect.runtime().pipe(Effect.flatMap(runtime =
|
|
|
59
54
|
ws.addEventListener("close", e => {
|
|
60
55
|
resume(Effect.fail(new WebSocketCloseError(e.code, e.reason)));
|
|
61
56
|
});
|
|
62
|
-
})
|
|
57
|
+
});
|
|
63
58
|
const waitForOpen = (ws, timeout) => Effect.timeoutFail(Effect.suspend(() => {
|
|
64
59
|
if (ws.readyState === _isomorphicWs.default.OPEN) {
|
|
65
60
|
return Effect.unit;
|
|
@@ -73,7 +68,7 @@ const waitForOpen = (ws, timeout) => Effect.timeoutFail(Effect.suspend(() => {
|
|
|
73
68
|
onTimeout: () => new WebSocketError("open-timeout"),
|
|
74
69
|
duration: timeout
|
|
75
70
|
});
|
|
76
|
-
const send = (ws, take, log) =>
|
|
71
|
+
const send = (ws, take, log) => Effect.forever(Effect.tap(data => {
|
|
77
72
|
if (data === Reconnect) {
|
|
78
73
|
return Effect.failSync(() => {
|
|
79
74
|
ws.close(1012, "reconnecting");
|
|
@@ -83,15 +78,15 @@ const send = (ws, take, log) => take.pipe(Effect.tap(data => log.debug("WS", "se
|
|
|
83
78
|
return Effect.sync(() => {
|
|
84
79
|
ws.send(data);
|
|
85
80
|
});
|
|
86
|
-
}),
|
|
81
|
+
})(Effect.tap(data => log.debug("WS", "send", data))(take)));
|
|
87
82
|
const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
88
83
|
const log = yield* _(_Log.Log);
|
|
89
84
|
const connect = (url, takeOutbound, onConnecting = Effect.unit, openTimeout = Duration.seconds(3)) => Effect.gen(function* (_) {
|
|
90
85
|
const queue = yield* _(Queue.unbounded());
|
|
91
|
-
const run =
|
|
86
|
+
const run = Effect.retryWhile(isReconnect)(Effect.scoped(Effect.flatMap(ws => Effect.all([offer(ws, queue, log), Effect.zipRight(waitForOpen(ws, openTimeout), send(ws, takeOutbound, log))], {
|
|
92
87
|
concurrency: "unbounded",
|
|
93
88
|
discard: true
|
|
94
|
-
}))
|
|
89
|
+
}))(Effect.zipRight(socket(url))(onConnecting))));
|
|
95
90
|
return {
|
|
96
91
|
run,
|
|
97
92
|
take: Queue.take(queue)
|
package/DiscordGateway/WS.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WS.js","names":["_Context","require","Duration","_interopRequireWildcard","Effect","Layer","Queue","Ref","
|
|
1
|
+
{"version":3,"file":"WS.js","names":["_Context","require","Duration","_interopRequireWildcard","Effect","Layer","Queue","Ref","_Log","_isomorphicWs","_interopRequireDefault","obj","__esModule","default","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","Reconnect","Symbol","exports","WebSocketError","reason","error","_tag","constructor","WebSocketCloseError","code","isReconnect","e","socket","urlRef","acquireRelease","ws","sync","removeAllListeners","close","map","_","WebSocket","offer","queue","log","async","resume","addEventListener","message","runFork","zipRight","debug","data","cause","fail","waitForOpen","timeout","timeoutFail","suspend","readyState","OPEN","unit","once","onTimeout","duration","send","take","forever","tap","failSync","make","gen","Log","connect","url","takeOutbound","onConnecting","openTimeout","seconds","unbounded","run","retryWhile","scoped","flatMap","all","concurrency","discard","WS","Tag","LiveWS","effect"],"sources":["../src/DiscordGateway/WS.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/DiscordGateway.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordGateway.d.ts","sourceRoot":"","sources":["./src/DiscordGateway.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC1C,OAAO,KAAK,KAAK,OAAO,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAE3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAEzC,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAe,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAChF,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"DiscordGateway.d.ts","sourceRoot":"","sources":["./src/DiscordGateway.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC1C,OAAO,KAAK,KAAK,OAAO,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAE3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAEzC,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAe,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAChF,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;AA4BzC,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CACzB,KAAK,EACL,cAAc,GAAG,mBAAmB,EACpC,KAAK,CACN,CAAA;IACD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAC9B,KAAK,EACL,KAAK,EACL,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,CAC7C,CAAA;IACD,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,SAAS,MAAM,OAAO,CAAC,aAAa,EAC3D,KAAK,EAAE,CAAC,KACL,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IAC1D,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,SAAS,MAAM,OAAO,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EACtE,KAAK,EAAE,CAAC,EACR,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAChE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAA;IAC/B,QAAQ,CAAC,IAAI,EAAE,CACb,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,KAC/C,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAA;CAC5E;AACD,eAAO,MAAM,cAAc,qCAAwB,CAAA;AAEnD,eAAO,MAAM,IAAI,+CA0Bf,CAAA;AAEF,eAAO,MAAM,kBAAkB,yRAG9B,CAAA"}
|
package/DiscordGateway.js
CHANGED
|
@@ -14,7 +14,7 @@ var _Sharder = /*#__PURE__*/require("dfx/DiscordGateway/Sharder");
|
|
|
14
14
|
var EffectUtils = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("dfx/utils/Effect"));
|
|
15
15
|
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); }
|
|
16
16
|
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; }
|
|
17
|
-
const fromDispatchFactory = source => event => Stream.filter(source, p => p.t === event)
|
|
17
|
+
const fromDispatchFactory = source => event => Stream.map(Stream.filter(source, p => p.t === event), p => p.d);
|
|
18
18
|
const handleDispatchFactory = hub => (event, handle) => EffectUtils.subscribeForEachPar(hub, _ => {
|
|
19
19
|
if (_.t === event) {
|
|
20
20
|
return handle(_.d);
|
package/DiscordGateway.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordGateway.js","names":["_Context","require","Effect","_interopRequireWildcard","Hub","Layer","Queue","Stream","_Sharder","EffectUtils","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","fromDispatchFactory","source","event","filter","p","t","
|
|
1
|
+
{"version":3,"file":"DiscordGateway.js","names":["_Context","require","Effect","_interopRequireWildcard","Hub","Layer","Queue","Stream","_Sharder","EffectUtils","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","fromDispatchFactory","source","event","map","filter","p","t","d","handleDispatchFactory","hub","handle","subscribeForEachPar","_","unit","DiscordGateway","Tag","exports","make","gen","sharder","Sharder","unbounded","sendQueue","send","payload","offer","dispatch","fromHub","fromDispatch","handleDispatch","run","of","shards","LiveDiscordGateway","provide","LiveSharder","effect"],"sources":["./src/DiscordGateway.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,QAAA,gBAAAC,OAAA;AAEA,IAAAC,MAAA,gBAAAC,uBAAA,eAAAF,OAAA;AACA,IAAAG,GAAA,gBAAAD,uBAAA,eAAAF,OAAA;AACA,IAAAI,KAAA,gBAAAF,uBAAA,eAAAF,OAAA;AACA,IAAAK,KAAA,gBAAAH,uBAAA,eAAAF,OAAA;AACA,IAAAM,MAAA,gBAAAJ,uBAAA,eAAAF,OAAA;AAEA,IAAAO,QAAA,gBAAAP,OAAA;AAGA,IAAAQ,WAAA,gBAAAN,uBAAA,eAAAF,OAAA;AAA+C,SAAAS,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,SAAAR,wBAAAY,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;AAE/C,MAAMW,mBAAmB,GAErBC,MAAyE,IAGzEC,KAAQ,IAER3B,MAAM,CAAC4B,GAAG,CACR5B,MAAM,CAAC6B,MAAM,CAACH,MAAM,EAAEI,CAAC,IAAIA,CAAC,CAACC,CAAC,KAAKJ,KAAK,CAAC,EACzCG,CAAC,IAAIA,CAAC,CAACE,CAAS,CACjB;AAEL,MAAMC,qBAAqB,GACxBC,GAA0D,IAC3D,CACEP,KAAQ,EACRQ,MAAmE,KAEnEjC,WAAW,CAACkC,mBAAmB,CAACF,GAAG,EAAEG,CAAC,IAAG;EACvC,IAAIA,CAAC,CAACN,CAAC,KAAKJ,KAAK,EAAE;IACjB,OAAOQ,MAAM,CAACE,CAAC,CAACL,CAAQ,CAAC;;EAE3B,OAAOrC,MAAM,CAAC2C,IAAI;AACpB,CAAC,CAAC;AAyBC,MAAMC,cAAc,gBAAG,IAAAC,YAAG,GAAkB;AAAAC,OAAA,CAAAF,cAAA,GAAAA,cAAA;AAE5C,MAAMG,IAAI,gBAAG/C,MAAM,CAACgD,GAAG,CAAC,WAAWN,CAAC;EACzC,MAAMO,OAAO,GAAG,OAAOP,CAAC,CAACQ,gBAAO,CAAC;EACjC,MAAMX,GAAG,GAAG,OAAOG,CAAC,CAClBxC,GAAG,CAACiD,SAAS,EAAgD,CAC9D;EAED,MAAMC,SAAS,GAAG,OAAOV,CAAC,CACxBtC,KAAK,CAAC+C,SAAS,EAA6C,CAC7D;EACD,MAAME,IAAI,GAAIC,OAAkD,IAC9DF,SAAS,CAACG,KAAK,CAACD,OAAO,CAAC;EAE1B,MAAME,QAAQ,GAAGnD,MAAM,CAACoD,OAAO,CAAClB,GAAG,CAAC;EACpC,MAAMmB,YAAY,GAAG5B,mBAAmB,CAAC0B,QAAQ,CAAC;EAClD,MAAMG,cAAc,GAAGrB,qBAAqB,CAACC,GAAG,CAAC;EAEjD,MAAMqB,GAAG,GAAGX,OAAO,CAACW,GAAG,CAACrB,GAAG,EAAEa,SAAS,CAAC;EAEvC,OAAOR,cAAc,CAACiB,EAAE,CAAC;IACvBD,GAAG;IACHJ,QAAQ;IACRE,YAAY;IACZC,cAAc;IACdN,IAAI;IACJS,MAAM,EAAEb,OAAO,CAACa;GACjB,CAAC;AACJ,CAAC,CAAC;AAAAhB,OAAA,CAAAC,IAAA,GAAAA,IAAA;AAEK,MAAMgB,kBAAkB,gBAAG5D,KAAK,CAAC6D,OAAO,CAC7CC,oBAAW,eACX9D,KAAK,CAAC+D,MAAM,CAACtB,cAAc,EAAEG,IAAI,CAAC,CACnC;AAAAD,OAAA,CAAAiB,kBAAA,GAAAA,kBAAA"}
|
package/DiscordREST.js
CHANGED
|
@@ -8,7 +8,7 @@ var _Context = /*#__PURE__*/require("@effect/data/Context");
|
|
|
8
8
|
var Duration = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/data/Duration"));
|
|
9
9
|
var HashSet = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/data/HashSet"));
|
|
10
10
|
var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/data/Option"));
|
|
11
|
-
var ConfigSecret = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/
|
|
11
|
+
var ConfigSecret = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/ConfigSecret"));
|
|
12
12
|
var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
|
|
13
13
|
var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Layer"));
|
|
14
14
|
var Ref = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Ref"));
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Tag } from "@effect/data/Context";
|
|
2
2
|
import type * as Cause from "@effect/io/Cause";
|
|
3
3
|
import type * as Config from "@effect/io/Config";
|
|
4
|
-
import type * as ConfigError from "@effect/io/
|
|
5
|
-
import * as ConfigSecret from "@effect/io/
|
|
4
|
+
import type * as ConfigError from "@effect/io/ConfigError";
|
|
5
|
+
import * as ConfigSecret from "@effect/io/ConfigSecret";
|
|
6
6
|
import * as Effect from "@effect/io/Effect";
|
|
7
7
|
import * as Layer from "@effect/io/Layer";
|
|
8
8
|
import type { DefinitionNotFound } from "dfx/Interactions/handlers";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../src/Interactions/webhook.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAG1C,OAAO,KAAK,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,KAAK,WAAW,MAAM,
|
|
1
|
+
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../src/Interactions/webhook.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAG1C,OAAO,KAAK,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,KAAK,WAAW,MAAM,wBAAwB,CAAA;AAC1D,OAAO,KAAK,YAAY,MAAM,yBAAyB,CAAA;AACvD,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAEzC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAEnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAEhE,OAAO,KAAK,KAAK,OAAO,MAAM,WAAW,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAA;AAExC,qBAAa,mBAAmB;IAC9B,QAAQ,CAAC,IAAI,yBAAwB;CACtC;AAED,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,CAAA;AA8BxE,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC,YAAY,CAAA;IAC7C,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAA;IAC7B,QAAQ,CAAC,SAAS,EAAE,MAAM,OAAO,MAAM,CAAC,iBAAiB,CAAA;CAC1D;AACD,QAAA,MAAM,UAAU,qDAKb,cAAc;;;;;;;;;;;;;;;;;;;;CAKf,CAAA;AAEF,MAAM,WAAW,aAAc,SAAQ,UAAU,CAAC,OAAO,UAAU,CAAC;CAAG;AACvE,eAAO,MAAM,aAAa,mCAAuB,CAAA;AAEjD,eAAO,MAAM,eAAe,SAAU,cAAc,6CACJ,CAAA;AAEhD,eAAO,MAAM,cAAc,EAAE,CAC3B,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,KAC7B,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,WAAW,EAAE,aAAa,CAEY,CAAA;AAE1E,qBAAa,iBAAiB;IAEhB,QAAQ,CAAC,MAAM,EAAE,OAAO;IADpC,QAAQ,CAAC,IAAI,uBAAsB;gBACd,MAAM,EAAE,OAAO;CACrC;AAuCD,MAAM,WAAW,iBAAiB,CAAC,CAAC;IAClC,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,mBAAmB,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC9E,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CAChE;AAED;;GAEG;AACH,eAAO,MAAM,WAAW,+KASlB,aAAa,CAAC,aAAa,EAAE,KAAK,EAAE,IAAI,CAkB7C,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB;aAMnB,OAAO;UACV,MAAM;MACR,aAAa,CACjB,aAAa,EACb,mBAAmB,GAAG,iBAAiB,GAAG,kBAAkB,EAC5D,QAAQ,mBAAmB,CAS5B,CAAA"}
|
package/Interactions/webhook.js
CHANGED
|
@@ -8,7 +8,7 @@ var Chunk = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/
|
|
|
8
8
|
var _Context = /*#__PURE__*/require("@effect/data/Context");
|
|
9
9
|
var _Function = /*#__PURE__*/require("@effect/data/Function");
|
|
10
10
|
var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/data/Option"));
|
|
11
|
-
var ConfigSecret = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/
|
|
11
|
+
var ConfigSecret = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/ConfigSecret"));
|
|
12
12
|
var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
|
|
13
13
|
var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Layer"));
|
|
14
14
|
var _handlers = /*#__PURE__*/require("dfx/Interactions/handlers");
|
package/gateway.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as Config from "@effect/io/Config";
|
|
2
|
-
import type * as ConfigError from "@effect/io/
|
|
2
|
+
import type * as ConfigError from "@effect/io/ConfigError";
|
|
3
3
|
import * as Layer from "@effect/io/Layer";
|
|
4
4
|
import type { DiscordREST } from "dfx";
|
|
5
5
|
import { DiscordConfig, Log } from "dfx";
|
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,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,
|
|
1
|
+
{"version":3,"file":"gateway.d.ts","sourceRoot":"","sources":["./src/gateway.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,wBAAwB,CAAA;AAE1D,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;AAE3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAGhD,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,8HAWrB,CAAA;AAED,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,CAW5B,CAAA"}
|
|
@@ -2,7 +2,7 @@ import * as Chunk from "@effect/data/Chunk";
|
|
|
2
2
|
import { Tag } from "@effect/data/Context";
|
|
3
3
|
import * as Duration from "@effect/data/Duration";
|
|
4
4
|
import * as Option from "@effect/data/Option";
|
|
5
|
-
import * as ConfigSecret from "@effect/io/
|
|
5
|
+
import * as ConfigSecret from "@effect/io/ConfigSecret";
|
|
6
6
|
import * as Effect from "@effect/io/Effect";
|
|
7
7
|
import * as Hub from "@effect/io/Hub";
|
|
8
8
|
import * as Layer from "@effect/io/Layer";
|
|
@@ -35,20 +35,21 @@ export const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
35
35
|
const send = p => Effect.flatMap(Ref.get(phase), phase => phase === 2 /* Phase.Connected */ ? Queue.offer(outboundQueue, p) : Queue.offer(pendingQueue, p));
|
|
36
36
|
const heartbeatSend = p => Effect.flatMap(Ref.get(phase), phase => phase !== 0 /* Phase.Connecting */ ? Queue.offer(outboundQueue, p) : Effect.succeed(false));
|
|
37
37
|
const prioritySend = p => Queue.offer(outboundQueue, p);
|
|
38
|
-
const resume =
|
|
39
|
-
const onConnecting =
|
|
38
|
+
const resume = Effect.asUnit(Effect.tap(_ => Queue.offerAll(outboundQueue, _))(Effect.zipRight(Queue.takeAll(pendingQueue))(setPhase(2 /* Phase.Connected */))));
|
|
39
|
+
const onConnecting = Effect.zipRight(setPhase(0 /* Phase.Connecting */))(Effect.tap(msgs => Queue.offerAll(pendingQueue, Chunk.filter(msgs, msg => msg !== Reconnect && msg.op !== Discord.GatewayOpcode.IDENTIFY && msg.op !== Discord.GatewayOpcode.RESUME && msg.op !== Discord.GatewayOpcode.HEARTBEAT)))(Queue.takeAll(outboundQueue)));
|
|
40
40
|
const socket = yield* _(dws.connect({
|
|
41
41
|
outbound,
|
|
42
42
|
onConnecting
|
|
43
43
|
}));
|
|
44
|
-
const
|
|
44
|
+
const isReady = Option.liftPredicate(p => p.op === Discord.GatewayOpcode.DISPATCH && p.t === "READY");
|
|
45
|
+
const [latestReady, updateLatestReady] = yield* _(Utils.latest(p => Option.map(isReady(p), p => p.d)));
|
|
45
46
|
const [latestSequence, updateLatestSequence] = yield* _(Utils.latest(p => Option.fromNullable(p.s)));
|
|
46
|
-
const maybeUpdateUrl = p => Option.
|
|
47
|
+
const maybeUpdateUrl = p => Option.match(Option.map(isReady(p), p => p.d), {
|
|
47
48
|
onNone: () => Effect.unit,
|
|
48
49
|
onSome: ({
|
|
49
50
|
resume_gateway_url
|
|
50
51
|
}) => socket.setUrl(resume_gateway_url)
|
|
51
|
-
})
|
|
52
|
+
});
|
|
52
53
|
const hellos = yield* _(Queue.unbounded());
|
|
53
54
|
const acks = yield* _(Queue.unbounded());
|
|
54
55
|
// heartbeats
|
|
@@ -60,10 +61,10 @@ export const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
60
61
|
intents: gateway.intents,
|
|
61
62
|
presence: gateway.presence
|
|
62
63
|
}, latestReady, latestSequence);
|
|
63
|
-
const onPayload = p =>
|
|
64
|
+
const onPayload = p => Effect.tap(() => {
|
|
64
65
|
switch (p.op) {
|
|
65
66
|
case Discord.GatewayOpcode.HELLO:
|
|
66
|
-
return Effect.
|
|
67
|
+
return Effect.zipRight(Queue.offer(hellos, p))(Effect.zipRight(setPhase(1 /* Phase.Handshake */))(Effect.tap(identify, prioritySend)));
|
|
67
68
|
case Discord.GatewayOpcode.HEARTBEAT_ACK:
|
|
68
69
|
return Queue.offer(acks, p);
|
|
69
70
|
case Discord.GatewayOpcode.INVALID_SESSION:
|
|
@@ -73,11 +74,12 @@ export const make = /*#__PURE__*/Effect.gen(function* (_) {
|
|
|
73
74
|
return Effect.zipRight(resume, Hub.publish(hub, p));
|
|
74
75
|
}
|
|
75
76
|
return Hub.publish(hub, p);
|
|
77
|
+
default:
|
|
78
|
+
return Effect.unit;
|
|
76
79
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
const
|
|
80
|
-
const run = Effect.all([socket.take.pipe(Effect.flatMap(onPayload), Effect.forever), heartbeats, drainSendQueue, socket.run], {
|
|
80
|
+
})(Effect.zipRight(maybeUpdateUrl(p))(Effect.zipRight(updateLatestSequence(p))(updateLatestReady(p))));
|
|
81
|
+
const drainSendQueue = Effect.forever(Effect.tap(Queue.take(sendQueue), send));
|
|
82
|
+
const run = Effect.all([Effect.forever(Effect.flatMap(socket.take, onPayload)), heartbeats, drainSendQueue, socket.run], {
|
|
81
83
|
discard: true,
|
|
82
84
|
concurrency: "unbounded"
|
|
83
85
|
});
|