jasder
/
comNG
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user terser to compress js

This commit is contained in:
Xen 2020-05-16 17:59:30 +08:00
parent 7a66e49ac3
commit 51eacb3984
6 changed files with 579 additions and 554 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -87,3 +87,6 @@ typings/
# Electron-Forge
out/
# terser map
*.map

11
package.json
View File

@ -6,6 +6,7 @@
"repository": "https://github.com/xenkuo/comNG",
"main": "src/main.js",
"scripts": {
"prestart": "terser src/base.js src/editor.js src/serialport.js --source-map -o src/index.js -c -m toplevel",
"start": "electron-forge start",
"rebuild": "electron-rebuild -f -w serialport",
"package": "electron-forge package",
@ -22,11 +23,12 @@
"config": {
"forge": {
"packagerConfig": {
"asar": true,
"asar": false,
"ignore": [
"node_modules/monaco-editor/(dev|esm|min-maps|monaco.d.ts)",
"node_modules/materialize-css/(extras|js|sass)",
"node_modules/material-design-icons/(?!iconfont)"
"node_modules/material-design-icons/(?!iconfont)",
"src/(base|editor|serialport).js"
],
"icon": "image/logo"
},
@ -97,6 +99,7 @@
"@electron-forge/publisher-github": "^6.0.0-beta.50",
"electron": "7.1.11",
"electron-rebuild": "^1.10.0",
"eslint": "^6.8.0"
"eslint": "^6.8.0",
"terser": "^4.6.13"
}
}
}

548
src/base.js Executable file
View File

