@effect/platform-node-shared 0.20.4 → 0.20.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.
Files changed (7) hide show
  1. package/dist/cjs/NodeSocket.js +32 -36
  2. package/dist/cjs/NodeSocket.js.map +1 -1
  3. package/dist/dts/NodeSocket.d.ts.map +1 -1
  4. package/dist/esm/NodeSocket.js +32 -36
  5. package/dist/esm/NodeSocket.js.map +1 -1
  6. package/package.json +3 -3
  7. package/src/NodeSocket.ts +52 -56
package/dist/cjs/NodeSocket.js CHANGED
@@ -11,8 +11,6 @@ var Deferred = _interopRequireWildcard(require("effect/Deferred"));
11
11
  var Effect = _interopRequireWildcard(require("effect/Effect"));
12
12
  var FiberSet = _interopRequireWildcard(require("effect/FiberSet"));
13
13
  var Layer = _interopRequireWildcard(require("effect/Layer"));
14
- var Mailbox = _interopRequireWildcard(require("effect/Mailbox"));
15
- var Option = _interopRequireWildcard(require("effect/Option"));
16
14
  var Scope = _interopRequireWildcard(require("effect/Scope"));
17
15
  var Net = _interopRequireWildcard(require("node:net"));
18
16
  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); }
@@ -61,16 +59,13 @@ const makeNet = options => fromDuplex(Effect.acquireRelease(Effect.async(resume
61
59
  * @category constructors
62
60
  */
63
61
  exports.makeNet = makeNet;
64
- const fromDuplex = open => Effect.withFiberRuntime(fiber => Effect.gen(function* () {
65
- const sendQueue = yield* Mailbox.make({
66
- capacity: fiber.getFiberRef(Socket.currentSendQueueCapacity),
67
- strategy: "dropping"
68
- });
62
+ const fromDuplex = open => Effect.withFiberRuntime(fiber => {
63
+ let currentSocket;
64
+ const latch = Effect.unsafeMakeLatch(false);
69
65
  const openContext = fiber.currentContext;
70
- const run = handler => Effect.gen(function* () {
71
- const scope = yield* Effect.scope;
72
- const fiberSet = yield* FiberSet.make();
73
- const conn = yield* open;
66
+ const run = handler => Effect.scopedWith(scope => Effect.gen(function* () {
67
+ const fiberSet = yield* FiberSet.make().pipe(Scope.extend(scope));
68
+ const conn = yield* Scope.extend(open, scope);
74
69
  const run = yield* Effect.provideService(FiberSet.runtime(fiberSet)(), NetSocket, conn);
75
70
  function onData(chunk) {
76
71
  const result = handler(chunk);
@@ -103,36 +98,37 @@ const fromDuplex = open => Effect.withFiberRuntime(fiber => Effect.gen(function*
103
98
  conn.on("end", onEnd);
104
99
  conn.on("error", onError);
105
100
  conn.on("close", onClose);
106
- yield* sendQueue.take.pipe(Effect.flatMap(chunk => Effect.async(resume => {
107
- if (Socket.isCloseEvent(chunk)) {
108
- conn.destroy(chunk.code > 1000 ? new Error(`closed with code ${chunk.code}`) : undefined);
109
- resume(Effect.fail(new Socket.SocketCloseError({
110
- reason: "Close",
111
- code: 1000,
112
- closeReason: chunk.reason
113
- })));
114
- } else {
115
- conn.write(chunk, cause => {
116
- resume(cause ? Effect.fail(new Socket.SocketGenericError({
117
- reason: "Write",
118
- cause
119
- })) : Effect.void);
120
- });
121
- }
122
- })), Effect.forever, Effect.catchTag("NoSuchElementException", () => Effect.async(resume => {
123
- conn.end(() => resume(Effect.void));
124
- })), FiberSet.run(fiberSet), Effect.withUnhandledErrorLogLevel(Option.none()));
101
+ currentSocket = conn;
102
+ yield* latch.open;
125
103
  return yield* FiberSet.join(fiberSet);
126
- }).pipe(Effect.mapInputContext(input => Context.merge(openContext, input)), Effect.scoped, Effect.interruptible);
127
- const write = chunk => sendQueue.offer(chunk);
128
- const writer = Effect.acquireRelease(Effect.succeed(write), () => sendQueue.end);
129
- return Socket.Socket.of({
104
+ })).pipe(Effect.mapInputContext(input => Context.merge(openContext, input)), Effect.ensuring(Effect.sync(() => {
105
+ latch.unsafeClose();
106
+ currentSocket = undefined;
107
+ })), Effect.interruptible);
108
+ const write = chunk => latch.whenOpen(Effect.async(resume => {
109
+ const conn = currentSocket;
110
+ if (Socket.isCloseEvent(chunk)) {
111
+ conn.destroy(chunk.code > 1000 ? new Error(`closed with code ${chunk.code}`) : undefined);
112
+ return resume(Effect.void);
113
+ }
114
+ currentSocket.write(chunk, cause => {
115
+ resume(cause ? Effect.fail(new Socket.SocketGenericError({
116
+ reason: "Write",
117
+ cause
118
+ })) : Effect.void);
119
+ });
120
+ }));
121
+ const writer = Effect.acquireRelease(Effect.succeed(write), () => Effect.sync(() => {
122
+ if (!currentSocket || currentSocket.writableEnded) return;
123
+ currentSocket.end();
124
+ }));
125
+ return Effect.succeed(Socket.Socket.of({
130
126
  [Socket.TypeId]: Socket.TypeId,
131
127
  run,
132
128
  runRaw: run,
133
129
  writer
134
- });
135
- }));
130
+ }));
131
+ });
136
132
  /**
137
133
  * @since 1.0.0
138
134
  * @category constructors
package/dist/cjs/NodeSocket.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"NodeSocket.js","names":["Socket","_interopRequireWildcard","require","Channel","Context","Deferred","Effect","FiberSet","Layer","Mailbox","Option","Scope","Net","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","NetSocket","exports","GenericTag","makeNet","options","fromDuplex","acquireRelease","async","resume","conn","createConnection","on","removeAllListeners","succeed","cause","fail","SocketGenericError","reason","sync","destroy","closed","destroySoon","open","withFiberRuntime","fiber","gen","sendQueue","make","capacity","getFiberRef","currentSendQueueCapacity","strategy","openContext","currentContext","run","handler","scope","fiberSet","provideService","runtime","onData","chunk","result","isEffect","onEnd","unsafeDone","deferred","void","onError","onClose","hadError","SocketCloseError","code","addFinalizer","off","take","pipe","flatMap","isCloseEvent","Error","undefined","closeReason","write","forever","catchTag","end","withUnhandledErrorLogLevel","none","join","mapInputContext","input","merge","scoped","interruptible","offer","writer","of","TypeId","runRaw","makeNetChannel","unwrapScoped","map","toChannelWith","layerNet","effect"],"sources":["../../src/NodeSocket.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"NodeSocket.js","names":["Socket","_interopRequireWildcard","require","Channel","Context","Deferred","Effect","FiberSet","Layer","Scope","Net","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","NetSocket","exports","GenericTag","makeNet","options","fromDuplex","acquireRelease","async","resume","conn","createConnection","on","removeAllListeners","succeed","cause","fail","SocketGenericError","reason","sync","destroy","closed","destroySoon","open","withFiberRuntime","fiber","currentSocket","latch","unsafeMakeLatch","openContext","currentContext","run","handler","scopedWith","scope","gen","fiberSet","make","pipe","extend","provideService","runtime","onData","chunk","result","isEffect","onEnd","unsafeDone","deferred","void","onError","onClose","hadError","SocketCloseError","code","addFinalizer","off","join","mapInputContext","input","merge","ensuring","unsafeClose","undefined","interruptible","write","whenOpen","isCloseEvent","Error","writer","writableEnded","end","of","TypeId","runRaw","makeNetChannel","unwrapScoped","map","toChannelWith","layerNet","effect"],"sources":["../../src/NodeSocket.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
package/dist/dts/NodeSocket.d.ts.map CHANGED
@@ -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;AAGrC,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,YACT,GAAG,CAAC,cAAc,KAC1B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CA4B/C,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,EAAE,QACrB,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,CAqG5D,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,EAAE,mBACtB,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,YAAa,GAAG,CAAC,cAAc,KAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CACrD,CAAA"}
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,YACT,GAAG,CAAC,cAAc,KAC1B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CA4B/C,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,EAAE,QACrB,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,CAmG3D,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,EAAE,mBACtB,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,YAAa,GAAG,CAAC,cAAc,KAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WAAW,CACrD,CAAA"}
package/dist/esm/NodeSocket.js CHANGED
@@ -8,8 +8,6 @@ import * as Deferred from "effect/Deferred";
8
8
  import * as Effect from "effect/Effect";
9
9
  import * as FiberSet from "effect/FiberSet";
10
10
  import * as Layer from "effect/Layer";
11
- import * as Mailbox from "effect/Mailbox";
12
- import * as Option from "effect/Option";
13
11
  import * as Scope from "effect/Scope";
14
12
  import * as Net from "node:net";
15
13
  /**
@@ -51,16 +49,13 @@ export const makeNet = options => fromDuplex(Effect.acquireRelease(Effect.async(
51
49
  * @since 1.0.0
52
50
  * @category constructors
53
51
  */
54
- export const fromDuplex = open => Effect.withFiberRuntime(fiber => Effect.gen(function* () {
55
- const sendQueue = yield* Mailbox.make({
56
- capacity: fiber.getFiberRef(Socket.currentSendQueueCapacity),
57
- strategy: "dropping"
58
- });
52
+ export const fromDuplex = open => Effect.withFiberRuntime(fiber => {
53
+ let currentSocket;
54
+ const latch = Effect.unsafeMakeLatch(false);
59
55
  const openContext = fiber.currentContext;
60
- const run = handler => Effect.gen(function* () {
61
- const scope = yield* Effect.scope;
62
- const fiberSet = yield* FiberSet.make();
63
- const conn = yield* open;
56
+ const run = handler => Effect.scopedWith(scope => Effect.gen(function* () {
57
+ const fiberSet = yield* FiberSet.make().pipe(Scope.extend(scope));
58
+ const conn = yield* Scope.extend(open, scope);
64
59
  const run = yield* Effect.provideService(FiberSet.runtime(fiberSet)(), NetSocket, conn);
65
60
  function onData(chunk) {
66
61
  const result = handler(chunk);
@@ -93,36 +88,37 @@ export const fromDuplex = open => Effect.withFiberRuntime(fiber => Effect.gen(fu
93
88
  conn.on("end", onEnd);
94
89
  conn.on("error", onError);
95
90
  conn.on("close", onClose);
96
- yield* sendQueue.take.pipe(Effect.flatMap(chunk => Effect.async(resume => {
97
- if (Socket.isCloseEvent(chunk)) {
98
- conn.destroy(chunk.code > 1000 ? new Error(`closed with code ${chunk.code}`) : undefined);
99
- resume(Effect.fail(new Socket.SocketCloseError({
100
- reason: "Close",
101
- code: 1000,
102
- closeReason: chunk.reason
103
- })));
104
- } else {
105
- conn.write(chunk, cause => {
106
- resume(cause ? Effect.fail(new Socket.SocketGenericError({
107
- reason: "Write",
108
- cause
109
- })) : Effect.void);
110
- });
111
- }
112
- })), Effect.forever, Effect.catchTag("NoSuchElementException", () => Effect.async(resume => {
113
- conn.end(() => resume(Effect.void));
114
- })), FiberSet.run(fiberSet), Effect.withUnhandledErrorLogLevel(Option.none()));
91
+ currentSocket = conn;
92
+ yield* latch.open;
115
93
  return yield* FiberSet.join(fiberSet);
116
- }).pipe(Effect.mapInputContext(input => Context.merge(openContext, input)), Effect.scoped, Effect.interruptible);
117
- const write = chunk => sendQueue.offer(chunk);
118
- const writer = Effect.acquireRelease(Effect.succeed(write), () => sendQueue.end);
119
- return Socket.Socket.of({
94
+ })).pipe(Effect.mapInputContext(input => Context.merge(openContext, input)), Effect.ensuring(Effect.sync(() => {
95
+ latch.unsafeClose();
96
+ currentSocket = undefined;
97
+ })), Effect.interruptible);
98
+ const write = chunk => latch.whenOpen(Effect.async(resume => {
99
+ const conn = currentSocket;
100
+ if (Socket.isCloseEvent(chunk)) {
101
+ conn.destroy(chunk.code > 1000 ? new Error(`closed with code ${chunk.code}`) : undefined);
102
+ return resume(Effect.void);
103
+ }
104
+ currentSocket.write(chunk, cause => {
105
+ resume(cause ? Effect.fail(new Socket.SocketGenericError({
106
+ reason: "Write",
107
+ cause
108
+ })) : Effect.void);
109
+ });
110
+ }));
111
+ const writer = Effect.acquireRelease(Effect.succeed(write), () => Effect.sync(() => {
112
+ if (!currentSocket || currentSocket.writableEnded) return;
113
+ currentSocket.end();
114
+ }));
115
+ return Effect.succeed(Socket.Socket.of({
120
116
  [Socket.TypeId]: Socket.TypeId,
121
117
  run,
122
118
  runRaw: run,
123
119
  writer
124
- });
125
- }));
120
+ }));
121
+ });
126
122
  /**
127
123
  * @since 1.0.0
128
124
  * @category constructors
package/dist/esm/NodeSocket.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"NodeSocket.js","names":["Socket","Channel","Context","Deferred","Effect","FiberSet","Layer","Mailbox","Option","Scope","Net","NetSocket","GenericTag","makeNet","options","fromDuplex","acquireRelease","async","resume","conn","createConnection","on","removeAllListeners","succeed","cause","fail","SocketGenericError","reason","sync","destroy","closed","destroySoon","open","withFiberRuntime","fiber","gen","sendQueue","make","capacity","getFiberRef","currentSendQueueCapacity","strategy","openContext","currentContext","run","handler","scope","fiberSet","provideService","runtime","onData","chunk","result","isEffect","onEnd","unsafeDone","deferred","void","onError","onClose","hadError","SocketCloseError","code","addFinalizer","off","take","pipe","flatMap","isCloseEvent","Error","undefined","closeReason","write","forever","catchTag","end","withUnhandledErrorLogLevel","none","join","mapInputContext","input","merge","scoped","interruptible","offer","writer","of","TypeId","runRaw","makeNetChannel","unwrapScoped","map","toChannelWith","layerNet","effect"],"sources":["../../src/NodeSocket.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"NodeSocket.js","names":["Socket","Channel","Context","Deferred","Effect","FiberSet","Layer","Scope","Net","NetSocket","GenericTag","makeNet","options","fromDuplex","acquireRelease","async","resume","conn","createConnection","on","removeAllListeners","succeed","cause","fail","SocketGenericError","reason","sync","destroy","closed","destroySoon","open","withFiberRuntime","fiber","currentSocket","latch","unsafeMakeLatch","openContext","currentContext","run","handler","scopedWith","scope","gen","fiberSet","make","pipe","extend","provideService","runtime","onData","chunk","result","isEffect","onEnd","unsafeDone","deferred","void","onError","onClose","hadError","SocketCloseError","code","addFinalizer","off","join","mapInputContext","input","merge","ensuring","unsafeClose","undefined","interruptible","write","whenOpen","isCloseEvent","Error","writer","writableEnded","end","of","TypeId","runRaw","makeNetChannel","unwrapScoped","map","toChannelWith","layerNet","effect"],"sources":["../../src/NodeSocket.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect/platform-node-shared",
3
- "version": "0.20.4",
3
+ "version": "0.20.6",
4
4
  "description": "Unified interfaces for common platform-specific services",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -14,8 +14,8 @@
14
14
  "multipasta": "^0.2.5"
15
15
  },
16
16
  "peerDependencies": {
17
- "@effect/platform": "^0.70.4",
18
- "effect": "^3.11.3"
17
+ "@effect/platform": "^0.70.6",
18
+ "effect": "^3.11.4"
19
19
  },
20
20
  "publishConfig": {
21
21
  "provenance": true
package/src/NodeSocket.ts CHANGED
@@ -9,8 +9,6 @@ import * as Deferred from "effect/Deferred"
9
9
  import * as Effect from "effect/Effect"
10
10
  import * as FiberSet from "effect/FiberSet"
11
11
  import * as Layer from "effect/Layer"
12
- import * as Mailbox from "effect/Mailbox"
13
- import * as Option from "effect/Option"
14
12
  import * as Scope from "effect/Scope"
15
13
  import * as Net from "node:net"
16
14
  import type { Duplex } from "node:stream"
@@ -74,18 +72,17 @@ export const makeNet = (
74
72
  export const fromDuplex = <RO>(
75
73
  open: Effect.Effect<Duplex, Socket.SocketError, RO>
76
74
  ): Effect.Effect<Socket.Socket, never, Exclude<RO, Scope.Scope>> =>
77
- Effect.withFiberRuntime<Socket.Socket, never, Exclude<RO, Scope.Scope>>((fiber) =>
78
- Effect.gen(function*() {
79
- const sendQueue = yield* Mailbox.make<Uint8Array | string | Socket.CloseEvent>({
80
- capacity: fiber.getFiberRef(Socket.currentSendQueueCapacity),
81
- strategy: "dropping"
82
- })
83
- const openContext = fiber.currentContext as Context.Context<RO>
84
- const run = <R, E, _>(handler: (_: Uint8Array) => Effect.Effect<_, E, R> | void) =>
75
+ Effect.withFiberRuntime<Socket.Socket, never, Exclude<RO, Scope.Scope>>((fiber) => {
76
+ let currentSocket: Duplex | undefined
77
+ const latch = Effect.unsafeMakeLatch(false)
78
+ const openContext = fiber.currentContext as Context.Context<RO>
79
+ const run = <R, E, _>(handler: (_: Uint8Array) => Effect.Effect<_, E, R> | void) =>
80
+ Effect.scopedWith((scope) =>
85
81
  Effect.gen(function*() {
86
- const scope = yield* Effect.scope
87
- const fiberSet = yield* FiberSet.make<any, E | Socket.SocketError>()
88
- const conn = yield* open
82
+ const fiberSet = yield* FiberSet.make<any, E | Socket.SocketError>().pipe(
83
+ Scope.extend(scope)
84
+ )
85
+ const conn = yield* Scope.extend(open, scope)
89
86
  const run = yield* Effect.provideService(FiberSet.runtime(fiberSet)<R>(), NetSocket, conn as Net.Socket)
90
87
 
91
88
  function onData(chunk: Uint8Array) {
@@ -128,53 +125,52 @@ export const fromDuplex = <RO>(
128
125
  conn.on("error", onError)
129
126
  conn.on("close", onClose)
130
127
 
131
- yield* sendQueue.take.pipe(
132
- Effect.flatMap((chunk) =>
133
- Effect.async<void, Socket.SocketError, never>((resume) => {
134
- if (Socket.isCloseEvent(chunk)) {
135
- conn.destroy(chunk.code > 1000 ? new Error(`closed with code ${chunk.code}`) : undefined)
136
- resume(Effect.fail(
137
- new Socket.SocketCloseError({ reason: "Close", code: 1000, closeReason: chunk.reason })
138
- ))
139
- } else {
140
- conn.write(chunk, (cause) => {
141
- resume(
142
- cause ? Effect.fail(new Socket.SocketGenericError({ reason: "Write", cause })) : Effect.void
143
- )
144
- })
145
- }
146
- })
147
- ),
148
- Effect.forever,
149
- Effect.catchTag("NoSuchElementException", () =>
150
- Effect.async((resume) => {
151
- conn.end(() => resume(Effect.void))
152
- })),
153
- FiberSet.run(fiberSet),
154
- Effect.withUnhandledErrorLogLevel(Option.none())
155
- )
128
+ currentSocket = conn
129
+ yield* latch.open
156
130
 
157
131
  return yield* FiberSet.join(fiberSet)
158
- }).pipe(
159
- Effect.mapInputContext((input: Context.Context<R | Scope.Scope>) => Context.merge(openContext, input)),
160
- Effect.scoped,
161
- Effect.interruptible
162
- )
163
-
164
- const write = (chunk: Uint8Array | string | Socket.CloseEvent) => sendQueue.offer(chunk)
165
- const writer = Effect.acquireRelease(
166
- Effect.succeed(write),
167
- () => sendQueue.end
132
+ })
133
+ ).pipe(
134
+ Effect.mapInputContext((input: Context.Context<R>) => Context.merge(openContext, input)),
135
+ Effect.ensuring(Effect.sync(() => {
136
+ latch.unsafeClose()
137
+ currentSocket = undefined
138
+ })),
139
+ Effect.interruptible
168
140
  )
169
141
 
170
- return Socket.Socket.of({
171
- [Socket.TypeId]: Socket.TypeId,
172
- run,
173
- runRaw: run,
174
- writer
175
- })
176
- })
177
- )
142
+ const write = (chunk: Uint8Array | string | Socket.CloseEvent) =>
143
+ latch.whenOpen(Effect.async<void, Socket.SocketError>((resume) => {
144
+ const conn = currentSocket!
145
+ if (Socket.isCloseEvent(chunk)) {
146
+ conn.destroy(chunk.code > 1000 ? new Error(`closed with code ${chunk.code}`) : undefined)
147
+ return resume(Effect.void)
148
+ }
149
+ currentSocket!.write(chunk, (cause) => {
150
+ resume(
151
+ cause
152
+ ? Effect.fail(new Socket.SocketGenericError({ reason: "Write", cause }))
153
+ : Effect.void
154
+ )
155
+ })
156
+ }))
157
+
158
+ const writer = Effect.acquireRelease(
159
+ Effect.succeed(write),
160
+ () =>
161
+ Effect.sync(() => {
162
+ if (!currentSocket || currentSocket.writableEnded) return
163
+ currentSocket.end()
164
+ })
165
+ )
166
+
167
+ return Effect.succeed(Socket.Socket.of({
168
+ [Socket.TypeId]: Socket.TypeId,
169
+ run,
170
+ runRaw: run,
171
+ writer
172
+ }))
173
+ })
178
174
 
179
175
  /**
180
176
  * @since 1.0.0