auto-terminal-profile 2.1.0 → 3.0.2

package/actions/update-profile.js

@@ -1,8 +1,11 @@
-import darkMode from 'dark-mode';
+import process from 'node:process';
 import {setTerminalProfile, setTerminalDefaultProfile} from 'terminal-profile';
 import {config} from '../config.js';
+import {isTerminalOpen} from '../functions/index.js';
 
 export async function updateProfile() {
+	if (!(await isTerminalOpen())) return;
+
 	if (!config.darkProfile) {
 		throw new Error('Dark profile not set');
 	}
@@ -11,7 +14,7 @@ export async function updateProfile() {
 		throw new Error('Light profile not set');
 	}
 
-	const mode = (await darkMode.isEnabled()) ? 'dark' : 'light';
+	const mode = process.env.DARKMODE === '1' ? 'dark' : 'light';
 	const profile = config[`${mode}Profile`];
 
 	await Promise.all([

package/changelog.md

@@ -5,13 +5,35 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [v2.1.0](https://github.com/ptrkcsk/terminal-profile/compare/v2.0.0...v2.1.0) – 2023-07-04
+## [v3.0.2](https://github.com/patrik-csak/terminal-profile/compare/v3.0.1...v3.0.2) – 2024-02-21
+
+### Fixed
+
+- Fix Terminal opening when closed
+
+## [v3.0.1](https://github.com/patrik-csak/terminal-profile/compare/v3.0.0...v3.0.1) – 2024-02-20
+
+### Fixed
+
+- Fix broken post-install compilation step
+
+## [v3.0.0](https://github.com/patrik-csak/terminal-profile/compare/v2.1.0...v3.0.0) – 2024-02-19
+
+### Removed
+
+- Support for Node.js versions before 18
+
+### Fixed
+
+- Fix issue causing `auto-terminal-profile` to silently fail on macOS Sonoma
+
+## [v2.1.0](https://github.com/patrik-csak/terminal-profile/compare/v2.0.0...v2.1.0) – 2023-07-04
 
 ### Changed
 
 - Update dependencies
 
-## [2.0.0](https://github.com/ptrkcsk/terminal-profile/compare/v1.1.1...v2.0.0) – 2023-05-10
+## [2.0.0](https://github.com/patrik-csak/terminal-profile/compare/v1.1.1...v2.0.0) – 2023-05-10
 
 ### Added
 

package/config.js

@@ -1,9 +1,9 @@
 import Conf from 'conf';
-import {readPackageUp} from 'read-pkg-up';
+import {readPackageUp} from 'read-package-up';
 
 const {packageJson} = await readPackageUp({cwd: new URL('.', import.meta.url)});
 
-const conf = new Conf({projectName: packageJson.name});
+const config_ = new Conf({projectName: packageJson.name});
 
 class Config {
 	keys = {
@@ -15,28 +15,28 @@ class Config {
 	 * @return {string}
 	 */
 	get darkProfile() {
-		return conf.get(this.keys.darkProfile);
+		return config_.get(this.keys.darkProfile);
 	}
 
 	/**
 	 * @param {string} profile
 	 */
 	set darkProfile(profile) {
-		conf.set(this.keys.darkProfile, profile);
+		config_.set(this.keys.darkProfile, profile);
 	}
 
 	/**
 	 * @return {string}
 	 */
 	get lightProfile() {
-		return conf.get(this.keys.lightProfile);
+		return config_.get(this.keys.lightProfile);
 	}
 
 	/**
 	 * @param {string} profile
 	 */
 	set lightProfile(profile) {
-		conf.set(this.keys.lightProfile, profile);
+		config_.set(this.keys.lightProfile, profile);
 	}
 }
 

package/constants/package-json.js

@@ -1,4 +1,4 @@
-import {readPackageUp} from 'read-pkg-up';
+import {readPackageUp} from 'read-package-up';
 
 export const {packageJson} = await readPackageUp({
 	cwd: new URL('.', import.meta.url),

package/dark-mode-notify/Makefile

@@ -0,0 +1,17 @@
+prefix ?= /usr/local
+bindir = $(prefix)/bin
+
+build:
+	swift build -c release --disable-sandbox
+
+install: build
+	install -d "$(bindir)"
+	install ".build/release/dark-mode-notify" "$(bindir)"
+
+uninstall:
+	rm -rf "$(bindir)/dark-mode-notify"
+
+clean:
+	rm -rf .build
+
+.PHONY: build install uninstall clean

package/dark-mode-notify/Package.swift

@@ -0,0 +1,15 @@
+// swift-tools-version:4.0
+import PackageDescription
+
+let package = Package(
+    name: "dark-mode-notify",
+    dependencies: [
+    ],
+    targets: [
+    	.target(
+		name: "dark-mode-notify",
+		path: "."
+	)
+    ]
+)
+

package/dark-mode-notify/README.md

@@ -4,9 +4,13 @@ This small Swift program will run a command whenever the dark mode status change
 
 ## Usage
 
-You can run it directly by doing `./dark-mode-notify.swift <program>`.
+Use make to compile the program, then run directly:
 
-Alternatively you can compile it by doing `swiftc dark-mode-notify.swift -o /usr/local/bin/dark-mode-notify`.
+```shell
+.build/release/dark-mode-notify <your-program>
+```
+
+Alternatively you can install it by doing `make install`.
 
 The program will be run immediately when the command starts, and every time the OS goes from dark mode to light mode or back. The environment variable `DARKMODE` will be set to either `1` or `0`.
 

package/dark-mode-notify/{dark-mode-notify.swift → main.swift}

@@ -1,9 +1,6 @@
-#!/usr/bin/env swift
-
-// Run as ./notify.swift <program to run when dark mode changes>
 // The program will have the DARKMODE env flag set to 1 or 0
-// You can also compile with:
-// swiftc notify.swift -o notify
+// Compile with:
+// swift build
 // And run the binary directly
 // Most credit goes to https://github.com/mnewt/dotemacs/blob/master/bin/dark-mode-notifier.swift
 
@@ -35,4 +32,11 @@ DistributedNotificationCenter.default.addObserver(
         shell(args)
 }
 
+NSWorkspace.shared.notificationCenter.addObserver(
+    forName: NSWorkspace.didWakeNotification,
+    object: nil,
+    queue: nil) { (notification) in
+    shell(args)
+}
+
 NSApplication.shared.run()

package/functions/get-launch-agent-plist-file-contents.js

@@ -15,7 +15,10 @@ export async function getLaunchAgentPlistFileContents() {
 				new URL('../cli.js', import.meta.url),
 			),
 			darkModeNotifyPath: fileURLToPath(
-				new URL('../dark-mode-notify/dark-mode-notify.swift', import.meta.url),
+				new URL(
+					'../dark-mode-notify/.build/release/dark-mode-notify',
+					import.meta.url,
+				),
 			),
 			logPath: envPaths(packageJson.name).log,
 			path: process.env.PATH,

package/functions/index.js

@@ -2,3 +2,4 @@ export {enableAutomaticSwitching} from './enable-automatic-switching.js';
 export {disableAutomaticSwitching} from './disable-automatic-switching.js';
 export {getLaunchAgentPlistFileContents} from './get-launch-agent-plist-file-contents.js';
 export {isAutomaticSwitchingEnabled} from './is-automatic-switching-enabled.js';
+export {isTerminalOpen} from './is-terminal-open.js';

package/functions/is-terminal-open.js

@@ -0,0 +1,18 @@
+import {runAppleScript} from 'run-applescript';
+
+/**
+ * @returns {Promise<boolean>}
+ */
+export async function isTerminalOpen() {
+	const result = await runAppleScript(`tell application "System Events"
+	set isOpen to (name of processes) contains "Terminal"
+end tell
+
+if isOpen then
+	return "true"
+else
+	return "false"
+end if`);
+
+	return result === 'true';
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "auto-terminal-profile",
-  "version": "2.1.0",
-  "description": "Automatically switch the macOS Terminal profile based on the system-wide dark / light appearance mode",
+  "version": "3.0.2",
+  "description": "Automatically switch macOS Terminal profile when system dark / light mode changes",
   "keywords": [
     "macos",
     "terminal",
@@ -9,34 +9,35 @@
     "dark mode",
     "profile"
   ],
+  "repository": "github:patrik-csak/auto-terminal-profile",
   "license": "MIT",
-  "author": "Patrik Csak <p@trikcsak.com>",
-  "funding": "https://www.buymeacoffee.com/patrikcsak",
+  "author": "Patrik Csak <p@trikcsak.com> (https://patrikcsak.com)",
+  "type": "module",
   "bin": "./cli.js",
-  "repository": "github:patrik-csak/auto-terminal-profile",
   "scripts": {
-    "format": "xo --fix",
-    "test": "xo"
+    "format": "xo --fix && sort-package-json",
+    "postinstall": "cd dark-mode-notify && make build",
+    "test": "xo && sort-package-json --check"
   },
   "dependencies": {
-    "commander": "^11.0.0",
-    "conf": "^11.0.1",
-    "dark-mode": "^4.0.0",
+    "commander": "^12.0.0",
+    "conf": "^12.0.0",
     "env-paths": "^3.0.0",
-    "execa": "^7.1.1",
+    "execa": "^8.0.1",
     "pupa": "^3.1.0",
-    "read-pkg-up": "^10.0.0",
+    "read-package-up": "^11.0.0",
+    "run-applescript": "^7.0.0",
     "terminal-profile": "^2.0.0",
     "untildify": "^5.0.0"
   },
   "devDependencies": {
-    "xo": "^0.54.2"
+    "sort-package-json": "^2.7.0",
+    "xo": "^0.57.0"
   },
   "engines": {
-    "node": ">=16 <=20"
+    "node": ">=18 <=20"
   },
   "os": [
     "darwin"
-  ],
-  "type": "module"
+  ]
 }

package/readme.md

@@ -6,7 +6,7 @@ Automatically switch the macOS Terminal profile based on the system-wide dark /
 
 ## Prerequisites
 
-- [Node.js](https://nodejs.org/en/) 16–20
+- [Node.js](https://nodejs.org/en/) 18–20
 
 ## Installation
 
@@ -32,4 +32,4 @@ auto-terminal-profile --help
 
 ## Acknowledgements
 
-Thanks to [Fatih Arslan](https://github.com/fatih) for his article [*Automatic dark mode for terminal applications*](https://arslan.io/2021/02/15/automatic-dark-mode-for-terminal-applications/) and [Bouke van der Bijl](https://github.com/bouk) for his project [dark-mode-notify](https://github.com/bouk/dark-mode-notify), which this project uses
+Thanks [Bouke van der Bijl](https://bou.ke) for his project [dark-mode-notify](https://github.com/bouk/dark-mode-notify), which this project depends on

package/templates/launch-agent.xml

@@ -5,17 +5,22 @@
 <dict>
     <key>Label</key>
     <string>ke.bou.dark-mode-notify</string>
+
     <key>KeepAlive</key>
     <true/>
+
     <key>StandardErrorPath</key>
     <string>{logPath}/dark-mode-notify-stderr.log</string>
+
     <key>StandardOutPath</key>
     <string>{logPath}/dark-mode-notify-stdout.log</string>
+
     <key>EnvironmentVariables</key>
     <dict>
         <key>PATH</key>
         <string>{path}</string>
     </dict>
+
     <key>ProgramArguments</key>
     <array>
         <string>{darkModeNotifyPath}</string>