@sentio/runtime 3.1.0-rc.2 → 3.1.0-rc.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentio/runtime",
-  "version": "3.1.0-rc.2",
+  "version": "3.1.0-rc.4",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -32,7 +32,7 @@
     "run": "tsx src/processor-runner.ts --log-format=json",
     "run-benchmark": "tsx src/decode-benchmark.ts",
     "start_js": "tsx ./lib/processor-runner.js $PWD/../../debug/dist/lib.js",
-    "start_ts": "tsx src/processor-runner.ts --debug --multi-server 3 --chains-config chains-config.json $PWD/../../examples/x2y2/src/processor.ts",
+    "start_ts": "tsx src/processor-runner.ts --debug --worker 3 --port 4000 --chains-config chains-config.json $PWD/../../examples/x2y2/src/processor.ts",
     "test": "glob -c 'tsx --test' '**/*.test.ts'"
   }
 }

package/src/full-service.ts

@@ -1,5 +1,4 @@
 import { CallContext } from 'nice-grpc'
-import { createRequire } from 'module'
 // Different than the simple one which
 import {
   DataBinding,
@@ -16,16 +15,12 @@ import {
 } from './gen/processor/protos/processor.js'
 
 import { DeepPartial, Empty, ProcessorV3ServiceImplementation, UpdateTemplatesRequest } from '@sentio/protos'
-import fs from 'fs-extra'
-import path from 'path'
 import os from 'os'
 import { GLOBAL_CONFIG } from './global-config.js'
-import { compareSemver, parseSemver, Semver } from './utils.js'
+import { compareSemver, locatePackageJson, parseSemver, Semver } from './utils.js'
 import { LRUCache } from 'lru-cache'
 import { createHash } from 'crypto'
 
-const require = createRequire(import.meta.url)
-
 const FUEL_PROTO_UPDATE_VERSION = parseSemver('2.54.0-rc.7')
 const FUEL_PROTO_NO_FUEL_TRANSACTION_AS_CALL_VERSION = parseSemver('2.55.0-rc.1')
 
@@ -68,17 +63,6 @@ function getParsedData(rawData: string): any {
   return parsedData
 }
 
-function locatePackageJson(pkgId: string) {
-  const m = require.resolve(pkgId)
-
-  let dir = path.dirname(m)
-  while (!fs.existsSync(path.join(dir, 'package.json'))) {
-    dir = path.dirname(dir)
-  }
-  const content = fs.readFileSync(path.join(dir, 'package.json'), 'utf-8')
-  return JSON.parse(content)
-}
-
 /**
  * The RuntimeServicePatcher class is responsible for providing backward compatibility
  * patches for different SDK versions. It ensures that the runtime can adapt to changes
@@ -89,10 +73,6 @@ export class RuntimeServicePatcher {
 
   constructor() {
     const sdkPackageJson = locatePackageJson('@sentio/sdk')
-    const runtimePackageJson = locatePackageJson('@sentio/runtime')
-
-    console.log('Runtime version:', runtimePackageJson.version, 'SDK version:', sdkPackageJson.version)
-
     this.sdkVersion = parseSemver(sdkPackageJson.version)
   }
 
@@ -298,10 +278,6 @@ export class FullProcessorServiceImpl implements ProcessorServiceImplementation
   constructor(instance: ProcessorServiceImplementation) {
     this.instance = instance
     const sdkPackageJson = locatePackageJson('@sentio/sdk')
-    const runtimePackageJson = locatePackageJson('@sentio/runtime')
-
-    console.log('Runtime version:', runtimePackageJson.version, 'SDK version:', sdkPackageJson.version)
-
     this.sdkVersion = parseSemver(sdkPackageJson.version)
   }
 

package/src/processor-runner.ts

@@ -24,6 +24,7 @@ import { ProcessorV3Definition } from '@sentio/protos'
 import { ProcessorServiceImplV3 } from './service-v3.js'
 import { dirname, join } from 'path'
 import { program, ProcessorRuntimeOptions } from 'processor-runner-program.js'
+import { locatePackageJson } from './utils.js'
 
 program.parse()
 
@@ -46,52 +47,14 @@ configureEndpoints(options)
 console.debug('Starting Server', options)
 
 // Check if this is a child process spawned for multi-server mode
-const isChildProcess = process.env['SENTIO_MULTI_SERVER_CHILD'] === 'true'
-const childServerPort = process.env['SENTIO_CHILD_SERVER_PORT']
+const isChildProcess = process.env['IS_CHILD'] === 'true'
 
-// Multi-worker mode: spawn child processes for additional servers
-if (options.worker > 1 && !isChildProcess) {
-  const childProcesses: ChildProcess[] = []
-  const basePort = parseInt(options.port)
-
-  // Spawn child processes for ports basePort+1 to basePort+(multiServer-1)
-  for (let i = 1; i < options.worker; i++) {
-    const childPort = basePort + i
-    const child = fork(fileURLToPath(import.meta.url), process.argv.slice(2), {
-      env: {
-        ...process.env,
-        SENTIO_MULTI_SERVER_CHILD: 'true',
-        SENTIO_CHILD_SERVER_PORT: String(childPort)
-      },
-      stdio: 'inherit'
-    })
-
-    child.on('error', (err) => {
-      console.error(`Child process on port ${childPort} error:`, err)
-    })
-
-    child.on('exit', (code) => {
-      console.log(`Child process on port ${childPort} exited with code ${code}`)
-    })
-
-    childProcesses.push(child)
-    console.log(`Spawned child server process for port ${childPort}`)
-  }
-
-  // Handle parent process shutdown - kill all children
-  const shutdownChildren = () => {
-    for (const child of childProcesses) {
-      child.kill('SIGINT')
-    }
-  }
-
-  process.on('SIGINT', shutdownChildren)
-  process.on('SIGTERM', shutdownChildren)
+if (!isChildProcess) {
+  const sdkPackageJson = locatePackageJson('@sentio/sdk')
+  const runtimePackageJson = locatePackageJson('@sentio/runtime')
+  console.log('Runtime version:', runtimePackageJson.version, 'SDK version:', sdkPackageJson.version)
 }
 
-// Determine the actual port for this process
-const actualPort = isChildProcess && childServerPort ? childServerPort : options.port
-
 let server: any
 let baseService: ProcessorServiceImpl
 let httpServer: http.Server | undefined
@@ -104,7 +67,7 @@ const loader = async () => {
 
 if (options.startActionServer) {
   server = new ActionServer(loader)
-  server.listen(actualPort)
+  server.listen(options.port)
 } else {
   server = createServer({
     'grpc.max_send_message_length': 768 * 1024 * 1024,
@@ -127,8 +90,8 @@ if (options.startActionServer) {
     new FullProcessorServiceV3Impl(new ProcessorServiceImplV3(loader, options, server.shutdown))
   )
 
-  server.listen('0.0.0.0:' + actualPort)
-  console.log('Processor Server Started at:', actualPort)
+  server.listen('0.0.0.0:' + options.port)
+  console.log('Processor Server Started at:', options.port)
 }
 
 // Only start metrics server on the main process (not child processes)
@@ -268,3 +231,58 @@ function shutdownServers(exitCode: number): void {
     process.exit(exitCode)
   }
 }
+
+// Multi-worker mode: spawn child processes for additional servers
+if (options.worker > 1 && !isChildProcess) {
+  const childProcesses: ChildProcess[] = []
+  const basePort = parseInt(options.port)
+
+  // Spawn child processes for ports basePort+1 to basePort+(worker-1)
+  for (let i = 1; i < options.worker; i++) {
+    const childPort = basePort + i
+    const args = process.argv.slice(2)
+    const childArgs: string[] = ['--port=' + String(childPort)]
+    // Ignore port argument for child process
+    // handle both '-p 4000' and '--port=4000' styles
+    // ignore '--inspect=0.0.0.0:9229'
+    for (let j = 0; j < args.length; j++) {
+      const arg = args[j]
+      if (arg === '-p' || arg === '--port') {
+        j++ // skip next arg
+        continue
+      } else if (arg.startsWith('--port=') || arg.startsWith('--inspect=')) {
+        continue
+      }
+
+      childArgs.push(arg)
+    }
+    const child = fork(fileURLToPath(import.meta.url), childArgs, {
+      env: {
+        ...process.env,
+        IS_CHILD: 'true'
+      },
+      stdio: 'inherit'
+    })
+
+    child.on('error', (err) => {
+      console.error(`Child process on port ${childPort} error:`, err)
+    })
+
+    child.on('exit', (code) => {
+      console.log(`Child process on port ${childPort} exited with code ${code}`)
+    })
+
+    childProcesses.push(child)
+    console.log(`Spawned child server process for port ${childPort}`)
+  }
+
+  // Handle parent process shutdown - kill all children
+  const shutdownChildren = () => {
+    for (const child of childProcesses) {
+      child.kill('SIGINT')
+    }
+  }
+
+  process.on('SIGINT', shutdownChildren)
+  process.on('SIGTERM', shutdownChildren)
+}

package/src/utils.ts

@@ -1,9 +1,12 @@
 import { EthCallParam, ProcessResult } from '@sentio/protos'
+import { createRequire } from 'module'
 
 // TODO better handling this, because old proto doesn't have this
 import { StateResult, ProcessResult as ProcessResultFull } from './gen/processor/protos/processor.js'
 
 import { Required } from 'utility-types'
+import path from 'path'
+import fs from 'fs'
 
 export function mergeProcessResults(results: ProcessResult[]): Required<ProcessResult, 'states'> {
   const res = {
@@ -112,3 +115,16 @@ export function compareSemver(a: Semver, b: Semver) {
   }
   return 0
 }
+
+const require = createRequire(import.meta.url)
+
+export function locatePackageJson(pkgId: string) {
+  const m = require.resolve(pkgId)
+
+  let dir = path.dirname(m)
+  while (!fs.existsSync(path.join(dir, 'package.json'))) {
+    dir = path.dirname(dir)
+  }
+  const content = fs.readFileSync(path.join(dir, 'package.json'), 'utf-8')
+  return JSON.parse(content)
+}