@mason-data/cli 0.8.0 → 0.10.0

package/dist/src/web/pages/tables.js

@@ -24,7 +24,7 @@ export const syncsHref = (table) => `#observability/syncs?table=${encodeURICompo
 export const columnsPath = (table) => `/api/tables/${encodeURIComponent(table)}/columns`;
 
 /** A table's sync in one word (`/api/state` `tables[].sync.state`, src/cli/readiness.ts `syncStateOf`). */
-const SYNC_WORDS = { synced: "Synced", syncing: "Syncing", failed: "Failed", waiting: "Waiting" };
+const SYNC_WORDS = { synced: "Synced", syncing: "Syncing", behind: "Behind", failed: "Failed", waiting: "Waiting" };
 
 /** Whether a table's name has the search box's text (any case; nothing typed: every table). */
 const nameMatches = (table, filter) => !filter || table.toLowerCase().includes(filter.trim().toLowerCase());
@@ -199,6 +199,8 @@ export function renderTables(s, ui = {}) {
   const { removing = null, choosing = null, columns = null, outcome = null, ticked = null, filter = "", show = "all", sizes, syncing = [], adding = [], shares = new Map(), before = new Map(), synced = null, open = () => false, limit = TABLE_ROWS } = ui;
   const now = ui.now ?? Date.now();
   if (!s.tables.length) return empty(`${s.source.database} has no table this user can read.`);
+  // why no table can be added or removed from here (a server's sources file this run cannot write), or null
+  const readOnly = s.sourcesReadOnly ?? null;
   const stream = s.stream ? new Map(streamRows(s.stream, now).tables) : null;
   // SEVEN NARROW COLUMNS OF FIXED WIDTHS, NOTHING LONG IN A CELL, AND NOTHING A CLICK INSERTS: a table's state is its word
   // over its copy's bar (a line kept for it when it has none); its last sync an age over how long it took; whatever is
@@ -227,7 +229,9 @@ export function renderTables(s, ui = {}) {
       ? `<a class="btn small" href="${esc(syncsHref(t.table))}">View events</a> ` +
         (syncing.includes(t.table) ? button("Syncing…", {}, "small", { room: ROOMS.sync, disabled: true }) : button(syncedNow ? "Synced ✓" : "Sync now", { syncTable: t.table }, "small", { room: ROOMS.sync })) + " " +
         // while it asks, Remove stays where it was, held down: the question beside it answers it
-        (asking ? button("Remove", {}, "danger small", { disabled: true, expanded: true }) : button("Remove", { removeTable: t.table }, "danger small"))
+        (readOnly ? "" : asking ? button("Remove", {}, "danger small", { disabled: true, expanded: true }) : button("Remove", { removeTable: t.table }, "danger small"))
+      // a sources file this run cannot write (`s.sourcesReadOnly`, a server's): no control that could only fail
+      : readOnly ? ""
       : t.reason === null
         ? `${button("Add", { addTable: t.table }, "primary small")} ${choosing === t.table ? button("Columns…", {}, "small", { disabled: true, expanded: true }) : button("Columns…", { choose: t.table }, "small")}`
         : t.key.length ? "" : choosing === t.table ? button("Name its key…", {}, "small", { disabled: true, expanded: true }) : button("Name its key…", { choose: t.table }, "small");
@@ -284,7 +288,8 @@ export function renderTables(s, ui = {}) {
   const matching = filter.trim() ? `<p class="count dim">${n(shown.length)} with “${esc(filter.trim())}” in the name</p>` : "";
   const sizesFailed = added && sizes && "failure" in sizes ? `<p class="count">The synced tables' own sizes: could not read them (${esc(firstLine(sizes.failure.message))}; ${code("mason usage")} has them)</p>` : "";
   const rowsHtml_ = written.map(line).join("");
