@clovapi/cli 0.1.17 → 0.1.18

package/bin/clovapi.js

@@ -2,12 +2,12 @@
 
 const { spawnSync } = require("node:child_process");
 const fs = require("node:fs");
-const path = require("node:path");
 
-const exeName = process.platform === "win32" ? "clovapi.exe" : "clovapi";
-const binPath = path.join(__dirname, "..", "vendor", exeName);
+const { cliBinPath, vendorBinPath } = require("../scripts/paths");
 
-if (!fs.existsSync(binPath)) {
+const binPath = [cliBinPath(), vendorBinPath()].find((candidate) => fs.existsSync(candidate));
+
+if (!binPath) {
   console.error("clovapi binary is not installed.");
   console.error("Reinstall with: npm i -g @clovapi/cli");
   process.exit(1);

package/package.json

@@ -1,22 +1,24 @@
 {
   "name": "@clovapi/cli",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "description": "Install clovapi CLI from GitHub Releases",
   "repository": {
     "type": "git",
     "url": "https://github.com/joohw/clovapi.git",
-    "directory": "switcher/npm"
+    "directory": "npm"
   },
   "license": "MIT",
   "bin": {
     "clovapi": "bin/clovapi.js"
   },
   "scripts": {
-    "postinstall": "node scripts/install.js"
+    "postinstall": "node scripts/install.js",
+    "test": "node --test scripts/paths.test.js"
   },
   "files": [
     "bin",
-    "scripts",
+    "scripts/install.js",
+    "scripts/paths.js",
     "vendor",
     "README.md"
   ],

package/scripts/install.js

@@ -7,6 +7,14 @@ const AdmZip = require("adm-zip");
 const tar = require("tar");
 
 const pkg = require("../package.json");
+const {
+  cliBinDir,
+  cliBinPath,
+  cliInstallLockPath,
+  cliVersionMetaPath,
+  exeName,
+  vendorBinPath,
+} = require("./paths");
 
 const PLATFORM_MAP = {
   darwin: "darwin",
@@ -111,7 +119,83 @@ async function extractArchive(archivePath, archiveName, outDir) {
   throw new Error(`unsupported archive format: ${archiveName}`);
 }
 
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function withInstallLock(fn) {
+  fs.mkdirSync(cliBinDir(), { recursive: true });
+  const lockPath = cliInstallLockPath();
+  let fd = null;
+  for (let attempt = 0; attempt < 100; attempt += 1) {
+    try {
+      fd = fs.openSync(lockPath, "wx");
+      break;
+    } catch (error) {
+      if (error && error.code === "EEXIST") {
+        await sleep(100);
+        continue;
+      }
+      throw error;
+    }
+  }
+  if (fd == null) {
+    throw new Error(`timed out waiting for install lock: ${lockPath}`);
+  }
+  try {
+    return await fn();
+  } finally {
+    fs.closeSync(fd);
+    try {
+      fs.unlinkSync(lockPath);
+    } catch {
+      // Best-effort cleanup; a future install will retry until the file disappears.
+    }
+  }
+}
+
+function installBinary(sourcePath, targetPath) {
+  fs.mkdirSync(path.dirname(targetPath), { recursive: true });
+  const tmpPath = path.join(path.dirname(targetPath), `.clovapi-install-${process.pid}-${Date.now()}`);
+  fs.copyFileSync(sourcePath, tmpPath);
+  if (process.platform !== "win32") {
+    fs.chmodSync(tmpPath, 0o755);
+  }
+  try {
+    fs.renameSync(tmpPath, targetPath);
+  } catch {
+    try {
+      fs.rmSync(targetPath, { force: true });
+      fs.renameSync(tmpPath, targetPath);
+    } catch (retryError) {
+      fs.rmSync(tmpPath, { force: true });
+      throw retryError;
+    }
+  }
+}
+
+function writeVersionMeta(version) {
+  fs.writeFileSync(cliVersionMetaPath(), `${String(version || "").trim()}\n`, { mode: 0o600 });
+}
+
+async function installLocalVendorIfPresent() {
+  const localBinary = vendorBinPath();
+  if (!fs.existsSync(localBinary)) {
+    return false;
+  }
+  await withInstallLock(async () => {
+    installBinary(localBinary, cliBinPath());
+    writeVersionMeta(pkg.version);
+  });
+  console.log(`[clovapi install] installed ${cliBinPath()} from local package binary`);
+  return true;
+}
+
 async function main() {
+  if (await installLocalVendorIfPresent()) {
+    return;
+  }
+
   const { versionTag, archiveName } = getReleaseCoordinates();
   const baseCandidates = buildBaseUrlCandidates(versionTag);
   let checksumBuffer = null;
@@ -151,22 +235,24 @@ async function main() {
   const archivePath = path.join(tmpDir, archiveName);
   fs.writeFileSync(archivePath, archiveBuffer);
 
-  const vendorDir = path.join(__dirname, "..", "vendor");
-  fs.mkdirSync(vendorDir, { recursive: true });
+  const extractDir = path.join(tmpDir, "extract");
+  fs.mkdirSync(extractDir, { recursive: true });
+  await extractArchive(archivePath, archiveName, extractDir);
 
-  await extractArchive(archivePath, archiveName, vendorDir);
-
-  const exeName = process.platform === "win32" ? "clovapi.exe" : "clovapi";
-  const binaryPath = path.join(vendorDir, exeName);
-  if (!fs.existsSync(binaryPath)) {
-    throw new Error(`binary not found after extraction: ${exeName}`);
+  const extractedBinaryPath = path.join(extractDir, exeName());
+  if (!fs.existsSync(extractedBinaryPath)) {
+    throw new Error(`binary not found after extraction: ${exeName()}`);
   }
 
-  if (process.platform !== "win32") {
-    fs.chmodSync(binaryPath, 0o755);
-  }
+  await withInstallLock(async () => {
+    installBinary(extractedBinaryPath, cliBinPath());
+    writeVersionMeta(pkg.version);
+
+    // Keep a package-local fallback for offline or manually copied npm installs.
+    installBinary(extractedBinaryPath, vendorBinPath());
+  });
 
-  console.log("[clovapi install] install complete");
+  console.log(`[clovapi install] installed ${cliBinPath()}`);
 }
 
 main().catch((err) => {

package/scripts/paths.js

@@ -0,0 +1,46 @@
+const os = require("node:os");
+const path = require("node:path");
+
+function configDir() {
+  if (process.platform === "win32") {
+    const base = process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming");
+    return path.join(base, "clovapi");
+  }
+  const xdg = process.env.XDG_CONFIG_HOME;
+  if (xdg) return path.join(xdg, "clovapi");
+  return path.join(os.homedir(), ".config", "clovapi");
+}
+
+function exeName() {
+  return process.platform === "win32" ? "clovapi.exe" : "clovapi";
+}
+
+function cliBinDir() {
+  return path.join(configDir(), "bin");
+}
+
+function cliBinPath() {
+  return path.join(cliBinDir(), exeName());
+}
+
+function cliVersionMetaPath() {
+  return path.join(cliBinDir(), "version.txt");
+}
+
+function cliInstallLockPath() {
+  return path.join(cliBinDir(), ".install.lock");
+}
+
+function vendorBinPath() {
+  return path.join(__dirname, "..", "vendor", exeName());
+}
+
+module.exports = {
+  cliBinDir,
+  cliBinPath,
+  cliInstallLockPath,
+  cliVersionMetaPath,
+  configDir,
+  exeName,
+  vendorBinPath,
+};