mirror of
https://github.com/shumaiOne/shumai.git
synced 2026-11-20 01:56:52 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
edd550b9f2 | ||
|
|
ea71954deb | ||
|
|
dc63ab3eaf | ||
|
|
d06dfc0ab3 | ||
|
|
84aa1662be | ||
|
|
91fedf1477 | ||
|
|
b0dbb56493 | ||
|
|
f6a0577585 | ||
|
|
1fee0f5a97 |
+1
-1
@@ -70,4 +70,4 @@ COPY --chown=bun:bun --from=builder /app/prisma.config.ts.prod ./prisma.config.t
|
||||
EXPOSE 3000
|
||||
|
||||
# Default command: run migrations and start API server
|
||||
CMD ["sh", "-c", "bun prisma migrate deploy && bun apps/web/src/index.js"]
|
||||
CMD ["sh", "-c", "bun prisma migrate deploy && bun index.js"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/agent-app",
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.4",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"bin": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/transcode-app",
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.4",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"bin": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/web-app",
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.4",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
|
||||
+64
-17
@@ -1,3 +1,4 @@
|
||||
import { join } from 'node:path'
|
||||
import { loadEnvConfig } from '@shumai/core/src/env-loader'
|
||||
loadEnvConfig(process.cwd(), process.env.NODE_ENV !== 'production')
|
||||
|
||||
@@ -41,25 +42,71 @@ if (process.env.WORKFLOW_EXECUTOR === 'temporal') {
|
||||
Promise.all(queuesToStart.map((q) => workflowService.startWorkers(q))).catch(console.error)
|
||||
}
|
||||
|
||||
const server = Bun.serve({
|
||||
port: 3000,
|
||||
fetch: app.fetch,
|
||||
maxRequestBodySize: process.env.MAX_REQUEST_BODY_SIZE
|
||||
? parseInt(process.env.MAX_REQUEST_BODY_SIZE)
|
||||
: 1024 * 1024 * 1024 * 10, // Default 10GB
|
||||
routes: {
|
||||
// Serve index.html for root
|
||||
'/': index,
|
||||
const isProd = process.env.NODE_ENV === 'production'
|
||||
|
||||
// Proxy API requests to Hono
|
||||
'/api/*': app.fetch,
|
||||
'/files/*': app.fetch,
|
||||
const server = Bun.serve(
|
||||
isProd
|
||||
? {
|
||||
port: 3000,
|
||||
maxRequestBodySize: process.env.MAX_REQUEST_BODY_SIZE
|
||||
? parseInt(process.env.MAX_REQUEST_BODY_SIZE)
|
||||
: 1024 * 1024 * 1024 * 10, // Default 10GB
|
||||
development: false,
|
||||
async fetch(req) {
|
||||
const url = new URL(req.url)
|
||||
|
||||
// Catch-all for SPA routing (fallback to index.html)
|
||||
'/*': index,
|
||||
},
|
||||
development: process.env.NODE_ENV !== 'production',
|
||||
})
|
||||
if (!url.pathname.startsWith('/api/') && !url.pathname.startsWith('/files/')) {
|
||||
const filepath = join(import.meta.dir, url.pathname)
|
||||
const file = Bun.file(filepath)
|
||||
if (await file.exists()) {
|
||||
try {
|
||||
const stat = await file.stat()
|
||||
if (stat.isFile()) {
|
||||
return new Response(file)
|
||||
}
|
||||
} catch {
|
||||
// ignore stat errors
|
||||
}
|
||||
}
|
||||
|
||||
const htmlFile = Bun.file(join(import.meta.dir, 'index.html'))
|
||||
if (await htmlFile.exists()) {
|
||||
return new Response(htmlFile, {
|
||||
headers: { 'Content-Type': 'text/html' },
|
||||
})
|
||||
}
|
||||
|
||||
const htmlFileNpm = Bun.file(join(import.meta.dir, 'shumai-app.html'))
|
||||
if (await htmlFileNpm.exists()) {
|
||||
return new Response(htmlFileNpm, {
|
||||
headers: { 'Content-Type': 'text/html' },
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
return app.fetch(req)
|
||||
},
|
||||
}
|
||||
: {
|
||||
port: 3000,
|
||||
maxRequestBodySize: process.env.MAX_REQUEST_BODY_SIZE
|
||||
? parseInt(process.env.MAX_REQUEST_BODY_SIZE)
|
||||
: 1024 * 1024 * 1024 * 10, // Default 10GB
|
||||
development: true,
|
||||
fetch: app.fetch,
|
||||
routes: {
|
||||
// Serve index.html for root
|
||||
'/': index,
|
||||
|
||||
// Proxy API requests to Hono
|
||||
'/api/*': app.fetch,
|
||||
'/files/*': app.fetch,
|
||||
|
||||
// Catch-all for SPA routing (fallback to index.html)
|
||||
'/*': index,
|
||||
},
|
||||
},
|
||||
)
|
||||
|
||||
console.log(`🚀 Server running at ${server.url}`)
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@ await Bun.build({
|
||||
target: 'bun',
|
||||
outdir: outdir,
|
||||
minify: false,
|
||||
naming: '[name].[ext]',
|
||||
plugins: [
|
||||
temporalWorkflow({
|
||||
bundleOptions: {},
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "shumai",
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.4",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"repository": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/agent",
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.4",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./src/index.ts",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/api",
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.4",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./src/index.ts",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/core",
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.4",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./src/index.ts",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/db",
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.4",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./src/index.ts",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/dtos",
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.4",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./src/index.ts",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/transcode",
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.4",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./src/index.ts",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/webui",
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.4",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./index.html",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@shumai/workflow-core",
|
||||
"version": "0.0.2",
|
||||
"version": "0.0.4",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./src/index.ts",
|
||||
|
||||
+106
-34
@@ -1,4 +1,4 @@
|
||||
import { rm, mkdir, cp, writeFile } from 'node:fs/promises'
|
||||
import { rm, mkdir, cp, writeFile, readdir } from 'node:fs/promises'
|
||||
import { existsSync } from 'node:fs'
|
||||
import path from 'node:path'
|
||||
import tailwindPlugin from 'bun-plugin-tailwind'
|
||||
@@ -16,6 +16,9 @@ if (existsSync(distDir)) {
|
||||
}
|
||||
await mkdir(distDir, { recursive: true })
|
||||
|
||||
const dummyRunnerPath = path.join(distDir, 'dummy-runner.ts')
|
||||
await writeFile(dummyRunnerPath, '// Shumai Runner Stub\n', 'utf-8')
|
||||
|
||||
const rootPackageJson = JSON.parse(await Bun.file('package.json').text())
|
||||
const version = rootPackageJson.version || '0.1.0'
|
||||
|
||||
@@ -112,21 +115,18 @@ async function compileApp({
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
// Rename generated binary (usually Bun names it 'src' or the folder name of the entrypoint)
|
||||
const generatedFile = path.join(outdir, 'src')
|
||||
const generatedFileExe = path.join(outdir, 'src.exe')
|
||||
// Rename generated binary dynamically by finding the output file in outdir
|
||||
const finalFile = path.join(outdir, binaryName)
|
||||
const files = await readdir(outdir)
|
||||
const generatedFilename = files.find((f) => f !== binaryName)
|
||||
|
||||
if (existsSync(generatedFile)) {
|
||||
if (generatedFilename) {
|
||||
const generatedPath = path.join(outdir, generatedFilename)
|
||||
console.log(`➡️ Moving binary to final location: ${finalFile}`)
|
||||
await cp(generatedFile, finalFile)
|
||||
await rm(generatedFile)
|
||||
} else if (existsSync(generatedFileExe)) {
|
||||
console.log(`➡️ Moving binary to final location: ${finalFile}`)
|
||||
await cp(generatedFileExe, finalFile)
|
||||
await rm(generatedFileExe)
|
||||
} else {
|
||||
console.error(`❌ Could not find compiled binary at ${generatedFile} or ${generatedFileExe}`)
|
||||
await cp(generatedPath, finalFile)
|
||||
await rm(generatedPath)
|
||||
} else if (!existsSync(finalFile)) {
|
||||
console.error(`❌ Could not find compiled binary in ${outdir}`)
|
||||
process.exit(1)
|
||||
}
|
||||
}
|
||||
@@ -173,17 +173,62 @@ async function buildPlatformPackages(
|
||||
}
|
||||
|
||||
// Function to build main wrapper package
|
||||
async function buildMainPackage(
|
||||
appName: string,
|
||||
description: string,
|
||||
hasPrisma: boolean,
|
||||
extraDependencies: Record<string, string> = {},
|
||||
) {
|
||||
// Function to build main wrapper package
|
||||
async function buildMainPackage({
|
||||
appName,
|
||||
description,
|
||||
hasPrisma,
|
||||
entrypoint,
|
||||
plugins = [],
|
||||
extraDependencies = {},
|
||||
}: {
|
||||
appName: string
|
||||
description: string
|
||||
hasPrisma: boolean
|
||||
entrypoint: string
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
plugins?: any[]
|
||||
extraDependencies?: Record<string, string>
|
||||
}) {
|
||||
console.log(`\n📄 Packaging wrapper app ${appName}...`)
|
||||
const mainOutDir = path.join(distDir, appName)
|
||||
const binOutDir = path.join(mainOutDir, 'bin')
|
||||
await mkdir(binOutDir, { recursive: true })
|
||||
|
||||
// 1. Bundle the JS application code for wrapper
|
||||
console.log(`📦 Bundling JS application code for wrapper ${appName}...`)
|
||||
const appJsName = `${appName}-app.js`
|
||||
|
||||
const buildResult = await Bun.build({
|
||||
entrypoints: [entrypoint],
|
||||
root: '.',
|
||||
target: 'bun',
|
||||
outdir: binOutDir,
|
||||
minify: true,
|
||||
naming: `${appName}-app.[ext]`,
|
||||
plugins,
|
||||
external: commonExternal,
|
||||
define: {
|
||||
'process.env.NODE_ENV': JSON.stringify('production'),
|
||||
},
|
||||
publicPath: '/',
|
||||
})
|
||||
|
||||
if (!buildResult.success) {
|
||||
console.error(`❌ JS bundling failed for ${appName}!`)
|
||||
for (const log of buildResult.logs) {
|
||||
console.error(log)
|
||||
}
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
// Confirm that the bundle exists
|
||||
const finalJsFile = path.join(binOutDir, appJsName)
|
||||
if (!existsSync(finalJsFile)) {
|
||||
console.error(`❌ Could not find compiled JS bundle at ${finalJsFile}`)
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
// Write JS wrapper script
|
||||
const wrapperContent = `#!/usr/bin/env node
|
||||
import { spawn } from 'node:child_process'
|
||||
@@ -223,7 +268,7 @@ if (platform === 'darwin' && arch === 'arm64') {
|
||||
|
||||
const pathsToTry = [
|
||||
join(__dirname, '..', '..', '..', pkgName, 'bin', binaryName), // Flat node_modules
|
||||
join(__dirname, '..', '..', 'node_modules', pkgName, 'bin', binaryName), // Nested node_modules
|
||||
join(__dirname, '..', 'node_modules', pkgName, 'bin', binaryName), // Nested node_modules
|
||||
]
|
||||
|
||||
let binaryPath = ''
|
||||
@@ -239,8 +284,14 @@ if (!binaryPath) {
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
const child = spawn(binaryPath, process.argv.slice(2), {
|
||||
const appJsPath = join(__dirname, '${appName}-app.js')
|
||||
|
||||
const child = spawn(binaryPath, ['run', appJsPath, ...process.argv.slice(2)], {
|
||||
stdio: 'inherit',
|
||||
env: {
|
||||
...process.env,
|
||||
BUN_BE_BUN: '1',
|
||||
},
|
||||
})
|
||||
|
||||
child.on('close', (code) => {
|
||||
@@ -301,32 +352,53 @@ child.on('error', (err) => {
|
||||
}
|
||||
|
||||
// 2. Build shumai (Main app & platform binaries)
|
||||
await buildPlatformPackages('shumai', './apps/web/src/index.ts', [
|
||||
const shumaiPlugins = [
|
||||
temporalWorkflow({
|
||||
bundleOptions: {},
|
||||
}),
|
||||
tailwindPlugin,
|
||||
])
|
||||
await buildMainPackage('shumai', 'A fullstack AI-powered media workspace and workflow engine', true)
|
||||
]
|
||||
await buildPlatformPackages('shumai', dummyRunnerPath)
|
||||
await buildMainPackage({
|
||||
appName: 'shumai',
|
||||
description: 'A fullstack AI-powered media workspace and workflow engine',
|
||||
hasPrisma: true,
|
||||
entrypoint: './apps/web/src/index.ts',
|
||||
plugins: shumaiPlugins,
|
||||
})
|
||||
|
||||
// 3. Build shumai-agent (Agent app & platform binaries)
|
||||
await buildPlatformPackages('shumai-agent', './apps/agent/src/index.ts', [
|
||||
const agentPlugins = [
|
||||
temporalWorkflow({
|
||||
bundleOptions: {},
|
||||
}),
|
||||
])
|
||||
await buildMainPackage('shumai-agent', 'AI worker agent for the shumai media workspace', false)
|
||||
]
|
||||
await buildPlatformPackages('shumai-agent', dummyRunnerPath)
|
||||
await buildMainPackage({
|
||||
appName: 'shumai-agent',
|
||||
description: 'AI worker agent for the shumai media workspace',
|
||||
hasPrisma: false,
|
||||
entrypoint: './apps/agent/src/index.ts',
|
||||
plugins: agentPlugins,
|
||||
})
|
||||
|
||||
// 4. Build shumai-transcode (Transcode app & platform binaries)
|
||||
await buildPlatformPackages('shumai-transcode', './apps/transcode/src/index.ts', [
|
||||
const transcodePlugins = [
|
||||
temporalWorkflow({
|
||||
bundleOptions: {},
|
||||
}),
|
||||
])
|
||||
await buildMainPackage(
|
||||
'shumai-transcode',
|
||||
'Media transcoding worker for the shumai media workspace',
|
||||
false,
|
||||
)
|
||||
]
|
||||
await buildPlatformPackages('shumai-transcode', dummyRunnerPath)
|
||||
await buildMainPackage({
|
||||
appName: 'shumai-transcode',
|
||||
description: 'Media transcoding worker for the shumai media workspace',
|
||||
hasPrisma: false,
|
||||
entrypoint: './apps/transcode/src/index.ts',
|
||||
plugins: transcodePlugins,
|
||||
})
|
||||
|
||||
if (existsSync(dummyRunnerPath)) {
|
||||
await rm(dummyRunnerPath)
|
||||
}
|
||||
|
||||
console.log('\n✅ All applications and platform binaries built and packaged successfully!')
|
||||
|
||||
Reference in New Issue
Block a user