@junctionpanel/server 0.1.70 → 0.1.72

package/dist/server/server/session.js

@@ -58,7 +58,7 @@ const WORKSPACE_STATUS_WATCH_DEBOUNCE_MS = 250;
 const WORKSPACE_STATUS_GIT_REFRESH_MS = 3000;
 const WORKSPACE_STATUS_PR_ACTIVE_REFRESH_MS = 15000;
 const WORKSPACE_STATUS_PR_PASSIVE_REFRESH_MS = 60000;
-const WORKSPACE_STATUS_PR_ACTIVE_CACHE_MAX_AGE_MS = WORKSPACE_STATUS_PR_ACTIVE_REFRESH_MS;
+const WORKSPACE_STATUS_PR_ACTIVE_CACHE_MAX_AGE_MS = 45000;
 const WORKSPACE_STATUS_PR_PASSIVE_CACHE_MAX_AGE_MS = 3 * 60000;
 const PROVIDER_CHILD_THREADS_REFRESH_DEBOUNCE_MS = 250;
 const PROVIDER_CHILD_THREADS_PERSISTED_LIST_INITIAL_LIMIT = 500;
@@ -3701,7 +3701,7 @@ export class Session {
             clearInterval(target.prRefreshInterval);
             target.prRefreshInterval = null;
         }
