Fall back to JP2 oneshot load on tile part error

dependencies/package.json

@@ -1,10 +1,10 @@
 {
   "name": "serverless-iiif-dependencies",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Dependencies for serverless IIIF",
   "author": "Michael B. Klein",
   "license": "Apache-2.0",
   "dependencies": {
-    "iiif-processor": "^4.0.5"
+    "sharp": "^0.33.5"
   }
 }

examples/cloudformation/custom_hostname.yml

@@ -21,7 +21,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:625046682746:applications/serverless-iiif
-        SemanticVersion: 5.0.6
+        SemanticVersion: 5.1.0
       Parameters:
         ForceHost: !Sub '${CacheHostName}.${CacheDomainName}'
         SourceBucket: !Ref IiifSourceBucket

examples/sam/customization/template.yaml

@@ -126,7 +126,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:625046682746:applications/serverless-iiif
-        SemanticVersion: 5.0.6
+        SemanticVersion: 5.1.0
       Parameters:
         CorsAllowOrigin: REFLECT_ORIGIN
         ForceHost: !Ref CacheDomainName

extras/terraform/main.tf

@@ -10,7 +10,7 @@ terraform {
 
 locals {
   serverless_iiif_app_id        = "arn:aws:serverlessrepo:us-east-1:625046682746:applications/serverless-iiif"
-  serverless_iiif_app_version   = "5.0.6"
+  serverless_iiif_app_version   = "5.1.0"
 }
 
 resource "aws_serverlessapplicationrepository_cloudformation_stack" "serverless_iiif" {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-iiif",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Lambda wrapper for iiif-processor",
   "author": "Michael B. Klein",
   "license": "Apache-2.0",

sam/cloudfront/template.yml

@@ -9,7 +9,7 @@ Metadata:
     ReadmeUrl: ./README.md
     Labels: ["iiif", "image-processing"]
     HomePageUrl: https://samvera.github.io/serverless-iiif
-    SemanticVersion: 5.0.6
+    SemanticVersion: 5.1.0
     SourceCodeUrl: https://github.com/samvera/serverless-iiif
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -324,7 +324,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:625046682746:applications/serverless-iiif
-        SemanticVersion: 5.0.6
+        SemanticVersion: 5.1.0
       Parameters:
         CorsAllowCredentials: !Ref CorsAllowCredentials
         CorsAllowOrigin: !Ref CorsAllowOrigin

sam/standalone/template.yml

@@ -9,7 +9,7 @@ Metadata:
     ReadmeUrl: ./README.md
     Labels: ["iiif", "image-processing"]
     HomePageUrl: https://samvera.github.io/serverless-iiif
-    SemanticVersion: 5.0.6
+    SemanticVersion: 5.1.0
     SourceCodeUrl: https://github.com/samvera/serverless-iiif
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -118,7 +118,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:625046682746:applications/serverless-iiif
-        SemanticVersion: 5.0.6
+        SemanticVersion: 5.1.0
       Parameters:
         CorsAllowCredentials: !Ref CorsAllowCredentials
         CorsAllowHeaders: !Ref CorsAllowHeaders

sam/template.yml

@@ -9,7 +9,7 @@ Metadata:
     ReadmeUrl: ../README.md
     Labels: ["iiif", "image-processing"]
     HomePageUrl: https://samvera.github.io/serverless-iiif
-    SemanticVersion: 5.0.6
+    SemanticVersion: 5.1.0
     SourceCodeUrl: https://github.com/samvera/serverless-iiif
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -136,13 +136,14 @@ Resources:
       ContentUri: ../dependencies
       CompatibleRuntimes:
         - nodejs18.x
+        - nodejs20.x
       LicenseInfo: "Apache-2.0"
     Metadata:
-      BuildMethod: nodejs18.x
+      BuildMethod: nodejs20.x
   IiifFunction:
     Type: "AWS::Serverless::Function"
     Properties:
-      Runtime: nodejs18.x
+      Runtime: nodejs20.x
       Handler: index.handler
       MemorySize:
         Ref: IiifLambdaMemory
@@ -153,10 +154,9 @@ Resources:
         Ref: IiifLambdaTimeout
       CodeUri: ../src
       Layers:
-        - Ref: Dependencies
         - Fn::If:
           - UseBuiltInDependencies
-          - !Ref AWS::NoValue
+          - Ref: Dependencies
           - Fn::If:
             - UseJP2SharpLayer
             - !Sub "arn:aws:lambda:${AWS::Region}:625046682746:layer:libvips-sharp-jp2:4"
@@ -208,6 +208,8 @@ Resources:
               - !Ref AWS::NoValue
           resolverTemplate: !Ref ResolverTemplate
           tiffBucket: !Ref SourceBucket
+    Metadata:
+      BuildMethod: makefile
 Outputs:
   EndpointV2:
     Description: IIIF Image API v2 Endpoint

src/Makefile

@@ -0,0 +1,3 @@
+build-IiifFunction:
+	rsync -ar --exclude node_modules . $(ARTIFACTS_DIR)
+	npm ci --omit=optional --omit=dev --prefix $(ARTIFACTS_DIR)

src/index.js

@@ -52,11 +52,25 @@ const handleServiceDiscoveryRequestFunc = () => {
           href: '/iiif/3/{:id}',
           name: 'IIIF Image API v3 endpoint'
         }
-      ]
+      ],
+      versions: { ...require('sharp').versions }
     })
   };
 };
 
+const executeResource = async (uri, streamResolver, dimensionFunction, density, sharpOptions = {}) => {
+  try {
+    const resource = new IIIF.Processor(uri, streamResolver, { dimensionFunction, density, sharpOptions });
+    return await resource.execute();
+  } catch (err) {
+    if (/Invalid tile part index/.test(err.message) && !sharpOptions.jp2Oneshot) {
+      console.log('Encountered JP2 tile part index error. Trying oneshot load.');
+      return await executeResource(uri, streamResolver, dimensionFunction, density, { ...sharpOptions, jp2Oneshot: true });
+    }
+    throw err;
+  }
+};
+
 const handleResourceRequestFunc = async (event, context) => {
   const density = helpers.parseDensity(process.env.density);
   const { getUri } = helpers;
@@ -66,8 +80,7 @@ const handleResourceRequestFunc = async (event, context) => {
   let resource;
   try {
     const uri = getUri(event);
-    resource = new IIIF.Processor(uri, streamResolver, { dimensionFunction: dimensionResolver, density: density });
-    const result = await resource.execute();
+    const result = await executeResource(uri, streamResolver, dimensionResolver, density);
     return makeResponse(result);
   } catch (err) {
     return errorHandler(err, event, context, resource);