@wix/origami-site-express 1.0.0 → 1.0.2

package/bin/origami-site-express.js

@@ -1,14 +1,15 @@
 #!/usr/bin/env node
+import { sendAndExit } from '@wix/origami-bi'
 import * as commands from '../src/index.js'
 
 const [command] = process.argv.slice(2)
 if (!Object.hasOwn(commands, command)) {
     console.error(`Usage: origami-site-express <${Object.keys(commands).join(' | ')}>`)
-    process.exit(1)
+    await sendAndExit(1)
 }
 try {
     await commands[command]({ root: process.cwd() })
 } catch (error) {
     console.error(error instanceof Error ? error.stack ?? error.message : error)
-    process.exit(1)
+    await sendAndExit(1)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/origami-site-express",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Run an exported Wix origami site on Node with Express and Vite.",
   "type": "module",
   "files": [
@@ -27,12 +27,14 @@
   "scripts": {
     "build": "tsc --noEmit",
     "lint": "oxlint .",
-    "test": "node --test test/*.spec.js"
+    "test": "node --test test/*.spec.js",
+    "typecheck": "tsc --noEmit"
   },
   "dependencies": {
     "@vitejs/plugin-react": "^6.1.1",
     "express": "^5.2.1",
-    "vite": "^8.1.0"
+    "vite": "^8.1.0",
+    "@wix/origami-bi": "0.5.0"
   },
   "peerDependencies": {
     "@wix/origami-site": "^1.0.0"
@@ -65,5 +67,5 @@
       ]
     }
   },
-  "falconPackageHash": "82d2b0fe1dee3c5c66e610cb98f442e08e7948b8c03158b370cae74e"
+  "falconPackageHash": "659aabfadbee36f1cd3556a802ba62429965c23b7ee50cf31c5e18fd"
 }

package/src/server/lifecycle.js

@@ -1,3 +1,4 @@
+import { currentRow, sendAndExit } from '@wix/origami-bi'
 /** Listens, prints the one ready line, and shuts down on SIGTERM/SIGINT. No host means every interface.
  * @param {import('node:http').Server} server @param {{ port: number, host?: string | undefined, onClose: () => Promise<unknown> }} options */
 export async function serve(server, { port, host, onClose }) {
@@ -7,8 +8,10 @@ export async function serve(server, { port, host, onClose }) {
     const shown = !host || address.address === '::' || address.address === '0.0.0.0' ? 'localhost'
         : address.family === 'IPv6' ? `[${address.address}]` : address.address
     console.log(`origami-site-express ready http://${shown}:${address.port}`)
+    const run = currentRow()?.run
     let stopping = false
-    const stop = async () => {
+    /** @param {'SIGINT' | 'SIGTERM' | 'SIGHUP'} signal */
+    const stop = async (signal) => {
         if (stopping) return
         stopping = true
         const closed = new Promise(resolve => server.close(resolve))
@@ -17,8 +20,10 @@ export async function serve(server, { port, host, onClose }) {
         try { await onClose() } catch (error) { console.error('[origami]', error) }
         await closed
         clearTimeout(force)
-        process.exit(0)
+        run?.closeAllRows(signal)
+        await sendAndExit(0, run ? { run } : {})
     }
-    process.once('SIGTERM', stop)
-    process.once('SIGINT', stop)
+    process.once('SIGTERM', () => stop('SIGTERM'))
+    process.once('SIGINT', () => stop('SIGINT'))
+    process.once('SIGHUP', () => stop('SIGHUP'))
 }