@pi-r/gcp 0.7.3 → 0.8.0

package/client/index.js

@@ -1,11 +1,29 @@
 "use strict";
-exports.CLOUD_DOWNLOAD_CHUNK = exports.CLOUD_UPLOAD_CHUNK = exports.CLOUD_UPLOAD_STREAM = exports.getProjectId = exports.createBucketRequest = exports.setPredefinedAcl = exports.setPublicRead = exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketTagging = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.createDatabaseClient = exports.createStorageClient = exports.validateDatabase = exports.validateStorage = exports.isFirebaseApp = void 0;
+exports.CLOUD_DOWNLOAD_CHUNK = exports.CLOUD_UPLOAD_CHUNK = exports.CLOUD_UPLOAD_STREAM = void 0;
+exports.isFirebaseApp = isFirebaseApp;
+exports.validateStorage = validateStorage;
+exports.validateDatabase = validateDatabase;
+exports.createStorageClient = createStorageClient;
+exports.createDatabaseClient = createDatabaseClient;
+exports.createBucket = createBucket;
+exports.createBucketV2 = createBucketV2;
+exports.setBucketPolicy = setBucketPolicy;
+exports.setBucketTagging = setBucketTagging;
+exports.setBucketWebsite = setBucketWebsite;
+exports.deleteObjects = deleteObjects;
+exports.deleteObjectsV2 = deleteObjectsV2;
+exports.executeQuery = executeQuery;
+exports.executeBatchQuery = executeBatchQuery;
+exports.setPublicRead = setPublicRead;
+exports.setPredefinedAcl = setPredefinedAcl;
+exports.createBucketRequest = createBucketRequest;
+exports.getProjectId = getProjectId;
 const path = require("path");
-const storage = require("@google-cloud/storage");
 const firestore_1 = require("@google-cloud/firestore");
+const storage_1 = require("@google-cloud/storage");
+const Cloud = require("@e-mc/cloud");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
-const Cloud = require("@e-mc/cloud");
 const FIREBASE_DB = {};
 const FIREBASE_STORAGE = {};
 const ADMIN_DB = {};
