Skip to content
This repository was archived by the owner on Oct 22, 2021. It is now read-only.

Commit 590c675

Browse files
GitSquaredGitSquared
committed
🔖 Release v2.2.2
1 parent 507a088 commit 590c675

File tree

6 files changed

+43
-34
lines changed

6 files changed

+43
-34
lines changed

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<a href="#featured-in"><img alt="undefined" src="https://img.shields.io/github/downloads/GitSquared/edex-ui/total.svg?style=popout"></a>
99
<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>
1010
<br>
11-
<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>
12-
<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>
13-
<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>
14-
<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>
11+
<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>
12+
<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>
13+
<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>
14+
<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>
1515
<a href="https://aur.archlinux.org/packages/edex-ui" target="_blank"><img alt="undefined" src="https://badgen.net/badge/AUR/Package/cyan"></a>
1616
<br><br><br>
1717
</p>

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "edex-ui",
33
"productName": "eDEX-UI",
4-
"version": "3.0.0-pre",
4+
"version": "2.2.2",
55
"description": "A science fiction desktop running everywhere. Awesome.",
66
"keywords": [
77
"desktop",

‎src/classes/locationGlobe.class.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class LocationGlobe {
8282
// Connections
8383
this.conns = [];
8484
this.addConn = ip => {
85-
require("https").get({host: "ipinfo.now.sh", port: 443, path: "/"+ip, localAddress: window.mods.netstat.internalIPv4, agent: false}, res => {
85+
require("https").get({host: "freegeoip.app", port: 443, path: "/json/"+ip, localAddress: window.mods.netstat.internalIPv4, agent: false}, res => {
8686
let rawData = "";
8787
res.on("data", chunk => {
8888
rawData += chunk;
@@ -135,9 +135,9 @@ class LocationGlobe {
135135

136136
async parseResponse(rawData, ip) {
137137
const json = JSON.parse(rawData);
138-
if (json.geo) {
139-
const lat = Number(json.geo.latitude);
140-
const lon = Number(json.geo.longitude);
138+
if (json.latitude && json.longitude) {
139+
const lat = Number(json.latitude);
140+
const lon = Number(json.longitude);
141141

142142
window.mods.globe.conns.push({
143143
ip,
@@ -153,7 +153,7 @@ class LocationGlobe {
153153
this.globe.addMarker(randomLat - 20, randomLong + 150, '', true);
154154
}
155155
addTemporaryConnectedMarker(ip) {
156-
require("https").get({host: "ipinfo.now.sh", port: 443, path: "/"+ip, localAddress: window.mods.netstat.internalIPv4, agent: false}, res => {
156+
require("https").get({host: "freegeoip.app", port: 443, path: "/json/"+ip, localAddress: window.mods.netstat.internalIPv4, agent: false}, res => {
157157
let rawData = "";
158158
res.on("data", chunk => {
159159
rawData += chunk;
@@ -165,9 +165,9 @@ class LocationGlobe {
165165
} catch(e) {
166166
return;
167167
}
168-
if (json.geo) {
169-
const lat = Number(json.geo.latitude);
170-
const lon = Number(json.geo.longitude);
168+
if (json.latitude && json.longitude) {
169+
const lat = Number(json.latitude);
170+
const lon = Number(json.longitude);
171171

172172
window.mods.globe.conns.push({
173173
ip,

‎src/classes/netstat.class.js

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,28 @@ class Netstat {
8686
offline = true;
8787
} else {
8888
if (this.lastconn.finished) {
89-
this.lastconn = require("https").get({host: "ipinfo.now.sh", port: 443, path: "/", localAddress: net.ip4, agent: this._httpsAgent}, res => {
89+
this.lastconn = require("https").get({host: "freegeoip.app", port: 443, path: "/json/", localAddress: net.ip4, agent: this._httpsAgent}, res => {
9090
let rawData = "";
9191
res.on("data", chunk => {
9292
rawData += chunk;
9393
});
9494
res.on("end", () => {
9595
try {
96-
this.ipinfo = JSON.parse(rawData);
97-
98-
if (!this.ipinfo.api_version.startsWith("3")) console.warn("Warning: ipinfo API version might not be compatible");
99-
100-
delete this.ipinfo.api_version;
101-
delete this.ipinfo.time;
96+
let data = JSON.parse(rawData);
97+
this.ipinfo = {
98+
ip: data.ip,
99+
geo: {
100+
latitude: data.latitude,
101+
longitude: data.longitude,
102+
metro_code: data.zip_code,
103+
time_zone: data.time_zone
104+
}
105+
};
106+
107+
// if (!this.ipinfo.api_version.startsWith("3")) console.warn("Warning: ipinfo API version might not be compatible");
108+
109+
// delete this.ipinfo.api_version;
110+
// delete this.ipinfo.time;
102111
let ip = this.ipinfo.ip;
103112
document.querySelector("#mod_netstat_innercontainer > div:nth-child(2) > h2").innerHTML = window._escapeHtml(ip);
104113
} catch(e) {

‎src/package-lock.json

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "edex-ui",
33
"productName": "eDEX-UI",
4-
"version": "3.0.0-pre",
4+
"version": "2.2.2",
55
"description": "eDEX-UI sci-fi interface",
66
"keywords": [
77
"desktop",
@@ -25,16 +25,16 @@
2525
"dependencies": {
2626
"color": "3.1.1",
2727
"howler": "2.1.2",
28-
"nanoid": "2.0.1",
28+
"nanoid": "2.0.2",
2929
"node-pty": "0.8.1",
3030
"pretty-bytes": "5.2.0",
3131
"shell-env": "3.0.0",
3232
"signale": "1.4.0",
3333
"smoothie": "1.35.0",
34-
"systeminformation": "4.4.1",
34+
"systeminformation": "4.5.1",
3535
"tail": "2.0.2",
3636
"ws": "7.0.0",
37-
"xterm": "3.13.0",
37+
"xterm": "3.13.1",
3838
"username": "5.0.0"
3939
},
4040
"optionalDependencies": {

0 commit comments

Comments
 (0)