danvics/Pulse
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix proxy UI type errors

Browse source
This commit is contained in:
rcourtman 2025-11-17 14:35:32 +00:00
parent a479040651
commit a46ca5052b
2 changed files with 50 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
frontend-modern/src/components/Settings/NodeModal.tsx
View file

@ -40,6 +40,12 @@ type TemperatureTransportDetail = {
disable?: boolean;
};
interface ProxyInstallResponse {
command: string;
pulseURL: string;
node?: string;
}
const deriveNameFromHost = (host: string): string => {
let value = host.trim();
if (!value) {
@ -167,12 +173,14 @@ export const NodeModal: Component<NodeModalProps> = (props) => {
try {
const nodeName = props.editingNode?.name ? encodeURIComponent(props.editingNode!.name) : '';
const query = nodeName ? `?node=${nodeName}` : '';
const response = await apiFetchJSON(`/api/temperature-proxy/install-command${query}`);
const response = (await apiFetchJSON(
`/api/temperature-proxy/install-command${query}`,
)) as ProxyInstallResponse;
if (!response || typeof response.command !== 'string') {
throw new Error('Proxy installer command unavailable');
}
setProxyInstallCommand(response.command);
showSuccess('HTTPS proxy command ready', 2000);
showSuccess('HTTPS proxy command ready', undefined, 2000);
} catch (error) {
const message =
error instanceof Error ? error.message : 'Failed to generate HTTPS proxy command';

71
frontend-modern/src/components/Settings/Settings.tsx
View file

@ -998,15 +998,16 @@ const Settings: Component<SettingsProps> = (props) => {
const diag = await response.json();
setDiagnosticsData(diag);
emitTemperatureProxyWarnings(diag);
if (diag?.temperatureProxy?.hostProxySummary) {
setHostProxyStatus({
hostSocketPresent: Boolean(diag.temperatureProxy?.socketFound),
containerSocketPresent: Boolean(
diag.temperatureProxy?.hostProxySummary?.containerSocketPresent ?? false,
),
summary: diag.temperatureProxy?.hostProxySummary ?? undefined,
});
}
setHostProxyStatus(
diag?.temperatureProxy?.hostProxySummary
? {
hostSocketPresent: Boolean(diag.temperatureProxy?.socketFound),
containerSocketPresent:
diag.temperatureProxy?.hostProxySummary?.containerSocketPresent ?? undefined,
summary: diag.temperatureProxy?.hostProxySummary ?? undefined,
}
: null,
);
} catch (err) {
logger.error('Failed to fetch diagnostics', err);
showError('Failed to run diagnostics');
@ -1022,7 +1023,7 @@ const Settings: Component<SettingsProps> = (props) => {
)) as HostProxyStatusResponse;
setHostProxyStatus(status);
if (notify) {
showSuccess('Host proxy status refreshed', 2000);
showSuccess('Host proxy status refreshed', undefined, 2000);
}
} catch (err) {
logger.error('Failed to refresh host proxy status', err);
@ -5602,7 +5603,11 @@ const Settings: Component<SettingsProps> = (props) => {
const command = status().reinstallCommand;
if (command) {
void copyToClipboard(command);
showSuccess('Host proxy command copied', 2000);
showSuccess(
'Host proxy command copied',
undefined,
2000,
);
}
}}
>
@ -6213,6 +6218,8 @@ const Settings: Component<SettingsProps> = (props) => {
const suffix = suffixMatch ? suffixMatch[0] : '';
return `node-REDACTED${suffix}`;
};
const sanitizeOptionalHostname = (value?: string) =>
value && value.trim() ? sanitizeHostname(value) : undefined;
const sanitizeText = (text: string | undefined) => {
if (!text) return text;
@ -6469,26 +6476,28 @@ const Settings: Component<SettingsProps> = (props) => {
if (Array.isArray(proxyDiag.socketHostCooldowns)) {
proxyDiag.socketHostCooldowns = (
proxyDiag.socketHostCooldowns as Array<Record<string, unknown>>
).map((entry) => ({
node: sanitizeHostname(
typeof entry.node === 'string' ? (entry.node as string) : undefined,
) as string,
host: sanitizeHostname(
typeof entry.host === 'string' ? (entry.host as string) : undefined,
) as string,
cooldownUntil:
typeof entry.cooldownUntil === 'string'
? (entry.cooldownUntil as string)
: undefined,
secondsRemaining:
typeof entry.secondsRemaining === 'number'
? (entry.secondsRemaining as number)
: undefined,
lastError:
typeof entry.lastError === 'string'
? sanitizeText(entry.lastError as string) ?? (entry.lastError as string)
: undefined,
}));
).map((entry) => {
const originalNode =
typeof entry.node === 'string' ? (entry.node as string) : undefined;
const originalHost =
typeof entry.host === 'string' ? (entry.host as string) : undefined;
return {
node: sanitizeOptionalHostname(originalNode),
host: sanitizeOptionalHostname(originalHost),
cooldownUntil:
typeof entry.cooldownUntil === 'string'
? (entry.cooldownUntil as string)
: undefined,
secondsRemaining:
typeof entry.secondsRemaining === 'number'
? (entry.secondsRemaining as number)
: undefined,
lastError:
typeof entry.lastError === 'string'
? sanitizeText(entry.lastError as string) ?? (entry.lastError as string)
: undefined,
};
});
}
}