@web-widget/node 0.2.0 → 0.3.0

package/dist/node.cjs

@@ -54,7 +54,6 @@ var FetchEvent = class {
 var dependencies = {
   Headers,
   ReadableStream,
-  // @ts-ignore
   Request: class extends Request {
     constructor(input, init) {
       super(input, addDuplexToInit(init));
@@ -91,16 +90,30 @@ function addDuplexToInit(init) {
   }
   return init;
 }
+function toMiddleware(webHandler, options) {
+  const toRequest = (0, import_node_utils.buildToRequest)(dependencies);
+  const toFetchEvent = (0, import_node_utils.buildToFetchEvent)(dependencies);
+  return async function middleware(incomingMessage, serverResponse, next) {
+    const request = toRequest(incomingMessage, options);
+    const webResponse = await webHandler(request, toFetchEvent(request));
+    await toServerResponse(webResponse, serverResponse);
+    await next();
+  };
+}
 async function toServerResponse(webResponse, serverResponse) {
+  if (!checkWritable(serverResponse)) {
+    return;
+  }
   if (!webResponse) {
     serverResponse.end();
     return;
   }
-  (0, import_node_utils.mergeIntoServerResponse)(
-    // @ts-ignore getAll() is not standard https://fetch.spec.whatwg.org/#headers-class
-    (0, import_node_utils.toOutgoingHeaders)(webResponse.headers),
-    serverResponse
-  );
+  if (!serverResponse.headersSent) {
+    (0, import_node_utils.mergeIntoServerResponse)(
+      (0, import_node_utils.toOutgoingHeaders)(webResponse.headers),
+      serverResponse
+    );
+  }
   serverResponse.statusCode = webResponse.status;
   serverResponse.statusMessage = webResponse.statusText;
   if (!webResponse.body) {
@@ -111,33 +124,29 @@ async function toServerResponse(webResponse, serverResponse) {
 }
 async function writeReadableStreamToWritable(stream, writable) {
   let reader = stream.getReader();
-  async function read() {
-    let { done, value } = await reader.read();
-    if (done) {
-      writable.end();
-      return;
-    }
-    writable.write(value);
-    let flushable = writable;
-    if (typeof flushable.flush === "function") {
-      flushable.flush();
-    }
-    await read();
-  }
+  let flushable = writable;
   try {
-    await read();
+    while (true) {
+      let { done, value } = await reader.read();
+      if (done) {
+        writable.end();
+        break;
+      }
+      writable.write(value);
+      if (typeof flushable.flush === "function") {
+        flushable.flush();
+      }
+    }
   } catch (error) {
     writable.destroy(error);
     throw error;
   }
 }
-function toMiddleware(webHandler, options) {
-  const toRequest = (0, import_node_utils.buildToRequest)(dependencies);
-  const toFetchEvent = (0, import_node_utils.buildToFetchEvent)(dependencies);
-  return async function middleware(incomingMessage, serverResponse, next) {
-    const request = toRequest(incomingMessage, options);
-    const webResponse = await webHandler(request, toFetchEvent(request));
-    await toServerResponse(webResponse, serverResponse);
-    await next();
-  };
+function checkWritable(serverResponse) {
+  if (serverResponse.writableEnded || serverResponse.finished)
+    return false;
+  const socket = serverResponse.socket;
+  if (!socket)
+    return true;
+  return socket.writable;
 }

package/dist/node.d.ts

@@ -1,6 +1,6 @@
+import { RequestOptions, WebHandler, NodeHandler } from '@edge-runtime/node-utils';
 import primitives from '@edge-runtime/primitives';
 import { IncomingMessage, ServerResponse } from 'node:http';
-import { RequestOptions, WebHandler, NodeHandler } from '@edge-runtime/node-utils';
 
 interface NodeAdapterOptions extends RequestOptions {
 }

package/dist/node.js

@@ -26,7 +26,6 @@ var FetchEvent = class {
 var dependencies = {
   Headers,
   ReadableStream,
-  // @ts-ignore
   Request: class extends Request {
     constructor(input, init) {
       super(input, addDuplexToInit(init));
@@ -63,16 +62,30 @@ function addDuplexToInit(init) {
   }
   return init;
 }
+function toMiddleware(webHandler, options) {
+  const toRequest = buildToRequest(dependencies);
+  const toFetchEvent = buildToFetchEvent(dependencies);
+  return async function middleware(incomingMessage, serverResponse, next) {
+    const request = toRequest(incomingMessage, options);
+    const webResponse = await webHandler(request, toFetchEvent(request));
+    await toServerResponse(webResponse, serverResponse);
+    await next();
+  };
+}
 async function toServerResponse(webResponse, serverResponse) {
+  if (!checkWritable(serverResponse)) {
+    return;
+  }
   if (!webResponse) {
     serverResponse.end();
     return;
   }
-  mergeIntoServerResponse(
-    // @ts-ignore getAll() is not standard https://fetch.spec.whatwg.org/#headers-class
-    toOutgoingHeaders(webResponse.headers),
-    serverResponse
-  );
+  if (!serverResponse.headersSent) {
+    mergeIntoServerResponse(
+      toOutgoingHeaders(webResponse.headers),
+      serverResponse
+    );
+  }
   serverResponse.statusCode = webResponse.status;
   serverResponse.statusMessage = webResponse.statusText;
   if (!webResponse.body) {
@@ -83,35 +96,31 @@ async function toServerResponse(webResponse, serverResponse) {
 }
 async function writeReadableStreamToWritable(stream, writable) {
   let reader = stream.getReader();
-  async function read() {
-    let { done, value } = await reader.read();
-    if (done) {
-      writable.end();
-      return;
-    }
-    writable.write(value);
-    let flushable = writable;
-    if (typeof flushable.flush === "function") {
-      flushable.flush();
-    }
-    await read();
-  }
+  let flushable = writable;
   try {
-    await read();
+    while (true) {
+      let { done, value } = await reader.read();
+      if (done) {
+        writable.end();
+        break;
+      }
+      writable.write(value);
+      if (typeof flushable.flush === "function") {
+        flushable.flush();
+      }
+    }
   } catch (error) {
     writable.destroy(error);
     throw error;
   }
 }
-function toMiddleware(webHandler, options) {
-  const toRequest = buildToRequest(dependencies);
-  const toFetchEvent = buildToFetchEvent(dependencies);
-  return async function middleware(incomingMessage, serverResponse, next) {
-    const request = toRequest(incomingMessage, options);
-    const webResponse = await webHandler(request, toFetchEvent(request));
-    await toServerResponse(webResponse, serverResponse);
-    await next();
-  };
+function checkWritable(serverResponse) {
+  if (serverResponse.writableEnded || serverResponse.finished)
+    return false;
+  const socket = serverResponse.socket;
+  if (!socket)
+    return true;
+  return socket.writable;
 }
 export {
   NodeAdapter as default

package/package.json

@@ -1,31 +1,25 @@
 {
   "name": "@web-widget/node",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "module",
   "exports": {
     ".": {
       "types": "./dist/node.d.ts",
       "require": "./dist/node.cjs",
       "default": "./dist/node.js"
-    },
-    "./koa": {
-      "types": "./dist/koa.d.ts",
-      "require": "./dist/koa.cjs",
-      "default": "./dist/koa.js"
     }
   },
   "files": [
     "dist/"
   ],
   "dependencies": {
-    "@edge-runtime/node-utils": "^2.1.2",
-    "@edge-runtime/primitives": "^3.0.4"
+    "@edge-runtime/node-utils": "^2.2.2",
+    "@edge-runtime/primitives": "^3.1.1"
   },
   "devDependencies": {
-    "@types/node": "^17.0.42",
-    "@types/koa": "^2.13.9",
-    "tsup": "^7.0.0",
-    "typescript": "^5.0.4"
+    "@types/node": "^17.0.45",
+    "tsup": "^7.2.0",
+    "typescript": "^5.2.2"
   },
   "engines": {
     "node": ">=18"

package/dist/koa.cjs

@@ -1,106 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/koa.ts
-var koa_exports = {};
-__export(koa_exports, {
-  default: () => NodeAdapter
-});
-module.exports = __toCommonJS(koa_exports);
-var import_node_utils = require("@edge-runtime/node-utils");
-var import_primitives = __toESM(require("@edge-runtime/primitives"), 1);
-if (!Reflect.get(global, "DISABLE_INSTALL_MCA_SHIMS")) {
-  Object.assign(global, import_primitives.default, { console });
-}
-var FetchEvent = class {
-  constructor(request) {
-    this.request = request;
-    this.response = null;
-    this.awaiting = /* @__PURE__ */ new Set();
-  }
-  respondWith(response) {
-    this.response = response;
-  }
-  waitUntil() {
-    throw new Error("waitUntil is not implemented yet for Node.js");
-  }
-};
-var dependencies = {
-  Headers,
-  ReadableStream,
-  // @ts-ignore
-  Request: class extends Request {
-    constructor(input, init) {
-      super(input, addDuplexToInit(init));
-    }
-  },
-  Uint8Array,
-  FetchEvent
-};
-var NodeAdapter = class {
-  #handler;
-  #middleware;
-  constructor(webRouter, options = {
-    defaultOrigin: webRouter?.options?.origin ?? "https://web-widget.js.org"
-  }) {
-    this.#handler = (0, import_node_utils.buildToNodeHandler)(
-      dependencies,
-      options
-    )(webRouter.handler);
-    const toRequest = (0, import_node_utils.buildToRequest)(dependencies);
-    const toFetchEvent = (0, import_node_utils.buildToFetchEvent)(dependencies);
-    this.#middleware = async (ctx, next) => {
-      const incomingMessage = ctx.req;
-      const request = toRequest(incomingMessage, options);
-      const response = await webRouter.handler(request, toFetchEvent(request));
-      ctx.status = response.status;
-      ctx.message = response.statusText;
-      ctx.set(
-        (0, import_node_utils.toOutgoingHeaders)(response.headers)
-      );
-      ctx.body = (0, import_node_utils.toToReadable)(response.body);
-      await next();
-    };
-  }
-  get middleware() {
-    return this.#middleware;
-  }
-  get handler() {
-    return this.#handler;
-  }
-  static get primitives() {
-    return import_primitives.default;
-  }
-};
-function addDuplexToInit(init) {
-  if (typeof init === "undefined" || typeof init === "object") {
-    return { duplex: "half", ...init };
-  }
-  return init;
-}

package/dist/koa.d.ts

@@ -1,22 +0,0 @@
-import primitives from '@edge-runtime/primitives';
-import { Middleware } from 'koa';
-export { Middleware } from 'koa';
-import { RequestOptions, WebHandler, NodeHandler } from '@edge-runtime/node-utils';
-
-interface NodeAdapterOptions extends RequestOptions {
-}
-
-declare class NodeAdapter {
-    #private;
-    constructor(webRouter: {
-        handler: WebHandler;
-        options?: {
-            origin?: string;
-        };
-    }, options?: NodeAdapterOptions);
-    get middleware(): Middleware;
-    get handler(): NodeHandler;
-    static get primitives(): typeof primitives;
-}
-
-export { NodeAdapterOptions, NodeAdapter as default };

package/dist/koa.js

@@ -1,81 +0,0 @@
-// src/koa.ts
-import {
-  buildToFetchEvent,
-  buildToNodeHandler,
-  buildToRequest,
-  toOutgoingHeaders,
-  toToReadable
-} from "@edge-runtime/node-utils";
-import primitives from "@edge-runtime/primitives";
-if (!Reflect.get(global, "DISABLE_INSTALL_MCA_SHIMS")) {
-  Object.assign(global, primitives, { console });
-}
-var FetchEvent = class {
-  constructor(request) {
-    this.request = request;
-    this.response = null;
-    this.awaiting = /* @__PURE__ */ new Set();
-  }
-  respondWith(response) {
-    this.response = response;
-  }
-  waitUntil() {
-    throw new Error("waitUntil is not implemented yet for Node.js");
-  }
-};
-var dependencies = {
-  Headers,
-  ReadableStream,
-  // @ts-ignore
-  Request: class extends Request {
-    constructor(input, init) {
-      super(input, addDuplexToInit(init));
-    }
-  },
-  Uint8Array,
-  FetchEvent
-};
-var NodeAdapter = class {
-  #handler;
-  #middleware;
-  constructor(webRouter, options = {
-    defaultOrigin: webRouter?.options?.origin ?? "https://web-widget.js.org"
-  }) {
-    this.#handler = buildToNodeHandler(
-      dependencies,
-      options
-    )(webRouter.handler);
-    const toRequest = buildToRequest(dependencies);
-    const toFetchEvent = buildToFetchEvent(dependencies);
-    this.#middleware = async (ctx, next) => {
-      const incomingMessage = ctx.req;
-      const request = toRequest(incomingMessage, options);
-      const response = await webRouter.handler(request, toFetchEvent(request));
-      ctx.status = response.status;
-      ctx.message = response.statusText;
-      ctx.set(
-        toOutgoingHeaders(response.headers)
-      );
-      ctx.body = toToReadable(response.body);
-      await next();
-    };
-  }
-  get middleware() {
-    return this.#middleware;
-  }
-  get handler() {
-    return this.#handler;
-  }
-  static get primitives() {
-    return primitives;
-  }
-};
-function addDuplexToInit(init) {
-  if (typeof init === "undefined" || typeof init === "object") {
-    return { duplex: "half", ...init };
-  }
-  return init;
-}
-export {
-  NodeAdapter as default
-};