[jira] [Commented] (OPENMEETINGS-2580) iceCandidates can be incoming before WebRtcEndpoint is ready and requires queueing
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2580?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17291197#comment-17291197 ] ASF subversion and git services commented on OPENMEETINGS-2580: --- Commit e3ed441ad8707b8094ae9dcb00cc1d390a219b3a in openmeetings's branch refs/heads/master from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=e3ed441 ] OPENMEETINGS-2580 Move adding iceCandidates before sending ws notification. > iceCandidates can be incoming before WebRtcEndpoint is ready and requires > queueing > -- > > Key: OPENMEETINGS-2580 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2580 > Project: Openmeetings > Issue Type: New Feature >Affects Versions: 6.0.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Major > Fix For: 6.0.0 > > > Will discuss via mailing list -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2580) iceCandidates can be incoming before WebRtcEndpoint is ready and requires queueing
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2580?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17291199#comment-17291199 ] ASF subversion and git services commented on OPENMEETINGS-2580: --- Commit 14c64a5fdcb67f4ed21304eaf1e37dcb57adcc29 in openmeetings's branch refs/heads/master from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=14c64a5 ] Merge pull request #132 from apache/feature/OPENMEETINGS-2580-re-apply-ice-before-sending-ws-candidates OPENMEETINGS-2580 re apply ice before sending ws candidates > iceCandidates can be incoming before WebRtcEndpoint is ready and requires > queueing > -- > > Key: OPENMEETINGS-2580 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2580 > Project: Openmeetings > Issue Type: New Feature >Affects Versions: 6.0.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Major > Fix For: 6.0.0 > > > Will discuss via mailing list -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2580) iceCandidates can be incoming before WebRtcEndpoint is ready and requires queueing
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2580?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17291198#comment-17291198 ] ASF subversion and git services commented on OPENMEETINGS-2580: --- Commit f7b743e75af56d250f735ca566df650e22d01bc6 in openmeetings's branch refs/heads/master from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=f7b743e ] OPENMEETINGS-2580 Externalise method. > iceCandidates can be incoming before WebRtcEndpoint is ready and requires > queueing > -- > > Key: OPENMEETINGS-2580 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2580 > Project: Openmeetings > Issue Type: New Feature >Affects Versions: 6.0.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Major > Fix For: 6.0.0 > > > Will discuss via mailing list -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2580) iceCandidates can be incoming before WebRtcEndpoint is ready and requires queueing
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2580?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17291200#comment-17291200 ] ASF subversion and git services commented on OPENMEETINGS-2580: --- Commit 14c64a5fdcb67f4ed21304eaf1e37dcb57adcc29 in openmeetings's branch refs/heads/master from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=14c64a5 ] Merge pull request #132 from apache/feature/OPENMEETINGS-2580-re-apply-ice-before-sending-ws-candidates OPENMEETINGS-2580 re apply ice before sending ws candidates > iceCandidates can be incoming before WebRtcEndpoint is ready and requires > queueing > -- > > Key: OPENMEETINGS-2580 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2580 > Project: Openmeetings > Issue Type: New Feature >Affects Versions: 6.0.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Major > Fix For: 6.0.0 > > > Will discuss via mailing list -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] 01/01: Merge pull request #132 from apache/feature/OPENMEETINGS-2580-re-apply-ice-before-sending-ws-candidates
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 14c64a5fdcb67f4ed21304eaf1e37dcb57adcc29 Merge: e6b90b8 f7b743e Author: Sebastian Wagner AuthorDate: Fri Feb 26 09:35:27 2021 +1300 Merge pull request #132 from apache/feature/OPENMEETINGS-2580-re-apply-ice-before-sending-ws-candidates OPENMEETINGS-2580 re apply ice before sending ws candidates .../apache/openmeetings/core/remote/KStream.java | 25 +- 1 file changed, 15 insertions(+), 10 deletions(-)
[openmeetings] branch master updated (e6b90b8 -> 14c64a5)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from e6b90b8 [OPENMEETINGS-2519] fabric.js is updated add e3ed441 OPENMEETINGS-2580 Move adding iceCandidates before sending ws notification. add f7b743e OPENMEETINGS-2580 Externalise method. new 14c64a5 Merge pull request #132 from apache/feature/OPENMEETINGS-2580-re-apply-ice-before-sending-ws-candidates The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/openmeetings/core/remote/KStream.java | 25 +- 1 file changed, 15 insertions(+), 10 deletions(-)
[jira] [Commented] (OPENMEETINGS-2582) File download fails
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2582?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17290940#comment-17290940 ] Ali Alhaidary commented on OPENMEETINGS-2582: - When pressing the download icon (in room or in recordings) the above error is logged, however, I can still save the file using 'save video as' option in the display of the video player. > File download fails > --- > > Key: OPENMEETINGS-2582 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2582 > Project: Openmeetings > Issue Type: Bug > Components: Recordings, UI, Usability >Affects Versions: 6.0.0 >Reporter: Ali Alhaidary >Assignee: Maxim Solodovnik >Priority: Major > > WARN 02-25 13:17:33.295 o.a.w.p.DefaultPageLockManager:139 [nio-5443-exec-9] > - Thread 'https-jsse-nio-5443-exec-9' failed to acquire lock to page with id > '1', attempted for PT1M0.79S out of allowed PT1M. The thread that holds > the lock has name 'https-jsse-nio-5443-exec-8'. > WARN 02-25 13:17:33.342 o.a.w.p.DefaultPageLockManager:114 [nio-5443-exec-9] > - "https-jsse-nio-5443-exec-8" daemon prio=5 tid=103 state=TIMED_WAITING > org.apache.wicket.util.lang.Threads$ThreadDump: null > at java.base@11.0.10/jdk.internal.misc.Unsafe.park(Native Method) > at > java.base@11.0.10/java.util.concurrent.locks.LockSupport.parkNanos(LockSupport.java:234) > at > java.base@11.0.10/java.util.concurrent.locks.AbstractQueuedSynchronizer.doAcquireSharedNanos(AbstractQueuedSynchronizer.java:1079) > at > java.base@11.0.10/java.util.concurrent.locks.AbstractQueuedSynchronizer.tryAcquireSharedNanos(AbstractQueuedSynchronizer.java:1369) > at > java.base@11.0.10/java.util.concurrent.CountDownLatch.await(CountDownLatch.java:278) > at > org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.awaitLatch(NioEndpoint.java:1157) > . > . > . > > ERROR 02-25 13:17:33.360 o.a.w.p.w.a.AbstractWebSocketProcessor:281 > [nio-5443-exec-9] - An error occurred during processing of a WebSocket message > org.apache.wicket.page.CouldNotLockPageException: Could not lock page 1. > Attempt lasted PT1M > at > org.apache.wicket.page.DefaultPageLockManager.lockPage(DefaultPageLockManager.java:170) > at > org.apache.wicket.page.PageAccessSynchronizer.lockPage(PageAccessSynchronizer.java:72) > at > org.apache.wicket.page.PageAccessSynchronizer$1.getPage(PageAccessSynchronizer.java:116) > at > org.apache.wicket.protocol.ws.api.AbstractWebSocketProcessor.getPage(AbstractWebSocketProcessor.java:340) > at > org.apache.wicket.protocol.ws.api.AbstractWebSocketProcessor.broadcastMessage(AbstractWebSocketProcessor.java:258) > at > org.apache.wicket.protocol.ws.api.AbstractWebSocketProcessor.onMessage(AbstractWebSocketProcessor.java:151) > at > org.apache.wicket.protocol.ws.javax.JavaxWebSocketProcessor$StringMessageHandler.onMessage(JavaxWebSocketProcessor.java:65) > . > . > . > . -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Created] (OPENMEETINGS-2582) File download fails
Ali Alhaidary created OPENMEETINGS-2582: --- Summary: File download fails Key: OPENMEETINGS-2582 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2582 Project: Openmeetings Issue Type: Bug Components: Recordings, UI, Usability Affects Versions: 6.0.0 Reporter: Ali Alhaidary Assignee: Maxim Solodovnik WARN 02-25 13:17:33.295 o.a.w.p.DefaultPageLockManager:139 [nio-5443-exec-9] - Thread 'https-jsse-nio-5443-exec-9' failed to acquire lock to page with id '1', attempted for PT1M0.79S out of allowed PT1M. The thread that holds the lock has name 'https-jsse-nio-5443-exec-8'. WARN 02-25 13:17:33.342 o.a.w.p.DefaultPageLockManager:114 [nio-5443-exec-9] - "https-jsse-nio-5443-exec-8" daemon prio=5 tid=103 state=TIMED_WAITING org.apache.wicket.util.lang.Threads$ThreadDump: null at java.base@11.0.10/jdk.internal.misc.Unsafe.park(Native Method) at java.base@11.0.10/java.util.concurrent.locks.LockSupport.parkNanos(LockSupport.java:234) at java.base@11.0.10/java.util.concurrent.locks.AbstractQueuedSynchronizer.doAcquireSharedNanos(AbstractQueuedSynchronizer.java:1079) at java.base@11.0.10/java.util.concurrent.locks.AbstractQueuedSynchronizer.tryAcquireSharedNanos(AbstractQueuedSynchronizer.java:1369) at java.base@11.0.10/java.util.concurrent.CountDownLatch.await(CountDownLatch.java:278) at org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.awaitLatch(NioEndpoint.java:1157) . . . ERROR 02-25 13:17:33.360 o.a.w.p.w.a.AbstractWebSocketProcessor:281 [nio-5443-exec-9] - An error occurred during processing of a WebSocket message org.apache.wicket.page.CouldNotLockPageException: Could not lock page 1. Attempt lasted PT1M at org.apache.wicket.page.DefaultPageLockManager.lockPage(DefaultPageLockManager.java:170) at org.apache.wicket.page.PageAccessSynchronizer.lockPage(PageAccessSynchronizer.java:72) at org.apache.wicket.page.PageAccessSynchronizer$1.getPage(PageAccessSynchronizer.java:116) at org.apache.wicket.protocol.ws.api.AbstractWebSocketProcessor.getPage(AbstractWebSocketProcessor.java:340) at org.apache.wicket.protocol.ws.api.AbstractWebSocketProcessor.broadcastMessage(AbstractWebSocketProcessor.java:258) at org.apache.wicket.protocol.ws.api.AbstractWebSocketProcessor.onMessage(AbstractWebSocketProcessor.java:151) at org.apache.wicket.protocol.ws.javax.JavaxWebSocketProcessor$StringMessageHandler.onMessage(JavaxWebSocketProcessor.java:65) . . . . -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2519) (6.0.0) Library versions need to be updated
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2519?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17290831#comment-17290831 ] ASF subversion and git services commented on OPENMEETINGS-2519: --- Commit e6b90b819d55faa5bde52233037572b480e61ba1 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=e6b90b8 ] [OPENMEETINGS-2519] fabric.js is updated > (6.0.0) Library versions need to be updated > --- > > Key: OPENMEETINGS-2519 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2519 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 6.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 6.0.0 > > > Library versions need to be updated -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2519] fabric.js is updated
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git The following commit(s) were added to refs/heads/master by this push: new e6b90b8 [OPENMEETINGS-2519] fabric.js is updated e6b90b8 is described below commit e6b90b819d55faa5bde52233037572b480e61ba1 Author: Maxim Solodovnik AuthorDate: Thu Feb 25 17:31:14 2021 +0700 [OPENMEETINGS-2519] fabric.js is updated --- openmeetings-web/src/main/front/wb/package.json | 2 +- openmeetings-web/src/main/front/wb/src/wb-area.js | 80 ++- 2 files changed, 37 insertions(+), 45 deletions(-) diff --git a/openmeetings-web/src/main/front/wb/package.json b/openmeetings-web/src/main/front/wb/package.json index 9b63ae5..7920b65 100644 --- a/openmeetings-web/src/main/front/wb/package.json +++ b/openmeetings-web/src/main/front/wb/package.json @@ -18,7 +18,7 @@ "tinyify": "^3.0.0" }, "dependencies": { -"fabric": "^3.6.6", +"fabric": "^4.3.1", "mathjax-full": "^3.1.2" } } diff --git a/openmeetings-web/src/main/front/wb/src/wb-area.js b/openmeetings-web/src/main/front/wb/src/wb-area.js index 4e94fec..a7baa5b 100644 --- a/openmeetings-web/src/main/front/wb/src/wb-area.js +++ b/openmeetings-web/src/main/front/wb/src/wb-area.js @@ -68,56 +68,48 @@ module.exports = class DrawWbArea extends WbAreaBase { let scroll, role = Role.NONE, _inited = false; // Fabric overrides (should be kept up-to-date on fabric.js updates) - if ('function' !== typeof(window.originalDrawControl)) { - window.originalDrawControl = fabric.Object.prototype._drawControl; - window.originalGetRotatedCornerCursor = fabric.Canvas.prototype._getRotatedCornerCursor; - window.originalGetActionFromCorner = fabric.Canvas.prototype._getActionFromCorner; - window.originalGetCornerCursor = fabric.Canvas.prototype.getCornerCursor; + if ('function' !== typeof (window.originalTr)) { + window.originalTr = fabric.Object.prototype.controls.tr; } - fabric.Object.prototype._drawControl = function(control, ctx, methodName, left, top, styleOverride) { - switch (control) { - case 'mtr': - { - const x = left + (this.cornerSize - arrowImg.width) / 2 - , y = top + (this.cornerSize - arrowImg.height) / 2; - ctx.drawImage(arrowImg, x, y); - } - break; - case 'tr': - { - if (role === Role.PRESENTER) { - const x = left + (this.cornerSize - delImg.width) / 2 - , y = top + (this.cornerSize - delImg.height) / 2; - ctx.drawImage(delImg, x, y); - } else { - window.originalDrawControl.call(this, control, ctx, methodName, left, top, styleOverride); - } + fabric.Object.prototype.controls.mtr.render = function(ctx, left, top, _, fabricObject) { + ctx.save(); + ctx.translate(left, top); + ctx.rotate(fabric.util.degreesToRadians(fabricObject.angle)); + ctx.drawImage(arrowImg, x-arrowImg.width / 2, -arrowImg.height / 2); + ctx.restore(); + }; + fabric.Object.prototype.controls.tr = new fabric.Control({ + x: 0.5 + , y: -0.5 + , cursorStyleHandler: function(eventData, control, fabricObject) { + if (role === Role.PRESENTER) { + return 'pointer'; } - break; - default: - window.originalDrawControl.call(this, control, ctx, methodName, left, top, styleOverride); - break; + return window.originalTr.cursorStyleHandler.call(this, eventData, control, fabricObject); } - }; - fabric.Canvas.prototype._getRotatedCornerCursor = function(corner, target, e) { - if (role === Role.PRESENTER && 'tr' === corner) { - return 'pointer'; + ,