Migrate packageManager to ES6

package.json

@@ -137,6 +137,7 @@
           "src/components/metadataEditor/personEditor.js",
           "src/components/multiSelect/multiSelect.js",
           "src/components/nowPlayingBar/nowPlayingBar.js",
+          "src/components/packageManager.js",
           "src/components/playback/brightnessosd.js",
           "src/components/playback/mediasession.js",
           "src/components/playback/nowplayinghelper.js",

src/components/packageManager.js

@@ -1,30 +1,94 @@
-define(['appSettings', 'pluginManager'], function (appSettings, pluginManager) {
+import appSettings from 'appSettings';
-    'use strict';
+import pluginManager from 'pluginManager';
+/* eslint-disable indent */
 
-    pluginManager = pluginManager.default || pluginManager;
+    class PackageManager {
+        #packagesList = [];
+        #settingsKey = 'installedpackages1';
 
-    var settingsKey = 'installedpackages1';
+        init() {
+            console.groupCollapsed('loading packages');
+            var manifestUrls = JSON.parse(appSettings.get(this.#settingsKey) || '[]');
 
-    function addPackage(packageManager, pkg) {
+            var instance = this;
-        packageManager.packagesList = packageManager.packagesList.filter(function (p) {
+            return Promise.all(manifestUrls.map((u) => {
+                return this.loadPackage(instance, u);
+            })).then(() => {
+                console.groupEnd('loading packages');
+                return Promise.resolve();
+            }, () => {
+                return Promise.resolve();
+            });
+        }
+
+        get packages() {
+            return this.#packagesList.slice(0);
+        }
+
+        install(url) {
+            return this.loadPackage(this, url, true).then((pkg) => {
+                var manifestUrls = JSON.parse(appSettings.get(this.#settingsKey) || '[]');
+
+                if (!manifestUrls.includes(url)) {
+                    manifestUrls.push(url);
+                    appSettings.set(this.#settingsKey, JSON.stringify(manifestUrls));
+                }
+
+                return pkg;
+            });
+        }
+
+        uninstall(name) {
+            var pkg = this.#packagesList.filter((p) => {
+                return p.name === name;
+            })[0];
+
+            if (pkg) {
+                this.#packagesList = this.#packagesList.filter((p) => {
+                    return p.name !== name;
+                });
+
+                this.removeUrl(pkg.url);
+            }
+
+            return Promise.resolve();
+        }
+
+        mapPath(pkg, pluginUrl) {
+            var urlLower = pluginUrl.toLowerCase();
+            if (urlLower.startsWith('http:') || urlLower.startsWith('https:') || urlLower.startsWith('file:')) {
+                return pluginUrl;
+            }
+
+            var packageUrl = pkg.url;
+            packageUrl = packageUrl.substring(0, packageUrl.lastIndexOf('/'));
+
+            packageUrl += '/';
+            packageUrl += pluginUrl;
+
+            return packageUrl;
+        }
+
+        addPackage(packageManager, pkg) {
+            packageManager.packagesList = packageManager.packagesList.filter((p) => {
                 return p.name !== pkg.name;
             });
 
             packageManager.packagesList.push(pkg);
         }
 
-    function removeUrl(url) {
+        removeUrl(url) {
-        var manifestUrls = JSON.parse(appSettings.get(settingsKey) || '[]');
+            var manifestUrls = JSON.parse(appSettings.get(this.#settingsKey) || '[]');
 
-        manifestUrls = manifestUrls.filter(function (i) {
+            manifestUrls = manifestUrls.filter((i) => {
                 return i !== url;
             });
 
-        appSettings.set(settingsKey, JSON.stringify(manifestUrls));
+            appSettings.set(this.#settingsKey, JSON.stringify(manifestUrls));
         }
 
-    function loadPackage(packageManager, url, throwError) {
+        loadPackage(packageManager, url, throwError) {
-        return new Promise(function (resolve, reject) {
+            return new Promise((resolve, reject) => {
                 var xhr = new XMLHttpRequest();
                 var originalUrl = url;
                 url += url.indexOf('?') === -1 ? '?' : '&';
@@ -32,27 +96,27 @@ define(['appSettings', 'pluginManager'], function (appSettings, pluginManager) {
 
                 xhr.open('GET', url, true);
 
-            var onError = function () {
+                var onError = () => {
                     if (throwError === true) {
                         reject();
                     } else {
-                    removeUrl(originalUrl);
+                        this.removeUrl(originalUrl);
                         resolve();
                     }
                 };
 
-            xhr.onload = function (e) {
+                xhr.onload = (e) => {
                     if (this.status < 400) {
                         var pkg = JSON.parse(this.response);
                         pkg.url = originalUrl;
 
-                    addPackage(packageManager, pkg);
+                        this.addPackage(packageManager, pkg);
 
                         var plugins = pkg.plugins || [];
                         if (pkg.plugin) {
                             plugins.push(pkg.plugin);
                         }
-                    var promises = plugins.map(function (pluginUrl) {
+                        var promises = plugins.map((pluginUrl) => {
                             return pluginManager.loadPlugin(packageManager.mapPath(pkg, pluginUrl));
                         });
                         Promise.all(promises).then(resolve, resolve);
@@ -66,71 +130,8 @@ define(['appSettings', 'pluginManager'], function (appSettings, pluginManager) {
                 xhr.send();
             });
         }
-
-    function PackageManager() {
-        this.packagesList = [];
     }
 
-    PackageManager.prototype.init = function () {
+/* eslint-enable indent */
-        var manifestUrls = JSON.parse(appSettings.get(settingsKey) || '[]');
 
-        var instance = this;
+export default new PackageManager();
-        return Promise.all(manifestUrls.map(function (u) {
-            return loadPackage(instance, u);
-        })).then(function () {
-            return Promise.resolve();
-        }, function () {
-            return Promise.resolve();
-        });
-    };
-
-    PackageManager.prototype.packages = function () {
-        return this.packagesList.slice(0);
-    };
-
-    PackageManager.prototype.install = function (url) {
-        return loadPackage(this, url, true).then(function (pkg) {
-            var manifestUrls = JSON.parse(appSettings.get(settingsKey) || '[]');
-
-            if (manifestUrls.indexOf(url) === -1) {
-                manifestUrls.push(url);
-                appSettings.set(settingsKey, JSON.stringify(manifestUrls));
-            }
-
-            return pkg;
-        });
-    };
-
-    PackageManager.prototype.uninstall = function (name) {
-        var pkg = this.packagesList.filter(function (p) {
-            return p.name === name;
-        })[0];
-
-        if (pkg) {
-            this.packagesList = this.packagesList.filter(function (p) {
-                return p.name !== name;
-            });
-
-            removeUrl(pkg.url);
-        }
-
-        return Promise.resolve();
-    };
-
-    PackageManager.prototype.mapPath = function (pkg, pluginUrl) {
-        var urlLower = pluginUrl.toLowerCase();
-        if (urlLower.indexOf('http:') === 0 || urlLower.indexOf('https:') === 0 || urlLower.indexOf('file:') === 0) {
-            return pluginUrl;
-        }
-
-        var packageUrl = pkg.url;
-        packageUrl = packageUrl.substring(0, packageUrl.lastIndexOf('/'));
-
-        packageUrl += '/';
-        packageUrl += pluginUrl;
-
-        return packageUrl;
-    };
-
-    return new PackageManager();
-});

src/scripts/site.js

@@ -497,7 +497,7 @@ function initClient() {
                     Promise.all(list.map(loadPlugin)).then(function () {
                         console.groupEnd('loading installed plugins');
                         require(['packageManager'], function (packageManager) {
-                            packageManager.init().then(resolve, reject);
+                            packageManager.default.init().then(resolve, reject);
                         });
                     }, reject);
                 });