@social-mail/social-mail-web-server 1.8.370 → 1.8.372
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/WebServer.d.ts.map +1 -1
- package/dist/WebServer.js +4 -0
- package/dist/WebServer.js.map +1 -1
- package/dist/server/storage/LockFile.d.ts.map +1 -1
- package/dist/server/storage/LockFile.js +3 -1
- package/dist/server/storage/LockFile.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/api/emails/d/get.d.ts.map +1 -1
- package/dist/wwwroot/routes/api/emails/d/get.js +13 -9
- package/dist/wwwroot/routes/api/emails/d/get.js.map +1 -1
- package/package.json +1 -1
- package/src/WebServer.ts +4 -0
- package/src/server/storage/LockFile.ts +3 -1
- package/src/wwwroot/routes/api/emails/d/get.ts +13 -9
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/emails/d/get.ts"],"names":[],"mappings":"AAGA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AAKjF,OAAO,OAAO,MAAM,6CAA6C,CAAC;AAUlE,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,OAAO,CAAC,iBAAiB,CAAoB;IAEvC,GAAG;
|
|
1
|
+
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/emails/d/get.ts"],"names":[],"mappings":"AAGA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AAKjF,OAAO,OAAO,MAAM,6CAA6C,CAAC;AAUlE,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,OAAO,CAAC,iBAAiB,CAAoB;IAEvC,GAAG;CA2FZ"}
|
|
@@ -39,7 +39,7 @@ let default_1 = class extends Page {
|
|
|
39
39
|
const rs = await secureFetch(url, { redirect: "follow", dispatcher });
|
|
40
40
|
const status = rs.status;
|
|
41
41
|
const headers = {};
|
|
42
|
-
let compress = false;
|
|
42
|
+
// let compress = false;
|
|
43
43
|
let contentType = void 0;
|
|
44
44
|
for (const [key, value] of rs.headers.entries()) {
|
|
45
45
|
if (key.startsWith(":")) {
|
|
@@ -59,9 +59,10 @@ let default_1 = class extends Page {
|
|
|
59
59
|
headers[key] = value;
|
|
60
60
|
continue;
|
|
61
61
|
case "content-encoding":
|
|
62
|
-
if (value === "gzip") {
|
|
63
|
-
|
|
64
|
-
}
|
|
62
|
+
// if (value === "gzip") {
|
|
63
|
+
// compress = true;
|
|
64
|
+
// }
|
|
65
|
+
headers[key] = value;
|
|
65
66
|
continue;
|
|
66
67
|
default:
|
|
67
68
|
if (/^access\-/i.test(key)) {
|
|
@@ -70,19 +71,22 @@ let default_1 = class extends Page {
|
|
|
70
71
|
continue;
|
|
71
72
|
}
|
|
72
73
|
}
|
|
73
|
-
const buffer = Buffer.from(await rs.arrayBuffer());
|
|
74
74
|
if (status >= 400) {
|
|
75
75
|
console.error(`Email Content Fetch Failed ${status} for ${url}`);
|
|
76
76
|
}
|
|
77
|
-
|
|
78
|
-
|
|
77
|
+
const rsHeaders = rs.headers;
|
|
78
|
+
if (rsHeaders.has("content-length")) {
|
|
79
|
+
headers["content-length"] = rsHeaders.get("content-length");
|
|
80
|
+
}
|
|
81
|
+
if (rsHeaders.has("content-encoding")) {
|
|
82
|
+
headers["content-encoding"] = rsHeaders.get("content-encoding");
|
|
79
83
|
}
|
|
80
84
|
return new Content({
|
|
81
|
-
reader: Readable.
|
|
85
|
+
reader: Readable.fromWeb(rs.body),
|
|
82
86
|
headers,
|
|
83
87
|
contentType,
|
|
84
88
|
status,
|
|
85
|
-
compress,
|
|
89
|
+
compress: false,
|
|
86
90
|
suppressLog: true
|
|
87
91
|
});
|
|
88
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/emails/d/get.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wDAAwD,CAAC;AACjF,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AACjF,OAAO,iBAAiB,MAAM,gEAAgE,CAAC;AAC/F,OAAO,EAAE,WAAW,EAAE,MAAM,+DAA+D,CAAC;AAC5F,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,OAAO,MAAM,6CAA6C,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC;IACzB,OAAO,EAAE;QACL,aAAa,EAAE,SAAS,CAAC,4BAA4B;KACxD;CACJ,CAAC,CAAC;AAGY,gBAAA,KAAM,SAAQ,IAAI;IAQ7B,KAAK,CAAC,GAAG;QAEL,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAI,IAAI,CAAC,GAAG,IAAI,CAAC,SAAkB,CAAC;QAE9D,sCAAsC;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAQ,CAAC;QACzE,IAAI,QAAQ,KAAK,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC3B,CAAC;QAED,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;QAClC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,MAAM,GAAG,GAAG,WAAW,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,aAAa,GAAG,CAAC,EAAE,CAAC;QAE5D,IAAI,CAAC;YAED,IAAI,CAAC,YAAY,GAAG,oCAAoC,CAAC;YAEzD,MAAM,EAAE,GAAG,MAAM,WAAW,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAG,QAAQ,EAAE,UAAU,EAAS,CAAC,CAAC;YAC9E,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;YACzB,MAAM,OAAO,GAAG,EAAE,CAAC;YAEnB,
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/emails/d/get.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/WebServer.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { existsSync, mkdirSync, unlinkSync, statSync, utimesSync, writeFileSync
|
|
|
4
4
|
import { createHash } from "node:crypto";
|
|
5
5
|
import sleep from "../../common/sleep.js";
|
|
6
6
|
import { globalEnv } from "../../common/globalEnv.js";
|
|
7
|
+
import TimeoutError from "../../common/errors/TimeoutError.js";
|
|
7
8
|
|
|
8
9
|
const tmpdir = globalEnv.tmpDir;
|
|
9
10
|
|
|
@@ -56,7 +57,8 @@ export default class LockFile implements Disposable {
|
|
|
56
57
|
}while(now < till);
|
|
57
58
|
|
|
58
59
|
if (throwOnFail) {
|
|
59
|
-
|
|
60
|
+
lastError ??= new TimeoutError("lock timed out");
|
|
61
|
+
throw new Error(`Could not acquire lock ${lockFile}, Reason: ${lastError?.stack ?? lastError?.toString()}`);
|
|
60
62
|
}
|
|
61
63
|
|
|
62
64
|
return {
|
|
@@ -47,7 +47,7 @@ export default class extends Page {
|
|
|
47
47
|
const status = rs.status;
|
|
48
48
|
const headers = {};
|
|
49
49
|
|
|
50
|
-
let compress = false;
|
|
50
|
+
// let compress = false;
|
|
51
51
|
|
|
52
52
|
let contentType = void 0;
|
|
53
53
|
|
|
@@ -69,9 +69,10 @@ export default class extends Page {
|
|
|
69
69
|
headers[key] = value;
|
|
70
70
|
continue;
|
|
71
71
|
case "content-encoding":
|
|
72
|
-
if (value === "gzip") {
|
|
73
|
-
|
|
74
|
-
}
|
|
72
|
+
// if (value === "gzip") {
|
|
73
|
+
// compress = true;
|
|
74
|
+
// }
|
|
75
|
+
headers[key] = value;
|
|
75
76
|
continue;
|
|
76
77
|
default:
|
|
77
78
|
if (/^access\-/i.test(key)) {
|
|
@@ -81,19 +82,22 @@ export default class extends Page {
|
|
|
81
82
|
}
|
|
82
83
|
}
|
|
83
84
|
|
|
84
|
-
const buffer = Buffer.from( await rs.arrayBuffer());
|
|
85
85
|
if (status >= 400) {
|
|
86
86
|
console.error(`Email Content Fetch Failed ${status} for ${url}`);
|
|
87
87
|
}
|
|
88
|
-
|
|
89
|
-
|
|
88
|
+
const rsHeaders = rs.headers;
|
|
89
|
+
if (rsHeaders.has("content-length")) {
|
|
90
|
+
headers["content-length"] = rsHeaders.get("content-length");
|
|
91
|
+
}
|
|
92
|
+
if (rsHeaders.has("content-encoding")) {
|
|
93
|
+
headers["content-encoding"] = rsHeaders.get("content-encoding");
|
|
90
94
|
}
|
|
91
95
|
return new Content({
|
|
92
|
-
reader: Readable.
|
|
96
|
+
reader: Readable.fromWeb(rs.body as any),
|
|
93
97
|
headers,
|
|
94
98
|
contentType,
|
|
95
99
|
status,
|
|
96
|
-
compress,
|
|
100
|
+
compress: false,
|
|
97
101
|
suppressLog: true
|
|
98
102
|
});
|
|
99
103
|
} catch (error) {
|