@social-mail/social-mail-web-server 1.5.122 → 1.5.125
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/content/ssr/ssr.js +29 -0
- package/dist/server/seed/ui/seed-ui.js +1 -1
- package/dist/server/services/cache/CacheService.d.ts.map +1 -1
- package/dist/server/services/cache/CacheService.js +1 -1
- package/dist/server/services/cache/CacheService.js.map +1 -1
- package/dist/server/services/channels/ChannelPageService.d.ts +11 -0
- package/dist/server/services/channels/ChannelPageService.d.ts.map +1 -1
- package/dist/server/services/channels/ChannelPageService.js +37 -21
- package/dist/server/services/channels/ChannelPageService.js.map +1 -1
- package/dist/server/services/ssr/SSRService.d.ts +8 -0
- package/dist/server/services/ssr/SSRService.d.ts.map +1 -0
- package/dist/server/services/ssr/SSRService.js +71 -0
- package/dist/server/services/ssr/SSRService.js.map +1 -0
- package/dist/server/storage/db/DbStorage.js +7 -7
- package/dist/server/storage/db/DbStorage.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/channels/index.d.ts.map +1 -1
- package/dist/wwwroot/routes/channels/index.js +31 -9
- package/dist/wwwroot/routes/channels/index.js.map +1 -1
- package/package.json +4 -3
- package/src/server/seed/ui/seed-ui.ts +1 -1
- package/src/server/services/cache/CacheService.ts +3 -2
- package/src/server/services/channels/ChannelPageService.tsx +49 -30
- package/src/server/services/ssr/SSRService.ts +76 -0
- package/src/server/storage/db/DbStorage.ts +7 -7
- package/src/wwwroot/routes/channels/index.tsx +39 -9
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
const jsdom = require("jsdom");
|
|
2
|
+
const { JSDOM } = jsdom;
|
|
3
|
+
|
|
4
|
+
const waitForExist = (w) => new Promise((resolve) => {
|
|
5
|
+
|
|
6
|
+
const rt = setTimeout(resolve, 15000);
|
|
7
|
+
|
|
8
|
+
const ri = setInterval(() => {
|
|
9
|
+
|
|
10
|
+
if (w.pageReady) {
|
|
11
|
+
clearInterval(ri);
|
|
12
|
+
clearTimeout(rt);
|
|
13
|
+
resolve();
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
}, 1000);
|
|
17
|
+
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
JSDOM.fromURL(process.argv[2], { runScripts: "dangerously" }).then((v) => {
|
|
21
|
+
|
|
22
|
+
waitForExist(v.window).then(() => {
|
|
23
|
+
|
|
24
|
+
console.log(v.window.document.documentElement.outerHTML);
|
|
25
|
+
process.exitCode = 0;
|
|
26
|
+
process.exit(0);
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { UIPackageConfig } from "../../services/DBConfig.js";
|
|
2
2
|
import semver from "semver";
|
|
3
3
|
export default async function seedUI(config) {
|
|
4
|
-
const version = "1.2.
|
|
4
|
+
const version = "1.2.551";
|
|
5
5
|
const existing = await config.getValue(UIPackageConfig, false);
|
|
6
6
|
if (existing) {
|
|
7
7
|
if (semver.gte(existing.version, version)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CacheService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/cache/CacheService.ts"],"names":[],"mappings":"AAOA,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAG3E,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAI/E,OAAO,UAAU,MAAM,oCAAoC,CAAC;AAK5D,qBAAa,UAAW,YAAW,UAAU;aAGrB,QAAQ,EAAE,MAAM;aAChB,WAAW,EAAE,MAAM;aACnB,QAAQ,EAAE,MAAM;gBAFhB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM;IAGpC,CAAC,MAAM,CAAC,OAAO,CAAC;CAOnB;AAGD,MAAM,CAAC,OAAO,OAAO,YAAY;IAG7B,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,OAAO,CAAc;IAG7B,OAAO,CAAC,aAAa,CAAgB;IAGrC,OAAO,CAAC,eAAe,CAAkB;IAGzC,OAAO,CAAC,aAAa,CAAgB;IAExB,KAAK;IAYL,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IA8BhE,SAAS,CAAC,GAAG,KAAA;IAeb,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,WAAwB;IAgB7D,GAAG,CAAC,EACb,GAAG,EACH,GAAG,EACH,OAAO,EACV,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,QAAQ,CAAC;QAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,KAAK,OAAO,CAAC,SAAS,CAAC,CAAA;KAAE;
|
|
1
|
+
{"version":3,"file":"CacheService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/cache/CacheService.ts"],"names":[],"mappings":"AAOA,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAG3E,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAI/E,OAAO,UAAU,MAAM,oCAAoC,CAAC;AAK5D,qBAAa,UAAW,YAAW,UAAU;aAGrB,QAAQ,EAAE,MAAM;aAChB,WAAW,EAAE,MAAM;aACnB,QAAQ,EAAE,MAAM;gBAFhB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM;IAGpC,CAAC,MAAM,CAAC,OAAO,CAAC;CAOnB;AAGD,MAAM,CAAC,OAAO,OAAO,YAAY;IAG7B,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,OAAO,CAAc;IAG7B,OAAO,CAAC,aAAa,CAAgB;IAGrC,OAAO,CAAC,eAAe,CAAkB;IAGzC,OAAO,CAAC,aAAa,CAAgB;IAExB,KAAK;IAYL,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IA8BhE,SAAS,CAAC,GAAG,KAAA;IAeb,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,WAAwB;IAgB7D,GAAG,CAAC,EACb,GAAG,EACH,GAAG,EACH,OAAO,EACV,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,QAAQ,CAAC;QAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,KAAK,OAAO,CAAC,SAAS,CAAC,CAAA;KAAE;CAoLrF"}
|
|
@@ -177,8 +177,8 @@ let CacheService = class CacheService {
|
|
|
177
177
|
const env_4 = { stack: [], error: void 0, hasError: false };
|
|
178
178
|
try {
|
|
179
179
|
const now = DateTime.now;
|
|
180
|
-
const dbLock = __addDisposableResource(env_4, await this.dbLockService.lock(`ci-${key}`, DateTime.now.addMinutes(5)), true);
|
|
181
180
|
const keyHash = await this.cryptoService.hashBuffer(Buffer.from(key, "utf-8"));
|
|
181
|
+
const dbLock = __addDisposableResource(env_4, await this.dbLockService.lock(`ci-${keyHash}`, DateTime.now.addMinutes(5)), true);
|
|
182
182
|
const keys = { key, keyHash };
|
|
183
183
|
let cachedItem = await this.db.cachedItems.statements.select({}, keys);
|
|
184
184
|
const { base: fileName } = parse(key);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CacheService.js","sourceRoot":"","sources":["../../../../src/server/services/cache/CacheService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CacheService.js","sourceRoot":"","sources":["../../../../src/server/services/cache/CacheService.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,20 @@ import SocialMailContext from "../../model/SocialMailContext.js";
|
|
|
2
2
|
import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
|
|
3
3
|
import XNode from "@entity-access/server-pages/dist/html/XNode.js";
|
|
4
4
|
import CachedEmailService from "../../smtp/services/CachedEmailService.js";
|
|
5
|
+
import WebSiteChannelService from "../../smtp/services/WebSiteChannelService.js";
|
|
5
6
|
export default class ChannelPageService {
|
|
6
7
|
db: SocialMailContext;
|
|
7
8
|
ce: CachedEmailService;
|
|
9
|
+
wcs: WebSiteChannelService;
|
|
10
|
+
getEmailMeta(host: any, url: any, [blogID, type, p1]: [any, any, any]): Promise<{
|
|
11
|
+
meta?: undefined;
|
|
12
|
+
email?: undefined;
|
|
13
|
+
title?: undefined;
|
|
14
|
+
} | {
|
|
15
|
+
meta: XNode[];
|
|
16
|
+
email: import("../../model/entities/Email.js").Email;
|
|
17
|
+
title: string;
|
|
18
|
+
}>;
|
|
8
19
|
modifyPage({ host, url, file, blogID, emailID, type }: {
|
|
9
20
|
host: string;
|
|
10
21
|
url: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChannelPageService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/channels/ChannelPageService.tsx"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAE/E,OAAO,KAAK,MAAM,gDAAgD,CAAC;AAEnE,OAAO,kBAAkB,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"ChannelPageService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/channels/ChannelPageService.tsx"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,oDAAoD,CAAC;AAE/E,OAAO,KAAK,MAAM,gDAAgD,CAAC;AAEnE,OAAO,kBAAkB,MAAM,2CAA2C,CAAC;AAG3E,OAAO,qBAAqB,MAAM,8CAA8C,CAAC;AAuCjF,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAGnC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,EAAE,EAAE,kBAAkB,CAAC;IAGvB,GAAG,EAAE,qBAAqB,CAAC;IAErB,YAAY,CAAC,IAAI,KAAA,EAAE,GAAG,KAAA,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,iBAAA;;;;;;;;;IA4C1C,UAAU,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,EAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,SAAS,CAAC;QAAC,IAAI,MAAC;QAAC,MAAM,MAAC;QAAC,OAAO,MAAA;KAAE;IA+C3H,MAAM,CAAE,EACV,IAAI,EACJ,IAAoB,EACpB,KAAK,EACL,OAAuB,EAC1B;;;;;KAAA;CA+BJ"}
|
|
@@ -14,6 +14,8 @@ import XNode from "@entity-access/server-pages/dist/html/XNode.js";
|
|
|
14
14
|
import { JSDOM } from 'jsdom';
|
|
15
15
|
import CachedEmailService from "../../smtp/services/CachedEmailService.js";
|
|
16
16
|
import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
17
|
+
import WebSiteChannelService from "../../smtp/services/WebSiteChannelService.js";
|
|
18
|
+
import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
|
|
17
19
|
const render = (parent, { name, attributes, children }) => {
|
|
18
20
|
const child = parent.ownerDocument.createElement(name);
|
|
19
21
|
if (attributes) {
|
|
@@ -49,25 +51,12 @@ const render = (parent, { name, attributes, children }) => {
|
|
|
49
51
|
return child;
|
|
50
52
|
};
|
|
51
53
|
let ChannelPageService = class ChannelPageService {
|
|
52
|
-
async
|
|
53
|
-
if (
|
|
54
|
-
|
|
55
|
-
const b = await this.db.mailboxes
|
|
56
|
-
.where({ host }, (p) => (x) => x.websiteChannels.some((c) => c.website.hosts.some((h) => h.host === p.host)))
|
|
57
|
-
.orderByDescending(void 0, (p) => (x) => x.datePublished)
|
|
58
|
-
.first();
|
|
59
|
-
blogID = Base36.encode(b.mailboxID);
|
|
60
|
-
const e = await this.db.emails
|
|
61
|
-
.where({ blogID }, (p) => (x) => x.status === "published"
|
|
62
|
-
&& x.mailboxes.some((m) => m.mailboxID === p.blogID))
|
|
63
|
-
.orderByDescending(void 0, (p) => (x) => x.emailID)
|
|
64
|
-
.first();
|
|
65
|
-
emailID = Base36.encode(e.emailID);
|
|
54
|
+
async getEmailMeta(host, url, [blogID, type, p1]) {
|
|
55
|
+
if (type !== "p") {
|
|
56
|
+
return {};
|
|
66
57
|
}
|
|
67
|
-
const eBlogID = blogID;
|
|
68
|
-
const eEmailID = emailID;
|
|
69
58
|
blogID = Base36.decode(blogID);
|
|
70
|
-
emailID = Base36.decode(
|
|
59
|
+
const emailID = Base36.decode(p1);
|
|
71
60
|
const email = await this.db.emails
|
|
72
61
|
.where({ blogID, emailID }, (p) => (x) => x.emailID === p.emailID
|
|
73
62
|
&& x.status === "published"
|
|
@@ -78,9 +67,7 @@ let ChannelPageService = class ChannelPageService {
|
|
|
78
67
|
.where({ blogID }, (p) => (x) => x.mailboxID === p.blogID)
|
|
79
68
|
.include((x) => x.emailAddress)
|
|
80
69
|
.first();
|
|
81
|
-
const html = await file.readAsText();
|
|
82
70
|
const title = email.subject;
|
|
83
|
-
const emailBody = await this.ce.getHtmlText(email);
|
|
84
71
|
const meta = [];
|
|
85
72
|
meta.push(XNode.create("meta", { property: "og:url", content: url }));
|
|
86
73
|
meta.push(XNode.create("meta", { name: "title", property: "og:title", content: title }));
|
|
@@ -93,10 +80,35 @@ let ChannelPageService = class ChannelPageService {
|
|
|
93
80
|
meta.push(XNode.create("meta", { property: "og:description", content: email.summary }));
|
|
94
81
|
}
|
|
95
82
|
// find first image...
|
|
96
|
-
const firstImage = email.attachments?.find((x) =>
|
|
83
|
+
const firstImage = email.attachments?.find((x) => /^(image|video)/i.test(x.contentType));
|
|
97
84
|
if (firstImage) {
|
|
98
|
-
meta.push(XNode.create("meta", { property: "og:image", content: `https://${host}/
|
|
85
|
+
meta.push(XNode.create("meta", { property: "og:image", content: `https://${host}/api/channel/file/webp(300)/${blogID}/${emailID}/${firstImage.appFileID}/${firstImage.name}/${firstImage.name}.300.webp` }));
|
|
99
86
|
}
|
|
87
|
+
return { meta, email, title };
|
|
88
|
+
}
|
|
89
|
+
async modifyPage({ host, url, file, blogID, emailID, type }) {
|
|
90
|
+
if (!blogID) {
|
|
91
|
+
// find first from host...
|
|
92
|
+
const mailboxes = await this.wcs.getMailboxes(host);
|
|
93
|
+
const b = await this.db.mailboxes
|
|
94
|
+
.where({ mailboxes }, (p) => (x) => Sql.in(x.mailboxID, p.mailboxes))
|
|
95
|
+
.orderByDescending(void 0, (p) => (x) => x.datePublished)
|
|
96
|
+
.first();
|
|
97
|
+
blogID = Base36.encode(b.mailboxID);
|
|
98
|
+
const e = await this.db.emails
|
|
99
|
+
.where({ blogID }, (p) => (x) => x.status === "published"
|
|
100
|
+
&& x.mailboxes.some((m) => m.mailboxID === p.blogID))
|
|
101
|
+
.orderByDescending(void 0, (p) => (x) => x.emailID)
|
|
102
|
+
.first();
|
|
103
|
+
emailID = Base36.encode(e.emailID);
|
|
104
|
+
}
|
|
105
|
+
const eBlogID = blogID;
|
|
106
|
+
const eEmailID = emailID;
|
|
107
|
+
blogID = Base36.decode(blogID);
|
|
108
|
+
emailID = Base36.decode(emailID);
|
|
109
|
+
const html = await file.readAsText();
|
|
110
|
+
const { meta, email, title } = await this.getEmailMeta(host, url, [blogID, "p", emailID]);
|
|
111
|
+
const emailBody = await this.ce.getHtmlText(email);
|
|
100
112
|
return await this.inject({
|
|
101
113
|
html,
|
|
102
114
|
title,
|
|
@@ -144,6 +156,10 @@ __decorate([
|
|
|
144
156
|
Inject,
|
|
145
157
|
__metadata("design:type", CachedEmailService)
|
|
146
158
|
], ChannelPageService.prototype, "ce", void 0);
|
|
159
|
+
__decorate([
|
|
160
|
+
Inject,
|
|
161
|
+
__metadata("design:type", WebSiteChannelService)
|
|
162
|
+
], ChannelPageService.prototype, "wcs", void 0);
|
|
147
163
|
ChannelPageService = __decorate([
|
|
148
164
|
RegisterScoped
|
|
149
165
|
], ChannelPageService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChannelPageService.js","sourceRoot":"","sources":["../../../../src/server/services/channels/ChannelPageService.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,KAAK,MAAM,gDAAgD,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,kBAAkB,MAAM,2CAA2C,CAAC;AAC3E,OAAO,QAAQ,MAAM,qDAAqD,CAAC;
|
|
1
|
+
{"version":3,"file":"ChannelPageService.js","sourceRoot":"","sources":["../../../../src/server/services/channels/ChannelPageService.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import CacheService from "../cache/CacheService.js";
|
|
2
|
+
import TempFileService from "../../storage/TempFileService.js";
|
|
3
|
+
export default class SSRService {
|
|
4
|
+
cacheService: CacheService;
|
|
5
|
+
tempFileService: TempFileService;
|
|
6
|
+
generate(location: string): Promise<import("@entity-access/server-pages/dist/core/LocalFile.js").LocalFile>;
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=SSRService.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SSRService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/ssr/SSRService.ts"],"names":[],"mappings":"AAKA,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAqB/D,MAAM,CAAC,OAAO,OAAO,UAAU;IAG3B,YAAY,EAAE,YAAY,CAAC;IAG3B,eAAe,EAAE,eAAe,CAAC;IAE3B,QAAQ,CAAC,QAAQ,EAAE,MAAM;CAwClC"}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
+
};
|
|
10
|
+
import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
|
|
11
|
+
import jsdom from "jsdom";
|
|
12
|
+
import CacheService from "../cache/CacheService.js";
|
|
13
|
+
import TempFileService from "../../storage/TempFileService.js";
|
|
14
|
+
import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
|
|
15
|
+
const { JSDOM } = jsdom;
|
|
16
|
+
const waitForExist = (w) => new Promise((resolve) => {
|
|
17
|
+
const rt = setTimeout(resolve, 15000);
|
|
18
|
+
const ri = setInterval(() => {
|
|
19
|
+
if (w.pageReady) {
|
|
20
|
+
clearInterval(ri);
|
|
21
|
+
clearTimeout(rt);
|
|
22
|
+
resolve();
|
|
23
|
+
}
|
|
24
|
+
}, 1000);
|
|
25
|
+
});
|
|
26
|
+
let SSRService = class SSRService {
|
|
27
|
+
async generate(location) {
|
|
28
|
+
const key = `/ssr-cache/${location}`;
|
|
29
|
+
return this.cacheService.get({
|
|
30
|
+
key,
|
|
31
|
+
ttl: TimeSpan.fromSeconds(15),
|
|
32
|
+
factory: async () => {
|
|
33
|
+
const resources = new jsdom.ResourceLoader({
|
|
34
|
+
strictSSL: false,
|
|
35
|
+
userAgent: "some-bot",
|
|
36
|
+
});
|
|
37
|
+
const fqUrl = new URL(location);
|
|
38
|
+
const fq = (ur) => {
|
|
39
|
+
if (!ur.url) {
|
|
40
|
+
return new URL(ur.toString(), fqUrl).toString();
|
|
41
|
+
}
|
|
42
|
+
return { ...ur, url: new URL(ur.url, fqUrl).toString() };
|
|
43
|
+
};
|
|
44
|
+
const { window } = await JSDOM.fromURL(location, {
|
|
45
|
+
runScripts: "dangerously",
|
|
46
|
+
resources,
|
|
47
|
+
beforeParse(w) {
|
|
48
|
+
w.fetch = (url, i) => fetch(fq(url), i);
|
|
49
|
+
},
|
|
50
|
+
});
|
|
51
|
+
await waitForExist(window);
|
|
52
|
+
const buffer = Buffer.from(window.document.documentElement.outerHTML, "utf8");
|
|
53
|
+
window.close();
|
|
54
|
+
return this.tempFileService.createFrom("file.html", buffer, "text/html");
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
};
|
|
59
|
+
__decorate([
|
|
60
|
+
Inject,
|
|
61
|
+
__metadata("design:type", CacheService)
|
|
62
|
+
], SSRService.prototype, "cacheService", void 0);
|
|
63
|
+
__decorate([
|
|
64
|
+
Inject,
|
|
65
|
+
__metadata("design:type", TempFileService)
|
|
66
|
+
], SSRService.prototype, "tempFileService", void 0);
|
|
67
|
+
SSRService = __decorate([
|
|
68
|
+
RegisterScoped
|
|
69
|
+
], SSRService);
|
|
70
|
+
export default SSRService;
|
|
71
|
+
//# sourceMappingURL=SSRService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SSRService.js","sourceRoot":"","sources":["../../../../src/server/services/ssr/SSRService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAIpF,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;AAExB,MAAM,YAAY,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;IAEtD,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAEtC,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,EAAE;QAExB,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;YACd,aAAa,CAAC,EAAE,CAAC,CAAC;YAClB,YAAY,CAAC,EAAE,CAAC,CAAC;YACjB,OAAO,EAAE,CAAC;QACd,CAAC;IAEL,CAAC,EAAE,IAAI,CAAC,CAAC;AAEb,CAAC,CAAC,CAAC;AAGY,IAAM,UAAU,GAAhB,MAAM,UAAU;IAQ3B,KAAK,CAAC,QAAQ,CAAC,QAAgB;QAE3B,MAAM,GAAG,GAAG,cAAc,QAAQ,EAAE,CAAC;QAGrC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC;YACzB,GAAG;YACH,GAAG,EAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7B,OAAO,EAAE,KAAK,IAAI,EAAE;gBAEhB,MAAM,SAAS,GAAG,IAAI,KAAK,CAAC,cAAc,CAAC;oBACvC,SAAS,EAAE,KAAK;oBAChB,SAAS,EAAE,UAAU;iBACxB,CAAC,CAAC;gBAEH,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAChC,MAAM,EAAE,GAAG,CAAC,EAAO,EAAE,EAAE;oBACnB,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBACV,OAAO,IAAI,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;oBACpD,CAAC;oBACD,OAAO,EAAE,GAAI,EAAE,EAAE,GAAG,EAAE,IAAI,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;gBAC9D,CAAC,CAAC;gBAEF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE;oBAC7C,UAAU,EAAE,aAAa;oBACzB,SAAS;oBACT,WAAW,CAAC,CAAC;wBACT,CAAC,CAAC,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,CAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;oBAC7C,CAAC;iBACJ,CAAC,CAAC;gBACH,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC;gBAE3B,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;gBAC9E,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;YAE7E,CAAC;SACJ,CAAC,CAAC;IACP,CAAC;CAEJ,CAAA;AA7CG;IADC,MAAM;8BACO,YAAY;gDAAC;AAG3B;IADC,MAAM;8BACU,eAAe;mDAAC;AANhB,UAAU;IAD9B,cAAc;GACM,UAAU,CAgD9B;eAhDoB,UAAU"}
|
|
@@ -87,13 +87,13 @@ export default class DbStorage extends BaseStorage {
|
|
|
87
87
|
const sha256 = await this.cryptoService.hashBuffer(file.openRead(), "base64");
|
|
88
88
|
const scope = __addDisposableResource(env_2, await this.createScope(), false);
|
|
89
89
|
const db = scope.resolve(DbStorageContext);
|
|
90
|
-
const { fileID } = await db.dbFiles.statements.
|
|
90
|
+
const { fileID } = await db.dbFiles.statements.selectOrInsert({
|
|
91
91
|
path: cloudPath,
|
|
92
92
|
sha256
|
|
93
|
-
});
|
|
93
|
+
}, { sha256, path: cloudPath });
|
|
94
94
|
let index = 0;
|
|
95
95
|
for await (const block of file.readBuffers()) {
|
|
96
|
-
await db.dbFileBlocks.statements.
|
|
96
|
+
await db.dbFileBlocks.statements.upsert({
|
|
97
97
|
fileID,
|
|
98
98
|
index,
|
|
99
99
|
block
|
|
@@ -202,7 +202,7 @@ __decorate([
|
|
|
202
202
|
__metadata("design:type", Number)
|
|
203
203
|
], DbFile.prototype, "fileID", void 0);
|
|
204
204
|
__decorate([
|
|
205
|
-
Column({ dataType: "Char"
|
|
205
|
+
Column({ dataType: "Char" }),
|
|
206
206
|
__metadata("design:type", String)
|
|
207
207
|
], DbFile.prototype, "path", void 0);
|
|
208
208
|
__decorate([
|
|
@@ -213,10 +213,10 @@ DbFile = __decorate([
|
|
|
213
213
|
Table("DbFiles"),
|
|
214
214
|
Index({
|
|
215
215
|
name: "IX_DbFiles_Path",
|
|
216
|
-
unique: true,
|
|
217
216
|
columns: [
|
|
218
|
-
{ name: (x) => x.
|
|
219
|
-
]
|
|
217
|
+
{ name: (x) => x.sha256, descending: false }
|
|
218
|
+
],
|
|
219
|
+
include: ["path"]
|
|
220
220
|
})
|
|
221
221
|
], DbFile);
|
|
222
222
|
let DbFileBlock = class DbFileBlock {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DbStorage.js","sourceRoot":"","sources":["../../../../src/server/storage/db/DbStorage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAU,MAAM,QAAQ,CAAC;AAC1C,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,aAAa,MAAM,0DAA0D,CAAC;AAErF,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,MAAM,MAAM,wDAAwD,CAAC;AAC5E,OAAO,KAAK,MAAM,uDAAuD,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,wDAAwD,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAG9F,MAAM,GAAG,GAAG,EAAE,GAAC,IAAI,GAAC,IAAI,CAAC;AAEzB,IAAI,MAAM,GAAG,KAAK,CAAC;AAEnB,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAE9C,KAAK,CAAC,MAAM;;;YACR,MAAM,KAAK,kCAAG,MAAM,IAAI,CAAC,WAAW,EAAE,QAAA,CAAC;YACvC,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAC3C,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC;;;;;;;;;KACtC;IAED,KAAK,CAAC,UAAU,CAAC,SAAiB,EAAE,IAAe;;;YAE/C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;YAC9E,MAAM,KAAK,kCAAG,MAAM,IAAI,CAAC,WAAW,EAAE,QAAA,CAAC;YACvC,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAE3C,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"DbStorage.js","sourceRoot":"","sources":["../../../../src/server/storage/db/DbStorage.ts"],"names":[],"mappings":"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"}
|