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

package/package.json

@@ -1,17 +1,19 @@
 {
   "name": "@sentio/runtime",
   "license": "Apache-2.0",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.0-rc.4",
   "scripts": {
     "compile": "tsc -p .",
     "build": "yarn compile",
     "build_all": "yarn lerna run --scope=@sentio/runtime build --include-dependencies",
-    "test": "jest",
-    "run": "ts-node --files src/processor-runner.ts --log-format=json",
-    "run-benchmark": "ts-node --files src/decode-benchmark.ts"
+    "test": "NODE_OPTIONS=--experimental-vm-modules yarn jest",
+    "run": "ts-node-esm --files src/processor-runner.ts --log-format=json",
+    "run-benchmark": "ts-node-esm --files src/decode-benchmark.ts",
+    "start_ts": "ts-node-esm --files ./src/processor-runner.ts  --log-format=json ../../../examples/x2y2/src/processor.ts",
+    "start_js": "ts-node-esm --files ./src/processor-runner.ts ../../../examples/x2y2/dist/lib.js"
   },
   "dependencies": {
-    "@sentio/protos": "^2.0.0-rc.2",
+    "@sentio/protos": "^2.0.0-rc.4",
     "command-line-args": "^5.2.1",
     "command-line-usage": "^6.1.3",
     "fs-extra": "^11.0.0",
@@ -19,7 +21,6 @@
     "nice-grpc": "^2.0.0",
     "nice-grpc-client-middleware-retry": "^2.0.1",
     "nice-grpc-error-details": "^0.1.4",
-    "p-queue": "^6.6.2",
     "winston": "^3.8.2"
   },
   "devDependencies": {
@@ -34,13 +35,14 @@
   "bin": {
     "processor-runner": "./lib/processor-runner.js"
   },
-  "main": "./lib/index.js",
-  "types": "./lib/index.d.ts",
-  "module": "./lib/index.js",
+  "type": "module",
+  "exports": {
+    ".": "./lib/index.js"
+  },
   "files": [
     "{lib,src}",
     "!{lib,src}/tests",
     "!**/*.test.{js,ts}"
   ],
-  "gitHead": "911db5d42c804d647b4bc38f557f8d0d73e10541"
+  "gitHead": "6daea963269624d5b40c60dba0c2bf9419537658"
 }

package/src/full-service.ts

@@ -1,4 +1,6 @@
 import { CallContext } from 'nice-grpc'
+import { createRequire } from 'module'
+const require = createRequire(import.meta.url)
 
 // Different than the simple one which
 import {
@@ -8,22 +10,29 @@ import {
   ProcessConfigRequest,
   ProcessorServiceImplementation,
   StartRequest,
-} from './gen/processor/protos/processor'
+} from './gen/processor/protos/processor.js'
 
-import { Empty } from '@sentio/protos/lib/google/protobuf/empty'
+import { Empty } from '@sentio/protos'
 import fs from 'fs-extra'
 import * as assert from 'assert'
+import path from 'path'
+
+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)
+}
 
 export class FullProcessorServiceImpl implements ProcessorServiceImplementation {
   constructor(instance: ProcessorServiceImplementation) {
     this.instance = instance
-    const sdkPackageJsonPath = require.resolve('@sentio/sdk/package.json')
-    const sdkPackageJsonContent = fs.readFileSync(sdkPackageJsonPath, 'utf-8')
-    const sdkPackageJson = JSON.parse(sdkPackageJsonContent)
-
-    const runtimePackageJsonPath = require.resolve('@sentio/runtime/package.json')
-    const runtimePackageJsonContent = fs.readFileSync(runtimePackageJsonPath, 'utf-8')
-    const runtimePackageJson = JSON.parse(runtimePackageJsonContent)
+    const sdkPackageJson = locatePackageJson('@sentio/sdk')
+    const runtimePackageJson = locatePackageJson('@sentio/runtime')
 
     console.log('Runtime version:', runtimePackageJson.version, 'SDK version:', sdkPackageJson.version)
 

package/src/gen/google/protobuf/empty.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import _m0 from "protobufjs/minimal";
+import _m0 from "protobufjs/minimal.js";
 
 export interface Empty {
 }

package/src/gen/google/protobuf/struct.ts

@@ -1,5 +1,5 @@
 /* eslint-disable */
-import _m0 from "protobufjs/minimal";
+import _m0 from "protobufjs/minimal.js";
 
 export enum NullValue {
   NULL_VALUE = 0,

package/src/gen/google/protobuf/timestamp.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
 import Long from "long";
-import _m0 from "protobufjs/minimal";
+import _m0 from "protobufjs/minimal.js";
 
 export interface Timestamp {
   seconds: bigint;

package/src/gen/processor/protos/processor.ts

@@ -1,10 +1,10 @@
 /* eslint-disable */
 import Long from "long";
 import type { CallContext, CallOptions } from "nice-grpc-common";
-import _m0 from "protobufjs/minimal";
-import { Empty } from "../../google/protobuf/empty";
-import { Struct } from "../../google/protobuf/struct";
-import { Timestamp } from "../../google/protobuf/timestamp";
+import _m0 from "protobufjs/minimal.js";
+import { Empty } from "../../google/protobuf/empty.js";
+import { Struct } from "../../google/protobuf/struct.js";
+import { Timestamp } from "../../google/protobuf/timestamp.js";
 
 export enum MetricType {
   UNKNOWN_TYPE = 0,

package/src/index.ts

@@ -1,6 +1,6 @@
-export * from './plugin'
-export * from './state'
-export * from './utils'
-export * from './endpoints'
-export * from './chain-config'
-export * from './service'
+export * from './plugin.js'
+export * from './state.js'
+export * from './utils.js'
+export * from './endpoints.js'
+export * from './chain-config.js'
+export * from './service.js'

package/src/processor-runner.ts

@@ -7,16 +7,15 @@ import * as util from 'util'
 import commandLineArgs from 'command-line-args'
 import { createServer } from 'nice-grpc'
 import { createLogger, transports, format } from 'winston'
-import { CompressionAlgorithms } from '@grpc/grpc-js/build/src/compression-algorithms'
+import { compressionAlgorithms } from '@grpc/grpc-js'
 
 import { ProcessorDefinition } from '@sentio/protos'
-import { ProcessorServiceImpl } from './service'
-import { State } from './state'
-import { Endpoints } from './endpoints'
+import { ProcessorServiceImpl } from './service.js'
+import { State } from './state.js'
+import { Endpoints } from './endpoints.js'
 
-import { load } from './loader'
-import { FullProcessorServiceImpl } from './full-service'
-import { ChainConfig } from './chain-config'
+import { FullProcessorServiceImpl } from './full-service.js'
+import { ChainConfig } from './chain-config.js'
 
 State.reset()
 // Endpoints.reset()
@@ -92,10 +91,17 @@ if (options.debug) {
 const server = createServer({
   'grpc.max_send_message_length': 128 * 1024 * 1024,
   'grpc.max_receive_message_length': 128 * 1024 * 1024,
-  'grpc.default_compression_algorithm': CompressionAlgorithms.gzip,
+  'grpc.default_compression_algorithm': compressionAlgorithms.gzip,
 })
 
-const baseService = new ProcessorServiceImpl(() => load(options.target), server.shutdown)
+// const m = await import(options.target)
+// console.log(m)
+
+const baseService = new ProcessorServiceImpl(async () => {
+  const m = await import(options.target)
+  console.log('module loaded')
+  return m
+}, server.shutdown)
 const service = new FullProcessorServiceImpl(baseService)
 
 server.add(ProcessorDefinition, service)

package/src/service.ts

@@ -10,13 +10,11 @@ import {
   ProcessorServiceImplementation,
   ProcessResult,
   StartRequest,
+  Empty,
 } from '@sentio/protos'
 
-import { Empty } from '@sentio/protos/lib/google/protobuf/empty'
-
-import { PluginManager } from './plugin'
-import { errorString, mergeProcessResults } from './utils'
-
+import { PluginManager } from './plugin.js'
+import { errorString, mergeProcessResults } from './utils.js'
 ;(BigInt.prototype as any).toJSON = function () {
   return this.toString()
 }
@@ -25,11 +23,11 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
   private started = false
   private processorConfig: ProcessConfigResponse
 
-  private readonly loader: () => void
+  private readonly loader: () => Promise<any>
 
   private readonly shutdownHandler?: () => void
 
-  constructor(loader: () => void, shutdownHandler?: () => void) {
+  constructor(loader: () => Promise<any>, shutdownHandler?: () => void) {
     this.loader = loader
     this.shutdownHandler = shutdownHandler
   }
@@ -55,25 +53,21 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     }
 
     try {
-      // for (const plugin of ['@sentio/sdk/lib/core/core-plugin', '@sentio/sdk/lib/core/eth-plugin']) {
-      //   try {
-      //     require(plugin)
-      //   } catch (e) {
-      //     console.error('Failed to load plugin: ', plugin)
-      //   }
-      // }
-
-      // for (const plugin of [
-      //   '@sentio/sdk/lib/core/sui-plugin',
-      //   '@sentio/sdk-aptos/lib/aptos-plugin',
-      //   '@sentio/sdk-solana/lib/solana-plugin',
-      // ]) {
-      //   try {
-      //     require(plugin)
-      //   } catch (e) {}
-      // }
-
-      this.loader()
+      for (const plugin of ['@sentio/sdk']) {
+        try {
+          await import(plugin)
+        } catch (e) {
+          console.error('Failed to load plugin: ', plugin)
+        }
+      }
+
+      for (const plugin of ['@sentio/sdk-aptos', '@sentio/sdk-solana']) {
+        try {
+          await import(plugin)
+        } catch (e) {}
+      }
+
+      await this.loader()
     } catch (e) {
       throw new ServerError(Status.INVALID_ARGUMENT, 'Failed to load processor: ' + errorString(e))
     }

package/lib/loader.d.ts

@@ -1,5 +0,0 @@
-export declare function load(name: string): {
-    module: any;
-    name: string;
-    path: string;
-} | undefined;

package/lib/loader.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.load = void 0;
-function load(name) {
-    const req = eval('require');
-    try {
-        let path;
-        try {
-            path = req.resolve(name, { paths: [process.cwd()] });
-        }
-        catch {
-            path = req.resolve(name);
-        }
-        const module = { module: req(path), name, path };
-        console.log('Processor Load successfully');
-        return module;
-    }
-    catch (err) {
-        if (err instanceof Error && err.message.startsWith(`Cannot find module '${name}'`)) {
-            // this error is expected
-            console.log("Couldn't load (expected): ", name);
-            return undefined;
-        }
-        else {
-            throw err;
-        }
-    }
-}
-exports.load = load;
-//# sourceMappingURL=loader.js.map

package/lib/loader.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":";;;AAAA,SAAgB,IAAI,CAAC,IAAY;IAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;IAE3B,IAAI;QACF,IAAI,IAAY,CAAA;QAChB,IAAI;YACF,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAA;SACrD;QAAC,MAAM;YACN,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;SACzB;QAED,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;QAChD,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAA;QAC1C,OAAO,MAAM,CAAA;KACd;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,uBAAuB,IAAI,GAAG,CAAC,EAAE;YAClF,yBAAyB;YACzB,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE,IAAI,CAAC,CAAA;YAC/C,OAAO,SAAS,CAAA;SACjB;aAAM;YACL,MAAM,GAAG,CAAA;SACV;KACF;AACH,CAAC;AAvBD,oBAuBC","sourcesContent":["export function load(name: string): { module: any; name: string; path: string } | undefined {\n  const req = eval('require')\n\n  try {\n    let path: string\n    try {\n      path = req.resolve(name, { paths: [process.cwd()] })\n    } catch {\n      path = req.resolve(name)\n    }\n\n    const module = { module: req(path), name, path }\n    console.log('Processor Load successfully')\n    return module\n  } catch (err) {\n    if (err instanceof Error && err.message.startsWith(`Cannot find module '${name}'`)) {\n      // this error is expected\n      console.log(\"Couldn't load (expected): \", name)\n      return undefined\n    } else {\n      throw err\n    }\n  }\n}\n"]}

package/src/loader.ts

@@ -1,24 +0,0 @@
-export function load(name: string): { module: any; name: string; path: string } | undefined {
-  const req = eval('require')
-
-  try {
-    let path: string
-    try {
-      path = req.resolve(name, { paths: [process.cwd()] })
-    } catch {
-      path = req.resolve(name)
-    }
-
-    const module = { module: req(path), name, path }
-    console.log('Processor Load successfully')
-    return module
-  } catch (err) {
-    if (err instanceof Error && err.message.startsWith(`Cannot find module '${name}'`)) {
-      // this error is expected
-      console.log("Couldn't load (expected): ", name)
-      return undefined
-    } else {
-      throw err
-    }
-  }
-}