dfx 0.42.3 → 0.42.5
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.js +1 -1
- package/DiscordGateway/DiscordWS.js.map +1 -1
- package/DiscordGateway/WS.js +11 -14
- package/DiscordGateway/WS.js.map +1 -1
- package/package.json +4 -4
- package/src/DiscordGateway/DiscordWS.ts +1 -1
- package/src/DiscordGateway/WS.ts +3 -7
- package/src/package.json +4 -4
|
@@ -17,7 +17,7 @@ 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.
|
|
20
|
+
const run = tsplus_module_5.retry(socket.run, tsplus_module_4.whileInput(tsplus_module_4.fixed(tsplus_module_3.seconds(0.5)), (_) => (_._tag === "WebSocketCloseError" && _.code < 2000) ||
|
|
21
21
|
(_._tag === "WebSocketError" && _.reason === "open-timeout")));
|
|
22
22
|
return {
|
|
23
23
|
run,
|
|
@@ -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,
|
|
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,sBAAe,wBAAiB,GAAG,CAAC,CAAC,EACnC,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,cAAc,CAAC,CAC/D,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.js
CHANGED
|
@@ -51,23 +51,20 @@ const waitForOpen = (ws, timeout) => tsplus_module_1.timeoutFail(tsplus_module_1
|
|
|
51
51
|
});
|
|
52
52
|
});
|
|
53
53
|
}), () => new WebSocketError("open-timeout"), timeout);
|
|
54
|
-
const send = (ws, take, log,
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
return new WebSocketCloseError(1012, "reconnecting");
|
|
60
|
-
});
|
|
61
|
-
}
|
|
62
|
-
return tsplus_module_1.sync(() => {
|
|
63
|
-
ws.send(data);
|
|
54
|
+
const send = (ws, take, log) => tsplus_module_1.forever(tsplus_module_1.tap(tsplus_module_1.tap(take, data => log.debug("WS", "send", data)), (data) => {
|
|
55
|
+
if (data === Reconnect) {
|
|
56
|
+
return tsplus_module_1.failSync(() => {
|
|
57
|
+
ws.close(1012, "reconnecting");
|
|
58
|
+
return new WebSocketCloseError(1012, "reconnecting");
|
|
64
59
|
});
|
|
65
|
-
}
|
|
66
|
-
return tsplus_module_1.
|
|
67
|
-
|
|
60
|
+
}
|
|
61
|
+
return tsplus_module_1.sync(() => {
|
|
62
|
+
ws.send(data);
|
|
63
|
+
});
|
|
64
|
+
}));
|
|
68
65
|
const make = tsplus_module_1.map(Log, log => {
|
|
69
66
|
const connect = (url, takeOutbound, onReconnect = tsplus_module_1.unit(), openTimeout = tsplus_module_3.seconds(3)) => tsplus_module_1.map(tsplus_module_4.unbounded(), queue => {
|
|
70
|
-
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
|
|
67
|
+
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), tsplus_module_1.zipRight(waitForOpen(ws, openTimeout), send(ws, takeOutbound, log)))), _ => (isReconnect(_) ? onReconnect : tsplus_module_1.unit())), isReconnect));
|
|
71
68
|
return { run, take: queue.take() };
|
|
72
69
|
});
|
|
73
70
|
return { connect };
|
package/DiscordGateway/WS.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WS.js","sourceRoot":"","sources":["../src/DiscordGateway/WS.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,SAAS,MAAM,eAAe,CAAA;AAErC,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,EAAE,CAAA;AAIjC,MAAM,OAAO,cAAc;IAGd;IACA;IAHF,IAAI,GAAG,gBAAgB,CAAA;IAChC,YACW,MAAgC,EAChC,KAAe;QADf,WAAM,GAAN,MAAM,CAA0B;QAChC,UAAK,GAAL,KAAK,CAAU;IACvB,CAAC;CACL;AAED,MAAM,OAAO,mBAAmB;IAET;IAAuB;IADnC,IAAI,GAAG,qBAAqB,CAAA;IACrC,YAAqB,IAAY,EAAW,MAAc;QAArC,SAAI,GAAJ,IAAI,CAAQ;QAAW,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;CAC/D;AAED,MAAM,WAAW,GAAG,CAClB,CAAuC,EACb,EAAE,CAC5B,CAAC,CAAC,IAAI,KAAK,qBAAqB,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAA;AAErD,MAAM,MAAM,GAAG,CAAC,MAAmB,EAAE,EAAE,CACrC,+BAAA,wCAAA,MAAM,GACC,CAAC,CAAC,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC,CAAgC,CAAC,EAC1C,EAAE,CAAC,EAAE,CACnB,qBAAY,GAAG,EAAE;IACf,CAAC;IAAC,EAAU,CAAC,kBAAkB,EAAE,EAAE,CAAA;IACnC,EAAE,CAAC,KAAK,EAAE,CAAA;AACZ,CAAC,CAAC,CACH,CAAA;AAEL,MAAM,KAAK,GAAG,CACZ,EAAwB,EACxB,KAA8B,EAC9B,GAAQ,EACR,EAAE,CACF,sBAAiE,MAAM,CAAC,EAAE;IACxE,EAAE,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE;QACvC,wBAAA,wBAAA,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAS,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,EAC/D;IACZ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;QACnC,MAAM,CAAC,qBAAY,IAAI,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;IACzD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE;QAC/B,MAAM,CAAC,qBAAY,IAAI,mBAAmB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAChE,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEJ,MAAM,WAAW,GAAG,CAAC,EAAwB,EAAE,OAAiB,EAAE,EAAE,CAClE,4BAAA,wBAAe,GAAG,EAAE;IAClB,IAAI,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE;QACpC,OAAO,sBAAa,CAAA;KACrB;IAED,OAAO,sBAAiC,MAAM,CAAC,EAAE;QAC/C,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,sBAAa,CAAC,EAAE;YACvD,IAAI,EAAE,IAAI;SACX,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,EAAa,GAAG,EAAE,CAAC,IAAI,cAAc,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC,CAAA;AAEnE,MAAM,IAAI,GAAG,CACX,EAAwB,EACxB,IAAmC,EACnC,GAAQ,EACR,
|
|
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.5",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"@tim-smart/discord-api-docs-parser": "^0.5.2",
|
|
28
28
|
"@tsplus-types/effect__data": "0.12.2-3b576ba",
|
|
29
29
|
"@tsplus-types/effect__io": "0.25.8-3b576ba",
|
|
30
|
-
"@tsplus-types/effect__stream": "0.21.
|
|
30
|
+
"@tsplus-types/effect__stream": "0.21.1-3b576ba",
|
|
31
31
|
"@types/ws": "^8.5.4",
|
|
32
32
|
"dotenv": "^16.0.3",
|
|
33
33
|
"lerna": "^6.6.1",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"@effect-http/client": "^0.24.2",
|
|
39
39
|
"@effect/data": "^0.12.2",
|
|
40
40
|
"@effect/io": "~0.25.8",
|
|
41
|
-
"@effect/stream": "~0.21.
|
|
41
|
+
"@effect/stream": "~0.21.1",
|
|
42
42
|
"tweetnacl": "^1.0.3"
|
|
43
43
|
},
|
|
44
44
|
"optionalDependencies": {
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
"ws": "^8.13.0"
|
|
49
49
|
},
|
|
50
50
|
"sideEffects": false,
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "6ce4b16891736f33f8a8d5617eee19401369242b"
|
|
52
52
|
}
|
|
@@ -52,7 +52,7 @@ const make = Do($ => {
|
|
|
52
52
|
const take = socket.take.map(encoding.decode)
|
|
53
53
|
|
|
54
54
|
const run = socket.run.retry(
|
|
55
|
-
Schedule.
|
|
55
|
+
Schedule.fixed(Duration.seconds(0.5)).whileInput(
|
|
56
56
|
(_: WebSocketError | WebSocketCloseError) =>
|
|
57
57
|
(_._tag === "WebSocketCloseError" && _.code < 2000) ||
|
|
58
58
|
(_._tag === "WebSocketError" && _.reason === "open-timeout"),
|
package/src/DiscordGateway/WS.ts
CHANGED
|
@@ -70,9 +70,8 @@ const send = (
|
|
|
70
70
|
ws: globalThis.WebSocket,
|
|
71
71
|
take: Effect<never, never, Message>,
|
|
72
72
|
log: Log,
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
const loop = take
|
|
73
|
+
) =>
|
|
74
|
+
take
|
|
76
75
|
.tap(data => log.debug("WS", "send", data))
|
|
77
76
|
.tap((data): Effect<never, WebSocketCloseError, void> => {
|
|
78
77
|
if (data === Reconnect) {
|
|
@@ -87,9 +86,6 @@ const send = (
|
|
|
87
86
|
})
|
|
88
87
|
}).forever
|
|
89
88
|
|
|
90
|
-
return waitForOpen(ws, openTimeout).zipRight(loop)
|
|
91
|
-
}
|
|
92
|
-
|
|
93
89
|
const make = Do($ => {
|
|
94
90
|
const log = $(Log)
|
|
95
91
|
|
|
@@ -105,7 +101,7 @@ const make = Do($ => {
|
|
|
105
101
|
const run = socket(url)
|
|
106
102
|
.flatMap(ws =>
|
|
107
103
|
offer(ws, queue, log).zipParLeft(
|
|
108
|
-
send(ws, takeOutbound, log
|
|
104
|
+
waitForOpen(ws, openTimeout).zipRight(send(ws, takeOutbound, log)),
|
|
109
105
|
),
|
|
110
106
|
)
|
|
111
107
|
.tapError(_ => (isReconnect(_) ? onReconnect : Effect.unit()))
|
package/src/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dfx",
|
|
3
|
-
"version": "0.42.
|
|
3
|
+
"version": "0.42.5",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"@tim-smart/discord-api-docs-parser": "^0.5.2",
|
|
28
28
|
"@tsplus-types/effect__data": "0.12.2-3b576ba",
|
|
29
29
|
"@tsplus-types/effect__io": "0.25.8-3b576ba",
|
|
30
|
-
"@tsplus-types/effect__stream": "0.21.
|
|
30
|
+
"@tsplus-types/effect__stream": "0.21.1-3b576ba",
|
|
31
31
|
"@types/ws": "^8.5.4",
|
|
32
32
|
"dotenv": "^16.0.3",
|
|
33
33
|
"lerna": "^6.6.1",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"@effect-http/client": "^0.24.2",
|
|
39
39
|
"@effect/data": "^0.12.2",
|
|
40
40
|
"@effect/io": "~0.25.8",
|
|
41
|
-
"@effect/stream": "~0.21.
|
|
41
|
+
"@effect/stream": "~0.21.1",
|
|
42
42
|
"tweetnacl": "^1.0.3"
|
|
43
43
|
},
|
|
44
44
|
"optionalDependencies": {
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
"ws": "^8.13.0"
|
|
49
49
|
},
|
|
50
50
|
"sideEffects": false,
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "6ce4b16891736f33f8a8d5617eee19401369242b"
|
|
52
52
|
}
|