@sentio/runtime 2.40.0-rc.31 → 2.40.0-rc.33

package/lib/{chunk-BWEU6VU4.js → chunk-4SVLLI4X.js}

@@ -59708,6 +59708,7 @@ var {
 } = dbMetrics;
 var STORE_BATCH_IDLE = process2.env["STORE_BATCH_MAX_IDLE"] ? parseInt(process2.env["STORE_BATCH_MAX_IDLE"]) : 1;
 var STORE_BATCH_SIZE = process2.env["STORE_BATCH_SIZE"] ? parseInt(process2.env["STORE_BATCH_SIZE"]) : 10;
+var STORE_UPSERT_NO_WAIT = process2.env["STORE_UPSERT_NO_WAIT"] === "true";
 var timeoutError = new Error("timeout");
 var _StoreContext = class {
   constructor(subject, processId) {
@@ -59716,6 +59717,7 @@ var _StoreContext = class {
   }
   defers = /* @__PURE__ */ new Map();
   statsInterval;
+  pendings = [];
   newPromise(opId, requestType) {
     return new Promise((resolve, reject) => {
       this.defers.set(opId, { resolve, reject, requestType });
@@ -59744,6 +59746,12 @@ var _StoreContext = class {
       processId: this.processId
     });
     send_counts[requestType]?.add(1);
+    if (requestType === "upsert" && STORE_UPSERT_NO_WAIT) {
+      this.pendings.push(promise);
+      return Promise.resolve({
+        opId
+      });
+    }
     return Promise.race(promises).then((result) => {
       if (timeoutSecs) {
         console.debug("db request", requestType, "op", opId, " took", Date.now() - start, "ms");
@@ -59809,23 +59817,35 @@ var _StoreContext = class {
       if (request.entity.length >= STORE_BATCH_SIZE) {
         this.sendBatch();
       }
+      if (STORE_UPSERT_NO_WAIT) {
+        return {
+          opId: this.upsertBatch.opId
+        };
+      }
       return promise;
     } else {
       const opId = _StoreContext.opCounter++;
-      const promise = this.newPromise(opId, "upsert");
       const timeout = setTimeout(() => {
         this.sendBatch();
       }, STORE_BATCH_IDLE);
       const start = Date.now();
+      const promise = this.newPromise(opId, "upsert").finally(() => {
+        request_times["upsert"].add(Date.now() - start);
+      });
       this.upsertBatch = {
         opId,
         request: req,
         promise,
         timer: timeout
       };
-      return promise.finally(() => {
-        request_times["upsert"].add(Date.now() - start);
-      });
+      if (STORE_UPSERT_NO_WAIT) {
+        this.pendings.push(promise);
+        return {
+          opId: this.upsertBatch.opId
+        };
+      } else {
+        return promise;
+      }
     }
   }
   sendBatch() {
@@ -59845,6 +59865,9 @@ var _StoreContext = class {
       batched_total_count.add(request.entity.length);
     }
   }
+  async awaitPendings() {
+    await Promise.all(this.pendings);
+  }
 };
 var StoreContext = _StoreContext;
 __publicField(StoreContext, "opCounter", 0n);
@@ -80387,7 +80410,8 @@ var ProcessorServiceImpl = class {
           const binding = request.binding;
           const dbContext = contexts.new(request.processId, subject);
           const start = Date.now();
-          PluginManager.INSTANCE.processBinding(binding, this.preparedData, dbContext).then((result) => {
+          PluginManager.INSTANCE.processBinding(binding, this.preparedData, dbContext).then(async (result) => {
+            await dbContext.awaitPendings();
             subject.next({
               result,
               processId: request.processId
@@ -80408,7 +80432,11 @@ var ProcessorServiceImpl = class {
         }
         if (request.dbResult) {
           const dbContext = contexts.get(request.processId);
-          dbContext?.result(request.dbResult);
+          try {
+            dbContext?.result(request.dbResult);
+          } catch (e) {
+            subject.error(new Error("db result error, process should stop"));
+          }
         }
       } catch (e) {
         console.error("unexpect error during handle loop", e);

package/lib/index.d.ts

@@ -17,6 +17,7 @@ declare class StoreContext {
     private static opCounter;
     private defers;
     private statsInterval;
+    private pendings;
     constructor(subject: Subject<DeepPartial$1<ProcessStreamResponse>>, processId: number);
     newPromise<T>(opId: bigint, requestType?: RequestType): Promise<T>;
     sendRequest(request: DeepPartial$1<Request>, timeoutSecs?: number): Promise<DBResponse>;
@@ -31,6 +32,7 @@ declare class StoreContext {
     } | undefined;
     private sendUpsertInBatch;
     private sendBatch;
+    awaitPendings(): Promise<void>;
 }
 
 declare abstract class Plugin {

package/lib/index.js

@@ -14,7 +14,7 @@ import {
   makeEthCallKey,
   mergeProcessResults,
   timeoutError
-} from "./chunk-BWEU6VU4.js";
+} from "./chunk-4SVLLI4X.js";
 
 // src/state.ts
 var _State = class {

package/lib/processor-runner.js

@@ -41,7 +41,7 @@ import {
   require_minimal,
   require_src,
   trace
-} from "./chunk-BWEU6VU4.js";
+} from "./chunk-4SVLLI4X.js";
 
 // ../../node_modules/.pnpm/universalify@2.0.1/node_modules/universalify/index.js
 var require_universalify = __commonJS({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentio/runtime",
-  "version": "2.40.0-rc.31",
+  "version": "2.40.0-rc.33",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {

package/src/db-context.ts

@@ -20,6 +20,7 @@ const {
 } = dbMetrics
 const STORE_BATCH_IDLE = process.env['STORE_BATCH_MAX_IDLE'] ? parseInt(process.env['STORE_BATCH_MAX_IDLE']) : 1
 const STORE_BATCH_SIZE = process.env['STORE_BATCH_SIZE'] ? parseInt(process.env['STORE_BATCH_SIZE']) : 10
+const STORE_UPSERT_NO_WAIT = process.env['STORE_UPSERT_NO_WAIT'] === 'true'
 
 type Request = Omit<DBRequest, 'opId'>
 type RequestType = keyof Request
@@ -28,12 +29,12 @@ export const timeoutError = new Error('timeout')
 
 export class StoreContext {
   private static opCounter = 0n
-
   private defers = new Map<
     bigint,
     { resolve: (value: any) => void; reject: (reason?: any) => void; requestType?: RequestType }
   >()
   private statsInterval: NodeJS.Timeout | undefined
+  private pendings: Promise<unknown>[] = []
 
   constructor(
     readonly subject: Subject<DeepPartial<ProcessStreamResponse>>,
@@ -76,6 +77,13 @@ export class StoreContext {
 
     send_counts[requestType]?.add(1)
 
+    if (requestType === 'upsert' && STORE_UPSERT_NO_WAIT) {
+      this.pendings.push(promise)
+      return Promise.resolve({
+        opId,
+      } as DBResponse)
+    }
+
     return Promise.race(promises)
       .then((result: DBResponse) => {
         if (timeoutSecs) {
@@ -159,15 +167,23 @@ export class StoreContext {
       if (request.entity.length >= STORE_BATCH_SIZE) {
         this.sendBatch()
       }
+      if (STORE_UPSERT_NO_WAIT) {
+        return {
+          opId: this.upsertBatch.opId
+        }
+      }
+
       return promise
     } else {
       const opId = StoreContext.opCounter++
-      const promise = this.newPromise<DBResponse>(opId, 'upsert')
       const timeout = setTimeout(() => {
         this.sendBatch()
       }, STORE_BATCH_IDLE)
-
       const start = Date.now()
+      const promise = this.newPromise<DBResponse>(opId, 'upsert').finally(() => {
+        request_times['upsert'].add(Date.now() - start)
+      })
+
       this.upsertBatch = {
         opId,
         request: req,
@@ -175,9 +191,14 @@ export class StoreContext {
         timer: timeout,
       }
 
-      return promise.finally(() => {
-        request_times['upsert'].add(Date.now() - start)
-      })
+      if (STORE_UPSERT_NO_WAIT) {
+        this.pendings.push(promise)
+        return {
+          opId: this.upsertBatch.opId
+        }
+      } else {
+        return promise
+      }
     }
   }
 
@@ -199,4 +220,8 @@ export class StoreContext {
       batched_total_count.add(request.entity.length)
     }
   }
+
+  async awaitPendings() {
+    await Promise.all(this.pendings)
+  }
 }

package/src/service.ts

@@ -410,7 +410,9 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
           const dbContext = contexts.new(request.processId, subject)
           const start = Date.now()
           PluginManager.INSTANCE.processBinding(binding, this.preparedData, dbContext)
-            .then((result) => {
+            .then(async (result) => {
+              // await all pending db requests
+              await dbContext.awaitPendings()
               subject.next({
                 result,
                 processId: request.processId
@@ -433,7 +435,11 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
         }
         if (request.dbResult) {
           const dbContext = contexts.get(request.processId)
-          dbContext?.result(request.dbResult)
+          try {
+            dbContext?.result(request.dbResult)
+          } catch (e) {
+            subject.error(new Error("db result error, process should stop"))
+          }
         }
       } catch (e) {
         // should not happen