@certik/skynet 0.25.4 → 0.25.6

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.25.6
+
+- Fix Nomad job names for indexers with boolean selector flags: `getJobName` no longer appends `-false` when optional flags default to `false` (e.g. `force`, `forceUpdate`). Unset string selectors (`undefined`, `null`, empty string) are also omitted from the job name suffix.
+
+## 0.25.5
+
+- Fix indexer process hanging after execution completes due to open DynamoDB HTTP keep-alive connections
+- Add missing `process.exit(0)` on successful completion of `reset`, `validate`, `delta` (no-op), and stateless `build` modes
+- Add `destroyDynamoDB` helper to properly close the DynamoDB client and release sockets
+
 ## 0.25.4
 
 - Added `email` module with `sendEmail` helper for sending emails via Mailgun
@@ -77,7 +87,6 @@
 ## 0.20.0
 
 - Fix databricks with bun (extra step needed for projects using the lib):
-
   - Copy the patch file `patches/@databricks%2Fsql@1.9.0.patch`
   - Add the following configs to your `package.json`:
 

package/dist/api.js

@@ -101,8 +101,17 @@ function toSelectorString(selectorFlags, delim = ",") {
 function normalizeSelectorValue(v) {
   return v.replace(/[^A-Za-z0-9]+/g, "-");
 }
+function includeSelectorValueInJobName(value) {
+  if (value === false)
+    return false;
+  if (value === undefined || value === null)
+    return false;
+  if (value === "")
+    return false;
+  return true;
+}
 function getJobName(name, selectorFlags, mode) {
-  const selectorNamePart = Object.keys(selectorFlags).sort().map((name2) => selectorFlags[name2]).join("-");
+  const selectorNamePart = Object.keys(selectorFlags).sort().map((key) => selectorFlags[key]).filter(includeSelectorValueInJobName).map((value) => String(value)).join("-");
   let jobName = name;
   if (mode) {
     jobName += `-${mode}`;

package/dist/app.js

@@ -564,6 +564,11 @@ async function deleteRecordsByHashKey(tableName, indexName, hashKeyValue, verbos
   }
   return totalDeleted;
 }
+function destroyDynamoDB() {
+  if (_dynamoDB) {
+    _dynamoDB.destroy();
+  }
+}
 // src/selector.ts
 function getSelectorDesc(selector) {
   return Object.keys(selector).map((name) => {
@@ -591,8 +596,17 @@ function toSelectorString(selectorFlags, delim = ",") {
 function normalizeSelectorValue(v) {
   return v.replace(/[^A-Za-z0-9]+/g, "-");
 }
+function includeSelectorValueInJobName(value) {
+  if (value === false)
+    return false;
+  if (value === undefined || value === null)
+    return false;
+  if (value === "")
+    return false;
+  return true;
+}
 function getJobName(name, selectorFlags, mode) {
-  const selectorNamePart = Object.keys(selectorFlags).sort().map((name2) => selectorFlags[name2]).join("-");
+  const selectorNamePart = Object.keys(selectorFlags).sort().map((key) => selectorFlags[key]).filter(includeSelectorValueInJobName).map((value) => String(value)).join("-");
   let jobName = name;
   if (mode) {
     jobName += `-${mode}`;
@@ -743,6 +757,7 @@ function createModeIndexerApp({
     inline.log(`[MODE INDEXER] mode=${mode}, env=${getEnvironment()}, ${toSelectorString(selectorFlags, ", ")}`);
     if (mode === "reset") {
       await runReset(selectorFlags);
+      process.exit(0);
     } else if (mode === "rebuild") {
       const rebuildFrom = from || await finalState.getMinId(selectorFlags);
       const rebuildTo = to || await finalState.getMaxId(selectorFlags);
@@ -854,6 +869,7 @@ function createModeIndexerApp({
       }
     }
     inline.log(`[MODE INDEXER] validated ${offsetRange(from, to)} ${finalState.type} successfully in ${Date.now() - startTime}ms`);
+    process.exit(0);
   }
   async function execBuild(selectorFlags, from, to, verbose, shouldSaveState = false) {
     let failedIds = [];
@@ -929,7 +945,7 @@ function createModeIndexerApp({
     const startTime = Date.now();
     if (to < from) {
       inline.log(`[MODE INDEXER] skip delta, there're no more items need to be processed, from=${from}, to=${to}, ${toSelectorString(selectorFlags, ", ")}`);
-      return;
+      process.exit(0);
     }
     inline.log(`[MODE INDEXER] starting delta, from=${from}, to=${to}, ${toSelectorString(selectorFlags, ", ")}, batchSize=${buildBatchSize}, concurrency=${buildConcurrency}`);
     try {
@@ -1028,6 +1044,8 @@ ${selector ? getSelectorDesc(selector) : ""}
     } catch (err) {
       inline.error(err);
       process.exit(1);
+    } finally {
+      destroyDynamoDB();
     }
   }
   return { run };
@@ -1087,6 +1105,7 @@ ${selector ? getSelectorDesc(selector) : ""}
         throw new Error(`[INDEXER] Build failed due to critical errors`);
       }
       inline.log(`[INDEXER] build successfully in ${Date.now() - startTime}ms`);
+      process.exit(0);
     }
     return runBuild(cli.flags).catch((err) => {
       inline.error(err);

package/dist/deploy.js

@@ -44,8 +44,17 @@ function toSelectorString(selectorFlags, delim = ",") {
 function normalizeSelectorValue(v) {
   return v.replace(/[^A-Za-z0-9]+/g, "-");
 }
+function includeSelectorValueInJobName(value) {
+  if (value === false)
+    return false;
+  if (value === undefined || value === null)
+    return false;
+  if (value === "")
+    return false;
+  return true;
+}
 function getJobName(name, selectorFlags, mode) {
-  const selectorNamePart = Object.keys(selectorFlags).sort().map((name2) => selectorFlags[name2]).join("-");
+  const selectorNamePart = Object.keys(selectorFlags).sort().map((key) => selectorFlags[key]).filter(includeSelectorValueInJobName).map((value) => String(value)).join("-");
   let jobName = name;
   if (mode) {
     jobName += `-${mode}`;

package/dist/dynamodb.d.ts

@@ -13,4 +13,5 @@ declare function getRecordByKey<T>(tableName: string, keys: Record<string, unkno
 declare function updateRecordByKey(tableName: string, idKey: Record<string, unknown>, fields: Record<string, unknown>, conditionExpressions?: null, verbose?: boolean): Promise<Record<string, any> | undefined>;
 declare function batchDeleteRecords(tableName: string, keys: Record<string, unknown>[]): Promise<void>;
 declare function deleteRecordsByHashKey(tableName: string, indexName: string | undefined, hashKeyValue: string, verbose?: boolean): Promise<number>;
-export { getDocClient, ScanCommand, BatchWriteCommand, GetCommand, PutCommand, QueryCommand, UpdateCommand, scanWholeTable, batchCreateRecords, createRecord, getRecordsByKey, getRecordByKey, updateRecordByKey, batchDeleteRecords, deleteRecordsByHashKey, };
+declare function destroyDynamoDB(): void;
+export { getDocClient, destroyDynamoDB, ScanCommand, BatchWriteCommand, GetCommand, PutCommand, QueryCommand, UpdateCommand, scanWholeTable, batchCreateRecords, createRecord, getRecordsByKey, getRecordByKey, updateRecordByKey, batchDeleteRecords, deleteRecordsByHashKey, };

package/dist/dynamodb.js

@@ -460,12 +460,18 @@ async function deleteRecordsByHashKey(tableName, indexName, hashKeyValue, verbos
   }
   return totalDeleted;
 }
+function destroyDynamoDB() {
+  if (_dynamoDB) {
+    _dynamoDB.destroy();
+  }
+}
 export {
   updateRecordByKey,
   scanWholeTable,
   getRecordsByKey,
   getRecordByKey,
   getDocClient,
+  destroyDynamoDB,
   deleteRecordsByHashKey,
   createRecord,
   batchDeleteRecords,

package/dist/indexer.js

@@ -564,6 +564,11 @@ async function deleteRecordsByHashKey(tableName, indexName, hashKeyValue, verbos
   }
   return totalDeleted;
 }
+function destroyDynamoDB() {
+  if (_dynamoDB) {
+    _dynamoDB.destroy();
+  }
+}
 // src/selector.ts
 function getSelectorDesc(selector) {
   return Object.keys(selector).map((name) => {
@@ -591,8 +596,17 @@ function toSelectorString(selectorFlags, delim = ",") {
 function normalizeSelectorValue(v) {
   return v.replace(/[^A-Za-z0-9]+/g, "-");
 }
+function includeSelectorValueInJobName(value) {
+  if (value === false)
+    return false;
+  if (value === undefined || value === null)
+    return false;
+  if (value === "")
+    return false;
+  return true;
+}
 function getJobName(name, selectorFlags, mode) {
-  const selectorNamePart = Object.keys(selectorFlags).sort().map((name2) => selectorFlags[name2]).join("-");
+  const selectorNamePart = Object.keys(selectorFlags).sort().map((key) => selectorFlags[key]).filter(includeSelectorValueInJobName).map((value) => String(value)).join("-");
   let jobName = name;
   if (mode) {
     jobName += `-${mode}`;
@@ -743,6 +757,7 @@ function createModeIndexerApp({
     inline.log(`[MODE INDEXER] mode=${mode}, env=${getEnvironment()}, ${toSelectorString(selectorFlags, ", ")}`);
     if (mode === "reset") {
       await runReset(selectorFlags);
+      process.exit(0);
     } else if (mode === "rebuild") {
       const rebuildFrom = from || await finalState.getMinId(selectorFlags);
       const rebuildTo = to || await finalState.getMaxId(selectorFlags);
@@ -854,6 +869,7 @@ function createModeIndexerApp({
       }
     }
     inline.log(`[MODE INDEXER] validated ${offsetRange(from, to)} ${finalState.type} successfully in ${Date.now() - startTime}ms`);
+    process.exit(0);
   }
   async function execBuild(selectorFlags, from, to, verbose, shouldSaveState = false) {
     let failedIds = [];
@@ -929,7 +945,7 @@ function createModeIndexerApp({
     const startTime = Date.now();
     if (to < from) {
       inline.log(`[MODE INDEXER] skip delta, there're no more items need to be processed, from=${from}, to=${to}, ${toSelectorString(selectorFlags, ", ")}`);
-      return;
+      process.exit(0);
     }
     inline.log(`[MODE INDEXER] starting delta, from=${from}, to=${to}, ${toSelectorString(selectorFlags, ", ")}, batchSize=${buildBatchSize}, concurrency=${buildConcurrency}`);
     try {
@@ -1028,6 +1044,8 @@ ${selector ? getSelectorDesc(selector) : ""}
     } catch (err) {
       inline.error(err);
       process.exit(1);
+    } finally {
+      destroyDynamoDB();
     }
   }
   return { run };
@@ -1087,6 +1105,7 @@ ${selector ? getSelectorDesc(selector) : ""}
         throw new Error(`[INDEXER] Build failed due to critical errors`);
       }
       inline.log(`[INDEXER] build successfully in ${Date.now() - startTime}ms`);
+      process.exit(0);
     }
     return runBuild(cli.flags).catch((err) => {
       inline.error(err);

package/dist/selector.js

@@ -25,8 +25,17 @@ function toSelectorString(selectorFlags, delim = ",") {
 function normalizeSelectorValue(v) {
   return v.replace(/[^A-Za-z0-9]+/g, "-");
 }
+function includeSelectorValueInJobName(value) {
+  if (value === false)
+    return false;
+  if (value === undefined || value === null)
+    return false;
+  if (value === "")
+    return false;
+  return true;
+}
 function getJobName(name, selectorFlags, mode) {
-  const selectorNamePart = Object.keys(selectorFlags).sort().map((name2) => selectorFlags[name2]).join("-");
+  const selectorNamePart = Object.keys(selectorFlags).sort().map((key) => selectorFlags[key]).filter(includeSelectorValueInJobName).map((value) => String(value)).join("-");
   let jobName = name;
   if (mode) {
     jobName += `-${mode}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certik/skynet",
-  "version": "0.25.4",
+  "version": "0.25.6",
   "description": "Skynet Shared JS library",
   "type": "module",
   "exports": {

package/src/dynamodb.ts

@@ -475,8 +475,15 @@ async function deleteRecordsByHashKey(
   return totalDeleted;
 }
 
+function destroyDynamoDB() {
+  if (_dynamoDB) {
+    _dynamoDB.destroy();
+  }
+}
+
 export {
   getDocClient,
+  destroyDynamoDB,
   // export common dynamodb commands to make it easier to use
   ScanCommand,
   BatchWriteCommand,

package/src/indexer.ts

@@ -1,5 +1,5 @@
 import meow from "meow";
-import { createRecord, getRecordByKey } from "./dynamodb";
+import { createRecord, getRecordByKey, destroyDynamoDB } from "./dynamodb";
 import { getEnvironment } from "./env";
 import { exponentialRetry } from "./availability";
 import { range as numberRange, fillRange as fillNumberRange } from "./util";
@@ -213,6 +213,7 @@ function createModeIndexerApp<T extends IndexerStateValue, TSelector extends Sel
 
     if (mode === "reset") {
       await runReset(selectorFlags);
+      process.exit(0);
     } else if (mode === "rebuild") {
       const rebuildFrom = from || (await finalState.getMinId(selectorFlags));
       const rebuildTo = to || (await finalState.getMaxId(selectorFlags));
@@ -389,6 +390,8 @@ function createModeIndexerApp<T extends IndexerStateValue, TSelector extends Sel
     inline.log(
       `[MODE INDEXER] validated ${offsetRange(from, to)} ${finalState.type} successfully in ${Date.now() - startTime}ms`,
     );
+
+    process.exit(0);
   }
 
   async function execBuild(
@@ -521,7 +524,7 @@ function createModeIndexerApp<T extends IndexerStateValue, TSelector extends Sel
         )}`,
       );
 
-      return;
+      process.exit(0);
     }
 
     inline.log(
@@ -646,6 +649,8 @@ ${selector ? getSelectorDesc(selector) : ""}
     } catch (err) {
       inline.error(err);
       process.exit(1);
+    } finally {
+      destroyDynamoDB();
     }
   }
 
@@ -731,6 +736,8 @@ ${selector ? getSelectorDesc(selector) : ""}
       }
 
       inline.log(`[INDEXER] build successfully in ${Date.now() - startTime}ms`);
+
+      process.exit(0);
     }
 
     return runBuild(cli.flags as ModeIndexerFlags<TSelector>).catch((err) => {

package/src/selector.ts

@@ -49,10 +49,20 @@ function normalizeSelectorValue(v: string) {
   return v.replace(/[^A-Za-z0-9]+/g, "-");
 }
 
+/** Values that should not affect Nomad job names (unset / default-off selectors). */
+function includeSelectorValueInJobName(value: unknown): boolean {
+  if (value === false) return false;
+  if (value === undefined || value === null) return false;
+  if (value === "") return false;
+  return true;
+}
+
 function getJobName<TSelector extends Selector>(name: string, selectorFlags: SelectorFlags<TSelector>, mode?: string) {
   const selectorNamePart = Object.keys(selectorFlags)
     .sort()
-    .map((name) => selectorFlags[name])
+    .map((key) => selectorFlags[key])
+    .filter(includeSelectorValueInJobName)
+    .map((value) => String(value))
     .join("-");
 
   let jobName = name;