Update cache code to reflect shape of response

samvera · Aug 15, 2023 · 7a5310a · 7a5310a
1 parent 603bac6
commit 7a5310a
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,9 @@
 .aws
 .aws-sam
 deploy.yaml
+node_modules
+samconfig.toml
+env.json
 package.yml
 samconfig.toml
 
@@ -23,4 +26,5 @@ env.json
 *~undo-tree~
 .DS_Store
 sharp-lambda-layer.*
-*.log
+*.log
+.vscode
diff --git a/dependencies/package-lock.json b/dependencies/package-lock.json
diff --git a/dependencies/package.json b/dependencies/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-iiif-dependencies",
-  "version": "4.3.3",
+  "version": "4.3.4",
   "description": "Dependencies for serverless IIIF",
   "author": "Michael B. Klein",
   "license": "Apache-2.0",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-iiif",
-  "version": "4.3.3",
+  "version": "4.3.4",
   "description": "Lambda wrapper for iiif-processor",
   "author": "Michael B. Klein",
   "license": "Apache-2.0",

diff --git a/sam/cloudfront/template.yml b/sam/cloudfront/template.yml
@@ -9,7 +9,7 @@ Metadata:
     ReadmeUrl: ../../README.md
     Labels: ["iiif", "image-processing"]
     HomePageUrl: https://github.com/samvera/serverless-iiif
-    SemanticVersion: 4.3.3
+    SemanticVersion: 4.3.4
     SourceCodeUrl: https://github.com/samvera/serverless-iiif
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -365,7 +365,7 @@ Resources:
       Location: ../standalone/template.yml
       # Location:
       #   ApplicationId: arn:aws:serverlessrepo:us-east-1:625046682746:applications/serverless-iiif-standalone
-      #   SemanticVersion: 4.3.3
+      #   SemanticVersion: 4.3.4
       Parameters:
         CacheBucket: !Ref CacheBucket
         CorsAllowCredentials: !Ref CorsAllowCredentials

diff --git a/sam/standalone/template.yml b/sam/standalone/template.yml
@@ -9,7 +9,7 @@ Metadata:
     ReadmeUrl: ../../README.md
     Labels: ["iiif", "image-processing"]
     HomePageUrl: https://github.com/samvera/serverless-iiif
-    SemanticVersion: 4.3.3
+    SemanticVersion: 4.3.4
     SourceCodeUrl: https://github.com/samvera/serverless-iiif
   AWS::CloudFormation::Interface:
     ParameterGroups:

diff --git a/src/cache.js b/src/cache.js
@@ -28,7 +28,7 @@ const makeCache = (key, image) => {
 
   return new Promise((resolve, reject) => {
     if (!cacheConfigured()) {
-      reject(new Error(`Content size (${image.length.toString()}) exceeds API gateway maximum`));
+      reject(new Error(`Content size (${image?.length?.toString()}) exceeds API gateway maximum`));
     }
 
     const s3 = new AWS.S3();

diff --git a/src/index.js b/src/index.js
@@ -67,7 +67,7 @@ const handleImageRequestFunc = async (uri, resource) => {
     const result = await resource.execute();
 
     if (isTooLarge(result.body)) {
-      await makeCache(key, result);
+      await makeCache(key, result.body);
       response = forceFailover();
     } else {
       response = makeResponse(result);

diff --git a/src/package-lock.json b/src/package-lock.json
diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-iiif",
-  "version": "4.3.3",
+  "version": "4.3.4",
   "description": "Lambda wrapper for iiif-processor",
   "author": "Michael B. Klein",
   "license": "Apache-2.0",