@sharpe-jupyter/connect 0.2.0 → 0.3.0

package/dist/index.js

@@ -10,7 +10,7 @@ import Spinner from "ink-spinner";
 import { spawn as spawn2 } from "child_process";
 
 // src/cloudflared.ts
-import { createWriteStream, existsSync, mkdirSync, chmodSync } from "fs";
+import { createWriteStream, existsSync, mkdirSync, chmodSync, unlinkSync } from "fs";
 import { join } from "path";
 import { homedir, platform, arch } from "os";
 import { pipeline } from "stream/promises";
@@ -61,7 +61,7 @@ async function ensureCloudflared() {
       fileStream
     );
     execSync(`tar -xzf "${tgzPath}" -C "${binDir}" cloudflared`, { stdio: "ignore" });
-    execSync(`rm -f "${tgzPath}"`, { stdio: "ignore" });
+    unlinkSync(tgzPath);
   } else {
     const fileStream = createWriteStream(binPath);
     await pipeline(
@@ -75,6 +75,53 @@ async function ensureCloudflared() {
   return { path: binPath, downloaded: true };
 }
 
+// src/ripgrep.ts
+import { existsSync as existsSync2, mkdirSync as mkdirSync2, chmodSync as chmodSync2, unlinkSync as unlinkSync2, createWriteStream as createWriteStream2 } from "fs";
+import { join as join2 } from "path";
+import { homedir as homedir2, arch as arch2 } from "os";
+import { pipeline as pipeline2 } from "stream/promises";
+import { Readable as Readable2 } from "stream";
+import { execSync as execSync2 } from "child_process";
+var RIPGREP_VERSION = "15.1.0";
+function getAssetName() {
+  const cpu = arch2();
+  const triple = cpu === "arm64" ? "aarch64-apple-darwin" : "x86_64-apple-darwin";
+  return `ripgrep-${RIPGREP_VERSION}-${triple}.tar.gz`;
+}
+function getBinDir2() {
+  return join2(homedir2(), ".sharpe", "bin");
+}
+function getRipgrepPath() {
+  return join2(getBinDir2(), "rg");
+}
+async function ensureRipgrep() {
+  const binPath = getRipgrepPath();
+  if (existsSync2(binPath)) {
+    return { path: binPath, downloaded: false };
+  }
+  const binDir = getBinDir2();
+  mkdirSync2(binDir, { recursive: true });
+  const assetName = getAssetName();
+  const url = `https://github.com/BurntSushi/ripgrep/releases/download/${RIPGREP_VERSION}/${assetName}`;
+  const response = await fetch(url, { redirect: "follow" });
+  if (!response.ok || !response.body) {
+    throw new Error(`Failed to download ripgrep: ${response.status} ${response.statusText}`);
+  }
+  const tgzPath = join2(binDir, assetName);
+  const fileStream = createWriteStream2(tgzPath);
+  await pipeline2(
+    Readable2.fromWeb(response.body),
+    fileStream
+  );
+  const dirName = assetName.replace(".tar.gz", "");
+  execSync2(`tar -xzf "${tgzPath}" -C "${binDir}" "${dirName}/rg"`, { stdio: "ignore" });
+  execSync2(`mv "${join2(binDir, dirName, "rg")}" "${binPath}"`, { stdio: "ignore" });
+  unlinkSync2(tgzPath);
+  execSync2(`rm -rf "${join2(binDir, dirName)}"`, { stdio: "ignore" });
+  chmodSync2(binPath, 493);
+  return { path: binPath, downloaded: true };
+}
+
 // src/health.ts
 async function checkJupyterHealth(port2) {
   try {
@@ -88,20 +135,22 @@ async function checkJupyterHealth(port2) {
 }
 
 // src/jupyter.ts
-import { execSync as execSync2, spawn } from "child_process";
-import { existsSync as existsSync2 } from "fs";
-import { join as join2 } from "path";
-import { homedir as homedir2, platform as platform2 } from "os";
-var VENV_DIR = join2(homedir2(), ".sharpe", "venv");
+import { execSync as execSync3, spawn } from "child_process";
+import { existsSync as existsSync3 } from "fs";
+import { join as join3 } from "path";
+import { homedir as homedir3, platform as platform2 } from "os";
+var SHARPE_DIR = join3(homedir3(), ".sharpe");
+var VENV_DIR = join3(SHARPE_DIR, "venv");
+var SHARPE_BIN_DIR = join3(SHARPE_DIR, "bin");
 var IS_WIN = platform2() === "win32";
 var BIN_DIR = IS_WIN ? "Scripts" : "bin";
 function venvBin(name) {
-  return join2(VENV_DIR, BIN_DIR, IS_WIN ? `${name}.exe` : name);
+  return join3(VENV_DIR, BIN_DIR, IS_WIN ? `${name}.exe` : name);
 }
 function findPython() {
   for (const cmd of ["python3", "python"]) {
     try {
-      const version = execSync2(`${cmd} --version`, { stdio: ["ignore", "pipe", "ignore"] }).toString().trim();
+      const version = execSync3(`${cmd} --version`, { stdio: ["ignore", "pipe", "ignore"] }).toString().trim();
       if (version.startsWith("Python 3")) return cmd;
     } catch {
     }
@@ -109,10 +158,10 @@ function findPython() {
   return null;
 }
 function venvExists() {
-  return existsSync2(venvBin("python"));
+  return existsSync3(venvBin("python"));
 }
 function createVenv(pythonCmd) {
-  execSync2(`${pythonCmd} -m venv "${VENV_DIR}"`, { stdio: "ignore" });
+  execSync3(`${pythonCmd} -m venv "${VENV_DIR}"`, { stdio: "ignore" });
 }
 function installPackages(packages) {
   return spawn(venvBin("pip"), ["install", "--quiet", ...packages], {
@@ -120,6 +169,7 @@ function installPackages(packages) {
   });
 }
 function startJupyter(port2) {
+  const env = { ...process.env, PATH: `${SHARPE_BIN_DIR}:${process.env.PATH ?? ""}` };
   return spawn(
     venvBin("jupyter"),
     [
@@ -130,9 +180,10 @@ function startJupyter(port2) {
       "--ServerApp.token=",
       "--ServerApp.password=",
       "--ServerApp.allow_remote_access=True",
-      "--ServerApp.disable_check_xsrf=True"
+      "--ServerApp.disable_check_xsrf=True",
+      '--ServerApp.jpserver_extensions={"sharpe_log_handler.handler": true}'
     ],
-    { stdio: ["ignore", "pipe", "pipe"] }
+    { stdio: ["ignore", "pipe", "pipe"], env }
   );
 }
 function parseJupyterLine(line) {
@@ -321,12 +372,12 @@ function App({ connectionCode: connectionCode2, port: port2 }) {
     let cancelled = false;
     async function run() {
       try {
-        await ensureCloudflared();
+        await Promise.all([ensureCloudflared(), ensureRipgrep()]);
       } catch {
         if (cancelled) return;
         setSetupStep("error");
         setError({
-          message: "Could not set up the connection tool.",
+          message: "Could not set up required tools.",
           hint: "Check your internet connection and try again."
         });
         return;
@@ -368,7 +419,7 @@ function App({ connectionCode: connectionCode2, port: port2 }) {
         if (cancelled) return;
         pushEvent("Installing Jupyter...");
         const installResult = await new Promise((resolve) => {
-          const proc2 = installPackages(["jupyter", "jupyter-resource-usage"]);
+          const proc2 = installPackages(["jupyter", "jupyter-resource-usage", "sharpe-log-handler"]);
           proc2.on("error", (err) => resolve(err.message));
           proc2.on("exit", (code) => resolve(code === 0 ? null : "install-failed"));
         });
@@ -608,7 +659,14 @@ Close whatever is using it and try again, or use a different port:
       /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginTop: 1, children: [
         setupStep === "done" && /* @__PURE__ */ jsx(Step, { status: "done", label: "Setting up" }),
         setupStep === "error" && /* @__PURE__ */ jsx(Step, { status: "error", label: "Setting up" }),
-        jupyterStep === "done" && /* @__PURE__ */ jsx(Step, { status: "done", label: "Notebook server running", detail: `http://localhost:${port2}` }),
+        jupyterStep === "done" && /* @__PURE__ */ jsx(
+          Step,
+          {
+            status: "done",
+            label: "Notebook server running",
+            detail: `http://localhost:${port2}`
+          }
+        ),
         jupyterStep === "error" && /* @__PURE__ */ jsx(Step, { status: "error", label: "Could not start notebook server" }),
         tunnelStep === "error" && /* @__PURE__ */ jsx(Step, { status: "error", label: "Connecting to Sharpe" })
       ] }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sharpe-jupyter/connect",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Connect a local JupyterHub to Sharpe via Cloudflare Tunnel",
   "type": "module",
   "bin": {