@social-mail/social-mail-web-server 1.8.474 → 1.8.477
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 +3 -5
- package/dist/server/services/puppeteer/PuppeteerService.d.ts.map +1 -1
- package/dist/server/services/puppeteer/PuppeteerService.js +7 -15
- package/dist/server/services/puppeteer/PuppeteerService.js.map +1 -1
- package/dist/server/services/push-notifications/web-push/WebPushService.js +1 -1
- package/dist/server/services/push-notifications/web-push/WebPushService.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 +4 -2
- 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 +8 -16
- package/src/server/services/push-notifications/web-push/WebPushService.ts +1 -1
- package/src/wwwroot/routes/store/journals/[journalID]/pdf/get.tsx +5 -2
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import SiteDiskContentCache from "../files/SiteDiskContentCache.js";
|
|
2
|
-
import Page from "@entity-access/server-pages/dist/Page.js";
|
|
3
2
|
import AuthorizationService from "@entity-access/server-pages/dist/services/AuthorizationService.js";
|
|
3
|
+
import Page from "@entity-access/server-pages/dist/Page.js";
|
|
4
4
|
export default class PuppeteerService {
|
|
5
5
|
siteCache: SiteDiskContentCache;
|
|
6
|
-
page: Page;
|
|
7
6
|
authService: AuthorizationService;
|
|
8
|
-
generate({ url, mobile, width, height, deviceScaleFactor, output, packageHash, test, testDelay, timeout,
|
|
7
|
+
generate({ url, mobile, width, height, deviceScaleFactor, output, packageHash, test, testDelay, timeout, page }: {
|
|
9
8
|
url: any;
|
|
10
9
|
mobile?: boolean;
|
|
11
10
|
width?: number;
|
|
@@ -16,8 +15,7 @@ export default class PuppeteerService {
|
|
|
16
15
|
test?: "true" | "window.pageReady";
|
|
17
16
|
testDelay?: number;
|
|
18
17
|
timeout?: number;
|
|
19
|
-
|
|
18
|
+
page?: Page<any, any>;
|
|
20
19
|
}): Promise<import("@entity-access/server-pages/dist/core/LocalFile.js").LocalFile>;
|
|
21
|
-
getCookies(domain: any): string;
|
|
22
20
|
}
|
|
23
21
|
//# 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;AACpE,OAAO,
|
|
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,oBAAoB,MAAM,mEAAmE,CAAC;AACrG,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAQ5D,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAGjC,SAAS,EAAE,oBAAoB,CAAC;IAGhC,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,IAAqB,EACxB;;;;;;;;;;;;KAAA;CA8DJ"}
|
|
@@ -66,16 +66,19 @@ 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
69
|
import AuthorizationService from "@entity-access/server-pages/dist/services/AuthorizationService.js";
|
|
71
70
|
let port = globalEnv.puppeteer.port;
|
|
72
71
|
if (/^\d+$/i.test(port)) {
|
|
73
72
|
port = Number(port);
|
|
74
73
|
}
|
|
75
74
|
let PuppeteerService = class PuppeteerService {
|
|
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,
|
|
77
|
-
const
|
|
78
|
-
|
|
75
|
+
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, page = void 0 }) {
|
|
76
|
+
const pageCookies = page?.request?.cookies;
|
|
77
|
+
let cookies = void 0;
|
|
78
|
+
if (pageCookies) {
|
|
79
|
+
const domain = page.request.URL.hostname;
|
|
80
|
+
cookies = JSON.stringify(Object.entries(pageCookies).map(([name, value]) => ({ name, value, domain, httpOnly: true, secure: true })));
|
|
81
|
+
}
|
|
79
82
|
const key = `previews/${packageHash}/${mobile ? "mobile" : "desktop"}/preview-${hash("sha256", url + "&cookies=" + cookies, "hex")}.${output}`;
|
|
80
83
|
const file = await this.siteCache.htmlCache.getOrCreateAsync(key, async (lf) => {
|
|
81
84
|
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
@@ -129,22 +132,11 @@ let PuppeteerService = class PuppeteerService {
|
|
|
129
132
|
}
|
|
130
133
|
return file;
|
|
131
134
|
}
|
|
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
|
-
}
|
|
139
135
|
};
|
|
140
136
|
__decorate([
|
|
141
137
|
Inject,
|
|
142
138
|
__metadata("design:type", SiteDiskContentCache)
|
|
143
139
|
], PuppeteerService.prototype, "siteCache", void 0);
|
|
144
|
-
__decorate([
|
|
145
|
-
Inject,
|
|
146
|
-
__metadata("design:type", Page)
|
|
147
|
-
], PuppeteerService.prototype, "page", void 0);
|
|
148
140
|
__decorate([
|
|
149
141
|
Inject,
|
|
150
142
|
__metadata("design:type", AuthorizationService)
|
|
@@ -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,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACpF,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AACjD,OAAO,oBAAoB,MAAM,kCAAkC,CAAC;AACpE,OAAO,
|
|
1
|
+
{"version":3,"file":"PuppeteerService.js","sourceRoot":"","sources":["../../../../src/server/services/puppeteer/PuppeteerService.ts"],"names":[],"mappings":"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"}
|
|
@@ -100,7 +100,7 @@ let WebPushService = class WebPushService extends BasePushService {
|
|
|
100
100
|
}
|
|
101
101
|
async pushMessage(deviceToken, payload) {
|
|
102
102
|
const c = this.pushConfig;
|
|
103
|
-
const pushService = JSON.parse(deviceToken);
|
|
103
|
+
const pushService = typeof deviceToken === "string" ? JSON.parse(deviceToken) : deviceToken;
|
|
104
104
|
await WebPush.sendNotification(pushService, JSON.stringify(payload), {
|
|
105
105
|
vapidDetails: {
|
|
106
106
|
subject: `https://${globalEnv.host}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebPushService.js","sourceRoot":"","sources":["../../../../../src/server/services/push-notifications/web-push/WebPushService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAC3D,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,eAAe,MAAM,uBAAuB,CAAC;AAEpD,MAAM,OAAO,aAAa;CAIzB;AAGc,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,eAAe;IAIhD,KAAK,CAAC,UAAU;;;YACnB,MAAM,KAAK,kCAAG,cAAc,CAAC,WAAW,EAAE,QAAA,CAAC;YAC3C,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YACnD,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACvC,MAAY,KAAK,kCAAG,MAAM,aAAa,CAAC,IAAI,CAAC,8BAA8B,CAAC,OAAA,CAAC;YAC7E,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YACnD,MAAM,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC;YACnB,IAAG,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;gBACf,MAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;gBACzC,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;gBAC/B,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC7B,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC;gBACb,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;YACtB,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,eAAe,CAAC,WAAW,SAAS,CAAC,IAAI,EAAE,EACnD,CAAC,CAAC,SAAS,EACX,CAAC,CAAC,UAAU,CAAC,CAAC;YAClB,CAAC;YACD,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;;;;;;;;;;;KACvB;IAEM,KAAK,CAAC,WAAW,CACpB,WAAW,EACX,OAAwB;QAExB,MAAM,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAE1B,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"WebPushService.js","sourceRoot":"","sources":["../../../../../src/server/services/push-notifications/web-push/WebPushService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAC3D,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,eAAe,MAAM,uBAAuB,CAAC;AAEpD,MAAM,OAAO,aAAa;CAIzB;AAGc,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,eAAe;IAIhD,KAAK,CAAC,UAAU;;;YACnB,MAAM,KAAK,kCAAG,cAAc,CAAC,WAAW,EAAE,QAAA,CAAC;YAC3C,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YACnD,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACvC,MAAY,KAAK,kCAAG,MAAM,aAAa,CAAC,IAAI,CAAC,8BAA8B,CAAC,OAAA,CAAC;YAC7E,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YACnD,MAAM,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC;YACnB,IAAG,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;gBACf,MAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;gBACzC,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;gBAC/B,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC7B,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC;gBACb,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;YACtB,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,eAAe,CAAC,WAAW,SAAS,CAAC,IAAI,EAAE,EACnD,CAAC,CAAC,SAAS,EACX,CAAC,CAAC,UAAU,CAAC,CAAC;YAClB,CAAC;YACD,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;;;;;;;;;;;KACvB;IAEM,KAAK,CAAC,WAAW,CACpB,WAAW,EACX,OAAwB;QAExB,MAAM,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC;QAE1B,MAAM,WAAW,GAAG,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;QAC5F,MAAM,OAAO,CAAC,gBAAgB,CAC1B,WAAW,EACX,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;YACrB,YAAY,EAAE;gBACV,OAAO,EAAE,WAAW,SAAS,CAAC,IAAI,EAAE;gBACpC,SAAS,EAAE,CAAC,CAAC,SAAS;gBACtB,UAAU,EAAE,CAAC,CAAC,UAAU;aAC3B;SACJ,CACJ,CAAC;IACN,CAAC;CAEJ,CAAA;AA5CoB,cAAc;IADlC,iBAAiB;GACG,cAAc,CA4ClC;eA5CoB,cAAc"}
|