@fedify/express 0.1.2 → 0.1.4-dev.8

package/README.md

@@ -34,6 +34,19 @@ app.use(integrateFederation(federation, (req) => "context data goes here"));
 Changelog
 ---------
 
+### Version 0.1.4
+
+To be released.
+
+### Version 0.1.3
+
+Released on August 5, 2024.
+
+ -  Fixed the middleware to not fill `Request.body` when the request method is
+    `GET` or `HEAD`.
+ -  Fixed the middleware to content-negotiate the response based on
+    the `Accept` header.
+
 ### Version 0.1.2
 
 Released on August 5, 2024.

package/dist/index.js

@@ -6,18 +6,36 @@ function integrateFederation(federation, contextDataFactory) {
     const contextData = contextDataFactory(req);
     const contextDataPromise = contextData instanceof Promise ? contextData : Promise.resolve(contextData);
     contextDataPromise.then(async (contextData2) => {
+      let notFound = false;
+      let notAcceptable = false;
       const response = await federation.fetch(request, {
         contextData: contextData2,
         onNotFound: () => {
+          notFound = true;
           next();
-          return new Response("", { status: 404 });
+          return new Response("Not found", { status: 404 });
         },
         onNotAcceptable: () => {
-          if (req.route != null) next();
-          return new Response("", { status: 406 });
+          notAcceptable = true;
+          next();
+          return new Response("Not acceptable", {
+            status: 406,
+            headers: {
+              "Content-Type": "text/plain",
+              Vary: "Accept"
+            }
+          });
         }
       });
-      setEResponse(res, response);
+      if (notFound || notAcceptable && req.route != null) return;
+      await setEResponse(res, response);
+      res.end();
+      res.status = () => res;
+      res.send = () => res;
+      res.end = () => res;
+      res.json = () => res;
+      res.removeHeader = () => res;
+      res.setHeader = () => res;
     });
   };
 }
