@pi-r/gcp 0.6.2 → 0.6.5

package/LICENSE

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

package/README.md

@@ -1,7 +1,10 @@
-### @pi-r/gcp
+# @pi-r/gcp
 
-https://e-mc.readthedocs.io/en/latest/cloud/gcp.html
+## Documentation
 
-### LICENSE
+- [E-mc](https://e-mc.readthedocs.io/en/latest/cloud/gcp.html)
+- [squared](https://squared.readthedocs.io)
+
+## LICENSE
 
 MIT

package/client/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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");
+const firestore_1 = require("@google-cloud/firestore");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
@@ -135,7 +135,7 @@ function createStorageClient(credential, bucket) {
             throw err;
         }
     }
-    getProjectId(credential);
+    getProjectId(credential, false);
     return new storage.Storage(credential);
 }
 exports.createStorageClient = createStorageClient;
@@ -144,13 +144,13 @@ function createDatabaseClient(credential, data) {
     try {
         let product, name, database, table, query;
         if (data) {
-            ({ product, name, table, query } = data);
+            ({ product, name, table, query, database } = data);
         }
         if (product === 'firebase' || isFirebaseApp(credential)) {
             packageName = getFirebasePackageName(credential);
             return getApp(credential, true);
         }
-        getProjectId(credential);
+        getProjectId(credential, true);
         if (data) {
             if (product === 'spanner' || !product && name && database && (query || table)) {
                 const { Spanner } = require(packageName = '@google-cloud/spanner');
@@ -174,7 +174,7 @@ function createDatabaseClient(credential, data) {
         this.checkPackage(err, packageName, { passThrough: true });
         throw err;
     }
-    return new firestore.Firestore(credential);
+    return new firestore_1.Firestore(credential);
 }
 exports.createDatabaseClient = createDatabaseClient;
 async function createBucket(credential, bucket, publicRead, service = 'gcp') {
@@ -194,7 +194,7 @@ async function createBucketV2(credential, bucket, acl, options, service = 'gcp')
     }
     return instance.createBucket(bucket, options)
         .then(async ([target]) => {
-        this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket created" /* VAL_CLOUD.CREATE_BUCKET */, bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
+        this.formatMessage(64, service, ["Bucket created", bucket], '', { ...Cloud.LOG_CLOUD_COMMAND });
         if (acl) {
             await setBucketPolicy.call(this, credential, bucket, { acl, bucket: target }, service);
         }
@@ -204,7 +204,7 @@ 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 /* LOG_TYPE.CLOUD */, service, ["Unable to create bucket" /* ERR_CLOUD.CREATE_BUCKET */, bucket], err, { ...Cloud.LOG_CLOUD_FAIL });
+        this.formatFail(64, service, ["Unable to create bucket", bucket], err, { ...Cloud.LOG_CLOUD_FAIL });
         return false;
     });
 }
@@ -215,7 +215,7 @@ async function setBucketPolicy(credential, bucket, options, service = 'gcp') {
     }
     const client = createStorageClient.call(this, credential, bucket).bucket(bucket);
     if (!await hasBucket(client)) {
-        this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Bucket does not exist" /* ERR_CLOUD.EXISTS_BUCKET */, bucket], (0, types_1.errorMessage)(service, "Bucket does not exist" /* ERR_CLOUD.EXISTS_BUCKET */), { ...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.LOG_CLOUD_FAIL, fatal: false });
         return false;
     }
     const errors = [];
@@ -256,10 +256,10 @@ async function setBucketPolicy(credential, bucket, options, service = 'gcp') {
         errors.push(...await updatePredefinedAcl(client.acl, options.acl, options.metadata));
     }
     if (errors.length) {
-        this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Unable to update bucket policy" /* ERR_CLOUD.POLICY_BUCKET */, bucket], errors[0], { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+        this.formatFail(64, service, ["Unable to update bucket policy", bucket], errors[0], { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
         return false;
     }
-    this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket ACL configured" /* VAL_CLOUD.ACL_BUCKET */, 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.LOG_CLOUD_COMMAND });
     return true;
 }
 exports.setBucketPolicy = setBucketPolicy;
