@malloy-publisher/server 0.0.170 → 0.0.171

package/dist/server.js

@@ -222427,7 +222427,7 @@ class PackageController {
     } else if (packageLocation.startsWith("gs://")) {
       await this.projectStore.downloadGcsDirectory(packageLocation, projectName, absoluteTargetPath, isCompressedFile);
     } else if (packageLocation.startsWith("s3://")) {
-      await this.projectStore.downloadS3Directory(packageLocation, projectName, absoluteTargetPath);
+      await this.projectStore.downloadS3Directory(packageLocation, projectName, absoluteTargetPath, isCompressedFile);
     }
     if (packageLocation.startsWith("/")) {
       await this.projectStore.mountLocalDirectory(packageLocation, absoluteTargetPath, projectName, packageName);
@@ -231020,7 +231020,7 @@ class ProjectStore {
     if (this.isS3URL(location)) {
       try {
         logger.info(`Downloading S3 directory from "${location}" to "${targetPath}"`);
-        await this.downloadS3Directory(location, projectName, targetPath);
+        await this.downloadS3Directory(location, projectName, targetPath, isCompressedFile);
         return;
       } catch (error) {
         const errorData = this.extractErrorDataFromError(error);
@@ -231097,10 +231097,33 @@ class ProjectStore {
     }
     logger.info(`Downloaded GCS directory ${gcsPath} to ${absoluteDirPath}`);
   }
-  async downloadS3Directory(s3Path, projectName, absoluteDirPath) {
+  async downloadS3Directory(s3Path, projectName, absoluteDirPath, isCompressedFile = false) {
     const trimmedPath = s3Path.slice(5);
     const [bucketName, ...prefixParts] = trimmedPath.split("/");
     const prefix = prefixParts.join("/");
+    if (isCompressedFile) {
+      const zipFilePath = `${absoluteDirPath}.zip`;
+      await fs7.promises.mkdir(path8.dirname(zipFilePath), {
+        recursive: true
+      });
+      const command = new import_client_s32.GetObjectCommand({
+        Bucket: bucketName,
+        Key: prefix
+      });
+      const item = await this.s3Client.send(command);
+      if (!item.Body) {
+        throw new ProjectNotFoundError(`Project ${projectName} not found in ${s3Path}`);
+      }
+      const file = fs7.createWriteStream(zipFilePath);
+      item.Body.transformToWebStream().pipeTo(import_stream5.Writable.toWeb(file));
+      await new Promise((resolve3, reject) => {
+        file.on("error", reject);
+        file.on("finish", resolve3);
+      });
+      await this.unzipProject(zipFilePath);
+      logger.info(`Downloaded S3 zip file ${s3Path} to ${absoluteDirPath}`);
+      return;
+    }
     const objects = await this.s3Client.listObjectsV2({
       Bucket: bucketName,
       Prefix: prefix
@@ -231138,6 +231161,7 @@ class ProjectStore {
         file.on("finish", resolve3);
       });
     }));
+    logger.info(`Downloaded S3 directory ${s3Path} to ${absoluteDirPath}`);
   }
   parseGitHubUrl(githubUrl) {
     const httpsRegex = /github\.com\/(?<owner>[^/]+)\/(?<repoName>[^/]+)(?<packagePath>\/[^/]+)*/;

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@malloy-publisher/server",
    "description": "Malloy Publisher Server",
-   "version": "0.0.170",
+   "version": "0.0.171",
    "main": "dist/server.js",
    "bin": {
       "malloy-publisher": "dist/server.js"

package/src/controller/package.controller.ts

@@ -113,6 +113,7 @@ export class PackageController {
             packageLocation,
             projectName,
             absoluteTargetPath,
+            isCompressedFile,
          );
       }
 

package/src/service/project_store.ts

@@ -1112,7 +1112,12 @@ export class ProjectStore {
             logger.info(
                `Downloading S3 directory from "${location}" to "${targetPath}"`,
             );
-            await this.downloadS3Directory(location, projectName, targetPath);
+            await this.downloadS3Directory(
+               location,
+               projectName,
+               targetPath,
+               isCompressedFile,
+            );
             return;
          } catch (error) {
             const errorData = this.extractErrorDataFromError(error);
@@ -1242,10 +1247,43 @@ export class ProjectStore {
       s3Path: string,
       projectName: string,
       absoluteDirPath: string,
+      isCompressedFile: boolean = false,
    ) {
       const trimmedPath = s3Path.slice(5);
       const [bucketName, ...prefixParts] = trimmedPath.split("/");
       const prefix = prefixParts.join("/");
+
+      if (isCompressedFile) {
+         // Download the single zip file
+         const zipFilePath = `${absoluteDirPath}.zip`;
+         await fs.promises.mkdir(path.dirname(zipFilePath), {
+            recursive: true,
+         });
+
+         const command = new GetObjectCommand({
+            Bucket: bucketName,
+            Key: prefix,
+         });
+         const item = await this.s3Client.send(command);
+         if (!item.Body) {
+            throw new ProjectNotFoundError(
+               `Project ${projectName} not found in ${s3Path}`,
+            );
+         }
+         const file = fs.createWriteStream(zipFilePath);
+         item.Body.transformToWebStream().pipeTo(Writable.toWeb(file));
+         await new Promise<void>((resolve, reject) => {
+            file.on("error", reject);
+            file.on("finish", resolve);
+         });
+
+         // Extract the zip file
+         await this.unzipProject(zipFilePath);
+         logger.info(`Downloaded S3 zip file ${s3Path} to ${absoluteDirPath}`);
+         return;
+      }
+
+      // Original behavior: download directory contents
       const objects = await this.s3Client.listObjectsV2({
          Bucket: bucketName,
          Prefix: prefix,
@@ -1291,6 +1329,7 @@ export class ProjectStore {
             });
          }),
       );
+      logger.info(`Downloaded S3 directory ${s3Path} to ${absoluteDirPath}`);
    }
 
    private parseGitHubUrl(