@pi-r/gcp 0.11.2 → 0.12.0

package/download/index.js

@@ -1,19 +1,20 @@
 "use strict";
-const path = require("node:path");
-const fs = require("node:fs");
-const stream = require("node:stream");
-const storage_1 = require("@google-cloud/storage");
-const Cloud = require("@e-mc/cloud");
-const types_1 = require("@e-mc/types");
-const util_1 = require("@e-mc/cloud/util");
-const client_1 = require("@pi-r/gcp");
+
+const path = require('node:path');
+const fs = require('node:fs');
+const stream = require('node:stream');
+const { TransferManager } = require('@google-cloud/storage');
+const Cloud = require('@e-mc/cloud');
+const { alignSize, errorValue, getTempDir, isObject } = require('@e-mc/types');
+const { createErrorHandler, intoArray, readableAsBuffer } = require('@e-mc/cloud/util');
+const { copyObject, createStorageClient, isFirebaseApp } = require('@pi-r/gcp');
 function download(credential, service = "gcp") {
-    const storage = client_1.createStorageClient.call(this, credential);
+    const storage = createStorageClient.call(this, credential);
     return (data, callback) => {
         const { bucket: Bucket, download: target } = data;
         const Key = target.keyname || target.filename;
         if (!Bucket || !Key) {
-            callback((0, types_1.errorValue)('Missing property', !Bucket ? 'Bucket' : 'Key'));
+            callback(errorValue('Missing property', !Bucket ? 'Bucket' : 'Key'));
             return;
         }
         const location = Cloud.joinPath(Bucket, Key);
@@ -21,10 +22,10 @@ function download(credential, service = "gcp") {
         const deleteFailed = (err) => {
             this.formatFail(64, service, ["Delete failed", location], err, Cloud.optionsLogMessage('FAIL', { fatal: !!target.active }));
         };
-        if ((0, client_1.isFirebaseApp)(credential, true, true)) {
+        if (isFirebaseApp(credential, true, true)) {
             const { ref, getStream, deleteObject } = require('@firebase/storage');
             const objectRef = ref(storage, Key);
-            (0, util_1.readableAsBuffer)(stream.Readable.from(getStream(objectRef)))
+            readableAsBuffer(stream.Readable.from(getStream(objectRef)))
                 .then(buffer => {
                 callback(null, buffer);
                 if (target.deleteObject) {
@@ -37,33 +38,33 @@ function download(credential, service = "gcp") {
             return;
         }
         const { flags = 0 } = target;
-        const tempDir = (0, types_1.getTempDir)(true, service);
+        const tempDir = getTempDir(true, service);
         const destination = path.join(tempDir, path.basename(target.filename || Key));
         const bucket = storage.bucket(Bucket);
         const file = bucket.file(Key, { generation: target.versionId });
-        const chunkSizeBytes = flags & 4 ? (0, types_1.alignSize)(target.chunkSize, 1024) : 0;
+        const chunkSizeBytes = flags & 4 ? alignSize(target.chunkSize, 1024) : 0;
         const complete = async () => {
             callback(null, destination);
-            const copyTo = (0, util_1.intoArray)(target.copyObject);
+            const copyTo = intoArray(target.copyObject);
             if (copyTo) {
                 const tasks = [];
                 for (const { bucket: bucketName, pathname, filename, options } of copyTo) {
                     const keyObject = filename ? Cloud.joinPath(pathname, filename, true) : Key;
-                    tasks.push(client_1.copyObject
+                    tasks.push(copyObject
                         .call(this, credential, Bucket, file, bucketName, keyObject, options)
-                        .catch((0, util_1.createErrorHandler)(this, service, Bucket)));
+                        .catch(createErrorHandler(this, service, Bucket)));
                 }
                 await Promise.all(tasks);
             }
             const deleteObject = target.deleteObject;
             if (deleteObject) {
-                file.delete((0, types_1.isObject)(deleteObject) ? deleteObject : { ignoreNotFound: true })
+                file.delete(isObject(deleteObject) ? deleteObject : { ignoreNotFound: true })
                     .then(deleteMessage)
                     .catch(deleteFailed);
             }
         };
         if (chunkSizeBytes > 0) {
-            new storage_1.TransferManager(bucket).downloadFileInChunks(file, {
+            new TransferManager(bucket).downloadFileInChunks(file, {
                 destination,
                 chunkSizeBytes,
                 concurrencyLimit: target.chunkLimit || target.options?.concurrencyLimit
@@ -84,4 +85,5 @@ function download(credential, service = "gcp") {
         }
     };
 }
+
 module.exports = download;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/gcp",
-  "version": "0.11.2",
+  "version": "0.12.0",
   "description": "Google (GCP) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -19,10 +19,10 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.13.9",
-    "@e-mc/module": "^0.13.9",
-    "@e-mc/types": "^0.13.9",
-    "@google-cloud/firestore": "^7.11.6",
+    "@e-mc/cloud": "^0.14.0",
+    "@e-mc/module": "^0.14.0",
+    "@e-mc/types": "^0.14.0",
+    "@google-cloud/firestore": "^8.5.0",
     "@google-cloud/storage": "^7.19.0"
   }
 }

package/types/index.d.ts

@@ -2,7 +2,7 @@ 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 { AggregateSpec } from '@google-cloud/firestore';
+import type { AggregateSpec, FieldPath } from '@google-cloud/firestore';
 import type { entity } from '@google-cloud/datastore/build/src/entity';
 import type { FirebaseOptions as IFirebaseOptions } from '@firebase/app';
 import type { ServiceAccount } from 'firebase-admin/app';
@@ -18,13 +18,14 @@ export interface GCPDatabaseQuery<T = PlainObject> extends Omit<CloudDatabase<un
     service: "gcp" | "gcloud";
     product?: "firestore" | "firebase" | "bigquery" | "bigtable" | "datastore" | "spanner";
     database?: string;
-    id?: string | string[] | number;
+    id?: string | string[] | number | boolean;
     updateType?: 0 | 1 | 2 | 3;
     columns?: string[];
     keys?: ArrayOf<DatastoreKey>;
     kind?: string | string[];
-    orderBy?: unknown[][];
+    orderBy?: (string | FieldPath | unknown[])[] | string | FieldPath;
     aggregateSpec?: AggregateSpec;
+    pipeline?: boolean;
     flags?: number;
 }
 

package/upload/index.js

@@ -1,21 +1,22 @@
 "use strict";
-const path = require("node:path");
-const fs = require("node:fs");
-const stream = require("node:stream");
-const storage_1 = require("@google-cloud/storage");
-const Cloud = require("@e-mc/cloud");
-const types_1 = require("@e-mc/types");
-const util_1 = require("@e-mc/cloud/util");
-const client_1 = require("@pi-r/gcp");
+
+const path = require('node:path');
+const fs = require('node:fs');
+const stream = require('node:stream');
+const { TransferManager } = require('@google-cloud/storage');
+const Cloud = require('@e-mc/cloud');
+const { alignSize, createAbortError, isArray, isObject } = require('@e-mc/types');
+const { createErrorHandler, createKeyAndBody, generateFilename, intoArray } = require('@e-mc/cloud/util');
+const { copyObject, createBucketV2, createStorageClient, isFirebaseApp, setPredefinedAcl } = require('@pi-r/gcp');
 const BUCKET_SESSION = new Set();
 const BUCKET_RESPONSE = {};
 const getBucketKey = (credential, bucket, acl = '') => Cloud.asString(credential, true) + bucket + '_' + acl;
 function upload(credential, service = "gcp") {
-    const storage = client_1.createStorageClient.call(this, credential);
+    const storage = createStorageClient.call(this, credential);
     return async (data, callback) => {
-        const firebase = (0, client_1.isFirebaseApp)(credential, true, true);
+        const firebase = isFirebaseApp(credential, true, true);
         const { bucket, localUri } = data;
-        const { pathname, flags = 0, fileGroup, contentType, metadata, endpoint, active, publicRead, acl, admin = {}, overwrite, options } = data.upload;
+        const { pathname, flags = 0, fileGroup, descendantsGroup, contentType, metadata, endpoint, active, publicRead, acl, admin = {}, overwrite, options } = data.upload;
         let filename = data.upload.filename || path.basename(localUri), chunkSizeBytes = 0, bucketClient, bucketKey, listFiles;
         const complete = (err, url) => {
             if (!firebase) {
@@ -26,7 +27,7 @@ function upload(credential, service = "gcp") {
             }
             callback(err, url);
         };
-        const addLog = (0, util_1.createErrorHandler)(this, bucket, service);
+        const addLog = createErrorHandler(this, bucket, service);
         if (firebase) {
             const { ref, listAll } = require('@firebase/storage');
             bucketClient = ref(storage, bucket);
@@ -44,7 +45,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[bucketKey = getBucketKey(credential, bucket, bucketAcl)] ||= client_1.createBucketV2.call(this, credential, bucket, bucketAcl, configBucket?.create);
+                const response = BUCKET_RESPONSE[bucketKey = getBucketKey(credential, bucket, bucketAcl)] ||= createBucketV2.call(this, credential, bucket, bucketAcl, configBucket?.create);
                 if (!await response) {
                     complete(null);
                     return;
@@ -64,7 +65,7 @@ function upload(credential, service = "gcp") {
                     })
                         .catch(addLog);
                 }
-                if ((0, types_1.isObject)(cors)) {
+                if (isObject(cors)) {
                     bucketClient.setCorsConfiguration(Array.isArray(cors) ? cors : [cors])
                         .then(([response]) => {
                         const length = response.cors?.length;
@@ -72,9 +73,9 @@ function upload(credential, service = "gcp") {
                     })
                         .catch(addLog);
                 }
-                if ((0, types_1.isObject)(lifecycle)) {
+                if (isObject(lifecycle)) {
                     let append = false;
-                    if ((0, types_1.isArray)(lifecycle)) {
+                    if (isArray(lifecycle)) {
                         const arg = lifecycle.at(-1);
                         if (typeof arg === 'boolean') {
                             append = arg;
@@ -90,7 +91,7 @@ function upload(credential, service = "gcp") {
                 }
             }
             if (flags & 4) {
-                const chunkSize = (0, types_1.alignSize)(data.upload.chunkSize, 1024);
+                const chunkSize = alignSize(data.upload.chunkSize, 1024);
                 if (chunkSize > 0) {
                     chunkSizeBytes = Math.max(chunkSize, 8388608);
                 }
@@ -98,7 +99,7 @@ function upload(credential, service = "gcp") {
         }
         if (!overwrite && (!listFiles || listFiles.length)) {
             const current = filename;
-            const next = (0, util_1.generateFilename)(filename);
+            const next = generateFilename(filename);
             let i = 0, exists = false;
             do {
                 if (i > 0) {
@@ -156,7 +157,7 @@ function upload(credential, service = "gcp") {
                 }
             }
             if (fileGroup) {
-                const [key, body, type] = (0, util_1.createKeyAndBody)(filename, fileGroup, chunkSizeBytes, addLog, flags);
+                const [key, body, type] = createKeyAndBody(filename, fileGroup, { errorCallback: addLog, descendantsGroup, flags, chunkSize: chunkSizeBytes });
                 Key.push(...key);
                 ContentType.push(...type);
                 for (let i = 0; i < body.length; ++i) {
@@ -177,7 +178,7 @@ function upload(credential, service = "gcp") {
             try {
                 Stream.push(data.buffer.length > 0 ? stream.Readable.from(data.buffer) : fs.createReadStream(localUri, { signal: this.signal }));
                 if (fileGroup) {
-                    const [key, body, type] = (0, util_1.createKeyAndBody)(filename, fileGroup, 0, addLog, 2);
+                    const [key, body, type] = createKeyAndBody(filename, fileGroup, { errorCallback: addLog, descendantsGroup, flags: 2 });
                     Key.push(...key);
                     Stream.push(...body);
                     ContentType.push(...type);
@@ -189,7 +190,7 @@ function upload(credential, service = "gcp") {
             }
         }
         else if (fileGroup) {
-            const [key, body, type] = (0, util_1.createKeyAndBody)(filename, fileGroup, 0, addLog);
+            const [key, body, type] = createKeyAndBody(filename, fileGroup, { errorCallback: addLog, descendantsGroup });
             Key.push(...key);
             Body.push(...body);
             ContentType.push(...type);
@@ -211,7 +212,7 @@ function upload(credential, service = "gcp") {
             const first = i === 0;
             if (this.aborted) {
                 if (first) {
-                    complete((0, types_1.createAbortError)());
+                    complete(createAbortError());
                 }
                 return;
             }
@@ -266,7 +267,7 @@ function upload(credential, service = "gcp") {
                     else {
                         predefined = true;
                     }
-                    if ((0, types_1.isObject)(metadata)) {
+                    if (isObject(metadata)) {
                         params.metadata = metadata;
                     }
                 }
@@ -293,7 +294,7 @@ function upload(credential, service = "gcp") {
                 const file = bucketClient.file(destination, params);
                 let uploadClient;
                 if (Path[i]) {
-                    uploadClient = new storage_1.TransferManager(bucketClient).uploadFileInChunks(Path[i], { uploadName: destination, chunkSizeBytes, headers, concurrencyLimit: data.upload.chunkLimit || concurrencyLimit, maxQueueSize });
+                    uploadClient = new TransferManager(bucketClient).uploadFileInChunks(Path[i], { uploadName: destination, chunkSizeBytes, headers, concurrencyLimit: data.upload.chunkLimit || concurrencyLimit, maxQueueSize });
                 }
                 else {
                     params.resumable ??= false;
@@ -316,12 +317,12 @@ function upload(credential, service = "gcp") {
                     const url = getURL(file.name);
                     this.formatMessage(64, service, "Upload success", url, Cloud.optionsLogMessage('UPLOAD'));
                     if (first) {
-                        const copyTo = (0, util_1.intoArray)(data.upload.copyObject);
+                        const copyTo = intoArray(data.upload.copyObject);
                         if (copyTo) {
                             const tasks = [];
                             for (const { bucket: bucketName, pathname: pathObject = pathname, filename: fileObject, options: copyOptions } of copyTo) {
                                 const keyObject = fileObject ? Cloud.joinPath(pathObject, fileObject, true) : file.name;
-                                tasks.push(client_1.copyObject
+                                tasks.push(copyObject
                                     .call(this, credential, bucket, file, bucketName, keyObject, copyOptions)
                                     .catch(addLog));
                             }
@@ -334,7 +335,7 @@ function upload(credential, service = "gcp") {
                             .catch(addLog);
                     }
                     if (ACL) {
-                        void client_1.setPredefinedAcl.call(this, file.acl, ACL, file.bucket, file.name, revoke || (await file.getMetadata())[0], true);
+                        void setPredefinedAcl.call(this, file.acl, ACL, file.bucket, file.name, revoke || (await file.getMetadata())[0], true);
                     }
                 })
                     .catch((err) => {
@@ -349,4 +350,5 @@ function upload(credential, service = "gcp") {
         }
     };
 }
+
 module.exports = upload;