@@ -277,11 +277,11 @@ async function setBucketWebsite(credential, bucket, options, service = 'gcp') {
     }
     return createStorageClient.call(this, credential, bucket).bucket(bucket).setMetadata({ website })
         .then(() => {
-        this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /* VAL_CLOUD.CONFIGURE_BUCKET */, bucket], website, { ...Cloud.LOG_CLOUD_COMMAND });
+        this.formatMessage(64, service, ["Bucket configured", bucket], website, { ...Cloud.LOG_CLOUD_COMMAND });
         return true;
     })
         .catch(err => {
-        this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Unable to configure bucket" /* ERR_CLOUD.CONFIGURE_BUCKET */, bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
+        this.formatFail(64, service, ["Unable to configure bucket", bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
         return false;
     });
 }
@@ -321,14 +321,14 @@ 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 /* LOG_TYPE.CLOUD */, service, "Bucket emptied" /* VAL_CLOUD.EMPTY_BUCKET */ + ' (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 /* LOG_TYPE.CLOUD */, service, ["Delete failed" /* ERR_CLOUD.DELETE_FAIL */, 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 })));
                     }
                 }
             }
@@ -342,7 +342,7 @@ async function deleteObjectsV2(credential, bucket, recursive = true, service = '
     }
     const checkErrors = () => {
         if (errors.length) {
-            this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Unable to empty bucket" /* ERR_CLOUD.DELETE_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.LOG_CLOUD_FAIL, fatal: false });
             return true;
         }
         return false;
@@ -352,7 +352,7 @@ async function deleteObjectsV2(credential, bucket, recursive = true, service = '
             errors.push(...result.filter(item => item.status === 'rejected').map((item) => item.reason));
             if (!checkErrors()) {
                 const files = result.length + ' files';
-                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket emptied" /* VAL_CLOUD.EMPTY_BUCKET */ + ` (${recursive ? 'recursive' : files})`, bucket], recursive ? files : '', { ...Cloud.LOG_CLOUD_COMMAND });
+                this.formatMessage(64, service, ["Bucket emptied" + ` (${recursive ? 'recursive' : files})`, bucket], recursive ? files : '', { ...Cloud.LOG_CLOUD_COMMAND });
             }
         })
             .catch(err => {
@@ -383,7 +383,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         return (clients[type] = createDatabaseClient.call(this, item, data));
     };
     const closeClient = () => {
-        const fs = clients[3 /* DB.FIRESTORE */];
+        const fs = clients[3];
         fs?.terminate();
     };
     const getFamily = (data, row, family) => {
@@ -420,7 +420,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         if (product === 'firebase' || isFirebaseApp(credential)) {
             if (!(0, types_1.isString)(query)) {
                 closeClient();
-                throw (0, util_1.formatError)(item, "Missing database query" /* ERR_DB.QUERY */);
+                throw (0, util_1.formatError)(item, "Missing database query");
             }
             const orderBy = item.orderBy;
             if (useCache) {
@@ -462,7 +462,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                     }
                 }
             }
-            const db = createClient(item, 0 /* DB.FIREBASE */);
+            const db = createClient(item, 0);
             if ((0, types_1.isPlainObject)(update)) {
                 await updateDB(ref(db, query), update);
             }
@@ -477,11 +477,11 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             const columns = (0, types_1.isPlainObject)(query) && query.columns || item.columns;
             if (!(query || table && columns)) {
                 closeClient();
-                throw (0, util_1.formatError)(item, "Missing database query" /* ERR_DB.QUERY */);
+                throw (0, util_1.formatError)(item, "Missing database query");
             }
             if (!name || !database) {
                 closeClient();
-                throw (0, util_1.formatError)(item, !name ? "Missing instance name" /* ERR_DB.INSTANCE */ : "Missing database name" /* ERR_DB.NAME */);
+                throw (0, util_1.formatError)(item, !name ? "Missing instance name" : "Missing database name");
             }
             const { updateType, options = {} } = item;
             if (useCache) {
@@ -491,7 +491,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                     continue;
                 }
             }
