@effect/platform-node-shared 0.19.13 → 0.19.15

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.
@@ -7,8 +7,8 @@ exports.makeNetChannel = exports.makeNet = exports.layerNet = exports.fromDuplex
7
7
  var Socket = _interopRequireWildcard(require("@effect/platform/Socket"));
8
8
  var Channel = _interopRequireWildcard(require("effect/Channel"));
9
9
  var Context = _interopRequireWildcard(require("effect/Context"));
10
+ var Deferred = _interopRequireWildcard(require("effect/Deferred"));
10
11
  var Effect = _interopRequireWildcard(require("effect/Effect"));
11
- var FiberRef = _interopRequireWildcard(require("effect/FiberRef"));
12
12
  var FiberSet = _interopRequireWildcard(require("effect/FiberSet"));
13
13
  var Layer = _interopRequireWildcard(require("effect/Layer"));
14
14
  var Option = _interopRequireWildcard(require("effect/Option"));
@@ -62,69 +62,62 @@ const makeNet = options => fromDuplex(Effect.acquireRelease(Effect.async(resume
62
62
  * @category constructors
63
63
  */
64
64
  exports.makeNet = makeNet;
65
- const fromDuplex = open => FiberRef.get(Socket.currentSendQueueCapacity).pipe(Effect.flatMap(sendQueueCapacity => Queue.dropping(sendQueueCapacity)), Effect.bindTo("sendQueue"), Effect.bind("openContext", () => Effect.context()), Effect.map(({
66
- openContext,
67
- sendQueue
68
- }) => {
69
- const run = handler => Effect.scope.pipe(Effect.bindTo("scope"), Effect.bind("conn", ({
70
- scope
71
- }) => open.pipe(Effect.provide(Context.add(openContext, Scope.Scope, scope)))), Effect.bind("fiberSet", _ => FiberSet.make()), Effect.bind("run", ({
72
- conn,
73
- fiberSet
74
- }) => FiberSet.runtime(fiberSet)().pipe(Effect.provideService(NetSocket, conn))), Effect.tap(({
75
- conn,
76
- fiberSet
77
- }) => Queue.take(sendQueue).pipe(Effect.tap(chunk => Effect.async(resume => {
78
- if (Socket.isCloseEvent(chunk)) {
79
- conn.destroy(chunk.code > 1000 ? new Error(`closed with code ${chunk.code}`) : undefined);
80
- } else if (chunk === EOF) {
81
- conn.end(() => resume(Effect.void));
82
- } else {
83
- conn.write(chunk, cause => {
84
- resume(cause ? Effect.fail(new Socket.SocketGenericError({
85
- reason: "Write",
86
- cause
87
- })) : Effect.void);
88
- });
89
- }
90
- return Effect.void;
91
- })), Effect.forever, Effect.withUnhandledErrorLogLevel(Option.none()), FiberSet.run(fiberSet))), Effect.tap(({
92
- conn,
93
- fiberSet,
94
- run
95
- }) => {
96
- conn.on("data", chunk => {
65
+ const fromDuplex = open => Effect.withFiberRuntime(fiber => Effect.gen(function* () {
66
+ const sendQueue = yield* Queue.dropping(fiber.getFiberRef(Socket.currentSendQueueCapacity));
67
+ const openContext = fiber.currentContext;
68
+ const run = handler => Effect.gen(function* () {
69
+ const scope = yield* Effect.scope;
70
+ const fiberSet = yield* FiberSet.make();
71
+ const conn = yield* open;
72
+ const run = yield* Effect.provideService(FiberSet.runtime(fiberSet)(), NetSocket, conn);
73
+ function onData(chunk) {
97
74
  const result = handler(chunk);
98
75
  if (Effect.isEffect(result)) {
99
76
  run(result);
100
77
  }
101
- });
102
- return Effect.async(resume => {
103
- function onEnd() {
104
- resume(Effect.void);
105
- }
106
- function onError(cause) {
107
- resume(Effect.fail(new Socket.SocketGenericError({
108
- reason: "Read",
109
- cause
110
- })));
111
- }
112
- function onClose(hadError) {
113
- resume(Effect.fail(new Socket.SocketCloseError({
114
- reason: "Close",
115
- code: hadError ? 1006 : 1000
116
- })));
78
+ }
79
+ function onEnd() {
80
+ Deferred.unsafeDone(fiberSet.deferred, Effect.void);
81
+ }
82
+ function onError(cause) {
83
+ Deferred.unsafeDone(fiberSet.deferred, Effect.fail(new Socket.SocketGenericError({
84
+ reason: "Read",
85
+ cause
86
+ })));
87
+ }
88
+ function onClose(hadError) {
89
+ Deferred.unsafeDone(fiberSet.deferred, Effect.fail(new Socket.SocketCloseError({
90
+ reason: "Close",
91
+ code: hadError ? 1006 : 1000
92
+ })));
93
+ }
94
+ yield* Scope.addFinalizer(scope, Effect.sync(() => {
95
+ conn.off("data", onData);
96
+ conn.off("end", onEnd);
97
+ conn.off("error", onError);
98
+ conn.off("close", onClose);
99
+ }));
100
+ conn.on("data", onData);
101
+ conn.on("end", onEnd);
102
+ conn.on("error", onError);
103
+ conn.on("close", onClose);
104
+ yield* Queue.take(sendQueue).pipe(Effect.tap(chunk => Effect.async(resume => {
105
+ if (Socket.isCloseEvent(chunk)) {
106
+ conn.destroy(chunk.code > 1000 ? new Error(`closed with code ${chunk.code}`) : undefined);
107
+ } else if (chunk === EOF) {
108
+ conn.end(() => resume(Effect.void));
109
+ } else {
110
+ conn.write(chunk, cause => {
111
+ resume(cause ? Effect.fail(new Socket.SocketGenericError({
112
+ reason: "Write",
113
+ cause
114
+ })) : Effect.void);
115
+ });
117
116
  }
118
- conn.on("end", onEnd);
119
- conn.on("error", onError);
120
- conn.on("close", onClose);
121
- return Effect.sync(() => {
122
- conn.off("end", onEnd);
123
- conn.off("error", onError);
124
- conn.off("close", onClose);
125
- });
126
- }).pipe(Effect.raceFirst(FiberSet.join(fiberSet)));
127
- }), Effect.scoped, Effect.interruptible);
117
+ return Effect.void;
118
+ })), Effect.forever, FiberSet.run(fiberSet), Effect.withUnhandledErrorLogLevel(Option.none()));
119
+ return yield* FiberSet.join(fiberSet);
120
+ }).pipe(Effect.mapInputContext(input => Context.merge(openContext, input)), Effect.scoped, Effect.interruptible);
128
121
  const write = chunk => Queue.offer(sendQueue, chunk);
129
122
  const writer = Effect.acquireRelease(Effect.succeed(write), () => Queue.offer(sendQueue, EOF));
130
123
  return Socket.Socket.of({
@@ -1 +1 @@
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","fromDuplex","acquireRelease","async","resume","conn","createConnection","on","removeAllListeners","succeed","cause","fail","SocketGenericError","reason","sync","destroy","closed","destroySoon","open","currentSendQueueCapacity","pipe","flatMap","sendQueueCapacity","dropping","bindTo","bind","context","map","openContext","sendQueue","run","handler","scope","provide","add","_","make","fiberSet","runtime","provideService","tap","take","chunk","isCloseEvent","code","Error","undefined","end","void","write","forever","withUnhandledErrorLogLevel","none","result","isEffect","onEnd","onError","onClose","hadError","SocketCloseError","off","raceFirst","join","scoped","interruptible","offer","writer","of","TypeId","runRaw","makeNetChannel","unwrapScoped","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","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","fromDuplex","acquireRelease","async","resume","conn","createConnection","on","removeAllListeners","succeed","cause","fail","SocketGenericError","reason","sync","destroy","closed","destroySoon","open","withFiberRuntime","fiber","gen","sendQueue","dropping","getFiberRef","currentSendQueueCapacity","openContext","currentContext","run","handler","scope","fiberSet","make","provideService","runtime","onData","chunk","result","isEffect","onEnd","unsafeDone","deferred","void","onError","onClose","hadError","SocketCloseError","code","addFinalizer","off","take","pipe","tap","isCloseEvent","Error","undefined","end","write","forever","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":";;;;;;AAGA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,OAAA,GAAAF,uBAAA,CAAAC,OAAA;AAEA,IAAAE,OAAA,GAAAH,uBAAA,CAAAC,OAAA;AACA,IAAAG,QAAA,GAAAJ,uBAAA,CAAAC,OAAA;AACA,IAAAI,MAAA,GAAAL,uBAAA,CAAAC,OAAA;AACA,IAAAK,QAAA,GAAAN,uBAAA,CAAAC,OAAA;AACA,IAAAM,KAAA,GAAAP,uBAAA,CAAAC,OAAA;AACA,IAAAO,MAAA,GAAAR,uBAAA,CAAAC,OAAA;AACA,IAAAQ,KAAA,GAAAT,uBAAA,CAAAC,OAAA;AACA,IAAAS,KAAA,GAAAV,uBAAA,CAAAC,OAAA;AACA,IAAAU,GAAA,GAAAX,uBAAA,CAAAC,OAAA;AAA+B,SAAAW,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAb,wBAAAa,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAd/B;;;;AAyBA;;;;AAIO,MAAMW,SAAS,GAAAC,OAAA,CAAAD,SAAA,gBAAuC7B,OAAO,CAAC+B,UAAU,CAC7E,4CAA4C,CAC7C;AACD,MAAMC,GAAG,gBAAGC,MAAM,CAACC,GAAG,CAAC,sCAAsC,CAAC;AAE9D;;;;AAIO,MAAMC,OAAO,GAClBC,OAA2B,IAE3BC,UAAU,CACRnC,MAAM,CAACoC,cAAc,CACnBpC,MAAM,CAACqC,KAAK,CAAyCC,MAAM,IAAI;EAC7D,MAAMC,IAAI,GAAGjC,GAAG,CAACkC,gBAAgB,CAACN,OAAO,CAAC;EAC1CK,IAAI,CAACE,EAAE,CAAC,SAAS,EAAE,MAAK;IACtBF,IAAI,CAACG,kBAAkB,EAAE;IACzBJ,MAAM,CAACtC,MAAM,CAAC2C,OAAO,CAACJ,IAAI,CAAC,CAAC;EAC9B,CAAC,CAAC;EACFA,IAAI,CAACE,EAAE,CAAC,OAAO,EAAGG,KAAK,IAAI;IACzBN,MAAM,CAACtC,MAAM,CAAC6C,IAAI,CAAC,IAAInD,MAAM,CAACoD,kBAAkB,CAAC;MAAEC,MAAM,EAAE,MAAM;MAAEH;IAAK,CAAE,CAAC,CAAC,CAAC;EAC/E,CAAC,CAAC;EACF,OAAO5C,MAAM,CAACgD,IAAI,CAAC,MAAK;IACtBT,IAAI,CAACU,OAAO,EAAE;EAChB,CAAC,CAAC;AACJ,CAAC,CAAC,EACDV,IAAI,IACHvC,MAAM,CAACgD,IAAI,CAAC,MAAK;EACf,IAAIT,IAAI,CAACW,MAAM,KAAK,KAAK,EAAE;IACzB,IAAI,aAAa,IAAIX,IAAI,EAAE;MACzBA,IAAI,CAACY,WAAW,EAAE;IACpB,CAAC,MAAM;MACL;MAAEZ,IAAmB,CAACU,OAAO,EAAE;IACjC;EACF;EACAV,IAAI,CAACG,kBAAkB,EAAE;AAC3B,CAAC,CAAC,CACL,CACF;AAEH;;;;AAAAd,OAAA,CAAAK,OAAA,GAAAA,OAAA;AAIO,MAAME,UAAU,GACrBiB,IAAmD,IAEnDpD,MAAM,CAACqD,gBAAgB,CAAkDC,KAAK,IAC5EtD,MAAM,CAACuD,GAAG,CAAC,aAAS;EAClB,MAAMC,SAAS,GAAG,OAAOpD,KAAK,CAACqD,QAAQ,CACrCH,KAAK,CAACI,WAAW,CAAChE,MAAM,CAACiE,wBAAwB,CAAC,CACnD;EACD,MAAMC,WAAW,GAAGN,KAAK,CAACO,cAAqC;EAC/D,MAAMC,GAAG,GAAaC,OAAyD,IAC7E/D,MAAM,CAACuD,GAAG,CAAC,aAAS;IAClB,MAAMS,KAAK,GAAG,OAAOhE,MAAM,CAACgE,KAAK;IACjC,MAAMC,QAAQ,GAAG,OAAOhE,QAAQ,CAACiE,IAAI,EAA+B;IACpE,MAAM3B,IAAI,GAAG,OAAOa,IAAI;IACxB,MAAMU,GAAG,GAAG,OAAO9D,MAAM,CAACmE,cAAc,CAAClE,QAAQ,CAACmE,OAAO,CAACH,QAAQ,CAAC,EAAK,EAAEtC,SAAS,EAAEY,IAAkB,CAAC;IAExG,SAAS8B,MAAMA,CAACC,KAAiB;MAC/B,MAAMC,MAAM,GAAGR,OAAO,CAACO,KAAK,CAAC;MAC7B,IAAItE,MAAM,CAACwE,QAAQ,CAACD,MAAM,CAAC,EAAE;QAC3BT,GAAG,CAACS,MAAM,CAAC;MACb;IACF;IACA,SAASE,KAAKA,CAAA;MACZ1E,QAAQ,CAAC2E,UAAU,CAACT,QAAQ,CAACU,QAAQ,EAAE3E,MAAM,CAAC4E,IAAI,CAAC;IACrD;IACA,SAASC,OAAOA,CAACjC,KAAY;MAC3B7C,QAAQ,CAAC2E,UAAU,CACjBT,QAAQ,CAACU,QAAQ,EACjB3E,MAAM,CAAC6C,IAAI,CAAC,IAAInD,MAAM,CAACoD,kBAAkB,CAAC;QAAEC,MAAM,EAAE,MAAM;QAAEH;MAAK,CAAE,CAAC,CAAC,CACtE;IACH;IACA,SAASkC,OAAOA,CAACC,QAAiB;MAChChF,QAAQ,CAAC2E,UAAU,CACjBT,QAAQ,CAACU,QAAQ,EACjB3E,MAAM,CAAC6C,IAAI,CACT,IAAInD,MAAM,CAACsF,gBAAgB,CAAC;QAC1BjC,MAAM,EAAE,OAAO;QACfkC,IAAI,EAAEF,QAAQ,GAAG,IAAI,GAAG;OACzB,CAAC,CACH,CACF;IACH;IACA,OAAO1E,KAAK,CAAC6E,YAAY,CACvBlB,KAAK,EACLhE,MAAM,CAACgD,IAAI,CAAC,MAAK;MACfT,IAAI,CAAC4C,GAAG,CAAC,MAAM,EAAEd,MAAM,CAAC;MACxB9B,IAAI,CAAC4C,GAAG,CAAC,KAAK,EAAEV,KAAK,CAAC;MACtBlC,IAAI,CAAC4C,GAAG,CAAC,OAAO,EAAEN,OAAO,CAAC;MAC1BtC,IAAI,CAAC4C,GAAG,CAAC,OAAO,EAAEL,OAAO,CAAC;IAC5B,CAAC,CAAC,CACH;IACDvC,IAAI,CAACE,EAAE,CAAC,MAAM,EAAE4B,MAAM,CAAC;IACvB9B,IAAI,CAACE,EAAE,CAAC,KAAK,EAAEgC,KAAK,CAAC;IACrBlC,IAAI,CAACE,EAAE,CAAC,OAAO,EAAEoC,OAAO,CAAC;IACzBtC,IAAI,CAACE,EAAE,CAAC,OAAO,EAAEqC,OAAO,CAAC;IAEzB,OAAO1E,KAAK,CAACgF,IAAI,CAAC5B,SAAS,CAAC,CAAC6B,IAAI,CAC/BrF,MAAM,CAACsF,GAAG,CAAEhB,KAAK,IACftE,MAAM,CAACqC,KAAK,CAAmCC,MAAM,IAAI;MACvD,IAAI5C,MAAM,CAAC6F,YAAY,CAACjB,KAAK,CAAC,EAAE;QAC9B/B,IAAI,CAACU,OAAO,CAACqB,KAAK,CAACW,IAAI,GAAG,IAAI,GAAG,IAAIO,KAAK,CAAC,oBAAoBlB,KAAK,CAACW,IAAI,EAAE,CAAC,GAAGQ,SAAS,CAAC;MAC3F,CAAC,MAAM,IAAInB,KAAK,KAAKxC,GAAG,EAAE;QACxBS,IAAI,CAACmD,GAAG,CAAC,MAAMpD,MAAM,CAACtC,MAAM,CAAC4E,IAAI,CAAC,CAAC;MACrC,CAAC,MAAM;QACLrC,IAAI,CAACoD,KAAK,CAACrB,KAAK,EAAG1B,KAAK,IAAI;UAC1BN,MAAM,CACJM,KAAK,GAAG5C,MAAM,CAAC6C,IAAI,CAAC,IAAInD,MAAM,CAACoD,kBAAkB,CAAC;YAAEC,MAAM,EAAE,OAAO;YAAEH;UAAK,CAAE,CAAC,CAAC,GAAG5C,MAAM,CAAC4E,IAAI,CAC7F;QACH,CAAC,CAAC;MACJ;MACA,OAAO5E,MAAM,CAAC4E,IAAI;IACpB,CAAC,CAAC,CACH,EACD5E,MAAM,CAAC4F,OAAO,EACd3F,QAAQ,CAAC6D,GAAG,CAACG,QAAQ,CAAC,EACtBjE,MAAM,CAAC6F,0BAA0B,CAAC1F,MAAM,CAAC2F,IAAI,EAAE,CAAC,CACjD;IAED,OAAO,OAAO7F,QAAQ,CAAC8F,IAAI,CAAC9B,QAAQ,CAAC;EACvC,CAAC,CAAC,CAACoB,IAAI,CACLrF,MAAM,CAACgG,eAAe,CAAEC,KAAuC,IAAKnG,OAAO,CAACoG,KAAK,CAACtC,WAAW,EAAEqC,KAAK,CAAC,CAAC,EACtGjG,MAAM,CAACmG,MAAM,EACbnG,MAAM,CAACoG,aAAa,CACrB;EAEH,MAAMT,KAAK,GAAIrB,KAA8C,IAAKlE,KAAK,CAACiG,KAAK,CAAC7C,SAAS,EAAEc,KAAK,CAAC;EAC/F,MAAMgC,MAAM,GAAGtG,MAAM,CAACoC,cAAc,CAClCpC,MAAM,CAAC2C,OAAO,CAACgD,KAAK,CAAC,EACrB,MAAMvF,KAAK,CAACiG,KAAK,CAAC7C,SAAS,EAAE1B,GAAG,CAAC,CAClC;EAED,OAAOpC,MAAM,CAACA,MAAM,CAAC6G,EAAE,CAAC;IACtB,CAAC7G,MAAM,CAAC8G,MAAM,GAAG9G,MAAM,CAAC8G,MAAM;IAC9B1C,GAAG;IACH2C,MAAM,EAAE3C,GAAG;IACXwC;GACD,CAAC;AACJ,CAAC,CAAC,CACH;AAEH;;;;AAAA1E,OAAA,CAAAO,UAAA,GAAAA,UAAA;AAIO,MAAMuE,cAAc,GACzBxE,OAA2B,IAS3BrC,OAAO,CAAC8G,YAAY,CAClB3G,MAAM,CAAC4G,GAAG,CAAC3E,OAAO,CAACC,OAAO,CAAC,EAAExC,MAAM,CAACmH,aAAa,EAAM,CAAC,CACzD;AAEH;;;;AAAAjF,OAAA,CAAA8E,cAAA,GAAAA,cAAA;AAIO,MAAMI,QAAQ,GAAI5E,OAA2B,IAClDhC,KAAK,CAAC6G,MAAM,CAACrH,MAAM,CAACA,MAAM,EAAEuC,OAAO,CAACC,OAAO,CAAC,CAAC;AAAAN,OAAA,CAAAkF,QAAA,GAAAA,QAAA","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;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;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;AAGD;;;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,CAmG5D,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;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;AAGD;;;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,CAgG5D,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"}
@@ -4,8 +4,8 @@
4
4
  import * as Socket from "@effect/platform/Socket";
5
5
  import * as Channel from "effect/Channel";
6
6
  import * as Context from "effect/Context";
7
+ import * as Deferred from "effect/Deferred";
7
8
  import * as Effect from "effect/Effect";
8
- import * as FiberRef from "effect/FiberRef";
9
9
  import * as FiberSet from "effect/FiberSet";
10
10
  import * as Layer from "effect/Layer";
11
11
  import * as Option from "effect/Option";
@@ -52,69 +52,62 @@ export const makeNet = options => fromDuplex(Effect.acquireRelease(Effect.async(
52
52
  * @since 1.0.0
53
53
  * @category constructors
54
54
  */
55
- export const fromDuplex = open => FiberRef.get(Socket.currentSendQueueCapacity).pipe(Effect.flatMap(sendQueueCapacity => Queue.dropping(sendQueueCapacity)), Effect.bindTo("sendQueue"), Effect.bind("openContext", () => Effect.context()), Effect.map(({
56
- openContext,
57
- sendQueue
58
- }) => {
59
- const run = handler => Effect.scope.pipe(Effect.bindTo("scope"), Effect.bind("conn", ({
60
- scope
61
- }) => open.pipe(Effect.provide(Context.add(openContext, Scope.Scope, scope)))), Effect.bind("fiberSet", _ => FiberSet.make()), Effect.bind("run", ({
62
- conn,
63
- fiberSet
64
- }) => FiberSet.runtime(fiberSet)().pipe(Effect.provideService(NetSocket, conn))), Effect.tap(({
65
- conn,
66
- fiberSet
67
- }) => Queue.take(sendQueue).pipe(Effect.tap(chunk => Effect.async(resume => {
68
- if (Socket.isCloseEvent(chunk)) {
69
- conn.destroy(chunk.code > 1000 ? new Error(`closed with code ${chunk.code}`) : undefined);
70
- } else if (chunk === EOF) {
71
- conn.end(() => resume(Effect.void));
72
- } else {
73
- conn.write(chunk, cause => {
74
- resume(cause ? Effect.fail(new Socket.SocketGenericError({
75
- reason: "Write",
76
- cause
77
- })) : Effect.void);
78
- });
79
- }
80
- return Effect.void;
81
- })), Effect.forever, Effect.withUnhandledErrorLogLevel(Option.none()), FiberSet.run(fiberSet))), Effect.tap(({
82
- conn,
83
- fiberSet,
84
- run
85
- }) => {
86
- conn.on("data", chunk => {
55
+ export const fromDuplex = open => Effect.withFiberRuntime(fiber => Effect.gen(function* () {
56
+ const sendQueue = yield* Queue.dropping(fiber.getFiberRef(Socket.currentSendQueueCapacity));
57
+ const openContext = fiber.currentContext;
58
+ const run = handler => Effect.gen(function* () {
59
+ const scope = yield* Effect.scope;
60
+ const fiberSet = yield* FiberSet.make();
61
+ const conn = yield* open;
62
+ const run = yield* Effect.provideService(FiberSet.runtime(fiberSet)(), NetSocket, conn);
63
+ function onData(chunk) {
87
64
  const result = handler(chunk);
88
65
  if (Effect.isEffect(result)) {
89
66
  run(result);
90
67
  }
91
- });
92
- return Effect.async(resume => {
93
- function onEnd() {
94
- resume(Effect.void);
95
- }
96
- function onError(cause) {
97
- resume(Effect.fail(new Socket.SocketGenericError({
98
- reason: "Read",
99
- cause
100
- })));
101
- }
102
- function onClose(hadError) {
103
- resume(Effect.fail(new Socket.SocketCloseError({
104
- reason: "Close",
105
- code: hadError ? 1006 : 1000
106
- })));
68
+ }
69
+ function onEnd() {
70
+ Deferred.unsafeDone(fiberSet.deferred, Effect.void);
71
+ }
72
+ function onError(cause) {
73
+ Deferred.unsafeDone(fiberSet.deferred, Effect.fail(new Socket.SocketGenericError({
74
+ reason: "Read",
75
+ cause
76
+ })));
77
+ }
78
+ function onClose(hadError) {
79
+ Deferred.unsafeDone(fiberSet.deferred, Effect.fail(new Socket.SocketCloseError({
80
+ reason: "Close",
81
+ code: hadError ? 1006 : 1000
82
+ })));
83
+ }
84
+ yield* Scope.addFinalizer(scope, Effect.sync(() => {
85
+ conn.off("data", onData);
86
+ conn.off("end", onEnd);
87
+ conn.off("error", onError);
88
+ conn.off("close", onClose);
89
+ }));
90
+ conn.on("data", onData);
91
+ conn.on("end", onEnd);
92
+ conn.on("error", onError);
93
+ conn.on("close", onClose);
94
+ yield* Queue.take(sendQueue).pipe(Effect.tap(chunk => Effect.async(resume => {
95
+ if (Socket.isCloseEvent(chunk)) {
96
+ conn.destroy(chunk.code > 1000 ? new Error(`closed with code ${chunk.code}`) : undefined);
97
+ } else if (chunk === EOF) {
98
+ conn.end(() => resume(Effect.void));
99
+ } else {
100
+ conn.write(chunk, cause => {
101
+ resume(cause ? Effect.fail(new Socket.SocketGenericError({
102
+ reason: "Write",
103
+ cause
104
+ })) : Effect.void);
105
+ });
107
106
  }
108
- conn.on("end", onEnd);
109
- conn.on("error", onError);
110
- conn.on("close", onClose);
111
- return Effect.sync(() => {
112
- conn.off("end", onEnd);
113
- conn.off("error", onError);
114
- conn.off("close", onClose);
115
- });
116
- }).pipe(Effect.raceFirst(FiberSet.join(fiberSet)));
117
- }), Effect.scoped, Effect.interruptible);
107
+ return Effect.void;
108
+ })), Effect.forever, FiberSet.run(fiberSet), Effect.withUnhandledErrorLogLevel(Option.none()));
109
+ return yield* FiberSet.join(fiberSet);
110
+ }).pipe(Effect.mapInputContext(input => Context.merge(openContext, input)), Effect.scoped, Effect.interruptible);
118
111
  const write = chunk => Queue.offer(sendQueue, chunk);
119
112
  const writer = Effect.acquireRelease(Effect.succeed(write), () => Queue.offer(sendQueue, EOF));
120
113
  return Socket.Socket.of({
@@ -1 +1 @@
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","fromDuplex","acquireRelease","async","resume","conn","createConnection","on","removeAllListeners","succeed","cause","fail","SocketGenericError","reason","sync","destroy","closed","destroySoon","open","get","currentSendQueueCapacity","pipe","flatMap","sendQueueCapacity","dropping","bindTo","bind","context","map","openContext","sendQueue","run","handler","scope","provide","add","_","make","fiberSet","runtime","provideService","tap","take","chunk","isCloseEvent","code","Error","undefined","end","void","write","forever","withUnhandledErrorLogLevel","none","result","isEffect","onEnd","onError","onClose","hadError","SocketCloseError","off","raceFirst","join","scoped","interruptible","offer","writer","of","TypeId","runRaw","makeNetChannel","unwrapScoped","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,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,GAAG,MAAM,UAAU;AAW/B;;;;AAIA,OAAO,MAAMC,SAAS,gBAAuCT,OAAO,CAACU,UAAU,CAC7E,4CAA4C,CAC7C;AACD,MAAMC,GAAG,gBAAGC,MAAM,CAACC,GAAG,CAAC,sCAAsC,CAAC;AAE9D;;;;AAIA,OAAO,MAAMC,OAAO,GAClBC,OAA2B,IAE3BC,UAAU,CACRf,MAAM,CAACgB,cAAc,CACnBhB,MAAM,CAACiB,KAAK,CAAyCC,MAAM,IAAI;EAC7D,MAAMC,IAAI,GAAGZ,GAAG,CAACa,gBAAgB,CAACN,OAAO,CAAC;EAC1CK,IAAI,CAACE,EAAE,CAAC,SAAS,EAAE,MAAK;IACtBF,IAAI,CAACG,kBAAkB,EAAE;IACzBJ,MAAM,CAAClB,MAAM,CAACuB,OAAO,CAACJ,IAAI,CAAC,CAAC;EAC9B,CAAC,CAAC;EACFA,IAAI,CAACE,EAAE,CAAC,OAAO,EAAGG,KAAK,IAAI;IACzBN,MAAM,CAAClB,MAAM,CAACyB,IAAI,CAAC,IAAI5B,MAAM,CAAC6B,kBAAkB,CAAC;MAAEC,MAAM,EAAE,MAAM;MAAEH;IAAK,CAAE,CAAC,CAAC,CAAC;EAC/E,CAAC,CAAC;EACF,OAAOxB,MAAM,CAAC4B,IAAI,CAAC,MAAK;IACtBT,IAAI,CAACU,OAAO,EAAE;EAChB,CAAC,CAAC;AACJ,CAAC,CAAC,EACDV,IAAI,IACHnB,MAAM,CAAC4B,IAAI,CAAC,MAAK;EACf,IAAIT,IAAI,CAACW,MAAM,KAAK,KAAK,EAAE;IACzB,IAAI,aAAa,IAAIX,IAAI,EAAE;MACzBA,IAAI,CAACY,WAAW,EAAE;IACpB,CAAC,MAAM;MACL;MAAEZ,IAAmB,CAACU,OAAO,EAAE;IACjC;EACF;EACAV,IAAI,CAACG,kBAAkB,EAAE;AAC3B,CAAC,CAAC,CACL,CACF;AAEH;;;;AAIA,OAAO,MAAMP,UAAU,GACrBiB,IAAmD,IAEnD/B,QAAQ,CAACgC,GAAG,CAACpC,MAAM,CAACqC,wBAAwB,CAAC,CAACC,IAAI,CAChDnC,MAAM,CAACoC,OAAO,CAAEC,iBAAiB,IAC/BhC,KAAK,CAACiC,QAAQ,CACZD,iBAAiB,CAClB,CACF,EACDrC,MAAM,CAACuC,MAAM,CAAC,WAAW,CAAC,EAC1BvC,MAAM,CAACwC,IAAI,CAAC,aAAa,EAAE,MAAMxC,MAAM,CAACyC,OAAO,EAA4B,CAAC,EAC5EzC,MAAM,CAAC0C,GAAG,CAAC,CAAC;EAAEC,WAAW;EAAEC;AAAS,CAAE,KAAI;EACxC,MAAMC,GAAG,GAAaC,OAAyD,IAC7E9C,MAAM,CAAC+C,KAAK,CAACZ,IAAI,CACfnC,MAAM,CAACuC,MAAM,CAAC,OAAO,CAAC,EACtBvC,MAAM,CAACwC,IAAI,CAAC,MAAM,EAAE,CAAC;IAAEO;EAAK,CAAE,KAC5Bf,IAAI,CAACG,IAAI,CACPnC,MAAM,CAACgD,OAAO,CAACjD,OAAO,CAACkD,GAAG,CAACN,WAAW,EAAErC,KAAK,CAACA,KAAK,EAAEyC,KAAK,CAAC,CAAC,CAChC,CAAC,EACjC/C,MAAM,CAACwC,IAAI,CAAC,UAAU,EAAGU,CAAC,IAAKhD,QAAQ,CAACiD,IAAI,EAA+B,CAAC,EAC5EnD,MAAM,CAACwC,IAAI,CAAC,KAAK,EAAE,CAAC;IAAErB,IAAI;IAAEiC;EAAQ,CAAE,KACpClD,QAAQ,CAACmD,OAAO,CAACD,QAAQ,CAAC,EAAK,CAACjB,IAAI,CAClCnC,MAAM,CAACsD,cAAc,CAAC9C,SAAS,EAAEW,IAAI,CAAC,CACvC,CAAC,EACJnB,MAAM,CAACuD,GAAG,CAAC,CAAC;IAAEpC,IAAI;IAAEiC;EAAQ,CAAE,KAC5B/C,KAAK,CAACmD,IAAI,CAACZ,SAAS,CAAC,CAACT,IAAI,CACxBnC,MAAM,CAACuD,GAAG,CAAEE,KAAK,IACfzD,MAAM,CAACiB,KAAK,CAAmCC,MAAM,IAAI;IACvD,IAAIrB,MAAM,CAAC6D,YAAY,CAACD,KAAK,CAAC,EAAE;MAC9BtC,IAAI,CAACU,OAAO,CAAC4B,KAAK,CAACE,IAAI,GAAG,IAAI,GAAG,IAAIC,KAAK,CAAC,oBAAoBH,KAAK,CAACE,IAAI,EAAE,CAAC,GAAGE,SAAS,CAAC;IAC3F,CAAC,MAAM,IAAIJ,KAAK,KAAK/C,GAAG,EAAE;MACxBS,IAAI,CAAC2C,GAAG,CAAC,MAAM5C,MAAM,CAAClB,MAAM,CAAC+D,IAAI,CAAC,CAAC;IACrC,CAAC,MAAM;MACL5C,IAAI,CAAC6C,KAAK,CAACP,KAAK,EAAGjC,KAAK,IAAI;QAC1BN,MAAM,CACJM,KAAK,GAAGxB,MAAM,CAACyB,IAAI,CAAC,IAAI5B,MAAM,CAAC6B,kBAAkB,CAAC;UAAEC,MAAM,EAAE,OAAO;UAAEH;QAAK,CAAE,CAAC,CAAC,GAAGxB,MAAM,CAAC+D,IAAI,CAC7F;MACH,CAAC,CAAC;IACJ;IACA,OAAO/D,MAAM,CAAC+D,IAAI;EACpB,CAAC,CAAC,CACH,EACD/D,MAAM,CAACiE,OAAO,EACdjE,MAAM,CAACkE,0BAA0B,CAAC9D,MAAM,CAAC+D,IAAI,EAAE,CAAC,EAChDjE,QAAQ,CAAC2C,GAAG,CAACO,QAAQ,CAAC,CACvB,CACF,EACDpD,MAAM,CAACuD,GAAG,CAAC,CAAC;IAAEpC,IAAI;IAAEiC,QAAQ;IAAEP;EAAG,CAAE,KAAI;IACrC1B,IAAI,CAACE,EAAE,CAAC,MAAM,EAAGoC,KAAK,IAAI;MACxB,MAAMW,MAAM,GAAGtB,OAAO,CAACW,KAAK,CAAC;MAC7B,IAAIzD,MAAM,CAACqE,QAAQ,CAACD,MAAM,CAAC,EAAE;QAC3BvB,GAAG,CAACuB,MAAM,CAAC;MACb;IACF,CAAC,CAAC;IAEF,OAAOpE,MAAM,CAACiB,KAAK,CAAmCC,MAAM,IAAI;MAC9D,SAASoD,KAAKA,CAAA;QACZpD,MAAM,CAAClB,MAAM,CAAC+D,IAAI,CAAC;MACrB;MACA,SAASQ,OAAOA,CAAC/C,KAAY;QAC3BN,MAAM,CAAClB,MAAM,CAACyB,IAAI,CAAC,IAAI5B,MAAM,CAAC6B,kBAAkB,CAAC;UAAEC,MAAM,EAAE,MAAM;UAAEH;QAAK,CAAE,CAAC,CAAC,CAAC;MAC/E;MACA,SAASgD,OAAOA,CAACC,QAAiB;QAChCvD,MAAM,CACJlB,MAAM,CAACyB,IAAI,CACT,IAAI5B,MAAM,CAAC6E,gBAAgB,CAAC;UAC1B/C,MAAM,EAAE,OAAO;UACfgC,IAAI,EAAEc,QAAQ,GAAG,IAAI,GAAG;SACzB,CAAC,CACH,CACF;MACH;MACAtD,IAAI,CAACE,EAAE,CAAC,KAAK,EAAEiD,KAAK,CAAC;MACrBnD,IAAI,CAACE,EAAE,CAAC,OAAO,EAAEkD,OAAO,CAAC;MACzBpD,IAAI,CAACE,EAAE,CAAC,OAAO,EAAEmD,OAAO,CAAC;MACzB,OAAOxE,MAAM,CAAC4B,IAAI,CAAC,MAAK;QACtBT,IAAI,CAACwD,GAAG,CAAC,KAAK,EAAEL,KAAK,CAAC;QACtBnD,IAAI,CAACwD,GAAG,CAAC,OAAO,EAAEJ,OAAO,CAAC;QAC1BpD,IAAI,CAACwD,GAAG,CAAC,OAAO,EAAEH,OAAO,CAAC;MAC5B,CAAC,CAAC;IACJ,CAAC,CAAC,CAACrC,IAAI,CACLnC,MAAM,CAAC4E,SAAS,CAAC1E,QAAQ,CAAC2E,IAAI,CAACzB,QAAQ,CAAC,CAAC,CAC1C;EACH,CAAC,CAAC,EACFpD,MAAM,CAAC8E,MAAM,EACb9E,MAAM,CAAC+E,aAAa,CACrB;EAEH,MAAMf,KAAK,GAAIP,KAA8C,IAAKpD,KAAK,CAAC2E,KAAK,CAACpC,SAAS,EAAEa,KAAK,CAAC;EAC/F,MAAMwB,MAAM,GAAGjF,MAAM,CAACgB,cAAc,CAClChB,MAAM,CAACuB,OAAO,CAACyC,KAAK,CAAC,EACrB,MAAM3D,KAAK,CAAC2E,KAAK,CAACpC,SAAS,EAAElC,GAAG,CAAC,CAClC;EAED,OAAOb,MAAM,CAACA,MAAM,CAACqF,EAAE,CAAC;IACtB,CAACrF,MAAM,CAACsF,MAAM,GAAGtF,MAAM,CAACsF,MAAM;IAC9BtC,GAAG;IACHuC,MAAM,EAAEvC,GAAG;IACXoC;GACD,CAAC;AACJ,CAAC,CAAC,CACH;AAEH;;;;AAIA,OAAO,MAAMI,cAAc,GACzBvE,OAA2B,IAS3BhB,OAAO,CAACwF,YAAY,CAClBtF,MAAM,CAAC0C,GAAG,CAAC7B,OAAO,CAACC,OAAO,CAAC,EAAEjB,MAAM,CAAC0F,aAAa,EAAM,CAAC,CACzD;AAEH;;;;AAIA,OAAO,MAAMC,QAAQ,GAAI1E,OAA2B,IAClDX,KAAK,CAACsF,MAAM,CAAC5F,MAAM,CAACA,MAAM,EAAEgB,OAAO,CAACC,OAAO,CAAC,CAAC","ignoreList":[]}
1
+ {"version":3,"file":"NodeSocket.js","names":["Socket","Channel","Context","Deferred","Effect","FiberSet","Layer","Option","Queue","Scope","Net","NetSocket","GenericTag","EOF","Symbol","for","makeNet","options","fromDuplex","acquireRelease","async","resume","conn","createConnection","on","removeAllListeners","succeed","cause","fail","SocketGenericError","reason","sync","destroy","closed","destroySoon","open","withFiberRuntime","fiber","gen","sendQueue","dropping","getFiberRef","currentSendQueueCapacity","openContext","currentContext","run","handler","scope","fiberSet","make","provideService","runtime","onData","chunk","result","isEffect","onEnd","unsafeDone","deferred","void","onError","onClose","hadError","SocketCloseError","code","addFinalizer","off","take","pipe","tap","isCloseEvent","Error","undefined","end","write","forever","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":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect/platform-node-shared",
3
- "version": "0.19.13",
3
+ "version": "0.19.15",
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.69.13",
18
- "effect": "^3.10.8"
17
+ "@effect/platform": "^0.69.15",
18
+ "effect": "^3.10.9"
19
19
  },
20
20
  "publishConfig": {
21
21
  "provenance": true
package/src/NodeSocket.ts CHANGED
@@ -5,8 +5,8 @@ import * as Socket from "@effect/platform/Socket"
5
5
  import * as Channel from "effect/Channel"
6
6
  import type * as Chunk from "effect/Chunk"
7
7
  import * as Context from "effect/Context"
8
+ import * as Deferred from "effect/Deferred"
8
9
  import * as Effect from "effect/Effect"
9
- import * as FiberRef from "effect/FiberRef"
10
10
  import * as FiberSet from "effect/FiberSet"
11
11
  import * as Layer from "effect/Layer"
12
12
  import * as Option from "effect/Option"
@@ -75,87 +75,84 @@ export const makeNet = (
75
75
  export const fromDuplex = <RO>(
76
76
  open: Effect.Effect<Duplex, Socket.SocketError, RO>
77
77
  ): Effect.Effect<Socket.Socket, never, Exclude<RO, Scope.Scope>> =>
78
- FiberRef.get(Socket.currentSendQueueCapacity).pipe(
79
- Effect.flatMap((sendQueueCapacity) =>
80
- Queue.dropping<Uint8Array | string | Socket.CloseEvent | typeof EOF>(
81
- sendQueueCapacity
78
+ Effect.withFiberRuntime<Socket.Socket, never, Exclude<RO, Scope.Scope>>((fiber) =>
79
+ Effect.gen(function*() {
80
+ const sendQueue = yield* Queue.dropping<Uint8Array | string | Socket.CloseEvent | typeof EOF>(
81
+ fiber.getFiberRef(Socket.currentSendQueueCapacity)
82
82
  )
83
- ),
84
- Effect.bindTo("sendQueue"),
85
- Effect.bind("openContext", () => Effect.context<Exclude<RO, Scope.Scope>>()),
86
- Effect.map(({ openContext, sendQueue }) => {
83
+ const openContext = fiber.currentContext as Context.Context<RO>
87
84
  const run = <R, E, _>(handler: (_: Uint8Array) => Effect.Effect<_, E, R> | void) =>
88
- Effect.scope.pipe(
89
- Effect.bindTo("scope"),
90
- Effect.bind("conn", ({ scope }) =>
91
- open.pipe(
92
- Effect.provide(Context.add(openContext, Scope.Scope, scope))
93
- ) as Effect.Effect<Net.Socket>),
94
- Effect.bind("fiberSet", (_) => FiberSet.make<any, E | Socket.SocketError>()),
95
- Effect.bind("run", ({ conn, fiberSet }) =>
96
- FiberSet.runtime(fiberSet)<R>().pipe(
97
- Effect.provideService(NetSocket, conn)
98
- )),
99
- Effect.tap(({ conn, fiberSet }) =>
100
- Queue.take(sendQueue).pipe(
101
- Effect.tap((chunk) =>
102
- Effect.async<void, Socket.SocketError, never>((resume) => {
103
- if (Socket.isCloseEvent(chunk)) {
104
- conn.destroy(chunk.code > 1000 ? new Error(`closed with code ${chunk.code}`) : undefined)
105
- } else if (chunk === EOF) {
106
- conn.end(() => resume(Effect.void))
107
- } else {
108
- conn.write(chunk, (cause) => {
109
- resume(
110
- cause ? Effect.fail(new Socket.SocketGenericError({ reason: "Write", cause })) : Effect.void
111
- )
112
- })
113
- }
114
- return Effect.void
85
+ Effect.gen(function*() {
86
+ const scope = yield* Effect.scope
87
+ const fiberSet = yield* FiberSet.make<any, E | Socket.SocketError>()
88
+ const conn = yield* open
89
+ const run = yield* Effect.provideService(FiberSet.runtime(fiberSet)<R>(), NetSocket, conn as Net.Socket)
90
+
91
+ function onData(chunk: Uint8Array) {
92
+ const result = handler(chunk)
93
+ if (Effect.isEffect(result)) {
94
+ run(result)
95
+ }
96
+ }
97
+ function onEnd() {
98
+ Deferred.unsafeDone(fiberSet.deferred, Effect.void)
99
+ }
100
+ function onError(cause: Error) {
101
+ Deferred.unsafeDone(
102
+ fiberSet.deferred,
103
+ Effect.fail(new Socket.SocketGenericError({ reason: "Read", cause }))
104
+ )
105
+ }
106
+ function onClose(hadError: boolean) {
107
+ Deferred.unsafeDone(
108
+ fiberSet.deferred,
109
+ Effect.fail(
110
+ new Socket.SocketCloseError({
111
+ reason: "Close",
112
+ code: hadError ? 1006 : 1000
115
113
  })
116
- ),
117
- Effect.forever,
118
- Effect.withUnhandledErrorLogLevel(Option.none()),
119
- FiberSet.run(fiberSet)
114
+ )
120
115
  )
121
- ),
122
- Effect.tap(({ conn, fiberSet, run }) => {
123
- conn.on("data", (chunk) => {
124
- const result = handler(chunk)
125
- if (Effect.isEffect(result)) {
126
- run(result)
127
- }
116
+ }
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)
128
124
  })
125
+ )
126
+ conn.on("data", onData)
127
+ conn.on("end", onEnd)
128
+ conn.on("error", onError)
129
+ conn.on("close", onClose)
129
130
 
130
- return Effect.async<void, Socket.SocketError, never>((resume) => {
131
- function onEnd() {
132
- resume(Effect.void)
133
- }
134
- function onError(cause: Error) {
135
- resume(Effect.fail(new Socket.SocketGenericError({ reason: "Read", cause })))
136
- }
137
- function onClose(hadError: boolean) {
138
- resume(
139
- Effect.fail(
140
- new Socket.SocketCloseError({
141
- reason: "Close",
142
- code: hadError ? 1006 : 1000
143
- })
144
- )
145
- )
146
- }
147
- conn.on("end", onEnd)
148
- conn.on("error", onError)
149
- conn.on("close", onClose)
150
- return Effect.sync(() => {
151
- conn.off("end", onEnd)
152
- conn.off("error", onError)
153
- conn.off("close", onClose)
131
+ yield* Queue.take(sendQueue).pipe(
132
+ Effect.tap((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
+ } else if (chunk === EOF) {
137
+ conn.end(() => resume(Effect.void))
138
+ } else {
139
+ conn.write(chunk, (cause) => {
140
+ resume(
141
+ cause ? Effect.fail(new Socket.SocketGenericError({ reason: "Write", cause })) : Effect.void
142
+ )
143
+ })
144
+ }
145
+ return Effect.void
154
146
  })
155
- }).pipe(
156
- Effect.raceFirst(FiberSet.join(fiberSet))
157
- )
158
- }),
147
+ ),
148
+ Effect.forever,
149
+ FiberSet.run(fiberSet),
150
+ Effect.withUnhandledErrorLogLevel(Option.none())
151
+ )
152
+
153
+ return yield* FiberSet.join(fiberSet)
154
+ }).pipe(
155
+ Effect.mapInputContext((input: Context.Context<R | Scope.Scope>) => Context.merge(openContext, input)),
159
156
  Effect.scoped,
160
157
  Effect.interruptible
161
158
  )