@outputai/core 0.13.0 → 0.13.1-next.318b2e6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@outputai/core",
-  "version": "0.13.0",
+  "version": "0.13.1-next.318b2e6.0",
   "description": "The core module of the output framework",
   "type": "module",
   "engines": {

package/src/worker/index.js

@@ -1,4 +1,4 @@
-import { Worker, NativeConnection, GracefulShutdownPeriodExpiredError } from '@temporalio/worker';
+import { Worker, NativeConnection } from '@temporalio/worker';
 import * as configs from './configs.js';
 import { loadActivities } from './loader/activities.js';
 import { loadWorkflows } from './loader/workflows.js';
@@ -174,11 +174,10 @@ execute()
     log.info( 'Flushing hook callbacks...' );
     await flushPendingHooks( hookFlushTimeoutMs );
 
-    // An expired drain is the bound working as intended, not a worker failure, so it keeps exit code 0.
-    const workerFailedToStop = shutdownFailures.some( v => v.service === 'worker' && !( v.error instanceof GracefulShutdownPeriodExpiredError ) );
+    const workerFailedToStop = shutdownFailures.some( v => v.service === 'worker' );
     const exitCode = workerFailedToStop || hasError ? 1 : 0;
     setTimeout( () => {
-      log.info( 'Bye' );
+      log.info( 'Bye', { exitCode } );
       process.exit( exitCode );
     } );
   } );

package/src/worker/index.spec.js

@@ -8,7 +8,6 @@ const {
   connectionMonitorInstance,
   createCatalogMock,
   flushPendingHooksMock,
-  GracefulShutdownPeriodExpiredError,
   hashSourceCodeMock,
   initInterceptorsMock,
   interruption,
@@ -118,11 +117,6 @@ const {
     name = 'UncaughtError';
   };
 
-  /** Stands in for the Temporal error thrown when the drain outlives the force time */
-  class GracefulShutdownPeriodExpiredError extends Error {
-    name = 'GracefulShutdownPeriodExpiredError';
-  };
-
   const interruption = { controller: null, KillSignError, UncaughtError };
 
   return {
@@ -132,7 +126,6 @@ const {
     connectionMonitorInstance,
     createCatalogMock: vi.fn().mockReturnValue( { workflowNames: [ 'demo' ] } ),
     flushPendingHooksMock: vi.fn().mockResolvedValue( undefined ),
-    GracefulShutdownPeriodExpiredError,
     hashSourceCodeMock: vi.fn().mockResolvedValue( 'catalog-hash' ),
     initInterceptorsMock: vi.fn().mockReturnValue( [] ),
     interruption,
@@ -204,8 +197,7 @@ vi.mock( './catalog_workflow/catalog_publisher.js', () => ( {
 vi.mock( './shutdown.js', () => ( { shutdownServices: shutdownServicesMock } ) );
 vi.mock( '@temporalio/worker', () => ( {
   NativeConnection: { connect: vi.fn().mockResolvedValue( mockConnection ) },
-  Worker: { create: vi.fn().mockResolvedValue( mockWorker ) },
-  GracefulShutdownPeriodExpiredError
+  Worker: { create: vi.fn().mockResolvedValue( mockWorker ) }
 } ) );
 
 const importWorker = async () => {
@@ -397,7 +389,7 @@ describe( 'worker/index', () => {
       } );
       expect( mockLog.error ).not.toHaveBeenCalled();
       expect( mainEventBusMock.emit ).not.toHaveBeenCalledWith( BusEventType.RUNTIME_ERROR, expect.anything() );
-      expect( mockLog.info ).toHaveBeenCalledWith( 'Bye' );
+      expect( mockLog.info ).toHaveBeenCalledWith( 'Bye', { exitCode: 0 } );
       expect( process.exit ).toHaveBeenCalledWith( 0 );
     } );
 
@@ -412,18 +404,6 @@ describe( 'worker/index', () => {
       expect( process.exit ).toHaveBeenCalledWith( 0 );
     } );
 
-    it( 'still exits cleanly when the drain outlived the force time', async () => {
-      await bootWorker();
-      const error = new GracefulShutdownPeriodExpiredError( 'Timed out while waiting for worker to shutdown gracefully' );
-      shutdownServicesMock.mockResolvedValueOnce( [ { service: 'worker', error } ] );
-
-      interruption.controller.abort( new interruption.KillSignError( 'SIGTERM' ) );
-      await waitForExit();
-
-      expect( mockLog.error ).not.toHaveBeenCalled();
-      expect( process.exit ).toHaveBeenCalledWith( 0 );
-    } );
-
     it( 'does not report the worker as terminated when a signal ended the run', async () => {
       await bootWorker();
 
@@ -482,7 +462,6 @@ describe( 'worker/index', () => {
 
       expect( process.exit ).toHaveBeenCalledWith( 1 );
     } );
-
     it( 'reports a lost connection and shuts down', async () => {
       const error = new Error( 'connection lost' );
       await bootWorker();