@social-mail/social-mail-web-server 1.16.596 → 1.16.598
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/.tsbuildinfo +1 -1
- package/dist/server/smtp/server/SmtpServerClient.d.ts +2 -2
- package/dist/server/smtp/server/SmtpServerClient.d.ts.map +1 -1
- package/dist/server/smtp/server/SmtpServerClient.js +6 -4
- package/dist/server/smtp/server/SmtpServerClient.js.map +1 -1
- package/package.json +1 -1
- package/src/server/smtp/server/SmtpServerClient.ts +6 -4
|
@@ -18,10 +18,10 @@ export default class SmtpServerClient {
|
|
|
18
18
|
setRemoteAddress(): Promise<void>;
|
|
19
19
|
commandXClient(address: any): Promise<void>;
|
|
20
20
|
commandQUIT(): void;
|
|
21
|
-
commandRCPT(to: string,
|
|
21
|
+
commandRCPT(to: string, extra: any): Promise<void>;
|
|
22
22
|
commandRSET(): Promise<void>;
|
|
23
23
|
commandDATA(): Promise<void>;
|
|
24
|
-
commandMAIL(from: string,
|
|
24
|
+
commandMAIL(from: string, extra: any): Promise<void>;
|
|
25
25
|
commandHELO(name: any): Promise<void>;
|
|
26
26
|
commandEHLO(serverName: any): Promise<void>;
|
|
27
27
|
writeLine(text: string): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmtpServerClient.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/server/SmtpServerClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,OAAO,YAAY,MAAM,kDAAkD,CAAC;AAY5E,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAyBrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAc,OAAO,CAAC,MAAM;IAvBxD,iBAAiB,EAAE,MAAM,CAAC;IAE1B,cAAc,EAAE,MAAM,CAAC;IAEvB,aAAa,EAAE,MAAM,CAAC;IAEtB,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,EAAE,CAAC;IAEpB,OAAO,CAAC,EAAE,CAAyB;IAGnC,OAAO,CAAC,GAAG,CAAkB;IAG7B,OAAO,CAAC,QAAQ,CAAsB;IAGtC,OAAO,CAAC,kBAAkB,CAAqB;IAE/C,OAAO,CAAC,QAAQ,CAAQ;IAExB,YAA6B,MAAM,EAAE,UAAU,EAAU,MAAM,EAAE,YAAY,EAC5E;IAEK,KAAK,kBAmCV;IAEK,gBAAgB,kBAYrB;IAGK,cAAc,CAAC,OAAO,KAAA,iBAQ3B;IAGD,WAAW,SAEV;IAGK,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"SmtpServerClient.d.ts","sourceRoot":"","sources":["../../../../src/server/smtp/server/SmtpServerClient.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,OAAO,YAAY,MAAM,kDAAkD,CAAC;AAY5E,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAyBrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAc,OAAO,CAAC,MAAM;IAvBxD,iBAAiB,EAAE,MAAM,CAAC;IAE1B,cAAc,EAAE,MAAM,CAAC;IAEvB,aAAa,EAAE,MAAM,CAAC;IAEtB,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,EAAE,CAAC;IAEpB,OAAO,CAAC,EAAE,CAAyB;IAGnC,OAAO,CAAC,GAAG,CAAkB;IAG7B,OAAO,CAAC,QAAQ,CAAsB;IAGtC,OAAO,CAAC,kBAAkB,CAAqB;IAE/C,OAAO,CAAC,QAAQ,CAAQ;IAExB,YAA6B,MAAM,EAAE,UAAU,EAAU,MAAM,EAAE,YAAY,EAC5E;IAEK,KAAK,kBAmCV;IAEK,gBAAgB,kBAYrB;IAGK,cAAc,CAAC,OAAO,KAAA,iBAQ3B;IAGD,WAAW,SAEV;IAGK,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,iBAYvC;IAGK,WAAW,kBAIhB;IAGK,WAAW,kBAuBhB;IAGK,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,iBAYzC;IAIK,WAAW,CAAC,IAAI,KAAA,iBAIrB;IAGK,WAAW,CAAC,UAAU,KAAA,iBAa3B;IAEK,SAAS,CAAC,IAAI,EAAE,MAAM,iBAE3B;IAGK,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,iBAE9C;IAEK,OAAO,kBAGZ;IAED,KAAK,SAMJ;IAGK,eAAe,qBA4BpB;IAEK,kBAAkB,kBAQvB;CACJ"}
|
|
@@ -81,11 +81,12 @@ let SmtpServerClient = class SmtpServerClient {
|
|
|
81
81
|
commandQUIT() {
|
|
82
82
|
this.continue = false;
|
|
83
83
|
}
|
|
84
|
-
async commandRCPT(to,
|
|
84
|
+
async commandRCPT(to, extra) {
|
|
85
85
|
if (!this.from) {
|
|
86
86
|
await this.writeLine("501 Syntax Error");
|
|
87
87
|
return;
|
|
88
88
|
}
|
|
89
|
+
const smtpUtf8 = /SMTPUTF8/i.test(extra);
|
|
89
90
|
if (!smtpUtf8) {
|
|
90
91
|
to = SmtpParser.parseAddress(to);
|
|
91
92
|
}
|
|
@@ -121,11 +122,12 @@ let SmtpServerClient = class SmtpServerClient {
|
|
|
121
122
|
this.from = void 0;
|
|
122
123
|
this.to = void 0;
|
|
123
124
|
}
|
|
124
|
-
async commandMAIL(from,
|
|
125
|
+
async commandMAIL(from, extra) {
|
|
125
126
|
if (this.from) {
|
|
126
127
|
await this.writeLine("501 Syntax Error");
|
|
127
128
|
return;
|
|
128
129
|
}
|
|
130
|
+
const smtpUtf8 = /SMTPUTF8/i.test(extra);
|
|
129
131
|
if (!smtpUtf8) {
|
|
130
132
|
from = SmtpParser.parseAddress(from);
|
|
131
133
|
}
|
|
@@ -229,7 +231,7 @@ __decorate([
|
|
|
229
231
|
__metadata("design:returntype", void 0)
|
|
230
232
|
], SmtpServerClient.prototype, "commandQUIT", null);
|
|
231
233
|
__decorate([
|
|
232
|
-
RegexMethod(/^RCPT TO:\s*<([^>]+)>(
|
|
234
|
+
RegexMethod(/^RCPT TO:\s*<([^>]+)>(.*)$/i),
|
|
233
235
|
__metadata("design:type", Function),
|
|
234
236
|
__metadata("design:paramtypes", [String, Object]),
|
|
235
237
|
__metadata("design:returntype", Promise)
|
|
@@ -247,7 +249,7 @@ __decorate([
|
|
|
247
249
|
__metadata("design:returntype", Promise)
|
|
248
250
|
], SmtpServerClient.prototype, "commandDATA", null);
|
|
249
251
|
__decorate([
|
|
250
|
-
RegexMethod(/^MAIL FROM:\s*<([^>]+)>(
|
|
252
|
+
RegexMethod(/^MAIL FROM:\s*<([^>]+)>(.*)$/i),
|
|
251
253
|
__metadata("design:type", Function),
|
|
252
254
|
__metadata("design:paramtypes", [String, Object]),
|
|
253
255
|
__metadata("design:returntype", Promise)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmtpServerClient.js","sourceRoot":"","sources":["../../../../src/server/smtp/server/SmtpServerClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SmtpServerClient.js","sourceRoot":"","sources":["../../../../src/server/smtp/server/SmtpServerClient.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -107,12 +107,13 @@ export default class SmtpServerClient {
|
|
|
107
107
|
this.continue = false;
|
|
108
108
|
}
|
|
109
109
|
|
|
110
|
-
@RegexMethod(/^RCPT TO:\s*<([^>]+)>(
|
|
111
|
-
async commandRCPT(to: string,
|
|
110
|
+
@RegexMethod(/^RCPT TO:\s*<([^>]+)>(.*)$/i)
|
|
111
|
+
async commandRCPT(to: string, extra: any) {
|
|
112
112
|
if (!this.from) {
|
|
113
113
|
await this.writeLine("501 Syntax Error");
|
|
114
114
|
return;
|
|
115
115
|
}
|
|
116
|
+
const smtpUtf8 = /SMTPUTF8/i.test(extra);
|
|
116
117
|
if(!smtpUtf8) {
|
|
117
118
|
to = SmtpParser.parseAddress(to);
|
|
118
119
|
}
|
|
@@ -154,12 +155,13 @@ export default class SmtpServerClient {
|
|
|
154
155
|
this.to = void 0;
|
|
155
156
|
}
|
|
156
157
|
|
|
157
|
-
@RegexMethod(/^MAIL FROM:\s*<([^>]+)>(
|
|
158
|
-
async commandMAIL(from: string,
|
|
158
|
+
@RegexMethod(/^MAIL FROM:\s*<([^>]+)>(.*)$/i)
|
|
159
|
+
async commandMAIL(from: string, extra: any) {
|
|
159
160
|
if(this.from) {
|
|
160
161
|
await this.writeLine("501 Syntax Error");
|
|
161
162
|
return;
|
|
162
163
|
}
|
|
164
|
+
const smtpUtf8 = /SMTPUTF8/i.test(extra);
|
|
163
165
|
if(!smtpUtf8) {
|
|
164
166
|
from = SmtpParser.parseAddress(from);
|
|
165
167
|
}
|