refactor(client): move api helpers

Author: ex3ndr

sources/commands/developerApi.ts sources/client/clientApi.tssources/commands/developerApi.ts renamed to sources/client/clientApi.ts

@@ -13,20 +13,20 @@ type JsonRequestInit = RequestInit & {
   json?: JsonValue;
 };
 
-export async function requireToken(context: CommandContext): Promise<string> {
+export async function requireClientToken(context: CommandContext): Promise<string> {
   const token = await loadToken(context.env);
   if (!token) {
     throw new Error('Not logged in. Run "bee login" first.');
   }
   return token;
 }
 
-export async function requestDeveloperJson(
+export async function requestClientJson(
   context: CommandContext,
   path: string,
   init: JsonRequestInit = {}
 ): Promise<unknown> {
-  const token = await requireToken(context);
+  const token = await requireClientToken(context);
   const headers = new Headers(init.headers);
   headers.set("Authorization", `Bearer ${token}`);
 

sources/commands/auth/developerMe.ts sources/client/clientMe.tssources/commands/auth/developerMe.ts renamed to sources/client/clientMe.ts

@@ -1,15 +1,15 @@
 import type { CommandContext } from "@/commands/types";
 
-type DevUser = {
+type ClientUser = {
   id: number;
   first_name: string;
   last_name: string | null;
 };
 
-export async function fetchDeveloperMe(
+export async function fetchClientMe(
   context: CommandContext,
   token: string
-): Promise<DevUser> {
+): Promise<ClientUser> {
   const response = await context.client.fetch("/v1/me", {
     method: "GET",
     headers: {
@@ -30,7 +30,7 @@ export async function fetchDeveloperMe(
   const id = data?.["id"];
   const firstName = data?.["first_name"];
   if (typeof id !== "number" || typeof firstName !== "string") {
-    throw new Error("Invalid response from developer API.");
+    throw new Error("Invalid response from API.");
   }
 
   return {

sources/commands/conversations/index.ts

@@ -1,5 +1,5 @@
 import type { Command, CommandContext } from "@/commands/types";
-import { printJson, requestDeveloperJson } from "@/commands/developerApi";
+import { printJson, requestClientJson } from "@/client/clientApi";
 
 const USAGE = [
   "bee conversations list [--limit N] [--cursor <cursor>]",
@@ -50,7 +50,7 @@ async function handleList(
 
   const suffix = params.toString();
   const path = suffix ? `/v1/conversations?${suffix}` : "/v1/conversations";
-  const data = await requestDeveloperJson(context, path, { method: "GET" });
+  const data = await requestClientJson(context, path, { method: "GET" });
   printJson(data);
 }
 
@@ -107,7 +107,7 @@ async function handleGet(
   context: CommandContext
 ): Promise<void> {
   const id = parseId(args);
-  const data = await requestDeveloperJson(context, `/v1/conversations/${id}`, {
+  const data = await requestClientJson(context, `/v1/conversations/${id}`, {
     method: "GET",
   });
   printJson(data);

sources/commands/daily/index.ts

@@ -1,5 +1,5 @@
 import type { Command, CommandContext } from "@/commands/types";
-import { printJson, requestDeveloperJson } from "@/commands/developerApi";
+import { printJson, requestClientJson } from "@/client/clientApi";
 
 const USAGE = [
   "bee daily list [--limit N]",
@@ -46,7 +46,7 @@ async function handleList(
 
   const suffix = params.toString();
   const path = suffix ? `/v1/daily?${suffix}` : "/v1/daily";
-  const data = await requestDeveloperJson(context, path, { method: "GET" });
+  const data = await requestClientJson(context, path, { method: "GET" });
   printJson(data);
 }
 
@@ -93,7 +93,7 @@ async function handleGet(
   context: CommandContext
 ): Promise<void> {
   const id = parseId(args);
-  const data = await requestDeveloperJson(context, `/v1/daily/${id}`, {
+  const data = await requestClientJson(context, `/v1/daily/${id}`, {
     method: "GET",
   });
   printJson(data);

sources/commands/facts/index.ts

@@ -1,5 +1,5 @@
 import type { Command, CommandContext } from "@/commands/types";
-import { printJson, requestDeveloperJson } from "@/commands/developerApi";
+import { printJson, requestClientJson } from "@/client/clientApi";
 
 const USAGE = [
   "bee facts list [--limit N] [--cursor <cursor>] [--confirmed <true|false>]",
@@ -66,7 +66,7 @@ async function handleList(
 
   const suffix = params.toString();
   const path = suffix ? `/v1/facts?${suffix}` : "/v1/facts";
-  const data = await requestDeveloperJson(context, path, { method: "GET" });
+  const data = await requestClientJson(context, path, { method: "GET" });
   printJson(data);
 }
 
@@ -137,7 +137,7 @@ async function handleGet(
   context: CommandContext
 ): Promise<void> {
   const id = parseId(args);
-  const data = await requestDeveloperJson(context, `/v1/facts/${id}`, {
+  const data = await requestClientJson(context, `/v1/facts/${id}`, {
     method: "GET",
   });
   printJson(data);
@@ -167,7 +167,7 @@ async function handleCreate(
   context: CommandContext
 ): Promise<void> {
   const options = parseCreateArgs(args);
-  const data = await requestDeveloperJson(context, "/v1/facts", {
+  const data = await requestClientJson(context, "/v1/facts", {
     method: "POST",
     json: { text: options.text },
   });
@@ -228,7 +228,7 @@ async function handleUpdate(
     body.confirmed = options.confirmed;
   }
 
-  const data = await requestDeveloperJson(context, `/v1/facts/${options.id}`, {
+  const data = await requestClientJson(context, `/v1/facts/${options.id}`, {
     method: "PUT",
     json: body,
   });
@@ -311,7 +311,7 @@ async function handleDelete(
   context: CommandContext
 ): Promise<void> {
   const id = parseId(args);
-  const data = await requestDeveloperJson(context, `/v1/facts/${id}`, {
+  const data = await requestClientJson(context, `/v1/facts/${id}`, {
     method: "DELETE",
   });
   printJson(data);

sources/commands/login/index.ts

@@ -10,7 +10,7 @@ import {
 import { emojiHash } from "@/utils/emojiHash";
 import { openBrowser } from "@/utils/browser";
 import { renderQrCode } from "@/utils/qrCode";
-import { fetchDeveloperMe } from "@/commands/auth/developerMe";
+import { fetchClientMe } from "@/client/clientMe";
 
 type LoginOptions = {
   token?: string;
@@ -63,7 +63,7 @@ async function handleLogin(
 
   token = token.trim();
 
-  const user = await fetchDeveloperMe(context, token);
+  const user = await fetchClientMe(context, token);
 
   await saveToken(context.env, token);
 

sources/commands/me/index.ts

@@ -1,5 +1,5 @@
 import type { Command } from "@/commands/types";
-import { printJson, requestDeveloperJson } from "@/commands/developerApi";
+import { printJson, requestClientJson } from "@/client/clientApi";
 
 const USAGE = "bee me";
 
@@ -12,7 +12,7 @@ export const meCommand: Command = {
       throw new Error(`Unexpected arguments: ${args.join(" ")}`);
     }
 
-    const data = await requestDeveloperJson(context, "/v1/me", {
+    const data = await requestClientJson(context, "/v1/me", {
       method: "GET",
     });
     printJson(data);

sources/commands/proxy/index.ts

@@ -1,5 +1,5 @@
 import type { Command, CommandContext } from "@/commands/types";
-import { requireToken } from "@/commands/developerApi";
+import { requireClientToken } from "@/client/clientApi";
 
 const USAGE = "bee proxy [--port N]";
 const DEFAULT_PORT = 8787;
@@ -76,7 +76,7 @@ async function startProxy(
   context: CommandContext,
   options: ProxyOptions
 ): Promise<void> {
-  const token = await requireToken(context);
+  const token = await requireClientToken(context);
   const port = await pickPort(options.port);
   const hostname = "127.0.0.1";
 

sources/commands/search/index.ts

@@ -1,5 +1,5 @@
 import type { Command, CommandContext } from "@/commands/types";
-import { printJson, requestDeveloperJson } from "@/commands/developerApi";
+import { printJson, requestClientJson } from "@/client/clientApi";
 
 const USAGE =
   "bee search conversations --query <text> [--limit N] [--cursor <cursor>]";
@@ -46,7 +46,7 @@ async function handleConversations(
     body.cursor = options.cursor;
   }
 
-  const data = await requestDeveloperJson(context, "/v1/search/conversations", {
+  const data = await requestClientJson(context, "/v1/search/conversations", {
     method: "POST",
     json: body,
   });

sources/commands/status/index.ts

@@ -1,7 +1,7 @@
 import type { Command, CommandContext } from "@/commands/types";
 import { getEnvironmentConfig } from "@/environment";
 import { loadToken } from "@/secureStore";
-import { fetchDeveloperMe } from "@/commands/auth/developerMe";
+import { fetchClientMe } from "@/client/clientMe";
 
 const USAGE = "bee status";
 
@@ -34,7 +34,7 @@ async function handleStatus(
   console.log(`API: ${config.label} (${config.apiUrl})`);
   console.log(`Token: ${maskToken(token)}`);
 
-  const user = await fetchDeveloperMe(context, token);
+  const user = await fetchClientMe(context, token);
   const name = [user.first_name, user.last_name].filter(Boolean).join(" ");
   console.log(`Verified as ${name} (id ${user.id}).`);
 }