25 Commits

Author SHA1 Message Date
e6d6260b1b Build version 4.0.1 2020-12-25 07:13:50 +00:00
adf3fba1b3 Changing icon
- Add icon for upload (HeroIcon)
- Actually call the button with the new icon
2020-12-25 06:47:07 +00:00
eb674f00f0 Added icons style 2020-09-09 20:28:08 +00:00
b1ff2cd677 Build 2020-09-09 20:19:04 +00:00
f680d5f47d Change the button to an icon 2020-09-09 20:17:57 +00:00
4cde0ea657 Build 2020-09-09 19:35:32 +00:00
d836371eaa Trying to add a button with a custom function 2020-09-09 19:34:04 +00:00
Kevin ANATOLE
84fb2fd6f6 Built with format 2020-09-07 22:25:30 +01:00
Kevin ANATOLE
2b12f06640 Added the format prop 2020-09-07 22:20:24 +01:00
Gennady Grishkovtsov
cf7df625ca Merge pull request #33 from yousef-soliman/master
Fix return last record as record not array
2020-04-03 18:06:54 +03:00
Yousef Soliman
a51fa4fdf2 fix return last record as record not array 2020-04-02 12:11:20 +02:00
Gennady Grishkovtsov
94fc582eef Add WAV support 2019-05-03 01:17:56 +03:00
Gennady Grishkovtsov
1f8aad013a Remove context closing from "pause" action & minor improvoments 2019-05-02 23:31:54 +03:00
Gennady Grishkovtsov
22d1b524a4 Merge branch 'master' of github.com:grishkovelli/vue-audio-recorder 2019-05-02 23:09:53 +03:00
Gennady Grishkovtsov
a9a98d2e33 Merge pull request #17 from antoniohof/master
Fix final recording broken by pause button
2019-02-23 10:50:10 +03:00
Gennady Grishkovtsov
e482c3bea7 Merge pull request #17 from antoniohof/master
Fix final recording broken by pause button
2019-02-23 10:49:16 +03:00
Antonio Hofmeister
0c4c0cd091 fix final recording broken by pause button 2019-02-22 17:29:13 -03:00
Gennady Grishkovtsov
77f3460825 Update README.md 2019-02-09 20:14:26 +03:00
Gennady Grishkovtsov
7fdf3f745b Add bitRate & sampleRate 2018-12-31 12:48:07 +03:00
Gennady Grishkovtsov
87f9703529 Add hover effect 2018-12-31 12:47:35 +03:00
Gennady Grishkovtsov
f4bf0c503a Update version to 3.0.1 2018-12-19 01:55:08 +03:00
Gennady Grishkovtsov
4cfac6de85 Update readme 2018-12-19 01:54:47 +03:00
Gennady Grishkovtsov
685a4b76e6 Add devtool 2018-12-19 01:54:01 +03:00
Gennady Grishkovtsov
d8d3d1491e Fix HTTP headers default value 2018-12-19 01:41:36 +03:00
Gennady Grishkovtsov
db90e87dff Update version to 3.0.0
- use MP3 instead of WAV
 - new callbacks & properties
 - refactoring
2018-12-17 00:00:41 +03:00
19 changed files with 392 additions and 220 deletions

View File

