Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Yoann HOUPERT
hublot
Commits
37327664
Commit
37327664
authored
Jun 13, 2017
by
Tom JORQUERA
Browse files
Merge branch 'issue-15' into 'master'
implement reco behavior Closes #15 See merge request !21
parents
0b37d60f
ed9d275d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
66 additions
and
1 deletion
+66
-1
client/controller/controller.js
client/controller/controller.js
+10
-0
client/robot/robot.js
client/robot/robot.js
+51
-1
client/robot/robot.test.js
client/robot/robot.test.js
+4
-0
config.json
config.json
+1
-0
No files found.
client/controller/controller.js
View file @
37327664
...
...
@@ -39,6 +39,16 @@ robotController = {
return
res
;
},
sendMessage
:
(
author
,
authorAvatar
,
message
)
=>
{
robotController
.
chatService
.
sendMessage
({
author
,
authorAvatar
,
message
,
displayName
:
author
,
published
:
new
Date
()
});
},
onAttendeePush
:
()
=>
{},
onAttendeeRemove
:
()
=>
{},
onAttendeeUpdate
:
()
=>
{}
...
...
client/robot/robot.js
View file @
37327664
...
...
@@ -5,6 +5,7 @@
/* global robot:true robotController robotLib MediaRecorder */
/* exported robot */
const
room
=
arguments
[
0
];
const
config
=
arguments
[
1
];
robotController
.
external
.
load
(
config
);
...
...
@@ -19,14 +20,63 @@ robot = {
mediaRecorder
.
start
(
interval
);
return
mediaRecorder
;
},
processReco
(
reco
)
{
reco
=
JSON
.
parse
(
reco
);
let
formattedReco
=
''
;
if
(
reco
.
keywords
&&
reco
.
keywords
.
length
>
0
)
{
formattedReco
+=
'
<h5>Mots-Clés</h5>
'
;
for
(
let
i
=
0
;
i
<
reco
.
keywords
.
length
;
i
++
)
{
formattedReco
+=
reco
.
keywords
[
i
].
key
+
'
,
'
;
}
// Remove last ', '
formattedReco
=
formattedReco
.
substring
(
0
,
formattedReco
.
length
-
2
);
}
if
(
reco
.
wikiarticles
&&
reco
.
wikiarticles
.
length
>
0
)
{
formattedReco
+=
'
<h5>Wikipedia</h5>
'
;
for
(
let
i
=
0
;
i
<
reco
.
wikiarticles
.
length
&&
i
<
5
;
i
++
)
{
formattedReco
+=
'
<p><a href="
'
+
encodeURI
(
reco
.
wikiarticles
[
i
].
link
)
+
'
" target="_blank">
'
+
reco
.
wikiarticles
[
i
].
title
+
'
</a>
'
;
}
}
if
(
reco
.
soArticles
&&
reco
.
soArticles
.
length
>
0
)
{
formattedReco
+=
'
<h5>StackOverflow</h5>
'
;
for
(
let
i
=
0
;
i
<
reco
.
soArticles
.
length
&&
i
<
5
;
i
++
)
{
formattedReco
+=
'
<p><a href="
'
+
encodeURI
(
reco
.
soArticles
[
i
].
link
)
+
'
" target="_blank">
'
+
reco
.
soArticles
[
i
].
title
+
'
</a>
'
;
}
}
console
.
log
(
formattedReco
);
if
(
formattedReco
!==
''
)
{
robotController
.
sendMessage
(
config
.
name
,
config
.
avatar
,
formattedReco
);
}
},
start
:
()
=>
{
robotLib
.
stt
=
robotLib
.
stt
(
config
);
robotLib
.
reco
=
robotLib
.
reco
(
config
);
robotLib
.
archive
=
robotLib
.
archive
(
config
);
robotController
.
onAttendeePush
=
(
e
,
data
)
=>
{
const
stream
=
robotController
.
getRemoteStream
(
data
.
easyrtcid
);
const
ws
=
robotLib
.
stt
.
getTranscriptSocket
(
e
=>
console
.
log
(
'
>
'
+
e
.
text
));
const
ws
=
robotLib
.
stt
.
getTranscriptSocket
(
e
=>
{
console
.
log
(
'
>
'
+
e
.
text
);
robotLib
.
reco
.
send
(
{
from
:
room
,
text
:
e
.
from
+
'
\t
'
+
e
.
until
+
'
\t
'
+
data
.
easyrtcid
+
'
\t
'
+
e
.
text
});
});
robot
.
processAudio
(
stream
,
e
=>
ws
.
send
(
e
.
data
),
100
);
};
robotLib
.
reco
.
start
(
room
);
setInterval
(
()
=>
robotLib
.
reco
.
getOnlineReco
(
room
)
.
then
(
robot
.
processReco
)
.
catch
(
console
.
error
),
8000
);
}
};
client/robot/robot.test.js
View file @
37327664
...
...
@@ -33,6 +33,10 @@ describe('client/robot', () => {
}
})
}),
reco
:
()
=>
({
start
:
()
=>
{},
getOnlineReco
:
()
=>
new
Promise
(()
=>
{},
()
=>
{})
}),
archive
:
()
=>
({})
};
...
...
config.json
View file @
37327664
...
...
@@ -20,6 +20,7 @@
},
"client"
:
{
"name"
:
"hublot"
,
"avatar"
:
"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEoAAABECAYAAAAm2qMBAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH4QYNDTU7dwT3OwAABUtJREFUeNrtnF1oHFUUx38zjUlabWKtELU3WLQPFrSOgopaRawmIZdqLVTtQ1R8sVqsH9SvQptKBaWF6oMiLYhUKiLYtMVOGqu0Kgnq260txQejEIZU0BRrqsaQZH2YO3Hczu7Ofszs1/xhyWaZPXvnN+fOPffcc8cgBlm2g5LCe38xcBtgAdcAi4HLgUuAi4BG/bVJ4BxwBhgFfgZ+ABQwpKQYT7cdpYyY4KwCHgDuB1pL9BNjwEFgv5LiUNTQogTVCTwF3Ec86gPeVlIciwKaEQGgp4HtQDPl0TiwUUmxu5TAjBJ2r2eAt6gcpYAnlRS7LNsBKAqYUSwky3Y6gAPAXCpTfwArlRRfF+NdRhGA5gH7gC6qQ33AWj2a5g3MKBDSzcB32r2NKgGV0q8blBTf5/tlswBImzQkqgiS11YTOG7ZznrvnErqUT5I+4DV1IY+UFI8Gva+ZeQBaUhH1LWkz5UUHWFgGSEhfQPcUmVdLayOKilW5IJlhIA0AHTUKCRPnygp1hTjUTuB56gPbVZSvFaIR3UCA9SXblVSfBsKlB4ym4AJ6lNGUEB6XhylD/iiTiGlgMNBN3UzwKPWAsvr2Ju6LNvpDhOZf0iij7KCsmxna42HAWHVYtnO89k8qjdhNKsdgaAs23k2YfP/3mbZzmNBHrUxYXOeXpi9y+u46VrgRMIlUO1KCsfUMUNPwiOj1vm7XgIqs1Z7N6xm3JXaRMFa6nmUTFhkl2U7KxqAZTHMn8aBaWA+0FAiu1Pa7hxtN8pA+c4GPeJFpd+Aq7yCCn11jgD3Fmm3X0khfTYXAMPAgojO40rDsh0FXB+B8UklRVMGV94DPFKg3V1KinUZ7E5pDyu1Bk2gLaKrsCnLctAThRrNAgnglYjO5QozQnc9l+VkJ+L+zSLVauJmM6NQm16cCLr69xQxAt0U5E06cF4U0bk0GZbtpCK8mS9RUgynV5NYtvMnMK9Am2eUFAt93c1bLVoKnIrKUw3LdiYi9CqA94CX9XC+BthdIruPA/txSxl3FDE4hNGYYdnOaeCyJKzMqmET+CXhkFOnTeCnhENO/WgCJxMOOTViAscTDjn1lQn0JxxyzgaOmjpKHk1wZNQp+C/DubcMDZjBrdgNM52Z0MfOlKGdfeBmOAHeL0MDmpUUrbhbPtpwc9N9+p55AvgU2ICbfW3Rx15Yhna+C75kl2U7I0B7TD++RUmxLWCuFmau1wtsjamdJ5UU1/m7HsCbMV6lKf9kOQ9IoOvEY9JO742R1pBUXC1QUhSUuo2xjTNKitkkYHr+uhd4NY5WWLbzNzAIbMbdgzeppJhJO8bQk95lwOvEW470ov+foIq7GeKvaJkGfgf+0l0rpQHNxU0sNsTcnnElRYv/g6AG9JQhXJgDLNSvStDD6R8YGbrFIHB7nQaYh5UU3TlB6ZGlEfinTkGZQCp9JM5WPi2BQ3UGabmSYigTvUzDt01a1VmNqzcTJAi3aegA7u7yWtZeJUVPrv6YNRJWUqwCvqxhSP1Kip5ce/fy2YZ2DLirxiAdUVJ0Fr0NLQDWx8CDtUJJSWGEnZCbIQ16sB4CttQIp3fymZCbedD3/m4D7sBd0KxmjeUbXBXisoO4D535rIpBLY4clG/i2AV04z6Rp9qU1xJ8SbIElu2YuGnbN4i2jqHUeklJsT02UD5gjbhFYr0VlAnIpUXAaEnCgwKhdQHrgU7gggoG9SvuAsZ0NlhmhA0YUFKsBFpwH7K1R480lTZaXgqMkOMhPLFkMtMen9QO3AhcjVuRvAR39Wc+7nJUObwvBZwF7s703JZ/AccI0dMbvIyTAAAAAElFTkSuQmCC"
,
"gstreamerURL"
:
"ws://localhost:8888"
,
"externalLibs"
:
[
"https://cdnjs.cloudflare.com/ajax/libs/sockjs-client/1.1.4/sockjs.min.js"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment