runcloud 0.1.99 → 0.1.101

package/dist/commands/create.js

@@ -1,135 +1,59 @@
-import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
-import { basename, join, resolve } from 'node:path';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
 import { ApiClient, ApiError, friendlyApiError } from '../api.js';
-import { 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;
-function projectName(dir, requested) {
-    const value = requested?.trim() || basename(resolve(dir));
-    if (value.length < 1 || value.length > 100) {
-        throw new Error('Project name must be between 1 and 100 characters.');
-    }
-    return value;
-}
-export function scaffoldV3Backend(dir, name) {
-    const serviceRoot = join(dir, 'backend', 'api-service');
-    mkdirSync(join(serviceRoot, 'src'), { recursive: true });
-    writeFileSync(join(dir, 'backend', 'newly.services.json'), `${JSON.stringify({
-        services: [{
-                name: 'api',
-                path: 'api-service',
-                type: 'worker',
-                public: true,
-                bindings: { DATABASE_URL: { database: 'app' } },
-            }],
-    }, null, 2)}\n`);
-    writeFileSync(join(serviceRoot, 'package.json'), `${JSON.stringify({
-        name: `@newly/${name.toLowerCase().replace(/[^a-z0-9-]+/g, '-').replace(/^-|-$/g, '') || 'api'}`,
-        private: true,
-        type: 'module',
-    }, null, 2)}\n`);
-    writeFileSync(join(serviceRoot, 'src', 'index.ts'), `interface Env {
-  DATABASE_URL: string;
-  NEWLY_ENVIRONMENT_ID: string;
-  NEWLY_PROJECT_ID: string;
-  NEWLY_SERVICE_NAME: string;
-}
-
-function json(value: unknown, status = 200): Response {
-  return Response.json(value, { status });
-}
-
-export default {
-  async fetch(request: Request, env: Env): Promise<Response> {
-    const url = new URL(request.url);
-    if (url.pathname === "/health") {
-      return json({ ok: true, environmentId: env.NEWLY_ENVIRONMENT_ID });
-    }
-    if (url.pathname === "/") {
-      return json({
-        projectId: env.NEWLY_PROJECT_ID,
-        environmentId: env.NEWLY_ENVIRONMENT_ID,
-        service: env.NEWLY_SERVICE_NAME,
-        databaseConfigured: Boolean(env.DATABASE_URL),
-      });
-    }
-    return json({ error: "Not found" }, 404);
-  },
-};
-`);
-}
-async function waitForProduction(client, environmentId, runtime) {
-    const intervalMs = runtime.intervalMs ?? POLL_INTERVAL_MS;
-    const deadline = Date.now() + (runtime.timeoutMs ?? POLL_TIMEOUT_MS);
-    for (;;) {
-        const environment = await client.get(`/environments/${encodeURIComponent(environmentId)}`);
-        if (environment.status === 'ready' || environment.status === 'failed')
-            return environment;
-        if (Date.now() >= deadline) {
-            throw new Error(`Timed out provisioning production (${environment.stage}).`);
-        }
-        await new Promise((done) => setTimeout(done, intervalMs));
-    }
-}
-export async function runCreate(client, dir, opts, runtime = {}) {
+import { requireCredentials, writeProjectLink } from '../config.js';
+import { extractSnapshot } from '../archive.js';
+export async function runCreate(client, dir, opts) {
     if (existsSync(join(dir, 'backend'))) {
         throw new Error('A `backend/` directory already exists here. Run `newly create` in a directory without one.');
     }
-    const name = projectName(dir, opts.name);
-    console.log(`Creating ${name} with production PostgreSQL…`);
-    const created = await client.post('/projects', { name });
+    const { project_id, status } = await client.post('/newly_backend/create_project', {
+        name: opts.name,
+        provision: opts.provision ?? true,
+    });
     writeProjectLink(dir, {
-        projectId: created.id,
+        projectId: project_id,
         pulledSha: null,
         pulledAt: new Date().toISOString(),
     });
-    scaffoldV3Backend(dir, name);
-    console.log(`Production database ${created.productionDatabaseId} is provisioning…`);
-    const production = await waitForProduction(client, created.productionEnvironmentId, runtime);
-    if (production.status === 'failed') {
-        throw new Error(`Production provisioning failed at ${production.stage}: ${production.lastError ?? created.lastError ?? 'unknown error'}`);
+    try {
+        const tar = await client.getBinary('/newly_backend/backend_template');
+        await extractSnapshot(tar, dir);
     }
-    if (production.class !== 'production' || production.projectId !== created.id) {
-        throw new Error('The production bootstrap returned an environment for the wrong project.');
+    catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        throw new Error(`Project ${project_id} was created and linked, but scaffolding the backend template failed: ${msg}. The project exists server-side.`);
     }
-    writeEnvironmentSelection(dir, {
-        id: production.id,
-        name: production.name,
-        projectId: created.id,
-    });
-    console.log(`Using production (${production.id}) in this workspace.`);
-    if (opts.deploy ?? true) {
-        console.log('Deploying the starter backend to production…');
-        await (runtime.deploy ?? runEnvironmentDeploy)(created.id, production.id, client, dir);
-        console.log(`Created ${name}; production database and backend are ready.`);
+    if (status === 'provisioning') {
+        console.log(`Created backend project ${project_id} and scaffolded backend/ here. ` +
+            `Provisioning the dev backend… check with \`newly status\`. Edit, then \`newly deploy\`.`);
     }
     else {
-        console.log(`Created ${name}; production database is ready. Deploy with: newly deploy`);
+        console.log(`Created backend project ${project_id} and scaffolded backend/ here ` +
+            `(not provisioned — run \`newly deploy\` when ready).`);
     }
-    return created.id;
+    return project_id;
 }
 export function registerCreate(program) {
     program
         .command('create')
-        .description('Create a v3 project with its production database and backend')
-        .argument('[name]', 'project name (defaults to the current directory name)')
-        .option('--no-deploy', 'create production without deploying the starter backend')
+        .description('Create a new backend-only Newly project here (scaffold + provision)')
+        .argument('[name]', 'project name (generated if omitted)')
+        .option('--no-provision', 'create without provisioning the backend')
         .action(async (name, opts) => {
         try {
             if (existsSync(join(process.cwd(), '.newly', 'project.json'))) {
                 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(), {
+            const client = new ApiClient(creds.apiUrl, creds.token);
+            await runCreate(client, process.cwd(), {
                 name,
-                deploy: opts.deploy,
+                provision: opts.provision,
             });
         }
-        catch (error) {
-            console.error(error instanceof ApiError
-                ? friendlyApiError(error)
-                : String(error instanceof Error ? error.message : error));
+        catch (e) {
+            console.error(e instanceof ApiError ? friendlyApiError(e) : String(e instanceof Error ? e.message : e));
             process.exitCode = 1;
         }
     });

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/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.99';
+export const CLI_VERSION = '0.1.101';

package/package.json

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