Merge remote-tracking branch 'origin/main' into features/v3-docs

Author: matt-aitken

apps/coordinator/package.json

@@ -4,7 +4,6 @@
   "version": "0.0.1",
   "description": "",
   "main": "dist/index.cjs",
-  "type": "module",
   "scripts": {
     "build": "npm run build:bundle",
     "build:bundle": "esbuild src/index.ts --bundle --outfile=dist/index.mjs --platform=node --format=esm --target=esnext --banner:js=\"const require = createRequire(import.meta.url);\"",
@@ -31,4 +30,4 @@
     "tsx": "^4.7.0",
     "typescript": "^5.3.3"
   }
-}
+}

apps/coordinator/src/index.ts

@@ -301,6 +301,16 @@ class TaskCoordinator {
 
           taskSocket.emit("RESUME_AFTER_DURATION", message);
         },
+        REQUEST_ATTEMPT_CANCELLATION: async (message) => {
+          const taskSocket = await this.#getAttemptSocket(message.attemptId);
+
+          if (!taskSocket) {
+            logger.log("Socket for attempt not found", { attemptId: message.attemptId });
+            return;
+          }
+
+          taskSocket.emit("REQUEST_ATTEMPT_CANCELLATION", message);
+        },
       },
     });
 
@@ -385,11 +395,21 @@ class TaskCoordinator {
 
           if (!executionAck) {
             logger.error("no execution ack", { attemptId: socket.data.attemptId });
+
+            socket.emit("REQUEST_EXIT", {
+              version: "v1",
+            });
+
             return;
           }
 
           if (!executionAck.success) {
             logger.error("execution unsuccessful", { attemptId: socket.data.attemptId });
+
+            socket.emit("REQUEST_EXIT", {
+              version: "v1",
+            });
+
             return;
           }
 

apps/coordinator/tsconfig.json

@@ -9,10 +9,10 @@
     "strict": true,
     "skipLibCheck": true,
     "paths": {
-      "@trigger.dev/core/v3": ["../core/src/v3"],
-      "@trigger.dev/core/v3/*": ["../core/src/v3/*"],
-      "@trigger.dev/core-apps": ["../core-apps/src"],
-      "@trigger.dev/core-apps/*": ["../core-apps/src/*"]
+      "@trigger.dev/core/v3": ["../../packages/core/src/v3"],
+      "@trigger.dev/core/v3/*": ["../../packages/core/src/v3/*"],
+      "@trigger.dev/core-apps": ["../../packages/core-apps/src"],
+      "@trigger.dev/core-apps/*": ["../../packages/core-apps/src/*"]
     }
   }
 }

apps/docker-provider/package.json

@@ -4,7 +4,6 @@
   "version": "0.0.1",
   "description": "",
   "main": "dist/index.cjs",
-  "type": "module",
   "scripts": {
     "build": "npm run build:bundle",
     "build:bundle": "esbuild src/index.ts --bundle --outfile=dist/index.mjs --platform=node --format=esm --target=esnext --banner:js=\"const require = createRequire(import.meta.url);\"",
@@ -29,4 +28,4 @@
     "tsx": "^4.7.0",
     "typescript": "^5.3.3"
   }
-}
+}

apps/docker-provider/tsconfig.json

@@ -7,10 +7,10 @@
     "strict": true,
     "skipLibCheck": true,
     "paths": {
-      "@trigger.dev/core/v3": ["../core/src/v3"],
-      "@trigger.dev/core/v3/*": ["../core/src/v3/*"],
-      "@trigger.dev/core-apps": ["../core-apps/src"],
-      "@trigger.dev/core-apps/*": ["../core-apps/src/*"]
+      "@trigger.dev/core/v3": ["../../packages/core/src/v3"],
+      "@trigger.dev/core/v3/*": ["../../packages/core/src/v3/*"],
+      "@trigger.dev/core-apps": ["../../packages/core-apps/src"],
+      "@trigger.dev/core-apps/*": ["../../packages/core-apps/src/*"]
     }
   }
 }

apps/webapp/app/components/code/InlineCode.tsx

@@ -10,14 +10,14 @@ const variants = {
   base: "text-base",
 };
 
+export type InlineCodeVariant = keyof typeof variants;
+
 type InlineCodeProps = {
   children: React.ReactNode;
+  variant?: InlineCodeVariant;
+  className?: string;
 };
 
