@social-mail/social-mail-web-server 2.0.48 → 2.0.50
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/common/globalEnv.js +1 -1
- package/dist/common/globalEnv.js.map +1 -1
- package/dist/server/services/dns/WebHostDnsService.d.ts.map +1 -1
- package/dist/server/services/dns/WebHostDnsService.js +2 -1
- package/dist/server/services/dns/WebHostDnsService.js.map +1 -1
- package/dist/server/virtual-servers/VirtualHost.d.ts.map +1 -1
- package/dist/server/virtual-servers/VirtualHost.js +4 -13
- package/dist/server/virtual-servers/VirtualHost.js.map +1 -1
- package/package.json +1 -1
- package/src/common/globalEnv.ts +1 -1
- package/src/server/services/dns/WebHostDnsService.ts +2 -1
- package/src/server/virtual-servers/VirtualHost.ts +4 -21
package/dist/common/globalEnv.js
CHANGED
|
@@ -84,7 +84,7 @@ export const globalEnv = {
|
|
|
84
84
|
},
|
|
85
85
|
port,
|
|
86
86
|
http: {
|
|
87
|
-
notFoundDelay: Number(process.env.SOCIAL_MAIL_HTTP_NOT_FOUND_DELAY ??
|
|
87
|
+
notFoundDelay: Number(process.env.SOCIAL_MAIL_HTTP_NOT_FOUND_DELAY ?? 0)
|
|
88
88
|
},
|
|
89
89
|
httpsPort: Number(process.env.SOCIAL_MAIL_HTTPS_PORT ?? 443),
|
|
90
90
|
http1Port: process.env.SOCIAL_MAIL_HTTP1_PORT || 8081,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globalEnv.js","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"globalEnv.js","sourceRoot":"","sources":["../../src/common/globalEnv.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebHostDnsService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/dns/WebHostDnsService.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAGlC,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,GAAG,CAAsB;IAGjC,OAAO,CAAC,eAAe,CAAkB;IAEnC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"WebHostDnsService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/dns/WebHostDnsService.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAGlC,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,GAAG,CAAsB;IAGjC,OAAO,CAAC,eAAe,CAAkB;IAEnC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBA8C1C;CAEJ"}
|
|
@@ -18,7 +18,8 @@ let WebHostDnsService = class WebHostDnsService {
|
|
|
18
18
|
async update(host, folderID) {
|
|
19
19
|
const { db } = this;
|
|
20
20
|
const existing = await db.hostedZoneRecords
|
|
21
|
-
.where({ host }, (x, p) => x.fqdn === p.host)
|
|
21
|
+
.where({ host }, (x, p) => x.fqdn === p.host && x.type === "A" || x.type === "AAAA" || x.type === "CNAME")
|
|
22
|
+
.orderBy((x) => (x.type === "A") ? 0 : (x.type === "CNAME" ? 1 : 2))
|
|
22
23
|
.first();
|
|
23
24
|
if (existing) {
|
|
24
25
|
await db.websiteFolderHosts.where({ host }, (x, p) => x.host === p.host)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebHostDnsService.js","sourceRoot":"","sources":["../../../../src/server/services/dns/WebHostDnsService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,mBAAmB,MAAM,2BAA2B,CAAC;AAC5D,OAAO,eAAe,MAAM,sBAAsB,CAAC;AACnD,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAGhD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAWlC,KAAK,CAAC,MAAM,CAAC,IAAY,EAAE,QAAgB;QAEvC,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;QAEpB,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,iBAAiB;aACtC,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"WebHostDnsService.js","sourceRoot":"","sources":["../../../../src/server/services/dns/WebHostDnsService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VirtualHost.d.ts","sourceRoot":"","sources":["../../../src/server/virtual-servers/VirtualHost.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,eAAe,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAClF,OAAO,gBAAgB,MAAM,gDAAgD,CAAC;AAC9E,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAM9D,MAAM,CAAC,OAAO,OAAO,WAAY,YAAW,eAAe,CAAC,WAAW,CAAC;IAEpE,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;IAGhC,EAAE,EAAE,gBAAgB,CAAC;IAErB,cAOC;IAGK,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,SAAI;;;
|
|
1
|
+
{"version":3,"file":"VirtualHost.d.ts","sourceRoot":"","sources":["../../../src/server/virtual-servers/VirtualHost.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,eAAe,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAClF,OAAO,gBAAgB,MAAM,gDAAgD,CAAC;AAC9E,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAM9D,MAAM,CAAC,OAAO,OAAO,WAAY,YAAW,eAAe,CAAC,WAAW,CAAC;IAEpE,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;IAGhC,EAAE,EAAE,gBAAgB,CAAC;IAErB,cAOC;IAGK,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,SAAI;;;OAgFrC;IAGK,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,SAAI;;;OA4B1C;IAEK,gBAAgB,CAAC,EAAE,EAAE,iBAAiB;;;OAuB3C;CAEJ"}
|
|
@@ -65,8 +65,8 @@ import { cacheFor } from "../../common/cacheFor.js";
|
|
|
65
65
|
import MessagingService from "../services/message-events/MessagingService.js";
|
|
66
66
|
import SocialMailContext from "../model/SocialMailContext.js";
|
|
67
67
|
import { globalEnv } from "../../common/globalEnv.js";
|
|
68
|
-
import ApexDomain from "../../common/ApexDomain.js";
|
|
69
68
|
import CryptoService from "../services/CryptoService.js";
|
|
69
|
+
import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
|
|
70
70
|
let VirtualHost = class VirtualHost {
|
|
71
71
|
constructor() {
|
|
72
72
|
setTimeout(() => {
|
|
@@ -121,18 +121,9 @@ let VirtualHost = class VirtualHost {
|
|
|
121
121
|
return { server: vs, host };
|
|
122
122
|
}
|
|
123
123
|
// for everything else... lets try the dns
|
|
124
|
-
const
|
|
125
|
-
const
|
|
126
|
-
|
|
127
|
-
const wildCardHost = await db.cachedDnsRecords.where({ host, wildcard, types }, (x, p) => x.fqdn === p.wildcard
|
|
128
|
-
&& x.type in p.types)
|
|
129
|
-
.include((x) => x.virtualServer)
|
|
130
|
-
.first();
|
|
131
|
-
if (wildCardHost) {
|
|
132
|
-
return { server: wildCardHost.virtualServer, host: wildcard };
|
|
133
|
-
}
|
|
134
|
-
const hostedRecord = await db.cachedDnsRecords.where({ host, wildcard, types }, (x, p) => x.fqdn === p.host
|
|
135
|
-
&& x.type in p.types)
|
|
124
|
+
const types = ["A", "AAAA", "CNAME"];
|
|
125
|
+
const hostedRecord = await db.cachedDnsRecords.where({ host, types }, (x, p) => x.fqdn === p.host
|
|
126
|
+
&& Sql.in(x.type, p.types))
|
|
136
127
|
.include((x) => x.virtualServer)
|
|
137
128
|
.first();
|
|
138
129
|
if (!hostedRecord) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VirtualHost.js","sourceRoot":"","sources":["../../../src/server/virtual-servers/VirtualHost.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,MAAM,EAAE,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACxG,OAAO,EAAE,QAAQ,EAAgC,MAAM,0BAA0B,CAAC;AAClF,OAAO,gBAAgB,MAAM,gDAAgD,CAAC;AAC9E,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,
|
|
1
|
+
{"version":3,"file":"VirtualHost.js","sourceRoot":"","sources":["../../../src/server/virtual-servers/VirtualHost.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/common/globalEnv.ts
CHANGED
|
@@ -99,7 +99,7 @@ export const globalEnv = {
|
|
|
99
99
|
},
|
|
100
100
|
port,
|
|
101
101
|
http: {
|
|
102
|
-
notFoundDelay: Number(process.env.SOCIAL_MAIL_HTTP_NOT_FOUND_DELAY ??
|
|
102
|
+
notFoundDelay: Number(process.env.SOCIAL_MAIL_HTTP_NOT_FOUND_DELAY ?? 0)
|
|
103
103
|
},
|
|
104
104
|
httpsPort: Number(process.env.SOCIAL_MAIL_HTTPS_PORT ?? 443),
|
|
105
105
|
http1Port: process.env.SOCIAL_MAIL_HTTP1_PORT || 8081,
|
|
@@ -23,7 +23,8 @@ export default class WebHostDnsService {
|
|
|
23
23
|
const { db } = this;
|
|
24
24
|
|
|
25
25
|
const existing = await db.hostedZoneRecords
|
|
26
|
-
.where({ host }, (x, p) => x.fqdn === p.host)
|
|
26
|
+
.where({ host }, (x, p) => x.fqdn === p.host && x.type === "A" || x.type === "AAAA" || x.type === "CNAME")
|
|
27
|
+
.orderBy((x) => (x.type === "A") ? 0 : (x.type === "CNAME" ? 1 : 2))
|
|
27
28
|
.first();
|
|
28
29
|
|
|
29
30
|
if(existing) {
|
|
@@ -4,8 +4,8 @@ import { cacheFor, ICacheContainer, ObjectCache } from "../../common/cacheFor.js
|
|
|
4
4
|
import MessagingService from "../services/message-events/MessagingService.js";
|
|
5
5
|
import SocialMailContext from "../model/SocialMailContext.js";
|
|
6
6
|
import { globalEnv } from "../../common/globalEnv.js";
|
|
7
|
-
import ApexDomain from "../../common/ApexDomain.js";
|
|
8
7
|
import CryptoService from "../services/CryptoService.js";
|
|
8
|
+
import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
|
|
9
9
|
|
|
10
10
|
@RegisterSingleton
|
|
11
11
|
export default class VirtualHost implements ICacheContainer<VirtualHost> {
|
|
@@ -79,28 +79,11 @@ export default class VirtualHost implements ICacheContainer<VirtualHost> {
|
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
// for everything else... lets try the dns
|
|
82
|
+
const types = ["A", "AAAA", "CNAME"];
|
|
82
83
|
|
|
83
|
-
const {
|
|
84
|
-
const wildcard = `*.${root}`;
|
|
85
|
-
|
|
86
|
-
const types = ["A", "CNAME"];
|
|
87
|
-
|
|
88
|
-
const wildCardHost = await db.cachedDnsRecords.where({ host, wildcard, types }, (x, p) =>
|
|
89
|
-
x.fqdn === p.wildcard
|
|
90
|
-
&& x.type in p.types
|
|
91
|
-
)
|
|
92
|
-
.include((x) => x.virtualServer)
|
|
93
|
-
.first();
|
|
94
|
-
|
|
95
|
-
if (wildCardHost) {
|
|
96
|
-
return { server: wildCardHost.virtualServer, host: wildcard };
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
const hostedRecord = await db.cachedDnsRecords.where({ host, wildcard, types }, (x, p) =>
|
|
100
|
-
|
|
84
|
+
const hostedRecord = await db.cachedDnsRecords.where({ host, types }, (x, p) =>
|
|
101
85
|
x.fqdn === p.host
|
|
102
|
-
&& x.type
|
|
103
|
-
|
|
86
|
+
&& Sql.in(x.type,p.types)
|
|
104
87
|
)
|
|
105
88
|
.include((x) => x.virtualServer)
|
|
106
89
|
.first();
|