feat(monorepo): introduce apps folder and decouple api package

This commit is contained in:
yiling
2026-06-02 15:30:16 +08:00
parent 35b0081e23
commit 3da2cdc524
17 changed files with 280 additions and 204 deletions
+2 -2
View File
@@ -6,6 +6,7 @@ WORKDIR /app
# Copy package files
COPY package.json bun.lock ./
COPY --parents packages/*/package.json ./
COPY --parents apps/*/package.json ./
# Install dependencies (including devDependencies for build tools)
RUN bun install --frozen-lockfile
@@ -48,5 +49,4 @@ COPY --from=builder /app/prisma.config.ts.prod ./prisma.config.ts
EXPOSE 3000
# Default command: run migrations and start API server
# Can be overridden to run workers: bun worker-cli.js [domain]
CMD ["sh", "-c", "bun prisma migrate deploy && bun api/src/index.js serve"]
CMD ["sh", "-c", "bun prisma migrate deploy && bun apps/web/src/index.js"]
+14
View File
@@ -0,0 +1,14 @@
{
"name": "@shumai/agent-app",
"version": "0.1.0",
"private": true,
"type": "module",
"bin": {
"shumai-agent": "./src/index.ts"
},
"dependencies": {
"@shumai/agent": "workspace:*",
"@shumai/core": "workspace:*",
"@shumai/workflow-core": "workspace:*"
}
}
+19
View File
@@ -0,0 +1,19 @@
import { loadEnvConfig } from '@shumai/core/src/env-loader'
loadEnvConfig(process.cwd(), process.env.NODE_ENV !== 'production')
import { workflowService } from '@shumai/workflow-core'
import { TaskQueueAgent } from '@shumai/workflow-core'
import { initAgentWorkflows } from '@shumai/agent'
async function run() {
// Initialize workflows and activities
initAgentWorkflows()
console.log('🚀 Starting Agent Worker...')
await workflowService.startWorkers(TaskQueueAgent)
}
run().catch((err) => {
console.error(err)
process.exit(1)
})
+4
View File
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src/**/*"]
}
+14
View File
@@ -0,0 +1,14 @@
{
"name": "@shumai/transcode-app",
"version": "0.1.0",
"private": true,
"type": "module",
"bin": {
"shumai-transcode": "./src/index.ts"
},
"dependencies": {
"@shumai/transcode": "workspace:*",
"@shumai/core": "workspace:*",
"@shumai/workflow-core": "workspace:*"
}
}
+19
View File
@@ -0,0 +1,19 @@
import { loadEnvConfig } from '@shumai/core/src/env-loader'
loadEnvConfig(process.cwd(), process.env.NODE_ENV !== 'production')
import { workflowService } from '@shumai/workflow-core'
import { TaskQueueTranscode } from '@shumai/workflow-core'
import { initTranscodeWorkflows } from '@shumai/transcode'
async function run() {
// Initialize workflows and activities
initTranscodeWorkflows()
console.log('🚀 Starting Transcode Worker...')
await workflowService.startWorkers(TaskQueueTranscode)
}
run().catch((err) => {
console.error(err)
process.exit(1)
})
+4
View File
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src/**/*"]
}
+18
View File
@@ -0,0 +1,18 @@
{
"name": "@shumai/web-app",
"version": "0.1.0",
"private": true,
"type": "module",
"dependencies": {
"@shumai/api": "workspace:*",
"@shumai/core": "workspace:*",
"@shumai/db": "workspace:*",
"@shumai/dtos": "workspace:*",
"@shumai/workflow-core": "workspace:*",
"@shumai/agent": "workspace:*",
"@shumai/transcode": "workspace:*",
"@shumai/worker-db": "workspace:*",
"@shumai/webui": "workspace:*",
"hono": "^4.12.14"
}
}
+73
View File
@@ -0,0 +1,73 @@
import { loadEnvConfig } from '@shumai/core/src/env-loader'
loadEnvConfig(process.cwd(), process.env.NODE_ENV !== 'production')
import index from '@shumai/webui/index.html'
import { initAgentWorkflows } from '@shumai/agent'
import { assetService } from '@shumai/core/src/asset/asset'
import { metadataService } from '@shumai/core/src/metadata/metadata'
import { initTranscodeWorkflows } from '@shumai/transcode'
import { initDbWorkflows } from '@shumai/worker-db'
import { workflowService } from '@shumai/workflow-core'
import { app } from '@shumai/api'
// Initialize workflows and activities for local executor mode
initAgentWorkflows()
initTranscodeWorkflows()
initDbWorkflows()
// Start services
await metadataService.syncSystemFields().catch(console.error)
assetService.startCleanupJob()
workflowService.start()
if (process.env.WORKFLOW_EXECUTOR === 'temporal') {
const args = process.argv.slice(2)
let workersOption = ''
for (let i = 0; i < args.length; i++) {
if (args[i] === '--workers') {
workersOption = args[i + 1] || ''
} else if (args[i].startsWith('--workers=')) {
workersOption = args[i].split('=')[1]
}
}
const queuesToStart = ['db_queue']
if (workersOption === 'agent' || workersOption === 'ai') {
queuesToStart.push('agent_queue')
} else if (workersOption === 'transcode') {
queuesToStart.push('transcode_queue')
} else if (workersOption === 'all') {
queuesToStart.push('agent_queue', 'transcode_queue')
}
Promise.all(queuesToStart.map((q) => workflowService.startWorkers(q))).catch(console.error)
}
const server = Bun.serve({
port: 3000,
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,
},
development: process.env.NODE_ENV !== 'production',
})
console.log(`🚀 Server running at ${server.url}`)
const shutdown = () => {
console.log('\nShutting down gracefully...')
assetService.stopCleanupJob()
server.stop(true)
process.exit(0)
}
process.on('SIGINT', shutdown)
process.on('SIGTERM', shutdown)
+4
View File
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src/**/*"]
}
+2 -2
View File
@@ -16,8 +16,8 @@ if (existsSync(outdir)) {
}
await Bun.build({
entrypoints: ['./packages/api/src/index.ts'],
root: 'packages',
entrypoints: ['./apps/web/src/index.ts'],
root: '.',
target: 'bun',
outdir: outdir,
minify: false,
+46 -5
View File
@@ -26,6 +26,46 @@
"vitest": "^4.1.4",
},
},
"apps/agent": {
"name": "@shumai/agent-app",
"version": "0.1.0",
"bin": {
"shumai-agent": "./src/index.ts",
},
"dependencies": {
"@shumai/agent": "workspace:*",
"@shumai/core": "workspace:*",
"@shumai/workflow-core": "workspace:*",
},
},
"apps/transcode": {
"name": "@shumai/transcode-app",
"version": "0.1.0",
"bin": {
"shumai-transcode": "./src/index.ts",
},
"dependencies": {
"@shumai/core": "workspace:*",
"@shumai/transcode": "workspace:*",
"@shumai/workflow-core": "workspace:*",
},
},
"apps/web": {
"name": "@shumai/web-app",
"version": "0.1.0",
"dependencies": {
"@shumai/agent": "workspace:*",
"@shumai/api": "workspace:*",
"@shumai/core": "workspace:*",
"@shumai/db": "workspace:*",
"@shumai/dtos": "workspace:*",
"@shumai/transcode": "workspace:*",
"@shumai/webui": "workspace:*",
"@shumai/worker-db": "workspace:*",
"@shumai/workflow-core": "workspace:*",
"hono": "^4.12.14",
},
},
"packages/agent": {
"name": "@shumai/agent",
"version": "0.1.0",
@@ -55,14 +95,9 @@
"version": "0.1.0",
"dependencies": {
"@hono/zod-validator": "^0.7.6",
"@shumai/agent": "workspace:*",
"@shumai/core": "workspace:*",
"@shumai/db": "workspace:*",
"@shumai/dtos": "workspace:*",
"@shumai/transcode": "workspace:*",
"@shumai/webui": "workspace:*",
"@shumai/worker-db": "workspace:*",
"@shumai/workflow-core": "workspace:*",
"hono": "^4.12.14",
"pino": "^10.3.1",
"ulid": "^3.0.2",
@@ -964,6 +999,8 @@
"@shumai/agent": ["@shumai/agent@workspace:packages/agent"],
"@shumai/agent-app": ["@shumai/agent-app@workspace:apps/agent"],
"@shumai/api": ["@shumai/api@workspace:packages/api"],
"@shumai/core": ["@shumai/core@workspace:packages/core"],
@@ -974,6 +1011,10 @@
"@shumai/transcode": ["@shumai/transcode@workspace:packages/transcode"],
"@shumai/transcode-app": ["@shumai/transcode-app@workspace:apps/transcode"],
"@shumai/web-app": ["@shumai/web-app@workspace:apps/web"],
"@shumai/webui": ["@shumai/webui@workspace:packages/webui"],
"@shumai/worker-db": ["@shumai/worker-db@workspace:packages/worker-db"],
+5 -3
View File
@@ -4,10 +4,11 @@
"private": true,
"type": "module",
"workspaces": [
"packages/*"
"packages/*",
"apps/*"
],
"scripts": {
"dev": "bun run --hot packages/api/src/index.ts serve",
"dev": "bun run --hot apps/web/src/index.ts",
"typecheck": "tsc --noEmit",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"test": "bun --bun vitest run",
@@ -15,7 +16,8 @@
"db:migrate": "bun run prisma migrate dev",
"db:deploy": "bun run prisma migrate deploy",
"generate-providers": "bun run scripts/generate-builtin-providers.ts",
"worker": "bun packages/api/src/index.ts worker",
"worker:agent": "bun apps/agent/src/index.ts",
"worker:transcode": "bun apps/transcode/src/index.ts",
"build": "bun run build.ts"
},
"devDependencies": {
-5
View File
@@ -9,11 +9,6 @@
"@shumai/core": "workspace:*",
"@shumai/db": "workspace:*",
"@shumai/dtos": "workspace:*",
"@shumai/workflow-core": "workspace:*",
"@shumai/agent": "workspace:*",
"@shumai/transcode": "workspace:*",
"@shumai/worker-db": "workspace:*",
"@shumai/webui": "workspace:*",
"hono": "^4.12.14",
"@hono/zod-validator": "^0.7.6",
"zod": "^4.4.3",
+56 -19
View File
@@ -1,22 +1,59 @@
import { loadEnvConfig } from '@shumai/core/src/env-loader'
loadEnvConfig(process.cwd(), process.env.NODE_ENV !== 'production')
import type { Prisma } from '@shumai/db'
import { Hono } from 'hono'
import agentRoute from './api/agent'
import attachmentRoute from './api/attachment'
import authnRoute from './api/authn'
import collectionRoute from './api/collection'
import fileRoute from './api/file'
import folderRoute from './api/folder'
import inviteRoute from './api/invite'
import metadataRoute from './api/metadata'
import { authMiddleware } from './api/middleware/auth'
import notificationRoute from './api/notification'
import projectRoute from './api/project'
import providerRoute from './api/provider'
import publicInviteRoute from './api/public-invite'
import publicShareRoute from './api/public-share'
import s3Route from './api/s3'
import shareRoute from './api/share'
import skillRoute from './api/skill'
import teamRoute from './api/team'
import uploadRoute from './api/upload'
import versionStackRoute from './api/versionStack'
const command = process.argv[2]
type User = Prisma.UserGetPayload<Record<string, never>>
if (command === 'worker') {
const { run } = await import('./worker')
run().catch((err) => {
console.error(err)
process.exit(1)
})
} else {
// Default or 'serve' command
const { run } = await import('./serve')
run().catch((err) => {
console.error(err)
process.exit(1)
})
}
export const app = new Hono()
// Re-export AppType for frontend client.ts usage (type-only)
export type { AppType } from './serve'
const apiRoute = new Hono<{ Variables: { user: User } }>()
// Public Routes
.route('/', authnRoute)
.route('/', publicInviteRoute)
.route('/', publicShareRoute)
// Protected Routes
.use('*', authMiddleware)
.route('/', inviteRoute)
.route('/', providerRoute)
.route('/', notificationRoute)
.route('/', metadataRoute)
.route('/', projectRoute)
.route('/', collectionRoute)
.route('/', teamRoute)
.route('/', versionStackRoute)
.route('/', fileRoute)
.route('/', folderRoute)
.route('/', agentRoute)
.route('/', attachmentRoute)
.route('/', uploadRoute)
.route('/', shareRoute)
.route('/', skillRoute)
app.route('/files', s3Route)
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const apiAppRoute = app.route('/api', apiRoute)
export type AppType = typeof apiAppRoute
export default app
-128
View File
@@ -1,128 +0,0 @@
import index from '@shumai/webui/index.html'
import { initAgentWorkflows } from '@shumai/agent'
import { assetService } from '@shumai/core/src/asset/asset'
import { metadataService } from '@shumai/core/src/metadata/metadata'
import type { Prisma } from '@shumai/db'
import { initTranscodeWorkflows } from '@shumai/transcode'
import { initDbWorkflows } from '@shumai/worker-db'
import { workflowService } from '@shumai/workflow-core'
import { Hono } from 'hono'
import agentRoute from './api/agent'
import attachmentRoute from './api/attachment'
import authnRoute from './api/authn'
import collectionRoute from './api/collection'
import fileRoute from './api/file'
import folderRoute from './api/folder'
import inviteRoute from './api/invite'
import metadataRoute from './api/metadata'
import { authMiddleware } from './api/middleware/auth'
import notificationRoute from './api/notification'
import projectRoute from './api/project'
import providerRoute from './api/provider'
import publicInviteRoute from './api/public-invite'
import publicShareRoute from './api/public-share'
import s3Route from './api/s3'
import shareRoute from './api/share'
import skillRoute from './api/skill'
import teamRoute from './api/team'
import uploadRoute from './api/upload'
import versionStackRoute from './api/versionStack'
type User = Prisma.UserGetPayload<Record<string, never>>
const app = new Hono()
const apiRoute = new Hono<{ Variables: { user: User } }>()
// Public Routes
.route('/', authnRoute)
.route('/', publicInviteRoute)
.route('/', publicShareRoute)
// Protected Routes
.use('*', authMiddleware)
.route('/', inviteRoute)
.route('/', providerRoute)
.route('/', notificationRoute)
.route('/', metadataRoute)
.route('/', projectRoute)
.route('/', collectionRoute)
.route('/', teamRoute)
.route('/', versionStackRoute)
.route('/', fileRoute)
.route('/', folderRoute)
.route('/', agentRoute)
.route('/', attachmentRoute)
.route('/', uploadRoute)
.route('/', shareRoute)
.route('/', skillRoute)
app.route('/files', s3Route)
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const apiAppRoute = app.route('/api', apiRoute)
export type AppType = typeof apiAppRoute
export async function run() {
// Initialize workflows and activities for local executor mode
initAgentWorkflows()
initTranscodeWorkflows()
initDbWorkflows()
// Start services
await metadataService.syncSystemFields().catch(console.error)
assetService.startCleanupJob()
workflowService.start()
if (process.env.WORKFLOW_EXECUTOR === 'temporal') {
const args = process.argv.slice(2)
let workersOption = ''
for (let i = 0; i < args.length; i++) {
if (args[i] === '--workers') {
workersOption = args[i + 1] || ''
} else if (args[i].startsWith('--workers=')) {
workersOption = args[i].split('=')[1]
}
}
const queuesToStart = ['db_queue']
if (workersOption === 'agent' || workersOption === 'ai') {
queuesToStart.push('agent_queue')
} else if (workersOption === 'transcode') {
queuesToStart.push('transcode_queue')
} else if (workersOption === 'all') {
queuesToStart.push('agent_queue', 'transcode_queue')
}
Promise.all(queuesToStart.map((q) => workflowService.startWorkers(q))).catch(console.error)
}
const server = Bun.serve({
port: 3000,
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,
},
development: process.env.NODE_ENV !== 'production',
})
console.log(`🚀 Server running at ${server.url}`)
const shutdown = () => {
console.log('\nShutting down gracefully...')
assetService.stopCleanupJob()
server.stop(true)
process.exit(0)
}
process.on('SIGINT', shutdown)
process.on('SIGTERM', shutdown)
}
-40
View File
@@ -1,40 +0,0 @@
import { workflowService } from '@shumai/workflow-core'
import { TaskQueueAgent, TaskQueueTranscode } from '@shumai/workflow-core'
import { initAgentWorkflows } from '@shumai/agent'
import { initTranscodeWorkflows } from '@shumai/transcode'
import { initDbWorkflows } from '@shumai/worker-db'
export async function run() {
// Initialize workflows and activities
initAgentWorkflows()
initTranscodeWorkflows()
initDbWorkflows()
const domain = process.argv[3]
if (!domain) {
console.error('Please specify a worker domain.')
console.log('Available domains: agent, transcode, all')
process.exit(1)
}
switch (domain) {
case 'agent':
case 'ai':
await workflowService.startWorkers(TaskQueueAgent)
break
case 'transcode':
await workflowService.startWorkers(TaskQueueTranscode)
break
case 'all':
await Promise.all([
workflowService.startWorkers(TaskQueueAgent),
workflowService.startWorkers(TaskQueueTranscode),
])
break
default:
console.error('Unknown domain: ' + domain)
console.log('Available domains: agent, transcode, all')
process.exit(1)
}
}