@pi-r/gcp 0.2.2 → 0.2.9

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2020-24 Code Geass
 
 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,5 +1,7 @@
-### @pi-r/gcp
+# @pi-r/gcp
 
-### LICENSE
+PEP 402 - Forever Josee + Nunnally
+
+## LICENSE
 
 MIT

package/client/index.js

@@ -184,7 +184,7 @@ async function createBucketV2(credential, bucket, acl, options, service = 'gcp')
     }
     return storage.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);
         }
@@ -194,7 +194,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;
     });
 }
@@ -205,7 +205,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, util_1.formatError)(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, util_1.formatError)(service, "Bucket does not exist"), { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
         return false;
     }
     const errors = [];
@@ -246,10 +246,10 @@ async function setBucketPolicy(credential, bucket, options, service = 'gcp') {
         errors.push(...await updatePredefinedAcl(client.acl, options.acl, options));
     }
     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;
@@ -266,11 +266,11 @@ 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;
     });
 }
@@ -310,14 +310,14 @@ async function deleteObjectsV2(credential, bucket, recursive = true, service = '
         const client = storage.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.indexOf('/') === -1) {
-                        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 })));
                     }
                 }
             }
@@ -331,7 +331,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;
@@ -341,7 +341,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 => {
@@ -372,7 +372,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];
         if (fs) {
             fs.terminate();
         }
@@ -421,7 +421,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 result[i] = rows;
                 continue;
             }
-            const db = createClient(item, 4 /* DB.BIGTABLE */).instance(name).table(table);
+            const db = createClient(item, 4).instance(name).table(table);
             if (id) {
                 const row = db.row(id);
                 if (Array.isArray(columns)) {
@@ -447,11 +447,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 (cached) {
@@ -461,7 +461,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);
@@ -480,7 +480,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)
@@ -501,7 +501,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         else if (product === 'firebase' || product === 'bigquery' || !product && !table && typeof query === 'string') {
             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 firebaseApp = product === 'firebase' || isFirebaseApp(credential);
             if (cached) {
@@ -544,7 +544,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);
                 }
@@ -562,20 +562,20 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 if (limit > 0) {
                     options.maxResults = limit;
                 }
-                const [job] = await createClient(item, 1 /* DB.BIGQUERY */).createQueryJob(options);
+                const [job] = await createClient(item, 1).createQueryJob(options);
                 [rows] = await job.getQueryResults();
             }
         }
         else if (product === 'datastore' || !product && !table && (keys || query)) {
             if (!keys && !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 (cached && (rows = getCache(queryString = Module.asString(keys || query, true) + Module.asString(item.options, true) + limit))) {
                 result[i] = rows;
                 continue;
             }
-            const db = createClient(item, 2 /* DB.DATASTORE */);
+            const db = createClient(item, 2);
             if (keys) {
                 const items = !Array.isArray(keys) ? db.key(keys) : keys.map((key) => db.key(key));
                 rows = await db.get(items, item.options);
@@ -598,7 +598,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;
                         }
                     }
@@ -612,7 +612,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 (cached) {
                 queryString = table + '_';
@@ -625,7 +625,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                         continue;
                     }
                 }
-                const db = createClient(item, 3 /* DB.FIRESTORE */).collection(table).doc(id);
+                const db = createClient(item, 3).collection(table).doc(id);
                 if ((0, types_1.isPlainObject)(update)) {
                     await db.update(update, { exists: true });
                 }
@@ -639,7 +639,7 @@ 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];
@@ -655,7 +655,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, args.slice(1));
                                 break;
                         }
                     }
@@ -674,12 +674,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);
     }
@@ -691,12 +691,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 });
         }
     });
 }
@@ -778,10 +778,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 });
         }
     });
 }

package/download/index.js

@@ -1,9 +1,8 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
 const https = require("https");
-const client_1 = require("../client");
+const client_1 = require("@pi-r/gcp");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
 const Cloud = require("@e-mc/cloud");
@@ -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.2.2",
+  "version": "0.2.9",
   "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.5.3",
-    "@e-mc/module": "^0.5.3",
-    "@e-mc/types": "^0.5.3",
-    "@google-cloud/firestore": "^6.5.0",
-    "@google-cloud/storage": "^6.10.1"
+    "@e-mc/cloud": "^0.5.5",
+    "@e-mc/module": "^0.5.5",
+    "@e-mc/types": "^0.5.5",
+    "@google-cloud/firestore": "^6.8.0",
+    "@google-cloud/storage": "^6.12.0"
   }
 }

package/upload/index.js

@@ -1,8 +1,7 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
-const client_1 = require("../client");
+const client_1 = require("@pi-r/gcp");
 const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
@@ -72,13 +71,13 @@ 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 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);
+        const getURL = (value) => endpoint ? Module.joinPath(endpoint, value) : Module.joinPath("https://storage.googleapis.com", bucket, value);
         const addLog = (err) => err instanceof Error && this.addLog(this.statusType.WARN, err.message, service + ': ' + bucket);
         if (fileGroup) {
             for (const [content, ext, localFile] of fileGroup) {
@@ -123,7 +122,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);
                     }
@@ -143,7 +142,7 @@ function upload(credential, service = 'gcp') {
                     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 */);
+                            throw new Error("Unable to create temp directory");
                         }
                         outputUri = path.join(tempDir, Key[i]);
                         if (typeof output === 'string') {
@@ -204,7 +203,7 @@ function upload(credential, service = 'gcp') {
                 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 });
+                        this.formatMessage(64, service, "Upload success", url, { ...Cloud.LOG_CLOUD_UPLOAD });
                         if (first) {
                             uploadResponse(null, url);
                         }