@pi-r/gcp 0.5.3 → 0.5.4

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Haruhi Suzumiya
+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/client/index.js

@@ -70,7 +70,7 @@ 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;
             }
@@ -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));
@@ -384,7 +385,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];
@@ -712,6 +713,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;
@@ -726,7 +728,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 = [];
@@ -784,7 +786,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/gcp",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "Google (GCP) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,9 +20,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.7.3",
-    "@e-mc/module": "^0.7.3",
-    "@e-mc/types": "^0.7.3",
+    "@e-mc/cloud": "^0.7.5",
+    "@e-mc/module": "^0.7.5",
+    "@e-mc/types": "^0.7.5",
     "@google-cloud/firestore": "^7.6.0",
     "@google-cloud/storage": "^7.9.0"
   }

package/upload/index.js

@@ -44,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[_a = bucketKey = getBucketKey(credential, bucket, bucketAcl)] || (BUCKET_RESPONSE[_a] = 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;
@@ -52,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));
             }

package/types/index.d.ts

@@ -1,36 +0,0 @@
-import type { CloudDatabase, CloudStorage } from '@e-mc/types/lib/cloud';
-
-import type { StorageOptions } from '@google-cloud/storage';
-import type { PathType } from '@google-cloud/datastore';
-import type { entity } from '@google-cloud/datastore/build/src/entity';
-import type { FirebaseOptions as IFirebaseOptions } from '@firebase/app';
-
-// @ts-ignore
-import type { GoogleAuthOptions } from 'google-auth-library';
-
-export type GCPStorage = CloudStorage<GCPStorageCredential, "gcp | gcloud">;
-
-export interface GCPStorageCredential extends StorageOptions, IFirebaseOptions {}
-
-export interface GCPDatabaseQuery<T = PlainObject> extends Omit<CloudDatabase<unknown, T, unknown, unknown[] | StandardMap, GCPDatabaseCredential>, "id"> {
-    source: "cloud";
-    service: "gcp" | "gcloud";
-    product?: "firestore" | "firebase" | "bigquery" | "bigtable" | "datastore" | "spanner";
-    database?: string;
-    id?: ArrayOf<string>;
-    updateType?: 0 | 1 | 2 | 3;
-    columns?: string[];
-    keys?: ArrayOf<DatastoreKey>;
-    kind?: ArrayOf<string>;
-    orderBy?: unknown[][];
-}
-
-export type GCPDatabaseCredential = GoogleAuthOptions;
-
-export interface FirebaseOptions extends IFirebaseOptions {
-    product?: "firebase";
-    admin?: boolean;
-}
-
-export type DatastoreKey = string | PathType[] | entity.KeyOptions;
-export type BucketAcl = "authenticatedRead" | "private" | "projectPrivate" | "publicRead" | "publicReadWrite" | "bucketAccessUniform" | "bucketAccessACL";