@elizaos/plugin-elizacloud 2.0.3-beta.5 → 2.0.3-beta.7

package/dist/index.js

@@ -1089,13 +1089,13 @@ var init_cloud_billing_routes = __esm(() => {
 });
 
 // src/routes/home-remote-runner-access-url.ts
-import { normalizeCloudSiteUrl as normalizeCloudSiteUrl3 } from "@elizaos/shared";
+import { normalizeCloudSiteUrl as normalizeCloudSiteUrl2 } from "@elizaos/shared";
 function buildHomeRemoteRunnerAccessUrl(input) {
   const sessionId = input.sessionId?.trim();
   if (!sessionId)
     return null;
   try {
-    const url = new URL(normalizeCloudSiteUrl3(input.cloudBaseUrl ?? undefined));
+    const url = new URL(normalizeCloudSiteUrl2(input.cloudBaseUrl ?? undefined));
     url.pathname = "/dashboard/app";
     url.search = "";
     url.hash = "";
@@ -1859,7 +1859,7 @@ function resolvePersistedCloudIdentity(runtime) {
     userId: normalizeEnvValue(runtimeWithCloud?.getSetting?.("ELIZA_CLOUD_USER_ID")) ?? normalizeEnvValue(runtimeWithCloud?.character?.secrets?.ELIZA_CLOUD_USER_ID)
   };
 }
-function resolveCloudApiBaseUrl4(rawBaseUrl) {
+function resolveCloudApiBaseUrl3(rawBaseUrl) {
   return resolveCloudApiBaseUrl(rawBaseUrl ?? DEFAULT_CLOUD_API_BASE_URL2) ?? DEFAULT_CLOUD_API_BASE_URL2;
 }
 function resolveCloudApiKey2(config, runtime) {
@@ -1982,7 +1982,7 @@ async function fetchCloudCredits(config, runtime) {
       error: authenticatedFailure ?? (authenticatedUnexpectedResponse ? "unexpected response" : "missing cloud api key")
     };
   }
-  const resolvedBaseUrl = resolveCloudApiBaseUrl4(config.cloud?.baseUrl);
+  const resolvedBaseUrl = resolveCloudApiBaseUrl3(config.cloud?.baseUrl);
   const baseUrlRejection = await validateCloudBaseUrl(resolvedBaseUrl);
   if (baseUrlRejection) {
     return {
@@ -2953,6 +2953,7 @@ var cloudStatusProvider = {
       const bridgeSvc = runtime.getService("CLOUD_BRIDGE");
       const containers = containerSvc?.getTrackedContainers() ?? [];
       const connected = bridgeSvc?.getConnectedContainerIds() ?? [];
+      const apiKeyInvalid = auth.isApiKeyInvalid();
       const running = containers.filter((c) => c.status === "running").length;
       const deploying = containers.filter((c) => c.status === "pending" || c.status === "building" || c.status === "deploying").length;
       const summaries = containers.slice(0, MAX_CONTAINER_SUMMARIES).map((c) => ({
@@ -2965,6 +2966,7 @@ var cloudStatusProvider = {
       }));
       const lines = [
         `ElizaCloud: ${containers.length} container(s), ${running} running, ${connected.length} bridged`,
+        ...apiKeyInvalid ? ["  - WARNING: Eliza Cloud API key REVOKED/INVALID — model calls will 401 until re-provisioned"] : [],
         ...summaries.map((c) => `  - ${c.name} [${c.status}]${c.url ? ` @ ${c.url}` : ""}${c.bridged ? " (bridged)" : ""}`)
       ];
       return {
@@ -2972,6 +2974,7 @@ var cloudStatusProvider = {
 `),
         values: {
           cloudAuthenticated: true,
+          cloudApiKeyInvalid: apiKeyInvalid,
           totalContainers: containers.length,
           runningContainers: running,
           deployingContainers: deploying
@@ -5351,6 +5354,11 @@ class PaypalManagedClient {
     return readPaypalJson(response);
   }
 }
+
+// src/cloud/index.ts
+init_base_url();
+init_validate_url();
+
 // src/cloud/null-observer.ts
 class NullCloudSetupObserver {
   onAvailabilityChecked(_result) {}
@@ -7216,7 +7224,6 @@ import {
   resolveApiSecurityConfig,
   resolveDesktopApiPort
 } from "@elizaos/core";
-import { isCloudReachable } from "@elizaos/shared";
 import { createRemoteJWKSet, jwtVerify } from "jose";
 async function deriveDeviceId() {
   const os = await import("node:os");
@@ -7388,12 +7395,57 @@ async function exchangeCodeForSession(args) {
     claims
   };
 }
+var DEFAULT_REVALIDATION_CONFIG = {
+  retryMs: 60000,
+  steadyMs: 1800000,
+  invalidThreshold: 2
+};
+function decideRevalidation(prev, probe, cfg = DEFAULT_REVALIDATION_CONFIG) {
+  if (probe === "valid") {
+    const log = prev.keyState !== "valid" ? { level: "info", message: "[CloudAuth] API key validated" } : null;
+    return {
+      state: { keyState: "valid", consecutiveInvalid: 0 },
+      delayMs: cfg.steadyMs,
+      log
+    };
+  }
+  if (probe === "invalid") {
+    const consecutiveInvalid = prev.consecutiveInvalid + 1;
+    const confirmed = consecutiveInvalid >= cfg.invalidThreshold;
+    if (confirmed) {
+      const log = prev.keyState !== "invalid" ? {
+        level: "error",
+        message: "[CloudAuth] Eliza Cloud API key is REVOKED/INVALID (cloud reachable, key rejected). Model calls will fail with 401 until the agent is re-provisioned or a valid ELIZAOS_CLOUD_API_KEY is set."
+      } : null;
+      return {
+        state: { keyState: "invalid", consecutiveInvalid },
+        delayMs: cfg.steadyMs,
+        log
+      };
+    }
+    return {
+      state: { keyState: prev.keyState, consecutiveInvalid },
+      delayMs: cfg.retryMs,
+      log: null
+    };
+  }
+  return {
+    state: { ...prev },
+    delayMs: cfg.retryMs,
+    log: null
+  };
+}
 
 class CloudAuthService extends Service {
   static serviceType = "CLOUD_AUTH";
   capabilityDescription = "Eliza Cloud device authentication and SSO session helpers";
   client;
   credentials = null;
+  revalidationTimer = null;
+  revalidationState = {
+    keyState: "unknown",
+    consecutiveInvalid: 0
+  };
   constructor(runtime) {
     super(runtime);
     this.client = new CloudApiClient2(DEFAULT_CLOUD_CONFIG.baseUrl);
@@ -7404,6 +7456,11 @@ class CloudAuthService extends Service {
     return service;
   }
   async stop() {
+    if (this.revalidationTimer) {
+      clearTimeout(this.revalidationTimer);
+      this.revalidationTimer = null;
+    }
+    this.revalidationState = { keyState: "unknown", consecutiveInvalid: 0 };
     this.credentials = null;
   }
   async initialize() {
@@ -7420,11 +7477,7 @@ class CloudAuthService extends Service {
         authenticatedAt: Date.now()
       };
       logger19.info("[CloudAuth] Authenticated with saved API key");
-      this.validateApiKey(key).then((valid) => {
-        if (!valid) {
-          logger19.warn("[CloudAuth] Saved API key could not be validated (cloud may be unreachable or key revoked) — model calls will use the key anyway");
-        }
-      }).catch(() => {});
+      this.scheduleRevalidation(0);
       return;
     }
     const enabled = this.runtime.getSetting("ELIZAOS_CLOUD_ENABLED");
@@ -7440,20 +7493,50 @@ class CloudAuthService extends Service {
       logger19.info("[CloudAuth] Cloud not enabled (set ELIZAOS_CLOUD_ENABLED=true)");
     }
   }
-  async validateApiKey(key) {
-    if (!await isCloudReachable()) {
-      logger19.warn("[CloudAuth] Cloud unreachable at boot — skipping API key validation; key will be used as-is");
-      return false;
-    }
+  async probeApiKey(key) {
     try {
       const validationClient = new CloudApiClient2(this.client.getBaseUrl(), key);
       await validationClient.get("/models", { timeoutMs: 2500 });
-      return true;
+      return "valid";
     } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      logger19.warn(`[CloudAuth] Could not reach cloud API to validate key: ${msg}`);
-      return false;
+      if (err instanceof CloudApiError2 && (err.statusCode === 401 || err.statusCode === 403)) {
+        return "invalid";
+      }
+      return "unreachable";
+    }
+  }
+  scheduleRevalidation(delayMs) {
+    if (this.revalidationTimer) {
+      clearTimeout(this.revalidationTimer);
     }
+    const timer = setTimeout(() => {
+      this.runRevalidation();
+    }, delayMs);
+    timer.unref?.();
+    this.revalidationTimer = timer;
+  }
+  async runRevalidation() {
+    const key = this.credentials?.apiKey;
+    if (!key) {
+      return;
+    }
+    const probe = await this.probeApiKey(key).catch(() => "unreachable");
+    if (this.credentials?.apiKey !== key) {
+      return;
+    }
+    const decision = decideRevalidation(this.revalidationState, probe);
+    this.revalidationState = decision.state;
+    if (decision.log) {
+      if (decision.log.level === "error") {
+        logger19.error(decision.log.message);
+      } else {
+        logger19.info(decision.log.message);
+      }
+    }
+    this.scheduleRevalidation(decision.delayMs);
+  }
+  isApiKeyInvalid() {
+    return this.revalidationState.keyState === "invalid";
   }
   async authenticateWithDevice() {
     const deviceId = await deriveDeviceId();
@@ -9881,7 +9964,7 @@ export {
   src_default as default,
   createPayment,
   createOrder,
-  cloudLogin2 as cloudLogin,
+  cloudLogin,
   clearCloudSecrets,
   __resetCloudBaseUrlCache,
   PlaidManagedClientError,
@@ -9897,12 +9980,12 @@ export {
   LIFEOPS_SCHEDULE_DEVICE_KINDS,
   ElizaCloudClient,
   DuffelConfigError,
-  ConnectionMonitor2 as ConnectionMonitor,
+  ConnectionMonitor,
   CloudTtsUnavailableError,
-  CloudRuntimeProxy2 as CloudRuntimeProxy,
+  CloudRuntimeProxy,
   CloudManager,
   ClackObserver,
-  BackupScheduler2 as BackupScheduler
+  BackupScheduler
 };
 
-//# debugId=BF5678F4013BB32F64756E2164756E21
+//# debugId=188CBE4719CE804364756E2164756E21