Skip to content

Commit 0fb4ec1

Browse files
Remove choosing Router and Peer
These parameters are decided by connecting to the Switcher and sending data through the Router
1 parent ca161d5 commit 0fb4ec1

File tree

1 file changed

+8
-36
lines changed

1 file changed

+8
-36
lines changed

Client/src/App.vue

Lines changed: 8 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<!-- <img alt="Vue logo" src="./assets/logo.png" /> -->
44
<n-space vertical>
55
<n-card>
6-
<n-form :model="userModel" ref="userRef" :rules="userRules">
7-
<n-form-item-row label="Peer" path="peer">
6+
<n-form :model="userModel" ref="userRef">
7+
<!-- <n-form-item-row label="Peer" path="peer">
88
<n-mention
99
:options="peerOptions"
1010
default-value="@"
@@ -17,7 +17,7 @@
1717
default-value="@"
1818
v-model:value="userModel.router"
1919
/>
20-
</n-form-item-row>
20+
</n-form-item-row> -->
2121
<n-form-item-row label="Message">
2222
<n-input
2323
maxlength="30"
@@ -61,35 +61,9 @@ import { ref } from "vue";
6161
import { useMessage } from "naive-ui";
6262
6363
const formModelRef = ref({
64-
peer: "@",
65-
router: "@",
6664
message: "",
6765
});
6866
69-
const userRules = {
70-
peer: {
71-
trigger: ["input", "blur"],
72-
required: true,
73-
message: "Peer is required",
74-
validator() {
75-
if (formModelRef.value.peer == "@") {
76-
return Error("Peer is required");
77-
}
78-
},
79-
},
80-
router: {
81-
router: ["input", "blur"],
82-
required: true,
83-
message: "Router is required",
84-
validator() {
85-
if (formModelRef.value.router == "@") {
86-
return Error("Only one router allowed");
87-
}
88-
},
89-
},
90-
message: {},
91-
};
92-
9367
export default {
9468
name: "App",
9569
components: {
@@ -103,7 +77,6 @@ export default {
10377
routerPort: null,
10478
socketPort: 51510,
10579
userModel: formModelRef,
106-
userRules,
10780
userLog: "\n",
10881
peerValue: "a",
10982
peerOptions: [
@@ -142,8 +115,8 @@ export default {
142115
},
143116
methods: {
144117
formSubmit: function () {
145-
const { peer, router, message } = formModelRef.value;
146-
if (peer.length == 1 || router.length == 1 || message.length < 1)
118+
const { message } = formModelRef.value;
119+
if (message.length < 1)
147120
return alert("Form not completed");
148121
// console.log({ peer, router, message });
149122
@@ -161,13 +134,13 @@ export default {
161134
// let sendMessage = Buffer.from("UDP CONNETION DATA");
162135
this.sendMessage(
163136
5,
164-
{ message, peer },
137+
{ message },
165138
this.routerIp,
166139
this.routerPort
167140
);
168141
169142
this.logMessage(
170-
`Sending message '${message}' to peer ${peer} through router ${router}.`
143+
`Sending message '${message}' to peer through router 1.`
171144
);
172145
},
173146
getInformationFromSwitcher: function () {
@@ -233,14 +206,13 @@ export default {
233206
this.routerIp = message.address;
234207
this.routerPort = message.port;
235208
this.hasFirstRouter = true;
236-
this.logMessage(`Router 1 has been detected on the Switcher Network`);
209+
this.logMessage(`You are the initial client. Router 1 has been detected on the Switcher Network, message: ${JSON.stringify(message)}`);
237210
} else {
238211
this.logMessage(
239212
`Received message from Switcher: ${JSON.stringify(message)}`
240213
);
241214
}
242215
}
243-
244216
// this.logMessage(`Received ${msg.length} bytes from ${info.address}:${info.port}`);
245217
246218
// console.log(

0 commit comments

Comments
 (0)