@pi-r/gcp 0.3.1 → 0.6.0

package/client/index.js

@@ -63,7 +63,7 @@ async function hasBucket(client) {
     const [exists] = await client.exists().catch(err => isErrorConflict(err) ? [true] : [false]);
     return exists;
 }
-function updatePredefinedAcl(acl, values, metadata = {}) {
+async function updatePredefinedAcl(acl, values, metadata = {}) {
     const items = [];
     let projectNumber;
     if ('projectNumber' in metadata || 'defaultObjectAcl' in metadata) {
@@ -102,7 +102,7 @@ function updatePredefinedAcl(acl, values, metadata = {}) {
     })
         .catch(err => [err]);
 }
-function setUniformBucketLevel(bucket, enabled) {
+async function setUniformBucketLevel(bucket, enabled) {
     return bucket.setMetadata({ iamConfiguration: { uniformBucketLevelAccess: { enabled } } });
 }
 const getFirebasePackageName = (credential) => credential.apiKey && credential.authDomain ? 'firebase' : 'firebase-admin';
@@ -135,7 +135,7 @@ function createStorageClient(credential, bucket) {
             throw err;
         }
     }
-    credential.projectId || (credential.projectId = getProjectId(credential));
+    getProjectId(credential);
     return new storage.Storage(credential);
 }
 exports.createStorageClient = createStorageClient;
@@ -150,7 +150,7 @@ function createDatabaseClient(credential, data) {
             packageName = getFirebasePackageName(credential);
             return getApp(credential, true);
         }
-        credential.projectId || (credential.projectId = getProjectId(credential));
+        getProjectId(credential);
         if (data) {
             if (product === 'spanner' || !product && name && data.database) {
                 const { Spanner } = require(packageName = '@google-cloud/spanner');
@@ -263,9 +263,9 @@ async function setBucketPolicy(credential, bucket, options, service = 'gcp') {
     return true;
 }
 exports.setBucketPolicy = setBucketPolicy;
-function setBucketWebsite(credential, bucket, options, service = 'gcp') {
+async function setBucketWebsite(credential, bucket, options, service = 'gcp') {
     if (isFirebaseApp(credential, true, true)) {
-        return Promise.resolve(false);
+        return false;
     }
     const website = {};
     const { indexPage, errorPage } = options;
@@ -286,7 +286,7 @@ function setBucketWebsite(credential, bucket, options, service = 'gcp') {
     });
 }
 exports.setBucketWebsite = setBucketWebsite;
-function deleteObjects(credential, Bucket, service) {
+async function deleteObjects(credential, Bucket, service) {
     return deleteObjectsV2.call(this, credential, Bucket, true, service);
 }
 exports.deleteObjects = deleteObjects;
@@ -314,7 +314,7 @@ async function deleteObjectsV2(credential, bucket, recursive = true, service = '
             }
         })('');
         if (files.length) {
-            promise = Promise.allSettled(files.map(value => deleteObject(ref(instance, value))));
+            promise = Promise.allSettled(files.map(async (value) => deleteObject(ref(instance, value))));
         }
     }
     else {
@@ -327,7 +327,7 @@ async function deleteObjectsV2(credential, bucket, recursive = true, service = '
             try {
                 const result = await client.getFiles();
                 for (const { name } of result[0]) {
-                    if (name.indexOf('/') === -1) {
+                    if (!name.includes('/')) {
                         tasks.push(client.file(name).delete({ ignoreNotFound: true }).catch(err => this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Delete failed" /* ERR_CLOUD.DELETE_FAIL */, name], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false })));
                     }
                 }
@@ -411,11 +411,10 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         const renewCache = ignoreCache === 0;
         const cached = caching && ignoreCache !== true || ignoreCache === false || ignoreCache === 1 || renewCache;
         const getCache = (value) => {
-            if (ignoreCache === 1) {
-                return;
+            if (ignoreCache !== 1) {
+                cacheValue.renewCache = renewCache;
+                return this.getQueryResult(service, credential, value, cacheValue);
             }
-            cacheValue.renewCache = renewCache;
-            return this.getQueryResult(service, credential, value, cacheValue);
         };
         let rows, queryString = '';
         if (product === 'bigtable' || !product && name && table && !database) {
@@ -464,7 +463,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;
@@ -493,7 +492,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                             }
                             else {
                                 transaction.runUpdate(update)
-                                    .then(() => transaction.commit().then(() => resolve()).catch(error => reject(error)))
+                                    .then(async () => transaction.commit().then(() => resolve()).catch(error => reject(error)))
                                     .catch(error => reject(error));
                             }
                         });
@@ -581,13 +580,19 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 closeClient();
                 throw (0, util_1.formatError)(item, "Missing database query" /* ERR_DB.QUERY */);
             }
-            if (cached && (rows = getCache(queryString = Module.asString(keys || query, true) + Module.asString(item.options, true) + limit))) {
-                result[i] = rows;
-                continue;
+            if (cached) {
+                queryString = Module.asString(keys || query, true) + Module.asString(item.options, true) + limit;
+                if (!update && (rows = getCache(queryString))) {
+                    result[i] = rows;
+                    continue;
+                }
             }
             const db = createClient(item, 2 /* DB.DATASTORE */);
             if (keys) {
-                const items = !Array.isArray(keys) ? db.key(keys) : keys.map((key) => db.key(key));
+                const items = !Array.isArray(keys) || !Array.isArray(keys[0]) ? db.key(keys) : keys.map((key) => db.key(key));
+                if ((0, types_1.isPlainObject)(update)) {
+                    await db.save({ key: items, data: update });
+                }
                 rows = await db.get(items, item.options);
                 if (rows.length > limit) {
                     rows = rows.slice(0, limit);
@@ -595,23 +600,36 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
             else {
                 const task = db.createQuery(item.kind);
+                if ((0, types_1.isPlainObject)(update)) {
+                    await new Promise((resolve, reject) => {
+                        db.runQuery(task.select('__key__'), item.options).then(entities => {
+                            if ((0, types_1.isArray)(entities)) {
+                                const items = entities.map((entity) => db.key(entity[db.KEY]));
+                                db.save({ key: items, data: update }).then(() => resolve()).catch(err => reject(err));
+                            }
+                            else {
+                                resolve();
+                            }
+                        })
+                            .catch(err => reject(err));
+                    });
+                }
                 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)); // eslint-disable-line prefer-spread
-                            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)); // eslint-disable-line prefer-spread
+                                break;
+                        }
                     }
                 }
                 if (limit > 0) {
@@ -652,24 +670,23 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 }
                 let db = createClient(item, 3 /* DB.FIRESTORE */).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)); // eslint-disable-line prefer-spread