@ -0,0 +1,548 @@
/* eslint-disable no-unused-vars */
/* eslint-disable no-undef */
const { remote, shell, ipcRenderer, clipboard } = require("electron");
const Store = require("electron-store");
const appVersion = remote.app.getVersion();
const appUpdaterUrl =
"https://gitee.com/api/v5/repos/xenkuo/comNG/releases/latest";
var M = require("materialize-css");
M.AutoInit();
var config;
var barHeight;
var menuHeight;
const store = new Store({
projectVersion: appVersion,
migrations: {
"1.0.3": (store) => {
store.delete("desert");
store.delete("about");
store.set("window.width", 600);
store.set("window.height", 640);
store.set("window.widthBefore", 600);
store.set("window.heightBefore", 640);
store.set("window.xBefore", 0);
store.set("window.yBefore", 0);
store.set("menu.hidden", true);
store.set("menu.tab", "general");
store.set("baudIndex", 2);
store.set("pathIndex", 0);
store.set("general.hexmode", false);
store.set("general.timestamp", false);
store.set("general.customized", 9600);
store.set("general.databitsIndex", 0);
store.set("general.parityIndex", 0);
store.set("general.stopbitsIndex", 0);
store.set("general.flowcontrolIndex", 0);
store.set("transmit.eof", "\r\n");
store.set("advance.sign.switch", false);
store.set("advance.sign.name", "");
store.set("advance.breakpoint.switch", false);
store.set("advance.breakpoint.onText", "Error");
store.set("advance.breakpoint.afterLines", 5);
store.set("advance.barColor.head", "#fafafa");
store.set("advance.barColor.middle", "#fafafa");
store.set("advance.barColor.tail", "#26a69a");
},
"1.0.4": (store) => {
store.set("general.modemSignal", false);
store.set(
"general.fontFamily",
"Consolas, 'SF Mono', Menlo, 'Lucida Console', 'Courier New', monospace"
);
store.set("general.fontSize", 12);
},
},
});
function configUpdate(key, value) {
let keyArray = key.split(".");
if (keyArray.length === 1) {
config[keyArray[0]] = value;
} else if (keyArray.length === 2) {
config[keyArray[0]][keyArray[1]] = value;
} else if (keyArray.length === 3) {
config[keyArray[0]][keyArray[1]][keyArray[2]] = value;
} else {
console.error("config key structure error");
}
store.set(key, value);
}
ipcRenderer.on("main-cmd", (event, arg) => {
console.log(arg);
switch (arg) {
case "Clear": {
let text = editor.getModel().getValue();
clipboard.writeText(text);
editor.getModel().setValue("");
break;
}
case "Switch":
document.getElementById("port-switch").click();
break;
case "ClearSwitch":
{
let switcher = document.getElementById("port-switch");
switcher.click();
if (true == switcher.checked) {
let text = editor.getModel().getValue();
clipboard.writeText(text);
editor.getModel().setValue("");
}
}
break;
case "Open":
openFile();
break;
case "Save":
saveToFile();
break;
default:
console.log("Unknown cmds");
break;
}
});
window.onload = () => {
config = store.store;
document.getElementById("menu-area").hidden = config.menu.hidden;
barHeight = getComputedStyle(document.documentElement)
.getPropertyValue("--bar-height")
.trim()
.split("px")[0];
barHeight = parseInt(barHeight);
menuHeight = getComputedStyle(document.documentElement)
.getPropertyValue("--menu-height")
.trim()
.split("px")[0];
menuHeight = parseInt(menuHeight);
let nav = document.getElementById("nav-area");
let bar = document.getElementById("bar-area");
let menu = document.getElementById("menu-area");
let editor = document.getElementById("editor-area");
editor.style.height =
window.innerHeight -
nav.offsetHeight -
bar.offsetHeight -
menu.offsetHeight +
"px";
M.Tabs.getInstance(document.getElementById("menu-tabs")).select(
config.menu.tab
);
let baudSelect = document.getElementById("baud-select");
baudSelect.options[0].text = config.general.customized;
baudSelect.selectedIndex = config.baudIndex;
M.FormSelect.init(baudSelect);
portUpdate();
document.getElementById("hexmode-switch").checked = config.general.hexmode;
document.getElementById("timestamp-switch").checked =
config.general.timestamp;
document.getElementById("modem-signal-switch").checked =
config.general.modemSignal;
if (config.general.modemSignal === true) {
document.getElementById("modem-signal-bar").hidden = false;
} else {
document.getElementById("modem-signal-bar").hidden = true;
}
document.getElementById("customized").value = config.general.customized;
let databits = document.getElementById("databits-select");
databits.selectedIndex = config.general.databitsIndex;
M.FormSelect.init(databits);
let parity = document.getElementById("parity-select");
parity.selectedIndex = config.general.parityIndex;
M.FormSelect.init(parity);
let stopbits = document.getElementById("stopbits-select");
stopbits.selectedIndex = config.general.stopbitsIndex;
M.FormSelect.init(stopbits);
let flowcontrol = document.getElementById("flowcontrol-select");
flowcontrol.selectedIndex = config.general.flowcontrolIndex;
M.FormSelect.init(flowcontrol);
document.getElementById("editor-font-family").value =
config.general.fontFamily;
document.getElementById("editor-font-size").value = config.general.fontSize;
document.getElementById("breakpoint-switch").checked =
config.advance.breakpoint.switch;
document.getElementById("breakpoint-on-text").value =
config.advance.breakpoint.onText;
document.getElementById("breakpoint-after-lines").value =
config.advance.breakpoint.afterLines;
document.getElementById("sign-switch").checked = config.advance.sign.switch;
document.getElementById("sign-name").value = config.advance.sign.name;
document.getElementById("bar-color-head").value =
config.advance.barColor.head;
document.getElementById("bar-color-middle").value =
config.advance.barColor.middle;
document.getElementById("bar-color-tail").value =
config.advance.barColor.tail;
document.documentElement.style.setProperty(
"--bar-color-head",
config.advance.barColor.head
);
document.documentElement.style.setProperty(
"--bar-color-middle",
config.advance.barColor.middle
);
document.documentElement.style.setProperty(
"--bar-color-tail",
config.advance.barColor.tail
);
document.getElementById("app-version").innerHTML = appVersion;
console.log("Current Version: ", appVersion);
fetch(appUpdaterUrl)
.then((data) => {
return data.json();
})
.then((res) => {
let latest = res.tag_name.split("v")[1];
if (latest !== appVersion) {
const dialogOpts = {
type: "info",
buttons: ["Download Now", "Later"],
message: "Version: " + latest + " released!",
detail: res.body,
};
dialog.showMessageBox(dialogOpts).then((returnValue) => {
if (returnValue.response === 0)
shell.openExternal(res.assets[0].browser_download_url);
});
}
});
};
window.onresize = () => {
configUpdate("window.width", window.innerWidth);
configUpdate("window.height", window.innerHeight);
let nav = document.getElementById("nav-area");
let bar = document.getElementById("bar-area");
let menu = document.getElementById("menu-area");
let editor = document.getElementById("editor-area");
editor.style.height =
window.innerHeight -
nav.offsetHeight -
bar.offsetHeight -
menu.offsetHeight +
"px";
};
document.onkeydown = function (e) {
e = e || window.event;
switch (e.which || e.keyCode) {
case 13:
console.log("hello world 13");
if (document.activeElement.id === "trans-data") {
document.getElementById("trans-send-btn").click();
}
break;
default:
console.log("unknown event");
break;
}
};
// prevent text select for double click action
document.getElementById("nav-area").onmousedown = () => {
return false;
};
document.getElementById("nav-area").ondblclick = () => {
if (
window.innerWidth === screen.width ||
window.innerHeight === screen.height
) {
window.resizeTo(config.window.widthBefore, config.window.heightBefore);
window.moveTo(config.window.xBefore, config.window.yBefore);
} else {
configUpdate("window.widthBefore", window.innerWidth);
configUpdate("window.heightBefore", window.innerHeight);
configUpdate("window.xBefore", window.screenX);
configUpdate("window.yBefore", window.screenY);
window.resizeTo(screen.width, screen.height);
window.moveTo(0, 0);
}
};
document.getElementById("logo").onclick = () => {
shell.openExternal("https://github.com/xenkuo/comNG");
};
document.getElementById("min-btn").onclick = () => {
remote.getCurrentWindow().minimize();
};
document.getElementById("max-btn").onclick = () => {
configUpdate("window.widthBefore", window.innerWidth);
configUpdate("window.heightBefore", window.innerHeight);
configUpdate("window.xBefore", window.screenX);
configUpdate("window.yBefore", window.screenY);
window.resizeTo(screen.width, screen.height);
window.moveTo(0, 0);
};
document.getElementById("close-btn").onclick = () => {
window.close();
};
document.getElementById("menu-btn").onclick = () => {
let menu = document.getElementById("menu-area");
let editor = document.getElementById("editor-area");
if (menu.hidden === true) {
editor.style.height = editor.offsetHeight - menuHeight + "px";
menu.hidden = false;
configUpdate("menu.hidden", false);
} else {
editor.style.height = editor.offsetHeight + menuHeight + "px";
menu.hidden = true;
configUpdate("menu.hidden", true);
}
};
document.body.onclick = (e) => {
// don't process fake click
if (e.isTrusted === false) return;
// don't process when click on menu-btn
if (e.target.parentNode.id === "menu-btn") return;
// don't process when we are in Transmit tab
if (document.getElementById("menu-tabs").M_Tabs.index === 1) return;
let pos = e.clientY;
let range = document.body.offsetHeight;
if (pos > range - barHeight || pos < range - barHeight - menuHeight) {
let menu = document.getElementById("menu-area");
let editor = document.getElementById("editor-area");
if (menu.hidden === false) {
editor.style.height = editor.offsetHeight + menuHeight + "px";
menu.hidden = true;
configUpdate("menu.hidden", true);
}
}
};
document.getElementById("menu-tabs").onclick = () => {
let tabs = M.Tabs.getInstance(document.getElementById("menu-tabs"));
configUpdate("menu.tab", tabs.$content[0].id);
};
document.getElementById("hexmode-switch").onclick = (e) => {
configUpdate("general.hexmode", e.target.checked);
};
document.getElementById("timestamp-switch").onclick = (e) => {
configUpdate("general.timestamp", e.target.checked);
};
document.getElementById("modem-signal-switch").onclick = (e) => {
let state = e.target.checked;
configUpdate("general.modemSignal", state);
if (state === true) {
document.getElementById("modem-signal-bar").hidden = false;
} else {
document.getElementById("modem-signal-bar").hidden = true;
}
};
document.getElementById("customized").onblur = (e) => {
let customized = parseInt(e.target.value);
if (isNaN(customized) === true) customized = 9600;
configUpdate("general.customized", customized);
let baudSelect = document.getElementById("baud-select");
baudSelect.options[0].text = customized;
M.FormSelect.init(baudSelect);
};
document.getElementById("databits-select").onchange = (e) => {
configUpdate("general.databitsIndex", e.target.selectedIndex);
};
document.getElementById("parity-select").onchange = (e) => {
configUpdate("general.parityIndex", e.target.selectedIndex);
};
document.getElementById("stopbits-select").onchange = (e) => {
configUpdate("general.stopbitsIndex", e.target.selectedIndex);
};
document.getElementById("flowcontrol-select").onchange = (e) => {
configUpdate("general.flowcontrolIndex", e.target.selectedIndex);
};
document.getElementById("sign-switch").onclick = (e) => {
configUpdate("advance.sign.switch", e.target.checked);
};
document.getElementById("sign-name").onblur = (e) => {
configUpdate("advance.sign.name", e.target.value);
};
let transRepeatTimer = undefined;
document.getElementById("trans-eof-select").onchange = (e) => {
let index = e.target.selectedIndex;
let eof = "\r\n";
switch (index) {
case 1:
eof = "\r";
break;
case 2:
eof = "\n";
break;
default:
break;
}
configUpdate("transmit.eof", eof);
};
// document.getElementById('trans-clear-btn').onclick = () => {
// document.getElementById('trans-data').value = ''
// }
document.getElementById("trans-send-btn").onclick = () => {
const p = document.getElementById("trans-log-area");
let data = document.getElementById("trans-data").value;
// if (data.trim() === "") return;
data.trim();
data += config.transmit.eof;
if (serialWrite(data) === false) return;
p.value += "\n" + document.getElementById("trans-data").value;
M.updateTextFields(p);
M.textareaAutoResize(p);
p.scrollTop = p.scrollHeight;
if (document.getElementById("trans-repeat-switch").checked === true) {
if (transRepeatTimer !== undefined) clearInterval(transRepeatTimer);
let interval = document.getElementById("trans-repeat-interval").value;
interval = parseInt(interval);
if (isNaN(interval) === true) interval = 1000;
transRepeatTimer = setInterval(() => {
serialWrite(data);
}, interval);
}
};
document.getElementById("trans-repeat-switch").onchange = (e) => {
let checked = e.target.checked;
if (checked === false && transRepeatTimer !== undefined)
clearInterval(transRepeatTimer);
};
document.getElementById("trans-log-btn").onclick = () => {
let p = document.getElementById("trans-log-area");
p.value = "";
M.updateTextFields(p);
M.textareaAutoResize(p);
};
document.getElementById("bar-color-head").oninput = (e) => {
let color = e.target.value;
document.documentElement.style.setProperty("--bar-color-head", color);
configUpdate("advance.barColor.head", color);
};
document.getElementById("bar-color-middle").oninput = (e) => {
let color = e.target.value;
document.documentElement.style.setProperty("--bar-color-middle", color);
configUpdate("advance.barColor.middle", color);
};
document.getElementById("bar-color-tail").oninput = (e) => {
let color = e.target.value;
document.documentElement.style.setProperty("--bar-color-tail", color);
configUpdate("advance.barColor.tail", color);
};
document.getElementById("issue").onclick = (e) => {
console.log("licence click", e);
e.preventDefault();
shell.openExternal(e.target.href);
};
document.getElementById("introduction").onclick = (e) => {
console.log("licence click", e);
e.preventDefault();
shell.openExternal(e.target.href);
};
document.getElementById("comnglang").onclick = (e) => {
console.log("licence click", e);
e.preventDefault();
shell.openExternal(e.target.href);
};
document.getElementById("baud-select").onchange = (e) => {
configUpdate("baudIndex", e.target.selectedIndex);
};
// document.getElementById("path-input").addEventListener(
// "click",
// e => {
// console.log("path select add event");
// if (e.isTrusted === false) return;
// console.log("path x");
// e.stopPropagation();
// // portUpdate();
// setTimeout(() => {
// try {
// let evt = document.createEvent("Event");
// evt.initEvent("click", true, true);
// document.getElementById("path-select").dispatchEvent(evt);
// } catch (e) {
// console.error(e);
// }
// }, 5000);
// },
// true
// );
document.getElementById("path-select").onchange = (e) => {
configUpdate("pathIndex", e.target.selectedIndex);
};
document.getElementById("refresh-btn").onclick = portUpdate;

