BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7472 from capilkey/force-http-server-slides

Browse Source 
Add option to force server to use HTTP slide URIs
This commit is contained in:
Fred Dixon 2019-05-20 18:13:18 -04:00 committed by GitHub
commit 0740e83fdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bigbluebutton-html5/imports/api/slides/server/modifiers/addSlide.js Normal file → Executable file
View File

@ -8,6 +8,8 @@ import Logger from '/imports/startup/server/logger';
import { SVG, PNG } from '/imports/utils/mimeTypes';
import calculateSlideData from '/imports/api/slides/server/helpers';
const loadSlidesFromHttpAlways = Meteor.settings.private.app.loadSlidesFromHttpAlways || false;
const requestWhiteboardHistory = (meetingId, slideId) => {
const REDIS_CONFIG = Meteor.settings.private.redis;
const CHANNEL = REDIS_CONFIG.channels.toAkkaApps;
@ -23,22 +25,21 @@ const requestWhiteboardHistory = (meetingId, slideId) => {
const SUPPORTED_TYPES = [SVG, PNG];
const fetchImageSizes = imageUri =>
probe(imageUri)
.then((result) => {
if (!SUPPORTED_TYPES.includes(result.mime)) {
throw new Meteor.Error('invalid-image-type', `received ${result.mime} expecting ${SUPPORTED_TYPES.join()}`);
}
const fetchImageSizes = imageUri => probe(imageUri)
.then((result) => {
if (!SUPPORTED_TYPES.includes(result.mime)) {
throw new Meteor.Error('invalid-image-type', `received ${result.mime} expecting ${SUPPORTED_TYPES.join()}`);
}
return {
width: result.width,
height: result.height,
};
})
.catch((reason) => {
Logger.error(`Error parsing image size. ${reason}. uri=${imageUri}`);
return reason;
});
return {
width: result.width,
height: result.height,
};
})
.catch((reason) => {
Logger.error(`Error parsing image size. ${reason}. uri=${imageUri}`);
return reason;
});
export default function addSlide(meetingId, podId, presentationId, slide) {
check(podId, String);
@ -93,7 +94,9 @@ export default function addSlide(meetingId, podId, presentationId, slide) {
return Logger.info(`Upserted slide id=${slide.id} pod=${podId} presentation=${presentationId}`);
};
return fetchImageSizes(imageUri)
const imageSizeUri = (loadSlidesFromHttpAlways ? imageUri.replace(/^https/i, 'http') : imageUri);
return fetchImageSizes(imageSizeUri)
.then(({ width, height }) => {
// there is a rare case when for a very long not-active meeting
// the presentation files just disappear
@ -120,6 +123,5 @@ export default function addSlide(meetingId, podId, presentationId, slide) {
return Slides.upsert(selector, modifier, cb);
})
.catch(reason =>
Logger.error(`Error parsing image size. ${reason}. slide=${slide.id} uri=${imageUri}`));
.catch(reason => Logger.error(`Error parsing image size. ${reason}. slide=${slide.id} uri=${imageUri}`));
}

1
bigbluebutton-html5/private/config/settings.yml
View File

@ -304,6 +304,7 @@ private:
app:
captionsChunkLength: 1000
pencilChunkLength: 100
loadSlidesFromHttpAlways: false
etherpad:
apikey: ETHERPAD_APIKEY
version: 1.2.13