Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/lib/device/http_network_config_builder.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { NetworkConfigBuilder } from "@device-ui/lib/device/network_config_builder";
import { NetworkType } from "@device-ui/lib/device/types";
import { Config } from "@device-ui/lib/device/config";
import { HTTPConfig } from "@device-ui/lib/device/http_config";
import { JSONFormatter } from "@device-ui/lib/fmt/json_formatter";

export class HTTPNetworkConfigBuilder implements NetworkConfigBuilder {
// Initialize.
constructor(private readonly baseURL: string) {}

// Build HTTP network config.
build(nt: NetworkType): Config | null {
switch (nt) {
case NetworkType.WiFiAP:
return new HTTPConfig(
new JSONFormatter(),
`${this.baseURL}/config/wifi/ap`,
);

case NetworkType.WiFiSTA:
return new HTTPConfig(
new JSONFormatter(),
`${this.baseURL}/config/wifi/sta`,
);

default:
return null;
}
}
}
7 changes: 7 additions & 0 deletions src/lib/device/network_config_builder.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { NetworkType } from "@device-ui/lib/device/types";
import { Config } from "@device-ui/lib/device/config";

export interface NetworkConfigBuilder {
// Build network config.
build(nt: NetworkType): Config | null;
}
6 changes: 6 additions & 0 deletions src/lib/device/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Various network types.
export enum NetworkType {
None = 0,
WiFiAP,
WiFiSTA,
}
92 changes: 92 additions & 0 deletions src/ui/preact/network_status_component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,24 @@ import { Component } from "preact";

import { ObjectMonitor } from "@device-ui/lib/core/object_monitor";
import { DataStore } from "@device-ui/lib/device/data_store";
import { Config } from "@device-ui/lib/device/config";
import { Notificator } from "@device-ui/lib/system/notificator";
import { NetworkConfigBuilder } from "@device-ui/lib/device/network_config_builder";
import { NetworkType } from "@device-ui/lib/device/types";

import { FormConfigComponent } from "@device-ui/ui/preact/form_config_component";

import "@device-ui/ui/preact/network_status_component.css";

export type NetworkStatusComponentProps = {
// Registration store to receive latest registration data.
registrationStore: DataStore;

// Notificator to send various notifications.
notificator: Notificator;

// Builder to build network config.
builder: NetworkConfigBuilder;
};

class WiFiStaData {
Expand All @@ -31,6 +43,8 @@ type NetworkData = WiFiApData | WiFiStaData;

type NetworkStatusComponentState = {
expanded: boolean;
enableConfiguration: boolean;
config: Config | null;
data: NetworkData | null;
};

Expand All @@ -43,6 +57,8 @@ export class NetworkStatusComponent

this.state = {
expanded: false,
enableConfiguration: false,
config: null,
data: null,
};
}
Expand Down Expand Up @@ -70,6 +86,8 @@ export class NetworkStatusComponent

this.setState({
expanded: false,
enableConfiguration: false,
config: null,
data: null,
});
}
Expand Down Expand Up @@ -174,8 +192,51 @@ export class NetworkStatusComponent
</div>
)}
</div>

{/* Configuration mode */}
{this.state.enableConfiguration && (
<FormConfigComponent
config={this.state.config!}
onClose={this.handleConfigEnd}
notificator={this.props.notificator}
/>
)}
</div>
)}

{isStaMode &&
this.state.expanded &&
!this.state.enableConfiguration && (
<div className="config-button-container">
<button
onClick={this.handleConfigBeginWiFiSta}
className="config-button"
>
Configure
</button>
</div>
)}

{isApMode && this.state.expanded && !this.state.enableConfiguration && (
<>
<div className="config-button-container">
<button
onClick={this.handleConfigBeginWiFiAp}
className="config-button"
>
Configure WiFi AP
</button>
</div>
<div className="config-button-container">
<button
onClick={this.handleConfigBeginWiFiSta}
className="config-button"
>
Configure WiFi STA
</button>
</div>
</>
)}
</div>
);
}
Expand All @@ -200,6 +261,37 @@ export class NetworkStatusComponent
this.setState({
...this.state,
expanded: !this.state.expanded,
enableConfiguration: false,
});
};

// Note: use arrow function to properly capture `this`.
private handleConfigEnd = () => {
this.setState({
...this.state,
expanded: false,
config: null,
enableConfiguration: false,
});
};

// Note: use arrow function to properly capture `this`.
private handleConfigBeginWiFiSta = () => {
this.setState({
...this.state,
expanded: true,
enableConfiguration: true,
config: this.props.builder.build(NetworkType.WiFiSTA),
});
};

// Note: use arrow function to properly capture `this`.
private handleConfigBeginWiFiAp = () => {
this.setState({
...this.state,
expanded: true,
enableConfiguration: true,
config: this.props.builder.build(NetworkType.WiFiAP),
});
};

Expand Down
2 changes: 2 additions & 0 deletions vite.config.base.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ export function createBaseConfig(deviceIP = "", projectConfig = {}) {
"/api/v1/config/sensor/analog": createProxyConfig(deviceIP),
"/api/v1/system/reboot": createProxyConfig(deviceIP),
"/api/v1/system/locate": createProxyConfig(deviceIP),
"/api/v1/config/wifi/sta": createProxyConfig(deviceIP),
"/api/v1/config/wifi/ap": createProxyConfig(deviceIP),
},
},
build: {
Expand Down