gestament 0.3.0 → 0.4.0

package/dist/{launchGtkApp-qi1qm5G4.js → launchGtkApp-Bst1BFbD.js}

@@ -7,7 +7,7 @@ import { tmpdir } from "node:os";
 import { join, resolve, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { a as appendPrerequisiteInstallHint } from "./prerequisites-JB0SKPVd.js";
-import { c as nativeElementInfo, d as nativeClick, e as nativeImageInfo, f as nativeCaptureBounds, g as nativeTableDeselectColumn, h as nativeTableSelectColumn, i as nativeTableDeselectRow, j as nativeTableSelectRow, k as nativeTableIsCellSelected, l as nativeTableIsColumnSelected, m as nativeTableIsRowSelected, o as nativeTableSelectedColumns, p as nativeTableSelectedRows, q as nativeTableColumnCount, r as nativeTableRowCount, s as nativeClearSelection, t as nativeSelectAllChildren, u as nativeDeselectChildAt, v as nativeSelectChildAt, w as nativeIsChildSelected, x as nativeSelectedChildAt, y as nativeSelectedChildCount, z as nativeChildCount, A as nativeChildAt, B as nativeValueInfo, C as nativeSetValue, D as nativeText, E as nativeSetText, F as nativeCapture, G as nativeTableCellAt, H as nativeFindAnyById, I as nativeTrayItems, J as nativeWindowCount, K as nativeWindowAt, a as nativeCaptureScreen, L as nativeFindById, M as nativeProcessAtspiReadiness } from "./native-CWdUmdty.js";
+import { c as nativeElementInfo, d as nativeClick, e as nativeImageInfo, f as nativeCaptureBounds, g as nativeTableDeselectColumn, h as nativeTableSelectColumn, i as nativeTableDeselectRow, j as nativeTableSelectRow, k as nativeTableIsCellSelected, l as nativeTableIsColumnSelected, m as nativeTableIsRowSelected, o as nativeTableSelectedColumns, p as nativeTableSelectedRows, q as nativeTableColumnCount, r as nativeTableRowCount, s as nativeClearSelection, t as nativeSelectAllChildren, u as nativeDeselectChildAt, v as nativeSelectChildAt, w as nativeIsChildSelected, x as nativeSelectedChildAt, y as nativeSelectedChildCount, z as nativeChildCount, A as nativeChildAt, B as nativeValueInfo, C as nativeSetValue, D as nativeText, E as nativeSetText, F as nativeX11Info, G as nativeResizeHints, H as nativeBounds, I as nativeCapture, J as nativeTableCellAt, K as nativeFindAnyById, L as nativeTrayItems, M as nativeWindowCount, N as nativeWindowAt, a as nativeCaptureScreen, O as nativeFindById, P as nativeProcessAtspiReadiness } from "./native-C6MsIBNF.js";
 const defaultDisplay = "xvfb";
 const defaultGSettings = "memory";
 const defaultTheme = "Adwaita";
@@ -22,6 +22,17 @@ const xvfbStartupTimeoutMs = 1e4;
 const xvfbPoolProbeTimeoutMs = 5e3;
 const firstPooledDisplayNumber = 90;
 const lastPooledDisplayNumber = 590;
+const sessionOwnedEnvironmentKeys = [
+  "DISPLAY",
+  "WAYLAND_DISPLAY",
+  "GDK_BACKEND",
+  "DBUS_SESSION_BUS_ADDRESS",
+  "AT_SPI_BUS_ADDRESS",
+  "NO_AT_BRIDGE",
+  "XAUTHORITY",
+  "GESTAMENT_XVFB_ACTIVE",
+  "XDG_SESSION_TYPE"
+];
 let socketCounter = 0;
 const leasedDisplayNumbers = /* @__PURE__ */ new Set();
 const idleXvfbByKey = /* @__PURE__ */ new Map();
@@ -311,12 +322,34 @@ const toWireEnvironment = (env) => {
   }
   return wireEnv;
 };
