@kirill.konshin/worker 0.0.2 → 0.0.3
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.
- package/dist/index.d.ts +3 -3
- package/dist/index.js +3 -13
- package/dist/worker.js +238 -220
- package/dist/worker.js.map +1 -1
- package/dist/workerUtils.js +22 -26
- package/dist/workerUtils.js.map +1 -1
- package/dist/wrpc.d.ts +1 -0
- package/dist/wrpc.d.ts.map +1 -1
- package/dist/wrpc.fixture.d.ts +26 -22
- package/dist/wrpc.fixture.d.ts.map +1 -1
- package/dist/wrpc.js +238 -235
- package/dist/wrpc.js.map +1 -1
- package/package.json +14 -4
- package/.ctirc +0 -20
- package/.turbo/turbo-build.log +0 -22
- package/.turbo/turbo-test.log +0 -97
- package/CHANGELOG.md +0 -7
- package/dist/index.js.map +0 -1
- package/src/index.ts +0 -3
- package/src/worker.test.ts +0 -197
- package/src/worker.ts +0 -347
- package/src/workerUtils.ts +0 -32
- package/src/wrpc.fixture.ts +0 -106
- package/src/wrpc.test.ts +0 -225
- package/src/wrpc.ts +0 -377
- package/tsconfig.json +0 -10
- package/turbo.json +0 -10
- package/vite.config.ts +0 -2
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export * from './worker';
|
|
2
|
-
export * from './workerUtils';
|
|
3
|
-
export * from './wrpc';
|
|
1
|
+
export * from './worker.js';
|
|
2
|
+
export * from './workerUtils.js';
|
|
3
|
+
export * from './wrpc.js';
|
|
4
4
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.js
CHANGED
|
@@ -1,14 +1,4 @@
|
|
|
1
|
-
import { RespondersBase, WorkerDialog } from "./worker.js";
|
|
2
1
|
import { getTransferrable, isTransferable } from "./workerUtils.js";
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
RespondersBase,
|
|
7
|
-
WorkerDialog,
|
|
8
|
-
deriveController,
|
|
9
|
-
getTransferrable,
|
|
10
|
-
isTransferable,
|
|
11
|
-
rejectOnSignal,
|
|
12
|
-
wrpc
|
|
13
|
-
};
|
|
14
|
-
//# sourceMappingURL=index.js.map
|
|
2
|
+
import { RespondersBase, WorkerDialog } from "./worker.js";
|
|
3
|
+
import { LogLevel, RESERVED_NAMES, deriveController, rejectOnSignal, wrpc } from "./wrpc.js";
|
|
4
|
+
export { LogLevel, RESERVED_NAMES, RespondersBase, WorkerDialog, deriveController, getTransferrable, isTransferable, rejectOnSignal, wrpc };
|
package/dist/worker.js
CHANGED
|
@@ -1,226 +1,244 @@
|
|
|
1
1
|
import { getTransferrable } from "./workerUtils.js";
|
|
2
|
-
|
|
3
|
-
|
|
2
|
+
//#region src/worker.ts
|
|
3
|
+
var ALL = "*";
|
|
4
|
+
var RESPONDER = Symbol("responder");
|
|
4
5
|
function checkClosed(obj, label = "external") {
|
|
5
|
-
|
|
6
|
+
if (obj?.closed) throw new Error(`Context ${obj.id} is closed (${label})`, { cause: obj });
|
|
6
7
|
}
|
|
7
8
|
function checkMessage(obj, message) {
|
|
8
|
-
|
|
9
|
+
if (!message) throw new Error("New context must have message", { cause: obj });
|
|
9
10
|
}
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
}
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
}
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
11
|
+
var WorkerDialog = class {
|
|
12
|
+
worker;
|
|
13
|
+
responders;
|
|
14
|
+
name;
|
|
15
|
+
debug;
|
|
16
|
+
contexts = /* @__PURE__ */ new Set();
|
|
17
|
+
closed = false;
|
|
18
|
+
currentId = 0;
|
|
19
|
+
constructor(worker, responders, name, debug = 0) {
|
|
20
|
+
this.worker = worker;
|
|
21
|
+
this.responders = responders;
|
|
22
|
+
this.name = name;
|
|
23
|
+
this.debug = debug;
|
|
24
|
+
if (!this.worker) return;
|
|
25
|
+
for (const message in this.responders) {
|
|
26
|
+
if (!this.responders?.[message]?.[RESPONDER]) continue;
|
|
27
|
+
const rootContext = new ResponseContext(this, message, ALL);
|
|
28
|
+
rootContext.listen(async (data, context, event) => {
|
|
29
|
+
const responseContext = context.withMessage(message, event.data.ctx.id);
|
|
30
|
+
/* v8 ignore start */
|
|
31
|
+
if (this.debug) console.log("Root Listener", rootContext.info, {
|
|
32
|
+
rootContext: context,
|
|
33
|
+
data,
|
|
34
|
+
responseContext,
|
|
35
|
+
event,
|
|
36
|
+
responder: this.responders[message]
|
|
37
|
+
});
|
|
38
|
+
/* v8 ignore stop */
|
|
39
|
+
try {
|
|
40
|
+
responseContext.send(await this.responders[message](data, responseContext), true);
|
|
41
|
+
responseContext.close("root.listener");
|
|
42
|
+
} catch (e) {
|
|
43
|
+
/* v8 ignore next */
|
|
44
|
+
if (this.debug) console.error(`Error in responder ${responseContext.info}`, { e });
|
|
45
|
+
responseContext.send(e, true);
|
|
46
|
+
}
|
|
47
|
+
}, true);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
getID() {
|
|
51
|
+
return (++this.currentId).toString();
|
|
52
|
+
}
|
|
53
|
+
close() {
|
|
54
|
+
for (const context of this.contexts) context.close("root");
|
|
55
|
+
this.contexts.clear();
|
|
56
|
+
}
|
|
57
|
+
withMessage(message) {
|
|
58
|
+
return new RequestContext(this, message, this.getID());
|
|
59
|
+
}
|
|
60
|
+
};
|
|
61
|
+
var RespondersBase = class {
|
|
62
|
+
create(message, responder) {
|
|
63
|
+
responder[RESPONDER] = true;
|
|
64
|
+
return responder;
|
|
65
|
+
}
|
|
66
|
+
};
|
|
67
|
+
var Context = class {
|
|
68
|
+
dialog;
|
|
69
|
+
message;
|
|
70
|
+
id;
|
|
71
|
+
parent;
|
|
72
|
+
unsub = /* @__PURE__ */ new Set();
|
|
73
|
+
closed = false;
|
|
74
|
+
constructor(dialog, message, id, parent = null) {
|
|
75
|
+
this.dialog = dialog;
|
|
76
|
+
this.message = message;
|
|
77
|
+
this.id = id;
|
|
78
|
+
this.parent = parent;
|
|
79
|
+
checkClosed(dialog, "newContext");
|
|
80
|
+
checkClosed(parent, "newContext");
|
|
81
|
+
checkMessage(this, message);
|
|
82
|
+
this.id = id ?? parent?.id;
|
|
83
|
+
if (!this.id) throw new Error("ID is required", { cause: this });
|
|
84
|
+
this.dialog.contexts.add(this);
|
|
85
|
+
}
|
|
86
|
+
close(reason = "external") {
|
|
87
|
+
/* v8 ignore next */
|
|
88
|
+
if (this.dialog.debug >= 2) console.log("Closing", this.info, reason, this);
|
|
89
|
+
this.dialog.contexts.delete(this);
|
|
90
|
+
for (const unsub of this.unsub) unsub();
|
|
91
|
+
this.unsub.clear();
|
|
92
|
+
this.dialog.contexts.forEach((context) => {
|
|
93
|
+
if (context.parent?.id === this.id) context.close("parent");
|
|
94
|
+
});
|
|
95
|
+
this.closed = true;
|
|
96
|
+
}
|
|
97
|
+
get info() {
|
|
98
|
+
return `${this.dialog.name}:${this.parent?.id ?? ALL}/${this.id}:${this.message.toString()}[${this.closed ? "closed" : "open"},${this.type}]`;
|
|
99
|
+
}
|
|
100
|
+
get debugInfo() {
|
|
101
|
+
return {
|
|
102
|
+
id: this.id,
|
|
103
|
+
parentId: this.parent?.id,
|
|
104
|
+
message: this.message,
|
|
105
|
+
closed: this.closed,
|
|
106
|
+
type: this.type,
|
|
107
|
+
listeners: this.unsub.size
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
postMessage(data, done = false) {
|
|
111
|
+
checkClosed(this, "postMessage");
|
|
112
|
+
const transfer = getTransferrable(data);
|
|
113
|
+
const ctx = {
|
|
114
|
+
done,
|
|
115
|
+
id: this.id,
|
|
116
|
+
parentId: this.parent?.id,
|
|
117
|
+
message: this.message
|
|
118
|
+
};
|
|
119
|
+
/* v8 ignore next */
|
|
120
|
+
if (this.dialog.debug >= 3) console.log("postMessage", this.info, {
|
|
121
|
+
ctx,
|
|
122
|
+
data,
|
|
123
|
+
transfer
|
|
124
|
+
}, this);
|
|
125
|
+
this.dialog.worker.postMessage({
|
|
126
|
+
data,
|
|
127
|
+
ctx
|
|
128
|
+
}, transfer);
|
|
129
|
+
return data;
|
|
130
|
+
}
|
|
131
|
+
send(data, done = false) {
|
|
132
|
+
return this.postMessage(data, done);
|
|
133
|
+
}
|
|
134
|
+
/**
|
|
135
|
+
* Does not automatically close, assumes consumer will close
|
|
136
|
+
*
|
|
137
|
+
* ```ts
|
|
138
|
+
* dialog.request('x').fetch((c) => {
|
|
139
|
+
* c.response('x').listen(() => { ... }); // listens to "x", will be closed by upper level fetch
|
|
140
|
+
* c.request('x').fetcH(y, (c) => { ... }); // closes
|
|
141
|
+
* }) // closes
|
|
142
|
+
*
|
|
143
|
+
* const un = dialog.context('x').listen((e) => { ... }); // listens to 'x'
|
|
144
|
+
* un(); // closes
|
|
145
|
+
*
|
|
146
|
+
* const un = dialog.context('x').listen((e) => { ... }); // listens to 'x'
|
|
147
|
+
* un(); // closes
|
|
148
|
+
* ```
|
|
149
|
+
*/
|
|
150
|
+
listen(callback, done = false) {
|
|
151
|
+
checkClosed(this, "listen");
|
|
152
|
+
const controller = new AbortController();
|
|
153
|
+
this.dialog.worker.addEventListener("message", async (event) => {
|
|
154
|
+
try {
|
|
155
|
+
const { data: { ctx, data } } = event;
|
|
156
|
+
if (!ctx || this.id !== ALL && this.id !== ctx.id || this.message !== ctx.message || done && !ctx.done) return;
|
|
157
|
+
/* v8 ignore next */
|
|
158
|
+
if (this.dialog.debug) console.log("Listener event", this.info, event, this);
|
|
159
|
+
await callback(data, this, event);
|
|
160
|
+
} catch (e) {
|
|
161
|
+
/* v8 ignore next */
|
|
162
|
+
if (this.dialog.debug) console.error(`Error in listener ${this.info}`, this, {
|
|
163
|
+
event,
|
|
164
|
+
e
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
}, { signal: controller.signal });
|
|
168
|
+
const unsub = () => {
|
|
169
|
+
/* v8 ignore next */
|
|
170
|
+
if (this.dialog.debug >= 2) console.log("Stop listening", this.info, this);
|
|
171
|
+
controller.abort();
|
|
172
|
+
this.unsub.delete(unsub);
|
|
173
|
+
};
|
|
174
|
+
this.unsub.add(unsub);
|
|
175
|
+
return unsub;
|
|
176
|
+
}
|
|
177
|
+
};
|
|
178
|
+
var RequestContext = class RequestContext extends Context {
|
|
179
|
+
type = "request";
|
|
180
|
+
withMessage(message, id) {
|
|
181
|
+
return new RequestContext(this.dialog, message, id, this);
|
|
182
|
+
}
|
|
183
|
+
send(data, done = false) {
|
|
184
|
+
return super.send(data, done);
|
|
185
|
+
}
|
|
186
|
+
listen(callback, done = false) {
|
|
187
|
+
return super.listen(callback, done);
|
|
188
|
+
}
|
|
189
|
+
/**
|
|
190
|
+
* Returns response
|
|
191
|
+
* If you need to work with ctx, use callback
|
|
192
|
+
* Closed automatically on response
|
|
193
|
+
*
|
|
194
|
+
* dialog.fetch('x', (c) => {
|
|
195
|
+
* c.listen(() => { ... }); // will be closed by upper level fetch
|
|
196
|
+
* c.fetcH(y, (c) => { ... }); // closes c
|
|
197
|
+
* c.context().fetcH(y, (c) => { ... }); // closes sub, not closes c, will be closed by upper level fetch
|
|
198
|
+
* })
|
|
199
|
+
*/
|
|
200
|
+
async fetch(data, callback) {
|
|
201
|
+
checkClosed(this, "fetch");
|
|
202
|
+
const res = await Promise.all([
|
|
203
|
+
callback?.(this),
|
|
204
|
+
this.expect(),
|
|
205
|
+
this.send(data, true)
|
|
206
|
+
]);
|
|
207
|
+
/* v8 ignore next */
|
|
208
|
+
if (this.dialog.debug >= 2) console.log("Fetch", this.info, this);
|
|
209
|
+
this.close("fetch");
|
|
210
|
+
return res[1];
|
|
211
|
+
}
|
|
212
|
+
async expect() {
|
|
213
|
+
checkClosed(this, "expect");
|
|
214
|
+
return new Promise((resolve, reject) => {
|
|
215
|
+
const responseListener = this.listen(async (data) => {
|
|
216
|
+
try {
|
|
217
|
+
if (data instanceof Error) throw data;
|
|
218
|
+
responseListener();
|
|
219
|
+
/* v8 ignore next */
|
|
220
|
+
if (this.dialog.debug >= 3) console.log("Expect", this.info, data, this);
|
|
221
|
+
resolve(data);
|
|
222
|
+
} catch (e) {
|
|
223
|
+
reject(e);
|
|
224
|
+
}
|
|
225
|
+
}, true);
|
|
226
|
+
});
|
|
227
|
+
}
|
|
228
|
+
};
|
|
229
|
+
var ResponseContext = class ResponseContext extends Context {
|
|
230
|
+
type = "response";
|
|
231
|
+
withMessage(message, id) {
|
|
232
|
+
return new ResponseContext(this.dialog, message, id, this);
|
|
233
|
+
}
|
|
234
|
+
listen(callback, done = false) {
|
|
235
|
+
return super.listen(callback, done);
|
|
236
|
+
}
|
|
237
|
+
send(data, done = false) {
|
|
238
|
+
return super.send(data, done);
|
|
239
|
+
}
|
|
225
240
|
};
|
|
226
|
-
//#
|
|
241
|
+
//#endregion
|
|
242
|
+
export { RespondersBase, WorkerDialog };
|
|
243
|
+
|
|
244
|
+
//# sourceMappingURL=worker.js.map
|
package/dist/worker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sources":["../src/worker.ts"],"sourcesContent":["import { getTransferrable } from './workerUtils';\n\n// Types\n\ntype WebWorker = Worker | (Window & typeof globalThis) | (WorkerGlobalScope & typeof globalThis);\n\ntype MethodReturn<R, M extends keyof R> = R[M] extends (...args: any[]) => any\n ? Partial<Awaited<ReturnType<R[M]>>>\n : never;\n\ntype MethodArg<R, M extends keyof R> = R[M] extends (arg: infer A, ...args: any[]) => any ? Partial<A> : never;\n\nexport type Ctx<R, K extends keyof R> = {\n id: string;\n parentId?: string;\n message: K;\n done: boolean;\n};\n\ntype Data<R, M extends keyof R> = MethodReturn<R, M> | MethodArg<R, M> | Error;\n\ntype Event<R, M extends keyof R> = MessageEvent<{ data: Data<R, M>; ctx: Ctx<R, M> }>;\n\ntype Listener<R, M extends keyof R, D extends Data<R, M> = Data<R, M>, S extends Context<R, M> = Context<R, M>> = (\n data: D,\n self: S,\n event: Event<R, M>,\n) => void | Promise<void>;\n\n// Constants\n\nconst ALL = '*';\n\nconst RESPONDER = Symbol('responder');\n\nfunction checkClosed(obj: any, label: string = 'external') {\n if (obj?.closed) throw new Error(`Context ${obj.id} is closed (${label})`, { cause: obj });\n}\n\nfunction checkMessage(obj: any, message: any) {\n if (!message) throw new Error('New context must have message', { cause: obj });\n}\n\n// Classes\n\nexport class WorkerDialog<R extends RespondersBase<any>> {\n readonly contexts: Set<Context<R, keyof R>> = new Set();\n protected closed = false;\n protected currentId = 0; // IDs are intentionally not global\n\n constructor(\n public worker: WebWorker,\n public responders: R,\n public name: string,\n public debug: number = 0, // 0 - none, 1 - general messages, 2 - sub/unsub, 3 - transport TODO Object?\n ) {\n if (!this.worker) return; // Next.js SSR\n\n for (const message in this.responders) {\n if (!this.responders?.[message]?.[RESPONDER]) continue;\n\n // root context with id=all\n const rootContext = new ResponseContext<R, typeof message>(this, message, ALL);\n\n //TODO: unsub(); ? Probably not needed, root must be always listening until closed by WorkerDialog\n rootContext.listen(async (data, context, event) => {\n // create sub context with ID\n const responseContext = context.withMessage(message, event.data.ctx.id);\n\n /* v8 ignore start */\n if (this.debug)\n console.log('Root Listener', rootContext.info, {\n rootContext: context,\n data,\n responseContext,\n event,\n responder: this.responders[message],\n });\n /* v8 ignore stop */\n\n try {\n responseContext.send(await (this.responders[message] as any)(data, responseContext), true);\n responseContext.close('root.listener');\n } catch (e) {\n /* v8 ignore next */\n if (this.debug) console.error(`Error in responder ${responseContext.info}`, { e });\n responseContext.send(e, true);\n }\n }, true);\n }\n }\n\n getID(): string {\n return (++this.currentId).toString();\n }\n\n close(): void {\n for (const context of this.contexts) context.close('root');\n this.contexts.clear();\n }\n\n withMessage<M extends keyof R>(message: M): RequestContext<R, M> {\n return new RequestContext<R, M>(this, message, this.getID()); // always new context\n }\n}\n\nexport class RespondersBase<R> {\n create<M extends keyof R, F extends (input: any, context: ResponseContext<R, M>) => any>(\n message: M,\n responder: F,\n ): F {\n responder[RESPONDER] = true;\n return responder as any;\n }\n}\n\n// can only be used to create actual contexts, carries the context data\nabstract class Context<R, M extends keyof R> {\n protected readonly unsub: Set<() => void> = new Set();\n protected closed = false;\n\n constructor(\n protected readonly dialog: WorkerDialog<any>,\n public message: M,\n public id: string | undefined,\n public parent: Context<R, keyof R> | undefined | null = null,\n ) {\n checkClosed(dialog, 'newContext');\n checkClosed(parent, 'newContext');\n checkMessage(this, message);\n this.id = id ?? parent?.id;\n if (!this.id) throw new Error('ID is required', { cause: this });\n this.dialog.contexts.add(this);\n }\n\n abstract withMessage<M2 extends keyof R>(message: M2, id?: string): Context<R, M2>;\n\n close(reason: string = 'external'): void {\n /* v8 ignore next */\n if (this.dialog.debug >= 2) console.log('Closing', this.info, reason, this);\n\n this.dialog.contexts.delete(this);\n\n // Unsubscribe from all listeners\n for (const unsub of this.unsub) unsub();\n this.unsub.clear();\n\n // Remove all child contexts\n this.dialog.contexts.forEach((context) => {\n if (context.parent?.id === this.id) context.close('parent');\n });\n\n this.closed = true;\n }\n\n get info() {\n return `${this.dialog.name}:${this.parent?.id ?? ALL}/${this.id}:${this.message.toString()}[${this.closed ? 'closed' : 'open'},${this.type}]`;\n }\n\n get debugInfo(): {\n id?: string;\n parentId?: string;\n message: string | number | symbol;\n closed: boolean;\n type: string;\n listeners: number;\n } {\n return {\n id: this.id,\n parentId: this.parent?.id,\n message: this.message,\n closed: this.closed,\n type: this.type,\n listeners: this.unsub.size,\n };\n }\n\n abstract type: 'request' | 'response' | string;\n\n protected postMessage(data?: Data<R, M>, done = false): Data<R, M> | undefined {\n checkClosed(this, 'postMessage');\n\n const transfer = getTransferrable(data);\n\n const ctx = {\n done,\n id: this.id,\n parentId: this.parent?.id,\n message: this.message,\n };\n\n /* v8 ignore next */\n if (this.dialog.debug >= 3) console.log('postMessage', this.info, { ctx, data, transfer }, this);\n\n this.dialog.worker.postMessage({ data, ctx }, transfer);\n\n return data;\n }\n\n send(data?: Data<R, M>, done = false): Data<R, M> | undefined {\n return this.postMessage(data, done);\n }\n\n /**\n * Does not automatically close, assumes consumer will close\n *\n * ```ts\n * dialog.request('x').fetch((c) => {\n * c.response('x').listen(() => { ... }); // listens to \"x\", will be closed by upper level fetch\n * c.request('x').fetcH(y, (c) => { ... }); // closes\n * }) // closes\n *\n * const un = dialog.context('x').listen((e) => { ... }); // listens to 'x'\n * un(); // closes\n *\n * const un = dialog.context('x').listen((e) => { ... }); // listens to 'x'\n * un(); // closes\n * ```\n */\n listen(callback: Listener<R, M>, done = false): () => void {\n checkClosed(this, 'listen');\n\n const controller = new AbortController();\n\n this.dialog.worker.addEventListener(\n 'message',\n async (event: Event<R, M>) => {\n try {\n const {\n data: { ctx, data },\n } = event;\n\n if (\n !ctx ||\n (this.id !== ALL && this.id !== ctx.id) ||\n this.message !== ctx.message ||\n (done && !ctx.done)\n )\n return; // unknown message from devtools etc., or different context\n\n /* v8 ignore next */\n if (this.dialog.debug) console.log('Listener event', this.info, event, this);\n\n await callback(data, this, event); // Requests can come here, but they're typed in responders\n } catch (e) {\n /* v8 ignore next */\n if (this.dialog.debug) console.error(`Error in listener ${this.info}`, this, { event, e });\n //TODO Respond with error?\n }\n },\n { signal: controller.signal },\n );\n\n const unsub = () => {\n /* v8 ignore next */\n if (this.dialog.debug >= 2) console.log('Stop listening', this.info, this);\n controller.abort();\n this.unsub.delete(unsub);\n };\n\n this.unsub.add(unsub);\n\n return unsub;\n }\n}\n\nclass RequestContext<R, M extends keyof R> extends Context<R, M> {\n type = 'request';\n\n withMessage<M2 extends keyof R>(message: M2, id?: string): RequestContext<R, M2> {\n return new RequestContext<R, M2>(this.dialog, message, id, this);\n }\n\n send(data?: MethodArg<R, M>, done = false): MethodArg<R, M> {\n return super.send(data, done) as any;\n }\n\n listen(callback: Listener<R, M, MethodReturn<R, M>, RequestContext<R, M>>, done = false): () => void {\n return super.listen(callback, done);\n }\n\n /**\n * Returns response\n * If you need to work with ctx, use callback\n * Closed automatically on response\n *\n * dialog.fetch('x', (c) => {\n * c.listen(() => { ... }); // will be closed by upper level fetch\n * c.fetcH(y, (c) => { ... }); // closes c\n * c.context().fetcH(y, (c) => { ... }); // closes sub, not closes c, will be closed by upper level fetch\n * })\n */\n async fetch(\n data?: MethodArg<R, M>,\n callback?: (context: RequestContext<R, M>) => void,\n ): Promise<MethodReturn<R, M>> {\n checkClosed(this, 'fetch');\n\n const res = await Promise.all([\n callback?.(this),\n this.expect(), // will be closed in expect -> listener -> unsub\n this.send(data, true),\n ]);\n\n /* v8 ignore next */\n if (this.dialog.debug >= 2) console.log('Fetch', this.info, this);\n\n this.close('fetch');\n\n return res[1];\n }\n\n protected async expect(): Promise<MethodReturn<R, M>> {\n checkClosed(this, 'expect');\n\n //FIXME Manual promise type\n return new Promise((resolve, reject) => {\n const responseListener = this.listen(async (data) => {\n try {\n if ((data as any) instanceof Error) throw data;\n responseListener();\n /* v8 ignore next */\n if (this.dialog.debug >= 3) console.log('Expect', this.info, data, this);\n resolve(data as any);\n } catch (e) {\n reject(e);\n }\n }, true);\n });\n }\n}\n\nclass ResponseContext<R, M extends keyof R> extends Context<R, M> {\n type = 'response';\n\n withMessage<M2 extends keyof R>(message: M2, id?: string): ResponseContext<R, M2> {\n return new ResponseContext<R, M2>(this.dialog, message, id, this);\n }\n\n listen(callback: Listener<R, M, MethodArg<R, M>, ResponseContext<R, M>>, done = false): () => void {\n return super.listen(callback, done);\n }\n\n send(data?: MethodReturn<R, M>, done = false): MethodReturn<R, M> {\n return super.send(data, done) as any;\n }\n}\n"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"worker.js","names":[],"sources":["../src/worker.ts"],"sourcesContent":["import { getTransferrable } from './workerUtils';\n\n// Types\n\ntype WebWorker = Worker | (Window & typeof globalThis) | (WorkerGlobalScope & typeof globalThis);\n\ntype MethodReturn<R, M extends keyof R> = R[M] extends (...args: any[]) => any\n ? Partial<Awaited<ReturnType<R[M]>>>\n : never;\n\ntype MethodArg<R, M extends keyof R> = R[M] extends (arg: infer A, ...args: any[]) => any ? Partial<A> : never;\n\nexport type Ctx<R, K extends keyof R> = {\n id: string;\n parentId?: string;\n message: K;\n done: boolean;\n};\n\ntype Data<R, M extends keyof R> = MethodReturn<R, M> | MethodArg<R, M> | Error;\n\ntype Event<R, M extends keyof R> = MessageEvent<{ data: Data<R, M>; ctx: Ctx<R, M> }>;\n\ntype Listener<R, M extends keyof R, D extends Data<R, M> = Data<R, M>, S extends Context<R, M> = Context<R, M>> = (\n data: D,\n self: S,\n event: Event<R, M>,\n) => void | Promise<void>;\n\n// Constants\n\nconst ALL = '*';\n\nconst RESPONDER = Symbol('responder');\n\nfunction checkClosed(obj: any, label: string = 'external') {\n if (obj?.closed) throw new Error(`Context ${obj.id} is closed (${label})`, { cause: obj });\n}\n\nfunction checkMessage(obj: any, message: any) {\n if (!message) throw new Error('New context must have message', { cause: obj });\n}\n\n// Classes\n\nexport class WorkerDialog<R extends RespondersBase<any>> {\n readonly contexts: Set<Context<R, keyof R>> = new Set();\n protected closed = false;\n protected currentId = 0; // IDs are intentionally not global\n\n constructor(\n public worker: WebWorker,\n public responders: R,\n public name: string,\n public debug: number = 0, // 0 - none, 1 - general messages, 2 - sub/unsub, 3 - transport TODO Object?\n ) {\n if (!this.worker) return; // Next.js SSR\n\n for (const message in this.responders) {\n if (!this.responders?.[message]?.[RESPONDER]) continue;\n\n // root context with id=all\n const rootContext = new ResponseContext<R, typeof message>(this, message, ALL);\n\n //TODO: unsub(); ? Probably not needed, root must be always listening until closed by WorkerDialog\n rootContext.listen(async (data, context, event) => {\n // create sub context with ID\n const responseContext = context.withMessage(message, event.data.ctx.id);\n\n /* v8 ignore start */\n if (this.debug)\n console.log('Root Listener', rootContext.info, {\n rootContext: context,\n data,\n responseContext,\n event,\n responder: this.responders[message],\n });\n /* v8 ignore stop */\n\n try {\n responseContext.send(await (this.responders[message] as any)(data, responseContext), true);\n responseContext.close('root.listener');\n } catch (e) {\n /* v8 ignore next */\n if (this.debug) console.error(`Error in responder ${responseContext.info}`, { e });\n responseContext.send(e, true);\n }\n }, true);\n }\n }\n\n getID(): string {\n return (++this.currentId).toString();\n }\n\n close(): void {\n for (const context of this.contexts) context.close('root');\n this.contexts.clear();\n }\n\n withMessage<M extends keyof R>(message: M): RequestContext<R, M> {\n return new RequestContext<R, M>(this, message, this.getID()); // always new context\n }\n}\n\nexport class RespondersBase<R> {\n create<M extends keyof R, F extends (input: any, context: ResponseContext<R, M>) => any>(\n message: M,\n responder: F,\n ): F {\n responder[RESPONDER] = true;\n return responder as any;\n }\n}\n\n// can only be used to create actual contexts, carries the context data\nabstract class Context<R, M extends keyof R> {\n protected readonly unsub: Set<() => void> = new Set();\n protected closed = false;\n\n constructor(\n protected readonly dialog: WorkerDialog<any>,\n public message: M,\n public id: string | undefined,\n public parent: Context<R, keyof R> | undefined | null = null,\n ) {\n checkClosed(dialog, 'newContext');\n checkClosed(parent, 'newContext');\n checkMessage(this, message);\n this.id = id ?? parent?.id;\n if (!this.id) throw new Error('ID is required', { cause: this });\n this.dialog.contexts.add(this);\n }\n\n abstract withMessage<M2 extends keyof R>(message: M2, id?: string): Context<R, M2>;\n\n close(reason: string = 'external'): void {\n /* v8 ignore next */\n if (this.dialog.debug >= 2) console.log('Closing', this.info, reason, this);\n\n this.dialog.contexts.delete(this);\n\n // Unsubscribe from all listeners\n for (const unsub of this.unsub) unsub();\n this.unsub.clear();\n\n // Remove all child contexts\n this.dialog.contexts.forEach((context) => {\n if (context.parent?.id === this.id) context.close('parent');\n });\n\n this.closed = true;\n }\n\n get info() {\n return `${this.dialog.name}:${this.parent?.id ?? ALL}/${this.id}:${this.message.toString()}[${this.closed ? 'closed' : 'open'},${this.type}]`;\n }\n\n get debugInfo(): {\n id?: string;\n parentId?: string;\n message: string | number | symbol;\n closed: boolean;\n type: string;\n listeners: number;\n } {\n return {\n id: this.id,\n parentId: this.parent?.id,\n message: this.message,\n closed: this.closed,\n type: this.type,\n listeners: this.unsub.size,\n };\n }\n\n abstract type: 'request' | 'response' | string;\n\n protected postMessage(data?: Data<R, M>, done = false): Data<R, M> | undefined {\n checkClosed(this, 'postMessage');\n\n const transfer = getTransferrable(data);\n\n const ctx = {\n done,\n id: this.id,\n parentId: this.parent?.id,\n message: this.message,\n };\n\n /* v8 ignore next */\n if (this.dialog.debug >= 3) console.log('postMessage', this.info, { ctx, data, transfer }, this);\n\n this.dialog.worker.postMessage({ data, ctx }, transfer);\n\n return data;\n }\n\n send(data?: Data<R, M>, done = false): Data<R, M> | undefined {\n return this.postMessage(data, done);\n }\n\n /**\n * Does not automatically close, assumes consumer will close\n *\n * ```ts\n * dialog.request('x').fetch((c) => {\n * c.response('x').listen(() => { ... }); // listens to \"x\", will be closed by upper level fetch\n * c.request('x').fetcH(y, (c) => { ... }); // closes\n * }) // closes\n *\n * const un = dialog.context('x').listen((e) => { ... }); // listens to 'x'\n * un(); // closes\n *\n * const un = dialog.context('x').listen((e) => { ... }); // listens to 'x'\n * un(); // closes\n * ```\n */\n listen(callback: Listener<R, M>, done = false): () => void {\n checkClosed(this, 'listen');\n\n const controller = new AbortController();\n\n this.dialog.worker.addEventListener(\n 'message',\n async (event: Event<R, M>) => {\n try {\n const {\n data: { ctx, data },\n } = event;\n\n if (\n !ctx ||\n (this.id !== ALL && this.id !== ctx.id) ||\n this.message !== ctx.message ||\n (done && !ctx.done)\n )\n return; // unknown message from devtools etc., or different context\n\n /* v8 ignore next */\n if (this.dialog.debug) console.log('Listener event', this.info, event, this);\n\n await callback(data, this, event); // Requests can come here, but they're typed in responders\n } catch (e) {\n /* v8 ignore next */\n if (this.dialog.debug) console.error(`Error in listener ${this.info}`, this, { event, e });\n //TODO Respond with error?\n }\n },\n { signal: controller.signal },\n );\n\n const unsub = () => {\n /* v8 ignore next */\n if (this.dialog.debug >= 2) console.log('Stop listening', this.info, this);\n controller.abort();\n this.unsub.delete(unsub);\n };\n\n this.unsub.add(unsub);\n\n return unsub;\n }\n}\n\nclass RequestContext<R, M extends keyof R> extends Context<R, M> {\n type = 'request';\n\n withMessage<M2 extends keyof R>(message: M2, id?: string): RequestContext<R, M2> {\n return new RequestContext<R, M2>(this.dialog, message, id, this);\n }\n\n send(data?: MethodArg<R, M>, done = false): MethodArg<R, M> {\n return super.send(data, done) as any;\n }\n\n listen(callback: Listener<R, M, MethodReturn<R, M>, RequestContext<R, M>>, done = false): () => void {\n return super.listen(callback, done);\n }\n\n /**\n * Returns response\n * If you need to work with ctx, use callback\n * Closed automatically on response\n *\n * dialog.fetch('x', (c) => {\n * c.listen(() => { ... }); // will be closed by upper level fetch\n * c.fetcH(y, (c) => { ... }); // closes c\n * c.context().fetcH(y, (c) => { ... }); // closes sub, not closes c, will be closed by upper level fetch\n * })\n */\n async fetch(\n data?: MethodArg<R, M>,\n callback?: (context: RequestContext<R, M>) => void,\n ): Promise<MethodReturn<R, M>> {\n checkClosed(this, 'fetch');\n\n const res = await Promise.all([\n callback?.(this),\n this.expect(), // will be closed in expect -> listener -> unsub\n this.send(data, true),\n ]);\n\n /* v8 ignore next */\n if (this.dialog.debug >= 2) console.log('Fetch', this.info, this);\n\n this.close('fetch');\n\n return res[1];\n }\n\n protected async expect(): Promise<MethodReturn<R, M>> {\n checkClosed(this, 'expect');\n\n //FIXME Manual promise type\n return new Promise((resolve, reject) => {\n const responseListener = this.listen(async (data) => {\n try {\n if ((data as any) instanceof Error) throw data;\n responseListener();\n /* v8 ignore next */\n if (this.dialog.debug >= 3) console.log('Expect', this.info, data, this);\n resolve(data as any);\n } catch (e) {\n reject(e);\n }\n }, true);\n });\n }\n}\n\nclass ResponseContext<R, M extends keyof R> extends Context<R, M> {\n type = 'response';\n\n withMessage<M2 extends keyof R>(message: M2, id?: string): ResponseContext<R, M2> {\n return new ResponseContext<R, M2>(this.dialog, message, id, this);\n }\n\n listen(callback: Listener<R, M, MethodArg<R, M>, ResponseContext<R, M>>, done = false): () => void {\n return super.listen(callback, done);\n }\n\n send(data?: MethodReturn<R, M>, done = false): MethodReturn<R, M> {\n return super.send(data, done) as any;\n }\n}\n"],"mappings":"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"}
|
package/dist/workerUtils.js
CHANGED
|
@@ -1,31 +1,27 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
g.RTCDataChannel,
|
|
15
|
-
g.MediaSourceHandle
|
|
16
|
-
// MIDIAccess, // ReferenceError: MIDIAccess is not defined
|
|
1
|
+
//#region src/workerUtils.ts
|
|
2
|
+
var g = globalThis;
|
|
3
|
+
var transferrable = [
|
|
4
|
+
g.ArrayBuffer,
|
|
5
|
+
g.MessagePort,
|
|
6
|
+
g.ReadableStream,
|
|
7
|
+
g.WritableStream,
|
|
8
|
+
g.TransformStream,
|
|
9
|
+
g.ImageBitmap,
|
|
10
|
+
g.VideoFrame,
|
|
11
|
+
g.OffscreenCanvas,
|
|
12
|
+
g.RTCDataChannel,
|
|
13
|
+
g.MediaSourceHandle
|
|
17
14
|
].filter(Boolean);
|
|
18
15
|
function isTransferable(obj) {
|
|
19
|
-
|
|
16
|
+
return transferrable.some((t) => obj instanceof t) ? obj : null;
|
|
20
17
|
}
|
|
21
18
|
function getTransferrable(data = {}) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
19
|
+
if (!data) return [];
|
|
20
|
+
return Object.values(data).reduce((r, v) => {
|
|
21
|
+
return Array.isArray(v) ? [...r, ...v.map(isTransferable)] : [...r, isTransferable(v)];
|
|
22
|
+
}, []).filter(Boolean);
|
|
26
23
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
//# sourceMappingURL=workerUtils.js.map
|
|
24
|
+
//#endregion
|
|
25
|
+
export { getTransferrable, isTransferable };
|
|
26
|
+
|
|
27
|
+
//# sourceMappingURL=workerUtils.js.map
|