@jira-deploy/core 1.0.6 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jira-deploy/core",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "type": "module",
   "main": "./index.js",
   "repository": {
@@ -30,6 +30,6 @@
     "dotenv": "^16.3.0"
   },
   "scripts": {
-    "test": "node --test tools.test.js"
+    "test": "node --test tools.test.js tools/jabber.test.js"
   }
 }

package/tools/jabber.js

@@ -7,11 +7,36 @@ import fs from 'fs';
 import path from 'path';
 import {error, ok} from './helpers.js';
 
-function getDefaultScriptPath() {
+function realpathOrNull(filePath) {
+  try {
+    return fs.realpathSync(filePath);
+  } catch {
+    return null;
+  }
+}
+
+function unique(values) {
+  return [...new Set(values.filter(Boolean))];
+}
+
+export function resolveJabberNotifyScriptPath({
+  env = process.env,
+  execPath = process.execPath,
+  cwd = process.cwd(),
+} = {}) {
+  if (env.JABBER_NOTIFY_SCRIPT) {
+    return env.JABBER_NOTIFY_SCRIPT;
+  }
+
+  const resolvedExecPath = realpathOrNull(execPath);
   const candidates = [
-    path.resolve(process.cwd(), 'packages/jira-core/scripts/jabber_notify.py'),
-    path.resolve(process.cwd(), 'scripts/jabber_notify.py'),
+    ...unique([resolvedExecPath, execPath]).map((candidate) =>
+      path.resolve(path.dirname(candidate), 'scripts/jabber_notify.py')
+    ),
+    path.resolve(cwd, 'packages/jira-core/scripts/jabber_notify.py'),
+    path.resolve(cwd, 'scripts/jabber_notify.py'),
   ];
+
   return candidates.find((candidate) => fs.existsSync(candidate)) ?? candidates[0];
 }
 
@@ -49,7 +74,7 @@ export function getJabberToolDefinitions() {
 // ── Handler ───────────────────────────────────────────────────────
 
 export async function handleSendJabberMessage(args, _ctx) {
-  const scriptPath = process.env.JABBER_NOTIFY_SCRIPT ?? getDefaultScriptPath();
+  const scriptPath = resolveJabberNotifyScriptPath();
 
   // dryRun 模式：不實際發送，直接回傳預覽
   if (args.dryRun) {

package/tools/jabber.test.js

@@ -0,0 +1,35 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import {mkdtempSync, mkdirSync, writeFileSync} from 'node:fs';
+import {tmpdir} from 'node:os';
+import {join} from 'node:path';
+
+import {resolveJabberNotifyScriptPath} from './jabber.js';
+
+test('resolveJabberNotifyScriptPath ignores empty env and prefers packaged script beside binary', () => {
+  const root = mkdtempSync(join(tmpdir(), 'ares-jabber-'));
+  const binDir = join(root, 'app');
+  const scriptPath = join(binDir, 'scripts', 'jabber_notify.py');
+  mkdirSync(join(binDir, 'scripts'), {recursive: true});
+  writeFileSync(scriptPath, '#!/usr/bin/env python3\n');
+
+  assert.equal(
+    resolveJabberNotifyScriptPath({
+      env: {JABBER_NOTIFY_SCRIPT: ''},
+      execPath: join(binDir, 'ares'),
+      cwd: join(root, 'work'),
+    }),
+    scriptPath,
+  );
+});
+
+test('resolveJabberNotifyScriptPath keeps explicit env override', () => {
+  assert.equal(
+    resolveJabberNotifyScriptPath({
+      env: {JABBER_NOTIFY_SCRIPT: '/custom/jabber_notify.py'},
+      execPath: '/opt/ares/ares',
+      cwd: '/tmp',
+    }),
+    '/custom/jabber_notify.py',
+  );
+});