@certik/skynet 0.10.44 → 0.10.45

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.10.44
+## 0.10.44 && 0.10.45
 
 - Fixed modeIndexer delta bug
 

package/indexer.js

@@ -126,53 +126,71 @@ function createModeIndexerApp({
       process.exit(0);
     }
 
-    if (!from) {
-      from = await finalState.getMinId(selectorFlags);
-    }
-
-    inline.log(
-      `[MODE INDEXER] mode=${mode}, from=${from}, to=${
-        to ? to : "undefined"
-      }, env=${getEnvironment()}, ${toSelectorString(selectorFlags, ", ")}`
-    );
+    inline.log(`[MODE INDEXER] mode=${mode}, env=${getEnvironment()}, ${toSelectorString(selectorFlags, ", ")}`);
 
     if (mode === "reset") {
       await runReset(selectorFlags);
     } else if (mode === "rebuild") {
+      const rebuildFrom = from || (await finalState.getMinId(selectorFlags));
+      const rebuildTo = to || (await finalState.getMaxId(selectorFlags));
+
       await runReset(selectorFlags);
-      await runRebuild(selectorFlags, from, to ? to : await finalState.getMaxId(selectorFlags), verbose);
+      await runRebuild(selectorFlags, rebuildFrom, rebuildTo, verbose);
     } else if (mode === "resume-rebuild") {
       const previousRebuildEnds = await getIndexerLatestId(name, selectorFlags);
 
-      await runRebuild(
-        selectorFlags,
-        previousRebuildEnds ? increaseId(finalState.type, previousRebuildEnds, 1) : from,
-        to ? to : await finalState.getMaxId(selectorFlags),
-        verbose
-      );
+      const rebuildFrom =
+        from || increaseId(finalState.type, previousRebuildEnds, 1) || (await finalState.getMinId(selectorFlags));
+      const rebuildTo = to || (await finalState.getMaxId(selectorFlags));
+
+      await runRebuild(selectorFlags, rebuildFrom, rebuildTo, verbose);
     } else if (mode === "validate" || mode === "validation") {
       const previousRebuildEnds = await getIndexerLatestId(name, selectorFlags);
 
+      if (!previousRebuildEnds) {
+        inline.log(`[MODE INDEXER] cannot validate without a successful rebuild`);
+        process.exit(0);
+      }
+
       const previousValidatedTo = await getIndexerValidatedId(name, selectorFlags);
 
-      const shouldSaveState = !to;
+      const validateFrom = from || previousValidatedTo || (await finalState.getMinId(selectorFlags));
+      const validateTo = to || previousRebuildEnds;
+      const shouldSaveState = !to; // should not save state for manual validations, those are for testing
 
-      await runValidate(
-        selectorFlags,
-        from ? from : previousValidatedTo,
-        to ? to : previousRebuildEnds,
-        shouldSaveState,
-        verbose
-      );
+      await runValidate(selectorFlags, validateFrom, validateTo, shouldSaveState, verbose);
     } else if (mode === "one") {
       if (to) {
         inline.log("[MODE INDEXER] one mode ignores --to option. you may want to use range mode instead");
       }
+      if (!from) {
+        inline.log(`[MODE INDEXER] must provide --from option for one mode`);
+        process.exit(1);
+      }
+
       await runRange(selectorFlags, from, from, verbose);
     } else if (mode === "range") {
+      if (!from || !to) {
+        inline.log(`[MODE INDEXER] must provide --from and --to option for range mode`);
+        process.exit(1);
+      }
+
       await runRange(selectorFlags, from, to, verbose);
     } else {
-      await runDelta(selectorFlags, verbose);
+      const stateItem = await getRecordByKey(STATE_TABLE_NAME, {
+        name: `${name}RebuildState(${toSelectorString(selectorFlags)})`,
+      });
+
+      // only build when rebuild succeed
+      if (!stateItem || stateItem.value !== "succeed") {
+        inline.log("[MODE INDEXER] skip because rebuild hasn't done yet");
+        process.exit(0);
+      }
+
+      const deltaFrom = increaseId(finalState.type, await getIndexerLatestId(name, selectorFlags), 1);
+      const deltaTo = await state.getMaxId(selectorFlags);
+
+      await runDelta(selectorFlags, deltaFrom, deltaTo, verbose);
     }
   }
 
@@ -385,74 +403,62 @@ function createModeIndexerApp({
     }
   }
 
