@effect/platform-browser 0.48.16 → 0.48.18

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.
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.make = exports.layerMessagePort = exports.layer = void 0;
7
7
  var _WorkerError = require("@effect/platform/WorkerError");
8
8
  var Runner = _interopRequireWildcard(require("@effect/platform/WorkerRunner"));
9
+ var Context = _interopRequireWildcard(require("effect/Context"));
9
10
  var Deferred = _interopRequireWildcard(require("effect/Deferred"));
10
11
  var Effect = _interopRequireWildcard(require("effect/Effect"));
11
12
  var ExecStrategy = _interopRequireWildcard(require("effect/ExecutionStrategy"));
@@ -14,6 +15,7 @@ var FiberId = _interopRequireWildcard(require("effect/FiberId"));
14
15
  var FiberSet = _interopRequireWildcard(require("effect/FiberSet"));
15
16
  var _GlobalValue = require("effect/GlobalValue");
16
17
  var Layer = _interopRequireWildcard(require("effect/Layer"));
18
+ var Runtime = _interopRequireWildcard(require("effect/Runtime"));
17
19
  var Scope = _interopRequireWildcard(require("effect/Scope"));
18
20
  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); }
19
21
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -37,20 +39,16 @@ const make = self => Runner.PlatformRunner.of({
37
39
  transfer: transfer
38
40
  });
39
41
  });
