fix: handle empty EMEX proxy env vars with proper defaults
Some checks failed
CI / Lint, Typecheck, Test & Build (push) Has been cancelled
Some checks failed
CI / Lint, Typecheck, Test & Build (push) Has been cancelled
ConfigService returns empty string (not the default) when env var exists but is empty. Add || fallbacks in code and set proper defaults in docker-compose to prevent invalid proxy URL like http://user:pass@:10000. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -122,10 +122,10 @@ export class EmexService {
|
|||||||
// Proxy config — same env vars as emex.browser.ts
|
// Proxy config — same env vars as emex.browser.ts
|
||||||
const useProxy = this.configService.get<string>('EMEX_USE_PROXY', 'false') === 'true';
|
const useProxy = this.configService.get<string>('EMEX_USE_PROXY', 'false') === 'true';
|
||||||
if (useProxy) {
|
if (useProxy) {
|
||||||
const host = this.configService.get<string>('EMEX_PROXY_HOST', '74.81.81.81');
|
const host = this.configService.get<string>('EMEX_PROXY_HOST', '') || '74.81.81.81';
|
||||||
const port = this.configService.get<number>('EMEX_PROXY_PORT_START', 10000);
|
const port = this.configService.get<number>('EMEX_PROXY_PORT_START', 10000) || 10000;
|
||||||
const user = this.configService.get<string>('EMEX_PROXY_USER', '1726bbe361918676d44e');
|
const user = this.configService.get<string>('EMEX_PROXY_USER', '') || '1726bbe361918676d44e';
|
||||||
const pass = this.configService.get<string>('EMEX_PROXY_PASS', 'f11c7b6128cc86c6');
|
const pass = this.configService.get<string>('EMEX_PROXY_PASS', '') || 'f11c7b6128cc86c6';
|
||||||
this.proxyUrl = `http://${user}:${pass}@${host}:${port}`;
|
this.proxyUrl = `http://${user}:${pass}@${host}:${port}`;
|
||||||
this.logger.log(`EMEX HTTP proxy enabled: ${host}:${port}`);
|
this.logger.log(`EMEX HTTP proxy enabled: ${host}:${port}`);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -39,9 +39,9 @@ services:
|
|||||||
- EMEX_USERNAME=${EMEX_USERNAME:-}
|
- EMEX_USERNAME=${EMEX_USERNAME:-}
|
||||||
- EMEX_PASSWORD=${EMEX_PASSWORD:-}
|
- EMEX_PASSWORD=${EMEX_PASSWORD:-}
|
||||||
- EMEX_USE_PROXY=${EMEX_USE_PROXY:-false}
|
- EMEX_USE_PROXY=${EMEX_USE_PROXY:-false}
|
||||||
- EMEX_PROXY_HOST=${EMEX_PROXY_HOST:-}
|
- EMEX_PROXY_HOST=${EMEX_PROXY_HOST:-74.81.81.81}
|
||||||
- EMEX_PROXY_USER=${EMEX_PROXY_USER:-}
|
- EMEX_PROXY_USER=${EMEX_PROXY_USER:-1726bbe361918676d44e}
|
||||||
- EMEX_PROXY_PASS=${EMEX_PROXY_PASS:-}
|
- EMEX_PROXY_PASS=${EMEX_PROXY_PASS:-f11c7b6128cc86c6}
|
||||||
- PCAT_USE_PROXY=${PCAT_USE_PROXY:-true}
|
- PCAT_USE_PROXY=${PCAT_USE_PROXY:-true}
|
||||||
- PCAT_PROXY_HOST=${PCAT_PROXY_HOST:-gw.dataimpulse.com}
|
- PCAT_PROXY_HOST=${PCAT_PROXY_HOST:-gw.dataimpulse.com}
|
||||||
- PCAT_PROXY_USER=${PCAT_PROXY_USER:-}
|
- PCAT_PROXY_USER=${PCAT_PROXY_USER:-}
|
||||||
@@ -101,9 +101,9 @@ services:
|
|||||||
- EMEX_USERNAME=${EMEX_USERNAME:-}
|
- EMEX_USERNAME=${EMEX_USERNAME:-}
|
||||||
- EMEX_PASSWORD=${EMEX_PASSWORD:-}
|
- EMEX_PASSWORD=${EMEX_PASSWORD:-}
|
||||||
- EMEX_USE_PROXY=${EMEX_USE_PROXY:-false}
|
- EMEX_USE_PROXY=${EMEX_USE_PROXY:-false}
|
||||||
- EMEX_PROXY_HOST=${EMEX_PROXY_HOST:-}
|
- EMEX_PROXY_HOST=${EMEX_PROXY_HOST:-74.81.81.81}
|
||||||
- EMEX_PROXY_USER=${EMEX_PROXY_USER:-}
|
- EMEX_PROXY_USER=${EMEX_PROXY_USER:-1726bbe361918676d44e}
|
||||||
- EMEX_PROXY_PASS=${EMEX_PROXY_PASS:-}
|
- EMEX_PROXY_PASS=${EMEX_PROXY_PASS:-f11c7b6128cc86c6}
|
||||||
- PCAT_USE_PROXY=${PCAT_USE_PROXY:-true}
|
- PCAT_USE_PROXY=${PCAT_USE_PROXY:-true}
|
||||||
- PCAT_PROXY_HOST=${PCAT_PROXY_HOST:-gw.dataimpulse.com}
|
- PCAT_PROXY_HOST=${PCAT_PROXY_HOST:-gw.dataimpulse.com}
|
||||||
- PCAT_PROXY_USER=${PCAT_PROXY_USER:-}
|
- PCAT_PROXY_USER=${PCAT_PROXY_USER:-}
|
||||||
|
|||||||
Reference in New Issue
Block a user