move to trpc client

Author: crowlKats

auth.ts

@@ -221,42 +221,19 @@ export async function authedFetch(
   const url = new URL(endpoint, deployUrl);
 
   let fallbackBody: ReadableStream | undefined;
-  try {
-    if (init.body instanceof ReadableStream) {
-      const [a, b] = init.body.tee();
-      init.body = a;
-      fallbackBody = b;
-    }
-
-    const res = await fetch(url, {
-      ...init,
-      headers,
-    });
-
-    if (res.status === 401) {
-      token_storage.remove();
-      auth = await getAuth(deployUrl);
+  if (init.body instanceof ReadableStream) {
+    const [a, b] = init.body.tee();
+    init.body = a;
+    fallbackBody = b;
+  }
 
-      const headers = new Headers(init.headers);
-      headers.set(
-        "cookie",
-        `token=${auth}; deno_auth_ghid=force`,
-      );
-      const res = await fetch(url, {
-        ...init,
-        headers,
-      });
+  const res = await fetch(url, {
+    ...init,
+    headers,
+  });
 
-      if (res.status === 401) {
-        const err = await res.json();
-        error(`unexpected authentication failure\n${err.message}`);
-      } else {
-        return res;
-      }
-    } else {
-      return res;
-    }
-  } catch {
+  if (res.status === 401) {
+    console.log(await res.text());
     token_storage.remove();
     auth = await getAuth(deployUrl);
 
@@ -265,17 +242,19 @@ export async function authedFetch(
       "cookie",
       `token=${auth}; deno_auth_ghid=force`,
     );
-    const res = await fetch(url, {
+    const retryRes = await fetch(url, {
       ...init,
       headers,
       body: init.body instanceof ReadableStream ? fallbackBody : init.body,
     });
 
-    if (res.status === 401) {
-      const err = await res.json();
+    if (retryRes.status === 401) {
+      const err = await retryRes.json();
       error(`unexpected authentication failure\n${err.message}`);
     } else {
-      return res;
+      return retryRes;
     }
+  } else {
+    return res;
   }
 }

publish.ts

@@ -105,29 +105,20 @@ export async function publish(
   hashesSpinner.stop();
   console.log(`${green("✔")} Generated hashes`);
 
-  const initiatedBuildRes = await authedFetch(
-    deployUrl,
-    "api/initiate_cli_build",
-    {
-      method: "POST",
-      headers: {
-        "content-type": "application/json",
-      },
-      body: JSON.stringify({
-        org,
-        app,
-        production: prod,
-        manifest,
-      }),
-    },
-  );
+  const trpcClient = createTrpcClient(deployUrl);
+
+  // deno-lint-ignore no-explicit-any
+  const revisionId: string = await (trpcClient.apps as any).initiateCliRevision.mutate({
+    org,
+    app,
+    production: prod,
+    manifest,
+  });
 
-  const { revisionId }: { revisionId: string } = await initiatedBuildRes.json();
+  console.log(revisionId);
 
   const missingHashesPromise = Promise.withResolvers<string[]>();
 
-  const trpcClient = createTrpcClient(deployUrl);
-
   // deno-lint-ignore no-explicit-any
   const sub = await (trpcClient.revisions as any).watchUntilReady.subscribe({
     org,