-  async function runDelta(selectorFlags, verbose) {
-    const stateItem = await getRecordByKey(STATE_TABLE_NAME, {
-      name: `${name}RebuildState(${toSelectorString(selectorFlags)})`,
-    });
-
-    // only build when rebuild succeed
-    if (stateItem && stateItem.value === "succeed") {
-      const from = increaseId(finalState.type, await getIndexerLatestId(name, selectorFlags), 1);
-
-      const startTime = Date.now();
-      const to = await state.getMaxId(selectorFlags);
-
-      if (to <= from) {
-        inline.log(
-          `[MODE INDEXER] skip delta because there're no items need to be processed, ${toSelectorString(
-            selectorFlags,
-            ", "
-          )}`
-        );
-
-        return;
-      }
+  async function runDelta(selectorFlags, from, to, verbose) {
+    const startTime = Date.now();
 
+    if (to < from) {
       inline.log(
-        `[MODE INDEXER] starting delta, from=${from}, to=${to}, ${toSelectorString(
+        `[MODE INDEXER] skip delta, there're no more items need to be processed, from=${from}, to=${to}, ${toSelectorString(
           selectorFlags,
           ", "
-        )}, batchSize=${buildBatchSize}, concurrency=${buildConcurrency}`
+        )}`
       );
 
-      try {
-        const failedIds = await execBuild(selectorFlags, from, to, verbose, true);
-
-        if (failedIds.length > 0) {
-          inline.log("[MODE INDEXER] built with some failed txs", failedIds);
+      return;
+    }
 
-          await createRecord(STATE_TABLE_NAME, {
-            name: `${name}DeltaState(${toSelectorString(selectorFlags)})`,
-            value: "failed",
-          });
+    inline.log(
+      `[MODE INDEXER] starting delta, from=${from}, to=${to}, ${toSelectorString(
+        selectorFlags,
+        ", "
+      )}, batchSize=${buildBatchSize}, concurrency=${buildConcurrency}`
+    );
 
-          await createRecord(STATE_TABLE_NAME, {
-            name: `${name}Since(${toSelectorString(selectorFlags)})`,
-            value: Math.min(to, failedIds[0]),
-          });
+    try {
+      const failedIds = await execBuild(selectorFlags, from, to, verbose, true);
 
-          process.exit(1);
-        } else {
-          await createRecord(STATE_TABLE_NAME, {
-            name: `${name}DeltaState(${toSelectorString(selectorFlags)})`,
-            value: "succeed",
-          });
+      if (failedIds.length > 0) {
+        inline.log("[MODE INDEXER] built with some failed txs", failedIds);
 
-          await createRecord(STATE_TABLE_NAME, {
-            name: `${name}Since(${toSelectorString(selectorFlags)})`,
-            value: to,
-          });
+        await createRecord(STATE_TABLE_NAME, {
+          name: `${name}DeltaState(${toSelectorString(selectorFlags)})`,
+          value: "failed",
+        });
 
-          inline.log(`[MODE INDEXER] built successfully in ${Date.now() - startTime}ms`);
-          process.exit(0);
-        }
-      } catch (err) {
-        inline.error("[MODE INDEXER] delta build failed", from, to, err);
+        await createRecord(STATE_TABLE_NAME, {
+          name: `${name}Since(${toSelectorString(selectorFlags)})`,
+          value: Math.min(to, failedIds[0]),
+        });
 
         process.exit(1);
+      } else {
+        await createRecord(STATE_TABLE_NAME, {
+          name: `${name}DeltaState(${toSelectorString(selectorFlags)})`,
+          value: "succeed",
+        });
+
+        await createRecord(STATE_TABLE_NAME, {
+          name: `${name}Since(${toSelectorString(selectorFlags)})`,
+          value: to,
+        });
+
+        inline.log(`[MODE INDEXER] built successfully in ${Date.now() - startTime}ms`);
+        process.exit(0);
       }
-    } else {
-      inline.log("[MODE INDEXER] skip because rebuild hasn't done yet");
+    } catch (err) {
+      inline.error("[MODE INDEXER] delta build failed", from, to, err);
+
+      process.exit(1);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certik/skynet",
-  "version": "0.10.44",
+  "version": "0.10.45",
   "description": "Skynet Shared JS library",
   "main": "index.js",
   "author": "CertiK Engineering",