fixing async errors take 1

fufexan · Dec 27, 2023 · 34e1a8e · 34e1a8e
1 parent 09bd0c9
commit 34e1a8e
Show file tree

Hide file tree

Showing 21 changed files with 298 additions and 258 deletions.
diff --git a/home/services/ags/config.js b/home/services/ags/config.js
@@ -9,15 +9,9 @@ const css = App.configDir + "/style.css";
 
 Utils.exec(`sass ${scss} ${css}`);
 
+App.connect("config-parsed", () => print("config parsed"));
 export default {
   style: css,
-  windows: [
-    SystemMenu,
-    Music,
-    Osd,
-    Bar,
-  ],
-
   closeWindowDelay: {
     "system-menu": 200,
   },
@@ -31,3 +25,18 @@ function reloadCss() {
 }
 
 Utils.monitorFile(`${App.configDir}/style`, reloadCss, "directory");
+
+function addWindows(windows) {
+  windows.forEach((win) => App.addWindow(win));
+}
+
+Utils.idle(() =>
+  addWindows(
+    [
+      Bar(),
+      Music(),
+      Osd(),
+      SystemMenu(),
+    ],
+  )
+);
diff --git a/home/services/ags/imports.js b/home/services/ags/imports.js
@@ -1,26 +1,37 @@
-// Helpers
-export const resource = (file) => `resource:///com/github/Aylur/ags/${file}.js`;
-export const require = async (file) => (await import(resource(file))).default;
-export const requireCustom = async (path) => (await import(path)).default;
-export const service = async (file) => await require(`service/${file}`);
-
 // Required components
-export const App = await require("app");
-export const GLib = await requireCustom("gi://GLib");
-export const Service = await require("service");
-export const Utils = await import(resource("utils"));
-export const Variable = await require("variable");
-export const Widget = await require("widget");
+import App from "resource:///com/github/Aylur/ags/app.js";
+import GLib from "gi://GLib";
+import * as Utils from "resource:///com/github/Aylur/ags/utils.js";
+import Service from "resource:///com/github/Aylur/ags/service.js";
+import Variable from "resource:///com/github/Aylur/ags/variable.js";
+import Widget from "resource:///com/github/Aylur/ags/widget.js";
 
 // Services
-export const Audio = await service("audio");
-export const Battery = await service("battery");
-export const Bluetooth = await service("bluetooth");
-export const Hyprland = await service("hyprland");
-export const Mpris = await service("mpris");
-export const Network = await service("network");
-export const PowerProfiles = await service("powerprofiles");
-export const SystemTray = await service("systemtray");
+import Audio from "resource:///com/github/Aylur/ags/service/audio.js";
+import Battery from "resource:///com/github/Aylur/ags/service/battery.js";
+import Bluetooth from "resource:///com/github/Aylur/ags/service/bluetooth.js";
+import Hyprland from "resource:///com/github/Aylur/ags/service/hyprland.js";
+import Mpris from "resource:///com/github/Aylur/ags/service/mpris.js";
+import Network from "resource:///com/github/Aylur/ags/service/network.js";
+import PowerProfiles from "resource:///com/github/Aylur/ags/service/powerprofiles.js";
+import SystemTray from "resource:///com/github/Aylur/ags/service/systemtray.js";
+
+import Icons from "./utils/icons.js";
 
-// My definitions
-export const Icons = await requireCustom("./utils/icons.js");
+export {
+  App,
+  Audio,
+  Battery,
+  Bluetooth,
+  GLib,
+  Hyprland,
+  Icons,
+  Mpris,
+  Network,
+  PowerProfiles,
+  Service,
+  SystemTray,
+  Utils,
+  Variable,
+  Widget,
+};
diff --git a/home/services/ags/services/brightness.js b/home/services/ags/services/brightness.js
@@ -76,7 +76,4 @@ class BrightnessService extends Service {
 
 const service = new BrightnessService();
 
-// make it global for easy use with cli
-globalThis.brightness = service;
-
 export default service;
diff --git a/home/services/ags/utils/mpris.js b/home/services/ags/utils/mpris.js
@@ -1,4 +1,5 @@
-import { GLib, Icons, Utils } from "../imports.js";
+import { Icons, Utils } from "../imports.js";
+import GLib from "gi://GLib";
 
 export const mprisStateIcon = (status) => {
   const state = status == "Playing" ? "pause" : "play";

diff --git a/home/services/ags/utils/popup_window.js b/home/services/ags/utils/popup_window.js
@@ -1,4 +1,5 @@
-import { App, Widget } from "../imports.js";
+import App from "resource:///com/github/Aylur/ags/app.js";
+import { Widget } from "../imports.js";
 const { Box, Revealer, Window } = Widget;
 
 export default (

diff --git a/home/services/ags/windows/bar/main.js b/home/services/ags/windows/bar/main.js
@@ -8,39 +8,40 @@ import CpuRam from "./modules/cpu_ram.js";
 import Tray from "./modules/tray.js";
 import Workspaces from "./modules/workspaces.js";
 
-const SystemInfo = Widget.EventBox({
-  className: "system-menu-toggler",
-  onPrimaryClick: () => App.toggleWindow("system-menu"),
+const SystemInfo = () =>
+  Widget.EventBox({
+    className: "system-menu-toggler",
+    onPrimaryClick: () => App.toggleWindow("system-menu"),
 
-  child: Widget.Box({
-    children: [
-      Net,
-      Bluetooth,
-      Battery,
-    ],
-  }),
-})
-  .hook(
-    App,
-    (self, window, visible) => {
-      if (window === "system-menu") {
-        self.toggleClassName("active", visible);
-      }
-    },
-  );
+    child: Widget.Box({
+      children: [
+        Net(),
+        Bluetooth(),
+        Battery(),
+      ],
+    }),
+  })
+    .hook(
+      App,
+      (self, window, visible) => {
+        if (window === "system-menu") {
+          self.toggleClassName("active", visible);
+        }
+      },
+    );
 
 const Start = Widget.Box({
   hexpand: true,
   hpack: "start",
   children: [
-    Workspaces,
+    Workspaces(),
     // Indicators
   ],
 });
 
 const Center = Widget.Box({
   children: [
-    Music,
+    Music(),
   ],
 });
 
@@ -49,24 +50,25 @@ const End = Widget.Box({
   hpack: "end",
 
   children: [
-    Tray,
-    CpuRam,
-    SystemInfo,
-    Date,
+    Tray(),
+    CpuRam(),
+    SystemInfo(),
+    Date(),
   ],
 });
 
-export default Widget.Window({
-  monitor: 0,
-  name: `bar`,
-  anchor: ["top", "left", "right"],
-  exclusivity: "exclusive",
+export default () =>
+  Widget.Window({
+    monitor: 0,
+    name: `bar`,
+    anchor: ["top", "left", "right"],
+    exclusivity: "exclusive",
 
-  child: Widget.CenterBox({
-    className: "bar",
+    child: Widget.CenterBox({
+      className: "bar",
 
-    startWidget: Start,
-    centerWidget: Center,
-    endWidget: End,
-  }),
-});
+      startWidget: Start,
+      centerWidget: Center,
+      endWidget: End,
+    }),
+  });
diff --git a/home/services/ags/windows/bar/modules/battery.js b/home/services/ags/windows/bar/modules/battery.js
@@ -1,5 +1,6 @@
 import { Battery, Widget } from "../../../imports.js";
 
-export default Widget.Icon({ className: "battery module" })
-  .bind("icon", Battery, "icon-name")
-  .bind("tooltip-text", Battery, "percent", (p) => `Battery on ${p}%`);
+export default () =>
+  Widget.Icon({ className: "battery module" })
+    .bind("icon", Battery, "icon-name")
+    .bind("tooltip-text", Battery, "percent", (p) => `Battery on ${p}%`);
diff --git a/home/services/ags/windows/bar/modules/bluetooth.js b/home/services/ags/windows/bar/modules/bluetooth.js
@@ -4,6 +4,7 @@ import {
   getBluetoothText,
 } from "../../../utils/bluetooth.js";
 
-export default Widget.Icon({ className: "bluetooth module" })
-  .bind("icon", Bluetooth, "connected-devices", getBluetoothIcon)
-  .bind("tooltip-text", Bluetooth, "connected-devices", getBluetoothText);
+export default () =>
+  Widget.Icon({ className: "bluetooth module" })
+    .bind("icon", Bluetooth, "connected-devices", getBluetoothIcon)
+    .bind("tooltip-text", Bluetooth, "connected-devices", getBluetoothText);
diff --git a/home/services/ags/windows/bar/modules/cpu_ram.js b/home/services/ags/windows/bar/modules/cpu_ram.js
@@ -40,11 +40,12 @@ const ram = {
       .catch((err) => print(err)),
 };
 
-export default Widget.Box({
-  className: "system-info module",
+export default () =>
+  Widget.Box({
+    className: "system-info module",
 
-  children: [
-    Indicator(cpu),
-    Indicator(ram),
-  ],
-});
+    children: [
+      Indicator(cpu),
+      Indicator(ram),
+    ],
+  });
diff --git a/home/services/ags/windows/bar/modules/date.js b/home/services/ags/windows/bar/modules/date.js
@@ -1,12 +1,13 @@
 import { Utils, Widget } from "../../../imports.js";
 
-export default Widget.EventBox({
-  child: Widget.Label({ className: "date module" })
-    .poll(
-      1000,
-      (self) =>
-        Utils.execAsync(["date", "+%a %b %d  %H:%M"]).then((r) =>
-          self.label = r
-        ),
-    ),
-});
+export default () =>
+  Widget.EventBox({
+    child: Widget.Label({ className: "date module" })
+      .poll(
+        1000,
+        (self) =>
+          Utils.execAsync(["date", "+%a %b %d  %H:%M"]).then((r) =>
+            self.label = r
+          ),
+      ),
+  });
diff --git a/home/services/ags/windows/bar/modules/music.js b/home/services/ags/windows/bar/modules/music.js
@@ -1,4 +1,5 @@
-import { App, Mpris, Widget } from "../../../imports.js";
+import { Mpris, Widget } from "../../../imports.js";
+import App from "resource:///com/github/Aylur/ags/app.js";
 
 const Cover = (player) =>
   Widget.Box({ className: "cover" })
@@ -26,20 +27,21 @@ export const MusicBox = (player) =>
     ],
   });
 
-export default Widget.EventBox({
-  className: "music",
-  onPrimaryClick: () => App.toggleWindow("music"),
-})
-  .hook(
-    App,
-    (self, window, visible) => {
-      if (window === "music") {
-        self.toggleClassName("active", visible);
-      }
-    },
-  )
-  .bind("visible", Mpris, "players", (p) => p.length > 0)
-  .bind("child", Mpris, "players", (players) => {
-    if (players.length == 0) return Widget.Box();
-    return MusicBox(players[0]);
-  });
+export default () =>
+  Widget.EventBox({
+    className: "music",
+    onPrimaryClick: () => App.toggleWindow("music"),
+  })
+    .hook(
+      App,
+      (self, window, visible) => {
+        if (window === "music") {
+          self.toggleClassName("active", visible);
+        }
+      },
+    )
+    .bind("visible", Mpris, "players", (p) => p.length > 0)
+    .bind("child", Mpris, "players", (players) => {
+      if (players.length == 0) return Widget.Box();
+      return MusicBox(players[0]);
+    });
diff --git a/home/services/ags/windows/bar/modules/net.js b/home/services/ags/windows/bar/modules/net.js
@@ -1,16 +1,17 @@
 import { Network, Widget } from "../../../imports.js";
 import { getNetIcon, getNetText } from "../../../utils/net.js";
 
-export default Widget.Icon({ className: "net module" })
-  .bind(
-    "icon",
-    Network,
-    "connectivity",
-    getNetIcon,
-  )
-  .bind(
-    "tooltip-text",
-    Network,
-    "connectivity",
-    getNetText,
-  );
+export default () =>
+  Widget.Icon({ className: "net module" })
+    .bind(
+      "icon",
+      Network,
+      "connectivity",
+      getNetIcon,
+    )
+    .bind(
+      "tooltip-text",
+      Network,
+      "connectivity",
+      getNetText,
+    );
diff --git a/home/services/ags/windows/bar/modules/tray.js b/home/services/ags/windows/bar/modules/tray.js
@@ -38,5 +38,6 @@ const Item = (item) =>
       ),
   });
 
-export default Widget.Box({ className: "tray module" })
-  .bind("children", SystemTray, "items", (items) => items.map(Item));
+export default () =>
+  Widget.Box({ className: "tray module" })
+    .bind("children", SystemTray, "items", (items) => items.map(Item));