fix(connection): support port on HTTP connection (#935)

This commit is contained in:
Dan Ditomaso
2025-11-05 21:53:26 -05:00
committed by GitHub
parent ab0308701c
commit 7c9013a217
@@ -4,24 +4,43 @@ export const urlOrIpv4Schema = z
.string()
.trim()
.refine((val) => {
const input = val.replace(/^https?:\/\//i, ""); // remove protocol for validation
const input = val.replace(/^https?:\/\//i, "");
// Split input into host and port (port is optional)
const lastColonIndex = input.lastIndexOf(":");
let host = input;
let port = null;
if (lastColonIndex !== -1) {
const potentialPort = input.substring(lastColonIndex + 1);
if (/^\d+$/.test(potentialPort)) {
host = input.substring(0, lastColonIndex);
port = parseInt(potentialPort, 10);
}
}
// Validate port if present
if (port !== null) {
// Must be 2-5 digits and between 10-65535
if (port < 10 || port > 65535) {
return false;
}
}
// IPv4 pattern
const ipv4Regex =
/^(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}$/;
// Domain pattern (e.g. example.com, meshtastic.local)
const domainRegex = /^(?!-)(?:[a-zA-Z0-9-]{1,63}\.)+[a-zA-Z]{2,}$/;
// Local domain (e.g. meshtastic.local)
const localDomainRegex = /^(?!-)[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.local$/;
return (
ipv4Regex.test(input) ||
domainRegex.test(input) ||
localDomainRegex.test(input)
ipv4Regex.test(host) ||
domainRegex.test(host) ||
localDomainRegex.test(host)
);
}, "Must be a valid IPv4 address or domain name")
}, "Must be a valid IPv4 address or domain name with optional port (10-65535)")
.transform((val) => {
return /^https?:\/\//i.test(val) ? val : `http://${val}`;
});