dfx 0.42.0 → 0.42.1
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.
|
@@ -17,7 +17,8 @@ const make = tsplus_module_5.flatMap(WS, ws => tsplus_module_5.map(DiscordWSCode
|
|
|
17
17
|
const takeOutbound = tsplus_module_5.map(outbound, a => a === Reconnect ? a : encoding.encode(a));
|
|
18
18
|
return tsplus_module_5.map(ws.connect(urlRef, takeOutbound, onReconnect), socket => {
|
|
19
19
|
const take = tsplus_module_5.map(socket.take, encoding.decode);
|
|
20
|
-
const run = tsplus_module_5.retry(socket.run, tsplus_module_4.whileInput(tsplus_module_4.exponential(tsplus_module_3.seconds(0.5)), (_) => _._tag === "WebSocketCloseError" && _.code < 2000)
|
|
20
|
+
const run = tsplus_module_5.retry(socket.run, tsplus_module_4.whileInput(tsplus_module_4.exponential(tsplus_module_3.seconds(0.5)), (_) => (_._tag === "WebSocketCloseError" && _.code < 2000) ||
|
|
21
|
+
(_._tag === "WebSocketError" && _.reason === "open")));
|
|
21
22
|
return {
|
|
22
23
|
run,
|
|
23
24
|
take,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordWS.js","sourceRoot":"","sources":["../../src/DiscordGateway/DiscordWS.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EACL,MAAM,EACN,SAAS,EACT,EAAE,GAGH,MAAM,uBAAuB,CAAA;AAkB9B,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,sBAAsB,GAAG,wBAAc,cAAc,EAAE;IAClE,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAC9B,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC5C,CAAC,CAAA;AAEF,MAAM,IAAI,2BACK,EAAE,EAAT,EAAE,wBACW,cAAc,EAA3B,QAAQ;IAEd,MAAM,OAAO,GAAG,CAAC,EACf,GAAG,GAAG,2BAA2B,EACjC,OAAO,GAAG,EAAE,EACZ,QAAQ,EACR,WAAW,GACF,EAAE,EAAE,yBAGT,qBAAS,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,EADrD,MAAM;QAGZ,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE,CAC7B,oBAAA,MAAM,EAAK,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;QAC7D,MAAM,YAAY,GAAG,oBAAA,QAAQ,EAAK,CAAC,CAAC,EAAE,CACpC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CACzC,CAAA;mCACgB,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,WAAW,CAAC,EAAxD,MAAM;YACZ,MAAM,IAAI,GAAG,oBAAA,MAAM,CAAC,IAAI,EAAK,QAAQ,CAAC,MAAM,CAAC,CAAA;YAE7C,MAAM,GAAG,GAAG,sBAAA,MAAM,CAAC,GAAG,EACpB,2BAAA,4BAAqB,wBAAiB,GAAG,CAAC,CAAC,EACzC,CAAC,CAAuC,EAAE,EAAE,CAC1C,CAAC,CAAC,IAAI,KAAK,qBAAqB,IAAI,CAAC,CAAC,IAAI,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"DiscordWS.js","sourceRoot":"","sources":["../../src/DiscordGateway/DiscordWS.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EACL,MAAM,EACN,SAAS,EACT,EAAE,GAGH,MAAM,uBAAuB,CAAA;AAkB9B,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,sBAAsB,GAAG,wBAAc,cAAc,EAAE;IAClE,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAC9B,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC5C,CAAC,CAAA;AAEF,MAAM,IAAI,2BACK,EAAE,EAAT,EAAE,wBACW,cAAc,EAA3B,QAAQ;IAEd,MAAM,OAAO,GAAG,CAAC,EACf,GAAG,GAAG,2BAA2B,EACjC,OAAO,GAAG,EAAE,EACZ,QAAQ,EACR,WAAW,GACF,EAAE,EAAE,yBAGT,qBAAS,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,EADrD,MAAM;QAGZ,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE,CAC7B,oBAAA,MAAM,EAAK,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;QAC7D,MAAM,YAAY,GAAG,oBAAA,QAAQ,EAAK,CAAC,CAAC,EAAE,CACpC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CACzC,CAAA;mCACgB,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,WAAW,CAAC,EAAxD,MAAM;YACZ,MAAM,IAAI,GAAG,oBAAA,MAAM,CAAC,IAAI,EAAK,QAAQ,CAAC,MAAM,CAAC,CAAA;YAE7C,MAAM,GAAG,GAAG,sBAAA,MAAM,CAAC,GAAG,EACpB,2BAAA,4BAAqB,wBAAiB,GAAG,CAAC,CAAC,EACzC,CAAC,CAAuC,EAAE,EAAE,CAC1C,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAqB,IAAI,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC;gBACnD,CAAC,CAAC,CAAC,IAAI,KAAK,gBAAgB,IAAI,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,CACvD,CACF,CAAA;YAED,OAAO;gBACL,GAAG;gBACH,IAAI;gBACJ,MAAM;aACE,CAAA;;MACV,CAAA;IAEJ,OAAO,EAAE,OAAO,EAAW,CAAA;GAC3B,CAAA;AAGF,MAAM,CAAC,MAAM,SAAS,GAAG,gBAAA,GAAG,EAAa,CAAA;AACzC,MAAM,CAAC,MAAM,aAAa,2BAAa,wBAAA,IAAI,EAAS,SAAS,CAAC,EAAjC,MAAM,CAA2B,CAAA"}
|
package/DiscordGateway/WS.d.ts
CHANGED
|
@@ -7,9 +7,10 @@ export declare const Reconnect: unique symbol;
|
|
|
7
7
|
export type Reconnect = typeof Reconnect;
|
|
8
8
|
export type Message = string | Buffer | ArrayBuffer | Reconnect;
|
|
9
9
|
export declare class WebSocketError {
|
|
10
|
-
readonly reason:
|
|
10
|
+
readonly reason: "open" | "error";
|
|
11
|
+
readonly error?: unknown;
|
|
11
12
|
readonly _tag = "WebSocketError";
|
|
12
|
-
constructor(reason: unknown);
|
|
13
|
+
constructor(reason: "open" | "error", error?: unknown);
|
|
13
14
|
}
|
|
14
15
|
export declare class WebSocketCloseError {
|
|
15
16
|
readonly code: number;
|
|
@@ -18,7 +19,7 @@ export declare class WebSocketCloseError {
|
|
|
18
19
|
constructor(code: number, reason: string);
|
|
19
20
|
}
|
|
20
21
|
declare const make: import("@effect/io/Effect").Effect<Log, never, {
|
|
21
|
-
readonly connect: (url: Ref<string>, takeOutbound: Effect<never, never, Message>, onReconnect?: import("@effect/io/Effect").Effect<never, never, void
|
|
22
|
+
readonly connect: (url: Ref<string>, takeOutbound: Effect<never, never, Message>, onReconnect?: import("@effect/io/Effect").Effect<never, never, void>, openTimeout?: import("../_common.js").Duration) => import("@effect/io/Effect").Effect<never, never, {
|
|
22
23
|
readonly run: import("@effect/io/Effect").Effect<never, WebSocketError | WebSocketCloseError, never>;
|
|
23
24
|
readonly take: import("@effect/io/Effect").Effect<never, never, WebSocket.Data>;
|
|
24
25
|
}>;
|
package/DiscordGateway/WS.js
CHANGED
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
import * as tsplus_module_1 from "@effect/io/Effect";
|
|
2
2
|
import * as tsplus_module_2 from "@effect/io/Ref";
|
|
3
|
-
import * as tsplus_module_3 from "@effect/
|
|
4
|
-
import * as tsplus_module_4 from "
|
|
3
|
+
import * as tsplus_module_3 from "@effect/data/Duration";
|
|
4
|
+
import * as tsplus_module_4 from "@effect/io/Queue";
|
|
5
|
+
import * as tsplus_module_5 from "dfx/_common";
|
|
5
6
|
import { Log } from "dfx/Log";
|
|
6
7
|
import WebSocket from "isomorphic-ws";
|
|
7
8
|
export const Reconnect = Symbol();
|
|
8
9
|
export class WebSocketError {
|
|
9
10
|
reason;
|
|
11
|
+
error;
|
|
10
12
|
_tag = "WebSocketError";
|
|
11
|
-
constructor(reason) {
|
|
13
|
+
constructor(reason, error) {
|
|
12
14
|
this.reason = reason;
|
|
15
|
+
this.error = error;
|
|
13
16
|
}
|
|
14
17
|
}
|
|
15
18
|
export class WebSocketCloseError {
|
|
@@ -22,24 +25,23 @@ export class WebSocketCloseError {
|
|
|
22
25
|
}
|
|
23
26
|
}
|
|
24
27
|
const isReconnect = (e) => e._tag === "WebSocketCloseError" && e.code === 1012;
|
|
25
|
-
const socket = (urlRef) => tsplus_module_1.acquireRelease(tsplus_module_1.
|
|
26
|
-
const ws = new WebSocket(url);
|
|
27
|
-
return tsplus_module_1.map(tsplus_module_1.async(resume => {
|
|
28
|
-
ws.addEventListener("open", () => resume(tsplus_module_1.unit()), {
|
|
29
|
-
once: true,
|
|
30
|
-
});
|
|
31
|
-
}), () => ws);
|
|
32
|
-
}), ws => tsplus_module_1.sync(() => {
|
|
28
|
+
const socket = (urlRef) => tsplus_module_1.tap(tsplus_module_1.acquireRelease(tsplus_module_1.map(tsplus_module_2.get(urlRef), _ => new WebSocket(_)), ws => tsplus_module_1.sync(() => {
|
|
33
29
|
;
|
|
34
30
|
ws.removeAllListeners?.();
|
|
35
31
|
ws.close();
|
|
36
|
-
}))
|
|
32
|
+
})), ws => ws.readyState === WebSocket.OPEN
|
|
33
|
+
? tsplus_module_1.unit()
|
|
34
|
+
: tsplus_module_1.async(resume => {
|
|
35
|
+
ws.addEventListener("open", () => resume(tsplus_module_1.unit()), {
|
|
36
|
+
once: true,
|
|
37
|
+
});
|
|
38
|
+
}));
|
|
37
39
|
const offer = (ws, queue, log) => tsplus_module_1.async(resume => {
|
|
38
40
|
ws.addEventListener("message", message => {
|
|
39
41
|
tsplus_module_1.runFork(tsplus_module_1.zipLeft(queue.offer(message.data), log.debug("WS", "offer", message.data)));
|
|
40
42
|
});
|
|
41
43
|
ws.addEventListener("error", cause => {
|
|
42
|
-
resume(tsplus_module_1.fail(new WebSocketError(cause)));
|
|
44
|
+
resume(tsplus_module_1.fail(new WebSocketError("error", cause)));
|
|
43
45
|
});
|
|
44
46
|
ws.addEventListener("close", e => {
|
|
45
47
|
resume(tsplus_module_1.fail(new WebSocketCloseError(e.code, e.reason)));
|
|
@@ -57,12 +59,12 @@ const send = (ws, take, log) => tsplus_module_1.forever(tsplus_module_1.tap(tspl
|
|
|
57
59
|
});
|
|
58
60
|
}));
|
|
59
61
|
const make = tsplus_module_1.map(Log, log => {
|
|
60
|
-
const connect = (url, takeOutbound, onReconnect = tsplus_module_1.unit()) => tsplus_module_1.map(
|
|
61
|
-
const run = tsplus_module_1.scoped(tsplus_module_1.retryWhile(tsplus_module_1.tapError(tsplus_module_1.flatMap(socket(url), ws => tsplus_module_1.zipParLeft(offer(ws, queue, log), send(ws, takeOutbound, log))), _ => (isReconnect(_) ? onReconnect : tsplus_module_1.unit())), isReconnect));
|
|
62
|
+
const connect = (url, takeOutbound, onReconnect = tsplus_module_1.unit(), openTimeout = tsplus_module_3.seconds(3)) => tsplus_module_1.map(tsplus_module_4.unbounded(), queue => {
|
|
63
|
+
const run = tsplus_module_1.scoped(tsplus_module_1.retryWhile(tsplus_module_1.tapError(tsplus_module_1.flatMap(tsplus_module_1.timeoutFail(socket(url), () => new WebSocketError("open"), openTimeout), ws => tsplus_module_1.zipParLeft(offer(ws, queue, log), send(ws, takeOutbound, log))), _ => (isReconnect(_) ? onReconnect : tsplus_module_1.unit())), isReconnect));
|
|
62
64
|
return { run, take: queue.take() };
|
|
63
65
|
});
|
|
64
66
|
return { connect };
|
|
65
67
|
});
|
|
66
|
-
export const WS =
|
|
68
|
+
export const WS = tsplus_module_5.Tag();
|
|
67
69
|
export const LiveWS = tsplus_module_1.toLayer(make, WS);
|
|
68
70
|
//# sourceMappingURL=WS.js.map
|
package/DiscordGateway/WS.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WS.js","sourceRoot":"","sources":["../../src/DiscordGateway/WS.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"WS.js","sourceRoot":"","sources":["../../src/DiscordGateway/WS.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dfx",
|
|
3
|
-
"version": "0.42.
|
|
3
|
+
"version": "0.42.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public",
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"ws": "^8.13.0"
|
|
51
51
|
},
|
|
52
52
|
"sideEffects": false,
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "54cd36e45f7f87564661e1253529851fee551b53"
|
|
54
54
|
}
|