@modern-js/server-core 2.49.5-alpha.0 → 2.50.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.
- package/dist/cjs/base/adapters/node/node.js +3 -3
- package/dist/cjs/base/middlewares/customServer/index.js +2 -2
- package/dist/esm/base/adapters/node/node.js +3 -3
- package/dist/esm/base/middlewares/customServer/index.js +2 -2
- package/dist/esm-node/base/adapters/node/node.js +3 -3
- package/dist/esm-node/base/middlewares/customServer/index.js +2 -2
- package/dist/types/base/adapters/node/node.d.ts +1 -1
- package/package.json +7 -7
|
@@ -37,7 +37,7 @@ var import_node_http = require("node:http");
|
|
|
37
37
|
var import_stream = require("./polyfills/stream");
|
|
38
38
|
var import_install = require("./polyfills/install");
|
|
39
39
|
(0, import_install.installGlobals)();
|
|
40
|
-
const createWebRequest = (req, res) => {
|
|
40
|
+
const createWebRequest = (req, res, body) => {
|
|
41
41
|
var _req_url;
|
|
42
42
|
const headerRecord = [];
|
|
43
43
|
const len = req.rawHeaders.length;
|
|
@@ -55,8 +55,8 @@ const createWebRequest = (req, res) => {
|
|
|
55
55
|
signal: controller.signal
|
|
56
56
|
};
|
|
57
57
|
res.on("close", () => controller.abort());
|
|
58
|
-
if (!(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader"))) {
|
|
59
|
-
init.body = (0, import_stream.createReadableStreamFromReadable)(req);
|
|
58
|
+
if (body || !(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader"))) {
|
|
59
|
+
init.body = body !== null && body !== void 0 ? body : (0, import_stream.createReadableStreamFromReadable)(req);
|
|
60
60
|
init.duplex = "half";
|
|
61
61
|
}
|
|
62
62
|
const url = `http://${req.headers.host}${req.url}`;
|
|
@@ -105,7 +105,7 @@ class CustomServer {
|
|
|
105
105
|
return getUnstableMiddlewares(serverMiddleware);
|
|
106
106
|
}
|
|
107
107
|
return async (c, next) => {
|
|
108
|
-
var
|
|
108
|
+
var _c_env;
|
|
109
109
|
const reporter = c.get("reporter");
|
|
110
110
|
const locals = {};
|
|
111
111
|
const resArgs = {
|
|
@@ -120,7 +120,7 @@ class CustomServer {
|
|
|
120
120
|
if (isRedirect(resArgs.headers, resArgs.status)) {
|
|
121
121
|
return c.redirect(resArgs.headers.get("Location") || "", resArgs.status || 302);
|
|
122
122
|
}
|
|
123
|
-
if ((_c_env = c.env) === null || _c_env === void 0 ? void 0 :
|
|
123
|
+
if ((_c_env = c.env) === null || _c_env === void 0 ? void 0 : _c_env.node.res.headersSent) {
|
|
124
124
|
return void 0;
|
|
125
125
|
}
|
|
126
126
|
if (!c.finalized) {
|
|
@@ -6,7 +6,7 @@ import { ServerResponse } from "node:http";
|
|
|
6
6
|
import { createReadableStreamFromReadable, writeReadableStreamToWritable } from "./polyfills/stream";
|
|
7
7
|
import { installGlobals } from "./polyfills/install";
|
|
8
8
|
installGlobals();
|
|
9
|
-
var createWebRequest = function(req, res) {
|
|
9
|
+
var createWebRequest = function(req, res, body) {
|
|
10
10
|
var _req_url;
|
|
11
11
|
var headerRecord = [];
|
|
12
12
|
var len = req.rawHeaders.length;
|
|
@@ -26,8 +26,8 @@ var createWebRequest = function(req, res) {
|
|
|
26
26
|
res.on("close", function() {
|
|
27
27
|
return controller.abort();
|
|
28
28
|
});
|
|
29
|
-
if (!(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader"))) {
|
|
30
|
-
init.body = createReadableStreamFromReadable(req);
|
|
29
|
+
if (body || !(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader"))) {
|
|
30
|
+
init.body = body !== null && body !== void 0 ? body : createReadableStreamFromReadable(req);
|
|
31
31
|
init.duplex = "half";
|
|
32
32
|
}
|
|
33
33
|
var url = "http://".concat(req.headers.host).concat(req.url);
|
|
@@ -187,7 +187,7 @@ var CustomServer = /* @__PURE__ */ function() {
|
|
|
187
187
|
2,
|
|
188
188
|
function() {
|
|
189
189
|
var _ref = _async_to_generator(function(c, next) {
|
|
190
|
-
var
|
|
190
|
+
var _c_env, reporter, locals, resArgs, customMiddlewareCtx, getCost, cost;
|
|
191
191
|
return _ts_generator(this, function(_state2) {
|
|
192
192
|
switch (_state2.label) {
|
|
193
193
|
case 0:
|
|
@@ -213,7 +213,7 @@ var CustomServer = /* @__PURE__ */ function() {
|
|
|
213
213
|
c.redirect(resArgs.headers.get("Location") || "", resArgs.status || 302)
|
|
214
214
|
];
|
|
215
215
|
}
|
|
216
|
-
if ((_c_env = c.env) === null || _c_env === void 0 ? void 0 :
|
|
216
|
+
if ((_c_env = c.env) === null || _c_env === void 0 ? void 0 : _c_env.node.res.headersSent) {
|
|
217
217
|
return [
|
|
218
218
|
2,
|
|
219
219
|
void 0
|
|
@@ -2,7 +2,7 @@ import { ServerResponse } from "node:http";
|
|
|
2
2
|
import { createReadableStreamFromReadable, writeReadableStreamToWritable } from "./polyfills/stream";
|
|
3
3
|
import { installGlobals } from "./polyfills/install";
|
|
4
4
|
installGlobals();
|
|
5
|
-
const createWebRequest = (req, res) => {
|
|
5
|
+
const createWebRequest = (req, res, body) => {
|
|
6
6
|
var _req_url;
|
|
7
7
|
const headerRecord = [];
|
|
8
8
|
const len = req.rawHeaders.length;
|
|
@@ -20,8 +20,8 @@ const createWebRequest = (req, res) => {
|
|
|
20
20
|
signal: controller.signal
|
|
21
21
|
};
|
|
22
22
|
res.on("close", () => controller.abort());
|
|
23
|
-
if (!(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader"))) {
|
|
24
|
-
init.body = createReadableStreamFromReadable(req);
|
|
23
|
+
if (body || !(method === "GET" || method === "HEAD") && ((_req_url = req.url) === null || _req_url === void 0 ? void 0 : _req_url.includes("__loader"))) {
|
|
24
|
+
init.body = body !== null && body !== void 0 ? body : createReadableStreamFromReadable(req);
|
|
25
25
|
init.duplex = "half";
|
|
26
26
|
}
|
|
27
27
|
const url = `http://${req.headers.host}${req.url}`;
|
|
@@ -81,7 +81,7 @@ class CustomServer {
|
|
|
81
81
|
return getUnstableMiddlewares(serverMiddleware);
|
|
82
82
|
}
|
|
83
83
|
return async (c, next) => {
|
|
84
|
-
var
|
|
84
|
+
var _c_env;
|
|
85
85
|
const reporter = c.get("reporter");
|
|
86
86
|
const locals = {};
|
|
87
87
|
const resArgs = {
|
|
@@ -96,7 +96,7 @@ class CustomServer {
|
|
|
96
96
|
if (isRedirect(resArgs.headers, resArgs.status)) {
|
|
97
97
|
return c.redirect(resArgs.headers.get("Location") || "", resArgs.status || 302);
|
|
98
98
|
}
|
|
99
|
-
if ((_c_env = c.env) === null || _c_env === void 0 ? void 0 :
|
|
99
|
+
if ((_c_env = c.env) === null || _c_env === void 0 ? void 0 : _c_env.node.res.headersSent) {
|
|
100
100
|
return void 0;
|
|
101
101
|
}
|
|
102
102
|
if (!c.finalized) {
|
|
@@ -4,7 +4,7 @@ import { Server as NodeServer } from 'node:http';
|
|
|
4
4
|
import type { Server as NodeHttpsServer } from 'node:https';
|
|
5
5
|
import { NodeRequest, NodeResponse } from '../../../core/plugin';
|
|
6
6
|
import { RequestHandler } from '../../../core/server';
|
|
7
|
-
export declare const createWebRequest: (req: NodeRequest, res: NodeResponse) => Request;
|
|
7
|
+
export declare const createWebRequest: (req: NodeRequest, res: NodeResponse, body?: BodyInit) => Request;
|
|
8
8
|
export declare const sendResponse: (response: Response, res: NodeResponse) => Promise<void>;
|
|
9
9
|
declare const getRequestListener: (handler: RequestHandler) => (req: NodeRequest, res: NodeResponse) => Promise<void>;
|
|
10
10
|
type NodeServerWrapper = (NodeServer | NodeHttpsServer) & {
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"modern",
|
|
16
16
|
"modern.js"
|
|
17
17
|
],
|
|
18
|
-
"version": "2.
|
|
18
|
+
"version": "2.50.0",
|
|
19
19
|
"jsnext:source": "./src/index.ts",
|
|
20
20
|
"types": "./dist/types/index.d.ts",
|
|
21
21
|
"main": "./dist/cjs/index.js",
|
|
@@ -69,9 +69,9 @@
|
|
|
69
69
|
"hono": "^3.12.2",
|
|
70
70
|
"isbot": "3.8.0",
|
|
71
71
|
"merge-deep": "^3.0.3",
|
|
72
|
-
"@modern-js/
|
|
73
|
-
"@modern-js/
|
|
74
|
-
"@modern-js/
|
|
72
|
+
"@modern-js/runtime-utils": "2.50.0",
|
|
73
|
+
"@modern-js/plugin": "2.50.0",
|
|
74
|
+
"@modern-js/utils": "2.50.0"
|
|
75
75
|
},
|
|
76
76
|
"devDependencies": {
|
|
77
77
|
"@types/jest": "^29",
|
|
@@ -81,9 +81,9 @@
|
|
|
81
81
|
"jest": "^29",
|
|
82
82
|
"ts-jest": "^29.1.0",
|
|
83
83
|
"typescript": "^5",
|
|
84
|
-
"@
|
|
85
|
-
"@
|
|
86
|
-
"@scripts/jest-config": "2.
|
|
84
|
+
"@modern-js/types": "2.50.0",
|
|
85
|
+
"@scripts/build": "2.50.0",
|
|
86
|
+
"@scripts/jest-config": "2.50.0"
|
|
87
87
|
},
|
|
88
88
|
"sideEffects": false,
|
|
89
89
|
"publishConfig": {
|