gestament 0.3.0 → 0.4.0

package/dist/{launchGtkApp-BIO_5Xjn.cjs → launchGtkApp-BfELuV-H.cjs}

@@ -8,7 +8,7 @@ const node_os = require("node:os");
 const node_path = require("node:path");
 const node_url = require("node:url");
 const prerequisites = require("./prerequisites-BuZST2Dy.cjs");
-const native = require("./native-CBXaFWP-.cjs");
+const native = require("./native-BUWDWMBB.cjs");
 var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 const defaultDisplay = "xvfb";
 const defaultGSettings = "memory";
@@ -24,6 +24,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();
@@ -313,15 +324,37 @@ 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 errors.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 = node_path.resolve(
-    node_path.dirname(node_url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("launchGtkApp-BIO_5Xjn.cjs", document.baseURI).href)),
+    node_path.dirname(node_url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("launchGtkApp-BfELuV-H.cjs", document.baseURI).href)),
     "..",
     "dist",
     "gestament-launcher-driver.cjs"
@@ -335,7 +368,7 @@ const resolveDriverPath = () => {
 };
 const resolveXvfbPoolProbePath = () => {
   const probePath = node_path.resolve(
-    node_path.dirname(node_url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("launchGtkApp-BIO_5Xjn.cjs", document.baseURI).href)),
+    node_path.dirname(node_url.fileURLToPath(typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("launchGtkApp-BfELuV-H.cjs", document.baseURI).href)),
     "..",
     "dist",
     "gestament-xvfb-pool-probe.cjs"
@@ -352,11 +385,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;
@@ -530,12 +569,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 = node_child_process.spawn(process.execPath, [probePath], {
-    env: {
-      ...process.env,
-      DISPLAY: xvfb.display,
-      GDK_BACKEND: "x11"
-    },
+    env,
     stdio: ["ignore", "pipe", "pipe"]
   });
   const timeout = setTimeout(() => {
@@ -1084,6 +1131,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) => {
@@ -1109,6 +1164,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 })
@@ -1221,6 +1279,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);
@@ -1335,13 +1400,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;
@@ -1352,6 +1428,7 @@ const createDriverBackedGtkAppLauncher = (options) => {
     await session.release();
   };
   return {
+    environment,
     launch,
     release,
     [Symbol.asyncDispose]: release
@@ -1760,6 +1837,9 @@ const createImageInfoOperation = (handle) => async () => {
     capture: async () => native.nativeCaptureBounds(info.bounds)
   };
 };
+const createBoundsOperation = (handle) => async () => native.nativeBounds(handle);
+const createResizeHintsOperation = (handle) => async () => native.nativeResizeHints(handle);
+const createX11InfoOperation = (handle) => async () => native.nativeX11Info(handle);
 const createValueOperation = (handle) => async () => native.nativeValueInfo(handle).value;
 const createSetValueOperation = (handle) => async (value) => {
   assertFiniteNumber("value", value);
@@ -1931,7 +2011,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) };
@@ -2259,8 +2342,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 = node_child_process.spawn(appPath, [..._args], {
-    env: createGtkAppEnvironment(process.env, options?.env),
+    env: appEnvironment,
     stdio: "pipe"
   });
   const state = {
@@ -2410,6 +2494,10 @@ const launchGtkApp = (appPath, args, options) => {
         throw errors.normalizeNativeError(error);
       }
     },
+    environment: async () => {
+      assertProcessRunning(state, appPath);
+      return { ...appEnvironment };
+    },
     findById,
     findByPath,
     getById,
@@ -2476,4 +2564,4 @@ const createGtkAppLauncher = (options) => createDriverBackedGtkAppLauncher(optio
 exports.createGtkAppEnvironment = createGtkAppEnvironment;
 exports.createGtkAppLauncher = createGtkAppLauncher;
 exports.launchGtkApp = launchGtkApp;
-//# sourceMappingURL=launchGtkApp-BIO_5Xjn.cjs.map
+//# sourceMappingURL=launchGtkApp-BfELuV-H.cjs.map