@effect/platform-node-shared 0.51.0 → 0.51.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.
- package/dist/cjs/NodeSocket.js +23 -21
- package/dist/cjs/NodeSocket.js.map +1 -1
- package/dist/dts/NodeSocket.d.ts.map +1 -1
- package/dist/esm/NodeSocket.js +23 -21
- package/dist/esm/NodeSocket.js.map +1 -1
- package/package.json +4 -4
- package/src/NodeSocket.ts +28 -25
package/dist/cjs/NodeSocket.js
CHANGED
|
@@ -28,8 +28,9 @@ const NetSocket = exports.NetSocket = /*#__PURE__*/Context.GenericTag("@effect/p
|
|
|
28
28
|
* @category constructors
|
|
29
29
|
*/
|
|
30
30
|
const makeNet = options => fromDuplex(Effect.scopeWith(scope => {
|
|
31
|
-
|
|
31
|
+
let conn;
|
|
32
32
|
return Effect.flatMap(Scope.addFinalizer(scope, Effect.sync(() => {
|
|
33
|
+
if (!conn) return;
|
|
33
34
|
if (conn.closed === false) {
|
|
34
35
|
if ("destroySoon" in conn) {
|
|
35
36
|
conn.destroySoon();
|
|
@@ -40,15 +41,16 @@ const makeNet = options => fromDuplex(Effect.scopeWith(scope => {
|
|
|
40
41
|
}
|
|
41
42
|
conn.removeAllListeners();
|
|
42
43
|
})), () => Effect.async(resume => {
|
|
43
|
-
|
|
44
|
-
reason: "Open",
|
|
45
|
-
cause
|
|
46
|
-
})));
|
|
44
|
+
conn = Net.createConnection(options);
|
|
47
45
|
conn.once("connect", () => {
|
|
48
|
-
conn.off("error", onError);
|
|
49
46
|
resume(Effect.succeed(conn));
|
|
50
47
|
});
|
|
51
|
-
conn.on("error",
|
|
48
|
+
conn.on("error", cause => {
|
|
49
|
+
resume(Effect.fail(new Socket.SocketGenericError({
|
|
50
|
+
reason: "Open",
|
|
51
|
+
cause
|
|
52
|
+
})));
|
|
53
|
+
});
|
|
52
54
|
}));
|
|
53
55
|
}));
|
|
54
56
|
/**
|
|
@@ -62,8 +64,22 @@ const fromDuplex = open => Effect.withFiberRuntime(fiber => {
|
|
|
62
64
|
const openContext = fiber.currentContext;
|
|
63
65
|
const run = (handler, opts) => Effect.scopedWith(Effect.fnUntraced(function* (scope) {
|
|
64
66
|
const fiberSet = yield* FiberSet.make().pipe(Scope.extend(scope));
|
|
67
|
+
yield* Scope.addFinalizer(scope, Effect.sync(() => {
|
|
68
|
+
conn.off("data", onData);
|
|
69
|
+
conn.off("end", onEnd);
|
|
70
|
+
conn.off("error", onError);
|
|
71
|
+
conn.off("close", onClose);
|
|
72
|
+
}));
|
|
65
73
|
const conn = yield* Scope.extend(open, scope);
|
|
74
|
+
conn.on("end", onEnd);
|
|
75
|
+
conn.on("error", onError);
|
|
76
|
+
conn.on("close", onClose);
|
|
66
77
|
const run = yield* Effect.provideService(FiberSet.runtime(fiberSet)(), NetSocket, conn);
|
|
78
|
+
conn.on("data", onData);
|
|
79
|
+
currentSocket = conn;
|
|
80
|
+
yield* latch.open;
|
|
81
|
+
if (opts?.onOpen) yield* opts.onOpen;
|
|
82
|
+
return yield* FiberSet.join(fiberSet);
|
|
67
83
|
function onData(chunk) {
|
|
68
84
|
const result = handler(chunk);
|
|
69
85
|
if (Effect.isEffect(result)) {
|
|
@@ -85,20 +101,6 @@ const fromDuplex = open => Effect.withFiberRuntime(fiber => {
|
|
|
85
101
|
code: hadError ? 1006 : 1000
|
|
86
102
|
})));
|
|
87
103
|
}
|
|
88
|
-
yield* Scope.addFinalizer(scope, Effect.sync(() => {
|
|
89
|
-
conn.off("data", onData);
|
|
90
|
-
conn.off("end", onEnd);
|
|
91
|
-
conn.off("error", onError);
|
|
92
|
-
conn.off("close", onClose);
|
|
93
|
-
}));
|
|
94
|
-
conn.on("data", onData);
|
|
95
|
-
conn.on("end", onEnd);
|
|
96
|
-
conn.on("error", onError);
|
|
97
|
-
conn.on("close", onClose);
|
|
98
|
-
currentSocket = conn;
|
|
99
|
-
yield* latch.open;
|
|
100
|
-
if (opts?.onOpen) yield* opts.onOpen;
|
|
101
|
-
return yield* FiberSet.join(fiberSet);
|
|
102
104
|
})).pipe(Effect.mapInputContext(input => Context.merge(openContext, input)), Effect.ensuring(Effect.sync(() => {
|
|
103
105
|
latch.unsafeClose();
|
|
104
106
|
currentSocket = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeSocket.js","names":["Socket","_interopRequireWildcard","require","Channel","Context","Deferred","Effect","FiberSet","Layer","Scope","Net","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","NetSocket","exports","GenericTag","makeNet","options","fromDuplex","scopeWith","scope","conn","
|
|
1
|
+
{"version":3,"file":"NodeSocket.js","names":["Socket","_interopRequireWildcard","require","Channel","Context","Deferred","Effect","FiberSet","Layer","Scope","Net","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","NetSocket","exports","GenericTag","makeNet","options","fromDuplex","scopeWith","scope","conn","flatMap","addFinalizer","sync","closed","destroySoon","destroy","removeAllListeners","async","resume","createConnection","once","succeed","on","cause","fail","SocketGenericError","reason","open","withFiberRuntime","fiber","currentSocket","latch","unsafeMakeLatch","openContext","currentContext","run","handler","opts","scopedWith","fnUntraced","fiberSet","make","pipe","extend","off","onData","onEnd","onError","onClose","provideService","runtime","onOpen","join","chunk","result","isEffect","unsafeDone","deferred","void","hadError","SocketCloseError","code","mapInputContext","input","merge","ensuring","unsafeClose","undefined","interruptible","write","whenOpen","isCloseEvent","Error","writer","acquireRelease","writableEnded","end","of","TypeId","runRaw","makeNetChannel","unwrapScoped","map","toChannelWith","layerNet","effect"],"sources":["../../src/NodeSocket.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeSocket.d.ts","sourceRoot":"","sources":["../../src/NodeSocket.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,yBAAyB,CAAA;AACjD,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAEzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAC/B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC;;;GAGG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AAED;;;GAGG;AACH,eAAO,MAAM,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,CAExD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,OAAO,GAClB,SAAS,GAAG,CAAC,cAAc,KAC1B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"NodeSocket.d.ts","sourceRoot":"","sources":["../../src/NodeSocket.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,yBAAyB,CAAA;AACjD,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAEzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAC/B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC;;;GAGG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AAED;;;GAGG;AACH,eAAO,MAAM,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,CAExD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,OAAO,GAClB,SAAS,GAAG,CAAC,cAAc,KAC1B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CA+B/C,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,EAAE,EAC3B,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,KAClD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,CAsG3D,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,EAAE,GAAG,KAAK,EACvC,SAAS,GAAG,CAAC,cAAc,KAC1B,OAAO,CAAC,OAAO,CAChB,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,EACvB,KAAK,CAAC,KAAK,CAAC,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,EACpD,MAAM,CAAC,WAAW,GAAG,EAAE,EACvB,EAAE,EACF,IAAI,EACJ,OAAO,CAIN,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,QAAQ,GAAI,SAAS,GAAG,CAAC,cAAc,KAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CACrD,CAAA"}
|
package/dist/esm/NodeSocket.js
CHANGED
|
@@ -20,8 +20,9 @@ export const NetSocket = /*#__PURE__*/Context.GenericTag("@effect/platform-node/
|
|
|
20
20
|
* @category constructors
|
|
21
21
|
*/
|
|
22
22
|
export const makeNet = options => fromDuplex(Effect.scopeWith(scope => {
|
|
23
|
-
|
|
23
|
+
let conn;
|
|
24
24
|
return Effect.flatMap(Scope.addFinalizer(scope, Effect.sync(() => {
|
|
25
|
+
if (!conn) return;
|
|
25
26
|
if (conn.closed === false) {
|
|
26
27
|
if ("destroySoon" in conn) {
|
|
27
28
|
conn.destroySoon();
|
|
@@ -32,15 +33,16 @@ export const makeNet = options => fromDuplex(Effect.scopeWith(scope => {
|
|
|
32
33
|
}
|
|
33
34
|
conn.removeAllListeners();
|
|
34
35
|
})), () => Effect.async(resume => {
|
|
35
|
-
|
|
36
|
-
reason: "Open",
|
|
37
|
-
cause
|
|
38
|
-
})));
|
|
36
|
+
conn = Net.createConnection(options);
|
|
39
37
|
conn.once("connect", () => {
|
|
40
|
-
conn.off("error", onError);
|
|
41
38
|
resume(Effect.succeed(conn));
|
|
42
39
|
});
|
|
43
|
-
conn.on("error",
|
|
40
|
+
conn.on("error", cause => {
|
|
41
|
+
resume(Effect.fail(new Socket.SocketGenericError({
|
|
42
|
+
reason: "Open",
|
|
43
|
+
cause
|
|
44
|
+
})));
|
|
45
|
+
});
|
|
44
46
|
}));
|
|
45
47
|
}));
|
|
46
48
|
/**
|
|
@@ -53,8 +55,22 @@ export const fromDuplex = open => Effect.withFiberRuntime(fiber => {
|
|
|
53
55
|
const openContext = fiber.currentContext;
|
|
54
56
|
const run = (handler, opts) => Effect.scopedWith(Effect.fnUntraced(function* (scope) {
|
|
55
57
|
const fiberSet = yield* FiberSet.make().pipe(Scope.extend(scope));
|
|
58
|
+
yield* Scope.addFinalizer(scope, Effect.sync(() => {
|
|
59
|
+
conn.off("data", onData);
|
|
60
|
+
conn.off("end", onEnd);
|
|
61
|
+
conn.off("error", onError);
|
|
62
|
+
conn.off("close", onClose);
|
|
63
|
+
}));
|
|
56
64
|
const conn = yield* Scope.extend(open, scope);
|
|
65
|
+
conn.on("end", onEnd);
|
|
66
|
+
conn.on("error", onError);
|
|
67
|
+
conn.on("close", onClose);
|
|
57
68
|
const run = yield* Effect.provideService(FiberSet.runtime(fiberSet)(), NetSocket, conn);
|
|
69
|
+
conn.on("data", onData);
|
|
70
|
+
currentSocket = conn;
|
|
71
|
+
yield* latch.open;
|
|
72
|
+
if (opts?.onOpen) yield* opts.onOpen;
|
|
73
|
+
return yield* FiberSet.join(fiberSet);
|
|
58
74
|
function onData(chunk) {
|
|
59
75
|
const result = handler(chunk);
|
|
60
76
|
if (Effect.isEffect(result)) {
|
|
@@ -76,20 +92,6 @@ export const fromDuplex = open => Effect.withFiberRuntime(fiber => {
|
|
|
76
92
|
code: hadError ? 1006 : 1000
|
|
77
93
|
})));
|
|
78
94
|
}
|
|
79
|
-
yield* Scope.addFinalizer(scope, Effect.sync(() => {
|
|
80
|
-
conn.off("data", onData);
|
|
81
|
-
conn.off("end", onEnd);
|
|
82
|
-
conn.off("error", onError);
|
|
83
|
-
conn.off("close", onClose);
|
|
84
|
-
}));
|
|
85
|
-
conn.on("data", onData);
|
|
86
|
-
conn.on("end", onEnd);
|
|
87
|
-
conn.on("error", onError);
|
|
88
|
-
conn.on("close", onClose);
|
|
89
|
-
currentSocket = conn;
|
|
90
|
-
yield* latch.open;
|
|
91
|
-
if (opts?.onOpen) yield* opts.onOpen;
|
|
92
|
-
return yield* FiberSet.join(fiberSet);
|
|
93
95
|
})).pipe(Effect.mapInputContext(input => Context.merge(openContext, input)), Effect.ensuring(Effect.sync(() => {
|
|
94
96
|
latch.unsafeClose();
|
|
95
97
|
currentSocket = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeSocket.js","names":["Socket","Channel","Context","Deferred","Effect","FiberSet","Layer","Scope","Net","NetSocket","GenericTag","makeNet","options","fromDuplex","scopeWith","scope","conn","
|
|
1
|
+
{"version":3,"file":"NodeSocket.js","names":["Socket","Channel","Context","Deferred","Effect","FiberSet","Layer","Scope","Net","NetSocket","GenericTag","makeNet","options","fromDuplex","scopeWith","scope","conn","flatMap","addFinalizer","sync","closed","destroySoon","destroy","removeAllListeners","async","resume","createConnection","once","succeed","on","cause","fail","SocketGenericError","reason","open","withFiberRuntime","fiber","currentSocket","latch","unsafeMakeLatch","openContext","currentContext","run","handler","opts","scopedWith","fnUntraced","fiberSet","make","pipe","extend","off","onData","onEnd","onError","onClose","provideService","runtime","onOpen","join","chunk","result","isEffect","unsafeDone","deferred","void","hadError","SocketCloseError","code","mapInputContext","input","merge","ensuring","unsafeClose","undefined","interruptible","write","whenOpen","isCloseEvent","Error","writer","acquireRelease","writableEnded","end","of","TypeId","runRaw","makeNetChannel","unwrapScoped","map","toChannelWith","layerNet","effect"],"sources":["../../src/NodeSocket.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,MAAM,MAAM,yBAAyB;AACjD,OAAO,KAAKC,OAAO,MAAM,gBAAgB;AAEzC,OAAO,KAAKC,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,GAAG,MAAM,UAAU;AAW/B;;;;AAIA,OAAO,MAAMC,SAAS,gBAAuCP,OAAO,CAACQ,UAAU,CAC7E,4CAA4C,CAC7C;AAED;;;;AAIA,OAAO,MAAMC,OAAO,GAClBC,OAA2B,IAE3BC,UAAU,CACRT,MAAM,CAACU,SAAS,CAAEC,KAAK,IAAI;EACzB,IAAIC,IAA4B;EAChC,OAAOZ,MAAM,CAACa,OAAO,CACnBV,KAAK,CAACW,YAAY,CAChBH,KAAK,EACLX,MAAM,CAACe,IAAI,CAAC,MAAK;IACf,IAAI,CAACH,IAAI,EAAE;IACX,IAAIA,IAAI,CAACI,MAAM,KAAK,KAAK,EAAE;MACzB,IAAI,aAAa,IAAIJ,IAAI,EAAE;QACzBA,IAAI,CAACK,WAAW,EAAE;MACpB,CAAC,MAAM;QACL;QAAEL,IAAmB,CAACM,OAAO,EAAE;MACjC;IACF;IACAN,IAAI,CAACO,kBAAkB,EAAE;EAC3B,CAAC,CAAC,CACH,EACD,MACEnB,MAAM,CAACoB,KAAK,CAAyCC,MAAM,IAAI;IAC7DT,IAAI,GAAGR,GAAG,CAACkB,gBAAgB,CAACd,OAAO,CAAC;IACpCI,IAAI,CAACW,IAAI,CAAC,SAAS,EAAE,MAAK;MACxBF,MAAM,CAACrB,MAAM,CAACwB,OAAO,CAACZ,IAAK,CAAC,CAAC;IAC/B,CAAC,CAAC;IACFA,IAAI,CAACa,EAAE,CAAC,OAAO,EAAGC,KAAK,IAAI;MACzBL,MAAM,CAACrB,MAAM,CAAC2B,IAAI,CAAC,IAAI/B,MAAM,CAACgC,kBAAkB,CAAC;QAAEC,MAAM,EAAE,MAAM;QAAEH;MAAK,CAAE,CAAC,CAAC,CAAC;IAC/E,CAAC,CAAC;EACJ,CAAC,CAAC,CACL;AACH,CAAC,CAAC,CACH;AAEH;;;;AAIA,OAAO,MAAMjB,UAAU,GACrBqB,IAAmD,IAEnD9B,MAAM,CAAC+B,gBAAgB,CAAkDC,KAAK,IAAI;EAChF,IAAIC,aAAiC;EACrC,MAAMC,KAAK,GAAGlC,MAAM,CAACmC,eAAe,CAAC,KAAK,CAAC;EAC3C,MAAMC,WAAW,GAAGJ,KAAK,CAACK,cAAqC;EAC/D,MAAMC,GAAG,GAAGA,CAAUC,OAAyD,EAAEC,IAEhF,KACCxC,MAAM,CAACyC,UAAU,CAACzC,MAAM,CAAC0C,UAAU,CAAC,WAAU/B,KAAK;IACjD,MAAMgC,QAAQ,GAAG,OAAO1C,QAAQ,CAAC2C,IAAI,EAA+B,CAACC,IAAI,CACvE1C,KAAK,CAAC2C,MAAM,CAACnC,KAAK,CAAC,CACpB;IACD,OAAOR,KAAK,CAACW,YAAY,CACvBH,KAAK,EACLX,MAAM,CAACe,IAAI,CAAC,MAAK;MACfH,IAAI,CAACmC,GAAG,CAAC,MAAM,EAAEC,MAAM,CAAC;MACxBpC,IAAI,CAACmC,GAAG,CAAC,KAAK,EAAEE,KAAK,CAAC;MACtBrC,IAAI,CAACmC,GAAG,CAAC,OAAO,EAAEG,OAAO,CAAC;MAC1BtC,IAAI,CAACmC,GAAG,CAAC,OAAO,EAAEI,OAAO,CAAC;IAC5B,CAAC,CAAC,CACH;IAED,MAAMvC,IAAI,GAAG,OAAOT,KAAK,CAAC2C,MAAM,CAAChB,IAAI,EAAEnB,KAAK,CAAC;IAC7CC,IAAI,CAACa,EAAE,CAAC,KAAK,EAAEwB,KAAK,CAAC;IACrBrC,IAAI,CAACa,EAAE,CAAC,OAAO,EAAEyB,OAAO,CAAC;IACzBtC,IAAI,CAACa,EAAE,CAAC,OAAO,EAAE0B,OAAO,CAAC;IAEzB,MAAMb,GAAG,GAAG,OAAOtC,MAAM,CAACoD,cAAc,CAACnD,QAAQ,CAACoD,OAAO,CAACV,QAAQ,CAAC,EAAK,EAAEtC,SAAS,EAAEO,IAAkB,CAAC;IACxGA,IAAI,CAACa,EAAE,CAAC,MAAM,EAAEuB,MAAM,CAAC;IAEvBf,aAAa,GAAGrB,IAAI;IACpB,OAAOsB,KAAK,CAACJ,IAAI;IACjB,IAAIU,IAAI,EAAEc,MAAM,EAAE,OAAOd,IAAI,CAACc,MAAM;IAEpC,OAAO,OAAOrD,QAAQ,CAACsD,IAAI,CAACZ,QAAQ,CAAC;IAErC,SAASK,MAAMA,CAACQ,KAAiB;MAC/B,MAAMC,MAAM,GAAGlB,OAAO,CAACiB,KAAK,CAAC;MAC7B,IAAIxD,MAAM,CAAC0D,QAAQ,CAACD,MAAM,CAAC,EAAE;QAC3BnB,GAAG,CAACmB,MAAM,CAAC;MACb;IACF;IACA,SAASR,KAAKA,CAAA;MACZlD,QAAQ,CAAC4D,UAAU,CAAChB,QAAQ,CAACiB,QAAQ,EAAE5D,MAAM,CAAC6D,IAAI,CAAC;IACrD;IACA,SAASX,OAAOA,CAACxB,KAAY;MAC3B3B,QAAQ,CAAC4D,UAAU,CACjBhB,QAAQ,CAACiB,QAAQ,EACjB5D,MAAM,CAAC2B,IAAI,CAAC,IAAI/B,MAAM,CAACgC,kBAAkB,CAAC;QAAEC,MAAM,EAAE,MAAM;QAAEH;MAAK,CAAE,CAAC,CAAC,CACtE;IACH;IACA,SAASyB,OAAOA,CAACW,QAAiB;MAChC/D,QAAQ,CAAC4D,UAAU,CACjBhB,QAAQ,CAACiB,QAAQ,EACjB5D,MAAM,CAAC2B,IAAI,CACT,IAAI/B,MAAM,CAACmE,gBAAgB,CAAC;QAC1BlC,MAAM,EAAE,OAAO;QACfmC,IAAI,EAAEF,QAAQ,GAAG,IAAI,GAAG;OACzB,CAAC,CACH,CACF;IACH;EACF,CAAC,CAAC,CAAC,CAACjB,IAAI,CACN7C,MAAM,CAACiE,eAAe,CAAEC,KAAyB,IAAKpE,OAAO,CAACqE,KAAK,CAAC/B,WAAW,EAAE8B,KAAK,CAAC,CAAC,EACxFlE,MAAM,CAACoE,QAAQ,CAACpE,MAAM,CAACe,IAAI,CAAC,MAAK;IAC/BmB,KAAK,CAACmC,WAAW,EAAE;IACnBpC,aAAa,GAAGqC,SAAS;EAC3B,CAAC,CAAC,CAAC,EACHtE,MAAM,CAACuE,aAAa,CACrB;EAEH,MAAMC,KAAK,GAAIhB,KAA8C,IAC3DtB,KAAK,CAACuC,QAAQ,CAACzE,MAAM,CAACoB,KAAK,CAA4BC,MAAM,IAAI;IAC/D,MAAMT,IAAI,GAAGqB,aAAc;IAC3B,IAAIrC,MAAM,CAAC8E,YAAY,CAAClB,KAAK,CAAC,EAAE;MAC9B5C,IAAI,CAACM,OAAO,CAACsC,KAAK,CAACQ,IAAI,GAAG,IAAI,GAAG,IAAIW,KAAK,CAAC,oBAAoBnB,KAAK,CAACQ,IAAI,EAAE,CAAC,GAAGM,SAAS,CAAC;MACzF,OAAOjD,MAAM,CAACrB,MAAM,CAAC6D,IAAI,CAAC;IAC5B;IACA5B,aAAc,CAACuC,KAAK,CAAChB,KAAK,EAAG9B,KAAK,IAAI;MACpCL,MAAM,CACJK,KAAK,GACD1B,MAAM,CAAC2B,IAAI,CAAC,IAAI/B,MAAM,CAACgC,kBAAkB,CAAC;QAAEC,MAAM,EAAE,OAAO;QAAEH;MAAK,CAAE,CAAC,CAAC,GACtE1B,MAAM,CAAC6D,IAAI,CAChB;IACH,CAAC,CAAC;EACJ,CAAC,CAAC,CAAC;EAEL,MAAMe,MAAM,GAAG5E,MAAM,CAAC6E,cAAc,CAClC7E,MAAM,CAACwB,OAAO,CAACgD,KAAK,CAAC,EACrB,MACExE,MAAM,CAACe,IAAI,CAAC,MAAK;IACf,IAAI,CAACkB,aAAa,IAAIA,aAAa,CAAC6C,aAAa,EAAE;IACnD7C,aAAa,CAAC8C,GAAG,EAAE;EACrB,CAAC,CAAC,CACL;EAED,OAAO/E,MAAM,CAACwB,OAAO,CAAC5B,MAAM,CAACA,MAAM,CAACoF,EAAE,CAAC;IACrC,CAACpF,MAAM,CAACqF,MAAM,GAAGrF,MAAM,CAACqF,MAAM;IAC9B3C,GAAG;IACH4C,MAAM,EAAE5C,GAAG;IACXsC;GACD,CAAC,CAAC;AACL,CAAC,CAAC;AAEJ;;;;AAIA,OAAO,MAAMO,cAAc,GACzB3E,OAA2B,IAS3BX,OAAO,CAACuF,YAAY,CAClBpF,MAAM,CAACqF,GAAG,CAAC9E,OAAO,CAACC,OAAO,CAAC,EAAEZ,MAAM,CAAC0F,aAAa,EAAM,CAAC,CACzD;AAEH;;;;AAIA,OAAO,MAAMC,QAAQ,GAAI/E,OAA2B,IAClDN,KAAK,CAACsF,MAAM,CAAC5F,MAAM,CAACA,MAAM,EAAEW,OAAO,CAACC,OAAO,CAAC,CAAC","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect/platform-node-shared",
|
|
3
|
-
"version": "0.51.
|
|
3
|
+
"version": "0.51.1",
|
|
4
4
|
"description": "Unified interfaces for common platform-specific services",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -16,11 +16,11 @@
|
|
|
16
16
|
"ws": "^8.18.2"
|
|
17
17
|
},
|
|
18
18
|
"peerDependencies": {
|
|
19
|
-
"@effect/cluster": "^0.50.
|
|
20
|
-
"@effect/platform": "^0.92.0",
|
|
19
|
+
"@effect/cluster": "^0.50.1",
|
|
21
20
|
"@effect/rpc": "^0.71.0",
|
|
21
|
+
"@effect/platform": "^0.92.0",
|
|
22
22
|
"@effect/sql": "^0.46.0",
|
|
23
|
-
"effect": "^3.18.
|
|
23
|
+
"effect": "^3.18.1"
|
|
24
24
|
},
|
|
25
25
|
"publishConfig": {
|
|
26
26
|
"provenance": true
|
package/src/NodeSocket.ts
CHANGED
|
@@ -38,11 +38,12 @@ export const makeNet = (
|
|
|
38
38
|
): Effect.Effect<Socket.Socket, Socket.SocketError> =>
|
|
39
39
|
fromDuplex(
|
|
40
40
|
Effect.scopeWith((scope) => {
|
|
41
|
-
|
|
41
|
+
let conn: Net.Socket | undefined
|
|
42
42
|
return Effect.flatMap(
|
|
43
43
|
Scope.addFinalizer(
|
|
44
44
|
scope,
|
|
45
45
|
Effect.sync(() => {
|
|
46
|
+
if (!conn) return
|
|
46
47
|
if (conn.closed === false) {
|
|
47
48
|
if ("destroySoon" in conn) {
|
|
48
49
|
conn.destroySoon()
|
|
@@ -55,13 +56,13 @@ export const makeNet = (
|
|
|
55
56
|
),
|
|
56
57
|
() =>
|
|
57
58
|
Effect.async<Net.Socket, Socket.SocketError, never>((resume) => {
|
|
58
|
-
|
|
59
|
-
resume(Effect.fail(new Socket.SocketGenericError({ reason: "Open", cause })))
|
|
59
|
+
conn = Net.createConnection(options)
|
|
60
60
|
conn.once("connect", () => {
|
|
61
|
-
|
|
62
|
-
|
|
61
|
+
resume(Effect.succeed(conn!))
|
|
62
|
+
})
|
|
63
|
+
conn.on("error", (cause) => {
|
|
64
|
+
resume(Effect.fail(new Socket.SocketGenericError({ reason: "Open", cause })))
|
|
63
65
|
})
|
|
64
|
-
conn.on("error", onError)
|
|
65
66
|
})
|
|
66
67
|
)
|
|
67
68
|
})
|
|
@@ -85,8 +86,29 @@ export const fromDuplex = <RO>(
|
|
|
85
86
|
const fiberSet = yield* FiberSet.make<any, E | Socket.SocketError>().pipe(
|
|
86
87
|
Scope.extend(scope)
|
|
87
88
|
)
|
|
89
|
+
yield* Scope.addFinalizer(
|
|
90
|
+
scope,
|
|
91
|
+
Effect.sync(() => {
|
|
92
|
+
conn.off("data", onData)
|
|
93
|
+
conn.off("end", onEnd)
|
|
94
|
+
conn.off("error", onError)
|
|
95
|
+
conn.off("close", onClose)
|
|
96
|
+
})
|
|
97
|
+
)
|
|
98
|
+
|
|
88
99
|
const conn = yield* Scope.extend(open, scope)
|
|
100
|
+
conn.on("end", onEnd)
|
|
101
|
+
conn.on("error", onError)
|
|
102
|
+
conn.on("close", onClose)
|
|
103
|
+
|
|
89
104
|
const run = yield* Effect.provideService(FiberSet.runtime(fiberSet)<R>(), NetSocket, conn as Net.Socket)
|
|
105
|
+
conn.on("data", onData)
|
|
106
|
+
|
|
107
|
+
currentSocket = conn
|
|
108
|
+
yield* latch.open
|
|
109
|
+
if (opts?.onOpen) yield* opts.onOpen
|
|
110
|
+
|
|
111
|
+
return yield* FiberSet.join(fiberSet)
|
|
90
112
|
|
|
91
113
|
function onData(chunk: Uint8Array) {
|
|
92
114
|
const result = handler(chunk)
|
|
@@ -114,25 +136,6 @@ export const fromDuplex = <RO>(
|
|
|
114
136
|
)
|
|
115
137
|
)
|
|
116
138
|
}
|
|
117
|
-
yield* Scope.addFinalizer(
|
|
118
|
-
scope,
|
|
119
|
-
Effect.sync(() => {
|
|
120
|
-
conn.off("data", onData)
|
|
121
|
-
conn.off("end", onEnd)
|
|
122
|
-
conn.off("error", onError)
|
|
123
|
-
conn.off("close", onClose)
|
|
124
|
-
})
|
|
125
|
-
)
|
|
126
|
-
conn.on("data", onData)
|
|
127
|
-
conn.on("end", onEnd)
|
|
128
|
-
conn.on("error", onError)
|
|
129
|
-
conn.on("close", onClose)
|
|
130
|
-
|
|
131
|
-
currentSocket = conn
|
|
132
|
-
yield* latch.open
|
|
133
|
-
if (opts?.onOpen) yield* opts.onOpen
|
|
134
|
-
|
|
135
|
-
return yield* FiberSet.join(fiberSet)
|
|
136
139
|
})).pipe(
|
|
137
140
|
Effect.mapInputContext((input: Context.Context<R>) => Context.merge(openContext, input)),
|
|
138
141
|
Effect.ensuring(Effect.sync(() => {
|