@sentio/runtime 2.0.3-rc.2 → 2.1.0-rc.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/runtime",
   "license": "Apache-2.0",
-  "version": "2.0.3-rc.2",
+  "version": "2.1.0-rc.2",
   "scripts": {
     "compile": "tsc",
     "build": "yarn compile",
@@ -13,7 +13,7 @@
     "start_js": "ts-node-esm --files ./lib/processor-runner.js $PWD/../../debug/dist/lib.js"
   },
   "dependencies": {
-    "@sentio/protos": "^2.0.3-rc.2",
+    "@sentio/protos": "^2.1.0-rc.2",
     "command-line-args": "^5.2.1",
     "command-line-usage": "^6.1.3",
     "fs-extra": "^11.0.0",
@@ -45,5 +45,5 @@
     "!{lib,src}/tests",
     "!**/*.test.{js,ts}"
   ],
-  "gitHead": "5c5db504a0764b8400d1caddcd45c6e986393dbe"
+  "gitHead": "4b67d3ccd6712c4ae6eada79c7fd7f8566c94ed9"
 }

package/src/full-service.ts

@@ -10,11 +10,11 @@ import {
   ProcessConfigRequest,
   ProcessorServiceImplementation,
   StartRequest,
+  ProcessResult,
 } from './gen/processor/protos/processor.js'
 
 import { Empty } from '@sentio/protos'
 import fs from 'fs-extra'
-import * as assert from 'assert'
 import path from 'path'
 
 function locatePackageJson(pkgId: string) {
@@ -59,7 +59,9 @@ export class FullProcessorServiceImpl implements ProcessorServiceImplementation
     for (const binding of request.bindings) {
       this.adjustDataBinding(binding)
     }
-    return await this.instance.processBindings(request, options)
+    const result = await this.instance.processBindings(request, options)
+    this.adjustResult(result.result as ProcessResult)
+    return result
   }
 
   async *processBindingsStream(requests: AsyncIterable<DataBinding>, context: CallContext) {
@@ -67,7 +69,15 @@ export class FullProcessorServiceImpl implements ProcessorServiceImplementation
     // y this.instance.processBindingsStream(requests, context)
   }
 
-  protected adjustDataBinding(dataBinding: DataBinding): void {
+  private adjustResult(res: ProcessResult): void {
+    for (const log of res.logs) {
+      if (log.attributes && !log.attributes2) {
+        log.attributes2 = JSON.parse(log.attributes)
+      }
+    }
+  }
+
+  private adjustDataBinding(dataBinding: DataBinding): void {
     switch (dataBinding.handlerType) {
       case HandlerType.APT_EVENT:
         if (dataBinding.data?.aptEvent) {

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

@@ -609,7 +609,9 @@ export interface LogResult {
   metadata: RecordMetaData | undefined;
   level: LogLevel;
   message: string;
+  /** @deprecated */
   attributes: string;
+  attributes2: { [key: string]: any } | undefined;
   runtimeInfo: RuntimeInfo | undefined;
 }
 
@@ -4567,7 +4569,7 @@ export const CounterResult = {
 };
 
 function createBaseLogResult(): LogResult {
-  return { metadata: undefined, level: 0, message: "", attributes: "", runtimeInfo: undefined };
+  return { metadata: undefined, level: 0, message: "", attributes: "", attributes2: undefined, runtimeInfo: undefined };
 }
 
 export const LogResult = {
@@ -4584,6 +4586,9 @@ export const LogResult = {
     if (message.attributes !== "") {
       writer.uint32(50).string(message.attributes);
     }
+    if (message.attributes2 !== undefined) {
+      Struct.encode(Struct.wrap(message.attributes2), writer.uint32(58).fork()).ldelim();
+    }
     if (message.runtimeInfo !== undefined) {
       RuntimeInfo.encode(message.runtimeInfo, writer.uint32(34).fork()).ldelim();
     }
@@ -4609,6 +4614,9 @@ export const LogResult = {
         case 6:
           message.attributes = reader.string();
           break;
+        case 7:
+          message.attributes2 = Struct.unwrap(Struct.decode(reader, reader.uint32()));
+          break;
         case 4:
           message.runtimeInfo = RuntimeInfo.decode(reader, reader.uint32());
           break;
@@ -4626,6 +4634,7 @@ export const LogResult = {
       level: isSet(object.level) ? logLevelFromJSON(object.level) : 0,
       message: isSet(object.message) ? String(object.message) : "",
       attributes: isSet(object.attributes) ? String(object.attributes) : "",
+      attributes2: isObject(object.attributes2) ? object.attributes2 : undefined,
       runtimeInfo: isSet(object.runtimeInfo) ? RuntimeInfo.fromJSON(object.runtimeInfo) : undefined,
     };
   },
@@ -4637,6 +4646,7 @@ export const LogResult = {
     message.level !== undefined && (obj.level = logLevelToJSON(message.level));
     message.message !== undefined && (obj.message = message.message);
     message.attributes !== undefined && (obj.attributes = message.attributes);
+    message.attributes2 !== undefined && (obj.attributes2 = message.attributes2);
     message.runtimeInfo !== undefined &&
       (obj.runtimeInfo = message.runtimeInfo ? RuntimeInfo.toJSON(message.runtimeInfo) : undefined);
     return obj;
@@ -4650,6 +4660,7 @@ export const LogResult = {
     message.level = object.level ?? 0;
     message.message = object.message ?? "";
     message.attributes = object.attributes ?? "";
+    message.attributes2 = object.attributes2 ?? undefined;
     message.runtimeInfo = (object.runtimeInfo !== undefined && object.runtimeInfo !== null)
       ? RuntimeInfo.fromPartial(object.runtimeInfo)
       : undefined;