The Unified and Autonomous Development Platform
Refactor websocket support and fix the read timeout issue
robin shen6a973ea969cf
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex 1e0e898d70..e3d73f0896 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -224,6 +224,7 @@ import io.onedev.server.web.websocket.DefaultWebSocketManager;import io.onedev.server.web.websocket.PullRequestChangeBroadcaster;import io.onedev.server.web.websocket.TaskChangeBroadcaster;import io.onedev.server.web.websocket.WebSocketManager;+import io.onedev.server.web.websocket.WebSocketPolicyProvider;import io.onedev.utils.ClassUtils;import io.onedev.utils.schedule.DefaultTaskScheduler;import io.onedev.utils.schedule.TaskScheduler;@@ -364,7 +365,7 @@ public class CoreModule extends AbstractPluginModule {private void configureWeb() {bind(WicketServlet.class).to(DefaultWicketServlet.class);bind(WicketFilter.class).to(DefaultWicketFilter.class);- bind(WebSocketPolicy.class).toInstance(WebSocketPolicy.newServerPolicy());+ bind(WebSocketPolicy.class).toProvider(WebSocketPolicyProvider.class);bind(EditSupportRegistry.class).to(DefaultEditSupportRegistry.class);bind(WebSocketManager.class).to(DefaultWebSocketManager.class);diff --git a/core/src/main/java/io/onedev/server/OneDev.java b/core/src/main/java/io/onedev/server/OneDev.javaindex 3087d657dd..180363b07e 100644--- a/core/src/main/java/io/onedev/server/OneDev.java+++ b/core/src/main/java/io/onedev/server/OneDev.java@@ -119,8 +119,6 @@ public class OneDev extends AbstractPlugin implements Serializable {@Sessional@Overridepublic void postStart() {- webSocketManager.stop();-listenerRegistry.post(new SystemStarted());ThreadContext.unbindSubject();logger.info("Server is ready at " + configManager.getSystemSetting().getServerUrl() + ".");@@ -180,6 +178,8 @@ public class OneDev extends AbstractPlugin implements Serializable {@Overridepublic void stop() {+ webSocketManager.stop();+unitOfWork.begin();try {listenerRegistry.post(new SystemStopped());diff --git a/core/src/main/java/io/onedev/server/model/CodeComment.java b/core/src/main/java/io/onedev/server/model/CodeComment.javaindex 8377d47da6..387e131c77 100644--- a/core/src/main/java/io/onedev/server/model/CodeComment.java+++ b/core/src/main/java/io/onedev/server/model/CodeComment.java@@ -294,6 +294,10 @@ public class CodeComment extends AbstractEntity {return contextChanged;}+ public static String getWebSocketObservable(Long commentId) {+ return CodeComment.class.getName() + ":" + commentId;+ }+public static class ComparingInfo implements Serializable {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.javaindex 1aa9507e08..cd1893c10f 100644--- a/core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java@@ -830,6 +830,10 @@ public class PullRequest extends AbstractEntity {return valid;}+ public static String getWebSocketObservable(Long requestId) {+ return PullRequest.class.getName() + ":" + requestId;+ }+public static class ComparingInfo implements Serializable {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/model/User.java b/core/src/main/java/io/onedev/server/model/User.javaindex 78b05238ac..bc53949629 100644--- a/core/src/main/java/io/onedev/server/model/User.java+++ b/core/src/main/java/io/onedev/server/model/User.java@@ -225,6 +225,10 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.uuid = uuid;}+ public static String getWebSocketObservable(Long userId) {+ return User.class.getName() + userId;+ }+@Overridepublic int compareTo(AbstractEntity entity) {User user = (User) entity;diff --git a/core/src/main/java/io/onedev/server/search/CommitIndexed.java b/core/src/main/java/io/onedev/server/search/CommitIndexed.javaindex c79107bd1d..913896022e 100644--- a/core/src/main/java/io/onedev/server/search/CommitIndexed.java+++ b/core/src/main/java/io/onedev/server/search/CommitIndexed.java@@ -23,4 +23,8 @@ public class CommitIndexed {return commitId;}+ public static String getWebSocketObservable(String commitId) {+ return CommitIndexed.class.getName() + ":" + commitId;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/behavior/WebSocketObserver.java b/core/src/main/java/io/onedev/server/web/behavior/WebSocketObserver.javanew file mode 100644index 0000000000..922e41807d--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/behavior/WebSocketObserver.java@@ -0,0 +1,27 @@+package io.onedev.server.web.behavior;++import java.util.Collection;++import org.apache.wicket.Component;+import org.apache.wicket.behavior.Behavior;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;++public abstract class WebSocketObserver extends Behavior {++ protected Component component;++ @Override+ public void bind(Component component) {+ super.bind(component);+ this.component = component;+ }++ private static final long serialVersionUID = 1L;++ public abstract Collection<String> getObservables();++ public abstract void onObservableChanged(IPartialPageRequestHandler handler, String observable);++ public abstract void onConnectionOpened(IPartialPageRequestHandler handler);++}diff --git a/core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex 8e0dc42885..f225c0166f 100644--- a/core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -3,8 +3,8 @@ package io.onedev.server.web.page.base;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;import java.io.Serializable;-import java.util.ArrayList;import java.util.Collection;+import java.util.HashSet;import javax.annotation.Nullable;@@ -36,6 +36,8 @@ import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.util.time.Duration;+import org.apache.wicket.util.visit.IVisit;+import org.apache.wicket.util.visit.IVisitor;import org.eclipse.jetty.servlet.ServletContextHandler;import org.unbescape.javascript.JavaScriptEscape;@@ -44,11 +46,11 @@ import io.onedev.server.OneDev;import io.onedev.server.manager.UserManager;import io.onedev.server.model.User;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;+import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.page.init.ServerInitPage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.websocket.PageDataChanged;import io.onedev.server.web.websocket.WebSocketManager;-import io.onedev.server.web.websocket.WebSocketRegion;@SuppressWarnings("serial")public abstract class BasePage extends WebPage {@@ -173,9 +175,13 @@ public abstract class BasePage extends WebPage {protected void onMessage(WebSocketRequestHandler handler, TextMessage message) {super.onMessage(handler, message);- if (message.getText().equals(WebSocketManager.RENDER_CALLBACK)) {- send(getPage(), Broadcast.BREADTH, new PageDataChanged(handler, false));- } else if (message.getText().equals(WebSocketManager.CONNECT_CALLBACK)) {+ if (message.getText().startsWith(WebSocketManager.OBSERVABLE_CHANGED)) {+ String observable = message.getText().substring(WebSocketManager.OBSERVABLE_CHANGED.length()+1);+ for (WebSocketObserver observer: getWebSocketObservers()) {+ if (observer.getObservables().contains(observable))+ observer.onObservableChanged(handler, observable);+ }+ } else if (message.getText().equals(WebSocketManager.CONNECTION_OPENED)) {/** re-render interesting parts upon websocket connecting after a page is opened,* this is necessary in case some web socket render request is sent between the@@ -186,13 +192,32 @@ public abstract class BasePage extends WebPage {* re-render the integration preview section after connecting will make it* displaying correctly*/- send(getPage(), Broadcast.BREADTH, new PageDataChanged(handler, true));+ for (WebSocketObserver observer: getWebSocketObservers())+ observer.onConnectionOpened(handler);}}});+ add(new WebSocketObserver() {++ @Override+ public Collection<String> getObservables() {+ return getWebSocketObservables();+ }++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler, String observable) {+ send(BasePage.this, Broadcast.BREADTH, new PageDataChanged(handler));+ }++ @Override+ public void onConnectionOpened(IPartialPageRequestHandler handler) {+ send(BasePage.this, Broadcast.BREADTH, new PageDataChanged(handler, true));+ }++ });}public FeedbackPanel getSessionFeedback() {@@ -220,13 +245,28 @@ public abstract class BasePage extends WebPage {@Overrideprotected void onAfterRender() {- if (getWebSocketRegions() != null)- AppLoader.getInstance(WebSocketManager.class).onRegionChange(this);+ AppLoader.getInstance(WebSocketManager.class).onObserverChanged(this);super.onAfterRender();}++ private Collection<WebSocketObserver> getWebSocketObservers() {+ Collection<WebSocketObserver> observers = new HashSet<>();+ visitChildren(Component.class, new IVisitor<Component, Void>() {++ @Override+ public void component(Component object, IVisit<Void> visit) {+ observers.addAll(object.getBehaviors(io.onedev.server.web.behavior.WebSocketObserver.class));+ }++ });+ return observers;+ }- public Collection<WebSocketRegion> getWebSocketRegions() {- return new ArrayList<>();+ public Collection<String> getWebSocketObservables() {+ Collection<String> observables = new HashSet<>();+ for (WebSocketObserver observer: getWebSocketObservers())+ observables.addAll(observer.getObservables());+ return observables;}private void checkReady() {diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.js b/core/src/main/java/io/onedev/server/web/page/base/base.jsindex 3cd2242ee8..7c2edf2b81 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/core/src/main/java/io/onedev/server/web/page/base/base.js@@ -381,7 +381,7 @@ onedev.server = {setupWebsocketCallback: function() {Wicket.Event.subscribe("/websocket/message", function(jqEvent, message) {- if (message == "RenderCallback") {+ if (message.indexOf("ObservableChanged:") != -1) {function requestToRender() {if (onedev.server.ajaxRequests.count != 0) {setTimeout(function() {@@ -397,7 +397,7 @@ onedev.server = {}});Wicket.Event.subscribe("/websocket/open", function(jqEvent) {- Wicket.WebSocket.send("ConnectCallback");+ Wicket.WebSocket.send("ConnectionOpened");});},diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 30027a381a..df796a8061 100644--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -47,8 +47,6 @@ import io.onedev.server.web.page.user.TaskListPage;import io.onedev.server.web.page.user.UserListPage;import io.onedev.server.web.page.user.UserProfilePage;import io.onedev.server.web.websocket.PageDataChanged;-import io.onedev.server.web.websocket.TaskChangedRegion;-import io.onedev.server.web.websocket.WebSocketRegion;import io.onedev.utils.license.LicenseDetail;@SuppressWarnings("serial")@@ -173,7 +171,6 @@ public abstract class LayoutPage extends BasePage {head.add(new WebMarkupContainer("userMenuTrigger").setVisible(false));head.add(new WebMarkupContainer("userMenu").setVisible(false));}-head.setOutputMarkupId(true);}@@ -182,12 +179,11 @@ public abstract class LayoutPage extends BasePage {};@Override- public Collection<WebSocketRegion> getWebSocketRegions() {- Collection<WebSocketRegion> regions = super.getWebSocketRegions();- if (getLoginUser() != null) {- regions.add(new TaskChangedRegion(getLoginUser().getId()));- }- return regions;+ public Collection<String> getWebSocketObservables() {+ Collection<String> observables = super.getWebSocketObservables();+ if (getLoginUser() != null)+ observables.add(User.getWebSocketObservable(getLoginUser().getId()));+ return observables;}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 5231850797..eddafbc00e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -99,12 +99,8 @@ import io.onedev.server.web.page.project.blob.search.quick.QuickSearchPanel;import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel;import io.onedev.server.web.page.project.commits.ProjectCommitsPage;import io.onedev.server.web.util.resource.RawBlobResourceReference;-import io.onedev.server.web.websocket.CodeCommentChangedRegion;-import io.onedev.server.web.websocket.CommitIndexedRegion;import io.onedev.server.web.websocket.PageDataChanged;-import io.onedev.server.web.websocket.PullRequestChangedRegion;import io.onedev.server.web.websocket.WebSocketManager;-import io.onedev.server.web.websocket.WebSocketRegion;@SuppressWarnings("serial")public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {@@ -702,7 +698,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {resolvedRevision = null;resolvedRevision = getProject().getObjectId(state.blobIdent.revision);- OneDev.getInstance(WebSocketManager.class).onRegionChange(this);+ OneDev.getInstance(WebSocketManager.class).onObserverChanged(this);newRevisionPicker(target);target.add(revisionIndexing);newBlobNavigator(target);@@ -874,7 +870,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {newBlobOperations(target);newBlobContent(target);resizeWindow(target);- OneDev.getInstance(WebSocketManager.class).onRegionChange(this);+ OneDev.getInstance(WebSocketManager.class).onObserverChanged(this);} else if (state.mark != null) {// This logic is added for performance reason, we do not want to// reload the file if go to different mark positions in same file@@ -899,14 +895,14 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {state.commentId = null;state.mark = null;}- OneDev.getInstance(WebSocketManager.class).onRegionChange(this);+ OneDev.getInstance(WebSocketManager.class).onObserverChanged(this);pushState(target);}@Overridepublic void onAddComment(AjaxRequestTarget target, TextRange mark) {state.commentId = null;- OneDev.getInstance(WebSocketManager.class).onRegionChange(this);+ OneDev.getInstance(WebSocketManager.class).onObserverChanged(this);state.mark = mark;pushState(target);}@@ -922,15 +918,15 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {}@Override- public Collection<WebSocketRegion> getWebSocketRegions() {- Collection<WebSocketRegion> regions = super.getWebSocketRegions();- regions.add(new CommitIndexedRegion(getProject().getRevCommit(resolvedRevision)));+ public Collection<String> getWebSocketObservables() {+ Collection<String> observables = super.getWebSocketObservables();+ observables.add("CommitIndexed:" + getProject().getRevCommit(resolvedRevision).name());if (state.requestId != null)- regions.add(new PullRequestChangedRegion(state.requestId));+ observables.add(PullRequest.class.getName() + ":" + state.requestId);if (state.commentId != null)- regions.add(new CodeCommentChangedRegion(state.commentId));+ observables.add(CodeComment.class.getName() + ":" + state.commentId);- return regions;+ return observables;}public static class State implements Serializable {diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 9d2f38ee2d..4b15163f05 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -48,6 +48,7 @@ import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.MarkPos;+import io.onedev.server.search.CommitIndexed;import io.onedev.server.util.Verification;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;@@ -64,8 +65,6 @@ import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.branches.ProjectBranchesPage;import io.onedev.server.web.page.project.tags.ProjectTagsPage;-import io.onedev.server.web.websocket.CommitIndexedRegion;-import io.onedev.server.web.websocket.WebSocketRegion;@SuppressWarnings("serial")public class CommitDetailPage extends ProjectPage implements CommentSupport {@@ -558,11 +557,11 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {}@Override- public Collection<WebSocketRegion> getWebSocketRegions() {- Collection<WebSocketRegion> regions = super.getWebSocketRegions();- regions.add(new CommitIndexedRegion(resolvedRevision));- regions.add(new CommitIndexedRegion(getCompareWith()));- return regions;+ public Collection<String> getWebSocketObservables() {+ Collection<String> observables = super.getWebSocketObservables();+ observables.add(CommitIndexed.getWebSocketObservable(resolvedRevision.name()));+ observables.add(CommitIndexed.getWebSocketObservable(getCompareWith().name()));+ return observables;}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 94d23d7a82..569537d646 100644--- a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -40,6 +40,7 @@ import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.MarkPos;import io.onedev.server.model.support.ProjectAndBranch;import io.onedev.server.model.support.ProjectAndRevision;+import io.onedev.server.search.CommitIndexed;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.TooltipBehavior;import io.onedev.server.web.component.commitlist.CommitListPanel;@@ -55,10 +56,7 @@ import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.pullrequests.newrequest.NewRequestPage;import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.RequestOverviewPage;-import io.onedev.server.web.websocket.CodeCommentChangedRegion;-import io.onedev.server.web.websocket.CommitIndexedRegion;import io.onedev.server.web.websocket.WebSocketManager;-import io.onedev.server.web.websocket.WebSocketRegion;@SuppressWarnings("serial")public class RevisionComparePage extends ProjectPage implements CommentSupport {@@ -638,7 +636,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {super.onPopState(target, data);state = (State) data;- OneDev.getInstance(WebSocketManager.class).onRegionChange(this);+ OneDev.getInstance(WebSocketManager.class).onObserverChanged(this);newTabPanel(target);target.add(tabbable);@@ -734,7 +732,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {state.mark = null;}pushState(target);- OneDev.getInstance(WebSocketManager.class).onRegionChange(this);+ OneDev.getInstance(WebSocketManager.class).onObserverChanged(this);}@Override@@ -753,7 +751,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {state.commentId = null;state.mark = mark;pushState(target);- OneDev.getInstance(WebSocketManager.class).onRegionChange(this);+ OneDev.getInstance(WebSocketManager.class).onObserverChanged(this);}@Override@@ -771,16 +769,16 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {}@Override- public Collection<WebSocketRegion> getWebSocketRegions() {- Collection<WebSocketRegion> regions = super.getWebSocketRegions();+ public Collection<String> getWebSocketObservables() {+ Collection<String> observables = super.getWebSocketObservables();if (state.compareWithMergeBase)- regions.add(new CommitIndexedRegion(mergeBase));+ observables.add(CommitIndexed.getWebSocketObservable(mergeBase.name()));else- regions.add(new CommitIndexedRegion(state.leftSide.getCommit()));- regions.add(new CommitIndexedRegion(state.rightSide.getCommit()));+ observables.add(CommitIndexed.getWebSocketObservable(state.leftSide.getCommit().name()));+ observables.add(CommitIndexed.getWebSocketObservable(state.rightSide.getCommit().name()));if (state.commentId != null)- regions.add(new CodeCommentChangedRegion(state.commentId));- return regions;+ observables.add(CodeComment.getWebSocketObservable(state.commentId));+ return observables;}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.javaindex ec3725c9ae..675ad59ca6 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java@@ -51,6 +51,7 @@ import io.onedev.server.model.support.MarkPos;import io.onedev.server.model.support.MergeStrategy;import io.onedev.server.model.support.ProjectAndBranch;import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.search.CommitIndexed;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.QualityCheckStatus;import io.onedev.server.util.Verification;@@ -76,9 +77,7 @@ import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.RequestOverviewPage;import io.onedev.server.web.page.security.LoginPage;-import io.onedev.server.web.websocket.CommitIndexedRegion;import io.onedev.server.web.websocket.PageDataChanged;-import io.onedev.server.web.websocket.WebSocketRegion;@SuppressWarnings("serial")public class NewRequestPage extends ProjectPage implements CommentSupport {@@ -759,12 +758,12 @@ public class NewRequestPage extends ProjectPage implements CommentSupport {}@Override- public Collection<WebSocketRegion> getWebSocketRegions() {- Collection<WebSocketRegion> regions = super.getWebSocketRegions();+ public Collection<String> getWebSocketObservables() {+ Collection<String> regions = super.getWebSocketObservables();PullRequest request = getPullRequest();if (request != null) {- regions.add(new CommitIndexedRegion(request.getBaseCommit()));- regions.add(new CommitIndexedRegion(request.getHeadCommit()));+ regions.add(CommitIndexed.getWebSocketObservable(request.getBaseCommit().name()));+ regions.add(CommitIndexed.getWebSocketObservable(request.getHeadCommit().name()));}return regions;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.javaindex d0ba8ca42d..e298d64817 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java@@ -97,8 +97,6 @@ import io.onedev.server.web.util.WicketUtils;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.util.model.EntityModel;import io.onedev.server.web.websocket.PageDataChanged;-import io.onedev.server.web.websocket.PullRequestChangedRegion;-import io.onedev.server.web.websocket.WebSocketRegion;@SuppressWarnings("serial")public abstract class RequestDetailPage extends ProjectPage {@@ -913,10 +911,10 @@ public abstract class RequestDetailPage extends ProjectPage {}@Override- public Collection<WebSocketRegion> getWebSocketRegions() {- Collection<WebSocketRegion> regions = super.getWebSocketRegions();- regions.add(new PullRequestChangedRegion(getPullRequest().getId()));- return regions;+ public Collection<String> getWebSocketObservables() {+ Collection<String> observables = super.getWebSocketObservables();+ observables.add(PullRequest.getWebSocketObservable(getPullRequest().getId()));+ return observables;}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.javaindex e59505bbf5..b9d33f8ded 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.java@@ -30,7 +30,6 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;import io.onedev.server.OneDev;@@ -40,6 +39,7 @@ import io.onedev.server.model.CodeComment;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.support.MarkPos;+import io.onedev.server.search.CommitIndexed;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.diff.revision.CommentSupport;@@ -47,11 +47,8 @@ import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;-import io.onedev.server.web.websocket.CodeCommentChangedRegion;-import io.onedev.server.web.websocket.CommitIndexedRegion;import io.onedev.server.web.websocket.PageDataChanged;import io.onedev.server.web.websocket.WebSocketManager;-import io.onedev.server.web.websocket.WebSocketRegion;@SuppressWarnings("serial")public class RequestChangesPage extends RequestDetailPage implements CommentSupport {@@ -134,7 +131,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp}private void onRegionChange() {- OneDev.getInstance(WebSocketManager.class).onRegionChange(this);+ OneDev.getInstance(WebSocketManager.class).onObserverChanged(this);}@Override@@ -556,13 +553,13 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp}@Override- public Collection<WebSocketRegion> getWebSocketRegions() {- Collection<WebSocketRegion> regions = super.getWebSocketRegions();- regions.add(new CommitIndexedRegion(ObjectId.fromString(state.oldCommit)));- regions.add(new CommitIndexedRegion(ObjectId.fromString(state.newCommit)));+ public Collection<String> getWebSocketObservables() {+ Collection<String> observables = super.getWebSocketObservables();+ observables.add(CommitIndexed.getWebSocketObservable(state.oldCommit));+ observables.add(CommitIndexed.getWebSocketObservable((state.newCommit)));if (state.commentId != null)- regions.add(new CodeCommentChangedRegion(state.commentId));- return regions;+ observables.add(CodeComment.getWebSocketObservable(state.commentId));+ return observables;}public static class State implements Serializable {diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.javaindex 49c896972b..4ecc1340e8 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java@@ -20,20 +20,18 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.git.GitUtils;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.MergePreview;+import io.onedev.server.search.CommitIndexed;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;-import io.onedev.server.web.websocket.CommitIndexedRegion;import io.onedev.server.web.websocket.PageDataChanged;-import io.onedev.server.web.websocket.WebSocketRegion;@SuppressWarnings("serial")public class MergePreviewPage extends RequestDetailPage {@@ -230,12 +228,12 @@ public class MergePreviewPage extends RequestDetailPage {}@Override- public Collection<WebSocketRegion> getWebSocketRegions() {- Collection<WebSocketRegion> regions = super.getWebSocketRegions();+ public Collection<String> getWebSocketObservables() {+ Collection<String> regions = super.getWebSocketObservables();MergePreview preview = getPullRequest().getMergePreview();if (getPullRequest().isOpen() && preview != null && preview.getMerged() != null) {- regions.add(new CommitIndexedRegion(ObjectId.fromString(preview.getTargetHead())));- regions.add(new CommitIndexedRegion(ObjectId.fromString(preview.getMerged())));+ regions.add(CommitIndexed.getWebSocketObservable(preview.getTargetHead()));+ regions.add(CommitIndexed.getWebSocketObservable(preview.getMerged()));}return regions;}diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/core/src/main/java/io/onedev/server/web/page/test/TestPage.htmlindex 5625218df7..37dc903dab 100644--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html@@ -1,3 +1,3 @@<wicket:extend>- <div class="test">test to see if long text can show ellipsis</div>+ <div wicket:id="date"></div></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex 6b8cb9eece..b8f7e5d495 100644--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -1,8 +1,9 @@package io.onedev.server.web.page.test;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.request.resource.CssResourceReference;+import java.util.Date;++import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.AbstractReadOnlyModel;import io.onedev.server.web.page.base.BasePage;@@ -12,12 +13,14 @@ public class TestPage extends BasePage {@Overrideprotected void onInitialize() {super.onInitialize();- }+ add(new Label("date", new AbstractReadOnlyModel<String>() {- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new CssResourceReference(TestPage.class, "test.css")));+ @Override+ public String getObject() {+ return new Date().toString();+ }++ }));}}diff --git a/core/src/main/java/io/onedev/server/web/page/test/test.css b/core/src/main/java/io/onedev/server/web/page/test/test.cssdeleted file mode 100644index 8ff298c0ad..0000000000--- a/core/src/main/java/io/onedev/server/web/page/test/test.css+++ /dev/null@@ -1,7 +0,0 @@-.test {- width: 100px;- white-space: nowrap;- text-overflow: ellipsis;- border: 1px solid red;- overflow: hidden;-}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/websocket/CodeCommentChangeBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/CodeCommentChangeBroadcaster.javaindex 6280ab3ba4..f89b2cc207 100644--- a/core/src/main/java/io/onedev/server/web/websocket/CodeCommentChangeBroadcaster.java+++ b/core/src/main/java/io/onedev/server/web/websocket/CodeCommentChangeBroadcaster.java@@ -5,6 +5,7 @@ import javax.inject.Singleton;import io.onedev.launcher.loader.Listen;import io.onedev.server.event.codecomment.CodeCommentEvent;+import io.onedev.server.model.CodeComment;import io.onedev.server.web.util.WicketUtils;@Singleton@@ -19,9 +20,8 @@ public class CodeCommentChangeBroadcaster {@Listenpublic void on(CodeCommentEvent event) {- CodeCommentChangedRegion region = new CodeCommentChangedRegion(event.getComment().getId());PageKey sourcePageKey = WicketUtils.getPageKey();- webSocketManager.render(region, sourcePageKey);+ webSocketManager.onObservableChanged(CodeComment.getWebSocketObservable(event.getComment().getId()), sourcePageKey);}}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/websocket/CodeCommentChangedRegion.java b/core/src/main/java/io/onedev/server/web/websocket/CodeCommentChangedRegion.javadeleted file mode 100644index a308f249b7..0000000000--- a/core/src/main/java/io/onedev/server/web/websocket/CodeCommentChangedRegion.java+++ /dev/null@@ -1,23 +0,0 @@-package io.onedev.server.web.websocket;--import io.onedev.server.web.websocket.WebSocketRegion;--public class CodeCommentChangedRegion implements WebSocketRegion {-- private final Long commentId;-- public CodeCommentChangedRegion(Long commentId) {- this.commentId = commentId;- }-- @Override- public boolean contains(WebSocketRegion region) {- if (region instanceof CodeCommentChangedRegion) {- CodeCommentChangedRegion codeCommentChangedRegion = (CodeCommentChangedRegion) region;- return commentId.equals(codeCommentChangedRegion.commentId);- } else {- return false;- }- }--}diff --git a/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.javaindex 370a1021fd..ea9aa41498 100644--- a/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java+++ b/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java@@ -5,7 +5,6 @@ import javax.inject.Singleton;import io.onedev.launcher.loader.Listen;import io.onedev.server.search.CommitIndexed;-import io.onedev.server.web.websocket.WebSocketManager;@Singletonpublic class CommitIndexedBroadcaster {@@ -19,8 +18,7 @@ public class CommitIndexedBroadcaster {@Listenpublic void on(CommitIndexed event) {- CommitIndexedRegion region = new CommitIndexedRegion(event.getCommitId());- webSocketManager.render(region, null);+ webSocketManager.onObservableChanged(CommitIndexed.class.getName() + event.getCommitId().name(), null);}}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedRegion.java b/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedRegion.javadeleted file mode 100644index e3f5f16c5a..0000000000--- a/core/src/main/java/io/onedev/server/web/websocket/CommitIndexedRegion.java+++ /dev/null@@ -1,25 +0,0 @@-package io.onedev.server.web.websocket;--import org.eclipse.jgit.lib.ObjectId;--import io.onedev.server.web.websocket.WebSocketRegion;--public class CommitIndexedRegion implements WebSocketRegion {-- private final ObjectId commitId;-- public CommitIndexedRegion(ObjectId commitId) {- this.commitId = commitId;- }-- @Override- public boolean contains(WebSocketRegion region) {- if (region instanceof CommitIndexedRegion) {- CommitIndexedRegion commitIndexedRegion = (CommitIndexedRegion) region;- return commitId.equals(commitIndexedRegion.commitId);- } else {- return false;- }- }--}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/websocket/CompositeRegion.java b/core/src/main/java/io/onedev/server/web/websocket/CompositeRegion.javadeleted file mode 100644index 8c0c4f3bce..0000000000--- a/core/src/main/java/io/onedev/server/web/websocket/CompositeRegion.java+++ /dev/null@@ -1,32 +0,0 @@-package io.onedev.server.web.websocket;--import java.util.Collection;--import com.google.common.collect.Lists;--public class CompositeRegion implements WebSocketRegion {-- private final Collection<WebSocketRegion> regions;-- public CompositeRegion(Collection<WebSocketRegion> regions) {- this.regions = regions;- }-- public CompositeRegion(WebSocketRegion region1, WebSocketRegion region2) {- this.regions = Lists.newArrayList(region1, region2);- }-- public CompositeRegion(WebSocketRegion region1, WebSocketRegion region2, WebSocketRegion region3) {- this.regions = Lists.newArrayList(region1, region2, region3);- }-- @Override- public boolean contains(WebSocketRegion region) {- for (WebSocketRegion each: regions) {- if (each.contains(region))- return true;- }- return false;- }--}diff --git a/core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java b/core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.javaindex b67f285bb7..4fdeb28edb 100644--- a/core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java+++ b/core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java@@ -35,7 +35,7 @@ public class DefaultWebSocketManager implements WebSocketManager {private final WebSocketPolicy webSocketPolicy;- private final Map<PageKey, Collection<WebSocketRegion>> regions = new ConcurrentHashMap<>();+ private final Map<PageKey, Collection<String>> observables = new ConcurrentHashMap<>();private final IWebSocketConnectionRegistry connectionRegistry = new SimpleWebSocketConnectionRegistry();@@ -47,16 +47,16 @@ public class DefaultWebSocketManager implements WebSocketManager {}@Override- public void onRegionChange(BasePage page) {+ public void onObserverChanged(BasePage page) {String sessionId = page.getSession().getId();if (sessionId != null) {- regions.put(new PageKey(sessionId, new PageIdKey(page.getPageId())), page.getWebSocketRegions());+ observables.put(new PageKey(sessionId, new PageIdKey(page.getPageId())), page.getWebSocketObservables());}}@Overridepublic void onDestroySession(String sessionId) {- for (Iterator<Map.Entry<PageKey, Collection<WebSocketRegion>>> it = regions.entrySet().iterator(); it.hasNext();) {+ for (Iterator<Map.Entry<PageKey, Collection<String>>> it = observables.entrySet().iterator(); it.hasNext();) {PageKey pageKey = it.next().getKey();if (pageKey.getSessionId().equals(sessionId))it.remove();@@ -65,20 +65,21 @@ public class DefaultWebSocketManager implements WebSocketManager {@Sessional@Override- public void render(WebSocketRegion region, @Nullable PageKey sourcePageKey) {+ public void onObservableChanged(String observable, @Nullable PageKey sourcePageKey) {dao.doAfterCommit(new Runnable() {@Overridepublic void run() {for (IWebSocketConnection connection: connectionRegistry.getConnections(application)) {PageKey pageKey = ((WebSocketConnection) connection).getPageKey();- if (connection.isOpen()- && (sourcePageKey == null || !sourcePageKey.equals(pageKey))- && containsRegion(connection, region)) {- try {- connection.sendMessage(RENDER_CALLBACK);- } catch (IOException e) {- throw new RuntimeException(e);+ if (connection.isOpen() && (sourcePageKey == null || !sourcePageKey.equals(pageKey))) {+ Collection<String> pageObservables = observables.get(pageKey);+ if (pageObservables != null && pageObservables.contains(observable)) {+ try {+ connection.sendMessage(OBSERVABLE_CHANGED + ":" + observable);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }}}}@@ -87,19 +88,6 @@ public class DefaultWebSocketManager implements WebSocketManager {});}- private boolean containsRegion(IWebSocketConnection connection, WebSocketRegion region) {- PageKey pageKey = ((WebSocketConnection)connection).getPageKey();- Collection<WebSocketRegion> connectionRegions = regions.get(pageKey);- if (connectionRegions != null) {- for (WebSocketRegion connectionRegion: connectionRegions) {- if (connectionRegion.contains(region)) {- return true;- }- }- }- return false;- }-@Overridepublic void start() {scheduledExecutorService.scheduleWithFixedDelay(new Runnable() {diff --git a/core/src/main/java/io/onedev/server/web/websocket/PullRequestChangeBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/PullRequestChangeBroadcaster.javaindex 1735be2c0e..c1bca2556e 100644--- a/core/src/main/java/io/onedev/server/web/websocket/PullRequestChangeBroadcaster.java+++ b/core/src/main/java/io/onedev/server/web/websocket/PullRequestChangeBroadcaster.java@@ -5,6 +5,7 @@ import javax.inject.Singleton;import io.onedev.launcher.loader.Listen;import io.onedev.server.event.pullrequest.PullRequestEvent;+import io.onedev.server.model.PullRequest;import io.onedev.server.web.util.WicketUtils;@Singleton@@ -19,10 +20,8 @@ public class PullRequestChangeBroadcaster {@Listenpublic void on(PullRequestEvent event) {- PullRequestChangedRegion region = new PullRequestChangedRegion(event.getRequest().getId());PageKey sourcePageKey = WicketUtils.getPageKey();-- webSocketManager.render(region, sourcePageKey);+ webSocketManager.onObservableChanged(PullRequest.getWebSocketObservable(event.getRequest().getId()), sourcePageKey);}}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/websocket/PullRequestChangedRegion.java b/core/src/main/java/io/onedev/server/web/websocket/PullRequestChangedRegion.javadeleted file mode 100644index a41c9ef5ff..0000000000--- a/core/src/main/java/io/onedev/server/web/websocket/PullRequestChangedRegion.java+++ /dev/null@@ -1,23 +0,0 @@-package io.onedev.server.web.websocket;--import io.onedev.server.web.websocket.WebSocketRegion;--public class PullRequestChangedRegion implements WebSocketRegion {-- public final Long requestId;-- public PullRequestChangedRegion(Long requestId) {- this.requestId = requestId;- }-- @Override- public boolean contains(WebSocketRegion region) {- if (region instanceof PullRequestChangedRegion) {- PullRequestChangedRegion pageDataChangedRegion = (PullRequestChangedRegion) region;- return requestId.equals(pageDataChangedRegion.requestId);- } else {- return false;- }- }--}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/websocket/RecentRenderRequest.java b/core/src/main/java/io/onedev/server/web/websocket/RecentRenderRequest.javadeleted file mode 100644index 7c145ada43..0000000000--- a/core/src/main/java/io/onedev/server/web/websocket/RecentRenderRequest.java+++ /dev/null@@ -1,31 +0,0 @@-package io.onedev.server.web.websocket;--import java.util.Date;--public class RecentRenderRequest {-- private final WebSocketRegion region;-- private final PageKey sourcePageKey;-- private final Date date;-- public RecentRenderRequest(WebSocketRegion region, PageKey sourcePageKey, Date date) {- this.region = region;- this.sourcePageKey = sourcePageKey;- this.date = date;- }-- public WebSocketRegion getRegion() {- return region;- }-- public PageKey getSourcePageKey() {- return sourcePageKey;- }-- public Date getDate() {- return date;- }--}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/websocket/TaskChangeBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/TaskChangeBroadcaster.javaindex 17992fbd9d..4b02d44fd8 100644--- a/core/src/main/java/io/onedev/server/web/websocket/TaskChangeBroadcaster.java+++ b/core/src/main/java/io/onedev/server/web/websocket/TaskChangeBroadcaster.java@@ -5,9 +5,9 @@ import javax.inject.Singleton;import io.onedev.launcher.loader.Listen;import io.onedev.server.model.PullRequestTask;+import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityPersisted;import io.onedev.server.persistence.dao.EntityRemoved;-import io.onedev.server.web.websocket.WebSocketManager;@Singletonpublic class TaskChangeBroadcaster {@@ -23,8 +23,7 @@ public class TaskChangeBroadcaster {public void on(EntityPersisted event) {if (event.getEntity() instanceof PullRequestTask) {PullRequestTask task = (PullRequestTask) event.getEntity();- TaskChangedRegion region = new TaskChangedRegion(task.getUser().getId());- webSocketManager.render(region, null);+ webSocketManager.onObservableChanged(User.getWebSocketObservable(task.getUser().getId()), null);}}@@ -32,8 +31,7 @@ public class TaskChangeBroadcaster {public void on(EntityRemoved event) {if (event.getEntity() instanceof PullRequestTask) {PullRequestTask task = (PullRequestTask) event.getEntity();- TaskChangedRegion region = new TaskChangedRegion(task.getUser().getId());- webSocketManager.render(region, null);+ webSocketManager.onObservableChanged(User.getWebSocketObservable(task.getUser().getId()), null);}}diff --git a/core/src/main/java/io/onedev/server/web/websocket/TaskChangedRegion.java b/core/src/main/java/io/onedev/server/web/websocket/TaskChangedRegion.javadeleted file mode 100644index d883efd9b6..0000000000--- a/core/src/main/java/io/onedev/server/web/websocket/TaskChangedRegion.java+++ /dev/null@@ -1,23 +0,0 @@-package io.onedev.server.web.websocket;--import io.onedev.server.web.websocket.WebSocketRegion;--public class TaskChangedRegion implements WebSocketRegion {-- public final Long userId;-- public TaskChangedRegion(Long userId) {- this.userId = userId;- }-- @Override- public boolean contains(WebSocketRegion region) {- if (region instanceof TaskChangedRegion) {- TaskChangedRegion pageDataChangedRegion = (TaskChangedRegion) region;- return userId.equals(pageDataChangedRegion.userId);- } else {- return false;- }- }--}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/websocket/WebSocketManager.java b/core/src/main/java/io/onedev/server/web/websocket/WebSocketManager.javaindex ccc39f3e5d..6f85a5eba9 100644--- a/core/src/main/java/io/onedev/server/web/websocket/WebSocketManager.java+++ b/core/src/main/java/io/onedev/server/web/websocket/WebSocketManager.java@@ -8,17 +8,17 @@ public interface WebSocketManager {static final String ERROR_MESSAGE = "ErrorMessage";- static final String RENDER_CALLBACK = "RenderCallback";+ static final String OBSERVABLE_CHANGED = "ObservableChanged";- static final String CONNECT_CALLBACK = "ConnectCallback";+ static final String CONNECTION_OPENED = "ConnectionOpened";static final String KEEP_ALIVE = "KeepAlive";- void onRegionChange(BasePage page);+ void onObserverChanged(BasePage page);void onDestroySession(String sessionId);- void render(WebSocketRegion region, @Nullable PageKey sourcePageKey);+ void onObservableChanged(String observable, @Nullable PageKey sourcePageKey);void start();diff --git a/core/src/main/java/io/onedev/server/web/websocket/WebSocketPolicyProvider.java b/core/src/main/java/io/onedev/server/web/websocket/WebSocketPolicyProvider.javanew file mode 100644index 0000000000..190d4f8e6e--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/websocket/WebSocketPolicyProvider.java@@ -0,0 +1,28 @@+package io.onedev.server.web.websocket;++import javax.inject.Inject;+import javax.inject.Provider;+import javax.inject.Singleton;++import org.eclipse.jetty.websocket.api.WebSocketPolicy;++import io.onedev.server.util.serverconfig.ServerConfig;++@Singleton+public class WebSocketPolicyProvider implements Provider<WebSocketPolicy> {++ private final ServerConfig serverConfig;++ @Inject+ public WebSocketPolicyProvider(ServerConfig serverConfig) {+ this.serverConfig = serverConfig;+ }++ @Override+ public WebSocketPolicy get() {+ WebSocketPolicy policy = WebSocketPolicy.newServerPolicy();+ policy.setIdleTimeout(serverConfig.getSessionTimeout()*1000);+ return policy;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/websocket/WebSocketRegion.java b/core/src/main/java/io/onedev/server/web/websocket/WebSocketRegion.javadeleted file mode 100644index a29170e217..0000000000--- a/core/src/main/java/io/onedev/server/web/websocket/WebSocketRegion.java+++ /dev/null@@ -1,5 +0,0 @@-package io.onedev.server.web.websocket;--public interface WebSocketRegion {- boolean contains(WebSocketRegion region);-}