@@ -109,15 +127,12 @@ const hasGoogleAuth = (credential) => (0, types_1.isString)(credential.keyFilena
 function isFirebaseApp(credential, store, admin) {
     return !!(credential.apiKey && credential.authDomain && (store || credential.databaseURL) || credential.product === "firebase" && process.env.GOOGLE_APPLICATION_CREDENTIALS) && (!admin || !credential.admin);
 }
-exports.isFirebaseApp = isFirebaseApp;
 function validateStorage(credential) {
     return hasGoogleAuth(credential) || isFirebaseApp(credential, true);
 }
-exports.validateStorage = validateStorage;
 function validateDatabase(credential, data) {
     return hasGoogleAuth(credential) && !!(data.product || data.database || data.table || data.query || data.id || data.keys || data.kind || data.options?.query) || isFirebaseApp(credential);
 }
-exports.validateDatabase = validateDatabase;
 function createStorageClient(credential, bucket) {
     if (isFirebaseApp(credential, true)) {
         let packageName = '';
@@ -134,9 +149,8 @@ function createStorageClient(credential, bucket) {
         }
     }
     getProjectId(credential, false);
-    return new storage.Storage(credential);
+    return new storage_1.Storage(credential);
 }
-exports.createStorageClient = createStorageClient;
 function createDatabaseClient(credential, data) {
     let packageName = '';
     try {
@@ -171,11 +185,9 @@ function createDatabaseClient(credential, data) {
     }
     return new firestore_1.Firestore(credential);
 }
-exports.createDatabaseClient = createDatabaseClient;
 async function createBucket(credential, bucket, publicRead, service = 'gcp') {
     return createBucketV2.call(this, credential, bucket, publicRead ? 'publicRead' : undefined, createBucketRequest(credential), service);
 }
-exports.createBucket = createBucket;
 async function createBucketV2(credential, bucket, acl, options, service = 'gcp') {
     if (isFirebaseApp(credential, true, true)) {
         return false;
@@ -203,7 +215,6 @@ async function createBucketV2(credential, bucket, acl, options, service = 'gcp')
         return false;
     });
 }
-exports.createBucketV2 = createBucketV2;
 async function setBucketPolicy(credential, bucket, options, service = 'gcp') {
     if (isFirebaseApp(credential, true, true)) {
         return false;
@@ -247,17 +258,16 @@ async function setBucketPolicy(credential, bucket, options, service = 'gcp') {
                 break;
         }
     }
-    if (options.acl && (options.acl = options.acl.filter(user => (0, types_1.isString)(user.entity))).length) {
+    if (options.acl && (options.acl = options.acl.filter(user => (0, types_1.isString)(user.entity))).length > 0) {
         errors.push(...await updatePredefinedAcl(client.acl, options.acl, options.metadata));
     }
-    if (errors.length) {
+    if (errors.length > 0) {
         this.formatFail(64, service, ["Unable to update bucket policy", bucket], errors[0], { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
         return false;
     }
     this.formatMessage(64, service, ["Bucket ACL configured", bucket], (0, types_1.isString)(acl) ? acl : '', { ...Cloud.LOG_CLOUD_COMMAND });
     return true;
 }
-exports.setBucketPolicy = setBucketPolicy;
 async function setBucketTagging(credential, bucket, labels, service = 'gcp') {
     if (isFirebaseApp(credential, true, true) || !(0, types_1.isPlainObject)(labels)) {
         return false;
@@ -284,7 +294,6 @@ async function setBucketTagging(credential, bucket, labels, service = 'gcp') {
         return false;
     });
 }
-exports.setBucketTagging = setBucketTagging;
 async function setBucketWebsite(credential, bucket, options, service = 'gcp') {
     if (isFirebaseApp(credential, true, true)) {
         return false;
@@ -307,11 +316,9 @@ async function setBucketWebsite(credential, bucket, options, service = 'gcp') {
         return false;
     });
 }
-exports.setBucketWebsite = setBucketWebsite;
 async function deleteObjects(credential, Bucket, service) {
     return deleteObjectsV2.call(this, credential, Bucket, true, service);
 }
-exports.deleteObjects = deleteObjects;
 async function deleteObjectsV2(credential, bucket, recursive = true, service = 'gcp') {
     const instance = createStorageClient.call(this, credential, bucket);
     const errors = [];
@@ -322,10 +329,10 @@ async function deleteObjectsV2(credential, bucket, recursive = true, service = '
         await (async function recurse(prefix) {
             try {
                 const { items, prefixes } = await listAll(ref(instance, prefix));
-                if (items.length) {
+                if (items.length > 0) {
                     files.push(...items.map(value => value.fullPath));
                 }
-                if (recursive && prefixes.length) {
+                if (recursive && prefixes.length > 0) {
                     for (const { name } of prefixes) {
                         await recurse(Cloud.joinPath(prefix, name));
                     }
@@ -335,7 +342,7 @@ async function deleteObjectsV2(credential, bucket, recursive = true, service = '
                 errors.push(err);
             }
         })('');
-        if (files.length) {
+        if (files.length > 0) {
             promise = Promise.allSettled(files.map(async (value) => deleteObject(ref(instance, value))));
         }
     }
@@ -343,27 +350,31 @@ async function deleteObjectsV2(credential, bucket, recursive = true, service = '
         const client = instance.bucket(bucket);
         if (await hasBucket(client)) {
             if (recursive) {
-                return client.deleteFiles({ force: true }).then(() => this.formatMessage(64, service, "Bucket emptied" + ' (recursive)', bucket, { ...Cloud.LOG_CLOUD_COMMAND }));
+                return client.deleteFiles({ force: true }).then(() => {
+                    this.formatMessage(64, service, "Bucket emptied" + ' (recursive)', bucket, { ...Cloud.LOG_CLOUD_COMMAND });
+                });
             }
             const tasks = [];
             try {
                 const result = await client.getFiles();
                 for (const { name } of result[0]) {
                     if (!name.includes('/')) {
-                        tasks.push(client.file(name).delete({ ignoreNotFound: true }).catch((err) => this.formatFail(64, service, ["Delete failed", name], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false })));
+                        tasks.push(client.file(name).delete({ ignoreNotFound: true }).catch((err) => {
+                            this.formatFail(64, service, ["Delete failed", name], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+                        }));
                     }
                 }
             }
             catch (err) {
                 errors.push(err);
             }
-            if (tasks.length) {
+            if (tasks.length > 0) {
                 promise = Promise.allSettled(tasks);
             }
         }
     }
     const checkErrors = () => {
-        if (errors.length) {
+        if (errors.length > 0) {
             this.formatFail(64, service, ["Unable to empty bucket" + (recursive ? ' (recursive)' : ''), errors.length + ' errors'], errors[0], { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
             return true;
         }
@@ -383,11 +394,9 @@ async function deleteObjectsV2(credential, bucket, recursive = true, service = '
     }
     checkErrors();
 }
-exports.deleteObjectsV2 = deleteObjectsV2;
 async function executeQuery(credential, data, sessionKey) {
     return (await executeBatchQuery.call(this, credential, [data], sessionKey))[0] || [];
 }
-exports.executeQuery = executeQuery;
 async function executeBatchQuery(credential, batch, sessionKey) {
     const length = batch.length;
     const result = new Array(length);
@@ -407,8 +416,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     const closeClient = () => {
         const fs = clients[3];
         if (fs) {
-            fs.terminate();
-            return;
+            void fs.terminate();
         }
         const sp = clients[5];
         if (sp) {
@@ -438,12 +446,6 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         const item = batch[i];
         const { service, product, name, database, table, id, query, limit = 0, update, ignoreCache } = item;
         const useCache = caching && ignoreCache !== true;
-        const getCache = (value) => {
-            if (ignoreCache !== 1) {
-                cacheValue.renewCache = ignoreCache === 0;
-                return this.getQueryResult(service, credential, value, cacheValue);
-            }
-        };
         cacheValue.exclusiveOf = Array.isArray(ignoreCache) ? ignoreCache : undefined;
         let rows, queryString = '';
         if (product === "firebase" || isFirebaseApp(credential)) {
@@ -454,7 +456,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             const orderBy = item.orderBy;
             if (useCache) {
                 queryString = query + Cloud.asString(orderBy, true);
-                if (!update && (rows = getCache(queryString))) {
+                if (!update && (rows = this.getCacheResult(service, credential, queryString, cacheValue, ignoreCache))) {
                     result[i] = rows;
                     continue;
                 }
@@ -495,7 +497,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             if ((0, types_1.isPlainObject)(update)) {
                 await updateDB(ref(db, query), update);
             }
-            const snapshot = await (constraints.length ? get(queryDB(ref(db, query), ...constraints)) : get(child(ref(db), query)));
+            const snapshot = await (constraints.length > 0 ? get(queryDB(ref(db, query), ...constraints)) : get(child(ref(db), query)));
             if (snapshot.exists()) {
                 const val = snapshot.val();
                 const group = limiter === 1 && Object.keys(val);
@@ -514,8 +516,8 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
             const { updateType, options = {} } = item;
             if (useCache) {
-                queryString = name + '_' + database + (table ? '_' + table + (columns ? Cloud.asString(columns, true) : '') : '') + '_' + Cloud.asString(query, true) + (limit > 0 ? limit : '');
-                if (!update && (rows = getCache(queryString))) {
+                queryString = name + '_' + database + (table ? '_' + table + (columns ? Cloud.asString(columns, true) : '') : '') + '_' + Cloud.asString(query, true) + (limit > 0 ? '_' + limit : '');
+                if (!update && (rows = this.getCacheResult(service, credential, queryString, cacheValue, ignoreCache))) {
                     result[i] = rows;
                     continue;
                 }
@@ -547,10 +549,16 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                                 transaction.runUpdate(update)
                                     .then(async () => {
                                     transaction.commit()
-                                        .then(() => resolve())
-                                        .catch((error) => reject(error));
+                                        .then(() => {
+                                        resolve();
+                                    })
+                                        .catch((error) => {
+                                        reject(error);
+                                    });
                                 })
-                                    .catch((error) => reject(error));
+                                    .catch((error) => {
+                                    reject(error);
+                                });
                             }
                         });
                     });
@@ -577,7 +585,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
             if (useCache) {
                 queryString = name + '_' + table + ((0, types_1.isString)(id) ? '_' + id + ((0, types_1.isArray)(columns) ? '_' + Cloud.asString(columns, true) : '') : '') + Cloud.asString(options, true);
-                if (!(update && id) && (rows = getCache(queryString))) {
+                if (!(update && id) && (rows = this.getCacheResult(service, credential, queryString, cacheValue, ignoreCache))) {
                     result[i] = rows;
                     continue;
                 }
@@ -612,6 +620,10 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             if ((0, types_1.isString)(query)) {
                 options.query = query;
             }
+            else if (!options.query) {
+                closeClient();
+                throw (0, util_1.formatError)(item, "Missing database query");
+            }
             if ((0, types_1.isObject)(params)) {
                 options.params = params;
             }
@@ -619,14 +631,13 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 options.maxResults = limit;
             }
             if (useCache) {
-                queryString = query + (database ? '_' + database + (table ? '_' + table : '') : '') + Cloud.asString(options, true);
-                if (!update && (rows = getCache(queryString))) {
+                queryString = (database ? database + '_' + (table ? table + '_' : '') : '') + Cloud.asString(options, true);
+                if (!update && (rows = this.getCacheResult(service, credential, queryString, cacheValue, ignoreCache))) {
                     result[i] = rows;
                     continue;
                 }
             }
             const instance = createClient(item, 1);
-            let job;
             if (database) {
                 const dataset = instance.dataset(database);
                 let target = dataset;
@@ -639,12 +650,12 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                     metadata.view = update;
                     await target.setMetadata(metadata);
                 }
-                [job] = await dataset.createQueryJob(options);
+                const job = (await dataset.createQueryJob(options))[0];
+                [rows] = await job.getQueryResults();
             }
             else {
-                [job] = await instance.createQueryJob(options);
+                [rows] = await instance.query(options);
             }
-            [rows] = await job.getQueryResults();
         }
         else if (product === "datastore" || !product && (item.keys || item.kind || query && !table && !id)) {
             const { keys, kind, options } = item;
@@ -654,7 +665,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
             if (useCache) {
                 queryString = (keys ? Cloud.asString(keys, true) : (kind ? (name ? '_' + name : '') + '_' + Cloud.asString(kind, true) : '') + '_' + Cloud.asString(query, true)) + (limit > 0 ? '_' + limit : 0) + (options ? Cloud.asString(options, true) : '');
-                if (!update && (rows = getCache(queryString))) {
+                if (!update && (rows = this.getCacheResult(service, credential, queryString, cacheValue, ignoreCache))) {
                     result[i] = rows;
                     continue;
                 }
@@ -702,13 +713,19 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                         db.runQuery(task.select('__key__'), 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));
+                                db.save({ key: items, data: update }).then(() => {
+                                    resolve();
+                                }).catch((err) => {
+                                    reject(err);
+                                });
                             }
                             else {
                                 resolve();
                             }
                         })
-                            .catch((err) => reject(err));
+                            .catch((err) => {
+                            reject(err);
+                        });
                     });
                 }
                 [rows] = await db.runQuery(task, options);
@@ -723,7 +740,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 const options = Array.isArray(id) ? item.options : null;
                 if (useCache) {
                     queryString = table + '_' + id + (options ? Cloud.asString(options, true) : '');
-                    if ((!update || Array.isArray(id)) && (rows = getCache(queryString))) {
+                    if ((!update || Array.isArray(id)) && (rows = this.getCacheResult(service, credential, queryString, cacheValue, ignoreCache))) {
                         result[i] = rows;
                         continue;
                     }
@@ -739,7 +756,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 else {
                     const doc = db.collection(table).doc(id);
                     if ((0, types_1.isPlainObject)(update)) {
-                        const pattern = /^__(delete|serverTimestamp|increment)(?:<(.+)>)?__$/;
+                        const pattern = /^__(delete|serverTimestamp|increment|vector|(?:array)(?:Union|Remove))(?:<(.+)>)?__$/s;
                         for (const attr in update) {
                             const match = pattern.exec(attr);
                             if (match) {
@@ -752,6 +769,41 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                                     case 'increment':
                                         update[attr] = firestore_1.FieldValue.increment(match[2] ? +match[2] : 1);
                                         break;
+                                    case 'vector':
+                                        if (match[2]) {
+                                            update[attr] = firestore_1.FieldValue.vector(match[2].split(',').map(unit => parseFloat(unit)));
+                                        }
+                                        break;
+                                    case 'arrayUnion':
+                                    case 'arrayRemove':
+                                        if (match[2]) {
+                                            update[attr] = firestore_1.FieldValue[method](...match[2].trim().split(/(?<!\\)\s*,\s*/).map(unit => {
+                                                switch (unit) {
+                                                    case 'true':
+                                                        return true;
+                                                    case 'false':
+                                                        return false;
+                                                    case 'undefined':
+                                                        return undefined;
+                                                    case 'null':
+                                                        return null;
+                                                }
+                                                if (isNaN(+unit)) {
+                                                    return +unit;
+                                                }
+                                                const a = unit[0];
+                                                const b = unit[unit.length - 1];
+                                                if (a === '[' && b === ']' || a === '{' && b === '}') {
+                                                    try {
+                                                        return JSON.parse(unit.replace(/\\,/g, ','));
+                                                    }
+                                                    catch {
+                                                    }
+                                                }
+                                                return unit;
+                                            }));
+                                        }
+                                        break;
                                 }
                             }
                         }
@@ -775,61 +827,76 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 }
             }
             else if (Array.isArray(query)) {
-                const orderBy = item.orderBy;
-                if (useCache && (rows = getCache(queryString = table + '_' + Cloud.asString(query, true) + '_' + Cloud.asString(orderBy, true) + (limit > 0 ? '_' + limit : '')))) {
-                    result[i] = rows;
-                    continue;
-                }
-                let db = createClient(item, 3).collection(table);
-                for (const args of query) {
-                    if ((0, types_1.isArray)(args)) {
-                        const method = args[0];
-                        const params = args.slice(1);
-                        switch (method) {
-                            case 'whereAnd':
-                            case 'whereOr':
-                                if (!params.every(p => (0, types_1.isArray)(p))) {
-                                    throw (0, types_1.errorMessage)(method, 'Conditionals are not in array format', Cloud.asString(params));
-                                }
-                                db = db.where(firestore_1.Filter[method === 'whereAnd' ? 'and' : 'or'](...params.map((p) => firestore_1.Filter.where(p[0], p[1], p[2]))));
-                                break;
-                            case 'where':
-                            case 'orderBy':
-                                params[0] = asFieldPath(params[0]);
-                                db = db[method].apply(db, params);
-                            case 'select':
-                                params.forEach((field, index) => {
-                                    params[index] = asFieldPath(field);
-                                });
-                                db = db.select.apply(db, params);
-                                break;
-                            case 'endAt':
-                            case 'endBefore':
-                            case 'limit':
-                            case 'limitToLast':
-                            case 'offset':
-                            case 'startAfter':
-                            case 'startAt':
-                            case 'withConverter':
-                                db = db[method].apply(db, params);
-                                break;
-                        }
+                const db = createClient(item, 3).collection(table);
+                if (item.params && query.every(value => typeof value === 'number')) {
+                    const options = item.options;
+                    if (useCache && (rows = this.getCacheResult(service, credential, queryString = table + '_' + Cloud.asString(item.params, true) + '_' + Cloud.asString(query, true) + (options ? Cloud.asString(options, true) : ''), cacheValue, ignoreCache))) {
+                        result[i] = rows;
+                        continue;
                     }
+                    rows = (await db.findNearest(asFieldPath(item.params), firestore_1.FieldValue.vector(query), options).get()).docs.map(doc => doc.data());
                 }
-                if (Array.isArray(orderBy)) {
-                    for (const order of orderBy) {
-                        if ((0, types_1.isArray)(order)) {
-                            db = db.orderBy(asFieldPath(order[0]), order[1]);
+                else {
+                    const orderBy = item.orderBy;
+                    if (useCache && (rows = this.getCacheResult(service, credential, queryString = table + '_' + Cloud.asString(query, true) + '_' + Cloud.asString(orderBy, true) + (limit > 0 ? '_' + limit : ''), cacheValue, ignoreCache))) {
+                        result[i] = rows;
+                        continue;
+                    }
+                    let target = db;
+                    for (const args of query) {
+                        if ((0, types_1.isArray)(args)) {
+                            const method = args[0];
+                            const params = args.slice(1);
+                            switch (method) {
+                                case 'whereAnd':
+                                case 'whereOr':
+                                    if (!params.every(p => (0, types_1.isArray)(p))) {
+                                        throw (0, types_1.errorMessage)(method, 'Conditionals are not in array format', Cloud.asString(params));
+                                    }
+                                    target = target.where(firestore_1.Filter[method === 'whereAnd' ? 'and' : 'or'](...params.map((p) => firestore_1.Filter.where(p[0], p[1], p[2]))));
+                                    break;
+                                case 'findNearest':
+                                    params[0] = asFieldPath(params[0]);
+                                    target = target.findNearest.apply(target, params).query;
+                                    break;
+                                case 'where':
+                                case 'orderBy':
+                                    params[0] = asFieldPath(params[0]);
+                                    target = target[method].apply(target, params);
+                                case 'select':
+                                    params.forEach((field, index) => {
+                                        params[index] = asFieldPath(field);
+                                    });
+                                    target = target.select.apply(target, params);
+                                    break;
+                                case 'endAt':
+                                case 'endBefore':
+                                case 'limit':
+                                case 'limitToLast':
+                                case 'offset':
+                                case 'startAfter':
+                                case 'startAt':
+                                case 'withConverter':
+                                    target = target[method].apply(target, params);
+                                    break;
+                            }
                         }
-                        else if ((0, types_1.isString)(order)) {
-                            db = db.orderBy(order);
+                    }
+                    if (Array.isArray(orderBy)) {
+                        for (const order of orderBy) {
+                            if ((0, types_1.isArray)(order)) {
+                                target = target.orderBy(asFieldPath(order[0]), order[1]);
+                            }
+                            else if ((0, types_1.isString)(order)) {
+                                target = target.orderBy(order);
+                            }
                         }
                     }
+                    if (limit > 0) {
+                        target = target.limit(limit);
+                    }
+                    rows = (await target.get()).docs.map(doc => doc.data());
                 }
-                if (limit > 0) {
-                    db = db.limit(limit);
-                }
-                rows = (await db.get()).docs.map(doc => doc.data());
             }
             else {
                 closeClient();
@@ -845,7 +912,6 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     closeClient();
     return result;
 }
-exports.executeBatchQuery = executeBatchQuery;
 function setPublicRead(acl, pathname, requested, service = 'gcp') {
     acl.add({ entity: 'allUsers', role: 'READER' })
         .then(() => {
@@ -859,7 +925,6 @@ function setPublicRead(acl, pathname, requested, service = 'gcp') {
         }
     });
 }
-exports.setPublicRead = setPublicRead;
 async function setPredefinedAcl(target, value, bucket, pathname = '', metadata = {}, requested = true, service = 'gcp') {
     let revoke;
     if (metadata === true) {
@@ -929,7 +994,7 @@ async function setPredefinedAcl(target, value, bucket, pathname = '', metadata =
         }
     }
     return updatePredefinedAcl(target, items, metadata).then(errors => {
-        if (errors.length) {
+        if (errors.length > 0) {
             this.formatMessage(64, service, [`Unable to ${revoke ? 'revoke' : 'grant'} ` + value, bucket && pathname ? bucket.name + '/' + pathname : bucket ? bucket.name : pathname], errors[0], { ...Cloud.LOG_CLOUD_WARN });
         }
         else if (requested && (bucket || pathname)) {
@@ -937,36 +1002,58 @@ async function setPredefinedAcl(target, value, bucket, pathname = '', metadata =
         }
     });
 }
-exports.setPredefinedAcl = setPredefinedAcl;
 function createBucketRequest(credential) {
     const options = {};
     for (const attr in credential) {
         switch (attr) {
             case 'archive':
-            case 'autoclass':
             case 'coldline':
-            case 'cors':
-            case 'customPlacementConfig':
+            case 'dataLocations':
             case 'dra':
             case 'enableObjectRetention':
-            case 'location':
             case 'multiRegional':
             case 'nearline':
+            case 'predefinedAcl':
+            case 'predefinedDefaultObjectAcl':
+            case 'projection':
             case 'regional':
             case 'requesterPays':
+            case 'standard':
+            case 'userProject':
+            case 'acl':
+            case 'autoclass':
+            case 'billing':
+            case 'cors':
+            case 'customPlacementConfig':
+            case 'defaultEventBasedHold':
+            case 'defaultObjectAcl':
+            case 'encryption':
+            case 'hierarchicalNamespace':
+            case 'iamConfiguration':
+            case 'labels':
+            case 'lifecycle':
+            case 'location':
+            case 'locationType':
+            case 'logging':
+            case 'metageneration':
+            case 'name':
+            case 'objectRetention':
+            case 'owner':
+            case 'projectNumber':
             case 'retentionPolicy':
             case 'rpo':
-            case 'standard':
+            case 'softDeletePolicy':
             case 'storageClass':
-            case 'userProject':
+            case 'timeCreated':
+            case 'updated':
             case 'versioning':
+            case 'website':
                 options[attr] = credential[attr];
                 break;
         }
     }
     return options;
 }
-exports.createBucketRequest = createBucketRequest;
 function getProjectId(credential, cache) {
     let projectId = credential.projectId;
     if (!cache && projectId) {
@@ -994,7 +1081,6 @@ function getProjectId(credential, cache) {
     }
     return projectId;
 }
-exports.getProjectId = getProjectId;
 exports.CLOUD_UPLOAD_STREAM = true;
 exports.CLOUD_UPLOAD_CHUNK = true;
 exports.CLOUD_DOWNLOAD_CHUNK = true;

package/download/index.js

@@ -2,10 +2,11 @@
 const path = require("path");
 const fs = require("fs");
 const https = require("https");
+const storage_1 = require("@google-cloud/storage");
 const types_1 = require("@e-mc/types");
 const Cloud = require("@e-mc/cloud");
 const client_1 = require("@pi-r/gcp");
-module.exports = function download(credential, service = 'gcp') {
+function download(credential, service = 'gcp') {
     const storage = client_1.createStorageClient.call(this, credential);
     return (data, callback) => {
         const { bucket: Bucket, download: target } = data;
@@ -14,7 +15,9 @@ module.exports = function download(credential, service = 'gcp') {
         const downloadResponse = (err, url = null) => {
             callback(err, url);
             if (tempDir) {
-                queueMicrotask(() => Cloud.removeDir(tempDir));
+                queueMicrotask(() => {
+                    Cloud.removeDir(tempDir);
+                });
             }
         };
         if (!Bucket || !Key) {
@@ -27,25 +30,29 @@ module.exports = function download(credential, service = 'gcp') {
         }
         const location = Cloud.joinPath(Bucket, Key);
         const destination = path.join(tempDir, path.basename(target.filename || Key));
-        const deleteMessage = () => this.formatMessage(64, service, "Delete success", location, { ...Cloud.LOG_CLOUD_DELETE });
+        const deleteMessage = () => {
+            this.formatMessage(64, service, "Delete success", location, { ...Cloud.LOG_CLOUD_DELETE });
+        };
         if ((0, client_1.isFirebaseApp)(credential, true, true)) {
             const { ref, getDownloadURL, deleteObject } = require('@firebase/storage');
             const objectRef = ref(storage, Key);
-            getDownloadURL(objectRef).then(url => {
+            void getDownloadURL(objectRef).then(url => {
                 https.get(url, res => {
                     const statusCode = res.statusCode;
                     if (statusCode >= 200 && statusCode < 300) {
-                        res.on('error', err => downloadResponse(err));
+                        res.on('error', downloadResponse);
                         res.pipe(fs.createWriteStream(destination)
                             .on('finish', () => {
                             downloadResponse(null, destination);
                             if (target.deleteObject) {
                                 deleteObject(objectRef)
-                                    .then(() => deleteMessage())
-                                    .catch((err) => this.formatFail(64, service, ["Delete failed", location], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active }));
+                                    .then(deleteMessage)
+                                    .catch((err) => {
+                                    this.formatFail(64, service, ["Delete failed", location], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active });
+                                });
                             }
                         })
-                            .on('error', err => downloadResponse(err)));
+                            .on('error', downloadResponse));
                     }
                     else {
                         downloadResponse((0, types_1.errorMessage)(statusCode, 'Invalid HTTP request', location));
@@ -57,18 +64,8 @@ module.exports = function download(credential, service = 'gcp') {
         const { flags = 0 } = target;
         const bucket = storage.bucket(Bucket);
         const file = bucket.file(Key, { generation: target.versionId });
-        const chunkSize = flags & 4 ? (0, types_1.alignSize)(target.chunkSize, 1024) : 0;
-        let manager;
-        if (chunkSize > 0) {
-            const { TransferManager } = require('@google-cloud/storage');
-            let concurrencyLimit = target.chunkLimit;
-            if (!concurrencyLimit && target.options) {
-                ({ concurrencyLimit } = target.options);
-            }
-            manager = new TransferManager(bucket).downloadFileInChunks(file, { destination, chunkSizeBytes: chunkSize, concurrencyLimit });
-        }
-        (manager || file.download({ destination }))
-            .then(() => {
+        const chunkSizeBytes = flags & 4 ? (0, types_1.alignSize)(target.chunkSize, 1024) : 0;
+        const fileDownload = () => {
             downloadResponse(null, destination);
             const deleteObject = target.deleteObject;
             if (deleteObject) {
@@ -81,7 +78,27 @@ module.exports = function download(credential, service = 'gcp') {
                     }
                 });
             }
-        })
-            .catch((err) => downloadResponse(err));
+        };
+        if (chunkSizeBytes > 0) {
+            new storage_1.TransferManager(bucket).downloadFileInChunks(file, {
+                destination,
+                chunkSizeBytes,
+                concurrencyLimit: target.chunkLimit || target.options?.concurrencyLimit
+            })
+                .then(fileDownload)
+                .catch(downloadResponse);
+        }
+        else if (target.chunkLimit === 1 && !target.chunkSize) {
+            file.createReadStream()
+                .pipe(fs.createWriteStream(destination))
+                .on('finish', fileDownload)
+                .on('error', downloadResponse);
+        }
+        else {
+            file.download({ destination })
+                .then(fileDownload)
+                .catch(downloadResponse);
+        }
     };
-};
+}
+module.exports = download;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/gcp",
-  "version": "0.7.3",
+  "version": "0.8.0",
   "description": "Google (GCP) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,9 +20,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.9.6",
-    "@e-mc/module": "^0.9.6",
-    "@e-mc/types": "^0.9.6",
+    "@e-mc/cloud": "^0.10.0",
+    "@e-mc/module": "^0.10.0",
+    "@e-mc/types": "^0.10.0",
     "@google-cloud/firestore": "^7.9.0",
     "@google-cloud/storage": "^7.12.0"
   }

package/types/index.d.ts

@@ -12,7 +12,7 @@ export type GCPStorage = CloudStorage<GCPStorageCredential, "gcp | gcloud">;
 
 export interface GCPStorageCredential extends StorageOptions, IFirebaseOptions {}
 
-export interface GCPDatabaseQuery<T = PlainObject> extends Omit<CloudDatabase<unknown, T, unknown, unknown[] | StandardMap, GCPDatabaseCredential>, "id"> {
+export interface GCPDatabaseQuery<T = PlainObject> extends Omit<CloudDatabase<unknown, T, unknown, string | unknown[] | StandardMap, GCPDatabaseCredential>, "id"> {
     source: "cloud";
     service: "gcp" | "gcloud";
     product?: "firestore" | "firebase" | "bigquery" | "bigtable" | "datastore" | "spanner";

package/upload/index.js

@@ -2,14 +2,14 @@
 const path = require("path");
 const fs = require("fs");
 const stream = require("stream");
+const Cloud = require("@e-mc/cloud");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
-const Cloud = require("@e-mc/cloud");
 const client_1 = require("@pi-r/gcp");
 const BUCKET_SESSION = new Set();
 const BUCKET_RESPONSE = {};
 const getBucketKey = (credential, bucket, acl = '') => Cloud.asString(credential, true) + bucket + '_' + acl;
-module.exports = function upload(credential, service = 'gcp') {
+function upload(credential, service = 'gcp') {
     const storage = client_1.createStorageClient.call(this, credential);
     return async (data, callback) => {
         const firebase = (0, client_1.isFirebaseApp)(credential, true, true);
@@ -25,7 +25,11 @@ module.exports = function upload(credential, service = 'gcp') {
             }
             callback(err, url);
         };
-        const addLog = (err) => err instanceof Error && this.addLog(this.statusType.WARN, err, service, bucket);
+        const addLog = (err) => {
+            if (err instanceof Error) {
+                this.addLog(this.statusType.WARN, err, service, bucket);
+            }
+        };
         if (firebase) {
             const { ref, listAll } = require('@firebase/storage');
             bucketClient = ref(storage, bucket);
@@ -53,11 +57,17 @@ module.exports = function upload(credential, service = 'gcp') {
             bucketClient = storage.bucket(bucket);
             if (configBucket) {
                 let { cors, lifecycle, retentionPolicy } = configBucket;
-                const commandMessage = (feature, message) => this.formatMessage(64, service, ["Bucket configured" + ` (${feature})`, bucket], message, { ...Cloud.LOG_CLOUD_COMMAND });
+                const commandMessage = (feature, message) => {
+                    this.formatMessage(64, service, ["Bucket configured" + ` (${feature})`, bucket], message, { ...Cloud.LOG_CLOUD_COMMAND });
+                };
                 if (typeof retentionPolicy === 'number') {
                     bucketClient.setRetentionPeriod(retentionPolicy)
-                        .then(([response]) => commandMessage('Retention Policy', response.retentionPolicy?.effectiveTime))
-                        .catch((err) => addLog(err));
+                        .then(([response]) => {
+                        commandMessage('Retention Policy', response.retentionPolicy?.effectiveTime);
+                    })
+                        .catch((err) => {
+                        addLog(err);
+                    });
                 }
                 if ((0, types_1.isObject)(cors)) {
                     bucketClient.setCorsConfiguration(Array.isArray(cors) ? cors : [cors])
@@ -65,7 +75,9 @@ module.exports = function upload(credential, service = 'gcp') {
                         const length = response.cors?.length;
                         commandMessage('CORS', length ? length + ' rules' : null);
                     })
-                        .catch((err) => addLog(err));
+                        .catch((err) => {
+                        addLog(err);
+                    });
                 }
                 if ((0, types_1.isObject)(lifecycle)) {
                     let append;
@@ -86,7 +98,9 @@ module.exports = function upload(credential, service = 'gcp') {
                         const length = response.lifecycle?.rule?.length;
                         commandMessage('Lifecycle', length ? length + ' rules' : null);
                     })
-                        .catch((err) => addLog(err));
+                        .catch((err) => {
+                        addLog(err);
+                    });
                 }
             }
             if (flags & 4) {
@@ -175,7 +189,7 @@ module.exports = function upload(credential, service = 'gcp') {
         }
         else if ((flags & 2) && !firebase) {
             try {
-                Stream.push(data.buffer.length ? stream.Readable.from(data.buffer) : fs.createReadStream(localUri, { signal: this.signal }));
+                Stream.push(data.buffer.length > 0 ? stream.Readable.from(data.buffer) : fs.createReadStream(localUri, { signal: this.signal }));
                 if (fileGroup) {
                     const [key, body, type] = (0, util_1.createKeyAndBody)(filename, fileGroup, 0, addLog, 2);
                     Key.push(...key);
@@ -317,10 +331,12 @@ module.exports = function upload(credential, service = 'gcp') {
                         uploadResponse(null, url);
                     }
                     if (Path[i]) {
-                        file.setMetadata(params).catch((err) => addLog(err));
+                        file.setMetadata(params).catch((err) => {
+                            addLog(err);
+                        });
                     }
                     if (ACL) {
-                        client_1.setPredefinedAcl.call(this, file.acl, ACL, file.bucket, file.name, revoke || (await file.getMetadata())[0], true);
+                        void client_1.setPredefinedAcl.call(this, file.acl, ACL, file.bucket, file.name, revoke || (await file.getMetadata())[0], true);
                     }
                 })
                     .catch((err) => {
@@ -334,4 +350,5 @@ module.exports = function upload(credential, service = 'gcp') {
             }
         }
     };
-};
+}
+module.exports = upload;