@fml-inc/fml 0.8.7 → 0.8.10-dev.1

package/dist/sync-cycle.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import {
   runObserverSyncCycle
-} from "./chunk-6BTC3S7C.js";
-import "./chunk-5JJQWV4G.js";
+} from "./chunk-2DGHAVVR.js";
+import "./chunk-JPHN4VKM.js";
 import "./chunk-F57IFY3K.js";
-import "./chunk-B3H2YWPJ.js";
+import "./chunk-HDAFEHUY.js";
 import "./chunk-MLKGABMK.js";
 
 // src/sync-cycle.ts

package/dist/telemetry-config-HRSNDMTG.js

@@ -0,0 +1,148 @@
+import {
+  DEFAULT_SYNC_URL,
+  FML_DATA_DIR,
+  getActiveEnv,
+  getSiteUrlForConvexUrl,
+  isHostedBackendUrl,
+  readTokens,
+  resolveEnvConvexUrl
+} from "./chunk-HDAFEHUY.js";
+import "./chunk-MLKGABMK.js";
+
+// src/telemetry-config.ts
+import { createHash, randomUUID } from "crypto";
+import fs from "fs";
+import path from "path";
+var CONFIG_TTL_MS = 60 * 60 * 1e3;
+var CONFIG_TIMEOUT_MS = 1500;
+var refreshesInFlight = /* @__PURE__ */ new Map();
+function parseSentryConfig(value) {
+  if (value === null) return null;
+  if (!value || typeof value !== "object")
+    throw new Error("Invalid Sentry config");
+  const config = value;
+  if (typeof config.dsn !== "string") throw new Error("Invalid Sentry DSN");
+  const url = new URL(config.dsn);
+  if (url.protocol !== "https:" || !url.username || url.password || url.search || url.hash || !/^\/(?:.*\/)?\d+$/.test(url.pathname)) {
+    throw new Error("Invalid Sentry DSN");
+  }
+  if (config.environment !== void 0 && (typeof config.environment !== "string" || !config.environment.trim())) {
+    throw new Error("Invalid Sentry environment");
+  }
+  return {
+    dsn: config.dsn,
+    ...typeof config.environment === "string" ? { environment: config.environment } : {}
+  };
+}
+function cachePathFor(siteUrl) {
+  const key = isHostedBackendUrl(siteUrl) ? DEFAULT_SYNC_URL : siteUrl;
+  return path.join(
+    FML_DATA_DIR,
+    "telemetry-config",
+    `${createHash("sha256").update(key).digest("hex")}.json`
+  );
+}
+function readCache(siteUrl) {
+  try {
+    const value = JSON.parse(
+      fs.readFileSync(cachePathFor(siteUrl), "utf8")
+    );
+    if (!value || typeof value !== "object") return void 0;
+    const entry = value;
+    if (typeof entry.siteUrl !== "string" || entry.siteUrl !== siteUrl && !(isHostedBackendUrl(entry.siteUrl) && isHostedBackendUrl(siteUrl)) || typeof entry.fetchedAt !== "number" || !Number.isFinite(entry.fetchedAt))
+      return void 0;
+    return {
+      siteUrl: entry.siteUrl,
+      fetchedAt: entry.fetchedAt,
+      ...entry.sentry === void 0 ? {} : { sentry: parseSentryConfig(entry.sentry) }
+    };
+  } catch {
+    return void 0;
+  }
+}
+function writeCache(entry) {
+  const cachePath = cachePathFor(entry.siteUrl);
+  const temporaryPath = `${cachePath}.${randomUUID()}.tmp`;
+  try {
+    fs.mkdirSync(path.dirname(cachePath), { recursive: true, mode: 448 });
+    fs.writeFileSync(temporaryPath, JSON.stringify(entry), { mode: 384 });
+    fs.renameSync(temporaryPath, cachePath);
+  } catch {
+  } finally {
+    try {
+      fs.rmSync(temporaryPath, { force: true });
+    } catch {
+    }
+  }
+}
+async function refreshCliTelemetryConfig(opts) {
+  try {
+    if (opts.signal?.aborted) return;
+    const siteUrl = opts.siteUrl ?? getSiteUrlForConvexUrl(resolveEnvConvexUrl(opts.envName));
+    if (!opts.siteUrl && !isHostedBackendUrl(siteUrl)) return;
+    if (!opts.force) {
+      const age = Date.now() - (readCache(siteUrl)?.fetchedAt ?? Number.NaN);
+      if (age >= 0 && age < CONFIG_TTL_MS) return;
+    }
+    const key = cachePathFor(siteUrl);
+    let refresh = refreshesInFlight.get(key);
+    if (!refresh) {
+      refresh = fetchAndCache(siteUrl, opts.accessToken, opts.signal).finally(
+        () => refreshesInFlight.delete(key)
+      );
+      refreshesInFlight.set(key, refresh);
+    }
+    await refresh;
+  } catch {
+  }
+}
+async function fetchAndCache(siteUrl, accessToken, signal) {
+  const timeout = AbortSignal.timeout(CONFIG_TIMEOUT_MS);
+  const response = await fetch(`${siteUrl}/api/telemetry/config`, {
+    headers: { Authorization: `Bearer ${accessToken}` },
+    signal: signal ? AbortSignal.any([signal, timeout]) : timeout,
+    redirect: "error"
+  });
+  if (!response.ok) throw new Error("Config fetch failed");
+  const data = await response.json();
+  if (!data || typeof data !== "object" || data.ok !== true)
+    throw new Error("Invalid telemetry config");
+  const sentry = data.sentry;
+  writeCache({
+    siteUrl,
+    fetchedAt: Date.now(),
+    ...sentry === void 0 ? {} : { sentry: parseSentryConfig(sentry) }
+  });
+}
+async function resolveCliSentryConfig(defaultDsn, forceRefresh = false) {
+  if (process.env.FML_SENTRY_DSN !== void 0) {
+    return process.env.FML_SENTRY_DSN ? {
+      dsn: process.env.FML_SENTRY_DSN,
+      environment: process.env.FML_SENTRY_ENVIRONMENT
+    } : null;
+  }
+  const active = getActiveEnv();
+  const siteUrl = getSiteUrlForConvexUrl(active.convexUrl);
+  const hosted = active.convexUrl !== null && isHostedBackendUrl(active.convexUrl) && isHostedBackendUrl(siteUrl);
+  const fallback = hosted && defaultDsn ? {
+    dsn: defaultDsn,
+    environment: process.env.DEPLOYMENT_ENV ?? process.env.NODE_ENV ?? "production"
+  } : null;
+  const auth = readTokens(active.name);
+  if (!auth || auth.refreshInvalidAt || (auth.siteUrl ? auth.siteUrl !== siteUrl && !(hosted && isHostedBackendUrl(auth.siteUrl)) : !hosted))
+    return fallback;
+  if (forceRefresh && auth.expiresAt > Date.now()) {
+    await refreshCliTelemetryConfig({
+      envName: active.name,
+      accessToken: auth.accessToken,
+      siteUrl: auth.siteUrl,
+      force: true
+    });
+  }
+  const cached = readCache(siteUrl);
+  return cached?.sentry === void 0 ? fallback : cached.sentry;
+}
+export {
+  refreshCliTelemetryConfig,
+  resolveCliSentryConfig
+};

package/dist/{token-store-ORR5MIJL.js → token-store-GYU3AXBK.js}

@@ -10,7 +10,7 @@ import {
   setSelectedOrg,
   storeServiceRefreshToken,
   writeTokens
-} from "./chunk-B3H2YWPJ.js";
+} from "./chunk-HDAFEHUY.js";
 import "./chunk-MLKGABMK.js";
 export {
   SERVICE_TOKEN_LOGIN_USER_ID,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fml-inc/fml",
-  "version": "0.8.7",
+  "version": "0.8.10-dev.1",
   "description": "FML CLI and agent tools",
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
@@ -33,7 +33,7 @@
     "open": "^10.1.0",
     "ora": "^8.2.0",
     "picocolors": "^1.1.1",
-    "smol-toml": "^1.7.0",
+    "smol-toml": "1.7.1",
     "zod": "4.1.12"
   },
   "devDependencies": {