tthr 0.3.23 → 0.3.25

package/dist/{chunk-5S4QNCO2.js → chunk-4X6M7K3X.js}

@@ -87,23 +87,31 @@ async function resolveEnvironmentFromApiKey(cwd = process.cwd()) {
   }
 }
 var DEFAULT_API_URL = "https://api.tetherdb.co.uk";
+function normaliseApiBase(raw) {
+  const trimmed = raw.trim().replace(/\/+$/, "");
+  try {
+    return new URL(trimmed).origin;
+  } catch {
+    return trimmed;
+  }
+}
 function getApiUrl(config) {
   if (process.env.TETHER_API_URL) {
-    return process.env.TETHER_API_URL.replace(/\/+$/, "");
+    return normaliseApiBase(process.env.TETHER_API_URL);
   }
   if (config?.url) {
-    return config.url.replace(/\/+$/, "");
+    return normaliseApiBase(config.url);
   }
   const isDev = process.env.NODE_ENV === "development" || process.env.TETHER_DEV === "true";
   return isDev ? "http://localhost:3001" : DEFAULT_API_URL;
 }
 async function resolveApiUrl(config) {
   if (process.env.TETHER_API_URL) {
-    return process.env.TETHER_API_URL.replace(/\/+$/, "");
+    return normaliseApiBase(process.env.TETHER_API_URL);
   }
   const resolved = config ?? await loadConfig();
   if (resolved?.url) {
-    return resolved.url.replace(/\/+$/, "");
+    return normaliseApiBase(resolved.url);
   }
   const isDev = process.env.NODE_ENV === "development" || process.env.TETHER_DEV === "true";
   return isDev ? "http://localhost:3001" : DEFAULT_API_URL;
@@ -233,6 +241,19 @@ async function clearCredentials() {
 }
 
 // src/commands/generate.ts
+function stripTimestamp(source) {
+  return source.replace(/^\/\/ Generated at: .*$\n?/m, "");
+}
+async function writeIfChanged(filePath, content) {
+  if (await fs3.pathExists(filePath)) {
+    const existing = await fs3.readFile(filePath, "utf-8");
+    if (stripTimestamp(existing) === stripTimestamp(content)) {
+      return false;
+    }
+  }
+  await fs3.writeFile(filePath, content);
+  return true;
+}
 function parseSchemaFile(source) {
   const tables = [];
   const schemaMatch = source.match(/defineSchema\s*\(\s*\{([\s\S]*)\}\s*\)/);
@@ -651,19 +672,19 @@ async function generateTypes(options = {}) {
   const apiUrl = `${await resolveApiUrl(config)}/api/v1`;
   const envVarKeys = projectId ? await fetchEnvVarKeys(projectId, environment, apiUrl) : [];
   await fs3.ensureDir(outputDir);
-  await fs3.writeFile(
+  await writeIfChanged(
     path3.join(outputDir, "db.ts"),
     generateDbFile(tables, schemaSource)
   );
-  await fs3.writeFile(
+  await writeIfChanged(
     path3.join(outputDir, "api.ts"),
     await generateApiFile(functionsDir)
   );
-  await fs3.writeFile(
+  await writeIfChanged(
     path3.join(outputDir, "env.ts"),
     generateEnvFile(envVarKeys)
   );
-  await fs3.writeFile(
+  await writeIfChanged(
     path3.join(outputDir, "index.ts"),
     `// Auto-generated by Tether CLI - do not edit manually
 export * from './db';

package/dist/{generate-FEUPHOUR.js → generate-VX2WJHYQ.js}

@@ -1,7 +1,7 @@
 import {
   generateCommand,
   generateTypes
-} from "./chunk-5S4QNCO2.js";
+} from "./chunk-4X6M7K3X.js";
 export {
   generateCommand,
   generateTypes

package/dist/index.js

@@ -13,7 +13,7 @@ import {
   resolveEnvironmentFromApiKey,
   resolvePath,
   saveCredentials
-} from "./chunk-5S4QNCO2.js";
+} from "./chunk-4X6M7K3X.js";
 
 // src/index.ts
 import { Command } from "commander";
@@ -1754,7 +1754,7 @@ async function runGenerate(spinner) {
   }
   isGenerating = true;
   try {
-    const { generateTypes: generateTypes2 } = await import("./generate-FEUPHOUR.js");
+    const { generateTypes: generateTypes2 } = await import("./generate-VX2WJHYQ.js");
     spinner.text = "Regenerating types...";
     await generateTypes2({ silent: true });
     spinner.succeed("Types regenerated");
@@ -2026,7 +2026,7 @@ async function devCommand(options) {
       }
     }
     spinner.text = "Generating types...";
-    const { generateTypes: generateTypes2 } = await import("./generate-FEUPHOUR.js");
+    const { generateTypes: generateTypes2 } = await import("./generate-VX2WJHYQ.js");
     await generateTypes2({ silent: true });
     spinner.succeed("Types generated");
     if (config.projectId) {
@@ -2207,24 +2207,28 @@ async function requestDeviceCode() {
   const userCode = generateUserCode();
   const deviceCode = crypto.randomUUID();
   const deviceName = os.hostname();
-  const response = await fetch(`${API_URL}/auth/device`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ userCode, deviceCode, deviceName })
-  }).catch(() => null);
-  if (response?.ok) {
-    return await response.json();
-  }
-  const baseUrl = API_URL.replace(/\/api\/v1$/, "");
-  return {
-    deviceCode,
-    userCode,
-    expiresIn: 60,
-    // 1 minute
-    interval: 5,
-    // Poll every 5 seconds
-    authUrl: `${baseUrl}/cli`
-  };
+  let response;
+  try {
+    response = await fetch(`${API_URL}/auth/device`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ userCode, deviceCode, deviceName })
+    });
+  } catch (err) {
+    throw new Error(
+      `Could not reach the Tether API at ${API_URL}: ${err instanceof Error ? err.message : String(err)}
+Set TETHER_API_URL in your shell or .env.local if your server is elsewhere.`
+    );
+  }
+  if (!response.ok) {
+    const body = await response.text().catch(() => "");
+    throw new Error(
+      `Tether API at ${API_URL} returned ${response.status} ${response.statusText} when requesting a device code.
+` + (body ? `Response: ${body.slice(0, 300)}
+` : "") + `Check that TETHER_API_URL points at a Tether server (not a dashboard / proxy).`
+    );
+  }
+  return await response.json();
 }
 async function pollForApproval(deviceCode, interval, expiresIn) {
   const startTime = Date.now();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tthr",
-  "version": "0.3.23",
+  "version": "0.3.25",
   "description": "Tether CLI - project scaffolding and deployment",
   "type": "module",
   "bin": {
@@ -17,12 +17,6 @@
   "files": [
     "dist"
   ],
-  "scripts": {
-    "build": "tsup src/index.ts --format esm --dts --clean",
-    "dev": "tsup src/index.ts --format esm --watch --clean",
-    "typecheck": "tsc --noEmit",
-    "start": "TETHER_DEV=true node dist/index.js"
-  },
   "dependencies": {
     "chalk": "^5.4.1",
     "chokidar": "^5.0.0",
@@ -38,5 +32,11 @@
     "@types/prompts": "^2.4.9",
     "tsup": "^8.3.6",
     "typescript": "^5.7.2"
+  },
+  "scripts": {
+    "build": "tsup src/index.ts --format esm --dts --clean",
+    "dev": "tsup src/index.ts --format esm --watch --clean",
+    "typecheck": "tsc --noEmit",
+    "start": "TETHER_DEV=true node dist/index.js"
   }
-}
+}