@social-mail/social-mail-web-server 1.4.985 → 1.4.987

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.
Files changed (11) hide show
  1. package/dist/common/globalEnv.d.ts +1 -0
  2. package/dist/common/globalEnv.d.ts.map +1 -1
  3. package/dist/common/globalEnv.js +1 -0
  4. package/dist/common/globalEnv.js.map +1 -1
  5. package/dist/tsconfig.tsbuildinfo +1 -1
  6. package/dist/wwwroot/routes/social-mail/public/dns/zones/index.d.ts.map +1 -1
  7. package/dist/wwwroot/routes/social-mail/public/dns/zones/index.js +17 -3
  8. package/dist/wwwroot/routes/social-mail/public/dns/zones/index.js.map +1 -1
  9. package/package.json +1 -1
  10. package/src/common/globalEnv.ts +1 -0
  11. package/src/wwwroot/routes/social-mail/public/dns/zones/index.ts +25 -3
package/dist/wwwroot/routes/social-mail/public/dns/zones/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/public/dns/zones/index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAG5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AAEpF,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAEhB,GAAG;CAuBZ"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/public/dns/zones/index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAG5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AAGpF,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,EAAE,EAAE,iBAAiB,CAAC;IAEhB,GAAG;CA4CZ"}
package/dist/wwwroot/routes/social-mail/public/dns/zones/index.js CHANGED
@@ -21,12 +21,26 @@ export default class default_1 extends Page {
21
21
  }
22
22
  const [zoneID] = this.childPath;
23
23
  if (!zoneID) {
24
- const zones = await this.db.hostedZones.asQuery().toArray();
25
- return this.json(zones);
24
+ const zones = await this.db.hostedZones
25
+ .asQuery()
26
+ .include((x) => x.domain)
27
+ .toArray();
28
+ return this.json(zones.map((x) => ({ ...x, zone: x.domain.name, domain: void 0 })));
26
29
  }
27
30
  const records = await this.db.hostedZoneRecords.where({ zoneID }, (p) => (x) => x.disabled === false && x.zoneID === p.zoneID)
28
31
  .toArray();
29
- return this.json(records);
32
+ const expand = (x) => {
33
+ const host = globalEnv.host;
34
+ let value = x.value;
35
+ value = value.replaceAll("$HOST$", host);
36
+ const ip = globalEnv.ips[0];
37
+ if (ip) {
38
+ value = value.replaceAll("$IP$", ip);
39
+ }
40
+ x.value = value;
41
+ return x;
42
+ };
43
+ return this.json(records.map(expand));
30
44
  }
31
45
  }
32
46
  __decorate([
package/dist/wwwroot/routes/social-mail/public/dns/zones/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/public/dns/zones/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAClE,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AAEpF,MAAM,CAAC,OAAO,gBAAO,SAAQ,IAAI;IAK7B,KAAK,CAAC,GAAG;QAEL,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,cAAc,EAAE,CAAC;YAChD,OAAO,IAAI,CAAC,OAAO,CAAC;gBAChB,IAAI,EAAE,cAAc;gBACpB,MAAM,EAAE,GAAG;aACd,CAAC,CAAC;QACP,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,SAAkB,CAAC;QAEzC,IAAI,CAAC,MAAM,EAAE,CAAC;YAEV,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAC;YAC5D,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,KAAK,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;aACzH,OAAO,EAAE,CAAC;QAEf,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAE9B,CAAC;CACJ;AAzBG;IADC,MAAM;8BACH,iBAAiB;qCAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/public/dns/zones/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAClE,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AAGpF,MAAM,CAAC,OAAO,gBAAO,SAAQ,IAAI;IAK7B,KAAK,CAAC,GAAG;QAEL,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,cAAc,EAAE,CAAC;YAChD,OAAO,IAAI,CAAC,OAAO,CAAC;gBAChB,IAAI,EAAE,cAAc;gBACpB,MAAM,EAAE,GAAG;aACd,CAAC,CAAC;QACP,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,SAAkB,CAAC;QAEzC,IAAI,CAAC,MAAM,EAAE,CAAC;YAEV,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW;iBAClC,OAAO,EAAE;iBACT,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;iBACxB,OAAO,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC;QACxF,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,KAAK,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;aACzH,OAAO,EAAE,CAAC;QAEf,MAAM,MAAM,GAAG,CAAC,CAAmB,EAAE,EAAE;YAEnC,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC;YAE5B,IAAI,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;YAEpB,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAEzC,MAAM,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC5B,IAAI,EAAE,EAAE,CAAC;gBACL,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACzC,CAAC;YAED,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC;YAEhB,OAAO,CAAC,CAAC;QACb,CAAC,CAAC;QAEF,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAE1C,CAAC;CACJ;AA9CG;IADC,MAAM;8BACH,iBAAiB;qCAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@social-mail/social-mail-web-server",
3
- "version": "1.4.985",
3
+ "version": "1.4.987",
4
4
  "description": "## Phase 1",
5
5
  "main": "index.js",
6
6
  "type": "module",
package/src/common/globalEnv.ts CHANGED
@@ -20,6 +20,7 @@ export const globalEnv = {
20
20
  protocol: void 0,
21
21
  version,
22
22
  host: process.env.SOCIAL_MAIL_HOST,
23
+ ips: (process.env.SOCIAL_MAIL_IPS ?? "").split(",").map((x) => x.trim()).filter((x) => x),
23
24
  senderEmailForNotification: process.env.SOCIAL_MAIL_SENDER_EMAIL_FOR_NOTIFICATION,
24
25
  cdn: process.env.SOCIAL_MAIL_CDN,
25
26
  path: process.env.SOCIAL_MAIL_PATH || "/",
package/src/wwwroot/routes/social-mail/public/dns/zones/index.ts CHANGED
@@ -2,6 +2,7 @@ import Page from "@entity-access/server-pages/dist/Page.js";
2
2
  import { globalEnv } from "../../../../../../common/globalEnv.js";
3
3
  import Inject from "@entity-access/entity-access/dist/di/di.js";
4
4
  import SocialMailContext from "../../../../../../server/model/SocialMailContext.js";
5
+ import { HostedZoneRecord } from "../../../../../../server/model/entities/HostedZone.js";
5
6
 
6
7
  export default class extends Page {
7
8
 
@@ -21,14 +22,35 @@ export default class extends Page {
21
22
 
22
23
  if (!zoneID) {
23
24
 
24
- const zones = await this.db.hostedZones.asQuery().toArray();
25
- return this.json(zones);
25
+ const zones = await this.db.hostedZones
26
+ .asQuery()
27
+ .include((x) => x.domain)
28
+ .toArray();
29
+ return this.json(zones.map((x) => ({ ... x, zone: x.domain.name, domain: void 0})));
26
30
  }
27
31
 
28
32
  const records = await this.db.hostedZoneRecords.where({ zoneID }, (p) => (x) => x.disabled === false && x.zoneID === p.zoneID)
29
33
  .toArray();
30
34
 
31
- return this.json(records);
35
+ const expand = (x: HostedZoneRecord) => {
36
+
37
+ const host = globalEnv.host;
38
+
39
+ let value = x.value;
40
+
41
+ value = value.replaceAll("$HOST$", host);
42
+
43
+ const ip = globalEnv.ips[0];
44
+ if (ip) {
45
+ value = value.replaceAll("$IP$", ip);
46
+ }
47
+
48
+ x.value = value;
49
+
50
+ return x;
51
+ };
52
+
53
+ return this.json(records.map(expand));
32
54
 
33
55
  }
34
56
  }