Skip to content

Commit ecbedab

Browse files
committed
fix(request): finally
Update request.dev.js Update request.js
1 parent ca9d0c5 commit ecbedab

File tree

2 files changed

+22
-14
lines changed

2 files changed

+22
-14
lines changed

src/request.dev.js

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ Console.info(`FORMAT: ${FORMAT}`);
9595
case "application/grpc":
9696
case "application/grpc+proto":
9797
case "application/octet-stream": {
98-
//Console.debug(`调试信息`, `$request: ${JSON.stringify($request, null, 2)}`);
98+
//Console.debug(`$request: ${JSON.stringify($request, null, 2)}`);
9999
let rawBody = $app === "Quantumult X" ? new Uint8Array($request.bodyBytes ?? []) : ($request.body ?? new Uint8Array());
100-
//Console.debug(`调试信息`, `isBuffer? ${ArrayBuffer.isView(rawBody)}: ${JSON.stringify(rawBody)}`);
100+
//Console.debug(`isBuffer? ${ArrayBuffer.isView(rawBody)}: ${JSON.stringify(rawBody)}`);
101101
switch (FORMAT) {
102102
case "application/protobuf":
103103
case "application/x-protobuf":
@@ -134,10 +134,10 @@ Console.info(`FORMAT: ${FORMAT}`);
134134
//const detectTrack = fetch(_request);
135135
await Promise.allSettled([detectStutus]).then(results => {
136136
/*
137-
results.forEach((result, i) => {
138-
Console.debug(`调试信息`, `result[${i}]: ${JSON.stringify(result)}`);
139-
});
140-
*/
137+
results.forEach((result, i) => {
138+
Console.debug(`result[${i}]: ${JSON.stringify(result)}`);
139+
});
140+
*/
141141
switch (results[0].status) {
142142
case "fulfilled": {
143143
const response = results[0].value;
@@ -281,9 +281,9 @@ Console.info(`FORMAT: ${FORMAT}`);
281281
})()
282282
.catch(e => Console.error(e))
283283
.finally(() => {
284-
switch ($response) {
285-
default: // 有构造回复数据,返回构造的回复数据
286-
//Console.debug(`finally`, `echo $response: ${JSON.stringify($response, null, 2)}`);
284+
switch (typeof $response) {
285+
case "object": // 有构造回复数据,返回构造的回复数据
286+
//Console.debug("finally", `echo $response: ${JSON.stringify($response, null, 2)}`);
287287
if ($response.headers?.["Content-Encoding"]) $response.headers["Content-Encoding"] = "identity";
288288
if ($response.headers?.["content-encoding"]) $response.headers["content-encoding"] = "identity";
289289
switch ($app) {
@@ -299,9 +299,12 @@ Console.info(`FORMAT: ${FORMAT}`);
299299
break;
300300
}
301301
break;
302-
case undefined: // 无构造回复数据,发送修改的请求数据
303-
//Console.debug(`finally`, `$request: ${JSON.stringify($request, null, 2)}`);
302+
case "undefined": // 无构造回复数据,发送修改的请求数据
303+
//Console.debug("finally", `$request: ${JSON.stringify($request, null, 2)}`);
304304
done($request);
305305
break;
306+
default:
307+
Console.error(`不合法的 $response 类型: ${typeof $response}`);
308+
break;
306309
}
307310
});

src/request.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,9 @@ Console.info(`FORMAT: ${FORMAT}`);
208208
})()
209209
.catch(e => Console.error(e))
210210
.finally(() => {
211-
switch ($response) {
212-
default: // 有构造回复数据,返回构造的回复数据
211+
switch (typeof $response) {
212+
case "object": // 有构造回复数据,返回构造的回复数据
213+
//Console.debug("finally", `echo $response: ${JSON.stringify($response, null, 2)}`);
213214
if ($response.headers?.["Content-Encoding"]) $response.headers["Content-Encoding"] = "identity";
214215
if ($response.headers?.["content-encoding"]) $response.headers["content-encoding"] = "identity";
215216
switch ($app) {
@@ -225,8 +226,12 @@ Console.info(`FORMAT: ${FORMAT}`);
225226
break;
226227
}
227228
break;
228-
case undefined: // 无构造回复数据,发送修改的请求数据
229+
case "undefined": // 无构造回复数据,发送修改的请求数据
230+
//Console.debug("finally", `$request: ${JSON.stringify($request, null, 2)}`);
229231
done($request);
230232
break;
233+
default:
234+
Console.error(`不合法的 $response 类型: ${typeof $response}`);
235+
break;
231236
}
232237
});

0 commit comments

Comments
 (0)