@output.ai/core 0.2.3 → 0.2.4

package/bin/worker.sh

@@ -23,4 +23,4 @@ sdk_dir="$(dirname "$script_dir")"
 
 cd ${sdk_dir}
 
-exec npm run worker -- ${invocation_dir} "${@:2}"  # Pass remaining args
+exec node "${sdk_dir}/src/worker/index.js" "${invocation_dir}" "${@:2}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@output.ai/core",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "The core module of the output framework",
   "type": "module",
   "exports": {

package/src/worker/catalog_workflow/workflow.js

@@ -1,4 +1,4 @@
-import { defineQuery, setHandler } from '@temporalio/workflow';
+import { defineQuery, setHandler, condition } from '@temporalio/workflow';
 
 /**
  * This is a special workflow, unique to each worker, which holds the meta information of all other workflows in that worker.
@@ -9,5 +9,6 @@ import { defineQuery, setHandler } from '@temporalio/workflow';
  */
 export default async function catalogWorkflow( catalog ) {
   setHandler( defineQuery( 'get' ), () => catalog );
-  await new Promise( () => {} ); // stay alive
+  // Wait indefinitely but remain responsive to workflow cancellation
+  await condition( () => false );
 };

package/src/worker/index.js

@@ -56,5 +56,39 @@ const callerDir = process.argv[2];
   } );
 
   console.log( '[Core]', 'Running worker...' );
-  worker.run();
-} )();
+
+  // FORCE_QUIT_GRACE_MS delays the second instance of a shutdown command.
+  // If running output-worker directly with npx, 2 signals are recieved in
+  // rapid succession, and users see the force quit message.
+  const FORCE_QUIT_GRACE_MS = 1000;
+  const state = { isShuttingDown: false, shutdownStartedAt: null };
+
+  const shutdown = signal => {
+    if ( state.isShuttingDown ) {
+      const elapsed = Date.now() - state.shutdownStartedAt;
+      if ( elapsed < FORCE_QUIT_GRACE_MS ) {
+        return; // ignore rapid duplicate signals
+      }
+      process.stderr.write( '[Core] Force quitting...\n' );
+      process.exit( 1 );
+    }
+    state.isShuttingDown = true;
+    state.shutdownStartedAt = Date.now();
+    process.stderr.write( `[Core] Received ${signal}, shutting down...\n` );
+    worker.shutdown();
+  };
+
+  process.on( 'SIGTERM', () => shutdown( 'SIGTERM' ) );
+  process.on( 'SIGINT', () => shutdown( 'SIGINT' ) );
+
+  await worker.run();
+  process.stderr.write( '[Core] Worker stopped.\n' );
+
+  await connection.close();
+  process.stderr.write( '[Core] Connection closed.\n' );
+
+  process.exit( 0 );
+} )().catch( error => {
+  process.stderr.write( `[Core] Fatal error: ${error.message}\n` );
+  process.exit( 1 );
+} );