@social-mail/social-mail-web-server 1.8.472 → 1.8.474
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/server/services/puppeteer/PuppeteerService.d.ts +7 -1
- package/dist/server/services/puppeteer/PuppeteerService.d.ts.map +1 -1
- package/dist/server/services/puppeteer/PuppeteerService.js +24 -4
- package/dist/server/services/puppeteer/PuppeteerService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/store/journals/[journalID]/pdf/get.d.ts.map +1 -1
- package/dist/wwwroot/routes/store/journals/[journalID]/pdf/get.js +2 -6
- package/dist/wwwroot/routes/store/journals/[journalID]/pdf/get.js.map +1 -1
- package/package.json +1 -1
- package/src/server/services/puppeteer/PuppeteerService.ts +26 -4
- package/src/wwwroot/routes/store/journals/[journalID]/pdf/get.tsx +2 -9
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import SiteDiskContentCache from "../files/SiteDiskContentCache.js";
|
|
2
|
+
import Page from "@entity-access/server-pages/dist/Page.js";
|
|
3
|
+
import AuthorizationService from "@entity-access/server-pages/dist/services/AuthorizationService.js";
|
|
2
4
|
export default class PuppeteerService {
|
|
3
5
|
siteCache: SiteDiskContentCache;
|
|
4
|
-
|
|
6
|
+
page: Page;
|
|
7
|
+
authService: AuthorizationService;
|
|
8
|
+
generate({ url, mobile, width, height, deviceScaleFactor, output, packageHash, test, testDelay, timeout, sendCookies, }: {
|
|
5
9
|
url: any;
|
|
6
10
|
mobile?: boolean;
|
|
7
11
|
width?: number;
|
|
@@ -12,6 +16,8 @@ export default class PuppeteerService {
|
|
|
12
16
|
test?: "true" | "window.pageReady";
|
|
13
17
|
testDelay?: number;
|
|
14
18
|
timeout?: number;
|
|
19
|
+
sendCookies?: boolean;
|
|
15
20
|
}): Promise<import("@entity-access/server-pages/dist/core/LocalFile.js").LocalFile>;
|
|
21
|
+
getCookies(domain: any): string;
|
|
16
22
|
}
|
|
17
23
|
//# sourceMappingURL=PuppeteerService.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PuppeteerService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":"AAMA,OAAO,oBAAoB,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"PuppeteerService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":"AAMA,OAAO,oBAAoB,MAAM,kCAAkC,CAAC;AACpE,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,oBAAoB,MAAM,mEAAmE,CAAC;AAQrG,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAGjC,SAAS,EAAE,oBAAoB,CAAC;IAGhC,IAAI,EAAE,IAAI,CAAC;IAGX,WAAW,EAAE,oBAAoB,CAAC;IAE5B,QAAQ,CAAC,EACX,GAAG,EACH,MAAc,EACd,KAA2B,EAC3B,MAA6B,EAC7B,iBAAkC,EAClC,MAAe,EACf,WAAgC,EAChC,IAA8C,EAC9C,SAAgB,EAChB,OAAe,EACf,WAAkB,GACrB;;;;;;;;;;;;KAAA;IA2DD,UAAU,CAAC,MAAM,KAAA,GAAG,MAAM;CAQ7B"}
|
|
@@ -60,19 +60,23 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
|
|
|
60
60
|
return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
|
|
61
61
|
});
|
|
62
62
|
/* eslint-disable no-console */
|
|
63
|
-
import Inject, {
|
|
63
|
+
import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
|
|
64
64
|
import { fetch } from "undici";
|
|
65
65
|
import { hash } from "crypto";
|
|
66
66
|
import { globalEnv } from "../../../common/globalEnv.js";
|
|
67
67
|
import LockFile from "../../storage/LockFile.js";
|
|
68
68
|
import SiteDiskContentCache from "../files/SiteDiskContentCache.js";
|
|
69
|
+
import Page from "@entity-access/server-pages/dist/Page.js";
|
|
70
|
+
import AuthorizationService from "@entity-access/server-pages/dist/services/AuthorizationService.js";
|
|
69
71
|
let port = globalEnv.puppeteer.port;
|
|
70
72
|
if (/^\d+$/i.test(port)) {
|
|
71
73
|
port = Number(port);
|
|
72
74
|
}
|
|
73
75
|
let PuppeteerService = class PuppeteerService {
|
|
74
|
-
async generate({ url, mobile = false, width = mobile ? 650 : 1200, height = mobile ? 1000 : 1536, deviceScaleFactor = mobile ? 2 : 1, output = "webp", packageHash = globalEnv.serverID, test = "true", testDelay = 1000, timeout = 15000 }) {
|
|
75
|
-
const
|
|
76
|
+
async generate({ url, mobile = false, width = mobile ? 650 : 1200, height = mobile ? 1000 : 1536, deviceScaleFactor = mobile ? 2 : 1, output = "webp", packageHash = globalEnv.serverID, test = "true", testDelay = 1000, timeout = 15000, sendCookies = true, }) {
|
|
77
|
+
const u = new URL(url);
|
|
78
|
+
const cookies = sendCookies ? this.getCookies(u.hostname) : "";
|
|
79
|
+
const key = `previews/${packageHash}/${mobile ? "mobile" : "desktop"}/preview-${hash("sha256", url + "&cookies=" + cookies, "hex")}.${output}`;
|
|
76
80
|
const file = await this.siteCache.htmlCache.getOrCreateAsync(key, async (lf) => {
|
|
77
81
|
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
78
82
|
try {
|
|
@@ -86,6 +90,7 @@ let PuppeteerService = class PuppeteerService {
|
|
|
86
90
|
test,
|
|
87
91
|
testDelay: testDelay,
|
|
88
92
|
timeout: timeout,
|
|
93
|
+
cookies,
|
|
89
94
|
output
|
|
90
95
|
});
|
|
91
96
|
console.log(`Fetching: ${url}`);
|
|
@@ -124,13 +129,28 @@ let PuppeteerService = class PuppeteerService {
|
|
|
124
129
|
}
|
|
125
130
|
return file;
|
|
126
131
|
}
|
|
132
|
+
getCookies(domain) {
|
|
133
|
+
const cookies = this.page?.request.cookies;
|
|
134
|
+
if (!cookies) {
|
|
135
|
+
return void 0;
|
|
136
|
+
}
|
|
137
|
+
return JSON.stringify(Object.entries(cookies).map(([name, value]) => ({ name, value, domain, httpOnly: true, secure: true })));
|
|
138
|
+
}
|
|
127
139
|
};
|
|
128
140
|
__decorate([
|
|
129
141
|
Inject,
|
|
130
142
|
__metadata("design:type", SiteDiskContentCache)
|
|
131
143
|
], PuppeteerService.prototype, "siteCache", void 0);
|
|
144
|
+
__decorate([
|
|
145
|
+
Inject,
|
|
146
|
+
__metadata("design:type", Page)
|
|
147
|
+
], PuppeteerService.prototype, "page", void 0);
|
|
148
|
+
__decorate([
|
|
149
|
+
Inject,
|
|
150
|
+
__metadata("design:type", AuthorizationService)
|
|
151
|
+
], PuppeteerService.prototype, "authService", void 0);
|
|
132
152
|
PuppeteerService = __decorate([
|
|
133
|
-
|
|
153
|
+
RegisterScoped
|
|
134
154
|
], PuppeteerService);
|
|
135
155
|
export default PuppeteerService;
|
|
136
156
|
//# sourceMappingURL=PuppeteerService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PuppeteerService.js","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,MAAM,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"PuppeteerService.js","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":"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"}
|