granola-toolkit 0.2.0 → 0.3.0

package/dist/cli.js

@@ -171,10 +171,56 @@ function transcriptSpeakerLabel(segment) {
 	return segment.source === "microphone" ? "You" : "System";
 }
 //#endregion
-//#region src/api.ts
-const USER_AGENT = "Granola/5.354.0";
-const CLIENT_VERSION = "5.354.0";
-const DOCUMENTS_URL = "https://api.granola.ai/v2/get-documents";
+//#region src/client/auth.ts
+function getAccessTokenFromSupabaseContents(supabaseContents) {
+	const wrapper = parseJsonString(supabaseContents);
+	if (!wrapper) throw new Error("failed to parse supabase.json");
+	const workosTokens = wrapper.workos_tokens;
+	let tokenPayload;
+	if (typeof workosTokens === "string") tokenPayload = parseJsonString(workosTokens);
+	else tokenPayload = asRecord(workosTokens);
+	const accessToken = tokenPayload ? stringValue(tokenPayload.access_token) : "";
+	if (!accessToken.trim()) throw new Error("access token not found in supabase.json");
+	return accessToken;
+}
+var SupabaseFileTokenSource = class {
+	constructor(filePath) {
+		this.filePath = filePath;
+	}
+	async loadAccessToken() {
+		return getAccessTokenFromSupabaseContents(await readFile(this.filePath, "utf8"));
+	}
+};
+var NoopTokenStore = class {
+	async clearToken() {}
+	async readToken() {}
+	async writeToken(_token) {}
+};
+var CachedTokenProvider = class {
+	#token;
+	constructor(source, store = new NoopTokenStore()) {
+		this.source = source;
+		this.store = store;
+	}
+	async getAccessToken() {
+		if (this.#token) return this.#token;
+		const storedToken = await this.store.readToken();
+		if (storedToken?.trim()) {
+			this.#token = storedToken;
+			return storedToken;
+		}
+		const token = await this.source.loadAccessToken();
+		this.#token = token;
+		await this.store.writeToken(token);
+		return token;
+	}
+	async invalidate() {
+		this.#token = void 0;
+		await this.store.clearToken();
+	}
+};
+//#endregion
+//#region src/client/parsers.ts
 function parseProseMirrorDoc(value, options = {}) {
 	if (value == null) return;
 	if (typeof value === "string") {
@@ -209,17 +255,6 @@ function parseLastViewedPanel(value) {
 		updatedAt: stringValue(panel.updated_at)
 	};
 }
-function getAccessToken(supabaseContents) {
-	const wrapper = parseJsonString(supabaseContents);
-	if (!wrapper) throw new Error("failed to parse supabase.json");
-	const workosTokens = wrapper.workos_tokens;
-	let tokenPayload;
-	if (typeof workosTokens === "string") tokenPayload = parseJsonString(workosTokens);
-	else tokenPayload = asRecord(workosTokens);
-	const accessToken = tokenPayload ? stringValue(tokenPayload.access_token) : "";
-	if (!accessToken.trim()) throw new Error("access token not found in supabase.json");
-	return accessToken;
-}
 function parseDocument(value) {
 	const record = asRecord(value);
 	if (!record) throw new Error("document payload is not an object");
@@ -235,44 +270,93 @@ function parseDocument(value) {
 		updatedAt: stringValue(record.updated_at)
 	};
 }
-async function fetchDocuments(options) {
-	const fetchImpl = options.fetchImpl ?? fetch;
-	const accessToken = getAccessToken(options.supabaseContents);
-	const documents = [];
-	const url = options.url ?? DOCUMENTS_URL;
-	const limit = 100;
-	let offset = 0;
-	for (;;) {
-		const signal = AbortSignal.timeout(options.timeoutMs);
-		const response = await fetchImpl(url, {
-			body: JSON.stringify({
+//#endregion
+//#region src/client/granola.ts
+const USER_AGENT = "Granola/5.354.0";
+const CLIENT_VERSION = "5.354.0";
+const DOCUMENTS_URL = "https://api.granola.ai/v2/get-documents";
+var GranolaApiClient = class {
+	constructor(httpClient, documentsUrl = DOCUMENTS_URL) {
+		this.httpClient = httpClient;
+		this.documentsUrl = documentsUrl;
+	}
+	async listDocuments(options) {
+		const documents = [];
+		const limit = options.limit ?? 100;
+		let offset = 0;
+		for (;;) {
+			const response = await this.httpClient.postJson(this.documentsUrl, {
 				include_last_viewed_panel: true,
 				limit,
 				offset
-			}),
+			}, {
+				headers: {
+					"User-Agent": USER_AGENT,
+					"X-Client-Version": CLIENT_VERSION
+				},
+				timeoutMs: options.timeoutMs
+			});
+			if (!response.ok) {
+				const body = (await response.text()).slice(0, 500);
+				throw new Error(`failed to get documents: ${response.status} ${response.statusText}${body ? `: ${body}` : ""}`);
+			}
+			const payload = await response.json();
+			if (!Array.isArray(payload.docs)) throw new Error("failed to parse documents response");
+			const page = payload.docs.map(parseDocument);
+			documents.push(...page);
+			if (page.length < limit) break;
+			offset += limit;
+		}
+		return documents;
+	}
+};
+//#endregion
+//#region src/client/http.ts
+var AuthenticatedHttpClient = class {
+	fetchImpl;
+	constructor(options) {
+		this.fetchImpl = options.fetchImpl ?? fetch;
+		this.logger = options.logger;
+		this.tokenProvider = options.tokenProvider;
+	}
+	logger;
+	tokenProvider;
+	async request(options) {
+		const { retryOnUnauthorized = true, timeoutMs, url } = options;
+		const accessToken = await this.tokenProvider.getAccessToken();
+		const response = await this.fetchImpl(url, {
+			body: options.body,
+			headers: {
+				...options.headers,
+				Authorization: `Bearer ${accessToken}`
+			},
+			method: options.method ?? "GET",
+			signal: AbortSignal.timeout(timeoutMs)
+		});
+		if (response.status === 401 && retryOnUnauthorized) {
+			this.logger?.warn?.("request returned 401; invalidating token provider and retrying once");
+			await this.tokenProvider.invalidate();
+			return this.request({
+				...options,
+				retryOnUnauthorized: false
+			});
+		}
+		return response;
+	}
+	async postJson(url, body, options = { timeoutMs: 3e4 }) {
+		return this.request({
+			...options,
+			body: JSON.stringify(body),
 			headers: {
 				Accept: "*/*",
-				Authorization: `Bearer ${accessToken}`,
 				"Content-Type": "application/json",
-				"User-Agent": USER_AGENT,
-				"X-Client-Version": CLIENT_VERSION
+				...options.headers
 			},
 			method: "POST",
-			signal
+			url
 		});
-		if (!response.ok) {
-			const body = (await response.text()).slice(0, 500);
-			throw new Error(`failed to get documents: ${response.status} ${response.statusText}${body ? `: ${body}` : ""}`);
-		}
-		const payload = await response.json();
-		if (!Array.isArray(payload.docs)) throw new Error("failed to parse documents response");
-		const page = payload.docs.map(parseDocument);
-		documents.push(...page);
-		if (page.length < limit) break;
-		offset += limit;
 	}
-	return documents;
-}
+};
 //#endregion
 //#region src/config.ts
 function pickString(value) {
@@ -516,10 +600,11 @@ const notesCommand = {
 		debug(config.debug, "timeoutMs", config.notes.timeoutMs);
 		debug(config.debug, "output", config.notes.output);
 		console.log("Fetching documents from Granola API...");
-		const documents = await fetchDocuments({
-			supabaseContents: await readFile(config.supabase, "utf8"),
-			timeoutMs: config.notes.timeoutMs
-		});
+		const tokenProvider = new CachedTokenProvider(new SupabaseFileTokenSource(config.supabase), new NoopTokenStore());
+		const documents = await new GranolaApiClient(new AuthenticatedHttpClient({
+			logger: console,
+			tokenProvider
+		})).listDocuments({ timeoutMs: config.notes.timeoutMs });
 		console.log(`Exporting ${documents.length} notes to ${config.notes.output}...`);
 		const written = await writeNotes(documents, config.notes.output);
 		console.log("✓ Export completed successfully");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "granola-toolkit",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "CLI toolkit for exporting and working with Granola notes and transcripts",
   "keywords": [
     "cli",
@@ -37,8 +37,11 @@
     "fmt": "vp fmt",
     "lint": "vp lint",
     "pack:dry-run": "npm pack --dry-run",
-    "prepublishOnly": "vp pack",
+    "prepublishOnly": "node scripts/prepublish.mjs",
     "release": "node scripts/release.mjs",
+    "release:major": "node scripts/release.mjs major",
+    "release:minor": "node scripts/release.mjs minor",
+    "release:patch": "node scripts/release.mjs patch",
     "start": "node dist/cli.js",
     "notes": "node dist/cli.js notes",
     "transcripts": "node dist/cli.js transcripts",