mirror of
https://github.com/twentyhq/twenty.git
synced 2026-04-19 14:33:21 -04:00
## Summary - Migrates `LogicFunctionModule`, `CodeInterpreterModule`, and `CaptchaModule` from the `forRootAsync` + injection token pattern to the `DriverFactoryBase` lazy-loading pattern (matching `EmailModule` and `FileStorageModule`) - Fixes #18724 where `LOGIC_FUNCTION_TYPE` was not respected in worker processes because the driver was created at module boot time before the DB config cache was loaded - Removes `isEnvOnly` from `LOGIC_FUNCTION_TYPE`, `CODE_INTERPRETER_TYPE`, `CAPTCHA_DRIVER`, `IS_MULTIWORKSPACE_ENABLED`, and `FRONTEND_URL` — these can now be safely configured via the database at runtime ## How it works Each migrated module now uses a `DriverFactory` (extending `DriverFactoryBase`) instead of a module-level async factory + Symbol injection token: 1. **Lazy creation**: `getCurrentDriver()` creates the driver on first call, after `DatabaseConfigDriver.onModuleInit()` has loaded the DB cache 2. **Auto-recreation**: If config changes in the DB, the next `getCurrentDriver()` call detects the key mismatch and creates a new driver instance 3. **Unified config**: Both server and worker read from the same database — driver config only needs to be set once ### Files deleted (old pattern) - `logic-function-module.factory.ts`, `logic-function-drivers.module.ts`, `logic-function-driver.constants.ts` - `code-interpreter-module.factory.ts` - `captcha.module-factory.ts`, `captcha-driver.constants.ts` ### Files created (new pattern) - `logic-function-driver.factory.ts` - `code-interpreter-driver.factory.ts` - `captcha-driver.factory.ts` Net: **-150 lines** ## Test plan - [x] `npx nx typecheck twenty-server` passes - [x] `npx nx lint:diff-with-main twenty-server` passes - [ ] Integration tests pass (`npx nx run twenty-server:test:integration:with-db-reset`) - [ ] Verify logic functions execute in workflow runs (the original bug) - [ ] Verify code interpreter works in workflow code steps - [ ] Verify captcha validation works on sign-up (when captcha is configured) Made with [Cursor](https://cursor.com)
135 lines
5.2 KiB
YAML
135 lines
5.2 KiB
YAML
name: twenty
|
|
|
|
services:
|
|
server:
|
|
image: twentycrm/twenty:${TAG:-latest}
|
|
volumes:
|
|
- server-local-data:/app/packages/twenty-server/.local-storage
|
|
ports:
|
|
- "3000:3000"
|
|
environment:
|
|
NODE_PORT: 3000
|
|
PG_DATABASE_URL: postgres://${PG_DATABASE_USER:-postgres}:${PG_DATABASE_PASSWORD:-postgres}@${PG_DATABASE_HOST:-db}:${PG_DATABASE_PORT:-5432}/default
|
|
SERVER_URL: ${SERVER_URL}
|
|
REDIS_URL: ${REDIS_URL:-redis://redis:6379}
|
|
DISABLE_DB_MIGRATIONS: ${DISABLE_DB_MIGRATIONS}
|
|
DISABLE_CRON_JOBS_REGISTRATION: ${DISABLE_CRON_JOBS_REGISTRATION}
|
|
|
|
STORAGE_TYPE: ${STORAGE_TYPE}
|
|
STORAGE_S3_REGION: ${STORAGE_S3_REGION}
|
|
STORAGE_S3_NAME: ${STORAGE_S3_NAME}
|
|
STORAGE_S3_ENDPOINT: ${STORAGE_S3_ENDPOINT}
|
|
|
|
APP_SECRET: ${APP_SECRET:-replace_me_with_a_random_string}
|
|
# MESSAGING_PROVIDER_GMAIL_ENABLED: ${MESSAGING_PROVIDER_GMAIL_ENABLED}
|
|
# CALENDAR_PROVIDER_GOOGLE_ENABLED: ${CALENDAR_PROVIDER_GOOGLE_ENABLED}
|
|
# AUTH_GOOGLE_CLIENT_ID: ${AUTH_GOOGLE_CLIENT_ID}
|
|
# AUTH_GOOGLE_CLIENT_SECRET: ${AUTH_GOOGLE_CLIENT_SECRET}
|
|
# AUTH_GOOGLE_CALLBACK_URL: ${AUTH_GOOGLE_CALLBACK_URL}
|
|
# AUTH_GOOGLE_APIS_CALLBACK_URL: ${AUTH_GOOGLE_APIS_CALLBACK_URL}
|
|
|
|
# CALENDAR_PROVIDER_MICROSOFT_ENABLED: ${CALENDAR_PROVIDER_MICROSOFT_ENABLED}
|
|
# MESSAGING_PROVIDER_MICROSOFT_ENABLED: ${MESSAGING_PROVIDER_MICROSOFT_ENABLED}
|
|
# AUTH_MICROSOFT_ENABLED: ${AUTH_MICROSOFT_ENABLED}
|
|
# AUTH_MICROSOFT_CLIENT_ID: ${AUTH_MICROSOFT_CLIENT_ID}
|
|
# AUTH_MICROSOFT_CLIENT_SECRET: ${AUTH_MICROSOFT_CLIENT_SECRET}
|
|
# AUTH_MICROSOFT_CALLBACK_URL: ${AUTH_MICROSOFT_CALLBACK_URL}
|
|
# AUTH_MICROSOFT_APIS_CALLBACK_URL: ${AUTH_MICROSOFT_APIS_CALLBACK_URL}
|
|
|
|
# EMAIL_FROM_ADDRESS: ${EMAIL_FROM_ADDRESS:-contact@yourdomain.com}
|
|
# EMAIL_FROM_NAME: ${EMAIL_FROM_NAME:-"John from YourDomain"}
|
|
# EMAIL_DRIVER: ${EMAIL_DRIVER:-smtp}
|
|
# EMAIL_SMTP_HOST: ${EMAIL_SMTP_HOST:-smtp.gmail.com}
|
|
# EMAIL_SMTP_PORT: ${EMAIL_SMTP_PORT:-465}
|
|
# EMAIL_SMTP_USER: ${EMAIL_SMTP_USER:-}
|
|
# EMAIL_SMTP_PASSWORD: ${EMAIL_SMTP_PASSWORD:-}
|
|
|
|
depends_on:
|
|
db:
|
|
condition: service_healthy
|
|
redis:
|
|
condition: service_healthy
|
|
healthcheck:
|
|
test: curl --fail http://localhost:3000/healthz
|
|
interval: 5s
|
|
timeout: 5s
|
|
retries: 20
|
|
restart: always
|
|
|
|
worker:
|
|
image: twentycrm/twenty:${TAG:-latest}
|
|
volumes:
|
|
- server-local-data:/app/packages/twenty-server/.local-storage
|
|
command: ["yarn", "worker:prod"]
|
|
environment:
|
|
PG_DATABASE_URL: postgres://${PG_DATABASE_USER:-postgres}:${PG_DATABASE_PASSWORD:-postgres}@${PG_DATABASE_HOST:-db}:${PG_DATABASE_PORT:-5432}/default
|
|
SERVER_URL: ${SERVER_URL}
|
|
REDIS_URL: ${REDIS_URL:-redis://redis:6379}
|
|
DISABLE_DB_MIGRATIONS: "true" # it already runs on the server
|
|
DISABLE_CRON_JOBS_REGISTRATION: "true" # it already runs on the server
|
|
|
|
STORAGE_TYPE: ${STORAGE_TYPE}
|
|
STORAGE_S3_REGION: ${STORAGE_S3_REGION}
|
|
STORAGE_S3_NAME: ${STORAGE_S3_NAME}
|
|
STORAGE_S3_ENDPOINT: ${STORAGE_S3_ENDPOINT}
|
|
|
|
APP_SECRET: ${APP_SECRET:-replace_me_with_a_random_string}
|
|
# MESSAGING_PROVIDER_GMAIL_ENABLED: ${MESSAGING_PROVIDER_GMAIL_ENABLED}
|
|
# CALENDAR_PROVIDER_GOOGLE_ENABLED: ${CALENDAR_PROVIDER_GOOGLE_ENABLED}
|
|
# AUTH_GOOGLE_CLIENT_ID: ${AUTH_GOOGLE_CLIENT_ID}
|
|
# AUTH_GOOGLE_CLIENT_SECRET: ${AUTH_GOOGLE_CLIENT_SECRET}
|
|
# AUTH_GOOGLE_CALLBACK_URL: ${AUTH_GOOGLE_CALLBACK_URL}
|
|
# AUTH_GOOGLE_APIS_CALLBACK_URL: ${AUTH_GOOGLE_APIS_CALLBACK_URL}
|
|
|
|
# CALENDAR_PROVIDER_MICROSOFT_ENABLED: ${CALENDAR_PROVIDER_MICROSOFT_ENABLED}
|
|
# MESSAGING_PROVIDER_MICROSOFT_ENABLED: ${MESSAGING_PROVIDER_MICROSOFT_ENABLED}
|
|
# AUTH_MICROSOFT_ENABLED: ${AUTH_MICROSOFT_ENABLED}
|
|
# AUTH_MICROSOFT_CLIENT_ID: ${AUTH_MICROSOFT_CLIENT_ID}
|
|
# AUTH_MICROSOFT_CLIENT_SECRET: ${AUTH_MICROSOFT_CLIENT_SECRET}
|
|
# AUTH_MICROSOFT_CALLBACK_URL: ${AUTH_MICROSOFT_CALLBACK_URL}
|
|
# AUTH_MICROSOFT_APIS_CALLBACK_URL: ${AUTH_MICROSOFT_APIS_CALLBACK_URL}
|
|
|
|
# EMAIL_FROM_ADDRESS: ${EMAIL_FROM_ADDRESS:-contact@yourdomain.com}
|
|
# EMAIL_FROM_NAME: ${EMAIL_FROM_NAME:-"John from YourDomain"}
|
|
# EMAIL_DRIVER: ${EMAIL_DRIVER:-smtp}
|
|
# EMAIL_SMTP_HOST: ${EMAIL_SMTP_HOST:-smtp.gmail.com}
|
|
# EMAIL_SMTP_PORT: ${EMAIL_SMTP_PORT:-465}
|
|
# EMAIL_SMTP_USER: ${EMAIL_SMTP_USER:-}
|
|
# EMAIL_SMTP_PASSWORD: ${EMAIL_SMTP_PASSWORD:-}
|
|
|
|
depends_on:
|
|
db:
|
|
condition: service_healthy
|
|
server:
|
|
condition: service_healthy
|
|
restart: always
|
|
|
|
db:
|
|
image: postgres:16
|
|
volumes:
|
|
- db-data:/var/lib/postgresql/data
|
|
environment:
|
|
POSTGRES_DB: ${PG_DATABASE_NAME:-default}
|
|
POSTGRES_PASSWORD: ${PG_DATABASE_PASSWORD:-postgres}
|
|
POSTGRES_USER: ${PG_DATABASE_USER:-postgres}
|
|
healthcheck:
|
|
test: pg_isready -U ${PG_DATABASE_USER:-postgres} -h localhost -d postgres
|
|
interval: 5s
|
|
timeout: 5s
|
|
retries: 10
|
|
restart: always
|
|
|
|
redis:
|
|
image: redis
|
|
restart: always
|
|
command: ["--maxmemory-policy", "noeviction"]
|
|
healthcheck:
|
|
test: ["CMD", "redis-cli", "ping"]
|
|
interval: 5s
|
|
timeout: 5s
|
|
retries: 10
|
|
|
|
volumes:
|
|
db-data:
|
|
server-local-data:
|