@x-tech-laboratories/x-libs 0.2.0 → 0.3.0

package/dist/web/format.js

@@ -1,26 +1,36 @@
 // Writes times, durations, sizes and counts short enough for a table cell.
+import pretty_bytes from "pretty-bytes";
 // ── Times ────────────────────────────────────────────────────────────────────
 export function now_seconds() {
     return Date.now() / 1000;
 }
+const relative = new Intl.RelativeTimeFormat("en", { style: "narrow", numeric: "always" });
+const plurals = new Intl.PluralRules("en");
+// A whole number of the largest unit that reads well, such as -3 hours, for "3h ago" or "in 3h".
+function relative_time(seconds) {
+    const magnitude = Math.abs(seconds);
+    const sign = seconds < 0 ? -1 : 1;
+    if (magnitude < 90)
+        return relative.format(sign * Math.round(magnitude), "second");
+    if (magnitude < 5400)
+        return relative.format(sign * Math.round(magnitude / 60), "minute");
+    if (magnitude < 129600)
+        return relative.format(sign * Math.round(magnitude / 3600), "hour");
+    return relative.format(sign * Math.round(magnitude / 86400), "day");
+}
 export function age(epoch) {
     if (!epoch)
         return "never";
-    const seconds = Math.max(0, now_seconds() - epoch);
-    if (seconds < 90)
-        return `${Math.round(seconds)}s ago`;
-    if (seconds < 5400)
-        return `${Math.round(seconds / 60)}m ago`;
-    if (seconds < 129600)
-        return `${Math.round(seconds / 3600)}h ago`;
-    return `${Math.round(seconds / 86400)}d ago`;
+    return relative_time(-Math.max(0, now_seconds() - epoch));
 }
-// How long until the epoch, such as "in 3d", or how long ago when it has passed.
+// How long until the epoch, such as "in 3d", "now" when it is less than 90 seconds off, or how long ago once passed.
 export function until(epoch) {
     if (epoch === null)
         return "—";
     const seconds = epoch - now_seconds();
-    return seconds < 0 ? age(epoch) : `in ${duration(seconds)}`;
+    if (seconds < 0)
+        return age(epoch);
+    return seconds < 90 ? "now" : relative_time(seconds);
 }
 export function duration(seconds) {
     if (seconds === null)
@@ -42,33 +52,19 @@ export function stamp(epoch) {
 // ── Sizes ────────────────────────────────────────────────────────────────────
 // Sizes in binary units, such as "44.4 GiB".
 export function bytes(count) {
-    const units = ["B", "KiB", "MiB", "GiB", "TiB", "PiB"];
-    let value = count;
-    let unit = 0;
-    while (value >= 1024 && unit < units.length - 1) {
-        value /= 1024;
-        unit += 1;
-    }
-    return unit === 0 ? `${Math.round(value)} B` : `${value.toFixed(1)} ${units[unit]}`;
+    return pretty_bytes(count, { binary: true, maximumFractionDigits: 1 });
 }
 // Sizes in decimal units, such as "1.2 GB".
 export function size(count) {
     if (count === null || count === undefined)
         return "—";
-    const units = ["B", "kB", "MB", "GB", "TB", "PB"];
-    let value = Math.abs(count);
-    let unit = 0;
-    while (value >= 1000 && unit < units.length - 1) {
-        value /= 1000;
-        unit += 1;
-    }
-    return `${count < 0 ? "−" : ""}${value.toFixed(value < 10 && unit > 0 ? 1 : 0)} ${units[unit]}`;
+    return pretty_bytes(count, { maximumFractionDigits: 1 });
 }
-// A size change with its sign, such as +1.2 GB or −300 MB.
+// A size change with its sign, such as +1.2 GB or -300 MB.
 export function size_change(count) {
     if (count === null || count === undefined)
         return "—";
-    return count > 0 ? `+${size(count)}` : size(count);
+    return count === 0 ? size(0) : pretty_bytes(count, { signed: true, maximumFractionDigits: 1 });
 }
 // ── Counts ───────────────────────────────────────────────────────────────────
 export function count_change(value) {
@@ -77,5 +73,5 @@ export function count_change(value) {
     return value > 0 ? `+${value.toLocaleString()}` : value < 0 ? `−${Math.abs(value).toLocaleString()}` : "0";
 }
 export function plural(count, word) {
-    return `${count.toLocaleString()} ${word}${count === 1 ? "" : "s"}`;
+    return `${count.toLocaleString()} ${word}${plurals.select(count) === "one" ? "" : "s"}`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@x-tech-laboratories/x-libs",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Code the X-apps share: agents and their long runs, passwords, durations, and the web page's helpers and widgets",
   "license": "GPL-3.0-or-later",
   "repository": {
@@ -24,7 +24,7 @@
     "build": "tsc -b",
     "test": "vitest run",
     "lint": "oxlint",
-    "prepublishOnly": "npm run build"
+    "prepack": "npm run build"
   },
   "peerDependencies": {
     "@fastify/websocket": "^11.3.5",
@@ -45,10 +45,17 @@
   "devDependencies": {
     "@fastify/websocket": "^11.3.5",
     "@types/node": "^24.19.2",
+    "@types/sshpk": "^1.17.5",
     "fastify": "^5.12.7",
     "oxlint": "^1.90.0",
     "preact": "^10.29.8",
     "typescript": "^7.0.2",
     "vitest": "^5.0.5"
+  },
+  "dependencies": {
+    "@inquirer/password": "^5.2.5",
+    "parse-duration": "^2.1.11",
+    "pretty-bytes": "^7.2.0",
+    "sshpk": "^1.18.0"
   }
 }