@duffcloudservices/cms 0.13.10 → 0.13.11

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.
@@ -308,6 +308,7 @@ function prerenderNavigationUrl(origin, routePath) {
308
308
  url.searchParams.set("dcs-no-telemetry", "");
309
309
  return url.toString();
310
310
  }
311
+ var BLOCKED_LOG_CAP = 1e3;
311
312
  var CONTENT_TYPES = {
312
313
  ".html": "text/html; charset=utf-8",
313
314
  ".js": "text/javascript; charset=utf-8",
@@ -329,10 +330,29 @@ var CONTENT_TYPES = {
329
330
  ".map": "application/json; charset=utf-8"
330
331
  };
331
332
  async function startStaticServer(outDir) {
333
+ let origin = "";
334
+ const blocked = [];
335
+ const refuse = (entry) => {
336
+ if (blocked.length < BLOCKED_LOG_CAP) blocked.push(entry);
337
+ };
332
338
  const server = http.createServer((req, res) => {
339
+ let url;
340
+ try {
341
+ url = new URL(req.url ?? "/", origin);
342
+ } catch {
343
+ res.writeHead(400, { Connection: "close" });
344
+ res.end();
345
+ return;
346
+ }
347
+ if (url.origin !== origin) {
348
+ refuse(`${req.method ?? "GET"} ${url.host}${url.pathname}`);
349
+ res.writeHead(403, { Connection: "close" });
350
+ res.end();
351
+ return;
352
+ }
333
353
  let pathname = "/";
334
354
  try {
335
- pathname = decodeURIComponent(new URL(req.url ?? "/", "http://127.0.0.1").pathname);
355
+ pathname = decodeURIComponent(url.pathname);
336
356
  } catch {
337
357
  pathname = "/";
338
358
  }
@@ -366,13 +386,19 @@ async function startStaticServer(outDir) {
366
386
  res.end(buf);
367
387
  });
368
388
  });
389
+ server.on("connect", (req, socket) => {
390
+ refuse(`CONNECT ${req.url ?? ""}`);
391
+ socket.destroy();
392
+ });
369
393
  await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve));
370
394
  const addr = server.address();
371
- const origin = `http://127.0.0.1:${addr.port}`;
395
+ origin = `http://127.0.0.1:${addr.port}`;
372
396
  return {
373
397
  origin,
398
+ blocked,
374
399
  close: () => new Promise((resolve) => {
375
400
  server.close(() => resolve());
401
+ server.closeAllConnections();
376
402
  })
377
403
  };
378
404
  }
@@ -402,29 +428,29 @@ async function createPlaywrightRenderer(options) {
402
428
  console.warn("[dcs-seo] body-prerender: playwright has no chromium export; skipping.");
403
429
  return null;
404
430
  }
431
+ const server = await startStaticServer(outDir);
405
432
  let browser;
406
433
  try {
407
- browser = await chromium.launch({ headless: true });
434
+ browser = await chromium.launch({ headless: true, proxy: { server: server.origin } });
408
435
  } catch (err) {
436
+ await server.close().catch(() => {
437
+ });
409
438
  console.warn(
410
439
  "[dcs-seo] body-prerender: failed to launch Chromium (run `npx playwright install chromium`); skipping body prerender:",
411
440
  err instanceof Error ? err.message : err
412
441
  );
413
442
  return null;
414
443
  }
415
- let staticServer;
416
444
  let context;
417
445
  try {
418
- staticServer = await startStaticServer(outDir);
419
446
  context = await browser.newContext({ reducedMotion: "reduce" });
420
447
  } catch (err) {
421
- await staticServer?.close().catch(() => {
422
- });
423
448
  await browser.close().catch(() => {
424
449
  });
450
+ await server.close().catch(() => {
451
+ });
425
452
  throw err;
426
453
  }
427
- const server = staticServer;
428
454
  const renderer = {
429
455
  async renderRoute(routePath) {
430
456
  const page = await context.newPage();
@@ -487,6 +513,7 @@ async function createPlaywrightRenderer(options) {
487
513
  let teardown = null;
488
514
  return {
489
515
  renderer,
516
+ blockedRequests: () => server.blocked.slice(),
490
517
  close() {
491
518
  teardown ??= (async () => {
492
519
  try {