@getxflow/cli 0.27.0 → 0.28.0

package/dist/commands/db.js

@@ -17,6 +17,19 @@ const text_file_1 = require("../text-file");
 const ui_1 = require("../ui");
 /** 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}`;
+}
+function printPlace(history) {
+    (0, ui_1.out)(`Schema: ${(0, ui_1.bold)(history.schema)}`);
+    if (history.server !== undefined)
+        (0, ui_1.out)(`Server: ${serverLabel(history.server)}`);
+    (0, ui_1.out)('');
+}
 function checksum(sql) {
     return (0, node_crypto_1.createHash)('sha256').update(sql).digest('hex').slice(0, 16);
 }
@@ -46,8 +59,7 @@ async function dbStatus(args) {
     if ((0, args_1.flagString)(args, 'project') !== undefined) {
         const { projectId, client } = await (0, session_1.projectTarget)(args);
         const history = await (0, api_1.apiJson)(client, `/api/v1/projects/${projectId}/db/migrate`);
-        (0, ui_1.out)(`Schema: ${(0, ui_1.bold)(history.schema)}`);
-        (0, ui_1.out)('');
+        printPlace(history);
         if (history.applied.length === 0) {
             (0, ui_1.note)('No migrations have been applied yet');
             return;
@@ -61,8 +73,7 @@ async function dbStatus(args) {
     const local = readMigrations(root);
     const history = await (0, api_1.apiJson)(client, `/api/v1/projects/${config.projectId}/db/migrate`);
     const applied = new Map(history.applied.map((row) => [row.name, row]));
-    (0, ui_1.out)(`Schema: ${(0, ui_1.bold)(history.schema)}`);
-    (0, ui_1.out)('');
+    printPlace(history);
     if (local.length === 0 && applied.size === 0) {
         (0, ui_1.note)(`No migrations. The first one: ${MIGRATIONS_DIR}/0001_init.sql`);
         return;
@@ -118,6 +129,7 @@ async function dbList() {
         database.name,
         database.id,
         database.schema ?? '-',
+        serverLabel(database.server),
         attachedProjects(database),
     ]));
     if (data.truncated)
@@ -127,6 +139,14 @@ async function dbList() {
         if (attached > 1)
             (0, ui_1.note)((0, ui_1.dim)(`  ${database.name} is shared by ${attached} projects: a migration affects all of them`));
     }
+    const down = new Map();
+    for (const { server } of data.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 "Data" section of the web interface'));
+    }
 }
 /** Long values would tear the columns apart; the cut is marked, never silent. */
 const CELL_LIMIT = 60;

package/dist/help.js

@@ -83,7 +83,7 @@ ${(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 organization and the projects on them
+  xflow db list                   databases of the organization, servers, projects
   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 migrate [--dry-run] [--allow-destructive]
@@ -288,8 +288,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 and what is waiting
-  xflow db list                    databases of the organization, and who is on them
+  xflow db status                  what is applied, what is waiting, the server
+  xflow db list                    databases of the organization: servers, projects
   xflow db schema [table]          tables of the project, or the columns of one
   xflow db query "select ..."      read data (--limit N: 50 by default, 300 at most;
                                    --json prints the values whole)
@@ -298,7 +298,10 @@ will work.`,
 
 ${(0, ui_1.bold)('list')} is about the organization, not about this project: it names the logical
 databases, the identifier ${(0, ui_1.bold)('xflow init --database <id>')} asks for, and the projects
-attached to each one. That last column is the one to read before a migration.
+attached to each one. That last column is the one to read before a migration. The server
+column says where a database lives: ${(0, ui_1.bold)('platform')} is the common one, ${(0, ui_1.bold)('own "<name>"')} the
+organization's own server. While an own server is not running, its databases do not
+answer, and that is not fixable from the code: its state is in the web interface.
 
 ${(0, ui_1.bold)('schema')} answers a different question than the ${(0, ui_1.bold)('migrations/')} directory: one logical
 database is shared by several projects, so the files say what you did, and the schema

package/dist/limits.js

@@ -7,6 +7,7 @@ const DENIAL_LABELS = {
     limit_projects: 'projects',
     limit_databases: 'databases',
     limit_connections: 'active connector connections',
+    limit_pages: 'public pages',
     limit_functions: 'cloud functions',
     limit_builds: 'builds this month',
     limit_builds_concurrent: 'builds running at once',
@@ -34,6 +35,7 @@ const QUOTA_ORDER = [
     'projects',
     'databases',
     'connections',
+    'pages',
     'functions',
     'developers',
     'members',
@@ -46,6 +48,7 @@ const QUOTA_LABELS = {
     projects: 'Projects',
     databases: 'Databases',
     connections: 'Active connections',
+    pages: 'Public pages',
     functions: 'Cloud functions',
     developers: 'Developers',
     members: 'Staff',

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 = '0.27.0';
+exports.CLI_VERSION = '0.28.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": "0.27.0",
+  "version": "0.28.0",
   "description": "CLI for the XFlow platform: source sync, deployment and publishing of applications",
   "license": "UNLICENSED",
   "engines": {

package/skills/xflow/SKILL.md

@@ -22,7 +22,7 @@ contains the fix.
 
 ## Keeping these instructions current
 
-These instructions ship with xflow CLI 0.27.0, so the copy you are reading can be older than
+These instructions ship with xflow CLI 0.28.0, so the copy you are reading can be older than
 the CLI answering your commands.
 
 When the CLI says this file does not match it, run `xflow skills --refresh` and then **read
@@ -435,6 +435,14 @@ transaction (50 rows by default, `--limit` up to 300; `--json` prints long value
 with double quotes goes in a `.sql` file outside the project, `xflow db query ../q.sql`: PowerShell
 strips them from arguments. Look before you write a migration against a shared database.
 
+An organization can have its own database server, and its new databases are then created there.
+`xflow db list` names the server of each database (`platform` is the common one), `xflow db
+status` the one under this project. Code stays the same: `DATABASE_URL` arrives as before, pass it
+as is, without an `ssl` option (an own server is reached over a closed network, and `ssl` makes
+the connection fail). While an own server is not running, migrations and queries say so and
+functions that use the database time out. That is not your code and not yours to fix: tell the
+person, who sees the server state in the "Data" section of the web interface, instead of retrying.
+
 ## File storage
 
 Two kinds of files live here, and they arrive through different doors.