idan/sshwifty-udp-telnet-http
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrap buildCurrent in try in case of unknown errors + verify no need to be async.

Browse Source
This commit is contained in:
NI
2019-08-27 21:10:21 +08:00
parent 134f0f07d3
commit 9257bd40c3
1 changed files with 54 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
ui/widgets/connector.vue
View File

@@ -257,67 +257,77 @@ export default {
this.$emit("cancel", true); this.$emit("cancel", true);
}, },
cancel() { cancel() {
if (this.working) {
return;
}
if (this.cancelled) { if (this.cancelled) {
return; return;
} }
this.cancelled = true; this.cancelled = true;
if (this.working) {
return;
}
this.sendCancel(); this.sendCancel();
}, },
buildCurrent(next) { buildCurrent(next) {
this.current = buildEmptyCurrent(); try {
this.current = buildEmptyCurrent();
this.working = this.getConnector().wizard.started(); this.working = this.getConnector().wizard.started();
this.current.type = next.type(); this.current.type = next.type();
this.current.data = next.data(); this.current.data = next.data();
switch (this.current.type) { switch (this.current.type) {
case command.NEXT_PROMPT: case command.NEXT_PROMPT:
let fields = this.current.data.inputs(); let fields = this.current.data.inputs();
for (let i in fields) { for (let i in fields) {
this.current.fields.push(buildField(i, fields[i])); this.current.fields.push(buildField(i, fields[i]));
} }
this.current.actionText = this.current.data.actionText(); this.current.actionText = this.current.data.actionText();
this.current.submittable = true; this.current.submittable = true;
this.current.alert = true; this.current.alert = true;
this.current.cancellable = true; this.current.cancellable = true;
// Fallthrough // Fallthrough
case command.NEXT_WAIT: case command.NEXT_WAIT:
this.current.title = this.current.data.title(); this.current.title = this.current.data.title();
this.current.message = this.current.data.message();
break;
case command.NEXT_DONE:
this.working = false;
this.disabled = true;
if (!this.current.data.success()) {
this.current.title = this.current.data.error();
this.current.message = this.current.data.message(); this.current.message = this.current.data.message();
} else { break;
this.$emit("done", this.current.data.data());
}
break;
default: case command.NEXT_DONE:
throw new Error("Unknown command type"); this.working = false;
this.disabled = true;
if (!this.current.data.success()) {
this.current.title = this.current.data.error();
this.current.message = this.current.data.message();
} else {
this.$emit("done", this.current.data.data());
}
break;
default:
throw new Error("Unknown command type");
}
if (!this.working) {
this.current.cancellable = false;
}
return next;
} catch (e) {
this.current.title = "Encountered an error";
this.current.message = e;
this.working = false;
this.disabled = true;
throw e;
} }
if (!this.working) {
this.current.cancellable = false;
}
return next;
}, },
getConnector() { getConnector() {
if (this.currentConnector === null) { if (this.currentConnector === null) {
@@ -377,9 +387,9 @@ export default {
event.target.style.height = ""; event.target.style.height = "";
event.target.style.height = event.target.scrollHeight + "px"; event.target.style.height = event.target.scrollHeight + "px";
}, },
async verify(key, field, force) { verify(key, field, force) {
try { try {
field.message = "" + (await field.field.verify(field.field.value)); field.message = "" + field.field.verify(field.field.value);
field.inputted = true; field.inputted = true;
field.verified = true; field.verified = true;
field.error = ""; field.error = "";