@sentio/runtime 2.17.0-rc.1 → 2.17.0-rc.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/full-service.js +19 -5
- package/lib/full-service.js.map +1 -1
- package/package.json +3 -3
- package/src/full-service.ts +20 -5
package/lib/full-service.js
CHANGED
@@ -4,6 +4,7 @@ const require = createRequire(import.meta.url);
|
|
4
4
|
import { HandlerType, } from './gen/processor/protos/processor.js';
|
5
5
|
import fs from 'fs-extra';
|
6
6
|
import path from 'path';
|
7
|
+
import os from 'os';
|
7
8
|
function locatePackageJson(pkgId) {
|
8
9
|
const m = require.resolve(pkgId);
|
9
10
|
let dir = path.dirname(m);
|
@@ -52,12 +53,25 @@ export class FullProcessorServiceImpl {
|
|
52
53
|
for (const binding of request.bindings) {
|
53
54
|
this.adjustDataBinding(binding);
|
54
55
|
}
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
result.configUpdated
|
56
|
+
try {
|
57
|
+
const result = await this.instance.processBindings(request, options);
|
58
|
+
this.adjustResult(result.result);
|
59
|
+
if (!result.configUpdated && result.result?.states?.configUpdated) {
|
60
|
+
result.configUpdated = result.result?.states?.configUpdated;
|
61
|
+
}
|
62
|
+
return result;
|
63
|
+
}
|
64
|
+
catch (e) {
|
65
|
+
if (this.sdkMinorVersion <= 16) {
|
66
|
+
// Old sdk doesn't handle this well
|
67
|
+
if (e.code === os.constants.errno.ECONNRESET ||
|
68
|
+
e.code === os.constants.errno.ECONNREFUSED ||
|
69
|
+
e.code === os.constants.errno.ECONNABORTED) {
|
70
|
+
process.exit(1);
|
71
|
+
}
|
72
|
+
}
|
73
|
+
throw e;
|
59
74
|
}
|
60
|
-
return result;
|
61
75
|
}
|
62
76
|
async *processBindingsStream(requests, context) {
|
63
77
|
throw new Error('Not Implemented for streaming');
|
package/lib/full-service.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"full-service.js","sourceRoot":"","sources":["../src/full-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AACtC,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAE9C,sCAAsC;AACtC,OAAO,EAEL,WAAW,GAMZ,MAAM,qCAAqC,CAAA;AAG5C,OAAO,EAAE,MAAM,UAAU,CAAA;AACzB,OAAO,IAAI,MAAM,MAAM,CAAA;
|
1
|
+
{"version":3,"file":"full-service.js","sourceRoot":"","sources":["../src/full-service.ts"],"names":[],"mappings":"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","sourcesContent":["import { CallContext } from 'nice-grpc'\nimport { createRequire } from 'module'\nconst require = createRequire(import.meta.url)\n\n// Different than the simple one which\nimport {\n DataBinding,\n HandlerType,\n ProcessBindingsRequest,\n ProcessConfigRequest,\n ProcessorServiceImplementation,\n StartRequest,\n ProcessResult,\n} from './gen/processor/protos/processor.js'\n\nimport { Empty } from '@sentio/protos'\nimport fs from 'fs-extra'\nimport path from 'path'\nimport os from 'os'\n\nfunction locatePackageJson(pkgId: string) {\n const m = require.resolve(pkgId)\n\n let dir = path.dirname(m)\n while (!fs.existsSync(path.join(dir, 'package.json'))) {\n dir = path.dirname(dir)\n }\n const content = fs.readFileSync(path.join(dir, 'package.json'), 'utf-8')\n return JSON.parse(content)\n}\n\nexport class FullProcessorServiceImpl implements ProcessorServiceImplementation {\n constructor(instance: ProcessorServiceImplementation) {\n this.instance = instance\n const sdkPackageJson = locatePackageJson('@sentio/sdk')\n const runtimePackageJson = locatePackageJson('@sentio/runtime')\n\n console.log('Runtime version:', runtimePackageJson.version, 'SDK version:', sdkPackageJson.version)\n\n const version = sdkPackageJson.version.split('.')\n this.sdkMinorVersion = parseInt(version[1])\n }\n\n instance: ProcessorServiceImplementation\n sdkMinorVersion: number\n\n async getConfig(request: ProcessConfigRequest, context: CallContext) {\n const config = await this.instance.getConfig(request, context)\n if (config.contractConfigs) {\n for (const contract of config.contractConfigs) {\n // @ts-ignore old fields\n if (contract.aptosCallConfigs) {\n // @ts-ignore old fields\n contract.moveCallConfigs = contract.aptosCallConfigs\n }\n // @ts-ignore old fields\n if (contract.aptosEventConfigs) {\n // @ts-ignore old fields\n contract.moveEventConfigs = contract.aptosEventConfigs\n }\n }\n }\n return config\n }\n\n async start(request: StartRequest, context: CallContext) {\n return await this.instance.start(request, context)\n }\n\n async stop(request: Empty, context: CallContext) {\n return await this.instance.stop(request, context)\n }\n\n async processBindings(request: ProcessBindingsRequest, options: CallContext) {\n for (const binding of request.bindings) {\n this.adjustDataBinding(binding)\n }\n try {\n const result = await this.instance.processBindings(request, options)\n this.adjustResult(result.result as ProcessResult)\n if (!result.configUpdated && result.result?.states?.configUpdated) {\n result.configUpdated = result.result?.states?.configUpdated\n }\n return result\n } catch (e) {\n if (this.sdkMinorVersion <= 16) {\n // Old sdk doesn't handle this well\n if (\n e.code === os.constants.errno.ECONNRESET ||\n e.code === os.constants.errno.ECONNREFUSED ||\n e.code === os.constants.errno.ECONNABORTED\n ) {\n process.exit(1)\n }\n }\n throw e\n }\n }\n\n async *processBindingsStream(requests: AsyncIterable<DataBinding>, context: CallContext) {\n throw new Error('Not Implemented for streaming')\n // y this.instance.processBindingsStream(requests, context)\n }\n\n private adjustResult(res: ProcessResult): void {}\n\n private adjustDataBinding(dataBinding: DataBinding): void {\n switch (dataBinding.handlerType) {\n case HandlerType.APT_EVENT:\n if (dataBinding.data?.aptEvent) {\n // const aptEvent = dataBinding.data.aptEvent\n // if (aptEvent.event && this.sdkMinorVersion < 40) {\n // assert.ok(aptEvent.transaction, 'No Transaction')\n // aptEvent.transaction.events = [aptEvent.event]\n // }\n }\n break\n case HandlerType.UNKNOWN:\n if (dataBinding.data?.ethBlock) {\n if (dataBinding.data.raw.length === 0) {\n // This is actually not needed in current system, just as initla test propose, move to test only\n // when this is stable\n dataBinding.data.raw = new TextEncoder().encode(JSON.stringify(dataBinding.data.ethBlock.block))\n }\n }\n break\n default:\n break\n }\n }\n}\n"]}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@sentio/runtime",
|
3
|
-
"version": "2.17.0-rc.
|
3
|
+
"version": "2.17.0-rc.2",
|
4
4
|
"license": "Apache-2.0",
|
5
5
|
"type": "module",
|
6
6
|
"exports": {
|
@@ -31,10 +31,10 @@
|
|
31
31
|
"prom-client": "^14.2.0",
|
32
32
|
"protobufjs": "^7.2.3",
|
33
33
|
"winston": "^3.8.2",
|
34
|
-
"@sentio/protos": "2.17.0-rc.
|
34
|
+
"@sentio/protos": "2.17.0-rc.2"
|
35
35
|
},
|
36
36
|
"peerDependencies": {
|
37
|
-
"@sentio/sdk": "^2.17.0-rc.
|
37
|
+
"@sentio/sdk": "^2.17.0-rc.2"
|
38
38
|
},
|
39
39
|
"devDependencies": {
|
40
40
|
"@types/command-line-args": "^5.2.0",
|
package/src/full-service.ts
CHANGED
@@ -16,6 +16,7 @@ import {
|
|
16
16
|
import { Empty } from '@sentio/protos'
|
17
17
|
import fs from 'fs-extra'
|
18
18
|
import path from 'path'
|
19
|
+
import os from 'os'
|
19
20
|
|
20
21
|
function locatePackageJson(pkgId: string) {
|
21
22
|
const m = require.resolve(pkgId)
|
@@ -74,12 +75,26 @@ export class FullProcessorServiceImpl implements ProcessorServiceImplementation
|
|
74
75
|
for (const binding of request.bindings) {
|
75
76
|
this.adjustDataBinding(binding)
|
76
77
|
}
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
result.configUpdated
|
78
|
+
try {
|
79
|
+
const result = await this.instance.processBindings(request, options)
|
80
|
+
this.adjustResult(result.result as ProcessResult)
|
81
|
+
if (!result.configUpdated && result.result?.states?.configUpdated) {
|
82
|
+
result.configUpdated = result.result?.states?.configUpdated
|
83
|
+
}
|
84
|
+
return result
|
85
|
+
} catch (e) {
|
86
|
+
if (this.sdkMinorVersion <= 16) {
|
87
|
+
// Old sdk doesn't handle this well
|
88
|
+
if (
|
89
|
+
e.code === os.constants.errno.ECONNRESET ||
|
90
|
+
e.code === os.constants.errno.ECONNREFUSED ||
|
91
|
+
e.code === os.constants.errno.ECONNABORTED
|
92
|
+
) {
|
93
|
+
process.exit(1)
|
94
|
+
}
|
95
|
+
}
|
96
|
+
throw e
|
81
97
|
}
|
82
|
-
return result
|
83
98
|
}
|
84
99
|
|
85
100
|
async *processBindingsStream(requests: AsyncIterable<DataBinding>, context: CallContext) {
|