feat(Worker): add cf-* headers to request

app/__tests__/server_spec.js

@@ -50,4 +50,24 @@ describe("server", () => {
       .expect(200, "goodbye")
       .then(() => done());
   });
+
+  it('Builds request with cf-* headers', done => {
+    const app = createApp(
+      `addEventListener('fetch', e => e.respondWith(new Response('hello', {
+        status: 201,
+        headers: e.request.headers // echo request headers
+      })))`
+    );
+
+    supertest(app)
+      .get("/some-route")
+      .expect(201, "hello")
+      .expect('cf-connecting-ip', /^\d+\.\d+\.\d+\.\d+$/)
+      .expect('cf-ipcountry', 'XX')
+      .expect('cf-ray', '0000000000000000')
+      .expect('cf-visitor', '{"scheme":"http"}')
+      .expect('x-forwarded-proto', 'http')
+      .expect('x-real-ip', /^\d+\.\d+\.\d+\.\d+$/)
+      .then(() => done());
+  });
 });

app/__tests__/worker_spec.js

@@ -1,4 +1,5 @@
 const express = require("express");
+const { Request } = require("node-fetch");
 const { Worker } = require("../worker");
 const { InMemoryKVStore } = require("../in-memory-kv-store");
 
@@ -94,7 +95,7 @@ describe("Workers", () => {
 
   test("It can stub out responses", async () => {
     const worker = new Worker("foo.com", 'addEventListener("fetch", (e) => e.respondWith(new Response("hello")))');
-    const response = await worker.executeFetchEvent("http://foo.com");
+    const response = await worker.executeFetchEvent(new Request("http://foo.com"));
     expect(response.status).toBe(200);
     expect(await response.text()).toBe("hello");
   });
@@ -118,31 +119,31 @@ describe("Workers", () => {
 
     test("It Fetches Correctly", async done => {
       const worker = new Worker(upstreamHost, "", { upstreamHost: upstreamHost });
-      const response = await worker.executeFetchEvent(`http://${upstreamHost}/success`);
+      const response = await worker.executeFetchEvent(new Request(`http://${upstreamHost}/success`));
       expect(response.status).toBe(200);
       expect(await response.text()).toBe("OK");
       done();
     });
 
     test("It does not follow redirects", async done => {
       const worker = new Worker(upstreamHost, "", { upstreamHost: upstreamHost });
-      const response = await worker.executeFetchEvent(`http://${upstreamHost}/redirect`);
+      const response = await worker.executeFetchEvent(new Request(`http://${upstreamHost}/redirect`));
       expect(response.status).toBe(301);
       expect(response.headers.get("Location")).toBe("https://www.google.com/");
       done();
     });
 
     test("The worker forwards the request upstream", async done => {
       const worker = new Worker("foo.com", "", { upstreamHost: upstreamHost });
-      const response = await worker.executeFetchEvent(`http://foo.com/success`);
+      const response = await worker.executeFetchEvent(new Request(`http://foo.com/success`));
       expect(response.status).toBe(200);
       expect(await response.text()).toBe("OK");
       done();
     });
 
     test("The worker does not keeps the host the same", async done => {
       const worker = new Worker("foo.com", "", { upstreamHost: upstreamHost });
-      const response = await worker.executeFetchEvent(`http://foo.com/host`);
+      const response = await worker.executeFetchEvent(new Request(`http://foo.com/host`));
       expect(response.status).toBe(200);
       expect(await response.text()).toBe("foo.com");
       done();
@@ -154,7 +155,7 @@ describe("Workers", () => {
         `addEventListener("fetch", (e) => e.respondWith(fetch("http://${upstreamHost}/host")))`,
         { upstreamHost: null }
       );
-      const response = await worker.executeFetchEvent(`http://foo.com/host`);
+      const response = await worker.executeFetchEvent(new Request(`http://foo.com/host`));
       expect(response.status).toBe(200);
       expect(await response.text()).toBe(upstreamHost);
       done();
@@ -168,7 +169,7 @@ describe("Workers", () => {
         { kvStores: ["MYSTORE"], kvStoreFactory: kvStoreFactory }
       );
 
-      const response = await worker.executeFetchEvent(`http://foo.com/blah`);
+      const response = await worker.executeFetchEvent(new Request(`http://foo.com/blah`));
       expect(response.status).toBe(200);
       expect(await response.text()).toBe("foo");
       expect(await kvStoreFactory.getClient("MYSTORE").get("foo")).toBe("bar");

app/server.js

@@ -1,16 +1,30 @@
 const express = require("express");
+const { Request } = require("node-fetch");
 const bodyParser = require("body-parser");
 const { Worker } = require("./worker");
 const { InMemoryKVStore } = require("./in-memory-kv-store");
 
-async function callWorker(worker, req, res) {
-  const url = req.protocol + "://" + req.get("host") + req.originalUrl;
-
-  const response = await worker.executeFetchEvent(url, {
-    headers: req.headers,
+function buildRequest(req) {
+  const url = `${req.protocol}://${req.get('host')}${req.originalUrl}`;
+  const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress.split(':').pop();
+  return new Request(url, {
+    headers: {
+      ...req.headers,
+      'cf-connecting-ip': ip,
+      'cf-ipcountry': 'XX',
+      'cf-ray': '0000000000000000',
+      'cf-visitor': JSON.stringify({ scheme: req.protocol }),
+      'x-forwarded-proto': req.protocol,
+      'x-real-ip': ip
+    },
     method: req.method,
-    body: ["GET", "HEAD"].includes(req.method) ? undefined : req.body
+    body: ['GET', 'HEAD'].includes(req.method) ? undefined : req.body
   });
+}
+
+async function callWorker(worker, req, res) {
+  const request = buildRequest(req);
+  const response = await worker.executeFetchEvent(request);
   const data = await response.arrayBuffer();
 
   res.status(response.status);

app/worker.js

@@ -59,12 +59,12 @@ class Worker {
     return fetch(request);
   }
 
-  async executeFetchEvent(url, opts) {
+  async executeFetchEvent(request) {
     let response = null;
     let waitUntil = [];
     this.triggerEvent("fetch", {
       type: "fetch",
-      request: new Request(url, { redirect: "manual", ...opts }),
+      request: new Request(request, { redirect: 'manual' }),
       respondWith: r => (response = r),
       waitUntil: e => waitUntil.push(e)
     });