@getnote/cli 1.5.8 → 1.5.10

package/README.md

@@ -44,6 +44,16 @@ allowBuilds:
 
 然后重新执行 `pnpm install`。也可以直接从 [Releases](https://github.com/iswalle/getnote-cli/releases) 下载对应平台的二进制文件并放入 `$PATH`。
 
+### 安装机制说明
+
+从 v1.5.10 起，npm 包**内置所有平台的二进制文件**（macOS/Linux/Windows，x64/ARM64），安装时**不再依赖 GitHub**。
+
+安装时由 postinstall 从 npm 包内的 prebuilt/ 目录复制当前平台二进制，不会访问 GitHub。
+
+**中国大陆用户**：只需配置 npm Registry 镜像（例如 npmmirror），即可获取完整 npm 包；不需要额外配置二进制下载地址。
+
+**包大小**：压缩后 ~22MB，解压后 ~55MB（包含 6 个平台二进制）。
+
 ---
 
 ## 使用要求

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getnote/cli",
-  "version": "1.5.8",
+  "version": "1.5.10",
   "description": "CLI tool for 得到大脑（Get笔记） — manage notes and knowledge bases from the terminal",
   "keywords": [
     "getnote",
@@ -11,21 +11,24 @@
   "homepage": "https://github.com/iswalle/getnote-cli",
   "repository": {
     "type": "git",
-    "url": "https://github.com/iswalle/getnote-cli.git"
+    "url": "git+https://github.com/iswalle/getnote-cli.git"
   },
   "license": "MIT",
   "bin": {
-    "getnote": "./bin/getnote.js",
-    "gnote": "./bin/getnote.js"
+    "getnote": "bin/getnote.js",
+    "gnote": "bin/getnote.js"
   },
   "scripts": {
     "postinstall": "node scripts/postinstall.js",
-    "test": "node --test scripts/postinstall.test.js"
+    "test": "node --test scripts/postinstall.test.js",
+    "prepare-package": "bash scripts/prepare-package.sh",
+    "prepack": "bash scripts/prepare-package.sh"
   },
   "files": [
     "bin/getnote.js",
     "scripts/",
     "skills/",
+    "prebuilt/",
     "README.md"
   ]
 }

package/scripts/postinstall.js

@@ -1,160 +1,60 @@
 #!/usr/bin/env node
-// postinstall.js — downloads the getnote binary for the current platform.
-
+// Install the platform binary bundled in this npm package.
+// Installation is local-only; no network request is made here.
 'use strict';
 
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-const https = require('https');
-const crypto = require('crypto');
-const { spawnSync } = require('child_process');
-
-const pkg = require('../package.json');
-const VERSION = pkg.version;
-const REPO = 'iswalle/getnote-cli';
-
-function getPlatform() {
-  const platform = os.platform();
-  const arch = os.arch();
+const fs = require('node:fs');
+const os = require('node:os');
+const path = require('node:path');
+const { spawnSync } = require('node:child_process');
+const { version } = require('../package.json');
 
-  const platformMap = { darwin: 'darwin', linux: 'linux', win32: 'windows' };
-  const archMap = { x64: 'amd64', arm64: 'arm64' };
+const platformNames = { darwin: 'darwin', linux: 'linux', win32: 'windows' };
+const archNames = { x64: 'amd64', arm64: 'arm64' };
 
-  const p = platformMap[platform];
-  const a = archMap[arch];
-  if (!p || !a) throw new Error(`Unsupported platform: ${platform}/${arch}`);
-  return { platform: p, arch: a };
+function getPlatform(platform = os.platform(), arch = os.arch()) {
+  const name = platformNames[platform];
+  const cpu = archNames[arch];
+  if (!name || !cpu) throw new Error(`Unsupported platform: ${platform}/${arch}`);
+  return { platform: name, arch: cpu };
 }
 
 function getBinaryName(platform) {
   return platform.platform === 'windows' ? 'getnote.exe' : 'getnote';
 }
 
-function getDownloadURL(platform) {
-  const ext = platform.platform === 'windows' ? '.zip' : '.tar.gz';
-  const asset = `getnote-cli_${VERSION}_${platform.platform}_${platform.arch}${ext}`;
-  return `https://github.com/${REPO}/releases/download/v${VERSION}/${asset}`;
-}
-
-function getWindowsExtractArgs(archivePath, destinationPath) {
-  return [
-    '-NoProfile',
-    '-Command',
-    '& { Expand-Archive -LiteralPath $args[0] -DestinationPath $args[1] -Force }',
-    archivePath,
-    destinationPath,
-  ];
+function getPrebuiltPath(platform) {
+  return path.join(__dirname, '..', 'prebuilt', `${platform.platform}-${platform.arch}`, getBinaryName(platform));
 }
 
-async function installArchive({
-  platform,
-  binDir,
-  binaryName,
-  binaryPath,
-  url,
-  tmpFile,
-  downloadFn = download,
-  verifyChecksumFn = verifyChecksum,
-  runFn = run,
-  chmodFn = fs.chmodSync,
-  unlinkFn = fs.unlinkSync,
-}) {
-  try {
-    await downloadFn(url, tmpFile);
-    await verifyChecksumFn(url, path.basename(url), tmpFile);
-    if (platform.platform === 'windows') {
-      runFn('powershell', getWindowsExtractArgs(tmpFile, binDir));
-    } else {
-      runFn('tar', ['-xzf', tmpFile, '-C', binDir, binaryName]);
-    }
-
-    chmodFn(binaryPath, 0o755);
-    console.log(`getnote installed at ${binaryPath}`);
-  } finally {
-    try { unlinkFn(tmpFile); } catch (_) {}
+function installFromPrebuilt(platform, binDir) {
+  const source = getPrebuiltPath(platform);
+  const destination = path.join(binDir, getBinaryName(platform));
+  if (!fs.existsSync(source)) {
+    throw new Error(`Bundled binary is missing: ${path.relative(path.join(__dirname, '..'), source)}. Install a newer @getnote/cli package.`);
   }
+  fs.mkdirSync(binDir, { recursive: true });
+  fs.copyFileSync(source, destination);
+  if (platform.platform !== 'windows') fs.chmodSync(destination, 0o755);
+  console.log(`getnote v${version} installed from the npm package`);
 }
 
-async function main() {
+function main() {
   const platform = getPlatform();
   const binDir = path.join(__dirname, '..', 'bin');
-  const binaryName = getBinaryName(platform);
-  const binaryPath = path.join(binDir, binaryName);
-  const url = getDownloadURL(platform);
-  const tmpFile = path.join(os.tmpdir(), `getnote-download-${Date.now()}`);
-
-  // Skip download if binary already matches current version
+  const binaryPath = path.join(binDir, getBinaryName(platform));
   if (fs.existsSync(binaryPath)) {
-    try {
-      const result = spawnSync(binaryPath, ['version'], { encoding: 'utf8' });
-      const fallback = result.status === 0 ? result : spawnSync(binaryPath, ['--version'], { encoding: 'utf8' });
-      const out = (fallback.stdout || '').trim();
-      if (out.includes(VERSION)) {
-        console.log(`getnote v${VERSION} already installed, skipping download.`);
-        return;
-      }
-    } catch (_) { /* binary exists but can't run (wrong arch etc.), re-download */ }
-  }
-
-  console.log(`Downloading getnote v${VERSION} for ${platform.platform}/${platform.arch}...`);
-  console.log(`URL: ${url}`);
-
-  fs.mkdirSync(binDir, { recursive: true });
-
-  await installArchive({ platform, binDir, binaryName, binaryPath, url, tmpFile });
-}
-
-function run(command, args) {
-  const result = spawnSync(command, args, { stdio: 'inherit' });
-  if (result.error) throw result.error;
-  if (result.status !== 0) throw new Error(`${command} exited with status ${result.status}`);
-}
-
-function download(url, destination, redirects = 0) {
-  if (redirects > 5) return Promise.reject(new Error('Too many redirects'));
-  return new Promise((resolve, reject) => {
-    const request = https.get(url, { headers: { 'User-Agent': '@getnote/cli installer' } }, response => {
-      if (response.statusCode >= 300 && response.statusCode < 400 && response.headers.location) {
-        response.resume();
-        return resolve(download(new URL(response.headers.location, url).toString(), destination, redirects + 1));
-      }
-      if (response.statusCode !== 200) {
-        response.resume();
-        return reject(new Error(`HTTP ${response.statusCode}: ${url}`));
-      }
-      const output = fs.createWriteStream(destination, { mode: 0o600 });
-      response.pipe(output);
-      output.on('finish', () => output.close(resolve));
-      output.on('error', reject);
-    });
-    request.on('error', reject);
-  });
-}
-
-async function verifyChecksum(assetURL, assetName, archivePath) {
-  const checksumPath = `${archivePath}.checksums`;
-  try {
-    await download(new URL('checksums.txt', assetURL).toString(), checksumPath);
-    const line = fs.readFileSync(checksumPath, 'utf8').split(/\r?\n/).find(value => {
-      const fields = value.trim().split(/\s+/);
-      return fields.length === 2 && fields[1].replace(/^\*/, '') === assetName;
-    });
-    if (!line) throw new Error(`Checksum for ${assetName} is missing`);
-    const expected = line.trim().split(/\s+/)[0].toLowerCase();
-    if (!/^[a-f0-9]{64}$/.test(expected)) throw new Error(`Checksum for ${assetName} is invalid`);
-    const actual = crypto.createHash('sha256').update(fs.readFileSync(archivePath)).digest('hex');
-    if (actual !== expected) throw new Error(`Checksum mismatch for ${assetName}`);
-  } finally {
-    try { fs.unlinkSync(checksumPath); } catch (_) {}
+    const result = spawnSync(binaryPath, ['version'], { encoding: 'utf8' });
+    if (result.status === 0 && (result.stdout || '').includes(version)) return;
   }
+  installFromPrebuilt(platform, binDir);
 }
 
 if (require.main === module) {
-  main().catch(err => {
-    console.error('Failed to install getnote:', err.message);
+  try { main(); } catch (error) {
+    console.error(`Failed to install getnote: ${error.message}`);
     process.exitCode = 1;
-  });
+  }
 }
 
-module.exports = { getWindowsExtractArgs, installArchive };
+module.exports = { getPlatform, getBinaryName, getPrebuiltPath, installFromPrebuilt };

package/scripts/postinstall.test.js

@@ -1,37 +1,15 @@
 'use strict';
-
 const assert = require('node:assert/strict');
 const test = require('node:test');
+const { getPlatform, getBinaryName, getPrebuiltPath } = require('./postinstall');
 
-const { getWindowsExtractArgs, installArchive } = require('./postinstall');
-
-test('Windows extraction invokes Expand-Archive inside a script block', () => {
-  assert.deepEqual(getWindowsExtractArgs('C:\\Temp\\getnote.zip', 'C:\\Program Files\\getnote'), [
-    '-NoProfile',
-    '-Command',
-    '& { Expand-Archive -LiteralPath $args[0] -DestinationPath $args[1] -Force }',
-    'C:\\Temp\\getnote.zip',
-    'C:\\Program Files\\getnote',
-  ]);
+test('maps Windows architectures to bundled executable paths', () => {
+  assert.deepEqual(getPlatform('win32', 'x64'), { platform: 'windows', arch: 'amd64' });
+  assert.deepEqual(getPlatform('win32', 'arm64'), { platform: 'windows', arch: 'arm64' });
+  assert.equal(getBinaryName({ platform: 'windows' }), 'getnote.exe');
+  assert.match(getPrebuiltPath({ platform: 'windows', arch: 'amd64' }), /prebuilt[\\/]windows-amd64[\\/]getnote\.exe$/);
 });
 
-test('temporary archive is removed when installation fails', async () => {
-  const removed = [];
-  await assert.rejects(
-    installArchive({
-      platform: { platform: 'windows', arch: 'amd64' },
-      binDir: 'C:\\getnote\\bin',
-      binaryName: 'getnote.exe',
-      binaryPath: 'C:\\getnote\\bin\\getnote.exe',
-      url: 'https://example.invalid/getnote.zip',
-      tmpFile: 'C:\\Temp\\getnote-download.zip',
-      downloadFn: async () => { throw new Error('download failed'); },
-      verifyChecksumFn: async () => {},
-      runFn: () => {},
-      chmodFn: () => {},
-      unlinkFn: file => removed.push(file),
-    }),
-    /download failed/,
-  );
-  assert.deepEqual(removed, ['C:\\Temp\\getnote-download.zip']);
+test('uses a package-local binary path', () => {
+  assert.doesNotMatch(getPrebuiltPath({ platform: 'windows', arch: 'amd64' }), /^https?:/);
 });

package/scripts/prepare-package.sh

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+# Build every supported binary into the npm package's prebuilt/ directory.
+# Uses npm naming convention (x64 instead of amd64) for consistency.
+set -euo pipefail
+
+VERSION="${1:-$(node -p "require('./package.json').version")}"
+VERSION="${VERSION% }"
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+cd "$ROOT"
+
+echo "==> Preparing package for version ${VERSION}"
+echo "==> Cleaning prebuilt directory..."
+rm -rf prebuilt
+
+echo "==> Creating platform directories..."
+mkdir -p prebuilt/darwin-amd64 prebuilt/darwin-arm64 prebuilt/linux-amd64 prebuilt/linux-arm64 prebuilt/windows-amd64 prebuilt/windows-arm64
+
+LDFLAGS="-s -w -X github.com/iswalle/getnote-cli/internal/version.Version=${VERSION}"
+
+echo "==> Building binaries..."
+echo "  - macOS x64..."
+GOOS=darwin GOARCH=amd64 go build -ldflags "$LDFLAGS" -o prebuilt/darwin-amd64/getnote .
+
+echo "  - macOS ARM64..."
+GOOS=darwin GOARCH=arm64 go build -ldflags "$LDFLAGS" -o prebuilt/darwin-arm64/getnote .
+
+echo "  - Linux x64..."
+GOOS=linux GOARCH=amd64 go build -ldflags "$LDFLAGS" -o prebuilt/linux-amd64/getnote .
+
+echo "  - Linux ARM64..."
+GOOS=linux GOARCH=arm64 go build -ldflags "$LDFLAGS" -o prebuilt/linux-arm64/getnote .
+
+echo "  - Windows x64..."
+GOOS=windows GOARCH=amd64 go build -ldflags "$LDFLAGS" -o prebuilt/windows-amd64/getnote.exe .
+
+echo "  - Windows ARM64..."
+GOOS=windows GOARCH=arm64 go build -ldflags "$LDFLAGS" -o prebuilt/windows-arm64/getnote.exe .
+
+echo "==> Verifying prebuilt binaries..."
+find prebuilt -type f -exec ls -lh {} \; | awk '{print $5, $9}'
+
+TOTAL_SIZE=$(du -sh prebuilt | awk '{print $1}')
+echo "==> Total prebuilt size: ${TOTAL_SIZE}"
+
+echo "==> Package preparation complete!"
+echo ""
+echo "Next steps:"
+echo "  1. Test with: npm pack --dry-run"
+echo "  2. Verify with: tar -tzf getnote-cli-${VERSION}.tgz | grep prebuilt"
+echo "  3. Test install: npm install -g ./getnote-cli-${VERSION}.tgz"
+echo "  4. Publish with: npm publish"

package/scripts/test-local-install.js

@@ -0,0 +1,99 @@
+#!/usr/bin/env node
+// Test local installation without network access
+
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+const VERSION = require('../package.json').version;
+const tmpDir = path.join(os.tmpdir(), `getnote-test-${Date.now()}`);
+
+console.log('==> Testing local installation...');
+console.log(`Version: ${VERSION}`);
+console.log(`Test directory: ${tmpDir}`);
+console.log('');
+
+// Create test environment
+fs.mkdirSync(tmpDir, { recursive: true });
+
+try {
+  // Pack the package
+  console.log('1. Creating package tarball...');
+  const tarball = path.resolve(`getnote-cli-${VERSION}.tgz`);
+  
+  if (!fs.existsSync(tarball)) {
+    console.error(`✗ Tarball not found: ${tarball}`);
+    console.error('  Run: npm pack');
+    process.exit(1);
+  }
+  
+  console.log(`   ✓ Found: ${tarball}`);
+  
+  // Install globally in test directory
+  console.log('');
+  console.log('2. Installing package...');
+  
+  const npmPrefix = path.join(tmpDir, 'npm-global');
+  fs.mkdirSync(npmPrefix, { recursive: true });
+  
+  execSync(`npm install --prefix "${npmPrefix}" "${tarball}"`, {
+    stdio: 'inherit',
+    env: { 
+      ...process.env,
+      npm_config_offline: 'true',  // Force offline mode
+      npm_config_prefer_offline: 'true'
+    }
+  });
+  
+  console.log('   ✓ Package installed');
+  
+  // Verify binary exists
+  console.log('');
+  console.log('3. Verifying installation...');
+  
+  const platform = os.platform();
+  const binaryName = platform === 'win32' ? 'getnote.exe' : 'getnote';
+  const binaryPath = path.join(
+    npmPrefix,
+    'node_modules',
+    '@getnote',
+    'cli',
+    'bin',
+    binaryName
+  );
+  
+  if (!fs.existsSync(binaryPath)) {
+    console.error(`   ✗ Binary not found: ${binaryPath}`);
+    process.exit(1);
+  }
+  
+  console.log(`   ✓ Binary exists: ${binaryPath}`);
+  
+  // Test binary execution
+  const result = execSync(`"${binaryPath}" --version`, { encoding: 'utf8' });
+  console.log(`   ✓ Binary runs: ${result.trim()}`);
+  
+  if (!result.includes(VERSION)) {
+    console.error(`   ✗ Version mismatch: expected ${VERSION}, got ${result.trim()}`);
+    process.exit(1);
+  }
+  
+  console.log('');
+  console.log('==> ✓ All tests passed!');
+  console.log('');
+  console.log('Installation succeeded without network access.');
+  console.log('The package includes all platform binaries and does not depend on GitHub.');
+  
+} catch (err) {
+  console.error('');
+  console.error('==> ✗ Test failed:');
+  console.error(err.message);
+  process.exit(1);
+} finally {
+  // Cleanup
+  console.log('');
+  console.log('Cleaning up...');
+  fs.rmSync(tmpDir, { recursive: true, force: true });
+  console.log('Done.');
+}