@web-widget/node 0.1.2 → 0.3.0

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.
Files changed (4) hide show
  1. package/dist/node.cjs +38 -29
  2. package/dist/node.d.ts +1 -1
  3. package/dist/node.js +38 -29
  4. package/package.json +6 -6
package/dist/node.cjs CHANGED
@@ -54,7 +54,6 @@ var FetchEvent = class {
54
54
  var dependencies = {
55
55
  Headers,
56
56
  ReadableStream,
57
- // @ts-ignore
58
57
  Request: class extends Request {
59
58
  constructor(input, init) {
60
59
  super(input, addDuplexToInit(init));
@@ -91,16 +90,30 @@ function addDuplexToInit(init) {
91
90
  }
92
91
  return init;
93
92
  }
93
+ function toMiddleware(webHandler, options) {
94
+ const toRequest = (0, import_node_utils.buildToRequest)(dependencies);
95
+ const toFetchEvent = (0, import_node_utils.buildToFetchEvent)(dependencies);
96
+ return async function middleware(incomingMessage, serverResponse, next) {
97
+ const request = toRequest(incomingMessage, options);
98
+ const webResponse = await webHandler(request, toFetchEvent(request));
99
+ await toServerResponse(webResponse, serverResponse);
100
+ await next();
101
+ };
102
+ }
94
103
  async function toServerResponse(webResponse, serverResponse) {
104
+ if (!checkWritable(serverResponse)) {
105
+ return;
106
+ }
95
107
  if (!webResponse) {
96
108
  serverResponse.end();
97
109
  return;
98
110
  }
99
- (0, import_node_utils.mergeIntoServerResponse)(
100
- // @ts-ignore getAll() is not standard https://fetch.spec.whatwg.org/#headers-class
101
- (0, import_node_utils.toOutgoingHeaders)(webResponse.headers),
102
- serverResponse
103
- );
111
+ if (!serverResponse.headersSent) {
112
+ (0, import_node_utils.mergeIntoServerResponse)(
113
+ (0, import_node_utils.toOutgoingHeaders)(webResponse.headers),
114
+ serverResponse
115
+ );
116
+ }
104
117
  serverResponse.statusCode = webResponse.status;
105
118
  serverResponse.statusMessage = webResponse.statusText;
106
119
  if (!webResponse.body) {
@@ -111,33 +124,29 @@ async function toServerResponse(webResponse, serverResponse) {
111
124
  }
112
125
  async function writeReadableStreamToWritable(stream, writable) {
113
126
  let reader = stream.getReader();
114
- async function read() {
115
- let { done, value } = await reader.read();
116
- if (done) {
117
- writable.end();
118
- return;
119
- }
120
- writable.write(value);
121
- let flushable = writable;
122
- if (typeof flushable.flush === "function") {
123
- flushable.flush();
124
- }
125
- await read();
126
- }
127
+ let flushable = writable;
127
128
  try {
128
- await read();
129
+ while (true) {
130
+ let { done, value } = await reader.read();
131
+ if (done) {
132
+ writable.end();
133
+ break;
134
+ }
135
+ writable.write(value);
136
+ if (typeof flushable.flush === "function") {
137
+ flushable.flush();
138
+ }
139
+ }
129
140
  } catch (error) {
130
141
  writable.destroy(error);
131
142
  throw error;
132
143
  }
133
144
  }
134
- function toMiddleware(webHandler, options) {
135
- const toRequest = (0, import_node_utils.buildToRequest)(dependencies);
136
- const toFetchEvent = (0, import_node_utils.buildToFetchEvent)(dependencies);
137
- return async function middleware(incomingMessage, serverResponse, next) {
138
- const request = toRequest(incomingMessage, options);
139
- const webResponse = await webHandler(request, toFetchEvent(request));
140
- await toServerResponse(webResponse, serverResponse);
141
- await next();
142
- };
145
+ function checkWritable(serverResponse) {
146
+ if (serverResponse.writableEnded || serverResponse.finished)
147
+ return false;
148
+ const socket = serverResponse.socket;
149
+ if (!socket)
150
+ return true;
151
+ return socket.writable;
143
152
  }
package/dist/node.d.ts CHANGED
@@ -1,6 +1,6 @@
1
+ import { RequestOptions, WebHandler, NodeHandler } from '@edge-runtime/node-utils';
1
2
  import primitives from '@edge-runtime/primitives';
2
3
  import { IncomingMessage, ServerResponse } from 'node:http';
3
- import { RequestOptions, WebHandler, NodeHandler } from '@edge-runtime/node-utils';
4
4
 
5
5
  interface NodeAdapterOptions extends RequestOptions {
6
6
  }
package/dist/node.js CHANGED
@@ -26,7 +26,6 @@ var FetchEvent = class {
26
26
  var dependencies = {
27
27
  Headers,
28
28
  ReadableStream,
29
- // @ts-ignore
30
29
  Request: class extends Request {
31
30
  constructor(input, init) {
32
31
  super(input, addDuplexToInit(init));
@@ -63,16 +62,30 @@ function addDuplexToInit(init) {
63
62
  }
64
63
  return init;
65
64
  }
65
+ function toMiddleware(webHandler, options) {
66
+ const toRequest = buildToRequest(dependencies);
67
+ const toFetchEvent = buildToFetchEvent(dependencies);
68
+ return async function middleware(incomingMessage, serverResponse, next) {
69
+ const request = toRequest(incomingMessage, options);
70
+ const webResponse = await webHandler(request, toFetchEvent(request));
71
+ await toServerResponse(webResponse, serverResponse);
72
+ await next();
73
+ };
74
+ }
66
75
  async function toServerResponse(webResponse, serverResponse) {
76
+ if (!checkWritable(serverResponse)) {
77
+ return;
78
+ }
67
79
  if (!webResponse) {
68
80
  serverResponse.end();
69
81
  return;
70
82
  }
71
- mergeIntoServerResponse(
72
- // @ts-ignore getAll() is not standard https://fetch.spec.whatwg.org/#headers-class
73
- toOutgoingHeaders(webResponse.headers),
74
- serverResponse
75
- );
83
+ if (!serverResponse.headersSent) {
84
+ mergeIntoServerResponse(
85
+ toOutgoingHeaders(webResponse.headers),
86
+ serverResponse
87
+ );
88
+ }
76
89
  serverResponse.statusCode = webResponse.status;
77
90
  serverResponse.statusMessage = webResponse.statusText;
78
91
  if (!webResponse.body) {
@@ -83,35 +96,31 @@ async function toServerResponse(webResponse, serverResponse) {
83
96
  }
84
97
  async function writeReadableStreamToWritable(stream, writable) {
85
98
  let reader = stream.getReader();
86
- async function read() {
87
- let { done, value } = await reader.read();
88
- if (done) {
89
- writable.end();
90
- return;
91
- }
92
- writable.write(value);
93
- let flushable = writable;
94
- if (typeof flushable.flush === "function") {
95
- flushable.flush();
96
- }
97
- await read();
98
- }
99
+ let flushable = writable;
99
100
  try {
100
- await read();
101
+ while (true) {
102
+ let { done, value } = await reader.read();
103
+ if (done) {
104
+ writable.end();
105
+ break;
106
+ }
107
+ writable.write(value);
108
+ if (typeof flushable.flush === "function") {
109
+ flushable.flush();
110
+ }
111
+ }
101
112
  } catch (error) {
102
113
  writable.destroy(error);
103
114
  throw error;
104
115
  }
105
116
  }
106
- function toMiddleware(webHandler, options) {
107
- const toRequest = buildToRequest(dependencies);
108
- const toFetchEvent = buildToFetchEvent(dependencies);
109
- return async function middleware(incomingMessage, serverResponse, next) {
110
- const request = toRequest(incomingMessage, options);
111
- const webResponse = await webHandler(request, toFetchEvent(request));
112
- await toServerResponse(webResponse, serverResponse);
113
- await next();
114
- };
117
+ function checkWritable(serverResponse) {
118
+ if (serverResponse.writableEnded || serverResponse.finished)
119
+ return false;
120
+ const socket = serverResponse.socket;
121
+ if (!socket)
122
+ return true;
123
+ return socket.writable;
115
124
  }
116
125
  export {
117
126
  NodeAdapter as default
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@web-widget/node",
3
- "version": "0.1.2",
3
+ "version": "0.3.0",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": {
@@ -13,13 +13,13 @@
13
13
  "dist/"
14
14
  ],
15
15
  "dependencies": {
16
- "@edge-runtime/node-utils": "^2.1.2",
17
- "@edge-runtime/primitives": "^3.0.4"
16
+ "@edge-runtime/node-utils": "^2.2.2",
17
+ "@edge-runtime/primitives": "^3.1.1"
18
18
  },
19
19
  "devDependencies": {
20
- "@types/node": "^17.0.42",
21
- "tsup": "^7.0.0",
22
- "typescript": "^5.0.4"
20
+ "@types/node": "^17.0.45",
21
+ "tsup": "^7.2.0",
22
+ "typescript": "^5.2.2"
23
23
  },
24
24
  "engines": {
25
25
  "node": ">=18"