@certik/skynet 0.10.27 → 0.10.30

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## 0.10.27
+## 0.10.30
+
+- Changed `api` app deployment to service type for rolling updates
+
+## 0.10.29
+
+- Added `serve.instances` parameter to `api` library to support multiple instances
+
+## 0.10.28
 
 - Fixed `deploy` library aws region bug
 

package/api.js

@@ -46,12 +46,29 @@ const apiKeyMiddleware = (key) => {
         return;
       }
 
-      if (apiKey !== key) {
-        inline.log("request has an invalid api key");
+      // key can be either a string or a map with multiple keys
+      if (typeof key === "string") {
+        if (apiKey !== key) {
+          inline.log("request has an invalid api key");
 
-        res.status(400).send("invalid api key");
+          res.status(400).send("invalid api key");
 
-        return;
+          return;
+        }
+
+        inline.log(`requested by valid key ${key.slice(0, 6)}`);
+      } else {
+        const name = key[apiKey];
+
+        if (!name) {
+          inline.log("request has an invalid api key");
+
+          res.status(400).send("invalid api key");
+
+          return;
+        }
+
+        inline.log(`requested by authorized user ${name}`);
       }
 
       next();
@@ -93,7 +110,9 @@ ${getSelectorDesc(selector)}
 
   const { verbose, ...selectorFlags } = cli.flags;
 
-  await useLock({ name: getJobName(name, selectorFlags), ttl: 50, verbose });
+  if (!serve.count || serve.count === 1) {
+    await useLock({ name: getJobName(name, selectorFlags), ttl: 50, verbose });
+  }
 
   // for health check
   app.get("/", (req, res) => {

package/app.d.ts

@@ -18,6 +18,7 @@ export type Serve = {
     apiKey: string;
     cpu: number;
     mem: number;
+    instances: number;
 }
 
 export type Consume = {

package/app.js

@@ -655,7 +655,14 @@ function api({ name, routes, serve, beforeListen, env = {}, region = "us-east-1"
         selector,
         region,
         env,
-        schedule: "@minutely",
+        type: "service",
+        restart: {
+          attempts: 3,
+          delay: "15s",
+          mode: "fail",
+          interval: "30m",
+        },
+        count: serve.instances,
         cpu: serve.cpu,
         mem: serve.mem,
         service: {

package/deploy.d.ts

@@ -14,6 +14,8 @@ type CreateDeployBaseParams = {
   selector: Selector | undefined,
   env: Env | undefined,
   region: string | undefined,
+  type: string | undefined,
+  count: number | undefined,
   check: Check,
 }
 

package/deploy.js

@@ -46,17 +46,19 @@ const genConfig = ({
   workingDirectory,
   cmd,
   cron,
+  count,
   restart,
   cpu,
   mem,
   service,
   additionalEnv = [],
+  type = "batch",
   region = "us-east-1",
   isProduction,
 }) => `job "${jobName}" {
   datacenters = ["${region}"]
 
-  type = "batch"
+  type = "${type}"
 
   ${
     cron
@@ -79,6 +81,17 @@ const genConfig = ({
   }
 
   group "default" {
+    ${count && count > 1 ? `count = ${count}` : ""}
+    ${
+      count && count > 1
+        ? `# Rolling Update
+    update {
+      max_parallel = 1
+      min_healthy_time = "10s"
+    }`
+        : ""
+    }
+
     reschedule {
       attempts  = 0
       unlimited = false
@@ -170,7 +183,6 @@ EOH
       # available to the task when it runs.
       env {
         SKYNET_ENVIRONMENT="${isProduction ? "prd" : "dev"}"
-        AWS_REGION="${region}"
       }
 
       # Specify the maximum resources required to run the task,
@@ -512,7 +524,9 @@ function createDeploy({
   bin = "bin/indexer",
   selector = {},
   region = "us-east-1",
+  type = "batch",
   env = {},
+  count,
   check,
   schedule,
   restart,
@@ -543,10 +557,12 @@ function createDeploy({
     const nomadJobDefinition = genConfig({
       jobName,
       cron: INTERVAL_ALIASES[cron] || cron,
+      count,
       restart,
       workingDirectory,
       additionalEnv: env,
       region,
+      type,
       cmd: `${bin} ${args}`,
       cpu,
       mem,

package/examples/api

@@ -64,6 +64,7 @@ const app = api({
     apiKey: process.env.EXAMPLE_API_KEY,
     cpu: 600,
     mem: 200,
+    instances: 3, // run 3 instances
   },
 });
 

package/package.json

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