@vrdmr/fnx-test 0.2.0 → 0.3.0

package/lib/profile-resolver.js

@@ -1,11 +1,11 @@
-import { readFile, writeFile, mkdir, stat } from 'node:fs/promises';
+import { readFile, writeFile, mkdir } from 'node:fs/promises';
+import { readFileSync, existsSync } from 'node:fs';
 import { join, resolve as resolvePath, isAbsolute } from 'node:path';
 import { homedir } from 'node:os';
 import { fileURLToPath } from 'node:url';
 
 const CACHE_DIR = join(homedir(), '.fnx', 'profiles');
 const CACHE_FILE = join(CACHE_DIR, 'sku-profiles.json');
-const CACHE_TTL_MS = 60 * 60 * 1000; // 1 hour
 
 const DEFAULT_CDN_URL = 'https://raw.githubusercontent.com/vrdmr/func-emulate/main/fnx/profiles/sku-profiles.json';
 
@@ -26,72 +26,67 @@ function isJsonString(str) {
   return str.trimStart().startsWith('{');
 }
 
-async function fetchRegistry() {
-  // If an explicit source was provided (--profiles flag or inline JSON), use it directly
+async function persistCache(rawJson) {
+  await mkdir(CACHE_DIR, { recursive: true });
+  await writeFile(CACHE_FILE, rawJson);
+}
+
+export async function fetchRegistryWithMeta() {
+  // If an explicit source was provided (--profiles flag or inline JSON), use it directly.
   if (profilesSource) {
-    // Inline JSON string
     if (isJsonString(profilesSource)) {
-      return JSON.parse(profilesSource);
+      return { registry: JSON.parse(profilesSource), source: 'inline-json' };
     }
 
-    // URL (http/https)
     if (isUrl(profilesSource)) {
       try {
         const res = await fetch(profilesSource);
-        if (res.ok) {
-          const json = await res.text();
-          await mkdir(CACHE_DIR, { recursive: true });
-          await writeFile(CACHE_FILE, json);
-          return JSON.parse(json);
-        }
-      } catch { /* fall through to error */ }
-      throw new Error(`Cannot fetch profiles from: ${profilesSource}`);
+        if (!res.ok) throw new Error(`HTTP ${res.status}`);
+        const json = await res.text();
+        await persistCache(json);
+        return { registry: JSON.parse(json), source: 'remote', url: profilesSource };
+      } catch {
+        throw new Error(`Cannot fetch profiles from: ${profilesSource}`);
+      }
     }
 
-    // Local file path
     const filePath = isAbsolute(profilesSource) ? profilesSource : resolvePath(process.cwd(), profilesSource);
     try {
-      return JSON.parse(await readFile(filePath, 'utf-8'));
+      return { registry: JSON.parse(await readFile(filePath, 'utf-8')), source: 'local-file', path: filePath };
     } catch (err) {
       throw new Error(`Cannot read profiles file: ${filePath} (${err.message})`);
     }
   }
 
-  // Default resolution chain: env var → cache → CDN → stale cache → bundled
+  // Default behavior: always attempt CDN first to detect upgrades/rollbacks quickly,
+  // then fall back to cache, then bundled profiles.
   const cdnUrl = process.env.FUNC_PROFILES_URL || DEFAULT_CDN_URL;
 
-  // 1. Try cache (if fresh)
-  try {
-    const cacheStat = await stat(CACHE_FILE);
-    if (Date.now() - cacheStat.mtimeMs < CACHE_TTL_MS) {
-      return JSON.parse(await readFile(CACHE_FILE, 'utf-8'));
-    }
-  } catch { /* no cache or stale */ }
-
-  // 2. Try CDN
   try {
     const res = await fetch(cdnUrl);
     if (res.ok) {
       const json = await res.text();
-      await mkdir(CACHE_DIR, { recursive: true });
-      await writeFile(CACHE_FILE, json);
-      return JSON.parse(json);
+      await persistCache(json);
+      return { registry: JSON.parse(json), source: 'remote', url: cdnUrl };
     }
   } catch { /* CDN unreachable */ }
 
-  // 3. Try stale cache
   try {
-    return JSON.parse(await readFile(CACHE_FILE, 'utf-8'));
-  } catch { /* no cache at all */ }
+    return { registry: JSON.parse(await readFile(CACHE_FILE, 'utf-8')), source: 'cache' };
+  } catch { /* no cache */ }
 
-  // 4. Fall back to bundled profiles
   try {
-    return JSON.parse(await readFile(BUNDLED_PROFILES_PATH, 'utf-8'));
+    return { registry: JSON.parse(await readFile(BUNDLED_PROFILES_PATH, 'utf-8')), source: 'bundled' };
   } catch {
     throw new Error('Cannot load SKU profiles: CDN unreachable, no cache, no bundled profiles.');
   }
 }
 
