runcloud 0.1.98 → 0.1.100

package/dist/commands/create.js

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import { basename, join, resolve } from 'node:path';
 import { ApiClient, ApiError, friendlyApiError } from '../api.js';
-import { requireCredentials, writeEnvironmentSelection, writeProjectLink } from '../config.js';
+import { controlPlaneUrl, requireCredentials, writeEnvironmentSelection, writeProjectLink, } from '../config.js';
 import { runEnvironmentDeploy } from './deploy.js';
 const POLL_INTERVAL_MS = 2_000;
 const POLL_TIMEOUT_MS = 20 * 60 * 1_000;
@@ -121,7 +121,7 @@ export function registerCreate(program) {
                 throw new Error('This directory is already linked to a project. Use a fresh directory for `newly create`.');
             }
             const creds = requireCredentials();
-            await runCreate(new ApiClient(creds.apiUrl, creds.token), process.cwd(), {
+            await runCreate(new ApiClient(controlPlaneUrl(creds), creds.token), process.cwd(), {
                 name,
                 deploy: opts.deploy,
             });

package/dist/commands/environment.js

@@ -1,12 +1,12 @@
 import { createInterface } from 'node:readline/promises';
 import { ApiClient, friendlyApiError } from '../api.js';
 import { runEnvironmentDatabaseShell } from '../shellSession.js';
-import { clearEnvironmentSelection, readEnvironmentSelection, requireCredentials, requireEnvironmentSelection, resolveProject, writeEnvironmentSelection, } from '../config.js';
+import { clearEnvironmentSelection, readEnvironmentSelection, controlPlaneUrl, requireCredentials, requireEnvironmentSelection, resolveProject, writeEnvironmentSelection, } from '../config.js';
 const POLL_INTERVAL_MS = 2_000;
 const POLL_TIMEOUT_MS = 10 * 60 * 1_000;
 function client() {
     const credentials = requireCredentials();
-    return new ApiClient(credentials.apiUrl, credentials.token);
+    return new ApiClient(controlPlaneUrl(credentials), credentials.token);
 }
 async function projectEnvironments(api, projectId) {
     const response = await api.get(`/projects/${encodeURIComponent(projectId)}/environments`);
@@ -248,7 +248,7 @@ export function registerEnvironment(program) {
             const projectId = resolveProject(process.cwd(), opts.project);
             const selected = requireEnvironmentSelection(process.cwd(), projectId);
             const credentials = requireCredentials();
-            const environment = await new ApiClient(credentials.apiUrl, credentials.token).get(`/environments/${encodeURIComponent(selected.id)}`);
+            const environment = await new ApiClient(controlPlaneUrl(credentials), credentials.token).get(`/environments/${encodeURIComponent(selected.id)}`);
             const resource = resolveNamedResource(environment.databases, value, 'database');
             if (resource.status !== 'ready')
                 throw new Error(`Database is not ready (${resource.status}).`);

package/dist/commands/login.js

@@ -94,8 +94,9 @@ function hostLabel() {
     }
 }
 export async function verifyRunCloudCredential(apiUrl, token) {
+    const probe = token.startsWith('nl_live_') ? '/auth/mobile/identity' : '/run-cloud/account';
     try {
-        await new ApiClient(normalizeApiUrl(apiUrl), token).get('/run-cloud/account');
+        await new ApiClient(normalizeApiUrl(apiUrl), token).get(probe);
     }
     catch (e) {
         if (e instanceof ApiError && (e.status === 401 || e.status === 403)) {

package/dist/config.js

@@ -33,6 +33,9 @@ export function loginCommandName() {
 export function normalizeApiUrl(url) {
     return url.replace(/\/+$/, '');
 }
+export function controlPlaneUrl(creds) {
+    return normalizeApiUrl(creds.authApiUrl ?? creds.apiUrl);
+}
 export function saveCredentials(creds) {
     mkdirSync(credentialsHome(), { recursive: true, mode: 0o700 });
     const normalized = { ...creds, apiUrl: normalizeApiUrl(creds.apiUrl) };

package/dist/version.js

@@ -1 +1 @@
-export const CLI_VERSION = '0.1.98';
+export const CLI_VERSION = '0.1.100';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runcloud",
-  "version": "0.1.98",
+  "version": "0.1.100",
   "description": "Create and control run.cloud remote mobile simulators and cloud sandboxes",
   "license": "Apache-2.0",
   "keywords": [