@genoacms/adapter-gcp 0.5.2-fix.6 → 0.5.2-fix.9

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.js

@@ -1,45 +1,16 @@
 import config from '../../config.js';
-import { readdir, lstat } from 'node:fs/promises';
 import { createReadStream, createWriteStream } from 'node:fs';
-import { join, resolve, dirname } from 'node:path';
+import { resolve, dirname, basename } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { CloudFunctionsServiceClient } from '@google-cloud/functions';
+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;
-const { uploadObject, getSignedURL } = await config.storage.adapter;
-function locateFunctionEntryScript() {
-    const currentDir = dirname(fileURLToPath(import.meta.url));
-    const indexPath = resolve(currentDir, './snippets/index.js');
-    return indexPath;
-}
-async function uploadFile(bucketName, filePath, destination) {
-    const reference = { bucket: bucketName, name: destination };
-    await uploadObject(reference, createReadStream(filePath));
-    return await getSignedURL(reference, new Date(Date.now() + 1000 * 60 * 60 * 12));
-}
-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);
-}
+const currentDir = dirname(fileURLToPath(import.meta.url));
 async function createZip(source, injectPaths, ignorePaths, out) {
     await new Promise((resolve, reject) => {
         const output = createWriteStream(out);
@@ -53,7 +24,7 @@ async function createZip(source, injectPaths, ignorePaths, out) {
         archive.pipe(output);
         archive.glob(source, { ignore: ignorePaths });
         for (const path of injectPaths) {
-            archive.append(path, { name: path });
+            archive.file(path, { name: basename(path) });
         }
         archive.finalize();
     });
@@ -62,7 +33,8 @@ async function uploadSource(sourceArchivePath) {
     const location = functionsClient.locationPath(projectId, region);
     const [urlResponse] = await functionsClient.generateUploadUrl({ parent: location });
     const uploadUrl = urlResponse.uploadUrl;
-    if (!uploadUrl)
+    const storageSource = urlResponse.storageSource;
+    if (!uploadUrl || !storageSource)
         throw new Error('Upload URL not found');
     const sourceArchiveStream = createReadStream(sourceArchivePath);
     await fetch(uploadUrl, {
@@ -74,11 +46,11 @@ async function uploadSource(sourceArchivePath) {
             'Content-Type': 'application/zip'
         }
     });
-    return uploadUrl;
+    return storageSource;
 }
-async function deployFunction(functionName, source) {
+async function deployFunction(functionName, storageSource) {
     const location = functionsClient.locationPath(projectId, region);
-    const name = functionsClient.cloudFunctionPath(projectId, region, functionName);
+    const name = functionsClient.functionPath(projectId, region, functionName);
     let isFunctionExisting;
     try {
         await functionsClient.getFunction({ name });
@@ -88,46 +60,52 @@ async function deployFunction(functionName, source) {
         isFunctionExisting = false;
     }
     const operationParams = {
-        location,
+        functionId: functionName,
+        parent: location,
         function: {
             name,
-            sourceUploadUrl: source,
-            entryPoint: 'svelteKitApp',
-            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, {});
+        [response] = await functionsClient.updateFunction(operationParams);
     }
     else {
-        [response] = await functionsClient.createFunction(operationParams, {});
+        [response] = await functionsClient.createFunction(operationParams);
     }
-    console.log(response, source);
+    console.log(response);
 }
 async function deploy() {
-    const bucketName = config.storage.defaultBucket;
-    const buildDirectoryPath = './*';
-    const buildArchivePath = '.build.zip';
-    const assetsDirectoryPath = './static';
-    const assetsDestPath = '.genoacms/deployment/static';
+    const buildDirectoryPath = '**';
+    const buildArchivePath = resolve(currentDir, '../../../deployment/build.zip');
+    const functionEntryScriptPath = resolve(currentDir, '../../../deployment/snippets/index.js');
     const ignoreArchivePaths = [
-        'node_modules',
-        '.git',
-        '.github',
+        'node_modules/**',
+        '.git/**',
+        '.github/**',
         '.gitignore',
-        'build'
+        'build/**'
     ];
     const injectArchivePaths = [
-        locateFunctionEntryScript()
+        functionEntryScriptPath
     ];
     await createZip(buildDirectoryPath, injectArchivePaths, ignoreArchivePaths, buildArchivePath);
-    const uploadUrl = await uploadSource(buildArchivePath);
-    await uploadDirectory(bucketName, assetsDirectoryPath, assetsDestPath);
-    await deployFunction('genoacms', uploadUrl);
+    const functionStorageSource = await uploadSource(buildArchivePath);
+    await deployFunction('genoacms', functionStorageSource);
 }
 export default deploy;

package/dist/services/storage/index.js

@@ -1,4 +1,5 @@
 import { getBucket } from './storage.js';
+import { join } from 'path';
 const getObject = async ({ bucket, name }) => {
     const bucketInstance = getBucket(bucket);
     const file = bucketInstance.file(name);
@@ -34,7 +35,7 @@ const listDirectory = async ({ bucket, name }, listingParams = {}) => {
     const bucketInstance = getBucket(bucket);
     const options = {
         autoPaginate: false,
-        prefix: name,
+        prefix: join(name, '/'),
         maxResults: listingParams?.limit,
         startOffset: listingParams?.startAfter,
         delimiter: '/'
@@ -50,7 +51,7 @@ const listDirectory = async ({ bucket, name }, listingParams = {}) => {
                 lastModified: new Date(file.metadata.updated)
             };
         }),
-        directories: apiResponse?.prefixes ?? []
+        directories: (apiResponse?.prefixes ?? []).filter((item) => item !== name)
     };
 };
 const createDirectory = async ({ bucket, name }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genoacms/adapter-gcp",
-  "version": "0.5.2-fix.6",
+  "version": "0.5.2-fix.9",
   "description": "Implementation of abstraction layer of GenoaCMS for GCP",
   "repository": {
     "type": "git",
@@ -20,7 +20,6 @@
     "@genoacms/cloudabstraction": "^0.5.2",
     "@google-cloud/firestore": "^7.1.0",
     "@google-cloud/functions": "^3.2.0",
-    "@google-cloud/functions-framework": "^3.3.0",
     "@google-cloud/resource-manager": "^5.1.0",
     "@google-cloud/storage": "^7.7.0",
     "archiver": "^7.0.0"
@@ -38,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,49 +1,20 @@
 import config from '../../config.js'
-import { readdir, lstat } from 'node:fs/promises'
 import { createReadStream, createWriteStream } from 'node:fs'
-import { join, resolve, dirname } from 'node:path'
+import { resolve, dirname, basename } from 'node:path'
 import { fileURLToPath } from 'node:url'
-import { CloudFunctionsServiceClient } from '@google-cloud/functions'
+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
-const { uploadObject, getSignedURL } = await config.storage.adapter
 
-function locateFunctionEntryScript (): string {
-  const currentDir = dirname(fileURLToPath(import.meta.url))
-  const indexPath = resolve(currentDir, './snippets/index.js')
-  return indexPath
-}
-async function uploadFile (bucketName: string, filePath: string, destination: string): Promise<void> {
-  const reference = { bucket: bucketName, name: destination }
-  await uploadObject(reference, createReadStream(filePath))
-  return await getSignedURL(reference, new Date(Date.now() + 1000 * 60 * 60 * 12))
-}
-
-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)
-}
+const currentDir = dirname(fileURLToPath(import.meta.url))
 
 async function createZip (source: string, injectPaths: string[], ignorePaths: string[], out: string): Promise<void> {
   await new Promise<void>((resolve, reject) => {
@@ -61,17 +32,18 @@ async function createZip (source: string, injectPaths: string[], ignorePaths: st
     archive.pipe(output)
     archive.glob(source, { ignore: ignorePaths })
     for (const path of injectPaths) {
-      archive.append(path, { name: path })
+      archive.file(path, { name: basename(path) })
     }
     archive.finalize()
   })
 }
 
-async function uploadSource (sourceArchivePath: string): Promise<string> {
+async function uploadSource (sourceArchivePath: string): Promise<IStorageSource> {
   const location = functionsClient.locationPath(projectId, region)
   const [urlResponse] = await functionsClient.generateUploadUrl({ parent: location })
   const uploadUrl = urlResponse.uploadUrl
-  if (!uploadUrl) throw new Error('Upload URL not found')
+  const storageSource = urlResponse.storageSource
+  if (!uploadUrl || !storageSource) throw new Error('Upload URL not found')
   const sourceArchiveStream = createReadStream(sourceArchivePath)
   await fetch(uploadUrl, {
     method: 'PUT',
@@ -82,12 +54,12 @@ async function uploadSource (sourceArchivePath: string): Promise<string> {
       'Content-Type': 'application/zip'
     }
   })
-  return uploadUrl
+  return storageSource
 }
 
-async function deployFunction (functionName: string, source: string): Promise<void> {
+async function deployFunction (functionName: string, storageSource: IStorageSource): Promise<void> {
   const location = functionsClient.locationPath(projectId, region)
-  const name = functionsClient.cloudFunctionPath(projectId, region, functionName)
+  const name = functionsClient.functionPath(projectId, region, functionName)
   let isFunctionExisting: boolean
   try {
     await functionsClient.getFunction({ name })
@@ -96,47 +68,53 @@ async function deployFunction (functionName: string, source: string): Promise<vo
     isFunctionExisting = false
   }
   const operationParams = {
-    location,
+    functionId: functionName,
+    parent: location,
     function: {
       name,
-      sourceUploadUrl: source,
-      entryPoint: 'svelteKitApp',
-      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, {})
+    [response] = await functionsClient.updateFunction(operationParams)
   } else {
-    [response] = await functionsClient.createFunction(operationParams, {})
+    [response] = await functionsClient.createFunction(operationParams)
   }
-  console.log(response, source)
+  console.log(response)
 }
 
 async function deploy (): Promise<void> {
-  const bucketName = config.storage.defaultBucket
-  const buildDirectoryPath = './*'
-  const buildArchivePath = '.build.zip'
-  const assetsDirectoryPath = './static'
-  const assetsDestPath = '.genoacms/deployment/static'
+  const buildDirectoryPath = '**'
+  const buildArchivePath = resolve(currentDir, '../../../deployment/build.zip')
+  const functionEntryScriptPath = resolve(currentDir, '../../../deployment/snippets/index.js')
   const ignoreArchivePaths = [
-    'node_modules',
-    '.git',
-    '.github',
+    'node_modules/**',
+    '.git/**',
+    '.github/**',
     '.gitignore',
-    'build'
+    'build/**'
   ]
   const injectArchivePaths = [
-    locateFunctionEntryScript()
+    functionEntryScriptPath
   ]
   await createZip(buildDirectoryPath, injectArchivePaths, ignoreArchivePaths, buildArchivePath)
-  const uploadUrl = await uploadSource(buildArchivePath)
-  await uploadDirectory(bucketName, assetsDirectoryPath, assetsDestPath)
-  await deployFunction('genoacms', uploadUrl)
+  const functionStorageSource = await uploadSource(buildArchivePath)
+  await deployFunction('genoacms', functionStorageSource)
 }
 
 export default deploy

package/src/services/storage/index.ts

@@ -4,6 +4,7 @@ import type {
 } from '@genoacms/cloudabstraction/storage'
 import { type File } from '@google-cloud/storage'
 import { getBucket } from './storage.js'
+import { join } from 'path'
 
 const getObject: Adapter.getObject = async ({ bucket, name }) => {
   const bucketInstance = getBucket(bucket)
@@ -46,7 +47,7 @@ const listDirectory: Adapter.listDirectory = async ({ bucket, name }, listingPar
   const bucketInstance = getBucket(bucket)
   const options = {
     autoPaginate: false,
-    prefix: name,
+    prefix: join(name, '/'),
     maxResults: listingParams?.limit,
     startOffset: listingParams?.startAfter,
     delimiter: '/'
@@ -65,7 +66,7 @@ const listDirectory: Adapter.listDirectory = async ({ bucket, name }, listingPar
         lastModified: new Date(file.metadata.updated as string)
       } satisfies StorageObject
     }),
-    directories: apiResponse?.prefixes ?? []
+    directories: (apiResponse?.prefixes ?? []).filter((item) => item !== name)
   }
 }
 

package/src/services/deployment/snippets/index.js

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