Add support for Gnome 45

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+end_of_line = lf
+insert_final_newline = true
+
+[*.js]
+quote_type = single

.eslintrc.yml

@@ -0,0 +1,109 @@
+# SPDX-License-Identifier: CC0-1.0
+# SPDX-FileCopyrightText: No rights reserved
+
+env:
+  es2021: true
+extends: "eslint:recommended"
+rules:
+  # See: https://eslint.org/docs/latest/rules/#possible-problems
+  array-callback-return: error
+  no-await-in-loop: error
+  no-constant-binary-expression: error
+  no-constructor-return: error
+  #no-duplicate-imports: error
+  no-new-native-nonconstructor: error
+  no-promise-executor-return: error
+  no-self-compare: error
+  no-template-curly-in-string: error
+  no-unmodified-loop-condition: error
+  no-unreachable-loop: error
+  no-unused-private-class-members: error
+  no-use-before-define:
+    - error
+    - functions: false
+      classes: true
+      variables: true
+      allowNamedExports: true
+  # See: https://eslint.org/docs/latest/rules/#suggestions
+  block-scoped-var: error
+  complexity: warn
+  consistent-return: error
+  default-param-last: error
+  eqeqeq: error
+  no-array-constructor: error
+  no-caller: error
+  no-extend-native: error
+  no-extra-bind: error
+  no-extra-label: error
+  no-iterator: error
+  no-label-var: error
+  no-loop-func: error
+  no-multi-assign: warn
+  no-new-object: error
+  no-new-wrappers: error
+  no-proto: error
+  no-shadow: warn
+  no-unused-vars:
+    - error
+    - varsIgnorePattern: ^_
+      argsIgnorePattern: ^_
+  no-var: warn
+  unicode-bom: error
+  # GJS Restrictions
+  no-restricted-globals:
+    - error
+    - name: Debugger
+      message: Internal use only
+    - name: GIRepositoryGType
+      message: Internal use only
+    - name: log
+      message: Use console.log()
+    - name: logError
+      message: Use console.warn() or console.error()
+  no-restricted-properties:
+    - error
+    - object: imports
+      property: format
+      message: Use template strings
+    - object: pkg
+      property: initFormat
+      message: Use template strings
+    - object: Lang
+      property: copyProperties
+      message: Use Object.assign()
+    - object: Lang
+      property: bind
+      message: Use arrow notation or Function.prototype.bind()
+    - object: Lang
+      property: Class
+      message: Use ES6 classes
+  no-restricted-syntax:
+    - error
+    - selector: >-
+        MethodDefinition[key.name="_init"]
+        CallExpression[arguments.length<=1][callee.object.type="Super"][callee.property.name="_init"]
+      message: Use constructor() and super()
+# GJS Globals
+globals:
+  ARGV: readonly
+  Debugger: readonly
+  GIRepositoryGType: readonly
+  globalThis: readonly
+  imports: readonly
+  Intl: readonly
+  log: readonly
+  logError: readonly
+  pkg: readonly
+  print: readonly
+  printerr: readonly
+  window: readonly
+  TextEncoder: readonly
+  TextDecoder: readonly
+  console: readonly
+  setTimeout: readonly
+  setInterval: readonly
+  clearTimeout: readonly
+  clearInterval: readonly
+parserOptions:
+  ecmaVersion: 2022
+  sourceType: module

.gitignore

@@ -3,3 +3,4 @@ locale/
 schemas/gschemas.compiled
 *~
 .idea/
+node_modules/

Makefile

@@ -5,14 +5,14 @@ UUID = [email protected]
 
 LANGUAGES=ca de en_CA fa fr it pt_BR ru zh_CN zh_TW es_ES nl_NL ru tr zh_CN
 DOC_FILES=CHANGELOG README.md
-SRC_FILES=extension.js prefs.js net_speed_layout_menu_item.js net_speed.js net_speed_status_icon.js lib.js
+SRC_FILES=extension.js prefs.js net_speed_layout_menu_item.js net_speed.js net_speed_status_icon.js lib.js messages.js
 MO_FILES=$(foreach LANGUAGE, $(LANGUAGES), locale/$(LANGUAGE)/LC_MESSAGES/$(GETTEXT_PACKAGE).mo)
 SCHEMA_FILES=schemas/gschemas.compiled schemas/org.gnome.shell.extensions.netspeed.gschema.xml
 EXTENSION_FILES=stylesheet.css metadata.json
 OUTPUT=$(DOC_FILES) $(SRC_FILES) $(MO_FILES) $(SCHEMA_FILES) $(EXTENSION_FILES)
 POT_FILE=po/$(GETTEXT_PACKAGE).pot
 LOCAL_INSTALL=~/.local/share/gnome-shell/extensions/$(UUID)
-pack: $(OUTPUT)
+pack: update-po schemas/gschemas.compiled $(OUTPUT)
 	zip $(UUID).zip $(OUTPUT)
 
 $(POT_FILE): $(SRC_FILES)
@@ -42,5 +42,13 @@ enable:
 disable:
 	gnome-extensions disable $(UUID)
 
-reload:
+uninstall:
+	gnome-extensions uninstall $(UUID)
+
+reset:
 	gnome-extensions reset $(UUID)
+
+reload:
+	# Reloading shell; Sending SIGHUP signal to gnome-shell (equivalent to alt + f2 ; r ; enter)
+	# busctl --verbose --user call org.gnome.Shell /org/gnome/Shell org.gnome.Shell Eval s 'Meta.restart("Restarting…")'
+	killall -HUP gnome-shell

extension.js

@@ -1,30 +1,49 @@
- /*
-  * Copyright 2011-2013 Amir Hedayaty < hedayaty AT gmail DOT com >
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 3 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-const Extension = imports.misc.extensionUtils.getCurrentExtension();
-const NetSpeed = Extension.imports.net_speed;
-
-/**
- * init
- * run when gnome-shell loads
+/*
+ * Copyright 2011-2013 Amir Hedayaty < hedayaty AT gmail DOT com >
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-function init() {
-    return new NetSpeed.NetSpeed();
-}
 
+import { Extension } from 'resource:///org/gnome/shell/extensions/extension.js';
+import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+
+import NetSpeedStatusIcon from './net_speed_status_icon.js';
+import { Logger } from './lib.js';
+import { NetSpeed } from './net_speed.js';
+
+
+export default class extends Extension {
+
+  enable() {
+    Logger.init(this);
+
+    this._netSpeed = new NetSpeed(this);
+    this._netSpeedMenu = new NetSpeedStatusIcon(this, this._netSpeed);
+
+    Main.panel.addToStatusArea('netSpeed', this._netSpeedMenu);
+    // reposition in panel trick
+    this._netSpeedMenu._positionInPanelChanged();
+
+    this._netSpeed.start();
+  }
+
+  disable() {
+    this._netSpeed?.stop();
+    this._netSpeedMenu?.destroy();
+    this._netSpeed = null;
+    this._netSpeedMenu = null;
+  }
+}
 
 // vim: ts=2 sw=2