@effect/platform-node-shared 0.3.4 → 0.3.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.
@@ -8,7 +8,6 @@ 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 Fiber = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Fiber"));
12
11
  var FiberSet = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/FiberSet"));
13
12
  var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
14
13
  var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Option"));
@@ -85,7 +84,7 @@ const fromNetSocket = open => Effect.gen(function* (_) {
85
84
  const conn = yield* _(open);
86
85
  const fiberSet = yield* _(FiberSet.make());
87
86
  const run = yield* _(FiberSet.runtime(fiberSet)(), Effect.provideService(NetSocket, conn));
88
- const writeFiber = yield* _(Queue.take(sendQueue), Effect.tap(chunk => Effect.async(resume => {
87
+ yield* _(Queue.take(sendQueue), Effect.tap(chunk => Effect.async(resume => {
89
88
  if (Socket.isCloseEvent(chunk)) {
90
89
  conn.destroy(chunk.code > 1000 ? new Error(`closed with code ${chunk.code}`) : undefined);
91
90
  } else if (chunk === EOF) {
@@ -98,7 +97,7 @@ const fromNetSocket = open => Effect.gen(function* (_) {
98
97
  })) : Effect.unit);
99
98
  });
100
99
  }
101
- })), Effect.forever, Effect.fork, Effect.withUnhandledErrorLogLevel(Option.none()));
100
+ })), Effect.forever, Effect.withUnhandledErrorLogLevel(Option.none()), FiberSet.run(fiberSet));
102
101
  conn.on("data", chunk => {
103
102
  run(handler(chunk));
104
103
  });
@@ -118,8 +117,8 @@ const fromNetSocket = open => Effect.gen(function* (_) {
118
117
  code: hadError ? 1006 : 1000
119
118
  })));
120
119
  });
121
- }), Effect.raceFirst(Fiber.join(writeFiber)), Effect.raceFirst(FiberSet.join(fiberSet)));
122
- }).pipe(Effect.scoped);
120
+ }), Effect.raceFirst(FiberSet.join(fiberSet)));
121
+ }).pipe(Effect.scoped, Effect.interruptible);
123
122
  const write = chunk => Queue.offer(sendQueue, chunk);
124
123
  const writer = Effect.acquireRelease(Effect.succeed(write), () => Queue.offer(sendQueue, EOF));
125
124
  return Socket.Socket.of({
@@ -1 +1 @@
1
- {"version":3,"file":"NodeSocket.js","names":["Socket","_interopRequireWildcard","require","Channel","Context","Effect","Fiber","FiberSet","Layer","Option","Queue","Net","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","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","writeFiber","take","tap","chunk","isCloseEvent","code","Error","undefined","end","unit","write","forever","fork","withUnhandledErrorLogLevel","none","hadError","SocketCloseError","raceFirst","join","pipe","scoped","offer","writer","of","TypeId","makeNetChannel","unwrapScoped","map","toChannelWith","layerNet"],"sources":["../../src/NodeSocket.ts"],"sourcesContent":[null],"mappings":"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"}
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","prototype","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","unit","write","forever","withUnhandledErrorLogLevel","none","hadError","SocketCloseError","raceFirst","join","pipe","scoped","interruptible","offer","writer","of","TypeId","makeNetChannel","unwrapScoped","map","toChannelWith","layerNet"],"sources":["../../src/NodeSocket.ts"],"sourcesContent":[null],"mappings":"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"}
@@ -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,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,aAAa,CAAC,aAAa,EAAE,OAAO,WAAW,EAAE,WAAW,CAwB5D,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,aAAa,SAClB,aAAa,CAAC,UAAU,EAAE,OAAO,WAAW,EAAE,WAAW,CAAC,KAC/D,aAAa,CAAC,aAAa,CAqE1B,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,cAAc,wBAChB,IAAI,cAAc,6IAW1B,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,QAAQ,YAAa,IAAI,cAAc,KAAG,WAAW,CAAC,aAAa,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;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,aAAa,CAAC,aAAa,EAAE,OAAO,WAAW,EAAE,WAAW,CAwB5D,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,aAAa,SAClB,aAAa,CAAC,UAAU,EAAE,OAAO,WAAW,EAAE,WAAW,CAAC,KAC/D,aAAa,CAAC,aAAa,CAuE1B,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,cAAc,wBAChB,IAAI,cAAc,6IAW1B,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,QAAQ,YAAa,IAAI,cAAc,KAAG,WAAW,CAAC,aAAa,EAAE,OAAO,WAAW,CAIjG,CAAA"}
@@ -5,7 +5,6 @@ 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 Fiber from "effect/Fiber";
9
8
  import * as FiberSet from "effect/FiberSet";
10
9
  import * as Layer from "effect/Layer";
11
10
  import * as Option from "effect/Option";
@@ -52,7 +51,7 @@ export const fromNetSocket = open => Effect.gen(function* (_) {
52
51
  const conn = yield* _(open);
53
52
  const fiberSet = yield* _(FiberSet.make());
54
53
  const run = yield* _(FiberSet.runtime(fiberSet)(), Effect.provideService(NetSocket, conn));
55
- const writeFiber = yield* _(Queue.take(sendQueue), Effect.tap(chunk => Effect.async(resume => {
54
+ yield* _(Queue.take(sendQueue), Effect.tap(chunk => Effect.async(resume => {
56
55
  if (Socket.isCloseEvent(chunk)) {
57
56
  conn.destroy(chunk.code > 1000 ? new Error(`closed with code ${chunk.code}`) : undefined);
58
57
  } else if (chunk === EOF) {
@@ -65,7 +64,7 @@ export const fromNetSocket = open => Effect.gen(function* (_) {
65
64
  })) : Effect.unit);
66
65
  });
67
66
  }
68
- })), Effect.forever, Effect.fork, Effect.withUnhandledErrorLogLevel(Option.none()));
67
+ })), Effect.forever, Effect.withUnhandledErrorLogLevel(Option.none()), FiberSet.run(fiberSet));
69
68
  conn.on("data", chunk => {
70
69
  run(handler(chunk));
71
70
  });