40
- const run = handler => Effect.uninterruptibleMask(restore => Scope.make().pipe(Effect.bindTo("scope"), Effect.bind("fiberSet", ({
41
- scope
42
- }) => FiberSet.make().pipe(Scope.extend(scope))), Effect.bind("runFork", ({
43
- fiberSet
44
- }) => FiberSet.runtime(fiberSet)()), Effect.tap(({
45
- fiberSet,
46
- runFork,
47
- scope
48
- }) => {
42
+ const run = handler => Effect.uninterruptibleMask(restore => Effect.gen(function* () {
43
+ const scope = yield* Effect.scope;
44
+ const runtime = (yield* Effect.runtime()).pipe(Runtime.updateContext(Context.omit(Scope.Scope)));
45
+ const fiberSet = yield* FiberSet.make();
46
+ const runFork = Runtime.runFork(runtime);
49
47
  function onMessage(portId) {
50
48
  return function (event) {
51
49
  const message = event.data;
52
50
  if (message[0] === 0) {
53
- runFork(restore(handler(portId, message[1])));
51
+ FiberSet.unsafeAdd(fiberSet, runFork(restore(handler(portId, message[1]))));
54
52
  } else {
55
53
  const port = ports.get(portId);
56
54
  if (port) {
@@ -76,7 +74,7 @@ const make = self => Runner.PlatformRunner.of({
76
74
  }));
77
75
  }
78
76
  function handlePort(port) {
79
- return Scope.fork(scope, ExecStrategy.sequential).pipe(Effect.flatMap(scope => {
77
+ const fiber = Scope.fork(scope, ExecStrategy.sequential).pipe(Effect.flatMap(scope => {
80
78
  const portId = currentPortId++;
81
79
  ports.set(portId, [port, scope]);
82
80
  const onMsg = onMessage(portId);
@@ -89,8 +87,10 @@ const make = self => Runner.PlatformRunner.of({
89
87
  return Scope.addFinalizer(scope, Effect.sync(() => {
90
88
  port.removeEventListener("message", onMsg);
91
89
  port.removeEventListener("messageerror", onError);
90
+ port.close();
92
91
  }));
93
92
  }), runFork);
93
+ FiberSet.unsafeAdd(fiberSet, fiber);
94
94
  }
95
95
  self.addEventListener("error", onError);
96
96
  let prevOnConnect;
@@ -104,20 +104,18 @@ const make = self => Runner.PlatformRunner.of({
104
104
  handlePort(port);
105
105
  }
106
106
  cachedPorts.clear();
107
+ yield* Scope.addFinalizer(scope, Effect.sync(() => self.close()));
107
108
  } else {
108
109
  handlePort(self);
109
110
  }
110
- return Scope.addFinalizer(scope, Effect.sync(() => {
111
+ yield* Scope.addFinalizer(scope, Effect.sync(() => {
111
112
  self.removeEventListener("error", onError);
112
113
  if ("onconnect" in self) {
113
114
  self.onconnect = prevOnConnect;
114
115
  }
115
- self.close();
116
116
  }));
117
- }), Effect.flatMap(({
118
- fiberSet,
119
- scope
120
- }) => restore(FiberSet.join(fiberSet)).pipe(Effect.ensuring(Scope.close(scope, Exit.void))))));
117
+ return yield* restore(FiberSet.join(fiberSet));
118
+ }).pipe(Effect.scoped));
121
119
  return {
122
120
  run,
123
121
  send
@@ -1 +1 @@
1
- {"version":3,"file":"workerRunner.js","names":["_WorkerError","require","Runner","_interopRequireWildcard","Deferred","Effect","ExecStrategy","Exit","FiberId","FiberSet","_GlobalValue","Layer","Scope","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","cachedPorts","globalValue","Set","globalHandleConnect","event","add","ports","self","onconnect","make","PlatformRunner","of","PlatformRunnerTypeId","start","sync","currentPortId","Map","send","portId","message","transfer","postMessage","run","handler","uninterruptibleMask","restore","pipe","bindTo","bind","scope","extend","fiberSet","runtime","tap","runFork","onMessage","data","port","close","void","delete","size","unsafeDone","deferred","interrupt","none","onMessageError","error","WorkerError","reason","cause","onError","handlePort","fork","sequential","flatMap","onMsg","addEventListener","addFinalizer","removeEventListener","prevOnConnect","clear","join","ensuring","exports","layerMessagePort","succeed","layer"],"sources":["../../../src/internal/workerRunner.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"workerRunner.js","names":["_WorkerError","require","Runner","_interopRequireWildcard","Context","Deferred","Effect","ExecStrategy","Exit","FiberId","FiberSet","_GlobalValue","Layer","Runtime","Scope","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","cachedPorts","globalValue","Set","globalHandleConnect","event","add","ports","self","onconnect","make","PlatformRunner","of","PlatformRunnerTypeId","start","sync","currentPortId","Map","send","portId","message","transfer","postMessage","run","handler","uninterruptibleMask","restore","gen","scope","runtime","pipe","updateContext","omit","fiberSet","runFork","onMessage","data","unsafeAdd","port","close","void","delete","size","unsafeDone","deferred","interrupt","none","onMessageError","error","WorkerError","reason","cause","onError","handlePort","fiber","fork","sequential","flatMap","onMsg","addEventListener","addFinalizer","removeEventListener","prevOnConnect","clear","join","scoped","exports","layerMessagePort","succeed","layer"],"sources":["../../../src/internal/workerRunner.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -1,5 +1,6 @@
1
1
  import { WorkerError } from "@effect/platform/WorkerError";
2
2
  import * as Runner from "@effect/platform/WorkerRunner";
3
+ import * as Context from "effect/Context";
3
4
  import * as Deferred from "effect/Deferred";
4
5
  import * as Effect from "effect/Effect";
5
6
  import * as ExecStrategy from "effect/ExecutionStrategy";
@@ -8,6 +9,7 @@ import * as FiberId from "effect/FiberId";
8
9
  import * as FiberSet from "effect/FiberSet";
9
10
  import { globalValue } from "effect/GlobalValue";
10
11
  import * as Layer from "effect/Layer";
12
+ import * as Runtime from "effect/Runtime";
11
13
  import * as Scope from "effect/Scope";
12
14
  const cachedPorts = /*#__PURE__*/globalValue("@effect/platform-browser/Worker/cachedPorts", () => new Set());
13
15
  function globalHandleConnect(event) {
@@ -29,20 +31,16 @@ export const make = self => Runner.PlatformRunner.of({
29
31
  transfer: transfer
30
32
  });
31
33
  });
32
- const run = handler => Effect.uninterruptibleMask(restore => Scope.make().pipe(Effect.bindTo("scope"), Effect.bind("fiberSet", ({
33
- scope
34
- }) => FiberSet.make().pipe(Scope.extend(scope))), Effect.bind("runFork", ({
35
- fiberSet
36
- }) => FiberSet.runtime(fiberSet)()), Effect.tap(({
37
- fiberSet,
38
- runFork,
39
- scope
40
- }) => {
34
+ const run = handler => Effect.uninterruptibleMask(restore => Effect.gen(function* () {
35
+ const scope = yield* Effect.scope;
36
+ const runtime = (yield* Effect.runtime()).pipe(Runtime.updateContext(Context.omit(Scope.Scope)));
37
+ const fiberSet = yield* FiberSet.make();
38
+ const runFork = Runtime.runFork(runtime);
41
39
  function onMessage(portId) {
42
40
  return function (event) {
43
41
  const message = event.data;
44
42
  if (message[0] === 0) {
45
- runFork(restore(handler(portId, message[1])));
43
+ FiberSet.unsafeAdd(fiberSet, runFork(restore(handler(portId, message[1]))));
46
44
  } else {
47
45
  const port = ports.get(portId);
48
46
  if (port) {
@@ -68,7 +66,7 @@ export const make = self => Runner.PlatformRunner.of({
68
66
  }));
69
67
  }
70
68
  function handlePort(port) {
71
- return Scope.fork(scope, ExecStrategy.sequential).pipe(Effect.flatMap(scope => {
69
+ const fiber = Scope.fork(scope, ExecStrategy.sequential).pipe(Effect.flatMap(scope => {
72
70
  const portId = currentPortId++;
73
71
  ports.set(portId, [port, scope]);
74
72
  const onMsg = onMessage(portId);
@@ -81,8 +79,10 @@ export const make = self => Runner.PlatformRunner.of({
81
79
  return Scope.addFinalizer(scope, Effect.sync(() => {
82
80
  port.removeEventListener("message", onMsg);
83
81
  port.removeEventListener("messageerror", onError);
82
+ port.close();
84
83
  }));
85
84
  }), runFork);
85
+ FiberSet.unsafeAdd(fiberSet, fiber);
86
86
  }
87
87
  self.addEventListener("error", onError);
88
88
  let prevOnConnect;
@@ -96,20 +96,18 @@ export const make = self => Runner.PlatformRunner.of({
96
96
  handlePort(port);
97
97
  }
98
98
  cachedPorts.clear();
99
+ yield* Scope.addFinalizer(scope, Effect.sync(() => self.close()));
99
100
  } else {
100
101
  handlePort(self);
101
102
  }
102
- return Scope.addFinalizer(scope, Effect.sync(() => {
103
+ yield* Scope.addFinalizer(scope, Effect.sync(() => {
103
104
  self.removeEventListener("error", onError);
104
105
  if ("onconnect" in self) {
105
106
  self.onconnect = prevOnConnect;
106
107
  }
107
- self.close();
108
108
  }));
109
- }), Effect.flatMap(({
110
- fiberSet,
111
- scope
112
- }) => restore(FiberSet.join(fiberSet)).pipe(Effect.ensuring(Scope.close(scope, Exit.void))))));
109
+ return yield* restore(FiberSet.join(fiberSet));
110
+ }).pipe(Effect.scoped));
113
111
  return {
114
112
  run,
115
113
  send
@@ -1 +1 @@
1
- {"version":3,"file":"workerRunner.js","names":["WorkerError","Runner","Deferred","Effect","ExecStrategy","Exit","FiberId","FiberSet","globalValue","Layer","Scope","cachedPorts","Set","globalHandleConnect","event","add","ports","self","onconnect","make","PlatformRunner","of","PlatformRunnerTypeId","start","sync","currentPortId","Map","send","portId","message","transfer","get","postMessage","run","handler","uninterruptibleMask","restore","pipe","bindTo","bind","scope","extend","fiberSet","runtime","tap","runFork","onMessage","data","port","close","void","delete","size","unsafeDone","deferred","interrupt","none","onMessageError","error","reason","cause","onError","handlePort","fork","sequential","flatMap","set","onMsg","addEventListener","addFinalizer","removeEventListener","prevOnConnect","clear","join","ensuring","layerMessagePort","succeed","layer"],"sources":["../../../src/internal/workerRunner.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAW,QAAQ,8BAA8B;AAC1D,OAAO,KAAKC,MAAM,MAAM,+BAA+B;AACvD,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,YAAY,MAAM,0BAA0B;AACxD,OAAO,KAAKC,IAAI,MAAM,aAAa;AACnC,OAAO,KAAKC,OAAO,MAAM,gBAAgB;AACzC,OAAO,KAAKC,QAAQ,MAAM,iBAAiB;AAC3C,SAASC,WAAW,QAAQ,oBAAoB;AAChD,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAErC,MAAMC,WAAW,gBAAGH,WAAW,CAAC,6CAA6C,EAAE,MAAM,IAAII,GAAG,EAAe,CAAC;AAC5G,SAASC,mBAAmBA,CAACC,KAAmB;EAC9CH,WAAW,CAACI,GAAG,CAAED,KAAsB,CAACE,KAAK,CAAC,CAAC,CAAC,CAAC;AACnD;AACA,IAAI,OAAOC,IAAI,KAAK,WAAW,IAAI,WAAW,IAAIA,IAAI,EAAE;EACtDA,IAAI,CAACC,SAAS,GAAGL,mBAAmB;AACtC;AAEA;AACA,OAAO,MAAMM,IAAI,GAAIF,IAA0B,IAC7ChB,MAAM,CAACmB,cAAc,CAACC,EAAE,CAAC;EACvB,CAACpB,MAAM,CAACqB,oBAAoB,GAAGrB,MAAM,CAACqB,oBAAoB;EAC1DC,KAAKA,CAAA;IACH,OAAOpB,MAAM,CAACqB,IAAI,CAAC,MAAK;MACtB,IAAIC,aAAa,GAAG,CAAC;MAErB,MAAMT,KAAK,GAAG,IAAIU,GAAG,EAAwD;MAC7E,MAAMC,IAAI,GAAGA,CAACC,MAAc,EAAEC,OAAU,EAAEC,QAAiC,KACzE3B,MAAM,CAACqB,IAAI,CAAC,MAAK;QACf;QAAC,CAACR,KAAK,CAACe,GAAG,CAACH,MAAM,CAAC,GAAG,CAAC,CAAC,IAAIX,IAAI,EAAEe,WAAW,CAAC,CAAC,CAAC,EAAEH,OAAO,CAAC,EAAE;UAC1DC,QAAQ,EAAEA;SACX,CAAC;MACJ,CAAC,CAAC;MAEJ,MAAMG,GAAG,GAAaC,OAA+D,IACnF/B,MAAM,CAACgC,mBAAmB,CAAEC,OAAO,IACjC1B,KAAK,CAACS,IAAI,EAAE,CAACkB,IAAI,CACflC,MAAM,CAACmC,MAAM,CAAC,OAAO,CAAC,EACtBnC,MAAM,CAACoC,IAAI,CAAC,UAAU,EAAE,CAAC;QAAEC;MAAK,CAAE,KAAKjC,QAAQ,CAACY,IAAI,EAAwB,CAACkB,IAAI,CAAC3B,KAAK,CAAC+B,MAAM,CAACD,KAAK,CAAC,CAAC,CAAC,EACvGrC,MAAM,CAACoC,IAAI,CAAC,SAAS,EAAE,CAAC;QAAEG;MAAQ,CAAE,KAAKnC,QAAQ,CAACoC,OAAO,CAACD,QAAQ,CAAC,EAAK,CAAC,EACzEvC,MAAM,CAACyC,GAAG,CAAC,CAAC;QAAEF,QAAQ;QAAEG,OAAO;QAAEL;MAAK,CAAE,KAAI;QAC1C,SAASM,SAASA,CAAClB,MAAc;UAC/B,OAAO,UAASd,KAAmB;YACjC,MAAMe,OAAO,GAAIf,KAAsB,CAACiC,IAAuC;YAC/E,IAAIlB,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;cACpBgB,OAAO,CAACT,OAAO,CAACF,OAAO,CAACN,MAAM,EAAEC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/C,CAAC,MAAM;cACL,MAAMmB,IAAI,GAAGhC,KAAK,CAACe,GAAG,CAACH,MAAM,CAAC;cAC9B,IAAIoB,IAAI,EAAE;gBACR7C,MAAM,CAAC0C,OAAO,CAACnC,KAAK,CAACuC,KAAK,CAACD,IAAI,CAAC,CAAC,CAAC,EAAE3C,IAAI,CAAC6C,IAAI,CAAC,CAAC;cACjD;cACAlC,KAAK,CAACmC,MAAM,CAACvB,MAAM,CAAC;cACpB,IAAIZ,KAAK,CAACoC,IAAI,KAAK,CAAC,EAAE;gBACpBlD,QAAQ,CAACmD,UAAU,CAACX,QAAQ,CAACY,QAAQ,EAAEjD,IAAI,CAACkD,SAAS,CAACjD,OAAO,CAACkD,IAAI,CAAC,CAAC;cACtE;YACF;UACF,CAAC;QACH;QACA,SAASC,cAAcA,CAACC,KAAmB;UACzCxD,QAAQ,CAACmD,UAAU,CACjBX,QAAQ,CAACY,QAAQ,EACjB,IAAItD,WAAW,CAAC;YAAE2D,MAAM,EAAE,QAAQ;YAAEC,KAAK,EAAEF,KAAK,CAACX;UAAI,CAAE,CAAC,CACzD;QACH;QACA,SAASc,OAAOA,CAACH,KAAU;UACzBxD,QAAQ,CAACmD,UAAU,CACjBX,QAAQ,CAACY,QAAQ,EACjB,IAAItD,WAAW,CAAC;YAAE2D,MAAM,EAAE,SAAS;YAAEC,KAAK,EAAEF,KAAK,CAACX;UAAI,CAAE,CAAC,CAC1D;QACH;QACA,SAASe,UAAUA,CAACd,IAAiB;UACnC,OAAOtC,KAAK,CAACqD,IAAI,CAACvB,KAAK,EAAEpC,YAAY,CAAC4D,UAAU,CAAC,CAAC3B,IAAI,CACpDlC,MAAM,CAAC8D,OAAO,CAAEzB,KAAK,IAAI;YACvB,MAAMZ,MAAM,GAAGH,aAAa,EAAE;YAC9BT,KAAK,CAACkD,GAAG,CAACtC,MAAM,EAAE,CAACoB,IAAI,EAAER,KAAK,CAAC,CAAC;YAChC,MAAM2B,KAAK,GAAGrB,SAAS,CAAClB,MAAM,CAAC;YAC/BoB,IAAI,CAACoB,gBAAgB,CAAC,SAAS,EAAED,KAAK,CAAC;YACvCnB,IAAI,CAACoB,gBAAgB,CAAC,cAAc,EAAEX,cAAc,CAAC;YACrD,IAAI,OAAO,IAAIT,IAAI,EAAE;cACnBA,IAAI,CAACzB,KAAK,EAAE;YACd;YACAyB,IAAI,CAAChB,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YACrB,OAAOtB,KAAK,CAAC2D,YAAY,CACvB7B,KAAK,EACLrC,MAAM,CAACqB,IAAI,CAAC,MAAK;cACfwB,IAAI,CAACsB,mBAAmB,CAAC,SAAS,EAAEH,KAAK,CAAC;cAC1CnB,IAAI,CAACsB,mBAAmB,CAAC,cAAc,EAAET,OAAO,CAAC;YACnD,CAAC,CAAC,CACH;UACH,CAAC,CAAC,EACFhB,OAAO,CACR;QACH;QACA5B,IAAI,CAACmD,gBAAgB,CAAC,OAAO,EAAEP,OAAO,CAAC;QACvC,IAAIU,aAAkC;QACtC,IAAI,WAAW,IAAItD,IAAI,EAAE;UACvBsD,aAAa,GAAGtD,IAAI,CAACC,SAAS;UAC9BD,IAAI,CAACC,SAAS,GAAG,UAASJ,KAAmB;YAC3C,MAAMkC,IAAI,GAAIlC,KAAsB,CAACE,KAAK,CAAC,CAAC,CAAC;YAC7C8C,UAAU,CAACd,IAAI,CAAC;UAClB,CAAC;UACD,KAAK,MAAMA,IAAI,IAAIrC,WAAW,EAAE;YAC9BmD,UAAU,CAACd,IAAI,CAAC;UAClB;UACArC,WAAW,CAAC6D,KAAK,EAAE;QACrB,CAAC,MAAM;UACLV,UAAU,CAAC7C,IAAW,CAAC;QACzB;QACA,OAAOP,KAAK,CAAC2D,YAAY,CACvB7B,KAAK,EACLrC,MAAM,CAACqB,IAAI,CAAC,MAAK;UACfP,IAAI,CAACqD,mBAAmB,CAAC,OAAO,EAAET,OAAO,CAAC;UAC1C,IAAI,WAAW,IAAI5C,IAAI,EAAE;YACvBA,IAAI,CAACC,SAAS,GAAGqD,aAAa;UAChC;UACAtD,IAAI,CAACgC,KAAK,EAAE;QACd,CAAC,CAAC,CACH;MACH,CAAC,CAAC,EACF9C,MAAM,CAAC8D,OAAO,CAAC,CAAC;QAAEvB,QAAQ;QAAEF;MAAK,CAAE,KACjCJ,OAAO,CAAC7B,QAAQ,CAACkE,IAAI,CAAC/B,QAAQ,CAA0C,CAAC,CAACL,IAAI,CAC5ElC,MAAM,CAACuE,QAAQ,CAAChE,KAAK,CAACuC,KAAK,CAACT,KAAK,EAAEnC,IAAI,CAAC6C,IAAI,CAAC,CAAC,CAC/C,CACF,CACF,CACF;MAEH,OAAO;QAAEjB,GAAG;QAAEN;MAAI,CAAE;IACtB,CAAC,CAAC;EACJ;CACD,CAAC;AAEJ;AACA,OAAO,MAAMgD,gBAAgB,GAAI3B,IAA0B,IAAKvC,KAAK,CAACmE,OAAO,CAAC3E,MAAM,CAACmB,cAAc,EAAED,IAAI,CAAC6B,IAAI,CAAC,CAAC;AAEhH;AACA,OAAO,MAAM6B,KAAK,gBAAGpE,KAAK,CAACe,IAAI,CAACvB,MAAM,CAACmB,cAAc,EAAE,MAAMD,IAAI,CAACF,IAAI,CAAC,CAAC","ignoreList":[]}
1
+ {"version":3,"file":"workerRunner.js","names":["WorkerError","Runner","Context","Deferred","Effect","ExecStrategy","Exit","FiberId","FiberSet","globalValue","Layer","Runtime","Scope","cachedPorts","Set","globalHandleConnect","event","add","ports","self","onconnect","make","PlatformRunner","of","PlatformRunnerTypeId","start","sync","currentPortId","Map","send","portId","message","transfer","get","postMessage","run","handler","uninterruptibleMask","restore","gen","scope","runtime","pipe","updateContext","omit","fiberSet","runFork","onMessage","data","unsafeAdd","port","close","void","delete","size","unsafeDone","deferred","interrupt","none","onMessageError","error","reason","cause","onError","handlePort","fiber","fork","sequential","flatMap","set","onMsg","addEventListener","addFinalizer","removeEventListener","prevOnConnect","clear","join","scoped","layerMessagePort","succeed","layer"],"sources":["../../../src/internal/workerRunner.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect/platform-browser",
3
- "version": "0.48.16",
3
+ "version": "0.48.18",
4
4
  "description": "Platform specific implementations for the browser",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -13,8 +13,8 @@
13
13
  "multipasta": "^0.2.5"
14
14
  },
15
15
  "peerDependencies": {
16
- "@effect/platform": "^0.69.16",
17
- "effect": "^3.10.10"
16
+ "@effect/platform": "^0.69.18",
17
+ "effect": "^3.10.12"
18
18
  },
19
19
  "publishConfig": {
20
20
  "provenance": true
@@ -1,5 +1,6 @@
1
1
  import { WorkerError } from "@effect/platform/WorkerError"
2
2
  import * as Runner from "@effect/platform/WorkerRunner"
3
+ import * as Context from "effect/Context"
3
4
  import * as Deferred from "effect/Deferred"
4
5
  import * as Effect from "effect/Effect"
5
6
  import * as ExecStrategy from "effect/ExecutionStrategy"
@@ -8,6 +9,7 @@ import * as FiberId from "effect/FiberId"
8
9
  import * as FiberSet from "effect/FiberSet"
9
10
  import { globalValue } from "effect/GlobalValue"
10
11
  import * as Layer from "effect/Layer"
12
+ import * as Runtime from "effect/Runtime"
11
13
  import * as Scope from "effect/Scope"
12
14
 
13
15
  const cachedPorts = globalValue("@effect/platform-browser/Worker/cachedPorts", () => new Set<MessagePort>())
@@ -36,95 +38,99 @@ export const make = (self: MessagePort | Window) =>
36
38
 
37
39
  const run = <A, E, R>(handler: (portId: number, message: I) => Effect.Effect<A, E, R>) =>
38
40
  Effect.uninterruptibleMask((restore) =>
39
- Scope.make().pipe(
40
- Effect.bindTo("scope"),
41
- Effect.bind("fiberSet", ({ scope }) => FiberSet.make<any, WorkerError | E>().pipe(Scope.extend(scope))),
42
- Effect.bind("runFork", ({ fiberSet }) => FiberSet.runtime(fiberSet)<R>()),
43
- Effect.tap(({ fiberSet, runFork, scope }) => {
44
- function onMessage(portId: number) {
45
- return function(event: MessageEvent) {
46
- const message = (event as MessageEvent).data as Runner.BackingRunner.Message<I>
47
- if (message[0] === 0) {
48
- runFork(restore(handler(portId, message[1])))
49
- } else {
50
- const port = ports.get(portId)
51
- if (port) {
52
- Effect.runFork(Scope.close(port[1], Exit.void))
53
- }
54
- ports.delete(portId)
55
- if (ports.size === 0) {
56
- Deferred.unsafeDone(fiberSet.deferred, Exit.interrupt(FiberId.none))
57
- }
41
+ Effect.gen(function*() {
42
+ const scope = yield* Effect.scope
43
+ const runtime = (yield* Effect.runtime<R | Scope.Scope>()).pipe(
44
+ Runtime.updateContext(Context.omit(Scope.Scope))
45
+ ) as Runtime.Runtime<R>
46
+ const fiberSet = yield* FiberSet.make<any, WorkerError | E>()
47
+ const runFork = Runtime.runFork(runtime)
48
+
49
+ function onMessage(portId: number) {
50
+ return function(event: MessageEvent) {
51
+ const message = (event as MessageEvent).data as Runner.BackingRunner.Message<I>
52
+ if (message[0] === 0) {
53
+ FiberSet.unsafeAdd(fiberSet, runFork(restore(handler(portId, message[1]))))
54
+ } else {
55
+ const port = ports.get(portId)
56
+ if (port) {
57
+ Effect.runFork(Scope.close(port[1], Exit.void))
58
+ }
59
+ ports.delete(portId)
60
+ if (ports.size === 0) {
61
+ Deferred.unsafeDone(fiberSet.deferred, Exit.interrupt(FiberId.none))
58
62
  }
59
63
  }
60
64
  }
61
- function onMessageError(error: MessageEvent) {
62
- Deferred.unsafeDone(
63
- fiberSet.deferred,
64
- new WorkerError({ reason: "decode", cause: error.data })
65
- )
66
- }
67
- function onError(error: any) {
68
- Deferred.unsafeDone(
69
- fiberSet.deferred,
70
- new WorkerError({ reason: "unknown", cause: error.data })
71
- )
72
- }
73
- function handlePort(port: MessagePort) {
74
- return Scope.fork(scope, ExecStrategy.sequential).pipe(
75
- Effect.flatMap((scope) => {
76
- const portId = currentPortId++
77
- ports.set(portId, [port, scope])
78
- const onMsg = onMessage(portId)
79
- port.addEventListener("message", onMsg)
80
- port.addEventListener("messageerror", onMessageError)
81
- if ("start" in port) {
82
- port.start()
83
- }
84
- port.postMessage([0])
85
- return Scope.addFinalizer(
86
- scope,
87
- Effect.sync(() => {
88
- port.removeEventListener("message", onMsg)
89
- port.removeEventListener("messageerror", onError)
90
- })
91
- )
92
- }),
93
- runFork
94
- )
65
+ }
66
+ function onMessageError(error: MessageEvent) {
67
+ Deferred.unsafeDone(
68
+ fiberSet.deferred,
69
+ new WorkerError({ reason: "decode", cause: error.data })
70
+ )
71
+ }
72
+ function onError(error: any) {
73
+ Deferred.unsafeDone(
74
+ fiberSet.deferred,
75
+ new WorkerError({ reason: "unknown", cause: error.data })
76
+ )
77
+ }
78
+ function handlePort(port: MessagePort) {
79
+ const fiber = Scope.fork(scope, ExecStrategy.sequential).pipe(
80
+ Effect.flatMap((scope) => {
81
+ const portId = currentPortId++
82
+ ports.set(portId, [port, scope])
83
+ const onMsg = onMessage(portId)
84
+ port.addEventListener("message", onMsg)
85
+ port.addEventListener("messageerror", onMessageError)
86
+ if ("start" in port) {
87
+ port.start()
88
+ }
89
+ port.postMessage([0])
90
+ return Scope.addFinalizer(
91
+ scope,
92
+ Effect.sync(() => {
93
+ port.removeEventListener("message", onMsg)
94
+ port.removeEventListener("messageerror", onError)
95
+ port.close()
96
+ })
97
+ )
98
+ }),
99
+ runFork
100
+ )
101
+ FiberSet.unsafeAdd(fiberSet, fiber)
102
+ }
103
+ self.addEventListener("error", onError)
104
+ let prevOnConnect: unknown | undefined
105
+ if ("onconnect" in self) {
106
+ prevOnConnect = self.onconnect
107
+ self.onconnect = function(event: MessageEvent) {
108
+ const port = (event as MessageEvent).ports[0]
109
+ handlePort(port)
95
110
  }
96
- self.addEventListener("error", onError)
97
- let prevOnConnect: unknown | undefined
98
- if ("onconnect" in self) {
99
- prevOnConnect = self.onconnect
100
- self.onconnect = function(event: MessageEvent) {
101
- const port = (event as MessageEvent).ports[0]
102
- handlePort(port)
103
- }
104
- for (const port of cachedPorts) {
105
- handlePort(port)
106
- }
107
- cachedPorts.clear()
108
- } else {
109
- handlePort(self as any)
111
+ for (const port of cachedPorts) {
112
+ handlePort(port)
110
113
  }
111
- return Scope.addFinalizer(
114
+ cachedPorts.clear()
115
+ yield* Scope.addFinalizer(
112
116
  scope,
113
- Effect.sync(() => {
114
- self.removeEventListener("error", onError)
115
- if ("onconnect" in self) {
116
- self.onconnect = prevOnConnect
117
- }
118
- self.close()
119
- })
120
- )
121
- }),
122
- Effect.flatMap(({ fiberSet, scope }) =>
123
- restore(FiberSet.join(fiberSet) as Effect.Effect<never, E | WorkerError>).pipe(
124
- Effect.ensuring(Scope.close(scope, Exit.void))
117
+ Effect.sync(() => self.close())
125
118
  )
119
+ } else {
120
+ handlePort(self as any)
121
+ }
122
+ yield* Scope.addFinalizer(
123
+ scope,
124
+ Effect.sync(() => {
125
+ self.removeEventListener("error", onError)
126
+ if ("onconnect" in self) {
127
+ self.onconnect = prevOnConnect
128
+ }
129
+ })
126
130
  )
127
- )
131
+
132
+ return (yield* restore(FiberSet.join(fiberSet))) as never
133
+ }).pipe(Effect.scoped)
128
134
  )
129
135
 
130
136
  return { run, send }