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

package/dist/config.d.ts

@@ -1,2 +1,2 @@
-declare const _default: Config<object, object, object, object>;
+declare const _default: any;
 export default _default;

package/dist/services/authorization/index.d.ts

@@ -1,3 +1,3 @@
-import type { isEmailAdmins as isEmailAdminsT } from '@genoacms/cloudabstraction/authorization';
-declare const isEmailAdmins: isEmailAdminsT;
+import type { Adapter } from '@genoacms/cloudabstraction/authorization';
+declare const isEmailAdmins: Adapter.isEmailAdmins;
 export { isEmailAdmins };

package/dist/services/authorization/index.js

@@ -1,5 +1,5 @@
-import { ProjectsClient } from '@google-cloud/resource-manager';
 import config from '../../config.js';
+import { ProjectsClient } from '@google-cloud/resource-manager';
 const resourceManager = new ProjectsClient({
     projectId: config.authorization.projectId,
     credentials: config.authorization.credentials

package/dist/services/database/index.d.ts

@@ -1,7 +1,7 @@
-import type { database as databaseT } from '@genoacms/cloudabstraction';
-declare const createDocument: databaseT.createDocument;
-declare const getCollection: databaseT.getCollection;
-declare const getDocument: databaseT.getDocument;
-declare const updateDocument: databaseT.updateDocument;
-declare const deleteDocument: databaseT.deleteDocument;
+import type { Adapter } from '@genoacms/cloudabstraction/database';
+declare const createDocument: Adapter.createDocument;
+declare const getCollection: Adapter.getCollection;
+declare const getDocument: Adapter.getDocument;
+declare const updateDocument: Adapter.updateDocument;
+declare const deleteDocument: Adapter.deleteDocument;
 export { createDocument, getDocument, getCollection, updateDocument, deleteDocument };

package/dist/services/database/index.js

@@ -1,5 +1,5 @@
-import { Firestore } from '@google-cloud/firestore';
 import config from '../../config.js';
+import { Firestore } from '@google-cloud/firestore';
 const firestore = new Firestore({
     credentials: config.database.credentials,
     databaseId: config.database.databaseId,

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

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

package/dist/services/deployment/deploy.js

@@ -0,0 +1,67 @@
+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({
+    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);
+        }
+        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);
+            });
+        }
+    }
+}
+async function uploadSourceCode(bucketName, source, dest) {
+    const bucket = getBucket(bucketName);
+    const uploadResponse = await bucket.upload(source, {
+        gzip: true,
+        destination: dest
+    });
+    const file = uploadResponse[0];
+    return file.cloudStorageURI.toString();
+}
+async function deployFunction(name, source) {
+    const location = functionsClient.locationPath(projectId, region);
+    const [response] = await functionsClient.createFunction({
+        location,
+        function: {
+            name,
+            sourceUploadUrl: source,
+            entryPoint: 'handler',
+            runtime: 'nodejs20',
+            httpsTrigger: {},
+            environmentVariables: {
+                NODE_ENV: 'production'
+            }
+        }
+    }, {});
+    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);
+}

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

@@ -0,0 +1,4 @@
+import type { Adapter } from '@genoacms/cloudabstraction/deployment';
+declare const svelteKitAdapter: Adapter.svelteKitAdapter;
+declare const deployProcedure: Adapter.deployProcedure;
+export { svelteKitAdapter, deployProcedure };

package/dist/services/deployment/index.js

@@ -0,0 +1,6 @@
+const svelteKitAdapter = '@sveltejs/adapter-node';
+const deployProcedure = async () => {
+    const deploy = (await import('./deploy.js')).default;
+    await deploy();
+};
+export { svelteKitAdapter, deployProcedure };

package/dist/services/storage/index.d.ts

@@ -1,9 +1,9 @@
 import type { Adapter } from '@genoacms/cloudabstraction/storage';
-declare const getObject: Adapter['getObject'];
-declare const getPublicURL: Adapter['getPublicURL'];
-declare const getSignedURL: Adapter['getSignedURL'];
-declare const uploadObject: Adapter['uploadObject'];
-declare const deleteObject: Adapter['deleteObject'];
-declare const listDirectory: Adapter['listDirectory'];
-declare const createDirectory: Adapter['createDirectory'];
+declare const getObject: Adapter.getObject;
+declare const getPublicURL: Adapter.getPublicURL;
+declare const getSignedURL: Adapter.getSignedURL;
+declare const uploadObject: Adapter.uploadObject;
+declare const deleteObject: Adapter.deleteObject;
+declare const listDirectory: Adapter.listDirectory;
+declare const createDirectory: Adapter.createDirectory;
 export { getObject, getPublicURL, getSignedURL, uploadObject, deleteObject, listDirectory, createDirectory };

