@social-mail/social-mail-web-server 1.8.464 → 1.8.466
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/WebCluster.d.ts.map +1 -1
- package/dist/WebCluster.js +0 -32
- package/dist/WebCluster.js.map +1 -1
- package/dist/common/ApexDomain.js +1 -1
- package/dist/common/ApexDomain.js.map +1 -1
- package/dist/server/model/entities/LoginSession.d.ts.map +1 -1
- package/dist/server/model/entities/LoginSession.js +5 -0
- package/dist/server/model/entities/LoginSession.js.map +1 -1
- package/dist/server/model/entities/WebSite.d.ts +4 -0
- package/dist/server/model/entities/WebSite.d.ts.map +1 -1
- package/dist/server/model/entities/WebSite.js +9 -0
- package/dist/server/model/entities/WebSite.js.map +1 -1
- package/dist/server/seed/ui/seed-ui.js +1 -1
- package/dist/server/seed/ui/seed-ui.js.map +1 -1
- package/dist/server/services/encryption/EncryptionService.d.ts +3 -2
- package/dist/server/services/encryption/EncryptionService.d.ts.map +1 -1
- package/dist/server/services/encryption/EncryptionService.js +2 -2
- package/dist/server/services/encryption/EncryptionService.js.map +1 -1
- package/dist/server/services/files/FileVersionService.js +1 -1
- package/dist/server/services/files/FileVersionService.js.map +1 -1
- package/dist/server/services/files/ISiteFolder.d.ts +4 -0
- package/dist/server/services/files/ISiteFolder.d.ts.map +1 -1
- package/dist/server/services/files/WebSiteContentService.d.ts +5 -2
- package/dist/server/services/files/WebSiteContentService.d.ts.map +1 -1
- package/dist/server/services/files/WebSiteContentService.js +65 -17
- package/dist/server/services/files/WebSiteContentService.js.map +1 -1
- package/dist/server/services/html/HtmlForEmailService.d.ts +6 -0
- package/dist/server/services/html/HtmlForEmailService.d.ts.map +1 -1
- package/dist/server/services/html/HtmlForEmailService.js +10 -0
- package/dist/server/services/html/HtmlForEmailService.js.map +1 -1
- package/dist/server/workflows/daily/DailyWorkflow.js +1 -1
- package/dist/server/workflows/daily/DailyWorkflow.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/index.d.ts.map +1 -1
- package/dist/wwwroot/routes/index.js.map +1 -1
- package/dist/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.d.ts +12 -0
- package/dist/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.d.ts.map +1 -0
- package/dist/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.js +57 -0
- package/dist/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.js.map +1 -0
- package/package.json +1 -1
- package/src/WebCluster.ts +0 -36
- package/src/common/ApexDomain.ts +1 -1
- package/src/server/model/entities/LoginSession.ts +5 -0
- package/src/server/model/entities/WebSite.ts +8 -0
- package/src/server/seed/ui/seed-ui.ts +1 -1
- package/src/server/services/encryption/EncryptionService.ts +2 -2
- package/src/server/services/files/FileVersionService.ts +1 -1
- package/src/server/services/files/ISiteFolder.ts +4 -0
- package/src/server/services/files/WebSiteContentService.ts +77 -18
- package/src/server/services/html/HtmlForEmailService.ts +12 -1
- package/src/server/workflows/daily/DailyWorkflow.ts +1 -1
- package/src/wwwroot/routes/index.tsx +1 -0
- package/src/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.tsx +48 -0
package/dist/WebCluster.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebCluster.d.ts","sourceRoot":"","sources":["../src/WebCluster.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"WebCluster.d.ts","sourceRoot":"","sources":["../src/WebCluster.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,eAAmC,MAAM,qDAAqD,CAAC;AAMtG,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,eAAe,CAAC,OAAO,SAAS,CAAC;WAEvD,KAAK,CAAC,GAAG,GAAE,OAAO,SAAqB;cAKrC,UAAU,CAAC,GAAG,EAAE,OAAO,SAAS;cA0BhC,SAAS,CAAC,GAAG,EAAE,OAAO,SAAS;CAMlD"}
|
package/dist/WebCluster.js
CHANGED
|
@@ -1,38 +1,9 @@
|
|
|
1
1
|
/* eslint-disable no-console */
|
|
2
2
|
import sleep from './common/sleep.js';
|
|
3
3
|
import WebServer from './WebServer.js';
|
|
4
|
-
import { spawn } from 'node:child_process';
|
|
5
4
|
import ClusterInstance from "@entity-access/server-pages/dist/ClusterInstance.js";
|
|
6
5
|
import { globalEnv } from './common/globalEnv.js';
|
|
7
6
|
import Tracer from './Tracer.js';
|
|
8
|
-
const scanViaClamAV = (globalEnv.av?.type ?? "ClamAV") === "ClamAV";
|
|
9
|
-
const spawnPromise = (path, args) => new Promise((resolve, reject) => {
|
|
10
|
-
const cd = spawn(path, args);
|
|
11
|
-
cd.stdout.on("data", (data) => {
|
|
12
|
-
console.log(`${path}: ${data}`);
|
|
13
|
-
});
|
|
14
|
-
cd.stderr.on("data", (data) => {
|
|
15
|
-
console.error(`${path}: ${data}`);
|
|
16
|
-
});
|
|
17
|
-
cd.on("close", resolve);
|
|
18
|
-
});
|
|
19
|
-
const spawnLoop = (everySeconds, path, args) => {
|
|
20
|
-
const run = async () => {
|
|
21
|
-
const everyMS = everySeconds * 1000;
|
|
22
|
-
while (true) {
|
|
23
|
-
await spawnPromise(path, args);
|
|
24
|
-
console.log(`${path} closed, restarting in ${everySeconds} seconds`);
|
|
25
|
-
await sleep(everyMS);
|
|
26
|
-
}
|
|
27
|
-
};
|
|
28
|
-
run().catch(console.error);
|
|
29
|
-
};
|
|
30
|
-
const runClamD = async () => {
|
|
31
|
-
spawnLoop(15, "clamd");
|
|
32
|
-
// we need to wait 20 seconds approx to let clamD start properly.
|
|
33
|
-
await sleep(30000);
|
|
34
|
-
spawnLoop(60 * 60 * 24, "freshclam");
|
|
35
|
-
};
|
|
36
7
|
const numCPUs = globalEnv.numCPUs;
|
|
37
8
|
export default class WebCluster extends ClusterInstance {
|
|
38
9
|
static start(arg = WebServer) {
|
|
@@ -41,9 +12,6 @@ export default class WebCluster extends ClusterInstance {
|
|
|
41
12
|
}
|
|
42
13
|
async runPrimary(arg) {
|
|
43
14
|
Tracer.instance.bindConsole();
|
|
44
|
-
if (scanViaClamAV) {
|
|
45
|
-
runClamD().catch(console.error);
|
|
46
|
-
}
|
|
47
15
|
// seed...
|
|
48
16
|
const ws = new arg();
|
|
49
17
|
await ws.create(true, false);
|
package/dist/WebCluster.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebCluster.js","sourceRoot":"","sources":["../src/WebCluster.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,
|
|
1
|
+
{"version":3,"file":"WebCluster.js","sourceRoot":"","sources":["../src/WebCluster.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,eAAmC,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;AAElC,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,eAAiC;IAE9D,MAAM,CAAC,KAAK,CAAC,MAAwB,SAAS;QACjD,MAAM,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC;QAC3B,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACf,CAAC;IAES,KAAK,CAAC,UAAU,CAAC,GAAqB;QAE5C,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QAE9B,UAAU;QACV,MAAM,EAAE,GAAG,IAAI,GAAG,EAAE,CAAC;QACrB,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAE7B,OAAM,IAAI,EAAE,CAAC;YACT,MAAM,OAAO,GAAG,EAAsB,CAAC;YACvC,OAAO,CAAC,GAAG,CAAC,oBAAoB,OAAO,UAAU,CAAC,CAAC;YACnD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC;gBAC3C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAC5C,CAAC;YAED,oBAAoB;YACpB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC;gBACtC,MAAM,KAAK,CAAC,EAAE,GAAC,EAAE,GAAC,EAAE,GAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;YAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC3B,MAAM,CAAC,OAAO,EAAE,CAAC;YACrB,CAAC;QACL,CAAC;IACL,CAAC;IAES,KAAK,CAAC,SAAS,CAAC,GAAqB;QAC3C,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9B,MAAM,EAAE,GAAG,IAAI,GAAG,EAAE,CAAC;QACrB,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;IACtB,CAAC;CAEJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApexDomain.js","sourceRoot":"","sources":["../../src/common/ApexDomain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,MAAM,CAAC,OAAO,OAAO,UAAU;IAE3B,MAAM,CAAC,aAAa,CAAC,IAAY,EAAE,OAAO,GAAG,IAAI;QAC7C,IAAI,CAAC;YACD,IAAI,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAChC,IAAI,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC7C,OAAO,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"ApexDomain.js","sourceRoot":"","sources":["../../src/common/ApexDomain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,MAAM,CAAC,OAAO,OAAO,UAAU;IAE3B,MAAM,CAAC,aAAa,CAAC,IAAY,EAAE,OAAO,GAAG,IAAI;QAC7C,IAAI,CAAC;YACD,IAAI,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAChC,IAAI,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC7C,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC/C,CAAC;YACD,IAAG,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnC,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,MAAM,EAAE,MAAM,EAAE,GAAI,KAAK,CAAC,IAAI,CAAC,CAAC;YAChC,OAAO,MAAM,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,iCAAiC,IAAI,EAAE,CAAC,CAAC;YACvD,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;CAEJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginSession.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/LoginSession.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGnD,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AAEvD,QAAA,MAAM,oBAAoB,iDAAkD,CAAC;AAC7E,MAAM,MAAM,eAAe,GAAG,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC;AAElE,QAAA,MAAM,eAAe,oCAAqC,CAAC;AAC3D,MAAM,MAAM,cAAc,GAAG,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"LoginSession.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/LoginSession.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGnD,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AAEvD,QAAA,MAAM,oBAAoB,iDAAkD,CAAC;AAC7E,MAAM,MAAM,eAAe,GAAG,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC;AAElE,QAAA,MAAM,eAAe,oCAAqC,CAAC;AAC3D,MAAM,MAAM,cAAc,GAAG,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;AAgB5D,MAAM,CAAC,OAAO,OAAO,YAAY;IAGtB,SAAS,EAAE,MAAM,CAAC;IAWlB,MAAM,EAAE,MAAM,CAAC;IAIf,KAAK,EAAE,QAAQ,CAAC;IAIhB,MAAM,EAAE,QAAQ,CAAC;IAGjB,OAAO,EAAE,OAAO,CAAC;IAGjB,WAAW,EAAE,QAAQ,CAAC;IAGtB,MAAM,EAAE,eAAe,CAAC;IAGxB,SAAS,EAAE,MAAM,CAAC;IAGlB,WAAW,EAAE,MAAM,CAAC;IAGpB,eAAe,EAAE,cAAc,CAAC;IAOhC,cAAc,EAAE,MAAM,CAAC;IAE9B;;OAEG;IAEI,QAAQ,EAAE,MAAM,CAAC;IAExB;;;;OAIG;IAEI,aAAa,EAAE,MAAM,CAAC;IAGtB,qBAAqB,EAAE,OAAO,CAAC;IAEtC;;;OAGG;IAEI,WAAW,EAAE,MAAM,CAAE;IAIrB,SAAS,EAAE,MAAM,CAAC;IAGlB,eAAe,EAAE,MAAM,CAAC;IAExB,IAAI,EAAE,IAAI,CAAC;IAEX,QAAQ,EAAE,cAAc,EAAE,CAAC;IAE3B,iBAAiB,EAAE,iBAAiB,CAAC;CAW/C"}
|
|
@@ -110,6 +110,11 @@ LoginSession = __decorate([
|
|
|
110
110
|
{ name: (x) => x.status, descending: false }
|
|
111
111
|
],
|
|
112
112
|
filter: (x) => x.invalid === false && x.deviceTokenType !== null
|
|
113
|
+
}),
|
|
114
|
+
Index({
|
|
115
|
+
name: "IX_LoginSessions_ActiveSessions",
|
|
116
|
+
columns: [{ name: (x) => x.expiry, descending: false }],
|
|
117
|
+
filter: (x) => x.invalid === false
|
|
113
118
|
})
|
|
114
119
|
], LoginSession);
|
|
115
120
|
export default LoginSession;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginSession.js","sourceRoot":"","sources":["../../../../src/server/model/entities/LoginSession.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAC5E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,wDAAwD,CAAC;AAClF,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAE3E,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,2DAA2D,CAAC;AAC7G,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AAEvD,MAAM,oBAAoB,GAAG,CAAC,SAAS,EAAE,iBAAiB,EAAE,MAAM,CAAU,CAAC;AAG7E,MAAM,eAAe,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"LoginSession.js","sourceRoot":"","sources":["../../../../src/server/model/entities/LoginSession.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ import type { WebSiteChannel } from "./WebSiteChannel.js";
|
|
|
14
14
|
import type { WebSiteVersion } from "./WebSiteVersion.js";
|
|
15
15
|
import type { WebSiteHost } from "./WebSiteHost.js";
|
|
16
16
|
import type WebSiteTag from "./WebSiteTag.js";
|
|
17
|
+
import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
17
18
|
/**
|
|
18
19
|
* Index Designs...
|
|
19
20
|
*
|
|
@@ -25,7 +26,9 @@ export default class WebSite {
|
|
|
25
26
|
folderID: number;
|
|
26
27
|
currentVersionID: number;
|
|
27
28
|
isStatic: boolean;
|
|
29
|
+
/** Is this website used as a template for other website? */
|
|
28
30
|
isTemplate: boolean;
|
|
31
|
+
hasEmailTemplates?: boolean;
|
|
29
32
|
isDesign: boolean;
|
|
30
33
|
isSuspended: boolean;
|
|
31
34
|
templateSites: number;
|
|
@@ -39,6 +42,7 @@ export default class WebSite {
|
|
|
39
42
|
* Will be set true when any file below listed folder id is modified
|
|
40
43
|
*/
|
|
41
44
|
isModified: boolean;
|
|
45
|
+
lastModified: DateTime;
|
|
42
46
|
snapshotStorage: number;
|
|
43
47
|
supportEmail: string;
|
|
44
48
|
fromEmail: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSite.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/WebSite.ts"],"names":[],"mappings":"AAGA,OAAO,OAAO,MAAM,cAAc,CAAC;AAGnC,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAChD,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"WebSite.d.ts","sourceRoot":"","sources":["../../../../src/server/model/entities/WebSite.ts"],"names":[],"mappings":"AAGA,OAAO,OAAO,MAAM,cAAc,CAAC;AAGnC,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAChD,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAE3E;;;;;;GAMG;AAgDH,MAAM,CAAC,OAAO,OAAO,OAAO;IAWjB,QAAQ,EAAE,MAAM,CAAC;IAWjB,gBAAgB,EAAE,MAAM,CAAC;IAGzB,QAAQ,EAAE,OAAO,CAAC;IAEzB,4DAA4D;IAErD,UAAU,EAAE,OAAO,CAAC;IAGpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAG5B,QAAQ,EAAE,OAAO,CAAC;IAGlB,WAAW,EAAE,OAAO,CAAC;IAIrB,aAAa,EAAE,MAAM,CAAC;IAGtB,YAAY,EAAE,MAAM,CAAC;IAGrB,SAAS,EAAE,MAAM,CAAC;IAGlB,KAAK,EAAE,MAAM,CAAC;IAId,YAAY,EAAE,OAAO,CAAC;IAGtB,WAAW,EAAE,MAAM,CAAC;IAGpB,UAAU,EAAE,MAAM,CAAC;IAE1B;;OAEG;IAEI,UAAU,EAAE,OAAO,CAAC;IAGpB,YAAY,EAAE,QAAQ,CAAC;IAGvB,eAAe,EAAE,MAAM,CAAC;IAGxB,YAAY,EAAE,MAAM,CAAC;IAGrB,SAAS,EAAE,MAAM,CAAC;IAGlB,QAAQ,EAAE,MAAM,CAAC;IAGjB,aAAa,EAAE,MAAM,CAAC;IAGtB,aAAa,EAAE,MAAM,CAAC;IAEtB,MAAM,EAAE,OAAO,CAAC;IAEvB,cAAc,EAAE,OAAO,CAAC;IAExB,KAAK,EAAE,WAAW,EAAE,CAAC;IAErB,QAAQ,EAAE,cAAc,EAAE,CAAC;IAE3B,QAAQ,EAAE,cAAc,EAAE,CAAC;IAE3B,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,cAAc,EAAE,oBAAoB,EAAE,CAAC;IACvC,WAAW,EAAE,UAAU,EAAE,CAAC;CAE7B"}
|
|
@@ -13,6 +13,7 @@ import Table from "@entity-access/entity-access/dist/decorators/Table.js";
|
|
|
13
13
|
import AppFile from "./AppFile.js";
|
|
14
14
|
import { JsonProperty, ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
|
|
15
15
|
import Index from "@entity-access/entity-access/dist/decorators/Index.js";
|
|
16
|
+
import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
16
17
|
/**
|
|
17
18
|
* Index Designs...
|
|
18
19
|
*
|
|
@@ -54,6 +55,10 @@ __decorate([
|
|
|
54
55
|
Column({ dataType: "Boolean", default: () => false }),
|
|
55
56
|
__metadata("design:type", Boolean)
|
|
56
57
|
], WebSite.prototype, "isTemplate", void 0);
|
|
58
|
+
__decorate([
|
|
59
|
+
Column({ dataType: "Boolean", default: () => false }),
|
|
60
|
+
__metadata("design:type", Boolean)
|
|
61
|
+
], WebSite.prototype, "hasEmailTemplates", void 0);
|
|
57
62
|
__decorate([
|
|
58
63
|
Column({ dataType: "Boolean", default: () => false }),
|
|
59
64
|
__metadata("design:type", Boolean)
|
|
@@ -95,6 +100,10 @@ __decorate([
|
|
|
95
100
|
Column({ dataType: "Boolean", default: () => false }),
|
|
96
101
|
__metadata("design:type", Boolean)
|
|
97
102
|
], WebSite.prototype, "isModified", void 0);
|
|
103
|
+
__decorate([
|
|
104
|
+
Column({ dataType: "DateTime", nullable: true }),
|
|
105
|
+
__metadata("design:type", DateTime)
|
|
106
|
+
], WebSite.prototype, "lastModified", void 0);
|
|
98
107
|
__decorate([
|
|
99
108
|
Column({ dataType: "BigInt", default: () => 0 }),
|
|
100
109
|
__metadata("design:type", Number)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSite.js","sourceRoot":"","sources":["../../../../src/server/model/entities/WebSite.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,wDAAwD,CAAC;AAC/F,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,2DAA2D,CAAC;AAC/G,OAAO,KAAK,MAAM,uDAAuD,CAAC;
|
|
1
|
+
{"version":3,"file":"WebSite.js","sourceRoot":"","sources":["../../../../src/server/model/entities/WebSite.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,wDAAwD,CAAC;AAC/F,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,2DAA2D,CAAC;AAC/G,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAgB1E,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAE3E;;;;;;GAMG;AAgDY,IAAM,OAAO,GAAb,MAAM,OAAO;CAiH3B,CAAA;AAtGU;IATN,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;IACzC,WAAW,CAAC,OAAO,EAAE;QAClB,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM;QACzB,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa;QACvC,oBAAoB,EAAE;YAClB,IAAI,EAAE,qBAAqB;YAC3B,QAAQ,EAAE,UAAU;SACvB;KACJ,CAAC;;yCACsB;AAWjB;IATN,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC9C,QAAQ,CAAC,OAAO,EAAE;QACf,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc;QACjC,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,sBAAsB;QAChD,oBAAoB,EAAE;YAClB,IAAI,EAAE,6BAA6B;YACnC,QAAQ,EAAE,UAAU;SACvB;KACJ,CAAC;;iDAC8B;AAGzB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC;;yCAC3B;AAIlB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAC,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC;;2CAC1B;AAGpB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAC,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC;;kDAClB;AAG5B;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAC,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC;;yCAC5B;AAGlB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,EAAC,CAAC;;4CACzB;AAIrB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;;8CACjB;AAGtB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;;6CAClB;AAGrB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CAClC;AAGlB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCACrC;AAId;IAFN,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAC,GAAG,EAAE,CAAC,KAAK,EAAC,CAAC;IACnD,oBAAoB;;6CACQ;AAGtB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC/B;AAGpB;IADN,YAAY,CAAC,EAAE,CAAC;;2CACS;AAMnB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC;;2CAC3B;AAGpB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC5B,QAAQ;6CAAC;AAGvB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,EAAC,CAAC;;gDAChB;AAGxB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;6CAC5B;AAGrB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;0CAC/B;AAGlB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,EAAC,CAAC;;yCACrC;AAGjB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;8CAC3B;AAGtB;IADN,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,EAAC,CAAC;;8CACnB;AAxFZ,OAAO;IA9C3B,KAAK,CAAC,UAAU,CAAC;IACjB,KAAK,CAAC;QACH,IAAI,EAAE,0BAA0B;QAChC,OAAO,EAAE;YACL,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE;SACnD;QACD,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,IAAI;KACvC,CAAC;IACD,KAAK,CAAC;QACH,IAAI,EAAE,wBAAwB;QAC9B,OAAO,EAAE;YACL,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE;SACnD;QACD,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI;KACrC,CAAC;IACD,KAAK,CAAC;QACH,IAAI,EAAE,iCAAiC;QACvC,OAAO,EAAE;YACL,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,UAAU,EAAE,IAAI,EAAE;SACrD;QACD,OAAO,EAAE;YACL,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ;SACpB;QACD,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,CAAC,gBAAgB,KAAK,IAAI;KACpE,CAAC;IAED,KAAK,CAAC;QACH,IAAI,EAAE,mCAAmC;QACzC,OAAO,EAAE;YACL,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,UAAU,EAAE,IAAI,EAAE;SACrD;QACD,OAAO,EAAE;YACL,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ;SACpB;QACD,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,IAAI,IAAI,CAAC,CAAC,gBAAgB,KAAK,IAAI;KACtE,CAAC;IACD,KAAK,CAAC;QACH,IAAI,EAAE,iCAAiC;QACvC,OAAO,EAAE;YACL,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,UAAU,EAAE,IAAI,EAAE;SACrD;QACD,OAAO,EAAE;YACL,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ;SACpB;QACD,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,CAAC,gBAAgB,KAAK,IAAI;KACpE,CAAC;GACmB,OAAO,CAiH3B;eAjHoB,OAAO"}
|
|
@@ -14,7 +14,7 @@ export default async function seedUI(config) {
|
|
|
14
14
|
await config.saveVersion(UIPackageConfig, {
|
|
15
15
|
package: "@social-mail/social-mail-client",
|
|
16
16
|
view: "dist/web/AppIndex",
|
|
17
|
-
version: "1.9.
|
|
17
|
+
version: "1.9.116"
|
|
18
18
|
});
|
|
19
19
|
await config.saveVersion(WebComponentsPackageConfig, {
|
|
20
20
|
package: "@social-mail/web-components",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seed-ui.js","sourceRoot":"","sources":["../../../../src/server/seed/ui/seed-ui.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,mBAAmB,EAAE,eAAe,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxH,OAAO,UAAU,MAAM,iDAAiD,CAAC;AAEzE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,MAAM,CAAC,MAAgB;IAEjD,MAAM,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE;QACjC,GAAG,EAAE;YACD,GAAG,EAAE,EAAE;YACP,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACb;QACD,GAAG,EAAE;YACD,kBAAkB,EAAE,EAAE;SACzB;KACJ,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,WAAW,CAAC,eAAe,EAAE;QACtC,OAAO,EAAE,iCAAiC;QAC1C,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"seed-ui.js","sourceRoot":"","sources":["../../../../src/server/seed/ui/seed-ui.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,mBAAmB,EAAE,eAAe,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxH,OAAO,UAAU,MAAM,iDAAiD,CAAC;AAEzE,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,MAAM,CAAC,MAAgB;IAEjD,MAAM,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE;QACjC,GAAG,EAAE;YACD,GAAG,EAAE,EAAE;YACP,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACb;QACD,GAAG,EAAE;YACD,kBAAkB,EAAE,EAAE;SACzB;KACJ,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,WAAW,CAAC,eAAe,EAAE;QACtC,OAAO,EAAE,iCAAiC;QAC1C,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE,SAAS;KACrB,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,WAAW,CAAC,0BAA0B,EAAE;QACjD,OAAO,EAAE,6BAA6B;QACtC,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE,SAAS;KACrB,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,WAAW,CAAC,mBAAmB,EAAE;QAC1C,OAAO,EAAE,+BAA+B;QACxC,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE,OAAO;KACnB,CAAC,CAAC;AAEP,CAAC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
+
import { Encoding } from "node:crypto";
|
|
1
2
|
export default class EncryptionService {
|
|
2
3
|
global: {
|
|
3
4
|
encrypt: (text: string, publicKey: any, host: string) => string;
|
|
4
5
|
decrypt: (text: string, publicKey: any, host: string) => string;
|
|
5
6
|
};
|
|
6
7
|
general: {
|
|
7
|
-
encrypt: (text: string) => string;
|
|
8
|
-
decrypt: (text: string) => string;
|
|
8
|
+
encrypt: (text: string, encoding?: Encoding) => string;
|
|
9
|
+
decrypt: (text: string, encoding?: Encoding) => string;
|
|
9
10
|
};
|
|
10
11
|
secure: {
|
|
11
12
|
encrypt: (text: string) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EncryptionService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/encryption/EncryptionService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"EncryptionService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/encryption/EncryptionService.ts"],"names":[],"mappings":"AAEA,OAAe,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAK/C,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAElC,MAAM;wBACc,MAAM,wBAAmB,MAAM;wBAC/B,MAAM,wBAAoB,MAAM;MAClD;IAEF,OAAO;wBACa,MAAM,aAAY,QAAQ;wBAC1B,MAAM,aAAY,QAAQ;MAC5C;IAEF,MAAM;wBACc,MAAM;wBACN,MAAM;MACxB;IAEF,OAAO,CAAC,OAAO;IAOf,OAAO,CAAC,OAAO;IAOf,OAAO,CAAC,SAAS;CAoBpB"}
|
|
@@ -15,8 +15,8 @@ let EncryptionService = class EncryptionService {
|
|
|
15
15
|
decrypt: (text, publicKey, host) => this.decrypt(text, publicKey, "base64url", host)
|
|
16
16
|
};
|
|
17
17
|
this.general = {
|
|
18
|
-
encrypt: (text) => this.encrypt(text, globalEnv.publicKey,
|
|
19
|
-
decrypt: (text) => this.decrypt(text, globalEnv.publicKey,
|
|
18
|
+
encrypt: (text, encoding = "base64url") => this.encrypt(text, globalEnv.publicKey, encoding),
|
|
19
|
+
decrypt: (text, encoding = "base64url") => this.decrypt(text, globalEnv.publicKey, encoding)
|
|
20
20
|
};
|
|
21
21
|
this.secure = {
|
|
22
22
|
encrypt: (text) => this.encrypt(text, globalEnv.secretKey),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EncryptionService.js","sourceRoot":"","sources":["../../../../src/server/services/encryption/EncryptionService.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,MAAoB,MAAM,aAAa,CAAC;AAE/C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAiC,CAAC;AAGxC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAAvB;QAEX,WAAM,GAAG;YACL,OAAO,EAAE,CAAC,IAAY,EAAE,SAAS,EAAE,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC;YACpG,OAAO,EAAE,CAAC,IAAY,EAAE,SAAS,EAAG,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC;SACxG,CAAC;QAEF,YAAO,GAAG;YACN,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"EncryptionService.js","sourceRoot":"","sources":["../../../../src/server/services/encryption/EncryptionService.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ let FileVersionService = class FileVersionService {
|
|
|
42
42
|
if (/text\//i.test(file.contentType)) {
|
|
43
43
|
const rootFolders = file.path.split("/").filter((x) => x && x !== file.fileContentID.toString());
|
|
44
44
|
await db.websiteFolders.where({ rootFolders }, (p) => (x) => Sql.in(x.folderID, p.rootFolders))
|
|
45
|
-
.update(void 0, (p) => (x) => ({ isModified: true }));
|
|
45
|
+
.update(void 0, (p) => (x) => ({ isModified: true, lastModified: Sql.date.now() }));
|
|
46
46
|
}
|
|
47
47
|
// clean older versions...
|
|
48
48
|
await DeleteFileHistoryWorkflow.queue(this.workflowContext, file.appFileID);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileVersionService.js","sourceRoot":"","sources":["../../../../src/server/services/files/FileVersionService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAErG,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAE3E,OAAO,yBAAyB,MAAM,oDAAoD,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAGhD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAI5B,KAAK,CAAC,WAAW,CAAC,IAAiB,EAAE,IAAa;QACrD,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;QACzC,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC5D,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC;QACjC,EAAE,CAAC,aAAa,GAAG,KAAK,CAAC;QACzB,EAAE,CAAC,WAAW,GAAG,KAAK,CAAC;QACvB,MAAM,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC;YACpC,MAAM,EAAE,IAAI,CAAC,SAAS;YACtB,MAAM;YACN,SAAS;YACT,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW;SACd,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,CAAC;aACnE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAE5F,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC9B,qBAAqB;YACrB,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ;iBACnB,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,QAAQ,CAAC;iBACrD,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;gBACd,OAAO;YACX,CAAC;QACL,CAAC;QAED,IAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YACpC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAU,CAAC;YAC1G,MAAM,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC;iBAC1F,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"FileVersionService.js","sourceRoot":"","sources":["../../../../src/server/services/files/FileVersionService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
export interface ISiteFolder {
|
|
2
2
|
snapshotFolderID: number;
|
|
3
|
+
host: string;
|
|
3
4
|
folderID: number;
|
|
4
5
|
eSiteID: string;
|
|
5
6
|
isTemplate: boolean;
|
|
6
7
|
isDesign: boolean;
|
|
7
8
|
remoteUrl: string;
|
|
9
|
+
cacheKey: string;
|
|
10
|
+
hasEmailTemplates: boolean;
|
|
11
|
+
draftMode: boolean;
|
|
8
12
|
}
|
|
9
13
|
//# sourceMappingURL=ISiteFolder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ISiteFolder.d.ts","sourceRoot":"","sources":["../../../../src/server/services/files/ISiteFolder.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"ISiteFolder.d.ts","sourceRoot":"","sources":["../../../../src/server/services/files/ISiteFolder.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;CACtB"}
|
|
@@ -6,6 +6,8 @@ import SocialMailContext from "../../model/SocialMailContext.js";
|
|
|
6
6
|
import { ICacheContainer, ObjectCache } from "../../../common/cacheFor.js";
|
|
7
7
|
import { ISiteFolder } from "./ISiteFolder.js";
|
|
8
8
|
import EncryptionService from "../encryption/EncryptionService.js";
|
|
9
|
+
import ReplicaReader from "../replica/ReplicaReader.js";
|
|
10
|
+
import type WebSite from "../../model/entities/WebSite.js";
|
|
9
11
|
/**
|
|
10
12
|
* We cannot read from replica as relative path can change anytime, only absolute file content id can be read from replica.
|
|
11
13
|
*/
|
|
@@ -13,12 +15,13 @@ export default class WebSiteContentService extends ServiceObject implements ICac
|
|
|
13
15
|
dbConfig: DBConfig;
|
|
14
16
|
siteCache: SiteDiskContentCache;
|
|
15
17
|
cache: ObjectCache<WebSiteContentService>;
|
|
18
|
+
replicaReader: ReplicaReader;
|
|
16
19
|
tfs: TempFileService;
|
|
17
20
|
ecs: EncryptionService;
|
|
18
21
|
db: SocialMailContext;
|
|
19
22
|
postInit(): void;
|
|
20
|
-
getCurrentSnapshotFolder(host:
|
|
21
|
-
getWebSiteFolder(folderID: any): Promise<
|
|
23
|
+
getCurrentSnapshotFolder(host: string): Promise<ISiteFolder>;
|
|
24
|
+
getWebSiteFolder(folderID: any): Promise<WebSite>;
|
|
22
25
|
getWebSite(host: any): Promise<{
|
|
23
26
|
folderID: number;
|
|
24
27
|
currency: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSiteContentService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/files/WebSiteContentService.ts"],"names":[],"mappings":"AACA,OAAe,EAAkB,aAAa,EAAmB,MAAM,4CAA4C,CAAC;AAEpH,OAAO,QAA8E,MAAM,gBAAgB,CAAC;AAC5G,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,oBAAoB,MAAM,2BAA2B,CAAC;AAC7D,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAY,eAAe,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAErF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,iBAAiB,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"WebSiteContentService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/files/WebSiteContentService.ts"],"names":[],"mappings":"AACA,OAAe,EAAkB,aAAa,EAAmB,MAAM,4CAA4C,CAAC;AAEpH,OAAO,QAA8E,MAAM,gBAAgB,CAAC;AAC5G,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,oBAAoB,MAAM,2BAA2B,CAAC;AAC7D,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAY,eAAe,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAErF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,iBAAiB,MAAM,oCAAoC,CAAC;AAGnE,OAAO,aAAa,MAAM,6BAA6B,CAAC;AAKxD,OAAO,KAAK,OAAO,MAAM,iCAAiC,CAAC;AAE3D;;GAEG;AAEH,MAAM,CAAC,OAAO,OAAO,qBACjB,SAAQ,aACR,YAAW,eAAe,CAAC,qBAAqB,CAAC;IAGjD,QAAQ,EAAE,QAAQ,CAAC;IAGnB,SAAS,EAAE,oBAAoB,CAAC;IAEhC,KAAK,EAAE,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAG1C,aAAa,EAAE,aAAa,CAAC;IAG7B,GAAG,EAAE,eAAe,CAAC;IAGrB,GAAG,EAAE,iBAAiB,CAAC;IAGvB,EAAE,EAAE,iBAAiB,CAAC;IAEtB,QAAQ;IAKF,wBAAwB,CAAC,IAAI,EAAE,MAAM;IAsErC,gBAAgB,CAAC,QAAQ,KAAA;IAMzB,UAAU,CAAC,IAAI,KAAA;;;;;;IAUf,OAAO,CAAC,QAAQ,KAAA,EAAE,GAAI,IAAI,EAAE,MAAM,EAAE;IAW1C,eAAe,CAAC,QAAQ,EAAE,SAAS;IAK7B,WAAW,CAAC,QAAQ,KAAA,EAAE,GAAI,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC;IAkBjE,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;IAUvD;;;;;;;;OAQG;IACG,eAAe,CAAC,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE;IAsCvD,eAAe;CAaxB;AAED,MAAM,WAAW,SAAS;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;CACzB"}
|
|
@@ -20,6 +20,10 @@ import EncryptionService from "../encryption/EncryptionService.js";
|
|
|
20
20
|
import { hash } from "crypto";
|
|
21
21
|
import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
|
|
22
22
|
import ReplicaReader from "../replica/ReplicaReader.js";
|
|
23
|
+
import HtmlForEmailService from "../html/HtmlForEmailService.js";
|
|
24
|
+
import { Base36 } from "../../../common/Base36.js";
|
|
25
|
+
import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
26
|
+
import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
|
|
23
27
|
/**
|
|
24
28
|
* We cannot read from replica as relative path can change anytime, only absolute file content id can be read from replica.
|
|
25
29
|
*/
|
|
@@ -28,15 +32,46 @@ let WebSiteContentService = class WebSiteContentService extends ServiceObject {
|
|
|
28
32
|
this.cache = this.siteCache.cache;
|
|
29
33
|
}
|
|
30
34
|
async getCurrentSnapshotFolder(host) {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
35
|
+
let site;
|
|
36
|
+
let draftMode = false;
|
|
37
|
+
let cacheKey;
|
|
38
|
+
// we will only decrypt site info form server-[site-info].root as the cluster may not want to
|
|
39
|
+
// lookup every website in every virtual server and no one outside cluster can route here
|
|
40
|
+
const { groups } = /^(?<sID>\d{1,16})\-(?<siteInfo>[^\.]{1,400})\.sites\./i.exec(host) ?? {};
|
|
41
|
+
const siteInfo = groups?.siteInfo;
|
|
42
|
+
if (siteInfo) {
|
|
43
|
+
let [folderID, time] = this.ecs.general.decrypt(siteInfo, "hex").split("-");
|
|
44
|
+
// for safety, time should not be more than 24 hours
|
|
45
|
+
folderID = Base36.decode(folderID);
|
|
46
|
+
time = Base36.decode(time);
|
|
47
|
+
const dt = DateTime.from(time);
|
|
48
|
+
if (dt.msSinceEpoch < DateTime.now.addDays(-1).msSinceEpoch) {
|
|
49
|
+
throw new EntityAccessError("Invalid draft url, please regenerate the url again");
|
|
50
|
+
}
|
|
51
|
+
site = await this.replicaReader.query((db) => db.websiteFolders.where({ folderID }, (p) => (x) => x.folderID === p.folderID
|
|
52
|
+
&& x.isSuspended === false)
|
|
53
|
+
.first());
|
|
54
|
+
if (!site) {
|
|
55
|
+
return null;
|
|
56
|
+
}
|
|
57
|
+
// we need to create disk snapshot of the last time here...
|
|
58
|
+
draftMode = true;
|
|
59
|
+
cacheKey = `${site.folderID.toString(36)}-${site.lastModified ? DateTime.from(site.lastModified).msSinceEpoch.toString(36) : "z"}`;
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
site = await this.replicaReader.query((db) => db.websiteFolders.where({ host }, (p) => (x) => x.hosts.some((h) => h.host === p.host)
|
|
63
|
+
&& x.isSuspended === false)
|
|
64
|
+
.first());
|
|
65
|
+
}
|
|
34
66
|
if (!site) {
|
|
35
67
|
return null;
|
|
36
68
|
}
|
|
37
|
-
if (!site.currentVersionID) {
|
|
69
|
+
if (!draftMode && !site.currentVersionID) {
|
|
38
70
|
return null;
|
|
39
71
|
}
|
|
72
|
+
if (!draftMode) {
|
|
73
|
+
cacheKey = site.currentVersionID.toString();
|
|
74
|
+
}
|
|
40
75
|
let remoteUrl = site.remoteUrl?.trim();
|
|
41
76
|
if (remoteUrl?.endsWith("/")) {
|
|
42
77
|
remoteUrl = remoteUrl.slice(0, -1);
|
|
@@ -47,17 +82,19 @@ let WebSiteContentService = class WebSiteContentService extends ServiceObject {
|
|
|
47
82
|
isDesign: site.isDesign,
|
|
48
83
|
eSiteID: this.ecs.general.encrypt(site.folderID.toString()),
|
|
49
84
|
remoteUrl: site.remoteUrl,
|
|
50
|
-
isTemplate: site.isTemplate
|
|
85
|
+
isTemplate: site.isTemplate,
|
|
86
|
+
hasEmailTemplates: site.hasEmailTemplates,
|
|
87
|
+
draftMode,
|
|
88
|
+
cacheKey,
|
|
89
|
+
host
|
|
51
90
|
};
|
|
52
91
|
}
|
|
53
92
|
async getWebSiteFolder(folderID) {
|
|
54
|
-
|
|
55
|
-
return replicaReader.query((db) => db.websiteFolders.where({ folderID }, (p) => (x) => x.folderID === p.folderID)
|
|
93
|
+
return this.replicaReader.query((db) => db.websiteFolders.where({ folderID }, (p) => (x) => x.folderID === p.folderID)
|
|
56
94
|
.first());
|
|
57
95
|
}
|
|
58
96
|
async getWebSite(host) {
|
|
59
|
-
const
|
|
60
|
-
const folder = await replicaReader.query((db) => this.db.websiteFolders.where({ host }, (p) => (x) => x.hosts.some((s) => s.host === p.host))
|
|
97
|
+
const folder = await this.replicaReader.query((db) => db.websiteFolders.where({ host }, (p) => (x) => x.hosts.some((s) => s.host === p.host))
|
|
61
98
|
.first());
|
|
62
99
|
if (!folder) {
|
|
63
100
|
return null;
|
|
@@ -81,11 +118,11 @@ let WebSiteContentService = class WebSiteContentService extends ServiceObject {
|
|
|
81
118
|
async getFileInfo(folderID, ...segments) {
|
|
82
119
|
const [top, ...paths] = segments;
|
|
83
120
|
const eTop = top.replace(/(\%|\_)/i, (x) => "\\" + x);
|
|
84
|
-
const child = await this.db.appFiles
|
|
121
|
+
const child = await this.replicaReader.query((db) => db.appFiles
|
|
85
122
|
.where({ folderID, eTop }, (p) => (x) => x.parentID === p.folderID && Sql.text.iLike(x.name, p.eTop))
|
|
86
123
|
.orderBy(void 0, (p) => (x) => x.isDeleted)
|
|
87
124
|
.thenByDescending({ top }, (p) => (x) => x.name === p.top)
|
|
88
|
-
.first();
|
|
125
|
+
.first());
|
|
89
126
|
if (!child) {
|
|
90
127
|
return null;
|
|
91
128
|
}
|
|
@@ -114,24 +151,31 @@ let WebSiteContentService = class WebSiteContentService extends ServiceObject {
|
|
|
114
151
|
* @returns
|
|
115
152
|
*/
|
|
116
153
|
async getSnapshotFile(siteFolder, path) {
|
|
117
|
-
const { snapshotFolderID } = siteFolder;
|
|
118
|
-
const src = await this.getFile(snapshotFolderID, ...path);
|
|
154
|
+
const { snapshotFolderID, draftMode, folderID, cacheKey } = siteFolder;
|
|
155
|
+
const src = await this.getFile(draftMode ? folderID : snapshotFolderID, ...path);
|
|
119
156
|
if (!src) {
|
|
120
157
|
return;
|
|
121
158
|
}
|
|
122
159
|
const fileName = path.pop();
|
|
123
160
|
if (/html$/i.test(src.contentType)) {
|
|
124
161
|
const currentPath = path.join("/");
|
|
125
|
-
const filePath = join(
|
|
162
|
+
const filePath = join(cacheKey, "transformed", ...path, fileName);
|
|
126
163
|
return this.siteCache.htmlCache.getOrCreateAsync(filePath, async (dest) => {
|
|
127
164
|
const ts = ServiceProvider.resolve(this, WebContentTranspileService);
|
|
128
|
-
|
|
165
|
+
let content = await ts.transformHtml(siteFolder, src, currentPath);
|
|
166
|
+
if (siteFolder.hasEmailTemplates) {
|
|
167
|
+
// transform email templates..
|
|
168
|
+
const { folderID: siteID, host } = siteFolder;
|
|
169
|
+
const url = `https://${host}/${currentPath}`;
|
|
170
|
+
const es = ServiceProvider.resolve(this, HtmlForEmailService);
|
|
171
|
+
content = await es.prepareHtml({ html: content, siteID, path, url });
|
|
172
|
+
}
|
|
129
173
|
await dest.writeAllText(content);
|
|
130
174
|
});
|
|
131
175
|
}
|
|
132
176
|
if (/css$/i.test(src.contentType)) {
|
|
133
177
|
const currentPath = path.join("/");
|
|
134
|
-
const filePath = join(
|
|
178
|
+
const filePath = join(cacheKey, "transformed", ...path, fileName);
|
|
135
179
|
return this.siteCache.htmlCache.getOrCreateAsync(filePath, async (dest) => {
|
|
136
180
|
const ts = ServiceProvider.resolve(this, WebContentTranspileService);
|
|
137
181
|
const content = await ts.transformCss(siteFolder, src, currentPath);
|
|
@@ -159,6 +203,10 @@ __decorate([
|
|
|
159
203
|
Inject,
|
|
160
204
|
__metadata("design:type", SiteDiskContentCache)
|
|
161
205
|
], WebSiteContentService.prototype, "siteCache", void 0);
|
|
206
|
+
__decorate([
|
|
207
|
+
Inject,
|
|
208
|
+
__metadata("design:type", ReplicaReader)
|
|
209
|
+
], WebSiteContentService.prototype, "replicaReader", void 0);
|
|
162
210
|
__decorate([
|
|
163
211
|
Inject,
|
|
164
212
|
__metadata("design:type", TempFileService)
|
|
@@ -174,7 +222,7 @@ __decorate([
|
|
|
174
222
|
__decorate([
|
|
175
223
|
cacheFor(),
|
|
176
224
|
__metadata("design:type", Function),
|
|
177
|
-
__metadata("design:paramtypes", [
|
|
225
|
+
__metadata("design:paramtypes", [String]),
|
|
178
226
|
__metadata("design:returntype", Promise)
|
|
179
227
|
], WebSiteContentService.prototype, "getCurrentSnapshotFolder", null);
|
|
180
228
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSiteContentService.js","sourceRoot":"","sources":["../../../../src/server/services/files/WebSiteContentService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACpH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,QAAQ,EAAE,EAAE,mBAAmB,EAAE,eAAe,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC5G,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,oBAAoB,MAAM,2BAA2B,CAAC;AAC7D,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAgC,MAAM,6BAA6B,CAAC;AACrF,OAAO,0BAA0B,MAAM,6CAA6C,CAAC;AAErF,OAAO,iBAAiB,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,aAAa,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"WebSiteContentService.js","sourceRoot":"","sources":["../../../../src/server/services/files/WebSiteContentService.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,5 +8,11 @@ export default class HtmlForEmailService {
|
|
|
8
8
|
siteID: any;
|
|
9
9
|
path: string[];
|
|
10
10
|
}): Promise<LocalFile>;
|
|
11
|
+
prepareHtml({ html, siteID, path, url }: {
|
|
12
|
+
html: string;
|
|
13
|
+
url: string;
|
|
14
|
+
siteID: any;
|
|
15
|
+
path: string[];
|
|
16
|
+
}): Promise<string>;
|
|
11
17
|
}
|
|
12
18
|
//# sourceMappingURL=HtmlForEmailService.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HtmlForEmailService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/html/HtmlForEmailService.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,oBAAoB,MAAM,kCAAkC,CAAC;AAKpE,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAGpC,SAAS,EAAE,oBAAoB,CAAC;IAE1B,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QAAE,OAAO,EAAE,SAAS,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,MAAC;QAAC,IAAI,EAAE,MAAM,EAAE,CAAA;KAAE;
|
|
1
|
+
{"version":3,"file":"HtmlForEmailService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/html/HtmlForEmailService.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAC/E,OAAO,oBAAoB,MAAM,kCAAkC,CAAC;AAKpE,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAGpC,SAAS,EAAE,oBAAoB,CAAC;IAE1B,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QAAE,OAAO,EAAE,SAAS,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,MAAC;QAAC,IAAI,EAAE,MAAM,EAAE,CAAA;KAAE;IAenG,WAAW,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,MAAC;QAAC,IAAI,EAAE,MAAM,EAAE,CAAA;KAAE;CAWvG"}
|
|
@@ -28,6 +28,16 @@ let HtmlForEmailService = class HtmlForEmailService {
|
|
|
28
28
|
await dest.writeAllText(html);
|
|
29
29
|
});
|
|
30
30
|
}
|
|
31
|
+
async prepareHtml({ html, siteID, path, url }) {
|
|
32
|
+
const browser = new JSDOM(html, { url });
|
|
33
|
+
await new Promise((resolve, reject) => {
|
|
34
|
+
browser.window.addEventListener("load", () => {
|
|
35
|
+
void inlineCSS(browser.window, browser.window.document).then(resolve);
|
|
36
|
+
});
|
|
37
|
+
});
|
|
38
|
+
html = browser.window.document.documentElement.outerHTML;
|
|
39
|
+
return html;
|
|
40
|
+
}
|
|
31
41
|
};
|
|
32
42
|
__decorate([
|
|
33
43
|
Inject,
|