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

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,67 +1,111 @@
 import config from '../../config.js';
-import { getBucket } from '../storage/storage.js';
-import { readdir, lstat } from 'node:fs/promises';
-import { createReadStream } from 'node:fs';
-import { join } from 'node:path';
-import { CloudFunctionsServiceClient } from '@google-cloud/functions';
-const functionsClient = new CloudFunctionsServiceClient({
+import { createReadStream, createWriteStream } from 'node:fs';
+import { resolve, dirname, basename } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { v2 } from '@google-cloud/functions';
+import archiver from 'archiver';
+const { FunctionServiceClient } = v2;
+const functionsClient = new FunctionServiceClient({
     credentials: config.deployment.credentials
 });
 const projectId = config.deployment.projectId;
 const region = config.deployment.region;
-async function uploadDirectory(bucketName, directoryPath, prefix = '') {
-    const bucket = getBucket(bucketName);
-    const files = await readdir(directoryPath);
-    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);
+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 } });
+        output.on('close', () => {
+            resolve();
+        });
+        archive.on('error', (err) => {
+            reject(err);
+        });
+        archive.pipe(output);
+        archive.glob(source, { ignore: ignorePaths });
+        for (const path of injectPaths) {
+            archive.file(path, { name: basename(path) });
         }
-        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);
-            });
-        }
-    }
+        archive.finalize();
+    });
 }
-async function uploadSourceCode(bucketName, source, dest) {
-    const bucket = getBucket(bucketName);
-    const uploadResponse = await bucket.upload(source, {
-        gzip: true,
-        destination: dest
+async function uploadSource(sourceArchivePath) {
+    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'
+        }
     });
-    const file = uploadResponse[0];
-    return file.cloudStorageURI.toString();
+    return storageSource;
 }
-async function deployFunction(name, source) {
+async function deployFunction(functionName, storageSource) {
     const location = functionsClient.locationPath(projectId, region);
-    const [response] = await functionsClient.createFunction({
-        location,
+    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 buildArchivePath = '.genoacms/deployment/build.zip';
-    await uploadDirectory(bucketName, './static', assetsPath);
-    const buildArchiveURI = await uploadSourceCode(bucketName, './build', buildArchivePath);
-    await deployFunction('genoacms', buildArchiveURI);
+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

@@ -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);
@@ -11,11 +12,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
@@ -36,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: '/'
@@ -52,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.1",
+  "version": "0.5.2-fix.10",
   "description": "Implementation of abstraction layer of GenoaCMS for GCP",
   "repository": {
     "type": "git",
@@ -19,11 +19,13 @@
   "dependencies": {
     "@genoacms/cloudabstraction": "^0.5.2",
     "@google-cloud/firestore": "^7.1.0",
-    "@google-cloud/functions": "^3.2.0",
+    "@google-cloud/functions": "^3.4.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,11 +37,11 @@
     "vitest": "^1.0.4"
   },
   "peerDependencies": {
-    "@sveltejs/adapter-node": "^4.0.1",
-    "@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,74 +1,120 @@
 import config from '../../config.js'
-import { getBucket } from '../storage/storage.js'
-import { readdir, lstat } from 'node:fs/promises'
-import { createReadStream } from 'node:fs'
-import { join } from 'node:path'
-import { CloudFunctionsServiceClient } from '@google-cloud/functions'
+import { createReadStream, createWriteStream } from 'node:fs'
+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 uploadDirectory (bucketName: string, directoryPath: string, prefix = ''): Promise<void> {
-  const bucket = getBucket(bucketName)
-  const files = await readdir(directoryPath)
+const currentDir = dirname(fileURLToPath(import.meta.url))
 
-  for (const file of files) {
-    const filePath = join(directoryPath, file)
-    const destination = join(prefix, file)
+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 } })
 
-    const isFileDirectory = (await lstat(filePath)).isDirectory()
-    if (isFileDirectory) {
-      await uploadDirectory(bucketName, filePath, destination)
-    } else {
-      const fileStream = createReadStream(filePath)
-      const gcsFile = bucket.file(destination)
+    output.on('close', () => {
+      resolve()
+    })
 
-      await new Promise((resolve, reject) => {
-        fileStream
-          .pipe(gcsFile.createWriteStream())
-          .on('error', reject)
-          .on('finish', resolve)
-      })
+    archive.on('error', (err) => {
+      reject(err)
+    })
+
+    archive.pipe(output)
+    archive.glob(source, { ignore: ignorePaths })
+    for (const path of injectPaths) {
+      archive.file(path, { name: basename(path) })
     }
-  }
+    archive.finalize()
+  })
 }
 
-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 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'
+    }
   })
-  const file = uploadResponse[0]
-  return file.cloudStorageURI.toString()
+  return storageSource
 }
 
-async function deployFunction (name: string, source: string): Promise<void> {
+async function deployFunction (functionName: string, storageSource: IStorageSource): Promise<void> {
   const location = functionsClient.locationPath(projectId, region)
-  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 buildArchivePath = '.genoacms/deployment/build.zip'
-  await uploadDirectory(bucketName, './static', assetsPath)
-  const buildArchiveURI = await uploadSourceCode(bucketName, './build', buildArchivePath)
-  await deployFunction('genoacms', buildArchiveURI)
+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

@@ -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)
@@ -20,11 +21,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
@@ -48,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: '/'
@@ -67,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/cloudFunction.js

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