mac-helper 0.5.0 → 0.7.0

package/lib/chrome.d.ts

@@ -2,7 +2,19 @@ export type ActiveTab = {
     url: string;
     title: string;
 };
-export declare const Chrome: {
-    getActiveTab(): Promise<ActiveTab>;
-};
-export declare function getChromeActiveTab(): Promise<ActiveTab>;
+export declare enum BrowserAppName {
+    Chrome = "Google Chrome",
+    Brave = "Brave Browser"
+}
+export declare class ChromiumBrowserHelper {
+    appName: string;
+    constructor(appName: string);
+    isRunning: () => Promise<boolean>;
+    isFrontmost: () => Promise<boolean>;
+    getActiveTab: () => Promise<ActiveTab | undefined>;
+}
+export declare const Chrome: ChromiumBrowserHelper;
+export declare const Brave: ChromiumBrowserHelper;
+export declare function isChromiumAppRunning(appName?: string): Promise<boolean>;
+export declare function getChromiumActiveTab(appName?: string): Promise<ActiveTab | undefined>;
+export declare function getChromiumIsFrontmost(appName?: string): Promise<boolean>;

package/lib/chrome.js

@@ -1,16 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Chrome = void 0;
-exports.getChromeActiveTab = getChromeActiveTab;
+exports.Brave = exports.Chrome = exports.ChromiumBrowserHelper = exports.BrowserAppName = void 0;
+exports.isChromiumAppRunning = isChromiumAppRunning;
+exports.getChromiumActiveTab = getChromiumActiveTab;
+exports.getChromiumIsFrontmost = getChromiumIsFrontmost;
 const run_1 = require("@jxa/run");
