@modern-js/server-core 2.60.5 → 2.60.6

package/dist/cjs/adapters/node/helper/index.js

@@ -18,6 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var helper_exports = {};
 __export(helper_exports, {
+  isResFinalized: () => import_utils.isResFinalized,
   loadCacheConfig: () => import_loadCache.loadCacheConfig,
   loadServerCliConfig: () => import_loadConfig.loadServerCliConfig,
   loadServerEnv: () => import_loadEnv.loadServerEnv,
@@ -29,8 +30,10 @@ var import_loadEnv = require("./loadEnv");
 var import_loadPlugin = require("./loadPlugin");
 var import_loadConfig = require("./loadConfig");
 var import_loadCache = require("./loadCache");
+var import_utils = require("./utils");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  isResFinalized,
   loadCacheConfig,
   loadServerCliConfig,
   loadServerEnv,

package/dist/cjs/adapters/node/helper/utils.js

@@ -0,0 +1,31 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  isResFinalized: () => isResFinalized
+});
+module.exports = __toCommonJS(utils_exports);
+const isResFinalized = (res) => {
+  var _res_socket;
+  return res.headersSent || res._modernBodyPiped || res.writableEnded || res.finished || !((_res_socket = res.socket) === null || _res_socket === void 0 ? void 0 : _res_socket.writable);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isResFinalized
+});

package/dist/cjs/adapters/node/hono.js

@@ -22,6 +22,7 @@ __export(hono_exports, {
   httpCallBack2HonoMid: () => httpCallBack2HonoMid
 });
 module.exports = __toCommonJS(hono_exports);
