@pi-r/gcp 0.6.5 → 0.6.7

package/client/index.js

@@ -1,5 +1,4 @@
 "use strict";
-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");
@@ -70,7 +69,7 @@ async function updatePredefinedAcl(acl, values, metadata = {}) {
         let defaultObjectAcl;
         ({ projectNumber, defaultObjectAcl } = metadata);
         if (projectNumber === undefined && (0, types_1.isArray)(defaultObjectAcl)) {
-            const target = defaultObjectAcl.find(item => item.projectTeam?.projectNumber);
+            const target = defaultObjectAcl.find(item => { var _a; return (_a = item.projectTeam) === null || _a === void 0 ? void 0 : _a.projectNumber; });
             if (target !== undefined) {
                 projectNumber = target.projectTeam.projectNumber;
             }
@@ -117,7 +116,8 @@ function validateStorage(credential) {
 }
 exports.validateStorage = validateStorage;
 function validateDatabase(credential, data) {
-    return (hasKeyFile(credential) || !!credential.authClient) && !!(data.product || data.database || data.table || data.query || data.id || data.keys || data.kind || data.options?.query) || isFirebaseApp(credential);
+    var _a;
+    return (hasKeyFile(credential) || !!credential.authClient) && !!(data.product || data.database || data.table || data.query || data.id || data.keys || data.kind || ((_a = data.options) === null || _a === void 0 ? void 0 : _a.query)) || isFirebaseApp(credential);
 }
 exports.validateDatabase = validateDatabase;
 function createStorageClient(credential, bucket) {
@@ -210,6 +210,7 @@ async function createBucketV2(credential, bucket, acl, options, service = 'gcp')
 }
 exports.createBucketV2 = createBucketV2;
 async function setBucketPolicy(credential, bucket, options, service = 'gcp') {
+    var _a;
     if (isFirebaseApp(credential, true, true)) {
         return false;
     }
@@ -226,7 +227,7 @@ async function setBucketPolicy(credential, bucket, options, service = 'gcp') {
             case 'private':
             case 'projectPrivate':
                 await client.makePrivate(options).catch(err => !isErrorConflict(err) && errors.push(err));
-                await setPredefinedAcl.call(this, client.acl, acl, client, '', options.bucket?.metadata).catch(err => errors.push(err));
+                await setPredefinedAcl.call(this, client.acl, acl, client, '', (_a = options.bucket) === null || _a === void 0 ? void 0 : _a.metadata).catch(err => errors.push(err));
                 break;
             case 'authenticatedRead':
                 await client.makePublic(options).catch(err => !isErrorConflict(err) && errors.push(err));
@@ -367,6 +368,7 @@ async function executeQuery(credential, data, sessionKey) {
 }
 exports.executeQuery = executeQuery;
 async function executeBatchQuery(credential, batch, sessionKey) {
+    var _a;
     const length = batch.length;
     const result = new Array(length);
     const clients = [];
@@ -384,7 +386,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     };
     const closeClient = () => {
         const fs = clients[3];
-        fs?.terminate();
+        fs === null || fs === void 0 ? void 0 : fs.terminate();
     };
     const getFamily = (data, row, family) => {
         const familyData = data[family];
@@ -574,7 +576,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 });
             }
         }
-        else if (product === 'bigquery' || !product && (!name && database && table || (0, types_1.isString)(query) || (0, types_1.isString)(item.options?.query))) {
+        else if (product === 'bigquery' || !product && (!name && database && table || (0, types_1.isString)(query) || (0, types_1.isString)((_a = item.options) === null || _a === void 0 ? void 0 : _a.query))) {
             const { params, options = {} } = item;
             if ((0, types_1.isString)(query)) {
                 options.query = query;
@@ -792,6 +794,7 @@ function setPublicRead(acl, pathname, requested, service = 'gcp') {
 }
 exports.setPublicRead = setPublicRead;
 async function setPredefinedAcl(target, value, bucket, pathname = '', metadata = {}, requested = true, service = 'gcp') {
+    var _a;
     let revoke;
     if (metadata === true) {
         revoke = true;
@@ -806,7 +809,7 @@ async function setPredefinedAcl(target, value, bucket, pathname = '', metadata =
             items = [{ entity: 'allUsers' }, { entity: 'allAuthenticatedUsers', role: revoke ? undefined : 'READER' }];
             break;
         default: {
-            const owner = metadata.owner?.entity;
+            const owner = (_a = metadata.owner) === null || _a === void 0 ? void 0 : _a.entity;
             let acl = metadata.acl;
             if ((0, types_1.isArray)(acl)) {
                 items = [];
@@ -864,7 +867,7 @@ async function setPredefinedAcl(target, value, bucket, pathname = '', metadata =
             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, service, [(revoke ? 'Revoke' : 'Grant') + ' ' + value, bucket?.name], pathname, { ...Cloud.LOG_CLOUD_COMMAND });
+            this.formatMessage(64, service, [(revoke ? 'Revoke' : 'Grant') + ' ' + value, bucket === null || bucket === void 0 ? void 0 : bucket.name], pathname, { ...Cloud.LOG_CLOUD_COMMAND });
         }
     });
 }

package/download/index.js

@@ -6,7 +6,7 @@ const types_1 = require("@e-mc/types");
 const Module = require("@e-mc/module");
 const Cloud = require("@e-mc/cloud");
 const client_1 = require("@pi-r/gcp");
-function download(credential, service = 'gcp') {
+module.exports = function download(credential, service = 'gcp') {
     const storage = client_1.createStorageClient.call(this, credential);
     return (data, callback) => {
         const { bucket: Bucket, download: target } = data;
@@ -76,6 +76,4 @@ function download(credential, service = 'gcp') {
                 .catch(err => downloadResponse(err));
         }
     };
-}
-
-module.exports = download;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/gcp",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "description": "Google (GCP) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,10 +20,10 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@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"
+    "@e-mc/cloud": "^0.8.8",
+    "@e-mc/module": "^0.8.8",
+    "@e-mc/types": "^0.8.8",
+    "@google-cloud/firestore": "^7.6.0",
+    "@google-cloud/storage": "^7.9.0"
   }
 }

package/upload/index.js

@@ -8,10 +8,11 @@ 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;
-function upload(credential, service = 'gcp') {
+module.exports = function upload(credential, service = 'gcp') {
     const storage = client_1.createStorageClient.call(this, credential);
     return async (data, callback) => {
         var _a;
+        var _b;
         const firebase = (0, client_1.isFirebaseApp)(credential, true, true);
         const { bucket, localUri } = data;
         const { pathname = '', fileGroup, contentType, metadata, endpoint, active, publicRead, acl, admin = {}, overwrite, options } = data.upload;
@@ -43,7 +44,7 @@ function upload(credential, service = 'gcp') {
             const configBucket = admin.configBucket;
             if (!BUCKET_SESSION.has(bucket)) {
                 const bucketAcl = admin.publicRead ? 'publicRead' : admin.acl;
-                const response = BUCKET_RESPONSE[_a = bucketKey = getBucketKey(credential, bucket, bucketAcl)] || (BUCKET_RESPONSE[_a] = client_1.createBucketV2.call(this, credential, bucket, bucketAcl, configBucket?.create || (0, client_1.createBucketRequest)(credential)));
+                const response = BUCKET_RESPONSE[_b = bucketKey = getBucketKey(credential, bucket, bucketAcl)] || (BUCKET_RESPONSE[_b] = client_1.createBucketV2.call(this, credential, bucket, bucketAcl, (configBucket === null || configBucket === void 0 ? void 0 : configBucket.create) || (0, client_1.createBucketRequest)(credential)));
                 if (!await response) {
                     uploadResponse(null);
                     return;
@@ -51,11 +52,12 @@ function upload(credential, service = 'gcp') {
                 BUCKET_SESSION.add(bucket);
             }
             bucketClient = storage.bucket(bucket);
-            const retentionPolicy = configBucket?.retentionPolicy;
+            const retentionPolicy = configBucket === null || configBucket === void 0 ? void 0 : configBucket.retentionPolicy;
             if (typeof retentionPolicy === 'number') {
                 bucketClient.setRetentionPeriod(retentionPolicy)
                     .then(([response]) => {
-                    this.formatMessage(64, service, ["Bucket configured" + ' (retention policy)', bucket], response.retentionPolicy?.effectiveTime, { ...Cloud.LOG_CLOUD_COMMAND });
+                    var _a;
+                    this.formatMessage(64, service, ["Bucket configured" + ' (retention policy)', bucket], (_a = response.retentionPolicy) === null || _a === void 0 ? void 0 : _a.effectiveTime, { ...Cloud.LOG_CLOUD_COMMAND });
                 })
                     .catch(err => addLog(err));
             }
@@ -167,7 +169,7 @@ function upload(credential, service = 'gcp') {
                         params.predefinedAcl = acl;
                     }
                 }
-                params.resumable ?? (params.resumable = false);
+                (_a = params.resumable) !== null && _a !== void 0 ? _a : (params.resumable = false);
                 const file = bucketClient.file(destination);
                 file.save(Body[i], params).then(async () => {
                     const url = getURL(file.name);
@@ -190,6 +192,4 @@ function upload(credential, service = 'gcp') {
             }
         }
     };
-}
-
-module.exports = upload;
+};