using new file streaming in 0.15

moleculerjs · Dec 4, 2024 · 16e61ec · 16e61ec
1 parent 4c87203
commit 16e61ec
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 66 deletions.
diff --git a/examples/file/index.js b/examples/file/index.js
@@ -43,6 +43,8 @@ broker.createService({
 				},
 
 				aliases: {
+					"GET /:file": "file.get",
+
 					// File upload from HTML form
 					"POST /": "multipart:file.save",
 

diff --git a/examples/formidable/index.js b/examples/formidable/index.js
@@ -45,6 +45,8 @@ broker.createService({
 				},
 
 				aliases: {
+					"GET /:file": "file.get",
+
 					// File upload from AJAX or cURL
 					"PUT /": "stream:file.save",
 
@@ -91,15 +93,11 @@ broker.createService({
 				const ctx = req.$ctx;
 				const entries = Array.isArray(files.myfile) ? files.myfile : [files.myfile];
 				const result = await Promise.all(entries.map(entry => {
-					return ctx.call("file.save", fs.createReadStream(entry.path), {
-						meta: {
-							filename: entry.name,
-							$params: {
-								...req.params,
-								...fields,
-							}
-						}
-					});
+					return ctx.call("file.save", {
+						$filename: entry.name,
+						...req.params,
+						...fields,
+					}, { stream: fs.createReadStream(entry.path) });
 				}));
 
 				return this.sendResponse(req, res, Array.isArray(files.myfile) ? result : result[0]);

diff --git a/test/integration/index.spec.js b/test/integration/index.spec.js
@@ -3615,16 +3615,16 @@ describe("Test file uploading", () => {
 		actions: {
 			save(ctx) {
 				return new this.Promise((resolve) => {
-					if (ctx.params.pipe) {
+					if (ctx.stream && ctx.stream.pipe) {
 						const hash = crypto.createHash("sha256");
 
 						hash.on("readable", () => {
 							const data = hash.read();
 							if (data)
-								resolve({ hash: data.toString("base64"), meta: ctx.meta });
+								resolve({ hash: data.toString("base64"), params: ctx.params, meta: ctx.meta });
 						});
 
-						ctx.params.pipe(hash);
+						ctx.stream.pipe(hash);
 					} else {
 						resolve({ params: ctx.params, meta: ctx.meta });
 					}
@@ -3722,14 +3722,12 @@ describe("Test file uploading", () => {
 			.then(res => {
 				expect(res.statusCode).toBe(200);
 				expect(res.headers["content-type"]).toBe("application/json; charset=utf-8");
-				expect(res.body).toEqual({ hash: origHashes["logo.png"], meta: {
-					$multipart: {},
-					$params: {},
-					encoding: "7bit",
-					fieldname: "myFile",
-					filename: "logo.png",
-					mimetype: "image/png"
-				} });
+				expect(res.body).toEqual({ hash: origHashes["logo.png"], params: {
+					$encoding: "7bit",
+					$fieldname: "myFile",
+					$filename: "logo.png",
+					$mimetype: "image/png"
+				}, meta: {} });
 
 				expect(onFilesLimitFn).toHaveBeenCalledTimes(0);
 			});
@@ -3738,21 +3736,18 @@ describe("Test file uploading", () => {
 	it("should send data field with multipart", () => {
 		return request(server)
 			.post("/upload")
-			.attach("myFile", assetsDir + "logo.png")
 			.field("name", "moleculer")
+			.attach("myFile", assetsDir + "logo.png")
 			.then(res => {
 				expect(res.statusCode).toBe(200);
 				expect(res.headers["content-type"]).toBe("application/json; charset=utf-8");
-				expect(res.body).toEqual({ hash: origHashes["logo.png"], meta: {
-					$multipart: {
-						name: "moleculer"
-					},
-					$params: {},
-					encoding: "7bit",
-					fieldname: "myFile",
-					filename: "logo.png",
-					mimetype: "image/png"
-				}  });
+				expect(res.body).toEqual({ hash: origHashes["logo.png"], params: {
+					name: "moleculer",
+					$encoding: "7bit",
+					$fieldname: "myFile",
+					$filename: "logo.png",
+					$mimetype: "image/png"
+				}, meta: {} });
 
 				expect(onFilesLimitFn).toHaveBeenCalledTimes(0);
 			});
@@ -3767,11 +3762,8 @@ describe("Test file uploading", () => {
 				expect(res.statusCode).toBe(200);
 				expect(res.headers["content-type"]).toBe("application/json; charset=utf-8");
 				expect(res.body).toEqual([{
-					meta: {
-						$multipart: { name: "moleculer", more: "services" },
-						$params: { id: "f1234" }
-					},
-					params: {}
+					meta: {},
+					params: { id: "f1234", name: "moleculer", more: "services" }
 				}]);
 			});
 	});
@@ -3784,14 +3776,12 @@ describe("Test file uploading", () => {
 			.then(res => {
 				expect(res.statusCode).toBe(200);
 				expect(res.headers["content-type"]).toBe("application/json; charset=utf-8");
-				expect(res.body).toEqual({ hash: origHashes["logo.png"], meta: {
-					$multipart: {},
-					$params: {},
-					encoding: "7bit",
-					fieldname: "myFile",
-					filename: "logo.png",
-					mimetype: "image/png"
-				}  });
+				expect(res.body).toEqual({ hash: origHashes["logo.png"], params: {
+					$encoding: "7bit",
+					$fieldname: "myFile",
+					$filename: "logo.png",
+					$mimetype: "image/png"
+				} , meta: {} });
 				expect(onFilesLimitFn).toHaveBeenCalledTimes(1);
 				expect(onFilesLimitFn).toHaveBeenCalledWith(expect.any(Busboy), expect.any(Alias), service);
 			});
@@ -3806,22 +3796,18 @@ describe("Test file uploading", () => {
 				expect(res.statusCode).toBe(200);
 				expect(res.headers["content-type"]).toBe("application/json; charset=utf-8");
 				expect(res.body).toEqual([
-					{ hash: origHashes["logo.png"], meta: {
-						$multipart: {},
-						$params: {},
-						encoding: "7bit",
-						fieldname: "myFile",
-						filename: "logo.png",
-						mimetype: "image/png"
-					}  },
-					{ hash: origHashes["lorem.txt"], meta: {
-						$multipart: {},
-						$params: {},
-						encoding: "7bit",
-						fieldname: "myText",
-						filename: "lorem.txt",
-						mimetype: "text/plain"
-					}  }
+					{ hash: origHashes["logo.png"], params: {
+						$encoding: "7bit",
+						$fieldname: "myFile",
+						$filename: "logo.png",
+						$mimetype: "image/png"
+					}, meta: {}  },
+					{ hash: origHashes["lorem.txt"], params: {
+						$encoding: "7bit",
+						$fieldname: "myText",
+						$filename: "lorem.txt",
+						$mimetype: "text/plain"
+					}, meta: {}  }
 				]);
 			});
 	});
@@ -3835,9 +3821,7 @@ describe("Test file uploading", () => {
 			.then(res => {
 				expect(res.statusCode).toBe(200);
 				expect(res.headers["content-type"]).toBe("application/json; charset=utf-8");
-				expect(res.body).toEqual({ hash: origHashes["logo.png"], meta: {
-					$params: {},
-				}  });
+				expect(res.body).toEqual({ hash: origHashes["logo.png"], params: {}, meta: {} });
 			});
 
 	});
@@ -3851,9 +3835,7 @@ describe("Test file uploading", () => {
 			.then(res => {
 				expect(res.statusCode).toBe(200);
 				expect(res.headers["content-type"]).toBe("application/json; charset=utf-8");
-				expect(res.body).toEqual({ hash: origHashes["logo.png"], meta: {
-					$params: { id: "f1234" },
-				} });
+				expect(res.body).toEqual({ hash: origHashes["logo.png"], params:  { id: "f1234" }, meta: {} });
 			});
 	});