فهرست منبع

better error handling

Gildas 7 سال پیش
والد
کامیت
df481a56f2
1فایلهای تغییر یافته به همراه7 افزوده شده و 18 حذف شده
  1. 7 18
      lib/fetch/bg/fetch.js

+ 7 - 18
lib/fetch/bg/fetch.js

@@ -35,7 +35,8 @@
 			}
 			send(response);
 		};
-		onRequest(request, sendResponse);
+		onRequest(request, sendResponse)
+			.catch(error => sendResponse({ error: error.toString() }));
 		return true;
 	});
 
@@ -45,11 +46,7 @@
 				const responseId = requestId;
 				requestId = requestId + 1;
 				let response;
-				try {
-					response = await fetch(request.url, request.options);
-				} catch (error) {
-					sendResponse({ error });
-				}
+				response = await fetch(request.url, request.options);
 				if (response) {
 					if (response.status >= 400) {
 						sendResponse({ error: new Error(response.statusText || response.status) });
@@ -65,21 +62,13 @@
 			}
 			if (request.method == "fetch.array") {
 				const content = fetchResponses.get(request.requestId);
-				try {
-					const buffer = await content.arrayBuffer();
-					sendResponse({ array: Array.from(new Uint8Array(buffer)) });
-				} catch (error) {
-					sendResponse({ error });
-				}
+				const buffer = await content.arrayBuffer();
+				sendResponse({ array: Array.from(new Uint8Array(buffer)) });
 			}
 			if (request.method == "fetch.text") {
 				const content = fetchResponses.get(request.requestId);
-				try {
-					const text = await content.text();
-					sendResponse({ text });
-				} catch (error) {
-					sendResponse({ error });
-				}
+				const text = await content.text();
+				sendResponse({ text });
 			}
 		}
 	}