-            const db = createClient(item, 5 /* DB.SPANNER */).instance(name).database(database, options.databasePool, options.databaseQuery);
+            const db = createClient(item, 5).instance(name).database(database, options.databasePool, options.databaseQuery);
             if (table) {
                 if ((0, types_1.isPlainObject)(update)) {
                     await db.table(table)[updateType === 1 ? 'insert' : updateType === 2 ? 'replace' : 'update'](update, options.tableUpdate);
@@ -512,7 +512,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                     await new Promise((resolve, reject) => {
                         db.runTransaction((err, transaction) => {
                             if (err || !transaction) {
-                                reject(err || new Error("Unknown" /* ERR_MESSAGE.UNKNOWN */));
+                                reject(err || new Error("Unknown"));
                             }
                             else {
                                 transaction.runUpdate(update)
@@ -533,7 +533,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         else if (product === 'bigtable' || !product && name && table && !database) {
             if (!name || !table) {
                 closeClient();
-                throw (0, util_1.formatError)(item, !name ? "Missing database name" /* ERR_DB.NAME */ : "Missing database table" /* ERR_DB.TABLE */);
+                throw (0, util_1.formatError)(item, !name ? "Missing database name" : "Missing database table");
             }
             const { columns, options = {} } = item;
             if ((0, types_1.isObject)(query)) {
@@ -549,7 +549,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                     continue;
                 }
             }
-            const db = createClient(item, 4 /* DB.BIGTABLE */).instance(name).table(table);
+            const db = createClient(item, 4).instance(name).table(table);
             if ((0, types_1.isString)(id)) {
                 const row = db.row(id);
                 if (update) {
@@ -592,7 +592,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                     continue;
                 }
             }
-            const instance = createClient(item, 1 /* DB.BIGQUERY */);
+            const instance = createClient(item, 1);
             let job;
             if (database) {
                 const dataset = instance.dataset(database);
@@ -617,7 +617,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             const { keys, kind } = item;
             if (!keys && !kind && !Array.isArray(query)) {
                 closeClient();
-                throw (0, util_1.formatError)(item, "Missing database query" /* ERR_DB.QUERY */);
+                throw (0, util_1.formatError)(item, "Missing database query");
             }
             if (useCache) {
                 queryString = (keys ? Cloud.asString(keys, true) : (kind ? (name ? name + '_' : '') + Cloud.asString(kind, true) : '') + (limit > 0 ? '_' + limit : 0) + Cloud.asString(query, true)) + Cloud.asString(item.options, true);
@@ -626,7 +626,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                     continue;
                 }
             }
-            const db = createClient(item, 2 /* DB.DATASTORE */);
+            const db = createClient(item, 2);
             if (keys) {
                 const items = !Array.isArray(keys) || !Array.isArray(keys[0]) ? db.key(keys) : keys.map((key) => db.key(key));
                 if ((0, types_1.isPlainObject)(update)) {
@@ -652,7 +652,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                                 case 'order':
                                 case 'select':
                                 case 'start':
-                                    task[method].apply(task, args.slice(1)); // eslint-disable-line prefer-spread
+                                    task[method].apply(task, args.slice(1));
                                     break;
                                 case 'hasAncestor':
                                     task.hasAncestor(db.key(args[1]));
@@ -684,7 +684,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         else if (product === 'firestore' || !product && table) {
             if (!table) {
                 closeClient();
-                throw (0, util_1.formatError)(item, "Missing database table" /* ERR_DB.TABLE */);
+                throw (0, util_1.formatError)(item, "Missing database table");
             }
             if (id) {
                 if (useCache) {
@@ -694,13 +694,13 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                         continue;
                     }
                 }
-                const db = createClient(item, 3 /* DB.FIRESTORE */);
+                const db = createClient(item, 3);
                 if (Array.isArray(id)) {
                     const items = id.map(ref => db.doc(table + '/' + ref));
                     if ((0, types_1.isPlainObject)(item.options)) {
                         items.push(item.options);
                     }
-                    rows = await db.getAll(...items);
+                    rows = (await db.getAll(...items)).filter(value => value.exists).map(value => value.data());
                 }
                 else {
                     const doc = db.collection(table).doc(id);
@@ -719,11 +719,21 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                     result[i] = rows;
                     continue;
                 }
-                let db = createClient(item, 3 /* DB.FIRESTORE */).collection(table);
+                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 => Array.isArray(p))) {
+                                    db = db.where(firestore_1.Filter[method === 'whereAnd' ? 'and' : 'or'](...params.map((p) => firestore_1.Filter.where(p[0], p[1], p[2]))));
+                                }
+                                else {
+                                    throw (0, types_1.errorMessage)(method, 'Conditionals are not in array format', Cloud.asString(params));
+                                }
+                                break;
                             case 'endAt':
                             case 'endBefore':
                             case 'limit':
@@ -735,7 +745,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                             case 'startAt':
                             case 'where':
                             case 'withConverter':
-                                db = db[method].apply(db, args.slice(1)); // eslint-disable-line prefer-spread
+                                db = db[method].apply(db, params);
                                 break;
                         }
                     }
@@ -754,12 +764,12 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             }
             else {
                 closeClient();
-                throw (0, util_1.formatError)(item, "Missing database query" /* ERR_DB.QUERY */);
+                throw (0, util_1.formatError)(item, "Missing database query");
             }
         }
         else {
             closeClient();
-            throw (0, util_1.formatError)(item, "Missing database product" /* ERR_DB.PRODUCT */);
+            throw (0, util_1.formatError)(item, "Missing database product");
         }
         result[i] = this.setQueryResult(service, credential, queryString, rows, cacheValue);
     }
@@ -771,12 +781,12 @@ function setPublicRead(acl, pathname, requested, service = 'gcp') {
     acl.add({ entity: 'allUsers', role: 'READER' })
         .then(() => {
         if (requested) {
-            this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Grant public-read" /* VAL_CLOUD.PUBLIC_READ */, pathname, { ...Cloud.LOG_CLOUD_COMMAND });
+            this.formatMessage(64, service, "Grant public-read", pathname, { ...Cloud.LOG_CLOUD_COMMAND });
         }
     })
         .catch(err => {
         if (requested) {
-            this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Unable to grant public-read" /* ERR_CLOUD.PUBLIC_READ */, pathname], err, { ...Cloud.LOG_CLOUD_WARN });
+            this.formatMessage(64, service, ["Unable to grant public-read", pathname], err, { ...Cloud.LOG_CLOUD_WARN });
         }
     });
 }
@@ -851,10 +861,10 @@ async function setPredefinedAcl(target, value, bucket, pathname = '', metadata =
     }
     return updatePredefinedAcl(target, items, metadata).then(errors => {
         if (errors.length) {
-            this.formatMessage(64 /* LOG_TYPE.CLOUD */, 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 ? bucket.name + '/' + pathname : bucket ? bucket.name : pathname], errors[0], { ...Cloud.LOG_CLOUD_WARN });
         }
         else if (requested && (bucket || pathname)) {
-            this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, [(revoke ? 'Revoke' : 'Grant') + ' ' + value, bucket?.name], pathname, { ...Cloud.LOG_CLOUD_COMMAND });
+            this.formatMessage(64, service, [(revoke ? 'Revoke' : 'Grant') + ' ' + value, bucket?.name], pathname, { ...Cloud.LOG_CLOUD_COMMAND });
         }
     });
 }