-type VariantProps = InlineCodeProps & {
-  variant?: keyof typeof variants;
-};
-
-export function InlineCode({ variant = "small", children }: VariantProps) {
-  return <code className={cn(inlineCode, variants[variant])}>{children}</code>;
+export function InlineCode({ variant = "small", children, className }: InlineCodeProps) {
+  return <code className={cn(inlineCode, variants[variant], className)}>{children}</code>;
 }

apps/webapp/app/components/primitives/Table.tsx

@@ -123,6 +123,7 @@ type TableCellProps = TableCellBasicProps & {
   onClick?: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
   hasAction?: boolean;
   isSticky?: boolean;
+  actionClassName?: string;
 };
 
 const stickyStyles =
@@ -132,6 +133,7 @@ export const TableCell = forwardRef<HTMLTableCellElement, TableCellProps>(
   (
     {
       className,
+      actionClassName,
       alignment = "left",
       children,
       colSpan,
@@ -176,11 +178,11 @@ export const TableCell = forwardRef<HTMLTableCellElement, TableCellProps>(
         colSpan={colSpan}
       >
         {to ? (
-          <Link to={to} className={flexClasses}>
+          <Link to={to} className={cn(flexClasses, actionClassName)}>
             {children}
           </Link>
         ) : onClick ? (
-          <button onClick={onClick} className={flexClasses}>
+          <button onClick={onClick} className={cn(flexClasses, actionClassName)}>
             {children}
           </button>
         ) : (

apps/webapp/app/components/primitives/TreeView/TreeView.tsx

@@ -1,25 +1,9 @@
 import { VirtualItem, Virtualizer, useVirtualizer } from "@tanstack/react-virtual";
-import {
-  Fragment,
-  MutableRefObject,
-  RefObject,
-  useCallback,
-  useEffect,
-  useImperativeHandle,
-  useReducer,
-  useRef,
-  useState,
-} from "react";
+import { MutableRefObject, RefObject, useCallback, useEffect, useReducer, useRef } from "react";
 import { UnmountClosed } from "react-collapse";
 import { cn } from "~/utils/cn";
-import { Changes, NodeState, NodesState, reducer } from "./reducer";
-import {
-  applyFilterToState,
-  concreteStateFromInput,
-  firstVisibleNode,
-  lastVisibleNode,
-  selectedIdFromState,
-} from "./utils";
+import { NodeState, NodesState, reducer } from "./reducer";
+import { applyFilterToState, concreteStateFromInput, selectedIdFromState } from "./utils";
 
 export type TreeViewProps<TData> = {
   tree: FlatTree<TData>;
@@ -232,6 +216,7 @@ export function useTree<TData>({
         index,
       });
     },
+    overscan: 20,
   });
 
   const scrollToNodeFn = useCallback(

apps/webapp/app/components/runs/v3/TaskPath.tsx

@@ -1,4 +1,6 @@
+import { InlineCode, InlineCodeVariant } from "~/components/code/InlineCode";
 import { SpanCodePathAccessory } from "./SpanTitle";
+import { cn } from "~/utils/cn";
 
 type TaskPathProps = {
   filePath: string;
@@ -16,3 +18,17 @@ export function TaskPath({ filePath, functionName, className }: TaskPathProps) {
     />
   );
 }
+
+type TaskFunctionNameProps = {
+  functionName: string;
+  variant?: InlineCodeVariant;
+  className?: string;
+};
+
+export function TaskFunctionName({ variant, functionName, className }: TaskFunctionNameProps) {
+  return (
+    <InlineCode variant={variant} className={cn("text-sun-100", className)}>
+      {functionName}()
+    </InlineCode>
+  );
+}

apps/webapp/app/consts.ts

@@ -10,3 +10,4 @@ export const RUN_CHUNK_EXECUTION_BUFFER = 350;
 export const MAX_RUN_CHUNK_EXECUTION_LIMIT = 120000; // 2 minutes
 export const VERCEL_RESPONSE_TIMEOUT_STATUS_CODES = [408, 504];
 export const MAX_BATCH_TRIGGER_ITEMS = 100;
+export const MAX_TASK_RUN_ATTEMPTS = 250;

apps/webapp/app/hooks/useLinkStatus.ts

@@ -0,0 +1,66 @@
+import { useLocation, useNavigation, useResolvedPath } from "@remix-run/react";
+import type { RelativeRoutingType } from "@remix-run/router";
+
+//A lot of this logic is lifted from <NavLink> in react-router-dom, thanks again Remix team ❤️.
+//https://github.com/remix-run/react-router/blob/a04ae6b90127ae583be08432c52b951e53f6a3c7/packages/react-router-dom/index.tsx#L1010
+
+type Options = {
+  /** Defines the relative path behavior for the link.
+   *
+   *  route - default, relative to the route hierarchy so .. will remove all URL segments of the current route pattern
+   *
+   *  path - relative to the path so .. will remove one URL segment
+   */
+  relative?: RelativeRoutingType;
+  /** The end prop changes the matching logic for the active and pending states to only match to the "end" of the NavLinks's to path. If the URL is longer than to, it will no longer be considered active. */
+  end?: boolean;
+};
+
+type Result = {
+  isActive: boolean;
+  isPending: boolean;
+  isTransitioning: boolean;
+};
+
+/** Pass a relative link and you will get back whether it's the current page, about to be and whether the route is currently changing */
+export function useLinkStatus(to: string, options?: Options): Result {
+  const { relative, end = false } = options || {};
+
+  const path = useResolvedPath(to, { relative: relative });
+  const pathName = path.pathname.toLowerCase();
+
+  //current location and pending location (if there is one)
+  const location = useLocation();
+  const locationPathname = location.pathname.toLowerCase();
+  const navigation = useNavigation();
+  const nextLocationPathname = navigation.location
+    ? navigation.location.pathname.toLowerCase()
+    : null;
+
+  // If the `to` has a trailing slash, look at that exact spot.  Otherwise,
+  // we're looking for a slash _after_ what's in `to`.  For example:
+  //
+  // <NavLink to="/users"> and <NavLink to="/users/">
+  // both want to look for a / at index 6 to match URL `/users/matt`
+  const endSlashPosition =
+    pathName !== "/" && pathName.endsWith("/") ? pathName.length - 1 : pathName.length;
+
+  const isActive =
+    locationPathname === pathName ||
+    (!end &&
+      locationPathname.startsWith(pathName) &&
+      locationPathname.charAt(endSlashPosition) === "/");
+
+  const isPending =
+    nextLocationPathname != null &&
+    (nextLocationPathname === pathName ||
+      (!end &&
+        nextLocationPathname.startsWith(pathName) &&
+        nextLocationPathname.charAt(pathName.length) === "/"));
+
+  return {
+    isActive,
+    isPending,
+    isTransitioning: navigation.state === "loading",
+  };
+}