Ping sensor, fixes #72#539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ewired wants to merge 1 commit into
base:develop
Choose a base branch
from
Draft

Ping sensor, fixes #72 #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion extension.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ var VitalsMenuButton = GObject.registerClass({
'network' : { 'icon': 'network-symbolic.svg',
'icon-rx': 'network-download-symbolic.svg',
'icon-tx': 'network-upload-symbolic.svg',
'icon-ping': 'network-ping-symbolic.svg',
'icon-ad': '../flags/1x1/ad.svg',
'icon-ae': '../flags/1x1/ae.svg',
'icon-af': '../flags/1x1/af.svg',
Expand DownExpand Up@@ -335,7 +336,8 @@ var VitalsMenuButton = GObject.registerClass({
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];
'include-static-info', 'include-static-gpu-info',
'network-ping-host' ];

for (let setting of Object.values(settings))
this._addSettingChangedSignal(setting, this._redrawMenu.bind(this));
Expand Down
8 changes: 8 additions & 0 deletions icons/gnome/network-ping-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/original/network-ping-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions prefs.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,24 @@ const Settings = new GObject.Class({
this._settings.bind('network-public-ip-interval', this.builder.get_object('network-public-ip-interval'),
'value', Gio.SettingsBindFlags.DEFAULT);

let pingHostEntry = this.builder.get_object('network-ping-host');
let pingHostSave = this.builder.get_object('network-ping-host-save');
let getSavedPingHost = () => this._settings.get_string('network-ping-host');
let savePingHost = () => {
if (pingHostEntry.get_text() === getSavedPingHost())
return;

this._settings.set_string('network-ping-host', pingHostEntry.get_text());
pingHostSave.set_sensitive(false);
};

pingHostEntry.set_text(getSavedPingHost());
pingHostEntry.connect('changed', (widget) => {
pingHostSave.set_sensitive(widget.get_text() !== getSavedPingHost());
});
pingHostEntry.connect('activate', () => savePingHost());
pingHostSave.connect('clicked', () => savePingHost());

// process individual text entry sensor preferences
sensors = [ 'storage-path', 'monitor-cmd' ];
for (let key in sensors) {
Expand Down
41 changes: 41 additions & 0 deletions prefs.ui
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,47 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="hexpand">1</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">1</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Ping host</property>
</object>
</child>
<child>
<object class="GtkEntry" id="network-ping-host">
<property name="placeholder_text" translatable="no">e.g. 1.1.1.1</property>
<property name="can_focus">1</property>
<property name="editable">1</property>
<property name="width_chars">18</property>
</object>
</child>
<child>
<object class="GtkButton" id="network-ping-host-save">
<property name="can_focus">1</property>
<property name="sensitive">0</property>
<property name="tooltip_text" translatable="yes">Save ping host</property>
<property name="icon_name">object-select-symbolic</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand Down
Binary file modifiedschemas/gschemas.compiled
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="s" name="network-ping-host">
<default>""</default>
<summary>Ping target host</summary>
<description>Hostname or IP address to ping for latency measurement</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand Down
63 changes: 63 additions & 0 deletions sensors.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import * as SubProcessModule from './helpers/subprocess.js';
import Gio from 'gi://Gio';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
import NM from 'gi://NM';
Expand All@@ -46,6 +47,8 @@ export const Sensors = GObject.registerClass({
this._settings = settings;
this._sensorIcons = sensorIcons;

this._pingCancellable = null;

this.resetHistory();

this._last_processor = { 'core': {}, 'speed': [] };
Expand All@@ -54,6 +57,7 @@ export const Sensors = GObject.registerClass({
this._addSettingChangedSignal('show-gpu', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('update-time', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('network-public-ip-interval', () => {this._lastPublicIPCheck = 0;});
this._addSettingChangedSignal('network-ping-host', () => this._pingCancellable?.cancel());
//this._addSettingChangedSignal('include-static-gpu-info', this._reconfigureNvidiaSmiProcess.bind(this));

this._gpu_drm_vendors = null;
Expand DownExpand Up@@ -338,6 +342,63 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'WiFi Signal Level', signal, 'network', 'string');
}
}).catch(err => { });

this._pollPing(value => {
this._returnValue(callback, 'Ping', value, 'network-ping', 'string');
});
}

_pollPing(callback) {
let host = this._settings.get_string('network-ping-host').trim();
if (!host) return;

this._pingCancellable?.cancel();
this._pingCancellable = new Gio.Cancellable();
let cancellable = this._pingCancellable;

let subprocess;
try {
subprocess = new Gio.Subprocess({
argv: ['ping', '-c', '1', '-W', '5', host],
flags: Gio.SubprocessFlags.STDOUT_PIPE |
Gio.SubprocessFlags.STDERR_PIPE,
});
subprocess.init(null);
} catch (e) {
callback('?? ms');
return;
}

cancellable.connect(() => subprocess.force_exit());

subprocess.communicate_utf8_async(null, cancellable, (proc, result) => {
let value = this._parsePingResult(proc, result, cancellable);
callback(value);
});
}

_parsePingResult(proc, result, cancellable) {
let stdout, exitStatus;
try {
[, stdout] = proc.communicate_utf8_finish(result);
exitStatus = proc.get_exit_status();
} catch (e) {
let cancelled = cancellable.is_cancelled();
return cancelled ? this._pingTimeoutLabel() : '?? ms';
}

if (exitStatus === 0 && stdout) {
let match = /time[=<]([\d.]+)\s*ms/.exec(stdout);
if (match)
return `${parseFloat(match[1]).toFixed(1)} ms`;
}

return exitStatus === 1 ? this._pingTimeoutLabel() : '?? ms';
}

_pingTimeoutLabel() {
let timeoutMs = Math.min(Math.max(this._settings.get_int('update-time'), 1), 5) * 1000;
return `${timeoutMs}+ ms`;
}

_queryStorage(callback, dwell) {
Expand DownExpand Up@@ -1066,11 +1127,13 @@ export const Sensors = GObject.registerClass({
this._frameMonitorLastTime = 0;
this._frameMonitorFrameCount = 0;
this._frameMonitorAccTime = 0;
this._pingCancellable?.cancel();
}

destroy() {
this._destroyFrameMonitor();
this._terminateNvidiaSmiProcess();
this._pingCancellable?.cancel();

for (let signal of Object.values(this._settingChangedSignals))
this._settings.disconnect(signal);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Ping sensor, fixes #72#539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ewired wants to merge 1 commit into
base:develop
Choose a base branch
from
Draft

Ping sensor, fixes #72 #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion extension.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ var VitalsMenuButton = GObject.registerClass({
'network' : { 'icon': 'network-symbolic.svg',
'icon-rx': 'network-download-symbolic.svg',
'icon-tx': 'network-upload-symbolic.svg',
'icon-ping': 'network-ping-symbolic.svg',
'icon-ad': '../flags/1x1/ad.svg',
'icon-ae': '../flags/1x1/ae.svg',
'icon-af': '../flags/1x1/af.svg',
Expand DownExpand Up@@ -335,7 +336,8 @@ var VitalsMenuButton = GObject.registerClass({
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];
'include-static-info', 'include-static-gpu-info',
'network-ping-host' ];

for (let setting of Object.values(settings))
this._addSettingChangedSignal(setting, this._redrawMenu.bind(this));
Expand Down
8 changes: 8 additions & 0 deletions icons/gnome/network-ping-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/original/network-ping-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions prefs.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,24 @@ const Settings = new GObject.Class({
this._settings.bind('network-public-ip-interval', this.builder.get_object('network-public-ip-interval'),
'value', Gio.SettingsBindFlags.DEFAULT);

let pingHostEntry = this.builder.get_object('network-ping-host');
let pingHostSave = this.builder.get_object('network-ping-host-save');
let getSavedPingHost = () => this._settings.get_string('network-ping-host');
let savePingHost = () => {
if (pingHostEntry.get_text() === getSavedPingHost())
return;

this._settings.set_string('network-ping-host', pingHostEntry.get_text());
pingHostSave.set_sensitive(false);
};

pingHostEntry.set_text(getSavedPingHost());
pingHostEntry.connect('changed', (widget) => {
pingHostSave.set_sensitive(widget.get_text() !== getSavedPingHost());
});
pingHostEntry.connect('activate', () => savePingHost());
pingHostSave.connect('clicked', () => savePingHost());

// process individual text entry sensor preferences
sensors = [ 'storage-path', 'monitor-cmd' ];
for (let key in sensors) {
Expand Down
41 changes: 41 additions & 0 deletions prefs.ui
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,47 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="hexpand">1</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">1</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Ping host</property>
</object>
</child>
<child>
<object class="GtkEntry" id="network-ping-host">
<property name="placeholder_text" translatable="no">e.g. 1.1.1.1</property>
<property name="can_focus">1</property>
<property name="editable">1</property>
<property name="width_chars">18</property>
</object>
</child>
<child>
<object class="GtkButton" id="network-ping-host-save">
<property name="can_focus">1</property>
<property name="sensitive">0</property>
<property name="tooltip_text" translatable="yes">Save ping host</property>
<property name="icon_name">object-select-symbolic</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand Down
Binary file modifiedschemas/gschemas.compiled
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="s" name="network-ping-host">
<default>""</default>
<summary>Ping target host</summary>
<description>Hostname or IP address to ping for latency measurement</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand Down
63 changes: 63 additions & 0 deletions sensors.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import * as SubProcessModule from './helpers/subprocess.js';
import Gio from 'gi://Gio';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
import NM from 'gi://NM';
Expand All@@ -46,6 +47,8 @@ export const Sensors = GObject.registerClass({
this._settings = settings;
this._sensorIcons = sensorIcons;

this._pingCancellable = null;

this.resetHistory();

this._last_processor = { 'core': {}, 'speed': [] };
Expand All@@ -54,6 +57,7 @@ export const Sensors = GObject.registerClass({
this._addSettingChangedSignal('show-gpu', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('update-time', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('network-public-ip-interval', () => {this._lastPublicIPCheck = 0;});
this._addSettingChangedSignal('network-ping-host', () => this._pingCancellable?.cancel());
//this._addSettingChangedSignal('include-static-gpu-info', this._reconfigureNvidiaSmiProcess.bind(this));

this._gpu_drm_vendors = null;
Expand DownExpand Up@@ -338,6 +342,63 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'WiFi Signal Level', signal, 'network', 'string');
}
}).catch(err => { });

this._pollPing(value => {
this._returnValue(callback, 'Ping', value, 'network-ping', 'string');
});
}

_pollPing(callback) {
let host = this._settings.get_string('network-ping-host').trim();
if (!host) return;

this._pingCancellable?.cancel();
this._pingCancellable = new Gio.Cancellable();
let cancellable = this._pingCancellable;

let subprocess;
try {
subprocess = new Gio.Subprocess({
argv: ['ping', '-c', '1', '-W', '5', host],
flags: Gio.SubprocessFlags.STDOUT_PIPE |
Gio.SubprocessFlags.STDERR_PIPE,
});
subprocess.init(null);
} catch (e) {
callback('?? ms');
return;
}

cancellable.connect(() => subprocess.force_exit());

subprocess.communicate_utf8_async(null, cancellable, (proc, result) => {
let value = this._parsePingResult(proc, result, cancellable);
callback(value);
});
}

_parsePingResult(proc, result, cancellable) {
let stdout, exitStatus;
try {
[, stdout] = proc.communicate_utf8_finish(result);
exitStatus = proc.get_exit_status();
} catch (e) {
let cancelled = cancellable.is_cancelled();
return cancelled ? this._pingTimeoutLabel() : '?? ms';
}

if (exitStatus === 0 && stdout) {
let match = /time[=<]([\d.]+)\s*ms/.exec(stdout);
if (match)
return `${parseFloat(match[1]).toFixed(1)} ms`;
}

return exitStatus === 1 ? this._pingTimeoutLabel() : '?? ms';
}

_pingTimeoutLabel() {
let timeoutMs = Math.min(Math.max(this._settings.get_int('update-time'), 1), 5) * 1000;
return `${timeoutMs}+ ms`;
}

_queryStorage(callback, dwell) {
Expand DownExpand Up@@ -1066,11 +1127,13 @@ export const Sensors = GObject.registerClass({
this._frameMonitorLastTime = 0;
this._frameMonitorFrameCount = 0;
this._frameMonitorAccTime = 0;
this._pingCancellable?.cancel();
}

destroy() {
this._destroyFrameMonitor();
this._terminateNvidiaSmiProcess();
this._pingCancellable?.cancel();

for (let signal of Object.values(this._settingChangedSignals))
this._settings.disconnect(signal);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Ping sensor, fixes #72#539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ewired wants to merge 1 commit into
base:develop
Choose a base branch
from
Draft

Ping sensor, fixes #72 #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion extension.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ var VitalsMenuButton = GObject.registerClass({
'network' : { 'icon': 'network-symbolic.svg',
'icon-rx': 'network-download-symbolic.svg',
'icon-tx': 'network-upload-symbolic.svg',
'icon-ping': 'network-ping-symbolic.svg',
'icon-ad': '../flags/1x1/ad.svg',
'icon-ae': '../flags/1x1/ae.svg',
'icon-af': '../flags/1x1/af.svg',
Expand DownExpand Up@@ -335,7 +336,8 @@ var VitalsMenuButton = GObject.registerClass({
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];
'include-static-info', 'include-static-gpu-info',
'network-ping-host' ];

for (let setting of Object.values(settings))
this._addSettingChangedSignal(setting, this._redrawMenu.bind(this));
Expand Down
8 changes: 8 additions & 0 deletions icons/gnome/network-ping-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/original/network-ping-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions prefs.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,24 @@ const Settings = new GObject.Class({
this._settings.bind('network-public-ip-interval', this.builder.get_object('network-public-ip-interval'),
'value', Gio.SettingsBindFlags.DEFAULT);

let pingHostEntry = this.builder.get_object('network-ping-host');
let pingHostSave = this.builder.get_object('network-ping-host-save');
let getSavedPingHost = () => this._settings.get_string('network-ping-host');
let savePingHost = () => {
if (pingHostEntry.get_text() === getSavedPingHost())
return;

this._settings.set_string('network-ping-host', pingHostEntry.get_text());
pingHostSave.set_sensitive(false);
};

pingHostEntry.set_text(getSavedPingHost());
pingHostEntry.connect('changed', (widget) => {
pingHostSave.set_sensitive(widget.get_text() !== getSavedPingHost());
});
pingHostEntry.connect('activate', () => savePingHost());
pingHostSave.connect('clicked', () => savePingHost());

// process individual text entry sensor preferences
sensors = [ 'storage-path', 'monitor-cmd' ];
for (let key in sensors) {
Expand Down
41 changes: 41 additions & 0 deletions prefs.ui
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,47 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="hexpand">1</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">1</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Ping host</property>
</object>
</child>
<child>
<object class="GtkEntry" id="network-ping-host">
<property name="placeholder_text" translatable="no">e.g. 1.1.1.1</property>
<property name="can_focus">1</property>
<property name="editable">1</property>
<property name="width_chars">18</property>
</object>
</child>
<child>
<object class="GtkButton" id="network-ping-host-save">
<property name="can_focus">1</property>
<property name="sensitive">0</property>
<property name="tooltip_text" translatable="yes">Save ping host</property>
<property name="icon_name">object-select-symbolic</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand Down
Binary file modifiedschemas/gschemas.compiled
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="s" name="network-ping-host">
<default>""</default>
<summary>Ping target host</summary>
<description>Hostname or IP address to ping for latency measurement</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand Down
63 changes: 63 additions & 0 deletions sensors.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import * as SubProcessModule from './helpers/subprocess.js';
import Gio from 'gi://Gio';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
import NM from 'gi://NM';
Expand All@@ -46,6 +47,8 @@ export const Sensors = GObject.registerClass({
this._settings = settings;
this._sensorIcons = sensorIcons;

this._pingCancellable = null;

this.resetHistory();

this._last_processor = { 'core': {}, 'speed': [] };
Expand All@@ -54,6 +57,7 @@ export const Sensors = GObject.registerClass({
this._addSettingChangedSignal('show-gpu', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('update-time', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('network-public-ip-interval', () => {this._lastPublicIPCheck = 0;});
this._addSettingChangedSignal('network-ping-host', () => this._pingCancellable?.cancel());
//this._addSettingChangedSignal('include-static-gpu-info', this._reconfigureNvidiaSmiProcess.bind(this));

this._gpu_drm_vendors = null;
Expand DownExpand Up@@ -338,6 +342,63 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'WiFi Signal Level', signal, 'network', 'string');
}
}).catch(err => { });

this._pollPing(value => {
this._returnValue(callback, 'Ping', value, 'network-ping', 'string');
});
}

_pollPing(callback) {
let host = this._settings.get_string('network-ping-host').trim();
if (!host) return;

this._pingCancellable?.cancel();
this._pingCancellable = new Gio.Cancellable();
let cancellable = this._pingCancellable;

let subprocess;
try {
subprocess = new Gio.Subprocess({
argv: ['ping', '-c', '1', '-W', '5', host],
flags: Gio.SubprocessFlags.STDOUT_PIPE |
Gio.SubprocessFlags.STDERR_PIPE,
});
subprocess.init(null);
} catch (e) {
callback('?? ms');
return;
}

cancellable.connect(() => subprocess.force_exit());

subprocess.communicate_utf8_async(null, cancellable, (proc, result) => {
let value = this._parsePingResult(proc, result, cancellable);
callback(value);
});
}

_parsePingResult(proc, result, cancellable) {
let stdout, exitStatus;
try {
[, stdout] = proc.communicate_utf8_finish(result);
exitStatus = proc.get_exit_status();
} catch (e) {
let cancelled = cancellable.is_cancelled();
return cancelled ? this._pingTimeoutLabel() : '?? ms';
}

if (exitStatus === 0 && stdout) {
let match = /time[=<]([\d.]+)\s*ms/.exec(stdout);
if (match)
return `${parseFloat(match[1]).toFixed(1)} ms`;
}

return exitStatus === 1 ? this._pingTimeoutLabel() : '?? ms';
}

_pingTimeoutLabel() {
let timeoutMs = Math.min(Math.max(this._settings.get_int('update-time'), 1), 5) * 1000;
return `${timeoutMs}+ ms`;
}

_queryStorage(callback, dwell) {
Expand DownExpand Up@@ -1066,11 +1127,13 @@ export const Sensors = GObject.registerClass({
this._frameMonitorLastTime = 0;
this._frameMonitorFrameCount = 0;
this._frameMonitorAccTime = 0;
this._pingCancellable?.cancel();
}

destroy() {
this._destroyFrameMonitor();
this._terminateNvidiaSmiProcess();
this._pingCancellable?.cancel();

for (let signal of Object.values(this._settingChangedSignals))
this._settings.disconnect(signal);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Ping sensor, fixes #72#539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ewired wants to merge 1 commit into
base:develop
Choose a base branch
from
Draft

Ping sensor, fixes #72 #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion extension.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ var VitalsMenuButton = GObject.registerClass({
'network' : { 'icon': 'network-symbolic.svg',
'icon-rx': 'network-download-symbolic.svg',
'icon-tx': 'network-upload-symbolic.svg',
'icon-ping': 'network-ping-symbolic.svg',
'icon-ad': '../flags/1x1/ad.svg',
'icon-ae': '../flags/1x1/ae.svg',
'icon-af': '../flags/1x1/af.svg',
Expand DownExpand Up@@ -335,7 +336,8 @@ var VitalsMenuButton = GObject.registerClass({
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];
'include-static-info', 'include-static-gpu-info',
'network-ping-host' ];

for (let setting of Object.values(settings))
this._addSettingChangedSignal(setting, this._redrawMenu.bind(this));
Expand Down
8 changes: 8 additions & 0 deletions icons/gnome/network-ping-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/original/network-ping-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions prefs.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,24 @@ const Settings = new GObject.Class({
this._settings.bind('network-public-ip-interval', this.builder.get_object('network-public-ip-interval'),
'value', Gio.SettingsBindFlags.DEFAULT);

let pingHostEntry = this.builder.get_object('network-ping-host');
let pingHostSave = this.builder.get_object('network-ping-host-save');
let getSavedPingHost = () => this._settings.get_string('network-ping-host');
let savePingHost = () => {
if (pingHostEntry.get_text() === getSavedPingHost())
return;

this._settings.set_string('network-ping-host', pingHostEntry.get_text());
pingHostSave.set_sensitive(false);
};

pingHostEntry.set_text(getSavedPingHost());
pingHostEntry.connect('changed', (widget) => {
pingHostSave.set_sensitive(widget.get_text() !== getSavedPingHost());
});
pingHostEntry.connect('activate', () => savePingHost());
pingHostSave.connect('clicked', () => savePingHost());

// process individual text entry sensor preferences
sensors = [ 'storage-path', 'monitor-cmd' ];
for (let key in sensors) {
Expand Down
41 changes: 41 additions & 0 deletions prefs.ui
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,47 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="hexpand">1</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">1</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Ping host</property>
</object>
</child>
<child>
<object class="GtkEntry" id="network-ping-host">
<property name="placeholder_text" translatable="no">e.g. 1.1.1.1</property>
<property name="can_focus">1</property>
<property name="editable">1</property>
<property name="width_chars">18</property>
</object>
</child>
<child>
<object class="GtkButton" id="network-ping-host-save">
<property name="can_focus">1</property>
<property name="sensitive">0</property>
<property name="tooltip_text" translatable="yes">Save ping host</property>
<property name="icon_name">object-select-symbolic</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand Down
Binary file modifiedschemas/gschemas.compiled
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="s" name="network-ping-host">
<default>""</default>
<summary>Ping target host</summary>
<description>Hostname or IP address to ping for latency measurement</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand Down
63 changes: 63 additions & 0 deletions sensors.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import * as SubProcessModule from './helpers/subprocess.js';
import Gio from 'gi://Gio';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
import NM from 'gi://NM';
Expand All@@ -46,6 +47,8 @@ export const Sensors = GObject.registerClass({
this._settings = settings;
this._sensorIcons = sensorIcons;

this._pingCancellable = null;

this.resetHistory();

this._last_processor = { 'core': {}, 'speed': [] };
Expand All@@ -54,6 +57,7 @@ export const Sensors = GObject.registerClass({
this._addSettingChangedSignal('show-gpu', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('update-time', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('network-public-ip-interval', () => {this._lastPublicIPCheck = 0;});
this._addSettingChangedSignal('network-ping-host', () => this._pingCancellable?.cancel());
//this._addSettingChangedSignal('include-static-gpu-info', this._reconfigureNvidiaSmiProcess.bind(this));

this._gpu_drm_vendors = null;
Expand DownExpand Up@@ -338,6 +342,63 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'WiFi Signal Level', signal, 'network', 'string');
}
}).catch(err => { });

this._pollPing(value => {
this._returnValue(callback, 'Ping', value, 'network-ping', 'string');
});
}

_pollPing(callback) {
let host = this._settings.get_string('network-ping-host').trim();
if (!host) return;

this._pingCancellable?.cancel();
this._pingCancellable = new Gio.Cancellable();
let cancellable = this._pingCancellable;

let subprocess;
try {
subprocess = new Gio.Subprocess({
argv: ['ping', '-c', '1', '-W', '5', host],
flags: Gio.SubprocessFlags.STDOUT_PIPE |
Gio.SubprocessFlags.STDERR_PIPE,
});
subprocess.init(null);
} catch (e) {
callback('?? ms');
return;
}

cancellable.connect(() => subprocess.force_exit());

subprocess.communicate_utf8_async(null, cancellable, (proc, result) => {
let value = this._parsePingResult(proc, result, cancellable);
callback(value);
});
}

_parsePingResult(proc, result, cancellable) {
let stdout, exitStatus;
try {
[, stdout] = proc.communicate_utf8_finish(result);
exitStatus = proc.get_exit_status();
} catch (e) {
let cancelled = cancellable.is_cancelled();
return cancelled ? this._pingTimeoutLabel() : '?? ms';
}

if (exitStatus === 0 && stdout) {
let match = /time[=<]([\d.]+)\s*ms/.exec(stdout);
if (match)
return `${parseFloat(match[1]).toFixed(1)} ms`;
}

return exitStatus === 1 ? this._pingTimeoutLabel() : '?? ms';
}

_pingTimeoutLabel() {
let timeoutMs = Math.min(Math.max(this._settings.get_int('update-time'), 1), 5) * 1000;
return `${timeoutMs}+ ms`;
}

_queryStorage(callback, dwell) {
Expand DownExpand Up@@ -1066,11 +1127,13 @@ export const Sensors = GObject.registerClass({
this._frameMonitorLastTime = 0;
this._frameMonitorFrameCount = 0;
this._frameMonitorAccTime = 0;
this._pingCancellable?.cancel();
}

destroy() {
this._destroyFrameMonitor();
this._terminateNvidiaSmiProcess();
this._pingCancellable?.cancel();

for (let signal of Object.values(this._settingChangedSignals))
this._settings.disconnect(signal);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Ping sensor, fixes #72#539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ewired wants to merge 1 commit into
base:develop
Choose a base branch
from
Draft

Ping sensor, fixes #72 #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion extension.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ var VitalsMenuButton = GObject.registerClass({
'network' : { 'icon': 'network-symbolic.svg',
'icon-rx': 'network-download-symbolic.svg',
'icon-tx': 'network-upload-symbolic.svg',
'icon-ping': 'network-ping-symbolic.svg',
'icon-ad': '../flags/1x1/ad.svg',
'icon-ae': '../flags/1x1/ae.svg',
'icon-af': '../flags/1x1/af.svg',
Expand DownExpand Up@@ -335,7 +336,8 @@ var VitalsMenuButton = GObject.registerClass({
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];
'include-static-info', 'include-static-gpu-info',
'network-ping-host' ];

for (let setting of Object.values(settings))
this._addSettingChangedSignal(setting, this._redrawMenu.bind(this));
Expand Down
8 changes: 8 additions & 0 deletions icons/gnome/network-ping-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/original/network-ping-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions prefs.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,24 @@ const Settings = new GObject.Class({
this._settings.bind('network-public-ip-interval', this.builder.get_object('network-public-ip-interval'),
'value', Gio.SettingsBindFlags.DEFAULT);

let pingHostEntry = this.builder.get_object('network-ping-host');
let pingHostSave = this.builder.get_object('network-ping-host-save');
let getSavedPingHost = () => this._settings.get_string('network-ping-host');
let savePingHost = () => {
if (pingHostEntry.get_text() === getSavedPingHost())
return;

this._settings.set_string('network-ping-host', pingHostEntry.get_text());
pingHostSave.set_sensitive(false);
};

pingHostEntry.set_text(getSavedPingHost());
pingHostEntry.connect('changed', (widget) => {
pingHostSave.set_sensitive(widget.get_text() !== getSavedPingHost());
});
pingHostEntry.connect('activate', () => savePingHost());
pingHostSave.connect('clicked', () => savePingHost());

// process individual text entry sensor preferences
sensors = [ 'storage-path', 'monitor-cmd' ];
for (let key in sensors) {
Expand Down
41 changes: 41 additions & 0 deletions prefs.ui
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,47 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="hexpand">1</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">1</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Ping host</property>
</object>
</child>
<child>
<object class="GtkEntry" id="network-ping-host">
<property name="placeholder_text" translatable="no">e.g. 1.1.1.1</property>
<property name="can_focus">1</property>
<property name="editable">1</property>
<property name="width_chars">18</property>
</object>
</child>
<child>
<object class="GtkButton" id="network-ping-host-save">
<property name="can_focus">1</property>
<property name="sensitive">0</property>
<property name="tooltip_text" translatable="yes">Save ping host</property>
<property name="icon_name">object-select-symbolic</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand Down
Binary file modifiedschemas/gschemas.compiled
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="s" name="network-ping-host">
<default>""</default>
<summary>Ping target host</summary>
<description>Hostname or IP address to ping for latency measurement</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand Down
63 changes: 63 additions & 0 deletions sensors.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import * as SubProcessModule from './helpers/subprocess.js';
import Gio from 'gi://Gio';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
import NM from 'gi://NM';
Expand All@@ -46,6 +47,8 @@ export const Sensors = GObject.registerClass({
this._settings = settings;
this._sensorIcons = sensorIcons;

this._pingCancellable = null;

this.resetHistory();

this._last_processor = { 'core': {}, 'speed': [] };
Expand All@@ -54,6 +57,7 @@ export const Sensors = GObject.registerClass({
this._addSettingChangedSignal('show-gpu', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('update-time', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('network-public-ip-interval', () => {this._lastPublicIPCheck = 0;});
this._addSettingChangedSignal('network-ping-host', () => this._pingCancellable?.cancel());
//this._addSettingChangedSignal('include-static-gpu-info', this._reconfigureNvidiaSmiProcess.bind(this));

this._gpu_drm_vendors = null;
Expand DownExpand Up@@ -338,6 +342,63 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'WiFi Signal Level', signal, 'network', 'string');
}
}).catch(err => { });

this._pollPing(value => {
this._returnValue(callback, 'Ping', value, 'network-ping', 'string');
});
}

_pollPing(callback) {
let host = this._settings.get_string('network-ping-host').trim();
if (!host) return;

this._pingCancellable?.cancel();
this._pingCancellable = new Gio.Cancellable();
let cancellable = this._pingCancellable;

let subprocess;
try {
subprocess = new Gio.Subprocess({
argv: ['ping', '-c', '1', '-W', '5', host],
flags: Gio.SubprocessFlags.STDOUT_PIPE |
Gio.SubprocessFlags.STDERR_PIPE,
});
subprocess.init(null);
} catch (e) {
callback('?? ms');
return;
}

cancellable.connect(() => subprocess.force_exit());

subprocess.communicate_utf8_async(null, cancellable, (proc, result) => {
let value = this._parsePingResult(proc, result, cancellable);
callback(value);
});
}

_parsePingResult(proc, result, cancellable) {
let stdout, exitStatus;
try {
[, stdout] = proc.communicate_utf8_finish(result);
exitStatus = proc.get_exit_status();
} catch (e) {
let cancelled = cancellable.is_cancelled();
return cancelled ? this._pingTimeoutLabel() : '?? ms';
}

if (exitStatus === 0 && stdout) {
let match = /time[=<]([\d.]+)\s*ms/.exec(stdout);
if (match)
return `${parseFloat(match[1]).toFixed(1)} ms`;
}

return exitStatus === 1 ? this._pingTimeoutLabel() : '?? ms';
}

_pingTimeoutLabel() {
let timeoutMs = Math.min(Math.max(this._settings.get_int('update-time'), 1), 5) * 1000;
return `${timeoutMs}+ ms`;
}

_queryStorage(callback, dwell) {
Expand DownExpand Up@@ -1066,11 +1127,13 @@ export const Sensors = GObject.registerClass({
this._frameMonitorLastTime = 0;
this._frameMonitorFrameCount = 0;
this._frameMonitorAccTime = 0;
this._pingCancellable?.cancel();
}

destroy() {
this._destroyFrameMonitor();
this._terminateNvidiaSmiProcess();
this._pingCancellable?.cancel();

for (let signal of Object.values(this._settingChangedSignals))
this._settings.disconnect(signal);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Ping sensor, fixes #72#539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ewired wants to merge 1 commit into
base:develop
Choose a base branch
from
Draft

Ping sensor, fixes #72 #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion extension.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ var VitalsMenuButton = GObject.registerClass({
'network' : { 'icon': 'network-symbolic.svg',
'icon-rx': 'network-download-symbolic.svg',
'icon-tx': 'network-upload-symbolic.svg',
'icon-ping': 'network-ping-symbolic.svg',
'icon-ad': '../flags/1x1/ad.svg',
'icon-ae': '../flags/1x1/ae.svg',
'icon-af': '../flags/1x1/af.svg',
Expand DownExpand Up@@ -335,7 +336,8 @@ var VitalsMenuButton = GObject.registerClass({
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];
'include-static-info', 'include-static-gpu-info',
'network-ping-host' ];

for (let setting of Object.values(settings))
this._addSettingChangedSignal(setting, this._redrawMenu.bind(this));
Expand Down
8 changes: 8 additions & 0 deletions icons/gnome/network-ping-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/original/network-ping-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions prefs.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,24 @@ const Settings = new GObject.Class({
this._settings.bind('network-public-ip-interval', this.builder.get_object('network-public-ip-interval'),
'value', Gio.SettingsBindFlags.DEFAULT);

let pingHostEntry = this.builder.get_object('network-ping-host');
let pingHostSave = this.builder.get_object('network-ping-host-save');
let getSavedPingHost = () => this._settings.get_string('network-ping-host');
let savePingHost = () => {
if (pingHostEntry.get_text() === getSavedPingHost())
return;

this._settings.set_string('network-ping-host', pingHostEntry.get_text());
pingHostSave.set_sensitive(false);
};

pingHostEntry.set_text(getSavedPingHost());
pingHostEntry.connect('changed', (widget) => {
pingHostSave.set_sensitive(widget.get_text() !== getSavedPingHost());
});
pingHostEntry.connect('activate', () => savePingHost());
pingHostSave.connect('clicked', () => savePingHost());

// process individual text entry sensor preferences
sensors = [ 'storage-path', 'monitor-cmd' ];
for (let key in sensors) {
Expand Down
41 changes: 41 additions & 0 deletions prefs.ui
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,47 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="hexpand">1</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">1</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Ping host</property>
</object>
</child>
<child>
<object class="GtkEntry" id="network-ping-host">
<property name="placeholder_text" translatable="no">e.g. 1.1.1.1</property>
<property name="can_focus">1</property>
<property name="editable">1</property>
<property name="width_chars">18</property>
</object>
</child>
<child>
<object class="GtkButton" id="network-ping-host-save">
<property name="can_focus">1</property>
<property name="sensitive">0</property>
<property name="tooltip_text" translatable="yes">Save ping host</property>
<property name="icon_name">object-select-symbolic</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand Down
Binary file modifiedschemas/gschemas.compiled
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="s" name="network-ping-host">
<default>""</default>
<summary>Ping target host</summary>
<description>Hostname or IP address to ping for latency measurement</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand Down
63 changes: 63 additions & 0 deletions sensors.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import * as SubProcessModule from './helpers/subprocess.js';
import Gio from 'gi://Gio';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
import NM from 'gi://NM';
Expand All@@ -46,6 +47,8 @@ export const Sensors = GObject.registerClass({
this._settings = settings;
this._sensorIcons = sensorIcons;

this._pingCancellable = null;

this.resetHistory();

this._last_processor = { 'core': {}, 'speed': [] };
Expand All@@ -54,6 +57,7 @@ export const Sensors = GObject.registerClass({
this._addSettingChangedSignal('show-gpu', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('update-time', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('network-public-ip-interval', () => {this._lastPublicIPCheck = 0;});
this._addSettingChangedSignal('network-ping-host', () => this._pingCancellable?.cancel());
//this._addSettingChangedSignal('include-static-gpu-info', this._reconfigureNvidiaSmiProcess.bind(this));

this._gpu_drm_vendors = null;
Expand DownExpand Up@@ -338,6 +342,63 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'WiFi Signal Level', signal, 'network', 'string');
}
}).catch(err => { });

this._pollPing(value => {
this._returnValue(callback, 'Ping', value, 'network-ping', 'string');
});
}

_pollPing(callback) {
let host = this._settings.get_string('network-ping-host').trim();
if (!host) return;

this._pingCancellable?.cancel();
this._pingCancellable = new Gio.Cancellable();
let cancellable = this._pingCancellable;

let subprocess;
try {
subprocess = new Gio.Subprocess({
argv: ['ping', '-c', '1', '-W', '5', host],
flags: Gio.SubprocessFlags.STDOUT_PIPE |
Gio.SubprocessFlags.STDERR_PIPE,
});
subprocess.init(null);
} catch (e) {
callback('?? ms');
return;
}

cancellable.connect(() => subprocess.force_exit());

subprocess.communicate_utf8_async(null, cancellable, (proc, result) => {
let value = this._parsePingResult(proc, result, cancellable);
callback(value);
});
}

_parsePingResult(proc, result, cancellable) {
let stdout, exitStatus;
try {
[, stdout] = proc.communicate_utf8_finish(result);
exitStatus = proc.get_exit_status();
} catch (e) {
let cancelled = cancellable.is_cancelled();
return cancelled ? this._pingTimeoutLabel() : '?? ms';
}

if (exitStatus === 0 && stdout) {
let match = /time[=<]([\d.]+)\s*ms/.exec(stdout);
if (match)
return `${parseFloat(match[1]).toFixed(1)} ms`;
}

return exitStatus === 1 ? this._pingTimeoutLabel() : '?? ms';
}

_pingTimeoutLabel() {
let timeoutMs = Math.min(Math.max(this._settings.get_int('update-time'), 1), 5) * 1000;
return `${timeoutMs}+ ms`;
}

_queryStorage(callback, dwell) {
Expand DownExpand Up@@ -1066,11 +1127,13 @@ export const Sensors = GObject.registerClass({
this._frameMonitorLastTime = 0;
this._frameMonitorFrameCount = 0;
this._frameMonitorAccTime = 0;
this._pingCancellable?.cancel();
}

destroy() {
this._destroyFrameMonitor();
this._terminateNvidiaSmiProcess();
this._pingCancellable?.cancel();

for (let signal of Object.values(this._settingChangedSignals))
this._settings.disconnect(signal);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Ping sensor, fixes #72#539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ewired wants to merge 1 commit into
base:develop
Choose a base branch
from
Draft

Ping sensor, fixes #72 #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion extension.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ var VitalsMenuButton = GObject.registerClass({
'network' : { 'icon': 'network-symbolic.svg',
'icon-rx': 'network-download-symbolic.svg',
'icon-tx': 'network-upload-symbolic.svg',
'icon-ping': 'network-ping-symbolic.svg',
'icon-ad': '../flags/1x1/ad.svg',
'icon-ae': '../flags/1x1/ae.svg',
'icon-af': '../flags/1x1/af.svg',
Expand DownExpand Up@@ -335,7 +336,8 @@ var VitalsMenuButton = GObject.registerClass({
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];
'include-static-info', 'include-static-gpu-info',
'network-ping-host' ];

for (let setting of Object.values(settings))
this._addSettingChangedSignal(setting, this._redrawMenu.bind(this));
Expand Down
8 changes: 8 additions & 0 deletions icons/gnome/network-ping-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/original/network-ping-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions prefs.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,24 @@ const Settings = new GObject.Class({
this._settings.bind('network-public-ip-interval', this.builder.get_object('network-public-ip-interval'),
'value', Gio.SettingsBindFlags.DEFAULT);

let pingHostEntry = this.builder.get_object('network-ping-host');
let pingHostSave = this.builder.get_object('network-ping-host-save');
let getSavedPingHost = () => this._settings.get_string('network-ping-host');
let savePingHost = () => {
if (pingHostEntry.get_text() === getSavedPingHost())
return;

this._settings.set_string('network-ping-host', pingHostEntry.get_text());
pingHostSave.set_sensitive(false);
};

pingHostEntry.set_text(getSavedPingHost());
pingHostEntry.connect('changed', (widget) => {
pingHostSave.set_sensitive(widget.get_text() !== getSavedPingHost());
});
pingHostEntry.connect('activate', () => savePingHost());
pingHostSave.connect('clicked', () => savePingHost());

// process individual text entry sensor preferences
sensors = [ 'storage-path', 'monitor-cmd' ];
for (let key in sensors) {
Expand Down
41 changes: 41 additions & 0 deletions prefs.ui
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,47 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="hexpand">1</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">1</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Ping host</property>
</object>
</child>
<child>
<object class="GtkEntry" id="network-ping-host">
<property name="placeholder_text" translatable="no">e.g. 1.1.1.1</property>
<property name="can_focus">1</property>
<property name="editable">1</property>
<property name="width_chars">18</property>
</object>
</child>
<child>
<object class="GtkButton" id="network-ping-host-save">
<property name="can_focus">1</property>
<property name="sensitive">0</property>
<property name="tooltip_text" translatable="yes">Save ping host</property>
<property name="icon_name">object-select-symbolic</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand Down
Binary file modifiedschemas/gschemas.compiled
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="s" name="network-ping-host">
<default>""</default>
<summary>Ping target host</summary>
<description>Hostname or IP address to ping for latency measurement</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand Down
63 changes: 63 additions & 0 deletions sensors.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import * as SubProcessModule from './helpers/subprocess.js';
import Gio from 'gi://Gio';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
import NM from 'gi://NM';
Expand All@@ -46,6 +47,8 @@ export const Sensors = GObject.registerClass({
this._settings = settings;
this._sensorIcons = sensorIcons;

this._pingCancellable = null;

this.resetHistory();

this._last_processor = { 'core': {}, 'speed': [] };
Expand All@@ -54,6 +57,7 @@ export const Sensors = GObject.registerClass({
this._addSettingChangedSignal('show-gpu', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('update-time', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('network-public-ip-interval', () => {this._lastPublicIPCheck = 0;});
this._addSettingChangedSignal('network-ping-host', () => this._pingCancellable?.cancel());
//this._addSettingChangedSignal('include-static-gpu-info', this._reconfigureNvidiaSmiProcess.bind(this));

this._gpu_drm_vendors = null;
Expand DownExpand Up@@ -338,6 +342,63 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'WiFi Signal Level', signal, 'network', 'string');
}
}).catch(err => { });

this._pollPing(value => {
this._returnValue(callback, 'Ping', value, 'network-ping', 'string');
});
}

_pollPing(callback) {
let host = this._settings.get_string('network-ping-host').trim();
if (!host) return;

this._pingCancellable?.cancel();
this._pingCancellable = new Gio.Cancellable();
let cancellable = this._pingCancellable;

let subprocess;
try {
subprocess = new Gio.Subprocess({
argv: ['ping', '-c', '1', '-W', '5', host],
flags: Gio.SubprocessFlags.STDOUT_PIPE |
Gio.SubprocessFlags.STDERR_PIPE,
});
subprocess.init(null);
} catch (e) {
callback('?? ms');
return;
}

cancellable.connect(() => subprocess.force_exit());

subprocess.communicate_utf8_async(null, cancellable, (proc, result) => {
let value = this._parsePingResult(proc, result, cancellable);
callback(value);
});
}

_parsePingResult(proc, result, cancellable) {
let stdout, exitStatus;
try {
[, stdout] = proc.communicate_utf8_finish(result);
exitStatus = proc.get_exit_status();
} catch (e) {
let cancelled = cancellable.is_cancelled();
return cancelled ? this._pingTimeoutLabel() : '?? ms';
}

if (exitStatus === 0 && stdout) {
let match = /time[=<]([\d.]+)\s*ms/.exec(stdout);
if (match)
return `${parseFloat(match[1]).toFixed(1)} ms`;
}

return exitStatus === 1 ? this._pingTimeoutLabel() : '?? ms';
}

_pingTimeoutLabel() {
let timeoutMs = Math.min(Math.max(this._settings.get_int('update-time'), 1), 5) * 1000;
return `${timeoutMs}+ ms`;
}

_queryStorage(callback, dwell) {
Expand DownExpand Up@@ -1066,11 +1127,13 @@ export const Sensors = GObject.registerClass({
this._frameMonitorLastTime = 0;
this._frameMonitorFrameCount = 0;
this._frameMonitorAccTime = 0;
this._pingCancellable?.cancel();
}

destroy() {
this._destroyFrameMonitor();
this._terminateNvidiaSmiProcess();
this._pingCancellable?.cancel();

for (let signal of Object.values(this._settingChangedSignals))
this._settings.disconnect(signal);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Ping sensor, fixes #72#539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ewired wants to merge 1 commit into
base:develop
Choose a base branch
from
Draft

Ping sensor, fixes #72 #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion extension.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ var VitalsMenuButton = GObject.registerClass({
'network' : { 'icon': 'network-symbolic.svg',
'icon-rx': 'network-download-symbolic.svg',
'icon-tx': 'network-upload-symbolic.svg',
'icon-ping': 'network-ping-symbolic.svg',
'icon-ad': '../flags/1x1/ad.svg',
'icon-ae': '../flags/1x1/ae.svg',
'icon-af': '../flags/1x1/af.svg',
Expand DownExpand Up@@ -335,7 +336,8 @@ var VitalsMenuButton = GObject.registerClass({
'fixed-widths', 'hide-icons', 'unit',
'memory-measurement', 'include-public-ip', 'network-public-ip-interval',
'network-public-ip-show-flag', 'network-speed-format', 'storage-measurement',
'include-static-info', 'include-static-gpu-info' ];
'include-static-info', 'include-static-gpu-info',
'network-ping-host' ];

for (let setting of Object.values(settings))
this._addSettingChangedSignal(setting, this._redrawMenu.bind(this));
Expand Down
8 changes: 8 additions & 0 deletions icons/gnome/network-ping-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/original/network-ping-symbolic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions prefs.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,24 @@ const Settings = new GObject.Class({
this._settings.bind('network-public-ip-interval', this.builder.get_object('network-public-ip-interval'),
'value', Gio.SettingsBindFlags.DEFAULT);

let pingHostEntry = this.builder.get_object('network-ping-host');
let pingHostSave = this.builder.get_object('network-ping-host-save');
let getSavedPingHost = () => this._settings.get_string('network-ping-host');
let savePingHost = () => {
if (pingHostEntry.get_text() === getSavedPingHost())
return;

this._settings.set_string('network-ping-host', pingHostEntry.get_text());
pingHostSave.set_sensitive(false);
};

pingHostEntry.set_text(getSavedPingHost());
pingHostEntry.connect('changed', (widget) => {
pingHostSave.set_sensitive(widget.get_text() !== getSavedPingHost());
});
pingHostEntry.connect('activate', () => savePingHost());
pingHostSave.connect('clicked', () => savePingHost());

// process individual text entry sensor preferences
sensors = [ 'storage-path', 'monitor-cmd' ];
for (let key in sensors) {
Expand Down
41 changes: 41 additions & 0 deletions prefs.ui
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,6 +147,47 @@
</property>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="hexpand">1</property>
<property name="selectable">0</property>
<property name="child">
<object class="GtkBox">
<property name="can_focus">1</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel">
<property name="hexpand">1</property>
<property name="can_focus">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Ping host</property>
</object>
</child>
<child>
<object class="GtkEntry" id="network-ping-host">
<property name="placeholder_text" translatable="no">e.g. 1.1.1.1</property>
<property name="can_focus">1</property>
<property name="editable">1</property>
<property name="width_chars">18</property>
</object>
</child>
<child>
<object class="GtkButton" id="network-ping-host-save">
<property name="can_focus">1</property>
<property name="sensitive">0</property>
<property name="tooltip_text" translatable="yes">Save ping host</property>
<property name="icon_name">object-select-symbolic</property>
</object>
</child>
</object>
</property>
</object>
</child>
</object>
</property>
</object>
Expand Down
Binary file modifiedschemas/gschemas.compiled
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions schemas/org.gnome.shell.extensions.vitals.gschema.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,6 +94,11 @@
<summary>Network speed format</summary>
<description>Should speed display in bits or bytes?</description>
</key>
<key type="s" name="network-ping-host">
<default>""</default>
<summary>Ping target host</summary>
<description>Hostname or IP address to ping for latency measurement</description>
</key>
<key type="s" name="storage-path">
<default>"/"</default>
<summary>Storage path</summary>
Expand Down
63 changes: 63 additions & 0 deletions sensors.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
import * as SubProcessModule from './helpers/subprocess.js';
import Gio from 'gi://Gio';
import * as FileModule from './helpers/file.js';
import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.js';
import NM from 'gi://NM';
Expand All@@ -46,6 +47,8 @@ export const Sensors = GObject.registerClass({
this._settings = settings;
this._sensorIcons = sensorIcons;

this._pingCancellable = null;

this.resetHistory();

this._last_processor = { 'core': {}, 'speed': [] };
Expand All@@ -54,6 +57,7 @@ export const Sensors = GObject.registerClass({
this._addSettingChangedSignal('show-gpu', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('update-time', this._reconfigureNvidiaSmiProcess.bind(this));
this._addSettingChangedSignal('network-public-ip-interval', () => {this._lastPublicIPCheck = 0;});
this._addSettingChangedSignal('network-ping-host', () => this._pingCancellable?.cancel());
//this._addSettingChangedSignal('include-static-gpu-info', this._reconfigureNvidiaSmiProcess.bind(this));

this._gpu_drm_vendors = null;
Expand DownExpand Up@@ -338,6 +342,63 @@ export const Sensors = GObject.registerClass({
this._returnValue(callback, 'WiFi Signal Level', signal, 'network', 'string');
}
}).catch(err => { });

this._pollPing(value => {
this._returnValue(callback, 'Ping', value, 'network-ping', 'string');
});
}

_pollPing(callback) {
let host = this._settings.get_string('network-ping-host').trim();
if (!host) return;

this._pingCancellable?.cancel();
this._pingCancellable = new Gio.Cancellable();
let cancellable = this._pingCancellable;

let subprocess;
try {
subprocess = new Gio.Subprocess({
argv: ['ping', '-c', '1', '-W', '5', host],
flags: Gio.SubprocessFlags.STDOUT_PIPE |
Gio.SubprocessFlags.STDERR_PIPE,
});
subprocess.init(null);
} catch (e) {
callback('?? ms');
return;
}

cancellable.connect(() => subprocess.force_exit());

subprocess.communicate_utf8_async(null, cancellable, (proc, result) => {
let value = this._parsePingResult(proc, result, cancellable);
callback(value);
});
}

_parsePingResult(proc, result, cancellable) {
let stdout, exitStatus;
try {
[, stdout] = proc.communicate_utf8_finish(result);
exitStatus = proc.get_exit_status();
} catch (e) {
let cancelled = cancellable.is_cancelled();
return cancelled ? this._pingTimeoutLabel() : '?? ms';
}

if (exitStatus === 0 && stdout) {
let match = /time[=<]([\d.]+)\s*ms/.exec(stdout);
if (match)
return `${parseFloat(match[1]).toFixed(1)} ms`;
}

return exitStatus === 1 ? this._pingTimeoutLabel() : '?? ms';
}

_pingTimeoutLabel() {
let timeoutMs = Math.min(Math.max(this._settings.get_int('update-time'), 1), 5) * 1000;
return `${timeoutMs}+ ms`;
}

_queryStorage(callback, dwell) {
Expand DownExpand Up@@ -1066,11 +1127,13 @@ export const Sensors = GObject.registerClass({
this._frameMonitorLastTime = 0;
this._frameMonitorFrameCount = 0;
this._frameMonitorAccTime = 0;
this._pingCancellable?.cancel();
}

destroy() {
this._destroyFrameMonitor();
this._terminateNvidiaSmiProcess();
this._pingCancellable?.cancel();

for (let signal of Object.values(this._settingChangedSignals))
this._settings.disconnect(signal);
Expand Down