Skip to content

Commit bee5743

Browse files
committed
feat: add username and password settings for mqtt broker
1 parent 68859fa commit bee5743

File tree

2 files changed

+34
-5
lines changed

2 files changed

+34
-5
lines changed

src/controllers/vda5050.controller.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,23 @@ export async function masterController(
2525
mqttPort: string,
2626
basepath: string,
2727
interfaceName: string,
28-
vdaVersion: VdaVersion
28+
vdaVersion: VdaVersion,
29+
username: string = "",
30+
password: string = "",
2931
) {
3032
if (mc) {
3133
mc.stop();
3234
client.end();
3335
}
34-
client = mqtt.connect("ws://" + mqttIp + ":" + mqttPort + "/" + basepath);
36+
client = mqtt.connect("ws://" + mqttIp + ":" + mqttPort + "/" + basepath, {username:username, password:password});
3537
clientStateHandlers();
3638
mc = new MasterController(
3739
{
3840
interfaceName: interfaceName,
3941
transport: {
4042
brokerUrl: "ws://" + mqttIp + ":" + mqttPort + "/" + basepath,
43+
username: username,
44+
password: password,
4145
},
4246
vdaVersion: vdaVersion,
4347
},

src/views/vda5050-visualizer/vda5050-visualizer.component.vue

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@ import {
1010
} from "@/controllers/vda5050.controller";
1111
1212
const brokerIp = ref(import.meta.env.VITE_MQTT_HOST);
13+
const username = ref("");
14+
const password = ref("");
1315
const brokerPort = ref(import.meta.env.VITE_MQTT_PORT);
1416
const basepath = ref(import.meta.env.VITE_BASEPATH);
1517
const interfaceName = ref(import.meta.env.VITE_VDA_INTERFACE);
1618
const vdaVersion = ref(import.meta.env.VITE_VDA_VERSION);
1719
let vda5050Visualizer: VDA5050Visualizer | undefined;
1820
const version = ref(0);
21+
const settings = ref(false);
1922
2023
function updateBroker() {
2124
version.value += 1;
@@ -24,7 +27,9 @@ function updateBroker() {
2427
brokerPort.value,
2528
basepath.value,
2629
interfaceName.value,
27-
vdaVersion.value
30+
vdaVersion.value,
31+
username.value,
32+
password.value
2833
);
2934
vda5050Visualizer = new VDA5050Visualizer();
3035
}
@@ -109,15 +114,35 @@ const options = [
109114
{{ getMqttClientState() }}</ui-button
110115
>
111116
</ui-grid-cell>
112-
<ui-grid-cell columns="2">
117+
<ui-grid-cell columns="1">
113118
<ui-button
114119
class="w100"
115-
style="height: 55px"
120+
style="height: 55px;"
121+
outlined
122+
icon="settings"
123+
@click="settings = !settings"
124+
>Settings</ui-button
125+
>
126+
</ui-grid-cell>
127+
<ui-grid-cell columns="1">
128+
<ui-button
129+
class="w100"
130+
style="height: 55px;"
116131
outlined
117132
@click="updateBroker()"
118133
>Start</ui-button
119134
>
120135
</ui-grid-cell>
136+
<ui-grid-cell columns="6" v-if="settings">
137+
<ui-textfield class="mr w100" outlined v-model="username">
138+
Username
139+
</ui-textfield>
140+
</ui-grid-cell>
141+
<ui-grid-cell columns="6" v-if="settings">
142+
<ui-textfield class="mr w100" outlined v-model="password">
143+
Password
144+
</ui-textfield>
145+
</ui-grid-cell>
121146
</ui-grid>
122147
</div>
123148
<div

0 commit comments

Comments
 (0)