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

package/deployment/snippets/index.js

@@ -0,0 +1,8 @@
+import { handler } from './build/handler.js'
+
+function genoacms (req, res) {
+  handler(req, res, undefined)
+}
+
+export { genoacms }
+

package/dist/services/deployment/deploy.d.ts

@@ -1 +1,2 @@
-export default function (): Promise<void>;
+declare function deploy(): Promise<void>;
+export default deploy;

package/dist/services/deployment/deploy.js

@@ -1,46 +1,17 @@
 import config from '../../config.js';
-import { getBucket } from '../storage/storage.js';
-import { readdir, lstat } from 'node:fs/promises';
 import { createReadStream, createWriteStream } from 'node:fs';
-import { join } from 'node:path';
-import { CloudFunctionsServiceClient } from '@google-cloud/functions';
+import { resolve, dirname, basename } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { v2 } from '@google-cloud/functions';
 import archiver from 'archiver';
-const functionsClient = new CloudFunctionsServiceClient({
+const { FunctionServiceClient } = v2;
+const functionsClient = new FunctionServiceClient({
     credentials: config.deployment.credentials
 });
 const projectId = config.deployment.projectId;
 const region = config.deployment.region;
-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);
-        promises.push(uploadFileOrDirectory(bucketName, filePath, destination));
-    }
-    await Promise.all(promises);
-}
-async function zipDirectory(source, out) {
+const currentDir = dirname(fileURLToPath(import.meta.url));
+async function createZip(source, injectPaths, ignorePaths, out) {
     await new Promise((resolve, reject) => {
         const output = createWriteStream(out);
         const archive = archiver('zip', { zlib: { level: 9 } });
@@ -51,36 +22,90 @@ async function zipDirectory(source, out) {
             reject(err);
         });
         archive.pipe(output);
-        archive.directory(source, false);
+        archive.glob(source, { ignore: ignorePaths });
+        for (const path of injectPaths) {
+            archive.file(path, { name: basename(path) });
+        }
         archive.finalize();
     });
 }
