dfx 0.24.5 → 0.24.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/DiscordGateway/DiscordWS.d.ts +2 -2
- package/DiscordGateway/DiscordWS.js +12 -12
- package/DiscordGateway/DiscordWS.js.map +1 -1
- package/DiscordGateway/Shard.js +15 -14
- package/DiscordGateway/Shard.js.map +1 -1
- package/DiscordGateway/WS.d.ts +2 -2
- package/DiscordGateway/WS.js +1 -1
- package/DiscordGateway/WS.js.map +1 -1
- package/package.json +3 -3
- package/utils/hub.d.ts +1 -6
- package/utils/hub.js +5 -13
- package/utils/hub.js.map +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="ws" />
|
|
2
|
-
import { Discord, Effect
|
|
2
|
+
import { Discord, Effect } from "dfx/_common";
|
|
3
3
|
import { WS } from "dfx/gateway";
|
|
4
4
|
import WebSocket from "isomorphic-ws";
|
|
5
5
|
export type Message = Discord.GatewayPayload | WS.Reconnect;
|
|
@@ -19,7 +19,7 @@ export declare const LiveJsonDiscordWSCodec: import("@effect-http/client/_common
|
|
|
19
19
|
declare const make: import("@effect-http/client/_common").Effect<import("../Log.js").Log | import("./WS.js").WS | DiscordWSCodec, never, {
|
|
20
20
|
readonly connect: ({ url, version, outbound, }: OpenOpts) => import("@effect-http/client/_common").Effect<never, never, {
|
|
21
21
|
readonly run: import("@effect-http/client/_common").Effect<never, never, never>;
|
|
22
|
-
readonly
|
|
22
|
+
readonly take: import("@effect-http/client/_common").Effect<never, never, import("../types.js").GatewayPayload<any>>;
|
|
23
23
|
readonly setUrl: (url: string) => import("@effect-http/client/_common").Effect<never, never, void>;
|
|
24
24
|
}>;
|
|
25
25
|
}>;
|
|
@@ -3,10 +3,9 @@ import * as tsplus_module_2 from "@effect/io/Layer";
|
|
|
3
3
|
import * as tsplus_module_3 from "@effect/data/Duration";
|
|
4
4
|
import * as tsplus_module_4 from "@effect/io/Schedule";
|
|
5
5
|
import * as tsplus_module_5 from "@effect/io/Effect";
|
|
6
|
-
import * as tsplus_module_6 from "dfx/
|
|
7
|
-
import * as tsplus_module_7 from "
|
|
8
|
-
import * as tsplus_module_8 from "
|
|
9
|
-
import * as tsplus_module_9 from "dfx";
|
|
6
|
+
import * as tsplus_module_6 from "dfx/gateway";
|
|
7
|
+
import * as tsplus_module_7 from "@effect/io/Ref";
|
|
8
|
+
import * as tsplus_module_8 from "dfx";
|
|
10
9
|
import { LiveWS } from "./WS.js";
|
|
11
10
|
export const DiscordWSCodec = tsplus_module_1.Tag();
|
|
12
11
|
export const LiveJsonDiscordWSCodec = tsplus_module_2.succeed(DiscordWSCodec, {
|
|
@@ -14,18 +13,19 @@ export const LiveJsonDiscordWSCodec = tsplus_module_2.succeed(DiscordWSCodec, {
|
|
|
14
13
|
encode: p => JSON.stringify(p),
|
|
15
14
|
decode: p => JSON.parse(p.toString("utf8")),
|
|
16
15
|
});
|
|
17
|
-
const make = tsplus_module_5.flatMap(tsplus_module_5.service(
|
|
18
|
-
const connect = ({ url = "wss://gateway.discord.gg/", version = 10, outbound, }) => tsplus_module_5.flatMap(
|
|
19
|
-
const setUrl = (url) =>
|
|
20
|
-
const
|
|
21
|
-
return tsplus_module_5.
|
|
22
|
-
const
|
|
16
|
+
const make = tsplus_module_5.flatMap(tsplus_module_5.service(tsplus_module_6.WS.WS), ws => tsplus_module_5.flatMap(tsplus_module_5.service(DiscordWSCodec), encoding => tsplus_module_5.map(tsplus_module_5.service(tsplus_module_8.Log.Log), log => {
|
|
17
|
+
const connect = ({ url = "wss://gateway.discord.gg/", version = 10, outbound, }) => tsplus_module_5.flatMap(tsplus_module_7.make(`${url}?v=${version}&encoding=${encoding.type}`), urlRef => {
|
|
18
|
+
const setUrl = (url) => tsplus_module_7.set(urlRef, `${url}?v=${version}&encoding=${encoding.type}`);
|
|
19
|
+
const takeOutbound = tsplus_module_5.map(outbound, a => a === tsplus_module_6.WS.Reconnect ? a : encoding.encode(a));
|
|
20
|
+
return tsplus_module_5.map(ws.connect(urlRef, takeOutbound), socket => {
|
|
21
|
+
const take = tsplus_module_5.map(socket.take, encoding.decode);
|
|
22
|
+
const run = tsplus_module_5.retry(tsplus_module_5.tapError(socket.run, e => log.info("DiscordWS", "ERROR", e)), tsplus_module_4.exponential(tsplus_module_3.seconds(0.5)));
|
|
23
23
|
return {
|
|
24
24
|
run,
|
|
25
|
-
|
|
25
|
+
take,
|
|
26
26
|
setUrl,
|
|
27
27
|
};
|
|
28
|
-
})
|
|
28
|
+
});
|
|
29
29
|
});
|
|
30
30
|
return { connect };
|
|
31
31
|
})));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscordWS.js","sourceRoot":"","sources":["../../src/DiscordGateway/DiscordWS.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DiscordWS.js","sourceRoot":"","sources":["../../src/DiscordGateway/DiscordWS.ts"],"names":[],"mappings":";;;;;;;;AACA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAgBhC,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,mDACK,gBAAA,EAAE,CAAC,EAAE,GAAZ,EAAE,4BACW,wBAAe,cAAc,CAAC,EAA3C,QAAQ,wBACA,wBAAe,gBAAA,GAAG,CAAC,GAAG,CAAC,EAA/B,GAAG;IAET,MAAM,OAAO,GAAG,CAAC,EACf,GAAG,GAAG,2BAA2B,EACjC,OAAO,GAAG,EAAE,EACZ,QAAQ,GACC,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,gBAAA,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAC5C,CAAA;mCACgB,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,EAA3C,MAAM;YACZ,MAAM,IAAI,GAAG,oBAAA,MAAM,CAAC,IAAI,EAAK,QAAQ,CAAC,MAAM,CAAC,CAAA;YAE7C,MAAM,GAAG,GAAG,sBAAA,yBAAA,MAAM,CAAC,GAAG,EACV,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAC1C,4BAAqB,wBAAiB,GAAG,CAAC,CAAC,CAInD,CAAA;YAED,OAAO;gBACL,GAAG;gBACH,IAAI;gBACJ,MAAM;aACE,CAAA;;MACV,CAAA;IAEJ,OAAO,EAAE,OAAO,EAAW,CAAA;IAC3B,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/Shard.js
CHANGED
|
@@ -29,24 +29,25 @@ export const make = tsplus_module_2.flatMap(tsplus_module_2.service(tsplus_modul
|
|
|
29
29
|
intents: gateway.intents,
|
|
30
30
|
presence: gateway.presence,
|
|
31
31
|
}, latestReady, latestSequence);
|
|
32
|
-
const onPayload = (
|
|
32
|
+
const onPayload = (p) => tsplus_module_2.flatMap(tsplus_module_2.zipPar(tsplus_module_2.zipPar(updateLatestReady(p), updateLatestSequence(p)), maybeUpdateUrl(p)), () => {
|
|
33
33
|
let effect = tsplus_module_2.unit();
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
34
|
+
switch (p.op) {
|
|
35
|
+
case 10 /* Discord.GatewayOpcode.HELLO */:
|
|
36
|
+
effect = tsplus_module_2.zipPar(tsplus_module_2.tap(identify, send), hellos.offer(p));
|
|
37
|
+
break;
|
|
38
|
+
case 11 /* Discord.GatewayOpcode.HEARTBEAT_ACK */:
|
|
39
|
+
effect = acks.offer(p);
|
|
40
|
+
break;
|
|
41
|
+
case 9 /* Discord.GatewayOpcode.INVALID_SESSION */:
|
|
42
|
+
effect = tsplus_module_2.tap(InvalidSession.fromPayload(p, latestReady), send);
|
|
43
|
+
break;
|
|
44
|
+
case 0 /* Discord.GatewayOpcode.DISPATCH */:
|
|
45
|
+
effect = hub.publish(p);
|
|
46
|
+
break;
|
|
45
47
|
}
|
|
46
48
|
return tsplus_module_2.map(effect, () => void 0);
|
|
47
49
|
});
|
|
48
|
-
const run = tsplus_module_2.zipParLeft(tsplus_module_2.zipParLeft(tsplus_module_2.forever(tsplus_module_2.flatMap(socket.
|
|
49
|
-
.take(), onPayload)), heartbeats), socket.run);
|
|
50
|
+
const run = tsplus_module_2.zipParLeft(tsplus_module_2.zipParLeft(tsplus_module_2.forever(tsplus_module_2.flatMap(socket.take, onPayload)), heartbeats), socket.run);
|
|
50
51
|
return {
|
|
51
52
|
run,
|
|
52
53
|
send: (p) => send(p),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Shard.js","sourceRoot":"","sources":["../../src/DiscordGateway/Shard.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAW,MAAM,gBAAgB,CAAA;AAClE,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAA;AACnD,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,OAAO,KAAK,cAAc,MAAM,2BAA2B,CAAA;AAC3D,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAEzC,MAAM,CAAC,MAAM,IAAI,2BACc,wBAAe,gBAAA,aAAa,CAAC,aAAa,CAAC,GAAlE,EAAE,KAAK,EAAE,OAAO,EAAE,6BACN,wCAAe,WAAW,CAAC,EAAvC,OAAO,gDACC,SAAS,GAAjB,GAAG;IAET,MAAM,OAAO,GAAG,CACd,KAAkC,EAClC,GAAsD,EACtD,EAAE,yBAEwB,2BAA0B,EAA5C,aAAa;QACnB,MAAM,QAAQ,GAAG,oBAAA,aAAa;aAC3B,IAAI,EAAE,EACF,GAAG,EAAE,CACR,OAAO,CAAC,SAAS,CAAC,gBAAgB,EAAE,wBAAiB,CAAC,CAAC,EAAE,GAAG,CAAC,CAC9D,CAAA;QACH,MAAM,IAAI,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;uCAElC,GAAG,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,EAApC,MAAM,4BAGV,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CACf,oBAAA,uBAEI,CAAC,CAAC,EAAmD,EAAE,CACrD,CAAC,CAAC,EAAE,2CAAmC,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,EAHhE,qBAAW,CAAC,CAAC,CAIV,EACI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,CAClB,GARG,CAAC,WAAW,EAAE,iBAAiB,CAAC,6BAWpC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,6BAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,GADtC,CAAC,cAAc,EAAE,oBAAoB,CAAC;YAG5C,MAAM,cAAc,GAAG,CAAC,CAAyB,EAAE,EAAE,CACnD,sBAAA,oBAAA,uBAEI,CAAC,CAAC,EAAmD,EAAE,CACrD,CAAC,CAAC,EAAE,2CAAmC,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,EAHhE,qBAAW,CAAC,CAAC,CAIV,EACI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,EAEb,GAAG,EAAE,CAAC,sBAAa,EACnB,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,CACzC,CAAA;2CAEY,2BAAyC,EAApD,MAAM,wBACG,2BAAyC,EAAlD,IAAI;gBAEV,aAAa;gBACb,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,CAAA;gBAEtE,WAAW;gBACX,MAAM,QAAQ,GAAG,QAAQ,CAAC,gBAAgB,CACxC;oBACE,KAAK,wBAAE,KAAK,CAAM;oBAClB,KAAK;oBACL,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;iBAC3B,EACD,WAAW,EACX,cAAc,CACf,CAAA;gBAED,MAAM,SAAS,GAAG,CAAC,CAAyB,EAAE,EAAE,yBAG1C,uBAAA,uBAAA,iBAAiB,CAAC,CAAC,CAAC,EACV,oBAAoB,CAAC,CAAC,CAAC,CAAC,EACxB,cAAc,CAAC,CAAC,CAAC,CAAC;oBAG9B,IAAI,MAAM,GAAG,sBAAa,CAAA;oBAE1B,
|
|
1
|
+
{"version":3,"file":"Shard.js","sourceRoot":"","sources":["../../src/DiscordGateway/Shard.ts"],"names":[],"mappings":"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"}
|
package/DiscordGateway/WS.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
/// <reference types="ws" />
|
|
3
|
-
import { Ref, Enqueue, Effect
|
|
3
|
+
import { Ref, Enqueue, Effect } from "dfx/_common";
|
|
4
4
|
import { Log } from "dfx";
|
|
5
5
|
import WebSocket from "isomorphic-ws";
|
|
6
6
|
export declare const Reconnect: unique symbol;
|
|
@@ -20,7 +20,7 @@ export declare class WebSocketCloseError {
|
|
|
20
20
|
declare const make: import("@effect-http/client/_common").Effect<import("../Log.js").Log, never, {
|
|
21
21
|
readonly connect: (url: Ref<string>, takeOutbound: Effect<never, never, Message>) => import("@effect-http/client/_common").Effect<never, never, {
|
|
22
22
|
readonly run: import("@effect-http/client/_common").Effect<never, WebSocketError | WebSocketCloseError, never>;
|
|
23
|
-
readonly
|
|
23
|
+
readonly take: import("@effect-http/client/_common").Effect<never, never, WebSocket.Data>;
|
|
24
24
|
}>;
|
|
25
25
|
}>;
|
|
26
26
|
export interface WS extends Effect.Success<typeof make> {
|
package/DiscordGateway/WS.js
CHANGED
|
@@ -59,7 +59,7 @@ const send = (ws, take, log) => tsplus_module_1.forever(tsplus_module_1.tap(tspl
|
|
|
59
59
|
const make = tsplus_module_1.map(tsplus_module_1.service(tsplus_module_5.Log.Log), log => {
|
|
60
60
|
const connect = (url, takeOutbound) => tsplus_module_1.map(tsplus_module_4.unbounded(), queue => {
|
|
61
61
|
const run = tsplus_module_1.scoped(tsplus_module_1.retry(tsplus_module_1.flatMap(socket(url), ws => tsplus_module_1.zipParLeft(offer(ws, queue), send(ws, takeOutbound, log))), tsplus_module_3.recurWhile(e => e._tag === "WebSocketCloseError" && e.code === 1012)));
|
|
62
|
-
return { run,
|
|
62
|
+
return { run, take: queue.take() };
|
|
63
63
|
});
|
|
64
64
|
return { connect };
|
|
65
65
|
});
|
package/DiscordGateway/WS.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WS.js","sourceRoot":"","sources":["../../src/DiscordGateway/WS.ts"],"names":[],"mappings":"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
|
|
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.24.
|
|
3
|
+
"version": "0.24.6",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"typescript": "https://cdn.jsdelivr.net/npm/@tsplus/installer@0.0.168/compiler/typescript.tgz"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@effect-http/client": "^0.2.
|
|
40
|
+
"@effect-http/client": "^0.2.8",
|
|
41
41
|
"@effect/data": "^0.1.2",
|
|
42
42
|
"@effect/io": "~0.1.12",
|
|
43
43
|
"@effect/stream": "~0.3.1",
|
|
@@ -51,5 +51,5 @@
|
|
|
51
51
|
"ws": "^8.12.1"
|
|
52
52
|
},
|
|
53
53
|
"sideEffects": false,
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "367f5c5f9d71f370952d50b273fe9d6039b345b5"
|
|
55
55
|
}
|
package/utils/hub.d.ts
CHANGED
|
@@ -1,14 +1,9 @@
|
|
|
1
|
-
import { Hub, Effect,
|
|
1
|
+
import { Hub, Effect, Maybe, RuntimeFiber } from "dfx/_common";
|
|
2
2
|
/**
|
|
3
3
|
* @tsplus fluent effect/io/Hub subscribeForEachPar
|
|
4
4
|
* @tsplus location "dfx/utils/hub"
|
|
5
5
|
*/
|
|
6
6
|
export declare const subscribeForEachPar: <R, E, A, X>(self: import("../_common.js").Hub<A>, effect: (_: A) => import("@effect-http/client/_common").Effect<R, E, X>) => import("@effect-http/client/_common").Effect<Exclude<R, import("../_common.js").Scope>, E, never>;
|
|
7
|
-
/**
|
|
8
|
-
* @tsplus fluent effect/io/Queue/Dequeue transform
|
|
9
|
-
* @tsplus location "dfx/utils/hub"
|
|
10
|
-
*/
|
|
11
|
-
export declare const transform: <A, B>(self: import("../_common.js").Dequeue<A>, f: (_: A) => B) => import("@effect-http/client/_common").Effect<never, never, readonly [import("../_common.js").Queue<B>, import("@effect-http/client/_common").Effect<never, never, never>]>;
|
|
12
7
|
/**
|
|
13
8
|
* @tsplus fluent effect/io/Effect foreverSwitch
|
|
14
9
|
* @tsplus location "dfx/utils/hub"
|
package/utils/hub.js
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import * as tsplus_module_1 from "dfx/_common";
|
|
2
2
|
import * as tsplus_module_2 from "@effect/io/Effect";
|
|
3
3
|
import * as tsplus_module_3 from "@effect/io/Deferred";
|
|
4
|
-
import * as tsplus_module_4 from "@effect/io/
|
|
5
|
-
import * as tsplus_module_5 from "@
|
|
6
|
-
import * as tsplus_module_6 from "@
|
|
7
|
-
import * as tsplus_module_7 from "@effect/io/Ref";
|
|
4
|
+
import * as tsplus_module_4 from "@effect/io/Fiber";
|
|
5
|
+
import * as tsplus_module_5 from "@fp-ts/core/Option";
|
|
6
|
+
import * as tsplus_module_6 from "@effect/io/Ref";
|
|
8
7
|
/**
|
|
9
8
|
* @tsplus fluent effect/io/Hub subscribeForEachPar
|
|
10
9
|
*/
|
|
@@ -14,18 +13,11 @@ export const subscribeForEachPar = (self, effect) => tsplus_module_2.flatMap(tsp
|
|
|
14
13
|
.take(), _ => tsplus_module_2.fork(tsplus_module_2.catchAllCause(effect(_), _ => tsplus_module_3.failCause(deferred, _)))))));
|
|
15
14
|
return tsplus_module_2.zipParLeft(run, tsplus_module_1.deferredAwait(deferred));
|
|
16
15
|
});
|
|
17
|
-
/**
|
|
18
|
-
* @tsplus fluent effect/io/Queue/Dequeue transform
|
|
19
|
-
*/
|
|
20
|
-
export const transform = (self, f) => tsplus_module_2.map(tsplus_module_4.unbounded(), queue => {
|
|
21
|
-
const run = tsplus_module_2.forever(tsplus_module_2.flatMap(self.take(), _ => queue.offer(f(_))));
|
|
22
|
-
return [queue, run];
|
|
23
|
-
});
|
|
24
16
|
/**
|
|
25
17
|
* @tsplus fluent effect/io/Effect foreverSwitch
|
|
26
18
|
*/
|
|
27
|
-
export const foreverSwitch = (self, f) => tsplus_module_2.flatMap(tsplus_module_3.make(), causeDeferred => tsplus_module_2.flatMap(
|
|
28
|
-
const run = tsplus_module_2.forever(tsplus_module_2.tap(tsplus_module_2.flatMap(tsplus_module_2.flatMap(self, _ => tsplus_module_2.fork(tsplus_module_2.tapErrorCause(f(_), _ => tsplus_module_3.failCause(causeDeferred, _)))), fiber =>
|
|
19
|
+
export const foreverSwitch = (self, f) => tsplus_module_2.flatMap(tsplus_module_3.make(), causeDeferred => tsplus_module_2.flatMap(tsplus_module_6.make(tsplus_module_5.none()), fiberRef => {
|
|
20
|
+
const run = tsplus_module_2.forever(tsplus_module_2.tap(tsplus_module_2.flatMap(tsplus_module_2.flatMap(self, _ => tsplus_module_2.fork(tsplus_module_2.tapErrorCause(f(_), _ => tsplus_module_3.failCause(causeDeferred, _)))), fiber => tsplus_module_6.getAndSet(fiberRef, tsplus_module_5.some(fiber))), _ => tsplus_module_5.match(_, () => tsplus_module_2.unit(), fiber => tsplus_module_4.interrupt(fiber))));
|
|
29
21
|
return tsplus_module_2.zipParLeft(run, tsplus_module_1.deferredAwait(causeDeferred));
|
|
30
22
|
}));
|
|
31
23
|
//# sourceMappingURL=hub.js.map
|
package/utils/hub.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hub.js","sourceRoot":"","sources":["../../src/utils/hub.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hub.js","sourceRoot":"","sources":["../../src/utils/hub.ts"],"names":[],"mappings":";;;;;;AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,IAAY,EACZ,MAAiC,EACjC,EAAE,yBAEmB,sBAAyB,EAAtC,QAAQ;IAEd,MAAM,GAAG,0BAAG,wBAAA,IAAI;SACb,SAAS,EAAE,EAEV,KAAK,CAAC,EAAE,yBACN,wBAAA,KAAK;SACF,IAAI,EAAE,EAEL,CAAC,CAAC,EAAE,sBAAC,8BAAA,MAAM,CAAC,CAAC,CAAC,EAAe,CAAC,CAAC,EAAE,CAAC,0BAAA,QAAQ,EAAW,CAAC,CAAC,CAAC,CAAK,CAC9D,CAAQ,CACd,CAAO,CAAA;WAED,2BAAA,GAAG,gCAAY,QAAQ,EAAO;EACvC,CAAA;AAGJ;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,IAAqB,EACrB,CAA8B,EACC,EAAE,yBAEP,sBAA0B,EAA5C,aAAa,4BACA,qBAAqC,sBAAY,CAAC,EAA/D,QAAQ;IAEd,MAAM,GAAG,2BAAG,oBAAA,wBAAA,wBAAA,IAAI,EACL,CAAC,CAAC,EAAE,sBAAC,8BAAA,CAAC,CAAC,CAAC,CAAC,EAAe,CAAC,CAAC,EAAE,CAAC,0BAAA,aAAa,EAAW,CAAC,CAAC,CAAC,CAAK,CAAC,EAC9D,KAAK,CAAC,EAAE,CAAC,0BAAA,QAAQ,EAAW,qBAAW,KAAK,CAAC,CAAC,CAAC,EACnD,CAAC,CAAC,EAAE,CACP,sBAAA,CAAC,EACC,GAAG,EAAE,CAAC,sBAAa,EACnB,KAAK,CAAC,EAAE,2BAAC,KAAK,CAAU,CACzB,CACF,CAAQ,CAAA;WAEF,2BAAA,GAAG,gCAAY,aAAa,EAAO;GAC5C,CAAA"}
|