@certik/skynet 0.14.0 → 0.15.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.15.1
+
+- BREAKING: changed api restart behavior to never fail the allocation
+
+## 0.15.0
+
+- BREAKING: only start one S3 client globally
+- Fixed: Properly throw error if S3 client encounters them
+
 ## 0.14.0
 
 - BREAKING: only start one DynamoDB client globally

package/app.js

@@ -46,7 +46,7 @@ async function checkDeployEnv(env) {
       }
 
       return { name: key, ok: true };
-    })
+    }),
   );
 
   const missingEnvs = envStatus.filter((s) => !s.ok).map((s) => s.name);
@@ -694,8 +694,8 @@ function api({ name, routes, serve, beforeListen, env = {}, region = "us-east-1"
         restart: {
           attempts: 3,
           delay: "15s",
-          mode: "fail",
-          interval: "30m",
+          mode: "delay",
+          interval: "2m",
         },
         count: serve.instances,
         killTimeout: serve.killTimeout,

package/deploy.js

@@ -134,7 +134,8 @@ const genConfig = ({
       }
 
       restart {
-        attempts = 0
+        attempts = 3
+        delay    = "15s"
         mode     = "fail"
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certik/skynet",
-  "version": "0.14.0",
+  "version": "0.15.1",
   "description": "Skynet Shared JS library",
   "type": "module",
   "main": "index.js",
@@ -43,4 +43,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/s3.js

@@ -6,11 +6,17 @@ import {
   DeleteObjectCommand,
   ListObjectsV2Command,
   NotFound,
+  NoSuchKey,
 } from "@aws-sdk/client-s3";
 import { getAWSSDKConfig } from "./env.js";
 
-function getS3() {
-  return new S3Client(getAWSSDKConfig());
+let _s3Client;
+
+function getS3(forceNew = false) {
+  if (!_s3Client || forceNew) {
+    _s3Client = new S3Client(getAWSSDKConfig());
+  }
+  return _s3Client;
 }
 
 async function readFile(bucketName, key, verbose = false) {
@@ -21,12 +27,16 @@ async function readFile(bucketName, key, verbose = false) {
   try {
     const result = await s3.send(new GetObjectCommand(params));
     return result.Body.transformToString();
-  } catch (noSuchKeyErr) {
-    if (verbose) {
-      console.log("no such bucket or key", bucketName, key);
+  } catch (error) {
+    if (error instanceof NoSuchKey) {
+      if (verbose) {
+        console.log("no such bucket or key", bucketName, key);
+      }
+      // do nothing
+      return null;
     }
-    // do nothing
-    return null;
+
+    throw error;
   }
 }
 
@@ -93,10 +103,16 @@ async function deleteFile(bucketName, key, verbose = false) {
 
   try {
     await s3.send(new DeleteObjectCommand(params));
-  } catch (noSuchKeyErr) {
-    if (verbose) {
-      console.log("no such bucket or key", bucketName, key);
+  } catch (error) {
+    if (error instanceof NoSuchKey) {
+      if (verbose) {
+        console.log("no such bucket or key", bucketName, key);
+      }
+      // do nothing
+      return null;
     }
+
+    throw error;
   }
 }