wire-mesh 3.6.4 → 3.6.6

package/dist/server.cjs

@@ -242,10 +242,12 @@ async function advanceCertificateSchedule(storage, now, options = {}) {
 	const stillValid = (await readStored(storage)).filter((certificate) => certificate.notAfter.getTime() > now.getTime());
 	const startedIndex = stillValid.findLastIndex((certificate) => certificate.notBefore.getTime() <= now.getTime());
 	const certificates = startedIndex === -1 ? [await mintPinnedCertificate(now, lifetimeMs)] : stillValid.slice(startedIndex);
-	while (certificates.length < 4) {
+	const missing = 4 - certificates.length;
+	if (missing > 0) {
 		const last = certificates[certificates.length - 1];
 		if (last === void 0) throw new Error("the certificate schedule is empty");
-		certificates.push(await mintPinnedCertificate(new Date(last.notBefore.getTime() + servingMs), lifetimeMs));
+		const successors = await Promise.all(Array.from({ length: missing }, async (_, index) => mintPinnedCertificate(new Date(last.notBefore.getTime() + servingMs * (index + 1)), lifetimeMs)));
+		certificates.push(...successors);
 	}
 	await writeStored(storage, certificates);
 	const [serving, next] = certificates;
@@ -327,7 +329,6 @@ function createWebTransportTransport(options = {}) {
 				await started.ready;
 				const bound = started.address();
 				if (bound === null) throw new Error("the WebTransport server bound no address");
-				port = bound.port;
 				const liveSessions = /* @__PURE__ */ new Set();
 				const drainState = { draining: false };
 				const endSession = (session) => {
@@ -361,6 +362,7 @@ function createWebTransportTransport(options = {}) {
 				})().catch(reportError);
 				return {
 					server: started,
+					port: bound.port,
 					drain: async () => {
 						drainState.draining = true;
 						const open = [...liveSessions];
@@ -370,6 +372,7 @@ function createWebTransportTransport(options = {}) {
 				};
 			};
 			let running = await startServer();
+			port = running.port;
 			const advertise = () => reachableHosts(host).map((reachable) => (0, wire_mesh_core_domain_pinned_address.formatPinnedAddress)(`${reachable}:${String(port)}`, schedule.advertised.map((certificate) => certificate.sha256Hex)));
 			/** Drains and stops the running server, if there is one: cleared first, so a rotation that failed after this point is retried by starting a server rather than by retiring one that is already gone. */
 			const retire = async () => {
@@ -390,6 +393,7 @@ function createWebTransportTransport(options = {}) {
 						await retire();
 						if (closed) return;
 						running = await startServer();
+						port = running.port;
 						options.onCertificateRenewed?.(advertise());
 					})().then(() => {
 						if (!closed) armRotation(untilRotation());

package/dist/server.mjs

@@ -241,10 +241,12 @@ async function advanceCertificateSchedule(storage, now, options = {}) {
 	const stillValid = (await readStored(storage)).filter((certificate) => certificate.notAfter.getTime() > now.getTime());
 	const startedIndex = stillValid.findLastIndex((certificate) => certificate.notBefore.getTime() <= now.getTime());
 	const certificates = startedIndex === -1 ? [await mintPinnedCertificate(now, lifetimeMs)] : stillValid.slice(startedIndex);
-	while (certificates.length < 4) {
+	const missing = 4 - certificates.length;
+	if (missing > 0) {
 		const last = certificates[certificates.length - 1];
 		if (last === void 0) throw new Error("the certificate schedule is empty");
-		certificates.push(await mintPinnedCertificate(new Date(last.notBefore.getTime() + servingMs), lifetimeMs));
+		const successors = await Promise.all(Array.from({ length: missing }, async (_, index) => mintPinnedCertificate(new Date(last.notBefore.getTime() + servingMs * (index + 1)), lifetimeMs)));
+		certificates.push(...successors);
 	}
 	await writeStored(storage, certificates);
 	const [serving, next] = certificates;
@@ -326,7 +328,6 @@ function createWebTransportTransport(options = {}) {
 				await started.ready;
 				const bound = started.address();
 				if (bound === null) throw new Error("the WebTransport server bound no address");
-				port = bound.port;
 				const liveSessions = /* @__PURE__ */ new Set();
 				const drainState = { draining: false };
 				const endSession = (session) => {
@@ -360,6 +361,7 @@ function createWebTransportTransport(options = {}) {
 				})().catch(reportError);
 				return {
 					server: started,
+					port: bound.port,
 					drain: async () => {
 						drainState.draining = true;
 						const open = [...liveSessions];
@@ -369,6 +371,7 @@ function createWebTransportTransport(options = {}) {
 				};
 			};
 			let running = await startServer();
+			port = running.port;
 			const advertise = () => reachableHosts(host).map((reachable) => formatPinnedAddress(`${reachable}:${String(port)}`, schedule.advertised.map((certificate) => certificate.sha256Hex)));
 			/** Drains and stops the running server, if there is one: cleared first, so a rotation that failed after this point is retried by starting a server rather than by retiring one that is already gone. */
 			const retire = async () => {
@@ -389,6 +392,7 @@ function createWebTransportTransport(options = {}) {
 						await retire();
 						if (closed) return;
 						running = await startServer();
+						port = running.port;
 						options.onCertificateRenewed?.(advertise());
 					})().then(() => {
 						if (!closed) armRotation(untilRotation());