@pi-r/gcp 0.3.2 → 0.5.2

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Studio Trigger
+Copyright 2023 Wit Studio
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -1,6 +1,6 @@
 # @pi-r/gcp
 
-PEP 402 - Forever Aina
+PEP 402 - Forever Vivy
 
 ## LICENSE
 

package/client/index.js

@@ -464,7 +464,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
             const { updateType, options = {} } = item;
             if (cached) {
-                queryString = name + '_' + database + '_' + (table ? table + Module.asString(columns, true) : '') + Module.asString(query, true) + limit;
+                queryString = name + '_' + database + '_' + (table ? table + (columns ? Module.asString(columns, true) : '') : '') + Module.asString(query, true) + limit;
                 if (!update && (rows = getCache(queryString))) {
                     result[i] = rows;
                     continue;
@@ -596,22 +596,21 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             else {
                 const task = db.createQuery(item.kind);
                 for (const args of query) {
-                    if (!(0, types_1.isArray)(args)) {
-                        continue;
-                    }
-                    const method = args[0];
-                    switch (method) {
-                        case 'end':
-                        case 'filter':
-                        case 'groupBy':
-                        case 'hasAncestor':
-                        case 'limit':
-                        case 'offset':
-                        case 'order':
-                        case 'select':
-                        case 'start':
-                            task[method].apply(task, args.slice(1));
-                            break;
+                    if ((0, types_1.isArray)(args)) {
+                        const method = args[0];
+                        switch (method) {
+                            case 'end':
+                            case 'filter':
+                            case 'groupBy':
+                            case 'hasAncestor':
+                            case 'limit':
+                            case 'offset':
+                            case 'order':
+                            case 'select':
+                            case 'start':
+                                task[method].apply(task, args.slice(1));
+                                break;
+                        }
                     }
                 }
                 if (limit > 0) {
@@ -652,24 +651,23 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 }
                 let db = createClient(item, 3).collection(table);
                 for (const args of query) {
-                    if (!(0, types_1.isArray)(args)) {
-                        continue;
-                    }
-                    const method = args[0];
-                    switch (method) {
-                        case 'endAt':
-                        case 'endBefore':
-                        case 'limit':
-                        case 'limitToLast':
-                        case 'offset':
-                        case 'orderBy':
-                        case 'select':
-                        case 'startAfter':
-                        case 'startAt':
-                        case 'where':
-                        case 'withConverter':
-                            db = db[method].apply(db, args.slice(1));
-                            break;
+                    if ((0, types_1.isArray)(args)) {
+                        const method = args[0];
+                        switch (method) {
+                            case 'endAt':
+                            case 'endBefore':
+                            case 'limit':
+                            case 'limitToLast':
+                            case 'offset':
+                            case 'orderBy':
+                            case 'select':
+                            case 'startAfter':
+                            case 'startAt':
+                            case 'where':
+                            case 'withConverter':
+                                db = db[method].apply(db, args.slice(1));
+                                break;
+                        }
                     }
                 }
                 if ((0, types_1.isArray)(orderBy)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/gcp",
-  "version": "0.3.2",
+  "version": "0.5.2",
   "description": "Google (GCP) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,10 +20,10 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.6.1",
-    "@e-mc/module": "^0.6.1",
-    "@e-mc/types": "^0.6.1",
-    "@google-cloud/firestore": "^6.8.0",
+    "@e-mc/cloud": "^0.7.2",
+    "@e-mc/module": "^0.7.2",
+    "@e-mc/types": "^0.7.2",
+    "@google-cloud/firestore": "^7.3.1",
     "@google-cloud/storage": "^7.7.0"
   }
 }

package/upload/index.js

@@ -27,6 +27,7 @@ function upload(credential, service = 'gcp') {
             }
             callback(err, url);
         };
+        const addLog = (err) => err instanceof Error && this.addLog(this.statusType.WARN, err.message, service + ': ' + bucket);
         if (firebase) {
             const { ref, listAll } = require('@firebase/storage');
             bucketClient = ref(storage, bucket);
@@ -41,9 +42,10 @@ function upload(credential, service = 'gcp') {
             }
         }
         else {
+            const configBucket = admin.configBucket;
             if (!BUCKET_SESSION.has(bucket)) {
                 const bucketAcl = admin.publicRead ? 'publicRead' : admin.acl;
-                const response = BUCKET_RESPONSE[_a = bucketKey = getBucketKey(credential, bucket, bucketAcl)] || (BUCKET_RESPONSE[_a] = client_1.createBucketV2.call(this, credential, bucket, bucketAcl, admin.configBucket?.create || (0, client_1.createBucketRequest)(credential)));
+                const response = BUCKET_RESPONSE[_a = bucketKey = getBucketKey(credential, bucket, bucketAcl)] || (BUCKET_RESPONSE[_a] = client_1.createBucketV2.call(this, credential, bucket, bucketAcl, configBucket?.create || (0, client_1.createBucketRequest)(credential)));
                 if (!await response) {
                     uploadResponse(null);
                     return;
@@ -51,6 +53,14 @@ function upload(credential, service = 'gcp') {
                 BUCKET_SESSION.add(bucket);
             }
             bucketClient = storage.bucket(bucket);
+            const retentionPolicy = configBucket?.retentionPolicy;
+            if (typeof retentionPolicy === 'number') {
+                bucketClient.setRetentionPeriod(retentionPolicy)
+                    .then(([response]) => {
+                    this.formatMessage(64, service, ["Bucket configured" + ' (retention policy)', bucket], response.retentionPolicy?.effectiveTime, { ...Cloud.LOG_CLOUD_COMMAND });
+                })
+                    .catch(err => addLog(err));
+            }
         }
         if (!overwrite && (!listFiles || listFiles.length)) {
             const current = filename;
@@ -79,7 +89,6 @@ function upload(credential, service = 'gcp') {
         const Body = [data.buffer];
         const ContentType = [contentType];
         const getURL = (value) => endpoint ? Module.joinPath(endpoint, value) : Module.joinPath("https://storage.googleapis.com", bucket, value);
-        const addLog = (err) => err instanceof Error && this.addLog(this.statusType.WARN, err.message, service + ': ' + bucket);
         if (fileGroup) {
             for (const [content, ext, localFile] of fileGroup) {
                 Key.push(ext === '.map' && localFile ? path.basename(localFile) : filename + ext);