npm - @joshski/dust - Versions diffs - 0.1.34 → 0.1.36 - Mend

@joshski/dust 0.1.34 → 0.1.36

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/dist/dust.js +58 -31
package/package.json +1 -1

package/dist/dust.js CHANGED Viewed

@@ -1,10 +1,7 @@
 #!/usr/bin/env node
-import { createRequire } from "node:module";
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
 // lib/cli/run.ts
 import { existsSync } from "node:fs";
-import { chmod, mkdir, readdir, readFile, writeFile } from "node:fs/promises";
+import { chmod as chmod2, mkdir as mkdir2, readdir as readdir2, readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
 // lib/config/settings.ts
 import { join } from "node:path";
@@ -543,6 +540,9 @@ async function audit(dependencies) {
 // lib/cli/commands/bucket.ts
 import { spawn as nodeSpawn3 } from "node:child_process";
+import { accessSync } from "node:fs";
+import { chmod, mkdir, readdir, readFile, writeFile } from "node:fs/promises";
+import { createServer as httpCreateServer } from "node:http";
 import { homedir, tmpdir } from "node:os";
 // lib/bucket/auth.ts
@@ -578,7 +578,24 @@ async function clearToken(fileSystem, homeDir) {
     await fileSystem.writeFile(path, "{}");
   } catch {}
 }
+async function defaultExchangeCode(code) {
+  const host = getDustbucketHost();
+  const response = await fetch(`${host}/auth/cli/exchange`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ code })
+  });
+  if (!response.ok) {
+    throw new Error(`Token exchange failed: ${response.status}`);
+  }
+  const body = await response.json();
+  if (typeof body.token !== "string") {
+    throw new Error("Invalid token exchange response");
+  }
+  return body.token;
+}
 async function authenticate(authDeps) {
+  const exchange = authDeps.exchangeCode ?? defaultExchangeCode;
   return new Promise((resolve, reject) => {
     let timer = null;
     let serverHandle = null;
@@ -595,13 +612,13 @@ async function authenticate(authDeps) {
     const handler = (request) => {
       const url = new URL(request.url);
       if (url.pathname === "/callback") {
-        const token = url.searchParams.get("token");
-        if (token) {
+        const code = url.searchParams.get("code");
+        if (code) {
           cleanup();
-          resolve(token);
+          exchange(code).then(resolve, reject);
           return new Response("<html><body><p>Authentication successful! You can close this tab.</p></body></html>", { headers: { "Content-Type": "text/html" } });
         }
-        return new Response("Missing token", { status: 400 });
+        return new Response("Missing code", { status: 400 });
       }
       return new Response("Not found", { status: 404 });
     };
@@ -2071,11 +2088,30 @@ function defaultWriteStdout(data) {
   process.stdout.write(data);
 }
 function defaultCreateServer(handler) {
-  const server = Bun.serve({
-    port: 0,
-    fetch: handler
+  let resolvedPort = 0;
+  const server = httpCreateServer(async (nodeRequest, nodeResponse) => {
+    const url = new URL(nodeRequest.url ?? "/", `http://localhost:${resolvedPort}`);
+    const request = new Request(url.toString(), {
+      method: nodeRequest.method ?? "GET"
+    });
+    const response = handler(request);
+    const body = await response.text();
+    nodeResponse.writeHead(response.status, {
+      "Content-Type": response.headers.get("content-type") ?? "text/plain"
+    });
+    nodeResponse.end(body);
+  });
+  server.listen(0, () => {
+    const addr2 = server.address();
+    if (addr2 && typeof addr2 === "object") {
+      resolvedPort = addr2.port;
+    }
   });
-  return { port: server.port ?? 0, stop: () => server.stop() };
+  const addr = server.address();
+  if (addr && typeof addr === "object") {
+    resolvedPort = addr.port;
+  }
+  return { port: resolvedPort, stop: () => server.close() };
 }
 function defaultOpenBrowser(url) {
   const cmd = process.platform === "darwin" ? "open" : "xdg-open";
@@ -2085,26 +2121,17 @@ function createDefaultBucketDependencies() {
   const authFileSystem = {
     exists: (path) => {
       try {
-        const file = Bun.file(path);
-        return file.size > 0;
+        accessSync(path);
+        return true;
       } catch {
         return false;
       }
     },
-    readFile: (path) => Bun.file(path).text(),
-    writeFile: (path, content) => Bun.write(path, content).then(() => {}),
-    mkdir: (path, options) => {
-      const { mkdir } = __require("node:fs/promises");
-      return mkdir(path, options);
-    },
-    readdir: (path) => {
-      const { readdir } = __require("node:fs/promises");
-      return readdir(path);
-    },
-    chmod: (path, mode) => {
-      const { chmod } = __require("node:fs/promises");
-      return chmod(path, mode);
-    }
+    readFile: (path) => readFile(path, "utf8"),
+    writeFile: (path, content) => writeFile(path, content, "utf8"),
+    mkdir: (path, options) => mkdir(path, options).then(() => {}),
+    readdir: (path) => readdir(path),
+    chmod: (path, mode) => chmod(path, mode)
   };
   return {
     spawn: nodeSpawn3,
@@ -3766,10 +3793,10 @@ function createFileSystem(primitives) {
     chmod: (path, mode) => primitives.chmod(path, mode)
   };
 }
-function createGlobScanner(readdir) {
+function createGlobScanner(readdir2) {
   return {
     scan: async function* (dir) {
-      for (const entry of await readdir(dir, { recursive: true })) {
+      for (const entry of await readdir2(dir, { recursive: true })) {
         if (entry.endsWith(".md"))
           yield entry;
       }
@@ -3793,4 +3820,4 @@ async function wireEntry(fsPrimitives, processPrimitives, consolePrimitives) {
 }
 // lib/cli/run.ts
-await wireEntry({ existsSync, readFile, writeFile, mkdir, readdir, chmod }, { argv: process.argv, cwd: () => process.cwd(), exit: process.exit }, { log: console.log, error: console.error });
+await wireEntry({ existsSync, readFile: readFile2, writeFile: writeFile2, mkdir: mkdir2, readdir: readdir2, chmod: chmod2 }, { argv: process.argv, cwd: () => process.cwd(), exit: process.exit }, { log: console.log, error: console.error });

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@joshski/dust",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "Flow state for AI coding agents",
   "type": "module",
   "bin": {