3
src/index.html
View File

@ -451,9 +451,10 @@
</div>
<!-- You can also require other files to run in this process -->
<script src="editor.js"></script>
<!-- <script src="editor.js"></script>
<script src="serialport.js"></script>
<script src="base.js"></script> -->
<script src="index.js"></script>
</body>
</html>

549
src/index.js Executable file → Normal file
View File

File diff suppressed because one or more lines are too long

19
yarn.lock
View File

@ -3606,7 +3606,15 @@ source-map-support@^0.5.13:
buffer-from "^1.0.0"
source-map "^0.6.0"
source-map@^0.6.0:
source-map-support@~0.5.12:
version "0.5.19"
resolved "https://registry.npm.taobao.org/source-map-support/download/source-map-support-0.5.19.tgz?cache=0&sync_timestamp=1587719493563&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map-support%2Fdownload%2Fsource-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
integrity sha1-qYti+G3K9PZzmWSMCFKRq56P7WE=
dependencies:
buffer-from "^1.0.0"
source-map "^0.6.0"
source-map@^0.6.0, source-map@~0.6.1:
version "0.6.1"
resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM=
@ -3874,6 +3882,15 @@ temp@^0.9.0:
dependencies:
rimraf "~2.6.2"
terser@^4.6.13:
version "4.6.13"
resolved "https://registry.npm.taobao.org/terser/download/terser-4.6.13.tgz#e879a7364a5e0db52ba4891ecde007422c56a916"
integrity sha1-6HmnNkpeDbUrpIkezeAHQixWqRY=
dependencies:
commander "^2.20.0"
source-map "~0.6.1"
source-map-support "~0.5.12"
text-table@^0.2.0:
version "0.2.0"
resolved "https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"