milkio 0.2.16 → 0.2.17

package/defines/define-http-handler.ts

@@ -132,11 +132,10 @@ export function defineHttpHandler(app: MilkioApp, options: ExecuteHttpServerOpti
 			let params: any;
 			try {
 				if (rawbody) params = JSON.parse(rawbody);
-				else if (request.request.method === 'GET' && fullurl.searchParams.get('params')) {
-					params = JSON.parse(decodeURIComponent(fullurl.searchParams.get('params')!));
-				} else {
-					params = undefined;
-				}
+				else params = undefined;
+				// Doing so may pose security risks, as attackers may trigger your requests through link redirection without being protected by browser CORS.
+				// Therefore, this feature was commented out after v0.3.0.
+				// else if (request.request.method === 'GET' && fullurl.searchParams.get('params')) {	params = JSON.parse(decodeURIComponent(fullurl.searchParams.get('params')!)); }
 			} catch (error) {
 				const logger = useLogger(executeId);
 				logger.log("TIP: body is not json, the content is not empty, but the content is not in a valid JSON format. The original content value can be retrieved via request.request.text()");
@@ -172,62 +171,82 @@ export function defineHttpHandler(app: MilkioApp, options: ExecuteHttpServerOpti
 			}
 
 			if (mode === "stream") {
-				const generator = (resultsRaw as any).$generator as AsyncGenerator;
 				let stream: ReadableStream;
 				let control: ReadableStreamDirectController | ReadableStreamDefaultController;
-				// SSE has a default timeout, which helps prevent memory leaks, especially when you are writing code with a while (true) loop
 
-				if (global?.Bun) {
-					// bun
+				// Handshake failure (usually due to incorrect parameters)
+				if (resultsRaw.$type === "result" && resultsRaw.$result.success === false) {
 					stream = new ReadableStream({
-						type: "direct",
-						async pull(controller: ReadableStreamDirectController) {
+						async pull(controller) {
 							control = controller;
-							try {
-								for await (const value of generator) {
-									if (!request.request.signal.aborted) {
-										const result: string = JSON.stringify(TSON.encode(value));
-										controller.write(`data:${result}\n\n`);
-									} else {
-										generator.return(undefined);
-										controller.close();
-									}
-								}
-							} catch (error) {
-								controller.close();
-								throw error;
-							}
+							controller.enqueue(`data:$MILKIO_FAIL@${JSON.stringify(TSON.encode(resultsRaw.$result))}\n\n`);
 							controller.close();
 						},
 						cancel() {
 							control.close();
 						},
-					} as unknown as UnderlyingByteSource);
+					});
 				} else {
-					// node.js or others
-					stream = new ReadableStream({
-						async pull(controller) {
-							control = controller;
-							try {
-								for await (const value of generator) {
-									if (!request.request.signal.aborted) {
-										const result: string = JSON.stringify(TSON.encode(value));
-										controller.enqueue(`data:${result}\n\n`);
-									} else {
-										generator.return(undefined);
-										controller.close();
+					// Handshake successful
+					const generator = (resultsRaw as any).$generator as AsyncGenerator;
+					// SSE has a default timeout, which helps prevent memory leaks, especially when you are writing code with a while (true) loop
+
+					if (global?.Bun) {
+						// bun
+						stream = new ReadableStream({
+							type: "direct",
+							async pull(controller: ReadableStreamDirectController) {
+								control = controller;
+								try {
+									controller.write(`data:$MILKIO_SUCC@${JSON.stringify(TSON.encode(resultsRaw.$result))}\n\n`);
+									for await (const value of generator) {
+										if (!request.request.signal.aborted) {
+											const result: string = JSON.stringify(TSON.encode(value));
+											controller.write(`data:${result}\n\n`);
+										} else {
+											generator.return(undefined);
+											controller.close();
+										}
 									}
+								} catch (error) {
+									const result = handleCatchError(error, executeId);
+									controller.write(`data:$MILKIO_FAIL@${JSON.stringify(TSON.encode(result))}\n\n`);
+									await new Promise((resolve) => setTimeout(resolve, 1));
 								}
-							} catch (error) {
 								controller.close();
-								throw error;
-							}
-							controller.close();
-						},
-						cancel() {
-							control.close();
-						},
-					});
+							},
+							cancel() {
+								control.close();
+							},
+						} as unknown as UnderlyingByteSource);
+					} else {
+						// node.js or others
+						stream = new ReadableStream({
+							async pull(controller) {
+								control = controller;
+								try {
+									controller.enqueue(`data:$MILKIO_SUCC@${JSON.stringify(TSON.encode(resultsRaw.$result))}\n\n`);
+									for await (const value of generator) {
+										if (!request.request.signal.aborted) {
+											const result: string = JSON.stringify(TSON.encode(value));
+											controller.enqueue(`data:${result}\n\n`);
+										} else {
+											generator.return(undefined);
+											controller.close();
+										}
+									}
+								} catch (error) {
+									const result = handleCatchError(error, executeId);
+									controller.enqueue(`data:$MILKIO_FAIL@${JSON.stringify(TSON.encode(result))}\n\n`);
+									await new Promise((resolve) => setTimeout(resolve, 1));
+								}
+								controller.close();
+							},
+							cancel() {
+								control.close();
+							},
+						});
+					}
 				}
 				detail.response.headers["Content-Type"] = "text/event-stream";
 				detail.response.headers["Cache-Control"] = "no-cache";

package/package.json

@@ -2,7 +2,7 @@
   "name": "milkio",
   "type": "module",
   "module": "index.ts",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "peerDependencies": {
     "typescript": "^5.4.2"
   },