@@ -14,6 +14,7 @@
- Records limit - Records limit
- A lot of callbacks - A lot of callbacks
- Individual an audio player - Individual an audio player
- MP3/WAV support
### Tested in (desktop) ### Tested in (desktop)
@@ -29,22 +30,28 @@ npm i vue-audio-recorder --save
## AudioRecorder props ## AudioRecorder props
| Prop | Type | Description | | Prop | Type | Description |
| --------------------- | -------- | --------------------------------------------------------------- | | --------------------- | -------- | ------------------------------------------------------------------------ |
| attempts | Number | Number of recording attempts | | attempts | Number | Number of recording attempts |
| compact | Boolean | Hide the download and upload buttons | | headers | Object | HTTP headers |
| headers | Object | HTTP headers | | time | Number | Time limit for the record (minutes) |
| time | Number | Time limit for the record (minutes) | | bit-rate | Number | Default: 128 (only for MP3) |
| upload-url | String | URL for uploading | | sample-rate | Number | Default: 44100 |
| start-record | Function | Fires after click the record button | | filename | String | Download/Upload filename |
| stop-record | Function | Fires after click the stop button or exceeding the time limit | | format | String | WAV/MP3. Default: mp3 |
| start-upload | Function | Fires after start uploading | | upload-url | String | URL for uploading |
| attempts-limit | Function | Fires after exceeding the attempts | | show-download-button | Boolean | If it is true show a download button. Default: true |
| failed-upload | Function | Fires after a failure uploading | | show-upload-button | Boolean | If it is true show an upload button. Default: true |
| mic-failed | Function | Fires if your microphone doesn't work | | show-custom-button | Boolean | If true show another button linked to specific action. Default: true |
| successful-upload | Function | Fires after a successful uploading | | before-upload | Function | Callback fires before uploading |
| successful-upload-msg | String | Displays the message after a successful uploading | | successful-upload | Function | Callback fires after successful uploading |
| failed-upload-msg | String | Displays the message after a failure uploading | | failed-upload | Function | Callback fires after failure uploading |
| mic-failed | Function | Callback fires if your microphone doesn't work |
| before-recording | Function | Callback fires after click the record button |
| pause-recording | Function | Callback fires after pause recording |
| after-recording | Function | Callback fires after click the stop button or exceeding the time limit |
| select-record | Function | Callback fires after choise a record. Returns the record |
| custom-callback | Function | Callback fires when clicking on the custom button |
## AudioPlayer props ## AudioPlayer props
| Prop | Type | Description | | Prop | Type | Description |
@@ -59,15 +66,25 @@ npm i vue-audio-recorder --save
Vue.use(AudioRecorder) Vue.use(AudioRecorder)
``` ```
```js
methods: {
callback (data) {
console.debug(data)
}
}
```
```html ```html
<audio-recorder <audio-recorder
upload-url="YOUR_API_URL" upload-url="YOUR_API_URL"
:attempts="3" :attempts="3"
:headers="headers"
:time="2" :time="2"
:start-record="callback" :headers="headers"
:stop-record="callback" :before-recording="callback"
:start-upload="callback" :pause-recording="callback"
:after-recording="callback"
:select-record="callback"
:before-upload="callback"
:successful-upload="callback" :successful-upload="callback"
:failed-upload="callback"/> :failed-upload="callback"/>
``` ```
@@ -89,6 +106,11 @@ npm run dev
npm run build npm run build
``` ```
## TODO
- Clear record list
- Responsive design
## Authors ## Authors
[Gennady Grishkovtsov](https://www.linkedin.com/in/grishkovtsov/) - Developer [Gennady Grishkovtsov](https://www.linkedin.com/in/grishkovtsov/) - Developer

View File

@@ -11,14 +11,19 @@
<audio-recorder v-if="showRecorder" <audio-recorder v-if="showRecorder"
upload-url="some url" upload-url="some url"
filename="ninja"
format="wav"
:attempts="3" :attempts="3"
:time="2" :time="2"
:headers="headers" :headers="headers"
:start-record="callback" :before-recording="callback"
:stop-record="callback" :pause-recording="callback"
:start-upload="callback" :after-recording="callback"
:select-record="callback"
:before-upload="callback"
:successful-upload="callback" :successful-upload="callback"
:failed-upload="callback"/> :failed-upload="callback"
:bit-rate="192"/>
<audio-player :src="mp3" v-if="!showRecorder"/> <audio-player :src="mp3" v-if="!showRecorder"/>
</div> </div>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,14 +1,16 @@
{ {
"name": "vue-audio-recorder", "name": "vue-audio-recorder",
"description": "Audio recorder for Vue.js. It allows to create, play, download and store records on a server", "description": "Audio recorder for Vue.js. It allows to create, play, download and store records on a server",
"version": "2.2.0", "version": "4.0.1",
"author": "Gennady Grishkovtsov <grishkovelli@gmail.com>", "author": "Gennady Grishkovtsov <grishkovelli@gmail.com>",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"dev": "webpack-dev-server --env.NODE_ENV=development --mode development --open --hot --https", "dev": "webpack-dev-server --env.NODE_ENV=development --mode development --open --hot --https",
"build": "webpack --env.NODE_ENV=production --mode production --progress --hide-modules" "build": "webpack --env.NODE_ENV=production --mode production --progress --hide-modules"
}, },
"dependencies": {}, "dependencies": {
"lamejs": "^1.2.0"
},
"browserslist": [ "browserslist": [
"> 1%", "> 1%",
"last 2 versions", "last 2 versions",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 44 KiB

View File

@@ -0,0 +1,38 @@
<style lang="scss">
@import '../scss/icons';
</style>
<template>
<icon-button
id="download"
class="ar-icon ar-icon__xs ar-icon--no-border"
name="download"
@click.native="download"/>
</template>
<script>
import IconButton from './icon-button'
export default {
props: {
record : { type: Object },
filename : { type: String }
},
components: {
IconButton
},
methods: {
download () {
if (!this.record.url) {
return
}
const type = this.record.blob.type.split('/')[1]
const link = document.createElement('a')
link.href = this.record.url
link.download = `${this.filename}.${type}`
link.click()
}
}
}
</script>

View File

@@ -10,6 +10,9 @@
data: function () { data: function () {
return { return {
icons: { icons: {
upload: '<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">\n' +
' <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-8l-4-4m0 0L8 8m4-4v12" />\n' +
'</svg>',
download: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M19 12v7H5v-7H3v7c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2v-7h-2zm-6 .67l2.59-2.58L17 11.5l-5 5-5-5 1.41-1.41L11 12.67V3h2z"/><path fill="none" d="M0 0h24v24H0z"/></svg>', download: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M19 12v7H5v-7H3v7c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2v-7h-2zm-6 .67l2.59-2.58L17 11.5l-5 5-5-5 1.41-1.41L11 12.67V3h2z"/><path fill="none" d="M0 0h24v24H0z"/></svg>',
mic: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 14c1.66 0 2.99-1.34 2.99-3L15 5c0-1.66-1.34-3-3-3S9 3.34 9 5v6c0 1.66 1.34 3 3 3zm5.3-3c0 3-2.54 5.1-5.3 5.1S6.7 14 6.7 11H5c0 3.41 2.72 6.23 6 6.72V21h2v-3.28c3.28-.48 6-3.3 6-6.72h-1.7z"/><path d="M0 0h24v24H0z" fill="none"/></svg>', mic: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 14c1.66 0 2.99-1.34 2.99-3L15 5c0-1.66-1.34-3-3-3S9 3.34 9 5v6c0 1.66 1.34 3 3 3zm5.3-3c0 3-2.54 5.1-5.3 5.1S6.7 14 6.7 11H5c0 3.41 2.72 6.23 6 6.72V21h2v-3.28c3.28-.48 6-3.3 6-6.72h-1.7z"/><path d="M0 0h24v24H0z" fill="none"/></svg>',
pause: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"/><path d="M0 0h24v24H0z" fill="none"/></svg>', pause: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z"/><path d="M0 0h24v24H0z" fill="none"/></svg>',

View File

@@ -35,7 +35,7 @@
}, },
methods: { methods: {
onMouseDown (ev) { onMouseDown (ev) {
let seekPos = calculateLineHeadPosition(ev, this.$refs[this.refId]) const seekPos = calculateLineHeadPosition(ev, this.$refs[this.refId])
this.$emit('change-linehead', seekPos) this.$emit('change-linehead', seekPos)
document.addEventListener('mousemove', this.onMouseMove) document.addEventListener('mousemove', this.onMouseMove)
document.addEventListener('mouseup', this.onMouseUp) document.addEventListener('mouseup', this.onMouseUp)
@@ -43,17 +43,17 @@
onMouseUp (ev) { onMouseUp (ev) {
document.removeEventListener('mouseup', this.onMouseUp) document.removeEventListener('mouseup', this.onMouseUp)
document.removeEventListener('mousemove', this.onMouseMove) document.removeEventListener('mousemove', this.onMouseMove)
let seekPos = calculateLineHeadPosition(ev, this.$refs[this.refId]) const seekPos = calculateLineHeadPosition(ev, this.$refs[this.refId])
this.$emit('change-linehead', seekPos) this.$emit('change-linehead', seekPos)
}, },
onMouseMove (ev) { onMouseMove (ev) {
let seekPos = calculateLineHeadPosition(ev, this.$refs[this.refId]) const seekPos = calculateLineHeadPosition(ev, this.$refs[this.refId])
this.$emit('change-linehead', seekPos) this.$emit('change-linehead', seekPos)
} }
}, },
computed: { computed: {
calculateSize () { calculateSize () {
let value = this.percentage < 1 ? this.percentage * 100 : this.percentage const value = this.percentage < 1 ? this.percentage * 100 : this.percentage
return `${this.rowDirection ? 'width' : 'height'}: ${value}%` return `${this.rowDirection ? 'width' : 'height'}: ${value}%`
} }
} }

View File

@@ -1,16 +1,26 @@
<style lang="scss"> <style lang="scss">
.ar-player { .ar-player {
width: 380px; width: 380px;
height: 120px; height: unset;
border: 1px solid #E8E8E8; border: 0;
border-radius: 24px; border-radius: 0;
display: flex; display: flex;
flex-direction: column-reverse; flex-direction: row;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background-color: #FAFAFA; background-color: unset;
font-family: 'Roboto', sans-serif; font-family: 'Roboto', sans-serif;
& > .ar-player-bar {
border: 1px solid #E8E8E8;
border-radius: 24px;
margin: 0 0 0 5px;
& > .ar-player__progress {
width: 125px;
}
}
&-bar { &-bar {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -26,33 +36,6 @@
justify-content: space-around; justify-content: space-around;
} }
&--compact {
height: unset;
flex-direction: row;
border: 0;
border-radius: 0;
background-color: unset;
& > .ar-player-actions {
width: unset;
& > #download,
& > #upload {
display: none;
}
}
& > .ar-player-bar {
border: 1px solid #E8E8E8;
border-radius: 24px;
margin: 0 0 0 5px;
& > .ar-player__progress {
width: 125px;
}
}
}
&__progress { &__progress {
width: 160px; width: 160px;
margin: 0 8px; margin: 0 8px;
@@ -73,6 +56,10 @@
&--active { &--active {
fill: white !important; fill: white !important;
background-color: #05CBCD !important; background-color: #05CBCD !important;
&:hover {
fill: #505050 !important;
}
} }
} }
} }
@@ -81,27 +68,14 @@
</style> </style>
<template> <template>
<div class="ar-player" :class="{'ar-player--compact': compact}"> <div class="ar-player">
<div class="ar-player-actions"> <div class="ar-player-actions">
<icon-button
id="download"
class="ar-icon ar-icon__sm"
name="download"
@click.native="decorator(download)"/>
<icon-button <icon-button
id="play" id="play"
class="ar-icon ar-icon__lg ar-player__play" class="ar-icon ar-icon__lg ar-player__play"
:name="playBtnIcon" :name="playBtnIcon"
:class="{'ar-player__play--active': isPlaying}" :class="{'ar-player__play--active': isPlaying}"
@click.native="decorator(playback)"/> @click.native="playback"/>
<uploader
id="upload"
class="ar-icon ar-icon__sm"
:record="record"
:options="uploaderOptions"/>
</div> </div>
<div class="ar-player-bar"> <div class="ar-player-bar">
@@ -122,16 +96,14 @@
<script> <script>
import IconButton from './icon-button' import IconButton from './icon-button'
import LineControl from './line-control' import LineControl from './line-control'
import Uploader from './uploader'
import VolumeControl from './volume-control' import VolumeControl from './volume-control'
import { convertTimeMMSS } from '@/lib/utils' import { convertTimeMMSS } from '@/lib/utils'
export default { export default {
props: { props: {
src : { type: String }, src : { type: String },
record : { type: Object }, record : { type: Object },
compact : { type: Boolean, default: true }, filename : { type: String }
uploaderOptions : { type: Object, default: () => new Object }
}, },
data () { data () {
return { return {
@@ -144,7 +116,6 @@
components: { components: {
IconButton, IconButton,
LineControl, LineControl,
Uploader,
VolumeControl VolumeControl
}, },
mounted: function() { mounted: function() {
@@ -167,7 +138,7 @@
}, },
computed: { computed: {
audioSource () { audioSource () {
let url = this.src || this.record.url const url = this.src || this.record.url
if (url) { if (url) {
return url return url
} else { } else {
@@ -183,6 +154,10 @@
}, },
methods: { methods: {
playback () { playback () {
if (!this.audioSource) {
return
}
if (this.isPlaying) { if (this.isPlaying) {
this.player.pause() this.player.pause()
} else { } else {
@@ -191,18 +166,6 @@
this.isPlaying = !this.isPlaying this.isPlaying = !this.isPlaying
}, },
download () {
let link = document.createElement('a')
link.href = this.record.url
link.download = 'record.wav'
link.click()
},
decorator (func) {
if (!this.audioSource) {
return
}
func()
},
_resetProgress () { _resetProgress () {
if (this.isPlaying) { if (this.isPlaying) {
this.player.pause() this.player.pause()

View File

@@ -1,4 +1,5 @@
<style lang="scss"> <style lang="scss">
@import '../scss/icons';
.ar { .ar {
width: 420px; width: 420px;
font-family: 'Roboto', sans-serif; font-family: 'Roboto', sans-serif;
@@ -72,7 +73,7 @@
&__records-limit { &__records-limit {
position: absolute; position: absolute;
color: #AEAEAE; color: #AEAEAE;
font-size: 12px; font-size: 13px;
top: 78px; top: 78px;
} }
} }
@@ -160,6 +161,22 @@
top: 0; top: 0;
color: rgb(244, 120, 90); color: rgb(244, 120, 90);
} }
&__downloader,
&__uploader {
position: absolute;
top: 0;
bottom: 0;
margin: auto;
}
&__downloader {
right: 115px;
}
&__uploader {
right: 85px;
}
} }
@import '../scss/icons'; @import '../scss/icons';
@@ -168,7 +185,6 @@
<template> <template>
<div class="ar"> <div class="ar">
<div class="ar__overlay" v-if="isUploading"></div> <div class="ar__overlay" v-if="isUploading"></div>
<div class="ar-spinner" v-if="isUploading"> <div class="ar-spinner" v-if="isUploading">
<div class="ar-spinner__dot"></div> <div class="ar-spinner__dot"></div>
<div class="ar-spinner__dot"></div> <div class="ar-spinner__dot"></div>
@@ -201,89 +217,98 @@
:class="{'ar-records__record--selected': record.id === selected.id}" :class="{'ar-records__record--selected': record.id === selected.id}"
:key="record.id" :key="record.id"
v-for="(record, idx) in recordList" v-for="(record, idx) in recordList"
@click="selected = record"> @click="choiceRecord(record)">
<div <div
class="ar__rm" class="ar__rm"
v-if="record.id === selected.id" v-if="record.id === selected.id"
@click="removeRecord(idx)">&times;</div> @click="removeRecord(idx)">&times;</div>
<div class="ar__text">Record {{idx + 1}}</div> <div class="ar__text">Record {{idx + 1}}</div>
<div class="ar__text">{{record.duration}}</div> <div class="ar__text">{{record.duration}}</div>
<downloader
v-if="record.id === selected.id && showDownloadButton"
class="ar__downloader"
:record="record"
:filename="filename"/>
<uploader
v-if="record.id === selected.id && showUploadButton"
class="ar__uploader"
:record="record"
:filename="filename"
:headers="headers"
:upload-url="uploadUrl"/>
<icon-button name="upload" class="ar__uploader ar-icon ar-icon__xs" v-if="showCustomButton" @click.native="customAction(record)" />
</div> </div>
</div> </div>
<audio-player :compact="compact" :record="selected" :uploader-options="uploaderOptions"/> <audio-player :record="selected"/>
<div :class="uploadStatusClasses" v-if="uploadStatus">{{message}}</div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import AudioPlayer from './player' import AudioPlayer from './player'
import Downloader from './downloader'
import IconButton from './icon-button' import IconButton from './icon-button'
import Recorder from '@/lib/recorder' import Recorder from '@/lib/recorder'
import Uploader from './uploader'
import UploaderPropsMixin from '@/mixins/uploader-props'
import { convertTimeMMSS } from '@/lib/utils' import { convertTimeMMSS } from '@/lib/utils'
export default { export default {
mixins: [UploaderPropsMixin],
props: { props: {
attempts : { type: Number }, attempts : { type: Number },
compact : { type: Boolean, default: false }, time : { type: Number },
time : { type: Number },
attemptsLimit : { type: Function }, bitRate : { type: Number, default: 128 },
micFailed : { type: Function }, sampleRate : { type: Number, default: 44100 },
startRecord : { type: Function },
stopRecord : { type: Function },
showDownloadButton : { type: Boolean, default: true },
showUploadButton : { type: Boolean, default: true },
showCustomButton : {type: Boolean, default: false},
micFailed : { type: Function },
beforeRecording : { type: Function },
pauseRecording : { type: Function },
afterRecording : { type: Function },
failedUpload : { type: Function }, failedUpload : { type: Function },
headers : { type: Object }, beforeUpload : { type: Function },
startUpload : { type: Function },
successfulUpload : { type: Function }, successfulUpload : { type: Function },
uploadUrl : { type: String }, selectRecord : { type: Function },
customCallback : { type: Function },
successfulUploadMsg : { type: String, default: 'Upload successful' }, format : { type: String }
failedUploadMsg : { type: String, default: 'Upload fail' }
}, },
data () { data () {
return { return {
isUploading : false, isUploading : false,
recorder : new Recorder({ recorder : this._initRecorder(),
afterStop: () => { recordList : [],
this.recordList = this.recorder.recordList() selected : {},
if (this.stopRecord) { uploadStatus : null,
this.stopRecord('stop record')
}
},
attempts: this.attempts,
time: this.time
}),
recordList : [],
selected : {},
uploadStatus : null,
uploaderOptions : {}
} }
}, },
components: { components: {
AudioPlayer, AudioPlayer,
IconButton Downloader,
IconButton,
Uploader
}, },
created () { mounted () {
this.uploaderOptions = {
failedUpload : this.failedUpload,
headers : this.headers,
startUpload : this.startUpload,
successfulUpload : this.successfulUpload,
uploadUrl : this.uploadUrl
}
this.$eventBus.$on('start-upload', () => { this.$eventBus.$on('start-upload', () => {
this.isUploading = true this.isUploading = true
this.beforeUpload && this.beforeUpload('before upload')
}) })
this.$eventBus.$on('end-upload', (resp) => { this.$eventBus.$on('end-upload', (msg) => {
this.isUploading = false this.isUploading = false
this.uploadStatus = status
setTimeout(() => {this.uploadStatus = null}, 1500) if (msg.status === 'success') {
this.successfulUpload && this.successfulUpload(msg.response)
} else {
this.failedUpload && this.failedUpload(msg.response)
}
}) })
}, },
beforeDestroy () { beforeDestroy () {
@@ -297,14 +322,8 @@
if (!this.isRecording || (this.isRecording && this.isPause)) { if (!this.isRecording || (this.isRecording && this.isPause)) {
this.recorder.start() this.recorder.start()
if (this.startRecord) {
this.startRecord('start record')
}
} else { } else {
this.recorder.pause() this.recorder.pause()
if (this.startRecord) {
this.startRecord('pause record')
}
} }
}, },
stopRecorder () { stopRecorder () {
@@ -313,16 +332,42 @@
} }
this.recorder.stop() this.recorder.stop()
this.recordList = this.recorder.recordList()
}, },
removeRecord (idx) { removeRecord (idx) {
this.recordList.splice(idx, 1) this.recordList.splice(idx, 1)
this.$set(this.selected, 'url', null) this.$set(this.selected, 'url', null)
this.$eventBus.$emit('remove-record') this.$eventBus.$emit('remove-record')
},
choiceRecord (record) {
if (this.selected === record) {
return
}
this.selected = record
this.selectRecord && this.selectRecord(record)
},
_initRecorder () {
return new Recorder({
beforeRecording : this.beforeRecording,
afterRecording : this.afterRecording,
pauseRecording : this.pauseRecording,
micFailed : this.micFailed,
bitRate : this.bitRate,
sampleRate : this.sampleRate,
format : this.format
})
},
customAction(record) {
if (this.customCallback) {
this.customCallback(record)
} else {
console.log(record)
}
} }
}, },
computed: { computed: {
attemptsLeft () { attemptsLeft () {
return this.attempts - this.recorder.records.length return this.attempts - this.recordList.length
}, },
iconButtonType () { iconButtonType () {
return this.isRecording && this.isPause ? 'mic' : this.isRecording ? 'pause' : 'mic' return this.isRecording && this.isPause ? 'mic' : this.isRecording ? 'pause' : 'mic'
@@ -333,20 +378,12 @@
isRecording () { isRecording () {
return this.recorder.isRecording return this.recorder.isRecording
}, },
message () {
return this.uploadStatus === 'success' ? this.successfulUploadMsg : this.failedUploadMsg
},
recordedTime () { recordedTime () {
if (this.time && this.recorder.duration >= this.time * 60) { if (this.time && this.recorder.duration >= this.time * 60) {
this.stopRecorder() this.stopRecorder()
} }
return convertTimeMMSS(this.recorder.duration) return convertTimeMMSS(this.recorder.duration)
}, },
uploadStatusClasses () {
let classes = ['ar__upload-status']
classes.push(this.uploadStatus === 'success' ? 'ar__upload-status--success' : 'ar__upload-status--fail')
return classes.join(' ')
},
volume () { volume () {
return parseFloat(this.recorder.volume) return parseFloat(this.recorder.volume)
} }

View File

@@ -3,16 +3,17 @@
</style> </style>
<template> <template>
<icon-button name="save" @click.native="upload"/> <icon-button name="save" class="ar-icon ar-icon__xs ar-icon--no-border" @click.native="upload"/>
</template> </template>
<script> <script>
import IconButton from './icon-button' import IconButton from './icon-button'
import UploaderPropsMixin from '@/mixins/uploader-props'
export default { export default {
mixins: [UploaderPropsMixin],
props: { props: {
options : { type: Object }, record: { type: Object }
record : { type: Object }
}, },
components: { components: {
IconButton IconButton
@@ -25,28 +26,16 @@
this.$eventBus.$emit('start-upload') this.$eventBus.$emit('start-upload')
if (this.options.startUpload) { const data = new FormData()
this.options.startUpload() data.append('audio', this.record.blob, `${this.filename}.mp3`)
}
let data = new FormData() const headers = Object.assign(this.headers, {})
data.append('audio', this.record.blob, 'my-record')
let headers = Object.assign(this.options.headers, {})
headers['Content-Type'] = `multipart/form-data; boundary=${data._boundary}` headers['Content-Type'] = `multipart/form-data; boundary=${data._boundary}`
this.$http.post(this.options.uploadUrl, data, { headers: headers }).then(resp => { this.$http.post(this.uploadUrl, data, { headers: headers }).then(resp => {
this.$eventBus.$emit('end-upload', 'success') this.$eventBus.$emit('end-upload', { status: 'success', response: resp })
if (this.options.successfulUpload) {
this.options.successfulUpload(resp)
}
}).catch(error => { }).catch(error => {
this.$eventBus.$emit('end-upload', 'fail') this.$eventBus.$emit('end-upload', { status: 'fail', response: error })
if (this.options.failedUpload) {
this.options.failedUpload(error)
}
}) })
} }
} }

49
src/lib/mp3-encoder.js Normal file
View File

@@ -0,0 +1,49 @@
import { Mp3Encoder } from 'lamejs'
export default class {
constructor(config) {
this.bitRate = config.bitRate
this.sampleRate = config.sampleRate
this.dataBuffer = []
this.encoder = new Mp3Encoder(1, this.sampleRate, this.bitRate)
}
encode(arrayBuffer) {
const maxSamples = 1152
const samples = this._convertBuffer(arrayBuffer)
let remaining = samples.length
for (let i = 0; remaining >= 0; i += maxSamples) {
const left = samples.subarray(i, i + maxSamples)
const buffer = this.encoder.encodeBuffer(left)
this.dataBuffer.push(new Int8Array(buffer))
remaining -= maxSamples
}
}
finish() {
this.dataBuffer.push(this.encoder.flush())
const blob = new Blob(this.dataBuffer, { type: 'audio/mp3' })
this.dataBuffer = []
return {
id : Date.now(),
blob : blob,
url : URL.createObjectURL(blob)
}
}
_floatTo16BitPCM(input, output) {
for (let i = 0; i < input.length; i++) {
const s = Math.max(-1, Math.min(1, input[i]))
output[i] = (s < 0 ? s * 0x8000 : s * 0x7FFF)
}
}
_convertBuffer(arrayBuffer) {
const data = new Float32Array(arrayBuffer)
const out = new Int16Array(arrayBuffer.length)
this._floatTo16BitPCM(data, out)
return out
}
}

View File

@@ -1,30 +1,56 @@
import Mp3Encoder from './mp3-encoder'
import WavEncoder from './wav-encoder' import WavEncoder from './wav-encoder'
import { convertTimeMMSS } from './utils' import { convertTimeMMSS } from './utils'
export default class { export default class {
constructor (options = {}) { constructor (options = {}) {
this.afterStop = options.afterStop this.beforeRecording = options.beforeRecording
this.micFailed = options.micFailed this.pauseRecording = options.pauseRecording
this.afterRecording = options.afterRecording
this.micFailed = options.micFailed
this.format = options.format
this.encoderOptions = {
bitRate : options.bitRate,
sampleRate : options.sampleRate
}
this.bufferSize = 4096 this.bufferSize = 4096
this.records = [] this.records = []
this.samples = []
this.isPause = false this.isPause = false
this.isRecording = false this.isRecording = false
this.duration = 0 this.duration = 0
this.volume = 0 this.volume = 0
this.wavSamples = []
this._duration = 0 this._duration = 0
} }
start () { start () {
navigator.mediaDevices.getUserMedia({audio: true}) const constraints = {
.then(this._micCaptured.bind(this)) video: false,
.catch(this._micError.bind(this)) audio: {
channelCount: 1,
echoCancellation: false
}
}
this.beforeRecording && this.beforeRecording('start recording')
navigator.mediaDevices
.getUserMedia(constraints)
.then(this._micCaptured.bind(this))
.catch(this._micError.bind(this))
this.isPause = false this.isPause = false
this.isRecording = true this.isRecording = true
if (this._isMp3() && !this.lameEncoder) {
this.lameEncoder = new Mp3Encoder(this.encoderOptions)
}
} }
stop () { stop () {
@@ -33,23 +59,22 @@ export default class {
this.processor.disconnect() this.processor.disconnect()
this.context.close() this.context.close()
let encoder = new WavEncoder({ let record = null
bufferSize : this.bufferSize,
sampleRate : this.context.sampleRate,
samples : this.samples
})
let audioBlob = encoder.getData() if (this._isMp3()) {
let audioUrl = URL.createObjectURL(audioBlob) record = this.lameEncoder.finish()
} else {
let wavEncoder = new WavEncoder({
bufferSize : this.bufferSize,
sampleRate : this.encoderOptions.sampleRate,
samples : this.wavSamples
})
record = wavEncoder.finish()
this.wavSamples = []
}
this.samples = [] record.duration = convertTimeMMSS(this.duration)
this.records.push(record)
this.records.push({
id : Date.now(),
blob : audioBlob,
duration : convertTimeMMSS(this.duration),
url : audioUrl
})
this._duration = 0 this._duration = 0
this.duration = 0 this.duration = 0
@@ -57,19 +82,18 @@ export default class {
this.isPause = false this.isPause = false
this.isRecording = false this.isRecording = false
if (this.afterStop) { this.afterRecording && this.afterRecording(record)
this.afterStop()
}
} }
pause () { pause () {
this.stream.getTracks().forEach((track) => track.stop()) this.stream.getTracks().forEach((track) => track.stop())
this.input.disconnect() this.input.disconnect()
this.processor.disconnect() this.processor.disconnect()
this.context.close()
this._duration = this.duration this._duration = this.duration
this.isPause = true this.isPause = true
this.pauseRecording && this.pauseRecording('pause recording')
} }
recordList () { recordList () {
@@ -77,7 +101,7 @@ export default class {
} }
lastRecord () { lastRecord () {
return this.records.slice(-1) return this.records.slice(-1).pop()
} }
_micCaptured (stream) { _micCaptured (stream) {
@@ -88,8 +112,14 @@ export default class {
this.stream = stream this.stream = stream
this.processor.onaudioprocess = (ev) => { this.processor.onaudioprocess = (ev) => {
let sample = ev.inputBuffer.getChannelData(0) const sample = ev.inputBuffer.getChannelData(0)
let sum = 0.0 let sum = 0.0
if (this._isMp3()) {
this.lameEncoder.encode(sample)
} else {
this.wavSamples.push(new Float32Array(sample))
}
for (let i = 0; i < sample.length; ++i) { for (let i = 0; i < sample.length; ++i) {
sum += sample[i] * sample[i] sum += sample[i] * sample[i]
@@ -97,7 +127,6 @@ export default class {
this.duration = parseFloat(this._duration) + parseFloat(this.context.currentTime.toFixed(2)) this.duration = parseFloat(this._duration) + parseFloat(this.context.currentTime.toFixed(2))
this.volume = Math.sqrt(sum / sample.length).toFixed(2) this.volume = Math.sqrt(sum / sample.length).toFixed(2)
this.samples.push(new Float32Array(sample))
} }
this.input.connect(this.processor) this.input.connect(this.processor)
@@ -105,8 +134,10 @@ export default class {
} }
_micError (error) { _micError (error) {
if (this.micFailed) { this.micFailed && this.micFailed(error)
this.micFailed(error) }
}
_isMp3 () {
return this.format.toLowerCase() === 'mp3'
} }
} }

View File

@@ -1,6 +1,6 @@
export function calculateLineHeadPosition (ev, element) { export function calculateLineHeadPosition (ev, element) {
let progressWidth = element.getBoundingClientRect().width const progressWidth = element.getBoundingClientRect().width
let leftPosition = ev.target.getBoundingClientRect().left const leftPosition = ev.target.getBoundingClientRect().left
let pos = (ev.clientX - leftPosition) / progressWidth let pos = (ev.clientX - leftPosition) / progressWidth
try { try {

View File

@@ -5,7 +5,7 @@ export default class {
this.samples = options.samples this.samples = options.samples
} }
getData () { finish () {
this._joinSamples() this._joinSamples()
let buffer = new ArrayBuffer(44 + this.samples.length * 2) let buffer = new ArrayBuffer(44 + this.samples.length * 2)
@@ -27,7 +27,13 @@ export default class {
this._floatTo16BitPCM(view, 44, this.samples) this._floatTo16BitPCM(view, 44, this.samples)
return new Blob([view], {type: 'audio/wav'}) const blob = new Blob([view], {type: 'audio/wav'})
return {
id : Date.now(),
blob : blob,
url : URL.createObjectURL(blob)
}
} }
_floatTo16BitPCM (output, offset, input) { _floatTo16BitPCM (output, offset, input) {

View File

@@ -0,0 +1,8 @@
export default {
props: {
filename : { type: String, default: 'record' },
format : { type: String, default: 'mp3' },
headers : { type: Object, default: () => ({}) },
uploadUrl : { type: String }
}
}

View File

@@ -7,6 +7,16 @@
cursor: pointer; cursor: pointer;
transition: .2s; transition: .2s;
&:hover {
fill: #505050;
}
&--no-border {
border: 0;
border-radius: 0;
padding: 0;
}
&--rec { &--rec {
fill: white; fill: white;
background-color: #FF6B64; background-color: #FF6B64;
@@ -15,7 +25,6 @@
&--pulse { &--pulse {
animation: ripple .5s linear infinite; animation: ripple .5s linear infinite;
@keyframes ripple { @keyframes ripple {
0% { 0% {
box-shadow: box-shadow:
@@ -32,14 +41,22 @@
} }
} }
&__xs {
width: 18px;
height: 18px;
line-height: 18px;
}
&__sm { &__sm {
width: 30px; width: 30px;
height: 30px; height: 30px;
line-height: 30px;
} }
&__lg { &__lg {
width: 45px; width: 45px;
height: 45px; height: 45px;
line-height: 45px;
box-shadow: 0 2px 5px 1px rgba(158,158,158,0.5); box-shadow: 0 2px 5px 1px rgba(158,158,158,0.5);
} }
} }

View File

@@ -3,6 +3,7 @@ const webpack = require('webpack')
const UglifyJsPlugin = require('uglifyjs-webpack-plugin') const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
module.exports = { module.exports = {
devtool: '#source-map',
entry: { entry: {
main: './src/index.js' main: './src/index.js'
}, },