+async function fetchRegistry() {
+  const { registry } = await fetchRegistryWithMeta();
+  return registry;
+}
+
 export async function resolveProfile(skuName) {
   const registry = await fetchRegistry();
   const profile = registry.profiles[skuName];
@@ -116,3 +111,17 @@ export async function listProfiles() {
   }
   console.log(`\n  Last updated: ${registry.updatedAt}`);
 }
+
+/** Synchronous read: cached profiles → bundled fallback. No network. */
+export function readProfilesSync() {
+  try {
+    if (existsSync(CACHE_FILE)) {
+      return JSON.parse(readFileSync(CACHE_FILE, 'utf-8'));
+    }
+  } catch { /* fall through */ }
+  try {
+    return JSON.parse(readFileSync(BUNDLED_PROFILES_PATH, 'utf-8'));
+  } catch {
+    return null;
+  }
+}

package/lib/warmup.js

@@ -2,8 +2,9 @@ import { existsSync, readdirSync } from 'node:fs';
 import { readFile, writeFile, mkdir } from 'node:fs/promises';
 import { join } from 'node:path';
 import { homedir } from 'node:os';
-import { resolveProfile, listProfiles } from './profile-resolver.js';
+import { resolveProfile, listProfiles, fetchRegistryWithMeta } from './profile-resolver.js';
 import { ensureHost, ensureBundle, getHostExeName, getPlatformRid } from './host-manager.js';
+import { title, info, success, warning, dim } from './colors.js';
 
 const FNX_DIR = join(homedir(), '.fnx');
 const META_FILE = join(FNX_DIR, '_meta.json');
@@ -57,9 +58,9 @@ async function runWarmup(args) {
   const rid = getPlatformRid();
 
   console.log();
-  console.log(`fnx warmup — pre-downloading assets for ${all ? 'ALL SKUs' : 'offline use'}`);
+  console.log(title(`fnx warmup — pre-downloading assets for ${all ? 'ALL SKUs' : 'offline use'}`));
   console.log();
-  console.log(`  Platform:        ${rid}`);
+  console.log(`  ${dim('Platform:')}        ${info(rid)}`);
 
   const meta = await loadMeta();
 
@@ -68,10 +69,10 @@ async function runWarmup(args) {
       console.log();
       const profile = await resolveProfile(skuName);
 
-      console.log(`  Target SKU:      ${profile.displayName} (${skuName})`);
-      console.log(`  Host Version:    ${profile.hostVersion}`);
+      console.log(`  ${dim('Target SKU:')}      ${info(`${profile.displayName} (${skuName})`)}`);
+      console.log(`  ${dim('Host Version:')}    ${info(profile.hostVersion)}`);
       if (profile.maxExtensionBundleVersion) {
-        console.log(`  Bundle Range:    ${profile.extensionBundleVersion} (max: ${profile.maxExtensionBundleVersion})`);
+        console.log(`  ${dim('Bundle Range:')}    ${info(`${profile.extensionBundleVersion} (max: ${profile.maxExtensionBundleVersion})`)}`);
       }
       console.log();
 
@@ -99,9 +100,9 @@ async function runWarmup(args) {
       }
 
       console.log();
-      console.log(`  ✓ fnx start --sku ${skuName} will work offline.`);
+      console.log(success(`  ✓ fnx start --sku ${skuName} will work offline.`));
     } catch (err) {
-      console.error(`  ⚠️  Warmup failed for ${skuName}: ${err.message}`);
+      console.error(warning(`  ⚠️  Warmup failed for ${skuName}: ${err.message}`));
     }
   }
 
@@ -113,7 +114,7 @@ async function runWarmup(args) {
   }
 
   console.log();
-  console.log('  Done.');
+  console.log(success('  Done.'));
   console.log();
 }
 
@@ -143,9 +144,8 @@ function findAnyCachedBundle(bundleDir) {
 
 async function getAllSkuNames() {
   try {
-    const profilesPath = new URL('../profiles/sku-profiles.json', import.meta.url).pathname;
-    const registry = JSON.parse(await readFile(profilesPath, 'utf-8'));
-    return Object.keys(registry.profiles);
+    const { registry } = await fetchRegistryWithMeta();
+    return Object.keys(registry.profiles || {});
   } catch {
     return ['flex', 'linux-premium', 'windows-consumption', 'windows-dedicated', 'linux-consumption'];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vrdmr/fnx-test",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "SKU-aware Azure Functions local emulator",
   "type": "module",
   "bin": {