feat: logs streaming (#10)

Author: crowlKats

auth.ts

@@ -12,6 +12,7 @@ import {
 import { Spinner } from "@std/cli/unstable-spinner";
 import { error } from "./util.ts";
 import token_storage from "./token_storage.ts";
+import { EventSourcePolyfill } from "event-source-polyfill";
 
 export function createTrpcClient(deployUrl: string) {
   const storedAuth = token_storage.get();
@@ -48,6 +49,18 @@ export function createTrpcClient(deployUrl: string) {
         }),
         true: httpSubscriptionLink({
           url: deployUrl + "/api",
+          EventSource: EventSourcePolyfill,
+          eventSourceOptions: () => {
+            if (storedAuth) {
+              return {
+                headers: {
+                  cookie: `token=${storedAuth}; deno_auth_ghid=force`,
+                },
+              };
+            } else {
+              return {};
+            }
+          },
           transformer,
         }),
       }),

deno.json

@@ -15,9 +15,11 @@
     "@std/tar": "jsr:@std/tar@^0.1.6",
     "@trpc/client": "npm:@trpc/client@^11.0.2",
     "@trpc/server": "npm:@trpc/server@^11.0.2",
+    "event-source-polyfill": "npm:event-source-polyfill@^1.0.31",
     "jsonc-parser": "npm:jsonc-parser@^3.3.1",
     "open": "npm:open@^10.1.0",
     "superjson": "npm:superjson@^2.2.2",
-    "@deno/framework-detect": "jsr:@deno/framework-detect@^0"
+    "@deno/framework-detect": "jsr:@deno/framework-detect@^0",
+    "temporal-polyfill": "npm:temporal-polyfill@^0.3.0"
   }
 }

deno.lock

@@ -1,8 +1,8 @@
 import { Command } from "@cliffy/command";
 import { publish } from "./publish.ts";
-import { red } from "@std/fmt/colors";
+import { red, yellow } from "@std/fmt/colors";
 import { create } from "./create.ts";
-import { withApp } from "./util.ts";
+import { error, renderTemporalTimestamp, withApp } from "./util.ts";
 import { setupAws, setupGcp } from "./setup-cloud.ts";
 import { getAppFromConfig, readConfig, writeConfig } from "./config.ts";
 import {
@@ -12,6 +12,7 @@ import {
   envUpdateContextsCommand,
   envUpdateValueCommand,
 } from "./env.ts";
+import { createTrpcClient } from "./auth.ts";
 
 const createCommand = new Command<{ endpoint: string }>()
   .description("Create a new application")
@@ -97,6 +98,75 @@ const envCommand = new Command<{ endpoint: string }>()
   .command("update-contexts", envUpdateContextsCommand)
   .command("delete", envDeleteCommand);
 
+const logsCommand = new Command<{ endpoint: string }>()
+  .option("--org <name:string>", "The name of the organization")
+  .option("--app <name:string>", "The name of the application")
+  .option("--start <date:string>", "The starting timestamp of the logs")
+  .option("--end <date:string>", "The ending timestamp of the logs", {
+    depends: ["start"],
+  })
+  .action(async (options, rootPath = Deno.cwd()) => {
+    const configContent = await readConfig(rootPath);
+    let { org, app } = getAppFromConfig(configContent);
+    org ??= options.org;
+    app ??= options.app;
+    const gottenApp = await withApp(options.endpoint, false, org, app);
+
+    interface LogEntry {
+      Timestamp: string;
+      TraceId: string;
+      SpanId: string;
+      SeverityText: string;
+      SeverityNumber: number;
+      Body: string;
+      ScopeName: string;
+      ScopeVersion: string;
+      LogAttributes: Record<string, string>;
+      Revision: string;
+    }
+
+    const trpcClient = createTrpcClient(options.endpoint);
+
+    const sub = (trpcClient.apps as any).logs.subscribe({
+      org: gottenApp.org,
+      app: gottenApp.app,
+      start: (options.start ? new Date(options.start) : new Date())
+        .toISOString(),
+      end: options.end ? new Date(options.end).toISOString() : undefined,
+      filter: {},
+    }, {
+      onData: (data: "streaming" | null | LogEntry[]) => {
+        if (data === "streaming") {
+          console.log("Streaming logs...");
+        } else if (Array.isArray(data)) {
+          for (const log of data) {
+            let text = `[${renderTemporalTimestamp(log.Timestamp)}${
+              log.TraceId ? ` (${log.TraceId})` : ""
+            }] ${log.Body}`;
+            if (text.endsWith("\n")) {
+              text = text.slice(0, -1);
+            }
+
+            if (log.SeverityNumber >= 17) {
+              console.log(red(text));
+            } else if (log.SeverityNumber >= 13) {
+              console.log(yellow(text));
+            } else {
+              console.log(text);
+            }
+          }
+        }
+      },
+      onError: (err: unknown) => {
+        sub.unsubscribe();
+        error(Deno.inspect(err));
+      },
+      onStopped: () => {
+        sub.unsubscribe();
+      },
+    });
+  });
+
 await new Command()
   .name("deno deploy")
   .description(`Interact with Deno Deploy
@@ -149,6 +219,7 @@ deploy your local directory to the specified application.`)
   )
   .command("create", createCommand)
   .command("env", envCommand)
+  .command("logs", logsCommand)
   .command("setup-aws", setupAWSCommand)
   .command("setup-gcp", setupGCPCommand)
   .command("tunnel-login", tunnelLoginCommand)

main.ts

@@ -6,6 +6,6 @@ export default {
     Deno[Deno.internal].core.ops.op_deploy_token_set(token);
   },
   remove() {
-    Deno[Deno.internal].core.ops.op_deploy_token_remove();
+    Deno[Deno.internal].core.ops.op_deploy_token_delete();
   },
 };

token_storage.ts

@@ -1,5 +1,6 @@
 import { red } from "@std/fmt/colors";
 import { promptSelect } from "@std/cli/unstable-prompt-select";
+import { Temporal } from "temporal-polyfill";
 
 import { createTrpcClient, getAuth } from "./auth.ts";
 import token_storage from "./token_storage.ts";
@@ -101,3 +102,25 @@ export async function withApp(
     app: app as string | null,
   };
 }
+
+export function renderTemporalTimestamp(timestamp: string, hideDate = false) {
+  function pad(n: number, width: number): string {
+    return n.toString().padStart(width, "0");
+  }
+
+  const date = Temporal
+    .Instant
+    .from(timestamp)
+    .toZonedDateTimeISO("UTC");
+  const months = pad(date.month, 2);
+  const days = pad(date.day, 2);
+  const hours = pad(date.hour, 2);
+  const minutes = pad(date.minute, 2);
+  const seconds = pad(date.second, 2);
+  const ms = (date.millisecond / 1000).toFixed(2).substring(2);
+
+  const time = `${hours}:${minutes}:${seconds}.${ms}`;
+  if (hideDate) return time;
+
+  return `${date.year}-${months}-${days} ${time}`;
+}