Support send/receive of videos

Naive approach, just downloading the whole chunk every time! Need to figure out caching and streaming for long-play stuff.
This commit is contained in:
N-Pex 2021-03-17 12:13:53 +01:00
parent 4c1de61ff4
commit cd29f8d681
7 changed files with 131 additions and 7 deletions

View file

@ -1,6 +1,6 @@
{ {
"name": "keanuapp-weblite", "name": "keanuapp-weblite",
"version": "0.1.3", "version": "0.1.4",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",

View file

@ -260,12 +260,16 @@ $admin-fg: white;
width: fit-content; width: fit-content;
max-width: 70%; max-width: 70%;
} }
.video2-bubble {
background-color: #e5e5e5;
border-radius: 10px 10px 0 10px;
}
.bubble.image-bubble { .bubble.image-bubble {
padding: 0px; padding: 0px;
display: inline-block; display: inline-block;
width: 70%; width: 70%;
max-width: 70%; max-width: 70%;
.v-image { .v-image, video {
border-radius: 10px 10px 0 10px; border-radius: 10px 10px 0 10px;
} }
} }
@ -428,6 +432,21 @@ $admin-fg: white;
} }
} }
.download-overlay {
position: absolute;
left: 0;
top: 0;
width:100%;
height:100%;
background-color: rgba(0,0,0,0.4);
align-items: center;
display: flex;
.download-text {
width: 100%;
color: white;
}
}
.room-name { .room-name {
font-family: 'Poppins', sans-serif; font-family: 'Poppins', sans-serif;
font-weight: 700; font-weight: 700;

View file

@ -302,9 +302,11 @@ import { TimelineWindow, EventTimeline } from "matrix-js-sdk";
import MessageIncomingText from "./messages/MessageIncomingText"; import MessageIncomingText from "./messages/MessageIncomingText";
import MessageIncomingImage from "./messages/MessageIncomingImage.vue"; import MessageIncomingImage from "./messages/MessageIncomingImage.vue";
import MessageIncomingAudio from "./messages/MessageIncomingAudio.vue"; import MessageIncomingAudio from "./messages/MessageIncomingAudio.vue";
import MessageIncomingVideo from "./messages/MessageIncomingVideo.vue";
import MessageOutgoingText from "./messages/MessageOutgoingText"; import MessageOutgoingText from "./messages/MessageOutgoingText";
import MessageOutgoingImage from "./messages/MessageOutgoingImage.vue"; import MessageOutgoingImage from "./messages/MessageOutgoingImage.vue";
import MessageOutgoingAudio from "./messages/MessageOutgoingAudio.vue"; import MessageOutgoingAudio from "./messages/MessageOutgoingAudio.vue";
import MessageOutgoingVideo from "./messages/MessageOutgoingVideo.vue";
import ContactJoin from "./messages/ContactJoin.vue"; import ContactJoin from "./messages/ContactJoin.vue";
import ContactLeave from "./messages/ContactLeave.vue"; import ContactLeave from "./messages/ContactLeave.vue";
import ContactInvited from "./messages/ContactInvited.vue"; import ContactInvited from "./messages/ContactInvited.vue";
@ -357,9 +359,11 @@ export default {
MessageIncomingText, MessageIncomingText,
MessageIncomingImage, MessageIncomingImage,
MessageIncomingAudio, MessageIncomingAudio,
MessageIncomingVideo,
MessageOutgoingText, MessageOutgoingText,
MessageOutgoingImage, MessageOutgoingImage,
MessageOutgoingAudio, MessageOutgoingAudio,
MessageOutgoingVideo,
ContactJoin, ContactJoin,
ContactLeave, ContactLeave,
ContactInvited, ContactInvited,
@ -728,6 +732,8 @@ export default {
return MessageIncomingImage; return MessageIncomingImage;
} else if (event.getContent().msgtype == "m.audio") { } else if (event.getContent().msgtype == "m.audio") {
return MessageIncomingAudio; return MessageIncomingAudio;
} else if (event.getContent().msgtype == "m.video") {
return MessageIncomingVideo;
} }
return MessageIncomingText; return MessageIncomingText;
} else { } else {
@ -735,6 +741,8 @@ export default {
return MessageOutgoingImage; return MessageOutgoingImage;
} else if (event.getContent().msgtype == "m.audio") { } else if (event.getContent().msgtype == "m.audio") {
return MessageOutgoingAudio; return MessageOutgoingAudio;
} else if (event.getContent().msgtype == "m.video") {
return MessageOutgoingVideo;
} }
return MessageOutgoingText; return MessageOutgoingText;
} }

View file

