wip5

Author: carderne

apps/webapp/app/components/BlankStatePanels.tsx

@@ -549,7 +549,7 @@ export function BranchesNoBranches({
               New branch
             </Button>
           }
-          parentEnvironment={parentEnvironment}
+          env="preview"
         />
       }
     >

apps/webapp/app/presenters/v3/DevPresence.server.ts

@@ -1,8 +1,10 @@
 import Redis, { type RedisOptions } from "ioredis";
 import { defaultReconnectOnError } from "@internal/redis";
 import { env } from "~/env.server";
+import { subDays } from "date-fns";
 
-const PRESENCE_KEY_PREFIX = "dev-presence:connection:";
+const DEV_RECENT_DEBOUNCE_SEC = 60;
+const DEV_RECENT_TTL = 7 * 24 * 60 * 60; // 7 days
 
 export class DevPresence {
   private redis: Redis;
@@ -17,13 +19,35 @@ export class DevPresence {
     return !!presenceValue;
   }
 
-  async setConnected(environmentId: string, ttl: number) {
+  async setConnected({ userId, projectId, environmentId, ttl }: { userId: string; projectId: string; environmentId: string; ttl: number; }) {
     const presenceKey = this.getPresenceKey(environmentId);
     await this.redis.setex(presenceKey, ttl, new Date().toISOString());
+
+    const touchKey = this.getTouchKey(environmentId);
+    const acquired = await this.redis.set(touchKey, "1", "EX", DEV_RECENT_DEBOUNCE_SEC, "NX");
+
+    if (acquired !== null) {
+      const recentKey = this.getRecentKey(userId, projectId);
+      const now = new Date();
+      const threeDaysAgo = subDays(now, 3);
+      await this.redis.zadd(recentKey, now.getTime(), environmentId);
+      await this.redis.zremrangebyscore(recentKey, 0, threeDaysAgo.getTime());
+      await this.redis.zremrangebyrank(recentKey, 0, -51);
+      await this.redis.expire(recentKey, DEV_RECENT_TTL);
+    }
+
   }
 
   private getPresenceKey(environmentId: string) {
-    return `${PRESENCE_KEY_PREFIX}${environmentId}`;
+    return `dev-presence:connection:${environmentId}`;
+  }
+
+  private getRecentKey(userId: string, projectId: string) {
+    return `dev-recent:${userId}:${projectId}`;
+  }
+
+  private getTouchKey(environmentId: string) {
+    return `dev-recent-touch:${environmentId}`;
   }
 }
 

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx

@@ -320,7 +320,7 @@ export default function Page() {
                   New branch…
                 </Button>
               }
-              parentEnvironment={branchableEnvironment}
+              env="preview"
             />
           )}
         </PageAccessories>
@@ -916,17 +916,17 @@ function updateBranchState({
 
 export function NewBranchPanel({
   button,
-  parentEnvironment,
+  env,
 }: {
   button: React.ReactNode;
-  parentEnvironment: { id: string };
+  env: "preview" | "development";
 }) {
   const lastSubmission = useActionData<typeof action>();
   const location = useLocation();
   const [searchParams, setSearchParams] = useSearchParams();
   const [isOpen, setIsOpen] = useState(false);
 
-  const [form, { parentEnvironmentId, branchName, failurePath }] = useForm({
+  const [form, { env: envField, branchName, failurePath }] = useForm({
     id: "create-branch",
     lastSubmission: lastSubmission as any,
     onValidate({ formData }) {
@@ -954,8 +954,8 @@ export function NewBranchPanel({
           <Form method="post" {...form.props} className="w-full">
             <Fieldset className="max-w-full gap-y-3">
               <input
-                value={parentEnvironment.id}
-                {...conform.input(parentEnvironmentId, { type: "hidden" })}
+                value={env}
+                {...conform.input(envField, { type: "hidden" })}
               />
               <input
                 value={location.pathname}

apps/webapp/app/routes/engine.v1.dev.presence.ts

@@ -1,4 +1,5 @@
 import { json } from "@remix-run/server-runtime";
+import invariant from "tiny-invariant";
 import { env } from "~/env.server";
 import { devPresence } from "~/presenters/v3/DevPresence.server";
 import { authenticateApiRequestWithFailure } from "~/services/apiAuth.server";
@@ -12,11 +13,17 @@ export const loader = createSSELoader({
   handler: async ({ id, controller, debug, request }) => {
     const authentication = await authenticateApiRequestWithFailure(request);
 
+
     if (!authentication.ok) {
       throw json({ error: "Invalid or Missing API key" }, { status: 401 });
     }
 
     const environmentId = authentication.environment.id;
+    const projectId = authentication.environment.projectId;
+    const userId = authentication.environment.orgMember?.userId;
+
+    invariant(userId, "No userId on dev environment");
+
     const ttl = env.DEV_PRESENCE_TTL_MS / 1000;
 
     return {
@@ -27,11 +34,11 @@ export const loader = createSSELoader({
       },
       initStream: async ({ send }) => {
         // Set initial presence with more context
-        await devPresence.setConnected(environmentId, ttl);
+        await devPresence.setConnected({ userId, projectId, environmentId, ttl });
         send({ event: "start", data: `Started ${id}` });
       },
       iterator: async ({ send, date }) => {
-        await devPresence.setConnected(environmentId, ttl);
+        await devPresence.setConnected({ userId, projectId, environmentId, ttl });
         send({ event: "time", data: new Date().toISOString() });
       },
       cleanup: async () => {},

packages/cli-v3/src/commands/deploy.ts

@@ -57,8 +57,8 @@ import { getProjectClient, upsertBranch } from "../utilities/session.js";
 import { getTmpDir } from "../utilities/tempDirectories.js";
 import { spinner } from "../utilities/windows.js";
 import { login } from "./login.js";
-import { archivePreviewOrDevBranch } from "./preview.js";
 import { updateTriggerPackages } from "./update.js";
+import { archivePreviewBranch } from "./preview.js";
 
 const DeployCommandOptions = CommonCommandOptions.extend({
   dryRun: z.boolean().default(false),
@@ -323,7 +323,7 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
       log.message(`Pull request ${gitMeta?.pullRequestNumber} is ${gitMeta?.pullRequestState}.`);
       const $buildSpinner = spinner();
       $buildSpinner.start(`Archiving preview branch: "${branch}"`);
-      const result = await archivePreviewOrDevBranch(authorization, branch, resolvedConfig.project);
+      const result = await archivePreviewBranch(authorization, branch, resolvedConfig.project);
       $buildSpinner.stop(
         result ? `Successfully archived "${branch}"` : `Failed to archive "${branch}".`
       );

packages/cli-v3/src/commands/preview.ts

@@ -128,7 +128,7 @@ async function _previewArchiveCommand(dir: string, options: PreviewCommandOption
   return result;
 }
 
-async function archivePreviewBranch(
+export async function archivePreviewBranch(
   authorization: LoginResultOk,
   branch: string,
   project: string