@pi-r/gcp 0.5.0 → 0.6.1

package/client/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CLOUD_UPLOAD_FROMDISK = exports.getProjectId = exports.createBucketRequest = exports.setPredefinedAcl = exports.setPublicRead = exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.createDatabaseClient = exports.createStorageClient = exports.validateDatabase = exports.validateStorage = exports.isFirebaseApp = void 0;
+exports.getProjectId = exports.createBucketRequest = exports.setPredefinedAcl = exports.setPublicRead = exports.executeBatchQuery = exports.executeQuery = exports.deleteObjectsV2 = exports.deleteObjects = exports.setBucketWebsite = exports.setBucketPolicy = exports.createBucketV2 = exports.createBucket = exports.createDatabaseClient = exports.createStorageClient = exports.validateDatabase = exports.validateStorage = exports.isFirebaseApp = void 0;
 const path = require("path");
 const storage = require("@google-cloud/storage");
 const firestore = require("@google-cloud/firestore");
@@ -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';
@@ -117,7 +117,7 @@ function validateStorage(credential) {
 }
 exports.validateStorage = validateStorage;
 function validateDatabase(credential, data) {
-    return hasKeyFile(credential) && !!(data.table || data.query || data.keys || data.product || data.database) || isFirebaseApp(credential);
+    return hasKeyFile(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) {
@@ -135,36 +135,36 @@ function createStorageClient(credential, bucket) {
             throw err;
         }
     }
-    credential.projectId || (credential.projectId = getProjectId(credential));
+    getProjectId(credential);
     return new storage.Storage(credential);
 }
 exports.createStorageClient = createStorageClient;
 function createDatabaseClient(credential, data) {
     let packageName = '';
     try {
-        let product, name, table;
+        let product, name, database, table, query;
         if (data) {
-            ({ product, name, table } = data);
+            ({ product, name, table, query } = data);
         }
         if (product === 'firebase' || isFirebaseApp(credential)) {
             packageName = getFirebasePackageName(credential);
             return getApp(credential, true);
         }
-        credential.projectId || (credential.projectId = getProjectId(credential));
+        getProjectId(credential);
         if (data) {
-            if (product === 'spanner' || !product && name && data.database) {
+            if (product === 'spanner' || !product && name && database && (query || table)) {
                 const { Spanner } = require(packageName = '@google-cloud/spanner');
                 return new Spanner(credential);
             }
-            if (product === 'bigtable' || !product && name && table) {
-                const { Bigtable } = require(packageName = '@google-cloud/bigtable');
-                return new Bigtable(credential);
-            }
-            if (product === 'bigquery' || !product && !table && typeof data.query === 'string') {
+            if (product === 'bigquery' || !product && (!name && table && database || (0, types_1.isString)(query))) {
                 const { BigQuery } = require(packageName = '@google-cloud/bigquery');
                 return new BigQuery(credential);
             }
-            if (product === 'datastore' || !product && !table && (data.keys || data.query)) {
+            if (product === 'bigtable' || !product && name && table && !database) {
+                const { Bigtable } = require(packageName = '@google-cloud/bigtable');
+                return new Bigtable(credential);
+            }
+            if (product === 'datastore' || !product && (data.keys || data.kind || query && !table && !data.id)) {
                 const { Datastore } = require(packageName = '@google-cloud/datastore');
                 return new Datastore(credential);
             }
@@ -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 })));
                     }
                 }
