dfx 0.111.3 → 0.113.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/Shard/StateStore.js +1 -1
- package/DiscordGateway/Shard/StateStore.js.map +1 -1
- package/DiscordGateway/Shard.d.ts +2 -2
- package/DiscordGateway/Shard.d.ts.map +1 -1
- package/DiscordGateway/Shard.js +7 -6
- package/DiscordGateway/Shard.js.map +1 -1
- package/DiscordGateway/Sharder.d.ts +1 -1
- package/Interactions/definitions.d.ts +5 -5
- package/mjs/DiscordGateway/Shard/StateStore.mjs +1 -1
- package/mjs/DiscordGateway/Shard/StateStore.mjs.map +1 -1
- package/mjs/DiscordGateway/Shard.mjs +7 -6
- package/mjs/DiscordGateway/Shard.mjs.map +1 -1
- package/mjs/version.mjs +1 -1
- package/package.json +4 -4
- package/src/DiscordGateway/Shard/StateStore.ts +1 -1
- package/src/DiscordGateway/Shard.ts +11 -9
- package/src/version.ts +1 -1
- package/version.d.ts +1 -1
- package/version.js +1 -1
|
@@ -31,7 +31,7 @@ class ShardStateStore extends /*#__PURE__*/Context.Tag("dfx/Shard/StateStore")()
|
|
|
31
31
|
}
|
|
32
32
|
});
|
|
33
33
|
});
|
|
34
|
-
static KVSLive = /*#__PURE__*/Layer.effect(ShardStateStore, /*#__PURE__*/Effect.gen(function* (
|
|
34
|
+
static KVSLive = /*#__PURE__*/Layer.effect(ShardStateStore, /*#__PURE__*/Effect.gen(function* () {
|
|
35
35
|
const store = yield* KVS.KeyValueStore;
|
|
36
36
|
return ShardStateStore.of({
|
|
37
37
|
forShard([id, count]) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StateStore.js","names":["Effect","_interopRequireWildcard","require","Option","Context","Layer","KVS","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","ShardStateStore","Tag","MemoryLive","sync","store","Map","of","forShard","id","count","key","fromNullable","state","clear","delete","KVSLive","effect","gen","
|
|
1
|
+
{"version":3,"file":"StateStore.js","names":["Effect","_interopRequireWildcard","require","Option","Context","Layer","KVS","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","ShardStateStore","Tag","MemoryLive","sync","store","Map","of","forShard","id","count","key","fromNullable","state","clear","delete","KVSLive","effect","gen","KeyValueStore","map","orDie","JSON","parse","stringify","remove"],"sources":["../../src/DiscordGateway/Shard/StateStore.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -8,7 +8,7 @@ export declare const make: Effect.Effect<{
|
|
|
8
8
|
readonly connect: (shard: [id: number, count: number]) => Effect.Effect<{
|
|
9
9
|
readonly id: [id: number, count: number];
|
|
10
10
|
}, never, import("effect/Scope").Scope | import("@effect/platform/Socket").WebSocketConstructor>;
|
|
11
|
-
}, never, DiscordConfig | RateLimiter | DiscordWS | import("dfx/DiscordGateway/Messaging").Messsaging
|
|
11
|
+
}, never, DiscordConfig | RateLimiter | ShardStateStore | DiscordWS | import("dfx/DiscordGateway/Messaging").Messsaging>;
|
|
12
12
|
type ShardService = Effect.Effect.Success<typeof make>;
|
|
13
13
|
export interface Shard {
|
|
14
14
|
readonly _: unique symbol;
|
|
@@ -18,7 +18,7 @@ export declare const Shard: import("effect/Context").Tag<Shard, {
|
|
|
18
18
|
readonly id: [id: number, count: number];
|
|
19
19
|
}, never, import("effect/Scope").Scope | import("@effect/platform/Socket").WebSocketConstructor>;
|
|
20
20
|
}>;
|
|
21
|
-
export declare const ShardLive: Layer.Layer<Shard, never, DiscordConfig | import("dfx/RateLimit").RateLimitStore | import("dfx/DiscordGateway/DiscordWS").DiscordWSCodec
|
|
21
|
+
export declare const ShardLive: Layer.Layer<Shard, never, DiscordConfig | import("dfx/RateLimit").RateLimitStore | ShardStateStore | import("dfx/DiscordGateway/DiscordWS").DiscordWSCodec>;
|
|
22
22
|
export interface RunningShard extends Effect.Effect.Success<ReturnType<ShardService["connect"]>> {
|
|
23
23
|
}
|
|
24
24
|
export {};
|
|
@@ -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;AAEjD,OAAO,EACL,SAAS,EAGV,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAA;AAGrE,OAAO,EAAE,WAAW,EAAmB,MAAM,eAAe,CAAA;AAI5D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,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;AAEjD,OAAO,EACL,SAAS,EAGV,MAAM,8BAA8B,CAAA;AAGrC,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAA;AAGrE,OAAO,EAAE,WAAW,EAAmB,MAAM,eAAe,CAAA;AAI5D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAcrC,eAAO,MAAM,IAAI;;;;wHAyJf,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;;;;EAA8D,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,6 +20,7 @@ var Option = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/O
|
|
|
20
20
|
var Mailbox = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/Mailbox"));
|
|
21
21
|
var Redacted = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/Redacted"));
|
|
22
22
|
var FiberHandle = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/FiberHandle"));
|
|
23
|
+
var _Function = /*#__PURE__*/require("effect/Function");
|
|
23
24
|
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); }
|
|
24
25
|
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; }
|
|
25
26
|
const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
|
|
@@ -34,7 +35,7 @@ const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
34
35
|
sendMailbox
|
|
35
36
|
} = yield* _Messaging.Messaging;
|
|
36
37
|
const shardState = yield* _StateStore.ShardStateStore;
|
|
37
|
-
const connect =
|
|
38
|
+
const connect = Effect.fnUntraced(function* (shard) {
|
|
38
39
|
const reconnectHandle = yield* FiberHandle.make();
|
|
39
40
|
let phase = 0 /* Phase.Connecting */;
|
|
40
41
|
const stateStore = shardState.forShard(shard);
|
|
@@ -121,10 +122,10 @@ const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
121
122
|
}
|
|
122
123
|
}
|
|
123
124
|
}
|
|
124
|
-
yield* Effect.
|
|
125
|
-
while
|
|
126
|
-
|
|
127
|
-
|
|
125
|
+
yield* Effect.whileLoop({
|
|
126
|
+
while: _Function.constTrue,
|
|
127
|
+
body: (0, _Function.constant)(Effect.flatMap(sendMailbox.take, write)),
|
|
128
|
+
step: _Function.constVoid
|
|
128
129
|
}).pipe(Effect.forkScoped, Effect.interruptible);
|
|
129
130
|
yield* Effect.gen(function* () {
|
|
130
131
|
while (true) {
|
|
@@ -134,7 +135,7 @@ const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
134
135
|
return {
|
|
135
136
|
id: shard
|
|
136
137
|
};
|
|
137
|
-
})
|
|
138
|
+
}, (effect, shard) => Effect.annotateLogs(effect, {
|
|
138
139
|
package: "dfx",
|
|
139
140
|
module: "DiscordGateway/Shard",
|
|
140
141
|
shard
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Shard.js","names":["_DiscordConfig","require","_DiscordWS","_Messaging","_StateStore","Heartbeats","_interopRequireWildcard","Identify","_RateLimit","Discord","_Context","Duration","Effect","Layer","Option","Mailbox","Redacted","FiberHandle","_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","
|
|
1
|
+
{"version":3,"file":"Shard.js","names":["_DiscordConfig","require","_DiscordWS","_Messaging","_StateStore","Heartbeats","_interopRequireWildcard","Identify","_RateLimit","Discord","_Context","Duration","Effect","Layer","Option","Mailbox","Redacted","FiberHandle","_Function","_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","fnUntraced","shard","reconnectHandle","phase","stateStore","forShard","resumeState","getOrElse","resumeUrl","sessionId","sequence","setPhase","p","suspend","annotateLogs","logTrace","heartbeatSend","void","write","resume","zipRight","clear","onConnecting","socket","maybeWait","minutes","hellos","acquireRelease","_","shutdown","acks","send","pipe","forkScoped","interruptible","identify","identifyOrResume","value","intents","presence","delayedReconnect","delay","Reconnect","onPayload","s","op","GatewayOpcode","DISPATCH","payload","d","session_id","resume_gateway_url","setUrl","HELLO","unsafeOffer","run","HEARTBEAT_ACK","INVALID_SESSION","RECONNECT","whileLoop","while","constTrue","body","constant","flatMap","take","step","constVoid","id","effect","package","module","Shard","GenericTag","ShardLive","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("
|
|
13
|
+
export declare const SharderLive: Layer.Layer<Sharder, never, ShardStore | DiscordConfig | import("dfx/RateLimit").RateLimitStore | import("./Shard/StateStore").ShardStateStore | import("./DiscordWS").DiscordWSCodec | import("@effect/platform/Socket").WebSocketConstructor | import("@effect/platform/HttpClient").HttpClient>;
|
|
14
14
|
//# sourceMappingURL=Sharder.d.ts.map
|
|
@@ -10,35 +10,35 @@ export declare class GlobalApplicationCommand<R, E> {
|
|
|
10
10
|
readonly _tag = "GlobalApplicationCommand";
|
|
11
11
|
constructor(command: Discord.CreateGlobalApplicationCommandParams, handle: CommandHandler<R, E>);
|
|
12
12
|
}
|
|
13
|
-
export declare const global: <R, E, const A extends Discord.CreateGlobalApplicationCommandParams>(command: A, handle: CommandHandler<R, E, A>) => GlobalApplicationCommand<Exclude<R,
|
|
13
|
+
export declare const global: <R, E, const A extends Discord.CreateGlobalApplicationCommandParams>(command: A, handle: CommandHandler<R, E, A>) => GlobalApplicationCommand<Exclude<R, DiscordInteraction | Scope | DiscordApplicationCommand>, E>;
|
|
14
14
|
export declare class GuildApplicationCommand<R, E> {
|
|
15
15
|
readonly command: Discord.CreateGuildApplicationCommandParams;
|
|
16
16
|
readonly handle: CommandHandler<R, E>;
|
|
17
17
|
readonly _tag = "GuildApplicationCommand";
|
|
18
18
|
constructor(command: Discord.CreateGuildApplicationCommandParams, handle: CommandHandler<R, E>);
|
|
19
19
|
}
|
|
20
|
-
export declare const guild: <R, E, const A extends Discord.CreateGuildApplicationCommandParams>(command: A, handle: CommandHandler<R, E, A>) => GuildApplicationCommand<Exclude<R,
|
|
20
|
+
export declare const guild: <R, E, const A extends Discord.CreateGuildApplicationCommandParams>(command: A, handle: CommandHandler<R, E, A>) => GuildApplicationCommand<Exclude<R, DiscordInteraction | Scope | DiscordApplicationCommand>, E>;
|
|
21
21
|
export declare class MessageComponent<R, E> {
|
|
22
22
|
readonly predicate: (customId: string) => boolean;
|
|
23
23
|
readonly handle: Effect.Effect<Discord.InteractionResponse, E, R>;
|
|
24
24
|
readonly _tag = "MessageComponent";
|
|
25
25
|
constructor(predicate: (customId: string) => boolean, handle: Effect.Effect<Discord.InteractionResponse, E, R>);
|
|
26
26
|
}
|
|
27
|
-
export declare const messageComponent: <R, E>(pred: (customId: string) => boolean, handle: CommandHandler<R, E, Discord.InteractionResponse>) => MessageComponent<Exclude<R,
|
|
27
|
+
export declare const messageComponent: <R, E>(pred: (customId: string) => boolean, handle: CommandHandler<R, E, Discord.InteractionResponse>) => MessageComponent<Exclude<R, DiscordInteraction | Scope | DiscordMessageComponent>, E>;
|
|
28
28
|
export declare class ModalSubmit<R, E> {
|
|
29
29
|
readonly predicate: (customId: string) => boolean;
|
|
30
30
|
readonly handle: Effect.Effect<Discord.InteractionResponse, E, R>;
|
|
31
31
|
readonly _tag = "ModalSubmit";
|
|
32
32
|
constructor(predicate: (customId: string) => boolean, handle: Effect.Effect<Discord.InteractionResponse, E, R>);
|
|
33
33
|
}
|
|
34
|
-
export declare const modalSubmit: <R, E>(pred: (customId: string) => boolean, handle: Effect.Effect<Discord.InteractionResponse, E, R>) => ModalSubmit<Exclude<R,
|
|
34
|
+
export declare const modalSubmit: <R, E>(pred: (customId: string) => boolean, handle: Effect.Effect<Discord.InteractionResponse, E, R>) => ModalSubmit<Exclude<R, DiscordInteraction | Scope | DiscordModalSubmit>, E>;
|
|
35
35
|
export declare class Autocomplete<R, E> {
|
|
36
36
|
readonly predicate: (data: Discord.ApplicationCommandDatum, focusedOption: Discord.ApplicationCommandInteractionDataOption) => boolean;
|
|
37
37
|
readonly handle: Effect.Effect<Discord.InteractionResponse, E, R>;
|
|
38
38
|
readonly _tag = "Autocomplete";
|
|
39
39
|
constructor(predicate: (data: Discord.ApplicationCommandDatum, focusedOption: Discord.ApplicationCommandInteractionDataOption) => boolean, handle: Effect.Effect<Discord.InteractionResponse, E, R>);
|
|
40
40
|
}
|
|
41
|
-
export declare const autocomplete: <R, E>(pred: (data: Discord.ApplicationCommandDatum, focusedOption: Discord.ApplicationCommandInteractionDataOption) => boolean, handle: Effect.Effect<Discord.InteractionResponse, E, R>) => Autocomplete<Exclude<R,
|
|
41
|
+
export declare const autocomplete: <R, E>(pred: (data: Discord.ApplicationCommandDatum, focusedOption: Discord.ApplicationCommandInteractionDataOption) => boolean, handle: Effect.Effect<Discord.InteractionResponse, E, R>) => Autocomplete<Exclude<R, DiscordInteraction | Scope | DiscordApplicationCommand | DiscordFocusedOption>, E>;
|
|
42
42
|
export type CommandHandler<R, E, A = any> = Effect.Effect<Discord.InteractionResponse, E, R> | CommandHandlerFn<R, E, A>;
|
|
43
43
|
export type CommandHandlerFn<R, E, A> = (i: CommandHelper<A>) => Effect.Effect<Discord.InteractionResponse, E, R>;
|
|
44
44
|
//# sourceMappingURL=definitions.d.ts.map
|
|
@@ -23,7 +23,7 @@ export class ShardStateStore extends /*#__PURE__*/Context.Tag("dfx/Shard/StateSt
|
|
|
23
23
|
}
|
|
24
24
|
});
|
|
25
25
|
});
|
|
26
|
-
static KVSLive = /*#__PURE__*/Layer.effect(ShardStateStore, /*#__PURE__*/Effect.gen(function* (
|
|
26
|
+
static KVSLive = /*#__PURE__*/Layer.effect(ShardStateStore, /*#__PURE__*/Effect.gen(function* () {
|
|
27
27
|
const store = yield* KVS.KeyValueStore;
|
|
28
28
|
return ShardStateStore.of({
|
|
29
29
|
forShard([id, count]) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StateStore.mjs","names":["Effect","Option","Context","Layer","KVS","ShardStateStore","Tag","MemoryLive","sync","store","Map","of","forShard","id","count","key","get","fromNullable","set","state","clear","delete","KVSLive","effect","gen","
|
|
1
|
+
{"version":3,"file":"StateStore.mjs","names":["Effect","Option","Context","Layer","KVS","ShardStateStore","Tag","MemoryLive","sync","store","Map","of","forShard","id","count","key","get","fromNullable","set","state","clear","delete","KVSLive","effect","gen","KeyValueStore","map","orDie","JSON","parse","stringify","remove"],"sources":["../../../src/DiscordGateway/Shard/StateStore.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,GAAG,MAAM,gCAAgC;AAcrD,OAAM,MAAOC,eAAgB,sBAAQH,OAAO,CAACI,GAAG,CAAC,sBAAsB,CAAC,EAGrE;EACD,OAAOC,UAAU,gBAAiCJ,KAAK,CAACK,IAAI,CAC1DH,eAAe,EACf,MAAK;IACH,MAAMI,KAAK,GAAG,IAAIC,GAAG,EAAsB;IAE3C,OAAOL,eAAe,CAACM,EAAE,CAAC;MACxBC,QAAQ,EAAEA,CAAC,CAACC,EAAE,EAAEC,KAAK,CAAC,KAAI;QACxB,MAAMC,GAAG,GAAG,GAAGF,EAAE,IAAIC,KAAK,EAAE;QAC5B,OAAO;UACLE,GAAG,EAAEhB,MAAM,CAACQ,IAAI,CAAC,MAAMP,MAAM,CAACgB,YAAY,CAACR,KAAK,CAACO,GAAG,CAACD,GAAG,CAAC,CAAC,CAAC;UAC3DG,GAAGA,CAACC,KAAK;YACP,OAAOnB,MAAM,CAACQ,IAAI,CAAC,MAAK;cACtBC,KAAK,CAACS,GAAG,CAACH,GAAG,EAAEI,KAAK,CAAC;YACvB,CAAC,CAAC;UACJ,CAAC;UACDC,KAAK,EAAEpB,MAAM,CAACQ,IAAI,CAAC,MAAK;YACtBC,KAAK,CAACY,MAAM,CAACN,GAAG,CAAC;UACnB,CAAC;SACF;MACH;KACD,CAAC;EACJ,CAAC,CACF;EAED,OAAOO,OAAO,gBACZnB,KAAK,CAACoB,MAAM,CACVlB,eAAe,eACfL,MAAM,CAACwB,GAAG,CAAC,aAAS;IAClB,MAAMf,KAAK,GAAG,OAAOL,GAAG,CAACqB,aAAa;IACtC,OAAOpB,eAAe,CAACM,EAAE,CAAC;MACxBC,QAAQA,CAAC,CAACC,EAAE,EAAEC,KAAK,CAAC;QAClB,MAAMC,GAAG,GAAG,mBAAmBF,EAAE,IAAIC,KAAK,EAAE;QAC5C,OAAO;UACLE,GAAG,EAAEhB,MAAM,CAAC0B,GAAG,CACb1B,MAAM,CAAC2B,KAAK,CAAClB,KAAK,CAACO,GAAG,CAACD,GAAG,CAAC,CAAC,EAC5Bd,MAAM,CAACyB,GAAG,CAACE,IAAI,CAACC,KAAK,CAAC,CACvB;UACDX,GAAG,EAAEC,KAAK,IAAInB,MAAM,CAAC2B,KAAK,CAAClB,KAAK,CAACS,GAAG,CAACH,GAAG,EAAEa,IAAI,CAACE,SAAS,CAACX,KAAK,CAAC,CAAC,CAAC;UACjEC,KAAK,EAAEpB,MAAM,CAAC2B,KAAK,CAAClB,KAAK,CAACsB,MAAM,CAAChB,GAAG,CAAC;SACtC;MACH;KACD,CAAC;EACJ,CAAC,CAAC,CACH","ignoreList":[]}
|
|
@@ -14,6 +14,7 @@ import * as Option from "effect/Option";
|
|
|
14
14
|
import * as Mailbox from "effect/Mailbox";
|
|
15
15
|
import * as Redacted from "effect/Redacted";
|
|
16
16
|
import * as FiberHandle from "effect/FiberHandle";
|
|
17
|
+
import { constant, constTrue, constVoid } from "effect/Function";
|
|
17
18
|
export const make = /*#__PURE__*/Effect.gen(function* () {
|
|
18
19
|
const {
|
|
19
20
|
gateway,
|
|
@@ -26,7 +27,7 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
26
27
|
sendMailbox
|
|
27
28
|
} = yield* Messaging;
|
|
28
29
|
const shardState = yield* ShardStateStore;
|
|
29
|
-
const connect =
|
|
30
|
+
const connect = Effect.fnUntraced(function* (shard) {
|
|
30
31
|
const reconnectHandle = yield* FiberHandle.make();
|
|
31
32
|
let phase = 0 /* Phase.Connecting */;
|
|
32
33
|
const stateStore = shardState.forShard(shard);
|
|
@@ -113,10 +114,10 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
113
114
|
}
|
|
114
115
|
}
|
|
115
116
|
}
|
|
116
|
-
yield* Effect.
|
|
117
|
-
while
|
|
118
|
-
|
|
119
|
-
|
|
117
|
+
yield* Effect.whileLoop({
|
|
118
|
+
while: constTrue,
|
|
119
|
+
body: constant(Effect.flatMap(sendMailbox.take, write)),
|
|
120
|
+
step: constVoid
|
|
120
121
|
}).pipe(Effect.forkScoped, Effect.interruptible);
|
|
121
122
|
yield* Effect.gen(function* () {
|
|
122
123
|
while (true) {
|
|
@@ -126,7 +127,7 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
|
|
|
126
127
|
return {
|
|
127
128
|
id: shard
|
|
128
129
|
};
|
|
129
|
-
})
|
|
130
|
+
}, (effect, shard) => Effect.annotateLogs(effect, {
|
|
130
131
|
package: "dfx",
|
|
131
132
|
module: "DiscordGateway/Shard",
|
|
132
133
|
shard
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Shard.mjs","names":["DiscordConfig","DiscordWS","DiscordWSLive","Reconnect","Messaging","MesssagingLive","ShardStateStore","Heartbeats","Identify","RateLimiter","RateLimiterLive","Discord","GenericTag","Duration","Effect","Layer","Option","Mailbox","Redacted","FiberHandle","make","gen","gateway","token","limiter","dws","hub","sendMailbox","shardState","connect","
|
|
1
|
+
{"version":3,"file":"Shard.mjs","names":["DiscordConfig","DiscordWS","DiscordWSLive","Reconnect","Messaging","MesssagingLive","ShardStateStore","Heartbeats","Identify","RateLimiter","RateLimiterLive","Discord","GenericTag","Duration","Effect","Layer","Option","Mailbox","Redacted","FiberHandle","constant","constTrue","constVoid","make","gen","gateway","token","limiter","dws","hub","sendMailbox","shardState","connect","fnUntraced","shard","reconnectHandle","phase","stateStore","forShard","resumeState","getOrElse","get","resumeUrl","sessionId","sequence","setPhase","p","suspend","annotateLogs","logTrace","heartbeatSend","void","write","resume","zipRight","clear","onConnecting","socket","maybeWait","minutes","hellos","acquireRelease","_","shutdown","acks","send","pipe","forkScoped","interruptible","identify","identifyOrResume","value","intents","presence","delayedReconnect","delay","onPayload","s","op","GatewayOpcode","DISPATCH","t","payload","d","session_id","resume_gateway_url","set","setUrl","HELLO","unsafeOffer","run","HEARTBEAT_ACK","INVALID_SESSION","RECONNECT","whileLoop","while","body","flatMap","take","step","id","effect","package","module","Shard","ShardLive","provide"],"sources":["../../src/DiscordGateway/Shard.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,aAAa,QAAQ,mBAAmB;AAEjD,SACEC,SAAS,EACTC,aAAa,EACbC,SAAS,QACJ,8BAA8B;AACrC,SAASC,SAAS,EAAEC,cAAc,QAAQ,8BAA8B;AAExE,SAASC,eAAe,QAAQ,qCAAqC;AACrE,OAAO,KAAKC,UAAU,MAAM,qCAAqC;AACjE,OAAO,KAAKC,QAAQ,MAAM,mCAAmC;AAC7D,SAASC,WAAW,EAAEC,eAAe,QAAQ,eAAe;AAC5D,OAAO,KAAKC,OAAO,MAAM,WAAW;AACpC,SAASC,UAAU,QAAQ,gBAAgB;AAC3C,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAE3C,OAAO,KAAKC,WAAW,MAAM,oBAAoB;AACjD,SAASC,QAAQ,EAAEC,SAAS,EAAEC,SAAS,QAAQ,iBAAiB;AAQhE,OAAO,MAAMC,IAAI,gBAAGT,MAAM,CAACU,GAAG,CAAC,aAAS;EACtC,MAAM;IAAEC,OAAO;IAAEC;EAAK,CAAE,GAAG,OAAO1B,aAAa;EAC/C,MAAM2B,OAAO,GAAG,OAAOlB,WAAW;EAClC,MAAMmB,GAAG,GAAG,OAAO3B,SAAS;EAC5B,MAAM;IAAE4B,GAAG;IAAEC;EAAW,CAAE,GAAG,OAAO1B,SAAS;EAC7C,MAAM2B,UAAU,GAAG,OAAOzB,eAAe;EAEzC,MAAM0B,OAAO,GAAGlB,MAAM,CAACmB,UAAU,CAC/B,WAAWC,KAAkC;IAC3C,MAAMC,eAAe,GAAG,OAAOhB,WAAW,CAACI,IAAI,EAAE;IACjD,IAAIa,KAAK;IACT,MAAMC,UAAU,GAAGN,UAAU,CAACO,QAAQ,CAACJ,KAAK,CAAC;IAC7C,MAAMK,WAAW,GAA8BvB,MAAM,CAACwB,SAAS,CAC7D,OAAOH,UAAU,CAACI,GAAG,EACrB,OAAO;MACLC,SAAS,EAAE,EAAE;MACbC,SAAS,EAAE,EAAE;MACbC,QAAQ,EAAE;KACX,CAAC,CACH;IACD,MAAMC,QAAQ,GAAIC,CAAQ,IACxBhC,MAAM,CAACiC,OAAO,CAAC,MAAK;MAClBX,KAAK,GAAGU,CAAC;MACT,OAAOhC,MAAM,CAACkC,YAAY,CACxBlC,MAAM,CAACmC,QAAQ,CAAC,kBAAkB,CAAC,EACnC,OAAO,EACPH,CAAC,CACF;IACH,CAAC,CAAC;IAEJ,MAAMI,aAAa,GAAIJ,CAAU,IAC/BhC,MAAM,CAACiC,OAAO,CAAC,MAAK;MAClB,IAAIX,KAAK,+BAAuB,OAAOtB,MAAM,CAACqC,IAAI;MAClD,OAAOC,KAAK,CAACN,CAAC,CAAC;IACjB,CAAC,CAAC;IAEJ,MAAMO,MAAM,GAAGvC,MAAM,CAACwC,QAAQ,CAC5BnC,WAAW,CAACoC,KAAK,CAACpB,eAAe,CAAC,EAClCU,QAAQ,yBAAiB,CAC1B;IAED,MAAMW,YAAY,GAAGX,QAAQ,0BAAkB;IAE/C,MAAMY,MAAM,GAAG,OAAO7B,GAAG,CAACI,OAAO,CAAC;MAAEwB;IAAY,CAAE,CAAC;IACnD,MAAMJ,KAAK,GAAIN,CAAU,IACvBhC,MAAM,CAACwC,QAAQ,CACb3B,OAAO,CAAC+B,SAAS,CAAC,gBAAgB,EAAE7C,QAAQ,CAAC8C,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAC7DF,MAAM,CAACL,KAAK,CAACN,CAAC,CAAC,CAChB;IAEH,MAAMc,MAAM,GAAG,OAAO9C,MAAM,CAAC+C,cAAc,CACzC5C,OAAO,CAACM,IAAI,EAA0B,EACtCuC,CAAC,IAAIA,CAAC,CAACC,QAAQ,CAChB;IACD,MAAMC,IAAI,GAAG,OAAOlD,MAAM,CAAC+C,cAAc,CACvC5C,OAAO,CAACM,IAAI,EAA0B,EACtCuC,CAAC,IAAIA,CAAC,CAACC,QAAQ,CAChB;IAED;IACA,OAAOxD,UAAU,CAAC0D,IAAI,CAACL,MAAM,EAAEI,IAAI,EAAE3B,UAAU,CAACI,GAAG,EAAES,aAAa,CAAC,CAACgB,IAAI,CACtEpD,MAAM,CAACqD,UAAU,EACjBrD,MAAM,CAACsD,aAAa,CACrB;IAED;IACA,MAAMC,QAAQ,GAAG7D,QAAQ,CAAC8D,gBAAgB,CACxC;MACE5C,KAAK,EAAER,QAAQ,CAACqD,KAAK,CAAC7C,KAAK,CAAC;MAC5BQ,KAAK;MACLsC,OAAO,EAAE/C,OAAO,CAAC+C,OAAO;MACxBC,QAAQ,EAAEhD,OAAO,CAACgD;KACnB,EACDpC,UAAU,CAACI,GAAG,CACf;IAED;IACA,MAAMiC,gBAAgB,GAAG5D,MAAM,CAAC6D,KAAK,CAAClB,MAAM,CAACL,KAAK,CAACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IAEtE,UAAUyE,SAASA,CAAC9B,CAAyB;MAC3C,IAAI,OAAOA,CAAC,CAAC+B,CAAC,KAAK,QAAQ,EAAE;QAC3BtC,WAAW,CAACK,QAAQ,GAAGE,CAAC,CAAC+B,CAAC;MAC5B;MACA,IAAI/B,CAAC,CAACgC,EAAE,KAAKnE,OAAO,CAACoE,aAAa,CAACC,QAAQ,IAAIlC,CAAC,CAACmC,CAAC,KAAK,OAAO,EAAE;QAC9D,MAAMC,OAAO,GAAGpC,CAAC,CAACqC,CAAuB;QACzC5C,WAAW,CAACI,SAAS,GAAGuC,OAAO,CAACE,UAAU;QAC1C7C,WAAW,CAACG,SAAS,GAAGwC,OAAO,CAACG,kBAAkB;QAClD,OAAOhD,UAAU,CAACiD,GAAG,CAAC/C,WAAW,CAAC;QAClC,OAAOkB,MAAM,CAAC8B,MAAM,CAACL,OAAO,CAACG,kBAAkB,CAAC;MAClD,CAAC,MAAM,IACL9C,WAAW,CAACG,SAAS,KAAK,EAAE,IAC5BH,WAAW,CAACI,SAAS,KAAK,EAAE,EAC5B;QACA,OAAON,UAAU,CAACiD,GAAG,CAAC/C,WAAW,CAAC;MACpC;MAEA,QAAQO,CAAC,CAACgC,EAAE;QACV,KAAKnE,OAAO,CAACoE,aAAa,CAACS,KAAK;UAAE;YAChC,OAAOpC,KAAK,CAAC,OAAOiB,QAAQ,CAAC;YAC7B,OAAOxB,QAAQ,yBAAiB;YAChCe,MAAM,CAAC6B,WAAW,CAAC3C,CAAC,CAAC;YACrB,OAAO3B,WAAW,CAACuE,GAAG,CAACvD,eAAe,EAAEuC,gBAAgB,CAAC;YACzD;UACF;QACA,KAAK/D,OAAO,CAACoE,aAAa,CAACY,aAAa;UAAE;YACxC3B,IAAI,CAACyB,WAAW,CAAC3C,CAAC,CAAC;YACnB;UACF;QACA,KAAKnC,OAAO,CAACoE,aAAa,CAACa,eAAe;UAAE;YAC1C,IAAI,CAAC9C,CAAC,CAACqC,CAAC,EAAE;cACR5C,WAAW,CAACI,SAAS,GAAG,EAAE;cAC1B,OAAON,UAAU,CAACkB,KAAK;YACzB;YACA,OAAOE,MAAM,CAACL,KAAK,CAACjD,SAAS,CAAC;YAC9B;UACF;QACA,KAAKQ,OAAO,CAACoE,aAAa,CAACC,QAAQ;UAAE;YACnC,IAAIlC,CAAC,CAACmC,CAAC,KAAK,OAAO,IAAInC,CAAC,CAACmC,CAAC,KAAK,SAAS,EAAE;cACxC,OAAO5B,MAAM;YACf;YACAxB,GAAG,CAAC4D,WAAW,CAAC3C,CAAC,CAAC;YAClB;UACF;QACA,KAAKnC,OAAO,CAACoE,aAAa,CAACc,SAAS;UAAE;YACpC,OAAOpC,MAAM,CAACL,KAAK,CAACjD,SAAS,CAAC;YAC9B;UACF;MACF;IACF;IAEA,OAAOW,MAAM,CAACgF,SAAS,CAAC;MACtBC,KAAK,EAAE1E,SAAS;MAChB2E,IAAI,EAAE5E,QAAQ,CAACN,MAAM,CAACmF,OAAO,CAACnE,WAAW,CAACoE,IAAI,EAAE9C,KAAK,CAAC,CAAC;MACvD+C,IAAI,EAAE7E;KACP,CAAC,CAAC4C,IAAI,CAACpD,MAAM,CAACqD,UAAU,EAAErD,MAAM,CAACsD,aAAa,CAAC;IAEhD,OAAOtD,MAAM,CAACU,GAAG,CAAC,aAAS;MACzB,OAAO,IAAI,EAAE;QACX,OAAOoD,SAAS,CAAC,OAAOnB,MAAM,CAACyC,IAAI,CAAC;MACtC;IACF,CAAC,CAAC,CAAChC,IAAI,CAACpD,MAAM,CAACqD,UAAU,EAAErD,MAAM,CAACsD,aAAa,CAAC;IAEhD,OAAO;MAAEgC,EAAE,EAAElE;IAAK,CAAW;EAC/B,CAAC,EACD,CAACmE,MAAM,EAAEnE,KAAK,KACZpB,MAAM,CAACkC,YAAY,CAACqD,MAAM,EAAE;IAC1BC,OAAO,EAAE,KAAK;IACdC,MAAM,EAAE,sBAAsB;IAC9BrE;GACD,CAAC,CACL;EAED,OAAO;IAAEF;EAAO,CAAW;AAC7B,CAAC,CAAC;AAOF,OAAO,MAAMwE,KAAK,gBAAG5F,UAAU,CAAsB,0BAA0B,CAAC;AAChF,OAAO,MAAM6F,SAAS,gBAAG1F,KAAK,CAACsF,MAAM,CAACG,KAAK,EAAEjF,IAAI,CAAC,CAAC2C,IAAI,cACrDnD,KAAK,CAAC2F,OAAO,CAACxG,aAAa,CAAC,eAC5Ba,KAAK,CAAC2F,OAAO,CAACrG,cAAc,CAAC,eAC7BU,KAAK,CAAC2F,OAAO,CAAChG,eAAe,CAAC,CAC/B","ignoreList":[]}
|
package/mjs/version.mjs
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const LIB_VERSION = "0.
|
|
1
|
+
export const LIB_VERSION = "0.113.0";
|
|
2
2
|
//# sourceMappingURL=version.mjs.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dfx",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.113.0",
|
|
4
4
|
"description": "Effect-TS discord library",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -35,12 +35,12 @@
|
|
|
35
35
|
"sideEffects": [],
|
|
36
36
|
"author": "Tim Smart <hello@timsmart.co>",
|
|
37
37
|
"peerDependencies": {
|
|
38
|
-
"@effect/platform": "^0.
|
|
39
|
-
"effect": "^3.
|
|
38
|
+
"@effect/platform": "^0.77",
|
|
39
|
+
"effect": "^3.13"
|
|
40
40
|
},
|
|
41
41
|
"optionalDependencies": {
|
|
42
42
|
"discord-verify": "^1.2.0"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "91eb51db121c833a99512035db21e2bafc8619d4",
|
|
45
45
|
"main": "./index.js"
|
|
46
46
|
}
|
|
@@ -47,7 +47,7 @@ export class ShardStateStore extends Context.Tag("dfx/Shard/StateStore")<
|
|
|
47
47
|
static KVSLive: Layer.Layer<ShardStateStore, never, KVS.KeyValueStore> =
|
|
48
48
|
Layer.effect(
|
|
49
49
|
ShardStateStore,
|
|
50
|
-
Effect.gen(function* (
|
|
50
|
+
Effect.gen(function* () {
|
|
51
51
|
const store = yield* KVS.KeyValueStore
|
|
52
52
|
return ShardStateStore.of({
|
|
53
53
|
forShard([id, count]) {
|
|
@@ -21,6 +21,7 @@ import * as Mailbox from "effect/Mailbox"
|
|
|
21
21
|
import * as Redacted from "effect/Redacted"
|
|
22
22
|
import type * as Types from "effect/Types"
|
|
23
23
|
import * as FiberHandle from "effect/FiberHandle"
|
|
24
|
+
import { constant, constTrue, constVoid } from "effect/Function"
|
|
24
25
|
|
|
25
26
|
const enum Phase {
|
|
26
27
|
Connecting,
|
|
@@ -35,8 +36,8 @@ export const make = Effect.gen(function* () {
|
|
|
35
36
|
const { hub, sendMailbox } = yield* Messaging
|
|
36
37
|
const shardState = yield* ShardStateStore
|
|
37
38
|
|
|
38
|
-
const connect = (
|
|
39
|
-
|
|
39
|
+
const connect = Effect.fnUntraced(
|
|
40
|
+
function* (shard: [id: number, count: number]) {
|
|
40
41
|
const reconnectHandle = yield* FiberHandle.make()
|
|
41
42
|
let phase = Phase.Connecting
|
|
42
43
|
const stateStore = shardState.forShard(shard)
|
|
@@ -158,10 +159,10 @@ export const make = Effect.gen(function* () {
|
|
|
158
159
|
}
|
|
159
160
|
}
|
|
160
161
|
|
|
161
|
-
yield* Effect.
|
|
162
|
-
while
|
|
163
|
-
|
|
164
|
-
|
|
162
|
+
yield* Effect.whileLoop({
|
|
163
|
+
while: constTrue,
|
|
164
|
+
body: constant(Effect.flatMap(sendMailbox.take, write)),
|
|
165
|
+
step: constVoid,
|
|
165
166
|
}).pipe(Effect.forkScoped, Effect.interruptible)
|
|
166
167
|
|
|
167
168
|
yield* Effect.gen(function* () {
|
|
@@ -171,13 +172,14 @@ export const make = Effect.gen(function* () {
|
|
|
171
172
|
}).pipe(Effect.forkScoped, Effect.interruptible)
|
|
172
173
|
|
|
173
174
|
return { id: shard } as const
|
|
174
|
-
}
|
|
175
|
-
|
|
175
|
+
},
|
|
176
|
+
(effect, shard) =>
|
|
177
|
+
Effect.annotateLogs(effect, {
|
|
176
178
|
package: "dfx",
|
|
177
179
|
module: "DiscordGateway/Shard",
|
|
178
180
|
shard,
|
|
179
181
|
}),
|
|
180
|
-
|
|
182
|
+
)
|
|
181
183
|
|
|
182
184
|
return { connect } as const
|
|
183
185
|
})
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const LIB_VERSION = "0.
|
|
1
|
+
export const LIB_VERSION = "0.113.0";
|
package/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const LIB_VERSION = "0.
|
|
1
|
+
export declare const LIB_VERSION = "0.113.0";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/version.js
CHANGED