Integrate event broker to publish auth state

aws · Jan 21, 2025 · 6ee52a1 · 6ee52a1
1 parent 8fc1f43
commit 6ee52a1
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 63 deletions.
diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/broker/EventBroker.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/broker/EventBroker.java
@@ -121,9 +121,7 @@ private <T, R> void processQueuedEvents(final String interestId, final Class<R>
 
                 List<R> batchedEvents = new ArrayList<>(BATCH_PROCESSING_QUEUE_SIZE);
 
-                while (!eventQueue.isEmpty()) {
-                    eventQueue.drainTo(batchedEvents);
-
+                while (eventQueue.drainTo(batchedEvents) > 0) {
                     for (R newEvent : batchedEvents) {
                         try {
                             eventCallback.callWith(newEvent);
@@ -152,8 +150,8 @@ private <T, R> void processQueuedEvents(final String interestId, final Class<R>
 
     private EventBroker() {
         eventTypeToPublisherMap = new ConcurrentHashMap<>();
-        publisherExecutor = new OrderedThreadPoolExecutor(3, 10, 10, 100, 10, TimeUnit.MILLISECONDS);
-        subscriberExecutor = new OrderedThreadPoolExecutor(3, 10, 10, 100, 10, TimeUnit.MILLISECONDS);
+        publisherExecutor = new OrderedThreadPoolExecutor(20, 20, 100, 10000, 3, TimeUnit.SECONDS);
+        subscriberExecutor = new OrderedThreadPoolExecutor(20, 20, 10, 10000, 3, TimeUnit.SECONDS);
     }
 
     public static EventBroker getInstance() {

diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/auth/AuthSourceProvider.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/auth/AuthSourceProvider.java
@@ -5,6 +5,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.Flow.Subscription;
 
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.AbstractSourceProvider;
@@ -13,7 +14,9 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.services.ISourceProviderService;
 
+import software.aws.toolkits.eclipse.amazonq.broker.EventBroker;
 import software.aws.toolkits.eclipse.amazonq.lsp.auth.model.AuthState;
+import software.aws.toolkits.eclipse.amazonq.observers.EventObserver;
 import software.aws.toolkits.eclipse.amazonq.plugin.Activator;
 
 /**
@@ -30,12 +33,13 @@
  * @see software.aws.toolkits.eclipse.amazonq.toolbar
  * @see software.aws.toolkits.eclipse.amazonq.toolbar-unauthenticated
  */
-public final class AuthSourceProvider extends AbstractSourceProvider implements AuthStatusChangedListener {
+public final class AuthSourceProvider extends AbstractSourceProvider implements EventObserver<AuthState> {
     public static final String IS_LOGGED_IN_VARIABLE_ID = "is_logged_in";
     private boolean isLoggedIn = false;
+    private Subscription authStateSubscription;
 
     public AuthSourceProvider() {
-        AuthStatusProvider.addAuthStatusChangeListener(this);
+        authStateSubscription = EventBroker.getInstance().subscribe(this);
         isLoggedIn = Activator.getLoginService().getAuthState().isLoggedIn();
     }
 
@@ -53,8 +57,7 @@ public void dispose() {
 
         // Notify listeners that this provider is being disposed
         fireSourceChanged(ISources.WORKBENCH, IS_LOGGED_IN_VARIABLE_ID, null);
-
-        AuthStatusProvider.removeAuthStatusChangeListener(this);
+        authStateSubscription.cancel();
     }
 
     @Override
@@ -69,15 +72,15 @@ public void setIsLoggedIn(final Boolean isLoggedIn) {
 
     public static AuthSourceProvider getProvider() {
         IWorkbench workbench = PlatformUI.getWorkbench();
-        ISourceProviderService sourceProviderService = (ISourceProviderService) workbench
+        ISourceProviderService sourceProviderService = workbench
                 .getService(ISourceProviderService.class);
         AuthSourceProvider provider = (AuthSourceProvider) sourceProviderService
                 .getSourceProvider(AuthSourceProvider.IS_LOGGED_IN_VARIABLE_ID);
         return provider;
     }
 
     @Override
-    public void onAuthStatusChanged(final AuthState authState) {
+    public void onEvent(final AuthState authState) {
         boolean isLoggedIn = authState.isLoggedIn();
         Display.getDefault().asyncExec(() -> {
             setIsLoggedIn(isLoggedIn);

diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/auth/DefaultAuthStateManager.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/lsp/auth/DefaultAuthStateManager.java
@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.eclipse.amazonq.lsp.auth;
 
+import software.aws.toolkits.eclipse.amazonq.broker.EventBroker;
 import software.aws.toolkits.eclipse.amazonq.configuration.PluginStore;
 import software.aws.toolkits.eclipse.amazonq.lsp.auth.model.AuthState;
 import software.aws.toolkits.eclipse.amazonq.lsp.auth.model.AuthStateType;
@@ -119,7 +120,7 @@ private void updateState(final AuthStateType authStatusType, final LoginType log
          * This notification is critical for ensuring all plugin components reflect the current
          * authentication state.
          */
-        AuthStatusProvider.notifyAuthStatusChanged(getAuthState());
+        EventBroker.getInstance().post(getAuthState());
     }
 
     private void syncAuthStateWithPluginStore() {

diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/views/AmazonQChatWebview.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/views/AmazonQChatWebview.java
@@ -117,7 +117,7 @@ public void completed(final ProgressEvent event) {
         });
 
         // Check if user is authenticated and build view accordingly
-        onAuthStatusChanged(authState);
+        onEvent(authState);
     }
 
     private Browser getAndUpdateStateManager() {
@@ -127,7 +127,7 @@ private Browser getAndUpdateStateManager() {
     }
 
     @Override
-    public final void onAuthStatusChanged(final AuthState authState) {
+    public final void onEvent(final AuthState authState) {
         Display.getDefault().asyncExec(() -> {
             amazonQCommonActions.updateActionVisibility(authState, getViewSite());
             if (authState.isExpired()) {

diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/views/AmazonQView.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/views/AmazonQView.java
@@ -2,34 +2,34 @@
 
 package software.aws.toolkits.eclipse.amazonq.views;
 
+import java.util.concurrent.Flow.Subscription;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.browser.Browser;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.part.ViewPart;
 
+import software.aws.toolkits.eclipse.amazonq.broker.EventBroker;
 import software.aws.toolkits.eclipse.amazonq.controllers.AmazonQViewController;
-import software.aws.toolkits.eclipse.amazonq.events.TestEvent;
-import software.aws.toolkits.eclipse.amazonq.lsp.auth.AuthStatusChangedListener;
-import software.aws.toolkits.eclipse.amazonq.lsp.auth.AuthStatusProvider;
 import software.aws.toolkits.eclipse.amazonq.lsp.auth.model.AuthState;
-import software.aws.toolkits.eclipse.amazonq.observers.StreamObserver;
+import software.aws.toolkits.eclipse.amazonq.observers.EventObserver;
 import software.aws.toolkits.eclipse.amazonq.plugin.Activator;
 import software.aws.toolkits.eclipse.amazonq.publishers.TestPublisher;
 import software.aws.toolkits.eclipse.amazonq.util.ThemeDetector;
 import software.aws.toolkits.eclipse.amazonq.views.actions.AmazonQCommonActions;
 
-public abstract class AmazonQView extends ViewPart implements AuthStatusChangedListener, StreamObserver<TestEvent> {
+public abstract class AmazonQView extends ViewPart implements EventObserver<AuthState> {
 
     private AmazonQViewController viewController;
     private AmazonQCommonActions amazonQCommonActions;
     private static final ThemeDetector THEME_DETECTOR = new ThemeDetector();
+    private Subscription authStateSubscription;
 
     protected AmazonQView() {
         this.viewController = new AmazonQViewController();
         new TestPublisher();
-//        EventBroker.getInstance().subscribe(this);
     }
 
     public final Browser getBrowser() {
@@ -86,10 +86,10 @@ private void setupActions(final AuthState authState) {
     }
 
     private void setupAuthStatusListeners() {
-        AuthStatusProvider.addAuthStatusChangeListener(this);
-        AuthStatusProvider.addAuthStatusChangeListener(amazonQCommonActions.getSignoutAction());
-        AuthStatusProvider.addAuthStatusChangeListener(amazonQCommonActions.getFeedbackDialogContributionAction());
-        AuthStatusProvider.addAuthStatusChangeListener(amazonQCommonActions.getCustomizationDialogContributionAction());
+        authStateSubscription = EventBroker.getInstance().subscribe(this);
+        EventBroker.getInstance().subscribe(amazonQCommonActions.getSignoutAction());
+        EventBroker.getInstance().subscribe(amazonQCommonActions.getFeedbackDialogContributionAction());
+        EventBroker.getInstance().subscribe(amazonQCommonActions.getCustomizationDialogContributionAction());
     }
 
     @Override
@@ -128,23 +128,8 @@ function waitForFunction(functionName, timeout = 30000) {
      */
     @Override
     public void dispose() {
-        AuthStatusProvider.removeAuthStatusChangeListener(this);
+        authStateSubscription.cancel();
         super.dispose();
     }
 
-    @Override
-    public final void onEvent(final TestEvent event) {
-        Activator.getLogger().info(event.getMessage());
-    }
-
-    @Override
-    public final void onError(final Throwable error) {
-        error.printStackTrace();
-    }
-
-    @Override
-    public final void onComplete() {
-        System.out.println("Complete");
-    }
-
 }
diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/views/ReauthenticateView.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/views/ReauthenticateView.java
@@ -4,6 +4,7 @@
 package software.aws.toolkits.eclipse.amazonq.views;
 
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Flow.Subscription;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -18,30 +19,31 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Link;
 
-import software.aws.toolkits.eclipse.amazonq.lsp.auth.AuthStatusChangedListener;
-import software.aws.toolkits.eclipse.amazonq.lsp.auth.AuthStatusProvider;
+import software.aws.toolkits.eclipse.amazonq.broker.EventBroker;
 import software.aws.toolkits.eclipse.amazonq.lsp.auth.model.AuthState;
+import software.aws.toolkits.eclipse.amazonq.observers.EventObserver;
 import software.aws.toolkits.eclipse.amazonq.plugin.Activator;
+import software.aws.toolkits.eclipse.amazonq.telemetry.UiTelemetryProvider;
 import software.aws.toolkits.eclipse.amazonq.util.Constants;
 import software.aws.toolkits.eclipse.amazonq.util.PluginUtils;
 import software.aws.toolkits.eclipse.amazonq.util.ThreadingUtils;
 import software.aws.toolkits.eclipse.amazonq.views.actions.SignoutAction;
-import software.aws.toolkits.eclipse.amazonq.telemetry.UiTelemetryProvider;
 
 
-public final class ReauthenticateView extends CallToActionView implements AuthStatusChangedListener {
+public final class ReauthenticateView extends CallToActionView implements EventObserver<AuthState> {
     public static final String ID = "software.aws.toolkits.eclipse.amazonq.views.ReauthenticateView";
 
     private static final String ICON_PATH = "icons/AmazonQ64.png";
     private static final String HEADER_LABEL = "Connection to Amazon Q Expired";
     private static final String DETAIL_MESSAGE = "Please re-authenticate to continue";
     private static final String BUTTON_LABEL = "Re-authenticate";
     private static final String LINK_LABEL = "Sign out";
+    private Subscription authStateSubscription;
 
     public ReauthenticateView() {
          // It is necessary for this view to be an `AuthStatusChangedListener` to switch the view back to Q Chat after the authentication
          // flow is successful. Without this listener, the re-authentication will succeed but the view will remain present.
-        AuthStatusProvider.addAuthStatusChangeListener(this);
+         authStateSubscription = EventBroker.getInstance().subscribe(this);
     }
 
     @Override
@@ -98,7 +100,7 @@ public void widgetSelected(final SelectionEvent e) {
     }
 
     @Override
-    public void onAuthStatusChanged(final AuthState authState) {
+    public void onEvent(final AuthState authState) {
         Display.getDefault().asyncExec(() -> {
             if (authState.isLoggedIn()) {
                 ViewVisibilityManager.showChatView("update");
@@ -138,7 +140,7 @@ protected void updateButtonStyle(final Button button) {
 
     @Override
     public void dispose() {
-        AuthStatusProvider.removeAuthStatusChangeListener(this);
+        authStateSubscription.cancel();
     }
 
     @Override

diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/views/ToolkitLoginWebview.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/views/ToolkitLoginWebview.java
@@ -92,11 +92,11 @@ public Object function(final Object[] arguments) {
         amazonQCommonActions = getAmazonQCommonActions();
 
         // Check if user is authenticated and build view accordingly
-        onAuthStatusChanged(authState);
+        onEvent(authState);
     }
 
     @Override
-    public void onAuthStatusChanged(final AuthState authState) {
+    public void onEvent(final AuthState authState) {
         var browser = getBrowser();
         Display.getDefault().asyncExec(() -> {
             amazonQCommonActions.updateActionVisibility(authState, getViewSite());

diff --git a/...tware/aws/toolkits/eclipse/amazonq/views/actions/CustomizationDialogContributionItem.java b/...tware/aws/toolkits/eclipse/amazonq/views/actions/CustomizationDialogContributionItem.java
@@ -4,6 +4,7 @@
 package software.aws.toolkits.eclipse.amazonq.views.actions;
 
 import java.util.Objects;
+
 import org.eclipse.jface.action.ContributionItem;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -13,18 +14,19 @@
 import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IViewSite;
+
 import jakarta.inject.Inject;
-import software.aws.toolkits.eclipse.amazonq.lsp.auth.AuthStatusChangedListener;
 import software.aws.toolkits.eclipse.amazonq.lsp.auth.model.AuthState;
 import software.aws.toolkits.eclipse.amazonq.lsp.auth.model.LoginType;
+import software.aws.toolkits.eclipse.amazonq.observers.EventObserver;
+import software.aws.toolkits.eclipse.amazonq.plugin.Activator;
+import software.aws.toolkits.eclipse.amazonq.telemetry.UiTelemetryProvider;
 import software.aws.toolkits.eclipse.amazonq.util.Constants;
 import software.aws.toolkits.eclipse.amazonq.views.CustomizationDialog;
-import software.aws.toolkits.eclipse.amazonq.views.model.Customization;
 import software.aws.toolkits.eclipse.amazonq.views.CustomizationDialog.ResponseSelection;
-import software.aws.toolkits.eclipse.amazonq.plugin.Activator;
-import software.aws.toolkits.eclipse.amazonq.telemetry.UiTelemetryProvider;
+import software.aws.toolkits.eclipse.amazonq.views.model.Customization;
 
-public final class CustomizationDialogContributionItem extends ContributionItem implements AuthStatusChangedListener {
+public final class CustomizationDialogContributionItem extends ContributionItem implements EventObserver<AuthState> {
     private static final String CUSTOMIZATION_MENU_ITEM_TEXT = "Select Customization";
 
     @Inject
@@ -45,7 +47,7 @@ public void updateVisibility(final AuthState authState) {
     }
 
     @Override
-    public void onAuthStatusChanged(final AuthState authState) {
+    public void onEvent(final AuthState authState) {
         updateVisibility(authState);
     }
 

diff --git a/...c/software/aws/toolkits/eclipse/amazonq/views/actions/FeedbackDialogContributionItem.java b/...c/software/aws/toolkits/eclipse/amazonq/views/actions/FeedbackDialogContributionItem.java
@@ -5,12 +5,12 @@
 import org.eclipse.ui.IViewSite;
 
 import jakarta.inject.Inject;
-import software.aws.toolkits.eclipse.amazonq.lsp.auth.AuthStatusChangedListener;
 import software.aws.toolkits.eclipse.amazonq.lsp.auth.model.AuthState;
+import software.aws.toolkits.eclipse.amazonq.observers.EventObserver;
 import software.aws.toolkits.eclipse.amazonq.views.DialogContributionItem;
 import software.aws.toolkits.eclipse.amazonq.views.FeedbackDialog;
 
-public final class FeedbackDialogContributionItem implements AuthStatusChangedListener {
+public final class FeedbackDialogContributionItem implements EventObserver<AuthState> {
     private static final String SHARE_FEEDBACK_MENU_ITEM_TEXT = "Share Feedback...";
 
     @Inject
@@ -40,7 +40,7 @@ public DialogContributionItem getDialogContributionItem() {
     }
 
     @Override
-    public void onAuthStatusChanged(final AuthState authState) {
+    public void onEvent(final AuthState authState) {
         updateVisibility(authState);
     }
 }
diff --git a/plugin/src/software/aws/toolkits/eclipse/amazonq/views/actions/SignoutAction.java b/plugin/src/software/aws/toolkits/eclipse/amazonq/views/actions/SignoutAction.java
@@ -3,15 +3,15 @@
 import org.eclipse.jface.action.Action;
 
 import software.aws.toolkits.eclipse.amazonq.customization.CustomizationUtil;
-import software.aws.toolkits.eclipse.amazonq.lsp.auth.AuthStatusChangedListener;
 import software.aws.toolkits.eclipse.amazonq.lsp.auth.model.AuthState;
+import software.aws.toolkits.eclipse.amazonq.observers.EventObserver;
 import software.aws.toolkits.eclipse.amazonq.plugin.Activator;
+import software.aws.toolkits.eclipse.amazonq.telemetry.UiTelemetryProvider;
 import software.aws.toolkits.eclipse.amazonq.util.Constants;
-import software.aws.toolkits.eclipse.amazonq.util.ThreadingUtils;
 import software.aws.toolkits.eclipse.amazonq.util.PluginUtils;
-import software.aws.toolkits.eclipse.amazonq.telemetry.UiTelemetryProvider;
+import software.aws.toolkits.eclipse.amazonq.util.ThreadingUtils;
 
-public final class SignoutAction extends Action implements AuthStatusChangedListener {
+public final class SignoutAction extends Action implements EventObserver<AuthState> {
     public SignoutAction() {
         setText("Sign out");
     }
@@ -42,7 +42,7 @@ public void updateVisibility(final AuthState authState) {
     }
 
     @Override
-    public void onAuthStatusChanged(final AuthState authState) {
+    public void onEvent(final AuthState authState) {
         updateVisibility(authState);
     }
 }