@persistmemory/cli 0.2.0 → 0.2.2

package/dist/index.js

@@ -1525,7 +1525,7 @@ function shortDate(iso) {
 }
 
 // src/help.ts
-var VERSION = "0.1.2";
+var VERSION = true ? "0.2.2" : versionFromManifest();
 var PACKAGE = "@persistmemory/cli";
 var HELP = `
   pm \u2014 PersistMemory from your terminal
@@ -1744,7 +1744,17 @@ async function startLoopback(options = {}) {
       // This page is one-use and holds a result; nothing should keep it.
       "cache-control": "no-store",
       // It never loads anything, so it is not allowed to.
-      "content-security-policy": "default-src 'none'; style-src 'unsafe-inline'"
+      "content-security-policy": "default-src 'none'; style-src 'unsafe-inline'",
+      /*
+              Not kept alive, because a kept socket keeps the PROCESS alive.
+      
+              `server.close()` stops new connections and leaves established ones
+              open, and a browser holds this one open by default — so `pm auth login`
+              printed "Signed in" and then sat there until somebody pressed Ctrl+C.
+              The page is the last thing this server ever serves; there is nothing to
+              reuse the connection for.
+            */
+      connection: "close"
     });
     response.end(donePage(callback));
     resolveCallback?.(callback);
@@ -1776,7 +1786,9 @@ async function startLoopback(options = {}) {
     },
     close() {
       clearTimeout(timer);
+      server.closeAllConnections?.();
       server.close();
+      server.unref();
     }
   };
 }
@@ -2062,7 +2074,7 @@ async function clientFor(resolved, deps) {
   });
 }
 async function currentCredential(resolved, deps) {
-  const credential = resolved.credential;
+  const credential = resolved.fromEnvironment ? resolved.credential : readCredentials(deps.paths)[resolved.profile] ?? resolved.credential;
   if (!credential) throw new NotSignedIn();
   if (!isExpired(credential, deps.now?.() ?? Date.now())) return credential;
   if (!credential.refreshToken || !resolved.clientId) {
@@ -2157,8 +2169,8 @@ async function readStdin() {
 // src/commands/agent.ts
 import { hostname } from "node:os";
 import { homedir as homedir2 } from "node:os";
-import { join as join4, resolve as resolve3 } from "node:path";
-import { readFileSync as readFileSync4, readdirSync, statSync as statSync2 } from "node:fs";
+import { basename, join as join4, resolve as resolve3 } from "node:path";
+import { existsSync as existsSync4, readFileSync as readFileSync4, readdirSync, statSync as statSync2, writeFileSync as writeFileSync4 } from "node:fs";
 
 // src/files.ts
 import { existsSync as existsSync3, readFileSync as readFileSync3, realpathSync, statSync, writeFileSync as writeFileSync3 } from "node:fs";
@@ -2283,6 +2295,17 @@ function locate(roots, requested) {
   }
   throw new Error(`${requested} is not inside any allowed folder (${roots.join(", ")})`);
 }
+function uncontested(target) {
+  if (!existsSync4(target)) return target;
+  const dot = target.lastIndexOf(".");
+  const stem = dot > target.lastIndexOf("/") && dot !== -1 ? target.slice(0, dot) : target;
+  const extension = stem === target ? "" : target.slice(dot);
+  for (let n = 1; n < 1e3; n += 1) {
+    const candidate = `${stem} (${n})${extension}`;
+    if (!existsSync4(candidate)) return candidate;
+  }
+  throw new Error(`${target} and a thousand names beside it are taken.`);
+}
 async function answer(context, apiUrl, token, roots, request) {
   let located;
   try {
@@ -2290,6 +2313,43 @@ async function answer(context, apiUrl, token, roots, request) {
   } catch (error) {
     return { ok: false, error: error instanceof Error ? error.message : "refused" };
   }
+  if (request.kind === "write_file") {
+    if (!request.sourceUrl) return { ok: false, error: "There was nothing to write." };
+    let downloaded;
+    let fetched;
+    try {
+      fetched = await fetch(request.sourceUrl);
+      if (!fetched.ok) {
+        return { ok: false, error: await said(fetched, "The file could not be fetched") };
+      }
+      downloaded = Buffer.from(await fetched.arrayBuffer());
+    } catch {
+      return { ok: false, error: "The file could not be fetched from the service." };
+    }
+    try {
+      let target = located;
+      if (existsSync4(located) && statSync2(located).isDirectory()) {
+        const disposition = fetched.headers.get("content-disposition") ?? "";
+        const named = /filename="([^"]+)"/.exec(disposition)?.[1];
+        target = join4(located, basename(named ?? "file"));
+      }
+      target = uncontested(target);
+      writeFileSync4(target, downloaded, { flag: "wx" });
+      return upload(
+        apiUrl,
+        token,
+        "written.txt",
+        Buffer.from(`Saved to ${target}
+${downloaded.length} bytes
+`, "utf8")
+      );
+    } catch (error) {
+      return {
+        ok: false,
+        error: error instanceof Error ? error.message : "could not write it"
+      };
+    }
+  }
   let bytes;
   let filename = request.path.split("/").pop() ?? "file";
   if (request.kind === "list_dir") {
@@ -2475,8 +2535,8 @@ async function agentCommand(context) {
 }
 
 // src/commands/google.ts
-import { writeFileSync as writeFileSync4 } from "node:fs";
-import { basename, resolve as resolve4 } from "node:path";
+import { writeFileSync as writeFileSync5 } from "node:fs";
+import { basename as basename2, resolve as resolve4 } from "node:path";
 import { readFileSync as readFileSync5 } from "node:fs";
 async function callApi(context, path, init = {}) {
   const credential = context.resolved.credential;
@@ -2542,8 +2602,8 @@ async function driveGet(context, fileId) {
   const disposition = response.headers.get("content-disposition") ?? "";
   const named = /filename="([^"]+)"/.exec(disposition)?.[1];
   const out = stringFlag(context.args, "out");
-  const target = resolve4(out ?? basename(named ?? fileId));
-  writeFileSync4(target, Buffer.from(await response.arrayBuffer()));
+  const target = resolve4(out ?? basename2(named ?? fileId));
+  writeFileSync5(target, Buffer.from(await response.arrayBuffer()));
   context.print(target);
   return 0;
 }
@@ -2559,7 +2619,7 @@ async function drivePut(context, path) {
     context.error(`Cannot read ${path}.`);
     return 1;
   }
-  const name = stringFlag(context.args, "name") ?? basename(path);
+  const name = stringFlag(context.args, "name") ?? basename2(path);
   const response = await callApi(
     context,
     `/api/v1/google/drive/files?name=${encodeURIComponent(name)}`,
@@ -2638,7 +2698,7 @@ async function mailCommand(context) {
 }
 
 // src/commands/requests.ts
-import { existsSync as existsSync4, writeFileSync as writeFileSync5 } from "node:fs";
+import { existsSync as existsSync5, writeFileSync as writeFileSync6 } from "node:fs";
 import { resolve as resolve5 } from "node:path";
 async function requestsCommand(context) {
   if (context.args.words[1] === "get") return collectCommand(context);
@@ -2708,24 +2768,24 @@ async function collectCommand(context) {
   }
   const name = stringFlag(context.args, "output", "o") ?? filename;
   const target = resolve5(name);
-  if (existsSync4(target)) {
+  if (existsSync5(target)) {
     context.error(`${target} already exists. Pass --output to write somewhere else.`);
     return 1;
   }
-  writeFileSync5(target, new Uint8Array(await file.arrayBuffer()));
+  writeFileSync6(target, new Uint8Array(await file.arrayBuffer()));
   context.print(`Wrote ${target}`);
   return 0;
 }
 
 // src/workspace.ts
-import { existsSync as existsSync5, readFileSync as readFileSync6, writeFileSync as writeFileSync6 } from "node:fs";
+import { existsSync as existsSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync7 } from "node:fs";
 import { dirname as dirname3, join as join5, resolve as resolvePath } from "node:path";
 var WORKSPACE_FILE = ".persistmemory.json";
 function findWorkspace(from = process.cwd()) {
   let dir = resolvePath(from);
   for (; ; ) {
     const file = join5(dir, WORKSPACE_FILE);
-    if (existsSync5(file)) {
+    if (existsSync6(file)) {
       const config = readWorkspace(file);
       if (config) return { file, dir, config };
     }
@@ -2748,7 +2808,7 @@ function readWorkspace(file) {
 }
 function writeWorkspace(dir, config) {
   const file = join5(dir, WORKSPACE_FILE);
-  writeFileSync6(file, `${JSON.stringify(config, null, 2)}
+  writeFileSync7(file, `${JSON.stringify(config, null, 2)}
 `, "utf8");
   return file;
 }
