@social-mail/social-mail-web-server 1.7.310 → 1.7.311
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/common/cacheFor.d.ts +1 -1
- package/dist/common/cacheFor.d.ts.map +1 -1
- package/dist/common/cacheFor.js +7 -0
- package/dist/common/cacheFor.js.map +1 -1
- package/dist/server/services/files/SiteDiskContentCache.d.ts +3 -1
- package/dist/server/services/files/SiteDiskContentCache.d.ts.map +1 -1
- package/dist/server/services/files/SiteDiskContentCache.js +5 -10
- package/dist/server/services/files/SiteDiskContentCache.js.map +1 -1
- package/dist/server/services/files/WebSiteContentService.d.ts +7 -3
- package/dist/server/services/files/WebSiteContentService.d.ts.map +1 -1
- package/dist/server/services/files/WebSiteContentService.js +57 -41
- package/dist/server/services/files/WebSiteContentService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/common/cacheFor.ts +8 -1
- package/src/server/services/files/SiteDiskContentCache.ts +6 -16
- package/src/server/services/files/WebSiteContentService.ts +47 -41
|
@@ -4,7 +4,7 @@ export declare class ObjectCache<T> {
|
|
|
4
4
|
private cache;
|
|
5
5
|
constructor(ttl?: any);
|
|
6
6
|
for(name: keyof T): TimedCache<any, any>;
|
|
7
|
-
clear(name
|
|
7
|
+
clear(name?: keyof T): void;
|
|
8
8
|
}
|
|
9
9
|
export interface ICacheContainer<T> {
|
|
10
10
|
cache: ObjectCache<T> | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cacheFor.d.ts","sourceRoot":"","sources":["../../src/common/cacheFor.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,8DAA8D,CAAC;AAGtF,qBAAa,WAAW,CAAC,CAAC;IAIV,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;IAFjC,OAAO,CAAC,KAAK,CAAmC;gBAEnB,GAAG,CAAC,KAAA;IAIjC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC;IASjB,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"cacheFor.d.ts","sourceRoot":"","sources":["../../src/common/cacheFor.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,8DAA8D,CAAC;AAGtF,qBAAa,WAAW,CAAC,CAAC;IAIV,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;IAFjC,OAAO,CAAC,KAAK,CAAmC;gBAEnB,GAAG,CAAC,KAAA;IAIjC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC;IASjB,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CAUvB;AAED,MAAM,WAAW,eAAe,CAAC,CAAC;IAC9B,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;CACrC;AAED,wBAAgB,QAAQ,CAAC,CAAC,cACC,eAAe,CAAC,CAAC,CAAC;kBAEf,GAAG,EAAE;;;EAqBlC"}
|
package/dist/common/cacheFor.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cacheFor.js","sourceRoot":"","sources":["../../src/common/cacheFor.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,UAAU,MAAM,8DAA8D,CAAC;AAGtF,MAAM,OAAO,WAAW;IAIpB,YAA6B,GAAI;QAAJ,QAAG,GAAH,GAAG,CAAC;QAFzB,UAAK,GAAyB,IAAI,GAAG,EAAE,CAAC;IAIhD,CAAC;IAED,GAAG,CAAC,IAAa;QACb,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,EAAE,EAAE,CAAC;YACN,EAAE,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC7B,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"cacheFor.js","sourceRoot":"","sources":["../../src/common/cacheFor.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,OAAO,UAAU,MAAM,8DAA8D,CAAC;AAGtF,MAAM,OAAO,WAAW;IAIpB,YAA6B,GAAI;QAAJ,QAAG,GAAH,GAAG,CAAC;QAFzB,UAAK,GAAyB,IAAI,GAAG,EAAE,CAAC;IAIhD,CAAC;IAED,GAAG,CAAC,IAAa;QACb,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,EAAE,EAAE,CAAC;YACN,EAAE,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC7B,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,IAAc;QAChB,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;gBACxC,OAAO,CAAC,KAAK,EAAE,CAAC;YACpB,CAAC;YACD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACnB,OAAO;QACX,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC;IAClC,CAAC;CACJ;AAAA,CAAC;AAMF,MAAM,UAAU,QAAQ;IACpB,OAAO,UAAS,MAAyB,EAAE,GAAG;QAC1C,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAA0B,CAAC;QACvD,SAAS,KAAK,CAAC,GAAI,CAAQ;YACvB,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,IAAI,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAe,CAAC;YACxE,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;gBACxC,MAAM,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBACpC,EAAE,EAAE,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBAChB,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,QAAQ,eAAe,CAAC,CAAC;oBACjD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACrB,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC3B,CAAC,CAAC,CAAC;gBACH,OAAO,EAAE,CAAC;YACd,CAAC,CAAC,CAAC;QACP,CAAC;QACD,MAAM,CAAC,GAAG;YACN,KAAK;YACL,UAAU,EAAE,IAAI;YAChB,YAAY,EAAE,IAAI;SACrB,CAAC;QACF,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QACtC,OAAO,CAAC,CAAC;IACb,CAAC,CAAC;AACN,CAAC"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { ServiceObject } from "@entity-access/entity-access/dist/di/di.js";
|
|
2
2
|
import BaseDiskCache from "../../../common/BaseDiskCache.js";
|
|
3
3
|
import MessagingService from "../message-events/MessagingService.js";
|
|
4
|
+
import { ObjectCache } from "../../../common/cacheFor.js";
|
|
4
5
|
export default class SiteDiskContentCache extends ServiceObject {
|
|
5
6
|
ms: MessagingService;
|
|
6
|
-
|
|
7
|
+
cache: ObjectCache<any>;
|
|
8
|
+
htmlCache: BaseDiskCache;
|
|
7
9
|
postInit(): void;
|
|
8
10
|
}
|
|
9
11
|
//# sourceMappingURL=SiteDiskContentCache.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiteDiskContentCache.d.ts","sourceRoot":"","sources":["../../../../src/server/services/files/SiteDiskContentCache.ts"],"names":[],"mappings":"AACA,OAAe,EAAqB,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAEtG,OAAO,aAAa,MAAM,kCAAkC,CAAC;AAE7D,OAAO,gBAAgB,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"SiteDiskContentCache.d.ts","sourceRoot":"","sources":["../../../../src/server/services/files/SiteDiskContentCache.ts"],"names":[],"mappings":"AACA,OAAe,EAAqB,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAEtG,OAAO,aAAa,MAAM,kCAAkC,CAAC;AAE7D,OAAO,gBAAgB,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAG1D,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,aAAa;IAG3D,EAAE,EAAE,gBAAgB,CAAC;IAErB,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,CAAqB;IAE5C,SAAS,gBAGN;IAEH,QAAQ;CAMX"}
|
|
@@ -13,24 +13,19 @@ import { join } from "path";
|
|
|
13
13
|
import BaseDiskCache from "../../../common/BaseDiskCache.js";
|
|
14
14
|
import { globalEnv } from "../../../common/globalEnv.js";
|
|
15
15
|
import MessagingService from "../message-events/MessagingService.js";
|
|
16
|
+
import { ObjectCache } from "../../../common/cacheFor.js";
|
|
16
17
|
let SiteDiskContentCache = class SiteDiskContentCache extends ServiceObject {
|
|
17
18
|
constructor() {
|
|
18
19
|
super(...arguments);
|
|
19
|
-
this.
|
|
20
|
-
|
|
20
|
+
this.cache = new ObjectCache();
|
|
21
|
+
this.htmlCache = new BaseDiskCache({
|
|
22
|
+
root: join(globalEnv.tmpDir, "site-html-cache", "html"),
|
|
21
23
|
keepTTLSeconds: 24 * 60 * 60
|
|
22
24
|
});
|
|
23
25
|
}
|
|
24
26
|
postInit() {
|
|
25
27
|
this.ms.snapshotRefresh.on(({ folderID }) => {
|
|
26
|
-
|
|
27
|
-
// we need to refresh everything...
|
|
28
|
-
this.htmlFileCache.clear().catch(console.error);
|
|
29
|
-
return;
|
|
30
|
-
}
|
|
31
|
-
// at zero all host to snapshot map will be stored
|
|
32
|
-
this.htmlFileCache.clearFolder("0").catch(console.error);
|
|
33
|
-
this.htmlFileCache.clearFolder(folderID.toString()).catch(console.error);
|
|
28
|
+
this.cache.clear();
|
|
34
29
|
});
|
|
35
30
|
}
|
|
36
31
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SiteDiskContentCache.js","sourceRoot":"","sources":["../../../../src/server/services/files/SiteDiskContentCache.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,MAAM,EAAE,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AACtG,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,aAAa,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,gBAAgB,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"SiteDiskContentCache.js","sourceRoot":"","sources":["../../../../src/server/services/files/SiteDiskContentCache.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,MAAM,EAAE,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AACtG,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,aAAa,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,gBAAgB,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAG3C,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,aAAa;IAAhD;;QAKX,UAAK,GAAqB,IAAI,WAAW,EAAE,CAAC;QAE5C,cAAS,GAAG,IAAI,aAAa,CAAC;YAC1B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,iBAAiB,EAAE,MAAM,CAAC;YACvD,cAAc,EAAE,EAAE,GAAC,EAAE,GAAC,EAAE;SAC3B,CAAC,CAAC;IAQP,CAAC;IANG,QAAQ;QACJ,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;YACxC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;IACP,CAAC;CAEJ,CAAA;AAfG;IADC,MAAM;8BACH,gBAAgB;gDAAC;AAHJ,oBAAoB;IADxC,iBAAiB;GACG,oBAAoB,CAkBxC;eAlBoB,oBAAoB"}
|
|
@@ -1,15 +1,19 @@
|
|
|
1
|
+
import { ServiceObject } from "@entity-access/entity-access/dist/di/di.js";
|
|
1
2
|
import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
2
3
|
import DBConfig from "../DBConfig.js";
|
|
3
4
|
import TempFileService from "../../storage/TempFileService.js";
|
|
4
5
|
import SiteDiskContentCache from "./SiteDiskContentCache.js";
|
|
5
6
|
import SocialMailContext from "../../model/SocialMailContext.js";
|
|
6
|
-
|
|
7
|
+
import { ICacheContainer, ObjectCache } from "../../../common/cacheFor.js";
|
|
8
|
+
export default class WebSiteContentService extends ServiceObject implements ICacheContainer<WebSiteContentService> {
|
|
7
9
|
dbConfig: DBConfig;
|
|
8
|
-
|
|
10
|
+
siteCache: SiteDiskContentCache;
|
|
11
|
+
cache: ObjectCache<WebSiteContentService>;
|
|
9
12
|
tfs: TempFileService;
|
|
10
13
|
db: SocialMailContext;
|
|
14
|
+
postInit(): void;
|
|
11
15
|
getCurrentSnapshotFolder(host: any): Promise<{
|
|
12
|
-
snapshotFolderID:
|
|
16
|
+
snapshotFolderID: number;
|
|
13
17
|
}>;
|
|
14
18
|
getWebSite(host: any): Promise<{
|
|
15
19
|
folderID: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSiteContentService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/files/WebSiteContentService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"WebSiteContentService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/files/WebSiteContentService.ts"],"names":[],"mappings":"AACA,OAAe,EAAqC,aAAa,EAAmB,MAAM,4CAA4C,CAAC;AAIvI,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAG/E,OAAO,QAA8E,MAAM,gBAAgB,CAAC;AAE5G,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAE/D,OAAO,oBAAoB,MAAM,2BAA2B,CAAC;AAC7D,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAY,eAAe,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAGrF,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,GAAG,EAAE,eAAe,CAAC;IAGrB,EAAE,EAAE,iBAAiB,CAAC;IAEtB,QAAQ;IAKF,wBAAwB,CAAC,IAAI,KAAA;;;IAe7B,UAAU,CAAC,IAAI,KAAA;;;;;;IAUf,OAAO,CAAC,QAAQ,KAAA,EAAE,GAAI,IAAI,EAAE,MAAM,EAAE;IASpC,WAAW,CAAC,QAAQ,KAAA,EAAE,GAAI,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAAE,IAAI,MAAC;QAAC,WAAW,MAAC;QAAC,SAAS,MAAC;QAAC,GAAG,MAAC;QAAC,aAAa,MAAA;KAAE,CAAC;IAgBxG,eAAe,CAAC,EAAE,gBAAgB,EAAE;;KAAA,EAAE,IAAI,EAAE,MAAM,EAAE;IAQpD,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;IAUjD,aAAa,CAAC,QAAQ,KAAA,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS;IAUvD,aAAa,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS;CA6DtD"}
|
|
@@ -8,7 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
10
|
/* eslint-disable no-console */
|
|
11
|
-
import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
|
|
11
|
+
import Inject, { RegisterScoped, ServiceObject } from "@entity-access/entity-access/dist/di/di.js";
|
|
12
12
|
import { join } from "path";
|
|
13
13
|
import { JSDOM } from 'jsdom';
|
|
14
14
|
import { descendentElementIterator } from "../../../common/html/Html.js";
|
|
@@ -16,31 +16,31 @@ import DBConfig, { FAFreePackageConfig, UIPackageConfig, WebComponentsPackageCon
|
|
|
16
16
|
import TempFileService from "../../storage/TempFileService.js";
|
|
17
17
|
import SiteDiskContentCache from "./SiteDiskContentCache.js";
|
|
18
18
|
import SocialMailContext from "../../model/SocialMailContext.js";
|
|
19
|
-
|
|
19
|
+
import { cacheFor } from "../../../common/cacheFor.js";
|
|
20
|
+
let WebSiteContentService = class WebSiteContentService extends ServiceObject {
|
|
21
|
+
postInit() {
|
|
22
|
+
this.cache = this.siteCache.cache;
|
|
23
|
+
}
|
|
20
24
|
async getCurrentSnapshotFolder(host) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
return { snapshotFolderID: appFileID };
|
|
32
|
-
});
|
|
25
|
+
const file = await this.db.appFiles
|
|
26
|
+
.where({ host }, (p) => (x) => x.currentVersionWebSites
|
|
27
|
+
.some((w) => w.hosts
|
|
28
|
+
.some((h) => h.host === p.host)))
|
|
29
|
+
.first();
|
|
30
|
+
if (!file) {
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
const { appFileID } = file;
|
|
34
|
+
return { snapshotFolderID: appFileID };
|
|
33
35
|
}
|
|
34
36
|
async getWebSite(host) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
return { folderID, currency, fromEmail, supportEmail };
|
|
43
|
-
});
|
|
37
|
+
const folder = await this.db.websiteFolders.where({ host }, (p) => (x) => x.hosts.some((s) => s.host === p.host))
|
|
38
|
+
.first();
|
|
39
|
+
if (!folder) {
|
|
40
|
+
return null;
|
|
41
|
+
}
|
|
42
|
+
const { folderID, currency, fromEmail, supportEmail } = folder;
|
|
43
|
+
return { folderID, currency, fromEmail, supportEmail };
|
|
44
44
|
}
|
|
45
45
|
async getFile(folderID, ...path) {
|
|
46
46
|
const fileInfo = await this.getFileInfo(folderID, ...path);
|
|
@@ -50,21 +50,19 @@ let WebSiteContentService = class WebSiteContentService {
|
|
|
50
50
|
return this.tfs.downloadFileContent(fileInfo.fileContentID, fileInfo);
|
|
51
51
|
}
|
|
52
52
|
async getFileInfo(folderID, ...path) {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
return await this.getFileInfo(child.appFileID, ...paths);
|
|
67
|
-
});
|
|
53
|
+
const [top, ...paths] = path;
|
|
54
|
+
const child = await this.db.appFiles
|
|
55
|
+
.where({ folderID, top }, (p) => (x) => x.parentID === p.folderID && x.name === p.top)
|
|
56
|
+
.orderBy(void 0, (p) => (x) => x.isDeleted)
|
|
57
|
+
.include((x) => x.fileContent)
|
|
58
|
+
.first();
|
|
59
|
+
if (!child) {
|
|
60
|
+
return null;
|
|
61
|
+
}
|
|
62
|
+
if (paths.length === 0) {
|
|
63
|
+
return { name: child.name, contentType: child.contentType, appFileID: child.appFileID, url: child.url, fileContentID: child.fileContentID };
|
|
64
|
+
}
|
|
65
|
+
return await this.getFileInfo(child.appFileID, ...paths);
|
|
68
66
|
}
|
|
69
67
|
async getSnapshotFile({ snapshotFolderID }, path) {
|
|
70
68
|
const file = await this.getFile(snapshotFolderID, ...path);
|
|
@@ -87,12 +85,12 @@ let WebSiteContentService = class WebSiteContentService {
|
|
|
87
85
|
return file;
|
|
88
86
|
}
|
|
89
87
|
const htmlFilePath = join(folderID.toString(), "transformed", ...path);
|
|
90
|
-
return this.
|
|
88
|
+
return this.siteCache.htmlCache.getOrCreateAsync(htmlFilePath, async (cf) => {
|
|
91
89
|
await this.transformHtml(file, cf);
|
|
92
90
|
});
|
|
93
91
|
}
|
|
94
92
|
async transformHtml(src, dest) {
|
|
95
|
-
const packageReplacements = await this.
|
|
93
|
+
const packageReplacements = await this.siteCache.htmlCache.getOrCreateJsonAsync("packages", async () => {
|
|
96
94
|
const config = this.dbConfig;
|
|
97
95
|
const packages = [
|
|
98
96
|
await config.get(UIPackageConfig),
|
|
@@ -147,7 +145,7 @@ __decorate([
|
|
|
147
145
|
__decorate([
|
|
148
146
|
Inject,
|
|
149
147
|
__metadata("design:type", SiteDiskContentCache)
|
|
150
|
-
], WebSiteContentService.prototype, "
|
|
148
|
+
], WebSiteContentService.prototype, "siteCache", void 0);
|
|
151
149
|
__decorate([
|
|
152
150
|
Inject,
|
|
153
151
|
__metadata("design:type", TempFileService)
|
|
@@ -156,6 +154,24 @@ __decorate([
|
|
|
156
154
|
Inject,
|
|
157
155
|
__metadata("design:type", SocialMailContext)
|
|
158
156
|
], WebSiteContentService.prototype, "db", void 0);
|
|
157
|
+
__decorate([
|
|
158
|
+
cacheFor(),
|
|
159
|
+
__metadata("design:type", Function),
|
|
160
|
+
__metadata("design:paramtypes", [Object]),
|
|
161
|
+
__metadata("design:returntype", Promise)
|
|
162
|
+
], WebSiteContentService.prototype, "getCurrentSnapshotFolder", null);
|
|
163
|
+
__decorate([
|
|
164
|
+
cacheFor(),
|
|
165
|
+
__metadata("design:type", Function),
|
|
166
|
+
__metadata("design:paramtypes", [Object]),
|
|
167
|
+
__metadata("design:returntype", Promise)
|
|
168
|
+
], WebSiteContentService.prototype, "getWebSite", null);
|
|
169
|
+
__decorate([
|
|
170
|
+
cacheFor(),
|
|
171
|
+
__metadata("design:type", Function),
|
|
172
|
+
__metadata("design:paramtypes", [Object, String]),
|
|
173
|
+
__metadata("design:returntype", Promise)
|
|
174
|
+
], WebSiteContentService.prototype, "getFileInfo", null);
|
|
159
175
|
WebSiteContentService = __decorate([
|
|
160
176
|
RegisterScoped
|
|
161
177
|
], WebSiteContentService);
|
|
@@ -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,
|
|
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,EAAqB,aAAa,EAAmB,MAAM,4CAA4C,CAAC;AAEvI,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,QAAQ,EAAE,EAAE,mBAAmB,EAAE,eAAe,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAE5G,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAE/D,OAAO,oBAAoB,MAAM,2BAA2B,CAAC;AAC7D,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAgC,MAAM,6BAA6B,CAAC;AAGtE,IAAM,qBAAqB,GAA3B,MAAM,qBACjB,SAAQ,aAAa;IAiBrB,QAAQ;QACJ,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;IACtC,CAAC;IAGK,AAAN,KAAK,CAAC,wBAAwB,CAAC,IAAI;QAC/B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ;aAC9B,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CACnB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,sBAAsB;aAC1B,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK;aACf,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;aAC5C,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAC3B,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,CAAC;IAC3C,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CAAC,IAAI;QACjB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;aAC5G,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;QAC/D,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAI,IAAc;QACtC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAI,IAAI,CAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,OAAO;QACX,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAC1E,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAI,IAAc;QAC1C,MAAM,CAAC,GAAG,EAAE,GAAI,KAAK,CAAC,GAAG,IAAI,CAAC;QAC9B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ;aAC/B,KAAK,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,GAAG,CAAC;aACpF,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;aAC1C,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;aAC7B,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE,CAAC;QAChJ,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,EAAE,GAAI,KAAK,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,EAAE,gBAAgB,EAAE,EAAE,IAAc;QACtD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAI,IAAI,CAAC,CAAC;QAC5D,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO;QACX,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,IAAY,EAAE,KAAe;QACnD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QACvD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;YAC7D,IAAI,WAAW,EAAE,CAAC;gBACd,OAAO,WAAW,CAAC;YACvB,CAAC;QACL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAc,EAAE,IAAe;QACzD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,GAAI,IAAI,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,gBAAgB,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;YACxE,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAc,EAAE,IAAe;QAE/C,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,oBAAoB,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE;YACnG,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;YAE7B,MAAM,QAAQ,GAAG;gBACb,MAAM,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;gBACjC,MAAM,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC;gBAC5C,MAAM,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC;aACxC,CAAC;YAEF,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACxB,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,GAAG,SAAS;gBACnC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO;aACnD,CAAC,CAAC,CAAC;QACR,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;QAEhC,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;QAEzC,MAAM,KAAK,GAAG,EAAqC,CAAC;QAEpD,KAAK,MAAM,IAAI,IAAI,yBAAyB,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;YACrE,QAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnB,KAAK,QAAQ;oBACT,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;oBAC9C,IAAI,YAAY,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;wBACpC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAmB,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;oBACrD,CAAC;oBACD,MAAM;gBACV,KAAK,MAAM;oBACP,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;oBAChD,IAAI,aAAa,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;wBACrC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAmB,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;oBACtD,CAAC;oBACD,MAAM;YACd,CAAC;QACL,CAAC;QAED,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACf,KAAK,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,mBAAmB,EAAE,CAAC;gBAEpD,KAAK,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,KAAK,EAAE,CAAC;oBAC3B,IAAI,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;oBAC1B,IAAI,CAAC,CAAC,EAAE,CAAC;wBACL,SAAS;oBACb,CAAC;oBACD,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;oBAC/B,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACzB,CAAC;YAEL,CAAC;QAEL,CAAC;QAED,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,EAAE,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,kBAAkB,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,CAAC;QAExJ,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IACzC,CAAC;CACJ,CAAA;AA7JG;IADC,MAAM;8BACG,QAAQ;uDAAC;AAGnB;IADC,MAAM;8BACI,oBAAoB;wDAAC;AAKhC;IADC,MAAM;8BACF,eAAe;kDAAC;AAGrB;IADC,MAAM;8BACH,iBAAiB;iDAAC;AAOhB;IADL,QAAQ,EAAE;;;;qEAaV;AAGK;IADL,QAAQ,EAAE;;;;uDASV;AAWK;IADL,QAAQ,EAAE;;;;wDAeV;AAvEgB,qBAAqB;IADzC,cAAc;GACM,qBAAqB,CAkKzC;eAlKoB,qBAAqB"}
|