From 5a070b4a15c2be3599e8f65732c4fec0a7805737 Mon Sep 17 00:00:00 2001 From: mrjvs Date: Wed, 13 Sep 2023 22:54:28 +0200 Subject: [PATCH] fix linter + make proxy work + remove temp files + fix typescript types --- .eslintrc.js | 2 - nitro.config.ts | 1 + package-lock.json | 339 ++++++++++++++++++++++++++++++++++++++++++- package.json | 3 + routes/index.ts | 72 --------- routes/worker.js.txt | 173 ---------------------- src/routes/index.ts | 22 +++ src/utils/headers.ts | 46 ++++++ tsconfig.json | 1 + 9 files changed, 410 insertions(+), 249 deletions(-) delete mode 100644 routes/index.ts delete mode 100644 routes/worker.js.txt create mode 100644 src/routes/index.ts create mode 100644 src/utils/headers.ts diff --git a/.eslintrc.js b/.eslintrc.js index 77e2ba1..a12b9d1 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -3,8 +3,6 @@ module.exports = { browser: true, }, extends: [ - "airbnb", - "airbnb/hooks", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended", ], diff --git a/nitro.config.ts b/nitro.config.ts index c3f9b3b..075d7f8 100644 --- a/nitro.config.ts +++ b/nitro.config.ts @@ -1,4 +1,5 @@ //https://nitro.unjs.io/config export default defineNitroConfig({ noPublicDir: true, + srcDir: "./src" }); diff --git a/package-lock.json b/package-lock.json index bba6dae..1142de8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,12 +8,16 @@ "name": "simple-proxy", "version": "2.0.0", "dependencies": { + "h3": "^1.8.1", "nitropack": "latest" }, "devDependencies": { + "@typescript-eslint/eslint-plugin": "^6.7.0", + "@typescript-eslint/parser": "^6.7.0", "eslint": "^8.48.0", "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" } }, @@ -1234,6 +1238,12 @@ "@types/node": "*" } }, + "node_modules/@types/json-schema": { + "version": "7.0.12", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", + "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", + "dev": true + }, "node_modules/@types/json5": { "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", @@ -1251,6 +1261,230 @@ "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==" }, + "node_modules/@types/semver": { + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.1.tgz", + "integrity": "sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==", + "dev": true + }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.0.tgz", + "integrity": "sha512-gUqtknHm0TDs1LhY12K2NA3Rmlmp88jK9Tx8vGZMfHeNMLE3GH2e9TRub+y+SOjuYgtOmok+wt1AyDPZqxbNag==", + "dev": true, + "dependencies": { + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.7.0", + "@typescript-eslint/type-utils": "6.7.0", + "@typescript-eslint/utils": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0", + "debug": "^4.3.4", + "graphemer": "^1.4.0", + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.0.tgz", + "integrity": "sha512-jZKYwqNpNm5kzPVP5z1JXAuxjtl2uG+5NpaMocFPTNC2EdYIgbXIPImObOkhbONxtFTTdoZstLZefbaK+wXZng==", + "dev": true, + "dependencies": { + "@typescript-eslint/scope-manager": "6.7.0", + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/typescript-estree": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0", + "debug": "^4.3.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz", + "integrity": "sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.7.0.tgz", + "integrity": "sha512-f/QabJgDAlpSz3qduCyQT0Fw7hHpmhOzY/Rv6zO3yO+HVIdPfIWhrQoAyG+uZVtWAIS85zAyzgAFfyEr+MgBpg==", + "dev": true, + "dependencies": { + "@typescript-eslint/typescript-estree": "6.7.0", + "@typescript-eslint/utils": "6.7.0", + "debug": "^4.3.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/types": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.0.tgz", + "integrity": "sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q==", + "dev": true, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz", + "integrity": "sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/visitor-keys": "6.7.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.0.tgz", + "integrity": "sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.7.0", + "@typescript-eslint/types": "6.7.0", + "@typescript-eslint/typescript-estree": "6.7.0", + "semver": "^7.5.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz", + "integrity": "sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.7.0", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, "node_modules/@vercel/nft": { "version": "0.23.1", "resolved": "https://registry.npmjs.org/@vercel/nft/-/nft-0.23.1.tgz", @@ -1527,6 +1761,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/array.prototype.findlastindex": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", @@ -2314,6 +2557,19 @@ "node": ">= 0.8" } }, + "node_modules/enhanced-resolve": { + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/es-abstract": { "version": "1.22.1", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz", @@ -2584,12 +2840,36 @@ "ms": "^2.1.1" } }, + "node_modules/eslint-import-resolver-typescript": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.0.tgz", + "integrity": "sha512-QTHR9ddNnn35RTxlaEnx2gCxqFlF2SEN0SE2d17SqwyM7YOSI2GHWRYp5BiRkObTUNYPupC/3Fq2a0PpT+EKpg==", + "dev": true, + "dependencies": { + "debug": "^4.3.4", + "enhanced-resolve": "^5.12.0", + "eslint-module-utils": "^2.7.4", + "fast-glob": "^3.3.1", + "get-tsconfig": "^4.5.0", + "is-core-module": "^2.11.0", + "is-glob": "^4.0.3" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts" + }, + "peerDependencies": { + "eslint": "*", + "eslint-plugin-import": "*" + } + }, "node_modules/eslint-module-utils": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", "dev": true, - "peer": true, "dependencies": { "debug": "^3.2.7" }, @@ -2607,7 +2887,6 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, - "peer": true, "dependencies": { "ms": "^2.1.1" } @@ -3226,6 +3505,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/get-tsconfig": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.0.tgz", + "integrity": "sha512-pmjiZ7xtB8URYm74PlGJozDNyhvsVLUcpBa8DZBG3bWHwaHa9bPiRpiSfovw+fjhwONSCWKRyk+JQHEGZmMrzw==", + "dev": true, + "dependencies": { + "resolve-pkg-maps": "^1.0.0" + }, + "funding": { + "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" + } + }, "node_modules/giget": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/giget/-/giget-1.1.2.tgz", @@ -5079,6 +5370,15 @@ "node": ">=8" } }, + "node_modules/resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "dev": true, + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } + }, "node_modules/reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -5656,6 +5956,15 @@ "url": "https://opencollective.com/unts" } }, + "node_modules/tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/tar": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz", @@ -5741,6 +6050,18 @@ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, + "node_modules/ts-api-utils": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz", + "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==", + "dev": true, + "engines": { + "node": ">=16.13.0" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, "node_modules/tsconfig-paths": { "version": "3.14.2", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", @@ -5848,6 +6169,20 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/typescript": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "dev": true, + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, "node_modules/ufo": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.0.tgz", diff --git a/package.json b/package.json index b02cf34..7202444 100644 --- a/package.json +++ b/package.json @@ -14,9 +14,12 @@ "nitropack": "latest" }, "devDependencies": { + "@typescript-eslint/eslint-plugin": "^6.7.0", + "@typescript-eslint/parser": "^6.7.0", "eslint": "^8.48.0", "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" } } diff --git a/routes/index.ts b/routes/index.ts deleted file mode 100644 index 764ac7d..0000000 --- a/routes/index.ts +++ /dev/null @@ -1,72 +0,0 @@ -import { - defineEventHandler, - getQuery, - isMethod, - handleCors, - proxyRequest, -} from 'h3'; - -export default defineEventHandler(async (event) => { - const destination = getQuery(event).destination; - - let response = new Response('404 Not Found', { - status: 404, - }); - - if (isMethod(event, 'OPTIONS')) { - // Handle CORS preflight requests - return handleCors(event, {}); - } else if (!destination?.toString()) { - return new Response('200 OK', { - status: 200, - headers: { - Allow: 'GET, HEAD, POST, OPTIONS', - 'Access-Control-Allow-Origin': '*', - }, - }); - } else if ( - isMethod(event, 'GET') || - isMethod(event, 'HEAD') || - isMethod(event, 'POST') - ) { - const headers = { - ...event.headers, - Cookie: event.headers.get('X-Cookie'), - Referer: event.headers.get('X-Referer'), - 'User-Agent': - event.headers.get('X-User-Agent') ?? - 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0', - Origin: - new URL(destination.toString()).origin ?? event.headers.get('X-Origin'), - Host: new URL(destination.toString()).host ?? event.headers.get('X-Host'), - PHPSESSID: event.headers.get('PHPSESSID') - ? `PHPSESSID=${event.headers.get('PHPSESSID')}` - : null, - }; - - Object.keys(headers).forEach((key) => { - if (headers[key as keyof Headers] === null) { - delete headers[key as keyof typeof headers]; - } - }); - - return proxyRequest(event, destination?.toString(), { - headers: { - 'Access-Control-Allow-Origin': '*', - 'Access-Control-Expose-Headers': '*', - Vary: 'Origin', - // 'X-Final-Destination' - // 'X-Set-Cookie' - // 'PHPSESSID' - }, - fetchOptions: { - headers: { - ...headers, - }, - redirect: 'follow', - }, - }); - } - - return response; -}); diff --git a/routes/worker.js.txt b/routes/worker.js.txt deleted file mode 100644 index 636b8a0..0000000 --- a/routes/worker.js.txt +++ /dev/null @@ -1,173 +0,0 @@ -const corsHeaders = { - 'Access-Control-Allow-Origin': '*', - 'Access-Control-Allow-Methods': 'GET,HEAD,POST,OPTIONS', - 'Access-Control-Max-Age': '86400', -}; - - function handleRequest(oRequest, destination, iteration = 0) { - console.log( - `PROXYING ${destination}${iteration ? ' ON ITERATION ' + iteration : ''}`, - ); - - // Create a new mutable request object for the destination - const request = new Request(destination, oRequest); - request.headers.set('Origin', new URL(destination).origin); - - // TODO - Make cookie handling better. PHPSESSID overwrites all other cookie related headers - - // Add custom X headers from client - // These headers are usually forbidden to be set by fetch - if (oRequest.headers.has('X-Cookie')) { - request.headers.set('Cookie', oRequest.headers.get('X-Cookie')); - request.headers.delete('X-Cookie'); - } - - if (request.headers.has('X-Referer')) { - request.headers.set('Referer', request.headers.get('X-Referer')); - request.headers.delete('X-Referer'); - } - - if (request.headers.has('X-Origin')) { - request.headers.set('Origin', request.headers.get('X-Origin')); - request.headers.delete('X-Origin'); - } - - // Set PHPSESSID cookie - if (request.headers.get('PHPSESSID')) { - request.headers.set( - 'Cookie', - `PHPSESSID=${request.headers.get('PHPSESSID')}`, - ); - } - - // Set User Agent, if not exists - const useragent = request.headers.get('User-Agent'); - if (!useragent) { - request.headers.set( - 'User-Agent', - 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0', - ); - } - - // Fetch the new resource - const oResponse = await fetch(request.clone()); - - // If the server returned a redirect, follow it - if ( - (oResponse.status === 302 || oResponse.status === 301) && - oResponse.headers.get('location') - ) { - // Server tried to redirect too many times - if (iteration > 5) { - return new Response('418 Too many redirects', { - status: 418, - }); - } - - // Handle and return the request for the redirected destination - return await handleRequest( - request, - oResponse.headers.get('location'), - iteration + 1, - ); - } - - // Create mutable response using the original response as init - const response = new Response(oResponse.body, oResponse); - - // Set CORS headers - response.headers.set('Access-Control-Allow-Origin', '*'); - response.headers.set('Access-Control-Expose-Headers', '*'); - - const cookiesToSet = response.headers.get('Set-Cookie'); - - // Transfer Set-Cookie to X-Set-Cookie - // Normally the Set-Cookie header is not accessible to fetch clients - if (cookiesToSet) { - response.headers.set('X-Set-Cookie', response.headers.get('Set-Cookie')); - } - - // Set PHPSESSID cookie - if ( - cookiesToSet && - cookiesToSet.includes('PHPSESSID') && - cookiesToSet.includes(';') - ) { - let phpsessid = cookiesToSet.slice(cookiesToSet.search('PHPSESSID') + 10); - phpsessid = phpsessid.slice(0, phpsessid.search(';')); - - response.headers.set('PHPSESSID', phpsessid); - } - - // Append to/Add Vary header so browser will cache response correctly - response.headers.append('Vary', 'Origin'); - - // Add X-Final-Destination header to get the final url - response.headers.set('X-Final-Destination', oResponse.url); - - return response; -} - -function handleOptions(request) { - // Make sure the necessary headers are present - // for this to be a valid pre-flight request - const headers = request.headers; - let response = new Response(null, { - headers: { - Allow: 'GET, HEAD, POST, OPTIONS', - }, - }); - - if ( - headers.get('Origin') !== null && - headers.get('Access-Control-Request-Method') !== null && - headers.get('Access-Control-Request-Headers') !== null - ) { - response = new Response(null, { - headers: { - ...corsHeaders, - // Allow all future content Request headers to go back to browser - // such as Authorization (Bearer) or X-Client-Name-Version - 'Access-Control-Allow-Headers': request.headers.get( - 'Access-Control-Request-Headers', - ), - }, - }); - } - - return response; -} - -addEventListener('fetch', (event) => { - const request = event.request; - const url = new URL(request.url); - const destination = url.searchParams.get('destination'); - - console.log(`HTTP ${request.method} - ${request.url}`); - - let response = new Response('404 Not Found', { - status: 404, - }); - - if (request.method === 'OPTIONS') { - // Handle CORS preflight requests - response = handleOptions(request); - } else if (!destination) { - response = new Response('200 OK', { - status: 200, - headers: { - Allow: 'GET, HEAD, POST, OPTIONS', - 'Access-Control-Allow-Origin': '*', - }, - }); - } else if ( - request.method === 'GET' || - request.method === 'HEAD' || - request.method === 'POST' - ) { - // Handle request - response = handleRequest(request, destination); - } - - event.respondWith(response); -}); diff --git a/src/routes/index.ts b/src/routes/index.ts new file mode 100644 index 0000000..d4dba33 --- /dev/null +++ b/src/routes/index.ts @@ -0,0 +1,22 @@ +import { getProxyHeaders, getAfterResponseHeaders } from '../utils/headers'; + +export default defineEventHandler(async (event) => { + // handle cors, if applicable + if (isPreflightRequest(event)) return handleCors(event, {}); + + // parse destination URL + const destination = getQuery<{ destination?: string }>(event).destination; + if (!destination) throw new Error('invalid destination'); + + // proxy + await proxyRequest(event, destination, { + fetchOptions: { + redirect: 'follow', + headers: getProxyHeaders(event.headers), + }, + onResponse(outputEvent, response) { + const headers = getAfterResponseHeaders(response.headers, response.url); + appendResponseHeaders(outputEvent, headers); + }, + }); +}); diff --git a/src/utils/headers.ts b/src/utils/headers.ts new file mode 100644 index 0000000..8699e0a --- /dev/null +++ b/src/utils/headers.ts @@ -0,0 +1,46 @@ +function copyHeader( + headers: Headers, + outputHeaders: Headers, + inputKey: string, + outputKey: string, +) { + if (headers.has(inputKey)) + outputHeaders.set(outputKey, headers.get(inputKey) ?? ''); +} + +export function getProxyHeaders(headers: Headers): Headers { + const output = new Headers(); + + const headerMap: Record = { + 'X-Cookie': 'Cookie', + 'X-Referer': 'Referer', + 'X-Origin': 'Origin', + }; + Object.entries(headerMap).forEach((entry) => { + copyHeader(headers, output, entry[0], entry[1]); + }); + + output.set( + 'User-Agent', + 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0', + ); + + return output; +} + +export function getAfterResponseHeaders( + headers: Headers, + finalUrl: string, +): Record { + const output: Record = {}; + + if (headers.has('Set-Cookie')) + output['X-Set-Cookie'] = headers.get('Set-Cookie') ?? ''; + + return { + 'Access-Control-Allow-Origin': '*', + 'Access-Control-Expose-Headers': '*', + Vary: 'Origin', + 'X-Final-Destination': finalUrl, + }; +} diff --git a/tsconfig.json b/tsconfig.json index 2b667a2..2247e3a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,4 +19,5 @@ "@/*": ["./*"] } }, + "extends": "./.nitro/types/tsconfig.json" }