Revert "refactor: split sync-engine CLI and serve binaries"

This reverts commit adfd28e.

Agent too eager to commit should have been a PR

Author: tonyxiao

Dockerfile

@@ -49,7 +49,8 @@ ENV NODE_ENV=production
 ENV GIT_COMMIT=$GIT_COMMIT
 ENV BUILD_DATE=$BUILD_DATE
 ENV COMMIT_URL=$COMMIT_URL
-ENTRYPOINT ["node", "--use-env-proxy", "dist/bin/serve.js"]
+ENTRYPOINT ["node", "--use-env-proxy", "dist/cli/index.js"]
+CMD ["serve"]
 
 # ===========================================================================
 # Service (also used for the worker container — same image, different CMD)

apps/engine/package.json

@@ -5,8 +5,7 @@
   "description": "Stripe Sync Engine — sync Stripe data to Postgres",
   "type": "module",
   "bin": {
-    "sync-engine": "./dist/bin/sync-engine.js",
-    "sync-engine-serve": "./dist/bin/serve.js"
+    "sync-engine": "./dist/cli/index.js"
   },
   "exports": {
     ".": {
@@ -20,9 +19,9 @@
       "import": "./dist/cli/command.js"
     },
     "./api": {
-      "bun": "./src/api/index.ts",
-      "types": "./dist/api/index.d.ts",
-      "import": "./dist/api/index.js"
+      "bun": "./src/api/app.ts",
+      "types": "./dist/api/app.d.ts",
+      "import": "./dist/api/app.js"
     },
     "./api/openapi-utils": {
       "bun": "./src/api/openapi-utils.ts",
@@ -33,7 +32,7 @@
   "scripts": {
     "build": "tsc",
     "x:watch": "sh -c 'if command -v bun > /dev/null 2>&1; then bun --watch \"$@\"; else tsx --watch --conditions bun \"$@\"; fi' --",
-    "dev": "LOG_LEVEL=${LOG_LEVEL:-trace} LOG_PRETTY=${LOG_PRETTY:-true} DANGEROUSLY_VERBOSE_LOGGING=true pnpm x:watch src/bin/serve.ts",
+    "dev": "LOG_LEVEL=${LOG_LEVEL:-trace} LOG_PRETTY=${LOG_PRETTY:-true} DANGEROUSLY_VERBOSE_LOGGING=true pnpm x:watch src/api/index.ts",
     "test": "vitest run",
     "generate:types": "openapi-typescript src/__generated__/openapi.json -o src/__generated__/openapi.d.ts"
   },

apps/engine/src/__tests__/bin-serve.test.ts

@@ -32,12 +32,12 @@ describe('Docker image', { timeout: 180_000 }, () => {
   })
 
   it('--version prints version and exits', () => {
-    const out = docker('run', '--rm', '--entrypoint', 'node', IMAGE, 'dist/bin/sync-engine.js', '--version')
+    const out = docker('run', '--rm', IMAGE, '--version')
     expect(out).toMatch(/\d+\.\d+\.\d+/)
   })
 
   it('--help prints usage and exits', () => {
-    const out = docker('run', '--rm', '--entrypoint', 'node', IMAGE, 'dist/bin/sync-engine.js', '--help')
+    const out = docker('run', '--rm', IMAGE, '--help')
     expect(out).toContain('sync-engine')
     expect(out).toContain('serve')
     expect(out).toContain('sync')
@@ -73,17 +73,7 @@ describe('Docker image', { timeout: 180_000 }, () => {
 
   it('check exits non-zero without valid config', () => {
     expect(() =>
-      docker(
-        'run',
-        '--rm',
-        '--entrypoint',
-        'node',
-        IMAGE,
-        'dist/bin/sync-engine.js',
-        'check',
-        '--postgres-url',
-        'postgres://invalid:5432/db'
-      )
+      docker('run', '--rm', IMAGE, 'check', '--postgres-url', 'postgres://invalid:5432/db')
     ).toThrow()
   })
 })

apps/engine/src/__tests__/docker.test.ts

@@ -1,3 +1,55 @@
-export { createApp } from './app.js'
-export { startApiServer } from './server.js'
-export type { StartApiServerOptions } from './server.js'
+#!/usr/bin/env node
+
+import source from '@stripe/sync-source-stripe'
+import pgDestination from '@stripe/sync-destination-postgres'
+import sheetsDestination from '@stripe/sync-destination-google-sheets'
+import { createConnectorResolver } from '../lib/index.js'
+import { createApp } from './app.js'
+import { logger } from '../logger.js'
+import { ENGINE_SERVER_OPTIONS } from '../http-server-options.js'
+
+const port = Number(process.env.PORT || 3001)
+
+async function main() {
+  if (process.env.DANGEROUSLY_VERBOSE_LOGGING === 'true') {
+    logger.warn(
+      '⚠️  DANGEROUSLY_VERBOSE_LOGGING is enabled — all request headers and message payloads will be logged. Do not use in production.'
+    )
+  }
+
+  const resolver = await createConnectorResolver({
+    sources: { stripe: source },
+    destinations: { postgres: pgDestination, google_sheets: sheetsDestination },
+  })
+  const app = await createApp(resolver)
+
+  // Use the web-standard fetch handler with the runtime's native server.
+  // Bun.serve() properly cancels ReadableStreams on client disconnect;
+  // @hono/node-server is the fallback for Node.js / tsx.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  if (typeof (globalThis as any).Bun !== 'undefined') {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ;(globalThis as any).Bun.serve({ fetch: app.fetch, port, idleTimeout: 60 })
+    logger.warn(
+      { port, server: 'Bun.serve' },
+      `Sync Engine API listening on http://localhost:${port}`
+    )
+  } else {
+    const { serve } = await import('@hono/node-server')
+    serve(
+      {
+        fetch: app.fetch,
+        port,
+        serverOptions: ENGINE_SERVER_OPTIONS,
+      },
+      (info) => {
+        logger.info(
+          { port: info.port },
+          `Sync Engine API listening on http://localhost:${info.port}`
+        )
+      }
+    )
+  }
+}
+
+main()