Convert IIIF viewer request function from CommonJS to ESM and upgrade @…

…middy
nulib · Nov 22, 2024 · d3f83c6 · d3f83c6
1 parent 443c2a9
commit d3f83c6
Show file tree

Hide file tree

Showing 5 changed files with 3,712 additions and 617 deletions.
diff --git a/iiif-server/src/authorize.js b/iiif-server/src/authorize.js
@@ -1,5 +1,5 @@
-const isString = require("lodash.isstring");
-const fetch = require("node-fetch");
+import isString from "lodash.isstring";
+import fetch from "node-fetch";
 
 let allowFrom, dcApiEndpoint;
 function reconfigure(config) {
@@ -28,7 +28,7 @@ function isBlurred({ region, size }) {
   return false;
 }
 
-async function authorize(params, referer, cookie, clientIp, config) {
+export async function authorize(params, referer, cookie, clientIp, config) {
   reconfigure(config);
   const allowedFrom = allowedFromRegexes(allowFrom);
 
@@ -58,5 +58,3 @@ async function getImageAuthorization(id, cookieHeader, clientIp) {
   );
   return response.status == 204;
 }
-
-module.exports = authorize;
diff --git a/iiif-server/src/index.js b/iiif-server/src/index.js
@@ -1,9 +1,8 @@
-const authorize = require("./authorize");
-const validateJwtClaims = require("./validate-jwt");
-const jwt = require("jsonwebtoken");
-const middy = require("@middy/core");
-const secretsManager = require("@middy/secrets-manager");
-
+import { authorize } from './authorize.js';
+import { validateJwtClaims } from "./validate-jwt.js";
+import jwt from "jsonwebtoken";
+import middy from "@middy/core";
+import secretsManager from "@middy/secrets-manager";
 
 function getEventHeader(request, name) {
   if (
@@ -176,6 +175,7 @@ async function processViewerRequest(event, context) {
 // }
 
 async function processRequest(event, context) {
+  console.log(context);
   const { eventType } = event.Records[0].cf.config;
   let result;
 
@@ -205,14 +205,12 @@ function functionNameAndRegion() {
 const { functionName, functionRegion } = functionNameAndRegion();
 console.log("Initializing", functionName, 'in', functionRegion);
 
-module.exports = {
-  handler:
-    middy(processRequest)
-      .use(
-        secretsManager({
-          fetchData: { config: functionName },
-          awsClientOptions: { region: functionRegion },
-          setToContext: true
-        })
-      )
-};
+export const handler = 
+  middy(processRequest)
+    .use(
+      secretsManager({
+        fetchData: { config: functionName },
+        awsClientOptions: { region: functionRegion },
+        setToContext: true
+      })
+    );