-  return stray + (added ? "" : empty("No table added yet", `Add one from the list, as ${code("mason add <table>")} does.`)) + matching +
+  return stray + (readOnly === null ? "" : `<p class="count">Tables are not added or removed from this page: ${esc(readOnly)}.</p>`) +
+    (added ? "" : empty("No table added yet", readOnly === null ? `Add one from the list, as ${code("mason add <table>")} does.` : `The sources file names the tables to sync.`)) + matching +
     panel(`<table class="catalog"><thead><tr>${head.map(([h, c]) => `<th scope="col"${c ? ` class="${c}"` : ""}>${h}</th>`).join("")}</tr></thead>` +
       `<tbody>${rowsHtml_}</tbody></table>`) + pops.join("") + moreRows("tables", Math.min(limit, shown.length), shown.length, TABLE_ROWS) +
     (!shown.length ? `<p class="dim">No ${show === "added" ? "added " : show === "failed" ? "failed " : show === "not-added" ? "table that is not added, " : ""}table${filter.trim() ? `'s name has “${esc(filter.trim())}”` : ""}.</p>` : "") + sizesFailed +

package/dist/src/web/pages/users.js

@@ -3,7 +3,7 @@
  * POST /api/users/<name>/disable and /enable, DELETE /api/users/<name>. An added user's password lives in this page's memory until the person dismisses it, never in
  * storage, a URL or a log line.
  */
-import { actId, badge, button, code, copyable, copyClick, duration, empty, esc, json, panel, pop, renderFailure, ROOMS, status, utcMinute } from "../shared.js";
+import { actId, badge, button, code, copyable, copyClick, duration, empty, esc, json, panel, pop, renderFailure, ROOMS, serverHostNote, status, utcMinute } from "../shared.js";
 
 /** The users as the page reads them: with each one's last use (`mason user list` asks the same), then every 30 s. */
 const USERS = "/api/users?lastUsed=1";
@@ -97,12 +97,13 @@ export function renderUsers(list, confirming = null, now = Date.now(), refused =
  * state), and a user's password is copied only from the card shown once when it is added (`renderAdded`). "" when the
  * run did not say.
  */
-export function renderUsersConnect(pg) {
+export function renderUsersConnect(pg, served = false) {
   if (!pg || typeof pg.shown !== "string") return "";
   const rows = [["Host", pg.host, "users-connect-host"], ["Port", String(pg.port), "users-connect-port"], ["Database", pg.database, "users-connect-database"],
     ["SSL mode", pg.sslmode ?? "disable", "users-connect-sslmode"], ["URL", pg.shown, "users-connect-url"], ["psql", pg.psql, "users-connect-psql"]];
   return `<div class="connect"><p class="connect-title">Connect</p>` +
     `<dl class="facts">${rows.map(([k, v, id]) => `<dt>${esc(k)}</dt><dd>${copyable(id, v)}</dd>`).join("")}</dl>` +
+    (served ? `<p class="tip">${serverHostNote(pg)}</p>` : "") +
     `<p class="tip">A user's name and password go in place of ${code("<user>")} and ${code("<password>")}. The password is shown once, when the user is added: lost, remove the user and add it again.</p></div>`;
 }
 
@@ -192,7 +193,7 @@ export const page = {
         return {
           // the roles file's state is the run's (/api/state roles): a file that cannot be read refuses every user held to it
           users: u ? renderUsers(u, m.confirming, ctx.now().getTime(), m.refused, ctx.read(STATE)?.body?.roles ?? null) : "",
-          "users-connect": renderUsersConnect(ctx.read(STATE)?.body?.postgres),
+          "users-connect": renderUsersConnect(ctx.read(STATE)?.body?.postgres, ctx.read(STATE)?.body?.served === true),
           added: m.added ? renderAdded(m.added) : "",
           action: m.actionFailure ? renderFailure(m.actionFailure) : "",
         };

package/dist/src/web/shared.js

@@ -292,6 +292,18 @@ export function failureOf(status, text) {
     next: [{ command: "mason status", what: "whether Mason runs, and why it stopped" }, { command: "mason start", what: "start it" }, { command: "mason ui", what: "this page, for the Mason that is running" }] };
 }
 
+/**
+ * A FAILURE AS IT IS ON A SERVER'S PAGE (`/api/state` `served`: read through `mason ui --ssh`): the two the page words
+ * itself name the commands of a run on this machine, and here what stopped answering is the tunnel, opened from the
+ * person's own machine. Every other failure is the run's, and stands.
+ */
+export function overTunnel(f) {
+  if (f.code !== "unreachable" && f.message !== "this page's cookie is not the running Mason's") return f;
+  return { code: f.code, message: "the tunnel to this server has closed", why: f.why,
+    fix: "mason ui --ssh <user@server>, on your own machine, opens this page again: each tunnel has its own address",
+    next: [{ command: "mason ui --ssh <user@server>", what: "this page, through a new tunnel" }] };
+}
+
 /** A part of a page written from one read: its body rendered, its Failure said where it shows when `says` (not the
  *  page's first read's: that is the banner), or that it is being asked. */
 export function readPart(ctx, path, render, says) {
@@ -328,7 +340,7 @@ export function statusKind(word) {
   const w = String(word ?? "").toLowerCase();
   if (/^(ready|synced|done|copied|completed|ok|streamed|running|live|added)\b/.test(w)) return "ok";
   if (/^(failed|error|refused|lost|not running|stopped)\b/.test(w)) return "bad";
-  if (/^(under way|syncing|copying|waiting|catching up|not streamed|not kept current|unsynced|cancelled|warning|left out|pending)\b/.test(w)) return "warn";
+  if (/^(under way|syncing|behind|copying|waiting|catching up|not streamed|not kept current|unsynced|cancelled|warning|left out|pending)\b/.test(w)) return "warn";
   return "unknown";
 }
 
@@ -471,16 +483,20 @@ export const USERS_HASH = "#users";
  * place. `first` (nothing has asked Mason anything yet) leads with what the URL is for. Nothing from a run that does
  * not say it.
  */
-export function renderConnect(pg, { first = false, table = null } = {}) {
+export function renderConnect(pg, { first = false, table = null, served = false, share = "" } = {}) {
   if (!pg || typeof pg.shown !== "string") return "";
   // a first statement to type that the request log lists (one that reads a copied table: UNLISTED_STATEMENTS)
   const tryIt = first && table ? `<dt>Then try</dt><dd>${copyable("connect-try", `select count(*) from ${entryName(table)};`)} <span class="dim">it shows on Queries</span></dd>` : "";
   return `<div class="connect${first ? " first" : ""}"><p class="connect-title">${first ? "Connect your first tool" : "Connect"}</p>` +
     (first ? `<p class="lead">Mason answers SQL over the Postgres protocol, as a read replica of your database would: point psql, a BI tool or your app's analytics code at this URL.</p>` : "") +
     `<dl class="facts"><dt>URL</dt><dd>${copyable("connect-url", pg.shown)}</dd><dt>psql</dt><dd>${copyable("connect-psql", pg.psql)}</dd>${tryIt}</dl>` +
-    `<p class="tip"><a class="btn${first ? " primary" : ""}" href="${USERS_HASH}">Create a user</a> <span>Its name and password go in place of ${code("<user>:<password>")}: the Users page shows the whole URL once, as ${code("mason user add <name>")} prints it.</span></p></div>`;
+    (served ? `<p class="tip">${serverHostNote(pg)}</p>` : "") +
+    `<p class="tip"><a class="btn${first ? " primary" : ""}" href="${USERS_HASH}">Create a user</a> <span>Its name and password go in place of ${code("<user>:<password>")}: the Users page shows the whole URL once, as ${code("mason user add <name>")} prints it.</span></p>${share}</div>`;
 }
 
+/** On a server's page the Postgres URL's host is the server's own view of itself: said beside it, as a tool elsewhere needs the server's address. */
+export const serverHostNote = (pg) => `This is the address on the server: from elsewhere a tool connects to the server's own address, in place of ${code(pg.host ?? "localhost")}.`;
+
 /** Nothing to show, quietly: a title and a line under it (`hintHtml`: HTML, a command in code()). */
 export const empty = (title, hintHtml = "") => `<div class="empty"><p class="empty-title">${esc(title)}</p>${hintHtml ? `<p>${hintHtml}</p>` : ""}</div>`;
 

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@mason-data/cli",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "mason start: point Mason at your Postgres and pick the tables to copy. Fast analytics for the database your app already has.",
   "keywords": ["mason", "analytics", "postgres", "duckdb", "cli"],
   "homepage": "https://github.com/embeddable-hq/mason-data#readme",
   "repository": { "type": "git", "url": "git+https://github.com/embeddable-hq/mason-data.git", "directory": "cli" },
   "license": "Apache-2.0",
   "type": "module",
-  "bin": { "mason": "dist/src/cli/main.js" },
+  "bin": { "mason": "dist/src/cli/mason.cjs" },
   "files": ["dist", "README.md", "LICENSE"],
   "engines": { "node": ">=22.13" },
   "scripts": {
@@ -16,16 +16,17 @@
   },
   "dependencies": {
     "@duckdb/node-api": "2.0.0-r.1",
+    "@duckdb/node-bindings": "2.0.0-r.1",
     "@electric-sql/pglite": "^0.5.10",
     "libpg-query": "^18.1.5",
     "pgsql-deparser": "18.3.8",
     "yaml": "^2.6.0"
   },
   "optionalDependencies": {
-    "@mason-data/extensions-darwin-arm64": "0.8.0",
-    "@mason-data/extensions-darwin-x64": "0.8.0",
-    "@mason-data/extensions-linux-arm64": "0.8.0",
-    "@mason-data/extensions-linux-x64": "0.8.0",
-    "@mason-data/extensions-win32-x64": "0.8.0"
+    "@mason-data/extensions-darwin-arm64": "0.10.0",
+    "@mason-data/extensions-darwin-x64": "0.10.0",
+    "@mason-data/extensions-linux-arm64": "0.10.0",
+    "@mason-data/extensions-linux-x64": "0.10.0",
+    "@mason-data/extensions-win32-x64": "0.10.0"
   }
 }