@bytecodealliance/preview2-shim 0.17.7 → 0.17.9

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.
@@ -1,15 +1,11 @@
1
- import { createReadableStream, getStreamOrThrow } from './worker-thread.js';
2
- import {
3
- createServer,
4
- request as httpRequest,
5
- Agent as HttpAgent,
6
- } from 'node:http';
7
- import { request as httpsRequest, Agent as HttpsAgent } from 'node:https';
8
- import { parentPort } from 'node:worker_threads';
9
- import { HTTP_SERVER_INCOMING_HANDLER } from './calls.js';
1
+ import { createReadableStream, getStreamOrThrow } from "./worker-thread.js";
2
+ import { createServer, request as httpRequest, Agent as HttpAgent } from "node:http";
3
+ import { request as httpsRequest, Agent as HttpsAgent } from "node:https";
4
+ import { parentPort } from "node:worker_threads";
5
+ import { HTTP_SERVER_INCOMING_HANDLER } from "./calls.js";
10
6
 
11
7
  const agentOptions = {
12
- keepAlive: true,
8
+ keepAlive: true,
13
9
  };
14
10
  const httpAgent = new HttpAgent(agentOptions);
15
11
  const httpsAgent = new HttpsAgent(agentOptions);
@@ -20,198 +16,191 @@ let responseCnt = 0;
20
16
  const responses = new Map();
21
17
 
22
18
  export async function stopHttpServer(id) {
23
- await new Promise((resolve) => servers.get(id).close(resolve));
19
+ await new Promise((resolve) => servers.get(id).close(resolve));
24
20
  }
25
21
 
26
22
  export function clearOutgoingResponse(id) {
27
- responses.delete(id);
23
+ responses.delete(id);
28
24
  }
29
25
 
30
26
  export async function getHttpServerAddress(id) {
31
- return servers.get(id).address();
27
+ return servers.get(id).address();
32
28
  }
33
29
 
