wyvrnpm 1.2.0 → 1.3.2

package/src/config.js

@@ -1,60 +1,61 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-
-/**
- * Returns the directory where wyvrnpm stores its config.
- *   Windows : %LOCALAPPDATA%\wyvrnpm
- *   Other   : ~/.config/wyvrnpm
- */
-function getConfigDir() {
-  if (process.env.LOCALAPPDATA) {
-    return path.join(process.env.LOCALAPPDATA, 'wyvrnpm');
-  }
-  return path.join(os.homedir(), '.config', 'wyvrnpm');
-}
-
-/** Full path to config.json. */
-function getConfigPath() {
-  return path.join(getConfigDir(), 'config.json');
-}
-
-/**
- * Read and parse config.json.
- * Returns a default empty config if the file doesn't exist yet.
- * @returns {{ installSources: SourceEntry[], publishSources: SourceEntry[] }}
- */
-function readConfig() {
-  const configPath = getConfigPath();
-  if (!fs.existsSync(configPath)) {
-    return { installSources: [], publishSources: [] };
-  }
-  try {
-    const raw = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-    return {
-      installSources: raw.installSources ?? [],
-      publishSources: raw.publishSources ?? [],
-    };
-  } catch {
-    console.warn('[wyvrn] Warning: could not parse config.json — using defaults');
-    return { installSources: [], publishSources: [] };
-  }
-}
-
-/**
- * Persist a config object to disk.
- * @param {{ installSources: SourceEntry[], publishSources: SourceEntry[] }} config
- */
-function writeConfig(config) {
-  const dir = getConfigDir();
-  fs.mkdirSync(dir, { recursive: true });
-  fs.writeFileSync(getConfigPath(), JSON.stringify(config, null, 2) + '\n', 'utf8');
-}
-
-module.exports = { getConfigDir, getConfigPath, readConfig, writeConfig };
-
-/**
- * @typedef {{ name: string, url: string, profile?: string, token?: string }} SourceEntry
- */
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+/**
+ * Returns the directory where wyvrnpm stores its config.
+ *   Windows : %LOCALAPPDATA%\wyvrnpm
+ *   Other   : ~/.config/wyvrnpm
+ */
+function getConfigDir() {
+  if (process.env.LOCALAPPDATA) {
+    return path.join(process.env.LOCALAPPDATA, 'wyvrnpm');
+  }
+  return path.join(os.homedir(), '.config', 'wyvrnpm');
+}
+
+/** Full path to config.json. */
+function getConfigPath() {
+  return path.join(getConfigDir(), 'config.json');
+}
+
+/**
+ * Read and parse config.json.
+ * Returns a default empty config if the file doesn't exist yet.
+ * @returns {{ installSources: SourceEntry[], publishSources: SourceEntry[], linkedPackages: Object<string, string> }}
+ */
+function readConfig() {
+  const configPath = getConfigPath();
+  if (!fs.existsSync(configPath)) {
+    return { installSources: [], publishSources: [], linkedPackages: {} };
+  }
+  try {
+    const raw = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+    return {
+      installSources: raw.installSources ?? [],
+      publishSources: raw.publishSources ?? [],
+      linkedPackages: raw.linkedPackages ?? {},
+    };
+  } catch {
+    console.warn('[wyvrn] Warning: could not parse config.json — using defaults');
+    return { installSources: [], publishSources: [], linkedPackages: {} };
+  }
+}
+
+/**
+ * Persist a config object to disk.
+ * @param {{ installSources: SourceEntry[], publishSources: SourceEntry[] }} config
+ */
+function writeConfig(config) {
+  const dir = getConfigDir();
+  fs.mkdirSync(dir, { recursive: true });
+  fs.writeFileSync(getConfigPath(), JSON.stringify(config, null, 2) + '\n', 'utf8');
+}
+
+module.exports = { getConfigDir, getConfigPath, readConfig, writeConfig };
+
+/**
+ * @typedef {{ name: string, url: string, profile?: string, token?: string }} SourceEntry
+ */

package/src/download.js