@ -0,0 +1,43 @@
<template>
<div :class="messageClasses">
<v-avatar class="avatar" size="32" color="#ededed">
<img v-if="messageEventAvatar(event)" :src="messageEventAvatar(event)" />
<span v-else class="white--text headline">{{
messageEventDisplayName(event).substring(0, 1).toUpperCase()
}}</span>
</v-avatar>
<div class="bubble image-bubble">
<v-responsive :aspect-ratio="16 / 9" :src="src">
<video :src="src" controls style="width:100%;height:100%">Video file</video>
<div v-if="downloadProgress" class="download-overlay">
<div class="text-center download-text">{{ downloadProgress }}% downloaded</div>
</div>
</v-responsive>
<QuickReactions :event="event" :reactions="reactions" />
</div>
<div class="op-button" ref="opbutton">
<v-btn icon @click.stop="showContextMenu($refs.opbutton)"
><v-icon>more_vert</v-icon></v-btn
>
</div>
<div v-if="showSenderAndTime" class="senderAndTime">
<div class="sender">{{ messageEventDisplayName(event) }}</div>
<div class="time">
{{ formatTime(event.event.origin_server_ts) }}
</div>
</div>
</div>
</template>
<script>
import messageMixin from "./messageMixin";
import attachmentMixin from "./attachmentMixin";
export default {
mixins: [messageMixin, attachmentMixin],
};
</script>
<style lang="scss">
@import "@/assets/css/chat.scss";
</style>

View file

@ -0,0 +1,39 @@
<template>
<div class="messageOut">
<div class="op-button" ref="opbutton">
<v-btn icon @click.stop="showContextMenu($refs.opbutton)"
><v-icon>more_vert</v-icon></v-btn
>
</div>
<div class="bubble image-bubble">
<v-responsive :aspect-ratio="16 / 9" class="ma-0 pa-0">
<video :src="src" controls style="width:100%;height:100%">Video file</video>
</v-responsive>
<QuickReactions :event="event" :reactions="reactions" />
</div>
<v-avatar class="avatar" size="32" color="#ededed" @click.stop="ownAvatarClicked">
<img v-if="userAvatar" :src="userAvatar" />
<span v-else class="white--text headline">{{ userAvatarLetter }}</span>
</v-avatar>
<div class="senderAndTime">
<!-- <div class="sender">{{ "You" }}</div> -->
<div class="time">
{{ formatTime(event.event.origin_server_ts) }}
</div>
<div class="status">{{ event.status }}</div>
</div>
</div>
</template>
<script>
import messageMixin from "./messageMixin";
import attachmentMixin from "./attachmentMixin";
export default {
mixins: [messageMixin, attachmentMixin],
};
</script>
<style lang="scss">
@import "@/assets/css/chat.scss";
</style>

View file

@ -3,13 +3,17 @@ import util from "../../plugins/utils";
export default { export default {
data() { data() {
return { return {
src: null src: null,
downloadProgress: null
} }
}, },
mounted() { mounted() {
console.log("Mounted with event:", JSON.stringify(this.event.getContent())) console.log("Mounted with event:", JSON.stringify(this.event.getContent()))
util util
.getAttachment(this.$matrix.matrixClient, this.event) .getAttachment(this.$matrix.matrixClient, this.event, (progress) => {
this.downloadProgress = progress;
console.log("Progress: " + progress);
})
.then((url) => { .then((url) => {
this.src = url; this.src = url;
}) })

View file

@ -12,7 +12,7 @@ var duration = require('dayjs/plugin/duration')
dayjs.extend(duration); dayjs.extend(duration);
class Util { class Util {
getAttachment(matrixClient, event) { getAttachment(matrixClient, event, progressCallback) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const content = event.getContent(); const content = event.getContent();
if (content.url != null) { if (content.url != null) {
@ -31,7 +31,13 @@ class Util {
reject("No url found!"); reject("No url found!");
} }
axios.get(url, { responseType: 'arraybuffer' }) axios.get(url, { responseType: 'arraybuffer', onDownloadProgress: progressEvent => {
let percentCompleted = Math.floor((progressEvent.loaded * 100) / progressEvent.total);
if (progressCallback) {
progressCallback(percentCompleted);
}
}
})
.then(response => { .then(response => {
return this.decryptIfNeeded(file, response); return this.decryptIfNeeded(file, response);
}) })
@ -41,7 +47,12 @@ class Util {
.catch(err => { .catch(err => {
console.log("Download error: ", err); console.log("Download error: ", err);
reject(err); reject(err);
}); })
.finally(() => {
if (progressCallback) {
progressCallback(null);
}
});
}); });
} }