+var import_helper = require("./helper");
 const httpCallBack2HonoMid = (handler) => {
   return async (context, next) => {
     const { req, res } = context.env.node;
@@ -40,7 +41,7 @@ const httpCallBack2HonoMid = (handler) => {
       delete req.__serverManifest;
       res.removeListener("pipe", onPipe);
     }
-    if (res.headersSent || res._modernBodyPiped) {
+    if ((0, import_helper.isResFinalized)(res)) {
       context.finalized = true;
     } else {
       await next();

package/dist/cjs/adapters/node/node.js

@@ -35,6 +35,7 @@ __export(node_exports, {
 });
 module.exports = __toCommonJS(node_exports);
 var import_node_http = require("node:http");
+var import_helper = require("./helper");
 var import_install = require("./polyfills/install");
 var import_stream = require("./polyfills/stream");
 var import_polyfills = require("./polyfills");
@@ -116,7 +117,7 @@ const getRequestListener = (handler) => {
           res
         }
       });
-      if (!res.headersSent && !response.res && !res._modernBodyPiped) {
+      if (!response.res && !(0, import_helper.isResFinalized)(res)) {
         await sendResponse(response, res);
       }
     } catch (error) {

package/dist/esm/adapters/node/helper/index.js

@@ -2,7 +2,9 @@ import { loadServerEnv } from "./loadEnv";
 import { loadServerPlugins } from "./loadPlugin";
 import { loadServerRuntimeConfig, loadServerCliConfig } from "./loadConfig";
 import { loadCacheConfig } from "./loadCache";
+import { isResFinalized } from "./utils";
 export {
+  isResFinalized,
   loadCacheConfig,
   loadServerCliConfig,
   loadServerEnv,

package/dist/esm/adapters/node/helper/utils.js

@@ -0,0 +1,7 @@
+var isResFinalized = function(res) {
+  var _res_socket;
+  return res.headersSent || res._modernBodyPiped || res.writableEnded || res.finished || !((_res_socket = res.socket) === null || _res_socket === void 0 ? void 0 : _res_socket.writable);
+};
+export {
+  isResFinalized
+};

package/dist/esm/adapters/node/hono.js

@@ -1,5 +1,6 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { isResFinalized } from "./helper";
 var httpCallBack2HonoMid = function(handler) {
   return function() {
     var _ref = _async_to_generator(function(context, next) {
@@ -42,7 +43,7 @@ var httpCallBack2HonoMid = function(handler) {
               7
             ];
           case 4:
-            if (!(res.headersSent || res._modernBodyPiped))
+            if (!isResFinalized(res))
               return [
                 3,
                 5

package/dist/esm/adapters/node/node.js

@@ -3,6 +3,7 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { ServerResponse } from "node:http";
+import { isResFinalized } from "./helper";
 import { installGlobals } from "./polyfills/install";
 import { createReadableStreamFromReadable, writeReadableStreamToWritable } from "./polyfills/stream";
 import { writeReadableStreamToWritable as writeReadableStreamToWritable2 } from "./polyfills";
@@ -145,7 +146,7 @@ var getRequestListener = function(handler) {
             ];
           case 1:
             response = _state.sent();
-            if (!(!res.headersSent && !response.res && !res._modernBodyPiped))
+            if (!(!response.res && !isResFinalized(res)))
               return [
                 3,
                 3

package/dist/esm-node/adapters/node/helper/index.js

@@ -2,7 +2,9 @@ import { loadServerEnv } from "./loadEnv";
 import { loadServerPlugins } from "./loadPlugin";
 import { loadServerRuntimeConfig, loadServerCliConfig } from "./loadConfig";
 import { loadCacheConfig } from "./loadCache";
+import { isResFinalized } from "./utils";
 export {
+  isResFinalized,
   loadCacheConfig,
   loadServerCliConfig,
   loadServerEnv,

package/dist/esm-node/adapters/node/helper/utils.js

@@ -0,0 +1,7 @@
+const isResFinalized = (res) => {
+  var _res_socket;
+  return res.headersSent || res._modernBodyPiped || res.writableEnded || res.finished || !((_res_socket = res.socket) === null || _res_socket === void 0 ? void 0 : _res_socket.writable);
+};
+export {
+  isResFinalized
+};

package/dist/esm-node/adapters/node/hono.js

@@ -1,3 +1,4 @@
+import { isResFinalized } from "./helper";
 const httpCallBack2HonoMid = (handler) => {
   return async (context, next) => {
     const { req, res } = context.env.node;
@@ -16,7 +17,7 @@ const httpCallBack2HonoMid = (handler) => {
       delete req.__serverManifest;
       res.removeListener("pipe", onPipe);
     }
-    if (res.headersSent || res._modernBodyPiped) {
+    if (isResFinalized(res)) {
       context.finalized = true;
     } else {
       await next();

package/dist/esm-node/adapters/node/node.js

@@ -1,4 +1,5 @@
 import { ServerResponse } from "node:http";
+import { isResFinalized } from "./helper";
 import { installGlobals } from "./polyfills/install";
 import { createReadableStreamFromReadable, writeReadableStreamToWritable } from "./polyfills/stream";
 import { writeReadableStreamToWritable as writeReadableStreamToWritable2 } from "./polyfills";
@@ -80,7 +81,7 @@ const getRequestListener = (handler) => {
           res
         }
       });
-      if (!res.headersSent && !response.res && !res._modernBodyPiped) {
+      if (!response.res && !isResFinalized(res)) {
         await sendResponse(response, res);
       }
     } catch (error) {

package/dist/types/adapters/node/helper/index.d.ts

@@ -2,3 +2,5 @@ export { loadServerEnv } from './loadEnv';
 export { loadServerPlugins } from './loadPlugin';
 export { loadServerRuntimeConfig, loadServerCliConfig } from './loadConfig';
 export { loadCacheConfig } from './loadCache';
+export { isResFinalized } from './utils';
+export type { NodeBindings } from './utils';

package/dist/types/adapters/node/helper/utils.d.ts

@@ -0,0 +1,17 @@
+import type { HonoRequest, NodeRequest, NodeResponse, ServerManifest } from '../../../types';
+type ExtendedNodeRequest = NodeRequest & {
+    __honoRequest?: HonoRequest;
+    __templates?: Record<string, string>;
+    __serverManifest?: ServerManifest;
+};
+type ExtendedNodeResponse = NodeResponse & {
+    _modernBodyPiped?: boolean;
+};
+export type NodeBindings = {
+    node: {
+        req: ExtendedNodeRequest;
+        res: ExtendedNodeResponse;
+    };
+};
+export declare const isResFinalized: (res: ExtendedNodeResponse) => boolean;
+export {};

package/dist/types/adapters/node/hono.d.ts

@@ -1,16 +1,5 @@
-import type { Context, HonoRequest, Middleware, Next, NodeRequest, NodeResponse, ServerEnv, ServerManifest } from '../../types';
-type NodeBindings = {
-    node: {
-        req: NodeRequest & {
-            __honoRequest?: HonoRequest;
-            __templates?: Record<string, string>;
-            __serverManifest?: ServerManifest;
-        };
-        res: NodeResponse & {
-            _modernBodyPiped?: boolean;
-        };
-    };
-};
+import type { Context, Middleware, Next, NodeRequest, NodeResponse, ServerEnv } from '../../types';
+import { type NodeBindings } from './helper';
 export type ServerNodeEnv = {
     Bindings: NodeBindings;
 };

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.60.5",
+  "version": "2.60.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -53,9 +53,9 @@
     "flatted": "^3.2.9",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.1",
-    "@modern-js/plugin": "2.60.5",
-    "@modern-js/runtime-utils": "2.60.5",
-    "@modern-js/utils": "2.60.5"
+    "@modern-js/plugin": "2.60.6",
+    "@modern-js/runtime-utils": "2.60.6",
+    "@modern-js/utils": "2.60.6"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -65,9 +65,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.60.5",
-    "@scripts/jest-config": "2.60.5",
-    "@scripts/build": "2.60.5"
+    "@modern-js/types": "2.60.6",
+    "@scripts/jest-config": "2.60.6",
+    "@scripts/build": "2.60.6"
   },
   "sideEffects": false,
   "publishConfig": {