@genoacms/adapter-gcp 0.5.2-fix.1 → 0.5.2-fix.5

package/dist/services/deployment/deploy.js

@@ -1,47 +1,63 @@
 import config from '../../config.js';
 import { getBucket } from '../storage/storage.js';
 import { readdir, lstat } from 'node:fs/promises';
-import { createReadStream } from 'node:fs';
+import { createReadStream, createWriteStream } from 'node:fs';
 import { join } from 'node:path';
 import { CloudFunctionsServiceClient } from '@google-cloud/functions';
+import archiver from 'archiver';
 const functionsClient = new CloudFunctionsServiceClient({
     credentials: config.deployment.credentials
 });
 const projectId = config.deployment.projectId;
 const region = config.deployment.region;
-async function uploadDirectory(bucketName, directoryPath, prefix = '') {
+async function uploadFile(bucketName, filePath, destination) {
     const bucket = getBucket(bucketName);
+    const fileStream = createReadStream(filePath);
+    const gcsFile = bucket.file(destination);
+    await new Promise((resolve, reject) => {
+        fileStream
+            .pipe(gcsFile.createWriteStream())
+            .on('error', reject)
+            .on('finish', resolve);
+    });
+}
+async function uploadFileOrDirectory(bucketName, path, prefix = '') {
+    const isDirectory = (await lstat(path)).isDirectory();
+    if (isDirectory) {
+        await uploadDirectory(bucketName, path, prefix);
+    }
+    else {
+        await uploadFile(bucketName, path, prefix);
+    }
+}
+async function uploadDirectory(bucketName, directoryPath, prefix = '') {
     const files = await readdir(directoryPath);
+    const promises = [];
     for (const file of files) {
         const filePath = join(directoryPath, file);
         const destination = join(prefix, file);
-        const isFileDirectory = (await lstat(filePath)).isDirectory();
-        if (isFileDirectory) {
-            await uploadDirectory(bucketName, filePath, destination);
-        }
-        else {
-            const fileStream = createReadStream(filePath);
-            const gcsFile = bucket.file(destination);
-            await new Promise((resolve, reject) => {
-                fileStream
-                    .pipe(gcsFile.createWriteStream())
-                    .on('error', reject)
-                    .on('finish', resolve);
-            });
-        }
+        promises.push(uploadFileOrDirectory(bucketName, filePath, destination));
     }
+    await Promise.all(promises);
 }
-async function uploadSourceCode(bucketName, source, dest) {
-    const bucket = getBucket(bucketName);
-    const uploadResponse = await bucket.upload(source, {
-        gzip: true,
-        destination: dest
+async function zipDirectory(source, out) {
+    await new Promise((resolve, reject) => {
+        const output = createWriteStream(out);
+        const archive = archiver('zip', { zlib: { level: 9 } });
+        output.on('close', () => {
+            resolve();
+        });
+        archive.on('error', (err) => {
+            reject(err);
+        });
+        archive.pipe(output);
+        archive.directory(source, false);
+        archive.finalize();
     });
-    const file = uploadResponse[0];
-    return file.cloudStorageURI.toString();
 }
-async function deployFunction(name, source) {
+async function deployFunction(functionName, source) {
     const location = functionsClient.locationPath(projectId, region);
+    const name = functionsClient.cloudFunctionPath(projectId, region, functionName);
     const [response] = await functionsClient.createFunction({
         location,
         function: {
@@ -60,8 +76,11 @@ async function deployFunction(name, source) {
 export default async function () {
     const bucketName = config.storage.defaultBucket;
     const assetsPath = '.genoacms/deployment/static';
-    const buildArchivePath = '.genoacms/deployment/build.zip';
+    const buildArchiveSrc = '.build.zip';
+    const buildArchiveDest = '.genoacms/deployment/build.zip';
+    const buildArchiveRef = `gs://${bucketName}/${buildArchiveDest}`;
+    await zipDirectory('./build', buildArchiveSrc);
     await uploadDirectory(bucketName, './static', assetsPath);
-    const buildArchiveURI = await uploadSourceCode(bucketName, './build', buildArchivePath);
-    await deployFunction('genoacms', buildArchiveURI);
+    await uploadFile(bucketName, buildArchiveSrc, buildArchiveDest);
+    await deployFunction('genoacms', buildArchiveRef);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genoacms/adapter-gcp",
-  "version": "0.5.2-fix.1",
+  "version": "0.5.2-fix.5",
   "description": "Implementation of abstraction layer of GenoaCMS for GCP",
   "repository": {
     "type": "git",
@@ -21,9 +21,11 @@
     "@google-cloud/firestore": "^7.1.0",
     "@google-cloud/functions": "^3.2.0",
     "@google-cloud/resource-manager": "^5.1.0",
-    "@google-cloud/storage": "^7.7.0"
+    "@google-cloud/storage": "^7.7.0",
+    "archiver": "^7.0.0"
   },
   "devDependencies": {
+    "@types/archiver": "^6.0.2",
     "@typescript-eslint/eslint-plugin": "^6.9.0",
     "eslint": "^8.52.0",
     "eslint-config-standard-with-typescript": "^39.1.1",
@@ -35,8 +37,8 @@
     "vitest": "^1.0.4"
   },
   "peerDependencies": {
-    "@sveltejs/adapter-node": "^4.0.1",
-    "@google-cloud/functions-framework": "^3.3.0"
+    "@google-cloud/functions-framework": "^3.3.0",
+    "@sveltejs/adapter-node": "^4.0.1"
   },
   "files": [
     "src",

package/src/services/deployment/deploy.ts

@@ -1,9 +1,10 @@
 import config from '../../config.js'
 import { getBucket } from '../storage/storage.js'
 import { readdir, lstat } from 'node:fs/promises'
-import { createReadStream } from 'node:fs'
+import { createReadStream, createWriteStream } from 'node:fs'
 import { join } from 'node:path'
 import { CloudFunctionsServiceClient } from '@google-cloud/functions'
+import archiver from 'archiver'
 
 const functionsClient = new CloudFunctionsServiceClient({
   credentials: config.deployment.credentials
@@ -11,43 +12,62 @@ const functionsClient = new CloudFunctionsServiceClient({
 const projectId = config.deployment.projectId
 const region = config.deployment.region
 
-async function uploadDirectory (bucketName: string, directoryPath: string, prefix = ''): Promise<void> {
+async function uploadFile (bucketName: string, filePath: string, destination: string): Promise<void> {
   const bucket = getBucket(bucketName)
+  const fileStream = createReadStream(filePath)
+  const gcsFile = bucket.file(destination)
+
+  await new Promise((resolve, reject) => {
+    fileStream
+      .pipe(gcsFile.createWriteStream())
+      .on('error', reject)
+      .on('finish', resolve)
+  })
+}
+
+async function uploadFileOrDirectory (bucketName: string, path: string, prefix = ''): Promise<void> {
+  const isDirectory = (await lstat(path)).isDirectory()
+  if (isDirectory) {
+    await uploadDirectory(bucketName, path, prefix)
+  } else {
+    await uploadFile(bucketName, path, prefix)
+  }
+}
+
+async function uploadDirectory (bucketName: string, directoryPath: string, prefix = ''): Promise<void> {
   const files = await readdir(directoryPath)
+  const promises = []
 
   for (const file of files) {
     const filePath = join(directoryPath, file)
     const destination = join(prefix, file)
-
-    const isFileDirectory = (await lstat(filePath)).isDirectory()
-    if (isFileDirectory) {
-      await uploadDirectory(bucketName, filePath, destination)
-    } else {
-      const fileStream = createReadStream(filePath)
-      const gcsFile = bucket.file(destination)
-
-      await new Promise((resolve, reject) => {
-        fileStream
-          .pipe(gcsFile.createWriteStream())
-          .on('error', reject)
-          .on('finish', resolve)
-      })
-    }
+    promises.push(uploadFileOrDirectory(bucketName, filePath, destination))
   }
+  await Promise.all(promises)
 }
 
-async function uploadSourceCode (bucketName: string, source: string, dest: string): Promise<string> {
-  const bucket = getBucket(bucketName)
-  const uploadResponse = await bucket.upload(source, {
-    gzip: true,
-    destination: dest
+async function zipDirectory (source: string, out: string): Promise<void> {
+  await new Promise<void>((resolve, reject) => {
+    const output = createWriteStream(out)
+    const archive = archiver('zip', { zlib: { level: 9 } })
+
+    output.on('close', () => {
+      resolve()
+    })
+
+    archive.on('error', (err) => {
+      reject(err)
+    })
+
+    archive.pipe(output)
+    archive.directory(source, false)
+    archive.finalize()
   })
-  const file = uploadResponse[0]
-  return file.cloudStorageURI.toString()
 }
 
-async function deployFunction (name: string, source: string): Promise<void> {
+async function deployFunction (functionName: string, source: string): Promise<void> {
   const location = functionsClient.locationPath(projectId, region)
+  const name = functionsClient.cloudFunctionPath(projectId, region, functionName)
   const [response] = await functionsClient.createFunction({
     location,
     function: {
@@ -67,8 +87,11 @@ async function deployFunction (name: string, source: string): Promise<void> {
 export default async function (): Promise<void> {
   const bucketName = config.storage.defaultBucket
   const assetsPath = '.genoacms/deployment/static'
-  const buildArchivePath = '.genoacms/deployment/build.zip'
+  const buildArchiveSrc = '.build.zip'
+  const buildArchiveDest = '.genoacms/deployment/build.zip'
+  const buildArchiveRef = `gs://${bucketName}/${buildArchiveDest}`
+  await zipDirectory('./build', buildArchiveSrc)
   await uploadDirectory(bucketName, './static', assetsPath)
-  const buildArchiveURI = await uploadSourceCode(bucketName, './build', buildArchivePath)
-  await deployFunction('genoacms', buildArchiveURI)
+  await uploadFile(bucketName, buildArchiveSrc, buildArchiveDest)
+  await deployFunction('genoacms', buildArchiveRef)
 }