@social-mail/social-mail-web-server 1.16.63 → 1.16.65
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/protocols/socket/client/SocketClient.d.ts +1 -0
- package/dist/protocols/socket/client/SocketClient.d.ts.map +1 -1
- package/dist/protocols/socket/client/SocketClient.js +4 -2
- package/dist/protocols/socket/client/SocketClient.js.map +1 -1
- package/dist/server/smtp/CertificateFetcher.js +1 -1
- package/dist/server/smtp/CertificateFetcher.js.map +1 -1
- package/dist/server/smtp/server/SmtpServerClient.js +2 -2
- package/dist/server/smtp/server/SmtpServerClient.js.map +1 -1
- package/package.json +1 -1
- package/src/protocols/socket/client/SocketClient.ts +5 -2
- package/src/server/smtp/CertificateFetcher.ts +1 -1
- package/src/server/smtp/server/SmtpServerClient.ts +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SocketClient.d.ts","sourceRoot":"","sources":["../../../../src/protocols/socket/client/SocketClient.ts"],"names":[],"mappings":"AAAA,OAAY,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAClC,OAAO,QAAQ,MAAM,sDAAsD,CAAC;AAC5E,OAAO,GAAkB,MAAM,KAAK,CAAC;AAGrC,MAAM,CAAC,OAAO,OAAO,YAAY;
|
|
1
|
+
{"version":3,"file":"SocketClient.d.ts","sourceRoot":"","sources":["../../../../src/protocols/socket/client/SocketClient.ts"],"names":[],"mappings":"AAAA,OAAY,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAClC,OAAO,QAAQ,MAAM,sDAAsD,CAAC;AAC5E,OAAO,GAAkB,MAAM,KAAK,CAAC;AAGrC,MAAM,CAAC,OAAO,OAAO,YAAY;IA4DzB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;WA3DJ,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,MAAS;WAI9B,OAAO,CAAC,EAAE,IAAI,EAAE,IAAa,EAAE,UAAmB,EAAE,MAAe,EAAE,GAAY,EAAC;;;;;;KAAA;IAmBtG,UAAU,0BAAsB;IAEhC,WAAW,0BAAsB;IAEjC,IAAI,eAAe,YAElB;IAED,IAAI,aAAa,WAEhB;IAED;;OAEG;IACH,IAAI,OAAO,IAGI,MAAM,CADpB;IACD,IAAI,OAAO,CAAC,CAAC,EAAE,MAAM,EAKpB;IAED,IAAI,MAAM,YAET;IAED,OAAO,CAAC,UAAU,CAAC;IACnB,OAAO,CAAC,OAAO,CAAC;IAChB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAe;IAEnC,OAAO;IAsBP,OAAO;IAIP,SAAS;IAaT,CAAC,MAAM,CAAC,OAAO,CAAC;IAIV,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,QAAoC,EAAE,GAAU,EAAC;;;KAAK;IAiBtF,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW;IAI7B,QAAQ,CAAC,IAAI,KAAA,EAAE,MAAM,CAAC,EAAE,WAAW;IAItB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;IAI7C,UAAU,CAAC,OAAO,GAAE,GAAG,CAAC,iBAAwB;IA+BjD,kBAAkB,CAAC,OAAO,GAAE,GAAG,CAAC,gBAAuB;CA4BvE"}
|
|
@@ -54,7 +54,8 @@ export default class SocketClient {
|
|
|
54
54
|
this.client.setTimeout(30000);
|
|
55
55
|
const bufferStream = new BufferStream();
|
|
56
56
|
this.bufferStream = bufferStream;
|
|
57
|
-
this.
|
|
57
|
+
this._onData = (data) => bufferStream.enqueue(data);
|
|
58
|
+
this.client.on("data", this._onData);
|
|
58
59
|
this._onTimeout = () => {
|
|
59
60
|
bufferStream.error(new Error("Timedout"));
|
|
60
61
|
this.onTimeout();
|
|
@@ -141,6 +142,7 @@ export default class SocketClient {
|
|
|
141
142
|
this.client.off("timeout", this._onTimeout);
|
|
142
143
|
this.client.off("error", this.eventError.dispatcher);
|
|
143
144
|
this.client.off("end", this._onTimeout);
|
|
145
|
+
this.client.off("data", this._onData);
|
|
144
146
|
const ts = await new Promise((resolve, reject) => {
|
|
145
147
|
const socket = this.client;
|
|
146
148
|
const c = new TLSSocket(socket, options);
|
|
@@ -153,7 +155,7 @@ export default class SocketClient {
|
|
|
153
155
|
this.client.setTimeout(0);
|
|
154
156
|
this.client = ts;
|
|
155
157
|
this.bufferStream = new BufferStream();
|
|
156
|
-
this.client.on("data",
|
|
158
|
+
this.client.on("data", this._onData);
|
|
157
159
|
this.client.on("close", this.eventClosed.dispatcher);
|
|
158
160
|
this.client.on("timeout", this._onTimeout);
|
|
159
161
|
this.client.on("error", this.eventError.dispatcher);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SocketClient.js","sourceRoot":"","sources":["../../../../src/protocols/socket/client/SocketClient.ts"],"names":[],"mappings":"AAAA,OAAO,GAAe,MAAM,KAAK,CAAC;AAClC,OAAO,QAAQ,MAAM,sDAAsD,CAAC;AAC5E,OAAO,GAAG,EAAE,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,YAAY;IAEtB,MAAM,CAAC,IAAI,CAAC,MAAc,EAAE,MAAM,GAAG,KAAK,CAAC;QAC9C,OAAO,IAAI,YAAY,CAAC,MAAM,EAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,CAAC,EAAE,UAAU,GAAG,KAAK,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,EAAE,GAAG,GAAG,KAAK,CAAC,EAAC;QAClG,MAAM,EAAE,CAAC,yBAAyB,IAAI,IAAI,IAAI,gBAAgB,GAAG,EAAE,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,MAAM,IAAI,OAAO,CAAe,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC/D,MAAM,CAAC,GAAG,GAAG;gBACT,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC;gBACpE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC7D,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBACtB,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC;gBAChB,MAAM,CAAC,KAAK,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;YACH,CAAC,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;gBACjB,MAAM,EAAE,CAAC,kBAAkB,CAAC,CAAC;gBAC7B,OAAO,CAAC,IAAI,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,wBAAwB,CAAC,CAAC;QACnC,OAAO,MAAM,CAAC;IAClB,CAAC;IAMD,IAAI,eAAe;QACf,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC;IAC7C,CAAC;IAED,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;IACrC,CAAC;IAED;;OAEG;IACH,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;IAC/B,CAAC;IACD,IAAI,OAAO,CAAC,CAAS;QACjB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACR,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC9B,CAAC;IACL,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;
|
|
1
|
+
{"version":3,"file":"SocketClient.js","sourceRoot":"","sources":["../../../../src/protocols/socket/client/SocketClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,7 @@ let CertificateFetcher = class CertificateFetcher {
|
|
|
40
40
|
return null;
|
|
41
41
|
}
|
|
42
42
|
const cert = await readFile(certPath, "utf-8");
|
|
43
|
-
const key = await readFile(
|
|
43
|
+
const key = await readFile(keyPath, "utf-8");
|
|
44
44
|
return createSecureContext({ cert, key });
|
|
45
45
|
}
|
|
46
46
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CertificateFetcher.js","sourceRoot":"","sources":["../../../src/server/smtp/CertificateFetcher.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAiB,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAgC,MAAM,0BAA0B,CAAC;AAClF,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG7B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAMtB,AAAN,KAAK,CAAC,OAAO,CAAC,UAAkB;QAEnC,IAAG,CAAC,UAAU,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;YACvB,OAAO,EAAE,UAAU;YACnB,IAAI,EAAC,CAAE,UAAU,CAAC;SACrB,CAAC,CAAC,CAAC;QAEJ,MAAM,KAAK,CAAC,WAAW,UAAU,EAAE,CAAC,CAAC;QAGrC,KAAI,IAAI,CAAC,GAAC,CAAC,EAAC,CAAC,GAAC,EAAE,EAAC,CAAC,EAAE,EAAE,CAAC;YACnB,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;YAElB,kCAAkC;YAClC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAChD,IAAG,OAAO,EAAE,CAAC;gBACT,OAAO,OAAO,CAAC;YACnB,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAkB;QAC7B,MAAM,QAAQ,GAAG,gBAAgB,UAAU,WAAW,CAAC;QACvD,MAAM,OAAO,GAAG,gBAAgB,UAAU,UAAU,CAAC;QACrD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAChD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC/C,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"CertificateFetcher.js","sourceRoot":"","sources":["../../../src/server/smtp/CertificateFetcher.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,mBAAmB,EAAiB,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAgC,MAAM,0BAA0B,CAAC;AAClF,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG7B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAMtB,AAAN,KAAK,CAAC,OAAO,CAAC,UAAkB;QAEnC,IAAG,CAAC,UAAU,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;YACvB,OAAO,EAAE,UAAU;YACnB,IAAI,EAAC,CAAE,UAAU,CAAC;SACrB,CAAC,CAAC,CAAC;QAEJ,MAAM,KAAK,CAAC,WAAW,UAAU,EAAE,CAAC,CAAC;QAGrC,KAAI,IAAI,CAAC,GAAC,CAAC,EAAC,CAAC,GAAC,EAAE,EAAC,CAAC,EAAE,EAAE,CAAC;YACnB,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;YAElB,kCAAkC;YAClC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAChD,IAAG,OAAO,EAAE,CAAC;gBACT,OAAO,OAAO,CAAC;YACnB,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAkB;QAC7B,MAAM,QAAQ,GAAG,gBAAgB,UAAU,WAAW,CAAC;QACvD,MAAM,OAAO,GAAG,gBAAgB,UAAU,UAAU,CAAC;QACrD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAChD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC/C,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC7C,OAAO,mBAAmB,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9C,CAAC;CAGJ,CAAA;AAvCgB;IADZ,QAAQ,EAAE;;;;iDA0BV;AA/BgB,kBAAkB;IADtC,iBAAiB;GACG,kBAAkB,CA6CtC;eA7CoB,kBAAkB"}
|
|
@@ -24,9 +24,9 @@ let SmtpServerClient = class SmtpServerClient {
|
|
|
24
24
|
this.ac = new AbortController();
|
|
25
25
|
}
|
|
26
26
|
async start() {
|
|
27
|
-
this.remoteAddress = this.socket.remoteAddress?.replace(
|
|
27
|
+
this.remoteAddress = this.socket.remoteAddress?.replace(/^\:\:ffff\:/, "");
|
|
28
28
|
try {
|
|
29
|
-
const [a] = await reverse(this.
|
|
29
|
+
const [a] = await reverse(this.remoteAddress);
|
|
30
30
|
if (a) {
|
|
31
31
|
this.clientHostname = a;
|
|
32
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmtpServerClient.js","sourceRoot":"","sources":["../../../../src/server/smtp/server/SmtpServerClient.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAEpF,OAAO,YAAY,MAAM,kDAAkD,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,mBAAmB,MAAM,oCAAoC,CAAC;AACrE,OAAO,SAAS,MAAM,0BAA0B,CAAC;AACjD,OAAO,UAAU,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAG3C,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAuBjC,YAA6B,MAAkB,EAAU,MAAoB;QAAhD,WAAM,GAAN,MAAM,CAAY;QAAU,WAAM,GAAN,MAAM,CAAc;QAXrE,OAAE,GAAG,IAAI,eAAe,EAAE,CAAC;IAYnC,CAAC;IAED,KAAK,CAAC,KAAK;QAEP,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"SmtpServerClient.js","sourceRoot":"","sources":["../../../../src/server/smtp/server/SmtpServerClient.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -58,6 +58,7 @@ export default class SocketClient {
|
|
|
58
58
|
}
|
|
59
59
|
|
|
60
60
|
private _onTimeout;
|
|
61
|
+
private _onData;
|
|
61
62
|
private isSecure = false;
|
|
62
63
|
private bufferStream: BufferStream;
|
|
63
64
|
|
|
@@ -68,7 +69,8 @@ export default class SocketClient {
|
|
|
68
69
|
this.client.setTimeout(30000);
|
|
69
70
|
const bufferStream = new BufferStream();
|
|
70
71
|
this.bufferStream = bufferStream;
|
|
71
|
-
this.
|
|
72
|
+
this._onData = (data: any) => bufferStream.enqueue(data);
|
|
73
|
+
this.client.on("data", this._onData);
|
|
72
74
|
this._onTimeout = () => {
|
|
73
75
|
bufferStream.error(new Error("Timedout"));
|
|
74
76
|
this.onTimeout();
|
|
@@ -169,6 +171,7 @@ export default class SocketClient {
|
|
|
169
171
|
this.client.off("timeout", this._onTimeout);
|
|
170
172
|
this.client.off("error", this.eventError.dispatcher);
|
|
171
173
|
this.client.off("end", this._onTimeout);
|
|
174
|
+
this.client.off("data", this._onData);
|
|
172
175
|
|
|
173
176
|
const ts = await new Promise<TLSSocket>((resolve, reject) => {
|
|
174
177
|
const socket = this.client;
|
|
@@ -182,7 +185,7 @@ export default class SocketClient {
|
|
|
182
185
|
this.client.setTimeout(0);
|
|
183
186
|
this.client = ts;
|
|
184
187
|
this.bufferStream = new BufferStream();
|
|
185
|
-
this.client.on("data",
|
|
188
|
+
this.client.on("data", this._onData);
|
|
186
189
|
this.client.on("close", this.eventClosed.dispatcher);
|
|
187
190
|
this.client.on("timeout", this._onTimeout);
|
|
188
191
|
this.client.on("error", this.eventError.dispatcher);
|
|
@@ -46,7 +46,7 @@ export default class CertificateFetcher implements ICacheContainer<CertificateFe
|
|
|
46
46
|
return null;
|
|
47
47
|
}
|
|
48
48
|
const cert = await readFile(certPath, "utf-8");
|
|
49
|
-
const key = await readFile(
|
|
49
|
+
const key = await readFile(keyPath, "utf-8");
|
|
50
50
|
return createSecureContext({ cert, key });
|
|
51
51
|
}
|
|
52
52
|
|
|
@@ -39,10 +39,10 @@ export default class SmtpServerClient {
|
|
|
39
39
|
|
|
40
40
|
async start() {
|
|
41
41
|
|
|
42
|
-
this.remoteAddress = this.socket.remoteAddress?.replace(
|
|
42
|
+
this.remoteAddress = this.socket.remoteAddress?.replace(/^\:\:ffff\:/,"");
|
|
43
43
|
|
|
44
44
|
try {
|
|
45
|
-
const [a] = await reverse(this.
|
|
45
|
+
const [a] = await reverse(this.remoteAddress);
|
|
46
46
|
if(a) {
|
|
47
47
|
this.clientHostname = a;
|
|
48
48
|
}
|