@@ -888,19 +898,24 @@ function createBucketRequest(credential) {
     return options;
 }
 exports.createBucketRequest = createBucketRequest;
-function getProjectId(credential) {
+function getProjectId(credential, cache) {
+    let projectId = credential.projectId;
+    if (!cache && 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 (pathname && Cloud.isPath(pathname = path.resolve(pathname)) || (pathname = process.env.GOOGLE_APPLICATION_CREDENTIALS) && Cloud.isPath(pathname = path.resolve(pathname))) {
         if (credential.keyFilename) {
             credential.keyFilename = pathname;
         }
         else {
             credential.keyFile = pathname;
         }
-        if (!credential.projectId) {
+        if (!projectId) {
             try {
-                const projectId = require(pathname).project_id;
-                if ((0, types_1.isString)(projectId)) {
+                const id = require(pathname).project_id;
+                if ((0, types_1.isString)(id)) {
+                    projectId = id;
                     credential.projectId = projectId;
                 }
             }
@@ -908,6 +923,6 @@ function getProjectId(credential) {
             }
         }
     }
-    return credential.projectId;
+    return projectId;
 }
 exports.getProjectId = getProjectId;

package/download/index.js

@@ -1,12 +1,11 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
 const https = require("https");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
 const Cloud = require("@e-mc/cloud");
-const client_1 = require("../client");
+const client_1 = require("@pi-r/gcp");
 function download(credential, service = 'gcp') {
     const storage = client_1.createStorageClient.call(this, credential);
     return (data, callback) => {
@@ -25,12 +24,12 @@ function download(credential, service = 'gcp') {
             return;
         }
         if (!(tempDir = this.getTempDir({ uuidDir: true }))) {
-            downloadResponse(new Error("Unable to create temp directory" /* ERR_CLOUD.TEMP_DIR */));
+            downloadResponse(new Error("Unable to create temp directory"));
             return;
         }
         const location = Module.joinPath(Bucket, Key);
         const destination = path.join(tempDir, path.basename(Key));
-        const deleteMessage = () => this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Delete success" /* VAL_CLOUD.DELETE_FILE */, location, { ...Cloud.LOG_CLOUD_DELETE });
+        const deleteMessage = () => this.formatMessage(64, service, "Delete success", location, { ...Cloud.LOG_CLOUD_DELETE });
         if (firebase) {
             const { ref, getDownloadURL, deleteObject } = require('@firebase/storage');
             const objectRef = ref(storage, Key);
@@ -45,7 +44,7 @@ function download(credential, service = 'gcp') {
                             if (target.deleteObject) {
                                 deleteObject(objectRef)
                                     .then(() => deleteMessage())
-                                    .catch(err => this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Delete failed" /* ERR_CLOUD.DELETE_FAIL */, location], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active }));
+                                    .catch(err => this.formatFail(64, service, ["Delete failed", location], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active }));
                             }
                         })
                             .on('error', err => downloadResponse(err)));
@@ -69,7 +68,7 @@ function download(credential, service = 'gcp') {
                             deleteMessage();
                         }
                         else {
-                            this.formatFail(64 /* LOG_TYPE.CLOUD */, service, ["Delete failed" /* ERR_CLOUD.DELETE_FAIL */, location], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active });
+                            this.formatFail(64, service, ["Delete failed", location], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: !!target.active });
                         }
                     });
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/gcp",
-  "version": "0.6.2",
+  "version": "0.6.5",
   "description": "Google (GCP) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/cloud/gcp"
   },
   "keywords": [
@@ -20,10 +20,10 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.8.2",
-    "@e-mc/module": "^0.8.2",
-    "@e-mc/types": "^0.8.2",
-    "@google-cloud/firestore": "^7.2.0",
+    "@e-mc/cloud": "^0.8.6",
+    "@e-mc/module": "^0.8.6",
+    "@e-mc/types": "^0.8.6",
+    "@google-cloud/firestore": "^7.3.1",
     "@google-cloud/storage": "^7.7.0"
   }
 }

