Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Update proxy middleware

Tomas Valentac67ca7cfdbe3
diff --git a/package-lock.json b/package-lock.json
index 41f870f5f..c81c31a3c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,7 @@
"@tiptap/starter-kit": "^2.0.0-beta.220",
"clsx": "^1.2.1",
"fuse.js": "^6.6.2",
- "http-proxy-middleware": "^2.0.6",
+ "http-proxy-middleware": "^3.0.0-beta.1",
"human-id": "^4.0.0",
"immer": "^9.0.19",
"lucide-react": "^0.130.1",
@@ -3626,26 +3626,19 @@
}
},
"node_modules/http-proxy-middleware": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
- "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+ "version": "3.0.0-beta.1",
+ "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.0-beta.1.tgz",
+ "integrity": "sha512-hdiTlVVoaxncf239csnEpG5ew2lRWnoNR1PMWOO6kYulSphlrfLs5JFZtFVH3R5EUWSZNMkeUqvkvfctuWaK8A==",
"dependencies": {
- "@types/http-proxy": "^1.17.8",
+ "@types/http-proxy": "^1.17.10",
+ "debug": "^4.3.4",
"http-proxy": "^1.18.1",
"is-glob": "^4.0.1",
"is-plain-obj": "^3.0.0",
- "micromatch": "^4.0.2"
+ "micromatch": "^4.0.5"
},
"engines": {
"node": ">=12.0.0"
- },
- "peerDependencies": {
- "@types/express": "^4.17.13"
- },
- "peerDependenciesMeta": {
- "@types/express": {
- "optional": true
- }
}
},
"node_modules/http-proxy-middleware/node_modules/is-plain-obj": {
diff --git a/package.json b/package.json
index da8a73714..60b9a8d58 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
"@tiptap/starter-kit": "^2.0.0-beta.220",
"clsx": "^1.2.1",
"fuse.js": "^6.6.2",
- "http-proxy-middleware": "^2.0.6",
+ "http-proxy-middleware": "^3.0.0-beta.1",
"human-id": "^4.0.0",
"immer": "^9.0.19",
"lucide-react": "^0.130.1",
@@ -83,4 +83,4 @@
"tailwindcss": "^3.2.7",
"typescript": "^4.9.5"
}
-}
\ No newline at end of file
+}
diff --git a/pages/api/service/[...all].ts b/pages/api/service/[...all].ts
index aa26af1ce..affdb2b56 100644
--- a/pages/api/service/[...all].ts
+++ b/pages/api/service/[...all].ts
@@ -1,4 +1,5 @@
import { createProxyMiddleware } from 'http-proxy-middleware'
+import type { NextApiRequest, NextApiResponse } from 'next'
export const config = {
api: {
@@ -11,15 +12,21 @@ export const config = {
},
}
-const pathPrefix = '/api/service'
-
const target = process.env.API_URL!
const isSecure = target.startsWith('https://')
-export default createProxyMiddleware(`${pathPrefix}/**`, {
+const proxy = createProxyMiddleware<NextApiRequest, NextApiResponse>({
target,
// ws: true,
secure: !isSecure,
changeOrigin: true,
- pathRewrite: { [`^${pathPrefix}`]: '' }, // remove prefix
+ pathRewrite: { '^/api/service': '' }, // remove prefix
})
+
+export default function handler(req: NextApiRequest, res: NextApiResponse) {
+ proxy(req, res, (result: unknown) => {
+ if (result instanceof Error) {
+ throw result
+ }
+ })
+}
diff --git a/pages/api/supabase/[...all].ts b/pages/api/supabase/[...all].ts
index 1d4897262..6de1142fc 100644
--- a/pages/api/supabase/[...all].ts
+++ b/pages/api/supabase/[...all].ts
@@ -1,4 +1,5 @@
import { createProxyMiddleware } from 'http-proxy-middleware'
+import type { NextApiRequest, NextApiResponse } from 'next'
export const config = {
api: {
@@ -16,10 +17,18 @@ const pathPrefix = '/api/supabase'
const target = process.env.SUPABASE_URL!
const isSecure = target.startsWith('https://')
-export default createProxyMiddleware(`${pathPrefix}/**`, {
+const proxy = createProxyMiddleware<NextApiRequest, NextApiResponse>({
target,
ws: true,
secure: !isSecure,
changeOrigin: true,
pathRewrite: { [`^${pathPrefix}`]: '' }, // remove prefix
})
+
+export default function handler(req: NextApiRequest, res: NextApiResponse) {
+ proxy(req, res, (result: unknown) => {
+ if (result instanceof Error) {
+ throw result
+ }
+ })
+}