diff --git a/src/js/src/main/shared/LogReceiverReadyMessage.js b/src/js/src/main/shared/LogReceiverReadyMessage.js new file mode 100644 index 0000000..c2de2a3 --- /dev/null +++ b/src/js/src/main/shared/LogReceiverReadyMessage.js @@ -0,0 +1,8 @@ +import { SolitudeMessage } from "../../js/SolitudeMessage.js"; + +export class LogReceiverReadyMessage extends SolitudeMessage { + static TYPE = "log_receiver_ready"; + constructor() { + super(LogReceiverReadyMessage.TYPE); + } +} diff --git a/src/js/src/simplelog/app.html b/src/js/src/simplelog/app.html index 8cef661..c9fec96 100644 --- a/src/js/src/simplelog/app.html +++ b/src/js/src/simplelog/app.html @@ -6,7 +6,7 @@ - +
- +
diff --git a/src/js/src/simplelog/app.js b/src/js/src/simplelog/app.js index 14b309d..e8604a0 100644 --- a/src/js/src/simplelog/app.js +++ b/src/js/src/simplelog/app.js @@ -1,27 +1,25 @@ +import { LogMessage } from "./shared/LogMessage.js"; +import { LogReceiverReadyMessage } from "../main/shared/LogReceiverReadyMessage.js"; + (function () { - const sol = window.solitude || graftSolitude(window); + const sol = window.solitude || graftSolitude(window); - sol.message.addListener(receptLog); - sol.message.fire({ - type: "log_receiver_ready", - }); + sol.message.addListener(LogMessage.filter(receptLog)); + sol.message.fire(new LogReceiverReadyMessage()); + let count = 0 - function receptLog(sign) { - if (sign.type != "log") - return; - - if (sign.level) { - log("[" + sign.level + "]: " + sign.msg); - } else { - log(sign.message); - } - + function receptLog(message) { + if (message.level) { + log("[" + message.level + "]: " + message.msg); + } else { + log(message.message); } - let count = 0 - function log(stmt) { - const area = document.querySelector("#logarea2"); - area.value = area.value + count + ":" + stmt + "\n"; - count++; - } + } + + function log(stmt) { + const area = document.querySelector("#logarea2"); + area.value = area.value + count + ":" + stmt + "\n"; + count++; + } })() diff --git a/src/js/src/simplelog/shared/LogMessage.js b/src/js/src/simplelog/shared/LogMessage.js new file mode 100644 index 0000000..68bb892 --- /dev/null +++ b/src/js/src/simplelog/shared/LogMessage.js @@ -0,0 +1,12 @@ +import { SolitudeMessage } from "../../js/SolitudeMessage.js" +/** + * ログ出力メッセージ + */ +export class LogMessage extends SolitudeMessage { + static TYPE = "log"; + constructor(level, msg) { + super(LogMessage.TYPE); + this.level = level; + this.msg = msg; + } +} \ No newline at end of file