Fix dynamic import troubles, daemon init

GSConnect · Sep 24, 2023 · e53e7c0 · e53e7c0
1 parent b32bf54
commit e53e7c0
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 16 deletions.
diff --git a/src/service/components/contacts.js b/src/service/components/contacts.js
@@ -14,9 +14,9 @@ let EBookContacts = null;
 let EDataServer = null;
 
 try {
-    EBook = await import('gi://EBook');
-    EBookContacts = await import('gi://EBookContacts');
-    EDataServer = await import('gi://EDataServer');
+    EBook = (await import('gi://EBook')).default;
+    EBookContacts = (await import('gi://EBookContacts')).default;
+    EDataServer = (await import('gi://EDataServer')).default;
 } catch (e) {
     HAVE_EDS = false;
 }

diff --git a/src/service/components/index.js b/src/service/components/index.js
@@ -13,7 +13,11 @@ const Default = new Map();
 // Load all components using dynamic import
 const components = {};
 
-const dir = Gio.File.new_for_uri(import.meta.url).get_parent().resolve_relative_path('components');
+// Promisify because prefs also imports this file
+Gio._promisify(Gio.File.prototype, 'enumerate_children_async');
+Gio._promisify(Gio.FileEnumerator.prototype, 'next_files_async');
+
+const dir = Gio.File.new_for_uri(import.meta.url).get_parent();
 const iter = await dir.enumerate_children_async(
     Gio.FILE_ATTRIBUTE_STANDARD_NAME,
     Gio.FileQueryInfoFlags.NOFOLLOW_SYMLINKS,
@@ -24,8 +28,10 @@ iter.close_async(GLib.PRIORITY_DEFAULT, null, null);
 
 for (let i = 0; i < infos.length; i++) {
     const info = infos[i];
-    const name = info.get_name();
-    components[name] = await import(`./components/${name}.js`);
+    const name = info.get_name().replace(/\.js$/, '');
+    if (name === 'index')
+        continue;
+    components[name] = await import(`./${name}.js`);
 }
 
 /**

diff --git a/src/service/components/pulseaudio.js b/src/service/components/pulseaudio.js
@@ -5,7 +5,6 @@
 import GIRepository from 'gi://GIRepository';
 import GLib from 'gi://GLib';
 import GObject from 'gi://GObject';
-import Gvc from 'gi://Gvc';
 
 import Config from '../../config.js';
 
@@ -17,6 +16,8 @@ const typelibDir = GLib.build_filenamev([Config.GNOME_SHELL_LIBDIR, 'gnome-shell
 GIRepository.Repository.prepend_search_path(typelibDir);
 GIRepository.Repository.prepend_library_path(typelibDir);
 
+const Gvc = (await import('gi://Gvc')).default;
+
 
 /**
  * Extend Gvc.MixerStream with a property for returning a user-visible name

diff --git a/src/service/daemon.js b/src/service/daemon.js
@@ -15,10 +15,10 @@ import 'gi://Pango?version=1.0';
 
 import system from 'system';
 
+import './utils/setup.js';
 import Config from '../config.js';
 import Manager from './manager.js';
-import ServiceUI from './ui/service.js';
-import './utils/setup.js';
+import * as ServiceUI from './ui/service.js';
 
 
 /**

diff --git a/src/service/manager.js b/src/service/manager.js
@@ -29,7 +29,7 @@ iter.close_async(GLib.PRIORITY_DEFAULT, null, null);
 
 for (let i = 0; i < infos.length; i++) {
     const info = infos[i];
-    const name = info.get_name();
+    const name = info.get_name().replace(/\.js$/, '');
     backends[name] = await import(`./backends/${name}.js`);
 }
 

diff --git a/src/service/plugins/contacts.js b/src/service/plugins/contacts.js
@@ -14,7 +14,7 @@ import Contacts from '../components/contacts.js';
 let EBookContacts;
 
 try {
-    EBookContacts = await import('gi://EBookContacts');
+    EBookContacts = (await import('gi://EBookContacts')).default;
 } catch (e) {
     EBookContacts = null;
 }

diff --git a/src/service/plugins/index.js b/src/service/plugins/index.js
@@ -20,8 +20,8 @@ iter.close_async(GLib.PRIORITY_DEFAULT, null, null);
 
 for (let i = 0; i < infos.length; i++) {
     const info = infos[i];
-    const name = info.get_name();
-    if (name === 'index.js')
+    const name = info.get_name().replace(/\.js$/, '');
+    if (name === 'index')
         continue;
     plugins[name] = await import(`./${name}.js`);
 }

diff --git a/src/service/utils/setup.js b/src/service/utils/setup.js
@@ -14,8 +14,8 @@ import setup, {setupGettext} from '../../utils/setup.js';
 
 // Promise Wrappers
 try {
-    const EBook = await import('gi://EBook');
-    const EDataServer = await import('gi://EDataServer');
+    const EBook = (await import('gi://EBook')).default;
+    const EDataServer = (await import('gi://EDataServer')).default;
 
     Gio._promisify(EBook.BookClient, 'connect');
     Gio._promisify(EBook.BookClient.prototype, 'get_view');
@@ -60,7 +60,10 @@ Config.RUNTIMEDIR = GLib.build_filenamev([GLib.get_user_runtime_dir(), 'gsconnec
 
 
 // Bootstrap
-setup(Config.PACKAGE_DATADIR);
+const utilsFolder = GLib.path_get_dirname(GLib.filename_from_uri(import.meta.url)[0]);
+const serviceFolder = GLib.path_get_dirname(utilsFolder);
+const extensionFolder = GLib.path_get_dirname(serviceFolder);
+setup(extensionFolder);
 setupGettext();
 
 if (Config.IS_USER) {