Merge pull request #84 from Isopolito/Gnome45

Gnome45

metadata.json

@@ -3,11 +3,9 @@
   "description": "A Gnome extension that shows the NordVPN status in the top bar and provides the ability to configure certain aspects of the connection.",
   "name": "gNordVPN-Local",
   "shell-version": [
-    "42",
-    "43",
-    "44"
+      "45"
   ],
   "url": "https://github.com/Isopolito/gNordVPN-Local",
   "uuid": "gnordvpn-local@isopolito",
-  "version": 23
+  "version": 25
 }

modules/CommonFavorite.js

@@ -1,17 +1,13 @@
-'use strict';
-const PopupMenu = imports.ui.popupMenu;
-
-// gNordVpn-Local modules
-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Vpn = Me.imports.modules.Vpn.Vpn;
-const Constants = Me.imports.modules.constants;
-const Signals = Me.imports.modules.Signals.Signals;
-const MenuBase = Me.imports.modules.MenuBase.MenuBase;
-const Favorites = Me.imports.modules.Favorites.Favorites;
-
-var CommonFavorite = class CommonFavorite extends MenuBase {
-    constructor(connectionCallback) {
+import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+
+import Vpn from './Vpn.js';
+import Signals from './Signals.js';
+import Favorites from './Favorites.js';
+import MenuBase from './MenuBase.js';
+import * as Constants from './constants.js';
+
+export default class CommonFavorite extends MenuBase {
+    constructor(connectionCallback, settings) {
         super();
         this._connectionCallback = connectionCallback;
         this._isBuilt = false;
@@ -20,8 +16,8 @@ var CommonFavorite = class CommonFavorite extends MenuBase {
         this._destroyMap = {};
         this.prevShowHide = true;
 
-        this._favorites = new Favorites();
-        this._vpn = new Vpn();
+        this._favorites = new Favorites(settings);
+        this._vpn = new Vpn(settings);
         this._signals = new Signals();
     }
 
@@ -85,11 +81,11 @@ var CommonFavorite = class CommonFavorite extends MenuBase {
     }
 
     _toggleFavoriteMenuItem(favorite, toAdd) {
-        let d = this._destroyMap[favorite];
-        if (d) {
-            this._signals.disconnect([d.menuItemClickId, d.menuItem.favoritePressId]);
-            d.icofavBtn.destroy();
-            d.menuItem.destroy();
+        let menuItemElements = this._destroyMap[favorite];
+        if (menuItemElements) {
+            this._signals.disconnect([menuItemElements.menuItemClickId, menuItemElements.menuItem.favoritePressId]);
+            menuItemElements.icofavBtn.destroy();
+            menuItemElements.menuItem.destroy();
         }
 
         if (toAdd) { 

modules/ConnectionMenu.js

@@ -1,18 +1,14 @@
-'use strict';
-const PopupMenu = imports.ui.popupMenu;
-
-// gNordVpn-Local modules
-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-const Vpn = Me.imports.modules.Vpn.Vpn;
-const Constants = Me.imports.modules.constants;
-const Signals = Me.imports.modules.Signals.Signals;
-const MenuBase = Me.imports.modules.MenuBase.MenuBase;
-const Favorites = Me.imports.modules.Favorites.Favorites;
-const Common = Me.imports.modules.common;
-
-var ConnectionMenu = class ConnectionMenu extends MenuBase {
-    constructor(connectionLabel, connectionType, favoritesKey, connectionCallback) {
+import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+
+import Vpn from './Vpn.js';
+import Signals from './Signals.js';
+import Favorites from './Favorites.js';
+import MenuBase from './MenuBase.js';
+import * as Common from './common.js';
+import * as Constants from './constants.js';
+
+export default class ConnectionMenu extends MenuBase {
+    constructor(connectionLabel, connectionType, favoritesKey, connectionCallback, settings) {
         super();
         this._connectionCallback = connectionCallback;
         this._connectionMenu = null;
@@ -22,8 +18,8 @@ var ConnectionMenu = class ConnectionMenu extends MenuBase {
         this._menuSeperator = null;
         this._destroyMap = {};
 
-        this._favorites = new Favorites();
-        this._vpn = new Vpn();
+        this._favorites = new Favorites(settings);
+        this._vpn = new Vpn(settings);
         this._signals = new Signals();
 
         this._connectionLabel = connectionLabel;

modules/Favorites.js

@@ -1,8 +1,6 @@
-const ExtensionUtils = imports.misc.extensionUtils;
-
-var Favorites = class Favorites {
-    constructor() {
-        this._settings = ExtensionUtils.getSettings(`org.gnome.shell.extensions.gnordvpn-local`);
+export default class Favorites {
+    constructor(settings) {
+        this._settings = settings;
     }
 
     _getData(a) { return this._settings.get_string(a); }

modules/MenuBase.js

@@ -1,7 +1,10 @@
-const St = imports.gi.St;
-const Clutter = imports.gi.Clutter;
+import St from 'gi://St';
+import Clutter from 'gi://Clutter';
+
+export default class MenuBase {
+    constructor() {
+    }
 
-var MenuBase = class MenuBase {
     buildFavIcon(isFavorite) {
         const icon_name = isFavorite ? `starred-symbolic` : `non-starred-symbolic`;
         const iconfav = new St.Icon({

modules/PanelIcon.js

@@ -1,35 +1,34 @@
-const St = imports.gi.St;
-const ExtensionUtils = imports.misc.extensionUtils;
+import St from 'gi://St';
+import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js';
 
-const Me = ExtensionUtils.getCurrentExtension();
-const Constants = Me.imports.modules.constants;
+import * as Constants from './constants.js';
 
-var PanelIcon = class PanelIcon {
-    constructor() {
-        this.settings = ExtensionUtils.getSettings(`org.gnome.shell.extensions.gnordvpn-local`);
+export default class PanelIcon {
+    constructor(settings) {
+        this._settings = settings;
 
         this.uiMap = {};
         this.commonStyle = "";
         this.updateStyle();
     }
 
     updateStyle() {
-        let savedStyle = this.settings.get_value('panel-styles').deep_unpack();
+        let savedStyle = this._settings.get_value('panel-styles').deep_unpack();
 
         this.uiMap = {};
         Object.keys(savedStyle).forEach(key => {
             this.uiMap[Constants.states[key]] = savedStyle[key];
         });
 
-        this.commonStyle = this.settings.get_string(`common-panel-style`);
+        this.commonStyle = this._settings.get_string(`common-panel-style`);
     }
 
     update(status) {
         if (!status || this._label.isDisposed) return;
 
         let config = this.uiMap[status.currentState.stateName];
         let msg = config.panelText
-        if (status.currentState.stateName == 'Status: Connected')
+        if (status.currentState.stateName === 'Status: Connected')
             msg = msg.replaceAll('{country}',      status.country)
                      .replaceAll('{COUNTRY}',      status.country.toUpperCase())
                      .replaceAll('{ctry}',         status.currentServer.replace(/(\d|.nordvpn.com)/g, '').toUpperCase())

modules/ProcCom.js

@@ -0,0 +1,25 @@
+import Gio from 'gi://Gio';
+import GLib from 'gi://GLib';
+
+export default class ProcCom {
+    constructor(props) {
+        Gio._promisify(Gio.Subprocess.prototype, 'communicate_utf8_async');
+    }
+
+    async execCommunicateAsync(command, input = null) {
+        let argv = command.split(/\s+/);
+        try {
+            const proc = Gio.Subprocess.new(argv, Gio.SubprocessFlags.STDOUT_PIPE | Gio.SubprocessFlags.STDERR_PIPE);
+            const [stdout, stderr] = await proc.communicate_utf8_async(null, null);
+
+            if (proc.get_successful()) return stdout;
+            else throw new Error(stderr);
+        } catch (e) {
+            logError(e, `gnordvpn`);
+        }
+    }
+
+    execCommunicateSync(command) {
+        return GLib.spawn_command_line_sync(command);
+    }
+}

modules/Signals.js

@@ -1,4 +1,4 @@
-var Signals = class Signals {
+export default class Signals {
     constructor() {
         this._ids = {};
     }

modules/StateManager.js

@@ -1,11 +1,6 @@
-// noinspection ES6ConvertVarToLetConst
-'use strict';
-const ExtensionUtils = imports.misc.extensionUtils;
+import * as Constants from './constants.js';
 
-const Me = ExtensionUtils.getCurrentExtension();
-const Constants = Me.imports.modules.constants;
-
-var StateManager = class StateManager {
+export default class StateManager {
     constructor() {
         this.STATE_OVERRIDE_UNSET = -1;
         this.stateOverride = undefined;