@sentio/runtime 2.44.5-rc.2 → 2.44.6-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentio/runtime",
-  "version": "2.44.5-rc.2",
+  "version": "2.44.6-rc.1",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {

package/src/action-server.ts

@@ -0,0 +1,18 @@
+import { PluginManager } from './plugin.js'
+import { ProcessConfigResponse } from '@sentio/protos'
+
+export class ActionServer {
+  constructor(readonly loader: () => Promise<void>) {}
+
+  async listen(port: number) {
+    const pluginManager = PluginManager.INSTANCE
+    await this.loader()
+    await pluginManager.configure(ProcessConfigResponse.create())
+    console.log('Starting Action Server at:', port)
+    await pluginManager.startServer(port)
+  }
+
+  forceShutdown() {
+    PluginManager.INSTANCE.shutdown()
+  }
+}

package/src/plugin.ts

@@ -15,13 +15,8 @@ export abstract class Plugin {
   supportedHandlers: HandlerType[] = []
 
   async configure(config: ProcessConfigResponse): Promise<void> {}
-  async start(start: StartRequest, actionServerPort?: number): Promise<void> {}
 
-  /**
-   * method used by action server only
-   * @param port
-   */
-  async startServer(port?: number): Promise<void> {}
+  async start(start: StartRequest): Promise<void> {}
 
   /**
    * @deprecated The method should not be used, use ctx.states instead
@@ -37,6 +32,17 @@ export abstract class Plugin {
   async preprocessBinding(request: DataBinding, preprocessStore: { [k: string]: any }): Promise<PreprocessResult> {
     return PreprocessResult.create()
   }
+
+  /**
+   * method used by action server only
+   * @param port
+   */
+  async startServer(port?: number): Promise<void> {}
+
+  /**
+   * method used by action server only
+   */
+  shutdownServer() {}
 }
 
 export class PluginManager {
@@ -66,13 +72,17 @@ export class PluginManager {
   }
 
   start(start: StartRequest, actionServerPort?: number) {
-    return Promise.all(this.plugins.map((plugin) => plugin.start(start, actionServerPort)))
+    return Promise.all(this.plugins.map((plugin) => plugin.start(start)))
   }
 
   startServer(port?: number) {
     return Promise.all(this.plugins.map((plugin) => plugin.startServer(port)))
   }
 
+  shutdown() {
+    this.plugins.forEach((plugin) => plugin.shutdownServer())
+  }
+
   /**
    * @deprecated The method should not be used, use ctx.states instead
    */

package/src/processor-runner.ts

@@ -5,7 +5,7 @@ import fs from 'fs-extra'
 
 import { compressionAlgorithms } from '@grpc/grpc-js'
 import commandLineArgs from 'command-line-args'
-import { createServer, Server } from 'nice-grpc'
+import { createServer } from 'nice-grpc'
 import { errorDetailsServerMiddleware } from 'nice-grpc-error-details'
 // import { registry as niceGrpcRegistry } from 'nice-grpc-prometheus'
 import { openTelemetryServerMiddleware } from 'nice-grpc-opentelemetry'
@@ -21,8 +21,7 @@ import { ChainConfig } from './chain-config.js'
 import { setupLogger } from './logger.js'
 
 import { setupOTLP } from './otlp.js'
-import { PluginManager } from './plugin.js'
-import { ProcessConfigResponse } from '@sentio/protos'
+import { ActionServer } from './action-server.js'
 
 // const mergedRegistry = Registry.merge([globalRegistry, niceGrpcRegistry])
 
@@ -87,20 +86,16 @@ for (const [id, config] of Object.entries(chainsConfig)) {
 
 console.debug('Starting Server', options)
 
-let server: Server
+let server: any
 let baseService: ProcessorServiceImpl
-
+const loader = async () => {
+  const m = await import(options.target)
+  console.debug('Module loaded', m)
+  return m
+}
 if (options['start-action-server']) {
-  const pluginManager = PluginManager.INSTANCE
-  pluginManager
-    .configure(ProcessConfigResponse.create())
-    .then(() => {
-      console.log('Starting Action Server at:', options.port)
-      return pluginManager.startServer(options.port)
-    })
-    .catch((err) => {
-      console.error('Error starting action server', err)
-    })
+  server = new ActionServer(loader)
+  server.listen(options.port)
 } else {
   server = createServer({
     'grpc.max_send_message_length': 384 * 1024 * 1024,
@@ -110,11 +105,7 @@ if (options['start-action-server']) {
     // .use(prometheusServerMiddleware())
     .use(openTelemetryServerMiddleware())
     .use(errorDetailsServerMiddleware)
-  baseService = new ProcessorServiceImpl(async () => {
-    const m = await import(options.target)
-    console.debug('Module loaded', m)
-    return m
-  }, server.shutdown)
+  baseService = new ProcessorServiceImpl(loader, server.shutdown)
   const service = new FullProcessorServiceImpl(baseService)
 
   server.add(ProcessorDefinition, service)