@sharpe-jupyter/connect 0.4.3 → 0.4.4

package/dist/index.js

@@ -2,6 +2,8 @@
 
 // src/index.tsx
 import { render } from "ink";
+import { readFileSync, writeFileSync, mkdirSync as mkdirSync4, existsSync as existsSync5 } from "fs";
+import { join as join5 } from "path";
 
 // src/app.tsx
 import { useState, useEffect, useRef, useCallback } from "react";
@@ -458,20 +460,7 @@ function App({ connectionCode: connectionCode2, port: port2 }) {
     const proc = isUvProject() ? startJupyterWithUv(port2, getUvPath()) : startJupyter(port2);
     jupyterProc.current = proc;
     didWeSpawnJupyter.current = true;
-    const pipeStream = (stream) => {
-      if (!stream) return;
-      let buf = "";
-      stream.on("data", (data) => {
-        buf += data.toString();
-        const lines = buf.split("\n");
-        buf = lines.pop() ?? "";
-        for (const line of lines) {
-          pushProcessLog(line);
-          const msg = parseJupyterLine(line);
-          if (msg) pushEvent(msg);
-        }
-      });
-    };
+    const pipeStream = createStreamPiper(pushProcessLog, pushEvent);
     pipeStream(proc.stderr);
     pipeStream(proc.stdout);
     proc.on("error", () => {
@@ -566,7 +555,13 @@ function App({ connectionCode: connectionCode2, port: port2 }) {
         const proc = startJupyterWithUv(port2, uvPath);
         jupyterProc.current = proc;
         didWeSpawnJupyter.current = true;
-        const spawnError = await waitForJupyterHealthy(proc, port2, pushEvent, pushProcessLog, () => cancelled);
+        const spawnError = await waitForJupyterHealthy(
+          proc,
+          port2,
+          pushEvent,
+          pushProcessLog,
+          () => cancelled
+        );
         if (cancelled) return;
         const errorInfo = handleJupyterSpawnError(spawnError, port2, processLogsRef.current);
         if (errorInfo) {
@@ -652,7 +647,13 @@ function App({ connectionCode: connectionCode2, port: port2 }) {
         const proc = startJupyter(port2);
         jupyterProc.current = proc;
         didWeSpawnJupyter.current = true;
-        const spawnError = await waitForJupyterHealthy(proc, port2, pushEvent, pushProcessLog, () => cancelled);
+        const spawnError = await waitForJupyterHealthy(
+          proc,
+          port2,
+          pushEvent,
+          pushProcessLog,
+          () => cancelled
+        );
         if (cancelled) return;
         const errorInfo = handleJupyterSpawnError(spawnError, port2, processLogsRef.current);
         if (errorInfo) {
@@ -945,24 +946,12 @@ function waitForJupyterHealthy(proc, port2, pushEvent, pushLog, isCancelled) {
         done(`signal-${signal}`);
       }
     });
-    const pipeOutput = (stream) => {
-      if (!stream) return;
-      let buf = "";
-      stream.on("data", (data) => {
-        buf += data.toString();
-        const lines = buf.split("\n");
-        buf = lines.pop() ?? "";
-        for (const line of lines) {
-          pushLog(line);
-          if (line.includes("Address already in use")) {
-            done("port-conflict");
-            return;
-          }
-          const msg = parseJupyterLine(line);
-          if (msg) pushEvent(msg);
-        }
-      });
-    };
+    const pipeOutput = createStreamPiper(pushLog, pushEvent, (line) => {
+      if (line.includes("Address already in use")) {
+        done("port-conflict");
+        return true;
+      }
+    });
     pipeOutput(proc.stderr);
     pipeOutput(proc.stdout);
     let attempts = 0;
@@ -981,6 +970,23 @@ function waitForJupyterHealthy(proc, port2, pushEvent, pushLog, isCancelled) {
     }, 1e3);
   });
 }
+function createStreamPiper(pushLog, pushEvent, onLine) {
+  return (stream) => {
+    if (!stream) return;
+    let buf = "";
+    stream.on("data", (data) => {
+      buf += data.toString();
+      const lines = buf.split("\n");
+      buf = lines.pop() ?? "";
+      for (const line of lines) {
+        pushLog(line);
+        if (onLine?.(line)) return;
+        const msg = parseJupyterLine(line);
+        if (msg) pushEvent(msg);
+      }
+    });
+  };
+}
 function handleJupyterSpawnError(spawnError, port2, lastLogs) {
   const logTail = lastLogs.length > 0 ? `
 
@@ -1019,6 +1025,70 @@ Close whatever is using it and try again, or use a different port:
 
 // src/index.tsx
 import { jsx as jsx2 } from "react/jsx-runtime";
+function getConfigDir() {
+  const home = process.env.HOME ?? process.env.USERPROFILE ?? "";
+  return join5(home, ".sharpe");
+}
+function getConfigPath() {
+  return join5(getConfigDir(), "config.json");
+}
+function loadSavedToken() {
+  try {
+    const raw = readFileSync(getConfigPath(), "utf-8");
+    const config = JSON.parse(raw);
+    return config.connectionCode ?? null;
+  } catch {
+    return null;
+  }
+}
+function saveToken(token) {
+  try {
+    mkdirSync4(getConfigDir(), { recursive: true });
+    const config = { connectionCode: token };
+    writeFileSync(getConfigPath(), JSON.stringify(config, null, 2) + "\n");
+  } catch {
+  }
+}
+function ensureShellAlias() {
+  const home = process.env.HOME;
+  if (!home) return;
+  const shell = process.env.SHELL ?? "";
+  let rcFile;
+  if (shell.endsWith("/zsh")) {
+    rcFile = join5(home, ".zshrc");
+  } else if (shell.endsWith("/bash")) {
+    const bashrc = join5(home, ".bashrc");
+    rcFile = existsSync5(bashrc) ? bashrc : join5(home, ".bash_profile");
+  } else {
+    return;
+  }
+  const aliasLine = 'alias sharpe="npx @sharpe-jupyter/connect@latest"';
+  try {
+    const contents = readFileSync(rcFile, "utf-8");
+    if (contents.includes("alias sharpe=")) return;
+  } catch {
+  }
+  try {
+    writeFileSync(rcFile, readFileSync(rcFile, "utf-8").trimEnd() + `
+
+# Sharpe CLI
+${aliasLine}
+`, "utf-8");
+    console.log(`Added "sharpe" alias to ${rcFile}`);
+    console.log(`Restart your terminal or run: source ${rcFile}
+`);
+  } catch {
+    try {
+      writeFileSync(rcFile, `# Sharpe CLI
+${aliasLine}
+`, "utf-8");
+      console.log(`Added "sharpe" alias to ${rcFile}`);
+      console.log(`Restart your terminal or run: source ${rcFile}
+`);
+    } catch {
+    }
+  }
+}
 function parseArgs(argv) {
   const args = argv.slice(2);
   let connectionCode2 = null;
@@ -1027,7 +1097,10 @@ function parseArgs(argv) {
     const arg = args[i];
     if (arg === "--help" || arg === "-h") {
       console.log(`
-Usage: sharpe-connect [connection-code] [options]
+Usage: sharpe [connection-code] [options]
+
+  If a connection code is provided, it is saved to ~/.sharpe/config.json
+  for future use. Run "sharpe" with no arguments to reuse the saved code.
 
 Options:
   --port, -p   Notebook port (default: 8888)
@@ -1045,5 +1118,12 @@ Options:
   }
   return { connectionCode: connectionCode2, port: port2 };
 }
-var { connectionCode, port } = parseArgs(process.argv);
+var { connectionCode: cliToken, port } = parseArgs(process.argv);
+var connectionCode = cliToken;
+if (connectionCode) {
+  saveToken(connectionCode);
+  ensureShellAlias();
+} else {
+  connectionCode = loadSavedToken();
+}
 render(/* @__PURE__ */ jsx2(App, { connectionCode, port }));

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@sharpe-jupyter/connect",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "Connect a local JupyterHub to Sharpe via Cloudflare Tunnel",
   "type": "module",
   "bin": {
+    "sharpe": "dist/index.js",
     "sharpe-connect": "dist/index.js"
   },
   "files": [