github/sim
1
0
Fork 0
mirror of https://github.com/simstudioai/sim.git synced 2026-01-08 22:48:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

v0.4.4: database config updates

Browse Source
This commit is contained in:
Waleed
2025-10-02 20:08:09 -07:00
committed by GitHub
parent cae0e85826 10692b5e5a
commit 2175fd1106
7 changed files with 22 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/sim/.env.example
View File

@@ -1,8 +1,5 @@
# Database (Required)
DATABASE_URL="postgresql://postgres:password@localhost:5432/postgres"
# DATABASE_SSL=disable # Optional: SSL mode (disable, prefer, require, verify-ca, verify-full)
# DATABASE_SSL_CA= # Optional: Base64-encoded CA certificate (required for verify-ca/verify-full)
# To generate: cat your-ca.crt | base64 | tr -d '\n'
# PostgreSQL Port (Optional) - defaults to 5432 if not specified
# POSTGRES_PORT=5432

54
apps/sim/socket-server/database/operations.ts
View File

@@ -1,4 +1,3 @@
import type { ConnectionOptions } from 'node:tls'
import * as schema from '@sim/db'
import { workflow, workflowBlocks, workflowEdges, workflowSubflows } from '@sim/db'
import { and, eq, or, sql } from 'drizzle-orm'
@@ -11,34 +10,6 @@ import { loadWorkflowFromNormalizedTables } from '@/lib/workflows/db-helpers'
const logger = createLogger('SocketDatabase')
const connectionString = env.DATABASE_URL
const getSSLConfig = () => {
const sslMode = env.DATABASE_SSL
if (!sslMode) return undefined
if (sslMode === 'disable') return false
if (sslMode === 'prefer') return 'prefer'
const sslConfig: ConnectionOptions = {}
if (sslMode === 'require') {
sslConfig.rejectUnauthorized = false
} else if (sslMode === 'verify-ca' || sslMode === 'verify-full') {
sslConfig.rejectUnauthorized = true
if (env.DATABASE_SSL_CA) {
try {
const ca = Buffer.from(env.DATABASE_SSL_CA, 'base64').toString('utf-8')
sslConfig.ca = ca
} catch (error) {
logger.error('Failed to parse DATABASE_SSL_CA:', error)
}
}
}
return sslConfig
}
const sslConfig = getSSLConfig()
const socketDb = drizzle(
postgres(connectionString, {
prepare: false,
@@ -47,7 +18,6 @@ const socketDb = drizzle(
max: 25,
onnotice: () => {},
debug: false,
...(sslConfig !== undefined && { ssl: sslConfig }),
}),
{ schema }
)
@@ -162,6 +132,7 @@ export async function getWorkflowState(workflowId: string) {
const finalState = {
// Default values for expected properties
deploymentStatuses: {},
hasActiveWebhook: false,
// Data from normalized tables
blocks: normalizedData.blocks,
edges: normalizedData.edges,
@@ -195,7 +166,23 @@ export async function persistWorkflowOperation(workflowId: string, operation: an
try {
const { operation: op, target, payload, timestamp, userId } = operation
// Log high-frequency operations for monitoring
if (op === 'update-position' && Math.random() < 0.01) {
// Log 1% of position updates
logger.debug('Socket DB operation sample:', {
operation: op,
target,
workflowId: `${workflowId.substring(0, 8)}...`,
})
}
await db.transaction(async (tx) => {
// Update the workflow's last modified timestamp first
await tx
.update(workflow)
.set({ updatedAt: new Date(timestamp) })
.where(eq(workflow.id, workflowId))
// Handle different operation types within the transaction
switch (target) {
case 'block':
@@ -213,13 +200,6 @@ export async function persistWorkflowOperation(workflowId: string, operation: an
default:
throw new Error(`Unknown operation target: ${target}`)
}
if (op !== 'update-position') {
await tx
.update(workflow)
.set({ updatedAt: new Date(timestamp) })
.where(eq(workflow.id, workflowId))
}
})
// Log slow operations for monitoring

30
apps/sim/socket-server/rooms/manager.ts
View File

@@ -1,4 +1,3 @@
import type { ConnectionOptions } from 'node:tls'
import * as schema from '@sim/db/schema'
import { workflowBlocks, workflowEdges } from '@sim/db/schema'
import { and, eq, isNull } from 'drizzle-orm'
@@ -9,34 +8,6 @@ import { env } from '@/lib/env'
import { createLogger } from '@/lib/logs/console/logger'
const connectionString = env.DATABASE_URL
const getSSLConfig = () => {
const sslMode = env.DATABASE_SSL
if (!sslMode) return undefined
if (sslMode === 'disable') return false
if (sslMode === 'prefer') return 'prefer'
const sslConfig: ConnectionOptions = {}
if (sslMode === 'require') {
sslConfig.rejectUnauthorized = false
} else if (sslMode === 'verify-ca' || sslMode === 'verify-full') {
sslConfig.rejectUnauthorized = true
if (env.DATABASE_SSL_CA) {
try {
const ca = Buffer.from(env.DATABASE_SSL_CA, 'base64').toString('utf-8')
sslConfig.ca = ca
} catch (error) {
console.error('Failed to parse DATABASE_SSL_CA:', error)
}
}
}
return sslConfig
}
const sslConfig = getSSLConfig()
const db = drizzle(
postgres(connectionString, {
prepare: false,
@@ -44,7 +15,6 @@ const db = drizzle(
connect_timeout: 20,
max: 5,
onnotice: () => {},
...(sslConfig !== undefined && { ssl: sslConfig }),
}),
{ schema }
)

41
packages/db/index.ts
View File

@@ -1,4 +1,3 @@
import type { ConnectionOptions } from 'node:tls'
import { drizzle, type PostgresJsDatabase } from 'drizzle-orm/postgres-js'
import postgres from 'postgres'
import * as schema from './schema'
@@ -11,52 +10,12 @@ if (!connectionString) {
throw new Error('Missing DATABASE_URL environment variable')
}
const getSSLConfig = () => {
const sslMode = process.env.DATABASE_SSL?.toLowerCase()
if (!sslMode) {
return undefined
}
if (sslMode === 'disable') {
return false
}
if (sslMode === 'prefer') {
return 'prefer'
}
const sslConfig: ConnectionOptions = {}
if (sslMode === 'require') {
sslConfig.rejectUnauthorized = false
} else if (sslMode === 'verify-ca' || sslMode === 'verify-full') {
sslConfig.rejectUnauthorized = true
if (process.env.DATABASE_SSL_CA) {
try {
const ca = Buffer.from(process.env.DATABASE_SSL_CA, 'base64').toString('utf-8')
sslConfig.ca = ca
} catch (error) {
console.error('Failed to parse DATABASE_SSL_CA:', error)
}
}
} else {
throw new Error(
`Invalid DATABASE_SSL mode: ${sslMode}. Must be one of: disable, prefer, require, verify-ca, verify-full`
)
}
return sslConfig
}
const sslConfig = getSSLConfig()
const postgresClient = postgres(connectionString, {
prepare: false,
idle_timeout: 20,
connect_timeout: 30,
max: 80,
onnotice: () => {},
...(sslConfig !== undefined && { ssl: sslConfig }),
})
const drizzleClient = drizzle(postgresClient, { schema })

37
packages/db/scripts/deregister-sso-provider.ts
View File

@@ -13,7 +13,6 @@
* SSO_PROVIDER_ID=provider-id (optional, if not provided will remove all providers for user)
*/
import type { ConnectionOptions } from 'node:tls'
import { and, eq } from 'drizzle-orm'
import { drizzle } from 'drizzle-orm/postgres-js'
import postgres from 'postgres'
@@ -45,50 +44,18 @@ const logger = {
}
// Get database URL from environment
const CONNECTION_STRING = process.env.DATABASE_URL
const CONNECTION_STRING = process.env.POSTGRES_URL ?? process.env.DATABASE_URL
if (!CONNECTION_STRING) {
console.error('❌ DATABASE_URL environment variable is required')
console.error('❌ POSTGRES_URL or DATABASE_URL environment variable is required')
process.exit(1)
}
const getSSLConfig = () => {
const sslMode = process.env.DATABASE_SSL?.toLowerCase()
if (!sslMode) return undefined
if (sslMode === 'disable') return false
if (sslMode === 'prefer') return 'prefer'
const sslConfig: ConnectionOptions = {}
if (sslMode === 'require') {
sslConfig.rejectUnauthorized = false
} else if (sslMode === 'verify-ca' || sslMode === 'verify-full') {
sslConfig.rejectUnauthorized = true
if (process.env.DATABASE_SSL_CA) {
try {
const ca = Buffer.from(process.env.DATABASE_SSL_CA, 'base64').toString('utf-8')
sslConfig.ca = ca
} catch (error) {
console.error('Failed to parse DATABASE_SSL_CA:', error)
}
}
} else {
throw new Error(
`Invalid DATABASE_SSL mode: ${sslMode}. Must be one of: disable, prefer, require, verify-ca, verify-full`
)
}
return sslConfig
}
const sslConfig = getSSLConfig()
const postgresClient = postgres(CONNECTION_STRING, {
prepare: false,
idle_timeout: 20,
connect_timeout: 30,
max: 10,
onnotice: () => {},
...(sslConfig !== undefined && { ssl: sslConfig }),
})
const db = drizzle(postgresClient)

33
packages/db/scripts/migrate-deployment-versions.ts
View File

@@ -3,7 +3,6 @@
// This script is intentionally self-contained for execution in the migrations image.
// Do not import from the main app code; duplicate minimal schema and DB setup here.
import type { ConnectionOptions } from 'node:tls'
import { sql } from 'drizzle-orm'
import { drizzle } from 'drizzle-orm/postgres-js'
import postgres from 'postgres'
@@ -118,44 +117,12 @@ const workflowDeploymentVersion = pgTable(
)
// ---------- DB client ----------
const getSSLConfig = () => {
const sslMode = process.env.DATABASE_SSL?.toLowerCase()
if (!sslMode) return undefined
if (sslMode === 'disable') return false
if (sslMode === 'prefer') return 'prefer'
const sslConfig: ConnectionOptions = {}
if (sslMode === 'require') {
sslConfig.rejectUnauthorized = false
} else if (sslMode === 'verify-ca' || sslMode === 'verify-full') {
sslConfig.rejectUnauthorized = true
if (process.env.DATABASE_SSL_CA) {
try {
const ca = Buffer.from(process.env.DATABASE_SSL_CA, 'base64').toString('utf-8')
sslConfig.ca = ca
} catch (error) {
console.error('Failed to parse DATABASE_SSL_CA:', error)
}
}
} else {
throw new Error(
`Invalid DATABASE_SSL mode: ${sslMode}. Must be one of: disable, prefer, require, verify-ca, verify-full`
)
}
return sslConfig
}
const sslConfig = getSSLConfig()
const postgresClient = postgres(CONNECTION_STRING, {
prepare: false,
idle_timeout: 20,
connect_timeout: 30,
max: 10,
onnotice: () => {},
...(sslConfig !== undefined && { ssl: sslConfig }),
})
const db = drizzle(postgresClient)

38
packages/db/scripts/register-sso-provider.ts
View File

@@ -32,7 +32,6 @@
* SSO_SAML_WANT_ASSERTIONS_SIGNED=true (optional, defaults to false)
*/
import type { ConnectionOptions } from 'node:tls'
import { eq } from 'drizzle-orm'
import { drizzle } from 'drizzle-orm/postgres-js'
import postgres from 'postgres'
@@ -135,50 +134,19 @@ const logger = {
}
// Get database URL from environment
const CONNECTION_STRING = process.env.DATABASE_URL
const CONNECTION_STRING = process.env.POSTGRES_URL ?? process.env.DATABASE_URL
if (!CONNECTION_STRING) {
console.error('❌ DATABASE_URL environment variable is required')
console.error('❌ POSTGRES_URL or DATABASE_URL environment variable is required')
process.exit(1)
}
const getSSLConfig = () => {
const sslMode = process.env.DATABASE_SSL?.toLowerCase()
if (!sslMode) return undefined
if (sslMode === 'disable') return false
if (sslMode === 'prefer') return 'prefer'
const sslConfig: ConnectionOptions = {}
if (sslMode === 'require') {
sslConfig.rejectUnauthorized = false
} else if (sslMode === 'verify-ca' || sslMode === 'verify-full') {
sslConfig.rejectUnauthorized = true
if (process.env.DATABASE_SSL_CA) {
try {
const ca = Buffer.from(process.env.DATABASE_SSL_CA, 'base64').toString('utf-8')
sslConfig.ca = ca
} catch (error) {
console.error('Failed to parse DATABASE_SSL_CA:', error)
}
}
} else {
throw new Error(
`Invalid DATABASE_SSL mode: ${sslMode}. Must be one of: disable, prefer, require, verify-ca, verify-full`
)
}
return sslConfig
}
const sslConfig = getSSLConfig()
// Initialize database connection (following migration script pattern)
const postgresClient = postgres(CONNECTION_STRING, {
prepare: false,
idle_timeout: 20,
connect_timeout: 30,
max: 10,
onnotice: () => {},
...(sslConfig !== undefined && { ssl: sslConfig }),
})
const db = drizzle(postgresClient)