aiiinotate 0.10.1 → 0.10.3

package/cli/utils/io.js

@@ -64,9 +64,16 @@ function fileArrayValidate (fileArr) {
  * @returns {Promise<string[]>}
  */
 async function parseImportInputFile(file) {
+  // ensure input file exists
+  const [ fileAbs, ok ] = fileOk(file);
+  if (!ok) {
+    console.error(`could not read import file: ${file}. exiting...`);
+    process.exit(1);
+  }
+
   // read `file` split it by lines, remove empty lines
   const fileArr =
-    fileRead(file)
+    fileRead(fileAbs)
       .split("\n")
       .filter(l => !l.match(/^\s*$/g));
   return [ ...new Set(fileArrayValidate(fileArr)) ];

package/config/.env.template

@@ -18,7 +18,7 @@ AIIINOTATE_SCHEME=http
 AIIINOTATE_LOG_TARGET=stdout
 # directory to save logs to (if AIIINOTATE_LOG_TARGET enables logging to file)
 AIIINOTATE_LOG_DIR=
-# log level. "debug"|"info"|"warning"|"error"
+# log level. "trace"|"debug"|"info"|"warn"|"error"|"fatal"
 AIIINOTATE_LOG_LEVEL=debug
 
 

package/package.json

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

package/src/constants.js

@@ -42,6 +42,12 @@ if (Object.values(env_mapper).some(e => e==null)) {
   process.exit(1);
 }
 
+const allowedLogLevels = [ "trace", "debug", "info", "warn", "error", "fatal" ];
+if (!allowedLogLevels.includes(LOG_LEVEL)) {
+  console.error(`SETUP ERROR: env variable AIIINOTATE_LOG_TARGET must be set to one of ${allowedLogLevels.map(x => "\"" + x + "\"").join(", ")}. Got "${LOG_LEVEL}". Exiting...`)
+  process.exit(1);
+}
+
 // enforce value constraints on variables
 const allowedLogTargets = [ "file", "stdout", "stdout+file", "off" ];
 if (!allowedLogTargets.includes(LOG_TARGET)) {

package/src/utils/utils.js

@@ -287,6 +287,9 @@ const recursiveSort = (x) => {
  * - to avoid the cache to grow unbounded, we define a max size after which
  *    we delete the greatest items in the cache.
  *
+ * cache structure:
+ * Map<[key:string]: { timestamp: Date, promise: Promise }>
+ *
  * NOTE: LIMITATIONS:
  * - `memoize` converts `fn` to an async function to work with both
  *    sync/async patterns, remember to await !
@@ -304,7 +307,11 @@ const memoize = (fn, timeout = 2000, maxSize = 200) => {
   if (timeout <= 0 || maxSize <= 0) {
     throw new Error("memoize: 'timeout' and 'maxSize' must be greater than 0.")
   }
+
+  // each key is mapped to an object storing the timestamp of cache item cration + the function result as a promise.
+  /** @type {Map<[key:string], { timestamp: Date, promise: Promise }>} */
   const cache = new Map();
+
   return async (...args) => {
     // if cache.size > cacheSize, remove the oldest items.
     const extraCount = cache.size - maxSize;

package/import_manifest_file.txt

@@ -1 +0,0 @@
-./wit1923_man1937.json