@pi-r/gcp 0.12.0 → 0.12.2

package/download/index.js

@@ -37,12 +37,12 @@ function download(credential, service = "gcp") {
                 .catch(callback);
             return;
         }
-        const { flags = 0 } = target;
+        const { encryptionKey, flags = 0 } = target;
         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 ? alignSize(target.chunkSize, 1024) : 0;
+        const chunkSizeBytes = (flags & 4) && !encryptionKey ? alignSize(target.chunkSize, 1024) : 0;
         const complete = async () => {
             callback(null, destination);
             const copyTo = intoArray(target.copyObject);
@@ -72,13 +72,16 @@ function download(credential, service = "gcp") {
                 .then(complete)
                 .catch(callback);
         }
-        else if (target.chunkLimit === 1 && !target.chunkSize) {
+        else if (target.chunkLimit === 1 && !target.chunkSize && !encryptionKey) {
             file.createReadStream()
                 .pipe(fs.createWriteStream(destination))
                 .on('finish', complete)
                 .on('error', callback);
         }
         else {
+            if (encryptionKey) {
+                file.setEncryptionKey(encryptionKey);
+            }
             file.download({ destination })
                 .then(complete)
                 .catch(callback);

package/package.json

@@ -1,11 +1,8 @@
 {
   "name": "@pi-r/gcp",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "Google (GCP) cloud functions for E-mc.",
   "main": "client/index.js",
-  "publishConfig": {
-    "access": "public"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/anpham6/pi-r.git",
@@ -19,10 +16,10 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@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"
+    "@e-mc/cloud": "^0.14.3",
+    "@e-mc/module": "^0.14.3",
+    "@e-mc/types": "^0.14.3",
+    "@google-cloud/firestore": "^8.6.0",
+    "@google-cloud/storage": "^7.21.0"
   }
 }

package/upload/index.js

@@ -16,7 +16,7 @@ function upload(credential, service = "gcp") {
     return async (data, callback) => {
         const firebase = isFirebaseApp(credential, true, true);
         const { bucket, localUri } = data;
-        const { pathname, flags = 0, fileGroup, descendantsGroup, contentType, metadata, endpoint, active, publicRead, acl, admin = {}, overwrite, options } = data.upload;
+        const { pathname, flags = 0, fileGroup, descendantsGroup, contentType, encryptionKey, 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) {
@@ -90,7 +90,7 @@ function upload(credential, service = "gcp") {
                         .catch(addLog);
                 }
             }
-            if (flags & 4) {
+            if ((flags & 4) && !encryptionKey) {
                 const chunkSize = alignSize(data.upload.chunkSize, 1024);
                 if (chunkSize > 0) {
                     chunkSizeBytes = Math.max(chunkSize, 8388608);
@@ -174,7 +174,7 @@ function upload(credential, service = "gcp") {
                 }
             }
         }
-        else if ((flags & 2) && !firebase) {
+        else if ((flags & 2) && !firebase && !encryptionKey) {
             try {
                 Stream.push(data.buffer.length > 0 ? stream.Readable.from(data.buffer) : fs.createReadStream(localUri, { signal: this.signal }));
                 if (fileGroup) {
@@ -309,6 +309,9 @@ function upload(credential, service = "gcp") {
                         });
                     }
                     else {
+                        if (encryptionKey) {
+                            params.encryptionKey = encryptionKey;
+                        }
                         uploadClient = file.save(Body[i], params);
                     }
                 }