@@ -85,8 +84,8 @@ export const fromNetSocket = open => Effect.gen(function* (_) {
85
84
  code: hadError ? 1006 : 1000
86
85
  })));
87
86
  });
88
- }), Effect.raceFirst(Fiber.join(writeFiber)), Effect.raceFirst(FiberSet.join(fiberSet)));
89
- }).pipe(Effect.scoped);
87
+ }), Effect.raceFirst(FiberSet.join(fiberSet)));
88
+ }).pipe(Effect.scoped, Effect.interruptible);
90
89
  const write = chunk => Queue.offer(sendQueue, chunk);
91
90
  const writer = Effect.acquireRelease(Effect.succeed(write), () => Queue.offer(sendQueue, EOF));
92
91
  return Socket.Socket.of({
@@ -1 +1 @@
1
- {"version":3,"file":"NodeSocket.js","names":["Socket","Channel","Context","Effect","Fiber","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","writeFiber","take","tap","chunk","isCloseEvent","code","Error","undefined","end","unit","write","forever","fork","withUnhandledErrorLogLevel","none","hadError","SocketCloseError","raceFirst","join","pipe","scoped","offer","writer","of","TypeId","makeNetChannel","unwrapScoped","map","toChannelWith","layerNet"],"sources":["../../src/NodeSocket.ts"],"sourcesContent":[null],"mappings":"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"}
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","unit","write","forever","withUnhandledErrorLogLevel","none","hadError","SocketCloseError","raceFirst","join","pipe","scoped","interruptible","offer","writer","of","TypeId","makeNetChannel","unwrapScoped","map","toChannelWith","layerNet"],"sources":["../../src/NodeSocket.ts"],"sourcesContent":[null],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect/platform-node-shared",
3
- "version": "0.3.4",
3
+ "version": "0.3.6",
4
4
  "description": "Unified interfaces for common platform-specific services",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -13,8 +13,8 @@
13
13
  "multipasta": "^0.1.21"
14
14
  },
15
15
  "peerDependencies": {
16
- "@effect/platform": "^0.48.4",
17
- "effect": "^2.4.6"
16
+ "@effect/platform": "^0.48.6",
17
+ "effect": "^2.4.7"
18
18
  },
19
19
  "exports": {
20
20
  "./package.json": "./package.json",
package/src/NodeSocket.ts CHANGED
@@ -6,7 +6,6 @@ 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 Fiber from "effect/Fiber"
10
9
  import * as FiberSet from "effect/FiberSet"
11
10
  import * as Layer from "effect/Layer"
12
11
  import * as Option from "effect/Option"
@@ -81,7 +80,7 @@ export const fromNetSocket = (
81
80
  FiberSet.runtime(fiberSet)<R>(),
82
81
  Effect.provideService(NetSocket, conn)
83
82
  )
84
- const writeFiber = yield* _(
83
+ yield* _(
85
84
  Queue.take(sendQueue),
86
85
  Effect.tap((chunk) =>
87
86
  Effect.async<void, Socket.SocketError, never>((resume) => {
@@ -97,8 +96,8 @@ export const fromNetSocket = (
97
96
  })
98
97
  ),
99
98
  Effect.forever,
100
- Effect.fork,
101
- Effect.withUnhandledErrorLogLevel(Option.none())
99
+ Effect.withUnhandledErrorLogLevel(Option.none()),
100
+ FiberSet.run(fiberSet)
102
101
  )
103
102
  conn.on("data", (chunk) => {
104
103
  run(handler(chunk))
@@ -122,10 +121,12 @@ export const fromNetSocket = (
122
121
  )
123
122
  })
124
123
  }),
125
- Effect.raceFirst(Fiber.join(writeFiber)),
126
124
  Effect.raceFirst(FiberSet.join(fiberSet))
127
125
  )
128
- }).pipe(Effect.scoped)
126
+ }).pipe(
127
+ Effect.scoped,
128
+ Effect.interruptible
129
+ )
129
130
 
130
131
  const write = (chunk: Uint8Array | Socket.CloseEvent) => Queue.offer(sendQueue, chunk)
131
132
  const writer = Effect.acquireRelease(