diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..f754d88e --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ + +/V3.1/build/ACTUALLY_OFFICIAL_SERVER_CLIENT +/V3.1/build/RobotVirtualMount diff --git a/V3.1/build/opt/jibo/Jibo/Skills/@be/be/be/ai-bridge-config.json b/V3.1/build/opt/jibo/Jibo/Skills/@be/be/be/ai-bridge-config.json index 2201bb8b..7d06bf7c 100644 --- a/V3.1/build/opt/jibo/Jibo/Skills/@be/be/be/ai-bridge-config.json +++ b/V3.1/build/opt/jibo/Jibo/Skills/@be/be/be/ai-bridge-config.json @@ -1,7 +1,7 @@ { "enabled": true, "mode": "TEXT", - "serverBaseUrl": "http://192.168.1.28:8020", + "serverBaseUrl": "http://192.168.1.28:9000", "recordSeconds": 5, "useDumpStateAudio": true, diff --git a/V3.1/build/opt/jibo/Jibo/Skills/@be/be/be/ai-bridge.js b/V3.1/build/opt/jibo/Jibo/Skills/@be/be/be/ai-bridge.js index 77c69581..12b9cf26 100644 --- a/V3.1/build/opt/jibo/Jibo/Skills/@be/be/be/ai-bridge.js +++ b/V3.1/build/opt/jibo/Jibo/Skills/@be/be/be/ai-bridge.js @@ -2444,7 +2444,9 @@ AIBridge.prototype._speak = function (text) { var ret; try { - ret = self.jibo.tts.speak(String(text), { mode: self.jibo.tts.TTSMode.TEXT }); + // Use SSML mode to support ESML tags (animations, pitch, breaks, etc.) + var ttsMode = self.jibo.tts.TTSMode ? self.jibo.tts.TTSMode.SSML : undefined; + ret = self.jibo.tts.speak(String(text), { mode: ttsMode }); } catch (e) { self.skill.log && self.skill.log.warn && self.skill.log.warn("AI Bridge TTS error", e); if (rlog) { diff --git a/V3.1/build/opt/jibo/Jibo/Skills/@be/be/node_modules/@be/ifttt/node_modules/@jibo/jibo-server-client/lib/region_config.json b/V3.1/build/opt/jibo/Jibo/Skills/@be/be/node_modules/@be/ifttt/node_modules/@jibo/jibo-server-client/lib/region_config.json index 2ca15c11..01b44f03 100644 --- a/V3.1/build/opt/jibo/Jibo/Skills/@be/be/node_modules/@be/ifttt/node_modules/@jibo/jibo-server-client/lib/region_config.json +++ b/V3.1/build/opt/jibo/Jibo/Skills/@be/be/node_modules/@be/ifttt/node_modules/@jibo/jibo-server-client/lib/region_config.json @@ -12,9 +12,12 @@ "endpoint": "{service}.{region}.api.jibo.com", "wsendpoint": "ws://socket:8090" }, + "api/*": { + "endpoint": "http://192.168.1.28:9000", + "wsendpoint": "ws://192.168.1.28:9000" + }, "*/*": "globalSSL" }, - "patterns": { "globalSSL": { "endpoint": "https://{region}.jibo.com", diff --git a/V3.1/build/opt/jibo/Jibo/Skills/@be/be/node_modules/@be/settings/node_modules/@jibo/jibo-server-client/lib/region_config.json b/V3.1/build/opt/jibo/Jibo/Skills/@be/be/node_modules/@be/settings/node_modules/@jibo/jibo-server-client/lib/region_config.json index 2ca15c11..01b44f03 100644 --- a/V3.1/build/opt/jibo/Jibo/Skills/@be/be/node_modules/@be/settings/node_modules/@jibo/jibo-server-client/lib/region_config.json +++ b/V3.1/build/opt/jibo/Jibo/Skills/@be/be/node_modules/@be/settings/node_modules/@jibo/jibo-server-client/lib/region_config.json @@ -12,9 +12,12 @@ "endpoint": "{service}.{region}.api.jibo.com", "wsendpoint": "ws://socket:8090" }, + "api/*": { + "endpoint": "http://192.168.1.28:9000", + "wsendpoint": "ws://192.168.1.28:9000" + }, "*/*": "globalSSL" }, - "patterns": { "globalSSL": { "endpoint": "https://{region}.jibo.com", diff --git a/V3.1/build/opt/jibo/Jibo/Skills/@be/be/node_modules/@be/surprises-ota/node_modules/@jibo/jibo-server-client/lib/region_config.json b/V3.1/build/opt/jibo/Jibo/Skills/@be/be/node_modules/@be/surprises-ota/node_modules/@jibo/jibo-server-client/lib/region_config.json index 2ca15c11..01b44f03 100644 --- a/V3.1/build/opt/jibo/Jibo/Skills/@be/be/node_modules/@be/surprises-ota/node_modules/@jibo/jibo-server-client/lib/region_config.json +++ b/V3.1/build/opt/jibo/Jibo/Skills/@be/be/node_modules/@be/surprises-ota/node_modules/@jibo/jibo-server-client/lib/region_config.json @@ -12,9 +12,12 @@ "endpoint": "{service}.{region}.api.jibo.com", "wsendpoint": "ws://socket:8090" }, + "api/*": { + "endpoint": "http://192.168.1.28:9000", + "wsendpoint": "ws://192.168.1.28:9000" + }, "*/*": "globalSSL" }, - "patterns": { "globalSSL": { "endpoint": "https://{region}.jibo.com", diff --git a/V3.1/build/opt/jibo/Jibo/Skills/@be/be/node_modules/@jibo/jibo-server-client/lib/region_config.json b/V3.1/build/opt/jibo/Jibo/Skills/@be/be/node_modules/@jibo/jibo-server-client/lib/region_config.json index 2ca15c11..01b44f03 100644 --- a/V3.1/build/opt/jibo/Jibo/Skills/@be/be/node_modules/@jibo/jibo-server-client/lib/region_config.json +++ b/V3.1/build/opt/jibo/Jibo/Skills/@be/be/node_modules/@jibo/jibo-server-client/lib/region_config.json @@ -12,9 +12,12 @@ "endpoint": "{service}.{region}.api.jibo.com", "wsendpoint": "ws://socket:8090" }, + "api/*": { + "endpoint": "http://192.168.1.28:9000", + "wsendpoint": "ws://192.168.1.28:9000" + }, "*/*": "globalSSL" }, - "patterns": { "globalSSL": { "endpoint": "https://{region}.jibo.com", diff --git a/V3.1/build/usr/local/etc/jibo-jetstream-service.json b/V3.1/build/usr/local/etc/jibo-jetstream-service.json index eb303abc..478245e7 100644 --- a/V3.1/build/usr/local/etc/jibo-jetstream-service.json +++ b/V3.1/build/usr/local/etc/jibo-jetstream-service.json @@ -16,10 +16,10 @@ "proactive_url": "/v1/proactive", "listen_url": "/v1/listen", "listen_language": "en-US", - "xxx_override": { + "override": { "hub_port": 9000, - "hub_hostname": "172.24.84.137", - "entrypoint_hostname": "dev-entrypoint.jibo.com" + "hub_hostname": "192.168.1.28", + "entrypoint_hostname": "192.168.1.28" }, "region-settings": { "comment": "This is a switch, selected by the 'region' field setting in the robot's /var/jibo/credentials.json file",