@@ -1,164 +1,172 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const { pipeline } = require('stream/promises');
-const { Readable } = require('stream');
-const StreamZip = require('node-stream-zip');
-
-/**
- * Downloads a single URL to a local file path, respecting the given timeout.
- *
- * @param {string} url - Remote URL to download.
- * @param {string} destPath - Local path to write the response body to.
- * @param {Function} httpClient - fetch-compatible function.
- * @param {number} timeoutMs - Abort timeout in milliseconds.
- * @returns {Promise<void>}
- * @throws {Error} On non-OK HTTP status or network / timeout error.
- */
-async function downloadFile(url, destPath, httpClient, timeoutMs) {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-
-  let response;
-  try {
-    response = await httpClient(url, { signal: controller.signal });
-  } finally {
-    clearTimeout(timer);
-  }
-
-  if (!response.ok) {
-    throw new Error(`HTTP ${response.status} for ${url}`);
-  }
-
-  // Stream the response body directly to disk — avoids loading large files into RAM.
-  const fileStream = fs.createWriteStream(destPath);
-  await pipeline(Readable.fromWeb(response.body), fileStream);
-}
-
-/**
- * Resolves which source URL contains a given package by probing each one in order.
- *
- * @param {string} name
- * @param {string} version
- * @param {string[]} packageSources
- * @param {string} platform
- * @param {Function} httpClient
- * @param {number} timeoutMs
- * @param {string} destZipPath - Where to save the downloaded zip.
- * @returns {Promise<boolean>} True if successfully downloaded, false otherwise.
- */
-async function tryDownloadFromSources(
-  name,
-  version,
-  packageSources,
-  platform,
-  httpClient,
-  timeoutMs,
-  destZipPath,
-) {
-  for (const source of packageSources) {
-    const base = source.replace(/\/$/, '');
-    const candidates = [
-      `${base}/${platform}/${name}/${version}/wyvrn.zip`,
-      `${base}/${platform}/${name}/${version}/razer.zip`,
-      `${base}/common/${name}/${version}/wyvrn.zip`,
-      `${base}/common/${name}/${version}/razer.zip`,
-    ];
-    for (const url of candidates) {
-      try {
-        await downloadFile(url, destZipPath, httpClient, timeoutMs);
-        return true;
-      } catch (err) {
-        console.warn(`[wyvrn] Could not download ${name}@${version} from ${url}: ${err.message}`);
-      }
-    }
-  }
-  return false;
-}
-
-/**
- * Downloads and extracts all resolved dependencies that are not already present on disk.
- *
- * @param {Map<string, string>} resolvedDeps - Map of package name -> version string.
- * @param {string[]} packageSources - Ordered list of base URLs to try.
- * @param {string} platform - Target platform string (e.g. "win_x64").
- * @param {string} razerDir - Local directory used for extraction (e.g. "wyvrn_internal").
- * @param {Function} httpClient - fetch-compatible function.
- * @param {number} timeout - HTTP timeout in seconds.
- * @returns {Promise<void>}
- */
-async function downloadDependencies(
-  resolvedDeps,
-  packageSources,
-  platform,
-  razerDir,
-  httpClient,
-  timeout,
-) {
-  const timeoutMs = timeout * 1000;
-
-  if (!fs.existsSync(razerDir)) {
-    fs.mkdirSync(razerDir, { recursive: true });
-  }
-
-  for (const [name, version] of resolvedDeps) {
-    const extractDir = path.join(razerDir, name);
-    const versionFile = path.join(extractDir, '.wyvrn-version');
-
-    if (fs.existsSync(extractDir)) {
-      const installedVersion = fs.existsSync(versionFile)
-        ? fs.readFileSync(versionFile, 'utf8').trim()
-        : null;
-      if (installedVersion === version) {
-        console.log(`[wyvrn] Already present: ${name}@${version} — skipping`);
-        continue;
-      }
-      console.log(`[wyvrn] Version changed: ${name} ${installedVersion} → ${version}, re-downloading`);
-      fs.rmSync(extractDir, { recursive: true, force: true });
-    }
-
-    console.log(`[wyvrn] Downloading: ${name}@${version}`);
-
-    const destZipPath = path.join(razerDir, `${name}.zip`);
-
-    const ok = await tryDownloadFromSources(
-      name,
-      version,
-      packageSources,
-      platform,
-      httpClient,
-      timeoutMs,
-      destZipPath,
-    );
-
-    if (!ok) {
-      console.warn(
-        `[wyvrn] Warning: package ${name}@${version} was not found in any configured source`,
-      );
-      continue;
-    }
-
-    try {
-      fs.mkdirSync(extractDir, { recursive: true });
-      const zip = new StreamZip.async({ file: destZipPath });
-      await zip.extract(null, extractDir);
-      await zip.close();
-      fs.writeFileSync(versionFile, version, 'utf8');
-      console.log(`[wyvrn] Extracted: ${name}@${version} → ${extractDir}`);
-    } catch (err) {
-      console.warn(`[wyvrn] Failed to extract ${name}@${version}: ${err.message}`);
-    } finally {
-      // Always remove the zip, even if extraction failed.
-      try {
-        fs.unlinkSync(destZipPath);
-      } catch {
-        // Ignore cleanup errors.
-      }
-    }
-  }
-}
-
-module.exports = {
-  downloadDependencies,
-};
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const { pipeline } = require('stream/promises');
+const { Readable } = require('stream');
+const StreamZip = require('node-stream-zip');
+const { isLink, getLinkTarget } = require('./link-utils');
+
+/**
+ * Downloads a single URL to a local file path, respecting the given timeout.
+ *
+ * @param {string} url - Remote URL to download.
+ * @param {string} destPath - Local path to write the response body to.
+ * @param {Function} httpClient - fetch-compatible function.
+ * @param {number} timeoutMs - Abort timeout in milliseconds.
+ * @returns {Promise<void>}
+ * @throws {Error} On non-OK HTTP status or network / timeout error.
+ */
+async function downloadFile(url, destPath, httpClient, timeoutMs) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+
+  let response;
+  try {
+    response = await httpClient(url, { signal: controller.signal });
+  } finally {
+    clearTimeout(timer);
+  }
+
+  if (!response.ok) {
+    throw new Error(`HTTP ${response.status} for ${url}`);
+  }
+
+  // Stream the response body directly to disk — avoids loading large files into RAM.
+  const fileStream = fs.createWriteStream(destPath);
+  await pipeline(Readable.fromWeb(response.body), fileStream);
+}
+
+/**
+ * Resolves which source URL contains a given package by probing each one in order.
+ *
+ * @param {string} name
+ * @param {string} version
+ * @param {string[]} packageSources
+ * @param {string} platform
+ * @param {Function} httpClient
+ * @param {number} timeoutMs
+ * @param {string} destZipPath - Where to save the downloaded zip.
+ * @returns {Promise<boolean>} True if successfully downloaded, false otherwise.
+ */
+async function tryDownloadFromSources(
+  name,
+  version,
+  packageSources,
+  platform,
+  httpClient,
+  timeoutMs,
+  destZipPath,
+) {
+  for (const source of packageSources) {
+    const base = source.replace(/\/$/, '');
+    const candidates = [
+      `${base}/${platform}/${name}/${version}/wyvrn.zip`,
+      `${base}/${platform}/${name}/${version}/razer.zip`,
+      `${base}/common/${name}/${version}/wyvrn.zip`,
+      `${base}/common/${name}/${version}/razer.zip`,
+    ];
+    for (const url of candidates) {
+      try {
+        await downloadFile(url, destZipPath, httpClient, timeoutMs);
+        return true;
+      } catch (err) {
+        console.warn(`[wyvrn] Could not download ${name}@${version} from ${url}: ${err.message}`);
+      }
+    }
+  }
+  return false;
+}
+
+/**
+ * Downloads and extracts all resolved dependencies that are not already present on disk.
+ *
+ * @param {Map<string, string>} resolvedDeps - Map of package name -> version string.
+ * @param {string[]} packageSources - Ordered list of base URLs to try.
+ * @param {string} platform - Target platform string (e.g. "win_x64").
+ * @param {string} razerDir - Local directory used for extraction (e.g. "wyvrn_internal").
+ * @param {Function} httpClient - fetch-compatible function.
+ * @param {number} timeout - HTTP timeout in seconds.
+ * @returns {Promise<void>}
+ */
+async function downloadDependencies(
+  resolvedDeps,
+  packageSources,
+  platform,
+  razerDir,
+  httpClient,
+  timeout,
+) {
+  const timeoutMs = timeout * 1000;
+
+  if (!fs.existsSync(razerDir)) {
+    fs.mkdirSync(razerDir, { recursive: true });
+  }
+
+  for (const [name, version] of resolvedDeps) {
+    const extractDir = path.join(razerDir, name);
+    const versionFile = path.join(extractDir, '.wyvrn-version');
+
+    // Skip linked packages - don't overwrite symlinks/junctions
+    if (isLink(extractDir)) {
+      const linkTarget = getLinkTarget(extractDir);
+      console.log(`[wyvrn] Linked: ${name} → ${linkTarget} (skipping download)`);
+      continue;
+    }
+
+    if (fs.existsSync(extractDir)) {
+      const installedVersion = fs.existsSync(versionFile)
+        ? fs.readFileSync(versionFile, 'utf8').trim()
+        : null;
+      if (installedVersion === version) {
+        console.log(`[wyvrn] Already present: ${name}@${version} — skipping`);
+        continue;
+      }
+      console.log(`[wyvrn] Version changed: ${name} ${installedVersion} → ${version}, re-downloading`);
+      fs.rmSync(extractDir, { recursive: true, force: true });
+    }
+
+    console.log(`[wyvrn] Downloading: ${name}@${version}`);
+
+    const destZipPath = path.join(razerDir, `${name}.zip`);
+
+    const ok = await tryDownloadFromSources(
+      name,
+      version,
+      packageSources,
+      platform,
+      httpClient,
+      timeoutMs,
+      destZipPath,
+    );
+
+    if (!ok) {
+      console.warn(
+        `[wyvrn] Warning: package ${name}@${version} was not found in any configured source`,
+      );
+      continue;
+    }
+
+    try {
+      fs.mkdirSync(extractDir, { recursive: true });
+      const zip = new StreamZip.async({ file: destZipPath });
+      await zip.extract(null, extractDir);
+      await zip.close();
+      fs.writeFileSync(versionFile, version, 'utf8');
+      console.log(`[wyvrn] Extracted: ${name}@${version} → ${extractDir}`);
+    } catch (err) {
+      console.warn(`[wyvrn] Failed to extract ${name}@${version}: ${err.message}`);
+    } finally {
+      // Always remove the zip, even if extraction failed.
+      try {
+        fs.unlinkSync(destZipPath);
+      } catch {
+        // Ignore cleanup errors.
+      }
+    }
+  }
+}
+
+module.exports = {
+  downloadDependencies,
+};

