Merge notification click and OSC 777 feature branch

Merges the branch from https://github.com/MacaylaMarvelous81/tabby-osc-notify/pull/1
which implements tab focus when clicking a notification and handling for OSC 777
notifications.

1 files changed, 20 insertions, 7 deletions

diff --git a/src/osc-notify-middleware.ts b/src/osc-notify-middleware.ts
index 15548f4..5bd7108 100644
--- a/src/osc-notify-middleware.ts
+++ b/src/osc-notify-middleware.ts
@@ -5,12 +5,14 @@ const oscPrefix = Buffer.from("\x1b]");
 const oscSuffix = Buffer.from("\x07");
 
 export default class OscNotifyMiddleware extends SessionMiddleware {
-	tabTitle: string;
+	getTitle: () => string;
+	onClick: () => void;
 
-	constructor(tabTitle: string) {
+	constructor(getTitle: () => string, onClick: () => void) {
 		super();
 
-		this.tabTitle = tabTitle;
+		this.getTitle = getTitle;
+		this.onClick = onClick;
 	}
 
 	get cwdReported$(): Observable<string> {
@@ -22,6 +24,7 @@ export default class OscNotifyMiddleware extends SessionMiddleware {
 
 	private cwdReported = new Subject<string>();
 	private copyRequested = new Subject<string>();
+	private notifications: Notification[] = [];
 
 	feedFromSession(data: Buffer): void {
 		let startIndex = 0;
@@ -36,10 +39,12 @@ export default class OscNotifyMiddleware extends SessionMiddleware {
 			const oscCode = parseInt(oscCodeString);
 
 			if (oscCode === 9) {
-				// TODO: onclick switch to tab
-				new Notification(this.tabTitle, {
-					body: oscParams[0]
-				});
+				const body = oscParams.slice().join(";");
+				this.showNotification(this.getTitle(), body);
+			} else if (oscCode === 777 && oscParams[0] === "notify") {
+				const title = oscParams[1] || this.getTitle();
+				const body = oscParams.slice(2).join(";");
+				this.showNotification(title, body);
 			} else {
 				continue;
 			}
@@ -48,7 +53,15 @@ export default class OscNotifyMiddleware extends SessionMiddleware {
 		super.feedFromSession(data);
 	}
 
+	private showNotification(title: string, body: string): void {
+		const notification = new Notification(title || "Terminal", { body });
+		notification.onclick = () => this.onClick();
+		this.notifications.push(notification);
+	}
+
 	close(): void {
+		this.notifications.forEach((notification) => notification.close());
+		this.notifications = [];
 		this.cwdReported.complete();
 		this.copyRequested.complete();
 		super.close();