@@ -407,49 +407,70 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     };
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
-        const { service, product, name, database, table, id, query, orderBy, keys, limit = 0, update, ignoreCache } = item;
-        const renewCache = ignoreCache === 0;
-        const cached = caching && ignoreCache !== true || ignoreCache === false || ignoreCache === 1 || renewCache;
+        const { service, product, name, database, table, id, query, orderBy, limit = 0, update, ignoreCache } = item;
+        const useCache = caching && ignoreCache !== true;
         const getCache = (value) => {
-            if (ignoreCache === 1) {
-                return;
+            if (ignoreCache !== 1) {
+                cacheValue.renewCache = ignoreCache === 0;
+                return this.getQueryResult(service, credential, value, cacheValue);
             }
-            cacheValue.renewCache = renewCache;
-            return this.getQueryResult(service, credential, value, cacheValue);
         };
+        cacheValue.exclusiveOf = Array.isArray(ignoreCache) ? ignoreCache : undefined;
         let rows, queryString = '';
-        if (product === 'bigtable' || !product && name && table && !database) {
-            const { columns, options = {} } = item;
-            if ((0, types_1.isObject)(query)) {
-                options.filter = query;
-            }
-            if (!id && limit > 0) {
-                (options.gaxOptions || (options.gaxOptions = {})).maxResults = limit;
-            }
-            if (cached && (rows = getCache(queryString = name + '_' + table + '_' + (id ? id + ((0, types_1.isArray)(columns) ? '_' + Module.asString(columns, true) : '') : '') + Module.asString(options, true)))) {
-                result[i] = rows;
-                continue;
+        if (product === 'firebase' || isFirebaseApp(credential)) {
+            if (!(0, types_1.isString)(query)) {
+                closeClient();
+                throw (0, util_1.formatError)(item, "Missing database query" /* ERR_DB.QUERY */);
             }
-            const db = createClient(item, 4 /* DB.BIGTABLE */).instance(name).table(table);
-            if (id) {
-                const row = db.row(id);
-                if (Array.isArray(columns)) {
-                    const [data] = await row.get(columns, options);
-                    rows = [getRowData(id, data)];
+            if (useCache) {
+                queryString = query + Module.asString(orderBy, true);
+                if (!update && (rows = getCache(queryString))) {
+                    result[i] = rows;
+                    continue;
                 }
-                else {
-                    const [response] = await row.get(options);
-                    rows = [getRowData(response.id, response.data)];
+            }
+            const { ref, get, child, query: queryDB, update: updateDB } = require('@firebase/database');
+            const constraints = [];
+            let limiter = 0;
+            if ((0, types_1.isArray)(orderBy)) {
+                const sort = require('@firebase/database');
+                for (const items of orderBy) {
+                    if (!(0, types_1.isArray)(items)) {
+                        continue;
+                    }
+                    const method = items[0];
+                    switch (method) {
+                        case 'orderByChild':
+                            constraints.push(sort.orderByChild(items[1]));
+                            break;
+                        case 'orderByKey':
+                        case 'orderByValue':
+                        case 'orderByPriority':
+                            constraints.push(sort[method]());
+                            break;
+                        case 'limitToFirst':
+                        case 'limitToLast':
+                            constraints.push(sort[method](limiter = +items[1]));
+                            break;
+                        case 'startAt':
+                        case 'startAfter':
+                        case 'endAt':
+                        case 'endBefore':
+                        case 'equalTo':
+                            constraints.push(sort[method](items[1], items[2]));
+                            break;
+                    }
                 }
             }
-            else {
-                rows = [];
-                await new Promise((resolve, reject) => {
-                    db.createReadStream(options)
-                        .on('data', row => rows.push(getRowData(row.id, row.data)))
-                        .on('error', reject)
-                        .on('end', resolve);
-                });
+            const db = createClient(item, 0 /* DB.FIREBASE */);
+            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)));
+            if (snapshot.exists()) {
+                const val = snapshot.val();
+                const group = limiter === 1 && Object.keys(val);
+                rows = [group && (0, types_1.isObject)(val) && (0, types_1.isObject)(val[group[0]]) ? val[group[0]] : val];
             }
         }
         else if (product === 'spanner' || !product && name && database && (query || table)) {
@@ -463,8 +484,8 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 throw (0, util_1.formatError)(item, !name ? "Missing instance name" /* ERR_DB.INSTANCE */ : "Missing database name" /* ERR_DB.NAME */);
             }
             const { updateType, options = {} } = item;
-            if (cached) {
-                queryString = name + '_' + database + '_' + (table ? table + Module.asString(columns, true) : '') + Module.asString(query, true) + limit;
+            if (useCache) {
+                queryString = name + '_' + database + '_' + (table ? table + (columns ? Module.asString(columns, true) : '') : '') + Module.asString(query, true) + (limit > 0 ? limit : '');
                 if (!update && (rows = getCache(queryString))) {
                     result[i] = rows;
                     continue;
@@ -477,7 +498,9 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 }
                 const request = (0, types_1.isPlainObject)(query) ? query : { columns };
                 request.json = true;
-                request.columns || (request.columns = item.columns);
+                if ((0, types_1.isObject)(item.columns)) {
+                    request.columns = item.columns;
+                }
                 request.keySet = { all: true };
                 if (limit > 0) {
                     request.limit = limit;
@@ -493,7 +516,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));
                             }
                         });
@@ -507,94 +530,115 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 [rows] = await db.run(request);
             }
         }