-                            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)); // eslint-disable-line prefer-spread
+                                break;
+                        }
                     }
                 }
                 if ((0, types_1.isArray)(orderBy)) {
@@ -777,7 +794,7 @@ async function setPredefinedAcl(target, value, bucket, pathname = '', metadata =
                     }
                     break;
                 default:
-                    return Promise.resolve();
+                    return;
             }
         }
     }
@@ -821,18 +838,25 @@ function createBucketRequest(credential) {
 }
 exports.createBucketRequest = createBucketRequest;
 function getProjectId(credential) {
-    try {
-        let pathname = credential.keyFilename || credential.keyFile;
-        if (pathname && Module.isPath(pathname = path.resolve(pathname)) || (pathname = process.env.GOOGLE_APPLICATION_CREDENTIALS) && Module.isPath(pathname = path.resolve(pathname))) {
-            const projectId = require(pathname).project_id;
-            if ((0, types_1.isString)(projectId)) {
-                return projectId;
+    let pathname = credential.keyFilename || credential.keyFile;
+    if (pathname && Module.isPath(pathname = path.resolve(pathname)) || (pathname = process.env.GOOGLE_APPLICATION_CREDENTIALS) && Module.isPath(pathname = path.resolve(pathname))) {
+        if (credential.keyFilename) {
+            credential.keyFilename = pathname;
+        }
+        else {
+            credential.keyFile = pathname;
+        }
+        if (!credential.projectId) {
+            try {
+                const projectId = require(pathname).project_id;
+                if ((0, types_1.isString)(projectId)) {
+                    credential.projectId = projectId;
+                }
+            }
+            catch {
             }
         }
     }
-    catch {
-    }
-    return '';
 }
 exports.getProjectId = getProjectId;
 exports.CLOUD_UPLOAD_FROMDISK = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/gcp",
-  "version": "0.3.1",
+  "version": "0.6.0",
   "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.0",
-    "@e-mc/module": "^0.6.0",
-    "@e-mc/types": "^0.6.0",
-    "@google-cloud/firestore": "^6.8.0",
+    "@e-mc/cloud": "^0.8.0",
+    "@e-mc/module": "^0.8.0",
+    "@e-mc/types": "^0.8.0",
+    "@google-cloud/firestore": "^7.1.0",
     "@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, 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 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /* VAL_CLOUD.CONFIGURE_BUCKET */ + ' (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" /* STRINGS.BASE_URL */, 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);