diff --git a/web/.env.example b/web/.env.example index 1f3dc23b77..ef3ecd8101 100644 --- a/web/.env.example +++ b/web/.env.example @@ -28,7 +28,6 @@ HONO_PROXY_HOST=127.0.0.1 HONO_PROXY_PORT= HONO_CONSOLE_API_PROXY_TARGET= HONO_PUBLIC_API_PROXY_TARGET= -# Defaults to https://enterprise-platform-dev.dify.dev when empty. HONO_ENTERPRISE_API_PROXY_TARGET= # The API PREFIX for MARKETPLACE diff --git a/web/plugins/dev-proxy/config.ts b/web/plugins/dev-proxy/config.ts index 7350d20fc5..c66aa5a2eb 100644 --- a/web/plugins/dev-proxy/config.ts +++ b/web/plugins/dev-proxy/config.ts @@ -1,6 +1,6 @@ -export const DEV_PROXY_TARGETS = ['dify', 'enterprise'] as const +const DEV_PROXY_TARGETS = ['dify', 'enterprise'] as const -export type DevProxyTarget = typeof DEV_PROXY_TARGETS[number] +type DevProxyTarget = typeof DEV_PROXY_TARGETS[number] type DevProxyConfigEnv = Partial { // Assert expect(targets.consoleApiTarget).toBe('https://console.example.com') expect(targets.publicApiTarget).toBe('https://console.example.com') - expect(targets.enterpriseApiTarget).toBe('https://enterprise-platform-dev.dify.dev') + expect(targets.enterpriseApiTarget).toBeUndefined() }) // Scenario: target paths should not be duplicated when the incoming route already includes them. diff --git a/web/plugins/dev-proxy/server.ts b/web/plugins/dev-proxy/server.ts index 9651b32677..db24a1768a 100644 --- a/web/plugins/dev-proxy/server.ts +++ b/web/plugins/dev-proxy/server.ts @@ -14,7 +14,11 @@ type DevProxyEnv = Partial>>>>>> main } type DevProxyAppOptions = DevProxyTargets & { @@ -189,7 +193,6 @@ export const resolveDevProxyTargets = (env: DevProxyEnv = {}): DevProxyTargets = const publicApiTarget = env.HONO_PUBLIC_API_PROXY_TARGET || consoleApiTarget const enterpriseApiTarget = env.HONO_ENTERPRISE_API_PROXY_TARGET - || DEFAULT_ENTERPRISE_PROXY_TARGET return { consoleApiTarget, @@ -236,7 +239,12 @@ export const createDevProxyApp = (options: DevProxyAppOptions) => { applyCorsHeaders(context.res.headers, context.req.header('origin')) }) +<<<<<<< HEAD registerProxyRoutes(app, ENTERPRISE_API_ROUTES, options.enterpriseApiTarget, fetchImpl) +======= + if (options.enterpriseApiTarget) + registerProxyRoutes(app, ENTERPRISE_API_ROUTES, options.enterpriseApiTarget, fetchImpl) +>>>>>>> main registerProxyRoutes(app, CONSOLE_API_ROUTES, options.consoleApiTarget, fetchImpl) registerProxyRoutes(app, PUBLIC_API_ROUTES, options.publicApiTarget, fetchImpl)