package/dist/services/storage/index.js

@@ -1,14 +1,4 @@
-import { Storage } from '@google-cloud/storage';
-import config from '../../config.js';
-const storage = new Storage({
-    credentials: config.storage.credentials
-});
-const getBucket = (name) => {
-    if (!config.storage.buckets.includes(name))
-        throw new Error('bucket-unregistered');
-    const bucket = storage.bucket(name);
-    return bucket;
-};
+import { getBucket } from './storage.js';
 const getObject = async ({ bucket, name }) => {
     const bucketInstance = getBucket(bucket);
     const file = bucketInstance.file(name);
@@ -32,10 +22,10 @@ const getSignedURL = async ({ bucket, name }) => {
     });
     return url;
 };
-const uploadObject = async ({ bucket, name }, stream) => {
+const uploadObject = async ({ bucket, name }, stream, options) => {
     const bucketInstance = getBucket(bucket);
     const file = bucketInstance.file(name);
-    await file.save(stream);
+    await file.save(stream, options);
 };
 const deleteObject = async ({ bucket, name }) => {
     const bucketInstance = getBucket(bucket);

package/dist/services/storage/storage.d.ts

@@ -0,0 +1,3 @@
+import { type Bucket } from '@google-cloud/storage';
+declare const getBucket: (name: string) => Bucket;
+export { getBucket };

package/dist/services/storage/storage.js

@@ -0,0 +1,12 @@
+import config from '../../config.js';
+import { Storage } from '@google-cloud/storage';
+const storage = new Storage({
+    credentials: config.storage.credentials
+});
+const getBucket = (name) => {
+    if (!config.storage.buckets.includes(name))
+        throw new Error('bucket-unregistered');
+    const bucket = storage.bucket(name);
+    return bucket;
+};
+export { getBucket };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genoacms/adapter-gcp",
-  "version": "0.4.1",
+  "version": "0.5.2-fix.1",
   "description": "Implementation of abstraction layer of GenoaCMS for GCP",
   "repository": {
     "type": "git",
@@ -17,8 +17,9 @@
   "homepage": "https://github.com/GenoaCMS/adapter-gcp#readme",
   "type": "module",
   "dependencies": {
-    "@genoacms/cloudabstraction": "^0.4.0",
+    "@genoacms/cloudabstraction": "^0.5.2",
     "@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"
   },
@@ -33,19 +34,27 @@
     "typescript": "^5.2.2",
     "vitest": "^1.0.4"
   },
+  "peerDependencies": {
+    "@sveltejs/adapter-node": "^4.0.1",
+    "@google-cloud/functions-framework": "^3.3.0"
+  },
   "files": [
     "src",
     "dist"
   ],
   "exports": {
-    "./auth": {
-      "import": "./dist/services/auth/index.js",
-      "types": "./dist/services/auth/index.d.ts"
+    "./authorization": {
+      "import": "./dist/services/authorization/index.js",
+      "types": "./dist/services/authorization/index.d.ts"
     },
     "./database": {
       "import": "./dist/services/database/index.js",
       "types": "./dist/services/database/index.d.ts"
     },
+    "./deployment": {
+      "import": "./dist/services/deployment/index.js",
+      "types": "./dist/services/deployment/index.d.ts"
+    },
     "./storage": {
       "import": "./dist/services/storage/index.js",
       "types": "./dist/services/storage/index.d.ts"

package/src/genoa.config.d.ts

@@ -25,6 +25,6 @@ interface StorageConfig {
   buckets: string[]
 }
 
-interface ConfigGCP extends Config<object, DatabaseConfig, StorageConfig> {}
+interface ConfigGCP extends Config<object, object, DatabaseConfig, StorageConfig> {}
 
 export default ConfigGCP

package/src/services/authorization/index.ts

@@ -1,6 +1,6 @@
-import { ProjectsClient } from '@google-cloud/resource-manager'
+import type { Adapter } from '@genoacms/cloudabstraction/authorization'
 import config from '../../config.js'
-import type { isEmailAdmins as isEmailAdminsT } from '@genoacms/cloudabstraction/authorization'
+import { ProjectsClient } from '@google-cloud/resource-manager'
 
 const resourceManager = new ProjectsClient({
   projectId: config.authorization.projectId,
@@ -8,7 +8,7 @@ const resourceManager = new ProjectsClient({
 })
 const projectId = config.authorization.projectId
 
-const isEmailAdmins: isEmailAdminsT = async (email: string) => {
+const isEmailAdmins: Adapter.isEmailAdmins = async (email: string) => {
   const resource = `projects/${projectId}`
   const role = resource + '/roles/genoacms'
   const data = await resourceManager.getIamPolicy({ resource })

package/src/services/database/index.ts

@@ -1,6 +1,13 @@
-import { Firestore } from '@google-cloud/firestore'
+import type {
+  Adapter,
+  CollectionSnapshot,
+  Document,
+  DocumentReference,
+  DocumentSnapshot,
+  UpdateSnapshot
+} from '@genoacms/cloudabstraction/database'
 import config from '../../config.js'
-import type { database as databaseT } from '@genoacms/cloudabstraction'
+import { Firestore } from '@google-cloud/firestore'
 
 const firestore = new Firestore({
   credentials: config.database.credentials,
@@ -8,24 +15,24 @@ const firestore = new Firestore({
   projectId: config.database.projectId
 })
 
-const createDocument: databaseT.createDocument = async (reference, data) => {
+const createDocument: Adapter.createDocument = async (reference, data) => {
   const document = await firestore.collection(reference.name).add(data)
-  const documentReference: databaseT.DocumentReference<typeof reference> = {
+  const documentReference: DocumentReference<typeof reference> = {
     collection: reference,
     id: document.id
   }
   return {
     reference: documentReference,
     data
-  } satisfies databaseT.DocumentSnapshot<typeof reference>
+  } satisfies DocumentSnapshot<typeof reference>
 }
 
-const getCollection: databaseT.getCollection = async (reference) => {
+const getCollection: Adapter.getCollection = async (reference) => {
   const collection = await firestore.collection(reference.name).get()
-  const documents: databaseT.CollectionSnapshot<typeof reference> = []
+  const documents: CollectionSnapshot<typeof reference> = []
 
   collection.forEach(document => {
-    const documentData: databaseT.Document<typeof reference.schema> = {}
+    const documentData: Document<typeof reference.schema> = {}
     Object.keys(reference.schema.properties).forEach(key => {
       documentData[key] = document.get(key)
     })
@@ -35,35 +42,35 @@ const getCollection: databaseT.getCollection = async (reference) => {
         collection: reference,
         id: document.id
       },
-      data: document.data() as databaseT.Document<typeof reference.schema>
+      data: document.data() as Document<typeof reference.schema>
     })
   })
   return documents
 }
 
-const getDocument: databaseT.getDocument = async ({ collection, id }) => {
+const getDocument: Adapter.getDocument = async ({ collection, id }) => {
   const document = await firestore.collection(collection.name).doc(id).get()
   if (!document.exists) return undefined
-  const documentReference: databaseT.DocumentReference<typeof collection> = {
+  const documentReference: DocumentReference<typeof collection> = {
     collection,
     id
   }
-  const documentSnapshot: databaseT.DocumentSnapshot<typeof collection> = {
+  const documentSnapshot: DocumentSnapshot<typeof collection> = {
     reference: documentReference,
-    data: document.data() as databaseT.Document<typeof collection>
+    data: document.data() as Document<typeof collection>
   }
   return documentSnapshot
 }
 
-const updateDocument: databaseT.updateDocument = async (reference, document) => {
+const updateDocument: Adapter.updateDocument = async (reference, document) => {
   await firestore.collection(reference.collection.name).doc(reference.id).update(document)
   return {
     reference,
     data: document
-  } satisfies databaseT.UpdateSnapshot<typeof reference.collection>
+  } satisfies UpdateSnapshot<typeof reference.collection>
 }
 
-const deleteDocument: databaseT.deleteDocument = async (reference) => {
+const deleteDocument: Adapter.deleteDocument = async (reference) => {
   await firestore.collection(reference.collection.name).doc(reference.id).delete()
 }
 

package/src/services/deployment/cloudFunction.js

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

package/src/services/deployment/deploy.ts

@@ -0,0 +1,74 @@
+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({
+  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)
+
+  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)
+      })
+    }
+  }
+}
+
+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
+  })
+  const file = uploadResponse[0]
+  return file.cloudStorageURI.toString()
+}
+
+async function deployFunction (name: string, source: string): Promise<void> {
+  const location = functionsClient.locationPath(projectId, region)
+  const [response] = await functionsClient.createFunction({
+    location,
+    function: {
+      name,
+      sourceUploadUrl: source,
+      entryPoint: 'handler',
+      runtime: 'nodejs20',
+      httpsTrigger: {},
+      environmentVariables: {
+        NODE_ENV: 'production'
+      }
+    }
+  }, {})
+  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)
+}

package/src/services/deployment/index.ts

@@ -0,0 +1,13 @@
+import type { Adapter } from '@genoacms/cloudabstraction/deployment'
+
+const svelteKitAdapter: Adapter.svelteKitAdapter = '@sveltejs/adapter-node'
+
+const deployProcedure: Adapter.deployProcedure = async () => {
+  const deploy = (await import('./deploy.js')).default
+  await deploy()
+}
+
+export {
+  svelteKitAdapter,
+  deployProcedure
+}

package/src/services/storage/index.ts

@@ -1,21 +1,11 @@
 import type {
-  StorageObject,
-  Adapter
+  Adapter,
+  StorageObject
 } from '@genoacms/cloudabstraction/storage'
-import { type Bucket, Storage, type File } from '@google-cloud/storage'
-import config from '../../config.js'
+import { type File } from '@google-cloud/storage'
+import { getBucket } from './storage.js'
 
-const storage = new Storage({
-  credentials: config.storage.credentials
-})
-
-const getBucket = (name: string): Bucket => {
-  if (!config.storage.buckets.includes(name)) throw new Error('bucket-unregistered')
-  const bucket = storage.bucket(name)
-  return bucket
-}
-
-const getObject: Adapter['getObject'] = async ({ bucket, name }) => {
+const getObject: Adapter.getObject = async ({ bucket, name }) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(name)
 
@@ -24,13 +14,13 @@ const getObject: Adapter['getObject'] = async ({ bucket, name }) => {
   }
 }
 
-const getPublicURL: Adapter['getPublicURL'] = async ({ bucket, name }) => {
+const getPublicURL: Adapter.getPublicURL = async ({ bucket, name }) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(name)
   return file.publicUrl()
 }
 
-const getSignedURL: Adapter['getSignedURL'] = async ({ bucket, name }) => {
+const getSignedURL: Adapter.getSignedURL = async ({ bucket, name }) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(name)
   const expires = new Date()
@@ -42,19 +32,19 @@ const getSignedURL: Adapter['getSignedURL'] = async ({ bucket, name }) => {
   return url
 }
 
-const uploadObject: Adapter['uploadObject'] = async ({ bucket, name }, stream) => {
+const uploadObject: Adapter.uploadObject = async ({ bucket, name }, stream, options) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(name)
-  await file.save(stream)
+  await file.save(stream, options)
 }
 
-const deleteObject: Adapter['deleteObject'] = async ({ bucket, name }) => {
+const deleteObject: Adapter.deleteObject = async ({ bucket, name }) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(name)
   await file.delete()
 }
 
-const listDirectory: Adapter['listDirectory'] = async ({ bucket, name }, listingParams = {}) => {
+const listDirectory: Adapter.listDirectory = async ({ bucket, name }, listingParams = {}) => {
   const bucketInstance = getBucket(bucket)
   const options = {
     autoPaginate: false,
@@ -81,7 +71,7 @@ const listDirectory: Adapter['listDirectory'] = async ({ bucket, name }, listing
   }
 }
 
-const createDirectory: Adapter['createDirectory'] = async ({ bucket, name }) => {
+const createDirectory: Adapter.createDirectory = async ({ bucket, name }) => {
   const bucketInstance = getBucket(bucket)
   const file = bucketInstance.file(`${name}/.folderPlaceholder`)
   await file.save('')

package/src/services/storage/storage.ts

@@ -0,0 +1,16 @@
+import config from '../../config.js'
+import { type Bucket, Storage } from '@google-cloud/storage'
+
+const storage = new Storage({
+  credentials: config.storage.credentials
+})
+
+const getBucket = (name: string): Bucket => {
+  if (!config.storage.buckets.includes(name)) throw new Error('bucket-unregistered')
+  const bucket = storage.bucket(name)
+  return bucket
+}
+
+export {
+  getBucket
+}