package/upload/index.js

@@ -1,11 +1,10 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
 const Cloud = require("@e-mc/cloud");
-const client_1 = require("../client");
+const client_1 = require("@pi-r/gcp");
 const BUCKET_SESSION = new Set();
 const BUCKET_RESPONSE = {};
 const getBucketKey = (credential, bucket, acl = '') => Module.asString(credential, true) + bucket + '_' + acl;
@@ -56,7 +55,7 @@ function upload(credential, service = 'gcp') {
             if (typeof retentionPolicy === 'number') {
                 bucketClient.setRetentionPeriod(retentionPolicy)
                     .then(([response]) => {
-                    this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["Bucket configured" /* VAL_CLOUD.CONFIGURE_BUCKET */ + ' (retention policy)', bucket], response.retentionPolicy?.effectiveTime, { ...Cloud.LOG_CLOUD_COMMAND });
+                    this.formatMessage(64, service, ["Bucket configured" + ' (retention policy)', bucket], response.retentionPolicy?.effectiveTime, { ...Cloud.LOG_CLOUD_COMMAND });
                 })
                     .catch(err => addLog(err));
             }
@@ -81,10 +80,10 @@ function upload(credential, service = 'gcp') {
                 }
             } while (exists && ++i);
             if (i > 0) {
-                this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, ["File renamed" /* VAL_CLOUD.RENAME_FILE */, current], filename, { ...Cloud.LOG_CLOUD_WARN });
+                this.formatMessage(64, service, ["File renamed", 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 getURL = (value) => endpoint ? Module.joinPath(endpoint, value) : Module.joinPath("https://storage.googleapis.com", bucket, value);
         const Key = [filename];
         const Body = [data.buffer];
         const ContentType = [contentType];
@@ -118,7 +117,7 @@ function upload(credential, service = 'gcp') {
                 uploadBytes(ref(bucketClient, destination), Body[i], params)
                     .then(() => {
                     const url = getURL(destination);
-                    this.formatMessage(64 /* LOG_TYPE.CLOUD */, service, "Upload success" /* VAL_CLOUD.UPLOAD_FILE */, url, { ...Cloud.LOG_CLOUD_UPLOAD });
+                    this.formatMessage(64, service, "Upload success", url, { ...Cloud.LOG_CLOUD_UPLOAD });
                     if (first) {
                         uploadResponse(null, url);
                     }
@@ -172,7 +171,7 @@ function upload(credential, service = 'gcp') {
                 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 });
+                    this.formatMessage(64, service, "Upload success", url, { ...Cloud.LOG_CLOUD_UPLOAD });
                     if (first) {
                         uploadResponse(null, url);
                     }