wyvrnpm 1.3.2 → 2.0.2

package/src/manifest.js

@@ -3,6 +3,9 @@
 const fs = require('fs');
 const path = require('path');
 
+/** Current manifest schema version emitted by v2 tooling. */
+const SCHEMA_VERSION = 2;
+
 /**
  * Valid project kind values, matching the C# serialisation enum.
  * @type {string[]}
@@ -19,21 +22,72 @@ const VALID_KINDS = [
 ];
 
 /**
- * Returns a blank manifest object populated with sensible defaults.
+ * Returns a blank v2 manifest object populated with sensible defaults.
+ *
+ * Build profile settings are NOT stored in wyvrn.json — they live in named
+ * profile files under the wyvrnpm config directory
+ * (%LOCALAPPDATA%\wyvrnpm\profiles\ on Windows).
+ *
+ * Dependencies can optionally carry per-package settings overrides that are
+ * merged on top of the active machine profile at install/publish time:
+ *
+ *   "dependencies": {
+ *     "zlib":    "1.2.11",
+ *     "openssl": { "version": "3.0.0", "settings": { "compiler.runtime": "static" } }
+ *   }
  *
  * @param {string} name - Project name (typically the directory basename).
  * @returns {object}
  */
 function defaultManifest(name) {
   return {
-    name: name,
+    name,
     version: '1.0.0.0',
+    schemaVersion: SCHEMA_VERSION,
     description: '',
     kind: 'ConsoleApp',
     dependencies: {},
   };
 }
 
