@malloy-publisher/server 0.0.83 → 0.0.85

package/src/service/project.ts

@@ -1,4 +1,5 @@
 import { BaseConnection } from "@malloydata/malloy/connection";
+import { Mutex } from "async-mutex";
 import * as fs from "fs/promises";
 import * as path from "path";
 import { components } from "../api";
@@ -12,6 +13,7 @@ type ApiProject = components["schemas"]["Project"];
 
 export class Project {
    private packages: Map<string, Package> = new Map();
+   private packageMutexes = new Map<string, Mutex>();
    private malloyConnections: Map<string, BaseConnection>;
    private apiConnections: ApiConnection[];
    private internalConnections: InternalConnection[];
@@ -129,14 +131,15 @@ export class Project {
                .filter((file) => file.isDirectory())
                .map(async (directory) => {
                   try {
-                     const _package = await this.getPackage(
-                        directory.name,
-                        false,
+                     return (
+                        await this.getPackage(directory.name, false)
+                     ).getPackageMetadata();
+                  } catch (error) {
+                     console.log(
+                        `Failed to load package: ${directory.name} due to : ${error}`,
                      );
-                     const metadata = _package.getPackageMetadata();
-                     return metadata;
-                  } catch {
                      // Directory did not contain a valid package.json file -- therefore, it's not a package.
+                     // Or it timed out
                      return undefined;
                   }
                }),
@@ -155,21 +158,33 @@ export class Project {
       packageName: string,
       reload: boolean,
    ): Promise<Package> {
-      let _package = this.packages.get(packageName);
-      if (_package === undefined || reload) {
+      // We need to acquire the mutex to prevent a thundering herd of requests from creating the
+      // package multiple times.
+      let packageMutex = this.packageMutexes.get(packageName);
+      if (!packageMutex) {
+         packageMutex = new Mutex();
+         this.packageMutexes.set(packageName, packageMutex);
+      }
+
+      return await packageMutex.runExclusive(async () => {
+         const _package = this.packages.get(packageName);
+         if (_package !== undefined && !reload) {
+            return _package;
+         }
+
          try {
-            _package = await Package.create(
+            const _package = await Package.create(
                this.projectName,
                packageName,
                path.join(this.projectPath, packageName),
                this.malloyConnections,
             );
             this.packages.set(packageName, _package);
+            return _package;
          } catch (error) {
             this.packages.delete(packageName);
             throw error;
          }
-      }
-      return _package;
+      });
    }
 }