extension/service: use AppLaunchContext again

Author: amezin

ddterm/shell/extension.js

@@ -237,6 +237,8 @@ class EnabledExtension {
             )
         ));
 
+        const app_info = install(this.extension, rollback);
+
         this.notifications = new Notifications({
             icon: this.symbolic_icon,
             gettext_domain: this.extension,
@@ -249,7 +251,7 @@ class EnabledExtension {
         this.service = new Service({
             bus: Gio.DBus.session,
             bus_name: APP_ID,
-            executable: this.extension.launcher_path,
+            app_info,
             subprocess: this.extension.app_process,
         });
 
@@ -405,8 +407,6 @@ class EnabledExtension {
             this.extension,
             rollback
         );
-
-        install(this.extension, rollback);
     }
 
     #set_skip_taskbar() {

ddterm/shell/service.js

@@ -2,6 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+import GLib from 'gi://GLib';
 import GObject from 'gi://GObject';
 import Gio from 'gi://Gio';
 
@@ -24,12 +25,12 @@ export const Service = GObject.registerClass({
             GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
             null
         ),
-        'executable': GObject.ParamSpec.string(
-            'executable',
+        'app-info': GObject.ParamSpec.object(
+            'app-info',
             null,
             null,
             GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT_ONLY,
-            null
+            Gio.AppInfo
         ),
         'wayland': GObject.ParamSpec.boolean(
             'wayland',
@@ -118,8 +119,8 @@ export const Service = GObject.registerClass({
             this.bus,
             this.bus_name,
             Gio.BusNameWatcherFlags.NONE,
-            (connection, name, owner) => this.#update_bus_name_owner(owner),
-            () => this.#update_bus_name_owner(null)
+            (connection, name, owner) => this.#update_bus_name_owner(name, owner),
+            (connection, name) => this.#update_bus_name_owner(name, null)
         );
     }
 
@@ -169,23 +170,39 @@ export const Service = GObject.registerClass({
     }
 
     #create_subprocess() {
-        const argv = [
-            this.executable,
+        const [, argv] = GLib.shell_parse_argv(this.app_info.get_commandline());
+
+        argv.push(
             '--gapplication-service',
             this.wayland ? '--allowed-gdk-backends=wayland' : '--allowed-gdk-backends=x11',
-            ...this.extra_argv,
-        ];
+            ...this.extra_argv
+        );
+
+        const launch_context = global.create_app_launch_context(0, -1);
+
+        for (const extra_env of this.extra_env) {
+            const split_pos = extra_env.indexOf('=');
+            const name = extra_env.slice(0, split_pos);
+            const value = extra_env.slice(split_pos + 1);
+
+            launch_context.setenv(name, value);
+        }
 
         const params = {
             journal_identifier: this.bus_name,
             argv,
-            environ: this.extra_env,
+            environ: launch_context.get_environment(),
         };
 
-        if (this.wayland)
-            return new WaylandSubprocess(params);
-        else
-            return new Subprocess(params);
+        launch_context.emit('launch-started', this.app_info, null);
+
+        const proc = this.wayland ? new WaylandSubprocess(params) : new Subprocess(params);
+
+        const platform_data = GLib.VariantDict.new(null);
+        platform_data.insert_value('pid', GLib.Variant.new_int32(proc.get_pid()));
+        launch_context.emit('launched', this.app_info, platform_data.end());
+
+        return proc;
     }
 
     async #wait_subprocess(cancellable) {
@@ -202,13 +219,13 @@ export const Service = GObject.registerClass({
         }
     }
 
-    #update_bus_name_owner(owner) {
+    #update_bus_name_owner(name, owner) {
         if (this.#bus_name_owner === owner)
             return;
 
         const prev_registered = this.is_registered;
 
-        log(`${this.bus_name}: name owner changed to ${JSON.stringify(owner)}`);
+        log(`${name}: name owner changed to ${JSON.stringify(owner)}`);
 
         this.#bus_name_owner = owner;
         this.notify('bus-name-owner');

ddterm/shell/subprocess.js

@@ -5,7 +5,6 @@
 import GLib from 'gi://GLib';
 import GObject from 'gi://GObject';
 import Gio from 'gi://Gio';
-import GnomeDesktop from 'gi://GnomeDesktop';
 import Meta from 'gi://Meta';
 
 import Gi from 'gi';
@@ -201,15 +200,9 @@ export const Subprocess = GObject.registerClass({
             ? make_subprocess_launcher_journald(this.journal_identifier)
             : make_subprocess_launcher_fallback();
 
-        for (const extra_env of this.environ) {
-            const split_pos = extra_env.indexOf('=');
-            const name = extra_env.slice(0, split_pos);
-            const value = extra_env.slice(split_pos + 1);
-
-            subprocess_launcher.setenv(name, value, true);
-        }
-
         try {
+            subprocess_launcher.set_environ(this.environ);
+
             this._subprocess = this._spawn(subprocess_launcher);
         } finally {
             subprocess_launcher.close();
@@ -220,18 +213,6 @@ export const Subprocess = GObject.registerClass({
         this._get_logs = logging_to_journald
             ? collect_journald_logs.bind(globalThis, journalctl, start_date, pid)
             : collect_stdio_logs(this._subprocess.get_stdout_pipe()).catch(logError);
-
-        if (!pid)
-            return;
-
-        GnomeDesktop.start_systemd_scope(
-            this.journal_identifier,
-            parseInt(pid, 10),
-            null,
-            null,
-            null,
-            null
-        );
     }
 
     get g_subprocess() {
@@ -265,6 +246,12 @@ export const Subprocess = GObject.registerClass({
         this.g_subprocess.send_signal(SIGTERM);
     }
 
+    get_pid() {
+        const pid = this.g_subprocess.get_identifier();
+
+        return pid ? parseInt(pid, 10) : null;
+    }
+
     get_logs() {
         if (this._get_logs instanceof Function)
             return this._get_logs();