@social-mail/social-mail-web-server 1.7.203 → 1.7.205
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/server/model/events/MailboxEvents.d.ts +0 -2
- package/dist/server/model/events/MailboxEvents.d.ts.map +1 -1
- package/dist/server/model/events/MailboxEvents.js +12 -12
- package/dist/server/model/events/MailboxEvents.js.map +1 -1
- package/dist/server/storage/LockFile.d.ts.map +1 -1
- package/dist/server/storage/LockFile.js +4 -2
- 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 +5 -1
- package/dist/wwwroot/routes/api/emails/d/get.js.map +1 -1
- package/package.json +1 -1
- package/src/server/model/events/MailboxEvents.ts +12 -12
- package/src/server/storage/LockFile.ts +4 -2
- package/src/wwwroot/routes/api/emails/d/get.ts +5 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/emails/d/get.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AAKjF,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,OAAO,CAAC,GAAG,CAAkB;IAG7B,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":"AAEA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AAKjF,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,OAAO,CAAC,GAAG,CAAkB;IAG7B,OAAO,CAAC,iBAAiB,CAAoB;IAEvC,GAAG;CA+EZ"}
|
|
@@ -71,7 +71,11 @@ let default_1 = class extends Page {
|
|
|
71
71
|
catch (error) {
|
|
72
72
|
this.cacheControl = "public, max-age=8600, immutable";
|
|
73
73
|
console.error(`Email Content Fetch Failed for ${url}`);
|
|
74
|
-
const
|
|
74
|
+
const cause = error.cause;
|
|
75
|
+
let body = error.stack ?? error;
|
|
76
|
+
if (cause) {
|
|
77
|
+
body += `\n${cause?.stack ?? cause}`;
|
|
78
|
+
}
|
|
75
79
|
return this.content({
|
|
76
80
|
body,
|
|
77
81
|
contentType: "text/plain",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/emails/d/get.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/emails/d/get.ts"],"names":[],"mappings":";;;;;;;;;AAAA,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,eAAe,MAAM,8DAA8D,CAAC;AAC3F,OAAO,iBAAiB,MAAM,gEAAgE,CAAC;AAGhF,gBAAA,KAAM,SAAQ,IAAI;IAW7B,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,wEAAwE;YACxE,2EAA2E;YAC3E,IAAI,CAAC,YAAY,GAAG,oCAAoC,CAAC;YAEzD,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAG,QAAQ,EAAE,CAAC,CAAC;YACrD,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;YACzB,MAAM,OAAO,GAAG,EAAE,CAAC;YAEnB,IAAI,QAAQ,GAAG,KAAK,CAAC,CAAC;YAEtB,IAAI,WAAW,GAAG,KAAK,CAAC,CAAC;YAEzB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;gBAC9C,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtB,SAAS;gBACb,CAAC;gBACD,QAAO,GAAG,EAAE,CAAC;oBACT,KAAK,YAAY,CAAC;oBAClB,KAAK,YAAY,CAAC;oBAClB,KAAK,eAAe,CAAC;oBACrB,KAAK,SAAS,CAAC;oBACf,KAAK,mBAAmB;wBACpB,SAAS;oBACb,KAAK,cAAc;wBACf,WAAW,GAAG,KAAK,CAAC;wBACpB,SAAS;oBACb,KAAK,kBAAkB;wBACnB,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;4BACnB,QAAQ,GAAG,IAAI,CAAC;wBACpB,CAAC;wBACD,SAAS;gBACjB,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACzB,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;YACjD,IAAI,MAAM,IAAI,GAAG,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,CAAC,kCAAkC,GAAG,EAAE,CAAC,CAAC;YAC3D,CAAC;YACD,OAAO,IAAI,CAAC,OAAO,CAAC;gBAChB,IAAI;gBACJ,OAAO;gBACP,WAAW;gBACX,MAAM;gBACN,QAAQ;gBACR,WAAW,EAAE,IAAI;aACpB,CAAC,CAAC;QACP,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,YAAY,GAAG,iCAAiC,CAAC;YACtD,OAAO,CAAC,KAAK,CAAC,kCAAkC,GAAG,EAAE,CAAC,CAAC;YACvD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;YAC1B,IAAI,IAAI,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC;YAChC,IAAI,KAAK,EAAE,CAAC;gBACR,IAAI,IAAI,KAAK,KAAK,EAAE,KAAK,IAAI,KAAK,EAAE,CAAC;YACzC,CAAC;YACD,OAAO,IAAI,CAAC,OAAO,CAAC;gBAChB,IAAI;gBACJ,WAAW,EAAE,YAAY;gBACzB,MAAM,EAAE,GAAG;gBACX,WAAW,EAAE,IAAI;aACpB,CAAC,CAAC;QACP,CAAC;IACL,CAAC;CACJ,CAAA;AAvFG;IADC,MAAM;8BACH,iBAAiB;qCAAC;AAGd;IADP,MAAM;8BACM,eAAe;sCAAC;AAGrB;IADP,MAAM;8BACoB,iBAAiB;oDAAC;AATlC;IADd,OAAO,CAAC,SAAS;aA2FjB"}
|
package/package.json
CHANGED
|
@@ -244,23 +244,23 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
|
|
|
244
244
|
// to: ea.emailAddress,
|
|
245
245
|
// htmlBody: ""
|
|
246
246
|
// });
|
|
247
|
-
return this.updateIndex(entity);
|
|
247
|
+
// return this.updateIndex(entity);
|
|
248
248
|
}
|
|
249
249
|
|
|
250
|
-
afterUpdate(entity: Mailbox, entry: ChangeEntry<Mailbox>) {
|
|
251
|
-
|
|
252
|
-
}
|
|
250
|
+
// afterUpdate(entity: Mailbox, entry: ChangeEntry<Mailbox>) {
|
|
251
|
+
// return this.updateIndex(entity);
|
|
252
|
+
// }
|
|
253
253
|
|
|
254
|
-
async updateIndex(entity: Mailbox) {
|
|
254
|
+
// async updateIndex(entity: Mailbox) {
|
|
255
255
|
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
256
|
+
// // if (entity.isChannel) {
|
|
257
|
+
// // // make sure unsubscribe/subscribe exists...
|
|
258
|
+
// // // await this.emailAddressService.
|
|
259
|
+
// // // await this.emailAddressService.getOrCreateChildMailbox(entity.mailboxID, "subscribe-");
|
|
260
|
+
// // // await this.emailAddressService.getOrCreateChildMailbox(entity.mailboxID, "unsubscribe-");
|
|
261
|
+
// // }
|
|
262
262
|
|
|
263
|
-
}
|
|
263
|
+
// }
|
|
264
264
|
|
|
265
265
|
async beforeDelete(entity: Mailbox, entry: ChangeEntry<Mailbox>) {
|
|
266
266
|
this.sessionUser.ensureIsAdmin();
|
|
@@ -33,6 +33,7 @@ export default class LockFile implements Disposable {
|
|
|
33
33
|
let now = Date.now();
|
|
34
34
|
const till = now + timeout;
|
|
35
35
|
|
|
36
|
+
let lastError = null as Error;
|
|
36
37
|
|
|
37
38
|
do {
|
|
38
39
|
|
|
@@ -51,13 +52,14 @@ export default class LockFile implements Disposable {
|
|
|
51
52
|
}
|
|
52
53
|
} catch (error){
|
|
53
54
|
// do nothing
|
|
54
|
-
|
|
55
|
+
lastError = error;
|
|
56
|
+
// console.error(error);
|
|
55
57
|
}
|
|
56
58
|
await sleep(interval);
|
|
57
59
|
now = Date.now();
|
|
58
60
|
}while(now < till);
|
|
59
61
|
|
|
60
|
-
throw new Error(
|
|
62
|
+
throw new Error(`Could not acquire lock ${lastError?.stack ?? lastError?.toString()}`);
|
|
61
63
|
}
|
|
62
64
|
|
|
63
65
|
timer: any;
|
|
@@ -83,7 +83,11 @@ export default class extends Page {
|
|
|
83
83
|
} catch (error) {
|
|
84
84
|
this.cacheControl = "public, max-age=8600, immutable";
|
|
85
85
|
console.error(`Email Content Fetch Failed for ${url}`);
|
|
86
|
-
const
|
|
86
|
+
const cause = error.cause;
|
|
87
|
+
let body = error.stack ?? error;
|
|
88
|
+
if (cause) {
|
|
89
|
+
body += `\n${cause?.stack ?? cause}`;
|
|
90
|
+
}
|
|
87
91
|
return this.content({
|
|
88
92
|
body,
|
|
89
93
|
contentType: "text/plain",
|