@mason-data/cli 0.8.0 → 0.9.0

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.9.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.9.0",
+    "@mason-data/extensions-darwin-x64": "0.9.0",
+    "@mason-data/extensions-linux-arm64": "0.9.0",
+    "@mason-data/extensions-linux-x64": "0.9.0",
+    "@mason-data/extensions-win32-x64": "0.9.0"
   }
 }