@getxflow/cli 1.4.0 → 1.5.0

package/dist/bin.js

@@ -180,15 +180,11 @@ async function run(args) {
                 await (0, db_1.dbExec)({ ...args, words: args.words.slice(2) });
                 return;
             }
-            if (second === 'move') {
-                await (0, db_1.dbMove)(rest);
-                return;
-            }
             if (second === undefined || second === 'status') {
                 await (0, db_1.dbStatus)({ ...args, words: args.words.slice(2) });
                 return;
             }
-            throw new errors_1.CliError(`Unknown command: db ${second}`, 'Available: status, list, schema, query, exec, migrate and move');
+            throw new errors_1.CliError(`Unknown command: db ${second}`, 'Available: status, list, schema, query, exec and migrate');
         case 'storage':
             if (second === 'push') {
                 await (0, storage_1.storagePush)(rest);

package/dist/commands/db.js

@@ -5,7 +5,6 @@ exports.dbList = dbList;
 exports.dbSchema = dbSchema;
 exports.dbQuery = dbQuery;
 exports.dbExec = dbExec;
-exports.dbMove = dbMove;
 exports.dbMigrate = dbMigrate;
 exports.migrateBeforeDeploy = migrateBeforeDeploy;
 const node_fs_1 = require("node:fs");
@@ -20,41 +19,6 @@ const ui_1 = require("../ui");
 const sources_1 = require("./sources");
 /** Migration files live in the repo; the applied history lives in the database. */
 const MIGRATIONS_DIR = 'migrations';
-function serverLabel(server) {
-    if (server === undefined)
-        return '-';
-    if (server === null)
-        return 'platform';
-    return server.status === 'active' ? `own "${server.name}"` : `own "${server.name}", ${server.status}`;
-}
-const moving = (move) => move?.status === 'copying' || move?.status === 'switching';
-/** Asked apart from the history: during a move the database does not answer, this does. */
-async function projectDatabase(client, projectId) {
-    try {
-        return await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/db/move`);
-    }
-    catch (e) {
-        if (e instanceof api_1.ApiError && e.code === 'not_deployed')
-            return null;
-        throw e;
-    }
-}
-function printPlace(history, place) {
-    (0, ui_1.out)(`Schema: ${(0, ui_1.bold)(history.schema)}`);
-    if (history.server !== undefined)
-        (0, ui_1.out)(`Server: ${serverLabel(history.server)}`);
-    if (place?.move)
-        (0, ui_1.out)(`Move:   ${moveLine(place.move)}`);
-    (0, ui_1.out)('');
-}
-/** Mid-move the history cannot be read, so the answer is the move itself. */
-function printMoving(place) {
-    if (place.database)
-        (0, ui_1.out)(`Database: ${(0, ui_1.bold)(place.database.name)}`);
-    (0, ui_1.out)(`Server:   ${serverLabel(place.server)}`);
-    (0, ui_1.out)(`Move:     ${place.move?.note ?? ''}`);
-    (0, ui_1.note)((0, ui_1.dim)('  Migrations and queries wait until it is over; the platform finishes it on its own'));
-}
 const STATE_LABEL = {
     pending: 'waiting',
     applied: 'applied',
@@ -86,11 +50,9 @@ async function dbStatus(args) {
     // is the applied history alone, which does not depend on any working copy.
     if ((0, args_1.flagString)(args, 'project') !== undefined) {
         const { projectId, client } = await (0, session_1.projectTarget)(args);
-        const place = await projectDatabase(client, projectId);
-        if (place && moving(place.move))
-            return printMoving(place);
         const history = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/db/migrate`);
-        printPlace(history, place);
+        (0, ui_1.out)(`Schema: ${(0, ui_1.bold)(history.schema)}`);
+        (0, ui_1.out)('');
         if (history.applied.length === 0) {
             (0, ui_1.note)('No migrations have been applied yet');
             return;
@@ -102,15 +64,13 @@ async function dbStatus(args) {
     const { root, config } = (0, config_1.requireProject)();
     const client = await (0, session_1.connectProject)(config.projectId, root, config);
     const local = readMigrations(root);
-    const place = await projectDatabase(client, config.projectId);
-    if (place && moving(place.move))
-        return printMoving(place);
     const status = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/db/status`, {
         method: 'POST',
         body: { migrations: local },
         timeoutMs: 60_000,
     });
-    printPlace({ schema: status.schema, server: status.server, applied: [] }, place);
+    (0, ui_1.out)(`Schema: ${(0, ui_1.bold)(status.schema)}`);
+    (0, ui_1.out)('');
     if (status.migrations.length === 0) {
         (0, ui_1.note)(`No migrations. The first one: ${MIGRATIONS_DIR}/0001_init.sql`);
         return;
@@ -121,65 +81,23 @@ async function dbStatus(args) {
         (0, ui_1.warn)('A changed file is never applied again and db migrate refuses it: write a new migration');
     }
 }
-function serverRow(server) {
-    const room = server.used_bytes !== null && server.space_bytes !== null
-        ? `${(0, ui_1.formatBytes)(server.used_bytes)} of ${(0, ui_1.formatBytes)(server.space_bytes)} used`
-        : '';
-    return [
-        server.id === null ? 'platform' : `own "${server.name}"`,
-        server.id === null ? 'plan space' : server.tier ?? '',
-        server.status === 'active' ? '' : server.status,
-        room,
-        `${server.databases} ${server.databases === 1 ? 'database' : 'databases'}`,
-    ];
-}
-/** The databases of the projects of the organization, and the servers they can live on. */
+/** The databases of the projects of the organization, largest first. */
 async function dbList() {
     const client = (0, session_1.connect)((0, config_1.localConfig)());
     const data = await (0, api_1.apiJson)(client, '/api/v1/org/databases');
     if (data.databases.length === 0) {
         (0, ui_1.note)('The organization has no databases');
         (0, ui_1.note)((0, ui_1.dim)('  One is created with the first project: xflow init'));
+        return;
     }
-    else {
-        printDatabases(data.databases, data.total, data.truncated);
-    }
-    printServers(data.servers);
-}
-function moveLine(move) {
-    return move.finished_at ? `${move.note} (${(0, ui_1.formatAge)(move.finished_at)})` : move.note;
-}
-function printDatabases(databases, total, truncated) {
-    (0, ui_1.table)(databases.map((database) => [
+    (0, ui_1.table)(data.databases.map((database) => [
         database.name,
         database.id,
-        database.schema ?? '-',
-        serverLabel(database.server),
-        typeof database.bytes === 'number' ? (0, ui_1.formatBytes)(database.bytes) : '',
+        database.schema_name,
+        database.bytes === null ? '' : (0, ui_1.formatBytes)(database.bytes),
     ]));
-    if (truncated)
-        (0, ui_1.note)((0, ui_1.dim)(`  Shown ${databases.length} of ${total}`));
-    for (const database of databases) {
-        if (database.move)
-            (0, ui_1.note)((0, ui_1.dim)(`  ${database.name}: ${moveLine(database.move)}`));
-    }
-    const down = new Map();
-    for (const { server } of databases)
-        if (server && server.status !== 'active')
-            down.set(server.id, server);
-    for (const server of down.values()) {
-        (0, ui_1.note)((0, ui_1.dim)(`  Server "${server.name}" is not running (${server.status}): its databases do not answer until it is back. ` +
-            'Not fixable from the code: tell the person, the server state is in the «Базы данных» (Databases) section of the web interface'));
-    }
-}
-/** Where a new or a moved database can go, with the room on each. Only the platform: no choice to show. */
-function printServers(servers) {
-    if (!servers || servers.length < 2)
-        return;
-    (0, ui_1.out)('');
-    (0, ui_1.out)((0, ui_1.bold)('Servers'));
-    (0, ui_1.table)(servers.map(serverRow));
-    (0, ui_1.note)((0, ui_1.dim)('  Without --server a new project keeps its database on the platform server. To put it on another: xflow init --server <name>, or xflow db move --to <name> for one that already exists'));
+    if (data.truncated)
+        (0, ui_1.note)((0, ui_1.dim)(`  Shown ${data.databases.length} of ${data.total}`));
 }
 /** Long values would tear the columns apart; the cut is marked, never silent. */
 const CELL_LIMIT = 60;
@@ -328,64 +246,6 @@ async function dbExec(args) {
             (0, ui_1.note)((0, ui_1.dim)(`  The first ${data.rows.length} returned rows: the rest are saved but not sent back`));
     }
 }
-const MOVE_POLL_MS = 3_000;
-/** Past this the command lets go: the move carries on, db status follows it. */
-const MOVE_FOLLOW_MS = 10 * 60_000;
-const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-/**
- * Moving the project database to another server of the organization. The platform
- * runs the move by itself; this command starts it and follows it to the end.
- */
-async function dbMove(args) {
-    const to = (0, args_1.flagString)(args, 'to');
-    if (!to) {
-        throw new errors_1.CliError('Name the server: --to <name>', 'The servers and their names: xflow db list ("platform" is the common one)');
-    }
-    const { projectId, client } = await (0, session_1.projectTarget)(args);
-    const path = `/api/v1/projects/${projectId}/db/move`;
-    let place;
-    // The platform takes the project name as the yes; --yes looks it up.
-    const confirm = (0, args_1.flagBool)(args, 'yes')
-        ? (await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}`)).name
-        : undefined;
-    try {
-        place = await (0, api_1.apiJson)(client, path, {
-            method: 'POST',
-            body: { to, confirm },
-            timeoutMs: 60_000,
-        });
-    }
-    catch (e) {
-        // Said in the words of this command: the flag, and the name that goes in it.
-        if (e instanceof api_1.ApiError && e.code === 'confirm_required') {
-            throw new errors_1.CliError(e.message, `To move it: xflow db move --to "${to}" --yes`);
-        }
-        throw e;
-    }
-    (0, ui_1.note)((0, ui_1.dim)('  The platform carries the move through by itself: stopping this command does not stop it'));
-    const deadline = Date.now() + MOVE_FOLLOW_MS;
-    let shown = '';
-    while (moving(place.move)) {
-        const line = place.move?.note ?? '';
-        if (line !== shown)
-            (0, ui_1.step)(line);
-        shown = line;
-        if (Date.now() > deadline) {
-            (0, ui_1.note)('Still going: xflow db status follows it');
-            return;
-        }
-        await sleep(MOVE_POLL_MS);
-        place = await (0, api_1.apiJson)(client, path);
-    }
-    const { move } = place;
-    if (move?.status === 'failed')
-        throw new errors_1.CliError(move.note);
-    if (move && (move.functions_done ?? 0) < (move.functions_total ?? 0)) {
-        (0, ui_1.warn)(move.note);
-        return;
-    }
-    (0, ui_1.ok)(move?.note ?? `The database is on ${serverLabel(place.server)}`);
-}
 async function dbMigrate(args) {
     const { root, config } = (0, config_1.requireProject)();
     const client = await (0, session_1.connectProject)(config.projectId, root, config);

package/dist/commands/projects.js

@@ -83,7 +83,7 @@ async function init(args) {
     (0, ui_1.step)(orgName ? `Creating the project in "${orgName}"` : 'Creating the project on the platform');
     const project = await (0, api_1.apiJson)(client, '/api/v1/projects', {
         method: 'POST',
-        body: { name, app: folder ? { name } : null, server: (0, args_1.flagString)(args, 'server') ?? null },
+        body: { name, app: folder ? { name } : null },
         timeoutMs: 60_000,
     });
     try {
@@ -105,8 +105,6 @@ async function init(args) {
     }
     (0, skills_1.installSkillQuietly)(target);
     (0, ui_1.ok)(`Project "${project.name}" created`);
-    if (project.server)
-        (0, ui_1.note)((0, ui_1.dim)(`  Its database goes to the own server "${project.server.name}"`));
     (0, ui_1.out)('');
     (0, ui_1.out)(`  ${(0, ui_1.bold)('Next:')}`);
     (0, ui_1.out)(`    cd ${(0, node_path_1.basename)(target)}`);
@@ -265,7 +263,7 @@ async function get(args) {
     if (card.description)
         (0, ui_1.out)(card.description);
     (0, ui_1.out)('');
-    (0, ui_1.out)(`Database: ${card.database.schema}${card.database.server_id ? ' (own server)' : ''}`);
+    (0, ui_1.out)(`Database: ${card.database.schema}`);
     (0, ui_1.out)('');
     (0, ui_1.out)('Apps:');
     if (card.apps.length === 0)

package/dist/flags.js

@@ -44,7 +44,7 @@ exports.KNOWN = {
     'org list': [],
     'org members': [],
     'org switch': [],
-    init: ['name', 'app', 'no-app', 'server', 'org'],
+    init: ['name', 'app', 'no-app', 'org'],
     link: [],
     projects: [],
     'projects list': [],
@@ -81,7 +81,6 @@ exports.KNOWN = {
     'db query': ['json', 'project'],
     'db exec': ['allow-destructive', 'json', 'project'],
     'db migrate': ['dry-run', 'allow-destructive'],
-    'db move': ['to', 'yes', 'project'],
     storage: ['json', 'project'],
     'storage ls': ['json', 'project'],
     'storage list': ['json', 'project'],

package/dist/help.js

@@ -91,14 +91,12 @@ ${(0, ui_1.bold)('Functions')}
 
 ${(0, ui_1.bold)('Database')}
   xflow db status                 which migrations are applied and which are waiting
-  xflow db list                   databases of the projects and the servers of the organization
+  xflow db list                   databases of the projects of the organization, with sizes
   xflow db schema [table]         tables of the project, or the columns of one
   xflow db query 'select ...'     read data, in a read-only transaction
   xflow db exec 'update ...'      a one-off data change, outside the migration history
   xflow db migrate [--dry-run] [--allow-destructive]
                                   apply the migrations from migrations/*.sql
-  xflow db move --to <server> --yes
-                                  move the project database to another server
 
 ${(0, ui_1.bold)('Pages')}
   xflow pages                     public sites of the organization at <name>.xflowpage.ru
@@ -173,7 +171,7 @@ no working copy of its own:
   xflow db query --project 3f2a… 'select id, title from tasks where done = false'
   xflow functions invoke kanban --project 3f2a… --data-file card.json
 
-Which commands: ${(0, ui_1.bold)('db status')}, ${(0, ui_1.bold)('db query')}, ${(0, ui_1.bold)('db exec')}, ${(0, ui_1.bold)('db schema')}, ${(0, ui_1.bold)('db move')}, ${(0, ui_1.bold)('functions list')},
+Which commands: ${(0, ui_1.bold)('db status')}, ${(0, ui_1.bold)('db query')}, ${(0, ui_1.bold)('db exec')}, ${(0, ui_1.bold)('db schema')}, ${(0, ui_1.bold)('functions list')},
 ${(0, ui_1.bold)('functions invoke')}, ${(0, ui_1.bold)('functions logs')}, ${(0, ui_1.bold)('logs')}, ${(0, ui_1.bold)('env')}, ${(0, ui_1.bold)('env rm')},
 ${(0, ui_1.bold)('connections')}, ${(0, ui_1.bold)('connections link')}, ${(0, ui_1.bold)('connections unlink')}, ${(0, ui_1.bold)('schedules')},
 ${(0, ui_1.bold)('schedules set')}, ${(0, ui_1.bold)('schedules rm')}, ${(0, ui_1.bold)('storage ls')}, ${(0, ui_1.bold)('storage push')},
@@ -336,8 +334,8 @@ is a hard gate on a changed contract, and until you run this command nothing els
 will work.`,
     db: `${(0, ui_1.bold)('xflow db')}: schema, data, migrations
 
-  xflow db status                  what is applied, what is waiting, the server
-  xflow db list                    databases of the projects, the servers of the organization
+  xflow db status                  what is applied, what is waiting
+  xflow db list                    databases of the projects of the organization, with sizes
   xflow db schema [table]          tables of the project, or the columns of one
   xflow db query 'select ...'      read data (rows: the query's own limit, 50 without
                                    one, 300 at most; --json prints the values whole)
@@ -345,26 +343,10 @@ will work.`,
   xflow db exec 'update ...'       a one-off data change: one INSERT, UPDATE, DELETE or MERGE
                                    (or <file>.sql; --allow-destructive, --json)
   xflow db migrate                 store the project root, then apply migrations/*.sql
-  xflow db move --to <server> --yes
-                                   move the project database to another server
 
 Every project has exactly one database of its own, shared by all of its apps and functions,
 and every command here works from any folder of the project. ${(0, ui_1.bold)('list')} is about the
-organization: one database per project, and where each lives: ${(0, ui_1.bold)('platform')} is the common
-server, ${(0, ui_1.bold)('own "<name>"')} an own server of the organization. While an own server is not
-running, its databases do not answer, and that is not fixable from the code. An organization
-with own servers also gets them listed, with the room used on each: that is the choice for
-${(0, ui_1.bold)('xflow init --server')} and ${(0, ui_1.bold)('db move')}.
-
-${(0, ui_1.bold)('move')} takes the database of this project to another server of the organization:
-${(0, ui_1.bold)('platform')} or an own server by name (or id, when two share a name). The platform copies
-the tables, switches the functions of the project and removes the old copy; nothing needs a
-deploy. While it copies, the apps read data but cannot save anything new, usually for a
-couple of minutes, which is why it asks for ${(0, ui_1.bold)('--yes')}. It also needs the
-right to move databases on the key: off by default, only its owner turns it on, in the
-platform settings where the key permissions live. The command follows the move to the end;
-stopping it does not stop the move, and ${(0, ui_1.bold)('xflow db status')} shows where it stands. A move
-that fails is rolled back. Buying, paying for and deleting servers stay with the person.
+organization: one database per project, largest first, to see which project takes the room.
 
 ${(0, ui_1.bold)('schema')} answers a different question than the ${(0, ui_1.bold)('migrations/')} directory: the files say
 what you did, the schema says what is actually in there. ${(0, ui_1.bold)('query')} runs inside a READ ONLY transaction, so
@@ -776,8 +758,6 @@ change them, restyle them or delete what you do not use.
   --name <name>       project name (the folder name by default)
   --app <folder>      the folder of the first app (made from the name by default)
   --no-app            a project without apps: its functions are workflows
-  --server <name>     the database of the project, right away on that server:
-                      platform, or an own server of the organization (xflow db list)
   --org <name>        the organization that gets the project; required when you are
                       signed in to several (xflow org)
 

package/dist/version.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_API_URL = exports.CLI_VERSION = void 0;
 /** Keep in sync with cli/package.json. */
-exports.CLI_VERSION = '1.4.0';
+exports.CLI_VERSION = '1.5.0';
 /** Overridden by XFLOW_API_URL or the `api` field in xflow.json. */
 exports.DEFAULT_API_URL = 'https://app.getxflow.com';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getxflow/cli",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "CLI for the XFlow platform: projects with apps, functions and a database; source sync, deployment and publishing",
   "license": "UNLICENSED",
   "engines": {