@social-mail/social-mail-web-server 1.8.486 → 1.8.487
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/SmtpReceiver.d.ts.map +1 -1
- package/dist/SmtpReceiver.js +4 -4
- package/dist/SmtpReceiver.js.map +1 -1
- package/dist/server/workflows/web-hooks/InvokeWebHookWorkflow.d.ts.map +1 -1
- package/dist/server/workflows/web-hooks/InvokeWebHookWorkflow.js +2 -1
- package/dist/server/workflows/web-hooks/InvokeWebHookWorkflow.js.map +1 -1
- package/dist/server/workflows/web-push/SendWebPushNotification.d.ts.map +1 -1
- package/dist/server/workflows/web-push/SendWebPushNotification.js +5 -4
- package/dist/server/workflows/web-push/SendWebPushNotification.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 +3 -2
- package/dist/wwwroot/routes/api/emails/d/get.js.map +1 -1
- package/dist/wwwroot/routes/callback/smtp/rcpt/index.d.ts.map +1 -1
- package/dist/wwwroot/routes/callback/smtp/rcpt/index.js +2 -1
- package/dist/wwwroot/routes/callback/smtp/rcpt/index.js.map +1 -1
- package/dist/wwwroot/routes/social-mail/site/draft/[eFileID]/index.d.ts.map +1 -1
- package/dist/wwwroot/routes/social-mail/site/draft/[eFileID]/index.js +2 -1
- package/dist/wwwroot/routes/social-mail/site/draft/[eFileID]/index.js.map +1 -1
- package/package.json +2 -2
- package/src/SmtpReceiver.ts +4 -4
- package/src/server/workflows/web-hooks/InvokeWebHookWorkflow.ts +2 -1
- package/src/server/workflows/web-push/SendWebPushNotification.ts +5 -4
- package/src/wwwroot/routes/api/emails/d/get.ts +3 -2
- package/src/wwwroot/routes/callback/smtp/rcpt/index.ts +2 -1
- package/src/wwwroot/routes/social-mail/site/draft/[eFileID]/index.ts +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmtpReceiver.d.ts","sourceRoot":"","sources":["../src/SmtpReceiver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAC1C,OAAO,mBAAmB,MAAM,+CAA+C,CAAC;
|
|
1
|
+
{"version":3,"file":"SmtpReceiver.d.ts","sourceRoot":"","sources":["../src/SmtpReceiver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAC1C,OAAO,mBAAmB,MAAM,+CAA+C,CAAC;AAIhF,OAAO,QAAQ,aAAa,CAAC;IAEzB,UAAU,iBAAiB;QACvB,KAAK,EAAE,eAAe,CAAC;QACvB,OAAO,EAAE,mBAAmB,CAAC;KAChC;CACJ;AAyDD,MAAM,CAAC,OAAO,OAAO,YAAY;WAEf,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,iBAAiB,EAAE,IAAI,SAAK;CAmBxE"}
|
package/dist/SmtpReceiver.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import * as smtpServer from "smtp-server";
|
|
2
2
|
import MailReceiverService from "./server/smtp/services/MailReceiverService.js";
|
|
3
3
|
import { globalServices } from "./globalServices.js";
|
|
4
|
+
import ServerLogger from "@entity-access/server-pages/dist/core/ServerLogger.js";
|
|
4
5
|
const chain = (promise, callback) => {
|
|
5
6
|
promise.then((resolved) => callback(void 0, resolved), (error) => {
|
|
6
|
-
|
|
7
|
+
ServerLogger.error(error);
|
|
7
8
|
callback(error);
|
|
8
9
|
});
|
|
9
10
|
};
|
|
@@ -52,12 +53,11 @@ export default class SmtpReceiver {
|
|
|
52
53
|
resolve(server);
|
|
53
54
|
});
|
|
54
55
|
server.on("error", (error) => {
|
|
55
|
-
|
|
56
|
-
console.error(error);
|
|
56
|
+
ServerLogger.error(error);
|
|
57
57
|
});
|
|
58
58
|
}
|
|
59
59
|
catch (e) {
|
|
60
|
-
|
|
60
|
+
ServerLogger.error(e);
|
|
61
61
|
reject(e);
|
|
62
62
|
}
|
|
63
63
|
});
|
package/dist/SmtpReceiver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmtpReceiver.js","sourceRoot":"","sources":["../src/SmtpReceiver.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAC1C,OAAO,mBAAmB,MAAM,+CAA+C,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"SmtpReceiver.js","sourceRoot":"","sources":["../src/SmtpReceiver.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAC1C,OAAO,mBAAmB,MAAM,+CAA+C,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,YAAY,MAAM,uDAAuD,CAAC;AAUjF,MAAM,KAAK,GAAG,CAAI,OAAmB,EAAE,QAA6C,EAAE,EAAE;IACpF,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE;QAC7D,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1B,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG;IAEb,6BAA6B;IAC7B,MAAM,EAAE,KAAK;IAEb,YAAY,EAAE,IAAI;IAElB,IAAI,EAAE,EAAE,GAAC,IAAI,GAAC,IAAI;IAElB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ;QAEjC,yBAAyB;QACzB,gFAAgF;QAChF,IAAI;QAEJ,mBAAmB;QACnB,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC;IACzD,CAAC;IAED,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ;QAC/B,sBAAsB;QACtB,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC9D,CAAC;IAED,SAAS,CAAC,OAAO,EAAE,QAAQ;QACvB,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC;QAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAC3D,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;QAC1B,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ;QAC5B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;IACxD,CAAC;IAED,iBAAiB,EAAE,KAAK;IAExB,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ;QAC1B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,CAAC,OAAO,EAAE,QAAQ;QACrB,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC;QACzB,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACvB,CAAC;CAE4B,CAAC;AAElC,MAAM,CAAC,OAAO,OAAO,YAAY;IAEtB,MAAM,CAAC,MAAM,CAAC,OAAqC,EAAE,IAAI,GAAG,EAAE;QACjE,OAAO,IAAI,OAAO,CAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1D,OAAO,GAAG,EAAE,GAAI,QAAQ,EAAG,GAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAC,CAAC;YAChD,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAClD,IAAI,CAAC;gBACD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE;oBAChC,OAAO,CAAC,GAAG,CAAC,+BAA+B,IAAI,gBAAgB,CAAC,CAAC;oBACjE,OAAO,CAAC,MAAM,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;gBAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;oBACzB,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC9B,CAAC,CAAC,CAAC;YACP,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACtB,MAAM,CAAC,CAAC,CAAC,CAAC;YACd,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InvokeWebHookWorkflow.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/web-hooks/InvokeWebHookWorkflow.ts"],"names":[],"mappings":"AACA,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AACnG,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAEtD,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAK/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"InvokeWebHookWorkflow.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/web-hooks/InvokeWebHookWorkflow.ts"],"names":[],"mappings":"AACA,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AACnG,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAEtD,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAK/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAG9D,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,QAAQ,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,WAAW,CAAA;CAAE,CAAC;IAElG,MAAM,CAAC,SAAS,SAAgB;IAEhC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW;IAMpE,GAAG;IAUH,OAAO,CACT,CAAC,EAAE,MAAM,EACD,EAAE,CAAC,EAAE,iBAAiB;CAmFrC"}
|
|
@@ -18,6 +18,7 @@ import { AppStringHelper } from "../../../common/AppStringHelper.js";
|
|
|
18
18
|
import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
19
19
|
import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
|
|
20
20
|
import SecureFetchBuilder from "../../../common/fetch/SecureFetchBuilder.js";
|
|
21
|
+
import ServerLogger from "@entity-access/server-pages/dist/core/ServerLogger.js";
|
|
21
22
|
class InvokeWebHookWorkflow extends Workflow {
|
|
22
23
|
static push(context, hook, input) {
|
|
23
24
|
return context.queue(InvokeWebHookWorkflow, { webHookID: hook.webHookID, input }, {
|
|
@@ -88,7 +89,7 @@ class InvokeWebHookWorkflow extends Workflow {
|
|
|
88
89
|
lastEventTime: now,
|
|
89
90
|
lastEvent: "failed"
|
|
90
91
|
}, { webHookID });
|
|
91
|
-
|
|
92
|
+
ServerLogger.error(response);
|
|
92
93
|
return false;
|
|
93
94
|
}
|
|
94
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InvokeWebHookWorkflow.js","sourceRoot":"","sources":["../../../../src/server/workflows/web-hooks/InvokeWebHookWorkflow.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,QAAQ,EAAE,EAAE,cAAc,EAAE,MAAM,yDAAyD,CAAC;AAEnG,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,kBAAkB,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"InvokeWebHookWorkflow.js","sourceRoot":"","sources":["../../../../src/server/workflows/web-hooks/InvokeWebHookWorkflow.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SendWebPushNotification.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/web-push/SendWebPushNotification.ts"],"names":[],"mappings":"AACA,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AAEnG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,uBAAuB,MAAM,8DAA8D,CAAC;
|
|
1
|
+
{"version":3,"file":"SendWebPushNotification.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/web-push/SendWebPushNotification.ts"],"names":[],"mappings":"AACA,OAAO,QAA4B,MAAM,yDAAyD,CAAC;AAEnG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,uBAAuB,MAAM,8DAA8D,CAAC;AAGnG,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,QAAQ,CAAC;IAAE,OAAO,MAAC;IAAC,SAAS,MAAC;IAAC,cAAc,MAAA;CAAC,CAAC;IAEhG,MAAM,CAAC,SAAS,SAAY;IAEtB,GAAG;IAKH,IAAI,CACE,EAAE,CAAC,EAAE,iBAAiB,EACtB,GAAG,CAAC,EAAE,uBAAuB;CAsD5C"}
|
|
@@ -16,6 +16,7 @@ import Inject from "@entity-access/entity-access/dist/di/di.js";
|
|
|
16
16
|
import SocialMailContext from "../../model/SocialMailContext.js";
|
|
17
17
|
import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
18
18
|
import PushNotificationService from "../../services/push-notifications/PushNotificationService.js";
|
|
19
|
+
import ServerLogger from "@entity-access/server-pages/dist/core/ServerLogger.js";
|
|
19
20
|
class SendWebPushNotification extends Workflow {
|
|
20
21
|
async run() {
|
|
21
22
|
await this.send();
|
|
@@ -52,20 +53,20 @@ class SendWebPushNotification extends Workflow {
|
|
|
52
53
|
}
|
|
53
54
|
catch (error) {
|
|
54
55
|
if (/expired|unsubscribed/i.test(error)) {
|
|
55
|
-
|
|
56
|
+
ServerLogger.error(`Push Subscription for ${iterator.sessionID} expired.`);
|
|
56
57
|
await db.loginSessions.where(iterator, (p) => (x) => x.sessionID === p.sessionID)
|
|
57
58
|
.update(void 0, (p) => (x) => ({ deviceToken: null, deviceTokenType: null }));
|
|
58
59
|
continue;
|
|
59
60
|
}
|
|
60
61
|
if (error.statusCode === 403) {
|
|
61
|
-
|
|
62
|
+
ServerLogger.error(`Push Subscription for ${iterator.sessionID} is no longer valid.`);
|
|
62
63
|
await db.loginSessions.where(iterator, (p) => (x) => x.sessionID === p.sessionID)
|
|
63
64
|
.update(void 0, (p) => (x) => ({ deviceToken: null, deviceTokenType: null }));
|
|
64
65
|
}
|
|
65
66
|
else {
|
|
66
|
-
|
|
67
|
+
ServerLogger.error(`Failed ${JSON.stringify(payload)} for ${iterator.deviceToken} for ${iterator.deviceTokenType}`);
|
|
67
68
|
}
|
|
68
|
-
|
|
69
|
+
ServerLogger.error(error);
|
|
69
70
|
}
|
|
70
71
|
}
|
|
71
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SendWebPushNotification.js","sourceRoot":"","sources":["../../../../src/server/workflows/web-push/SendWebPushNotification.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,QAAQ,EAAE,EAAE,cAAc,EAAE,MAAM,yDAAyD,CAAC;AACnG,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,uBAAuB,MAAM,8DAA8D,CAAC;
|
|
1
|
+
{"version":3,"file":"SendWebPushNotification.js","sourceRoot":"","sources":["../../../../src/server/workflows/web-push/SendWebPushNotification.ts"],"names":[],"mappings":"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"}
|