From 289592d1074a4744b6468d6ca23a2413eda53fe7 Mon Sep 17 00:00:00 2001 From: Erik Demaine Date: Fri, 9 Feb 2024 14:27:22 -0500 Subject: [PATCH] Upgrade Zoom web client to v3.1.6 --- CHANGELOG.md | 2 ++ public/zoom.html | 14 +++++------ public/zoom.js | 44 ++++++++++++++++++----------------- tools/upgrade-web-zoom.coffee | 7 +++--- 4 files changed, 35 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2924bc..3a46f37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/public/zoom.html b/public/zoom.html index 5636297..bd278c0 100644 --- a/public/zoom.html +++ b/public/zoom.html @@ -5,20 +5,18 @@ Zoom WebSDK CDN - - - - - - - - + + + + + + diff --git a/public/zoom.js b/public/zoom.js index 9325115..0862842 100644 --- a/public/zoom.js +++ b/public/zoom.js @@ -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(); }); @@ -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, @@ -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); -}; +} diff --git a/tools/upgrade-web-zoom.coffee b/tools/upgrade-web-zoom.coffee index c44de42..bcbd8d5 100644 --- a/tools/upgrade-web-zoom.coffee +++ b/tools/upgrade-web-zoom.coffee @@ -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 + """