aiiinotate 0.4.1 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiiinotate",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "a fast IIIF-compliant annotation server",
   "main": "./cli/index.js",
   "type": "module",

package/src/data/annotations/annotations2.js

@@ -229,7 +229,6 @@ class Annotations2 extends CollectionAbstract {
               target.manifestUri
                 ? await this.manifestsPlugin.getCanvasIdx(target.manifestUri, target.full)
                 : undefined;
-            // console.log(">>> #insertManifestsAndGetCanvasIdx: target", target);
             return target;
           })
         )

package/src/data/manifests/manifests2.js

@@ -1,7 +1,7 @@
 import fastifyPlugin from "fastify-plugin";
 
 import CollectionAbstract from "#data/collectionAbstract.js";
-import { getManifestShortId, manifestUri } from "#utils/iiif2Utils.js";
+import { getManifestShortId } from "#utils/iiif2Utils.js";
 import { formatInsertResponse } from "#src/data/utils/routeUtils.js";
 import { inspectObj, visibleLog, ajvCompile } from "#utils/utils.js";
 import { IIIF_PRESENTATION_2_CONTEXT } from "#utils/iiifUtils.js";
@@ -211,6 +211,8 @@ class Manifests2 extends CollectionAbstract {
           const r = await this.#fetchManifestFromUri(manifestUri);
           if ( ! r.error ) {
             manifestArray.push(r);
+          } else {
+            fetchErrorIds.push(r);
           }
         } catch (err) {
           if ( throwOnError ) {
@@ -223,6 +225,9 @@ class Manifests2 extends CollectionAbstract {
     const result = await this.insertManifestArray(manifestArray, throwOnError);
     // if there has been an error but error-throwing was disabled, complete the response object with description of the errors
     if ( !throwOnError ) {
+      if ( fetchErrorIds.length ) {
+        console.error(`${this.funcName(this.insertManifestsFromUriArray)}: error inserting ${fetchErrorIds} manifests`, fetchErrorIds);
+      }
       result.fetchErrorIds = fetchErrorIds;
     }
     return result;

package/src/data/utils/iiif2Utils.js

@@ -85,6 +85,26 @@ const getAnnotationTarget = (annotation) => {
   return maybeToArray(annotation.on).map(getSingleAnnotationTarget);
 }
 
+/**
+ * @example "127.0.0.1:3000/data/2/wit9_man11_anno165/annotation/c26_abda6e3c-2926-4495-9787-cb3f3588e47c"
+ * @param {string} manifestShortId
+ * @param {string} canvasId
+ * @returns {string}
+ */
+const toAiiinotateAnnotationUri = (manifestShortId, canvasId) =>
+  `${process.env.AIIINOTATE_BASE_URL}/data/${IIIF_PRESENTATION_2}/${manifestShortId}/annotation/${canvasId}_${uuid4()}`;
+
+const toAiiinotateManifestUri = (manifestShortId) =>
+  `${process.env.AIIINOTATE_BASE_URL}/data/${IIIF_PRESENTATION_2}/${manifestShortId}/manifest.json`;
+
+/**
+ * if `canvasUri` follows the recommended IIIF 2.1 recommended URI pattern, convert it to a JSON manifest URI.
+ * @param {string} canvasUri
+ * @returns {string} : the manifest URI
+ */
+const canvasUriToManifestUri = (canvasUri) =>
+  canvasUri.split("/").slice(0,-2).join("/") + "/manifest.json";
+
 /**
  * convert the annotation's `on` to a SpecificResource
  * reimplemented from SAS: https://github.com/glenrobson/SimpleAnnotationServer/blob/dc7c8c6de9f4693c678643db2a996a49eebfcbb0/src/main/java/uk/org/llgc/annotation/store/AnnotationUtils.java#L123-L135
@@ -128,7 +148,7 @@ const makeTarget = (annotation) => {
     }
     if ( objectHasKey(specificResource, "full") ) {
       specificResource.manifestShortId = getManifestShortId(specificResource.full);
-      specificResource.manifestUri = manifestUri(specificResource.manifestShortId);
+      specificResource.manifestUri = canvasUriToManifestUri(specificResource.full);
     }
     return specificResource
   }
@@ -157,29 +177,9 @@ const makeAnnotationId = (annotation, manifestShortId) => {
     throw new Error(`${makeAnnotationId.name}: could not make an 'annotationId' (with manifestShortId=${manifestShortId}, annotation=${annotation})`)
   }
 
-  return annotationUri(manifestShortId, canvasId);
+  return toAiiinotateAnnotationUri(manifestShortId, canvasId);
 }
 
-/**
- * @example "127.0.0.1:3000/data/2/wit9_man11_anno165/annotation/c26_abda6e3c-2926-4495-9787-cb3f3588e47c"
- * @param {string} manifestShortId
- * @param {string} canvasId
- * @returns {string}
- */
-const annotationUri = (manifestShortId, canvasId) =>
-  `${process.env.AIIINOTATE_BASE_URL}/data/${IIIF_PRESENTATION_2}/${manifestShortId}/annotation/${canvasId}_${uuid4()}`;
-
-const manifestUri = (manifestShortId) =>
-  `${process.env.AIIINOTATE_BASE_URL}/data/${IIIF_PRESENTATION_2}/${manifestShortId}/manifest.json`;
-
-/**
- * if `canvasUri` follows the recommended IIIF 2.1 recommended URI pattern, convert it to a JSON manifest URI.
- * @param {string} canvasUri
- * @returns {string} : the manifest URI
- */
-const canvasUriToManifestUri = (canvasUri) =>
-  canvasUri.split("/").slice(0,-2).join("/") + "/manifest.json";
-
 /**
  *
  * @param {object[]} resources: the annotatons
@@ -203,8 +203,8 @@ const toAnnotationList = (resources, annotationListId, label) => {
 export {
   makeTarget,
   makeAnnotationId,
-  annotationUri,
-  manifestUri,
+  toAiiinotateAnnotationUri,
+  toAiiinotateManifestUri,
   toAnnotationList,
   getManifestShortId,
   getCanvasShortId,