gitlocker 1.0.6 → 1.0.7

package/THIRD_PARTY_NOTICES.md

@@ -2,7 +2,7 @@
 
 Project: gitlocker
 
-Version: 1.0.6
+Version: 1.0.7
 
 Resolved vcpkg triplet: `x64-linux-static`
 

package/bin/gitlocker.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 const { spawnSync } = require('child_process');
+const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
@@ -11,79 +12,78 @@ function getPlatformPackage() {
   if (platform === 'win32') {
     if (arch === 'x64') {
       return '@git-braints/cli-win32-x64';
-    } else {
-      console.error(`[GitLocker] Unsupported architecture on Windows: ${arch}. GitLocker currently only supports Windows x64.`);
-      process.exit(1);
     }
+    console.error(`[GitLocker] Unsupported architecture on Windows: ${arch}. GitLocker currently only supports Windows x64.`);
+    process.exit(1);
   }
 
   if (platform === 'linux') {
     if (arch === 'x64') {
       return '@git-braints/cli-linux-x64';
-    } else {
-      console.error(`[GitLocker] Unsupported architecture on Linux: ${arch}. GitLocker currently only supports Linux x64.`);
-      process.exit(1);
     }
+    console.error(`[GitLocker] Unsupported architecture on Linux: ${arch}. GitLocker currently only supports Linux x64.`);
+    process.exit(1);
   }
 
   if (platform === 'darwin') {
     if (arch === 'arm64') {
       return '@git-braints/cli-darwin-arm64';
-    } else {
-      console.error(`[GitLocker] Unsupported architecture on macOS: ${arch}. GitLocker currently only supports macOS arm64.`);
-      process.exit(1);
     }
+    console.error(`[GitLocker] Unsupported architecture on macOS: ${arch}. GitLocker currently only supports macOS arm64.`);
+    process.exit(1);
   }
 
   console.error(`[GitLocker] Unsupported platform: ${platform}.`);
-  console.error(`GitLocker npm distribution currently only supports Windows (win32-x64), Linux (linux-x64) and macOS (darwin-arm64) in this build.`);
-  console.error(`For other platforms, please compile GitLocker from source or download from GitHub Releases.`);
+  console.error('GitLocker npm distribution currently only supports Windows (win32-x64), Linux (linux-x64) and macOS (darwin-arm64).');
+  console.error('For other platforms, compile GitLocker from source or download GitHub Release archives.');
   process.exit(1);
 }
 
-try {
-  const packageName = getPlatformPackage();
-  
-  // 获取子包中二进制的绝对路径
-  let packageDir;
+function resolvePackageDir(packageName) {
   try {
-    packageDir = path.dirname(require.resolve(`${packageName}/package.json`));
+    return path.dirname(require.resolve(`${packageName}/package.json`));
   } catch (resolveErr) {
     console.error(`[GitLocker] Error: Platform binary package "${packageName}" is not found.`);
-    console.error(`This may occur if optional dependencies were skipped during installation.`);
-    console.error(`Please reinstall with optional dependencies enabled:`);
-    console.error(`  npm install -g gitlocker --include=optional\n`);
+    console.error('This may occur if optional dependencies were skipped during installation.');
+    console.error('Reinstall with optional dependencies enabled:');
+    console.error('  npm install -g gitlocker --include=optional');
     process.exit(1);
   }
+}
 
-  const isWin = os.platform() === 'win32';
-  const binaryName = isWin ? 'gitl.exe' : 'gitl';
-  const binaryPath = path.join(packageDir, binaryName);
+const packageName = getPlatformPackage();
+const packageDir = resolvePackageDir(packageName);
+const binaryName = os.platform() === 'win32' ? 'gitl.exe' : 'gitl';
+const binaryPath = path.join(packageDir, binaryName);
 
-  const fs = require('fs');
-  if (!fs.existsSync(binaryPath)) {
-    console.error(`[GitLocker] Error: Native binary not found at "${binaryPath}".`);
-    process.exit(1);
-  }
+if (!fs.existsSync(binaryPath)) {
+  console.error(`[GitLocker] Error: Native binary not found at "${binaryPath}".`);
+  console.error('The platform package installed, but gitl was missing from it.');
+  console.error('On Windows, Windows Defender may quarantine gitl.exe after npm extract.');
+  console.error('Restore the file from quarantine, or reinstall:');
+  console.error('  npm uninstall -g gitlocker && npm install -g gitlocker@latest');
+  console.error('You can also run the signed GitHub Release archive for your platform.');
+  process.exit(1);
+}
 
-  // 非 Windows 平台需要赋予执行权限
-  if (!isWin) {
-    try {
-      fs.chmodSync(binaryPath, 0o755);
-    } catch (e) {
-      // 忽略可能的权限变更失败
-    }
+if (os.platform() !== 'win32') {
+  try {
+    fs.chmodSync(binaryPath, 0o755);
+  } catch (chmodErr) {
+    // The publish step already marks the Unix binary executable.
   }
+}
 
-  // 透传执行
-  const args = process.argv.slice(2);
-  const result = spawnSync(binaryPath, args, {
-    stdio: 'inherit',
-    windowsHide: true
-  });
-  
-  process.exit(result.status ?? 0);
-} catch (err) {
-  console.error('[GitLocker] Failed to run native CLI:', err.message);
+const result = spawnSync(binaryPath, process.argv.slice(2), {
+  stdio: 'inherit'
+});
+
+if (result.error) {
+  console.error(`[GitLocker] Failed to start "${binaryPath}": ${result.error.message}`);
+  process.exit(1);
+}
+if (result.signal) {
+  console.error(`[GitLocker] Native CLI terminated by signal ${result.signal}.`);
   process.exit(1);
 }
+process.exit(result.status === null ? 1 : result.status);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitlocker",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Git repository encryption with pluggable key providers for Windows, Linux, and macOS",
   "homepage": "https://gitbraints.com/products/gitlocker",
   "repository": {
@@ -43,8 +43,8 @@
   "author": "GitBraints",
   "license": "MIT",
   "optionalDependencies": {
-    "@git-braints/cli-darwin-arm64": "1.0.6",
-    "@git-braints/cli-linux-x64": "1.0.6",
-    "@git-braints/cli-win32-x64": "1.0.6"
+    "@git-braints/cli-darwin-arm64": "1.0.7",
+    "@git-braints/cli-linux-x64": "1.0.7",
+    "@git-braints/cli-win32-x64": "1.0.7"
   }
 }