Skip to content

Commit be9780c

Browse files
HenryHengZJHenryHengZJ
authored
Chore/update base command args (#5541)
* update base command args * simplified the process of setting environment variables by replacing individual flag checks with a loop that iterates over the flags object
1 parent b405c96 commit be9780c

File tree

1 file changed

+81
-91
lines changed
  • packages/server/src/commands

1 file changed

+81
-91
lines changed

‎packages/server/src/commands/base.ts‎

Lines changed: 81 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,29 @@ enum EXIT_CODE {
1212

1313
export abstract class BaseCommand extends Command {
1414
static flags = {
15+
// General Settings
1516
FLOWISE_FILE_SIZE_LIMIT: Flags.string(),
1617
PORT: Flags.string(),
1718
CORS_ORIGINS: Flags.string(),
1819
IFRAME_ORIGINS: Flags.string(),
1920
DEBUG: Flags.string(),
20-
BLOB_STORAGE_PATH: Flags.string(),
21+
NUMBER_OF_PROXIES: Flags.string(),
22+
SHOW_COMMUNITY_NODES: Flags.string(),
23+
DISABLE_FLOWISE_TELEMETRY: Flags.string(),
24+
DISABLED_NODES: Flags.string(),
25+
26+
// Logging
2127
LOG_PATH: Flags.string(),
2228
LOG_LEVEL: Flags.string(),
29+
LOG_SANITIZE_BODY_FIELDS: Flags.string(),
30+
LOG_SANITIZE_HEADER_FIELDS: Flags.string(),
31+
32+
// Custom tool/function dependencies
2333
TOOL_FUNCTION_BUILTIN_DEP: Flags.string(),
2434
TOOL_FUNCTION_EXTERNAL_DEP: Flags.string(),
2535
ALLOW_BUILTIN_DEP: Flags.string(),
26-
NUMBER_OF_PROXIES: Flags.string(),
36+
37+
// Database
2738
DATABASE_TYPE: Flags.string(),
2839
DATABASE_PATH: Flags.string(),
2940
DATABASE_PORT: Flags.string(),
@@ -33,12 +44,20 @@ export abstract class BaseCommand extends Command {
3344
DATABASE_PASSWORD: Flags.string(),
3445
DATABASE_SSL: Flags.string(),
3546
DATABASE_SSL_KEY_BASE64: Flags.string(),
47+
DATABASE_REJECT_UNAUTHORIZED: Flags.string(),
48+
49+
// Langsmith tracing
3650
LANGCHAIN_TRACING_V2: Flags.string(),
3751
LANGCHAIN_ENDPOINT: Flags.string(),
3852
LANGCHAIN_API_KEY: Flags.string(),
3953
LANGCHAIN_PROJECT: Flags.string(),
54+
55+
// Model list config
4056
MODEL_LIST_CONFIG_JSON: Flags.string(),
57+
58+
// Storage
4159
STORAGE_TYPE: Flags.string(),
60+
BLOB_STORAGE_PATH: Flags.string(),
4261
S3_STORAGE_BUCKET_NAME: Flags.string(),
4362
S3_STORAGE_ACCESS_KEY_ID: Flags.string(),
4463
S3_STORAGE_SECRET_ACCESS_KEY: Flags.string(),
@@ -49,15 +68,17 @@ export abstract class BaseCommand extends Command {
4968
GOOGLE_CLOUD_STORAGE_PROJ_ID: Flags.string(),
5069
GOOGLE_CLOUD_STORAGE_BUCKET_NAME: Flags.string(),
5170
GOOGLE_CLOUD_UNIFORM_BUCKET_ACCESS: Flags.string(),
52-
SHOW_COMMUNITY_NODES: Flags.string(),
71+
72+
// Credentials / Secret Keys
5373
SECRETKEY_STORAGE_TYPE: Flags.string(),
5474
SECRETKEY_PATH: Flags.string(),
5575
FLOWISE_SECRETKEY_OVERWRITE: Flags.string(),
5676
SECRETKEY_AWS_ACCESS_KEY: Flags.string(),
5777
SECRETKEY_AWS_SECRET_KEY: Flags.string(),
5878
SECRETKEY_AWS_REGION: Flags.string(),
5979
SECRETKEY_AWS_NAME: Flags.string(),
60-
DISABLED_NODES: Flags.string(),
80+
81+
// Queue
6182
MODE: Flags.string(),
6283
WORKER_CONCURRENCY: Flags.string(),
6384
QUEUE_NAME: Flags.string(),
@@ -75,10 +96,60 @@ export abstract class BaseCommand extends Command {
7596
REDIS_CA: Flags.string(),
7697
REDIS_KEEP_ALIVE: Flags.string(),
7798
ENABLE_BULLMQ_DASHBOARD: Flags.string(),
99+
100+
// Security
78101
CUSTOM_MCP_SECURITY_CHECK: Flags.string(),
79102
CUSTOM_MCP_PROTOCOL: Flags.string(),
80103
HTTP_DENY_LIST: Flags.string(),
81-
TRUST_PROXY: Flags.string()
104+
TRUST_PROXY: Flags.string(),
105+
106+
// Auth
107+
APP_URL: Flags.string(),
108+
SMTP_HOST: Flags.string(),
109+
SMTP_PORT: Flags.string(),
110+
SMTP_USER: Flags.string(),
111+
SMTP_PASSWORD: Flags.string(),
112+
SMTP_SECURE: Flags.string(),
113+
ALLOW_UNAUTHORIZED_CERTS: Flags.string(),
114+
SENDER_EMAIL: Flags.string(),
115+
JWT_AUTH_TOKEN_SECRET: Flags.string(),
116+
JWT_REFRESH_TOKEN_SECRET: Flags.string(),
117+
JWT_ISSUER: Flags.string(),
118+
JWT_AUDIENCE: Flags.string(),
119+
JWT_TOKEN_EXPIRY_IN_MINUTES: Flags.string(),
120+
JWT_REFRESH_TOKEN_EXPIRY_IN_MINUTES: Flags.string(),
121+
EXPIRE_AUTH_TOKENS_ON_RESTART: Flags.string(),
122+
EXPRESS_SESSION_SECRET: Flags.string(),
123+
SECURE_COOKIES: Flags.string(),
124+
INVITE_TOKEN_EXPIRY_IN_HOURS: Flags.string(),
125+
PASSWORD_RESET_TOKEN_EXPIRY_IN_MINS: Flags.string(),
126+
PASSWORD_SALT_HASH_ROUNDS: Flags.string(),
127+
TOKEN_HASH_SECRET: Flags.string(),
128+
WORKSPACE_INVITE_TEMPLATE_PATH: Flags.string(),
129+
130+
// Enterprise
131+
LICENSE_URL: Flags.string(),
132+
FLOWISE_EE_LICENSE_KEY: Flags.string(),
133+
OFFLINE: Flags.string(),
134+
135+
// Metrics
136+
POSTHOG_PUBLIC_API_KEY: Flags.string(),
137+
ENABLE_METRICS: Flags.string(),
138+
METRICS_PROVIDER: Flags.string(),
139+
METRICS_INCLUDE_NODE_METRICS: Flags.string(),
140+
METRICS_SERVICE_NAME: Flags.string(),
141+
METRICS_OPEN_TELEMETRY_METRIC_ENDPOINT: Flags.string(),
142+
METRICS_OPEN_TELEMETRY_PROTOCOL: Flags.string(),
143+
METRICS_OPEN_TELEMETRY_DEBUG: Flags.string(),
144+
145+
// Proxy
146+
GLOBAL_AGENT_HTTP_PROXY: Flags.string(),
147+
GLOBAL_AGENT_HTTPS_PROXY: Flags.string(),
148+
GLOBAL_AGENT_NO_PROXY: Flags.string(),
149+
150+
// Document Loaders
151+
PUPPETEER_EXECUTABLE_FILE_PATH: Flags.string(),
152+
PLAYWRIGHT_EXECUTABLE_FILE_PATH: Flags.string()
82153
}
83154

84155
protected async stopProcess() {
@@ -126,91 +197,10 @@ export abstract class BaseCommand extends Command {
126197
})
127198

128199
const { flags } = await this.parse(this.constructor as any)
129-
if (flags.PORT) process.env.PORT = flags.PORT
130-
if (flags.CORS_ORIGINS) process.env.CORS_ORIGINS = flags.CORS_ORIGINS
131-
if (flags.IFRAME_ORIGINS) process.env.IFRAME_ORIGINS = flags.IFRAME_ORIGINS
132-
if (flags.DEBUG) process.env.DEBUG = flags.DEBUG
133-
if (flags.NUMBER_OF_PROXIES) process.env.NUMBER_OF_PROXIES = flags.NUMBER_OF_PROXIES
134-
if (flags.SHOW_COMMUNITY_NODES) process.env.SHOW_COMMUNITY_NODES = flags.SHOW_COMMUNITY_NODES
135-
if (flags.DISABLED_NODES) process.env.DISABLED_NODES = flags.DISABLED_NODES
136-
if (flags.FLOWISE_FILE_SIZE_LIMIT) process.env.FLOWISE_FILE_SIZE_LIMIT = flags.FLOWISE_FILE_SIZE_LIMIT
137-
138-
// Credentials
139-
if (flags.SECRETKEY_STORAGE_TYPE) process.env.SECRETKEY_STORAGE_TYPE = flags.SECRETKEY_STORAGE_TYPE
140-
if (flags.SECRETKEY_PATH) process.env.SECRETKEY_PATH = flags.SECRETKEY_PATH
141-
if (flags.FLOWISE_SECRETKEY_OVERWRITE) process.env.FLOWISE_SECRETKEY_OVERWRITE = flags.FLOWISE_SECRETKEY_OVERWRITE
142-
if (flags.SECRETKEY_AWS_ACCESS_KEY) process.env.SECRETKEY_AWS_ACCESS_KEY = flags.SECRETKEY_AWS_ACCESS_KEY
143-
if (flags.SECRETKEY_AWS_SECRET_KEY) process.env.SECRETKEY_AWS_SECRET_KEY = flags.SECRETKEY_AWS_SECRET_KEY
144-
if (flags.SECRETKEY_AWS_REGION) process.env.SECRETKEY_AWS_REGION = flags.SECRETKEY_AWS_REGION
145-
if (flags.SECRETKEY_AWS_NAME) process.env.SECRETKEY_AWS_NAME = flags.SECRETKEY_AWS_NAME
146-
147-
// Logs
148-
if (flags.LOG_PATH) process.env.LOG_PATH = flags.LOG_PATH
149-
if (flags.LOG_LEVEL) process.env.LOG_LEVEL = flags.LOG_LEVEL
150-
151-
// Custom tool/function dependencies
152-
if (flags.TOOL_FUNCTION_BUILTIN_DEP) process.env.TOOL_FUNCTION_BUILTIN_DEP = flags.TOOL_FUNCTION_BUILTIN_DEP
153-
if (flags.TOOL_FUNCTION_EXTERNAL_DEP) process.env.TOOL_FUNCTION_EXTERNAL_DEP = flags.TOOL_FUNCTION_EXTERNAL_DEP
154-
if (flags.ALLOW_BUILTIN_DEP) process.env.ALLOW_BUILTIN_DEP = flags.ALLOW_BUILTIN_DEP
155-
156-
// Database config
157-
if (flags.DATABASE_TYPE) process.env.DATABASE_TYPE = flags.DATABASE_TYPE
158-
if (flags.DATABASE_PATH) process.env.DATABASE_PATH = flags.DATABASE_PATH
159-
if (flags.DATABASE_PORT) process.env.DATABASE_PORT = flags.DATABASE_PORT
160-
if (flags.DATABASE_HOST) process.env.DATABASE_HOST = flags.DATABASE_HOST
161-
if (flags.DATABASE_NAME) process.env.DATABASE_NAME = flags.DATABASE_NAME
162-
if (flags.DATABASE_USER) process.env.DATABASE_USER = flags.DATABASE_USER
163-
if (flags.DATABASE_PASSWORD) process.env.DATABASE_PASSWORD = flags.DATABASE_PASSWORD
164-
if (flags.DATABASE_SSL) process.env.DATABASE_SSL = flags.DATABASE_SSL
165-
if (flags.DATABASE_SSL_KEY_BASE64) process.env.DATABASE_SSL_KEY_BASE64 = flags.DATABASE_SSL_KEY_BASE64
166-
167-
// Langsmith tracing
168-
if (flags.LANGCHAIN_TRACING_V2) process.env.LANGCHAIN_TRACING_V2 = flags.LANGCHAIN_TRACING_V2
169-
if (flags.LANGCHAIN_ENDPOINT) process.env.LANGCHAIN_ENDPOINT = flags.LANGCHAIN_ENDPOINT
170-
if (flags.LANGCHAIN_API_KEY) process.env.LANGCHAIN_API_KEY = flags.LANGCHAIN_API_KEY
171-
if (flags.LANGCHAIN_PROJECT) process.env.LANGCHAIN_PROJECT = flags.LANGCHAIN_PROJECT
172-
173-
// Model list config
174-
if (flags.MODEL_LIST_CONFIG_JSON) process.env.MODEL_LIST_CONFIG_JSON = flags.MODEL_LIST_CONFIG_JSON
175-
176-
// Storage
177-
if (flags.STORAGE_TYPE) process.env.STORAGE_TYPE = flags.STORAGE_TYPE
178-
if (flags.BLOB_STORAGE_PATH) process.env.BLOB_STORAGE_PATH = flags.BLOB_STORAGE_PATH
179-
if (flags.S3_STORAGE_BUCKET_NAME) process.env.S3_STORAGE_BUCKET_NAME = flags.S3_STORAGE_BUCKET_NAME
180-
if (flags.S3_STORAGE_ACCESS_KEY_ID) process.env.S3_STORAGE_ACCESS_KEY_ID = flags.S3_STORAGE_ACCESS_KEY_ID
181-
if (flags.S3_STORAGE_SECRET_ACCESS_KEY) process.env.S3_STORAGE_SECRET_ACCESS_KEY = flags.S3_STORAGE_SECRET_ACCESS_KEY
182-
if (flags.S3_STORAGE_REGION) process.env.S3_STORAGE_REGION = flags.S3_STORAGE_REGION
183-
if (flags.S3_ENDPOINT_URL) process.env.S3_ENDPOINT_URL = flags.S3_ENDPOINT_URL
184-
if (flags.S3_FORCE_PATH_STYLE) process.env.S3_FORCE_PATH_STYLE = flags.S3_FORCE_PATH_STYLE
185-
if (flags.GOOGLE_CLOUD_STORAGE_CREDENTIAL) process.env.GOOGLE_CLOUD_STORAGE_CREDENTIAL = flags.GOOGLE_CLOUD_STORAGE_CREDENTIAL
186-
if (flags.GOOGLE_CLOUD_STORAGE_PROJ_ID) process.env.GOOGLE_CLOUD_STORAGE_PROJ_ID = flags.GOOGLE_CLOUD_STORAGE_PROJ_ID
187-
if (flags.GOOGLE_CLOUD_STORAGE_BUCKET_NAME) process.env.GOOGLE_CLOUD_STORAGE_BUCKET_NAME = flags.GOOGLE_CLOUD_STORAGE_BUCKET_NAME
188-
if (flags.GOOGLE_CLOUD_UNIFORM_BUCKET_ACCESS)
189-
process.env.GOOGLE_CLOUD_UNIFORM_BUCKET_ACCESS = flags.GOOGLE_CLOUD_UNIFORM_BUCKET_ACCESS
190-
191-
// Queue
192-
if (flags.MODE) process.env.MODE = flags.MODE
193-
if (flags.REDIS_URL) process.env.REDIS_URL = flags.REDIS_URL
194-
if (flags.REDIS_HOST) process.env.REDIS_HOST = flags.REDIS_HOST
195-
if (flags.REDIS_PORT) process.env.REDIS_PORT = flags.REDIS_PORT
196-
if (flags.REDIS_USERNAME) process.env.REDIS_USERNAME = flags.REDIS_USERNAME
197-
if (flags.REDIS_PASSWORD) process.env.REDIS_PASSWORD = flags.REDIS_PASSWORD
198-
if (flags.REDIS_TLS) process.env.REDIS_TLS = flags.REDIS_TLS
199-
if (flags.REDIS_CERT) process.env.REDIS_CERT = flags.REDIS_CERT
200-
if (flags.REDIS_KEY) process.env.REDIS_KEY = flags.REDIS_KEY
201-
if (flags.REDIS_CA) process.env.REDIS_CA = flags.REDIS_CA
202-
if (flags.WORKER_CONCURRENCY) process.env.WORKER_CONCURRENCY = flags.WORKER_CONCURRENCY
203-
if (flags.QUEUE_NAME) process.env.QUEUE_NAME = flags.QUEUE_NAME
204-
if (flags.QUEUE_REDIS_EVENT_STREAM_MAX_LEN) process.env.QUEUE_REDIS_EVENT_STREAM_MAX_LEN = flags.QUEUE_REDIS_EVENT_STREAM_MAX_LEN
205-
if (flags.REMOVE_ON_AGE) process.env.REMOVE_ON_AGE = flags.REMOVE_ON_AGE
206-
if (flags.REMOVE_ON_COUNT) process.env.REMOVE_ON_COUNT = flags.REMOVE_ON_COUNT
207-
if (flags.REDIS_KEEP_ALIVE) process.env.REDIS_KEEP_ALIVE = flags.REDIS_KEEP_ALIVE
208-
if (flags.ENABLE_BULLMQ_DASHBOARD) process.env.ENABLE_BULLMQ_DASHBOARD = flags.ENABLE_BULLMQ_DASHBOARD
209-
210-
// Security
211-
if (flags.CUSTOM_MCP_SECURITY_CHECK) process.env.CUSTOM_MCP_SECURITY_CHECK = flags.CUSTOM_MCP_SECURITY_CHECK
212-
if (flags.CUSTOM_MCP_PROTOCOL) process.env.CUSTOM_MCP_PROTOCOL = flags.CUSTOM_MCP_PROTOCOL
213-
if (flags.HTTP_DENY_LIST) process.env.HTTP_DENY_LIST = flags.HTTP_DENY_LIST
214-
if (flags.TRUST_PROXY) process.env.TRUST_PROXY = flags.TRUST_PROXY
200+
Object.keys(flags).forEach((key) => {
201+
if (Object.prototype.hasOwnProperty.call(flags, key) && flags[key]) {
202+
process.env[key] = flags[key]
203+
}
204+
})
215205
}
216206
}

0 commit comments

Comments
 (0)