Merge pull request #233 from KKoukiou/more-cleanups

More code refactoring and cleanups
rhinstaller · Mar 26, 2024 · 31eb5b8 · 31eb5b8
2 parents a4354b9 + 5f704e5
commit 31eb5b8
Show file tree

Hide file tree

Showing 18 changed files with 403 additions and 344 deletions.
diff --git a/src/apis/index.js b/src/apis/index.js
@@ -0,0 +1,17 @@
+import { BossClient } from "./boss.js";
+import { LocalizationClient } from "./localization.js";
+import { NetworkClient } from "./network.js";
+import { PayloadsClient } from "./payloads";
+import { RuntimeClient } from "./runtime";
+import { StorageClient } from "./storage.js";
+import { UsersClient } from "./users";
+
+export const clients = [
+    BossClient,
+    LocalizationClient,
+    NetworkClient,
+    PayloadsClient,
+    RuntimeClient,
+    StorageClient,
+    UsersClient
+];
diff --git a/src/apis/localization.js b/src/apis/localization.js
@@ -36,7 +36,7 @@ const getProperty = (...args) => {
 };
 
 export class LocalizationClient {
-    constructor (address) {
+    constructor (address, dispatch) {
         if (LocalizationClient.instance && (!address || LocalizationClient.instance.address === address)) {
             return LocalizationClient.instance;
         }
@@ -50,10 +50,38 @@ export class LocalizationClient {
             { address, bus: "none", superuser: "try" }
         );
         this.address = address;
+        this.dispatch = dispatch;
     }
 
-    init () {
+    async init () {
         this.client.addEventListener("close", () => console.error("Localization client closed"));
+
+        this.startEventMonitor();
+
+        await this.initData();
+    }
+
+    async initData () {
+        await this.dispatch(getLanguageAction());
+        await this.dispatch(getLanguagesAction());
+    }
+
+    startEventMonitor () {
+        this.client.subscribe(
+            { },
+            (path, iface, signal, args) => {
+                switch (signal) {
+                case "PropertiesChanged":
+                    if (args[0] === INTERFACE_NAME && Object.hasOwn(args[1], "Language")) {
+                        this.dispatch(getLanguageAction());
+                    } else {
+                        debug(`Unhandled signal on ${path}: ${iface}.${signal}`, JSON.stringify(args));
+                    }
+                    break;
+                default:
+                    debug(`Unhandled signal on ${path}: ${iface}.${signal}`, JSON.stringify(args));
+                }
+            });
     }
 }
 
@@ -111,28 +139,3 @@ export const getLocaleData = ({ locale }) => {
 export const setLanguage = ({ lang }) => {
     return setProperty("Language", cockpit.variant("s", lang));
 };
-
-export const startEventMonitorLocalization = ({ dispatch }) => {
-    return new LocalizationClient().client.subscribe(
-        { },
-        (path, iface, signal, args) => {
-            switch (signal) {
-            case "PropertiesChanged":
-                if (args[0] === INTERFACE_NAME && Object.hasOwn(args[1], "Language")) {
-                    dispatch(getLanguageAction());
-                } else {
-                    debug(`Unhandled signal on ${path}: ${iface}.${signal}`, JSON.stringify(args));
-                }
-                break;
-            default:
-                debug(`Unhandled signal on ${path}: ${iface}.${signal}`, JSON.stringify(args));
-            }
-        });
-};
-
-export const initDataLocalization = ({ dispatch }) => {
-    return Promise.all([
-        dispatch(getLanguageAction()),
-        dispatch(getLanguagesAction())
-    ]);
-};
diff --git a/src/apis/network.js b/src/apis/network.js
@@ -30,7 +30,7 @@ const getProperty = (...args) => {
 };
 
 export class NetworkClient {
-    constructor (address) {
+    constructor (address, dispatch) {
         if (NetworkClient.instance && (!address || NetworkClient.instance.address === address)) {
             return NetworkClient.instance;
         }
@@ -44,10 +44,38 @@ export class NetworkClient {
             { address, bus: "none", superuser: "try" }
         );
         this.address = address;
+        this.dispatch = dispatch;
     }
 
-    init () {
+    async init () {
         this.client.addEventListener("close", () => console.error("Network client closed"));
+
+        this.startEventMonitor();
+
+        await this.initData();
+    }
+
+    async initData () {
+        await this.dispatch(getConnectedAction());
+    }
+
+    startEventMonitor () {
+        this.client.subscribe(
+            { },
+            (path, iface, signal, args) => {
+                switch (signal) {
+                case "PropertiesChanged":
+                    if (args[0] === INTERFACE_NAME && Object.hasOwn(args[1], "Connected")) {
+                        this.dispatch(getConnectedAction());
+                    } else {
+                        debug(`Unhandled signal on ${path}: ${iface}.${signal}`, JSON.stringify(args));
+                    }
+                    break;
+                default:
+                    debug(`Unhandled signal on ${path}: ${iface}.${signal}`, JSON.stringify(args));
+                }
+            }
+        );
     }
 }
 
@@ -57,28 +85,3 @@ export class NetworkClient {
 export const getConnected = () => {
     return getProperty("Connected");
 };
-
-export const startEventMonitorNetwork = ({ dispatch }) => {
-    return new NetworkClient().client.subscribe(
-        { },
-        (path, iface, signal, args) => {
-            switch (signal) {
-            case "PropertiesChanged":
-                if (args[0] === INTERFACE_NAME && Object.hasOwn(args[1], "Connected")) {
-                    dispatch(getConnectedAction());
-                } else {
-                    debug(`Unhandled signal on ${path}: ${iface}.${signal}`, JSON.stringify(args));
-                }
-                break;
-            default:
-                debug(`Unhandled signal on ${path}: ${iface}.${signal}`, JSON.stringify(args));
-            }
-        }
-    );
-};
-
-export const initDataNetwork = ({ dispatch }) => {
-    return Promise.all([
-        dispatch(getConnectedAction())
-    ]);
-};
diff --git a/src/apis/payloads.js b/src/apis/payloads.js
@@ -26,7 +26,7 @@ const callClient = (...args) => {
 };
 
 export class PayloadsClient {
-    constructor (address) {
+    constructor (address, dispatch) {
         if (PayloadsClient.instance && (!address || PayloadsClient.instance.address === address)) {
             return PayloadsClient.instance;
         }
@@ -40,6 +40,7 @@ export class PayloadsClient {
             { address, bus: "none", superuser: "try" }
         );
         this.address = address;
+        this.dispatch = dispatch;
     }
 
     init () {

diff --git a/src/apis/runtime.js b/src/apis/runtime.js
@@ -30,7 +30,7 @@ const getProperty = (...args) => {
 };
 
 export class RuntimeClient {
-    constructor (address) {
+    constructor (address, dispatch) {
         if (RuntimeClient.instance && (!address || RuntimeClient.instance.address === address)) {
             return RuntimeClient.instance;
         }
@@ -44,12 +44,40 @@ export class RuntimeClient {
             { address, bus: "none", superuser: "try" }
         );
         this.address = address;
+        this.dispatch = dispatch;
     }
 
-    init () {
+    async init () {
         this.client.addEventListener(
             "close", () => console.error("Runtime client closed")
         );
+
+        this.startEventMonitor();
+
+        await this.initData();
+    }
+
+    startEventMonitor () {
+        this.client.subscribe(
+            { },
+            (path, iface, signal, args) => {
+                switch (signal) {
+                case "PropertiesChanged":
+                    if (args[0] === INTERFACE_NAME && Object.hasOwn(args[1], "PasswordPolicies")) {
+                        this.dispatch(getPasswordPoliciesAction());
+                    } else {
+                        debug(`Unhandled signal on ${path}: ${iface}.${signal}`, JSON.stringify(args));
+                    }
+                    break;
+                default:
+                    debug(`Unhandled signal on ${path}: ${iface}.${signal}`, JSON.stringify(args));
+                }
+            }
+        );
+    }
+
+    async initData () {
+        await this.dispatch(getPasswordPoliciesAction());
     }
 }
 
@@ -68,28 +96,3 @@ export const getIsFinal = () => {
 export const getPasswordPolicies = () => {
     return getProperty("PasswordPolicies");
 };
-
-export const startEventMonitorRuntime = ({ dispatch }) => {
-    return new RuntimeClient().client.subscribe(
-        { },
-        (path, iface, signal, args) => {
-            switch (signal) {
-            case "PropertiesChanged":
-                if (args[0] === INTERFACE_NAME && Object.hasOwn(args[1], "PasswordPolicies")) {
-                    dispatch(getPasswordPoliciesAction());
-                } else {
-                    debug(`Unhandled signal on ${path}: ${iface}.${signal}`, JSON.stringify(args));
-                }
-                break;
-            default:
-                debug(`Unhandled signal on ${path}: ${iface}.${signal}`, JSON.stringify(args));
-            }
-        }
-    );
-};
-
-export const initDataRuntime = ({ dispatch }) => {
-    return Promise.all([
-        dispatch(getPasswordPoliciesAction())
-    ]);
-};
diff --git a/src/apis/storage.js b/src/apis/storage.js
@@ -39,7 +39,7 @@ const getProperty = (...args) => {
 };
 
 export class StorageClient {
-    constructor (address) {
+    constructor (address, dispatch) {
         if (StorageClient.instance && (!address || StorageClient.instance.address === address)) {
             return StorageClient.instance;
         }
@@ -53,10 +53,53 @@ export class StorageClient {
             { address, bus: "none", superuser: "try" }
         );
         this.address = address;
+        this.dispatch = dispatch;
     }
 
-    init () {
+    async init () {
         this.client.addEventListener("close", () => console.error("Storage client closed"));
+
+        this.startEventMonitor();
+
+        await this.initData();
+    }
+
+    startEventMonitor () {
+        this.client.subscribe(
+            { },
+            (path, iface, signal, args) => {
+                switch (signal) {
+                case "PropertiesChanged":
+                    if (args[0] === "org.fedoraproject.Anaconda.Modules.Storage.DiskSelection") {
+                        this.dispatch(getDiskSelectionAction());
+                    } else if (args[0] === "org.fedoraproject.Anaconda.Modules.Storage.Partitioning.Manual" && Object.hasOwn(args[1], "Requests")) {
+                        this.dispatch(getPartitioningDataAction({ partitioning: path, requests: args[1].Requests.v }));
+                    } else if (args[0] === "org.fedoraproject.Anaconda.Modules.Storage.Partitioning.Automatic" && Object.hasOwn(args[1], "Request")) {
+                        this.dispatch(getPartitioningDataAction({ partitioning: path, requests: [args[1].Request.v] }));
+                    } else if (args[0] === INTERFACE_NAME && Object.hasOwn(args[1], "CreatedPartitioning")) {
+                        const last = args[1].CreatedPartitioning.v.length - 1;
+                        this.dispatch(getPartitioningDataAction({ partitioning: args[1].CreatedPartitioning.v[last] }));
+                    } else {
+                        debug(`Unhandled signal on ${path}: ${iface}.${signal} ${JSON.stringify(args)}`);
+                    }
+                    break;
+                default:
+                    debug(`Unhandled signal on ${path}: ${iface}.${signal} ${JSON.stringify(args)}`);
+                }
+            });
+    }
+
+    async initData () {
+        this.dispatch(setStorageScenarioAction(window.localStorage.getItem("storage-scenario-id") || getDefaultScenario().id));
+
+        const partitioning = await getProperty("CreatedPartitioning");
+        if (partitioning.length !== 0) {
+            for (const path of partitioning) {
+                await this.dispatch(getPartitioningDataAction({ partitioning: path }));
+            }
+        }
+        await this.dispatch(getDevicesAction());
+        await this.dispatch(getDiskSelectionAction());
     }
 }
 
@@ -96,41 +139,3 @@ export const runStorageTask = ({ onFail, onSuccess, task }) => {
 export const scanDevicesWithTask = () => {
     return callClient("ScanDevicesWithTask", []);
 };
-
-export const startEventMonitorStorage = ({ dispatch }) => {
-    return new StorageClient().client.subscribe(
-        { },
-        (path, iface, signal, args) => {
-            switch (signal) {
-            case "PropertiesChanged":
-                if (args[0] === "org.fedoraproject.Anaconda.Modules.Storage.DiskSelection") {
-                    dispatch(getDiskSelectionAction());
-                } else if (args[0] === "org.fedoraproject.Anaconda.Modules.Storage.Partitioning.Manual" && Object.hasOwn(args[1], "Requests")) {
-                    dispatch(getPartitioningDataAction({ partitioning: path, requests: args[1].Requests.v }));
-                } else if (args[0] === "org.fedoraproject.Anaconda.Modules.Storage.Partitioning.Automatic" && Object.hasOwn(args[1], "Request")) {
-                    dispatch(getPartitioningDataAction({ partitioning: path, requests: [args[1].Request.v] }));
-                } else if (args[0] === INTERFACE_NAME && Object.hasOwn(args[1], "CreatedPartitioning")) {
-                    const last = args[1].CreatedPartitioning.v.length - 1;
-                    dispatch(getPartitioningDataAction({ partitioning: args[1].CreatedPartitioning.v[last] }));
-                } else {
-                    debug(`Unhandled signal on ${path}: ${iface}.${signal} ${JSON.stringify(args)}`);
-                }
-                break;
-            default:
-                debug(`Unhandled signal on ${path}: ${iface}.${signal} ${JSON.stringify(args)}`);
-            }
-        });
-};
-
-export const initDataStorage = ({ dispatch }) => {
-    dispatch(setStorageScenarioAction(window.localStorage.getItem("storage-scenario-id") || getDefaultScenario().id));
-
-    return getProperty("CreatedPartitioning")
-            .then(res => {
-                if (res.length !== 0) {
-                    return Promise.all(res.map(path => dispatch(getPartitioningDataAction({ partitioning: path }))));
-                }
-            })
-            .then(() => dispatch(getDevicesAction()))
-            .then(() => dispatch(getDiskSelectionAction()));
-};
diff --git a/src/apis/users.js b/src/apis/users.js
@@ -30,7 +30,7 @@ const callClient = (...args) => {
 };
 
 export class UsersClient {
-    constructor (address) {
+    constructor (address, dispatch) {
         if (UsersClient.instance && (!address || UsersClient.instance.address === address)) {
             return UsersClient.instance;
         }
@@ -44,6 +44,7 @@ export class UsersClient {
             { address, bus: "none", superuser: "try" }
         );
         this.address = address;
+        this.dispatch = dispatch;
     }
 
     init () {