npm - runcloud - Versions diffs - 0.1.131 → 0.1.133 - Mend

runcloud 0.1.131 → 0.1.133

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/dist/api.js +2 -1
package/dist/commands/email.js +10 -83
package/dist/commands/environment.js +3 -3
package/dist/commands/login.js +6 -11
package/dist/commands/token.js +4 -9
package/dist/config.js +2 -5
package/dist/runCloudAuth.js +0 -2
package/dist/version.js +1 -1
package/package.json +1 -1
package/runcloud-0.1.133.tgz +0 -0
package/runcloud-0.1.131.tgz +0 -0

package/dist/api.js CHANGED Viewed

@@ -257,8 +257,9 @@ function headline(err) {
             return `Session expired or invalid — run \`${command}\`.`;
         }
         if (err.status === 403) {
-            if (err.detail)
+            if (err.detail && !/^forbidden\.?$/i.test(err.detail.trim())) {
                 return `Forbidden: ${err.detail}`;
+            }
             const where = err.path ? ` on ${err.path}` : '';
             return (`Forbidden, and the API did not say why. Either the credential was not accepted ` +
                 `(run \`${loginCommandName()}\`), or it is valid but not allowed${where}.`);

package/dist/commands/email.js CHANGED Viewed

@@ -1,86 +1,13 @@
-import { ApiClient, friendlyApiError } from '../api.js';
-import { requireCredentials, resolveProject } from '../config.js';
-import { assertDevOnly } from './misc.js';
-function makeClient(project) {
-    const creds = requireCredentials();
-    return {
-        client: new ApiClient(creds.apiUrl, creds.token),
-        projectId: resolveProject(process.cwd(), project),
-    };
-}
-export async function getEmailStatus(client, projectId, env) {
-    return await client.get(`/newly_backend/email/status?project_id=${encodeURIComponent(projectId)}&env=${env}`);
-}
-export function formatEmailStatus(status) {
-    const lines = [
-        `email: ${status.configured ? 'configured' : 'not configured'}`,
-        `from: ${status.from ?? '(not set)'}`,
-    ];
-    if (status.requires_deploy)
-        lines.push('requires deploy: yes');
-    if (status.notes)
-        lines.push(`notes: ${status.notes}`);
-    return lines.join('\n');
-}
-export async function sendTestEmail(client, opts) {
-    return await client.post('/newly_backend/email/test', {
-        project_id: opts.projectId,
-        env: opts.env,
-        to: opts.to,
-        from: opts.from,
-        subject: opts.subject,
-        text: opts.text,
-        html: opts.html,
-    });
-}
+export const EMAIL_RETIRED_MESSAGE = '`newly email` was retired: it never had a server to talk to. ' +
+    'There is no CLI replacement; send mail from your API service with your own provider.';
 export function registerEmail(program) {
-    const email = program.command('email').description('Manage Newly Email');
-    email
-        .command('status')
-        .description('Show Newly Email configuration for this backend')
-        .option('--env <env>', 'dev or prod', 'dev')
-        .option('--project <id>', 'project id')
-        .action(async (opts) => {
-        try {
-            assertDevOnly(opts.env, 'email status');
-            const { client, projectId } = makeClient(opts.project);
-            console.log(formatEmailStatus(await getEmailStatus(client, projectId, opts.env)));
-        }
-        catch (e) {
-            console.error(friendlyApiError(e));
-            process.exitCode = 1;
-        }
-    });
-    email
-        .command('test')
-        .description('Send a test email through the deployed API service')
-        .requiredOption('--to <email>', 'recipient email address')
-        .option('--from <email>', 'sender email address; defaults to the backend sender setting')
-        .option('--subject <subject>', 'email subject', 'Newly email test')
-        .option('--text <text>', 'plain-text body', 'This is a test email from your Newly backend.')
-        .option('--html <html>', 'optional HTML body')
-        .option('--env <env>', 'dev or prod', 'dev')
-        .option('--project <id>', 'project id')
-        .action(async (opts) => {
-        try {
-            assertDevOnly(opts.env, 'email test');
-            const { client, projectId } = makeClient(opts.project);
-            const result = await sendTestEmail(client, {
-                projectId,
-                env: opts.env,
-                to: opts.to,
-                from: opts.from,
-                subject: opts.subject,
-                text: opts.text,
-                html: opts.html,
-            });
-            console.log(result.message_id
-                ? `Email sent. message_id=${result.message_id}`
-                : 'Email sent.');
-        }
-        catch (e) {
-            console.error(friendlyApiError(e));
-            process.exitCode = 1;
-        }
+    program
+        .command('email')
+        .description('Retired: send mail from your API service instead')
+        .allowUnknownOption()
+        .allowExcessArguments()
+        .action(() => {
+        console.error(EMAIL_RETIRED_MESSAGE);
+        process.exitCode = 1;
     });
 }

package/dist/commands/environment.js CHANGED Viewed

@@ -1,12 +1,12 @@
 import { createInterface } from 'node:readline/promises';
 import { ApiClient, friendlyApiError } from '../api.js';
 import { runEnvironmentDatabaseShell } from '../shellSession.js';
-import { clearEnvironmentSelection, readEnvironmentSelection, controlPlaneUrl, requireCredentials, requireEnvironmentSelection, resolveProject, writeEnvironmentSelection, } from '../config.js';
+import { clearEnvironmentSelection, readEnvironmentSelection, 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(controlPlaneUrl(credentials), credentials.token);
+    return new ApiClient(credentials.apiUrl, 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(controlPlaneUrl(credentials), credentials.token).get(`/environments/${encodeURIComponent(selected.id)}`);
+            const environment = await new ApiClient(credentials.apiUrl, 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 CHANGED Viewed

@@ -49,9 +49,8 @@ export function openBrowser(url) {
     });
     child.unref();
 }
-export function commandApiUrls(apiUrl, authApiUrl) {
-    const same = normalizeApiUrl(apiUrl) === normalizeApiUrl(authApiUrl);
-    return { apiUrl, ...(same ? {} : { authApiUrl }) };
+export function commandApiUrl(isRunCloud, authApiUrl, offered) {
+    return isRunCloud && offered ? offered : authApiUrl;
 }
 export async function emailLogin(apiUrl, presetEmail, io) {
     const email = presetEmail?.trim()
@@ -135,7 +134,6 @@ export function whoamiReport(creds) {
     const rows = [
         ['Account', creds.account ?? 'not recorded (browser sign-in never sees an address)'],
         ['API', creds.apiUrl],
-        ...(creds.authApiUrl ? [['Issued by', creds.authApiUrl]] : []),
         ['Expires', expiresAtLabel(creds) ?? 'never'],
         ['Credential', credentialsDisplayPath()],
     ];
@@ -223,10 +221,8 @@ export function registerLogin(program) {
                 let method = methodFromFlags(opts);
                 const terminal = method === 'email' || !method ? acquirePromptIO() : null;
                 try {
-                    let providers = null;
                     if (!method && terminal) {
-                        providers = await fetchProviders(authApiUrl);
-                        const choices = loginChoices(providers);
+                        const choices = loginChoices(await fetchProviders(authApiUrl));
                         if (choices.length === 0) {
                             throw new Error(`${authApiUrl} has no sign-in methods enabled.`);
                         }
@@ -234,15 +230,14 @@ export function registerLogin(program) {
                     }
                     if (method === 'email') {
                         const preset = typeof opts.email === 'string' ? opts.email : undefined;
-                        providers ??= await fetchProviders(authApiUrl);
                         const { email, token } = await emailLogin(authApiUrl, preset, terminal?.io);
                         saveCredentials({
                             token,
+                            apiUrl: authApiUrl,
                             appUrl: opts.appUrl,
                             expiresAt: Number.MAX_SAFE_INTEGER,
                             revocable: true,
                             account: email,
-                            ...commandApiUrls(providers.cliApiUrl ?? authApiUrl, authApiUrl),
                         });
                         console.log(`\n  Signed in as ${email}`);
                         console.log(`  Credential saved to ${credentialsDisplayPath()}\n`);
@@ -274,11 +269,11 @@ export function registerLogin(program) {
             await verifyRunCloudCredential(authApiUrl, payload.token);
             saveCredentials({
                 token: payload.token,
+                apiUrl: commandApiUrl(isRunCloud, authApiUrl, payload.apiUrl),
                 appUrl: opts.appUrl,
                 expiresAt: Math.floor(Date.now() / 1000) + payload.expiresIn,
                 revocable: true,
                 ...(payload.account ? { account: payload.account } : {}),
-                ...commandApiUrls(payload.apiUrl, authApiUrl),
             });
             console.log(`Logged in${payload.account ? ` as ${payload.account}` : ''}. ` +
                 `Credentials saved to ${credentialsDisplayPath()}`);
@@ -313,7 +308,7 @@ export function registerLogin(program) {
         .action(async () => {
         const creds = loadCredentials();
         if (creds?.revocable) {
-            console.log(await revokeRunCloudCredential(creds.authApiUrl ?? creds.apiUrl, creds.token));
+            console.log(await revokeRunCloudCredential(creds.apiUrl, creds.token));
         }
         clearCredentials();
         console.log('Logged out.');

package/dist/commands/token.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { acquirePromptIO, select, PromptAbortedError } from '../prompt.js';
 import { fetchProviders } from '../runCloudAuth.js';
-import { authApiUrlFor, commandApiUrls, emailLogin, loginChoices, methodFromFlags, openBrowser, verifyRunCloudCredential, } from './login.js';
+import { authApiUrlFor, commandApiUrl, emailLogin, loginChoices, methodFromFlags, openBrowser, verifyRunCloudCredential, } from './login.js';
 export function tokenReport(isRunCloud, minted) {
     const bin = isRunCloud ? 'runcloud' : 'newly';
     const tokenVar = isRunCloud ? 'RUN_CLOUD_API_TOKEN' : 'NEWLY_API_TOKEN';
@@ -49,10 +49,8 @@ export function registerToken(program) {
                 let method = methodFromFlags(opts);
                 const terminal = method === 'email' || !method ? acquirePromptIO() : null;
                 try {
-                    let providers = null;
                     if (!method && terminal) {
-                        providers = await fetchProviders(authApiUrl);
-                        const choices = loginChoices(providers);
+                        const choices = loginChoices(await fetchProviders(authApiUrl));
                         if (choices.length === 0) {
                             throw new Error(`${authApiUrl} has no sign-in methods enabled.`);
                         }
@@ -60,11 +58,9 @@ export function registerToken(program) {
                     }
                     if (method === 'email') {
                         const preset = typeof opts.email === 'string' ? opts.email : undefined;
-                        providers ??= await fetchProviders(authApiUrl);
                         const { email, token: minted } = await emailLogin(authApiUrl, preset, terminal?.io);
                         await verifyRunCloudCredential(authApiUrl, minted);
-                        const urls = commandApiUrls(providers.cliApiUrl ?? authApiUrl, authApiUrl);
-                        console.log(tokenReport(isRunCloud, { token: minted, apiUrl: urls.apiUrl, account: email }));
+                        console.log(tokenReport(isRunCloud, { token: minted, apiUrl: authApiUrl, account: email }));
                         return;
                     }
                 }
@@ -82,10 +78,9 @@ export function registerToken(program) {
                 openBrowser,
             });
             await verifyRunCloudCredential(authApiUrl, payload.token);
-            const urls = commandApiUrls(payload.apiUrl, authApiUrl);
             console.log(tokenReport(isRunCloud, {
                 token: payload.token,
-                apiUrl: urls.apiUrl,
+                apiUrl: commandApiUrl(isRunCloud, authApiUrl, payload.apiUrl),
                 ...(payload.account ? { account: payload.account } : {}),
             }));
         }

package/dist/config.js CHANGED Viewed

@@ -36,9 +36,6 @@ 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) };
@@ -67,10 +64,10 @@ export function loadCredentials() {
     if (!existsSync(credentialsPath()))
         return null;
     try {
-        const creds = JSON.parse(readFileSync(credentialsPath(), 'utf8'));
+        const { authApiUrl, ...creds } = JSON.parse(readFileSync(credentialsPath(), 'utf8'));
         if (!creds.token || creds.expiresAt < Date.now() / 1000)
             return null;
-        return { ...creds, apiUrl: normalizeApiUrl(creds.apiUrl) };
+        return { ...creds, apiUrl: normalizeApiUrl(authApiUrl ?? creds.apiUrl) };
     }
     catch {
         return null;

package/dist/runCloudAuth.js CHANGED Viewed

@@ -41,13 +41,11 @@ export async function fetchProviders(apiUrl) {
     if (!response.ok)
         throw new AuthError(await readError(response), response.status);
     const payload = (await response.json());
-    const cliApiUrl = typeof payload.cliApiUrl === 'string' ? payload.cliApiUrl.trim() : '';
     return {
         emailOtp: payload.emailOtp === true,
         google: payload.google === true,
         github: payload.github === true,
         apple: payload.apple === true,
-        ...(cliApiUrl ? { cliApiUrl } : {}),
     };
 }
 export async function sendEmailCode(apiUrl, email) {

package/dist/version.js CHANGED Viewed

	@@ -1 +1 @@
1	- export const CLI_VERSION = '0.1.~~131~~';
1	+ export const CLI_VERSION = '0.1.133';

package/package.json CHANGED Viewed

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

package/runcloud-0.1.133.tgz ADDED Viewed

Binary file

package/runcloud-0.1.131.tgz DELETED Viewed

Binary file