Skip to content

Commit

Permalink
Upgrade Zoom web client to v3.1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
edemaine committed Feb 9, 2024
1 parent 2f2e988 commit 289592d
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 32 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ instead of version numbers.

* Creating a room without entering a room title creates visual feedback
instead of silently failing.
* Upgrade Zoom web client to
[v3.1.6](https://developers.zoom.us/changelog/meeting-sdk/web/3.1.6).

## 2023-05-27

Expand Down
14 changes: 6 additions & 8 deletions public/zoom.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,18 @@
<style>#content_container { overflow: auto }</style>
<title>Zoom WebSDK CDN</title>
<meta charset="utf-8" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.12.2/css/bootstrap.css" />
<link type="text/css" rel="stylesheet" href="https://source.zoom.us/2.12.2/css/react-select.css" />
<meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<meta http-equiv="origin-trial" content="">
</head>

<body>
<script src="https://source.zoom.us/2.12.2/lib/vendor/react.min.js"></script>
<script src="https://source.zoom.us/2.12.2/lib/vendor/react-dom.min.js"></script>
<script src="https://source.zoom.us/2.12.2/lib/vendor/redux.min.js"></script>
<script src="https://source.zoom.us/2.12.2/lib/vendor/redux-thunk.min.js"></script>
<script src="https://source.zoom.us/2.12.2/lib/vendor/lodash.min.js"></script>
<script src="https://source.zoom.us/zoom-meeting-2.12.2.min.js"></script>
<script src="https://source.zoom.us/3.1.6/lib/vendor/react.min.js"></script>
<script src="https://source.zoom.us/3.1.6/lib/vendor/react-dom.min.js"></script>
<script src="https://source.zoom.us/3.1.6/lib/vendor/redux.min.js"></script>
<script src="https://source.zoom.us/3.1.6/lib/vendor/redux-thunk.min.js"></script>
<script src="https://source.zoom.us/3.1.6/lib/vendor/lodash.min.js"></script>
<script src="https://source.zoom.us/zoom-meeting-3.1.6.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script>
<script src="/zoom.js"></script>
</body>
Expand Down
44 changes: 23 additions & 21 deletions public/zoom.js
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,8 @@ window.testTool = testTool;
// disablePreview: true, // default false
//////////////////////////////////////////////////////////////////////////

window.addEventListener('DOMContentLoaded', function(event) {
console.log('DOM fully loaded and parsed');
window.addEventListener("DOMContentLoaded", function (event) {
console.log("DOM fully loaded and parsed");
websdkready();
});

Expand Down Expand Up @@ -395,24 +395,26 @@ function websdkready() {
}
console.log(JSON.stringify(ZoomMtg.checkSystemRequirements()));

// it's option if you want to change the WebSDK dependency link resources. setZoomJSLib must be run at first
// ZoomMtg.setZoomJSLib("https://source.zoom.us/2.12.2/lib", "/av"); // CDN version defaul
// it's option if you want to change the MeetingSDK-Web dependency link resources. setZoomJSLib must be run at first
// ZoomMtg.setZoomJSLib("https://source.zoom.us/{VERSION}/lib", "/av"); // default, don't need call it
if (meetingConfig.china)
ZoomMtg.setZoomJSLib("https://jssdk.zoomus.cn/2.12.2/lib", "/av"); // china cdn option
ZoomMtg.setZoomJSLib("https://jssdk.zoomus.cn/3.1.6/lib", "/av"); // china cdn option

ZoomMtg.preLoadWasm();
ZoomMtg.prepareJssdk();
ZoomMtg.prepareWebSDK();

function beginJoin(signature) {
ZoomMtg.i18n.load(meetingConfig.lang);
ZoomMtg.init({
leaveUrl: meetingConfig.leaveUrl,
webEndpoint: meetingConfig.webEndpoint,
disableCORP: !window.crossOriginIsolated, // default true
// disablePreview: true, // default false
disablePreview: true, // default false
externalLinkPage: "/zoomLink.html",
success: function () {
console.log(meetingConfig);
console.log("signature", signature);
ZoomMtg.i18n.load(meetingConfig.lang);
ZoomMtg.i18n.reload(meetingConfig.lang);

ZoomMtg.join({
meetingNumber: meetingConfig.meetingNumber,
userName: meetingConfig.userName,
Expand Down Expand Up @@ -450,22 +452,22 @@ setTimeout(() => clearInterval(autoJoinInterval), 5000);
},
});

ZoomMtg.inMeetingServiceListener('onUserJoin', function (data) {
console.log('inMeetingServiceListener onUserJoin', data);
ZoomMtg.inMeetingServiceListener("onUserJoin", function (data) {
console.log("inMeetingServiceListener onUserJoin", data);
});
ZoomMtg.inMeetingServiceListener('onUserLeave', function (data) {
console.log('inMeetingServiceListener onUserLeave', data);

ZoomMtg.inMeetingServiceListener("onUserLeave", function (data) {
console.log("inMeetingServiceListener onUserLeave", data);
});
ZoomMtg.inMeetingServiceListener('onUserIsInWaitingRoom', function (data) {
console.log('inMeetingServiceListener onUserIsInWaitingRoom', data);

ZoomMtg.inMeetingServiceListener("onUserIsInWaitingRoom", function (data) {
console.log("inMeetingServiceListener onUserIsInWaitingRoom", data);
});
ZoomMtg.inMeetingServiceListener('onMeetingStatus', function (data) {
console.log('inMeetingServiceListener onMeetingStatus', data);

ZoomMtg.inMeetingServiceListener("onMeetingStatus", function (data) {
console.log("inMeetingServiceListener onMeetingStatus", data);
});
}

beginJoin(meetingConfig.signature);
};
}
7 changes: 4 additions & 3 deletions tools/upgrade-web-zoom.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,13 @@ makeJs = ->
.replace /\bleaveUrl: "[^"]*"/g, (m) ->
changes++
m.replace /"[^"]*"/, '"/zoomDone.html"'
.replace /\bexternalLinkPage: '[^']*'/g, (m) ->
.replace /\bexternalLinkPage: "[^"]*"/g, (m) ->
changes++
m.replace /'[^']*'/, '"/zoomLink.html"'
.replace /\bdisablePreview: false/g, (m) ->
m.replace /"[^"]*"/, '"/zoomLink.html"'
.replace /(\/\/ )?\bdisablePreview: false/g, (m) ->
changes++
m.replace /false/, 'true'
.replace /\/\/ /, ''
.replace /console\.log\("join meeting success"\);\r?\n/, (m) ->
changes++
m + """
Expand Down

0 comments on commit 289592d

Please sign in to comment.