tinacms 2.5.2 → 2.6.1

package/dist/client.js

@@ -1,6 +1,6 @@
 (function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports) : typeof define === "function" && define.amd ? define(["exports"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.tinacms = {}));
-})(this, function(exports2) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("async-lock")) : typeof define === "function" && define.amd ? define(["exports", "async-lock"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.tinacms = {}, global.NOOP));
+})(this, function(exports2, AsyncLock) {
   "use strict";
   const TINA_HOST = "content.tinajs.io";
   class TinaClient {
@@ -26,6 +26,7 @@
         if (this.cacheDir && typeof window === "undefined" && typeof require !== "undefined") {
           const { NodeCache: NodeCache2 } = await Promise.resolve().then(() => nodeCache);
           this.cache = await NodeCache2(this.cacheDir);
+          this.cacheLock = new AsyncLock();
         }
       } catch (e) {
         console.error(e);
@@ -62,42 +63,58 @@
         ...providedFetchOptions
       };
       let key = "";
+      let result;
       if (this.cache) {
         key = this.cache.makeKey(bodyString);
-        const value = await this.cache.get(key);
-        if (value) {
-          return value;
-        }
-      }
-      const res = await fetch(url, optionsObject);
-      if (!res.ok) {
-        let additionalInfo = "";
-        if (res.status === 401) {
-          additionalInfo = "Please check that your client ID, URL and read only token are configured properly.";
-        }
-        throw new Error(
-          `Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/errors/faq/`
-        );
-      }
-      const json = await res.json();
-      if (json.errors && errorPolicyDefined === "throw") {
-        throw new Error(
-          `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
-        Errors: 
-	${json.errors.map((error) => error.message).join("\n")}`
+        await this.cacheLock.acquire(key, async () => {
+          result = await this.cache.get(key);
+          if (!result) {
+            result = await requestFromServer(
+              url,
+              args.query,
+              optionsObject,
+              errorPolicyDefined
+            );
+            await this.cache.set(key, result);
+          }
+        });
+      } else {
+        result = await requestFromServer(
+          url,
+          args.query,
+          optionsObject,
+          errorPolicyDefined
         );
       }
-      const result = {
-        data: json == null ? void 0 : json.data,
-        errors: (json == null ? void 0 : json.errors) || null,
-        query: args.query
-      };
-      if (this.cache) {
-        await this.cache.set(key, result);
-      }
       return result;
     }
   }
+  async function requestFromServer(url, query, optionsObject, errorPolicyDefined) {
+    const res = await fetch(url, optionsObject);
+    if (!res.ok) {
+      let additionalInfo = "";
+      if (res.status === 401) {
+        additionalInfo = "Please check that your client ID, URL and read only token are configured properly.";
+      }
+      throw new Error(
+        `Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/errors/faq/`
+      );
+    }
+    const json = await res.json();
+    if (json.errors && errorPolicyDefined === "throw") {
+      throw new Error(
+        `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
+      Errors: 
+	${json.errors.map((error) => error.message).join("\n")}`
+      );
+    }
+    const result = {
+      data: json == null ? void 0 : json.data,
+      errors: (json == null ? void 0 : json.errors) || null,
+      query
+    };
+    return result;
+  }
   function createClient(args) {
     const client = new TinaClient(args);
     return client;
@@ -129,22 +146,35 @@
         return createHash("sha256").update(input).digest("hex");
       },
       get: async (key) => {
+        let readValue;
+        const cacheFilename = `${cacheDir}/${key}`;
         try {
-          const data = await fs.promises.readFile(`${cacheDir}/${key}`, "utf-8");
-          return JSON.parse(data);
+          const data = await fs.promises.readFile(cacheFilename, "utf-8");
+          readValue = JSON.parse(data);
         } catch (e) {
-          if (e.code === "ENOENT") {
-            return void 0;
+          if (e.code !== "ENOENT") {
+            console.error(
+              `Failed to read cache file to ${cacheFilename}: ${e.message}`
+            );
           }
-          throw e;
         }
+        return readValue;
       },
       set: async (key, value) => {
-        await fs.promises.writeFile(
-          `${cacheDir}/${key}`,
-          JSON.stringify(value),
-          "utf-8"
-        );
+        const cacheFilename = `${cacheDir}/${key}`;
+        try {
+          await fs.promises.writeFile(cacheFilename, JSON.stringify(value), {
+            encoding: "utf-8",
+            flag: "wx"
+            // Don't overwrite existing caches
+          });
+        } catch (e) {
+          if (e.code !== "EEXIST") {
+            console.error(
+              `Failed to write cache file to ${cacheFilename}: ${e.message}`
+            );
+          }
+        }
       }
     };
   };

