Merge branch 'master' into dev

Remove ARM 32-bit from publish

.github/workflows/cloudflare.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         
       - uses: pnpm/action-setup@v2
         with:
@@ -20,7 +20,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
           cache: 'pnpm'
 
       - name: Install packages

.github/workflows/linting_testing.yml

@@ -14,16 +14,16 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         
       - uses: pnpm/action-setup@v2
         with:
           version: latest
 
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'pnpm'
 
       - name: Install packages
@@ -41,16 +41,16 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v2
         with:
           version: latest
       
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'pnpm'
       
       - name: Install pnpm packages
@@ -58,3 +58,17 @@ jobs:
 
       - name: Build Project
         run: pnpm build
+
+  docker:
+    name: Build docker
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build
+        uses: docker/build-push-action@v5

.github/workflows/publish.yml

@@ -19,17 +19,17 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Get version
         id: package-version
         uses: martinbeentjes/npm-get-version-action@main
 
       - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -37,7 +37,7 @@ jobs:
 
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           flavor: |
@@ -47,9 +47,12 @@ jobs:
 
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           push: true
+          platforms: linux/amd64,linux/arm64
           context: .
           labels: ${{ steps.meta.outputs.labels }}
           tags: ${{ steps.meta.outputs.tags }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         
       - uses: pnpm/action-setup@v2
         with:
@@ -41,7 +41,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: v${{ steps.package-version.outputs.current-version }}
-          release_name: Bot v${{ steps.package-version.outputs.current-version }}
+          release_name: Simple-proxy v${{ steps.package-version.outputs.current-version }}
           draft: false
           prerelease: false
           body: |

.gitignore

@@ -4,4 +4,5 @@ node_modules
 .cache
 .output
 .env
-dist
+dist
+.netlify

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-alpine as base
+FROM node:20-alpine as base
 WORKDIR /app
 
 # Build layer

README.md

@@ -1,7 +1,7 @@
 # simple-proxy
 
 Simple reverse proxy to bypass CORS, used by [movie-web](https://movie-web.app).
-Read the docs at https://docs.movie-web.app/proxy
+Read the docs at https://docs.movie-web.app/proxy/introduction
 
 ---
 
@@ -18,3 +18,4 @@ Read the docs at https://docs.movie-web.app/proxy
  - cloudflare workers
  - AWS lambda
  - nodejs
+ - netlify edge functions

netlify.toml

@@ -0,0 +1,4 @@
+[build]
+command = "pnpm build:netlify"
+publish = "."
+edge_functions = ".netlify"

nitro.config.ts

@@ -1,9 +1,13 @@
 import { join } from "path";
+import pkg from "./package.json";
 
 //https://nitro.unjs.io/config
 export default defineNitroConfig({
   noPublicDir: true,
   srcDir: "./src",
+  runtimeConfig: {
+    version: pkg.version
+  },
   alias: {
     "@": join(__dirname, "src")
   }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "simple-proxy",
   "private": true,
-  "version": "2.1.1",
+  "version": "2.1.4",
   "scripts": {
     "prepare": "nitropack prepare",
     "dev": "nitropack dev",
@@ -9,15 +9,16 @@
     "build:cloudflare": "NITRO_PRESET=cloudflare npm run build",
     "build:aws": "NITRO_PRESET=aws_lambda npm run build",
     "build:node": "NITRO_PRESET=node-server npm run build",
+    "build:netlify": "NITRO_PRESET=netlify_edge npm run build",
     "start": "node .output/server/index.mjs",
     "lint": "eslint --ext .ts src/",
     "lint:fix": "eslint --fix --ext .ts src/",
     "preinstall": "npx only-allow pnpm"
   },
   "dependencies": {
-    "h3": "^1.9.0",
+    "h3": "^1.10.0",
     "jose": "^5.2.0",
-    "nitropack": "latest"
+    "nitropack": "^2.8.1"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^6.7.0",
@@ -26,6 +27,12 @@
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-import-resolver-typescript": "^3.6.0",
-    "eslint-plugin-prettier": "^5.0.0"
+    "eslint-plugin-prettier": "^5.0.0",
+    "@rollup/wasm-node": "^4.9.4"
+  },
+  "pnpm": {
+    "overrides": {
+      "rollup": "npm:@rollup/wasm-node"
+    }
   }
 }

src/routes/index.ts

@@ -21,7 +21,9 @@ export default defineEventHandler(async (event) => {
       event,
       status: 200,
       data: {
-        message: 'Proxy is working as expected',
+        message: `Proxy is working as expected (v${
+          useRuntimeConfig(event).version
+        })`,
       },
     });
 
@@ -39,17 +41,22 @@ export default defineEventHandler(async (event) => {
   const token = await createTokenIfNeeded(event);
 
   // proxy
-  await specificProxyRequest(event, destination, {
-    blacklistedHeaders: getBlacklistedHeaders(),
-    fetchOptions: {
-      redirect: 'follow',
-      headers: getProxyHeaders(event.headers),
-      body,
-    },
-    onResponse(outputEvent, response) {
-      const headers = getAfterResponseHeaders(response.headers, response.url);
-      setResponseHeaders(outputEvent, headers);
-      if (token) setTokenHeader(event, token);
-    },
-  });
+  try {
+    await specificProxyRequest(event, destination, {
+      blacklistedHeaders: getBlacklistedHeaders(),
+      fetchOptions: {
+        redirect: 'follow',
+        headers: getProxyHeaders(event.headers),
+        body,
+      },
+      onResponse(outputEvent, response) {
+        const headers = getAfterResponseHeaders(response.headers, response.url);
+        setResponseHeaders(outputEvent, headers);
+        if (token) setTokenHeader(event, token);
+      },
+    });
+  } catch (e) {
+    console.log('Error fetching', e);
+    throw e;
+  }
 });

src/utils/headers.ts

@@ -12,11 +12,15 @@ const blacklistedHeaders = [
   'cf-ray',
   'cf-visitor',
   'cf-ew-via',
+  'cdn-loop',
+  'x-amzn-trace-id',
+  'cf-ipcountry',
   'x-forwarded-for',
   'x-forwarded-host',
   'x-forwarded-proto',
   'forwarded',
   'x-real-ip',
+  'content-length',
   ...Object.keys(headerMap),
 ];
 

src/utils/proxy.ts

@@ -69,7 +69,15 @@ export async function specificProxyRequest(
     opts.fetchOptions?.headers,
     opts.headers,
   );
-  (fetchHeaders.forEach as any)(console.log);
+  const headerObj = Object.fromEntries([...(fetchHeaders.entries as any)()]);
+  if (process.env.REQ_DEBUG === 'true') {
+    console.log({
+      type: 'request',
+      method,
+      url: target,
+      headers: headerObj,
+    });
+  }
 
   return sendProxy(event, target, {
     ...opts,