Darkages/SpotMicroESP32-Leika
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ap settngs post working, error msg on response

Browse Source
This commit is contained in:
Niklas Jensen
2026-01-24 11:24:09 +01:00
committed by nikguin04
parent ae4a2fe115
commit d5af8d0294
6 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/lib/api.ts
+12 -3
View File
@@ -2,7 +2,8 @@ import { get } from 'svelte/store'
import { Err, Ok, type Result } from './utilities'
import { apiLocation } from './stores/location-store'
import type { MessageFns } from './platform_shared/filesystem'
import { Response } from './platform_shared/api'
import { Request, Response } from './platform_shared/api'
import { BinaryWriter } from '@bufbuild/protobuf/wire'
export const api = {
get<TResponse>(endpoint: string, params?: RequestInit) {
@@ -13,6 +14,10 @@ export const api = {
return sendRequest<TResponse>(endpoint, 'POST', data)
},
post_proto<TResponse>(endpoint: string, data: Request) {
return sendRequest<TResponse>(endpoint, 'POST', Request.encode(data))
},
put<TResponse>(endpoint: string, data?: unknown) {
return sendRequest<TResponse>(endpoint, 'PUT', data)
},
@@ -29,7 +34,11 @@ async function sendRequest<TResponse>(
params?: RequestInit
): Promise<Result<TResponse, Error>> {
endpoint = resolveUrl(endpoint)
const body = data !== null && typeof data !== 'undefined' ? JSON.stringify(data) : undefined
const isProtobuf = data instanceof BinaryWriter
const body = data !== null && typeof data !== 'undefined'
? (isProtobuf ? data.finish() : JSON.stringify(data))
: undefined
const request = {
...params,
@@ -38,7 +47,7 @@ async function sendRequest<TResponse>(
headers: {
...params?.headers,
Authorization: 'Basic',
'Content-Type': 'application/json'
'Content-Type': isProtobuf ? 'application/x-protobuf' : 'application/json'
}
}
app/src/lib/types/models.ts
-12
View File
@@ -71,18 +71,6 @@ export type NetworkItem = {
encryption_type: number
}
export type ApSettings = {
provision_mode: number
ssid: string
password: string
channel: number
ssid_hidden: boolean
max_clients: number
local_ip: number
gateway_ip: number
subnet_mask: number
}
export type Rssi = {
rssi: number
ssid: string
app/src/routes/wifi/ap/Accesspoint.svelte
+23 -18
View File
@@ -6,15 +6,14 @@
import SettingsCard from '$lib/components/SettingsCard.svelte'
import { notifications } from '$lib/components/toasts/notifications'
import Spinner from '$lib/components/Spinner.svelte'
import { type ApSettings } from '$lib/types/models'
import { api } from '$lib/api'
import { ipToUint32, uint32ToIp, isValidIpString } from '$lib/utilities'
import { AP, Devices, Home, MAC } from '$lib/components/icons'
import StatusItem from '$lib/components/StatusItem.svelte'
import { APStatus, Response } from '$lib/platform_shared/api'
import { APSettings, APStatus, Request, Response } from '$lib/platform_shared/api'
import { input } from '$lib/stores'
let apSettings: ApSettings | null = $state(null)
let apSettings: APSettings | null = $state(null)
let apStatus: APStatus | null = $state(null)
let ipDisplay = $state({
@@ -36,16 +35,16 @@
}
async function getAPSettings() {
const result = await api.get<ApSettings>('/api/ap/settings')
const result = await api.get<Response>('/api/ap/settings')
if (result.isErr()) {
console.error('Error:', result.inner)
return
}
apSettings = result.inner
apSettings = result.inner.apSettings!
ipDisplay = {
local_ip: uint32ToIp(apSettings.local_ip),
gateway_ip: uint32ToIp(apSettings.gateway_ip),
subnet_mask: uint32ToIp(apSettings.subnet_mask)
local_ip: uint32ToIp(apSettings.localIp),
gateway_ip: uint32ToIp(apSettings.gatewayIp),
subnet_mask: uint32ToIp(apSettings.subnetMask)
}
return apSettings
}
@@ -88,15 +87,21 @@
subnet_mask: false
})
async function postAPSettings(data: ApSettings) {
const result = await api.post<ApSettings>('/api/ap/settings', data)
async function postAPSettings(data: APSettings) {
const result = await api.post_proto<Response>('/api/ap/settings', Request.create({ apSettings: data }))
if (result.isErr()) {
notifications.error('User not authorized.', 3000)
console.error('Error:', result.inner)
return
}
if (result.inner.statusCode !== 200) {
notifications.error(result.inner.errorMessage || 'Failed to update settings', 3000)
return
}
if (result.inner.apSettings) {
apSettings = result.inner.apSettings
}
notifications.success('Access Point settings updated.', 3000)
apSettings = result.inner
}
function handleSubmitAP(e: Event) {
@@ -119,7 +124,7 @@
formErrors.channel = false
}
let maxClients = Number(apSettings.max_clients)
let maxClients = Number(apSettings.maxClients)
if (1 > maxClients || maxClients > 8) {
valid = false
formErrors.max_clients = true
@@ -149,9 +154,9 @@
}
if (valid) {
apSettings.local_ip = ipToUint32(ipDisplay.local_ip)
apSettings.gateway_ip = ipToUint32(ipDisplay.gateway_ip)
apSettings.subnet_mask = ipToUint32(ipDisplay.subnet_mask)
apSettings.localIp = ipToUint32(ipDisplay.local_ip)
apSettings.gatewayIp = ipToUint32(ipDisplay.gateway_ip)
apSettings.subnetMask = ipToUint32(ipDisplay.subnet_mask)
postAPSettings(apSettings)
}
}
@@ -225,7 +230,7 @@
<select
class="select select-bordered w-full"
id="apmode"
bind:value={apSettings.provision_mode}
bind:value={apSettings.provisionMode}
>
{#each provisionMode as mode (mode.id)}
<option value={mode.id}>
@@ -305,7 +310,7 @@
) ?
'border-error border-2'
: ''}"
bind:value={apSettings.max_clients}
bind:value={apSettings.maxClients}
id="clients"
required
/>
@@ -393,7 +398,7 @@
<label class="label my-auto cursor-pointer justify-start gap-4">
<input
type="checkbox"
bind:checked={apSettings.ssid_hidden}
bind:checked={apSettings.ssidHidden}
class="checkbox checkbox-primary"
/>
<span class="">Hide SSID</span>