-        else if (product === 'firebase' || product === 'bigquery' || !product && !table && typeof query === 'string') {
-            if (!(0, types_1.isString)(query)) {
+        else if (product === 'bigtable' || !product && name && table && !database) {
+            if (!name || !table) {
                 closeClient();
-                throw (0, util_1.formatError)(item, "Missing database query" /* ERR_DB.QUERY */);
+                throw (0, util_1.formatError)(item, !name ? "Missing database name" /* ERR_DB.NAME */ : "Missing database table" /* ERR_DB.TABLE */);
+            }
+            const { columns, options = {} } = item;
+            if ((0, types_1.isObject)(query)) {
+                options.filter = query;
+            }
+            if (!id && limit > 0) {
+                (options.gaxOptions || (options.gaxOptions = {})).maxResults = limit;
             }
-            const firebaseApp = product === 'firebase' || isFirebaseApp(credential);
-            if (cached) {
-                queryString = query + (firebaseApp ? Module.asString(orderBy, true) : Module.asString(item.params, true) + Module.asString(item.options, true) + limit);
-                if ((product === 'bigquery' || !update) && (rows = getCache(queryString))) {
+            if (useCache) {
+                queryString = name + '_' + table + '_' + (id ? id + ((0, types_1.isArray)(columns) ? '_' + Module.asString(columns, true) : '') : '') + Module.asString(options, true);
+                if (!(update && id) && (rows = getCache(queryString))) {
                     result[i] = rows;
                     continue;
                 }
             }
-            if (firebaseApp) {
-                const { ref, get, child, query: queryDB, update: updateDB } = require('@firebase/database');
-                const constraints = [];
-                let limiter = 0;
-                if ((0, types_1.isArray)(orderBy)) {
-                    const sort = require('@firebase/database');
-                    for (const items of orderBy) {
-                        if (!(0, types_1.isArray)(items)) {
-                            continue;
-                        }
-                        const method = items[0];
-                        switch (method) {
-                            case 'orderByChild':
-                                constraints.push(sort.orderByChild(items[1]));
-                                break;
-                            case 'orderByKey':
-                            case 'orderByValue':
-                            case 'orderByPriority':
-                                constraints.push(sort[method]());
-                                break;
-                            case 'limitToFirst':
-                            case 'limitToLast':
-                                constraints.push(sort[method](limiter = +items[1]));
-                                break;
-                            case 'startAt':
-                            case 'startAfter':
-                            case 'endAt':
-                            case 'endBefore':
-                            case 'equalTo':
-                                constraints.push(sort[method](items[1], items[2]));
-                                break;
-                        }
-                    }
+            const db = createClient(item, 4 /* DB.BIGTABLE */).instance(name).table(table);
+            if (id) {
+                const row = db.row(id);
+                if (update) {
+                    await row.save(update);
                 }
-                const db = createClient(item, 0 /* DB.FIREBASE */);
-                if ((0, types_1.isPlainObject)(update)) {
-                    await updateDB(ref(db, query), update);
+                if (Array.isArray(columns)) {
+                    const [data] = await row.get(columns, options);
+                    rows = [getRowData(id, data)];
                 }
-                const snapshot = await (constraints.length ? 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);
-                    rows = [group && (0, types_1.isObject)(val) && (0, types_1.isObject)(val[group[0]]) ? val[group[0]] : val];
+                else {
+                    const [response] = await row.get(options);
+                    rows = [getRowData(response.id, response.data)];
                 }
             }
             else {
-                const { options = {} } = item;
+                rows = [];
+                await new Promise((resolve, reject) => {
+                    db.createReadStream(options)
+                        .on('data', row => rows.push(getRowData(row.id, row.data)))
+                        .on('error', reject)
+                        .on('end', resolve);
+                });
+            }
+        }
+        else if (product === 'bigquery' || !product && (!name && database && table || (0, types_1.isString)(query) || (0, types_1.isString)(item.options?.query))) {
+            const { params, options = {} } = item;
+            if ((0, types_1.isString)(query)) {
                 options.query = query;
-                options.params || (options.params = item.params);
-                if (limit > 0) {
-                    options.maxResults = limit;
+            }
+            if ((0, types_1.isObject)(params)) {
+                options.params = params;
+            }
+            if (limit > 0) {
+                options.maxResults = limit;
+            }
+            if (useCache) {
+                queryString = query + (database ? '_' + database + (table ? '_' + table : '') : '') + Module.asString(options, true);
+                if (!update && (rows = getCache(queryString))) {
+                    result[i] = rows;
+                    continue;
+                }
+            }
+            const instance = createClient(item, 1 /* DB.BIGQUERY */);
+            let job;
+            if (database) {
+                const dataset = instance.dataset(database);
+                let target = dataset;
+                if (table) {
+                    target = target.table(table);
+                    options.destination = target;
+                }
+                if ((0, types_1.isString)(update)) {
+                    const [metadata] = await target.getMetadata();
+                    metadata.view = update;
+                    await target.setMetadata(metadata);
                 }
-                const [job] = await createClient(item, 1 /* DB.BIGQUERY */).createQueryJob(options);
-                [rows] = await job.getQueryResults();
+                [job] = await dataset.createQueryJob(options);
+            }
+            else {
+                [job] = await instance.createQueryJob(options);
             }
+            [rows] = await job.getQueryResults();
         }
-        else if (product === 'datastore' || !product && !table && (keys || query)) {
+        else if (product === 'datastore' || !product && (item.keys || item.kind || query && !table && !id)) {
+            const { keys, kind } = item;
             if (!keys && !Array.isArray(query)) {
                 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 (useCache) {
+                queryString = (keys ? Module.asString(keys, true) : Module.asString(query, true) + (kind || '')) + Module.asString(item.options, true) + (limit > 0 ? limit : 0);
+                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) {
+                if (limit > 0 && rows.length > limit) {
                     rows = rows.slice(0, limit);
                 }
             }
             else {
-                const task = db.createQuery(item.kind);
+                const task = db.createQuery(kind);
                 for (const args of query) {
                     if ((0, types_1.isArray)(args)) {
                         const method = args[0];
@@ -616,6 +660,20 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 if (limit > 0) {
                     task.limit(limit);
                 }
+                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));
+                    });
+                }
                 [rows] = await db.runQuery(task, item.options);
             }
         }
@@ -624,12 +682,9 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 closeClient();
                 throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
             }
-            if (cached) {
-                queryString = table + '_';
-            }
             if (id) {
-                if (cached) {
-                    queryString += id;
+                if (useCache) {
+                    queryString = table + '_' + id;
                     if (!update && (rows = getCache(queryString))) {
                         result[i] = rows;
                         continue;
@@ -645,7 +700,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 }
             }
             else if (Array.isArray(query)) {
-                if (cached && (rows = getCache(queryString += Module.asString(query, true) + Module.asString(orderBy, true) + limit))) {
+                if (useCache && (rows = getCache(queryString = table + '_' + Module.asString(query, true) + Module.asString(orderBy, true) + (limit > 0 ? limit : '')))) {
                     result[i] = rows;
                     continue;
                 }
@@ -775,7 +830,7 @@ async function setPredefinedAcl(target, value, bucket, pathname = '', metadata =
                     }
                     break;
                 default:
-                    return Promise.resolve();
+                    return;
             }
         }
     }
@@ -819,18 +874,24 @@ 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.5.0",
+  "version": "0.6.1",
   "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.7.0",
-    "@e-mc/module": "^0.7.0",
-    "@e-mc/types": "^0.7.0",
+    "@e-mc/cloud": "^0.8.1",
+    "@e-mc/module": "^0.8.1",
+    "@e-mc/types": "^0.8.1",
     "@google-cloud/firestore": "^7.1.0",
     "@google-cloud/storage": "^7.7.0"
   }

package/upload/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
-const fs = require("fs");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
@@ -27,7 +26,7 @@ function upload(credential, service = 'gcp') {
             }
             callback(err, url);
         };
-        const addLog = (err) => err instanceof Error && this.addLog(this.statusType.WARN, err.message, service + ': ' + bucket);
+        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);
@@ -85,15 +84,15 @@ function upload(credential, service = 'gcp') {
                 this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["File renamed" /* VAL_CLOUD.RENAME_FILE */, current], filename, { ...Cloud.LOG_CLOUD_WARN });
             }
         }
+        const getURL = (value) => endpoint ? Module.joinPath(endpoint, value) : Module.joinPath("https://storage.googleapis.com" /* STRINGS.BASE_URL */, bucket, value);
         const Key = [filename];
         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);
         if (fileGroup) {
-            for (const [content, ext, localFile] of fileGroup) {
-                Key.push(ext === '.map' && localFile ? path.basename(localFile) : filename + ext);
-                Body.push(content);
-            }
+            const [key, body, type] = (0, util_1.createKeyAndBody)(filename, fileGroup, addLog);
+            Key.push(...key);
+            Body.push(...body);
+            ContentType.push(...type);
         }
         for (let i = 0; i < Key.length; ++i) {
             const first = i === 0;
@@ -103,21 +102,9 @@ function upload(credential, service = 'gcp') {
                 }
                 return;
             }
+            const destination = pathname ? Module.joinPath(pathname, Key[i]) : Key[i];
             if (firebase) {
                 const { ref, uploadBytes } = require('@firebase/storage');
-                if (!Buffer.isBuffer(Body[i])) {
-                    try {
-                        Body[i] = fs.readFileSync(Body[i]);
-                    }
-                    catch (err) {
-                        if (first) {
-                            uploadResponse(err);
-                            return;
-                        }
-                        addLog(err);
-                        continue;
-                    }
-                }
                 const params = { ...options };
                 if (first) {
                     params.contentType || (params.contentType = ContentType[i]);
@@ -128,7 +115,6 @@ function upload(credential, service = 'gcp') {
                 else {
                     params.contentType = ContentType[i];
                 }
-                const destination = pathname ? Module.joinPath(pathname, Key[i]) : Key[i];
                 uploadBytes(ref(bucketClient, destination), Body[i], params)
                     .then(() => {
                     const url = getURL(destination);
@@ -147,33 +133,6 @@ function upload(credential, service = 'gcp') {
                 });
             }
             else {
-                let outputUri, tempDir;
-                try {
-                    const output = Body[i];
-                    if (Buffer.isBuffer(output) || path.basename(output) !== Key[i]) {
-                        if (!(tempDir = this.getTempDir({ uuidDir: true }))) {
-                            throw new Error("Unable to create temp directory" /* ERR_CLOUD.TEMP_DIR */);
-                        }
-                        outputUri = path.join(tempDir, Key[i]);
-                        if (typeof output === 'string') {
-                            fs.copyFileSync(output, outputUri);
-                        }
-                        else {
-                            fs.writeFileSync(outputUri, output);
-                        }
-                    }
-                    else {
-                        outputUri = output;
-                    }
-                }
-                catch (err) {
-                    if (first) {
-                        uploadResponse(err);
-                        return;
-                    }
-                    addLog(err);
-                    continue;
-                }
                 const params = { ...options };
                 const readable = publicRead || active && publicRead !== false && publicRead !== 0 && !acl;
                 let ACL, revoke, predefined;
@@ -185,7 +144,7 @@ function upload(credential, service = 'gcp') {
                     else {
                         predefined = true;
                     }
-                    if (metadata) {
+                    if (typeof metadata === 'object') {
                         params.metadata = metadata;
                     }
                 }
@@ -209,26 +168,21 @@ function upload(credential, service = 'gcp') {
                         params.predefinedAcl = acl;
                     }
                 }
-                params.destination = pathname ? Module.joinPath(pathname, path.basename(outputUri)) : undefined;
-                bucketClient.upload(outputUri, params, (err, file) => {
-                    if (file) {
-                        const url = getURL(file.name);
-                        this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /* VAL_CLOUD.UPLOAD_FILE */, url, { ...Cloud.LOG_CLOUD_UPLOAD });
-                        if (first) {
-                            uploadResponse(null, url);
-                        }
-                        if (ACL) {
-                            client_1.setPredefinedAcl.call(this, file.acl, ACL, file.bucket, file.name, revoke || file.metadata, true);
-                        }
-                    }
-                    else if (first) {
-                        uploadResponse(err);
+                params.resumable ?? (params.resumable = false);
+                const file = bucketClient.file(destination);
+                file.save(Body[i], params).then(async () => {
+                    const url = getURL(file.name);
+                    this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /* VAL_CLOUD.UPLOAD_FILE */, url, { ...Cloud.LOG_CLOUD_UPLOAD });
+                    if (first) {
+                        uploadResponse(null, url);
                     }
-                    else {
-                        addLog(err);
+                    if (ACL) {
+                        client_1.setPredefinedAcl.call(this, file.acl, ACL, file.bucket, file.name, revoke || (await file.getMetadata())[0], true);
                     }
-                    if (tempDir) {
-                        queueMicrotask(() => Module.removeDir(tempDir));
+                })
+                    .catch(err => {
+                    if (first) {
+                        uploadResponse(err);
                     }
                 });
             }