@heliosgraphics/epoque 0.0.1-alpha.0 → 0.0.1-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@heliosgraphics/epoque",
-	"version": "0.0.1-alpha.0",
+	"version": "0.0.1-alpha.1",
 	"author": "Chris Puska <chris@puska.org>",
 	"description": "sync a local folder",
 	"type": "module",

package/src/api.ts

@@ -2,8 +2,8 @@ import { readFile } from "node:fs/promises"
 import type { RemoteArchive, RemoteArticle, RemoteArticleImage, RemoteCollection } from "./types"
 
 interface ApiErrorBody {
-	error?: string
-	message?: string
+	error?: unknown
+	message?: unknown
 }
 
 type JsonBody = Record<string, unknown> | Array<unknown>
@@ -77,9 +77,7 @@ export class EpoqueApi {
 
 		const response = await fetch(`${this.#origin}${path}`, { body, headers, method: options.method ?? "GET" })
 
-		if (!response.ok) {
-			throw new Error(await getResponseError(response))
-		}
+		if (!response.ok) throw new Error(await getResponseError(response))
 
 		if (response.status === 204) return undefined as T
 
@@ -87,11 +85,28 @@ export class EpoqueApi {
 	}
 }
 
+const getErrorMessage = (value: unknown): string | null => {
+	if (typeof value === "string") return value.trim() || null
+	if (!value || typeof value !== "object") return null
+	if (Array.isArray(value)) return getErrorMessage(value[0])
+
+	const record = value as Record<string, unknown>
+	const details = getErrorMessage(record.details)
+	const message = getErrorMessage(record.message)
+
+	if (details && message) return `${message}: ${details}`
+
+	return details ?? message ?? getErrorMessage(record.error) ?? getErrorMessage(record.code)
+}
+
 const getResponseError = async (response: Response): Promise<string> => {
 	try {
 		const body = (await response.json()) as ApiErrorBody
+		const message = getErrorMessage(body.error) ?? getErrorMessage(body.message)
+
+		if (response.status === 401 && message === "unauthorized") return "invalid API key"
 
-		return body.error || body.message || `request failed with ${response.status}`
+		return message ?? `request failed with ${response.status}`
 	} catch (_error) {
 		return `request failed with ${response.status}`
 	}

package/src/cli.ts

@@ -3,12 +3,12 @@
 import { createInterface } from "node:readline/promises"
 import { stdin as input, stdout as output } from "node:process"
 import { EpoqueApi } from "./api"
-import { getApiKey, getStoredOrigin, normalizeOrigin, readGlobalConfig, readProjectConfig, writeGlobalConfig } from "./config"
+import { getApiKey, normalizeOrigin, readGlobalConfig, writeGlobalConfig } from "./config"
 import { syncFolder } from "./sync"
 
 const HELP = `Usage:
-  epoque login [--origin https://epoque.app]
-  epoque sync [--dry-run] [--origin https://epoque.app]
+  epoque login
+  epoque sync [--dry-run]
 `
 
 const promptLine = async (question: string): Promise<string> => {
@@ -68,17 +68,10 @@ const promptSecret = async (question: string): Promise<string> => {
 	})
 }
 
-const getFlagValue = (args: Array<string>, name: string): string | undefined => {
-	const index = args.indexOf(name)
-	if (index === -1) return undefined
-
-	return args[index + 1]
-}
-
 const hasFlag = (args: Array<string>, name: string): boolean => args.includes(name)
 
-const login = async (args: Array<string>): Promise<void> => {
-	const origin = normalizeOrigin(getFlagValue(args, "--origin") ?? (await getStoredOrigin()))
+const login = async (): Promise<void> => {
+	const origin = normalizeOrigin(undefined)
 	const apiKey = (await promptSecret("API key: ")).trim()
 
 	if (!apiKey) throw new Error("api key is required")
@@ -93,8 +86,7 @@ const login = async (args: Array<string>): Promise<void> => {
 
 const sync = async (args: Array<string>): Promise<void> => {
 	const cwd = process.cwd()
-	const projectConfig = await readProjectConfig(cwd)
-	const origin = normalizeOrigin(getFlagValue(args, "--origin") ?? projectConfig?.origin ?? (await getStoredOrigin()))
+	const origin = normalizeOrigin(undefined)
 	const apiKey = await getApiKey()
 
 	if (!apiKey) throw new Error("not logged in. Run `epoque login` first or set EPOQUE_API_KEY")
@@ -118,7 +110,7 @@ const main = async (): Promise<void> => {
 
 	switch (command) {
 		case "login":
-			await login(args)
+			await login()
 			return
 		case "sync":
 			await sync(args)

package/src/config.ts

@@ -42,14 +42,6 @@ export const getApiKey = async (): Promise<string | null> => {
 	return config.apiKey ?? null
 }
 
-export const getStoredOrigin = async (originOverride?: string): Promise<string> => {
-	if (originOverride) return normalizeOrigin(originOverride)
-
-	const config = await readGlobalConfig()
-
-	return normalizeOrigin(config.origin)
-}
-
 export const readProjectConfig = async (cwd: string): Promise<ProjectConfig | null> => {
 	try {
 		const content = await readFile(getProjectConfigPath(cwd), "utf8")