chore: commit pending changes

ScriptedAlchemy · ScriptedAlchemy · commit 995e9e5582eb · 2025-09-26T19:59:08.000-07:00
diff --git a/cypress-e2e/config/cypress.config.ts b/cypress-e2e/config/cypress.config.ts
@@ -120,7 +120,7 @@ export default defineConfig({
       localhost8081: 'http://localhost:8081',
       localhost8082: 'http://localhost:8082',
       localhost8083: 'http://localhost:8083',
-      localhost8084: 'http://localhost:8084',
+      localhost8184: 'http://localhost:8184',
       localhost9000: 'http://localhost:9000',
       localhost9001: 'http://localhost:9001',
       localhost9002: 'http://localhost:9002',
diff --git a/federated-css-react-ssr/server-utils/loopback.js b/federated-css-react-ssr/server-utils/loopback.js
@@ -0,0 +1,22 @@
+'use strict';
+
+const LOOPBACK_HOSTS = new Set(['localhost', '127.0.0.1', '::1']);
+
+function sanitizeLoopbackHttpUrl(rawUrl) {
+  const url = new URL(rawUrl);
+  if (url.protocol !== 'http:') {
+    throw new Error(`Only http:// loopback URLs are supported for prewarm. Received: ${rawUrl}`);
+  }
+  if (!LOOPBACK_HOSTS.has(url.hostname)) {
+    throw new Error(`Refusing to access non-loopback host "${url.hostname}" for URL: ${rawUrl}`);
+  }
+  if (!url.port) {
+    url.port = '80';
+  }
+  return url;
+}
+
+module.exports = {
+  sanitizeLoopbackHttpUrl,
+  LOOPBACK_HOSTS,
+};
diff --git a/federated-css-react-ssr/shell-apps/css-jss/server/index.js b/federated-css-react-ssr/shell-apps/css-jss/server/index.js
@@ -1,28 +1,30 @@
 const express = require('express');
 const initMiddleware = require('./middleware');
 const fetch = require('node-fetch');
+const { sanitizeLoopbackHttpUrl } = require('../../../server-utils/loopback');
 
 const app = express();
 const PORT = 4000;
 
 async function waitUrl(url, timeout = 300000) {
+  const target = sanitizeLoopbackHttpUrl(url);
   const start = Date.now();
   // Retry until the remoteEntry.js is available over HTTP
   /* eslint-disable no-await-in-loop */
   while (true) {
     try {
-      const res = await fetch(url);
+      const res = await fetch(target.href);
       if (res.ok) return;
     } catch (_) {}
 
     if (Date.now() - start > timeout) {
       // extra diagnostics in CI: try to print which ports are listening
       try {
         const { execSync } = require('node:child_process');
-        const ss = execSync(`ss -ltnp | grep :${new URL(url).port} || true`, { stdio: ['ignore','pipe','ignore'] }).toString().trim();
-        if (ss) console.log(`[prewarm] port diag ${new URL(url).port}: ${ss}`);
+        const ss = execSync(`ss -ltnp | grep :${target.port} || true`, { stdio: ['ignore','pipe','ignore'] }).toString().trim();
+        if (ss) console.log(`[prewarm] port diag ${target.port}: ${ss}`);
       } catch (e) {}
-      throw new Error(`prewarm timeout for ${url}`);
+      throw new Error(`prewarm timeout for ${target.href}`);
     }
     await new Promise(r => setTimeout(r, 5000));
   }
diff --git a/federated-css-react-ssr/shell-apps/css-scss/server/index.js b/federated-css-react-ssr/shell-apps/css-scss/server/index.js
@@ -1,24 +1,26 @@
 const express = require('express');
 const initMiddleware = require('./middleware');
 const fetch = require('node-fetch');
+const { sanitizeLoopbackHttpUrl } = require('../../../server-utils/loopback');
 
 const app = express();
 const PORT = 4001;
 
 async function waitUrl(url, timeout = 300000) {
+  const target = sanitizeLoopbackHttpUrl(url);
   const start = Date.now();
   while (true) {
     try {
-      const res = await fetch(url);
+      const res = await fetch(target.href);
       if (res.ok) return;
     } catch (_) {}
     if (Date.now() - start > timeout) {
       try {
         const { execSync } = require('node:child_process');
-        const ss = execSync(`ss -ltnp | grep :${new URL(url).port} || true`, { stdio: ['ignore','pipe','ignore'] }).toString().trim();
-        if (ss) console.log(`[prewarm] port diag ${new URL(url).port}: ${ss}`);
+        const ss = execSync(`ss -ltnp | grep :${target.port} || true`, { stdio: ['ignore','pipe','ignore'] }).toString().trim();
+        if (ss) console.log(`[prewarm] port diag ${target.port}: ${ss}`);
       } catch {}
-      throw new Error(`prewarm timeout for ${url}`);
+      throw new Error(`prewarm timeout for ${target.href}`);
     }
     await new Promise(r => setTimeout(r, 5000));
   }
diff --git a/federated-css-react-ssr/shell-apps/jss-styled-components-css-module/server/index.js b/federated-css-react-ssr/shell-apps/jss-styled-components-css-module/server/index.js
@@ -1,24 +1,26 @@
 const express = require('express');
 const initMiddleware = require('./middleware');
 const fetch = require('node-fetch');
+const { sanitizeLoopbackHttpUrl } = require('../../../server-utils/loopback');
 
 const app = express();
 const PORT = 4003;
 
 async function waitUrl(url, timeout = 300000) {
+  const target = sanitizeLoopbackHttpUrl(url);
   const start = Date.now();
   while (true) {
     try {
-      const res = await fetch(url);
+      const res = await fetch(target.href);
       if (res.ok) return;
     } catch (_) {}
     if (Date.now() - start > timeout) {
       try {
         const { execSync } = require('node:child_process');
-        const ss = execSync(`ss -ltnp | grep :${new URL(url).port} || true`, { stdio: ['ignore','pipe','ignore'] }).toString().trim();
-        if (ss) console.log(`[prewarm] port diag ${new URL(url).port}: ${ss}`);
+        const ss = execSync(`ss -ltnp | grep :${target.port} || true`, { stdio: ['ignore','pipe','ignore'] }).toString().trim();
+        if (ss) console.log(`[prewarm] port diag ${target.port}: ${ss}`);
       } catch {}
-      throw new Error(`prewarm timeout for ${url}`);
+      throw new Error(`prewarm timeout for ${target.href}`);
     }
     await new Promise(r => setTimeout(r, 5000));
   }
diff --git a/federated-css-react-ssr/shell-apps/jss-styled-components/server/index.js b/federated-css-react-ssr/shell-apps/jss-styled-components/server/index.js
@@ -1,24 +1,26 @@
 const express = require('express');
 const initMiddleware = require('./middleware');
 const fetch = require('node-fetch');
+const { sanitizeLoopbackHttpUrl } = require('../../../server-utils/loopback');
 
 const app = express();
 const PORT = 4002;
 
 async function waitUrl(url, timeout = 300000) {
+  const target = sanitizeLoopbackHttpUrl(url);
   const start = Date.now();
   while (true) {
     try {
-      const res = await fetch(url);
+      const res = await fetch(target.href);
       if (res.ok) return;
     } catch (_) {}
     if (Date.now() - start > timeout) {
       try {
         const { execSync } = require('node:child_process');
-        const ss = execSync(`ss -ltnp | grep :${new URL(url).port} || true`, { stdio: ['ignore','pipe','ignore'] }).toString().trim();
-        if (ss) console.log(`[prewarm] port diag ${new URL(url).port}: ${ss}`);
+        const ss = execSync(`ss -ltnp | grep :${target.port} || true`, { stdio: ['ignore','pipe','ignore'] }).toString().trim();
+        if (ss) console.log(`[prewarm] port diag ${target.port}: ${ss}`);
       } catch {}
-      throw new Error(`prewarm timeout for ${url}`);
+      throw new Error(`prewarm timeout for ${target.href}`);
     }
     await new Promise(r => setTimeout(r, 5000));
   }
diff --git a/federated-css-react-ssr/shell-apps/less-scss/server/index.js b/federated-css-react-ssr/shell-apps/less-scss/server/index.js
@@ -1,24 +1,26 @@
 const express = require('express');
 const initMiddleware = require('./middleware');
 const fetch = require('node-fetch');
+const { sanitizeLoopbackHttpUrl } = require('../../../server-utils/loopback');
 
 const app = express();
 const PORT = 4004;
 
 async function waitUrl(url, timeout = 300000) {
+  const target = sanitizeLoopbackHttpUrl(url);
   const start = Date.now();
   while (true) {
     try {
-      const res = await fetch(url);
+      const res = await fetch(target.href);
       if (res.ok) return;
     } catch (_) {}
     if (Date.now() - start > timeout) {
       try {
         const { execSync } = require('node:child_process');
-        const ss = execSync(`ss -ltnp | grep :${new URL(url).port} || true`, { stdio: ['ignore','pipe','ignore'] }).toString().trim();
-        if (ss) console.log(`[prewarm] port diag ${new URL(url).port}: ${ss}`);
+        const ss = execSync(`ss -ltnp | grep :${target.port} || true`, { stdio: ['ignore','pipe','ignore'] }).toString().trim();
+        if (ss) console.log(`[prewarm] port diag ${target.port}: ${ss}`);
       } catch {}
-      throw new Error(`prewarm timeout for ${url}`);
+      throw new Error(`prewarm timeout for ${target.href}`);
     }
     await new Promise(r => setTimeout(r, 5000));
   }
diff --git a/federated-css-react-ssr/shell-apps/scss-tailwind-css/server/index.js b/federated-css-react-ssr/shell-apps/scss-tailwind-css/server/index.js
@@ -1,24 +1,26 @@
 const express = require('express');
 const initMiddleware = require('./middleware');
 const fetch = require('node-fetch');
+const { sanitizeLoopbackHttpUrl } = require('../../../server-utils/loopback');
 
 const app = express();
 const PORT = 4005;
 
 async function waitUrl(url, timeout = 300000) {
+  const target = sanitizeLoopbackHttpUrl(url);
   const start = Date.now();
   while (true) {
     try {
-      const res = await fetch(url);
+      const res = await fetch(target.href);
       if (res.ok) return;
     } catch (_) {}
     if (Date.now() - start > timeout) {
       try {
         const { execSync } = require('node:child_process');
-        const ss = execSync(`ss -ltnp | grep :${new URL(url).port} || true`, { stdio: ['ignore','pipe','ignore'] }).toString().trim();
-        if (ss) console.log(`[prewarm] port diag ${new URL(url).port}: ${ss}`);
+        const ss = execSync(`ss -ltnp | grep :${target.port} || true`, { stdio: ['ignore','pipe','ignore'] }).toString().trim();
+        if (ss) console.log(`[prewarm] port diag ${target.port}: ${ss}`);
       } catch {}
-      throw new Error(`prewarm timeout for ${url}`);
+      throw new Error(`prewarm timeout for ${target.href}`);
     }
     await new Promise(r => setTimeout(r, 5000));
   }
diff --git a/federated-css/README.md b/federated-css/README.md
@@ -58,7 +58,7 @@ Note. you don't need to start required remotes separately for this command.
 
 # Running Demo NextJs
 
-Commands will run host NextJs App on `http://localhost:8081-8084/`.
+Commands will run host NextJs App on `http://localhost:8081-8184/` (ports 8081, 8082, 8083, 8184).
 
 -`start:nextjs:combination-of-4` -`start:nextjs:jss-tailwind-global` -`start:nextjs:jss-css-and-tailwind-module` -`start:nextjs:less-and-styled-component`
 
diff --git a/federated-css/consumers-nextjs/less-and-styled-component/package.json b/federated-css/consumers-nextjs/less-and-styled-component/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "scripts": {
     "build": "cross-env NEXT_PRIVATE_LOCAL_WEBPACK=true next build",
-    "start": "cross-env NEXT_PRIVATE_LOCAL_WEBPACK=true next dev -p 8084",
+    "start": "cross-env NEXT_PRIVATE_LOCAL_WEBPACK=true next dev -p 8184",
     "lint": "next lint"
   },
   "dependencies": {
diff --git a/federated-css/e2e/common-checks.spec.ts b/federated-css/e2e/common-checks.spec.ts
@@ -42,7 +42,7 @@ const appsUnderTest: AppConfig[] = [
     isNextJs: true,
   },
   {
-    port: 8084,
+    port: 8184,
     buttons: [styledComponent, less],
     isNextJs: true,
   },
diff --git a/federated-css/scripts/aggressive-port-cleanup.cjs b/federated-css/scripts/aggressive-port-cleanup.cjs
@@ -70,7 +70,7 @@ async function aggressiveKillPort(port) {
 async function cleanupAllPorts() {
   const reactConsumerPorts = [3001, 3002, 3003, 3004, 3005, 3006, 3007];
   const exposePorts = [4000, 4001, 4002, 4003, 4004, 4005, 4006, 4007];
-  const nextConsumerPorts = [8081, 8082, 8083, 8084];
+  const nextConsumerPorts = [8081, 8082, 8083, 8184];
 
   const allPorts = [...reactConsumerPorts, ...exposePorts, ...nextConsumerPorts];
 
diff --git a/federated-css/scripts/kill-all-ports.cjs b/federated-css/scripts/kill-all-ports.cjs
@@ -4,7 +4,7 @@ const { cleanupAllPorts } = require('./aggressive-port-cleanup.cjs');
 
 const reactConsumerPorts = [3001, 3002, 3003, 3004, 3005, 3006, 3007];
 const exposePorts = [4000, 4001, 4002, 4003, 4004, 4005, 4006, 4007];
-const nextConsumerPorts = [8081, 8082, 8083, 8084];
+const nextConsumerPorts = [8081, 8082, 8083, 8184];
 
 const ports = [...new Set([...reactConsumerPorts, ...exposePorts, ...nextConsumerPorts])];
 
diff --git a/federated-css/scripts/start-all.cjs b/federated-css/scripts/start-all.cjs
@@ -113,7 +113,7 @@ async function main() {
   const nextConsumers = [
     { dir: 'jss-css-and-tailwind-module', port: 8083 },
     { dir: 'jss-and-tailwind-global', port: 8082 },
-    { dir: 'less-and-styled-component', port: 8084 },
+    { dir: 'less-and-styled-component', port: 8184 },
     { dir: 'combination-of-4', port: 8081 },
   ];
 
