@pi-r/gcp 0.8.2 → 0.9.0

package/LICENSE

@@ -1,7 +1,7 @@
-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:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+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:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,7 +1,7 @@
-### @pi-r/gcp
-
-https://e-mc.readthedocs.io/en/latest/cloud/gcp.html
-
-### LICENSE
-
-MIT
+### @pi-r/gcp
+
+https://e-mc.readthedocs.io/en/latest/cloud/gcp.html
+
+### LICENSE
+
+MIT

package/client/index.js

@@ -12,18 +12,19 @@ exports.setBucketTagging = setBucketTagging;
 exports.setBucketWebsite = setBucketWebsite;
 exports.deleteObjects = deleteObjects;
 exports.deleteObjectsV2 = deleteObjectsV2;
+exports.deleteObjectsV3 = deleteObjectsV3;
 exports.executeQuery = executeQuery;
 exports.executeBatchQuery = executeBatchQuery;
 exports.setPublicRead = setPublicRead;
 exports.setPredefinedAcl = setPredefinedAcl;
 exports.createBucketRequest = createBucketRequest;
 exports.getProjectId = getProjectId;
-const path = require("path");
+const path = require("node:path");
 const firestore_1 = require("@google-cloud/firestore");
 const storage_1 = require("@google-cloud/storage");
 const Cloud = require("@e-mc/cloud");
-const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
+const util_1 = require("@e-mc/cloud/util");
 const FIREBASE_DB = {};
 const FIREBASE_STORAGE = {};
 const ADMIN_DB = {};
@@ -316,10 +317,19 @@ async function setBucketWebsite(credential, bucket, options, service = 'gcp') {
         return false;
     });
 }