@@ -34,16 +52,29 @@ function fromERequest(req) {
   return new Request(url, {
     method: req.method,
     headers,
-    body: Readable.toWeb(req)
+    duplex: "half",
+    body: req.method === "GET" || req.method === "HEAD" ? void 0 : Readable.toWeb(req)
   });
 }
 function setEResponse(res, response) {
   res.status(response.status);
   response.headers.forEach((value, key) => res.setHeader(key, value));
-  if (response.body == null) return;
-  Readable.fromWeb(response.body).pipe(res);
+  if (response.body == null) return Promise.resolve();
+  const body = response.body;
+  return new Promise((resolve) => {
+    const reader = body.getReader();
+    reader.read().then(function read({ done, value }) {
+      if (done) {
+        reader.releaseLock();
+        resolve();
+        return;
+      }
+      res.write(Buffer.from(value));
+      reader.read().then(read);
+    });
+  });
 }
 export {
   integrateFederation
 };
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyJpbXBvcnQgeyBSZWFkYWJsZSB9IGZyb20gXCJub2RlOnN0cmVhbVwiO1xuaW1wb3J0IHR5cGUgeyBSZWFkYWJsZVN0cmVhbSBhcyBXZWJSZWFkYWJsZVN0cmVhbSB9IGZyb20gXCJub2RlOnN0cmVhbS93ZWJcIjtcbmltcG9ydCB0eXBlIHsgRmVkZXJhdGlvbiB9IGZyb20gXCJAZmVkaWZ5L2ZlZGlmeVwiO1xuaW1wb3J0IHR5cGUge1xuICBSZXF1ZXN0IGFzIEVSZXF1ZXN0LFxuICBSZXNwb25zZSBhcyBFUmVzcG9uc2UsXG4gIE5leHRGdW5jdGlvbixcbn0gZnJvbSBcImV4cHJlc3NcIjtcblxudHlwZSBNaWRkbGV3YXJlID0gKHJlcTogRVJlcXVlc3QsIHJlczogRVJlc3BvbnNlLCBuZXh0OiBOZXh0RnVuY3Rpb24pID0+IHZvaWQ7XG5cbmV4cG9ydCB0eXBlIENvbnRleHREYXRhRmFjdG9yeTxUQ29udGV4dERhdGE+ID0gKFxuICByZXE6IEVSZXF1ZXN0LFxuKSA9PiBUQ29udGV4dERhdGEgfCBQcm9taXNlPFRDb250ZXh0RGF0YT47XG5cbmV4cG9ydCBmdW5jdGlvbiBpbnRlZ3JhdGVGZWRlcmF0aW9uPFRDb250ZXh0RGF0YT4oXG4gIGZlZGVyYXRpb246IEZlZGVyYXRpb248VENvbnRleHREYXRhPixcbiAgY29udGV4dERhdGFGYWN0b3J5OiBDb250ZXh0RGF0YUZhY3Rvcnk8VENvbnRleHREYXRhPixcbik6IE1pZGRsZXdhcmUge1xuICByZXR1cm4gKHJlcSwgcmVzLCBuZXh0KSA9PiB7XG4gICAgY29uc3QgcmVxdWVzdCA9IGZyb21FUmVxdWVzdChyZXEpO1xuICAgIGNvbnN0IGNvbnRleHREYXRhID0gY29udGV4dERhdGFGYWN0b3J5KHJlcSk7XG4gICAgY29uc3QgY29udGV4dERhdGFQcm9taXNlID1cbiAgICAgIGNvbnRleHREYXRhIGluc3RhbmNlb2YgUHJvbWlzZVxuICAgICAgICA/IGNvbnRleHREYXRhXG4gICAgICAgIDogUHJvbWlzZS5yZXNvbHZlKGNvbnRleHREYXRhKTtcbiAgICBjb250ZXh0RGF0YVByb21pc2UudGhlbihhc3luYyAoY29udGV4dERhdGEpID0+IHtcbiAgICAgIGNvbnN0IHJlc3BvbnNlID0gYXdhaXQgZmVkZXJhdGlvbi5mZXRjaChyZXF1ZXN0LCB7XG4gICAgICAgIGNvbnRleHREYXRhLFxuICAgICAgICBvbk5vdEZvdW5kOiAoKSA9PiB7XG4gICAgICAgICAgLy8gSWYgdGhlIGBmZWRlcmF0aW9uYCBvYmplY3QgZmluZHMgYSByZXF1ZXN0IG5vdCByZXNwb25zaWJsZSBmb3IgaXRcbiAgICAgICAgICAvLyAoaS5lLiwgbm90IGEgZmVkZXJhdGlvbi1yZWxhdGVkIHJlcXVlc3QpLCBpdCB3aWxsIGNhbGwgdGhlIGBuZXh0YFxuICAgICAgICAgIC8vIGZ1bmN0aW9uIHByb3ZpZGVkIGJ5IHRoZSBFeHByZXNzIGZyYW1ld29yayB0byBjb250aW51ZSB0aGUgcmVxdWVzdFxuICAgICAgICAgIC8vIGhhbmRsaW5nIGJ5IHRoZSBFeHByZXNzOlxuICAgICAgICAgIG5leHQoKTtcbiAgICAgICAgICByZXR1cm4gbmV3IFJlc3BvbnNlKFwiXCIsIHsgc3RhdHVzOiA0MDQgfSk7IC8vIHVudXNlZFxuICAgICAgICB9LFxuICAgICAgICBvbk5vdEFjY2VwdGFibGU6ICgpID0+IHtcbiAgICAgICAgICAvLyBTaW1pbGFyIHRvIGBvbk5vdEZvdW5kYCwgYnV0IHNsaWdodGx5IG1vcmUgdHJpY2t5LlxuICAgICAgICAgIC8vIFdoZW4gdGhlIGBmZWRlcmF0aW9uYCBvYmplY3QgZmluZHMgYSByZXF1ZXN0IG5vdCBhY2NlcHRhYmxlXG4gICAgICAgICAgLy8gdHlwZS13aXNlIChpLmUuLCBhIHVzZXItYWdlbnQgZG9lc24ndCB3YW50IEpTT04tTEQpLCBpdCB3aWxsIGNhbGxcbiAgICAgICAgICAvLyB0aGUgYG5leHRgIGZ1bmN0aW9uIHByb3ZpZGVkIGJ5IHRoZSBFeHByZXNzIGZyYW1ld29yayB0byBjb250aW51ZVxuICAgICAgICAgIC8vIGlmIGFueSByb3V0ZSBpcyBtYXRjaGVkLCBhbmQgb3RoZXJ3aXNlLCBpdCB3aWxsIHJldHVybiBhIDQwNiBOb3RcbiAgICAgICAgICAvLyBBY2NlcHRhYmxlIHJlc3BvbnNlOlxuICAgICAgICAgIGlmIChyZXEucm91dGUgIT0gbnVsbCkgbmV4dCgpO1xuICAgICAgICAgIHJldHVybiBuZXcgUmVzcG9uc2UoXCJcIiwgeyBzdGF0dXM6IDQwNiB9KTtcbiAgICAgICAgfSxcbiAgICAgIH0pO1xuICAgICAgc2V0RVJlc3BvbnNlKHJlcywgcmVzcG9uc2UpO1xuICAgIH0pO1xuICB9O1xufVxuXG5mdW5jdGlvbiBmcm9tRVJlcXVlc3QocmVxOiBFUmVxdWVzdCk6IFJlcXVlc3Qge1xuICBjb25zdCB1cmwgPSBgJHtyZXEucHJvdG9jb2x9Oi8vJHtyZXEuaGVhZGVyKFwiSG9zdFwiKSA/PyByZXEuaG9zdG5hbWV9JHtyZXEudXJsfWA7XG4gIGNvbnN0IGhlYWRlcnMgPSBuZXcgSGVhZGVycygpO1xuICBmb3IgKGNvbnN0IFtrZXksIHZhbHVlXSBvZiBPYmplY3QuZW50cmllcyhyZXEuaGVhZGVycykpIHtcbiAgICBpZiAoQXJyYXkuaXNBcnJheSh2YWx1ZSkpIHtcbiAgICAgIGZvciAoY29uc3QgdiBvZiB2YWx1ZSkgaGVhZGVycy5hcHBlbmQoa2V5LCB2KTtcbiAgICB9IGVsc2UgaWYgKHR5cGVvZiB2YWx1ZSA9PT0gXCJzdHJpbmdcIikge1xuICAgICAgaGVhZGVycy5hcHBlbmQoa2V5LCB2YWx1ZSk7XG4gICAgfVxuICB9XG4gIHJldHVybiBuZXcgUmVxdWVzdCh1cmwsIHtcbiAgICBtZXRob2Q6IHJlcS5tZXRob2QsXG4gICAgaGVhZGVycyxcbiAgICBib2R5OiBSZWFkYWJsZS50b1dlYihyZXEpIGFzIFJlYWRhYmxlU3RyZWFtPFVpbnQ4QXJyYXk+LFxuICB9KTtcbn1cblxuZnVuY3Rpb24gc2V0RVJlc3BvbnNlKHJlczogRVJlc3BvbnNlLCByZXNwb25zZTogUmVzcG9uc2UpOiB2b2lkIHtcbiAgcmVzLnN0YXR1cyhyZXNwb25zZS5zdGF0dXMpO1xuICByZXNwb25zZS5oZWFkZXJzLmZvckVhY2goKHZhbHVlLCBrZXkpID0+IHJlcy5zZXRIZWFkZXIoa2V5LCB2YWx1ZSkpO1xuICBpZiAocmVzcG9uc2UuYm9keSA9PSBudWxsKSByZXR1cm47XG4gIC8vIGJpb21lLWlnbm9yZSBsaW50L3N1c3BpY2lvdXMvbm9FeHBsaWNpdEFueTogUmVhZGFibGUuZnJvbVdlYiBpcyB1bnR5cGVkXG4gIFJlYWRhYmxlLmZyb21XZWIocmVzcG9uc2UuYm9keSBhcyBXZWJSZWFkYWJsZVN0cmVhbTxhbnk+KS5waXBlKHJlcyk7XG59XG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQUEsU0FBUyxnQkFBZ0I7QUFlbEIsU0FBUyxvQkFDZCxZQUNBLG9CQUNZO0FBQ1osU0FBTyxDQUFDLEtBQUssS0FBSyxTQUFTO0FBQ3pCLFVBQU0sVUFBVSxhQUFhLEdBQUc7QUFDaEMsVUFBTSxjQUFjLG1CQUFtQixHQUFHO0FBQzFDLFVBQU0scUJBQ0osdUJBQXVCLFVBQ25CLGNBQ0EsUUFBUSxRQUFRLFdBQVc7QUFDakMsdUJBQW1CLEtBQUssT0FBT0EsaUJBQWdCO0FBQzdDLFlBQU0sV0FBVyxNQUFNLFdBQVcsTUFBTSxTQUFTO0FBQUEsUUFDL0MsYUFBQUE7QUFBQSxRQUNBLFlBQVksTUFBTTtBQUtoQixlQUFLO0FBQ0wsaUJBQU8sSUFBSSxTQUFTLElBQUksRUFBRSxRQUFRLElBQUksQ0FBQztBQUFBLFFBQ3pDO0FBQUEsUUFDQSxpQkFBaUIsTUFBTTtBQU9yQixjQUFJLElBQUksU0FBUyxLQUFNLE1BQUs7QUFDNUIsaUJBQU8sSUFBSSxTQUFTLElBQUksRUFBRSxRQUFRLElBQUksQ0FBQztBQUFBLFFBQ3pDO0FBQUEsTUFDRixDQUFDO0FBQ0QsbUJBQWEsS0FBSyxRQUFRO0FBQUEsSUFDNUIsQ0FBQztBQUFBLEVBQ0g7QUFDRjtBQUVBLFNBQVMsYUFBYSxLQUF3QjtBQUM1QyxRQUFNLE1BQU0sR0FBRyxJQUFJLFFBQVEsTUFBTSxJQUFJLE9BQU8sTUFBTSxLQUFLLElBQUksUUFBUSxHQUFHLElBQUksR0FBRztBQUM3RSxRQUFNLFVBQVUsSUFBSSxRQUFRO0FBQzVCLGFBQVcsQ0FBQyxLQUFLLEtBQUssS0FBSyxPQUFPLFFBQVEsSUFBSSxPQUFPLEdBQUc7QUFDdEQsUUFBSSxNQUFNLFFBQVEsS0FBSyxHQUFHO0FBQ3hCLGlCQUFXLEtBQUssTUFBTyxTQUFRLE9BQU8sS0FBSyxDQUFDO0FBQUEsSUFDOUMsV0FBVyxPQUFPLFVBQVUsVUFBVTtBQUNwQyxjQUFRLE9BQU8sS0FBSyxLQUFLO0FBQUEsSUFDM0I7QUFBQSxFQUNGO0FBQ0EsU0FBTyxJQUFJLFFBQVEsS0FBSztBQUFBLElBQ3RCLFFBQVEsSUFBSTtBQUFBLElBQ1o7QUFBQSxJQUNBLE1BQU0sU0FBUyxNQUFNLEdBQUc7QUFBQSxFQUMxQixDQUFDO0FBQ0g7QUFFQSxTQUFTLGFBQWEsS0FBZ0IsVUFBMEI7QUFDOUQsTUFBSSxPQUFPLFNBQVMsTUFBTTtBQUMxQixXQUFTLFFBQVEsUUFBUSxDQUFDLE9BQU8sUUFBUSxJQUFJLFVBQVUsS0FBSyxLQUFLLENBQUM7QUFDbEUsTUFBSSxTQUFTLFFBQVEsS0FBTTtBQUUzQixXQUFTLFFBQVEsU0FBUyxJQUE4QixFQUFFLEtBQUssR0FBRztBQUNwRTsiLAogICJuYW1lcyI6IFsiY29udGV4dERhdGEiXQp9Cg==
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2luZGV4LnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyJpbXBvcnQgeyBSZWFkYWJsZSB9IGZyb20gXCJub2RlOnN0cmVhbVwiO1xuaW1wb3J0IHR5cGUgeyBGZWRlcmF0aW9uIH0gZnJvbSBcIkBmZWRpZnkvZmVkaWZ5XCI7XG5pbXBvcnQgdHlwZSB7XG4gIFJlcXVlc3QgYXMgRVJlcXVlc3QsXG4gIFJlc3BvbnNlIGFzIEVSZXNwb25zZSxcbiAgTmV4dEZ1bmN0aW9uLFxufSBmcm9tIFwiZXhwcmVzc1wiO1xuXG50eXBlIE1pZGRsZXdhcmUgPSAocmVxOiBFUmVxdWVzdCwgcmVzOiBFUmVzcG9uc2UsIG5leHQ6IE5leHRGdW5jdGlvbikgPT4gdm9pZDtcblxuZXhwb3J0IHR5cGUgQ29udGV4dERhdGFGYWN0b3J5PFRDb250ZXh0RGF0YT4gPSAoXG4gIHJlcTogRVJlcXVlc3QsXG4pID0+IFRDb250ZXh0RGF0YSB8IFByb21pc2U8VENvbnRleHREYXRhPjtcblxuZXhwb3J0IGZ1bmN0aW9uIGludGVncmF0ZUZlZGVyYXRpb248VENvbnRleHREYXRhPihcbiAgZmVkZXJhdGlvbjogRmVkZXJhdGlvbjxUQ29udGV4dERhdGE+LFxuICBjb250ZXh0RGF0YUZhY3Rvcnk6IENvbnRleHREYXRhRmFjdG9yeTxUQ29udGV4dERhdGE+LFxuKTogTWlkZGxld2FyZSB7XG4gIHJldHVybiAocmVxLCByZXMsIG5leHQpID0+IHtcbiAgICBjb25zdCByZXF1ZXN0ID0gZnJvbUVSZXF1ZXN0KHJlcSk7XG4gICAgY29uc3QgY29udGV4dERhdGEgPSBjb250ZXh0RGF0YUZhY3RvcnkocmVxKTtcbiAgICBjb25zdCBjb250ZXh0RGF0YVByb21pc2UgPVxuICAgICAgY29udGV4dERhdGEgaW5zdGFuY2VvZiBQcm9taXNlXG4gICAgICAgID8gY29udGV4dERhdGFcbiAgICAgICAgOiBQcm9taXNlLnJlc29sdmUoY29udGV4dERhdGEpO1xuICAgIGNvbnRleHREYXRhUHJvbWlzZS50aGVuKGFzeW5jIChjb250ZXh0RGF0YSkgPT4ge1xuICAgICAgbGV0IG5vdEZvdW5kID0gZmFsc2U7XG4gICAgICBsZXQgbm90QWNjZXB0YWJsZSA9IGZhbHNlO1xuICAgICAgY29uc3QgcmVzcG9uc2UgPSBhd2FpdCBmZWRlcmF0aW9uLmZldGNoKHJlcXVlc3QsIHtcbiAgICAgICAgY29udGV4dERhdGEsXG4gICAgICAgIG9uTm90Rm91bmQ6ICgpID0+IHtcbiAgICAgICAgICAvLyBJZiB0aGUgYGZlZGVyYXRpb25gIG9iamVjdCBmaW5kcyBhIHJlcXVlc3Qgbm90IHJlc3BvbnNpYmxlIGZvciBpdFxuICAgICAgICAgIC8vIChpLmUuLCBub3QgYSBmZWRlcmF0aW9uLXJlbGF0ZWQgcmVxdWVzdCksIGl0IHdpbGwgY2FsbCB0aGUgYG5leHRgXG4gICAgICAgICAgLy8gZnVuY3Rpb24gcHJvdmlkZWQgYnkgdGhlIEV4cHJlc3MgZnJhbWV3b3JrIHRvIGNvbnRpbnVlIHRoZSByZXF1ZXN0XG4gICAgICAgICAgLy8gaGFuZGxpbmcgYnkgdGhlIEV4cHJlc3M6XG4gICAgICAgICAgbm90Rm91bmQgPSB0cnVlO1xuICAgICAgICAgIG5leHQoKTtcbiAgICAgICAgICByZXR1cm4gbmV3IFJlc3BvbnNlKFwiTm90IGZvdW5kXCIsIHsgc3RhdHVzOiA0MDQgfSk7IC8vIHVudXNlZFxuICAgICAgICB9LFxuICAgICAgICBvbk5vdEFjY2VwdGFibGU6ICgpID0+IHtcbiAgICAgICAgICAvLyBTaW1pbGFyIHRvIGBvbk5vdEZvdW5kYCwgYnV0IHNsaWdodGx5IG1vcmUgdHJpY2t5LlxuICAgICAgICAgIC8vIFdoZW4gdGhlIGBmZWRlcmF0aW9uYCBvYmplY3QgZmluZHMgYSByZXF1ZXN0IG5vdCBhY2NlcHRhYmxlXG4gICAgICAgICAgLy8gdHlwZS13aXNlIChpLmUuLCBhIHVzZXItYWdlbnQgZG9lc24ndCB3YW50IEpTT04tTEQpLCBpdCB3aWxsIGNhbGxcbiAgICAgICAgICAvLyB0aGUgYG5leHRgIGZ1bmN0aW9uIHByb3ZpZGVkIGJ5IHRoZSBFeHByZXNzIGZyYW1ld29yayB0byBjb250aW51ZVxuICAgICAgICAgIC8vIGlmIGFueSByb3V0ZSBpcyBtYXRjaGVkLCBhbmQgb3RoZXJ3aXNlLCBpdCB3aWxsIHJldHVybiBhIDQwNiBOb3RcbiAgICAgICAgICAvLyBBY2NlcHRhYmxlIHJlc3BvbnNlOlxuICAgICAgICAgIG5vdEFjY2VwdGFibGUgPSB0cnVlO1xuICAgICAgICAgIG5leHQoKTtcbiAgICAgICAgICByZXR1cm4gbmV3IFJlc3BvbnNlKFwiTm90IGFjY2VwdGFibGVcIiwge1xuICAgICAgICAgICAgc3RhdHVzOiA0MDYsXG4gICAgICAgICAgICBoZWFkZXJzOiB7XG4gICAgICAgICAgICAgIFwiQ29udGVudC1UeXBlXCI6IFwidGV4dC9wbGFpblwiLFxuICAgICAgICAgICAgICBWYXJ5OiBcIkFjY2VwdFwiLFxuICAgICAgICAgICAgfSxcbiAgICAgICAgICB9KTtcbiAgICAgICAgfSxcbiAgICAgIH0pO1xuICAgICAgaWYgKG5vdEZvdW5kIHx8IChub3RBY2NlcHRhYmxlICYmIHJlcS5yb3V0ZSAhPSBudWxsKSkgcmV0dXJuO1xuICAgICAgYXdhaXQgc2V0RVJlc3BvbnNlKHJlcywgcmVzcG9uc2UpO1xuICAgICAgLy8gUHJldmVudCB0aGUgRXhwcmVzcyBmcmFtZXdvcmsgZnJvbSBzZW5kaW5nIHRoZSByZXNwb25zZSBhZ2FpbjpcbiAgICAgIHJlcy5lbmQoKTtcbiAgICAgIHJlcy5zdGF0dXMgPSAoKSA9PiByZXM7XG4gICAgICByZXMuc2VuZCA9ICgpID0+IHJlcztcbiAgICAgIHJlcy5lbmQgPSAoKSA9PiByZXM7XG4gICAgICByZXMuanNvbiA9ICgpID0+IHJlcztcbiAgICAgIHJlcy5yZW1vdmVIZWFkZXIgPSAoKSA9PiByZXM7XG4gICAgICByZXMuc2V0SGVhZGVyID0gKCkgPT4gcmVzO1xuICAgIH0pO1xuICB9O1xufVxuXG5mdW5jdGlvbiBmcm9tRVJlcXVlc3QocmVxOiBFUmVxdWVzdCk6IFJlcXVlc3Qge1xuICBjb25zdCB1cmwgPSBgJHtyZXEucHJvdG9jb2x9Oi8vJHtyZXEuaGVhZGVyKFwiSG9zdFwiKSA/PyByZXEuaG9zdG5hbWV9JHtyZXEudXJsfWA7XG4gIGNvbnN0IGhlYWRlcnMgPSBuZXcgSGVhZGVycygpO1xuICBmb3IgKGNvbnN0IFtrZXksIHZhbHVlXSBvZiBPYmplY3QuZW50cmllcyhyZXEuaGVhZGVycykpIHtcbiAgICBpZiAoQXJyYXkuaXNBcnJheSh2YWx1ZSkpIHtcbiAgICAgIGZvciAoY29uc3QgdiBvZiB2YWx1ZSkgaGVhZGVycy5hcHBlbmQoa2V5LCB2KTtcbiAgICB9IGVsc2UgaWYgKHR5cGVvZiB2YWx1ZSA9PT0gXCJzdHJpbmdcIikge1xuICAgICAgaGVhZGVycy5hcHBlbmQoa2V5LCB2YWx1ZSk7XG4gICAgfVxuICB9XG4gIHJldHVybiBuZXcgUmVxdWVzdCh1cmwsIHtcbiAgICBtZXRob2Q6IHJlcS5tZXRob2QsXG4gICAgaGVhZGVycyxcbiAgICBkdXBsZXg6IFwiaGFsZlwiLFxuICAgIGJvZHk6XG4gICAgICByZXEubWV0aG9kID09PSBcIkdFVFwiIHx8IHJlcS5tZXRob2QgPT09IFwiSEVBRFwiXG4gICAgICAgID8gdW5kZWZpbmVkXG4gICAgICAgIDogKFJlYWRhYmxlLnRvV2ViKHJlcSkpLFxuICB9KTtcbn1cblxuZnVuY3Rpb24gc2V0RVJlc3BvbnNlKHJlczogRVJlc3BvbnNlLCByZXNwb25zZTogUmVzcG9uc2UpOiBQcm9taXNlPHZvaWQ+IHtcbiAgcmVzLnN0YXR1cyhyZXNwb25zZS5zdGF0dXMpO1xuICByZXNwb25zZS5oZWFkZXJzLmZvckVhY2goKHZhbHVlLCBrZXkpID0+IHJlcy5zZXRIZWFkZXIoa2V5LCB2YWx1ZSkpO1xuICBpZiAocmVzcG9uc2UuYm9keSA9PSBudWxsKSByZXR1cm4gUHJvbWlzZS5yZXNvbHZlKCk7XG4gIGNvbnN0IGJvZHkgPSByZXNwb25zZS5ib2R5O1xuICByZXR1cm4gbmV3IFByb21pc2UoKHJlc29sdmUpID0+IHtcbiAgICBjb25zdCByZWFkZXIgPSBib2R5LmdldFJlYWRlcigpO1xuICAgIHJlYWRlci5yZWFkKCkudGhlbihmdW5jdGlvbiByZWFkKHsgZG9uZSwgdmFsdWUgfSkge1xuICAgICAgaWYgKGRvbmUpIHtcbiAgICAgICAgcmVhZGVyLnJlbGVhc2VMb2NrKCk7XG4gICAgICAgIHJlc29sdmUoKTtcbiAgICAgICAgcmV0dXJuO1xuICAgICAgfVxuICAgICAgcmVzLndyaXRlKEJ1ZmZlci5mcm9tKHZhbHVlKSk7XG4gICAgICByZWFkZXIucmVhZCgpLnRoZW4ocmVhZCk7XG4gICAgfSk7XG4gIH0pO1xufVxuIl0sCiAgIm1hcHBpbmdzIjogIjtBQUFBLFNBQVMsZ0JBQWdCO0FBY2xCLFNBQVMsb0JBQ2QsWUFDQSxvQkFDWTtBQUNaLFNBQU8sQ0FBQyxLQUFLLEtBQUssU0FBUztBQUN6QixVQUFNLFVBQVUsYUFBYSxHQUFHO0FBQ2hDLFVBQU0sY0FBYyxtQkFBbUIsR0FBRztBQUMxQyxVQUFNLHFCQUNKLHVCQUF1QixVQUNuQixjQUNBLFFBQVEsUUFBUSxXQUFXO0FBQ2pDLHVCQUFtQixLQUFLLE9BQU9BLGlCQUFnQjtBQUM3QyxVQUFJLFdBQVc7QUFDZixVQUFJLGdCQUFnQjtBQUNwQixZQUFNLFdBQVcsTUFBTSxXQUFXLE1BQU0sU0FBUztBQUFBLFFBQy9DLGFBQUFBO0FBQUEsUUFDQSxZQUFZLE1BQU07QUFLaEIscUJBQVc7QUFDWCxlQUFLO0FBQ0wsaUJBQU8sSUFBSSxTQUFTLGFBQWEsRUFBRSxRQUFRLElBQUksQ0FBQztBQUFBLFFBQ2xEO0FBQUEsUUFDQSxpQkFBaUIsTUFBTTtBQU9yQiwwQkFBZ0I7QUFDaEIsZUFBSztBQUNMLGlCQUFPLElBQUksU0FBUyxrQkFBa0I7QUFBQSxZQUNwQyxRQUFRO0FBQUEsWUFDUixTQUFTO0FBQUEsY0FDUCxnQkFBZ0I7QUFBQSxjQUNoQixNQUFNO0FBQUEsWUFDUjtBQUFBLFVBQ0YsQ0FBQztBQUFBLFFBQ0g7QUFBQSxNQUNGLENBQUM7QUFDRCxVQUFJLFlBQWEsaUJBQWlCLElBQUksU0FBUyxLQUFPO0FBQ3RELFlBQU0sYUFBYSxLQUFLLFFBQVE7QUFFaEMsVUFBSSxJQUFJO0FBQ1IsVUFBSSxTQUFTLE1BQU07QUFDbkIsVUFBSSxPQUFPLE1BQU07QUFDakIsVUFBSSxNQUFNLE1BQU07QUFDaEIsVUFBSSxPQUFPLE1BQU07QUFDakIsVUFBSSxlQUFlLE1BQU07QUFDekIsVUFBSSxZQUFZLE1BQU07QUFBQSxJQUN4QixDQUFDO0FBQUEsRUFDSDtBQUNGO0FBRUEsU0FBUyxhQUFhLEtBQXdCO0FBQzVDLFFBQU0sTUFBTSxHQUFHLElBQUksUUFBUSxNQUFNLElBQUksT0FBTyxNQUFNLEtBQUssSUFBSSxRQUFRLEdBQUcsSUFBSSxHQUFHO0FBQzdFLFFBQU0sVUFBVSxJQUFJLFFBQVE7QUFDNUIsYUFBVyxDQUFDLEtBQUssS0FBSyxLQUFLLE9BQU8sUUFBUSxJQUFJLE9BQU8sR0FBRztBQUN0RCxRQUFJLE1BQU0sUUFBUSxLQUFLLEdBQUc7QUFDeEIsaUJBQVcsS0FBSyxNQUFPLFNBQVEsT0FBTyxLQUFLLENBQUM7QUFBQSxJQUM5QyxXQUFXLE9BQU8sVUFBVSxVQUFVO0FBQ3BDLGNBQVEsT0FBTyxLQUFLLEtBQUs7QUFBQSxJQUMzQjtBQUFBLEVBQ0Y7QUFDQSxTQUFPLElBQUksUUFBUSxLQUFLO0FBQUEsSUFDdEIsUUFBUSxJQUFJO0FBQUEsSUFDWjtBQUFBLElBQ0EsUUFBUTtBQUFBLElBQ1IsTUFDRSxJQUFJLFdBQVcsU0FBUyxJQUFJLFdBQVcsU0FDbkMsU0FDQyxTQUFTLE1BQU0sR0FBRztBQUFBLEVBQzNCLENBQUM7QUFDSDtBQUVBLFNBQVMsYUFBYSxLQUFnQixVQUFtQztBQUN2RSxNQUFJLE9BQU8sU0FBUyxNQUFNO0FBQzFCLFdBQVMsUUFBUSxRQUFRLENBQUMsT0FBTyxRQUFRLElBQUksVUFBVSxLQUFLLEtBQUssQ0FBQztBQUNsRSxNQUFJLFNBQVMsUUFBUSxLQUFNLFFBQU8sUUFBUSxRQUFRO0FBQ2xELFFBQU0sT0FBTyxTQUFTO0FBQ3RCLFNBQU8sSUFBSSxRQUFRLENBQUMsWUFBWTtBQUM5QixVQUFNLFNBQVMsS0FBSyxVQUFVO0FBQzlCLFdBQU8sS0FBSyxFQUFFLEtBQUssU0FBUyxLQUFLLEVBQUUsTUFBTSxNQUFNLEdBQUc7QUFDaEQsVUFBSSxNQUFNO0FBQ1IsZUFBTyxZQUFZO0FBQ25CLGdCQUFRO0FBQ1I7QUFBQSxNQUNGO0FBQ0EsVUFBSSxNQUFNLE9BQU8sS0FBSyxLQUFLLENBQUM7QUFDNUIsYUFBTyxLQUFLLEVBQUUsS0FBSyxJQUFJO0FBQUEsSUFDekIsQ0FBQztBQUFBLEVBQ0gsQ0FBQztBQUNIOyIsCiAgIm5hbWVzIjogWyJjb250ZXh0RGF0YSJdCn0K

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@fedify/express",
-  "version": "0.1.2",
+  "version": "0.1.4-dev.8+334b0876",
   "description": "Integrate Fedify with Express",
