@certik/skynet 0.10.11 → 0.10.12

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.10.12
+
+- Fixed distributed lock name for `producer` and `api` type apps
+
 ## 0.10.11
 
 - Added distributed lock for `producer` and `api` type apps

package/api.js

@@ -1,6 +1,6 @@
 const express = require("express");
 const meow = require("meow");
-const { getSelectorFlags, getSelectorDesc } = require("./selector");
+const { getJobName, getSelectorFlags, getSelectorDesc } = require("./selector");
 const { isProduction } = require("./env");
 const { useLock } = require("./distributed-lock");
 const { inline } = require("./log");
@@ -83,7 +83,7 @@ ${getSelectorDesc(selector)}
 
   const { verbose, ...selectorFlags } = cli.flags;
 
-  await useLock({ name, ttl: 120, verbose });
+  await useLock({ name: getJobName(name, selectorFlags), ttl: 120, verbose });
 
   // for health check
   app.get("/", (req, res) => {

package/deploy.js

@@ -4,7 +4,7 @@ const execa = require("execa");
 const meow = require("meow");
 const chalk = require("chalk");
 const which = require("which");
-const { getSelectorFlags, getSelectorDesc } = require("./selector");
+const { getJobName, getSelectorFlags, getSelectorDesc } = require("./selector");
 const { getEnvOrThrow } = require("./env");
 const { getBinaryName, detectSkynetDirectory } = require("./cli");
 
@@ -207,30 +207,6 @@ EOH
   }
 }`;
 
-function normalizeSelectorValue(v) {
-  return v.replace(/[^A-Za-z0-9]+/g, "-");
-}
-
-function getJobName(name, selectorFlags, mode = null) {
-  const selectorNamePart = Object.keys(selectorFlags)
-    .sort()
-    .map((name) => selectorFlags[name])
-    .join("-");
-
-  let jobName = name;
-
-  if (mode) {
-    jobName += `-${mode}`;
-  }
-
-  if (selectorNamePart.length > 0) {
-    // handle special case
-    jobName += `-${normalizeSelectorValue(selectorNamePart)}`;
-  }
-
-  return jobName;
-}
-
 async function prepareNomad(isProduction) {
   if (isProduction) {
     console.log("Deploy to Production");

package/distributed-lock.js

@@ -79,10 +79,12 @@ async function hasLock(name, uid = null) {
 }
 
 async function useLock({ name, ttl, verbose }) {
+  const lockWarningMessage = `only one process with the same lock name ${name} should be running, terminate current process`;
+
   const lockAvailable = await hasLock(name);
 
   if (!lockAvailable) {
-    console.log("only one process with the same name should be running, quit");
+    console.log(lockWarningMessage);
     process.exit(0);
   }
 
@@ -90,7 +92,7 @@ async function useLock({ name, ttl, verbose }) {
 
   setInterval(async () => {
     if (!(await hasLock(name, uid))) {
-      console.log("only one process with the same name should be running, quit");
+      console.log(lockWarningMessage);
       process.exit(0);
     }
 

package/kafka.js

@@ -2,7 +2,7 @@ const meow = require("meow");
 const { getEnvironment, getEnvOrThrow } = require("./env");
 const { wait } = require("./availability");
 const { Kafka, logLevel } = require("kafkajs");
-const { getSelectorFlags, getSelectorDesc, toSelectorString } = require("./selector");
+const { getJobName, getSelectorFlags, getSelectorDesc, toSelectorString } = require("./selector");
 const { createRecord, getRecordByKey, deleteRecordsByHashKey } = require("./dynamodb");
 const { exponentialRetry } = require("./availability");
 const { useLock } = require("./distributed-lock");
@@ -219,7 +219,7 @@ ${getSelectorDesc(selector)}
         process.exit(0);
       }
 
-      await useLock({ name, ttl: 120, verbose });
+      await useLock({ name: getJobName(name, selectorFlags), ttl: 120, verbose });
 
       if (!from) {
         const prevId = await getProducerLatestId(name, selectorFlags);

package/package.json

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

package/selector.js

@@ -46,7 +46,32 @@ function toSelectorString(selectorFlags, delim = ",") {
     .join(delim);
 }
 
+function normalizeSelectorValue(v) {
+  return v.replace(/[^A-Za-z0-9]+/g, "-");
+}
+
+function getJobName(name, selectorFlags, mode = null) {
+  const selectorNamePart = Object.keys(selectorFlags)
+    .sort()
+    .map((name) => selectorFlags[name])
+    .join("-");
+
+  let jobName = name;
+
+  if (mode) {
+    jobName += `-${mode}`;
+  }
+
+  if (selectorNamePart.length > 0) {
+    // handle special case
+    jobName += `-${normalizeSelectorValue(selectorNamePart)}`;
+  }
+
+  return jobName;
+}
+
 module.exports = {
+  getJobName,
   getSelectorDesc,
   getSelectorFlags,
   toSelectorString,