-exports.Chrome = {
-    async getActiveTab() {
-        return await getChromeActiveTab();
-    },
-};
-async function getChromeActiveTab() {
-    return await (0, run_1.run)(() => {
-        const app = Application('Google Chrome');
+const app_1 = require("./app");
+var BrowserAppName;
+(function (BrowserAppName) {
+    BrowserAppName["Chrome"] = "Google Chrome";
+    BrowserAppName["Brave"] = "Brave Browser";
+})(BrowserAppName || (exports.BrowserAppName = BrowserAppName = {}));
+class ChromiumBrowserHelper {
+    appName;
+    constructor(appName) {
+        this.appName = appName;
+    }
+    isRunning = () => isChromiumAppRunning(this.appName);
+    isFrontmost = () => getChromiumIsFrontmost(this.appName);
+    getActiveTab = () => getChromiumActiveTab(this.appName);
+}
+exports.ChromiumBrowserHelper = ChromiumBrowserHelper;
+exports.Chrome = new ChromiumBrowserHelper(BrowserAppName.Chrome);
+exports.Brave = new ChromiumBrowserHelper(BrowserAppName.Brave);
+/* #region implements */
+function isChromiumAppRunning(appName = BrowserAppName.Chrome) {
+    return (0, app_1.isAppRunning)(appName);
+}
+async function getChromiumActiveTab(appName = BrowserAppName.Chrome) {
+    if (!(await isChromiumAppRunning(appName)))
+        return;
+    return await (0, run_1.run)((appName) => {
+        const app = Application(appName);
         app.includeStandardAdditions = true;
         const win = (app.windows() || []).find((w) => !w.minimized());
         const tab = win?.activeTab();
@@ -18,6 +39,15 @@ async function getChromeActiveTab() {
             url: tab?.url(),
             title: tab?.title(),
         };
-    });
+    }, appName);
+}
+async function getChromiumIsFrontmost(appName = BrowserAppName.Chrome) {
+    if (!isChromiumAppRunning(appName))
+        return false;
+    return await (0, run_1.run)((appName) => {
+        const app = Application(appName);
+        app.includeStandardAdditions = true;
+        return app.frontmost();
+    }, appName);
 }
-// getChromeActiveTab().then(console.log)
+/* #endregion */

package/lib/finder.d.ts

@@ -23,6 +23,6 @@ export type QSpaceFileItem = {
 export declare function isRepresentPF(file: string): boolean;
 export declare function isRepresentQS(file: string): boolean;
 /**
- * 处理 $PF $QS, ignore case
+ * 处理 `@pf` `@qs`, ignore case
  */
 export declare function normalizeInputFileList(fileList: string[]): Promise<string[]>;

package/lib/finder.js

@@ -7,11 +7,11 @@ exports.QSpace = exports.Finder = exports.PathFinder = void 0;
 exports.isRepresentPF = isRepresentPF;
 exports.isRepresentQS = isRepresentQS;
 exports.normalizeInputFileList = normalizeInputFileList;
+const run_1 = require("@jxa/run");
+const es_toolkit_1 = require("es-toolkit");
 const node_os_1 = require("node:os");
 const node_path_1 = __importDefault(require("node:path"));
 const node_url_1 = require("node:url");
-const run_1 = require("@jxa/run");
-const es_toolkit_1 = require("es-toolkit");
 const promise_map_1 = __importDefault(require("promise.map"));
 const app_1 = require("./app");
 /**
@@ -109,24 +109,26 @@ async function QSpace_allSelected() {
 /* #endregion */
 /* #region Top Level Helper */
 function isRepresentPF(file) {
-    return /^\$?pf$/i.test(file);
+    return /^[@$]?pf$/i.test(file);
 }
 function isRepresentQS(file) {
-    return /^\$?qs$/i.test(file);
+    return /^[@$]?qs$/i.test(file);
 }
 /**
- * 处理 $PF $QS, ignore case
+ * 处理 `@pf` `@qs`, ignore case
  */
 async function normalizeInputFileList(fileList) {
     return (0, es_toolkit_1.uniq)((await (0, promise_map_1.default)(fileList, async (f) => {
-        if (isRepresentPF(f))
-            return await exports.PathFinder.allSelected();
-        if (isRepresentQS(f))
-            return await exports.QSpace.allSelected();
+        if (process.platform === 'darwin') {
+            if (isRepresentPF(f))
+                return await exports.PathFinder.allSelected();
+            if (isRepresentQS(f))
+                return await exports.QSpace.allSelected();
+        }
         return node_path_1.default.resolve(f);
     }, (0, node_os_1.availableParallelism)())).flat());
 }
 /* #endregion */
 // ;(async () => {
-//   console.log(await getQSpaceSelected())
+//   console.log(await normalizeInputFileList(['@pf']))
 // })()

package/lib/iterm.js

@@ -4,14 +4,14 @@ exports.iTerm = void 0;
 exports.runInIterm = runInIterm;
 const run_1 = require("@jxa/run");
 async function runInIterm(command, reuse = true) {
-    await (0, run_1.run)((command, reuse) => {
+    const result = await (0, run_1.run)((command, reuse) => {
         const app = Application('iTerm');
         app.includeStandardAdditions = true;
         app.activate();
         let usingSession;
         // reuse when possible
         if (reuse) {
-            const session = app.currentWindow().currentSession();
+            const session = app.currentWindow()?.currentSession();
             const isIdle = session?.isAtShellPrompt();
             if (isIdle) {
                 usingSession = session;
@@ -20,13 +20,15 @@ async function runInIterm(command, reuse = true) {
         // create new tab when necessary
         if (!usingSession) {
             const tab = app.createTabWithDefaultProfile(app.currentWindow);
-            usingSession = tab.currentSession();
-        }
-        if (!usingSession) {
-            return;
+            usingSession = tab?.currentSession(); // TODO: iterm2 updated, this code no longer works
         }
+        if (!usingSession)
+            return 'no-session';
         app.write(usingSession, { text: command });
     }, command, reuse);
+    if (result === 'no-session') {
+        console.error('No iTerm session found');
+    }
 }
 exports.iTerm = {
     run: runInIterm,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mac-helper",
-  "version": "0.5.0",
-  "packageManager": "pnpm@10.25.0+sha512.5e82639027af37cf832061bcc6d639c219634488e0f2baebe785028a793de7b525ffcd3f7ff574f5e9860654e098fe852ba8ac5dd5cefe1767d23a020a92f501",
+  "version": "0.7.0",
+  "packageManager": "pnpm@10.32.1+sha512.a706938f0e89ac1456b6563eab4edf1d1faf3368d1191fc5c59790e96dc918e4456ab2e67d613de1043d2e8c81f87303e6b40d4ffeca9df15ef1ad567348f2be",
   "description": "useful helper for macOS",
   "keywords": [
     "mac",
@@ -39,29 +39,29 @@
   },
   "dependencies": {
     "@jxa/run": "^1.4.0",
-    "es-toolkit": "^1.43.0",
+    "es-toolkit": "^1.45.1",
     "promise.map": "^1.1.3"
   },
   "devDependencies": {
     "@jxa/global-type": "^1.4.0",
     "@jxa/sdef-to-dts": "^1.4.0",
     "@jxa/types": "^1.4.0",
-    "@magicdawn/eslint-config": "^1.5.14",
+    "@magicdawn/eslint-config": "^1.6.2",
     "@magicdawn/prettier-config": "^0.1.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^25.0.2",
-    "@vitest/coverage-v8": "^4.0.15",
+    "@types/node": "^25.5.0",
+    "@vitest/coverage-v8": "^4.1.0",
     "delay": "^7.0.0",
-    "eslint": "^9.39.2",
+    "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",
-    "fs-extra": "^11.3.2",
+    "fs-extra": "^11.3.4",
     "husky": "^9.1.7",
     "jxa-common-used": "^0.0.3",
-    "lint-staged": "^16.2.7",
-    "prettier": "^3.7.4",
+    "lint-staged": "^16.4.0",
+    "prettier": "^3.8.1",
     "should": "^13.2.3",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.15"
+    "vitest": "^4.1.0"
   },
   "pnpm": {
     "onlyBuiltDependencies": [

package/src/chrome.ts

@@ -1,26 +1,47 @@
 import { run } from '@jxa/run'
 import type { GoogleChrome } from 'jxa-common-used'
+import { isAppRunning } from './app'
 
 export type ActiveTab = { url: string; title: string }
 
-export const Chrome = {
-  async getActiveTab(): Promise<ActiveTab> {
-    return await getChromeActiveTab()
-  },
+export enum BrowserAppName {
+  Chrome = 'Google Chrome',
+  Brave = 'Brave Browser',
 }
 
-export async function getChromeActiveTab(): Promise<ActiveTab> {
-  return await run(() => {
-    const app = Application<GoogleChrome>('Google Chrome')
-    app.includeStandardAdditions = true
+export class ChromiumBrowserHelper {
+  constructor(public appName: string) {}
+  isRunning = (): Promise<boolean> => isChromiumAppRunning(this.appName)
+  isFrontmost = (): Promise<boolean> => getChromiumIsFrontmost(this.appName)
+  getActiveTab = (): Promise<ActiveTab | undefined> => getChromiumActiveTab(this.appName)
+}
 
+export const Chrome = new ChromiumBrowserHelper(BrowserAppName.Chrome)
+export const Brave = new ChromiumBrowserHelper(BrowserAppName.Brave)
+
+/* #region implements */
+export function isChromiumAppRunning(appName: string = BrowserAppName.Chrome): Promise<boolean> {
+  return isAppRunning(appName)
+}
+export async function getChromiumActiveTab(appName: string = BrowserAppName.Chrome): Promise<ActiveTab | undefined> {
+  if (!(await isChromiumAppRunning(appName))) return
+  return await run((appName: string) => {
+    const app = Application<GoogleChrome>(appName)
+    app.includeStandardAdditions = true
     const win = (app.windows() || []).find((w) => !w.minimized())
     const tab = win?.activeTab()
     return {
       url: tab?.url(),
       title: tab?.title(),
     }
-  })
+  }, appName)
 }
-
-// getChromeActiveTab().then(console.log)
+export async function getChromiumIsFrontmost(appName: string = BrowserAppName.Chrome): Promise<boolean> {
+  if (!isChromiumAppRunning(appName)) return false
+  return await run((appName: string) => {
+    const app = Application<GoogleChrome>(appName)
+    app.includeStandardAdditions = true
+    return app.frontmost()
+  }, appName)
+}
+/* #endregion */

package/src/finder.ts

@@ -1,11 +1,11 @@
+import { run as jxaRun } from '@jxa/run'
+import { uniq } from 'es-toolkit'
+import type { PathFinder as PathFinderType } from 'jxa-common-used'
 import { availableParallelism } from 'node:os'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
-import { run as jxaRun } from '@jxa/run'
-import { uniq } from 'es-toolkit'
 import pmap from 'promise.map'
 import { isAppRunning } from './app'
-import type { PathFinder as PathFinderType } from 'jxa-common-used'
 
 /**
  * `App` named epxorts
@@ -124,15 +124,15 @@ async function QSpace_allSelected() {
 
 /* #region Top Level Helper */
 export function isRepresentPF(file: string) {
-  return /^\$?pf$/i.test(file)
+  return /^[@$]?pf$/i.test(file)
 }
 
 export function isRepresentQS(file: string) {
-  return /^\$?qs$/i.test(file)
+  return /^[@$]?qs$/i.test(file)
 }
 
 /**
- * 处理 $PF $QS, ignore case
+ * 处理 `@pf` `@qs`, ignore case
  */
 export async function normalizeInputFileList(fileList: string[]) {
   return uniq(
@@ -140,8 +140,10 @@ export async function normalizeInputFileList(fileList: string[]) {
       await pmap(
         fileList,
         async (f) => {
-          if (isRepresentPF(f)) return await PathFinder.allSelected()
-          if (isRepresentQS(f)) return await QSpace.allSelected()
+          if (process.platform === 'darwin') {
+            if (isRepresentPF(f)) return await PathFinder.allSelected()
+            if (isRepresentQS(f)) return await QSpace.allSelected()
+          }
           return path.resolve(f)
         },
         availableParallelism(),
@@ -152,5 +154,5 @@ export async function normalizeInputFileList(fileList: string[]) {
 /* #endregion */
 
 // ;(async () => {
-//   console.log(await getQSpaceSelected())
+//   console.log(await normalizeInputFileList(['@pf']))
 // })()

package/src/iterm.ts

@@ -2,8 +2,9 @@ import { run } from '@jxa/run'
 import type { iTerm2 } from 'jxa-common-used'
 
 export async function runInIterm(command: string, reuse = true) {
-  await run(
-    (command, reuse) => {
+  type RunResult = 'no-session' | undefined
+  const result: RunResult = await run(
+    (command, reuse): RunResult => {
       const app = Application<iTerm2>('iTerm')
       app.includeStandardAdditions = true
       app.activate()
@@ -12,7 +13,7 @@ export async function runInIterm(command: string, reuse = true) {
 
       // reuse when possible
       if (reuse) {
-        const session: iTerm2.Session = app.currentWindow().currentSession()
+        const session: iTerm2.Session | undefined = app.currentWindow()?.currentSession()
         const isIdle = session?.isAtShellPrompt()
         if (isIdle) {
           usingSession = session
@@ -22,18 +23,19 @@ export async function runInIterm(command: string, reuse = true) {
       // create new tab when necessary
       if (!usingSession) {
         const tab = app.createTabWithDefaultProfile(app.currentWindow)
-        usingSession = tab.currentSession()
-      }
-
-      if (!usingSession) {
-        return
+        usingSession = tab?.currentSession() // TODO: iterm2 updated, this code no longer works
       }
 
+      if (!usingSession) return 'no-session'
       app.write(usingSession, { text: command })
     },
     command,
     reuse,
   )
+
+  if (result === 'no-session') {
+    console.error('No iTerm session found')
+  }
 }
 
 export const iTerm = {