chore: import upstream snapshot with attribution
CI / Migrate Dev DB (push) Has been skipped
CI / Detect Version (push) Has been cancelled
CI / Migrate DB (push) Has been cancelled
CI / Build Dev ECR (./docker/app.Dockerfile, ECR_APP) (push) Has been cancelled
CI / Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS) (push) Has been cancelled
CI / Build Dev ECR (./docker/pii.Dockerfile, ECR_PII) (push) Has been cancelled
CI / Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME) (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
CI / Build AMD64 (./docker/app.Dockerfile, ECR_APP, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build AMD64 (./docker/db.Dockerfile, ECR_MIGRATIONS, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (./docker/pii.Dockerfile, ECR_PII, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (./docker/realtime.Dockerfile, ECR_REALTIME, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/app.Dockerfile, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/db.Dockerfile, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/pii.Dockerfile, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/realtime.Dockerfile, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Test and Build (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
CI / Migrate Dev DB (push) Has been skipped
CI / Detect Version (push) Has been cancelled
CI / Migrate DB (push) Has been cancelled
CI / Build Dev ECR (./docker/app.Dockerfile, ECR_APP) (push) Has been cancelled
CI / Build Dev ECR (./docker/db.Dockerfile, ECR_MIGRATIONS) (push) Has been cancelled
CI / Build Dev ECR (./docker/pii.Dockerfile, ECR_PII) (push) Has been cancelled
CI / Build Dev ECR (./docker/realtime.Dockerfile, ECR_REALTIME) (push) Has been cancelled
CI / Deploy Trigger.dev (Dev) (push) Has been cancelled
CI / Build AMD64 (./docker/app.Dockerfile, ECR_APP, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build AMD64 (./docker/db.Dockerfile, ECR_MIGRATIONS, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build AMD64 (./docker/pii.Dockerfile, ECR_PII, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build AMD64 (./docker/realtime.Dockerfile, ECR_REALTIME, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/app.Dockerfile, ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/db.Dockerfile, ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/pii.Dockerfile, ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Build ARM64 (GHCR Only) (./docker/realtime.Dockerfile, ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/migrations) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/pii) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/realtime) (push) Has been cancelled
CI / Create GHCR Manifests (ghcr.io/simstudioai/simstudio) (push) Has been cancelled
CI / Check Docs Changes (push) Has been cancelled
CI / Process Docs (push) Has been cancelled
CI / Create GitHub Release (push) Has been cancelled
CI / Test and Build (push) Has been cancelled
Publish CLI Package / publish-npm (push) Has been cancelled
Publish Python SDK / publish-pypi (push) Has been cancelled
Publish TypeScript SDK / publish-npm (push) Has been cancelled
This commit is contained in:
@@ -0,0 +1,190 @@
|
||||
import { createLogger } from '@sim/logger'
|
||||
import { getErrorMessage } from '@sim/utils/errors'
|
||||
import { isPayloadSizeLimitError } from '@/lib/core/utils/stream-limits'
|
||||
import { isUserFileWithMetadata } from '@/lib/core/utils/user-file'
|
||||
import type { ExecutionContext } from '@/lib/uploads/contexts/execution/utils'
|
||||
import { generateExecutionFileKey, generateFileId } from '@/lib/uploads/contexts/execution/utils'
|
||||
import type { UserFile } from '@/executor/types'
|
||||
|
||||
const logger = createLogger('ExecutionFileStorage')
|
||||
|
||||
async function getStorageService() {
|
||||
return import('@/lib/uploads/core/storage-service')
|
||||
}
|
||||
|
||||
function isSerializedBuffer(value: unknown): value is { type: string; data: number[] } {
|
||||
return (
|
||||
!!value &&
|
||||
typeof value === 'object' &&
|
||||
(value as { type?: unknown }).type === 'Buffer' &&
|
||||
Array.isArray((value as { data?: unknown }).data)
|
||||
)
|
||||
}
|
||||
|
||||
function toBuffer(data: unknown, fileName: string): Buffer {
|
||||
if (data === undefined || data === null) {
|
||||
throw new Error(`File '${fileName}' has no data`)
|
||||
}
|
||||
|
||||
if (Buffer.isBuffer(data)) {
|
||||
return data
|
||||
}
|
||||
|
||||
if (isSerializedBuffer(data)) {
|
||||
return Buffer.from(data.data)
|
||||
}
|
||||
|
||||
if (data instanceof ArrayBuffer) {
|
||||
return Buffer.from(data)
|
||||
}
|
||||
|
||||
if (ArrayBuffer.isView(data)) {
|
||||
return Buffer.from(data.buffer, data.byteOffset, data.byteLength)
|
||||
}
|
||||
|
||||
if (Array.isArray(data)) {
|
||||
return Buffer.from(data)
|
||||
}
|
||||
|
||||
if (typeof data === 'string') {
|
||||
const trimmed = data.trim()
|
||||
if (trimmed.startsWith('data:')) {
|
||||
const [, base64Data] = trimmed.split(',')
|
||||
return Buffer.from(base64Data ?? '', 'base64')
|
||||
}
|
||||
return Buffer.from(trimmed, 'base64')
|
||||
}
|
||||
|
||||
throw new Error(`File '${fileName}' has unsupported data format: ${typeof data}`)
|
||||
}
|
||||
|
||||
/**
|
||||
* Upload a file to execution-scoped storage
|
||||
*/
|
||||
export async function uploadExecutionFile(
|
||||
context: ExecutionContext,
|
||||
fileBuffer: Buffer,
|
||||
fileName: string,
|
||||
contentType: string,
|
||||
userId?: string
|
||||
): Promise<UserFile> {
|
||||
logger.info(`Uploading execution file: ${fileName} for execution ${context.executionId}`)
|
||||
logger.debug(`File upload context:`, {
|
||||
workspaceId: context.workspaceId,
|
||||
workflowId: context.workflowId,
|
||||
executionId: context.executionId,
|
||||
userId: userId || 'not provided',
|
||||
fileName,
|
||||
bufferSize: fileBuffer.length,
|
||||
})
|
||||
|
||||
const storageKey = generateExecutionFileKey(context, fileName)
|
||||
const fileId = generateFileId()
|
||||
|
||||
logger.info(`Generated storage key: "${storageKey}" for file: ${fileName}`)
|
||||
|
||||
const metadata: Record<string, string> = {
|
||||
originalName: fileName,
|
||||
uploadedAt: new Date().toISOString(),
|
||||
purpose: 'execution',
|
||||
workspaceId: context.workspaceId,
|
||||
}
|
||||
|
||||
if (userId) {
|
||||
metadata.userId = userId
|
||||
}
|
||||
|
||||
try {
|
||||
const StorageService = await getStorageService()
|
||||
const fileInfo = await StorageService.uploadFile({
|
||||
file: fileBuffer,
|
||||
fileName: storageKey,
|
||||
contentType,
|
||||
context: 'execution',
|
||||
preserveKey: true, // Don't add timestamp prefix
|
||||
customKey: storageKey, // Use exact execution-scoped key
|
||||
metadata, // Pass metadata for cloud storage and database tracking
|
||||
})
|
||||
|
||||
const presignedUrl = await StorageService.generatePresignedDownloadUrl(
|
||||
fileInfo.key,
|
||||
'execution',
|
||||
5 * 60
|
||||
)
|
||||
|
||||
const userFile: UserFile = {
|
||||
id: fileId,
|
||||
name: fileName,
|
||||
size: fileBuffer.length,
|
||||
type: contentType,
|
||||
url: presignedUrl,
|
||||
key: fileInfo.key,
|
||||
context: 'execution',
|
||||
}
|
||||
|
||||
logger.info(`Successfully uploaded execution file: ${fileName} (${fileBuffer.length} bytes)`, {
|
||||
key: fileInfo.key,
|
||||
})
|
||||
return userFile
|
||||
} catch (error) {
|
||||
logger.error(`Failed to upload execution file ${fileName}:`, error)
|
||||
throw new Error(`Failed to upload file: ${getErrorMessage(error, 'Unknown error')}`)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Download a file from execution-scoped storage
|
||||
*/
|
||||
export async function downloadExecutionFile(
|
||||
userFile: UserFile,
|
||||
options: { maxBytes?: number } = {}
|
||||
): Promise<Buffer> {
|
||||
logger.info(`Downloading execution file: ${userFile.name}`)
|
||||
|
||||
try {
|
||||
const StorageService = await getStorageService()
|
||||
const fileBuffer = await StorageService.downloadFile({
|
||||
key: userFile.key,
|
||||
context: 'execution',
|
||||
...(options.maxBytes === undefined ? {} : { maxBytes: options.maxBytes }),
|
||||
})
|
||||
|
||||
logger.info(
|
||||
`Successfully downloaded execution file: ${userFile.name} (${fileBuffer.length} bytes)`
|
||||
)
|
||||
return fileBuffer
|
||||
} catch (error) {
|
||||
if (isPayloadSizeLimitError(error)) {
|
||||
throw error
|
||||
}
|
||||
logger.error(`Failed to download execution file ${userFile.name}:`, error)
|
||||
throw new Error(`Failed to download file: ${getErrorMessage(error, 'Unknown error')}`)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert raw file data (from tools/triggers) to UserFile
|
||||
* Handles all common formats: Buffer, serialized Buffer, base64, data URLs
|
||||
*/
|
||||
export async function uploadFileFromRawData(
|
||||
rawData: {
|
||||
name?: string
|
||||
filename?: string
|
||||
data?: unknown
|
||||
mimeType?: string
|
||||
contentType?: string
|
||||
size?: number
|
||||
},
|
||||
context: ExecutionContext,
|
||||
userId?: string
|
||||
): Promise<UserFile> {
|
||||
if (isUserFileWithMetadata(rawData)) {
|
||||
return rawData
|
||||
}
|
||||
|
||||
const fileName = rawData.name || rawData.filename || 'file.bin'
|
||||
const buffer = toBuffer(rawData.data, fileName)
|
||||
const contentType = rawData.mimeType || rawData.contentType || 'application/octet-stream'
|
||||
|
||||
return uploadExecutionFile(context, buffer, fileName, contentType, userId)
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
export * from './execution-file-manager'
|
||||
export * from './utils'
|
||||
@@ -0,0 +1,60 @@
|
||||
import { randomFloat } from '@sim/utils/random'
|
||||
import { isUuid, sanitizeFileName } from '@/executor/constants'
|
||||
import type { UserFile } from '@/executor/types'
|
||||
|
||||
/**
|
||||
* Execution context for file operations
|
||||
*/
|
||||
export interface ExecutionContext {
|
||||
workspaceId: string
|
||||
workflowId: string
|
||||
executionId: string
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate execution-scoped storage key with explicit prefix
|
||||
* Format: execution/workspace_id/workflow_id/execution_id/filename
|
||||
*/
|
||||
export function generateExecutionFileKey(context: ExecutionContext, fileName: string): string {
|
||||
const { workspaceId, workflowId, executionId } = context
|
||||
const safeFileName = sanitizeFileName(fileName)
|
||||
return `execution/${workspaceId}/${workflowId}/${executionId}/${safeFileName}`
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate unique file ID for execution files
|
||||
*/
|
||||
export function generateFileId(): string {
|
||||
return `file_${Date.now()}_${randomFloat().toString(36).substring(2, 9)}`
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if a key matches execution file pattern
|
||||
* Execution files have keys in format: execution/workspaceId/workflowId/executionId/filename
|
||||
*/
|
||||
function matchesExecutionFilePattern(key: string): boolean {
|
||||
if (!key || key.startsWith('/api/') || key.startsWith('http')) {
|
||||
return false
|
||||
}
|
||||
|
||||
const parts = key.split('/')
|
||||
|
||||
if (parts[0] === 'execution' && parts.length >= 5) {
|
||||
const [, workspaceId, workflowId, executionId] = parts
|
||||
return isUuid(workspaceId) && isUuid(workflowId) && isUuid(executionId)
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if a file is from execution storage based on its key pattern
|
||||
* Execution files have keys in format: execution/workspaceId/workflowId/executionId/filename
|
||||
*/
|
||||
export function isExecutionFile(file: UserFile): boolean {
|
||||
if (!file.key) {
|
||||
return false
|
||||
}
|
||||
|
||||
return matchesExecutionFilePattern(file.key)
|
||||
}
|
||||
Reference in New Issue
Block a user