@@ -3017,7 +3077,7 @@ function message(error) {
 }
 
 // src/commands/maintain.ts
-import { existsSync as existsSync6, rmSync } from "node:fs";
+import { existsSync as existsSync7, rmSync } from "node:fs";
 import { spawnSync } from "node:child_process";
 import { dirname as dirname4, resolve as resolve7 } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -3061,7 +3121,7 @@ Delete the file it runs from: ${processPath()}`
   return 0;
 }
 async function deleteCommand(context) {
-  if (!existsSync6(context.paths.dir)) {
+  if (!existsSync7(context.paths.dir)) {
     context.print(`Nothing to delete: ${context.paths.dir} does not exist.`);
     return 0;
   }
@@ -3114,7 +3174,7 @@ import { randomUUID } from "node:crypto";
 import { relative as relative2 } from "node:path";
 
 // src/events.ts
-import { appendFileSync, existsSync as existsSync7, mkdirSync as mkdirSync3, readFileSync as readFileSync7 } from "node:fs";
+import { appendFileSync, existsSync as existsSync8, mkdirSync as mkdirSync3, readFileSync as readFileSync7 } from "node:fs";
 import { join as join6 } from "node:path";
 function openSessionLog(paths, id) {
   const directory = join6(paths.dir, "sessions");
@@ -3131,7 +3191,7 @@ function openSessionLog(paths, id) {
       }
     },
     read() {
-      if (!existsSync7(path)) return [];
+      if (!existsSync8(path)) return [];
       return readFileSync7(path, "utf8").split("\n").filter((line) => line.trim() !== "").flatMap((line) => {
         try {
           return [JSON.parse(line)];
@@ -3747,6 +3807,16 @@ async function dispatch(context) {
     case "setup":
     case "init":
       return setupCommand(context);
+    /*
+          `pm version` as well as `--version`.
+    
+          It is what people type, and answering "Unknown command" to somebody
+          asking which version they are running — while a flag two characters away
+          answers it — is a needless dead end.
+        */
+    case "version":
+      context.print(VERSION);
+      return 0;
     case "update":
     case "upgrade":
       return updateCommand(context);