@sentio/runtime 2.40.0-rc.32 → 2.40.0-rc.34

package/lib/{chunk-KVYXDEGV.js → chunk-PPRDWL6W.js}

@@ -59717,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 });
@@ -59746,6 +59747,7 @@ var _StoreContext = class {
     });
     send_counts[requestType]?.add(1);
     if (requestType === "upsert" && STORE_UPSERT_NO_WAIT) {
+      this.pendings.push(promise);
       return Promise.resolve({
         opId
       });
@@ -59776,10 +59778,6 @@ var _StoreContext = class {
         recv_counts[defer.requestType]?.add(1);
       }
       if (dbResult.error) {
-        if (defer.requestType == "upsert" && STORE_UPSERT_NO_WAIT) {
-          console.error("upsert no_wait enabled, the error may not be thrown in user function", dbResult.error);
-          throw new Error(dbResult.error);
-        }
         defer.reject(new Error(dbResult.error));
       } else {
         defer.resolve(dbResult);
@@ -59841,11 +59839,13 @@ var _StoreContext = class {
         timer: timeout
       };
       if (STORE_UPSERT_NO_WAIT) {
+        this.pendings.push(promise);
         return {
           opId: this.upsertBatch.opId
         };
+      } else {
+        return promise;
       }
-      return promise;
     }
   }
   sendBatch() {
@@ -59865,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);
@@ -80289,7 +80292,7 @@ var ProcessorServiceImpl = class {
     } catch (e) {
       console.error(`eth call error: ${e}`);
     }
-    console.log(
+    console.debug(
       `${Object.keys(results).length} calls finished, actual calls: ${callPromises.length + multicallPromises.length}, elapsed: ${Date.now() - start}ms`
     );
     return {
@@ -80407,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

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-KVYXDEGV.js";
+} from "./chunk-PPRDWL6W.js";
 
 // src/state.ts
 var _State = class {

package/lib/processor-runner.js

@@ -41,7 +41,7 @@ import {
   require_minimal,
   require_src,
   trace
-} from "./chunk-KVYXDEGV.js";
+} from "./chunk-PPRDWL6W.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.32",
+  "version": "2.40.0-rc.34",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {

package/src/db-context.ts

@@ -29,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>>,
@@ -78,7 +78,7 @@ 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)
@@ -115,11 +115,6 @@ export class StoreContext {
         recv_counts[defer.requestType]?.add(1)
       }
       if (dbResult.error) {
-        if (defer.requestType == 'upsert' && STORE_UPSERT_NO_WAIT) {
-          console.error('upsert no_wait enabled, the error may not be thrown in user function', dbResult.error)
-          throw new Error(dbResult.error)
-        }
-
         defer.reject(new Error(dbResult.error))
       } else {
         defer.resolve(dbResult)
@@ -197,12 +192,13 @@ export class StoreContext {
       }
 
       if (STORE_UPSERT_NO_WAIT) {
+        this.pendings.push(promise)
         return {
           opId: this.upsertBatch.opId
         }
+      } else {
+        return promise
       }
-
-      return promise
     }
   }
 
@@ -224,4 +220,8 @@ export class StoreContext {
       batched_total_count.add(request.entity.length)
     }
   }
+
+  async awaitPendings() {
+    await Promise.all(this.pendings)
+  }
 }

package/src/service.ts

@@ -256,7 +256,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
     } catch (e) {
       console.error(`eth call error: ${e}`)
     }
-    console.log(
+    console.debug(
       `${Object.keys(results).length} calls finished, actual calls: ${callPromises.length + multicallPromises.length}, elapsed: ${Date.now() - start}ms`
     )
     return {
@@ -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
@@ -436,7 +438,7 @@ export class ProcessorServiceImpl implements ProcessorServiceImplementation {
           try {
             dbContext?.result(request.dbResult)
           } catch (e) {
-            subject.error(new Error("db result error, process should stop"))
+            subject.error(new Error('db result error, process should stop'))
           }
         }
       } catch (e) {