package/src/index.js

@@ -1,9 +1,9 @@
-'use strict';
-
-module.exports = {
-  init: require('./commands/init'),
-  install: require('./commands/install'),
-  clean: require('./commands/clean'),
-  publish: require('./commands/publish'),
-  configure: require('./commands/configure'),
-};
+'use strict';
+
+module.exports = {
+  init: require('./commands/init'),
+  install: require('./commands/install'),
+  clean: require('./commands/clean'),
+  publish: require('./commands/publish'),
+  configure: require('./commands/configure'),
+};

package/src/link-utils.js

@@ -0,0 +1,95 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Creates a symlink/junction from linkPath pointing to targetPath.
+ * Uses junctions on Windows (no admin rights required), symlinks on Unix.
+ *
+ * @param {string} targetPath - The actual directory to link to.
+ * @param {string} linkPath - The path where the link will be created.
+ */
+function createLink(targetPath, linkPath) {
+  const absoluteTarget = path.resolve(targetPath);
+  const absoluteLink = path.resolve(linkPath);
+
+  // Ensure parent directory exists
+  const parentDir = path.dirname(absoluteLink);
+  if (!fs.existsSync(parentDir)) {
+    fs.mkdirSync(parentDir, { recursive: true });
+  }
+
+  // Remove existing link/directory if present
+  if (fs.existsSync(absoluteLink)) {
+    const stats = fs.lstatSync(absoluteLink);
+    if (stats.isSymbolicLink()) {
+      fs.unlinkSync(absoluteLink);
+    } else {
+      fs.rmSync(absoluteLink, { recursive: true, force: true });
+    }
+  }
+
+  // Use 'junction' on Windows (no admin required), 'dir' on Unix
+  const linkType = process.platform === 'win32' ? 'junction' : 'dir';
+  fs.symlinkSync(absoluteTarget, absoluteLink, linkType);
+}
+
+/**
+ * Checks if a path is a symlink or junction.
+ *
+ * @param {string} linkPath - Path to check.
+ * @returns {boolean} True if it's a symlink/junction.
+ */
+function isLink(linkPath) {
+  try {
+    const stats = fs.lstatSync(linkPath);
+    return stats.isSymbolicLink();
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Removes a symlink/junction without affecting the target directory.
+ *
+ * @param {string} linkPath - Path to the symlink/junction to remove.
+ * @returns {boolean} True if removed, false if it didn't exist or wasn't a link.
+ */
+function removeLink(linkPath) {
+  try {
+    const stats = fs.lstatSync(linkPath);
+    if (stats.isSymbolicLink()) {
+      fs.unlinkSync(linkPath);
+      return true;
+    }
+    return false;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Gets the target path of a symlink/junction.
+ *
+ * @param {string} linkPath - Path to the symlink/junction.
+ * @returns {string|null} The target path, or null if not a link.
+ */
+function getLinkTarget(linkPath) {
+  try {
+    const stats = fs.lstatSync(linkPath);
+    if (stats.isSymbolicLink()) {
+      return fs.readlinkSync(linkPath);
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+
+module.exports = {
+  createLink,
+  isLink,
+  removeLink,
+  getLinkTarget,
+};