@pi-r/gcp 0.10.2 → 0.11.0

package/client/index.js

@@ -13,6 +13,7 @@ exports.setBucketWebsite = setBucketWebsite;
 exports.deleteObjects = deleteObjects;
 exports.deleteObjectsV2 = deleteObjectsV2;
 exports.deleteObjectsV3 = deleteObjectsV3;
+exports.copyObject = copyObject;
 exports.executeQuery = executeQuery;
 exports.executeBatchQuery = executeBatchQuery;
 exports.setPublicRead = setPublicRead;
@@ -98,15 +99,11 @@ async function hasBucket(client) {
 }
 async function updatePredefinedAcl(acl, values, metadata = {}) {
     const items = [];
-    let projectNumber;
-    if ('projectNumber' in metadata || 'defaultObjectAcl' in metadata) {
-        let defaultObjectAcl;
-        ({ projectNumber, defaultObjectAcl } = metadata);
-        if (projectNumber === undefined && (0, types_1.isArray)(defaultObjectAcl)) {
-            const target = defaultObjectAcl.find(item => item.projectTeam?.projectNumber);
-            if (target !== undefined) {
-                projectNumber = target.projectTeam.projectNumber;
-            }
+    let { projectNumber, defaultObjectAcl } = metadata;
+    if (projectNumber === undefined && (0, types_1.isArray)(defaultObjectAcl)) {
+        const target = defaultObjectAcl.find(item => item.projectTeam?.projectNumber);
+        if (target !== undefined) {
+            projectNumber = target.projectTeam.projectNumber;
         }
     }
     for (const target of acl.default ? [acl, acl.default] : [acl]) {
@@ -141,7 +138,7 @@ async function setUniformBucketLevel(bucket, enabled) {
 const keyLimit = (limit) => limit > 0 ? `_${limit}` : '_0';
 const asFieldPath = (params) => Array.isArray(params) && params.every(item => typeof item === 'string') ? new firestore_1.FieldPath(...params) : params;
 const getFirebasePackageName = (credential) => credential.apiKey && credential.authDomain && credential ? 'firebase' : 'firebase-admin';
-const isErrorConflict = (err) => err instanceof Error && err.code === 409;
+const isErrorConflict = (err) => (0, types_1.isErrorCode)(err, 409);
 const hasGoogleAuth = (credential) => (0, types_1.isString)(credential.keyFilename || credential.keyFile || process.env.GOOGLE_APPLICATION_CREDENTIALS) || (0, types_1.isObject)(credential.credentials) || !!credential.authClient;
 const isSpanner = (data) => data.product === "spanner" || !data.product && !!(data.name && data.database && (data.query || data.table));
 const isBigtable = (data) => data.product === "bigtable" || !data.product && !!(data.name && data.table && !data.database);
@@ -206,10 +203,10 @@ function createDatabaseClient(credential, data) {
     }
     return new firestore_1.Firestore(credential);
 }
-async function createBucket(credential, bucket, publicRead, service = 'gcp') {
+async function createBucket(credential, bucket, publicRead, service = "gcp") {
     return createBucketV2.call(this, credential, bucket, publicRead ? 'publicRead' : undefined, createBucketRequest(credential), service);
 }
-async function createBucketV2(credential, bucket, acl, options, service = 'gcp') {
+async function createBucketV2(credential, bucket, acl, options, service = "gcp") {
     if (isFirebaseApp(credential, true, true)) {
         return false;
     }
@@ -222,7 +219,7 @@ async function createBucketV2(credential, bucket, acl, options, service = 'gcp')
     }
     return instance.createBucket(bucket, options)
         .then(async ([target]) => {
-        this.formatMessage(64, service, ["Bucket created", bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
+        this.formatMessage(64, service, ["Bucket created", bucket], '', Cloud.optionsLogMessage('COMMAND'));
         if (acl) {
             await setBucketPolicy.call(this, credential, bucket, { acl, bucket: target }, service);
         }
@@ -232,17 +229,17 @@ async function createBucketV2(credential, bucket, acl, options, service = 'gcp')
         if (isErrorConflict(err)) {
             return acl ? await setBucketPolicy.call(this, credential, bucket, { acl }, service) : true;
         }
-        this.formatFail(64, service, ["Unable to create bucket", bucket], err, { ...Cloud.LOG_CLOUD_FAIL });
+        this.formatFail(64, service, ["Unable to create bucket", bucket], err, Cloud.optionsLogMessage('FAIL'));
         return false;
     });
 }
-async function setBucketPolicy(credential, bucket, options, service = 'gcp') {
+async function setBucketPolicy(credential, bucket, options, service = "gcp") {
     if (isFirebaseApp(credential, true, true)) {
         return false;
     }
     const client = createStorageClient.call(this, credential, bucket).bucket(bucket);
     if (!await hasBucket(client)) {
-        this.formatFail(64, service, ["Bucket does not exist", bucket], (0, types_1.errorMessage)(service, "Bucket does not exist"), { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+        this.formatFail(64, service, ["Bucket does not exist", bucket], (0, types_1.errorMessage)(service, "Bucket does not exist"), Cloud.optionsLogMessage('FAIL', { fatal: false }));
         return false;
     }
     const errors = [];
@@ -283,13 +280,13 @@ async function setBucketPolicy(credential, bucket, options, service = 'gcp') {
         errors.push(...await updatePredefinedAcl(client.acl, options.acl, options.metadata));
     }
     if (errors.length > 0) {
-        this.formatFail(64, service, ["Unable to update bucket policy", bucket], errors[0], { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+        this.formatFail(64, service, ["Unable to update bucket policy", bucket], errors[0], Cloud.optionsLogMessage('FAIL', { fatal: false }));
         return false;
     }
-    this.formatMessage(64, service, ["Bucket ACL configured", bucket], (0, types_1.isString)(acl) ? acl : '', { ...Cloud.LOG_CLOUD_COMMAND });
+    this.formatMessage(64, service, ["Bucket ACL configured", bucket], (0, types_1.isString)(acl) ? acl : '', Cloud.optionsLogMessage('COMMAND'));
     return true;
 }
-async function setBucketTagging(credential, bucket, labels, service = 'gcp') {
+async function setBucketTagging(credential, bucket, labels, service = "gcp") {
     if (isFirebaseApp(credential, true, true) || !(0, types_1.isPlainObject)(labels)) {
         return false;
     }
@@ -307,15 +304,15 @@ async function setBucketTagging(credential, bucket, labels, service = 'gcp') {
     }
     return client.setMetadata({ labels })
         .then(([metadata]) => {
-        this.formatMessage(64, service, [deleting ? "Tags deleted" : "Tags created", bucket], ((0, types_1.isPlainObject)(metadata.labels) ? Object.keys(metadata.labels).length : 0) + ' labels (current)', { ...Cloud.LOG_CLOUD_COMMAND });
+        this.formatMessage(64, service, [deleting ? "Tags deleted" : "Tags created", bucket], ((0, types_1.isPlainObject)(metadata.labels) ? Object.keys(metadata.labels).length : 0) + ' labels (current)', Cloud.optionsLogMessage('COMMAND'));
         return true;
     })
         .catch((err) => {
-        this.formatFail(64, service, ["Unable to update bucket tagging", bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+        this.formatFail(64, service, ["Unable to update bucket tagging", bucket], err, Cloud.optionsLogMessage('FAIL', { fatal: false }));
         return false;
     });
 }
-async function setBucketWebsite(credential, bucket, options, service = 'gcp') {
+async function setBucketWebsite(credential, bucket, options, service = "gcp") {
     if (isFirebaseApp(credential, true, true)) {
         return false;
     }
@@ -327,13 +324,14 @@ async function setBucketWebsite(credential, bucket, options, service = 'gcp') {
     if ((0, types_1.isString)(errorPage)) {
         website.notFoundPage = errorPage;
     }
-    return createStorageClient.call(this, credential, bucket).bucket(bucket).setMetadata({ website })
+    const client = createStorageClient.call(this, credential, bucket).bucket(bucket);
+    return client.setMetadata({ website })
         .then(() => {
-        this.formatMessage(64, service, ["Bucket website configured", bucket], website, { ...Cloud.LOG_CLOUD_COMMAND });
+        this.formatMessage(64, service, ["Bucket website configured", bucket], website, Cloud.optionsLogMessage('COMMAND'));
         return true;
     })
         .catch((err) => {
-        this.formatFail(64, service, ["Unable to set bucket website", bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+        this.formatFail(64, service, ["Unable to set bucket website", bucket], err, Cloud.optionsLogMessage('FAIL', { fatal: false }));
         return false;
     });
 }
@@ -343,10 +341,10 @@ async function deleteObjects(credential, bucket, service, sdk, recursive = true)
 async function deleteObjectsV2(credential, bucket, recursive = true, service) {
     return deleteObjectsV3.call(this, credential, bucket, { recursive }, service);
 }
-async function deleteObjectsV3(credential, bucket, options = {}, service = 'gcp') {
-    options = { ...options };
+async function deleteObjectsV3(credential, bucket, options = {}, service = "gcp") {
     let recursive = true;
     if ('recursive' in options) {
+        options = { ...options };
         recursive = options.recursive;
         delete options.recursive;
     }
@@ -381,7 +379,7 @@ async function deleteObjectsV3(credential, bucket, options = {}, service = 'gcp'
         if (await hasBucket(client)) {
             if (recursive) {
                 return client.deleteFiles({ ...options, force: true }).then(() => {
-                    this.formatMessage(64, service, "Bucket emptied" + ' (recursive)', bucket, { ...Cloud.LOG_CLOUD_COMMAND });
+                    this.formatMessage(64, service, "Bucket emptied" + ' (recursive)', bucket, Cloud.optionsLogMessage('COMMAND'));
                 });
             }
             const tasks = [];
@@ -390,7 +388,7 @@ async function deleteObjectsV3(credential, bucket, options = {}, service = 'gcp'
                 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 });
+                            this.formatFail(64, service, ["Delete failed", name], err, Cloud.optionsLogMessage('FAIL', { fatal: false }));
                         }));
                     }
                 }
@@ -405,7 +403,7 @@ async function deleteObjectsV3(credential, bucket, options = {}, service = 'gcp'
     }
     const checkErrors = () => {
         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 });
+            this.formatFail(64, service, ["Unable to empty bucket" + (recursive ? ' (recursive)' : ''), errors.length + ' errors'], errors[0], Cloud.optionsLogMessage('FAIL', { fatal: false }));
             return true;
         }
         return false;
@@ -415,7 +413,7 @@ async function deleteObjectsV3(credential, bucket, options = {}, service = 'gcp'
             errors.push(...result.filter(item => item.status === 'rejected').map((item) => item.reason));
             if (!checkErrors()) {
                 const files = result.length + ' files';
-                this.formatMessage(64, service, ["Bucket emptied" + ` (${recursive ? 'recursive' : files})`, bucket], recursive ? files : '', { ...Cloud.LOG_CLOUD_COMMAND });
+                this.formatMessage(64, service, ["Bucket emptied" + ` (${recursive ? 'recursive' : files})`, bucket], recursive ? files : '', Cloud.optionsLogMessage('COMMAND'));
             }
         })
             .catch((err) => {
@@ -424,6 +422,21 @@ async function deleteObjectsV3(credential, bucket, options = {}, service = 'gcp'
     }
     checkErrors();
 }
+async function copyObject(credential, bucketSource, keySource, bucket, key, options = {}, service = "gcp") {
+    if (isFirebaseApp(credential, true, true)) {
+        throw (0, types_1.errorValue)("Copy object not supported", 'firebase');
+    }
+    const instance = createStorageClient.call(this, credential);
+    const source = (0, types_1.isString)(keySource) ? instance.bucket(bucketSource).file(keySource) : keySource;
+    const destination = (0, types_1.isString)(key) ? instance.bucket(bucket).file(key) : key;
+    return source.copy(destination, options)
+        .then(() => {
+        this.formatMessage(64, service, ["Copy success", bucket], source.bucket.name + '/' + source.name, Cloud.optionsLogMessage('COMMAND'));
+    })
+        .catch((err) => {
+        this.formatFail(64, service, ["Copy failed", destination.bucket.name + '/' + destination.name], err, Cloud.optionsLogMessage('FAIL', { fatal: false }));
+    });
+}
 async function executeQuery(credential, data, sessionKey) {
     return (await executeBatchQuery.call(this, credential, [data], sessionKey))[0] || [];
 }
@@ -1043,20 +1056,20 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     closeClient();
     return result;
 }
-function setPublicRead(acl, pathname, requested, service = 'gcp') {
+function setPublicRead(acl, pathname, requested, service = "gcp") {
     acl.add({ entity: 'allUsers', role: 'READER' })
         .then(() => {
         if (requested) {
-            this.formatMessage(64, service, "Grant public-read", pathname, { ...Cloud.LOG_CLOUD_COMMAND });
+            this.formatMessage(64, service, "Grant public-read", pathname, Cloud.optionsLogMessage('COMMAND'));
         }
     })
         .catch((err) => {
         if (requested) {
-            this.formatMessage(64, service, ["Unable to grant public-read", pathname], err, { ...Cloud.LOG_CLOUD_WARN });
+            this.formatMessage(64, service, ["Unable to grant public-read", pathname], err, Cloud.optionsLogMessage('WARN'));
         }
     });
 }
-async function setPredefinedAcl(target, value, bucket, pathname = '', metadata = {}, requested = true, service = 'gcp') {
+async function setPredefinedAcl(target, value, bucket, pathname = '', metadata = {}, requested = true, service = "gcp") {
     let revoke = false;
     if (metadata === true) {
         revoke = true;
@@ -1126,10 +1139,10 @@ async function setPredefinedAcl(target, value, bucket, pathname = '', metadata =
     }
     return updatePredefinedAcl(target, items, metadata).then(errors => {
         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 });
+            this.formatMessage(64, service, [`Unable to ${revoke ? 'revoke' : 'grant'} ` + value, bucket && pathname ? Cloud.joinPath(bucket.name, pathname) : bucket ? bucket.name : pathname], errors[0], Cloud.optionsLogMessage('WARN'));
         }
         else if (requested && (bucket || pathname)) {
-            this.formatMessage(64, service, [(revoke ? 'Revoke' : 'Grant') + ' ' + value, bucket?.name], pathname, { ...Cloud.LOG_CLOUD_COMMAND });
+            this.formatMessage(64, service, [(revoke ? 'Revoke' : 'Grant') + ' ' + value, bucket?.name], pathname, Cloud.optionsLogMessage('COMMAND'));
         }
     });
 }

package/download/index.js

@@ -1,12 +1,13 @@
 "use strict";
 const path = require("node:path");
 const fs = require("node:fs");
-const https = require("node:https");
+const stream = require("node:stream");
 const storage_1 = require("@google-cloud/storage");
 const Cloud = require("@e-mc/cloud");
 const types_1 = require("@e-mc/types");
+const util_1 = require("@e-mc/cloud/util");
 const client_1 = require("@pi-r/gcp");
-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;
@@ -15,56 +16,50 @@ function download(credential, service = 'gcp') {
             callback((0, types_1.errorValue)('Missing property', !Bucket ? 'Bucket' : 'Key'));
             return;
         }
-        const tempDir = (0, types_1.getTempDir)(true, service);
         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.optionsLogMessage('DELETE'));
+        const deleteFailed = (err) => {
+            this.formatFail(64, service, ["Delete failed", location], err, Cloud.optionsLogMessage('FAIL', { fatal: !!target.active }));
         };
         if ((0, client_1.isFirebaseApp)(credential, true, true)) {
-            const { ref, getDownloadURL, deleteObject } = require('@firebase/storage');
+            const { ref, getStream, deleteObject } = require('@firebase/storage');
             const objectRef = ref(storage, Key);
-            void getDownloadURL(objectRef).then(url => {
-                https.get(url, res => {
-                    const statusCode = res.statusCode;
-                    if (statusCode >= 200 && statusCode < 300) {
-                        res.on('error', callback);
-                        res.pipe(fs.createWriteStream(destination)
-                            .on('finish', () => {
-                            callback(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 });
-                                });
-                            }
-                        })
-                            .on('error', callback));
-                    }
-                    else {
-                        callback((0, types_1.errorMessage)(statusCode, 'Invalid HTTP request', location));
-                    }
-                });
-            });
+            (0, util_1.readableAsBuffer)(stream.Readable.from(getStream(objectRef)))
+                .then(buffer => {
+                callback(null, buffer);
+                if (target.deleteObject) {
+                    deleteObject(objectRef)
+                        .then(deleteMessage)
+                        .catch(deleteFailed);
+                }
+            })
+                .catch(callback);
             return;
         }
         const { flags = 0 } = target;
+        const tempDir = (0, types_1.getTempDir)(true, service);
+        const destination = path.join(tempDir, path.basename(target.filename || Key));
         const bucket = storage.bucket(Bucket);
         const file = bucket.file(Key, { generation: target.versionId });
         const chunkSizeBytes = flags & 4 ? (0, types_1.alignSize)(target.chunkSize, 1024) : 0;
-        const fileDownload = () => {
+        const complete = async () => {
             callback(null, destination);
+            const copyTo = (0, util_1.intoArray)(target.copyObject);
+            if (copyTo) {
+                const tasks = [];
+                for (const { bucket: bucketName, pathname, filename, options } of copyTo) {
+                    const keyObject = filename ? Cloud.joinPath(pathname, filename, true) : Key;
+                    tasks.push(client_1.copyObject
+                        .call(this, credential, Bucket, file, bucketName, keyObject, options)
+                        .catch((0, util_1.createErrorHandler)(this, service, Bucket)));
+                }
+                await Promise.all(tasks);
+            }
             const deleteObject = target.deleteObject;
             if (deleteObject) {
-                file.delete((0, types_1.isObject)(deleteObject) ? deleteObject : { ignoreNotFound: true }, err => {
-                    if (!err) {
-                        deleteMessage();
-                    }
-                    else {
-                        this.formatFail(64, service, ["Delete failed", location], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active });
-                    }
-                });
+                file.delete((0, types_1.isObject)(deleteObject) ? deleteObject : { ignoreNotFound: true })
+                    .then(deleteMessage)
+                    .catch(deleteFailed);
             }
         };
         if (chunkSizeBytes > 0) {
@@ -73,18 +68,18 @@ function download(credential, service = 'gcp') {
                 chunkSizeBytes,
                 concurrencyLimit: target.chunkLimit || target.options?.concurrencyLimit
             })
-                .then(fileDownload)
+                .then(complete)
                 .catch(callback);
         }
         else if (target.chunkLimit === 1 && !target.chunkSize) {
             file.createReadStream()
                 .pipe(fs.createWriteStream(destination))
-                .on('finish', fileDownload)
+                .on('finish', complete)
                 .on('error', callback);
         }
         else {
             file.download({ destination })
-                .then(fileDownload)
+                .then(complete)
                 .catch(callback);
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/gcp",
-  "version": "0.10.2",
+  "version": "0.11.0",
   "description": "Google (GCP) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -19,10 +19,10 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.12.5",
-    "@e-mc/module": "^0.12.5",
-    "@e-mc/types": "^0.12.5",
-    "@google-cloud/firestore": "^7.11.3",
-    "@google-cloud/storage": "^7.16.0"
+    "@e-mc/cloud": "^0.13.0",
+    "@e-mc/module": "^0.13.0",
+    "@e-mc/types": "^0.13.0",
+    "@google-cloud/firestore": "^7.11.6",
+    "@google-cloud/storage": "^7.17.2"
   }
 }

package/upload/index.js

@@ -10,14 +10,14 @@ 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;
-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);
         const { bucket, localUri } = data;
-        const { pathname = '', flags = 0, fileGroup, contentType, metadata, endpoint, active, publicRead, acl, admin = {}, overwrite, options } = data.upload;
+        const { pathname, flags = 0, fileGroup, contentType, metadata, endpoint, active, publicRead, acl, admin = {}, overwrite, options } = data.upload;
         let filename = data.upload.filename || path.basename(localUri), chunkSizeBytes = 0, bucketClient, bucketKey, listFiles;
-        const uploadResponse = (err, url) => {
+        const complete = (err, url) => {
             if (!firebase) {
                 BUCKET_SESSION.delete(bucket);
                 if (bucketKey) {
@@ -26,11 +26,7 @@ function upload(credential, service = 'gcp') {
             }
             callback(err, url);
         };
-        const addLog = (err) => {
-            if (err instanceof Error) {
-                this.addLog(this.statusType.WARN, err, service, bucket);
-            }
-        };
+        const addLog = (0, util_1.createErrorHandler)(this, bucket, service);
         if (firebase) {
             const { ref, listAll } = require('@firebase/storage');
             bucketClient = ref(storage, bucket);
@@ -39,7 +35,7 @@ function upload(credential, service = 'gcp') {
                     listFiles = (await listAll(bucketClient)).items.map(item => item.fullPath);
                 }
                 catch (err) {
-                    uploadResponse(err);
+                    complete(err);
                     return;
                 }
             }
@@ -50,7 +46,7 @@ function upload(credential, service = 'gcp') {
                 const bucketAcl = admin.publicRead ? "publicRead" : admin.acl;
                 const response = BUCKET_RESPONSE[bucketKey = getBucketKey(credential, bucket, bucketAcl)] ||= client_1.createBucketV2.call(this, credential, bucket, bucketAcl, configBucket?.create);
                 if (!await response) {
-                    uploadResponse(null);
+                    complete(null);
                     return;
                 }
                 BUCKET_SESSION.add(bucket);
@@ -59,7 +55,7 @@ function upload(credential, service = 'gcp') {
             if (configBucket) {
                 let { cors, lifecycle, retentionPolicy } = configBucket;
                 const commandMessage = (feature, message) => {
-                    this.formatMessage(64, service, ["Bucket configured" + ` (${feature})`, bucket], message, { ...Cloud.LOG_CLOUD_COMMAND });
+                    this.formatMessage(64, service, ["Bucket configured" + ` (${feature})`, bucket], message, Cloud.optionsLogMessage('COMMAND'));
                 };
                 if (typeof retentionPolicy === 'number') {
                     (retentionPolicy === 0 ? bucketClient.removeRetentionPeriod() : bucketClient.setRetentionPeriod(retentionPolicy))
@@ -78,16 +74,11 @@ function upload(credential, service = 'gcp') {
                 }
                 if ((0, types_1.isObject)(lifecycle)) {
                     let append = false;
-                    if (Array.isArray(lifecycle)) {
-                        if (lifecycle.length === 0) {
-                            append = false;
-                        }
-                        else {
-                            const arg = lifecycle[lifecycle.length - 1];
-                            if (typeof arg === 'boolean') {
-                                append = arg;
-                                lifecycle = lifecycle.slice(0, lifecycle.length - 1);
-                            }
+                    if ((0, types_1.isArray)(lifecycle)) {
+                        const arg = lifecycle.at(-1);
+                        if (typeof arg === 'boolean') {
+                            append = arg;
+                            lifecycle = lifecycle.slice(0, lifecycle.length - 1);
                         }
                     }
                     bucketClient.addLifecycleRule(lifecycle, { append })
@@ -116,7 +107,7 @@ function upload(credential, service = 'gcp') {
                         break;
                     }
                 }
-                const name = pathname ? Cloud.joinPath(pathname, filename) : filename;
+                const name = Cloud.joinPath(pathname, filename, true);
                 if (firebase) {
                     exists = listFiles.includes(name);
                 }
@@ -125,7 +116,7 @@ function upload(credential, service = 'gcp') {
                 }
             } while (exists && ++i);
             if (i > 0) {
-                this.formatMessage(64, service, ["File renamed", current], filename, { ...Cloud.LOG_CLOUD_WARN });
+                this.formatMessage(64, service, ["File renamed", current], filename, Cloud.optionsLogMessage('WARN'));
             }
         }
         const getURL = (value) => endpoint ? Cloud.joinPath(endpoint, value) : Cloud.joinPath("https://storage.googleapis.com", bucket, value);
@@ -160,7 +151,7 @@ function upload(credential, service = 'gcp') {
                     }
                 }
                 catch (err) {
-                    uploadResponse(err);
+                    complete(err);
                     return;
                 }
             }
@@ -193,7 +184,7 @@ function upload(credential, service = 'gcp') {
                 }
             }
             catch (err) {
-                uploadResponse(err);
+                complete(err);
                 return;
             }
         }
@@ -220,11 +211,11 @@ function upload(credential, service = 'gcp') {
             const first = i === 0;
             if (this.aborted) {
                 if (first) {
-                    uploadResponse((0, types_1.createAbortError)());
+                    complete((0, types_1.createAbortError)());
                 }
                 return;
             }
-            const destination = pathname ? Cloud.joinPath(pathname, Key[i]) : Key[i];
+            const destination = Cloud.joinPath(pathname, Key[i], true);
             if (firebase) {
                 const { ref, uploadBytes } = require('@firebase/storage');
                 const params = { ...options };
@@ -234,7 +225,7 @@ function upload(credential, service = 'gcp') {
                             Body[0] = fs.readFileSync(localUri);
                         }
                         catch (err) {
-                            uploadResponse(err);
+                            complete(err);
                             return;
                         }
                     }
@@ -249,14 +240,14 @@ function upload(credential, service = 'gcp') {
                 uploadBytes(ref(bucketClient, destination), Body[i], params)
                     .then(() => {
                     const url = getURL(destination);
-                    this.formatMessage(64, service, "Upload success", url, { ...Cloud.LOG_CLOUD_UPLOAD });
+                    this.formatMessage(64, service, "Upload success", url, Cloud.optionsLogMessage('UPLOAD'));
                     if (first) {
-                        uploadResponse(null, url);
+                        complete(null, url);
                     }
                 })
                     .catch((err) => {
                     if (first) {
-                        uploadResponse(err);
+                        complete(err);
                     }
                     else {
                         addLog(err);
@@ -323,14 +314,24 @@ function upload(credential, service = 'gcp') {
                 uploadClient
                     .then(async () => {
                     const url = getURL(file.name);
-                    this.formatMessage(64, service, "Upload success", url, { ...Cloud.LOG_CLOUD_UPLOAD });
+                    this.formatMessage(64, service, "Upload success", url, Cloud.optionsLogMessage('UPLOAD'));
                     if (first) {
-                        uploadResponse(null, url);
+                        const copyTo = (0, util_1.intoArray)(data.upload.copyObject);
+                        if (copyTo) {
+                            const tasks = [];
+                            for (const { bucket: bucketName, pathname: pathObject = pathname, filename: fileObject, options: copyOptions } of copyTo) {
+                                const keyObject = fileObject ? Cloud.joinPath(pathObject, fileObject, true) : file.name;
+                                tasks.push(client_1.copyObject
+                                    .call(this, credential, bucket, file, bucketName, keyObject, copyOptions)
+                                    .catch(addLog));
+                            }
+                            void Promise.all(tasks);
+                        }
+                        complete(null, url);
                     }
                     if (Path[i]) {
-                        file.setMetadata(params).catch((err) => {
-                            addLog(err);
-                        });
+                        file.setMetadata(params)
+                            .catch(addLog);
                     }
                     if (ACL) {
                         void client_1.setPredefinedAcl.call(this, file.acl, ACL, file.bucket, file.name, revoke || (await file.getMetadata())[0], true);
@@ -338,7 +339,7 @@ function upload(credential, service = 'gcp') {
                 })
                     .catch((err) => {
                     if (first) {
-                        uploadResponse(err);
+                        complete(err);
                     }
                     else {
                         addLog(err);