@effect/platform-node-shared 0.4.23 → 0.4.25

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.
@@ -8,10 +8,12 @@ var Socket = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect
8
8
  var Channel = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Channel"));
9
9
  var Context = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Context"));
10
10
  var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
11
+ var FiberRef = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/FiberRef"));
11
12
  var FiberSet = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/FiberSet"));
12
13
  var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
13
14
  var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Option"));
14
15
  var Queue = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Queue"));
16
+ var Scope = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Scope"));
15
17
  var Net = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("node:net"));
16
18
  function _getRequireWildcardCache(e) {
17
19
  if ("function" != typeof WeakMap) return null;
@@ -84,9 +86,11 @@ const makeNet = options => fromNetSocket(Effect.acquireRelease(Effect.async(resu
84
86
  */
85
87
  exports.makeNet = makeNet;
86
88
  const fromNetSocket = open => Effect.gen(function* (_) {
87
- const sendQueue = yield* _(Queue.unbounded());
89
+ const sendQueue = yield* _(Queue.dropping(yield* FiberRef.get(Socket.currentSendQueueCapacity)));
90
+ const openContext = yield* Effect.context();
88
91
  const run = handler => Effect.gen(function* (_) {
89
- const conn = yield* _(open);
92
+ const scope = yield* Effect.scope;
93
+ const conn = yield* open.pipe(Effect.provide(Context.add(openContext, Scope.Scope, scope)));
90
94
  const fiberSet = yield* _(FiberSet.make());
91
95
  const run = yield* _(FiberSet.runtime(fiberSet)(), Effect.provideService(NetSocket, conn));
92
96
  yield* _(Queue.take(sendQueue), Effect.tap(chunk => Effect.async(resume => {
@@ -102,25 +106,34 @@ const fromNetSocket = open => Effect.gen(function* (_) {
102
106
  })) : Effect.void);
103
107
  });
104
108
  }
109
+ return Effect.void;
105
110
  })), Effect.forever, Effect.withUnhandledErrorLogLevel(Option.none()), FiberSet.run(fiberSet));
106
111
  conn.on("data", chunk => {
107
112
  run(handler(chunk));
108
113
  });
109
114
  yield* _(Effect.async(resume => {
110
- conn.on("end", () => {
115
+ function onEnd() {
111
116
  resume(Effect.void);
112
- });
113
- conn.on("error", error => {
117
+ }
118
+ function onError(error) {
114
119
  resume(Effect.fail(new Socket.SocketGenericError({
115
120
  reason: "Read",
116
121
  error
117
122
  })));
118
- });
119
- conn.on("close", hadError => {
123
+ }
124
+ function onClose(hadError) {
120
125
  resume(Effect.fail(new Socket.SocketCloseError({
121
126
  reason: "Close",
122
127
  code: hadError ? 1006 : 1000
123
128
  })));
129
+ }
130
+ conn.on("end", onEnd);
131
+ conn.on("error", onError);
132
+ conn.on("close", onClose);
133
+ return Effect.sync(() => {
134
+ conn.off("end", onEnd);
135
+ conn.off("error", onError);
136
+ conn.off("close", onClose);
124
137
  });
125
138
  }), Effect.raceFirst(FiberSet.join(fiberSet)));
126
139
  }).pipe(Effect.scoped, Effect.interruptible);
@@ -144,6 +157,6 @@ const makeNetChannel = options => Channel.unwrapScoped(Effect.map(makeNet(option
144
157
  * @category layers
145
158
  */
146
159
  exports.makeNetChannel = makeNetChannel;
147
- const layerNet = options => Layer.scoped(Socket.Socket, makeNet(options));
160
+ const layerNet = options => Layer.effect(Socket.Socket, makeNet(options));
148
161
  exports.layerNet = layerNet;
149
162
  //# sourceMappingURL=NodeSocket.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"NodeSocket.js","names":["Socket","_interopRequireWildcard","require","Channel","Context","Effect","FiberSet","Layer","Option","Queue","Net","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","NetSocket","exports","GenericTag","EOF","Symbol","for","makeNet","options","fromNetSocket","acquireRelease","async","resume","conn","createConnection","on","removeAllListeners","succeed","error","fail","SocketGenericError","reason","sync","destroy","closed","destroySoon","open","gen","_","sendQueue","unbounded","run","handler","fiberSet","make","runtime","provideService","take","tap","chunk","isCloseEvent","code","Error","undefined","end","void","write","forever","withUnhandledErrorLogLevel","none","hadError","SocketCloseError","raceFirst","join","pipe","scoped","interruptible","offer","writer","of","TypeId","runRaw","makeNetChannel","unwrapScoped","map","toChannelWith","layerNet"],"sources":["../../src/NodeSocket.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"NodeSocket.js","names":["Socket","_interopRequireWildcard","require","Channel","Context","Effect","FiberRef","FiberSet","Layer","Option","Queue","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","EOF","Symbol","for","makeNet","options","fromNetSocket","acquireRelease","async","resume","conn","createConnection","on","removeAllListeners","succeed","error","fail","SocketGenericError","reason","sync","destroy","closed","destroySoon","open","gen","_","sendQueue","dropping","currentSendQueueCapacity","openContext","context","run","handler","scope","pipe","provide","add","fiberSet","make","runtime","provideService","take","tap","chunk","isCloseEvent","code","Error","undefined","end","void","write","forever","withUnhandledErrorLogLevel","none","onEnd","onError","onClose","hadError","SocketCloseError","off","raceFirst","join","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":[]}
@@ -8,7 +8,7 @@ import type * as Chunk from "effect/Chunk";
8
8
  import * as Context from "effect/Context";
9
9
  import * as Effect from "effect/Effect";
10
10
  import * as Layer from "effect/Layer";
11
- import type * as Scope from "effect/Scope";
11
+ import * as Scope from "effect/Scope";
12
12
  import * as Net from "node:net";
13
13
  /**
14
14
  * @since 1.0.0
@@ -26,12 +26,12 @@ export declare const NetSocket: Context.Tag<NetSocket, Net.Socket>;
26
26
  * @since 1.0.0
27
27
  * @category constructors
28
28
  */
29
- export declare const makeNet: (options: Net.NetConnectOpts) => Effect.Effect<Socket.Socket, Socket.SocketError, Scope.Scope>;
29
+ export declare const makeNet: (options: Net.NetConnectOpts) => Effect.Effect<Socket.Socket, Socket.SocketError>;
30
30
  /**
31
31
  * @since 1.0.0
32
32
  * @category constructors
33
33
  */
34
- export declare const fromNetSocket: (open: Effect.Effect<Net.Socket, Socket.SocketError, Scope.Scope>) => Effect.Effect<Socket.Socket>;
34
+ export declare const fromNetSocket: <RO>(open: Effect.Effect<Net.Socket, Socket.SocketError, RO>) => Effect.Effect<Socket.Socket, never, Exclude<RO, Scope.Scope>>;
35
35
  /**
36
36
  * @since 1.0.0
37
37
  * @category constructors
@@ -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;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAE/B;;;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;AAGD;;;GAGG;AACH,eAAO,MAAM,OAAO,YACT,IAAI,cAAc,KAC1B,OAAO,MAAM,CAAC,OAAO,MAAM,EAAE,OAAO,WAAW,EAAE,MAAM,KAAK,CA4B5D,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,aAAa,SAClB,OAAO,MAAM,CAAC,IAAI,MAAM,EAAE,OAAO,WAAW,EAAE,MAAM,KAAK,CAAC,KAC/D,OAAO,MAAM,CAAC,OAAO,MAAM,CAwE1B,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,cAAc,wBAChB,IAAI,cAAc,KAC1B,QAAQ,OAAO,CAChB,MAAM,KAAK,CAAC,UAAU,CAAC,EACvB,MAAM,KAAK,CAAC,UAAU,GAAG,MAAM,GAAG,iBAAiB,CAAC,EACpD,OAAO,WAAW,GAAG,EAAE,EACvB,EAAE,EACF,IAAI,EACJ,OAAO,CAIN,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,QAAQ,YAAa,IAAI,cAAc,KAAG,MAAM,KAAK,CAAC,OAAO,MAAM,EAAE,OAAO,WAAW,CAIjG,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;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAE/B;;;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;AAGD;;;GAGG;AACH,eAAO,MAAM,OAAO,YACT,IAAI,cAAc,KAC1B,OAAO,MAAM,CAAC,OAAO,MAAM,EAAE,OAAO,WAAW,CA4B/C,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,aAAa,aAClB,OAAO,MAAM,CAAC,IAAI,MAAM,EAAE,OAAO,WAAW,EAAE,EAAE,CAAC,KACtD,OAAO,MAAM,CAAC,OAAO,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,MAAM,KAAK,CAAC,CAuF3D,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,cAAc,wBAChB,IAAI,cAAc,KAC1B,QAAQ,OAAO,CAChB,MAAM,KAAK,CAAC,UAAU,CAAC,EACvB,MAAM,KAAK,CAAC,UAAU,GAAG,MAAM,GAAG,iBAAiB,CAAC,EACpD,OAAO,WAAW,GAAG,EAAE,EACvB,EAAE,EACF,IAAI,EACJ,OAAO,CAIN,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,QAAQ,YAAa,IAAI,cAAc,KAAG,MAAM,KAAK,CAAC,OAAO,MAAM,EAAE,OAAO,WAAW,CAIjG,CAAA"}
@@ -5,10 +5,12 @@ import * as Socket from "@effect/platform/Socket";
5
5
  import * as Channel from "effect/Channel";
6
6
  import * as Context from "effect/Context";
7
7
  import * as Effect from "effect/Effect";
8
+ import * as FiberRef from "effect/FiberRef";
8
9
  import * as FiberSet from "effect/FiberSet";
9
10
  import * as Layer from "effect/Layer";
10
11
  import * as Option from "effect/Option";
11
12
  import * as Queue from "effect/Queue";
13
+ import * as Scope from "effect/Scope";
12
14
  import * as Net from "node:net";
13
15
  /**
14
16
  * @since 1.0.0
@@ -51,9 +53,11 @@ export const makeNet = options => fromNetSocket(Effect.acquireRelease(Effect.asy
51
53
  * @category constructors
52
54
  */
53
55
  export const fromNetSocket = open => Effect.gen(function* (_) {
54
- const sendQueue = yield* _(Queue.unbounded());
56
+ const sendQueue = yield* _(Queue.dropping(yield* FiberRef.get(Socket.currentSendQueueCapacity)));
57
+ const openContext = yield* Effect.context();
55
58
  const run = handler => Effect.gen(function* (_) {
56
- const conn = yield* _(open);
59
+ const scope = yield* Effect.scope;
60
+ const conn = yield* open.pipe(Effect.provide(Context.add(openContext, Scope.Scope, scope)));
57
61
  const fiberSet = yield* _(FiberSet.make());
58
62
  const run = yield* _(FiberSet.runtime(fiberSet)(), Effect.provideService(NetSocket, conn));
59
63
  yield* _(Queue.take(sendQueue), Effect.tap(chunk => Effect.async(resume => {
@@ -69,25 +73,34 @@ export const fromNetSocket = open => Effect.gen(function* (_) {
69
73
  })) : Effect.void);
70
74
  });
71
75
  }
76
+ return Effect.void;
72
77
  })), Effect.forever, Effect.withUnhandledErrorLogLevel(Option.none()), FiberSet.run(fiberSet));
73
78
  conn.on("data", chunk => {
74
79
  run(handler(chunk));
75
80
  });
76
81
  yield* _(Effect.async(resume => {
77
- conn.on("end", () => {
82
+ function onEnd() {
78
83
  resume(Effect.void);
79
- });
80
- conn.on("error", error => {
84
+ }
85
+ function onError(error) {
81
86
  resume(Effect.fail(new Socket.SocketGenericError({
82
87
  reason: "Read",
83
88
  error
84
89
  })));
85
- });
86
- conn.on("close", hadError => {
90
+ }
91
+ function onClose(hadError) {
87
92
  resume(Effect.fail(new Socket.SocketCloseError({
88
93
  reason: "Close",
89
94
  code: hadError ? 1006 : 1000
90
95
  })));
96
+ }
97
+ conn.on("end", onEnd);
98
+ conn.on("error", onError);
99
+ conn.on("close", onClose);
100
+ return Effect.sync(() => {
101
+ conn.off("end", onEnd);
102
+ conn.off("error", onError);
103
+ conn.off("close", onClose);
91
104
  });
92
105
  }), Effect.raceFirst(FiberSet.join(fiberSet)));
93
106
  }).pipe(Effect.scoped, Effect.interruptible);
@@ -109,5 +122,5 @@ export const makeNetChannel = options => Channel.unwrapScoped(Effect.map(makeNet
109
122
  * @since 1.0.0
110
123
  * @category layers
111
124
  */
112
- export const layerNet = options => Layer.scoped(Socket.Socket, makeNet(options));
125
+ export const layerNet = options => Layer.effect(Socket.Socket, makeNet(options));
113
126
  //# sourceMappingURL=NodeSocket.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"NodeSocket.js","names":["Socket","Channel","Context","Effect","FiberSet","Layer","Option","Queue","Net","NetSocket","GenericTag","EOF","Symbol","for","makeNet","options","fromNetSocket","acquireRelease","async","resume","conn","createConnection","on","removeAllListeners","succeed","error","fail","SocketGenericError","reason","sync","destroy","closed","destroySoon","open","gen","_","sendQueue","unbounded","run","handler","fiberSet","make","runtime","provideService","take","tap","chunk","isCloseEvent","code","Error","undefined","end","void","write","forever","withUnhandledErrorLogLevel","none","hadError","SocketCloseError","raceFirst","join","pipe","scoped","interruptible","offer","writer","of","TypeId","runRaw","makeNetChannel","unwrapScoped","map","toChannelWith","layerNet"],"sources":["../../src/NodeSocket.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"NodeSocket.js","names":["Socket","Channel","Context","Effect","FiberRef","FiberSet","Layer","Option","Queue","Scope","Net","NetSocket","GenericTag","EOF","Symbol","for","makeNet","options","fromNetSocket","acquireRelease","async","resume","conn","createConnection","on","removeAllListeners","succeed","error","fail","SocketGenericError","reason","sync","destroy","closed","destroySoon","open","gen","_","sendQueue","dropping","get","currentSendQueueCapacity","openContext","context","run","handler","scope","pipe","provide","add","fiberSet","make","runtime","provideService","take","tap","chunk","isCloseEvent","code","Error","undefined","end","void","write","forever","withUnhandledErrorLogLevel","none","onEnd","onError","onClose","hadError","SocketCloseError","off","raceFirst","join","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":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect/platform-node-shared",
3
- "version": "0.4.23",
3
+ "version": "0.4.25",
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.1"
15
15
  },
16
16
  "peerDependencies": {
17
- "@effect/platform": "^0.53.4",
18
- "effect": "^3.1.4"
17
+ "@effect/platform": "^0.53.6",
18
+ "effect": "^3.1.5"
19
19
  },
20
20
  "publishConfig": {
21
21
  "provenance": true
package/src/NodeSocket.ts CHANGED
@@ -6,11 +6,12 @@ import * as Channel from "effect/Channel"
6
6
  import type * as Chunk from "effect/Chunk"
7
7
  import * as Context from "effect/Context"
8
8
  import * as Effect from "effect/Effect"
9
+ import * as FiberRef from "effect/FiberRef"
9
10
  import * as FiberSet from "effect/FiberSet"
10
11
  import * as Layer from "effect/Layer"
11
12
  import * as Option from "effect/Option"
12
13
  import * as Queue from "effect/Queue"
13
- import type * as Scope from "effect/Scope"
14
+ import * as Scope from "effect/Scope"
14
15
  import * as Net from "node:net"
15
16
 
16
17
  /**
@@ -36,7 +37,7 @@ const EOF = Symbol.for("@effect/experimental/Socket/Node/EOF")
36
37
  */
37
38
  export const makeNet = (
38
39
  options: Net.NetConnectOpts
39
- ): Effect.Effect<Socket.Socket, Socket.SocketError, Scope.Scope> =>
40
+ ): Effect.Effect<Socket.Socket, Socket.SocketError> =>
40
41
  fromNetSocket(
41
42
  Effect.acquireRelease(
42
43
  Effect.async<Net.Socket, Socket.SocketError, never>((resume) => {
@@ -70,15 +71,21 @@ export const makeNet = (
70
71
  * @since 1.0.0
71
72
  * @category constructors
72
73
  */
73
- export const fromNetSocket = (
74
- open: Effect.Effect<Net.Socket, Socket.SocketError, Scope.Scope>
75
- ): Effect.Effect<Socket.Socket> =>
74
+ export const fromNetSocket = <RO>(
75
+ open: Effect.Effect<Net.Socket, Socket.SocketError, RO>
76
+ ): Effect.Effect<Socket.Socket, never, Exclude<RO, Scope.Scope>> =>
76
77
  Effect.gen(function*(_) {
77
- const sendQueue = yield* _(Queue.unbounded<Uint8Array | string | Socket.CloseEvent | typeof EOF>())
78
+ const sendQueue = yield* _(Queue.dropping<Uint8Array | string | Socket.CloseEvent | typeof EOF>(
79
+ yield* FiberRef.get(Socket.currentSendQueueCapacity)
80
+ ))
81
+ const openContext = yield* Effect.context<Exclude<RO, Scope.Scope>>()
78
82
 
79
83
  const run = <R, E, _>(handler: (_: Uint8Array) => Effect.Effect<_, E, R>) =>
80
84
  Effect.gen(function*(_) {
81
- const conn = yield* _(open)
85
+ const scope = yield* Effect.scope
86
+ const conn = yield* open.pipe(
87
+ Effect.provide(Context.add(openContext, Scope.Scope, scope))
88
+ ) as Effect.Effect<Net.Socket>
82
89
  const fiberSet = yield* _(FiberSet.make<any, E | Socket.SocketError>())
83
90
  const run = yield* _(
84
91
  FiberSet.runtime(fiberSet)<R>(),
@@ -97,6 +104,7 @@ export const fromNetSocket = (
97
104
  resume(error ? Effect.fail(new Socket.SocketGenericError({ reason: "Write", error })) : Effect.void)
98
105
  })
99
106
  }
107
+ return Effect.void
100
108
  })
101
109
  ),
102
110
  Effect.forever,
@@ -108,13 +116,13 @@ export const fromNetSocket = (
108
116
  })
109
117
  yield* _(
110
118
  Effect.async<void, Socket.SocketError, never>((resume) => {
111
- conn.on("end", () => {
119
+ function onEnd() {
112
120
  resume(Effect.void)
113
- })
114
- conn.on("error", (error) => {
121
+ }
122
+ function onError(error: Error) {
115
123
  resume(Effect.fail(new Socket.SocketGenericError({ reason: "Read", error })))
116
- })
117
- conn.on("close", (hadError) => {
124
+ }
125
+ function onClose(hadError: boolean) {
118
126
  resume(
119
127
  Effect.fail(
120
128
  new Socket.SocketCloseError({
@@ -123,6 +131,14 @@ export const fromNetSocket = (
123
131
  })
124
132
  )
125
133
  )
134
+ }
135
+ conn.on("end", onEnd)
136
+ conn.on("error", onError)
137
+ conn.on("close", onClose)
138
+ return Effect.sync(() => {
139
+ conn.off("end", onEnd)
140
+ conn.off("error", onError)
141
+ conn.off("close", onClose)
126
142
  })
127
143
  }),
128
144
  Effect.raceFirst(FiberSet.join(fiberSet))
@@ -169,7 +185,7 @@ export const makeNetChannel = <IE = never>(
169
185
  * @category layers
170
186
  */
171
187
  export const layerNet = (options: Net.NetConnectOpts): Layer.Layer<Socket.Socket, Socket.SocketError> =>
172
- Layer.scoped(
188
+ Layer.effect(
173
189
  Socket.Socket,
174
190
  makeNet(options)
175
191
  )