34
- export async function setOutgoingResponse(
35
- id,
36
- { statusCode, headers, streamId }
37
- ) {
38
- const response = responses.get(id);
39
- const textDecoder = new TextDecoder();
40
- response.writeHead(
41
- statusCode,
42
- Object.fromEntries(
43
- headers.map(([key, val]) => [key, textDecoder.decode(val)])
44
- )
45
- );
46
- response.flushHeaders();
47
- const { stream } = getStreamOrThrow(streamId);
48
- stream.pipe(response);
49
- responses.delete(id);
30
+ export async function setOutgoingResponse(id, { statusCode, headers, streamId }) {
31
+ const response = responses.get(id);
32
+ const textDecoder = new TextDecoder();
33
+ response.writeHead(
34
+ statusCode,
35
+ Object.fromEntries(headers.map(([key, val]) => [key, textDecoder.decode(val)])),
36
+ );
37
+ response.flushHeaders();
38
+ const { stream } = getStreamOrThrow(streamId);
39
+ stream.pipe(response);
40
+ responses.delete(id);
50
41
  }
51
42
 
52
43
  export async function startHttpServer(id, { port, host }) {
53
- const server = createServer((req, res) => {
54
- // create the streams and their ids
55
- const streamId = createReadableStream(req);
56
- const responseId = ++responseCnt;
57
- parentPort.postMessage({
58
- type: HTTP_SERVER_INCOMING_HANDLER,
59
- id,
60
- payload: {
61
- responseId,
62
- method: req.method,
63
- host: req.headers.host || host || 'localhost',
64
- pathWithQuery: req.url,
65
- headers: Object.entries(req.headersDistinct).flatMap(
66
- ([key, val]) => val.map((val) => [key, val])
67
- ),
68
- streamId,
69
- },
70
- });
71
- responses.set(responseId, res);
72
- });
73
- await new Promise((resolve, reject) => {
74
- server.listen(port, host, resolve);
75
- server.on('error', reject);
44
+ const server = createServer((req, res) => {
45
+ // create the streams and their ids
46
+ const streamId = createReadableStream(req);
47
+ const responseId = ++responseCnt;
48
+ parentPort.postMessage({
49
+ type: HTTP_SERVER_INCOMING_HANDLER,
50
+ id,
51
+ payload: {
52
+ responseId,
53
+ method: req.method,
54
+ host: req.headers.host || host || "localhost",
55
+ pathWithQuery: req.url,
56
+ headers: Object.entries(req.headersDistinct).flatMap(([key, val]) =>
57
+ val.map((val) => [key, val]),
58
+ ),
59
+ streamId,
60
+ },
76
61
  });
77
- servers.set(id, server);
62
+ responses.set(responseId, res);
63
+ });
64
+ await new Promise((resolve, reject) => {
65
+ server.listen(port, host, resolve);
66
+ server.on("error", reject);
67
+ });
68
+ servers.set(id, server);
78
69
  }
79
70
 
80
71
  export async function createHttpRequest(
81
- method,
82
- scheme,
83
- authority,
84
- pathWithQuery,
85
- headers,
86
- bodyId,
87
- connectTimeout,
88
- betweenBytesTimeout,
89
- firstByteTimeout
72
+ method,
73
+ scheme,
74
+ authority,
75
+ pathWithQuery,
76
+ headers,
77
+ bodyId,
78
+ connectTimeout,
79
+ betweenBytesTimeout,
80
+ firstByteTimeout,
90
81
  ) {
91
- let stream = null;
92
- if (bodyId) {
93
- try {
94
- ({ stream } = getStreamOrThrow(bodyId));
95
- } catch (e) {
96
- if (e.tag === 'closed') {
97
- throw {
98
- tag: 'internal-error',
99
- val: 'Unexpected closed body stream',
100
- };
101
- }
102
- // it should never be possible for the body stream to already
103
- // be closed, or for there to be a write error
104
- // we therefore just throw internal error here
105
- if (e.tag === 'last-operation-failed') {
106
- throw {
107
- tag: 'internal-error',
108
- val: e.val,
109
- };
110
- }
111
- // entirely unknown error -> trap
112
- throw e;
113
- }
114
- }
82
+ let stream = null;
83
+ if (bodyId) {
115
84
  try {
116
- // Make a request
117
- let req;
118
- switch (scheme) {
119
- case 'http:':
120
- req = httpRequest({
121
- agent: httpAgent,
122
- method,
123
- host: authority.split(':')[0],
124
- port: authority.split(':')[1],
125
- path: pathWithQuery,
126
- timeout:
127
- connectTimeout && Number(connectTimeout / 1_000_000n),
128
- });
129
- break;
130
- case 'https:':
131
- req = httpsRequest({
132
- agent: httpsAgent,
133
- method,
134
- host: authority.split(':')[0],
135
- port: authority.split(':')[1],
136
- path: pathWithQuery,
137
- timeout:
138
- connectTimeout && Number(connectTimeout / 1_000_000n),
139
- });
140
- break;
141
- default:
142
- throw { tag: 'HTTP-protocol-error' };
143
- }
144
- for (const [key, value] of headers) {
145
- req.appendHeader(key, value);
146
- }
147
- req.flushHeaders();
148
- if (stream) {
149
- stream.pipe(req);
150
- } else {
151
- req.end();
152
- }
153
- const res = await new Promise((resolve, reject) => {
154
- req.once('timeout', () => {
155
- reject({
156
- tag: 'connection-timeout',
157
- });
158
- req.destroy();
159
- });
160
- req.once('response', resolve);
161
- req.once('close', () => reject);
162
- req.once('error', reject);
85
+ ({ stream } = getStreamOrThrow(bodyId));
86
+ } catch (e) {
87
+ if (e.tag === "closed") {
88
+ throw {
89
+ tag: "internal-error",
90
+ val: "Unexpected closed body stream",
91
+ };
92
+ }
93
+ // it should never be possible for the body stream to already
94
+ // be closed, or for there to be a write error
95
+ // we therefore just throw internal error here
96
+ if (e.tag === "last-operation-failed") {
97
+ throw {
98
+ tag: "internal-error",
99
+ val: e.val,
100
+ };
101
+ }
102
+ // entirely unknown error -> trap
103
+ throw e;
104
+ }
105
+ }
106
+ try {
107
+ // Make a request
108
+ let req;
109
+ switch (scheme) {
110
+ case "http:":
111
+ req = httpRequest({
112
+ agent: httpAgent,
113
+ method,
114
+ host: authority.split(":")[0],
115
+ port: authority.split(":")[1],
116
+ path: pathWithQuery,
117
+ timeout: connectTimeout && Number(connectTimeout / 1_000_000n),
118
+ });
119
+ break;
120
+ case "https:":
121
+ req = httpsRequest({
122
+ agent: httpsAgent,
123
+ method,
124
+ host: authority.split(":")[0],
125
+ port: authority.split(":")[1],
126
+ path: pathWithQuery,
127
+ timeout: connectTimeout && Number(connectTimeout / 1_000_000n),
128
+ });
129
+ break;
130
+ default:
131
+ throw { tag: "HTTP-protocol-error" };
132
+ }
133
+ for (const [key, value] of headers) {
134
+ req.appendHeader(key, value);
135
+ }
136
+ req.flushHeaders();
137
+ if (stream) {
138
+ stream.pipe(req);
139
+ } else {
140
+ req.end();
141
+ }
142
+ const res = await new Promise((resolve, reject) => {
143
+ req.once("timeout", () => {
144
+ reject({
145
+ tag: "connection-timeout",
163
146
  });
164
- if (firstByteTimeout) {
165
- res.setTimeout(Number(firstByteTimeout / 1_000_000n));
166
- }
167
- if (betweenBytesTimeout) {
168
- res.once('readable', () => {
169
- res.setTimeout(Number(betweenBytesTimeout / 1_000_000n));
170
- });
171
- }
172
- const bodyStreamId = createReadableStream(res);
173
- return {
174
- status: res.statusCode,
175
- headers: Array.from(Object.entries(res.headers)),
176
- bodyStreamId,
147
+ req.destroy();
148
+ });
149
+ req.once("response", resolve);
150
+ req.once("close", () => reject);
151
+ req.once("error", reject);
152
+ });
153
+ if (firstByteTimeout) {
154
+ res.setTimeout(Number(firstByteTimeout / 1_000_000n));
155
+ }
156
+ if (betweenBytesTimeout) {
157
+ res.once("readable", () => {
158
+ res.setTimeout(Number(betweenBytesTimeout / 1_000_000n));
159
+ });
160
+ }
161
+ const bodyStreamId = createReadableStream(res);
162
+ return {
163
+ status: res.statusCode,
164
+ headers: Array.from(Object.entries(res.headers)),
165
+ bodyStreamId,
166
+ };
167
+ } catch (e) {
168
+ if (e?.tag) {
169
+ throw e;
170
+ }
171
+ const err = getFirstError(e);
172
+ switch (err.code) {
173
+ case "ECONNRESET":
174
+ throw { tag: "HTTP-protocol-error" };
175
+ case "ENOTFOUND":
176
+ throw {
177
+ tag: "DNS-error",
178
+ val: {
179
+ rcode: err.code,
180
+ infoCode: err.errno < 0 ? -err.errno : err.errno,
181
+ },
177
182
  };
178
- } catch (e) {
179
- if (e?.tag) {
180
- throw e;
181
- }
182
- const err = getFirstError(e);
183
- switch (err.code) {
184
- case 'ECONNRESET':
185
- throw { tag: 'HTTP-protocol-error' };
186
- case 'ENOTFOUND':
187
- throw {
188
- tag: 'DNS-error',
189
- val: {
190
- rcode: err.code,
191
- infoCode: err.errno < 0 ? -err.errno : err.errno,
192
- },
193
- };
194
- case 'ECONNREFUSED':
195
- throw {
196
- tag: 'connection-refused',
197
- };
198
- }
183
+ case "ECONNREFUSED":
199
184
  throw {
200
- tag: 'internal-error',
201
- val: err.toString(),
185
+ tag: "connection-refused",
202
186
  };
203
187
  }
188
+ throw {
189
+ tag: "internal-error",
190
+ val: err.toString(),
191
+ };
192
+ }
204
193
  }
205
194
 
206
195
  function getFirstError(e) {
207
- if (typeof e !== 'object' || e === null) {
208
- return e;
209
- }
210
- if (e.cause) {
211
- return getFirstError(e.cause);
212
- }
213
- if (e instanceof AggregateError) {
214
- return getFirstError(e.errors[0]);
215
- }
196
+ if (typeof e !== "object" || e === null) {
216
197
  return e;
198
+ }
199
+ if (e.cause) {
200
+ return getFirstError(e.cause);
201
+ }
202
+ if (e instanceof AggregateError) {
203
+ return getFirstError(e.errors[0]);
204
+ }
205
+ return e;
217
206
  }