Skip to content

E
edex-ui

烟灰好 / edex-ui
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
E
edex-ui

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 590c6751 编写于 作者: G Gabriel SAILLARD (GitSquared)
浏览文件
操作

🔖 Release v2.2.2

上级 507a0880
隐藏空白更改
内联 并排
Showing with 43 addition and 34 deletion
README.md
浏览文件 @ 590c6751
......@@ -8,10 +8,10 @@
<a href="#featured-in"><img alt="undefined" src="https://img.shields.io/github/downloads/GitSquared/edex-ui/total.svg?style=popout"></a>
<a href="https://github.com/GitSquared/edex-ui/blob/master/LICENSE"><img alt="undefined" src="https://img.shields.io/github/license/GitSquared/edex-ui.svg?style=popout"></a>
<br>
<a href="https://github.com/GitSquared/edex-ui/releases/download/v2.2.1/eDEX-UI.Windows.Installer.exe" target="_blank"><img alt="undefined" src="https://badgen.net/badge//Windows/blue?icon=windows"></a>
<a href="https://github.com/GitSquared/edex-ui/releases/download/v2.2.1/eDEX-UI.MacOS.Image.dmg" target="_blank"><img alt="undefined" src="https://badgen.net/badge//macOS/grey?icon=apple"></a>
<a href="https://github.com/GitSquared/edex-ui/releases/download/v2.2.1/eDEX-UI.Linux.x86_64.AppImage" target="_blank"><img alt="undefined" src="https://badgen.net/badge//Linux64/orange?icon=terminal"></a>
<a href="https://github.com/GitSquared/edex-ui/releases/download/v2.2.1/eDEX-UI.Linux.i386.AppImage" target="_blank"><img alt="undefined" src="https://badgen.net/badge//Linux32/orange?icon=terminal"></a>
<a href="https://github.com/GitSquared/edex-ui/releases/download/v2.2.2/eDEX-UI.Windows.Installer.exe" target="_blank"><img alt="undefined" src="https://badgen.net/badge//Windows/blue?icon=windows"></a>
<a href="https://github.com/GitSquared/edex-ui/releases/download/v2.2.2/eDEX-UI.MacOS.Image.dmg" target="_blank"><img alt="undefined" src="https://badgen.net/badge//macOS/grey?icon=apple"></a>
<a href="https://github.com/GitSquared/edex-ui/releases/download/v2.2.2/eDEX-UI.Linux.x86_64.AppImage" target="_blank"><img alt="undefined" src="https://badgen.net/badge//Linux64/orange?icon=terminal"></a>
<a href="https://github.com/GitSquared/edex-ui/releases/download/v2.2.2/eDEX-UI.Linux.i386.AppImage" target="_blank"><img alt="undefined" src="https://badgen.net/badge//Linux32/orange?icon=terminal"></a>
<a href="https://aur.archlinux.org/packages/edex-ui" target="_blank"><img alt="undefined" src="https://badgen.net/badge/AUR/Package/cyan"></a>
<br><br><br>
</p>
......
package.json
浏览文件 @ 590c6751
{
"name": "edex-ui",
"productName": "eDEX-UI",
"version": "3.0.0-pre",
"version": "2.2.2",
"description": "A science fiction desktop running everywhere. Awesome.",
"keywords": [
"desktop",
......
src/classes/locationGlobe.class.js
浏览文件 @ 590c6751
......@@ -82,7 +82,7 @@ class LocationGlobe {
// Connections
this.conns = [];
this.addConn = ip => {
require("https").get({host: "ipinfo.now.sh", port: 443, path: "/"+ip, localAddress: window.mods.netstat.internalIPv4, agent: false}, res => {
require("https").get({host: "freegeoip.app", port: 443, path: "/json/"+ip, localAddress: window.mods.netstat.internalIPv4, agent: false}, res => {
let rawData = "";
res.on("data", chunk => {
rawData += chunk;
......@@ -135,9 +135,9 @@ class LocationGlobe {
async parseResponse(rawData, ip) {
const json = JSON.parse(rawData);
if (json.geo) {
const lat = Number(json.geo.latitude);
const lon = Number(json.geo.longitude);
if (json.latitude && json.longitude) {
const lat = Number(json.latitude);
const lon = Number(json.longitude);
window.mods.globe.conns.push({
ip,
......@@ -153,7 +153,7 @@ class LocationGlobe {
this.globe.addMarker(randomLat - 20, randomLong + 150, '', true);
}
addTemporaryConnectedMarker(ip) {
require("https").get({host: "ipinfo.now.sh", port: 443, path: "/"+ip, localAddress: window.mods.netstat.internalIPv4, agent: false}, res => {
require("https").get({host: "freegeoip.app", port: 443, path: "/json/"+ip, localAddress: window.mods.netstat.internalIPv4, agent: false}, res => {
let rawData = "";
res.on("data", chunk => {
rawData += chunk;
......@@ -165,9 +165,9 @@ class LocationGlobe {
} catch(e) {
return;
}
if (json.geo) {
const lat = Number(json.geo.latitude);
const lon = Number(json.geo.longitude);
if (json.latitude && json.longitude) {
const lat = Number(json.latitude);
const lon = Number(json.longitude);
window.mods.globe.conns.push({
ip,
......
src/classes/netstat.class.js
浏览文件 @ 590c6751
......@@ -86,19 +86,28 @@ class Netstat {
offline = true;
} else {
if (this.lastconn.finished) {
this.lastconn = require("https").get({host: "ipinfo.now.sh", port: 443, path: "/", localAddress: net.ip4, agent: this._httpsAgent}, res => {
this.lastconn = require("https").get({host: "freegeoip.app", port: 443, path: "/json/", localAddress: net.ip4, agent: this._httpsAgent}, res => {
let rawData = "";
res.on("data", chunk => {
rawData += chunk;
});
res.on("end", () => {
try {
this.ipinfo = JSON.parse(rawData);
if (!this.ipinfo.api_version.startsWith("3")) console.warn("Warning: ipinfo API version might not be compatible");
delete this.ipinfo.api_version;
delete this.ipinfo.time;
let data = JSON.parse(rawData);
this.ipinfo = {
ip: data.ip,
geo: {
latitude: data.latitude,
longitude: data.longitude,
metro_code: data.zip_code,
time_zone: data.time_zone
}
};
// if (!this.ipinfo.api_version.startsWith("3")) console.warn("Warning: ipinfo API version might not be compatible");
// delete this.ipinfo.api_version;
// delete this.ipinfo.time;
let ip = this.ipinfo.ip;
document.querySelector("#mod_netstat_innercontainer > div:nth-child(2) > h2").innerHTML = window._escapeHtml(ip);
} catch(e) {
......
src/package-lock.json
浏览文件 @ 590c6751
{
"name": "edex-ui",
"version": "3.0.0-pre",
"version": "2.2.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......@@ -230,9 +230,9 @@
"integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw=="
},
"nanoid": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.0.1.tgz",
"integrity": "sha512-k1u2uemjIGsn25zmujKnotgniC/gxQ9sdegdezeDiKdkDW56THUMqlz3urndKCXJxA6yPzSZbXx/QCMe/pxqsA=="
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.0.2.tgz",
"integrity": "sha512-X4yQ8VHoFvHcykGunT2Jxrsm1c4vH5UKtau7LLJYXO1istCRE3jD8JxDyGCzN+h7dpWBCvWaSYgloRuphKRqUQ=="
},
"nice-try": {
"version": "1.0.5",
......@@ -471,9 +471,9 @@
}
},
"systeminformation": {
"version": "4.4.1",
"resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.4.1.tgz",
"integrity": "sha512-rZhqXp8+Scjb7e9w68WwgiagHDrTU0hiIXHPb9eystJMymrSxC43ibtAps1afjyB+zymrdaa92z//9Nl6f9sDg=="
"version": "4.5.1",
"resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.5.1.tgz",
"integrity": "sha512-wfOt4eyrXOBdr67VOK4IXvpwiwdtvC/Fv8GhwoQslLD153OAuOinl50spIltDvIKiTaE24k9GScDiUVEA+/vpA=="
},
"tail": {
"version": "2.0.2",
......@@ -511,9 +511,9 @@
}
},
"xterm": {
"version": "3.13.0",
"resolved": "https://registry.npmjs.org/xterm/-/xterm-3.13.0.tgz",
"integrity": "sha512-FZVmvkkbkky3zldJ2NNOZ9h8jirtbGTlF4sIKMDrejR4wPsVZ3o4F++DQVkdeZqjAwtNOMoR17PMSOTZ+h070g=="
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/xterm/-/xterm-3.13.1.tgz",
"integrity": "sha512-QtQjqZ3JVgIQHK6cBKIGSHY36dNs15nQ5+w8i5Pxg5I6nYGyg5HJT79xZyLiZhOoIet00fUQvVXArrOM2R9WNw=="
}
}
}
src/package.json
浏览文件 @ 590c6751
{
"name": "edex-ui",
"productName": "eDEX-UI",
"version": "3.0.0-pre",
"version": "2.2.2",
"description": "eDEX-UI sci-fi interface",
"keywords": [
"desktop",
......@@ -25,16 +25,16 @@
"dependencies": {
"color": "3.1.1",
"howler": "2.1.2",
"nanoid": "2.0.1",
"nanoid": "2.0.2",
"node-pty": "0.8.1",
"pretty-bytes": "5.2.0",
"shell-env": "3.0.0",
"signale": "1.4.0",
"smoothie": "1.35.0",
"systeminformation": "4.4.1",
"systeminformation": "4.5.1",
"tail": "2.0.2",
"ws": "7.0.0",
"xterm": "3.13.0",
"xterm": "3.13.1",
"username": "5.0.0"
},
"optionalDependencies": {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或