-        if (target.subscriptions.size === 0) {
+        if (!this.workspaceStatusShouldPollPullRequest(target)) {
             return;
         }
         const intervalMs = this.resolveWorkspaceStatusPrRefreshIntervalMs(target);
@@ -3733,6 +3733,22 @@ export class Session {
             ? WORKSPACE_STATUS_PR_ACTIVE_REFRESH_MS
             : WORKSPACE_STATUS_PR_PASSIVE_REFRESH_MS;
     }
+    workspaceStatusShouldPollPullRequest(target) {
+        if (target.subscriptions.size === 0) {
+            return false;
+        }
+        if (this.workspaceStatusHasActiveSubscribers(target)) {
+            return true;
+        }
+        const latestPayload = target.latestPayload;
+        if (!latestPayload
+            || !latestPayload.git.isGit
+            || latestPayload.pullRequestError
+            || !latestPayload.githubFeaturesEnabled) {
+            return false;
+        }
+        return latestPayload.pullRequest != null && !latestPayload.pullRequest.isMerged;
+    }
     removeWorkspaceStatusSubscription(subscriptionId) {
         const subscription = this.workspaceStatusSubscriptions.get(subscriptionId);
         if (!subscription) {
@@ -3758,21 +3774,22 @@ export class Session {
         if (includePr && options?.bumpPrGeneration) {
             target.prRefreshGeneration += 1;
         }
+        if (includePr) {
+            target.pendingPrRefresh = true;
+        }
+        else {
+            target.pendingGitRefresh = true;
+        }
         if (!shouldDebounce) {
-            void this.refreshWorkspaceStatusTarget(target, { includePr });
+            void this.refreshWorkspaceStatusTarget(target);
             return;
         }
         if (target.debounceTimer) {
             clearTimeout(target.debounceTimer);
         }
-        if (includePr) {
-            target.refreshIncludesPr = true;
-        }
         target.debounceTimer = setTimeout(() => {
             target.debounceTimer = null;
-            void this.refreshWorkspaceStatusTarget(target, {
-                includePr: includePr || target.refreshIncludesPr,
-            });
+            void this.refreshWorkspaceStatusTarget(target);
         }, WORKSPACE_STATUS_WATCH_DEBOUNCE_MS);
     }
     workspaceStatusSnapshotFingerprint(snapshot) {
@@ -3838,21 +3855,27 @@ export class Session {
         };
     }
     async refreshWorkspaceStatusTarget(target, options) {
+        if (options) {
+            if (options.includePr) {
+                target.pendingPrRefresh = true;
+            }
+            else {
+                target.pendingGitRefresh = true;
+            }
+        }
         if (target.refreshPromise) {
-            target.refreshQueued = true;
-            target.refreshIncludesPr = target.refreshIncludesPr || Boolean(options?.includePr);
             return;
         }
         target.refreshPromise = (async () => {
             do {
-                const hasExplicitIncludePr = options != null && 'includePr' in options;
                 const fullGit = this.workspaceStatusHasActiveSubscribers(target);
                 const previousHasLoadedPullRequest = target.hasLoadedPullRequest;
-                const includePr = target.refreshIncludesPr
-                    || (hasExplicitIncludePr ? Boolean(options?.includePr) : !target.latestPayload);
+                const hadPreviousPayload = target.latestPayload != null;
+                const pendingGitRefresh = target.pendingGitRefresh;
+                const includePr = target.pendingPrRefresh || (!hadPreviousPayload && !pendingGitRefresh);
                 const prRefreshGeneration = includePr ? target.prRefreshGeneration : null;
-                target.refreshQueued = false;
-                target.refreshIncludesPr = false;
+                target.pendingGitRefresh = false;
+                target.pendingPrRefresh = false;
                 const snapshot = await this.computeWorkspaceStatusSnapshot(target, {
                     includePr,
                     fullGit,
@@ -3862,22 +3885,17 @@ export class Session {
                 }
                 const newerPrRefreshQueued = includePr
                     && (prRefreshGeneration !== target.prRefreshGeneration
-                        || target.refreshQueued
-                        || target.refreshIncludesPr);
+                        || target.pendingPrRefresh);
                 if (newerPrRefreshQueued) {
-                    target.refreshQueued = true;
-                    target.refreshIncludesPr = true;
                     continue;
                 }
                 const activeSubscribersPresent = this.workspaceStatusHasActiveSubscribers(target);
                 const gitIdentityChanged = this.workspaceStatusGitIdentityChanged(target.latestPayload, snapshot.git);
-                const needsPrReplay = (!includePr && target.refreshIncludesPr)
-                    || (!includePr && fullGit && activeSubscribersPresent && gitIdentityChanged);
+                const needsPrReplay = !includePr && hadPreviousPayload && gitIdentityChanged && snapshot.git.isGit;
                 const needsFullGitReplay = !fullGit && activeSubscribersPresent;
                 if (needsPrReplay
                     || needsFullGitReplay) {
-                    target.refreshQueued = true;
-                    target.refreshIncludesPr = target.refreshIncludesPr || needsPrReplay || needsFullGitReplay;
+                    target.pendingPrRefresh = true;
                     continue;
                 }
                 target.latestPayload = snapshot;
@@ -3886,12 +3904,13 @@ export class Session {
                         || includePr
                         || (previousHasLoadedPullRequest && !gitIdentityChanged);
                 target.latestPayloadHasFullGitData = !snapshot.git.isGit || fullGit;
+                this.updateWorkspaceStatusPrPolling(target);
                 const fingerprint = this.workspaceStatusSnapshotFingerprint(snapshot);
                 if (fingerprint !== target.latestFingerprint) {
                     target.latestFingerprint = fingerprint;
                     this.emitWorkspaceStatusChanged(target, snapshot);
                 }
-            } while (target.refreshQueued);
+            } while (target.pendingGitRefresh || target.pendingPrRefresh);
         })();
         try {
             await target.refreshPromise;
@@ -3919,8 +3938,8 @@ export class Session {
             prRefreshInterval: null,
             debounceTimer: null,
             refreshPromise: null,
-            refreshQueued: false,
-            refreshIncludesPr: false,
+            pendingGitRefresh: false,
+            pendingPrRefresh: false,
             prRefreshGeneration: 0,
             latestPayload: null,
             latestFingerprint: null,
@@ -3978,7 +3997,7 @@ export class Session {
         this.updateWorkspaceStatusGitPolling(target);
         this.updateWorkspaceStatusPrPolling(target);
         const fullGit = this.workspaceStatusHasActiveSubscribers(target);
-        const includePr = fullGit;
+        const includePr = fullGit || !target.latestPayload;
         const previousFingerprint = target.latestFingerprint;
         const hadExistingSubscribers = target.subscriptions.size > 1;
         const snapshot = target.latestPayload
@@ -3991,6 +4010,7 @@ export class Session {
         target.latestPayload = snapshot;
         target.hasLoadedPullRequest = hasLoadedPullRequest;
         target.latestPayloadHasFullGitData = !snapshot.git.isGit || fullGit;
+        this.updateWorkspaceStatusPrPolling(target);
         const nextFingerprint = this.workspaceStatusSnapshotFingerprint(snapshot);
         target.latestFingerprint = nextFingerprint;
         this.emit({