@pi-r/gcp 0.10.1 → 0.10.2

package/client/index.js

@@ -741,7 +741,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                     metadata.view = update;
                     await target.setMetadata(metadata);
                 }
-                const job = (await dataset.createQueryJob(options))[0];
+                const [job] = await dataset.createQueryJob(options);
                 [rows] = await job.getQueryResults();
             }
             else {

package/download/index.js

@@ -11,23 +11,11 @@ function download(credential, service = 'gcp') {
     return (data, callback) => {
         const { bucket: Bucket, download: target } = data;
         const Key = target.keyname || target.filename;
-        let tempDir;
-        const downloadResponse = (err, url = null) => {
-            callback(err, url);
-            if (tempDir) {
-                setImmediate(() => {
-                    Cloud.removeDir(tempDir);
-                });
-            }
-        };
         if (!Bucket || !Key) {
-            downloadResponse((0, types_1.errorValue)('Missing property', !Bucket ? 'Bucket' : 'Key'));
-            return;
-        }
-        if (!(tempDir = this.getTempDir({ uuidDir: true }))) {
-            downloadResponse((0, types_1.errorValue)("Unable to create temp directory", service));
+            callback((0, types_1.errorValue)('Missing property', !Bucket ? 'Bucket' : 'Key'));
             return;
         }
+        const tempDir = (0, types_1.getTempDir)(true, service);
         const location = Cloud.joinPath(Bucket, Key);
         const destination = path.join(tempDir, path.basename(target.filename || Key));
         const deleteMessage = () => {
@@ -40,10 +28,10 @@ function download(credential, service = 'gcp') {
                 https.get(url, res => {
                     const statusCode = res.statusCode;
                     if (statusCode >= 200 && statusCode < 300) {
-                        res.on('error', downloadResponse);
+                        res.on('error', callback);
                         res.pipe(fs.createWriteStream(destination)
                             .on('finish', () => {
-                            downloadResponse(null, destination);
+                            callback(null, destination);
                             if (target.deleteObject) {
                                 deleteObject(objectRef)
                                     .then(deleteMessage)
@@ -52,10 +40,10 @@ function download(credential, service = 'gcp') {
                                 });
                             }
                         })
-                            .on('error', downloadResponse));
+                            .on('error', callback));
                     }
                     else {
-                        downloadResponse((0, types_1.errorMessage)(statusCode, 'Invalid HTTP request', location));
+                        callback((0, types_1.errorMessage)(statusCode, 'Invalid HTTP request', location));
                     }
                 });
             });
@@ -66,7 +54,7 @@ function download(credential, service = 'gcp') {
         const file = bucket.file(Key, { generation: target.versionId });
         const chunkSizeBytes = flags & 4 ? (0, types_1.alignSize)(target.chunkSize, 1024) : 0;
         const fileDownload = () => {
-            downloadResponse(null, destination);
+            callback(null, destination);
             const deleteObject = target.deleteObject;
             if (deleteObject) {
                 file.delete((0, types_1.isObject)(deleteObject) ? deleteObject : { ignoreNotFound: true }, err => {
@@ -86,18 +74,18 @@ function download(credential, service = 'gcp') {
                 concurrencyLimit: target.chunkLimit || target.options?.concurrencyLimit
             })
                 .then(fileDownload)
-                .catch(downloadResponse);
+                .catch(callback);
         }
         else if (target.chunkLimit === 1 && !target.chunkSize) {
             file.createReadStream()
                 .pipe(fs.createWriteStream(destination))
                 .on('finish', fileDownload)
-                .on('error', downloadResponse);
+                .on('error', callback);
         }
         else {
             file.download({ destination })
                 .then(fileDownload)
-                .catch(downloadResponse);
+                .catch(callback);
         }
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/gcp",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "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.12.3",
-    "@e-mc/module": "^0.12.3",
-    "@e-mc/types": "^0.12.3",
-    "@google-cloud/firestore": "^7.11.0",
+    "@e-mc/cloud": "^0.12.5",
+    "@e-mc/module": "^0.12.5",
+    "@e-mc/types": "^0.12.5",
+    "@google-cloud/firestore": "^7.11.3",
     "@google-cloud/storage": "^7.16.0"
   }
 }