expanding on signed URLs and download code

CaffeineFusion · CaffeineFusion · commit 5d1abcb738a7 · 2019-01-07T21:45:23.000+11:00
diff --git a/README.MD b/README.MD
@@ -32,10 +32,9 @@ Firebase approach to uploads: https://firebase.google.com/docs/storage/web/uploa
 Pub/Sub: https://github.com/googleapis/nodejs-pubsub/
 
 
-## Questions
-- How will client be informed of workerised file upload failure? Web Socket?  
-- How do we provide information on file before it has been fully uploaded to the server?
-- How to verify correct filetype?
+## TODO
+- Filetype verification
+- Partitioned file uploads
 
 
 ## Architecture
diff --git a/experiments/gcp/upload.js b/experiments/gcp/upload.js
@@ -17,10 +17,49 @@ function uploadByURL(url, bucket, fileName) {
 		request(url)
 			.on('response', (response) => { response.pause(); resolve(response); })
 			.on('error', (reject));
-	}).then((response) => { return response.pipe(file.createWriteStream({ gzip: true })); })
+		//.on('finish', ());
+	}).then((response) => { return response.pipe(file.createWriteStream({ gzip: true })); }) // TODO: Restructure.
 		.catch((error) => { return { error }; }); // TODO: Add more detailed error handling. - statusCode etc.
 }
+// TODO: file.createResumableUpload
 
 exports.upload = function (url, fileName) {
 	return uploadByURL(url, storage.bucket(config.bucket_name), fileName);
 };
+
+function downloadByID(fileName, bucket) {
+	let file = bucket.file(fileName);
+	return new Promise((resolve, reject) => {
+		file.createReadStream()
+			.on('response', (response) => { response.pause(); resolve(response); })
+			.on('error', (reject))
+			.pipe(); // localCache
+	})
+		.catch((error) => { return { error }; }); // TODO: Add more detailed error handling. - statusCode etc.
+}
+
+exports.download = function (id) {
+	return downloadByID(id, storage.bucket(config.bucket_name));
+};
+
+
+/**
+ * Returns a Signed URL to access the uploaded file
+ * TODO: set expiry date to match the bucket's expiry rules for files
+ */
+function getURL(fileName, bucket) {
+	let file = bucket.file(fileName);
+	file.getSignedUrl({action:'read', expires:'01-01-2020'}, function(err, url) {
+		if (err) {
+			console.error(err);
+			return;
+		}
+		return url;
+	});
+}
+
+
+
+exports.get = function (fileName) {
+	return getURL(fileName, storage.bucket(config.bucket_name));
+};
diff --git a/index.js b/index.js
@@ -42,8 +42,7 @@ function uploadByURL(url, bucket, fileName) {
 		request(url)
 			.on('response', (response) => { response.pause(); resolve(response); })	// Create, then pause and return the stream
 			.on('error', (reject));
-	})
-		.then((response) => { return response.pipe(file.createWriteStream({ gzip: true })); })
+	}).then((response) => { return response.pipe(file.createWriteStream({ gzip: true })); })
 		.catch((error) => { return { error }; }); // TODO: Add more detailed error handling. - statusCode etc.
 }
 
@@ -56,6 +55,7 @@ function upload(url, fileName) {
  * TODO: refactor to adapt based on content-type
  */
 function getImage(req, res) {
+
 	res.status(200).send();
 }
 