-  "keywords": ["Fedify", "Express", "Express.js"],
+  "keywords": [
+    "Fedify",
+    "Express",
+    "Express.js"
+  ],
   "author": {
     "name": "Hong Minhee",
     "email": "hong@minhee.org",
@@ -32,7 +36,9 @@
       }
     }
   },
-  "files": ["src/", "dist/"],
+  "files": [
+    "dist/"
+  ],
   "devDependencies": {
     "@biomejs/biome": "1.8.3",
     "@types/express": ">=4.0.0, <5",

package/src/index.ts

@@ -1,77 +0,0 @@
-import { Readable } from "node:stream";
-import type { ReadableStream as WebReadableStream } from "node:stream/web";
-import type { Federation } from "@fedify/fedify";
-import type {
-  Request as ERequest,
-  Response as EResponse,
-  NextFunction,
-} from "express";
-
-type Middleware = (req: ERequest, res: EResponse, next: NextFunction) => void;
-
-export type ContextDataFactory<TContextData> = (
-  req: ERequest,
-) => TContextData | Promise<TContextData>;
-
-export function integrateFederation<TContextData>(
-  federation: Federation<TContextData>,
-  contextDataFactory: ContextDataFactory<TContextData>,
-): Middleware {
-  return (req, res, next) => {
-    const request = fromERequest(req);
-    const contextData = contextDataFactory(req);
-    const contextDataPromise =
-      contextData instanceof Promise
-        ? contextData
-        : Promise.resolve(contextData);
-    contextDataPromise.then(async (contextData) => {
-      const response = await federation.fetch(request, {
-        contextData,
-        onNotFound: () => {
-          // If the `federation` object finds a request not responsible for it
-          // (i.e., not a federation-related request), it will call the `next`
-          // function provided by the Express framework to continue the request
-          // handling by the Express:
-          next();
-          return new Response("", { status: 404 }); // unused
-        },
-        onNotAcceptable: () => {
-          // Similar to `onNotFound`, but slightly more tricky.
-          // When the `federation` object finds a request not acceptable
-          // type-wise (i.e., a user-agent doesn't want JSON-LD), it will call
-          // the `next` function provided by the Express framework to continue
-          // if any route is matched, and otherwise, it will return a 406 Not
-          // Acceptable response:
-          if (req.route != null) next();
-          return new Response("", { status: 406 });
-        },
-      });
-      setEResponse(res, response);
-    });
-  };
-}
-
-function fromERequest(req: ERequest): Request {
-  const url = `${req.protocol}://${req.header("Host") ?? req.hostname}${req.url}`;
-  const headers = new Headers();
-  for (const [key, value] of Object.entries(req.headers)) {
-    if (Array.isArray(value)) {
-      for (const v of value) headers.append(key, v);
-    } else if (typeof value === "string") {
-      headers.append(key, value);
-    }
-  }
-  return new Request(url, {
-    method: req.method,
-    headers,
-    body: Readable.toWeb(req) as ReadableStream<Uint8Array>,
-  });
-}
-
-function setEResponse(res: EResponse, response: Response): void {
-  res.status(response.status);
-  response.headers.forEach((value, key) => res.setHeader(key, value));
-  if (response.body == null) return;
-  // biome-ignore lint/suspicious/noExplicitAny: Readable.fromWeb is untyped
-  Readable.fromWeb(response.body as WebReadableStream<any>).pipe(res);
-}