-async function deployFunction(functionName, source) {
+async function uploadSource(sourceArchivePath) {
     const location = functionsClient.locationPath(projectId, region);
-    const name = functionsClient.cloudFunctionPath(projectId, region, functionName);
-    const [response] = await functionsClient.createFunction({
-        location,
+    const [urlResponse] = await functionsClient.generateUploadUrl({ parent: location });
+    const uploadUrl = urlResponse.uploadUrl;
+    const storageSource = urlResponse.storageSource;
+    if (!uploadUrl || !storageSource)
+        throw new Error('Upload URL not found');
+    const sourceArchiveStream = createReadStream(sourceArchivePath);
+    await fetch(uploadUrl, {
+        method: 'PUT',
+        // @ts-expect-error: invalid typings
+        body: sourceArchiveStream,
+        duplex: 'half',
+        headers: {
+            'Content-Type': 'application/zip'
+        }
+    });
+    return storageSource;
+}
+async function deployFunction(functionName, storageSource) {
+    const location = functionsClient.locationPath(projectId, region);
+    const name = functionsClient.functionPath(projectId, region, functionName);
+    let isFunctionExisting;
+    try {
+        await functionsClient.getFunction({ name });
+        isFunctionExisting = true;
+    }
+    catch (error) {
+        isFunctionExisting = false;
+    }
+    const operationParams = {
+        functionId: functionName,
+        parent: location,
         function: {
             name,
-            sourceUploadUrl: source,
-            entryPoint: 'handler',
-            runtime: 'nodejs20',
-            httpsTrigger: {},
-            environmentVariables: {
-                NODE_ENV: 'production'
+            buildConfig: {
+                entryPoint: 'genoacms',
+                runtime: 'nodejs20',
+                source: {
+                    storageSource
+                }
+            },
+            serviceConfig: {
+                minInstanceCount: 0,
+                maxInstanceCount: 1,
+                ingressSettings: 1,
+                environmentVariables: {
+                    NODE_ENV: 'production'
+                }
             }
         }
-    }, {});
+    };
+    let response;
+    if (isFunctionExisting) {
+        [response] = await functionsClient.updateFunction(operationParams);
+    }
+    else {
+        [response] = await functionsClient.createFunction(operationParams);
+    }
     console.log(response);
 }
-export default async function () {
-    const bucketName = config.storage.defaultBucket;
-    const assetsPath = '.genoacms/deployment/static';
-    const buildArchiveSrc = '.build.zip';
-    const buildArchiveDest = '.genoacms/deployment/build.zip';
-    const buildArchiveRef = `gs://${bucketName}/${buildArchiveDest}`;
-    await zipDirectory('./build', buildArchiveSrc);
-    await uploadDirectory(bucketName, './static', assetsPath);
-    await uploadFile(bucketName, buildArchiveSrc, buildArchiveDest);
-    await deployFunction('genoacms', buildArchiveRef);
+async function deploy() {
+    const buildDirectoryPath = '**';
+    const buildArchivePath = resolve(currentDir, '../../../deployment/build.zip');
+    const functionEntryScriptPath = resolve(currentDir, '../../../deployment/snippets/index.js');
+    const ignoreArchivePaths = [
+        'node_modules/**',
+        '.git/**',
+        '.github/**',
+        '.gitignore',
+        'build/**'
+    ];
+    const injectArchivePaths = [
+        functionEntryScriptPath
+    ];
+    await createZip(buildDirectoryPath, injectArchivePaths, ignoreArchivePaths, buildArchivePath);
+    const functionStorageSource = await uploadSource(buildArchivePath);
+    await deployFunction('genoacms', functionStorageSource);
 }
+export default deploy;

package/dist/services/storage/index.js

@@ -11,11 +11,9 @@ const getPublicURL = async ({ bucket, name }) => {
     const file = bucketInstance.file(name);
     return file.publicUrl();
 };
-const getSignedURL = async ({ bucket, name }) => {
+const getSignedURL = async ({ bucket, name }, expires) => {
     const bucketInstance = getBucket(bucket);
     const file = bucketInstance.file(name);
-    const expires = new Date();
-    expires.setTime(expires.getTime() + 60 * 60 * 1_000);
     const [url] = await file.getSignedUrl({
         action: 'read',
         expires

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genoacms/adapter-gcp",
-  "version": "0.5.2-fix.5",
+  "version": "0.5.2-fix.8",
   "description": "Implementation of abstraction layer of GenoaCMS for GCP",
   "repository": {
     "type": "git",
@@ -37,11 +37,11 @@
     "vitest": "^1.0.4"
   },
   "peerDependencies": {
-    "@google-cloud/functions-framework": "^3.3.0",
     "@sveltejs/adapter-node": "^4.0.1"
   },
   "files": [
     "src",
+    "deployment",
     "dist"
   ],
   "exports": {

package/src/services/deployment/deploy.ts

@@ -1,52 +1,22 @@
 import config from '../../config.js'
-import { getBucket } from '../storage/storage.js'
-import { readdir, lstat } from 'node:fs/promises'
 import { createReadStream, createWriteStream } from 'node:fs'
-import { join } from 'node:path'
-import { CloudFunctionsServiceClient } from '@google-cloud/functions'
+import { resolve, dirname, basename } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { v2 } from '@google-cloud/functions'
 import archiver from 'archiver'
+import type { google } from '@google-cloud/functions/build/protos/protos.js'
+type IStorageSource = google.cloud.functions.v2.IStorageSource
 
-const functionsClient = new CloudFunctionsServiceClient({
+const { FunctionServiceClient } = v2
+const functionsClient = new FunctionServiceClient({
   credentials: config.deployment.credentials
 })
 const projectId = config.deployment.projectId
 const region = config.deployment.region
 
-async function uploadFile (bucketName: string, filePath: string, destination: string): Promise<void> {
-  const bucket = getBucket(bucketName)
-  const fileStream = createReadStream(filePath)
-  const gcsFile = bucket.file(destination)
+const currentDir = dirname(fileURLToPath(import.meta.url))
 
-  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)
-    promises.push(uploadFileOrDirectory(bucketName, filePath, destination))
-  }
-  await Promise.all(promises)
-}
-
-async function zipDirectory (source: string, out: string): Promise<void> {
+async function createZip (source: string, injectPaths: string[], ignorePaths: string[], out: string): Promise<void> {
   await new Promise<void>((resolve, reject) => {
     const output = createWriteStream(out)
     const archive = archiver('zip', { zlib: { level: 9 } })
@@ -60,38 +30,91 @@ async function zipDirectory (source: string, out: string): Promise<void> {
     })
 
     archive.pipe(output)
-    archive.directory(source, false)
+    archive.glob(source, { ignore: ignorePaths })
+    for (const path of injectPaths) {
+      archive.file(path, { name: basename(path) })
+    }
     archive.finalize()
   })
 }
 
-async function deployFunction (functionName: string, source: string): Promise<void> {
+async function uploadSource (sourceArchivePath: string): Promise<IStorageSource> {
+  const location = functionsClient.locationPath(projectId, region)
+  const [urlResponse] = await functionsClient.generateUploadUrl({ parent: location })
+  const uploadUrl = urlResponse.uploadUrl
+  const storageSource = urlResponse.storageSource
+  if (!uploadUrl || !storageSource) throw new Error('Upload URL not found')
+  const sourceArchiveStream = createReadStream(sourceArchivePath)
+  await fetch(uploadUrl, {
+    method: 'PUT',
+    // @ts-expect-error: invalid typings
+    body: sourceArchiveStream,
+    duplex: 'half',
+    headers: {
+      'Content-Type': 'application/zip'
+    }
+  })
+  return storageSource
+}
+
+async function deployFunction (functionName: string, storageSource: IStorageSource): Promise<void> {
   const location = functionsClient.locationPath(projectId, region)
-  const name = functionsClient.cloudFunctionPath(projectId, region, functionName)
-  const [response] = await functionsClient.createFunction({
-    location,
+  const name = functionsClient.functionPath(projectId, region, functionName)
+  let isFunctionExisting: boolean
+  try {
+    await functionsClient.getFunction({ name })
+    isFunctionExisting = true
+  } catch (error) {
+    isFunctionExisting = false
+  }
+  const operationParams = {
+    functionId: functionName,
+    parent: location,
     function: {
       name,
-      sourceUploadUrl: source,
-      entryPoint: 'handler',
-      runtime: 'nodejs20',
-      httpsTrigger: {},
-      environmentVariables: {
-        NODE_ENV: 'production'
+      buildConfig: {
+        entryPoint: 'genoacms',
+        runtime: 'nodejs20',
+        source: {
+          storageSource
+        }
+      },
+      serviceConfig: {
+        minInstanceCount: 0,
+        maxInstanceCount: 1,
+        ingressSettings: 1, // ALLOW_ALL
+        environmentVariables: {
+          NODE_ENV: 'production'
+        }
       }
     }
-  }, {})
+  }
+  let response
+  if (isFunctionExisting) {
+    [response] = await functionsClient.updateFunction(operationParams)
+  } else {
+    [response] = await functionsClient.createFunction(operationParams)
+  }
   console.log(response)
 }
 
-export default async function (): Promise<void> {
-  const bucketName = config.storage.defaultBucket
-  const assetsPath = '.genoacms/deployment/static'
-  const buildArchiveSrc = '.build.zip'
-  const buildArchiveDest = '.genoacms/deployment/build.zip'
-  const buildArchiveRef = `gs://${bucketName}/${buildArchiveDest}`
-  await zipDirectory('./build', buildArchiveSrc)
-  await uploadDirectory(bucketName, './static', assetsPath)
-  await uploadFile(bucketName, buildArchiveSrc, buildArchiveDest)
-  await deployFunction('genoacms', buildArchiveRef)
+async function deploy (): Promise<void> {
+  const buildDirectoryPath = '**'
+  const buildArchivePath = resolve(currentDir, '../../../deployment/build.zip')
+  const functionEntryScriptPath = resolve(currentDir, '../../../deployment/snippets/index.js')
+  const ignoreArchivePaths = [
+    'node_modules/**',
+    '.git/**',
+    '.github/**',
+    '.gitignore',
+    'build/**'
+  ]
+  const injectArchivePaths = [
+    functionEntryScriptPath
+  ]
+  await createZip(buildDirectoryPath, injectArchivePaths, ignoreArchivePaths, buildArchivePath)
+  const functionStorageSource = await uploadSource(buildArchivePath)
+  await deployFunction('genoacms', functionStorageSource)
 }
+
+export default deploy

package/src/services/storage/index.ts

@@ -20,11 +20,9 @@ const getPublicURL: Adapter.getPublicURL = async ({ bucket, name }) => {
   return file.publicUrl()
 }
 
-const getSignedURL: Adapter.getSignedURL = async ({ bucket, name }) => {
+const getSignedURL: Adapter.getSignedURL = async ({ bucket, name }, expires) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(name)
-  const expires = new Date()
-  expires.setTime(expires.getTime() + 60 * 60 * 1_000)
   const [url] = await file.getSignedUrl({
     action: 'read',
     expires

package/src/services/deployment/cloudFunction.js

@@ -1,8 +0,0 @@
-import { HttpFunction } from '@google-cloud/functions-framework'
-import app from './build'
-
-const svelteKitApp = HttpFunction(app.handler)
-
-export {
-  svelteKitApp
-}