-async function deleteObjects(credential, Bucket, service) {
-    return deleteObjectsV2.call(this, credential, Bucket, true, service);
+async function deleteObjects(credential, bucket, service, sdk, recursive = true) {
+    return deleteObjectsV2.call(this, credential, bucket, recursive, service);
 }
-async function deleteObjectsV2(credential, bucket, recursive = true, service = 'gcp') {
+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 };
+    let recursive = true;
+    if ('recursive' in options) {
+        recursive = options.recursive;
+        delete options.recursive;
+    }
     const instance = createStorageClient.call(this, credential, bucket);
     const errors = [];
     let promise;
@@ -350,13 +360,13 @@ 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(() => {
+                return client.deleteFiles({ ...options, force: true }).then(() => {
                     this.formatMessage(64, service, "Bucket emptied" + ' (recursive)', bucket, { ...Cloud.LOG_CLOUD_COMMAND });
                 });
             }
             const tasks = [];
             try {
-                const result = await client.getFiles();
+                const result = await client.getFiles(options);
                 for (const { name } of result[0]) {
                     if (!name.includes('/')) {
                         tasks.push(client.file(name).delete({ ignoreNotFound: true }).catch((err) => {
@@ -922,7 +932,7 @@ function setPublicRead(acl, pathname, requested, service = 'gcp') {
     });
 }
 async function setPredefinedAcl(target, value, bucket, pathname = '', metadata = {}, requested = true, service = 'gcp') {
-    let revoke;
+    let revoke = false;
     if (metadata === true) {
         revoke = true;
         metadata = {};

package/download/index.js

@@ -1,10 +1,10 @@
 "use strict";
-const path = require("path");
-const fs = require("fs");
-const https = require("https");
+const path = require("node:path");
+const fs = require("node:fs");
+const https = require("node:https");
 const storage_1 = require("@google-cloud/storage");
-const types_1 = require("@e-mc/types");
 const Cloud = require("@e-mc/cloud");
+const types_1 = require("@e-mc/types");
 const client_1 = require("@pi-r/gcp");
 function download(credential, service = 'gcp') {
     const storage = client_1.createStorageClient.call(this, credential);
@@ -15,7 +15,7 @@ function download(credential, service = 'gcp') {
         const downloadResponse = (err, url = null) => {
             callback(err, url);
             if (tempDir) {
-                queueMicrotask(() => {
+                setImmediate(() => {
                     Cloud.removeDir(tempDir);
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/gcp",
-  "version": "0.8.2",
+  "version": "0.9.0",
   "description": "Google (GCP) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -13,17 +13,16 @@
   },
   "keywords": [
     "squared",
-    "e-mc",
-    "squared-functions"
+    "e-mc"
   ],
   "author": "An Pham <anpham6@gmail.com>",
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.10.2",
-    "@e-mc/module": "^0.10.2",
-    "@e-mc/types": "^0.10.2",
-    "@google-cloud/firestore": "^7.10.0",
-    "@google-cloud/storage": "^7.13.0"
+    "@e-mc/cloud": "^0.11.0",
+    "@e-mc/module": "^0.11.0",
+    "@e-mc/types": "^0.11.0",
+    "@google-cloud/firestore": "^7.11.0",
+    "@google-cloud/storage": "^7.14.0"
   }
 }

package/types/index.d.ts

@@ -1,36 +1,36 @@
-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, string | 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;
+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, string | unknown[] | StandardMap, GCPDatabaseCredential>, "id"> {
+    source: "cloud";
+    service: "gcp" | "gcloud";
+    product?: "firestore" | "firebase" | "bigquery" | "bigtable" | "datastore" | "spanner";
+    database?: string;
+    id?: string | string[];
+    updateType?: 0 | 1 | 2 | 3;
+    columns?: string[];
+    keys?: DatastoreKey | DatastoreKey[];
+    kind?: string | 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";

package/upload/index.js

@@ -1,10 +1,10 @@
 "use strict";
-const path = require("path");
-const fs = require("fs");
-const stream = require("stream");
+const path = require("node:path");
+const fs = require("node:fs");
+const stream = require("node:stream");
 const Cloud = require("@e-mc/cloud");
-const util_1 = require("@e-mc/cloud/util");
 const types_1 = require("@e-mc/types");
+const util_1 = require("@e-mc/cloud/util");
 const client_1 = require("@pi-r/gcp");
 const BUCKET_SESSION = new Set();
 const BUCKET_RESPONSE = {};
@@ -65,9 +65,7 @@ function upload(credential, service = 'gcp') {
                         .then(([response]) => {
                         commandMessage('Retention Policy', response.retentionPolicy?.effectiveTime);
                     })
-                        .catch((err) => {
-                        addLog(err);
-                    });
+                        .catch(addLog);
                 }
                 if ((0, types_1.isObject)(cors)) {
                     bucketClient.setCorsConfiguration(Array.isArray(cors) ? cors : [cors])
@@ -75,12 +73,10 @@ function upload(credential, service = 'gcp') {
                         const length = response.cors?.length;
                         commandMessage('CORS', length ? length + ' rules' : null);
                     })
-                        .catch((err) => {
-                        addLog(err);
-                    });
+                        .catch(addLog);
                 }
                 if ((0, types_1.isObject)(lifecycle)) {
-                    let append;
+                    let append = false;
                     if (Array.isArray(lifecycle)) {
                         if (lifecycle.length === 0) {
                             append = false;
@@ -98,9 +94,7 @@ function upload(credential, service = 'gcp') {
                         const length = response.lifecycle?.rule?.length;
                         commandMessage('Lifecycle', length ? length + ' rules' : null);
                     })
-                        .catch((err) => {
-                        addLog(err);
-                    });
+                        .catch(addLog);
                 }
             }
             if (flags & 4) {
@@ -113,7 +107,7 @@ function upload(credential, service = 'gcp') {
         if (!overwrite && (!listFiles || listFiles.length)) {
             const current = filename;
             const next = (0, util_1.generateFilename)(filename);
-            let i = 0, exists;
+            let i = 0, exists = false;
             do {
                 if (i > 0) {
                     [filename, exists] = next(i);
@@ -271,7 +265,7 @@ function upload(credential, service = 'gcp') {
             else {
                 const params = { ...options };
                 const readable = publicRead || active && publicRead !== false && publicRead !== 0 && !acl;
-                let ACL, revoke, predefined;
+                let ACL, revoke = false, predefined = false;
                 if (first) {
                     params.contentType ||= ContentType[i];
                     if (readable) {