checkpoint 4

Author: PinJinx

src/server/gstreamer/captureProvider.ts

@@ -97,47 +97,39 @@ export class LinuxWaylandPortalCaptureProvider implements CaptureProvider {
 	private async waitForPortalResponse(requestPath: string): Promise<any> {
 		logger.info(`Request path = ${requestPath}`)
 
-		const requestObj = await this.dbusConnection.getProxyObject(
-			"org.freedesktop.portal.Desktop",
-			requestPath,
-		)
-
-		logger.info(
-			`Interfaces = ${Object.keys(requestObj.nodes ?? {}).join(", ")}`,
-		)
-
-		logger.info(
-			JSON.stringify(
-				requestObj.interfaces.map((i: any) => i.$name),
-				null,
-				2,
-			),
-		)
-
-		const requestIface = requestObj.getInterface(
-			"org.freedesktop.portal.Request",
-		)
 		return Promise.race([
 			new Promise((resolve, reject) => {
-				requestIface.on("Response", (responseCode: number, results: any) => {
-					if (responseCode === 0) {
-						resolve(results)
-					} else if (responseCode === 1) {
+				const handler = (msg: any) => {
+					if (msg.path !== requestPath) return
+					if (msg.interface !== "org.freedesktop.portal.Request") return
+					if (msg.member !== "Response") return
+
+					this.dbusConnection.removeListener("message", handler)
+
+					const [responseCode, results] = msg.body
+					if (responseCode === 0) resolve(results)
+					else if (responseCode === 1)
 						reject(new Error("User cancelled the Wayland screen cast prompt"))
-					} else {
+					else
 						reject(
 							new Error(
 								`Portal request failed with response code: ${responseCode}`,
 							),
 						)
-					}
-				})
+				}
+				this.dbusConnection.on("message", handler)
 			}),
 			new Promise((_, reject) =>
-				setTimeout(() => reject(new Error("Portal request timeout")), 10000),
+				setTimeout(() => reject(new Error("Portal request timeout")), 30000),
 			),
 		])
 	}
+	private getDbusId(): string {
+		// dbus-next exposes the unique name as e.g. ":1.88"
+		const uniqueName: string = this.dbusConnection.name ?? ""
+		// ":1.88" -> "1_88"
+		return uniqueName.replace(":", "").replace(/\./g, "_")
+	}
 
 	private async negotiateScreenCastPortal(): Promise<void> {
 		const portalDest = "org.freedesktop.portal.Desktop"
@@ -149,6 +141,9 @@ export class LinuxWaylandPortalCaptureProvider implements CaptureProvider {
 		logger.info("Portal Step 2 - Get ScreenRequest")
 		// 1. Create Session
 		const token = generateToken().replaceAll("-", "_")
+		const sessionResponsePromise = this.waitForPortalResponse(
+			`/org/freedesktop/portal/desktop/request/${this.getDbusId()}/rein_create_req_${token}`,
+		)
 		const sessionRequestPath = await screenCast.CreateSession({
 			// Use this.dbusModule.Variant instead of this.dbusConnection.Variant
 			session_handle_token: new this.dbusModule.Variant(
@@ -162,7 +157,7 @@ export class LinuxWaylandPortalCaptureProvider implements CaptureProvider {
 		})
 		logger.info("Portal Step 2 - Get ScreenCast Results")
 		logger.info(`CreateSession returned: ${JSON.stringify(sessionRequestPath)}`)
-		const sessionResults = await this.waitForPortalResponse(sessionRequestPath)
+		const sessionResults = await sessionResponsePromise
 		logger.info(`CreateSession response: ${JSON.stringify(sessionResults)}`)
 		this.sessionPath = sessionResults["session_handle"].value
 
@@ -173,18 +168,27 @@ export class LinuxWaylandPortalCaptureProvider implements CaptureProvider {
 		}
 
 		// 2. Select Sources
-		const selectRequestPath = await screenCast.SelectSources(this.sessionPath, {
+		const selectToken = "rein_select_req"
+		const selectResponsePromise = this.waitForPortalResponse(
+			`/org/freedesktop/portal/desktop/request/${this.getDbusId()}/${selectToken}`,
+		)
+		await screenCast.SelectSources(this.sessionPath, {
 			multiple: new this.dbusModule.Variant("b", false),
 			types: new this.dbusModule.Variant("u", 1),
-			handle_token: new this.dbusModule.Variant("s", "rein_select_req"),
+			handle_token: new this.dbusModule.Variant("s", selectToken),
 		})
-		await this.waitForPortalResponse(selectRequestPath)
+		await selectResponsePromise
 
 		// 3. Start Session
-		const startRequestPath = await screenCast.Start(this.sessionPath, {
-			handle_token: new this.dbusModule.Variant("s", "rein_start_req"),
+		const startToken = "rein_start_req"
+		const startResponsePromise = this.waitForPortalResponse(
+			`/org/freedesktop/portal/desktop/request/${this.getDbusId()}/${startToken}`,
+		)
+		await screenCast.Start(this.sessionPath, "", {
+			// <-- "" is the parent window handle
+			handle_token: new this.dbusModule.Variant("s", startToken),
 		})
-		const startResults = await this.waitForPortalResponse(startRequestPath)
+		const startResults = await startResponsePromise
 
 		const streamsVariant = startResults["streams"]
 		if (
@@ -196,21 +200,21 @@ export class LinuxWaylandPortalCaptureProvider implements CaptureProvider {
 			logger.info(
 				`Successfully negotiated Wayland Portal. Target PipeWire Node: ${this.pipewireNodeId}`,
 			)
+			logger.info(
+				`Streams payload: ${JSON.stringify(streamsVariant.value, null, 2)}`,
+			)
+			//await new Promise(() => {})
 		} else {
 			throw new Error("No screen cast streams returned by the Wayland portal.")
 		}
 
 		// 4. OpenPipeWireRemote
-		await screenCast.OpenPipeWireRemote(this.sessionPath, {})
+		//await screenCast.OpenPipeWireRemote(this.sessionPath, {})
 	}
 
 	public async getGStreamerSource(): Promise<string[]> {
 		if (this.pipewireNodeId !== null && this.pipewireNodeId > 0) {
-			return [
-				"pipewiresrc",
-				`target-object=${this.pipewireNodeId}`,
-				"do-timestamp=true",
-			]
+			return ["pipewiresrc", `path=${this.pipewireNodeId}`, "do-timestamp=true"]
 		}
 
 		throw new Error("PipeWire node ID was not successfully extracted.")

src/server/gstreamer/gstManager.ts

@@ -93,10 +93,11 @@ export class GstManager extends EventEmitter {
 		try {
 			this.provider = CaptureProviderFactory.create()
 			await this.provider.initialize()
-
+			logger.warn("Exited out")
 			const sourceBlocks = await this.provider.getGStreamerSource()
 			const pipelineArgs = this.buildPipelineArgs(sourceBlocks, token, whipPort)
-
+			logger.info(`Source blocks: ${JSON.stringify(sourceBlocks)}`)
+			logger.info(`Pipeline args: ${pipelineArgs.join(" ")}`)
 			this.executePipeline(pipelineArgs, whipPort, token)
 		} catch (error) {
 			logger.error(
@@ -112,6 +113,7 @@ export class GstManager extends EventEmitter {
 		whipPort: number,
 		token: string,
 	): void {
+		logger.info("Starting Pipeline")
 		const spawnedEnv = { ...process.env }
 		if (!spawnedEnv.DISPLAY) spawnedEnv.DISPLAY = ":0"
 		if (!spawnedEnv.XAUTHORITY) {
@@ -147,6 +149,7 @@ export class GstManager extends EventEmitter {
 
 		this.process.stderr?.on("data", (data: Buffer) => {
 			const logStr = data.toString()
+			logger.info(`GStreamer raw stderr [${this.sessionId}]: ${logStr.trim()}`)
 			if (
 				logStr.includes("ERROR") &&
 				logStr.includes("pipeline doesn't want to preroll")