-const resolveLauncherEnvironment = (options, effective) => toWireEnvironment({
-  GDK_BACKEND: resolveGdkBackend(effective),
-  GSETTINGS_BACKEND: options.gsettings === null ? void 0 : options.gsettings ?? defaultGSettings,
-  GTK_THEME: options.theme === null ? void 0 : options.theme ?? defaultTheme,
-  ...options.env
-});
+const wireEnvironmentToGtkAppEnvironment = (env) => {
+  const appEnv = {};
+  for (const [key, value] of Object.entries(env)) {
+    appEnv[key] = value === null ? void 0 : value;
+  }
+  return appEnv;
+};
+const assertNoSessionOwnedEnvironmentOverrides = (options, effective) => {
+  if (effective.kind !== "xvfb" || options.env === void 0) {
+    return;
+  }
+  for (const key of sessionOwnedEnvironmentKeys) {
+    if (Object.hasOwn(options.env, key)) {
+      throw createGtkInvalidArgumentError(
+        `options.env must not override ${key} when using internal Xvfb.`
+      );
+    }
+  }
+};
+const resolveLauncherEnvironment = (options, effective) => {
+  assertNoSessionOwnedEnvironmentOverrides(options, effective);
+  return toWireEnvironment({
+    GDK_BACKEND: resolveGdkBackend(effective),
+    GSETTINGS_BACKEND: options.gsettings === null ? void 0 : options.gsettings ?? defaultGSettings,
+    GTK_THEME: options.theme === null ? void 0 : options.theme ?? defaultTheme,
+    ...options.env
+  });
+};
 const resolveDriverPath = () => {
   const driverPath = resolve(
     dirname(fileURLToPath(import.meta.url)),
@@ -350,11 +383,17 @@ const createDriverEnvironment = (effective, xvfb) => {
   delete env.AT_SPI_BUS_ADDRESS;
   delete env.NO_AT_BRIDGE;
   if (effective.kind === "xvfb") {
+    delete env.DBUS_SESSION_BUS_ADDRESS;
+    delete env.DISPLAY;
+    delete env.WAYLAND_DISPLAY;
+    delete env.AT_SPI_BUS_ADDRESS;
+    delete env.NO_AT_BRIDGE;
+    delete env.XAUTHORITY;
     env.GDK_BACKEND = "x11";
     env.GESTAMENT_XVFB_ACTIVE = "1";
+    env.XDG_SESSION_TYPE = "x11";
     if (xvfb !== void 0) {
       env.DISPLAY = xvfb.display;
-      delete env.XAUTHORITY;
     }
   }
   return env;
@@ -528,12 +567,20 @@ const runXvfbProbe = (xvfb) => new Promise((resolveProbe, rejectProbe) => {
   const probePath = resolveXvfbPoolProbePath();
   const stdout = [];
   const stderr = [];
+  const env = {
+    ...process.env,
+    DISPLAY: xvfb.display,
+    GDK_BACKEND: "x11",
+    GESTAMENT_XVFB_ACTIVE: "1",
+    XDG_SESSION_TYPE: "x11"
+  };
+  delete env.AT_SPI_BUS_ADDRESS;
+  delete env.DBUS_SESSION_BUS_ADDRESS;
+  delete env.NO_AT_BRIDGE;
+  delete env.WAYLAND_DISPLAY;
+  delete env.XAUTHORITY;
   const child = spawn(process.execPath, [probePath], {
-    env: {
-      ...process.env,
-      DISPLAY: xvfb.display,
-      GDK_BACKEND: "x11"
-    },
+    env,
     stdio: ["ignore", "pipe", "pipe"]
   });
   const timeout = setTimeout(() => {
@@ -1082,6 +1129,14 @@ const createLaunchPayload = (options, args) => {
     timeoutMs: options.timeoutMs ?? null
   };
 };
+const createEnvironmentPayload = (options) => {
+  const display = resolveDisplay(options.display);
+  const xvfb = resolveXvfbOptions(options);
+  const effective = resolveEffectiveDisplay(display, xvfb);
+  return {
+    env: resolveLauncherEnvironment(options, effective)
+  };
+};
 const elementRefToProxy = (session, ref) => ref === null ? void 0 : createProxyGtkElement(session, ref);
 const trayRefToProxy = (session, ref) => ref === null ? void 0 : createProxyGtkTrayItem(session, ref);
 const createProxyGtkApp = (session, ref) => {
@@ -1107,6 +1162,9 @@ const createProxyGtkApp = (session, ref) => {
   };
   const app = {
     capture: async () => decodeCapture(await appRequest("app.capture")),
+    environment: async () => wireEnvironmentToGtkAppEnvironment(
+      await appRequest("app.environment")
+    ),
     findById: async (id) => elementRefToProxy(
       session,
       await appRequest("app.findById", { id })
@@ -1219,6 +1277,13 @@ const createProxyGtkElement = (session, ref) => {
   };
   switch (ref.kind) {
     case "window":
+      target.bounds = () => session.request("element.bounds", { elementId });
+      target.resizeHints = () => session.request("window.resizeHints", {
+        elementId
+      });
+      target.x11Info = () => session.request("window.x11Info", { elementId });
+      addChildContainerProxyOperations(session, elementId, target);
+      break;
     case "container":
     case "menu":
       addChildContainerProxyOperations(session, elementId, target);
@@ -1333,13 +1398,24 @@ const createDriverBackedGtkAppLauncher = (options) => {
     return sessionPromise;
   };
   const launch = async (args) => {
+    const payload = createLaunchPayload(options, args ?? []);
     const session = await ensureSession();
     const appRef = await session.request(
       "launcher.launch",
-      createLaunchPayload(options, args ?? [])
+      payload
     );
     return createProxyGtkApp(session, appRef);
   };
+  const environment = async () => {
+    const payload = createEnvironmentPayload(options);
+    const session = await ensureSession();
+    return wireEnvironmentToGtkAppEnvironment(
+      await session.request(
+        "launcher.environment",
+        payload
+      )
+    );
+  };
   const release = async () => {
     const releasingSession = sessionPromise;
     sessionPromise = void 0;
@@ -1350,6 +1426,7 @@ const createDriverBackedGtkAppLauncher = (options) => {
     await session.release();
   };
   return {
+    environment,
     launch,
     release,
     [Symbol.asyncDispose]: release
@@ -1758,6 +1835,9 @@ const createImageInfoOperation = (handle) => async () => {
     capture: async () => nativeCaptureBounds(info.bounds)
   };
 };
+const createBoundsOperation = (handle) => async () => nativeBounds(handle);
+const createResizeHintsOperation = (handle) => async () => nativeResizeHints(handle);
+const createX11InfoOperation = (handle) => async () => nativeX11Info(handle);
 const createValueOperation = (handle) => async () => nativeValueInfo(handle).value;
 const createSetValueOperation = (handle) => async (value) => {
   assertFiniteNumber("value", value);
@@ -1929,7 +2009,10 @@ const createGtkElement = (handle) => {
       return {
         ...common,
         kind: "window",
-        ...createChildContainerOperations(handle, void 0)
+        bounds: createBoundsOperation(handle),
+        ...createChildContainerOperations(handle, void 0),
+        resizeHints: createResizeHintsOperation(handle),
+        x11Info: createX11InfoOperation(handle)
       };
     case "button":
       return { ...common, kind: "button", click: createClickOperation(handle) };
@@ -2257,8 +2340,9 @@ const createGtkAppEnvironment = (baseEnv, overrides) => {
 const launchGtkApp = (appPath, args, options) => {
   const _args = args ?? [];
   const _timeoutMs = options?.timeoutMs ?? 1e4;
+  const appEnvironment = createGtkAppEnvironment(process.env, options?.env);
   const child = spawn(appPath, [..._args], {
-    env: createGtkAppEnvironment(process.env, options?.env),
+    env: appEnvironment,
     stdio: "pipe"
   });
   const state = {
@@ -2408,6 +2492,10 @@ const launchGtkApp = (appPath, args, options) => {
         throw normalizeNativeError(error);
       }
     },
+    environment: async () => {
+      assertProcessRunning(state, appPath);
+      return { ...appEnvironment };
+    },
     findById,
     findByPath,
     getById,
@@ -2476,4 +2564,4 @@ export {
   createGtkAppEnvironment as c,
   launchGtkApp as l
 };
-//# sourceMappingURL=launchGtkApp-qi1qm5G4.js.map
+//# sourceMappingURL=launchGtkApp-Bst1BFbD.js.map