package/dist/client.mjs

@@ -1,3 +1,4 @@
+import AsyncLock from "async-lock";
 const TINA_HOST = "content.tinajs.io";
 class TinaClient {
   constructor({
@@ -20,8 +21,9 @@ class TinaClient {
     }
     try {
       if (this.cacheDir && typeof window === "undefined" && typeof require !== "undefined") {
-        const { NodeCache } = await import("./node-cache-4c336858.mjs");
+        const { NodeCache } = await import("./node-cache-5e8db9f0.mjs");
         this.cache = await NodeCache(this.cacheDir);
+        this.cacheLock = new AsyncLock();
       }
     } catch (e) {
       console.error(e);
@@ -58,42 +60,58 @@ class TinaClient {
       ...providedFetchOptions
     };
     let key = "";
+    let result;
     if (this.cache) {
       key = this.cache.makeKey(bodyString);
-      const value = await this.cache.get(key);
-      if (value) {
-        return value;
-      }
-    }
-    const res = await fetch(url, optionsObject);
-    if (!res.ok) {
-      let additionalInfo = "";
-      if (res.status === 401) {
-        additionalInfo = "Please check that your client ID, URL and read only token are configured properly.";
-      }
-      throw new Error(
-        `Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/errors/faq/`
+      await this.cacheLock.acquire(key, async () => {
+        result = await this.cache.get(key);
+        if (!result) {
+          result = await requestFromServer(
+            url,
+            args.query,
+            optionsObject,
+            errorPolicyDefined
+          );
+          await this.cache.set(key, result);
+        }
+      });
+    } else {
+      result = await requestFromServer(
+        url,
+        args.query,
+        optionsObject,
+        errorPolicyDefined
       );
     }
-    const json = await res.json();
-    if (json.errors && errorPolicyDefined === "throw") {
-      throw new Error(
-        `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
-        Errors: 
-	${json.errors.map((error) => error.message).join("\n")}`
-      );
-    }
-    const result = {
-      data: json == null ? void 0 : json.data,
-      errors: (json == null ? void 0 : json.errors) || null,
-      query: args.query
-    };
-    if (this.cache) {
-      await this.cache.set(key, result);
-    }
     return result;
   }
 }
+async function requestFromServer(url, query, optionsObject, errorPolicyDefined) {
+  const res = await fetch(url, optionsObject);
+  if (!res.ok) {
+    let additionalInfo = "";
+    if (res.status === 401) {
+      additionalInfo = "Please check that your client ID, URL and read only token are configured properly.";
+    }
+    throw new Error(
+      `Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/errors/faq/`
+    );
+  }
+  const json = await res.json();
+  if (json.errors && errorPolicyDefined === "throw") {
+    throw new Error(
+      `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
+      Errors: 
+	${json.errors.map((error) => error.message).join("\n")}`
+    );
+  }
+  const result = {
+    data: json == null ? void 0 : json.data,
+    errors: (json == null ? void 0 : json.errors) || null,
+    query
+  };
+  return result;
+}
 function createClient(args) {
   const client = new TinaClient(args);
   return client;