Skip to content

Commit 23b1101

Browse files
author
ozelot379
committed
Improve error handling
1 parent 8592d05 commit 23b1101

7 files changed

Lines changed: 36 additions & 65 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## [x]
44
- Convert dialog, inventory and recipe book ui
5+
- Improve error handling
56
- Possible bugs fixed in:
67
- Fix dye
78
- Fix enchanted item glint

‎src/index.js‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,21 @@ class ConvertJavaTextureToBedrock {
3939
* @returns {Promise<*>}
4040
*/
4141
async convert() {
42-
try {
43-
await this.output._init(this.input, this.log);
42+
await this.output._init(this.input, this.log);
4443

45-
for await (const entry of this.input.getEntries()) {
46-
await entry._init(this.log);
44+
for await (const entry of this.input.getEntries()) {
45+
await entry._init(this.log);
4746

48-
await this.output.applyInputEntry(entry);
49-
}
50-
51-
for await (const converter of getConverters()) {
52-
await converter._init(this.input, this.output, this.log);
47+
await this.output.applyInputEntry(entry);
48+
}
5349

54-
await addAdditionalConverters(...await converter.convert());
55-
}
50+
for await (const converter of getConverters()) {
51+
await converter._init(this.input, this.output, this.log);
5652

57-
return await this.output.generate();
58-
} catch (err) {
59-
this.log.error(err.message);
60-
throw err;
53+
await addAdditionalConverters(...await converter.convert());
6154
}
55+
56+
return await this.output.generate();
6257
}
6358
}
6459

‎src/log/AbstractLog.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,6 @@ class AbstractLog {
3232
warn(log) {
3333

3434
}
35-
36-
/**
37-
* @param {string} log
38-
*
39-
* @abstract
40-
*/
41-
error(log) {
42-
43-
}
4435
}
4536

4637
export {AbstractLog};

‎src/log/ConsoleLog.js‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@ class ConsoleLog extends AbstractLog {
1717
warn(log) {
1818
console.warn(log);
1919
}
20-
21-
/**
22-
* @inheritDoc
23-
*/
24-
error(log) {
25-
console.error(log);
26-
}
2720
}
2821

2922
export {ConsoleLog};

‎src/log/SilentLog.js‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@ class SilentLog extends AbstractLog {
1717
warn(log) {
1818

1919
}
20-
21-
/**
22-
* @inheritDoc
23-
*/
24-
error(log) {
25-
26-
}
2720
}
2821

2922
export {SilentLog};

‎src/webapp/js/index.js‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ document.addEventListener("DOMContentLoaded", () => {
2121

2222
const worker = new Worker();
2323
worker.addEventListener("message", afterConvert);
24+
worker.addEventListener("error", errorConvert);
2425

2526
const logs = document.createElement("ul");
2627
logs.classList.add("log");
@@ -109,17 +110,6 @@ document.addEventListener("DOMContentLoaded", () => {
109110
// Allow select same file again
110111
selectInputFileButton.value = selectInputFolderButton.value = "";
111112

112-
if (err) {
113-
swal({
114-
title: "Conversion was failed",
115-
content: logs,
116-
icon: "error"
117-
});
118-
119-
_log("Conversion failed");
120-
return;
121-
}
122-
123113
const savePopup = swal({
124114
title: "Conversion was successfully",
125115
content: logs,
@@ -139,6 +129,21 @@ document.addEventListener("DOMContentLoaded", () => {
139129
}
140130
}
141131

132+
/**
133+
* @param {Error} err
134+
*/
135+
function errorConvert(err) {
136+
_log(`ERROR: ${err.message}`);
137+
138+
swal({
139+
title: "Conversion was failed",
140+
content: logs,
141+
icon: "error"
142+
});
143+
144+
_log("Conversion failed");
145+
}
146+
142147
/**
143148
* @param {string} log
144149
*/

‎src/webapp/js/worker.js‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import ConvertJavaTextureToBedrock, {AbstractLog, ArrayInput, FileInputEntry, FileOutput} from "./../..";
22

33
addEventListener("message", async (e) => {
4-
const files = e.data;
5-
6-
let output;
74
try {
8-
output = {
5+
const files = e.data;
6+
7+
const output = {
98
output: await new ConvertJavaTextureToBedrock(
109
new ArrayInput(Array.prototype.map.call(files, file => new FileInputEntry(file))),
1110
new FileOutput(),
@@ -23,21 +22,15 @@ addEventListener("message", async (e) => {
2322
warn(log) {
2423
this.log(`WARNING: ${log}`);
2524
}
26-
27-
/**
28-
* @inheritDoc
29-
*/
30-
error(log) {
31-
this.log(`ERROR: ${log}`);
32-
}
3325
}()
3426
).convert()
3527
};
28+
29+
postMessage(output);
3630
} catch (err) {
37-
output = {
38-
err: err.message,
39-
};
31+
// https://stackoverflow.com/questions/39992417/how-to-bubble-a-web-worker-error-in-a-promise-via-worker-onerror#answer-40081158
32+
setTimeout(() => {
33+
throw err;
34+
})
4035
}
41-
42-
postMessage(output);
4336
});

0 commit comments

Comments
 (0)