+/**
+ * Normalise the raw `dependencies` field from a manifest into a consistent
+ * `{ name → { version, settings } }` map, regardless of the input format:
+ *
+ *   • String value  : "1.0.0"               → { version: "1.0.0", settings: {} }
+ *   • Object value  : { version, settings? } → kept (settings defaults to {})
+ *   • Array format  : [{ Name, Version }]    → converted
+ *
+ * @param {object|Array|undefined} rawDeps
+ * @returns {Record<string, { version: string, settings: object }>}
+ */
+function normalizeDependencies(rawDeps) {
+  if (!rawDeps || typeof rawDeps !== 'object') return {};
+
+  if (Array.isArray(rawDeps)) {
+    const result = {};
+    for (const d of rawDeps) {
+      const n = d.Name ?? d.name;
+      const v = d.Version ?? d.version;
+      if (n && v) result[n] = { version: v, settings: {} };
+    }
+    return result;
+  }
+
+  const result = {};
+  for (const [n, value] of Object.entries(rawDeps)) {
+    if (typeof value === 'string') {
+      result[n] = { version: value, settings: {} };
+    } else if (value && typeof value === 'object') {
+      result[n] = {
+        version:  value.version ?? value.Version ?? '',
+        settings: value.settings ?? {},
+      };
+    }
+  }
+  return result;
+}
+
 /**
  * Reads and parses a wyvrn.json manifest from disk.
  *
@@ -70,8 +124,10 @@ function writeManifest(manifestPath, data) {
 }
 
 module.exports = {
+  SCHEMA_VERSION,
   VALID_KINDS,
   defaultManifest,
+  normalizeDependencies,
   readManifest,
   writeManifest,
 };

package/src/profile.js

@@ -0,0 +1,377 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const crypto = require('crypto');
+const { execSync } = require('child_process');
+
+// ---------------------------------------------------------------------------
+// OS / Arch mapping (Node → Conan-style names)
+// ---------------------------------------------------------------------------
+const OS_MAP = {
+  win32:  'Windows',
+  linux:  'Linux',
+  darwin: 'Macos',
+};
+
+const ARCH_MAP = {
+  x64:    'x86_64',
+  ia32:   'x86',
+  arm:    'armv7',
+  arm64:  'armv8',
+  ppc64:  'ppc64le',
+  s390x:  's390x',
+  mips:   'mips',
+  mipsel: 'mipsel',
+};
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+function tryExec(cmd) {
+  try {
+    return execSync(cmd, { stdio: ['ignore', 'pipe', 'pipe'], timeout: 5000 })
+      .toString()
+      .trim();
+  } catch {
+    return null;
+  }
+}
+
+function detectOs() {
+  return OS_MAP[process.platform] ?? process.platform;
+}
+
+function detectArch() {
+  return ARCH_MAP[process.arch] ?? process.arch;
+}
+
+// ---------------------------------------------------------------------------
+// Compiler detection (per platform)
+// ---------------------------------------------------------------------------
+
+function detectCompilerWindows() {
+  // 1) MSVC via vswhere
+  const vswhere = tryExec(
+    '"C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vswhere.exe"' +
+    ' -latest -property installationVersion',
+  );
+  if (vswhere) {
+    const major = parseInt(vswhere.split('.')[0], 10);
+    // VS17 → MSVC 193x, VS16 → 192x, VS15 → 191x, VS14 → 190x
+    const vsToMsvc = { 17: '193', 16: '192', 15: '191', 14: '190' };
+    return {
+      compiler:           'msvc',
+      'compiler.version': vsToMsvc[major] ?? String(major),
+      'compiler.runtime': 'dynamic',
+    };
+  }
+
+  // 2) Clang / clang-cl
+  const clang = tryExec('clang --version');
+  if (clang) {
+    const m = clang.match(/version (\d+)/);
+    return {
+      compiler:           'clang',
+      'compiler.version': m ? m[1] : 'unknown',
+      'compiler.runtime': null,
+    };
+  }
+
+  // 3) MinGW GCC
+  const gcc = tryExec('gcc --version');
+  if (gcc) {
+    const m = gcc.match(/(\d+\.\d+\.\d+)/);
+    return {
+      compiler:           'gcc',
+      'compiler.version': m ? m[1].split('.')[0] : 'unknown',
+      'compiler.runtime': null,
+    };
+  }
+
+  return { compiler: 'unknown', 'compiler.version': 'unknown', 'compiler.runtime': null };
+}
+
+function detectCompilerMacos() {
+  const clang = tryExec('clang --version');
+  if (clang) {
+    const appleMatch = clang.match(/Apple clang version (\d+)/i);
+    if (appleMatch) {
+      return { compiler: 'apple-clang', 'compiler.version': appleMatch[1], 'compiler.runtime': null };
+    }
+    const llvmMatch = clang.match(/version (\d+)/);
+    return {
+      compiler:           'clang',
+      'compiler.version': llvmMatch ? llvmMatch[1] : 'unknown',
+      'compiler.runtime': null,
+    };
+  }
+  return { compiler: 'unknown', 'compiler.version': 'unknown', 'compiler.runtime': null };
+}
+
+function detectCompilerLinux() {
+  // Prefer GCC on Linux
+  const gcc = tryExec('gcc --version');
+  if (gcc) {
+    const m = gcc.match(/(\d+\.\d+\.\d+)/);
+    if (m) {
+      return {
+        compiler:           'gcc',
+        'compiler.version': m[1].split('.')[0],
+        'compiler.runtime': null,
+      };
+    }
+  }
+
+  const clang = tryExec('clang --version');
+  if (clang) {
+    const m = clang.match(/version (\d+)/);
+    return {
+      compiler:           'clang',
+      'compiler.version': m ? m[1] : 'unknown',
+      'compiler.runtime': null,
+    };
+  }
+
+  return { compiler: 'unknown', 'compiler.version': 'unknown', 'compiler.runtime': null };
+}
+
+// ---------------------------------------------------------------------------
+// Public API
+// ---------------------------------------------------------------------------
+
+/**
+ * Auto-detect the current build environment profile.
+ * Mirrors Conan 2.0 profile structure.
+ *
+ * @returns {WyvrnProfile}
+ */
+function detectProfile() {
+  const compilerInfo =
+    process.platform === 'win32'  ? detectCompilerWindows()
+    : process.platform === 'darwin' ? detectCompilerMacos()
+    : detectCompilerLinux();
+
+  return {
+    os:                 detectOs(),
+    arch:               detectArch(),
+    compiler:           compilerInfo.compiler,
+    'compiler.version': compilerInfo['compiler.version'],
+    'compiler.cppstd':  '20',
+    'compiler.runtime': compilerInfo['compiler.runtime'],
+  };
+}
+
+/**
+ * Compute a stable 16-char SHA256 prefix that identifies a unique build profile.
+ * Only non-null, non-wildcard fields contribute to the hash.
+ *
+ * @param {WyvrnProfile} profile
+ * @returns {string} 16-character lowercase hex string
+ */
+function hashProfile(profile) {
+  const significant = Object.fromEntries(
+    Object.entries(profile)
+      .filter(([, v]) => v !== null && v !== undefined && v !== '*' && v !== '')
+      .sort(([a], [b]) => a.localeCompare(b)),
+  );
+  return crypto
+    .createHash('sha256')
+    .update(JSON.stringify(significant))
+    .digest('hex')
+    .slice(0, 16);
+}
+
+/**
+ * Compute the SHA256 hash of a file or Buffer.
+ *
+ * @param {string|Buffer} source - Absolute path to a file, or a Buffer.
+ * @returns {string} Full 64-character lowercase hex SHA256.
+ */
+function sha256Of(source) {
+  const buf = Buffer.isBuffer(source) ? source : fs.readFileSync(source);
+  return crypto.createHash('sha256').update(buf).digest('hex');
+}
+
+/**
+ * Try to get the current git commit SHA in the given directory.
+ *
+ * @param {string} [cwd] - Directory to run git in (defaults to process.cwd()).
+ * @returns {string|null}
+ */
+function getGitSha(cwd) {
+  const result = tryExec(`git -C "${cwd || '.'}" rev-parse HEAD`);
+  return result && /^[0-9a-f]{40}$/i.test(result) ? result : null;
+}
+
+/**
+ * Try to get the remote origin URL for the current git repo.
+ *
+ * @param {string} [cwd]
+ * @returns {string|null}
+ */
+function getGitRepo(cwd) {
+  return tryExec(`git -C "${cwd || '.'}" remote get-url origin`) || null;
+}
+
+/**
+ * Format a profile for human-readable display (Conan-style).
+ *
+ * @param {WyvrnProfile} profile
+ * @returns {string}
+ */
+function formatProfile(profile) {
+  const fieldOrder = [
+    'os', 'arch', 'compiler', 'compiler.version', 'compiler.cppstd', 'compiler.runtime',
+  ];
+  const lines = ['[settings]'];
+  for (const key of fieldOrder) {
+    const val = profile[key];
+    if (val !== null && val !== undefined) {
+      lines.push(`${key}=${val}`);
+    }
+  }
+  return lines.join('\n');
+}
+
+/**
+ * Merge a partial override into a base profile, ignoring null/undefined overrides.
+ *
+ * @param {WyvrnProfile} base
+ * @param {Partial<WyvrnProfile>} overrides
+ * @returns {WyvrnProfile}
+ */
+function mergeProfile(base, overrides) {
+  return {
+    ...base,
+    ...Object.fromEntries(Object.entries(overrides).filter(([, v]) => v != null)),
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Profile file management
+// ---------------------------------------------------------------------------
+
+/**
+ * Returns the directory where named build profiles are stored.
+ *   Windows : %LOCALAPPDATA%\wyvrnpm\profiles
+ *   Other   : ~/.config/wyvrnpm/profiles
+ *
+ * @returns {string}
+ */
+function getProfilesDir() {
+  const base = process.env.LOCALAPPDATA
+    ? path.join(process.env.LOCALAPPDATA, 'wyvrnpm')
+    : path.join(require('os').homedir(), '.config', 'wyvrnpm');
+  return path.join(base, 'profiles');
+}
+
+/**
+ * Read a named profile from the profiles directory.
+ * Looks for `{name}.json`, then `{name}` without extension.
+ *
+ * @param {string} name - Profile name (e.g. "default", "msvc_release").
+ * @returns {WyvrnProfile|null} Parsed profile, or null if not found.
+ */
+function readProfile(name) {
+  const dir = getProfilesDir();
+  for (const filename of [`${name}.json`, name]) {
+    const p = path.join(dir, filename);
+    if (fs.existsSync(p)) {
+      try { return JSON.parse(fs.readFileSync(p, 'utf8')); }
+      catch { return null; }
+    }
+  }
+  return null;
+}
+
+/**
+ * Write a named profile to the profiles directory as `{name}.json`.
+ *
+ * @param {string}       name
+ * @param {WyvrnProfile} profile
+ */
+function writeProfile(name, profile) {
+  const dir = getProfilesDir();
+  fs.mkdirSync(dir, { recursive: true });
+  fs.writeFileSync(
+    path.join(dir, `${name}.json`),
+    JSON.stringify(profile, null, 2) + '\n',
+    'utf8',
+  );
+}
+
+/**
+ * Delete a named profile file. Does nothing if the profile does not exist.
+ *
+ * @param {string} name
+ * @returns {boolean} true if a file was deleted.
+ */
+function deleteProfile(name) {
+  const dir = getProfilesDir();
+  for (const filename of [`${name}.json`, name]) {
+    const p = path.join(dir, filename);
+    if (fs.existsSync(p)) {
+      fs.unlinkSync(p);
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * List all profile names available in the profiles directory.
+ *
+ * @returns {string[]} Sorted list of profile names (without `.json` extension).
+ */
+function listProfiles() {
+  const dir = getProfilesDir();
+  if (!fs.existsSync(dir)) return [];
+  return fs
+    .readdirSync(dir)
+    .filter((f) => f.endsWith('.json'))
+    .map((f) => f.slice(0, -5))
+    .sort();
+}
+
+/**
+ * Load the active build profile by name. Falls back to auto-detection if the
+ * named profile file does not exist yet.
+ *
+ * @param {string} [name='default']
+ * @returns {{ profile: WyvrnProfile, fromFile: boolean }}
+ */
+function loadProfile(name = 'default') {
+  const stored = readProfile(name);
+  if (stored) return { profile: stored, fromFile: true };
+  return { profile: detectProfile(), fromFile: false };
+}
+
+module.exports = {
+  // Detection
+  detectProfile,
+  hashProfile,
+  sha256Of,
+  getGitSha,
+  getGitRepo,
+  formatProfile,
+  mergeProfile,
+  // Profile file management
+  getProfilesDir,
+  readProfile,
+  writeProfile,
+  deleteProfile,
+  listProfiles,
+  loadProfile,
+};
+
+/**
+ * @typedef {{
+ *   os:                  string,
+ *   arch:                string,
+ *   compiler:            string,
+ *   'compiler.version':  string,
+ *   'compiler.cppstd':   string,
+ *   'compiler.runtime':  string|null,
+ * }} WyvrnProfile
+ */

package/src/providers/base.js

@@ -6,6 +6,19 @@
  * To add a new provider:
  *   1. Create src/providers/<name>.js that extends BaseProvider
  *   2. Register it in src/providers/index.js
+ *
+ * ─── Schema versions ────────────────────────────────────────────────────────
+ *
+ *  v1 (legacy):  {source}/{platform}/{name}/{version}/wyvrn.{json,zip}
+ *                {source}/{platform}/{name}/latest.json
+ *
+ *  v2:           {source}/v2/{name}/{version}/{profileHash}/wyvrn.{json,zip}
+ *                {source}/v2/{name}/{version}/source.json
+ *                {source}/v2/{name}/versions.json
+ *                {source}/v2/{name}/latest.json
+ *
+ * Publishing with v2 tooling writes both v2 AND v1 paths by default so that
+ * v1 clients can still consume the packages.
  */
 class BaseProvider {
   /**
@@ -18,18 +31,13 @@ class BaseProvider {
     return false;
   }
 
+  // ── v1 (legacy) API ────────────────────────────────────────────────────────
+
   /**
-   * Publish package files to the destination.
+   * Publish package files to the v1 destination path.
    *
    * @param {{ manifest: string, zip: string }} files
-   *   Absolute paths to the local wyvrn.json and wyvrn.zip to upload.
-   * @param {{ source: string, platform: string, name: string, version: string, profile?: string, token?: string }} options
-   *   `source`   – the raw --source value (URL / URI)
-   *   `platform` – target platform string (e.g. win_x64)
-   *   `name`     – package name from manifest
-   *   `version`  – package version from manifest
-   *   `profile`  – AWS SSO profile (S3 provider)
-   *   `token`    – Bearer token (HTTP provider)
+   * @param {{ source: string, platform: string, name: string, version: string, awsProfile?: string, token?: string }} options
    * @returns {Promise<void>}
    */
   async publish(_files, _options) {
@@ -37,16 +45,85 @@ class BaseProvider {
   }
 
   /**
-   * Returns true if the given package version already exists at the destination.
-   * Providers should override this; the default assumes it does not exist.
+   * Returns true if the given package version already exists at the v1 destination.
    *
-   * @param {{ source: string, platform: string, name: string, version: string, profile?: string, token?: string }} _options
+   * @param {{ source: string, platform: string, name: string, version: string, awsProfile?: string, token?: string }} _options
    * @returns {Promise<boolean>}
    */
   async exists(_options) {
     return false;
   }
 
+  // ── v2 API ─────────────────────────────────────────────────────────────────
+
+  /**
+   * Returns true if a prebuilt binary matching the given profile hash already
+   * exists at the v2 destination.
+   *
+   * @param {{ source: string, name: string, version: string, profileHash: string, awsProfile?: string, token?: string }} _options
+   * @returns {Promise<boolean>}
+   */
+  async v2Exists(_options) {
+    return false;
+  }
+
+  /**
+   * Publish to the v2 path.
+   * Writes wyvrn.json + wyvrn.zip under profileHash, updates versions.json and latest.json.
+   *
+   * @param {{ manifest: string, zip: string }} files  - local file paths
+   * @param {{
+   *   source:        string,
+   *   name:          string,
+   *   version:       string,
+   *   profileHash:   string,
+   *   buildSettings: import('../profile').WyvrnProfile,  // stored in metadata for debugging
+   *   contentSha256: string,
+   *   gitSha:        string|null,
+   *   gitRepo:       string|null,
+   *   awsProfile?:   string,
+   *   token?:        string,
+   * }} options
+   * @returns {Promise<void>}
+   */
+  async v2Publish(_files, _options) {
+    throw new Error(`v2Publish() is not implemented in ${this.constructor.name}`);
+  }
+
+  /**
+   * Fetch the wyvrn.json metadata object for a specific v2 build.
+   * Returns null if the build does not exist.
+   *
+   * @param {{ source: string, name: string, version: string, profileHash: string, awsProfile?: string, token?: string }} _options
+   * @returns {Promise<object|null>}
+   */
+  async v2GetMeta(_options) {
+    return null;
+  }
+
+  /**
+   * Fetch and return the parsed versions.json index for a package.
+   * Returns null if no index exists yet.
+   *
+   * @param {{ source: string, name: string, awsProfile?: string, token?: string }} _options
+   * @returns {Promise<object|null>}
+   */
+  async v2GetVersionsIndex(_options) {
+    return null;
+  }
+
+  /**
+   * Download the prebuilt binary zip for a specific v2 build to destPath.
+   *
+   * @param {{ source: string, name: string, version: string, profileHash: string, awsProfile?: string, token?: string }} options
+   * @param {string} destPath  - absolute path to write the zip to
+   * @param {number} timeoutMs
+   * @returns {Promise<boolean>}  true on success
+   */
+  async v2DownloadZip(_options, _destPath, _timeoutMs) {
+    return false;
+  }
+
   /** Human-readable provider name shown in log output. */
   static get providerName() {
     return 'BaseProvider';