framer-dalton 0.0.11 → 0.0.13

package/dist/cli.js

@@ -10,7 +10,7 @@ import { z } from 'zod';
 import { fileURLToPath } from 'url';
 import { createTRPCClient, httpLink } from '@trpc/client';
 
-/* @framer/ai CLI v0.0.11 */
+/* @framer/ai CLI v0.0.13 */
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 function openUrl(url) {
@@ -134,11 +134,10 @@ function extractProjectId(input) {
   if (/^[a-zA-Z0-9]+$/.test(input)) {
     return input;
   }
-  const match = input.match(/\/projects\/[^/]+--([a-zA-Z0-9]+)/);
-  if (match) {
-    return match[1];
-  }
-  const slugMatch = input.match(/^(?:.+--)?([a-zA-Z0-9]+)(?:-[a-zA-Z0-9]+)?$/);
+  const candidate = input.match(/\/projects\/([^/?#]+)/)?.[1] ?? input;
+  const slugMatch = candidate.match(
+    /^(?:.+--)?([a-zA-Z0-9]+)(?:-[a-zA-Z0-9]+)?$/
+  );
   if (slugMatch) {
     return slugMatch[1];
   }
@@ -204,6 +203,16 @@ __name(printError, "printError");
 
 // src/auth-callback.ts
 var TIMEOUT_MS = 3e5;
+var codeMessages = {
+  "user.denied": "Authorization denied by user.",
+  "project.access_denied": "You don\u2019t have access to this project.",
+  "project.not_found": "Project not found. Check that the project ID is correct.",
+  "project.unauthorized": "Not logged in to Framer.",
+  "api_key.access_denied": "You don\u2019t have permission to create API keys for this project.",
+  "api_key.unauthorized": "Session expired.",
+  connection_error: "Could not connect to Framer.",
+  unknown: "Authorization failed."
+};
 var themes = {
   dark: {
     pageBackground: "rgb(17, 17, 17)",
@@ -271,15 +280,6 @@ function successHtml(theme) {
   });
 }
 __name(successHtml, "successHtml");
-function deniedHtml(theme) {
-  return htmlPage({
-    title: "Framer \u2014 Authorization Denied",
-    heading: "Authorization Denied",
-    message: "Agent access was denied. You can close this tab.",
-    theme
-  });
-}
-__name(deniedHtml, "deniedHtml");
 function errorHtml(theme) {
   return htmlPage({
     title: "Framer \u2014 Authorization Failed",
@@ -289,27 +289,53 @@ function errorHtml(theme) {
   });
 }
 __name(errorHtml, "errorHtml");
+function codeHtml(code, theme) {
+  const heading = code === "user.denied" ? "Authorization Denied" : "Authorization Failed";
+  return htmlPage({
+    title: `Framer \u2014 ${heading}`,
+    heading,
+    message: codeMessages[code],
+    theme
+  });
+}
+__name(codeHtml, "codeHtml");
 function parseTheme(value) {
   return value === "light" ? "light" : "dark";
 }
 __name(parseTheme, "parseTheme");
+var validCodes = new Set(Object.keys(codeMessages));
+function parseCode(value) {
+  if (value !== null && validCodes.has(value)) return value;
+  return null;
+}
+__name(parseCode, "parseCode");
 async function acquireKeyFromBrowser(projectId) {
   const state = crypto.randomBytes(16).toString("hex");
   return new Promise((resolve, reject) => {
-    let pendingResult = null;
+    let settled = false;
+    let pendingApiKey = null;
+    function settle(fn) {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      fn();
+    }
+    __name(settle, "settle");
     const server = http.createServer((req, res) => {
       const url = new URL(req.url ?? "/", `http://127.0.0.1`);
       if (url.pathname === "/done") {
         const theme2 = parseTheme(url.searchParams.get("theme"));
         res.writeHead(200, { "Content-Type": "text/html" });
-        res.end(successHtml(theme2));
-        if (pendingResult) {
-          const { apiKey: apiKey2 } = pendingResult;
-          pendingResult = null;
-          cleanup();
-          print("\u2713 Agent authorized");
-          resolve(apiKey2);
-        }
+        res.end(successHtml(theme2), () => {
+          if (pendingApiKey) {
+            const apiKey2 = pendingApiKey;
+            pendingApiKey = null;
+            settle(() => {
+              print("\u2713 Agent authorized");
+              resolve(apiKey2);
+            });
+          }
+        });
         return;
       }
       if (url.pathname === "/error") {
@@ -324,12 +350,14 @@ async function acquireKeyFromBrowser(projectId) {
         return;
       }
       const theme = parseTheme(url.searchParams.get("theme"));
-      const error = url.searchParams.get("error");
-      if (error === "denied") {
+      const legacyError = url.searchParams.get("error");
+      const legacyCode = legacyError === "denied" ? "user.denied" : legacyError === "failed" ? "project.unauthorized" : null;
+      const code = parseCode(url.searchParams.get("code")) ?? legacyCode;
+      if (code !== null) {
         res.writeHead(200, { "Content-Type": "text/html" });
-        res.end(deniedHtml(theme));
-        cleanup();
-        reject(new Error("Authorization denied by user."));
+        res.end(codeHtml(code, theme), () => {
+          settle(() => reject(new Error(codeMessages[code])));
+        });
         return;
       }
       const apiKey = url.searchParams.get("apiKey");
@@ -339,7 +367,7 @@ async function acquireKeyFromBrowser(projectId) {
         res.end();
         return;
       }
-      pendingResult = { apiKey, theme };
+      pendingApiKey = apiKey;
       res.writeHead(302, { Location: `/done?theme=${theme}` });
       res.end();
     });
@@ -347,9 +375,10 @@ async function acquireKeyFromBrowser(projectId) {
     const pollTimer = setInterval(() => {
       const apiKey = getApiKey(projectId);
       if (apiKey) {
-        cleanup();
-        print("\u2713 API key detected from config");
-        resolve(apiKey);
+        settle(() => {
+          print("\u2713 API key detected from config");
+          resolve(apiKey);
+        });
       }
     }, POLL_INTERVAL_MS);
     const HINT_MS = 55e3;
@@ -366,25 +395,31 @@ async function acquireKeyFromBrowser(projectId) {
       print("Waiting for authorization in browser...");
     }, HINT_MS);
     const timer = setTimeout(() => {
-      cleanup();
-      reject(
-        new Error(
-          "Browser authorization timed out. Use `framer project auth <projectUrlOrId> <apiKey>` instead."
+      settle(
+        () => reject(
+          new Error(
+            "Browser authorization timed out. Use `framer project auth <projectUrlOrId> <apiKey>` instead."
+          )
         )
       );
     }, TIMEOUT_MS);
+    let cleaned = false;
     function cleanup() {
+      if (cleaned) return;
+      cleaned = true;
       clearTimeout(timer);
       clearTimeout(hintTimer);
       clearInterval(pollTimer);
       server.close();
+      server.closeAllConnections();
     }
     __name(cleanup, "cleanup");
-    server.listen(0, "127.0.0.1", async () => {
+    server.keepAliveTimeout = 0;
+    server.unref();
+    server.listen(0, "127.0.0.1", () => {
       const addr = server.address();
       if (!addr || typeof addr === "string") {
-        cleanup();
-        reject(new Error("Failed to start callback server."));
+        settle(() => reject(new Error("Failed to start callback server.")));
         return;
       }
       const callbackUrl = `http://127.0.0.1:${addr.port}/callback`;
@@ -393,13 +428,14 @@ async function acquireKeyFromBrowser(projectId) {
       deeplink.searchParams.set("state", state);
       deeplink.searchParams.set("projectId", projectId);
       const deeplinkStr = deeplink.toString();
-      const opened = await openUrl(deeplinkStr);
-      if (opened) {
-        print("Waiting for authorization in browser...");
-      } else {
-        printError("Could not open browser. Open this URL manually:");
-        printError(deeplinkStr);
-      }
+      openUrl(deeplinkStr).then((opened) => {
+        if (opened) {
+          print("Waiting for authorization in browser...");
+        } else {
+          printError("Could not open browser. Open this URL manually:");
+          printError(deeplinkStr);
+        }
+      });
     });
   });
 }
@@ -14910,7 +14946,7 @@ ${typeDef}`);
 __name(renderDocs, "renderDocs");
 var __filename$1 = fileURLToPath(import.meta.url);
 var __dirname$1 = path4.dirname(__filename$1);
-var VERSION = "0.0.11" ;
+var VERSION = "0.0.13" ;
 var RELAY_PORT = Number(process.env.FRAMER_CLI_PORT) || 19988;
 var client = createTRPCClient({
   links: [

package/dist/start-relay-server.js

@@ -13,7 +13,7 @@ import { createRequire } from 'module';
 import * as vm from 'vm';
 import { connect } from 'framer-api';
 
-/* @framer/ai relay server v0.0.11 */
+/* @framer/ai relay server v0.0.13 */
 var __defProp = Object.defineProperty;
 var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : /* @__PURE__ */ Symbol.for("Symbol." + name);
 var __typeError = (msg) => {
@@ -91,7 +91,7 @@ function log(message) {
 __name(log, "log");
 var __filename$1 = fileURLToPath(import.meta.url);
 path.dirname(__filename$1);
-var VERSION = "0.0.11" ;
+var VERSION = "0.0.13" ;
 var RELAY_PORT = Number(process.env.FRAMER_CLI_PORT) || 19988;
 createTRPCClient({
   links: [
@@ -796,6 +796,7 @@ var appRouter = t.router({
           error: "Failed to get connection for session"
         };
       }
+      const start = performance.now();
       const result = await executeWithReconnect(
         session,
         framer,
@@ -804,8 +805,11 @@ var appRouter = t.router({
         () => sessionManager.reconnect(session),
         execId
       );
+      const elapsed = (performance.now() - start).toFixed(0);
       if (result.error) {
-        log(`exec.error ${tag} error="${result.error}"`);
+        log(`exec.error ${tag} ${elapsed}ms error="${result.error}"`);
+      } else {
+        log(`exec.done ${tag} ${elapsed}ms`);
       }
       return result;
     } catch (_) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "framer-dalton",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "type": "module",
   "bin": {
     "framer-dalton": "./dist/cli.js"