Test everything

web-client/.gitignore

@@ -27,4 +27,5 @@ dist-ssr
 src/lib/proto/*
 
 # Except for the README.md file
-!src/lib/proto/README.md
+!src/lib/proto/README.md
+coverage

web-client/package.json

@@ -14,7 +14,7 @@
     "format": "prettier --write .",
     "lint": "eslint . --ext .ts,.tsx",
     "lint:fix": "eslint . --fix --ext .ts,.tsx",
-    "test": "pnpm proto && vitest"
+    "test": "TZ=UTC pnpm proto && vitest"
   },
   "devDependencies": {
     "@protobuf-ts/protoc": "^2.9.1",
@@ -23,6 +23,7 @@
     "@types/testing-library__jest-dom": "^5.14.9",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
+    "@vitest/coverage-v8": "^0.34.6",
     "autoprefixer": "^10.4.16",
     "eslint": "^8.53.0",
     "eslint-config-prettier": "^8.10.0",

web-client/src/lib/formatters.ts

@@ -8,7 +8,7 @@ export function convertTimestampToNanoseconds(timestamp: Timestamp): number {
   return (Number(timestamp.seconds) * 1e9) + (timestamp.nanos);
 }
 
-function formatMs(ms: string) {
+export function formatMs(ms: string) {
   switch (ms.length) {
     case 1:
       return "00" + ms;
@@ -18,6 +18,7 @@ function formatMs(ms: string) {
       return ms;
   }
 }
+
 export function formatTimestamp(stamp: Date) {
   return `${stamp.toLocaleTimeString("en", {
     hour: "2-digit",

web-client/src/lib/span/a.ts

@@ -0,0 +1,15 @@
+import { Span } from "../connection/monitor";
+import { Metadata } from "../proto/common";
+import { flattenChildren } from "./flattenChildren";
+
+type Options = { span: Span, metadata: Map<bigint, Metadata> }
+
+export function recursivelyFindSpanByName({ span, metadata }: Options, name: string): Span[] | null {
+    const meta = metadata.get(span.metadataId)!;
+    if (meta.name === name) {
+        return [span];
+    }
+
+    const allChildren = flattenChildren(span.children);
+    return allChildren?.filter(c => metadata.get(c.metadataId)!.name === name) ?? null;
+}

web-client/src/lib/span/getIpcRequestName.ts

@@ -1,19 +1,19 @@
 import { Span } from "../connection/monitor";
 import { Metadata } from "../proto/common";
-import { findSpanByName } from "./findSpanByName";
+import { recursivelyFindSpanByName } from "./recursivelyFindSpanByName";
 
 type Options = {
     metadata: Map<bigint, Metadata>
     span: Span
 }
 
 export function getIpcRequestName({ metadata, span }: Options) {
-    const meta = metadata.get(span.metadataId)!;
-    if (meta.name === "wry::ipc::handle") {
-        const commandHandlerSpan = findSpanByName(
+    const meta = metadata.get(span.metadataId);
+    if (meta?.name === "wry::ipc::handle") {
+        const commandHandlerSpan = recursivelyFindSpanByName(
             { span, metadata },
             "ipc::request::handle"
-        );
+        )?.[0] ?? null;
         if (commandHandlerSpan) {
             const val = commandHandlerSpan.fields.find(
                 (f) => f.name === "cmd"
@@ -22,5 +22,5 @@ export function getIpcRequestName({ metadata, span }: Options) {
             return val?.oneofKind === "strVal" ? val.strVal : null;
         }
     }
-    return meta.name;
+    return meta?.name ?? null;
 };

web-client/src/lib/span/recursivelyFindSpanByName.ts

@@ -5,8 +5,8 @@ import { flattenChildren } from "./flattenChildren";
 type Options = { span: Span, metadata: Map<bigint, Metadata> }
 
 export function recursivelyFindSpanByName({ span, metadata }: Options, name: string): Span[] | null {
-    const meta = metadata.get(span.metadataId)!;
-    if (meta.name === name) {
+    const meta = metadata.get(span.metadataId);
+    if (meta?.name === name) {
         return [span];
     }