diff --git a/.travis.yml b/.travis.yml
index 625ed375d0c7b533483b7802661dd138393fee9c..1747ee5f9d674f4a1c608276a8a98ca13a4f3ad1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ env:
- BBB_SERVER_URL=http://localhost/bigbluebutton/api
script:
- - travis_wait bash ./build_script.sh $JOB_TYPE
+ - travis_wait 30 bash ./build_script.sh $JOB_TYPE
after_script:
- docker stop $docker
diff --git a/akka-bbb-apps/build.sbt b/akka-bbb-apps/build.sbt
index af6c93edc018133d6157c388642194f9447837e8..1a4da064d35b82d6e584ef2784cba7290eb5db75 100755
--- a/akka-bbb-apps/build.sbt
+++ b/akka-bbb-apps/build.sbt
@@ -1,33 +1,34 @@
-enablePlugins(JavaServerAppPackaging)
-
-name := "bbb-apps-akka"
-
-organization := "org.bigbluebutton"
+import org.bigbluebutton.build._
-version := "0.0.2"
+import scalariform.formatter.preferences._
+import com.typesafe.sbt.SbtScalariform
+import com.typesafe.sbt.SbtScalariform.ScalariformKeys
-scalaVersion := "2.12.6"
+import com.typesafe.sbt.SbtNativePackager.autoImport._
-scalacOptions ++= Seq(
- "-unchecked",
- "-deprecation",
- "-Xlint",
- "-Ywarn-dead-code",
- "-language:_",
- "-target:jvm-1.8",
- "-encoding", "UTF-8"
-)
+enablePlugins(JavaServerAppPackaging)
-resolvers ++= Seq(
- "spray repo" at "http://repo.spray.io/",
- "rediscala" at "http://dl.bintray.com/etaty/maven",
- "blindside-repos" at "http://blindside.googlecode.com/svn/repository/"
+version := "0.0.3"
+
+val compileSettings = Seq(
+ organization := "org.bigbluebutton",
+
+ scalacOptions ++= List(
+ "-unchecked",
+ "-deprecation",
+ "-Xlint",
+ "-Ywarn-dead-code",
+ "-language:_",
+ "-target:jvm-1.8",
+ "-encoding", "UTF-8"
+ ),
+ javacOptions ++= List(
+ "-Xlint:unchecked",
+ "-Xlint:deprecation"
+ )
)
-resolvers += Resolver.sonatypeRepo("releases")
-resolvers += Resolver.typesafeRepo("releases")
-
-publishTo := Some(Resolver.file("file", new File(Path.userHome.absolutePath+"/dev/repo/maven-repo/releases" )) )
+publishTo := Some(Resolver.file("file", new File(Path.userHome.absolutePath + "/dev/repo/maven-repo/releases")))
// We want to have our jar files in lib_managed dir.
// This way we'll have the right path when we import
@@ -38,75 +39,15 @@ testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console",
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports")
-val akkaVersion = "2.5.14"
-val scalaTestVersion = "3.0.5"
-
-libraryDependencies ++= {
- Seq(
- "ch.qos.logback" % "logback-classic" % "1.2.3" % "runtime",
- "junit" % "junit" % "4.11",
- "commons-codec" % "commons-codec" % "1.11",
- "org.apache.commons" % "commons-lang3" % "3.7"
- )
-}
-
-libraryDependencies += "org.bigbluebutton" % "bbb-common-message_2.12" % "0.0.19-SNAPSHOT"
-
-// https://mvnrepository.com/artifact/org.scala-lang/scala-library
-libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value
-// https://mvnrepository.com/artifact/org.scala-lang/scala-compiler
-libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value
-
-// https://mvnrepository.com/artifact/com.typesafe.akka/akka-actor_2.12
-libraryDependencies += "com.typesafe.akka" % "akka-actor_2.12" % akkaVersion
-
-// https://mvnrepository.com/artifact/com.typesafe.akka/akka-slf4j_2.12
-libraryDependencies += "com.typesafe.akka" % "akka-slf4j_2.12" % akkaVersion
-
-// https://mvnrepository.com/artifact/com.github.etaty/rediscala_2.12
-libraryDependencies += "com.github.etaty" % "rediscala_2.12" % "1.8.0"
-
-libraryDependencies += "com.softwaremill.quicklens" %% "quicklens" % "1.4.11"
-libraryDependencies += "com.google.code.gson" % "gson" % "2.8.5"
-libraryDependencies += "joda-time" % "joda-time" % "2.10"
-libraryDependencies += "io.spray" % "spray-json_2.12" % "1.3.4"
-libraryDependencies += "org.parboiled" % "parboiled-scala_2.12" % "1.1.8"
-
-// https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-scala_2.12
-libraryDependencies += "com.fasterxml.jackson.module" % "jackson-module-scala_2.12" % "2.9.6"
+lazy val bbbAppsAkka = (project in file(".")).settings(name := "bbb-apps-akka", libraryDependencies ++= Dependencies.runtime).settings(compileSettings)
+scalariformAutoformat := false
-// For generating test reports
-libraryDependencies += "org.pegdown" % "pegdown" % "1.6.0" % "test"
-// https://mvnrepository.com/artifact/com.typesafe.akka/akka-testkit_2.12
-libraryDependencies += "com.typesafe.akka" % "akka-testkit_2.12" % akkaVersion % "test"
-
-// https://mvnrepository.com/artifact/org.scalactic/scalactic_2.12
-libraryDependencies += "org.scalactic" % "scalactic_2.12" % "3.0.3" % "test"
-
-// https://mvnrepository.com/artifact/org.scalatest/scalatest_2.12
-libraryDependencies += "org.scalatest" % "scalatest_2.12" % scalaTestVersion % "test"
-
-libraryDependencies += "org.mockito" % "mockito-core" % "2.21.0" % "test"
-
-
-
-
-import com.typesafe.sbt.SbtScalariform
-
-import scalariform.formatter.preferences._
-import com.typesafe.sbt.SbtScalariform.ScalariformKeys
-
-SbtScalariform.defaultScalariformSettings
-
-ScalariformKeys.preferences := ScalariformKeys.preferences.value
+scalariformPreferences := scalariformPreferences.value
.setPreference(AlignSingleLineCaseStatements, true)
- .setPreference(DoubleIndentClassDeclaration, true)
+ .setPreference(DoubleIndentConstructorArguments, true)
.setPreference(AlignParameters, true)
-
-
-
//-----------
// Packaging
//
@@ -127,19 +68,12 @@ val user = "bigbluebutton"
val group = "bigbluebutton"
// user which will execute the application
-daemonUser in Linux := user
+daemonUser in Linux := user
// group which will execute the application
-daemonGroup in Linux := group
-
-mappings in Universal <+= (packageBin in Compile, sourceDirectory ) map { (_, src) =>
- // Move the application.conf so the user can override settings here
- val appConf = src / "main" / "resources" / "application.conf"
- appConf -> "conf/application.conf"
-}
-
-mappings in Universal <+= (packageBin in Compile, sourceDirectory ) map { (_, src) =>
- // Move logback.xml so the user can override settings here
- val logConf = src / "main" / "resources" / "logback.xml"
- logConf -> "conf/logback.xml"
-}
+daemonGroup in Linux := group
+
+mappings in(Universal, packageBin) += file("src/main/resources/application.conf") -> "conf/application.conf"
+mappings in(Universal, packageBin) += file("src/main/resources/logback.xml") -> "conf/logback.xml"
+
+debianPackageDependencies in Debian ++= Seq("java8-runtime-headless", "bash")
diff --git a/akka-bbb-apps/project/Build.scala b/akka-bbb-apps/project/Build.scala
deleted file mode 100755
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/akka-bbb-apps/project/Dependencies.scala b/akka-bbb-apps/project/Dependencies.scala
new file mode 100644
index 0000000000000000000000000000000000000000..005bd86a3736ad7367cc7d73366786e266a29072
--- /dev/null
+++ b/akka-bbb-apps/project/Dependencies.scala
@@ -0,0 +1,83 @@
+package org.bigbluebutton.build
+
+import sbt._
+import Keys._
+
+object Dependencies {
+
+ object Versions {
+ // Scala
+ val scala = "2.12.7"
+ val junit = "4.12"
+ val junitInterface = "0.11"
+ val scalactic = "3.0.3"
+
+ // Libraries
+ val akkaVersion = "2.5.17"
+ val gson = "2.8.5"
+ val jackson = "2.9.7"
+ val logback = "1.2.3"
+ val quicklens = "1.4.11"
+ val spray = "1.3.4"
+
+ // Apache Commons
+ val lang = "3.8.1"
+ val codec = "1.11"
+
+ // BigBlueButton
+ val bbbCommons = "0.0.20-SNAPSHOT"
+
+ // Test
+ val scalaTest = "3.0.5"
+ val mockito = "2.23.0"
+ val akkaTestKit = "2.5.18"
+ }
+
+ object Compile {
+ val scalaLibrary = "org.scala-lang" % "scala-library" % Versions.scala
+ val scalaCompiler = "org.scala-lang" % "scala-compiler" % Versions.scala
+
+ val akkaActor = "com.typesafe.akka" % "akka-actor_2.12" % Versions.akkaVersion
+ val akkaSl4fj = "com.typesafe.akka" % "akka-slf4j_2.12" % Versions.akkaVersion
+
+ val googleGson = "com.google.code.gson" % "gson" % Versions.gson
+ val jacksonModule = "com.fasterxml.jackson.module" %% "jackson-module-scala" % Versions.jackson
+ val quicklens = "com.softwaremill.quicklens" %% "quicklens" % Versions.quicklens
+ val logback = "ch.qos.logback" % "logback-classic" % Versions.logback % "runtime"
+ val commonsCodec = "commons-codec" % "commons-codec" % Versions.codec
+ val sprayJson = "io.spray" % "spray-json_2.12" % Versions.spray
+
+ val apacheLang = "org.apache.commons" % "commons-lang3" % Versions.lang
+
+ val bbbCommons = "org.bigbluebutton" % "bbb-common-message_2.12" % Versions.bbbCommons
+ }
+
+ object Test {
+ val scalaTest = "org.scalatest" %% "scalatest" % Versions.scalaTest % "test"
+ val junit = "junit" % "junit" % Versions.junit % "test"
+ val mockitoCore = "org.mockito" % "mockito-core" % Versions.mockito % "test"
+ val scalactic = "org.scalactic" % "scalactic_2.12" % Versions.scalactic % "test"
+ val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % Versions.akkaTestKit % "test"
+ }
+
+ val testing = Seq(
+ Test.scalaTest,
+ Test.junit,
+ Test.mockitoCore,
+ Test.scalactic,
+ Test.akkaTestKit)
+
+ val runtime = Seq(
+ Compile.scalaLibrary,
+ Compile.scalaCompiler,
+ Compile.akkaActor,
+ Compile.akkaSl4fj,
+ Compile.googleGson,
+ Compile.jacksonModule,
+ Compile.quicklens,
+ Compile.logback,
+ Compile.commonsCodec,
+ Compile.sprayJson,
+ Compile.apacheLang,
+ Compile.bbbCommons) ++ testing
+}
\ No newline at end of file
diff --git a/akka-bbb-apps/project/build.properties b/akka-bbb-apps/project/build.properties
index a6e117b61042ee81c62ba3a0fc5210d9502944df..2e6e3d24608ee15e892ed3b16d84224f7667e808 100755
--- a/akka-bbb-apps/project/build.properties
+++ b/akka-bbb-apps/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=1.2.6
\ No newline at end of file
diff --git a/akka-bbb-apps/project/plugins.sbt b/akka-bbb-apps/project/plugins.sbt
index ec155bbffce66550d65b058d63ef45fea0fa8b56..bc8c448553a2010f0c76ea69ccb7917f51ffef8a 100755
--- a/akka-bbb-apps/project/plugins.sbt
+++ b/akka-bbb-apps/project/plugins.sbt
@@ -1,11 +1,11 @@
addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
-addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.6")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.12")
-addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.7")
+addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.8")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
diff --git a/akka-bbb-apps/run.sh b/akka-bbb-apps/run.sh
index 4015c4f1373a8caa1271bb9fa175c5940624bf89..fb253febdd48027f6337030036ed2384a76c1714 100755
--- a/akka-bbb-apps/run.sh
+++ b/akka-bbb-apps/run.sh
@@ -1,3 +1 @@
-sbt clean
-sbt run
-
+sbt clean run
diff --git a/akka-bbb-apps/src/main/resources/application.conf b/akka-bbb-apps/src/main/resources/application.conf
index e6904f7e9d99b9aae44fb0428072f15ebef56a5c..591f22a88f5ef2613020407b8dc6f493bb6cf046 100755
--- a/akka-bbb-apps/src/main/resources/application.conf
+++ b/akka-bbb-apps/src/main/resources/application.conf
@@ -10,7 +10,7 @@ akka {
loggers = ["akka.event.slf4j.Slf4jLogger"]
loglevel = "DEBUG"
- rediscala-publish-worker-dispatcher {
+ redis-publish-worker-dispatcher {
mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
# Throughput defines the maximum number of messages to be
# processed per actor before the thread jumps to the next actor.
@@ -18,7 +18,7 @@ akka {
throughput = 512
}
- rediscala-subscriber-worker-dispatcher {
+ redis-subscriber-worker-dispatcher {
mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
# Throughput defines the maximum number of messages to be
# processed per actor before the thread jumps to the next actor.
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
index 74a852b9a5ce018e90f1a4db00c0762c53475526..82b54478421679653cf4b56766a8146660b531dc 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
@@ -1,12 +1,18 @@
package org.bigbluebutton
-import akka.event.Logging
-import akka.actor.ActorSystem
-import org.bigbluebutton.endpoint.redis.{ AppsRedisSubscriberActor, KeepAliveRedisPublisher, RedisPublisher, RedisRecorderActor }
+import org.bigbluebutton.common2.redis.RedisPublisher
import org.bigbluebutton.core._
import org.bigbluebutton.core.bus._
import org.bigbluebutton.core.pubsub.senders.ReceivedJsonMsgHandlerActor
-import org.bigbluebutton.core2.{ AnalyticsActor, FromAkkaAppsMsgSenderActor }
+import org.bigbluebutton.core2.AnalyticsActor
+import org.bigbluebutton.core2.FromAkkaAppsMsgSenderActor
+import org.bigbluebutton.endpoint.redis.AppsRedisSubscriberActor
+import org.bigbluebutton.endpoint.redis.RedisRecorderActor
+
+import akka.actor.ActorSystem
+import akka.event.Logging
+import org.bigbluebutton.common2.redis.MessageSender
+import org.bigbluebutton.common2.bus.IncomingJsonMessageBus
object Boot extends App with SystemConfiguration {
@@ -22,7 +28,7 @@ object Boot extends App with SystemConfiguration {
val outGW = new OutMessageGatewayImp(outBus2)
- val redisPublisher = new RedisPublisher(system)
+ val redisPublisher = new RedisPublisher(system, "BbbAppsAkkaPub")
val msgSender = new MessageSender(redisPublisher)
val redisRecorderActor = system.actorOf(RedisRecorderActor.props(system), "redisRecorderActor")
@@ -46,8 +52,5 @@ object Boot extends App with SystemConfiguration {
val redisMessageHandlerActor = system.actorOf(ReceivedJsonMsgHandlerActor.props(bbbMsgBus, incomingJsonMessageBus))
incomingJsonMessageBus.subscribe(redisMessageHandlerActor, toAkkaAppsJsonChannel)
- val redisSubscriberActor = system.actorOf(AppsRedisSubscriberActor.props(incomingJsonMessageBus), "redis-subscriber")
-
- val keepAliveRedisPublisher = new KeepAliveRedisPublisher(system, redisPublisher)
-
+ val redisSubscriberActor = system.actorOf(AppsRedisSubscriberActor.props(system, incomingJsonMessageBus), "redis-subscriber")
}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
index d2986d262a88d84363f7870e563f11d981312a6f..743a4894c4acec763614b2f9d50ca560e59ba24b 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
@@ -1,15 +1,10 @@
package org.bigbluebutton
-import com.typesafe.config.ConfigFactory
import scala.util.Try
-trait SystemConfiguration {
+import org.bigbluebutton.common2.redis.RedisConfiguration
- val config = ConfigFactory.load()
-
- lazy val redisHost = Try(config.getString("redis.host")).getOrElse("127.0.0.1")
- lazy val redisPort = Try(config.getInt("redis.port")).getOrElse(6379)
- lazy val redisPassword = Try(config.getString("redis.password")).getOrElse("")
+trait SystemConfiguration extends RedisConfiguration {
lazy val bbbWebHost = Try(config.getString("services.bbbWebHost")).getOrElse("localhost")
lazy val bbbWebPort = Try(config.getInt("services.bbbWebPort")).getOrElse(8888)
@@ -31,8 +26,6 @@ trait SystemConfiguration {
lazy val outBbbMsgMsgChannel = Try(config.getString("eventBus.outBbbMsgMsgChannel")).getOrElse("OutBbbMsgChannel")
lazy val recordServiceMessageChannel = Try(config.getString("eventBus.recordServiceMessageChannel")).getOrElse("RecordServiceMessageChannel")
- lazy val toAkkaAppsRedisChannel = Try(config.getString("redis.toAkkaAppsRedisChannel")).getOrElse("to-akka-apps-redis-channel")
- lazy val fromAkkaAppsRedisChannel = Try(config.getString("redis.fromAkkaAppsRedisChannel")).getOrElse("from-akka-apps-redis-channel")
lazy val toHTML5RedisChannel = Try(config.getString("redis.toHTML5RedisChannel")).getOrElse("to-html5-redis-channel")
lazy val fromAkkaAppsChannel = Try(config.getString("eventBus.fromAkkaAppsChannel")).getOrElse("from-akka-apps-channel")
lazy val toAkkaAppsChannel = Try(config.getString("eventBus.toAkkaAppsChannel")).getOrElse("to-akka-apps-channel")
@@ -41,21 +34,9 @@ trait SystemConfiguration {
lazy val toAkkaAppsJsonChannel = Try(config.getString("eventBus.toAkkaAppsChannel")).getOrElse("to-akka-apps-json-channel")
lazy val fromAkkaAppsJsonChannel = Try(config.getString("eventBus.fromAkkaAppsChannel")).getOrElse("from-akka-apps-json-channel")
- lazy val toVoiceConfRedisChannel = Try(config.getString("redis.toVoiceConfRedisChannel")).getOrElse("to-voice-conf-redis-channel")
- lazy val fromVoiceConfRedisChannel = Try(config.getString("redis.fromVoiceConfRedisChannel")).getOrElse("from-voice-conf-redis-channel")
-
- lazy val fromAkkaAppsWbRedisChannel = Try(config.getString("redis.fromAkkaAppsWbRedisChannel")).getOrElse("from-akka-apps-wb-redis-channel")
- lazy val fromAkkaAppsChatRedisChannel = Try(config.getString("redis.fromAkkaAppsChatRedisChannel")).getOrElse("from-akka-apps-chat-redis-channel")
- lazy val fromAkkaAppsPresRedisChannel = Try(config.getString("redis.fromAkkaAppsPresRedisChannel")).getOrElse("from-akka-apps-pres-redis-channel")
-
lazy val maxNumberOfNotes = Try(config.getInt("sharedNotes.maxNumberOfNotes")).getOrElse(3)
lazy val maxNumberOfUndos = Try(config.getInt("sharedNotes.maxNumberOfUndos")).getOrElse(30)
- lazy val httpInterface = Try(config.getString("http.interface")).getOrElse("")
- lazy val httpPort = Try(config.getInt("http.port")).getOrElse(9090)
- lazy val telizeHost = Try(config.getString("services.telizeHost")).getOrElse("")
- lazy val telizePort = Try(config.getInt("services.telizePort")).getOrElse(80)
-
lazy val applyPermissionCheck = Try(config.getBoolean("apps.checkPermissions")).getOrElse(false)
lazy val voiceConfRecordPath = Try(config.getString("voiceConf.recordPath")).getOrElse("/var/freeswitch/meetings")
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSender.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSender.scala
deleted file mode 100755
index 250b1b3fba8c2b5f3a122f5cd54c168b7fdf30c4..0000000000000000000000000000000000000000
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSender.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bigbluebutton.core
-
-import org.bigbluebutton.endpoint.redis.RedisPublisher
-
-class MessageSender(publisher: RedisPublisher) {
-
- def send(channel: String, data: String) {
- publisher.publish(channel, data)
- }
-}
\ No newline at end of file
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/RegisterUserReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/RegisterUserReqMsgHdlr.scala
index b9ed6467939bf9dfa7d6b605361704b0524cdf01..1659cea34f42f3158217f41a95c6488a2661e88c 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/RegisterUserReqMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/RegisterUserReqMsgHdlr.scala
@@ -22,7 +22,6 @@ trait RegisterUserReqMsgHdlr {
BbbCommonEnvCoreMsg(envelope, event)
}
- val guestPolicy = liveMeeting.guestsWaiting.getGuestPolicy().policy
val guestStatus = msg.body.guestStatus
val regUser = RegisteredUsers.create(msg.body.intUserId, msg.body.extUserId,
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
index 7d762dbb11a7ba9e0a4d168621abb52967782224..639adf2ca10bf647b747d88e3ce40b85b2161391 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
@@ -6,7 +6,9 @@ import com.fasterxml.jackson.databind.JsonNode
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.core.bus._
import org.bigbluebutton.core2.ReceivedMessageRouter
-import scala.reflect.runtime.universe._
+import scala.reflect.runtime.universe._
+import org.bigbluebutton.common2.bus.ReceivedJsonMessage
+import org.bigbluebutton.common2.bus.IncomingJsonMessageBus
object ReceivedJsonMsgHandlerActor {
def props(eventBus: BbbMsgRouterEventBus, incomingJsonMessageBus: IncomingJsonMessageBus): Props =
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/RecordEvent.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/RecordEvent.scala
index 3dfb958767ff633bdacc8d637a4f6d5bd743af33..cc18aec6b2d2f62dc28331fb8f88290ff4813588 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/RecordEvent.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/RecordEvent.scala
@@ -21,7 +21,9 @@ package org.bigbluebutton.core.record.events
import java.text.SimpleDateFormat
+import scala.collection.Map
import scala.collection.mutable.HashMap
+
import org.bigbluebutton.core.api.TimestampGenerator
trait RecordEvent {
@@ -70,6 +72,7 @@ trait RecordEvent {
eventMap.put(EVENT, event)
}
+ // @fixme : not used anymore
/**
* Convert the event into a Map to be recorded.
* @return
@@ -77,6 +80,7 @@ trait RecordEvent {
final def toMap(): Map[String, String] = {
eventMap.toMap
}
+
}
object RecordEvent extends RecordEvent {
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
index 2dcaaf0f1f44a96019243bbd968727a8ecc684ff..0061b110d6c0e6437a8ae2a1f9386594b08935ce 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
@@ -3,8 +3,8 @@ package org.bigbluebutton.core2
import akka.actor.{ Actor, ActorLogging, Props }
import org.bigbluebutton.SystemConfiguration
import org.bigbluebutton.common2.msgs._
-import org.bigbluebutton.common2.util.JsonUtil
-import org.bigbluebutton.core.MessageSender
+import org.bigbluebutton.common2.util.JsonUtil
+import org.bigbluebutton.common2.redis.MessageSender
object FromAkkaAppsMsgSenderActor {
def props(msgSender: MessageSender): Props = Props(classOf[FromAkkaAppsMsgSenderActor], msgSender)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AkkaAppsRedisSubscriberActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AkkaAppsRedisSubscriberActor.scala
new file mode 100755
index 0000000000000000000000000000000000000000..8e8ba2ebc6cdceb55bc6e8df8cb003267dd2bbb5
--- /dev/null
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AkkaAppsRedisSubscriberActor.scala
@@ -0,0 +1,32 @@
+package org.bigbluebutton.endpoint.redis
+
+import org.bigbluebutton.SystemConfiguration
+import org.bigbluebutton.common2.bus.IncomingJsonMessageBus
+import org.bigbluebutton.common2.redis.{ RedisSubscriber, RedisSubscriberProvider }
+
+import akka.actor.ActorSystem
+import akka.actor.Props
+
+object AppsRedisSubscriberActor extends RedisSubscriber {
+
+ val channels = Seq(toAkkaAppsRedisChannel, fromVoiceConfRedisChannel)
+ val patterns = Seq("bigbluebutton:to-bbb-apps:*", "bigbluebutton:from-voice-conf:*", "bigbluebutton:from-bbb-transcode:*")
+
+ def props(system: ActorSystem, jsonMsgBus: IncomingJsonMessageBus): Props =
+ Props(
+ classOf[AppsRedisSubscriberActor],
+ system, jsonMsgBus,
+ redisHost, redisPort,
+ channels, patterns).withDispatcher("akka.redis-subscriber-worker-dispatcher")
+}
+
+class AppsRedisSubscriberActor(
+ system: ActorSystem,
+ jsonMsgBus: IncomingJsonMessageBus,
+ redisHost: String, redisPort: Int,
+ channels: Seq[String] = Nil, patterns: Seq[String] = Nil)
+ extends RedisSubscriberProvider(system, "BbbAppsAkkaSub", channels, patterns, jsonMsgBus) with SystemConfiguration {
+
+ addListener(toAkkaAppsJsonChannel)
+ subscribe()
+}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
deleted file mode 100755
index 5a5a1424f59eaee4f6c91c2714e74bead3251766..0000000000000000000000000000000000000000
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bigbluebutton.endpoint.redis
-
-import akka.actor.Props
-import akka.actor.OneForOneStrategy
-import akka.actor.SupervisorStrategy.Resume
-import java.io.{ PrintWriter, StringWriter }
-import java.net.InetSocketAddress
-
-import redis.actors.RedisSubscriberActor
-import redis.api.pubsub.{ Message, PMessage }
-
-import scala.concurrent.duration._
-import org.bigbluebutton.SystemConfiguration
-import org.bigbluebutton.core.bus.{ IncomingJsonMessage, IncomingJsonMessageBus, ReceivedJsonMessage }
-import redis.api.servers.ClientSetname
-
-object AppsRedisSubscriberActor extends SystemConfiguration {
-
- val TO_AKKA_APPS = "bbb:to-akka-apps"
- val channels = Seq(toAkkaAppsRedisChannel, fromVoiceConfRedisChannel)
- val patterns = Seq("bigbluebutton:to-bbb-apps:*", "bigbluebutton:from-voice-conf:*", "bigbluebutton:from-bbb-transcode:*")
-
- def props(jsonMsgBus: IncomingJsonMessageBus): Props =
- Props(classOf[AppsRedisSubscriberActor], jsonMsgBus,
- redisHost, redisPort,
- channels, patterns).withDispatcher("akka.rediscala-subscriber-worker-dispatcher")
-}
-
-class AppsRedisSubscriberActor(jsonMsgBus: IncomingJsonMessageBus, redisHost: String,
- redisPort: Int,
- channels: Seq[String] = Nil, patterns: Seq[String] = Nil)
- extends RedisSubscriberActor(
- new InetSocketAddress(redisHost, redisPort),
- channels, patterns, onConnectStatus = connected => { println(s"connected: $connected") }) with SystemConfiguration {
-
- override val supervisorStrategy = OneForOneStrategy(maxNrOfRetries = 10, withinTimeRange = 1 minute) {
- case e: Exception => {
- val sw: StringWriter = new StringWriter()
- sw.write("An exception has been thrown on AppsRedisSubscriberActor, exception message [" + e.getMessage() + "] (full stacktrace below)\n")
- e.printStackTrace(new PrintWriter(sw))
- log.error(sw.toString())
- Resume
- }
- }
-
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- write(ClientSetname("BbbAppsAkkaSub").encodedRequest)
-
- def onMessage(message: Message) {
- if (message.channel == toAkkaAppsRedisChannel || message.channel == fromVoiceConfRedisChannel) {
- val receivedJsonMessage = new ReceivedJsonMessage(message.channel, message.data.utf8String)
- //log.debug(s"RECEIVED:\n [${receivedJsonMessage.channel}] \n ${receivedJsonMessage.data} \n")
- jsonMsgBus.publish(IncomingJsonMessage(toAkkaAppsJsonChannel, receivedJsonMessage))
- }
- }
-
- def onPMessage(pmessage: PMessage) {
-
- // We don't use PSubscribe anymore, but an implementation of the method is required
- //log.error("Should not be receiving a PMessage. It triggered on a match of pattern: " + pmessage.patternMatched)
- //log.error(pmessage.data.utf8String)
- }
-}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/KeepAliveRedisPublisher.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/KeepAliveRedisPublisher.scala
deleted file mode 100755
index 74aa6e4b7885620de866627bba075e45e28dba75..0000000000000000000000000000000000000000
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/KeepAliveRedisPublisher.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.bigbluebutton.endpoint.redis
-
-import scala.concurrent.duration._
-import scala.concurrent.ExecutionContext.Implicits.global
-import akka.actor.ActorSystem
-import org.bigbluebutton.SystemConfiguration
-
-class KeepAliveRedisPublisher(val system: ActorSystem, sender: RedisPublisher) extends SystemConfiguration {
-
- val startedOn = System.currentTimeMillis()
-
- system.scheduler.schedule(2 seconds, 5 seconds) {
- //val msg = new BbbAppsIsAliveMessage(startedOn, System.currentTimeMillis())
- // sender.publish("bigbluebutton:from-bbb-apps:keepalive", msg.toJson())
- }
-}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPublisher.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPublisher.scala
deleted file mode 100755
index 6af8a64ebb05093023cc7e90a0f445cce3170b8b..0000000000000000000000000000000000000000
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPublisher.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.bigbluebutton.endpoint.redis
-
-import redis.RedisClient
-import akka.actor.ActorSystem
-import org.bigbluebutton.SystemConfiguration
-import akka.util.ByteString
-
-class RedisPublisher(val system: ActorSystem) extends SystemConfiguration {
-
- val redis = RedisClient(redisHost, redisPort)(system)
-
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- redis.clientSetname("BbbAppsAkkaPub")
-
- def publish(channel: String, data: String) {
- //println("PUBLISH TO [" + channel + "]: \n [" + data + "]")
- redis.publish(channel, ByteString(data))
- }
-
-}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
index 7a01783d5b6448ad53fd98eb53a235f2829d284b..c3c68f726ad22021d7a1c68fc02aac5fb46cd217 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
@@ -1,40 +1,30 @@
package org.bigbluebutton.endpoint.redis
-import akka.actor.{ Actor, ActorLogging, ActorSystem, Props }
-import org.bigbluebutton.SystemConfiguration
-import redis.RedisClient
-import scala.concurrent.ExecutionContext.Implicits.global
import scala.collection.immutable.StringOps
+import scala.collection.JavaConverters._
+
+import org.bigbluebutton.SystemConfiguration
import org.bigbluebutton.common2.msgs._
-import org.bigbluebutton.core.record.events._
+import org.bigbluebutton.common2.redis.RedisStorageProvider
import org.bigbluebutton.core.apps.groupchats.GroupChatApp
+import org.bigbluebutton.core.record.events._
+
+import akka.actor.Actor
+import akka.actor.ActorLogging
+import akka.actor.ActorSystem
+import akka.actor.Props
object RedisRecorderActor {
def props(system: ActorSystem): Props = Props(classOf[RedisRecorderActor], system)
}
-class RedisRecorderActor(val system: ActorSystem)
- extends SystemConfiguration
- with Actor with ActorLogging {
- val redis = RedisClient(redisHost, redisPort)(system)
-
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- redis.clientSetname("BbbAppsAkkaRecorder")
-
- val COLON = ":"
-
- private def record(session: String, message: collection.immutable.Map[String, String]): Unit = {
- for {
- msgid <- redis.incr("global:nextRecordedMsgId")
- key = "recording" + COLON + session + COLON + msgid
- _ <- redis.hmset(key.mkString, message)
- _ <- redis.expire(key.mkString, keysExpiresInSec)
- key2 = "meeting" + COLON + session + COLON + "recordings"
- _ <- redis.rpush(key2.mkString, msgid.toString)
- result <- redis.expire(key2.mkString, keysExpiresInSec)
- } yield result
+class RedisRecorderActor(system: ActorSystem)
+ extends RedisStorageProvider(system, "BbbAppsAkkaRecorder")
+ with SystemConfiguration
+ with Actor with ActorLogging {
+ private def record(session: String, message: java.util.Map[java.lang.String, java.lang.String]): Unit = {
+ redis.recordAndExpire(session, message)
}
def receive = {
@@ -121,7 +111,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setMessage(msg.body.msg.message)
ev.setColor(msg.body.msg.color)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
}
@@ -129,7 +119,7 @@ class RedisRecorderActor(val system: ActorSystem)
val ev = new ClearPublicChatRecordEvent()
ev.setMeetingId(msg.header.meetingId)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handlePresentationConversionCompletedEvtMsg(msg: PresentationConversionCompletedEvtMsg) {
@@ -139,7 +129,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setPresentationName(msg.body.presentation.id)
ev.setOriginalFilename(msg.body.presentation.name)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
if (msg.body.presentation.current) {
recordSharePresentationEvent(msg.header.meetingId, msg.body.podId, msg.body.presentation.id)
@@ -154,7 +144,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setSlide(getPageNum(msg.body.pageId))
ev.setId(msg.body.pageId)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleResizeAndMovePageEvtMsg(msg: ResizeAndMovePageEvtMsg) {
@@ -168,7 +158,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setWidthRatio(msg.body.widthRatio)
ev.setHeightRatio(msg.body.heightRatio)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleRemovePresentationEvtMsg(msg: RemovePresentationEvtMsg) {
@@ -177,7 +167,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setPodId(msg.body.podId)
ev.setPresentationName(msg.body.presentationId)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleSetPresentationDownloadableEvtMsg(msg: SetPresentationDownloadableEvtMsg) {
@@ -187,7 +177,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setPresentationName(msg.body.presentationId)
ev.setDownloadable(msg.body.downloadable)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleSetCurrentPresentationEvtMsg(msg: SetCurrentPresentationEvtMsg) {
@@ -200,7 +190,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setPodId(msg.body.podId)
ev.setCurrentPresenter(msg.body.currentPresenterId)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleRemovePresentationPodEvtMsg(msg: RemovePresentationPodEvtMsg) {
@@ -208,7 +198,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setMeetingId(msg.header.meetingId)
ev.setPodId(msg.body.podId)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleSetPresenterInPodRespMsg(msg: SetPresenterInPodRespMsg) {
@@ -217,7 +207,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setPodId(msg.body.podId)
ev.setNextPresenterId(msg.body.nextPresenterId)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def recordSharePresentationEvent(meetingId: String, podId: String, presentationId: String) {
@@ -227,7 +217,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setPresentationName(presentationId)
ev.setShare(true)
- record(meetingId, ev.toMap)
+ record(meetingId, ev.toMap.asJava)
}
private def getPageNum(id: String): Integer = {
@@ -266,7 +256,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setPosition(annotation.position)
ev.addAnnotation(annotation.annotationInfo)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleSendCursorPositionEvtMsg(msg: SendCursorPositionEvtMsg) {
@@ -279,7 +269,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setXPercent(msg.body.xPercent)
ev.setYPercent(msg.body.yPercent)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleClearWhiteboardEvtMsg(msg: ClearWhiteboardEvtMsg) {
@@ -291,7 +281,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setUserId(msg.body.userId)
ev.setFullClear(msg.body.fullClear)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleUndoWhiteboardEvtMsg(msg: UndoWhiteboardEvtMsg) {
@@ -302,7 +292,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setWhiteboardId(msg.body.whiteboardId)
ev.setUserId(msg.body.userId)
ev.setShapeId(msg.body.annotationId)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleUserJoinedMeetingEvtMsg(msg: UserJoinedMeetingEvtMsg): Unit = {
@@ -313,7 +303,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setName(msg.body.name)
ev.setRole(msg.body.role)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleUserLeftMeetingEvtMsg(msg: UserLeftMeetingEvtMsg): Unit = {
@@ -321,7 +311,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setMeetingId(msg.header.meetingId)
ev.setUserId(msg.body.intId)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handlePresenterAssignedEvtMsg(msg: PresenterAssignedEvtMsg): Unit = {
@@ -331,7 +321,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setName(msg.body.presenterName)
ev.setAssignedBy(msg.body.assignedBy)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleUserEmojiChangedEvtMsg(msg: UserEmojiChangedEvtMsg) {
handleUserStatusChange(msg.header.meetingId, msg.body.userId, "emojiStatus", msg.body.emoji)
@@ -352,7 +342,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setStatus(statusName)
ev.setValue(statusValue)
- record(meetingId, ev.toMap)
+ record(meetingId, ev.toMap.asJava)
}
private def handleUserJoinedVoiceConfToClientEvtMsg(msg: UserJoinedVoiceConfToClientEvtMsg) {
@@ -365,7 +355,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setMuted(msg.body.muted)
ev.setTalking(msg.body.talking)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleUserLeftVoiceConfToClientEvtMsg(msg: UserLeftVoiceConfToClientEvtMsg) {
@@ -374,7 +364,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setBridge(msg.body.voiceConf)
ev.setParticipant(msg.body.intId)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleUserMutedVoiceEvtMsg(msg: UserMutedVoiceEvtMsg) {
@@ -384,7 +374,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setParticipant(msg.body.intId)
ev.setMuted(msg.body.muted)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleUserTalkingVoiceEvtMsg(msg: UserTalkingVoiceEvtMsg) {
@@ -394,7 +384,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setParticipant(msg.body.intId)
ev.setTalking(msg.body.talking)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleVoiceRecordingStartedEvtMsg(msg: VoiceRecordingStartedEvtMsg) {
@@ -404,7 +394,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setRecordingTimestamp(msg.body.timestamp)
ev.setFilename(msg.body.stream)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleVoiceRecordingStoppedEvtMsg(msg: VoiceRecordingStoppedEvtMsg) {
@@ -414,7 +404,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setRecordingTimestamp(msg.body.timestamp)
ev.setFilename(msg.body.stream)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleEditCaptionHistoryEvtMsg(msg: EditCaptionHistoryEvtMsg) {
@@ -426,7 +416,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setLocaleCode(msg.body.localeCode)
ev.setText(msg.body.text)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleScreenshareRtmpBroadcastStartedEvtMsg(msg: ScreenshareRtmpBroadcastStartedEvtMsg) {
@@ -434,7 +424,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setMeetingId(msg.header.meetingId)
ev.setStreamPath(msg.body.stream)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleScreenshareRtmpBroadcastStoppedEvtMsg(msg: ScreenshareRtmpBroadcastStoppedEvtMsg) {
@@ -442,7 +432,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setMeetingId(msg.header.meetingId)
ev.setStreamPath(msg.body.stream)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
/*
@@ -462,7 +452,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setUserId(msg.body.setBy)
ev.setRecordingStatus(msg.body.recording)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleRecordStatusResetSysMsg(msg: RecordStatusResetSysMsg) {
@@ -471,7 +461,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setUserId(msg.body.setBy)
ev.setRecordingStatus(msg.body.recording)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleWebcamsOnlyForModeratorChangedEvtMsg(msg: WebcamsOnlyForModeratorChangedEvtMsg) {
@@ -480,14 +470,14 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setUserId(msg.body.setBy)
ev.setWebcamsOnlyForModerator(msg.body.webcamsOnlyForModerator)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleEndAndKickAllSysMsg(msg: EndAndKickAllSysMsg): Unit = {
val ev = new EndAndKickAllRecordEvent()
ev.setMeetingId(msg.header.meetingId)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleRecordingChapterBreakSysMsg(msg: RecordingChapterBreakSysMsg): Unit = {
@@ -495,7 +485,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setMeetingId(msg.header.meetingId)
ev.setChapterBreakTimestamp(msg.body.timestamp)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handlePollStartedEvtMsg(msg: PollStartedEvtMsg): Unit = {
@@ -503,7 +493,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setPollId(msg.body.pollId)
ev.setAnswers(msg.body.poll.answers)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handleUserRespondedToPollRecordMsg(msg: UserRespondedToPollRecordMsg): Unit = {
@@ -512,7 +502,7 @@ class RedisRecorderActor(val system: ActorSystem)
ev.setUserId(msg.header.userId)
ev.setAnswerId(msg.body.answerId)
- record(msg.header.meetingId, ev.toMap)
+ record(msg.header.meetingId, ev.toMap.asJava)
}
private def handlePollStoppedEvtMsg(msg: PollStoppedEvtMsg): Unit = {
@@ -527,6 +517,6 @@ class RedisRecorderActor(val system: ActorSystem)
val ev = new PollStoppedRecordEvent()
ev.setPollId(pollId)
- record(meetingId, ev.toMap)
+ record(meetingId, ev.toMap.asJava)
}
}
diff --git a/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/AppsTestFixtures.scala b/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/AppsTestFixtures.scala
index fb2b3f5e7694a60e7140ea4158684e103b4a882b..3e57891347a7b653e8fe4392aea6854d7065ddc1 100755
--- a/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/AppsTestFixtures.scala
+++ b/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/AppsTestFixtures.scala
@@ -15,10 +15,16 @@ trait AppsTestFixtures {
val meetingName = "test meeting"
val record = false
val voiceConfId = "85115"
+ val muteOnStart = true
val deskshareConfId = "85115-DESKSHARE"
val durationInMinutes = 10
val maxInactivityTimeoutMinutes = 120
- val warnMinutesBeforeMax = 5
+ val warnMinutesBeforeMax = 30
+ val meetingExpireIfNoUserJoinedInMinutes = 5
+ val meetingExpireWhenLastUserLeftInMinutes = 10
+ val userInactivityInspectTimerInMinutes = 60
+ val userInactivityThresholdInMinutes = 10
+ val userActivitySignResponseDelayInMinutes = 5
val autoStartRecording = false
val allowStartStopRecording = false
val webcamsOnlyForModerator = false;
@@ -38,24 +44,19 @@ trait AppsTestFixtures {
val red5DeskShareAppTestFixtures = "red5App"
val metadata: collection.immutable.Map[String, String] = Map("foo" -> "bar", "bar" -> "baz", "baz" -> "foo")
val screenshareProps = ScreenshareProps("TODO", "TODO", "TODO")
- val breakoutProps = BreakoutProps(parentMeetingId, sequence, Vector())
+ val breakoutProps = BreakoutProps(parentId = parentMeetingId, sequence = sequence, freeJoin = false, breakoutRooms = Vector())
val meetingProp = MeetingProp(name = meetingName, extId = externalMeetingId, intId = meetingId,
isBreakout = isBreakout.booleanValue())
- val durationProps = DurationProps(
- duration = durationInMinutes,
- createdTime = createTime, createdDate = createDate,
- maxInactivityTimeoutMinutes = maxInactivityTimeoutMinutes,
- warnMinutesBeforeMax = warnMinutesBeforeMax,
- meetingExpireIfNoUserJoinedInMinutes = 5,
- meetingExpireWhenLastUserLeftInMinutes = 1
- )
+ val durationProps = DurationProps(duration = durationInMinutes, createdTime = createTime, createdDate = createDate, maxInactivityTimeoutMinutes = maxInactivityTimeoutMinutes, warnMinutesBeforeMax = warnMinutesBeforeMax,
+ meetingExpireIfNoUserJoinedInMinutes = meetingExpireIfNoUserJoinedInMinutes, meetingExpireWhenLastUserLeftInMinutes = meetingExpireWhenLastUserLeftInMinutes,
+ userInactivityInspectTimerInMinutes = userInactivityInspectTimerInMinutes, userInactivityThresholdInMinutes = userInactivityInspectTimerInMinutes, userActivitySignResponseDelayInMinutes = userActivitySignResponseDelayInMinutes)
val password = PasswordProp(moderatorPass = moderatorPassword, viewerPass = viewerPassword)
val recordProp = RecordProp(record = record, autoStartRecording = autoStartRecording,
allowStartStopRecording = allowStartStopRecording)
val welcomeProp = WelcomeProp(welcomeMsgTemplate = welcomeMsgTemplate, welcomeMsg = welcomeMsg,
modOnlyMessage = modOnlyMessage)
- val voiceProp = VoiceProp(telVoice = voiceConfId, voiceConf = voiceConfId, dialNumber = dialNumber)
+ val voiceProp = VoiceProp(telVoice = voiceConfId, voiceConf = voiceConfId, dialNumber = dialNumber, muteOnStart = muteOnStart)
val usersProp = UsersProp(maxUsers = maxUsers, webcamsOnlyForModerator = webcamsOnlyForModerator,
guestPolicy = guestPolicy)
val metadataProp = new MetadataProp(metadata)
@@ -84,7 +85,6 @@ trait AppsTestFixtures {
val layouts = new Layouts()
val wbModel = new WhiteboardModel()
val presModel = new PresentationModel()
- val breakoutRooms = new BreakoutRooms()
val captionModel = new CaptionModel()
val notesModel = new SharedNotesModel()
val registeredUsers = new RegisteredUsers
diff --git a/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/domain/MeetingInactivityTrackerTests.scala b/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/domain/MeetingInactivityTrackerTests.scala
index 6a09dc346bd76bba763afeea65f961be87b4daed..95f8ab07d9f674a95c649813b873fe8e5c11c6da 100755
--- a/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/domain/MeetingInactivityTrackerTests.scala
+++ b/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/domain/MeetingInactivityTrackerTests.scala
@@ -1,7 +1,6 @@
package org.bigbluebutton.core.domain
import org.bigbluebutton.core.UnitSpec
-import org.bigbluebutton.core.running.MeetingExpiryTrackerHelper
import org.bigbluebutton.core.util.TimeUtil
class MeetingInactivityTrackerTests extends UnitSpec {
diff --git a/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/models/GroupsChatTests.scala b/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/models/GroupsChatTests.scala
index ca600fa0a2c3bff3f0db4fb9d6a95797f61ae74d..60246a571a7341bd1abca9ce3c484d690e92168a 100755
--- a/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/models/GroupsChatTests.scala
+++ b/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/models/GroupsChatTests.scala
@@ -2,7 +2,6 @@ package org.bigbluebutton.core.models
import org.bigbluebutton.common2.msgs.{ GroupChatAccess, GroupChatUser }
import org.bigbluebutton.core.UnitSpec
-import org.bigbluebutton.core.domain.BbbSystemConst
class GroupsChatTests extends UnitSpec {
@@ -10,7 +9,7 @@ class GroupsChatTests extends UnitSpec {
val gcId = "gc-id"
val chatName = "Public"
val userId = "uid-1"
- val createBy = GroupChatUser(BbbSystemConst.SYSTEM_USER, BbbSystemConst.SYSTEM_USER)
+ val createBy = GroupChatUser("groupId", "groupname")
val gc = GroupChatFactory.create(gcId, chatName, GroupChatAccess.PUBLIC, createBy, Vector.empty, Vector.empty)
val user = GroupChatUser(userId, "User 1")
val gc2 = gc.add(user)
@@ -25,18 +24,16 @@ class GroupsChatTests extends UnitSpec {
}
"A GroupChat" should "be able to add, update, and remove msg" in {
- val createBy = GroupChatUser(BbbSystemConst.SYSTEM_USER, BbbSystemConst.SYSTEM_USER)
+ val createBy = GroupChatUser("groupId", "groupname")
val gcId = "gc-id"
val chatName = "Public"
- val userId = "uid-1"
val gc = GroupChatFactory.create(gcId, chatName, GroupChatAccess.PUBLIC, createBy, Vector.empty, Vector.empty)
val msgId1 = "msgid-1"
val ts = System.currentTimeMillis()
val hello = "Hello World!"
val msg1 = GroupChatMessage(id = msgId1, timestamp = ts, correlationId = "cordId1", createdOn = ts,
- updatedOn = ts, sender = createBy,
- font = "arial", size = 12, color = "red", message = hello)
+ updatedOn = ts, sender = createBy, color = "red", message = hello)
val gc2 = gc.add(msg1)
assert(gc2.msgs.size == 1)
@@ -45,8 +42,7 @@ class GroupsChatTests extends UnitSpec {
val foo = "Foo bar"
val ts2 = System.currentTimeMillis()
val msg2 = GroupChatMessage(id = msgId2, timestamp = ts2, correlationId = "cordId2", createdOn = ts2,
- updatedOn = ts2, sender = createBy,
- font = "arial", size = 12, color = "red", message = foo)
+ updatedOn = ts2, sender = createBy, color = "red", message = foo)
val gc3 = gc2.add(msg2)
assert(gc3.msgs.size == 2)
@@ -55,8 +51,7 @@ class GroupsChatTests extends UnitSpec {
val msgId3 = "msgid-3"
val ts3 = System.currentTimeMillis()
val msg3 = GroupChatMessage(id = msgId3, timestamp = ts3, correlationId = "cordId3", createdOn = ts3,
- updatedOn = ts3, sender = createBy,
- font = "arial", size = 12, color = "red", message = baz)
+ updatedOn = ts3, sender = createBy, color = "red", message = baz)
val gc4 = gc3.update(msg3)
gc4.findMsgWithId(msgId3) match {
diff --git a/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/pubsub/sender/ReceivedJsonMsgHandlerTraitTests.scala b/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/pubsub/sender/ReceivedJsonMsgHandlerTraitTests.scala
index 8de72a97a547dd9e08f8c75d76089b406df4574e..329383ad1512275c9afab734496cd35dfee05273 100755
--- a/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/pubsub/sender/ReceivedJsonMsgHandlerTraitTests.scala
+++ b/akka-bbb-apps/src/test/scala/org/bigbluebutton/core/pubsub/sender/ReceivedJsonMsgHandlerTraitTests.scala
@@ -3,13 +3,13 @@ package org.bigbluebutton.core.pubsub.sender
import org.bigbluebutton.SystemConfiguration
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.core.{ AppsTestFixtures, UnitSpec }
-import org.bigbluebutton.core.bus.{ BbbMsgEvent, BbbMsgRouterEventBus, ReceivedJsonMessage }
+import org.bigbluebutton.core.bus.{ BbbMsgEvent, BbbMsgRouterEventBus }
import org.bigbluebutton.core2.ReceivedMessageRouter
import org.mockito.Mockito._
import org.scalatest.mockito.MockitoSugar
class ReceivedJsonMsgHandlerTraitTests extends UnitSpec
- with AppsTestFixtures with MockitoSugar with SystemConfiguration {
+ with AppsTestFixtures with MockitoSugar with SystemConfiguration {
class MessageRouter(val eventBus: BbbMsgRouterEventBus) extends ReceivedMessageRouter {
diff --git a/akka-bbb-apps/src/test/scala/org/bigbluebutton/core2/testdata/TestDataGen.scala b/akka-bbb-apps/src/test/scala/org/bigbluebutton/core2/testdata/TestDataGen.scala
index d4789a43739f5a05ca2d49e1d5eb65c9a844e564..907d352379aec626bc70dbb139878d14d3d7b412 100755
--- a/akka-bbb-apps/src/test/scala/org/bigbluebutton/core2/testdata/TestDataGen.scala
+++ b/akka-bbb-apps/src/test/scala/org/bigbluebutton/core2/testdata/TestDataGen.scala
@@ -46,9 +46,9 @@ object TestDataGen {
def createUserFor(liveMeeting: LiveMeeting, regUser: RegisteredUser, presenter: Boolean): UserState = {
val u = UserState(intId = regUser.id, extId = regUser.externId, name = regUser.name, role = regUser.role,
guest = regUser.guest, authed = regUser.authed, guestStatus = regUser.guestStatus,
- emoji = "none", locked = false, presenter, avatar = regUser.avatarURL)
+ emoji = "none", locked = false, presenter = false, avatar = regUser.avatarURL, clientType = "unknown",
+ userLeftFlag = UserLeftFlag(false, 0))
Users2x.add(liveMeeting.users2x, u)
-
u
}
}
diff --git a/akka-bbb-fsesl/build.sbt b/akka-bbb-fsesl/build.sbt
index 319345d682c45b7255b457ba2a3adafae985b767..020426a651d37ecdf2f70f96a43d7518c3f52d8d 100755
--- a/akka-bbb-fsesl/build.sbt
+++ b/akka-bbb-fsesl/build.sbt
@@ -1,26 +1,35 @@
-enablePlugins(JavaServerAppPackaging)
-
-name := "bbb-fsesl-akka"
+import org.bigbluebutton.build._
-organization := "org.bigbluebutton"
+import scalariform.formatter.preferences._
+import com.typesafe.sbt.SbtScalariform
+import com.typesafe.sbt.SbtScalariform.ScalariformKeys
-version := "0.0.1"
+import com.typesafe.sbt.SbtNativePackager.autoImport._
-scalaVersion := "2.12.6"
+enablePlugins(JavaServerAppPackaging)
-scalacOptions ++= Seq(
- "-unchecked",
- "-deprecation",
- "-Xlint",
- "-Ywarn-dead-code",
- "-language:_",
- "-target:jvm-1.8",
- "-encoding", "UTF-8"
+version := "0.0.2"
+
+val compileSettings = Seq(
+ organization := "org.bigbluebutton",
+
+ scalacOptions ++= List(
+ "-unchecked",
+ "-deprecation",
+ "-Xlint",
+ "-Ywarn-dead-code",
+ "-language:_",
+ "-target:jvm-1.8",
+ "-encoding", "UTF-8"
+ ),
+ javacOptions ++= List(
+ "-Xlint:unchecked",
+ "-Xlint:deprecation"
+ )
)
resolvers ++= Seq(
"spray repo" at "http://repo.spray.io/",
- "rediscala" at "http://dl.bintray.com/etaty/maven",
"blindside-repos" at "http://blindside.googlecode.com/svn/repository/"
)
@@ -37,63 +46,14 @@ testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console",
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports")
-val akkaVersion = "2.5.14"
-val scalaTestV = "2.2.6"
-
-
-libraryDependencies ++= {
- Seq(
- "ch.qos.logback" % "logback-classic" % "1.2.3" % "runtime",
- "junit" % "junit" % "4.11",
- "commons-codec" % "commons-codec" % "1.11",
- "joda-time" % "joda-time" % "2.10",
- "org.apache.commons" % "commons-lang3" % "3.7"
-
- )}
-
-libraryDependencies += "org.bigbluebutton" % "bbb-common-message_2.12" % "0.0.19-SNAPSHOT"
-
-libraryDependencies += "org.bigbluebutton" % "bbb-fsesl-client" % "0.0.6"
-
-// https://mvnrepository.com/artifact/org.scala-lang/scala-library
-libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value
-// https://mvnrepository.com/artifact/org.scala-lang/scala-compiler
-libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value
-
-// https://mvnrepository.com/artifact/com.typesafe.akka/akka-actor_2.12
-libraryDependencies += "com.typesafe.akka" % "akka-actor_2.12" % akkaVersion
-
-// https://mvnrepository.com/artifact/com.typesafe.akka/akka-slf4j_2.12
-libraryDependencies += "com.typesafe.akka" % "akka-slf4j_2.12" % akkaVersion
-
-// https://mvnrepository.com/artifact/com.github.etaty/rediscala_2.12
-libraryDependencies += "com.github.etaty" % "rediscala_2.12" % "1.8.0"
-
-// For generating test reports
-libraryDependencies += "org.pegdown" % "pegdown" % "1.6.0" % "test"
-// https://mvnrepository.com/artifact/com.typesafe.akka/akka-testkit_2.12
-libraryDependencies += "com.typesafe.akka" % "akka-testkit_2.12" % "2.5.14" % "test"
-
-// https://mvnrepository.com/artifact/org.scalactic/scalactic_2.12
-libraryDependencies += "org.scalactic" % "scalactic_2.12" % "3.0.5" % "test"
-
-// https://mvnrepository.com/artifact/org.scalatest/scalatest_2.12
-libraryDependencies += "org.scalatest" % "scalatest_2.12" % "3.0.5" % "test"
-
-libraryDependencies += "org.mockito" % "mockito-core" % "2.21.0" % "test"
-
-seq(Revolver.settings: _*)
-
-import com.typesafe.sbt.SbtScalariform
-
-import scalariform.formatter.preferences._
-import com.typesafe.sbt.SbtScalariform.ScalariformKeys
+Seq(Revolver.settings: _*)
+lazy val bbbFseslAkka = (project in file(".")).settings(name := "bbb-fsesl-akka", libraryDependencies ++= Dependencies.runtime).settings(compileSettings)
-SbtScalariform.defaultScalariformSettings
+scalariformAutoformat := false
-ScalariformKeys.preferences := ScalariformKeys.preferences.value
+scalariformPreferences := scalariformPreferences.value
.setPreference(AlignSingleLineCaseStatements, true)
- .setPreference(DoubleIndentClassDeclaration, true)
+ .setPreference(DoubleIndentConstructorArguments, true)
.setPreference(AlignParameters, true)
//-----------
@@ -121,16 +81,7 @@ daemonUser in Linux := user
// group which will execute the application
daemonGroup in Linux := group
-mappings in Universal <+= (packageBin in Compile, sourceDirectory ) map { (_, src) =>
- // Move the application.conf so the user can override settings here
- val appConf = src / "main" / "resources" / "application.conf"
- appConf -> "conf/application.conf"
-}
-
-mappings in Universal <+= (packageBin in Compile, sourceDirectory ) map { (_, src) =>
- // Move logback.xml so the user can override settings here
- val logConf = src / "main" / "resources" / "logback.xml"
- logConf -> "conf/logback.xml"
-}
+mappings in(Universal, packageBin) += file("src/main/resources/application.conf") -> "conf/application.conf"
+mappings in(Universal, packageBin) += file("src/main/resources/logback.xml") -> "conf/logback.xml"
debianPackageDependencies in Debian ++= Seq("java8-runtime-headless", "bash")
diff --git a/akka-bbb-fsesl/project/Build.scala b/akka-bbb-fsesl/project/Build.scala
deleted file mode 100755
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/akka-bbb-fsesl/project/Dependencies.scala b/akka-bbb-fsesl/project/Dependencies.scala
new file mode 100644
index 0000000000000000000000000000000000000000..6eab6d49d1aef1ed3e82de5be48f8e915e1f741b
--- /dev/null
+++ b/akka-bbb-fsesl/project/Dependencies.scala
@@ -0,0 +1,71 @@
+package org.bigbluebutton.build
+
+import sbt._
+import Keys._
+
+object Dependencies {
+
+ object Versions {
+ // Scala
+ val scala = "2.12.7"
+ val junitInterface = "0.11"
+ val scalactic = "3.0.3"
+
+ // Libraries
+ val akkaVersion = "2.5.17"
+ val logback = "1.2.3"
+
+ // Apache Commons
+ val lang = "3.8.1"
+ val codec = "1.11"
+
+ // BigBlueButton
+ val bbbCommons = "0.0.20-SNAPSHOT"
+ val bbbFsesl = "0.0.7-SNAPSHOT"
+
+ // Test
+ val scalaTest = "3.0.5"
+ val akkaTestKit = "2.5.18"
+ val junit = "4.12"
+ }
+
+ object Compile {
+ val scalaLibrary = "org.scala-lang" % "scala-library" % Versions.scala
+ val scalaCompiler = "org.scala-lang" % "scala-compiler" % Versions.scala
+
+ val akkaActor = "com.typesafe.akka" % "akka-actor_2.12" % Versions.akkaVersion
+ val akkaSl4fj = "com.typesafe.akka" % "akka-slf4j_2.12" % Versions.akkaVersion
+
+ val logback = "ch.qos.logback" % "logback-classic" % Versions.logback
+ val commonsCodec = "commons-codec" % "commons-codec" % Versions.codec
+
+ val apacheLang = "org.apache.commons" % "commons-lang3" % Versions.lang
+
+ val bbbCommons = "org.bigbluebutton" % "bbb-common-message_2.12" % Versions.bbbCommons
+ val bbbFseslClient = "org.bigbluebutton" % "bbb-fsesl-client" % Versions.bbbFsesl
+ }
+
+ object Test {
+ val scalaTest = "org.scalatest" %% "scalatest" % Versions.scalaTest % "test"
+ val junit = "junit" % "junit" % Versions.junit % "test"
+ val scalactic = "org.scalactic" % "scalactic_2.12" % Versions.scalactic % "test"
+ val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % Versions.akkaTestKit % "test"
+ }
+
+ val testing = Seq(
+ Test.scalaTest,
+ Test.junit,
+ Test.scalactic,
+ Test.akkaTestKit)
+
+ val runtime = Seq(
+ Compile.scalaLibrary,
+ Compile.scalaCompiler,
+ Compile.akkaActor,
+ Compile.akkaSl4fj,
+ Compile.logback,
+ Compile.commonsCodec,
+ Compile.apacheLang,
+ Compile.bbbCommons,
+ Compile.bbbFseslClient) ++ testing
+}
diff --git a/akka-bbb-fsesl/project/build.properties b/akka-bbb-fsesl/project/build.properties
index a6e117b61042ee81c62ba3a0fc5210d9502944df..2e6e3d24608ee15e892ed3b16d84224f7667e808 100755
--- a/akka-bbb-fsesl/project/build.properties
+++ b/akka-bbb-fsesl/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=1.2.6
\ No newline at end of file
diff --git a/akka-bbb-fsesl/project/plugins.sbt b/akka-bbb-fsesl/project/plugins.sbt
index 56e1e39f39dc0e78ca98f35d7c98f4c833509120..bc8c448553a2010f0c76ea69ccb7917f51ffef8a 100755
--- a/akka-bbb-fsesl/project/plugins.sbt
+++ b/akka-bbb-fsesl/project/plugins.sbt
@@ -1,11 +1,11 @@
addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
-addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
-
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.6")
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
+
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.12")
-addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.7")
+addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.8")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
diff --git a/akka-bbb-fsesl/run.sh b/akka-bbb-fsesl/run.sh
index 4015c4f1373a8caa1271bb9fa175c5940624bf89..97d3f3534508e5c4b3e816a8481bb4ae16b80644 100755
--- a/akka-bbb-fsesl/run.sh
+++ b/akka-bbb-fsesl/run.sh
@@ -1,3 +1 @@
-sbt clean
-sbt run
-
+sbt clean run
\ No newline at end of file
diff --git a/akka-bbb-fsesl/src/main/resources/application.conf b/akka-bbb-fsesl/src/main/resources/application.conf
index 37ac46cfee4c9c4a83c09df12747a5bbfeda6ac0..ac1acc3b350de7a5059eccf75d229db145a5a592 100755
--- a/akka-bbb-fsesl/src/main/resources/application.conf
+++ b/akka-bbb-fsesl/src/main/resources/application.conf
@@ -1,37 +1,37 @@
-akka {
- actor {
- debug {
- receive = on
- }
- }
- loggers = ["akka.event.slf4j.Slf4jLogger"]
- loglevel = "DEBUG"
- stdout-loglevel = "DEBUG"
-
- rediscala-subscriber-worker-dispatcher {
- mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
- # Throughput defines the maximum number of messages to be
- # processed per actor before the thread jumps to the next actor.
- # Set to 1 for as fair as possible.
- throughput = 512
- }
-}
-
-
-freeswitch {
- esl {
- host="127.0.0.1"
- port=8021
- password="ClueCon"
- }
- conf {
- profile="cdquality"
- }
-}
-
-redis {
- host="127.0.0.1"
- port=6379
- password=""
-}
-
+akka {
+ actor {
+ debug {
+ receive = on
+ }
+ }
+ loggers = ["akka.event.slf4j.Slf4jLogger"]
+ loglevel = "DEBUG"
+ stdout-loglevel = "DEBUG"
+
+ redis-subscriber-worker-dispatcher {
+ mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
+ # Throughput defines the maximum number of messages to be
+ # processed per actor before the thread jumps to the next actor.
+ # Set to 1 for as fair as possible.
+ throughput = 512
+ }
+}
+
+
+freeswitch {
+ esl {
+ host="127.0.0.1"
+ port=8021
+ password="ClueCon"
+ }
+ conf {
+ profile="cdquality"
+ }
+}
+
+redis {
+ host="127.0.0.1"
+ port=6379
+ password=""
+}
+
diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/Boot.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/Boot.scala
index 1ab8664c2b09a3489ca5c8aa60322a67ca47f57e..aad91e4ddd34681322d68a2a89cf912849dbfb55 100755
--- a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/Boot.scala
+++ b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/Boot.scala
@@ -1,19 +1,20 @@
package org.bigbluebutton
-import akka.actor.{ ActorSystem }
-
-import org.bigbluebutton.endpoint.redis.{ AppsRedisSubscriberActor, RedisPublisher }
+import org.bigbluebutton.common2.bus.IncomingJsonMessageBus
+import org.bigbluebutton.common2.redis.RedisPublisher
+import org.bigbluebutton.endpoint.redis.FSESLRedisSubscriberActor
import org.bigbluebutton.freeswitch.{ RxJsonMsgHdlrActor, VoiceConferenceService }
-import org.bigbluebutton.freeswitch.bus.InsonMsgBus
import org.bigbluebutton.freeswitch.voice.FreeswitchConferenceEventListener
import org.bigbluebutton.freeswitch.voice.freeswitch.{ ConnectionManager, ESLEventListener, FreeswitchApplication }
import org.freeswitch.esl.client.manager.DefaultManagerConnection
+import akka.actor.ActorSystem
+
object Boot extends App with SystemConfiguration {
implicit val system = ActorSystem("bigbluebutton-fsesl-system")
- val redisPublisher = new RedisPublisher(system)
+ val redisPublisher = new RedisPublisher(system, "BbbFsEslAkkaPub")
val eslConnection = new DefaultManagerConnection(eslHost, eslPort, eslPassword)
@@ -30,10 +31,9 @@ object Boot extends App with SystemConfiguration {
val fsApplication = new FreeswitchApplication(connManager, fsProfile)
fsApplication.start()
- val inJsonMsgBus = new InsonMsgBus
+ val inJsonMsgBus = new IncomingJsonMessageBus
val redisMessageHandlerActor = system.actorOf(RxJsonMsgHdlrActor.props(fsApplication))
inJsonMsgBus.subscribe(redisMessageHandlerActor, toFsAppsJsonChannel)
- val redisSubscriberActor = system.actorOf(AppsRedisSubscriberActor.props(system, inJsonMsgBus), "redis-subscriber")
-
+ val redisSubscriberActor = system.actorOf(FSESLRedisSubscriberActor.props(system, inJsonMsgBus), "redis-subscriber")
}
diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/SystemConfiguration.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
index c9c776a410d714d2e28627a173e97a075500050e..188d202835c68438d44ba8fc7f26308fb929d5d2 100755
--- a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
+++ b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
@@ -1,23 +1,15 @@
package org.bigbluebutton
-import com.typesafe.config.ConfigFactory
import scala.util.Try
-trait SystemConfiguration {
-
- val config = ConfigFactory.load()
+import org.bigbluebutton.common2.redis.RedisConfiguration
+trait SystemConfiguration extends RedisConfiguration {
lazy val eslHost = Try(config.getString("freeswitch.esl.host")).getOrElse("127.0.0.1")
lazy val eslPort = Try(config.getInt("freeswitch.esl.port")).getOrElse(8021)
lazy val eslPassword = Try(config.getString("freeswitch.esl.password")).getOrElse("ClueCon")
lazy val fsProfile = Try(config.getString("freeswitch.conf.profile")).getOrElse("cdquality")
- lazy val redisHost = Try(config.getString("redis.host")).getOrElse("127.0.0.1")
- lazy val redisPort = Try(config.getInt("redis.port")).getOrElse(6379)
- lazy val redisPassword = Try(config.getString("redis.password")).getOrElse("")
-
- lazy val toVoiceConfRedisChannel = Try(config.getString("redis.toVoiceConfRedisChannel")).getOrElse("to-voice-conf-redis-channel")
- lazy val fromVoiceConfRedisChannel = Try(config.getString("redis.fromVoiceConfRedisChannel")).getOrElse("from-voice-conf-redis-channel")
lazy val toFsAppsJsonChannel = Try(config.getString("eventBus.toFsAppsChannel")).getOrElse("to-fs-apps-json-channel")
lazy val fromFsAppsJsonChannel = Try(config.getString("eventBus.fromFsAppsChannel")).getOrElse("from-fs-apps-json-channel")
}
diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
deleted file mode 100755
index 4f969be0b6465347544e038f95917fa3c8a1794e..0000000000000000000000000000000000000000
--- a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.bigbluebutton.endpoint.redis
-
-import java.io.PrintWriter
-import java.io.StringWriter
-import java.net.InetSocketAddress
-
-import scala.concurrent.ExecutionContext.Implicits.global
-import scala.concurrent.duration.DurationInt
-import org.bigbluebutton.SystemConfiguration
-import akka.actor.ActorSystem
-import akka.actor.OneForOneStrategy
-import akka.actor.Props
-import akka.actor.SupervisorStrategy.Resume
-import org.bigbluebutton.freeswitch.bus.{ InJsonMsg, InsonMsgBus, ReceivedJsonMsg }
-import redis.actors.RedisSubscriberActor
-import redis.api.pubsub.Message
-import redis.api.pubsub.PMessage
-import redis.api.servers.ClientSetname
-
-object AppsRedisSubscriberActor extends SystemConfiguration {
-
- val channels = Seq(toVoiceConfRedisChannel)
- val patterns = Seq("bigbluebutton:to-voice-conf:*", "bigbluebutton:from-bbb-apps:*")
-
- def props(system: ActorSystem, inJsonMgBus: InsonMsgBus): Props =
- Props(classOf[AppsRedisSubscriberActor], system, inJsonMgBus,
- redisHost, redisPort,
- channels, patterns).withDispatcher("akka.rediscala-subscriber-worker-dispatcher")
-}
-
-class AppsRedisSubscriberActor(
- val system: ActorSystem,
- inJsonMgBus: InsonMsgBus, redisHost: String,
- redisPort: Int,
- channels: Seq[String] = Nil, patterns: Seq[String] = Nil)
- extends RedisSubscriberActor(
- new InetSocketAddress(redisHost, redisPort),
- channels, patterns, onConnectStatus = connected => { println(s"connected: $connected") }) with SystemConfiguration {
-
- override val supervisorStrategy = OneForOneStrategy(maxNrOfRetries = 10, withinTimeRange = 1 minute) {
- case e: Exception => {
- val sw: StringWriter = new StringWriter()
- sw.write("An exception has been thrown on AppsRedisSubscriberActor, exception message [" + e.getMessage() + "] (full stacktrace below)\n")
- e.printStackTrace(new PrintWriter(sw))
- log.error(sw.toString())
- Resume
- }
- }
-
- // val decoder = new FromJsonDecoder()
-
- var lastPongReceivedOn = 0L
- system.scheduler.schedule(10 seconds, 10 seconds)(checkPongMessage())
-
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- write(ClientSetname("BbbFsEslAkkaSub").encodedRequest)
-
- def checkPongMessage() {
- val now = System.currentTimeMillis()
-
- if (lastPongReceivedOn != 0 && (now - lastPongReceivedOn > 30000)) {
- log.error("FSESL pubsub error!");
- }
- }
-
- def onMessage(message: Message) {
- if (message.channel == toVoiceConfRedisChannel) {
- val receivedJsonMessage = new ReceivedJsonMsg(message.channel, message.data.utf8String)
- log.debug(s"RECEIVED:\n [${receivedJsonMessage.channel}] \n ${receivedJsonMessage.data} \n")
- inJsonMgBus.publish(InJsonMsg(toFsAppsJsonChannel, receivedJsonMessage))
- }
- }
-
- def onPMessage(pmessage: PMessage) {
- // log.debug(s"pattern message received: $pmessage")
- }
-
- def handleMessage(msg: String) {
- log.warning("**** TODO: Handle pubsub messages. ****")
- }
-}
diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/FSESLRedisSubscriberActor.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/FSESLRedisSubscriberActor.scala
new file mode 100755
index 0000000000000000000000000000000000000000..016bc9890b42407769b824287b1705f415063b9e
--- /dev/null
+++ b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/FSESLRedisSubscriberActor.scala
@@ -0,0 +1,46 @@
+package org.bigbluebutton.endpoint.redis
+
+import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.duration.DurationInt
+
+import org.bigbluebutton.SystemConfiguration
+import org.bigbluebutton.common2.bus.IncomingJsonMessageBus
+import org.bigbluebutton.common2.redis.{ RedisSubscriber, RedisSubscriberProvider }
+
+import akka.actor.ActorSystem
+import akka.actor.Props
+
+object FSESLRedisSubscriberActor extends RedisSubscriber {
+
+ val channels = Seq(toVoiceConfRedisChannel)
+ val patterns = Seq("bigbluebutton:to-voice-conf:*", "bigbluebutton:from-bbb-apps:*")
+
+ def props(system: ActorSystem, inJsonMgBus: IncomingJsonMessageBus): Props =
+ Props(
+ classOf[FSESLRedisSubscriberActor],
+ system, inJsonMgBus,
+ redisHost, redisPort,
+ channels, patterns).withDispatcher("akka.redis-subscriber-worker-dispatcher")
+}
+
+class FSESLRedisSubscriberActor(
+ system: ActorSystem,
+ inJsonMgBus: IncomingJsonMessageBus,
+ redisHost: String, redisPort: Int,
+ channels: Seq[String] = Nil, patterns: Seq[String] = Nil)
+ extends RedisSubscriberProvider(system, "BbbFsEslAkkaSub", channels, patterns, inJsonMgBus) with SystemConfiguration {
+
+ var lastPongReceivedOn = 0L
+ system.scheduler.schedule(10 seconds, 10 seconds)(checkPongMessage())
+
+ def checkPongMessage() {
+ val now = System.currentTimeMillis()
+
+ if (lastPongReceivedOn != 0 && (now - lastPongReceivedOn > 30000)) {
+ log.error("FSESL pubsub error!");
+ }
+ }
+
+ addListener(toFsAppsJsonChannel)
+ subscribe()
+}
\ No newline at end of file
diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPublisher.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPublisher.scala
deleted file mode 100755
index 11acf3d06d30cd2574e3e38a26befc09fae7166d..0000000000000000000000000000000000000000
--- a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPublisher.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.bigbluebutton.endpoint.redis
-
-import redis.RedisClient
-import akka.actor.ActorSystem
-import org.bigbluebutton.SystemConfiguration
-
-class RedisPublisher(val system: ActorSystem) extends SystemConfiguration {
-
- val redis = RedisClient(redisHost, redisPort)(system)
-
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- redis.clientSetname("BbbFsEslAkkaPub")
-
- def publish(channel: String, data: String) {
- //println("PUBLISH TO [" + channel + "]: \n [" + data + "]")
- redis.publish(channel, data)
- }
-
-}
diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgHdlrActor.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgHdlrActor.scala
index 378210c50ca7307ba0927d0d84fc0f18997471ee..dc839a9f3162c165c0ec3521fd1fa0a931147fd3 100755
--- a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgHdlrActor.scala
+++ b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/RxJsonMsgHdlrActor.scala
@@ -1,12 +1,16 @@
package org.bigbluebutton.freeswitch
-import akka.actor.{ Actor, ActorLogging, Props }
-import com.fasterxml.jackson.databind.JsonNode
import org.bigbluebutton.SystemConfiguration
+import org.bigbluebutton.common2.bus.ReceivedJsonMessage
import org.bigbluebutton.common2.msgs._
-import org.bigbluebutton.freeswitch.bus.ReceivedJsonMsg
import org.bigbluebutton.freeswitch.voice.freeswitch.FreeswitchApplication
+import com.fasterxml.jackson.databind.JsonNode
+
+import akka.actor.Actor
+import akka.actor.ActorLogging
+import akka.actor.Props
+
object RxJsonMsgHdlrActor {
def props(fsApp: FreeswitchApplication): Props =
Props(classOf[RxJsonMsgHdlrActor], fsApp)
@@ -15,13 +19,13 @@ object RxJsonMsgHdlrActor {
class RxJsonMsgHdlrActor(val fsApp: FreeswitchApplication) extends Actor with ActorLogging
with SystemConfiguration with RxJsonMsgDeserializer {
def receive = {
- case msg: ReceivedJsonMsg =>
+ case msg: ReceivedJsonMessage =>
log.debug("handling {} - {}", msg.channel, msg.data)
handleReceivedJsonMessage(msg)
case _ => // do nothing
}
- def handleReceivedJsonMessage(msg: ReceivedJsonMsg): Unit = {
+ def handleReceivedJsonMessage(msg: ReceivedJsonMessage): Unit = {
for {
envJsonNode <- JsonDeserializer.toBbbCommonEnvJsNodeMsg(msg.data)
} yield handle(envJsonNode.envelope, envJsonNode.core)
diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
index f82d08080087570a5b1102f2e972443904c10163..a72302e7f3fdbbd6093f8d7c206668e7fe251aca 100755
--- a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
+++ b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
@@ -2,9 +2,9 @@ package org.bigbluebutton.freeswitch
import org.bigbluebutton.SystemConfiguration
import org.bigbluebutton.freeswitch.voice.IVoiceConferenceService
-import org.bigbluebutton.endpoint.redis.RedisPublisher
import org.bigbluebutton.common2.msgs._
-import org.bigbluebutton.common2.util.JsonUtil
+import org.bigbluebutton.common2.util.JsonUtil
+import org.bigbluebutton.common2.redis.RedisPublisher
class VoiceConferenceService(sender: RedisPublisher) extends IVoiceConferenceService with SystemConfiguration {
diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/bus/InJsonMsgBus.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/bus/InJsonMsgBus.scala
deleted file mode 100755
index 6f7bb865ea8c1002d7f6ff16655a3c2eb016568e..0000000000000000000000000000000000000000
--- a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/bus/InJsonMsgBus.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.bigbluebutton.freeswitch.bus
-
-import akka.actor.ActorRef
-import akka.event.{ EventBus, LookupClassification }
-
-case class ReceivedJsonMsg(channel: String, data: String)
-case class InJsonMsg(val topic: String, val payload: ReceivedJsonMsg)
-
-class InsonMsgBus extends EventBus with LookupClassification {
- type Event = InJsonMsg
- type Classifier = String
- type Subscriber = ActorRef
-
- // is used for extracting the classifier from the incoming events
- override protected def classify(event: Event): Classifier = event.topic
-
- // will be invoked for each event for all subscribers which registered themselves
- // for the event’s classifier
- override protected def publish(event: Event, subscriber: Subscriber): Unit = {
- subscriber ! event.payload
- }
-
- // must define a full order over the subscribers, expressed as expected from
- // `java.lang.Comparable.compare`
- override protected def compareSubscribers(a: Subscriber, b: Subscriber): Int =
- a.compareTo(b)
-
- // determines the initial size of the index data structure
- // used internally (i.e. the expected number of different classifiers)
- override protected def mapSize: Int = 128
-}
diff --git a/bbb-apps-common/build.sbt b/bbb-apps-common/build.sbt
index 693e0e360cde0a9ce16593b4d235f9a6e0d9eb10..9a31293e2a7201ccbe2e0c514da9c4b7a4ac3c33 100755
--- a/bbb-apps-common/build.sbt
+++ b/bbb-apps-common/build.sbt
@@ -1,20 +1,23 @@
-
-name := "bbb-apps-common"
-
-organization := "org.bigbluebutton"
-
-version := "0.0.3-SNAPSHOT"
-
-scalaVersion := "2.12.6"
-
-scalacOptions ++= Seq(
- "-unchecked",
- "-deprecation",
- "-Xlint",
- "-Ywarn-dead-code",
- "-language:_",
- "-target:jvm-1.8",
- "-encoding", "UTF-8"
+import org.bigbluebutton.build._
+
+version := "0.0.4-SNAPSHOT"
+
+val compileSettings = Seq(
+ organization := "org.bigbluebutton",
+
+ scalacOptions ++= List(
+ "-unchecked",
+ "-deprecation",
+ "-Xlint",
+ "-Ywarn-dead-code",
+ "-language:_",
+ "-target:jvm-1.8",
+ "-encoding", "UTF-8"
+ ),
+ javacOptions ++= List(
+ "-Xlint:unchecked",
+ "-Xlint:deprecation"
+ )
)
// We want to have our jar files in lib_managed dir.
@@ -22,57 +25,8 @@ scalacOptions ++= Seq(
// into eclipse.
retrieveManaged := true
-testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console", "junitxml")
-
-testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports")
-
-val akkaVersion = "2.5.14"
-val scalaTestV = "2.2.6"
-
-// https://mvnrepository.com/artifact/org.scala-lang/scala-library
-libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value
-// https://mvnrepository.com/artifact/org.scala-lang/scala-compiler
-libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value
-
-// https://mvnrepository.com/artifact/com.typesafe.akka/akka-actor_2.12
-libraryDependencies += "com.typesafe.akka" % "akka-actor_2.12" % "2.5.1"
-// https://mvnrepository.com/artifact/com.typesafe.akka/akka-slf4j_2.12
-libraryDependencies += "com.typesafe.akka" % "akka-slf4j_2.12" % "2.5.1"
-
-// https://mvnrepository.com/artifact/com.github.etaty/rediscala_2.12
-libraryDependencies += "com.github.etaty" % "rediscala_2.12" % "1.8.0"
-
-libraryDependencies += "com.softwaremill.quicklens" %% "quicklens" % "1.4.11"
-
-libraryDependencies += "org.bigbluebutton" % "bbb-common-message_2.12" % "0.0.19-SNAPSHOT"
-
-libraryDependencies += "com.google.code.gson" % "gson" % "2.8.5"
-libraryDependencies += "redis.clients" % "jedis" % "2.9.0"
-
-// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
-libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.7"
-libraryDependencies += "commons-io" % "commons-io" % "2.4"
-libraryDependencies += "org.apache.commons" % "commons-pool2" % "2.6.0"
-libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.23" % "provided"
-
-
-libraryDependencies += "junit" % "junit" % "4.12" % "test"
-libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
-
-// For generating test reports
-libraryDependencies += "org.pegdown" % "pegdown" % "1.6.0" % "test"
-// https://mvnrepository.com/artifact/com.typesafe.akka/akka-testkit_2.12
-libraryDependencies += "com.typesafe.akka" % "akka-testkit_2.12" % "2.5.1" % "test"
-
-// https://mvnrepository.com/artifact/org.scalactic/scalactic_2.12
-libraryDependencies += "org.scalactic" % "scalactic_2.12" % "3.0.3" % "test"
-
-// https://mvnrepository.com/artifact/org.scalatest/scalatest_2.12
-libraryDependencies += "org.scalatest" % "scalatest_2.12" % "3.0.3" % "test"
-
-libraryDependencies += "org.mockito" % "mockito-core" % "2.7.22" % "test"
-
-seq(Revolver.settings: _*)
+Seq(Revolver.settings: _*)
+lazy val appsCommons = (project in file(".")).settings(name := "bbb-apps-common", libraryDependencies ++= Dependencies.runtime).settings(compileSettings)
//-----------
// Packaging
@@ -133,5 +87,3 @@ pomExtra := (
licenses := Seq("LGPL-3.0" -> url("http://opensource.org/licenses/LGPL-3.0"))
homepage := Some(url("http://www.bigbluebutton.org"))
-
-
diff --git a/bbb-apps-common/deploy.sh b/bbb-apps-common/deploy.sh
index ccba754eaaf8182e665e94d1210571e23ebfb7b4..f829bc13dc598da480ee4e512a87c9436925a359 100755
--- a/bbb-apps-common/deploy.sh
+++ b/bbb-apps-common/deploy.sh
@@ -1,2 +1 @@
-sbt clean
-sbt publish publishLocal
+sbt clean publish publishLocal
diff --git a/bbb-apps-common/project/Dependencies.scala b/bbb-apps-common/project/Dependencies.scala
new file mode 100644
index 0000000000000000000000000000000000000000..86f51a25ef7c86fa3e7f0a0f0a11c094d9bbf46d
--- /dev/null
+++ b/bbb-apps-common/project/Dependencies.scala
@@ -0,0 +1,57 @@
+package org.bigbluebutton.build
+
+import sbt._
+import Keys._
+
+object Dependencies {
+
+ object Versions {
+ // Scala
+ val scala = "2.12.7"
+
+ // Libraries
+ val akkaVersion = "2.5.17"
+ val gson = "2.8.5"
+ val sl4j = "1.7.25"
+ val quicklens = "1.4.11"
+
+ // Apache Commons
+ val lang = "3.8.1"
+ val io = "2.6"
+ val pool = "2.6.0"
+
+ // BigBlueButton
+ val bbbCommons = "0.0.20-SNAPSHOT"
+ }
+
+ object Compile {
+ val scalaLibrary = "org.scala-lang" % "scala-library" % Versions.scala
+ val scalaCompiler = "org.scala-lang" % "scala-compiler" % Versions.scala
+
+ val akkaActor = "com.typesafe.akka" % "akka-actor_2.12" % Versions.akkaVersion
+ val akkaSl4fj = "com.typesafe.akka" % "akka-slf4j_2.12" % Versions.akkaVersion
+
+ val googleGson = "com.google.code.gson" % "gson" % Versions.gson
+ val quicklens = "com.softwaremill.quicklens" %% "quicklens" % Versions.quicklens
+ val sl4jApi = "org.slf4j" % "slf4j-api" % Versions.sl4j % "provided"
+
+ val apacheLang = "org.apache.commons" % "commons-lang3" % Versions.lang
+ val apacheIo = "commons-io" % "commons-io" % Versions.io
+ val apachePool2 = "org.apache.commons" % "commons-pool2" % Versions.pool
+
+ val bbbCommons = "org.bigbluebutton" % "bbb-common-message_2.12" % Versions.bbbCommons
+ }
+
+ val runtime = Seq(
+ Compile.scalaLibrary,
+ Compile.scalaCompiler,
+ Compile.akkaActor,
+ Compile.akkaSl4fj,
+ Compile.googleGson,
+ Compile.quicklens,
+ Compile.sl4jApi,
+ Compile.apacheLang,
+ Compile.apacheIo,
+ Compile.apachePool2,
+ Compile.bbbCommons)
+}
diff --git a/bbb-apps-common/project/build.properties b/bbb-apps-common/project/build.properties
index a6e117b61042ee81c62ba3a0fc5210d9502944df..2e6e3d24608ee15e892ed3b16d84224f7667e808 100755
--- a/bbb-apps-common/project/build.properties
+++ b/bbb-apps-common/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=1.2.6
\ No newline at end of file
diff --git a/bbb-apps-common/project/plugins.sbt b/bbb-apps-common/project/plugins.sbt
index 1a99bbcaf45749dbd833d7f6141744e2062bb181..3559bf68d62ef19f25fa810533bbe596eb022d02 100755
--- a/bbb-apps-common/project/plugins.sbt
+++ b/bbb-apps-common/project/plugins.sbt
@@ -1,9 +1,9 @@
-addSbtPlugin("io.spray" % "sbt-revolver" % "0.7.2")
+addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
-addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.7")
+addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.8")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ClientGWApplication.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ClientGWApplication.scala
index 9f0bf267da240b1da0d28ae1f8231cfed4f00891..bad84e615018bd9a435aad7f8f63a3f95855270d 100644
--- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ClientGWApplication.scala
+++ b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ClientGWApplication.scala
@@ -3,12 +3,16 @@ package org.bigbluebutton.client
import akka.actor.ActorSystem
import akka.event.Logging
import org.bigbluebutton.client.bus._
-import org.bigbluebutton.client.endpoint.redis.{AppsRedisSubscriberActor, MessageSender, RedisPublisher}
+import org.bigbluebutton.client.endpoint.redis.Red5AppsRedisSubscriberActor
import org.bigbluebutton.client.meeting.MeetingManagerActor
+import org.bigbluebutton.common2.redis.RedisPublisher
import scala.concurrent.duration._
+import org.bigbluebutton.common2.redis.MessageSender
+import org.bigbluebutton.api2.bus.MsgFromAkkaAppsEventBus
+import org.bigbluebutton.common2.bus.JsonMsgFromAkkaAppsBus
-class ClientGWApplication(val msgToClientGW: MsgToClientGW) extends SystemConfiguration{
+class ClientGWApplication(val msgToClientGW: MsgToClientGW) extends SystemConfiguration {
implicit val system = ActorSystem("bbb-apps-common")
implicit val timeout = akka.util.Timeout(3 seconds)
@@ -20,7 +24,7 @@ class ClientGWApplication(val msgToClientGW: MsgToClientGW) extends SystemConfig
private val msgToRedisEventBus = new MsgToRedisEventBus
private val msgToClientEventBus = new MsgToClientEventBus
- private val redisPublisher = new RedisPublisher(system)
+ private val redisPublisher = new RedisPublisher(system, "Red5AppsPub")
private val msgSender: MessageSender = new MessageSender(redisPublisher)
private val meetingManagerActorRef = system.actorOf(
@@ -41,19 +45,17 @@ class ClientGWApplication(val msgToClientGW: MsgToClientGW) extends SystemConfig
msgToClientEventBus.subscribe(msgToClientJsonActor, toClientChannel)
- private val appsRedisSubscriberActor = system.actorOf(
- AppsRedisSubscriberActor.props(receivedJsonMsgBus), "appsRedisSubscriberActor")
+ private val appsRedisSubscriberActor = system.actorOf(Red5AppsRedisSubscriberActor.props(system, receivedJsonMsgBus), "appsRedisSubscriberActor")
private val receivedJsonMsgHdlrActor = system.actorOf(
ReceivedJsonMsgHdlrActor.props(msgFromAkkaAppsEventBus), "receivedJsonMsgHdlrActor")
receivedJsonMsgBus.subscribe(receivedJsonMsgHdlrActor, fromAkkaAppsJsonChannel)
-
/**
- *
- * External Interface for Gateway
- */
+ *
+ * External Interface for Gateway
+ */
def connect(connInfo: ConnInfo): Unit = {
//log.debug("**** ClientGWApplication connect " + connInfo)
diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/MsgToRedisActor.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/MsgToRedisActor.scala
index 94b37ae92489caf176caa2a5b3191dbaeb4d3fd4..5a3ce496ff2c1827b741c8106adf66693af2f2c1 100644
--- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/MsgToRedisActor.scala
+++ b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/MsgToRedisActor.scala
@@ -1,10 +1,10 @@
package org.bigbluebutton.client
-import akka.actor.{Actor, ActorLogging, Props}
+import akka.actor.{ Actor, ActorLogging, Props }
import org.bigbluebutton.common2.msgs.BbbCommonEnvJsNodeMsg
-import org.bigbluebutton.common2.util.JsonUtil
-import org.bigbluebutton.client.endpoint.redis.MessageSender
+import org.bigbluebutton.common2.util.JsonUtil
import org.bigbluebutton.common2.msgs.LookUpUserReqMsg
+import org.bigbluebutton.common2.redis.MessageSender
object MsgToRedisActor {
def props(msgSender: MessageSender): Props =
@@ -20,11 +20,10 @@ class MsgToRedisActor(msgSender: MessageSender)
def handle(msg: BbbCommonEnvJsNodeMsg): Unit = {
val json = JsonUtil.toJson(msg)
-
+
msg.envelope.name match {
case LookUpUserReqMsg.NAME => msgSender.send(toThirdPartyRedisChannel, json)
- case _ => msgSender.send(toAkkaAppsRedisChannel, json)
+ case _ => msgSender.send(toAkkaAppsRedisChannel, json)
}
}
-
}
diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ReceivedJsonMsgHdlrActor.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ReceivedJsonMsgHdlrActor.scala
index d18cb333ed7e2cbd1066db5c11e61bf3e50160e8..ea6c3a3b660418de17a5c7969212f142d6f9e95e 100755
--- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ReceivedJsonMsgHdlrActor.scala
+++ b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ReceivedJsonMsgHdlrActor.scala
@@ -1,11 +1,13 @@
package org.bigbluebutton.client
import akka.actor.{Actor, ActorLogging, Props}
-import org.bigbluebutton.client.bus.{JsonMsgFromAkkaApps, MsgFromAkkaApps, MsgFromAkkaAppsEventBus}
import org.bigbluebutton.common2.msgs.BbbCommonEnvJsNodeMsg
import org.bigbluebutton.common2.util.JsonUtil
-import scala.util.{Failure, Success}
+import scala.util.{Failure, Success}
+import org.bigbluebutton.common2.bus.JsonMsgFromAkkaApps
+import org.bigbluebutton.api2.bus.MsgFromAkkaAppsEventBus
+import org.bigbluebutton.api2.bus.MsgFromAkkaApps
object ReceivedJsonMsgHdlrActor {
diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ReceivedMessageRouter.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ReceivedMessageRouter.scala
index 701be0b1654e89eb0a0d7b7cad51305b7b72be7d..232720efbf4c61140f6ec0d5ddfe963e189cfd27 100755
--- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ReceivedMessageRouter.scala
+++ b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ReceivedMessageRouter.scala
@@ -1,6 +1,6 @@
-package org.bigbluebutton.client
-
-import org.bigbluebutton.client.bus.{MsgFromAkkaApps, MsgFromAkkaAppsEventBus}
+package org.bigbluebutton.client
+
+import org.bigbluebutton.api2.bus.{ MsgFromAkkaApps, MsgFromAkkaAppsEventBus }
trait ReceivedMessageRouter {
val msgFromAkkaAppsEventBus: MsgFromAkkaAppsEventBus
diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/SystemConfiguration.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/SystemConfiguration.scala
index 26e7528bbbb99e0b0424c9ca0e269c0cde477089..0f9d34cfadcaa854d871330a1434928744281ebd 100644
--- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/SystemConfiguration.scala
+++ b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/SystemConfiguration.scala
@@ -1,17 +1,10 @@
package org.bigbluebutton.client
import scala.util.Try
-import com.typesafe.config.ConfigFactory
-trait SystemConfiguration {
- val config = ConfigFactory.load()
+import org.bigbluebutton.common2.redis.RedisConfiguration
- lazy val redisHost = Try(config.getString("redis.host")).getOrElse("127.0.0.1")
- lazy val redisPort = Try(config.getInt("redis.port")).getOrElse(6379)
- lazy val redisPassword = Try(config.getString("redis.password")).getOrElse("")
-
- lazy val toAkkaAppsRedisChannel = Try(config.getString("redis.toAkkaAppsRedisChannel")).getOrElse("to-akka-apps-redis-channel")
- lazy val fromAkkaAppsRedisChannel = Try(config.getString("redis.fromAkkaAppsRedisChannel")).getOrElse("from-akka-apps-redis-channel")
+trait SystemConfiguration extends RedisConfiguration {
lazy val toThirdPartyRedisChannel = Try(config.getString("redis.toThirdPartyRedisChannel")).getOrElse("to-third-party-redis-channel")
lazy val fromThirdPartyRedisChannel = Try(config.getString("redis.fromThirdPartyRedisChannel")).getOrElse("from-third-party-redis-channel")
lazy val fromAkkaAppsChannel = Try(config.getString("eventBus.fromAkkaAppsChannel")).getOrElse("from-akka-apps-channel")
@@ -19,8 +12,4 @@ trait SystemConfiguration {
lazy val fromClientChannel = Try(config.getString("eventBus.fromClientChannel")).getOrElse("from-client-channel")
lazy val toClientChannel = Try(config.getString("eventBus.toClientChannel")).getOrElse("to-client-channel")
lazy val fromAkkaAppsJsonChannel = Try(config.getString("eventBus.fromAkkaAppsChannel")).getOrElse("from-akka-apps-json-channel")
-
- lazy val fromAkkaAppsWbRedisChannel = Try(config.getString("redis.fromAkkaAppsWbRedisChannel")).getOrElse("from-akka-apps-wb-redis-channel")
- lazy val fromAkkaAppsChatRedisChannel = Try(config.getString("redis.fromAkkaAppsChatRedisChannel")).getOrElse("from-akka-apps-chat-redis-channel")
- lazy val fromAkkaAppsPresRedisChannel = Try(config.getString("redis.fromAkkaAppsPresRedisChannel")).getOrElse("from-akka-apps-pres-redis-channel")
}
diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/JsonMsgFromAkkaAppsBus.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/JsonMsgFromAkkaAppsBus.scala
deleted file mode 100755
index ad28aa0618eb0ce5298feb8be9383ff2850d4c5c..0000000000000000000000000000000000000000
--- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/JsonMsgFromAkkaAppsBus.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.bigbluebutton.client.bus
-
-import akka.actor.ActorRef
-import akka.event.{EventBus, LookupClassification}
-
-case class JsonMsgFromAkkaApps(name: String, data: String)
-case class JsonMsgFromAkkaAppsEvent(val topic: String, val payload: JsonMsgFromAkkaApps)
-
-class JsonMsgFromAkkaAppsBus extends EventBus with LookupClassification {
- type Event = JsonMsgFromAkkaAppsEvent
- type Classifier = String
- type Subscriber = ActorRef
-
- // is used for extracting the classifier from the incoming events
- override protected def classify(event: Event): Classifier = event.topic
-
- // will be invoked for each event for all subscribers which registered themselves
- // for the event’s classifier
- override protected def publish(event: Event, subscriber: Subscriber): Unit = {
- subscriber ! event.payload
- }
-
- // must define a full order over the subscribers, expressed as expected from
- // `java.lang.Comparable.compare`
- override protected def compareSubscribers(a: Subscriber, b: Subscriber): Int =
- a.compareTo(b)
-
- // determines the initial size of the index data structure
- // used internally (i.e. the expected number of different classifiers)
- override protected def mapSize: Int = 128
-
-}
diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgFromAkkaAppsEventBus.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgFromAkkaAppsEventBus.scala
deleted file mode 100755
index 20dc5055368e2084c2f8c3dc50e6fcf88f870135..0000000000000000000000000000000000000000
--- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/bus/MsgFromAkkaAppsEventBus.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.bigbluebutton.client.bus
-
-import akka.actor.ActorRef
-import akka.event.{EventBus, LookupClassification}
-import org.bigbluebutton.common2.msgs.{ BbbCommonEnvJsNodeMsg}
-
-case class MsgFromAkkaApps(val topic: String, val payload: BbbCommonEnvJsNodeMsg)
-
-class MsgFromAkkaAppsEventBus extends EventBus with LookupClassification {
- type Event = MsgFromAkkaApps
- type Classifier = String
- type Subscriber = ActorRef
-
- // is used for extracting the classifier from the incoming events
- override protected def classify(event: Event): Classifier = event.topic
-
- // will be invoked for each event for all subscribers which registered themselves
- // for the event’s classifier
- override protected def publish(event: Event, subscriber: Subscriber): Unit = {
- subscriber ! event.payload
- }
-
- // must define a full order over the subscribers, expressed as expected from
- // `java.lang.Comparable.compare`
- override protected def compareSubscribers(a: Subscriber, b: Subscriber): Int =
- a.compareTo(b)
-
- // determines the initial size of the index data structure
- // used internally (i.e. the expected number of different classifiers)
- override protected def mapSize: Int = 128
-}
diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/AppsRedisSubscriberActor.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/AppsRedisSubscriberActor.scala
deleted file mode 100644
index 2d3a30fe97fac898b5d91ae743c4c096d5c67658..0000000000000000000000000000000000000000
--- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/AppsRedisSubscriberActor.scala
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.bigbluebutton.client.endpoint.redis
-
-import akka.actor.{ActorLogging, OneForOneStrategy, Props}
-import akka.actor.SupervisorStrategy.Resume
-import java.io.{PrintWriter, StringWriter}
-import java.net.InetSocketAddress
-
-import redis.actors.RedisSubscriberActor
-import redis.api.pubsub.{Message, PMessage}
-
-import scala.concurrent.duration._
-import org.bigbluebutton.client._
-import org.bigbluebutton.client.bus.{JsonMsgFromAkkaApps, JsonMsgFromAkkaAppsBus, JsonMsgFromAkkaAppsEvent}
-import redis.api.servers.ClientSetname
-
-object AppsRedisSubscriberActor extends SystemConfiguration {
-
- val channels = Seq(fromAkkaAppsRedisChannel, fromAkkaAppsWbRedisChannel, fromAkkaAppsChatRedisChannel, fromAkkaAppsPresRedisChannel, fromThirdPartyRedisChannel)
- val patterns = Seq("bigbluebutton:from-bbb-apps:*")
-
- def props(jsonMsgBus: JsonMsgFromAkkaAppsBus): Props =
- Props(classOf[AppsRedisSubscriberActor], jsonMsgBus,
- redisHost, redisPort,
- channels, patterns).withDispatcher("akka.rediscala-subscriber-worker-dispatcher")
-}
-
-class AppsRedisSubscriberActor(jsonMsgBus: JsonMsgFromAkkaAppsBus, redisHost: String,
- redisPort: Int,
- channels: Seq[String] = Nil, patterns: Seq[String] = Nil)
- extends RedisSubscriberActor(new InetSocketAddress(redisHost, redisPort),
- channels, patterns, onConnectStatus = connected => { println(s"connected: $connected") })
- with SystemConfiguration with ActorLogging {
-
- override val supervisorStrategy = OneForOneStrategy(maxNrOfRetries = 10, withinTimeRange = 1 minute) {
- case e: Exception => {
- val sw: StringWriter = new StringWriter()
- sw.write("An exception has been thrown on AppsRedisSubscriberActor, exception message [" + e.getMessage() + "] (full stacktrace below)\n")
- e.printStackTrace(new PrintWriter(sw))
- log.error(sw.toString())
- Resume
- }
- }
-
-
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- write(ClientSetname("Red5AppsSub").encodedRequest)
-
- def onMessage(message: Message) {
- if (channels.contains(message.channel)) {
- //log.debug(s"RECEIVED:\n ${message.data.utf8String} \n")
- val receivedJsonMessage = new JsonMsgFromAkkaApps(message.channel, message.data.utf8String)
- jsonMsgBus.publish(JsonMsgFromAkkaAppsEvent(fromAkkaAppsJsonChannel, receivedJsonMessage))
- }
-
- }
-
- def onPMessage(pmessage: PMessage) {
- // We don't use PSubscribe anymore, but an implementation of the method is required
- log.error("Should not be receiving a PMessage. It triggered on a match of pattern: " + pmessage.patternMatched)
- }
-}
diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/KeepAliveRedisPublisher.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/KeepAliveRedisPublisher.scala
deleted file mode 100755
index 131a2d46ceec85cc9d5f870ca32f381c70f797d9..0000000000000000000000000000000000000000
--- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/KeepAliveRedisPublisher.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.bigbluebutton.client.endpoint.redis
-
-import scala.concurrent.duration._
-import scala.concurrent.ExecutionContext.Implicits.global
-import akka.actor.ActorSystem
-import org.bigbluebutton.client.SystemConfiguration
-//import org.bigbluebutton.common.messages.BbbAppsIsAliveMessage
-
-class KeepAliveRedisPublisher(val system: ActorSystem, sender: RedisPublisher) extends SystemConfiguration {
-
- val startedOn = System.currentTimeMillis()
-
- system.scheduler.schedule(2 seconds, 5 seconds) {
-// val msg = new BbbAppsIsAliveMessage(startedOn, System.currentTimeMillis())
-// sender.publish("bigbluebutton:from-bbb-apps:keepalive", msg.toJson())
- }
-}
diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/MessageSender.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/MessageSender.scala
deleted file mode 100755
index 191af624c8c0e67aa8be845784a1ca9942ed3255..0000000000000000000000000000000000000000
--- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/MessageSender.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.bigbluebutton.client.endpoint.redis
-
-class MessageSender(publisher: RedisPublisher) {
-
- def send(channel: String, data: String) {
- publisher.publish(channel, data)
- }
-}
diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/Red5AppsRedisSubscriberActor.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/Red5AppsRedisSubscriberActor.scala
new file mode 100644
index 0000000000000000000000000000000000000000..0281a091f34ae86e23e4494eef8682934775e904
--- /dev/null
+++ b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/Red5AppsRedisSubscriberActor.scala
@@ -0,0 +1,50 @@
+package org.bigbluebutton.client.endpoint.redis
+
+import org.bigbluebutton.common2.redis.RedisSubscriberProvider
+import io.lettuce.core.pubsub.RedisPubSubListener
+import org.bigbluebutton.common2.bus.JsonMsgFromAkkaApps
+import org.bigbluebutton.common2.redis.RedisConfiguration
+import org.bigbluebutton.client.SystemConfiguration
+import akka.actor.ActorSystem
+import org.bigbluebutton.common2.redis.RedisSubscriber
+import org.bigbluebutton.common2.bus.JsonMsgFromAkkaAppsBus
+import akka.actor.Props
+import org.bigbluebutton.common2.bus.JsonMsgFromAkkaAppsEvent
+
+object Red5AppsRedisSubscriberActor extends RedisSubscriber with RedisConfiguration with SystemConfiguration {
+
+ val channels = Seq(fromAkkaAppsRedisChannel, fromAkkaAppsWbRedisChannel, fromAkkaAppsChatRedisChannel, fromAkkaAppsPresRedisChannel, fromThirdPartyRedisChannel)
+ val patterns = Seq("bigbluebutton:from-bbb-apps:*")
+
+ def props(system: ActorSystem, jsonMsgBus: JsonMsgFromAkkaAppsBus): Props =
+ Props(
+ classOf[Red5AppsRedisSubscriberActor],
+ system, jsonMsgBus,
+ redisHost, redisPort,
+ channels, patterns).withDispatcher("akka.redis-subscriber-worker-dispatcher")
+}
+
+class Red5AppsRedisSubscriberActor(system: ActorSystem, jsonMsgBus: JsonMsgFromAkkaAppsBus,
+ redisHost: String, redisPort: Int,
+ channels: Seq[String] = Nil, patterns: Seq[String] = Nil)
+ extends RedisSubscriberProvider(system, "Red5AppsSub", channels, patterns, null) with SystemConfiguration {
+
+ override def addListener(appChannel: String) {
+ connection.addListener(new RedisPubSubListener[String, String] {
+ def message(channel: String, message: String): Unit = {
+ if (channels.contains(channel)) {
+ val receivedJsonMessage = new JsonMsgFromAkkaApps(channel, message)
+ jsonMsgBus.publish(JsonMsgFromAkkaAppsEvent(fromAkkaAppsJsonChannel, receivedJsonMessage))
+ }
+ }
+ def message(pattern: String, channel: String, message: String): Unit = { log.info("Subscribed to channel {} with pattern {}", channel, pattern) }
+ def psubscribed(pattern: String, count: Long): Unit = { log.info("Subscribed to pattern {}", pattern) }
+ def punsubscribed(pattern: String, count: Long): Unit = { log.info("Unsubscribed from pattern {}", pattern) }
+ def subscribed(channel: String, count: Long): Unit = { log.info("Subscribed to pattern {}", channel) }
+ def unsubscribed(channel: String, count: Long): Unit = { log.info("Unsubscribed from channel {}", channel) }
+ })
+ }
+
+ addListener(null)
+ subscribe()
+}
diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/RedisPublisher.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/RedisPublisher.scala
deleted file mode 100755
index 379b15f5dec53f025e454613d7c8b2a08bdcf042..0000000000000000000000000000000000000000
--- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/RedisPublisher.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bigbluebutton.client.endpoint.redis
-
-import redis.RedisClient
-import akka.actor.ActorSystem
-import akka.event.Logging
-import org.bigbluebutton.client.SystemConfiguration
-import akka.util.ByteString
-
-class RedisPublisher(val system: ActorSystem) extends SystemConfiguration {
-
- val redis = RedisClient(redisHost, redisPort)(system)
-
- val log = Logging(system, getClass)
-
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- redis.clientSetname("Red5AppsPub")
-
- def publish(channel: String, data: String) {
- //log.debug("PUBLISH TO [" + channel + "]: \n [" + data + "]")
- redis.publish(channel, ByteString(data))
- }
-
-}
diff --git a/bbb-common-message/build.sbt b/bbb-common-message/build.sbt
index 29cf68bec63494dc7c7a58eb54b78c7748c6a525..054aa4acd34f7ae83ac5ea420818bfcf71ade0fd 100755
--- a/bbb-common-message/build.sbt
+++ b/bbb-common-message/build.sbt
@@ -1,19 +1,23 @@
-name := "bbb-common-message"
-
-organization := "org.bigbluebutton"
-
-version := "0.0.19-SNAPSHOT"
-
-scalaVersion := "2.12.6"
-
-scalacOptions ++= Seq(
- "-unchecked",
- "-deprecation",
- "-Xlint",
- "-Ywarn-dead-code",
- "-language:_",
- "-target:jvm-1.8",
- "-encoding", "UTF-8"
+import org.bigbluebutton.build._
+
+version := "0.0.20-SNAPSHOT"
+
+val compileSettings = Seq(
+ organization := "org.bigbluebutton",
+
+ scalacOptions ++= List(
+ "-unchecked",
+ "-deprecation",
+ "-Xlint",
+ "-Ywarn-dead-code",
+ "-language:_",
+ "-target:jvm-1.8",
+ "-encoding", "UTF-8"
+ ),
+ javacOptions ++= List(
+ "-Xlint:unchecked",
+ "-Xlint:deprecation"
+ )
)
resolvers += Resolver.sonatypeRepo("releases")
@@ -26,32 +30,8 @@ retrieveManaged := true
testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console", "junitxml")
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports")
-libraryDependencies ++= {
- Seq(
- "com.google.code.gson" % "gson" % "2.5"
- )}
-
-// https://mvnrepository.com/artifact/org.scala-lang/scala-library
-libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value
-// https://mvnrepository.com/artifact/org.scala-lang/scala-compiler
-libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value
-
-libraryDependencies += "junit" % "junit" % "4.12" % "test"
-libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
-
-// https://mvnrepository.com/artifact/org.scalactic/scalactic_2.12
-libraryDependencies += "org.scalactic" % "scalactic_2.12" % "3.0.3" % "test"
-
-// For generating test reports
-libraryDependencies += "org.pegdown" % "pegdown" % "1.6.0" % "test"
-
-// https://mvnrepository.com/artifact/org.scalatest/scalatest_2.12
-libraryDependencies += "org.scalatest" % "scalatest_2.12" % "3.0.3" % "test"
-
-// https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-scala_2.12
-libraryDependencies += "com.fasterxml.jackson.module" % "jackson-module-scala_2.12" % "2.9.6"
-
-seq(Revolver.settings: _*)
+Seq(Revolver.settings: _*)
+lazy val commonMessage = (project in file(".")).settings(name := "bbb-common-message", libraryDependencies ++= Dependencies.runtime).settings(compileSettings)
//-----------
// Packaging
@@ -71,12 +51,12 @@ seq(Revolver.settings: _*)
// This forbids including Scala related libraries into the dependency
//autoScalaLibrary := false
-/***************************
-* When developing, change the version above to x.x.x-SNAPSHOT then use the file resolver to
-* publish to the local maven repo using "sbt publish"
-*/
+/** *************************
+ * When developing, change the version above to x.x.x-SNAPSHOT then use the file resolver to
+ * publish to the local maven repo using "sbt publish"
+ */
// Uncomment this to publish to local maven repo while commenting out the nexus repo
-publishTo := Some(Resolver.file("file", new File(Path.userHome.absolutePath+"/.m2/repository")))
+publishTo := Some(Resolver.file("file", new File(Path.userHome.absolutePath + "/.m2/repository")))
// Comment this out when publishing to local maven repo using SNAPSHOT version.
@@ -101,15 +81,14 @@ pomExtra := (
<url>git@github.com:bigbluebutton/bigbluebutton.git</url>
<connection>scm:git:git@github.com:bigbluebutton/bigbluebutton.git</connection>
</scm>
- <developers>
- <developer>
- <id>ritzalam</id>
- <name>Richard Alam</name>
- <url>http://www.bigbluebutton.org</url>
- </developer>
- </developers>)
-
+ <developers>
+ <developer>
+ <id>ritzalam</id>
+ <name>Richard Alam</name>
+ <url>http://www.bigbluebutton.org</url>
+ </developer>
+ </developers>)
+
licenses := Seq("LGPL-3.0" -> url("http://opensource.org/licenses/LGPL-3.0"))
homepage := Some(url("http://www.bigbluebutton.org"))
-
diff --git a/bbb-common-message/deploy.sh b/bbb-common-message/deploy.sh
index ccba754eaaf8182e665e94d1210571e23ebfb7b4..f829bc13dc598da480ee4e512a87c9436925a359 100755
--- a/bbb-common-message/deploy.sh
+++ b/bbb-common-message/deploy.sh
@@ -1,2 +1 @@
-sbt clean
-sbt publish publishLocal
+sbt clean publish publishLocal
diff --git a/bbb-common-message/project/Build.scala b/bbb-common-message/project/Build.scala
deleted file mode 100755
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/bbb-common-message/project/Dependencies.scala b/bbb-common-message/project/Dependencies.scala
new file mode 100644
index 0000000000000000000000000000000000000000..c8d886208a730623e74fade96419511c92e62676
--- /dev/null
+++ b/bbb-common-message/project/Dependencies.scala
@@ -0,0 +1,68 @@
+package org.bigbluebutton.build
+
+import sbt._
+import Keys._
+
+object Dependencies {
+
+ object Versions {
+ // Scala
+ val scala = "2.12.7"
+ val junit = "4.12"
+ val junitInterface = "0.11"
+ val scalactic = "3.0.3"
+
+ // Libraries
+ val akkaVersion = "2.5.17"
+ val gson = "2.8.5"
+ val jackson = "2.9.7"
+ val sl4j = "1.7.25"
+ val red5 = "1.0.10-M5"
+ val pool = "2.6.0"
+
+ // Redis
+ val lettuce = "5.1.3.RELEASE"
+
+ // Test
+ val scalaTest = "3.0.5"
+ }
+
+ object Compile {
+ val scalaLibrary = "org.scala-lang" % "scala-library" % Versions.scala
+ val scalaCompiler = "org.scala-lang" % "scala-compiler" % Versions.scala
+
+ val akkaActor = "com.typesafe.akka" % "akka-actor_2.12" % Versions.akkaVersion
+
+ val googleGson = "com.google.code.gson" % "gson" % Versions.gson
+ val jacksonModule = "com.fasterxml.jackson.module" %% "jackson-module-scala" % Versions.jackson
+ val sl4jApi = "org.slf4j" % "slf4j-api" % Versions.sl4j % "runtime"
+ val red5 = "org.red5" % "red5-server-common" % Versions.red5
+ val apachePool2 = "org.apache.commons" % "commons-pool2" % Versions.pool
+
+ val lettuceCore = "io.lettuce" % "lettuce-core" % Versions.lettuce
+ }
+
+ object Test {
+ val scalaTest = "org.scalatest" %% "scalatest" % Versions.scalaTest % "test"
+ val junit = "junit" % "junit" % Versions.junit % "test"
+ val junitInteface = "com.novocode" % "junit-interface" % Versions.junitInterface % "test"
+ val scalactic = "org.scalactic" % "scalactic_2.12" % Versions.scalactic % "test"
+ }
+
+ val testing = Seq(
+ Test.scalaTest,
+ Test.junit,
+ Test.junitInteface,
+ Test.scalactic)
+
+ val runtime = Seq(
+ Compile.scalaLibrary,
+ Compile.scalaCompiler,
+ Compile.akkaActor,
+ Compile.googleGson,
+ Compile.jacksonModule,
+ Compile.sl4jApi,
+ Compile.red5,
+ Compile.apachePool2,
+ Compile.lettuceCore) ++ testing
+}
diff --git a/bbb-common-message/project/build.properties b/bbb-common-message/project/build.properties
index a6e117b61042ee81c62ba3a0fc5210d9502944df..2e6e3d24608ee15e892ed3b16d84224f7667e808 100755
--- a/bbb-common-message/project/build.properties
+++ b/bbb-common-message/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=1.2.6
\ No newline at end of file
diff --git a/bbb-common-message/project/plugins.sbt b/bbb-common-message/project/plugins.sbt
index 5ab7b095f69a2b3d8a3bf5350fa7e7e1a64f8f2f..3559bf68d62ef19f25fa810533bbe596eb022d02 100755
--- a/bbb-common-message/project/plugins.sbt
+++ b/bbb-common-message/project/plugins.sbt
@@ -2,8 +2,8 @@ addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
-addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.7")
+addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.8")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
diff --git a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/EventRecordingService.java b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/Keys.java
old mode 100755
new mode 100644
similarity index 50%
rename from bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/EventRecordingService.java
rename to bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/Keys.java
index d534387e2e99c3a2a0c0b38bdb7511a69bf0a0d3..96509383d5f8e564b9f480baa862bc2277a6b0c0
--- a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/EventRecordingService.java
+++ b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/Keys.java
@@ -1,7 +1,7 @@
/**
* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
*
-* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
+* Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
*
* This program is free software; you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
@@ -16,28 +16,13 @@
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.bigbluebutton.app.screenshare;
+package org.bigbluebutton.common2.redis;
-import java.util.Map;
-
-import redis.clients.jedis.Jedis;
-
-public class EventRecordingService {
- private static final String COLON = ":";
-
- private final String host;
- private final int port;
-
- public EventRecordingService(String host, int port) {
- this.host = host;
- this.port = port;
- }
-
- public void record(String meetingId, Map<String, String> event) {
- Jedis jedis = new Jedis(host, port);
- Long msgid = jedis.incr("global:nextRecordedMsgId");
- jedis.hmset("recording:" + meetingId + COLON + msgid, event);
- jedis.rpush("meeting:" + meetingId + COLON + "recordings", msgid.toString());
- }
+public final class Keys {
+ public static final String MEETING = "meeting-";
+ public static final String MEETINGS = "meetings";
+ public static final String MEETING_INFO = "meeting:info:";
+ public static final String BREAKOUT_MEETING = "meeting:breakout:";
+ public static final String BREAKOUT_ROOMS = "meeting:breakout:rooms:";
}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/RedisAwareCommunicator.java b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/RedisAwareCommunicator.java
new file mode 100644
index 0000000000000000000000000000000000000000..23dc26d26f04721273a3a8f552001d87dfd0ed8a
--- /dev/null
+++ b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/RedisAwareCommunicator.java
@@ -0,0 +1,98 @@
+/**
+* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+*
+* Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+*
+* This program is free software; you can redistribute it and/or modify it under the
+* terms of the GNU Lesser General Public License as published by the Free Software
+* Foundation; either version 3.0 of the License, or (at your option) any later
+* version.
+*
+* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License along
+* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+package org.bigbluebutton.common2.redis;
+
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+import org.slf4j.Logger;
+
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.event.Event;
+import io.lettuce.core.event.EventBus;
+import io.lettuce.core.event.connection.ConnectedEvent;
+import io.lettuce.core.event.connection.ConnectionActivatedEvent;
+import io.lettuce.core.event.connection.ConnectionDeactivatedEvent;
+import io.lettuce.core.event.connection.DisconnectedEvent;
+import reactor.core.Disposable;
+
+public abstract class RedisAwareCommunicator {
+
+ protected RedisClient redisClient;
+
+ protected Disposable eventBusSubscription;
+
+ protected EventBus eventBus;
+
+ protected String host;
+ protected String password;
+ protected int port;
+ protected String clientName;
+ protected int expireKey;
+
+ public abstract void start();
+
+ public abstract void stop();
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ protected void connectionStatusHandler(Event event, Logger log) {
+ if (event instanceof ConnectedEvent) {
+ log.info("Connected to redis");
+ } else if (event instanceof ConnectionActivatedEvent) {
+ log.info("Connected to redis activated");
+ } else if (event instanceof DisconnectedEvent) {
+ log.info("Disconnected from redis");
+ } else if (event instanceof ConnectionDeactivatedEvent) {
+ log.info("Connected to redis deactivated");
+ }
+ }
+
+ public void setClientName(String clientName) {
+ this.clientName = clientName;
+ }
+
+ public void setHost(String host) {
+ this.host = host;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public void setExpireKey(int expireKey) {
+ this.expireKey = expireKey;
+ }
+
+ protected GenericObjectPoolConfig createPoolingConfig() {
+ GenericObjectPoolConfig config = new GenericObjectPoolConfig();
+ config.setMaxTotal(32);
+ config.setMaxIdle(8);
+ config.setMinIdle(1);
+ config.setTestOnBorrow(true);
+ config.setTestOnReturn(true);
+ config.setTestWhileIdle(true);
+ config.setNumTestsPerEvictionRun(12);
+ config.setMaxWaitMillis(5000);
+ config.setTimeBetweenEvictionRunsMillis(60000);
+ config.setBlockWhenExhausted(true);
+ return config;
+ }
+}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/RedisStorageService.java b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/RedisStorageService.java
new file mode 100644
index 0000000000000000000000000000000000000000..19f844bc159ef7979c4dbcf1b9f546d2067adb0e
--- /dev/null
+++ b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/RedisStorageService.java
@@ -0,0 +1,116 @@
+/**
+* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+*
+* Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+*
+* This program is free software; you can redistribute it and/or modify it under the
+* terms of the GNU Lesser General Public License as published by the Free Software
+* Foundation; either version 3.0 of the License, or (at your option) any later
+* version.
+*
+* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License along
+* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+package org.bigbluebutton.common2.redis;
+
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
+
+public class RedisStorageService extends RedisAwareCommunicator {
+
+ private static Logger log = LoggerFactory.getLogger(RedisStorageService.class);
+
+ StatefulRedisConnection<String, String> connection;
+
+ public void start() {
+ log.info("Starting RedisStorageService with client name: {}", clientName);
+ RedisURI redisUri = RedisURI.Builder.redis(this.host, this.port).withClientName(this.clientName)
+ .withPassword(this.password).build();
+
+ redisClient = RedisClient.create(redisUri);
+ redisClient.setOptions(ClientOptions.builder().autoReconnect(true).build());
+ eventBus = redisClient.getResources().eventBus();
+ eventBusSubscription = eventBus.get().subscribe(e -> connectionStatusHandler(e, log));
+
+ connection = redisClient.connect();
+ }
+
+ public void stop() {
+ eventBusSubscription.dispose();
+ connection.close();
+ redisClient.shutdown();
+ log.info("RedisStorageService Stopped");
+ }
+
+ public void recordMeetingInfo(String meetingId, Map<String, String> info) {
+ log.debug("Storing meeting {} metadata {}", meetingId, info);
+ recordMeeting(Keys.MEETING_INFO + meetingId, info);
+ }
+
+ public void recordBreakoutInfo(String meetingId, Map<String, String> breakoutInfo) {
+ log.debug("Saving breakout metadata in {}", meetingId);
+ recordMeeting(Keys.BREAKOUT_MEETING + meetingId, breakoutInfo);
+ }
+
+ public void addBreakoutRoom(String parentId, String breakoutId) {
+ log.debug("Saving breakout room for meeting {}", parentId);
+ RedisCommands<String, String> commands = connection.sync();
+ commands.sadd(Keys.BREAKOUT_ROOMS + parentId, breakoutId);
+ }
+
+ public void record(String meetingId, Map<String, String> event) {
+ log.debug("Recording meeting event {} inside a transaction", meetingId);
+ RedisCommands<String, String> commands = connection.sync();
+ Long msgid = commands.incr("global:nextRecordedMsgId");
+ commands.hmset("recording:" + meetingId + ":" + msgid, event);
+ commands.rpush("meeting:" + meetingId + ":" + "recordings", Long.toString(msgid));
+ }
+
+ // @fixme: not used anywhere
+ public void removeMeeting(String meetingId) {
+ log.debug("Removing meeting meeting {} inside a transaction", meetingId);
+ RedisCommands<String, String> commands = connection.sync();
+ commands.del(Keys.MEETING + meetingId);
+ commands.srem(Keys.MEETINGS + meetingId);
+ }
+
+ public void recordAndExpire(String meetingId, Map<String, String> event) {
+ log.debug("Recording meeting event {} inside a transaction", meetingId);
+ RedisCommands<String, String> commands = connection.sync();
+
+ Long msgid = commands.incr("global:nextRecordedMsgId");
+ String key = "recording:" + meetingId + ":" + msgid;
+ commands.hmset(key, event);
+ /**
+ * We set the key to expire after 14 days as we are still recording the
+ * event into redis even if the meeting is not recorded. (ralam sept 23,
+ * 2015)
+ */
+ commands.expire(key, expireKey);
+ key = "meeting:" + meetingId + ":recordings";
+ commands.rpush(key, Long.toString(msgid));
+ commands.expire(key, expireKey);
+ }
+
+ private String recordMeeting(String key, Map<String, String> info) {
+ log.debug("Storing metadata {}", info);
+ String result = "";
+ RedisCommands<String, String> commands = connection.sync();
+ result = commands.hmset(key, info);
+ return result;
+ }
+}
\ No newline at end of file
diff --git a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessageDistributor.java b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageDistributor.java
similarity index 89%
rename from bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessageDistributor.java
rename to bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageDistributor.java
index b51ed206c8f6ea6b5da5e3681709dbfe103f6f3b..89c8e9e46587090caa945a3a28fd8cb8529add65 100755
--- a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessageDistributor.java
+++ b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageDistributor.java
@@ -1,4 +1,4 @@
-package org.bigbluebutton.red5.pubsub;
+package org.bigbluebutton.common2.redis.pubsub;
import java.util.Set;
@@ -22,4 +22,4 @@ public class MessageDistributor {
listener.handleMessage(pattern, channel, message);
}
}
-}
\ No newline at end of file
+}
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageHandler.java b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageHandler.java
similarity index 85%
rename from bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageHandler.java
rename to bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageHandler.java
index b94db88559d8e7d351690cd88b72ad4ba228099a..95bbde9e690becf55776d73e61a8ddd548e32365 100755
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageHandler.java
+++ b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageHandler.java
@@ -16,8 +16,8 @@
* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.bigbluebutton.voiceconf.messaging;
+package org.bigbluebutton.common2.redis.pubsub;
public interface MessageHandler {
- void handleMessage(String pattern, String channel, String message);
+ void handleMessage(String pattern, String channel, String message);
}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageReceiver.java b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageReceiver.java
new file mode 100755
index 0000000000000000000000000000000000000000..ade4b5d648f11a4da9ba29adbb72de43d921edce
--- /dev/null
+++ b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageReceiver.java
@@ -0,0 +1,121 @@
+package org.bigbluebutton.common2.redis.pubsub;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.bigbluebutton.common2.redis.RedisAwareCommunicator;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.pubsub.RedisPubSubListener;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands;
+import io.lettuce.core.support.ConnectionPoolSupport;
+
+public class MessageReceiver extends RedisAwareCommunicator {
+ private static Logger log = Red5LoggerFactory.getLogger(MessageReceiver.class, "video");
+
+ private ReceivedMessageHandler handler;
+
+ GenericObjectPool<StatefulRedisPubSubConnection<String, String>> connectionPool;
+
+ private final Executor runExec = Executors.newSingleThreadExecutor();
+
+ private volatile boolean receiveMessage = false;
+
+ private final String FROM_BBB_APPS_PATTERN = "from-akka-apps-redis-channel";
+
+ public void start() {
+ log.info("Ready to receive messages from Redis pubsub.");
+ receiveMessage = true;
+
+ RedisURI redisUri = RedisURI.Builder.redis(this.host, this.port).withClientName(this.clientName).build();
+ if (!this.password.isEmpty()) {
+ redisUri.setPassword(this.password);
+ }
+
+ redisClient = RedisClient.create(redisUri);
+ redisClient.setOptions(ClientOptions.builder().autoReconnect(true).build());
+ eventBus = redisClient.getResources().eventBus();
+ eventBusSubscription = eventBus.get().subscribe(e -> connectionStatusHandler(e, log));
+
+ connectionPool = ConnectionPoolSupport.createGenericObjectPool(() -> redisClient.connectPubSub(),
+ createPoolingConfig());
+
+ Runnable messageReceiver = new Runnable() {
+ public void run() {
+ if (receiveMessage) {
+ try (StatefulRedisPubSubConnection<String, String> connection = connectionPool.borrowObject()) {
+ if (receiveMessage) {
+ connection.addListener(new MessageListener());
+
+ RedisPubSubAsyncCommands<String, String> async = connection.async();
+ RedisFuture<Void> future = async.subscribe(FROM_BBB_APPS_PATTERN);
+ }
+ } catch (Exception e) {
+ log.error("Error resubscribing to channels: ", e);
+ }
+ }
+ }
+ };
+
+ runExec.execute(messageReceiver);
+ }
+
+ public void stop() {
+ receiveMessage = false;
+ connectionPool.close();
+ redisClient.shutdown();
+ log.info("MessageReceiver Stopped");
+ }
+
+ public void setMessageHandler(ReceivedMessageHandler handler) {
+ this.handler = handler;
+ }
+
+ private class MessageListener implements RedisPubSubListener<String, String> {
+
+ @Override
+ public void message(String channel, String message) {
+ handler.handleMessage("", channel, message);
+ }
+
+ @Override
+ public void message(String pattern, String channel, String message) {
+ log.debug("RECEIVED onPMessage" + channel + " message=\n" + message);
+ Runnable task = new Runnable() {
+ public void run() {
+ handler.handleMessage(pattern, channel, message);
+ }
+ };
+
+ runExec.execute(task);
+ }
+
+ @Override
+ public void subscribed(String channel, long count) {
+ log.debug("Subscribed to the channel: " + channel);
+ }
+
+ @Override
+ public void psubscribed(String pattern, long count) {
+ log.debug("Subscribed to the pattern: " + pattern);
+ }
+
+ @Override
+ public void unsubscribed(String channel, long count) {
+ log.debug("Unsubscribed from the channel: " + channel);
+ }
+
+ @Override
+ public void punsubscribed(String pattern, long count) {
+ log.debug("Unsubscribed from the pattern: " + pattern);
+ }
+ }
+
+}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageSender.java b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageSender.java
new file mode 100755
index 0000000000000000000000000000000000000000..8209f5bf76934d9959a385861ef773f184845bd4
--- /dev/null
+++ b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageSender.java
@@ -0,0 +1,94 @@
+package org.bigbluebutton.common2.redis.pubsub;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.bigbluebutton.common2.redis.RedisAwareCommunicator;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
+import io.lettuce.core.ClientOptions;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisFuture;
+import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.async.RedisAsyncCommands;
+import io.lettuce.core.pubsub.StatefulRedisPubSubConnection;
+import io.lettuce.core.support.ConnectionPoolSupport;
+
+public class MessageSender extends RedisAwareCommunicator {
+ private static Logger log = Red5LoggerFactory.getLogger(MessageSender.class, "bigbluebutton");
+
+ GenericObjectPool<StatefulRedisPubSubConnection<String, String>> connectionPool;
+
+ private volatile boolean sendMessage = false;
+
+ private final Executor msgSenderExec = Executors.newSingleThreadExecutor();
+ private final Executor runExec = Executors.newSingleThreadExecutor();
+ private BlockingQueue<MessageToSend> messages = new LinkedBlockingQueue<MessageToSend>();
+
+ public void stop() {
+ sendMessage = false;
+ connectionPool.close();
+ redisClient.shutdown();
+ }
+
+ public void start() {
+ RedisURI redisUri = RedisURI.Builder.redis(this.host, this.port).withClientName(this.clientName).build();
+ if (!this.password.isEmpty()) {
+ redisUri.setPassword(this.password);
+ }
+
+ redisClient = RedisClient.create(redisUri);
+ redisClient.setOptions(ClientOptions.builder().autoReconnect(true).build());
+ eventBus = redisClient.getResources().eventBus();
+ eventBusSubscription = eventBus.get().subscribe(e -> connectionStatusHandler(e, log));
+
+ connectionPool = ConnectionPoolSupport.createGenericObjectPool(() -> redisClient.connectPubSub(),
+ createPoolingConfig());
+
+ log.info("Redis org.bigbluebutton.red5.pubsub.message publisher starting!");
+ try {
+ sendMessage = true;
+
+ Runnable messageSender = new Runnable() {
+ public void run() {
+ while (sendMessage) {
+ try {
+ MessageToSend msg = messages.take();
+ publish(msg.getChannel(), msg.getMessage());
+ } catch (InterruptedException e) {
+ log.warn("Failed to get org.bigbluebutton.common2.redis.pubsub from queue.");
+ }
+ }
+ }
+ };
+ msgSenderExec.execute(messageSender);
+ } catch (Exception e) {
+ log.error("Error subscribing to channels: " + e.getMessage());
+ }
+
+ }
+
+ public void send(String channel, String message) {
+ MessageToSend msg = new MessageToSend(channel, message);
+ messages.add(msg);
+ }
+
+ private void publish(final String channel, final String message) {
+ Runnable task = new Runnable() {
+ public void run() {
+ try (StatefulRedisPubSubConnection<String, String> connection = connectionPool.borrowObject()) {
+ RedisAsyncCommands<String, String> async = connection.async();
+ RedisFuture<Long> future = async.publish(channel, message);
+ } catch (Exception e) {
+ log.warn("Cannot publish the org.bigbluebutton.red5.pubsub.message to redis", e);
+ }
+ }
+ };
+
+ runExec.execute(task);
+ }
+}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageToSend.java b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageToSend.java
new file mode 100755
index 0000000000000000000000000000000000000000..dba49444b87ae7ac2d2e9040ff7d44a6ffd81bd9
--- /dev/null
+++ b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageToSend.java
@@ -0,0 +1,19 @@
+package org.bigbluebutton.common2.redis.pubsub;
+
+public class MessageToSend {
+ private final String channel;
+ private final String message;
+
+ public MessageToSend(String channel, String message) {
+ this.channel = channel;
+ this.message = message;
+ }
+
+ public String getChannel() {
+ return channel;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+}
diff --git a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/ReceivedMessage.java b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/ReceivedMessage.java
similarity index 87%
rename from bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/ReceivedMessage.java
rename to bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/ReceivedMessage.java
index 41c775f739fc95f8e0c827ff1aa4a2adf6976ee5..01f893f309ef0ae497cdcc54a6808e0f252c72a2 100755
--- a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/ReceivedMessage.java
+++ b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/ReceivedMessage.java
@@ -1,4 +1,4 @@
-package org.bigbluebutton.red5.pubsub;
+package org.bigbluebutton.common2.redis.pubsub;
public class ReceivedMessage {
private final String pattern;
diff --git a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/ReceivedMessageHandler.java b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/ReceivedMessageHandler.java
similarity index 90%
rename from bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/ReceivedMessageHandler.java
rename to bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/ReceivedMessageHandler.java
index ddafee0b6e8b2897c8da27a344c24e7ad63cd8fe..ed296626114b185eaf805ef21a73e665416778f3 100755
--- a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/ReceivedMessageHandler.java
+++ b/bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/ReceivedMessageHandler.java
@@ -1,15 +1,16 @@
-package org.bigbluebutton.red5.pubsub;
+package org.bigbluebutton.common2.redis.pubsub;
-
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
public class ReceivedMessageHandler {
- private static Logger log = Red5LoggerFactory.getLogger(ReceivedMessageHandler.class, "video");
+ private static Logger log = Red5LoggerFactory
+ .getLogger(ReceivedMessageHandler.class/* , "video" */);
private BlockingQueue<ReceivedMessage> receivedMessages = new LinkedBlockingQueue<ReceivedMessage>();
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/IncomingJsonMessageBus.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/IncomingJsonMessageBus.scala
old mode 100755
new mode 100644
similarity index 94%
rename from akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/IncomingJsonMessageBus.scala
rename to bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/IncomingJsonMessageBus.scala
index f2e9aa281de9441af7bf0fe3fe1c7e63f91fa59d..96dbff59b4312665dcd909d73d3e3a3d1b102731
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/bus/IncomingJsonMessageBus.scala
+++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/IncomingJsonMessageBus.scala
@@ -1,4 +1,4 @@
-package org.bigbluebutton.core.bus
+package org.bigbluebutton.common2.bus
import akka.actor.ActorRef
import akka.event.{ EventBus, LookupClassification }
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/JsonMsgFromAkkaAppsBus.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/JsonMsgFromAkkaAppsBus.scala
old mode 100755
new mode 100644
similarity index 88%
rename from bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/JsonMsgFromAkkaAppsBus.scala
rename to bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/JsonMsgFromAkkaAppsBus.scala
index 5d26e2c23bb7a1c4f27a150d64a8a1fe4f4a0907..871f6f76f9948b4fc7b7fd0abbdf3cbb9bdd6c6b
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/JsonMsgFromAkkaAppsBus.scala
+++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/JsonMsgFromAkkaAppsBus.scala
@@ -1,7 +1,7 @@
-package org.bigbluebutton.api2.bus
+package org.bigbluebutton.common2.bus
import akka.actor.ActorRef
-import akka.event.{EventBus, LookupClassification}
+import akka.event.{ EventBus, LookupClassification }
case class JsonMsgFromAkkaApps(name: String, data: String)
case class JsonMsgFromAkkaAppsEvent(val topic: String, val payload: JsonMsgFromAkkaApps)
@@ -23,7 +23,7 @@ class JsonMsgFromAkkaAppsBus extends EventBus with LookupClassification {
// must define a full order over the subscribers, expressed as expected from
// `java.lang.Comparable.compare`
override protected def compareSubscribers(a: Subscriber, b: Subscriber): Int =
- a.compareTo(b)
+ a.compareTo(b)
// determines the initial size of the index data structure
// used internally (i.e. the expected number of different classifiers)
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgFromAkkaAppsEventBus.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/MsgFromAkkaAppsEventBus.scala
old mode 100755
new mode 100644
similarity index 91%
rename from bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgFromAkkaAppsEventBus.scala
rename to bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/MsgFromAkkaAppsEventBus.scala
index e9f25b91a5f9e2f8f224bed7e482334204ea806a..097df4a29c433f8e7b8e3dc1702696f1b8a2ad12
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MsgFromAkkaAppsEventBus.scala
+++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/MsgFromAkkaAppsEventBus.scala
@@ -2,9 +2,9 @@ package org.bigbluebutton.api2.bus
import akka.actor.ActorRef
import akka.event.{EventBus, LookupClassification}
-import org.bigbluebutton.common2.msgs.{BbbCommonEnvCoreMsg}
+import org.bigbluebutton.common2.msgs.BbbCommonMsg
-case class MsgFromAkkaApps(val topic: String, val payload: BbbCommonEnvCoreMsg)
+case class MsgFromAkkaApps(val topic: String, val payload: BbbCommonMsg)
class MsgFromAkkaAppsEventBus extends EventBus with LookupClassification {
type Event = MsgFromAkkaApps
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/OldMessageEventBus.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/OldMessageEventBus.scala
similarity index 86%
rename from bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/OldMessageEventBus.scala
rename to bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/OldMessageEventBus.scala
index cccd288cdcbf317ad7ea7da62761dcbdfcb4e9f6..9b7c6bdd0b248a80efe49dc062501f0d472338dc 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/OldMessageEventBus.scala
+++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/OldMessageEventBus.scala
@@ -1,7 +1,8 @@
-package org.bigbluebutton.api2.bus
+package org.bigbluebutton.common2.bus
import akka.actor.ActorRef
import akka.event.{EventBus, LookupClassification}
+import akka.actor.actorRef2Scala
case class OldReceivedJsonMessage(pattern: String, channel: String, msg: String)
case class OldIncomingJsonMessage(val topic: String, val payload: OldReceivedJsonMessage)
@@ -11,7 +12,7 @@ class OldMessageEventBus extends EventBus with LookupClassification {
type Classifier = String
type Subscriber = ActorRef
- // is used for extracting the classifier from the incoming events
+ // is used for extracting te classifier from the incoming events
override protected def classify(event: Event): Classifier = event.topic
// will be invoked for each event for all subscribers which registered themselves
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/MessageSender.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/MessageSender.scala
similarity index 71%
rename from bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/MessageSender.scala
rename to bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/MessageSender.scala
index be38ef420165f015adbeb0a6675f4f213dacd304..2426a353e6d687ebfe073acc28337f48b961444a 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/MessageSender.scala
+++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/MessageSender.scala
@@ -1,4 +1,4 @@
-package org.bigbluebutton.api2.endpoint.redis
+package org.bigbluebutton.common2.redis
class MessageSender(publisher: RedisPublisher) {
diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisClientProvider.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisClientProvider.scala
new file mode 100644
index 0000000000000000000000000000000000000000..afeba57bf44c5604908cbc22711342ee580fa1a0
--- /dev/null
+++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisClientProvider.scala
@@ -0,0 +1,15 @@
+package org.bigbluebutton.common2.redis
+
+import akka.actor.ActorSystem
+import io.lettuce.core.ClientOptions
+import io.lettuce.core.RedisClient
+import io.lettuce.core.RedisURI
+
+abstract class RedisClientProvider(val system: ActorSystem, val clientName: String) extends RedisConfiguration {
+ // Set the name of this client to be able to distinguish when doing
+ // CLIENT LIST on redis-cli
+ val redisUri = RedisURI.Builder.redis(redisHost, redisPort).withClientName(clientName).withPassword(redisPassword).build()
+
+ var redis = RedisClient.create(redisUri)
+ redis.setOptions(ClientOptions.builder().autoReconnect(true).build())
+}
diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisConfiguration.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisConfiguration.scala
new file mode 100644
index 0000000000000000000000000000000000000000..8dcfd16ff578dc24aa0049318a72e050b8344881
--- /dev/null
+++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisConfiguration.scala
@@ -0,0 +1,25 @@
+package org.bigbluebutton.common2.redis
+
+import scala.util.Try
+import com.typesafe.config.ConfigFactory
+
+trait RedisConfiguration {
+ val config = ConfigFactory.load()
+
+ // Redis server configuration
+ lazy val redisHost = Try(config.getString("redis.host")).getOrElse("127.0.0.1")
+ lazy val redisPort = Try(config.getInt("redis.port")).getOrElse(6379)
+ lazy val redisPassword = Try(config.getString("redis.password")).getOrElse("")
+ lazy val redisExpireKey = Try(config.getInt("redis.keyExpiry")).getOrElse(1209600)
+
+ // Redis channels
+ lazy val toAkkaAppsRedisChannel = Try(config.getString("redis.toAkkaAppsRedisChannel")).getOrElse("to-akka-apps-redis-channel")
+ lazy val fromAkkaAppsRedisChannel = Try(config.getString("redis.fromAkkaAppsRedisChannel")).getOrElse("from-akka-apps-redis-channel")
+
+ lazy val toVoiceConfRedisChannel = Try(config.getString("redis.toVoiceConfRedisChannel")).getOrElse("to-voice-conf-redis-channel")
+ lazy val fromVoiceConfRedisChannel = Try(config.getString("redis.fromVoiceConfRedisChannel")).getOrElse("from-voice-conf-redis-channel")
+
+ lazy val fromAkkaAppsWbRedisChannel = Try(config.getString("redis.fromAkkaAppsWbRedisChannel")).getOrElse("from-akka-apps-wb-redis-channel")
+ lazy val fromAkkaAppsChatRedisChannel = Try(config.getString("redis.fromAkkaAppsChatRedisChannel")).getOrElse("from-akka-apps-chat-redis-channel")
+ lazy val fromAkkaAppsPresRedisChannel = Try(config.getString("redis.fromAkkaAppsPresRedisChannel")).getOrElse("from-akka-apps-pres-redis-channel")
+}
diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisConnectionHandler.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisConnectionHandler.scala
new file mode 100644
index 0000000000000000000000000000000000000000..c30003c95da1becaaff67d45c705d67bcf09a650
--- /dev/null
+++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisConnectionHandler.scala
@@ -0,0 +1,29 @@
+package org.bigbluebutton.common2.redis
+
+import io.lettuce.core.RedisClient
+import io.lettuce.core.event.Event
+import io.lettuce.core.event.EventBus
+import io.lettuce.core.event.connection.{ ConnectionDeactivatedEvent, ConnectionActivatedEvent, ConnectedEvent, DisconnectedEvent }
+import reactor.core.Disposable
+import akka.event.LoggingAdapter
+
+trait RedisConnectionHandler {
+
+ def subscribeToEventBus(redis: RedisClient, log: LoggingAdapter) {
+ val eventBus: EventBus = redis.getResources().eventBus();
+ // @todo : unsubscribe when connection is closed
+ val eventBusSubscription: Disposable = eventBus.get().subscribe(e => connectionStatusHandler(e, log))
+ }
+
+ def connectionStatusHandler(event: Event, log: LoggingAdapter) {
+ if (event.isInstanceOf[ConnectedEvent]) {
+ log.info("Connected to redis");
+ } else if (event.isInstanceOf[ConnectionActivatedEvent]) {
+ log.info("Connection to redis activated");
+ } else if (event.isInstanceOf[DisconnectedEvent]) {
+ log.info("Disconnected from redis");
+ } else if (event.isInstanceOf[ConnectionDeactivatedEvent]) {
+ log.info("Connection to redis deactivated");
+ }
+ }
+}
diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisPublisher.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisPublisher.scala
new file mode 100755
index 0000000000000000000000000000000000000000..47c5af6f10dcba75a018bcc1658bfebd12219fb2
--- /dev/null
+++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisPublisher.scala
@@ -0,0 +1,21 @@
+package org.bigbluebutton.common2.redis
+
+import akka.actor.ActorSystem
+import akka.event.Logging
+
+class RedisPublisher(system: ActorSystem, clientName: String) extends RedisClientProvider(system, clientName) with RedisConnectionHandler {
+
+ val log = Logging(system, getClass)
+
+ subscribeToEventBus(redis, log)
+
+ val connection = redis.connectPubSub()
+
+ redis.connect()
+
+ def publish(channel: String, data: String) {
+ val async = connection.async();
+ async.publish(channel, data);
+ }
+
+}
diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisStorageProvider.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisStorageProvider.scala
new file mode 100644
index 0000000000000000000000000000000000000000..71fc9df41a4c2d2f755c794a949d42db41b46203
--- /dev/null
+++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisStorageProvider.scala
@@ -0,0 +1,13 @@
+package org.bigbluebutton.common2.redis
+
+import akka.actor.ActorSystem
+
+abstract class RedisStorageProvider(system: ActorSystem, clientName: String) extends RedisConfiguration {
+ var redis = new RedisStorageService()
+ redis.setHost(redisHost)
+ redis.setPort(redisPort)
+ redis.setPassword(redisPassword)
+ redis.setExpireKey(redisExpireKey)
+ redis.setClientName(clientName)
+ redis.start();
+}
diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisSubscriber.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisSubscriber.scala
new file mode 100644
index 0000000000000000000000000000000000000000..5c65a338577604ac1c9b342740bc99f7641b8591
--- /dev/null
+++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisSubscriber.scala
@@ -0,0 +1,6 @@
+package org.bigbluebutton.common2.redis
+
+trait RedisSubscriber extends RedisConfiguration {
+ val channels: Seq[String]
+ val patterns: Seq[String]
+}
diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisSubscriberProvider.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisSubscriberProvider.scala
new file mode 100644
index 0000000000000000000000000000000000000000..e091e9ad25919454973ae8f4bf450c712d89eccc
--- /dev/null
+++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisSubscriberProvider.scala
@@ -0,0 +1,62 @@
+package org.bigbluebutton.common2.redis
+
+import akka.actor.ActorSystem
+import org.bigbluebutton.common2.bus.ReceivedJsonMessage
+import org.bigbluebutton.common2.bus.IncomingJsonMessage
+import io.lettuce.core.pubsub.RedisPubSubListener
+import org.bigbluebutton.common2.bus.IncomingJsonMessageBus
+import akka.actor.ActorLogging
+import akka.actor.Actor
+
+import akka.actor.ActorSystem
+import akka.actor.OneForOneStrategy
+import akka.actor.SupervisorStrategy.Resume
+import java.io.StringWriter
+import scala.concurrent.duration._
+import java.io.PrintWriter
+
+abstract class RedisSubscriberProvider(system: ActorSystem, clientName: String,
+ channels: Seq[String], patterns: Seq[String],
+ jsonMsgBus: IncomingJsonMessageBus)
+ extends RedisClientProvider(system, clientName) with RedisConnectionHandler with Actor with ActorLogging {
+
+ subscribeToEventBus(redis, log)
+
+ var connection = redis.connectPubSub()
+
+ def addListener(appChannel: String) {
+ connection.addListener(new RedisPubSubListener[String, String] {
+ def message(channel: String, message: String): Unit = {
+ if (channels.contains(channel)) {
+ val receivedJsonMessage = new ReceivedJsonMessage(channel, message)
+ jsonMsgBus.publish(IncomingJsonMessage(appChannel, receivedJsonMessage))
+ }
+ }
+ def message(pattern: String, channel: String, message: String): Unit = { log.info("Subscribed to channel {} with pattern {}", channel, pattern) }
+ def psubscribed(pattern: String, count: Long): Unit = { log.info("Subscribed to pattern {}", pattern) }
+ def punsubscribed(pattern: String, count: Long): Unit = { log.info("Unsubscribed from pattern {}", pattern) }
+ def subscribed(channel: String, count: Long): Unit = { log.info("Subscribed to pattern {}", channel) }
+ def unsubscribed(channel: String, count: Long): Unit = { log.info("Unsubscribed from channel {}", channel) }
+ })
+ }
+
+ def subscribe() {
+ val async = connection.async()
+ for (channel <- channels) async.subscribe(channel)
+ for (pattern <- patterns) async.psubscribe(pattern)
+ }
+
+ override val supervisorStrategy = OneForOneStrategy(maxNrOfRetries = 10, withinTimeRange = 1 minute) {
+ case e: Exception => {
+ val sw: StringWriter = new StringWriter()
+ sw.write("An exception has been thrown on " + getClass + ", exception message [" + e.getMessage + "] (full stacktrace below)\n")
+ e.printStackTrace(new PrintWriter(sw))
+ log.error(sw.toString())
+ Resume
+ }
+ }
+
+ def receive = {
+ case _ => // do nothing
+ }
+}
diff --git a/bbb-common-message/src/test/scala/org/bigbluebutton/common2/TestFixtures.scala b/bbb-common-message/src/test/scala/org/bigbluebutton/common2/TestFixtures.scala
index d2a42e7dffe3c62f49da15b23c8f54b205409559..ccfa4e929a14eaa1bd2f6100e3872be1433271a8 100755
--- a/bbb-common-message/src/test/scala/org/bigbluebutton/common2/TestFixtures.scala
+++ b/bbb-common-message/src/test/scala/org/bigbluebutton/common2/TestFixtures.scala
@@ -2,7 +2,6 @@ package org.bigbluebutton.common2
import org.bigbluebutton.common2.domain._
-
trait TestFixtures {
val meetingId = "testMeetingId"
val externalMeetingId = "testExternalMeetingId"
@@ -12,6 +11,15 @@ trait TestFixtures {
val record = false
val voiceConfId = "85115"
val durationInMinutes = 10
+
+ val maxInactivityTimeoutMinutes = 120
+ val warnMinutesBeforeMax = 30
+ val meetingExpireIfNoUserJoinedInMinutes = 5
+ val meetingExpireWhenLastUserLeftInMinutes = 10
+ val userInactivityInspectTimerInMinutes = 60
+ val userInactivityThresholdInMinutes = 10
+ val userActivitySignResponseDelayInMinutes = 5
+
val autoStartRecording = false
val allowStartStopRecording = false
val webcamsOnlyForModerator = false
@@ -25,19 +33,23 @@ trait TestFixtures {
val modOnlyMessage = "Moderator only message"
val dialNumber = "613-555-1234"
val maxUsers = 25
+ val muteOnStart = false
val guestPolicy = "ALWAYS_ASK"
val metadata: collection.immutable.Map[String, String] = Map("foo" -> "bar", "bar" -> "baz", "baz" -> "foo")
val meetingProp = MeetingProp(name = meetingName, extId = externalMeetingId, intId = meetingId,
isBreakout = isBreakout.booleanValue())
- val breakoutProps = BreakoutProps(parentId = parentMeetingId, sequence = sequence, breakoutRooms = Vector())
- val durationProps = DurationProps(duration = durationInMinutes, createdTime = createTime, createdDate = createDate)
+ val breakoutProps = BreakoutProps(parentId = parentMeetingId, sequence = sequence, freeJoin = false, breakoutRooms = Vector())
+
+ val durationProps = DurationProps(duration = durationInMinutes, createdTime = createTime, createdDate = createDate, maxInactivityTimeoutMinutes = maxInactivityTimeoutMinutes, warnMinutesBeforeMax = warnMinutesBeforeMax,
+ meetingExpireIfNoUserJoinedInMinutes = meetingExpireIfNoUserJoinedInMinutes, meetingExpireWhenLastUserLeftInMinutes = meetingExpireWhenLastUserLeftInMinutes,
+ userInactivityInspectTimerInMinutes = userInactivityInspectTimerInMinutes, userInactivityThresholdInMinutes = userInactivityInspectTimerInMinutes, userActivitySignResponseDelayInMinutes = userActivitySignResponseDelayInMinutes)
val password = PasswordProp(moderatorPass = moderatorPassword, viewerPass = viewerPassword)
val recordProp = RecordProp(record = record, autoStartRecording = autoStartRecording,
allowStartStopRecording = allowStartStopRecording)
val welcomeProp = WelcomeProp(welcomeMsgTemplate = welcomeMsgTemplate, welcomeMsg = welcomeMsg,
modOnlyMessage = modOnlyMessage)
- val voiceProp = VoiceProp(telVoice = voiceConfId, voiceConf = voiceConfId, dialNumber = dialNumber)
+ val voiceProp = VoiceProp(telVoice = voiceConfId, voiceConf = voiceConfId, dialNumber = dialNumber, muteOnStart = muteOnStart)
val usersProp = UsersProp(maxUsers = maxUsers, webcamsOnlyForModerator = webcamsOnlyForModerator,
guestPolicy = guestPolicy)
val metadataProp = new MetadataProp(metadata)
diff --git a/bbb-common-message/src/test/scala/org/bigbluebutton/common2/messages/DeserializerTests.scala b/bbb-common-message/src/test/scala/org/bigbluebutton/common2/messages/DeserializerTests.scala
index b3050e3bf264eaee2c50e9779e6c603ba8d3e66d..6eccd3d56cef3de2b3ba6b859085eb7520f941f6 100755
--- a/bbb-common-message/src/test/scala/org/bigbluebutton/common2/messages/DeserializerTests.scala
+++ b/bbb-common-message/src/test/scala/org/bigbluebutton/common2/messages/DeserializerTests.scala
@@ -1,12 +1,11 @@
package org.bigbluebutton.common2.messages
import com.fasterxml.jackson.databind.JsonNode
-import org.bigbluebutton.common2.messages.MessageBody.CreateMeetingReqMsgBody
+import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.common2.util.JsonUtil
-import org.bigbluebutton.common2.{TestFixtures, UnitSpec2}
-
-import scala.util.{Failure, Success}
+import org.bigbluebutton.common2.{ TestFixtures, UnitSpec2 }
+import scala.util.{ Failure, Success }
class DeserializerTests extends UnitSpec2 with TestFixtures {
@@ -28,7 +27,7 @@ class DeserializerTests extends UnitSpec2 with TestFixtures {
println(map)
map match {
case Success(envJsNodeMsg) => assert(envJsNodeMsg.core.isInstanceOf[JsonNode])
- case Failure(ex) => fail("Failed to decode json message " + ex)
+ case Failure(ex) => fail("Failed to decode json message " + ex)
}
}
@@ -46,11 +45,12 @@ class DeserializerTests extends UnitSpec2 with TestFixtures {
println(map)
map match {
- case Success(envJsNodeMsg) => assert(envJsNodeMsg.core.isInstanceOf[JsonNode])
- val createMeetingReqMsg = Deserializer.toCreateMeetingReqMsg(envJsNodeMsg.envelope, envJsNodeMsg.core)
- createMeetingReqMsg match {
+ case Success(envJsNodeMsg) =>
+ assert(envJsNodeMsg.core.isInstanceOf[JsonNode])
+ val (msg, exception) = Deserializer.toBbbCommonMsg[CreateMeetingReqMsg](envJsNodeMsg.core)
+ msg match {
case Some(cmrq) => assert(cmrq.isInstanceOf[CreateMeetingReqMsg])
- case None => fail("Failed to decode CreateMeetingReqMsg")
+ case None => fail("Failed to decode CreateMeetingReqMsg")
}
case Failure(ex) => fail("Failed to decode json message " + ex)
}
@@ -71,11 +71,12 @@ class DeserializerTests extends UnitSpec2 with TestFixtures {
println(map)
map match {
- case Success(envJsNodeMsg) => assert(envJsNodeMsg.core.isInstanceOf[JsonNode])
+ case Success(envJsNodeMsg) =>
+ assert(envJsNodeMsg.core.isInstanceOf[JsonNode])
val (msg, exception) = Deserializer.toBbbCommonMsg[CreateMeetingReqMsg](envJsNodeMsg.core)
msg match {
case Some(cmrq) => assert(cmrq.isInstanceOf[CreateMeetingReqMsg])
- case None => fail("Should have successfully decoded CreateMeetingReqMsg ")
+ case None => fail("Should have successfully decoded CreateMeetingReqMsg ")
}
case Failure(ex) => fail("Failed to decode json message " + ex)
}
@@ -103,7 +104,7 @@ class DeserializerTests extends UnitSpec2 with TestFixtures {
val (result, error) = Deserializer.toBbbCoreMessageFromClient(jsonMsg)
result match {
case Some(msg) => assert(msg.header.name == "foo")
- case None => fail("Should have deserialized message but failed with error: " + error)
+ case None => fail("Should have deserialized message but failed with error: " + error)
}
}
}
diff --git a/bbb-common-message/src/test/scala/org/bigbluebutton/common2/util/JsonUtilTest.scala b/bbb-common-message/src/test/scala/org/bigbluebutton/common2/util/JsonUtilTest.scala
index f701a432de2a92dc520fe585b4b17ec5b00d13ae..7d65d24d2b53db9acc5d623cb40ec2640a6676e1 100755
--- a/bbb-common-message/src/test/scala/org/bigbluebutton/common2/util/JsonUtilTest.scala
+++ b/bbb-common-message/src/test/scala/org/bigbluebutton/common2/util/JsonUtilTest.scala
@@ -1,14 +1,12 @@
package org.bigbluebutton.common2.util
-import org.bigbluebutton.common2.{TestFixtures, UnitSpec2}
-import org.bigbluebutton.common2.messages._
+import org.bigbluebutton.common2.{ TestFixtures, UnitSpec2 }
+import org.bigbluebutton.common2.msgs._
import scala.collection.immutable.List
import com.fasterxml.jackson.databind.JsonNode
-import org.bigbluebutton.common2.messages.MessageBody.ValidateAuthTokenReqMsgBody
-
-import scala.util.{Failure, Success}
+import scala.util.{ Failure, Success }
case class Person(name: String, age: Int)
case class Group(name: String, persons: Seq[Person], leader: Person)
@@ -26,7 +24,7 @@ class JsonUtilTest extends UnitSpec2 with TestFixtures {
// map: Map[String,Seq[Int]] = Map(a -> List(1, 2), b -> List(3, 4, 5), c -> List())
println(map)
map match {
- case Success(a) => assert(a.values.size == 3)
+ case Success(a) => assert(a.values.size == 3)
case Failure(ex) => fail("Failed to decode json message")
}
}
@@ -38,7 +36,7 @@ class JsonUtilTest extends UnitSpec2 with TestFixtures {
val jeroen = Person("Jeroen", 26)
val martin = Person("Martin", 54)
- val originalGroup = Group("Scala ppl", Seq(jeroen,martin), martin)
+ val originalGroup = Group("Scala ppl", Seq(jeroen, martin), martin)
// originalGroup: Group = Group(Scala ppl,List(Person(Jeroen,26), Person(Martin,54)),Person(Martin,54))
println(originalGroup)
@@ -52,7 +50,7 @@ class JsonUtilTest extends UnitSpec2 with TestFixtures {
}
"JsonUtil" should "unmarshall a ValidateAuthTokenReq" in {
- val header: BbbCoreHeaderWithMeetingId = new BbbCoreHeaderWithMeetingId("foo", "mId")
+ val header: BbbClientMsgHeader = new BbbClientMsgHeader("foo", "mId", "uId")
val body: ValidateAuthTokenReqMsgBody = new ValidateAuthTokenReqMsgBody(userId = "uId", authToken = "myToken")
val msg: ValidateAuthTokenReqMsg = new ValidateAuthTokenReqMsg(header, body)
val json = JsonUtil.toJson(msg)
diff --git a/bbb-common-web/build.sbt b/bbb-common-web/build.sbt
index 11ff1b07e84f78a5e330ea98ddf8763bd2cb50aa..0519059e3804bb645328d651ae678ce0ef83224d 100755
--- a/bbb-common-web/build.sbt
+++ b/bbb-common-web/build.sbt
@@ -1,19 +1,23 @@
-name := "bbb-common-web"
-
-organization := "org.bigbluebutton"
-
-version := "0.0.2-SNAPSHOT"
-
-scalaVersion := "2.12.6"
-
-scalacOptions ++= Seq(
- "-unchecked",
- "-deprecation",
- "-Xlint",
- "-Ywarn-dead-code",
- "-language:_",
- "-target:jvm-1.8",
- "-encoding", "UTF-8"
+import org.bigbluebutton.build._
+
+version := "0.0.3-SNAPSHOT"
+
+val compileSettings = Seq(
+ organization := "org.bigbluebutton",
+
+ scalacOptions ++= List(
+ "-unchecked",
+ "-deprecation",
+ "-Xlint",
+ "-Ywarn-dead-code",
+ "-language:_",
+ "-target:jvm-1.8",
+ "-encoding", "UTF-8"
+ ),
+ javacOptions ++= List(
+ "-Xlint:unchecked",
+ "-Xlint:deprecation"
+ )
)
// We want to have our jar files in lib_managed dir.
@@ -25,82 +29,8 @@ testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console",
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports")
-val akkaVersion = "2.5.14"
-
-// https://mvnrepository.com/artifact/org.scala-lang/scala-library
-libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value
-// https://mvnrepository.com/artifact/org.scala-lang/scala-compiler
-libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value
-
-// https://mvnrepository.com/artifact/com.typesafe.akka/akka-actor_2.12
-libraryDependencies += "com.typesafe.akka" % "akka-actor_2.12" % akkaVersion
-// https://mvnrepository.com/artifact/com.typesafe.akka/akka-slf4j_2.12
-libraryDependencies += "com.typesafe.akka" % "akka-slf4j_2.12" % akkaVersion
-
-// https://mvnrepository.com/artifact/com.github.etaty/rediscala_2.12
-libraryDependencies += "com.github.etaty" % "rediscala_2.12" % "1.8.0"
-
-libraryDependencies += "com.softwaremill.quicklens" %% "quicklens" % "1.4.11"
-
-libraryDependencies += "org.bigbluebutton" % "bbb-common-message_2.12" % "0.0.19-SNAPSHOT"
-// https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-scala_2.12
-libraryDependencies += "com.fasterxml.jackson.module" % "jackson-module-scala_2.12" % "2.9.6"
-
-libraryDependencies += "redis.clients" % "jedis" % "2.9.0"
-libraryDependencies += "com.google.code.gson" % "gson" % "2.8.5"
-
-// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
-libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.7"
-libraryDependencies += "commons-io" % "commons-io" % "2.6"
-libraryDependencies += "org.apache.commons" % "commons-pool2" % "2.6.0"
-libraryDependencies += "com.zaxxer" % "nuprocess" % "1.2.4"
-
-// https://mvnrepository.com/artifact/org.jodconverter/jodconverter-core
-libraryDependencies += "org.jodconverter" % "jodconverter-local" % "4.2.0"
-
-// https://mvnrepository.com/artifact/org.libreoffice/unoil
-libraryDependencies += "org.libreoffice" % "unoil" % "5.4.2"
-
-// https://mvnrepository.com/artifact/org.libreoffice/ridl
-libraryDependencies += "org.libreoffice" % "ridl" % "5.4.2"
-
-// https://mvnrepository.com/artifact/org.libreoffice/juh
-libraryDependencies += "org.libreoffice" % "juh" % "5.4.2"
-
-// https://mvnrepository.com/artifact/org.libreoffice/jurt
-libraryDependencies += "org.libreoffice" % "jurt" % "5.4.2"
-
-
-libraryDependencies += "org.apache.poi" % "poi-ooxml" % "3.17"
-
-libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.25"
-
-// https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient
-libraryDependencies += "org.apache.httpcomponents" % "httpclient" % "4.5.6"
-// https://mvnrepository.com/artifact/org.apache.httpcomponents/httpasyncclient
-libraryDependencies += "org.apache.httpcomponents" % "httpasyncclient" % "4.1.4"
-
-libraryDependencies += "org.freemarker" % "freemarker" % "2.3.28"
-libraryDependencies += "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.9.6"
-// https://mvnrepository.com/artifact/org.codehaus.woodstox/woodstox-core-asl
-libraryDependencies += "org.codehaus.woodstox" % "woodstox-core-asl" % "4.4.1"
-
-libraryDependencies += "org.pegdown" % "pegdown" % "1.4.0" % "test"
-libraryDependencies += "junit" % "junit" % "4.12" % "test"
-libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
-// https://mvnrepository.com/artifact/org.mockito/mockito-core
-libraryDependencies += "org.mockito" % "mockito-core" % "2.7.12" % "test"
-libraryDependencies += "org.scalactic" %% "scalactic" % "3.0.1" % "test"
-libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test"
-
-// https://mvnrepository.com/artifact/com.typesafe.akka/akka-testkit_2.12
-libraryDependencies += "com.typesafe.akka" % "akka-testkit_2.12" % akkaVersion % "test"
-
-// https://mvnrepository.com/artifact/org.scala-lang.modules/scala-xml_2.12
-libraryDependencies += "org.scala-lang.modules" % "scala-xml_2.12" % "1.1.0"
-
-
-seq(Revolver.settings: _*)
+Seq(Revolver.settings: _*)
+lazy val commonWeb = (project in file(".")).settings(name := "bbb-common-web", libraryDependencies ++= Dependencies.runtime).settings(compileSettings)
//-----------
// Packaging
@@ -120,12 +50,12 @@ crossPaths := false
// This forbids including Scala related libraries into the dependency
autoScalaLibrary := false
-/***************************
-* When developing, change the version above to x.x.x-SNAPSHOT then use the file resolver to
-* publish to the local maven repo using "sbt publish"
-*/
+/** *************************
+ * When developing, change the version above to x.x.x-SNAPSHOT then use the file resolver to
+ * publish to the local maven repo using "sbt publish"
+ */
// Uncomment this to publish to local maven repo while commenting out the nexus repo
-publishTo := Some(Resolver.file("file", new File(Path.userHome.absolutePath+"/.m2/repository")))
+publishTo := Some(Resolver.file("file", new File(Path.userHome.absolutePath + "/.m2/repository")))
// Comment this out when publishing to local maven repo using SNAPSHOT version.
@@ -150,16 +80,14 @@ pomExtra := (
<url>git@github.com:bigbluebutton/bigbluebutton.git</url>
<connection>scm:git:git@github.com:bigbluebutton/bigbluebutton.git</connection>
</scm>
- <developers>
- <developer>
- <id>ritzalam</id>
- <name>Richard Alam</name>
- <url>http://www.bigbluebutton.org</url>
- </developer>
- </developers>)
-
+ <developers>
+ <developer>
+ <id>ritzalam</id>
+ <name>Richard Alam</name>
+ <url>http://www.bigbluebutton.org</url>
+ </developer>
+ </developers>)
+
licenses := Seq("LGPL-3.0" -> url("http://opensource.org/licenses/LGPL-3.0"))
homepage := Some(url("http://www.bigbluebutton.org"))
-
-
diff --git a/bbb-common-web/deploy.sh b/bbb-common-web/deploy.sh
index 948f5634178c0655544d5ab9148e6df8cc177ffc..f829bc13dc598da480ee4e512a87c9436925a359 100755
--- a/bbb-common-web/deploy.sh
+++ b/bbb-common-web/deploy.sh
@@ -1,3 +1 @@
-sbt clean
-sbt publish publishLocal
-
+sbt clean publish publishLocal
diff --git a/bbb-common-web/project/Build.scala b/bbb-common-web/project/Build.scala
deleted file mode 100755
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/bbb-common-web/project/Dependencies.scala b/bbb-common-web/project/Dependencies.scala
new file mode 100644
index 0000000000000000000000000000000000000000..11f02264ce17223db982de1bb0ef02a5c983b1cb
--- /dev/null
+++ b/bbb-common-web/project/Dependencies.scala
@@ -0,0 +1,103 @@
+package org.bigbluebutton.build
+
+import sbt._
+import Keys._
+
+object Dependencies {
+
+ object Versions {
+ // Scala
+ val scala = "2.12.7"
+ val junit = "4.12"
+ val junitInterface = "0.11"
+ val scalactic = "3.0.3"
+
+ // Libraries
+ val akkaVersion = "2.5.17"
+ val gson = "2.8.5"
+ val jackson = "2.9.7"
+ val freemaker = "2.3.28"
+ val apacheHttp = "4.5.6"
+ val apacheHttpAsync = "4.1.4"
+
+ // Office and document conversion
+ val apacheOffice = "4.0.0"
+ val jodConverter = "4.2.1"
+ val apachePoi = "3.17"
+ val nuProcess = "1.2.4"
+ val libreOffice = "5.4.2"
+
+ // Apache Commons
+ val lang = "3.8.1"
+ val io = "2.6"
+ val pool = "2.6.0"
+
+ // BigBlueButton
+ val bbbCommons = "0.0.20-SNAPSHOT"
+
+ // Test
+ val scalaTest = "3.0.5"
+ }
+
+ object Compile {
+ val scalaLibrary = "org.scala-lang" % "scala-library" % Versions.scala
+ val scalaCompiler = "org.scala-lang" % "scala-compiler" % Versions.scala
+
+ val akkaActor = "com.typesafe.akka" % "akka-actor_2.12" % Versions.akkaVersion
+ val akkaSl4fj = "com.typesafe.akka" % "akka-slf4j_2.12" % Versions.akkaVersion % "runtime"
+
+ val googleGson = "com.google.code.gson" % "gson" % Versions.gson
+ val jacksonModule = "com.fasterxml.jackson.module" %% "jackson-module-scala" % Versions.jackson
+ val jacksonXml = "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % Versions.jackson
+ val freeMaker = "org.freemarker" % "freemarker" % Versions.freemaker
+ val apacheHttp = "org.apache.httpcomponents" % "httpclient" % Versions.apacheHttp
+ val apacheHttpAsync = "org.apache.httpcomponents" % "httpasyncclient" % Versions.apacheHttpAsync
+
+ val poiXml = "org.apache.poi" % "poi-ooxml" % Versions.apachePoi
+ val jodConverter = "org.jodconverter" % "jodconverter-local" % Versions.jodConverter
+ val nuProcess = "com.zaxxer" % "nuprocess" % Versions.nuProcess
+
+ val officeUnoil = "org.libreoffice" % "unoil" % Versions.libreOffice
+ val officeRidl = "org.libreoffice" % "ridl" % Versions.libreOffice
+ val officeJuh = "org.libreoffice" % "juh" % Versions.libreOffice
+ val officejurt = "org.libreoffice" % "jurt" % Versions.libreOffice
+
+ val apacheLang = "org.apache.commons" % "commons-lang3" % Versions.lang
+ val apacheIo = "commons-io" % "commons-io" % Versions.io
+ val apachePool2 = "org.apache.commons" % "commons-pool2" % Versions.pool
+
+ val bbbCommons = "org.bigbluebutton" % "bbb-common-message_2.12" % Versions.bbbCommons
+ }
+
+ object Test {
+ val scalaTest = "org.scalatest" %% "scalatest" % Versions.scalaTest % "test"
+ val junit = "junit" % "junit" % Versions.junit % "test"
+ val junitInteface = "com.novocode" % "junit-interface" % Versions.junitInterface % "test"
+ val scalactic = "org.scalactic" % "scalactic_2.12" % Versions.scalactic % "test"
+ }
+
+ val testing = Seq(
+ Test.scalaTest,
+ Test.junit,
+ Test.junitInteface,
+ Test.scalactic)
+
+ val runtime = Seq(
+ Compile.scalaLibrary,
+ Compile.scalaCompiler,
+ Compile.akkaActor,
+ Compile.akkaSl4fj,
+ Compile.googleGson,
+ Compile.jacksonModule,
+ Compile.jacksonXml,
+ Compile.freeMaker,
+ Compile.apacheHttp,
+ Compile.apacheHttpAsync,
+ Compile.poiXml,
+ Compile.jodConverter,
+ Compile.nuProcess,
+ Compile.apacheLang,
+ Compile.apacheIo,
+ Compile.apachePool2,
+ Compile.bbbCommons) ++ testing
+}
diff --git a/bbb-common-web/project/build.properties b/bbb-common-web/project/build.properties
index a6e117b61042ee81c62ba3a0fc5210d9502944df..2e6e3d24608ee15e892ed3b16d84224f7667e808 100755
--- a/bbb-common-web/project/build.properties
+++ b/bbb-common-web/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=1.2.6
\ No newline at end of file
diff --git a/bbb-common-web/project/plugins.sbt b/bbb-common-web/project/plugins.sbt
index b91f89e4a637ce583af1b0e09615d2f9044e033b..4eb70b26c5aeae53a81b4c122607bda9733ec175 100755
--- a/bbb-common-web/project/plugins.sbt
+++ b/bbb-common-web/project/plugins.sbt
@@ -2,9 +2,7 @@ addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
-
-addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.7")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.7")
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
index b55af510e8eba9d48d0700d4fe44f72b52dbdc8b..825d0deea84dd58dc6a186cf6ab21bc84c37c299 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
@@ -48,7 +48,6 @@ import org.bigbluebutton.api.domain.RegisteredUser;
import org.bigbluebutton.api.domain.User;
import org.bigbluebutton.api.domain.UserSession;
import org.bigbluebutton.api.messaging.MessageListener;
-import org.bigbluebutton.api.messaging.RedisStorageService;
import org.bigbluebutton.api.messaging.converters.messages.DestroyMeetingMessage;
import org.bigbluebutton.api.messaging.converters.messages.EndMeetingMessage;
import org.bigbluebutton.api.messaging.messages.CreateBreakoutRoom;
@@ -77,6 +76,7 @@ import org.bigbluebutton.api.messaging.messages.UserStatusChanged;
import org.bigbluebutton.api.messaging.messages.UserUnsharedWebcam;
import org.bigbluebutton.api2.IBbbWebApiGWApp;
import org.bigbluebutton.api2.domain.UploadedTrack;
+import org.bigbluebutton.common2.redis.RedisStorageService;
import org.bigbluebutton.presentation.PresentationUrlDownloadService;
import org.bigbluebutton.web.services.RegisteredUserCleanupTimerTask;
import org.bigbluebutton.web.services.callback.CallbackUrlService;
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/MessageDistributor.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/MessageDistributor.java
index d6f2837b40f3c7a4bc0df3744d340a689531b39a..007d16d51d374da794faf6dcc5027571841e3ea3 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/MessageDistributor.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/MessageDistributor.java
@@ -5,23 +5,23 @@ import java.util.Set;
import org.bigbluebutton.api.messaging.messages.IMessage;
public class MessageDistributor {
- private ReceivedMessageHandler handler;
- private Set<MessageListener> listeners;
+ private ReceivedMessageHandler handler;
+ private Set<MessageListener> listeners;
- public void setMessageListeners(Set<MessageListener> listeners) {
- this.listeners = listeners;
- }
+ public void setMessageListeners(Set<MessageListener> listeners) {
+ this.listeners = listeners;
+ }
- public void setMessageHandler(ReceivedMessageHandler handler) {
- this.handler = handler;
- if (handler != null) {
- handler.setMessageDistributor(this);
+ public void setMessageHandler(ReceivedMessageHandler handler) {
+ this.handler = handler;
+ if (handler != null) {
+ handler.setMessageDistributor(this);
+ }
}
- }
- public void notifyListeners(IMessage message) {
- for (MessageListener listener : listeners) {
- listener.handle(message);
+ public void notifyListeners(IMessage message) {
+ for (MessageListener listener : listeners) {
+ listener.handle(message);
+ }
}
- }
}
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/ReceivedMessageHandler.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/ReceivedMessageHandler.java
index 38690c4b1e1810135b329130eb6b436bfd8fd3c0..9a1171de745952d9d915efabcd3490a3328a8ab6 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/ReceivedMessageHandler.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/ReceivedMessageHandler.java
@@ -11,65 +11,65 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ReceivedMessageHandler implements IReceivedOldMessageHandler {
- private static Logger log = LoggerFactory.getLogger(ReceivedMessageHandler.class);
+ private static Logger log = LoggerFactory.getLogger(ReceivedMessageHandler.class);
- private BlockingQueue<ReceivedMessage> receivedMessages = new LinkedBlockingQueue<>();
+ private BlockingQueue<ReceivedMessage> receivedMessages = new LinkedBlockingQueue<>();
- private volatile boolean processMessage = false;
+ private volatile boolean processMessage = false;
- private final Executor msgProcessorExec = Executors.newSingleThreadExecutor();
- private final Executor runExec = Executors.newSingleThreadExecutor();
+ private final Executor msgProcessorExec = Executors.newSingleThreadExecutor();
+ private final Executor runExec = Executors.newSingleThreadExecutor();
- private MessageDistributor outGW;
+ private MessageDistributor outGW;
- public void stop() {
- processMessage = false;
- }
+ public void stop() {
+ processMessage = false;
+ }
- public void start() {
- log.info("Ready to handle messages from Redis pubsub!");
+ public void start() {
+ log.info("Ready to handle messages from Redis pubsub!");
+
+ try {
+ processMessage = true;
+
+ Runnable messageProcessor = new Runnable() {
+ public void run() {
+ while (processMessage) {
+ try {
+ ReceivedMessage msg = receivedMessages.take();
+ processMessage(msg);
+ } catch (InterruptedException e) {
+ log.warn("Error while taking received message from queue.");
+ }
+ }
+ }
+ };
+ msgProcessorExec.execute(messageProcessor);
+ } catch (Exception e) {
+ log.error("Error subscribing to channels: {}", e);
+ }
+ }
- try {
- processMessage = true;
+ private void notifyListeners(IMessage message) {
+ outGW.notifyListeners(message);
+ }
- Runnable messageProcessor = new Runnable() {
- public void run() {
- while (processMessage) {
- try {
- ReceivedMessage msg = receivedMessages.take();
- processMessage(msg);
- } catch (InterruptedException e) {
- log.warn("Error while taking received message from queue.");
+ private void processMessage(final ReceivedMessage msg) {
+ Runnable task = new Runnable() {
+ public void run() {
+ notifyListeners(msg.getMessage());
}
- }
- }
- };
- msgProcessorExec.execute(messageProcessor);
- } catch (Exception e) {
- log.error("Error subscribing to channels: {}", e);
+ };
+
+ runExec.execute(task);
+ }
+
+ public void handleMessage(IMessage message) {
+ ReceivedMessage rm = new ReceivedMessage(message);
+ receivedMessages.add(rm);
+ }
+
+ public void setMessageDistributor(MessageDistributor outGW) {
+ this.outGW = outGW;
}
- }
-
- private void notifyListeners(IMessage message) {
- outGW.notifyListeners(message);
- }
-
- private void processMessage(final ReceivedMessage msg) {
- Runnable task = new Runnable() {
- public void run() {
- notifyListeners(msg.getMessage());
- }
- };
-
- runExec.execute(task);
- }
-
- public void handleMessage(IMessage message) {
- ReceivedMessage rm = new ReceivedMessage(message);
- receivedMessages.add(rm);
- }
-
- public void setMessageDistributor(MessageDistributor outGW) {
- this.outGW = outGW;
- }
}
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/RedisStorageService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/RedisStorageService.java
deleted file mode 100755
index 180c95e5ce1517133df3bf5fb72d55aa967a6680..0000000000000000000000000000000000000000
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/RedisStorageService.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.bigbluebutton.api.messaging;
-
-import java.util.Map;
-
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.Protocol;
-
-public class RedisStorageService {
- private static Logger log = LoggerFactory.getLogger(RedisStorageService.class);
-
- private JedisPool redisPool;
- private String host;
- private int port;
-
- public void stop() {
-
- }
-
- public void start() {
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- redisPool = new JedisPool(new GenericObjectPoolConfig<Object>(), host, port, Protocol.DEFAULT_TIMEOUT, null,
- Protocol.DEFAULT_DATABASE, "BbbRed5AppsPub");
- }
-
- public void recordMeetingInfo(String meetingId, Map<String, String> info) {
- Jedis jedis = redisPool.getResource();
- try {
- if (log.isDebugEnabled()) {
- for (Map.Entry<String,String> entry : info.entrySet()) {
- log.debug("Storing metadata {} = {}", entry.getKey(), entry.getValue());
- }
- }
-
- log.debug("Saving metadata in {}", meetingId);
- jedis.hmset("meeting:info:" + meetingId, info);
- } catch (Exception e) {
- log.warn("Cannot record the info meeting: {}", meetingId, e);
- } finally {
- jedis.close();
- }
- }
-
- public void recordBreakoutInfo(String meetingId, Map<String, String> breakoutInfo) {
- Jedis jedis = redisPool.getResource();
- try {
- log.debug("Saving breakout metadata in {}", meetingId);
- jedis.hmset("meeting:breakout:" + meetingId, breakoutInfo);
- } catch (Exception e) {
- log.warn("Cannot record the info meeting: {}", meetingId, e);
- } finally {
- jedis.close();
- }
- }
-
- public void addBreakoutRoom(String parentId, String breakoutId) {
- Jedis jedis = redisPool.getResource();
- try {
-
- log.debug("Saving breakout room for meeting {}", parentId);
- jedis.sadd("meeting:breakout:rooms:" + parentId, breakoutId);
- } catch (Exception e) {
- log.warn("Cannot record the info meeting:" + parentId, e);
- } finally {
- jedis.close();
- }
- }
-
- public void removeMeeting(String meetingId) {
- Jedis jedis = redisPool.getResource();
- try {
- jedis.del("meeting-" + meetingId);
- jedis.srem("meetings", meetingId);
- } finally {
- jedis.close();
- }
- }
-
- public void setHost(String host) {
- this.host = host;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-}
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/web/services/RedisStorageService.java b/bbb-common-web/src/main/java/org/bigbluebutton/web/services/RedisStorageService.java
deleted file mode 100755
index 3a45aedfd144ec9a6803672d81432e1c21420f7d..0000000000000000000000000000000000000000
--- a/bbb-common-web/src/main/java/org/bigbluebutton/web/services/RedisStorageService.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
-* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-*
-* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
-*
-* This program is free software; you can redistribute it and/or modify it under the
-* terms of the GNU Lesser General Public License as published by the Free Software
-* Foundation; either version 3.0 of the License, or (at your option) any later
-* version.
-*
-* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License along
-* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-package org.bigbluebutton.web.services;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bigbluebutton.api.domain.Poll;
-
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-
-public class RedisStorageService implements IStorageService{
- JedisPool jedisPool;
-
- private static final String SEPARATOR = ":";
- private static final String ID_SEED = "nextID";
-
- /* Meeting Patterns */
- private static final String MEETING = "meeting";
- private static final String POLL = "poll";
- private static final String POLL_ANSWER = "answer";
- private static final String POLL_RESULTS = "results";
-
- /*
-meeting:<id>:poll:list [1,2,3] <-- list
-meeting:<id>:poll:<pollid> title, date <-- hash
-meeting:<id>:poll:<pollid>:answer:list [1,2,3] <-- list
-meeting:<id>:poll:<pollid>:answer:<answerid> answertext <-- key/value
-
-meeting:<id>:poll:<pollid>:answer:<answerid>:results [<userid>|1] <-- Set
- */
-
- public String generatePollID(String meetingID){
- Jedis jedis = (Jedis) jedisPool.getResource();
- String pattern = getPollRedisPattern(meetingID);
- String pollID = Long.toString(jedis.incr(pattern + SEPARATOR + ID_SEED));
- jedisPool.returnResource(jedis);
- return pollID;
- }
-
- public String generatePollAnswerID(String meetingID){
- Jedis jedis = jedisPool.getResource();
- String pattern = getPollRedisPattern(meetingID);
- String pollID = Long.toString(jedis.incr(pattern + SEPARATOR + POLL_ANSWER + SEPARATOR + ID_SEED));
- jedisPool.returnResource(jedis);
- return pollID;
- }
-
- public void storePoll(Poll p){
- Jedis jedis = jedisPool.getResource();
- String pattern = getPollRedisPattern(p.getMeetingID());
-
- HashMap<String,String> pollMap = p.toMap();
- jedis.hmset(pattern + SEPARATOR + p.getPollID(), pollMap);
- jedisPool.returnResource(jedis);
- }
-
- public void storePollAnswers(String meetingID, String pollID, Map<String,String> answers){
- Jedis jedis = jedisPool.getResource();
- String pattern = getPollRedisPattern(meetingID);
-
- //HashMap<String,String> pollMap = p.toMap();
- //jedis.hmset(pattern + SEPARATOR + p.getPollID + SEPARATOR + POLL_ANSWER + SEPARATOR + ID_SEED, pollMap);
- //jedisPool.returnResource(jedis);
- }
-
- private String getPollRedisPattern(String meetingID){
- return MEETING + SEPARATOR + meetingID + SEPARATOR + POLL;
- }
-
- public void setJedisPool(JedisPool jedisPool){
- this.jedisPool = jedisPool;
- }
-}
\ No newline at end of file
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
index 053c62ad567117e2120f8eb817a85ae55db7b081..6d62c007f4b22d54d1943c9533b207da058a0c62 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
+++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
@@ -5,12 +5,14 @@ import akka.actor.ActorSystem
import akka.event.Logging
import org.bigbluebutton.api.messaging.converters.messages._
import org.bigbluebutton.api2.bus._
-import org.bigbluebutton.api2.endpoint.redis.{ AppsRedisSubscriberActor, MessageSender, RedisPublisher }
+import org.bigbluebutton.api2.endpoint.redis.{ WebRedisSubscriberActor }
+import org.bigbluebutton.common2.redis.MessageSender
import org.bigbluebutton.api2.meeting.{ OldMeetingMsgHdlrActor, RegisterUser }
import org.bigbluebutton.common2.domain._
import org.bigbluebutton.presentation.messages._
-
import scala.concurrent.duration._
+import org.bigbluebutton.common2.redis._
+import org.bigbluebutton.common2.bus._
class BbbWebApiGWApp(
val oldMessageReceivedGW: OldMessageReceivedGW,
@@ -24,10 +26,8 @@ class BbbWebApiGWApp(
val log = Logging(system, getClass)
- log.debug("*********** meetingManagerChannel = " + meetingManagerChannel)
-
private val jsonMsgToAkkaAppsBus = new JsonMsgToAkkaAppsBus
- private val redisPublisher = new RedisPublisher(system)
+ private val redisPublisher = new RedisPublisher(system, "BbbWebPub")
private val msgSender: MessageSender = new MessageSender(redisPublisher)
private val messageSenderActorRef = system.actorOf(MessageSenderActor.props(msgSender), "messageSenderActor")
@@ -54,8 +54,7 @@ class BbbWebApiGWApp(
msgToAkkaAppsEventBus.subscribe(msgToAkkaAppsToJsonActor, toAkkaAppsChannel)
- private val appsRedisSubscriberActor = system.actorOf(
- AppsRedisSubscriberActor.props(receivedJsonMsgBus, oldMessageEventBus), "appsRedisSubscriberActor")
+ private val appsRedisSubscriberActor = system.actorOf(WebRedisSubscriberActor.props(system, receivedJsonMsgBus, oldMessageEventBus), "appsRedisSubscriberActor")
private val receivedJsonMsgHdlrActor = system.actorOf(
ReceivedJsonMsgHdlrActor.props(msgFromAkkaAppsEventBus), "receivedJsonMsgHdlrActor")
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/SystemConfiguration.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/SystemConfiguration.scala
index 0eb67da98170ac2b5304922e745ffcd835351719..71d5d402c9dbc462ff2206677a22e5912f4ed5eb 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/SystemConfiguration.scala
+++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/SystemConfiguration.scala
@@ -3,17 +3,11 @@ package org.bigbluebutton.api2
import com.typesafe.config.ConfigFactory
import scala.util.Try
+import org.bigbluebutton.common2.redis.RedisConfiguration
-trait SystemConfiguration {
- val config = ConfigFactory.load("bbb-web")
+trait SystemConfiguration extends RedisConfiguration {
+ override val config = ConfigFactory.load("bbb-web")
- lazy val redisHost = Try(config.getString("redis.host")).getOrElse("127.0.0.1")
- lazy val redisPort = Try(config.getInt("redis.port")).getOrElse(6379)
- lazy val redisPassword = Try(config.getString("redis.password")).getOrElse("")
-
- lazy val toAkkaAppsRedisChannel = Try(config.getString("redis.toAkkaAppsRedisChannel")).getOrElse("to-akka-apps-redis-channel")
- lazy val fromAkkaAppsRedisChannel = Try(config.getString("redis.fromAkkaAppsRedisChannel")).getOrElse("from-akka-apps-redis-channel")
- lazy val meetingManagerChannel = Try(config.getString("eventBus.meetingManagerChannel")).getOrElse("FOOOOOOOOO")
lazy val fromAkkaAppsChannel = Try(config.getString("eventBus.fromAkkaAppsChannel")).getOrElse("from-akka-apps-channel")
lazy val toAkkaAppsChannel = Try(config.getString("eventBus.toAkkaAppsChannel")).getOrElse("to-akka-apps-channel")
lazy val fromClientChannel = Try(config.getString("eventBus.fromClientChannel")).getOrElse("from-client-channel")
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MessageSenderActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MessageSenderActor.scala
index f4dc981cc96c2d79547f5d62693aa8da83c33558..e21612025c28d43587c0f715fe81455e67ffd03b 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MessageSenderActor.scala
+++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/MessageSenderActor.scala
@@ -4,7 +4,7 @@ import java.io.{PrintWriter, StringWriter}
import akka.actor.SupervisorStrategy.Resume
import akka.actor.{Actor, ActorLogging, OneForOneStrategy, Props}
-import org.bigbluebutton.api2.endpoint.redis.MessageSender
+import org.bigbluebutton.common2.redis.MessageSender
import scala.concurrent.duration._
object MessageSenderActor {
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/OldMessageJsonReceiverActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/OldMessageJsonReceiverActor.scala
index f996ad30ef5c87f4b417d238639ffc3facd34f76..ab5af661bf3f1fec0935d364ce2e9c027538813d 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/OldMessageJsonReceiverActor.scala
+++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/OldMessageJsonReceiverActor.scala
@@ -1,6 +1,7 @@
package org.bigbluebutton.api2.bus
-import akka.actor.{Actor, ActorLogging, Props}
+import akka.actor.{Actor, ActorLogging, Props}
+import org.bigbluebutton.common2.bus.OldReceivedJsonMessage
object OldMessageJsonReceiverActor{
def props(gw: OldMessageReceivedGW): Props = Props(classOf[OldMessageJsonReceiverActor], gw)
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
index e63f2d454eecd42ea026bab87933fa10d02dde58..174e4951dfd5fad4a2a6c1dbd980207d78999111 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
+++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
@@ -1,6 +1,7 @@
package org.bigbluebutton.api2.bus
import org.bigbluebutton.api2.SystemConfiguration
+import org.bigbluebutton.common2.bus._
import org.bigbluebutton.common2.msgs._
import com.fasterxml.jackson.databind.JsonNode
import akka.actor.Actor
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/domain/Recording.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/domain/Recording.scala
index ef3ad2841b4339afe9ab223a5a09a27acdf9181a..1584b300207bef03c2de675264cf8726bc972436 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/domain/Recording.scala
+++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/domain/Recording.scala
@@ -243,7 +243,7 @@ case class RecMeta(id: String, meetingId: String, internalMeetingId: Option[ Str
val startTimeElem = <startTime>{startTime}</startTime>
val endTimeElem = <endTime>{endTime}</endTime>
val participantsElem = <participants>{participants}</participants>
-
+ val rawSizeElem = <rawSize>{rawSize}</rawSize>
val buffer = new scala.xml.NodeBuffer
buffer += recordIdElem
@@ -256,6 +256,7 @@ case class RecMeta(id: String, meetingId: String, internalMeetingId: Option[ Str
buffer += startTimeElem
buffer += endTimeElem
buffer += participantsElem
+ buffer += rawSizeElem
meta foreach (m => buffer += metaToElem(m))
breakout foreach (b => buffer += b.toXml())
@@ -285,6 +286,7 @@ case class RecMeta(id: String, meetingId: String, internalMeetingId: Option[ Str
buffer += startTimeElem
buffer += endTimeElem
buffer += participantsElem
+ buffer += rawSizeElem
meeting foreach { m =>
buffer += m.toMetadataXml()
@@ -320,8 +322,6 @@ case class RecMeta(id: String, meetingId: String, internalMeetingId: Option[ Str
dataMetrics foreach(p => buffer += p.toMetadataXml())
- buffer += rawSizeElem
-
<recording>{buffer}</recording>
}
}
@@ -346,11 +346,13 @@ case class RecMetaPlayback(format: String, link: String, processingTime: Int,
val urlElem = <url>{link}</url>
val processTimeElem = <processingTime>{processingTime}</processingTime>
val lengthElem = <length>{duration / 60000}</length>
+ val sizeElem = <size>{size}</size>
buffer += formatElem
buffer += urlElem
buffer += processTimeElem
buffer += lengthElem
+ buffer += sizeElem
extensions foreach {ext =>
ext.head.child foreach {child =>
@@ -369,12 +371,13 @@ case class RecMetaPlayback(format: String, link: String, processingTime: Int,
val urlElem = <link>{link}</link>
val processTimeElem = <processing_time>{processingTime}</processing_time>
val lengthElem = <duration>{duration}</duration>
+ val sizeElem = <size>{size}</size>
buffer += formatElem
buffer += urlElem
buffer += processTimeElem
buffer += lengthElem
-
+ buffer += sizeElem
extensions foreach {ext =>
buffer += ext.head
@@ -390,11 +393,13 @@ case class RecMetaPlayback(format: String, link: String, processingTime: Int,
val urlElem = <url>{link}</url>
val processTimeElem = <processingTime>{processingTime}</processingTime>
val lengthElem = <length>{duration / 60000}</length>
+ val sizeElem = <size>{size}</size>
buffer += formatElem
buffer += urlElem
buffer += processTimeElem
buffer += lengthElem
+ buffer += sizeElem
extensions foreach {ext =>
ext.head.child foreach {child =>
@@ -530,6 +535,7 @@ case class RecMetaResponse(
val startTimeElem = <startTime>{startTime}</startTime>
val endTimeElem = <endTime>{endTime}</endTime>
val participantsElem = <participants>{participants}</participants>
+ val rawSizeElem = <rawSize>{rawSize}</rawSize>
val buffer = new scala.xml.NodeBuffer
buffer += recordIdElem
@@ -542,6 +548,7 @@ case class RecMetaResponse(
buffer += startTimeElem
buffer += endTimeElem
buffer += participantsElem
+ buffer += rawSizeElem
meta foreach (m => buffer += metaToElem(m))
breakout foreach (b => buffer += b.toXml())
@@ -551,7 +558,13 @@ case class RecMetaResponse(
// Iterate over all formats before include the playback tag
val formats = new scala.xml.NodeBuffer
- playbacks foreach(p => formats += p.toFormatXml())
+ var size = 0L
+ playbacks foreach(p => {
+ size += p.size
+ formats += p.toFormatXml()
+ })
+ val sizeElem = <size>{size}</size>
+ buffer += sizeElem
val playbackElem = <playback>{formats}</playback>
buffer += playbackElem
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/AppsRedisSubscriberActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/AppsRedisSubscriberActor.scala
deleted file mode 100755
index 3b566c6f2f90eedc8969cb7b3346aef349c69a02..0000000000000000000000000000000000000000
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/AppsRedisSubscriberActor.scala
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bigbluebutton.api2.endpoint.redis
-
-import java.io.{PrintWriter, StringWriter}
-import java.net.InetSocketAddress
-
-import akka.actor.SupervisorStrategy.Resume
-import akka.actor.{OneForOneStrategy, Props}
-import redis.api.servers.ClientSetname
-import redis.actors.RedisSubscriberActor
-import redis.api.pubsub.{Message, PMessage}
-import scala.concurrent.duration._
-
-import org.bigbluebutton.api2.SystemConfiguration
-import org.bigbluebutton.api2.bus._
-
-object AppsRedisSubscriberActor extends SystemConfiguration {
-
- val channels = Seq(fromAkkaAppsRedisChannel)
- val patterns = Seq("bigbluebutton:from-bbb-apps:*")
-
- def props(jsonMsgBus: JsonMsgFromAkkaAppsBus, oldMessageEventBus: OldMessageEventBus): Props =
- Props(classOf[AppsRedisSubscriberActor], jsonMsgBus, oldMessageEventBus,
- redisHost, redisPort,
- channels, patterns).withDispatcher("akka.rediscala-subscriber-worker-dispatcher")
-}
-
-class AppsRedisSubscriberActor(jsonMsgBus: JsonMsgFromAkkaAppsBus, oldMessageEventBus: OldMessageEventBus, redisHost: String,
- redisPort: Int,
- channels: Seq[String] = Nil, patterns: Seq[String] = Nil)
- extends RedisSubscriberActor(new InetSocketAddress(redisHost, redisPort),
- channels, patterns, onConnectStatus = connected => { println(s"connected: $connected") }) with SystemConfiguration {
-
- override val supervisorStrategy = OneForOneStrategy(maxNrOfRetries = 10, withinTimeRange = 1 minute) {
- case e: Exception => {
- val sw: StringWriter = new StringWriter()
- sw.write("An exception has been thrown on AppsRedisSubscriberActor, exception message [" + e.getMessage() + "] (full stacktrace below)\n")
- e.printStackTrace(new PrintWriter(sw))
- log.error(sw.toString())
- Resume
- }
- }
-
-
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- write(ClientSetname("Red5AppsSub").encodedRequest)
-
- def onMessage(message: Message) {
- //log.error(s"SHOULD NOT BE RECEIVING: $message")
- if (message.channel == fromAkkaAppsRedisChannel) {
- val receivedJsonMessage = new JsonMsgFromAkkaApps(message.channel, message.data.utf8String)
- jsonMsgBus.publish(JsonMsgFromAkkaAppsEvent(fromAkkaAppsJsonChannel, receivedJsonMessage))
- }
- }
-
- def onPMessage(pmessage: PMessage) {
- log.debug(s"RECEIVED:\n ${pmessage.data.utf8String} \n")
- val receivedJsonMessage = new OldReceivedJsonMessage(pmessage.patternMatched,
- pmessage.channel, pmessage.data.utf8String)
-
- oldMessageEventBus.publish(OldIncomingJsonMessage(fromAkkaAppsOldJsonChannel, receivedJsonMessage))
- }
-}
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/RedisDataStorageActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/RedisDataStorageActor.scala
index 8fb2731d4204bd661b5c1762549593439adf1066..e4d6628018a0a84ee2c596c3b12221c4b1393c86 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/RedisDataStorageActor.scala
+++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/RedisDataStorageActor.scala
@@ -1,51 +1,48 @@
package org.bigbluebutton.api2.endpoint.redis
-import akka.actor.{Actor, ActorLogging, ActorSystem, Props}
import org.bigbluebutton.api2.SystemConfiguration
-import redis.RedisClient
+import org.bigbluebutton.common2.redis.RedisStorageProvider
+import akka.actor.Actor
+import akka.actor.ActorLogging
+import akka.actor.ActorSystem
+import akka.actor.Props
case class RecordMeetingInfoMsg(meetingId: String, info: collection.immutable.Map[String, String])
case class RecordBreakoutInfoMsg(meetingId: String, info: collection.immutable.Map[String, String])
case class AddBreakoutRoomMsg(parentId: String, breakoutId: String)
case class RemoveMeetingMsg(meetingId: String)
-
object RedisDataStorageActor {
def props(system: ActorSystem): Props = Props(classOf[RedisDataStorageActor], system)
}
-class RedisDataStorageActor(val system: ActorSystem) extends Actor with ActorLogging with SystemConfiguration {
-
- val redis = RedisClient(redisHost, redisPort)(system)
-
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- redis.clientSetname("BbbWebStore")
+class RedisDataStorageActor(val system: ActorSystem)
+ extends RedisStorageProvider(system, "BbbWebStore")
+ with SystemConfiguration
+ with Actor with ActorLogging {
def receive = {
- case msg: RecordMeetingInfoMsg => handleRecordMeetingInfoMsg(msg)
+ case msg: RecordMeetingInfoMsg => handleRecordMeetingInfoMsg(msg)
case msg: RecordBreakoutInfoMsg => handleRecordBreakoutInfoMsg(msg)
- case msg: AddBreakoutRoomMsg => handleAddBreakoutRoomMsg(msg)
- case msg: RemoveMeetingMsg => handleRemoveMeetingMsg(msg)
+ case msg: AddBreakoutRoomMsg => handleAddBreakoutRoomMsg(msg)
+ case msg: RemoveMeetingMsg => handleRemoveMeetingMsg(msg)
}
-
def handleRecordMeetingInfoMsg(msg: RecordMeetingInfoMsg): Unit = {
- redis.hmset("meeting:info:" + msg.meetingId, msg.info)
+ redis.recordMeetingInfo(msg.meetingId, msg.info.asInstanceOf[java.util.Map[java.lang.String, java.lang.String]]);
}
def handleRecordBreakoutInfoMsg(msg: RecordBreakoutInfoMsg): Unit = {
- redis.hmset("meeting:breakout:" + msg.meetingId, msg.info)
+ redis.recordBreakoutInfo(msg.meetingId, msg.info.asInstanceOf[java.util.Map[java.lang.String, java.lang.String]])
}
def handleAddBreakoutRoomMsg(msg: AddBreakoutRoomMsg): Unit = {
- redis.sadd("meeting:breakout:rooms:" + msg.parentId, msg.breakoutId)
+ redis.addBreakoutRoom(msg.parentId, msg.breakoutId)
}
def handleRemoveMeetingMsg(msg: RemoveMeetingMsg): Unit = {
- redis.del("meeting-" + msg.meetingId)
- redis.srem("meetings", msg.meetingId)
+ redis.removeMeeting(msg.meetingId)
}
}
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/RedisPublisher.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/RedisPublisher.scala
deleted file mode 100755
index 23e47ddd06d00f8173032f08c5d585c354129f5f..0000000000000000000000000000000000000000
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/RedisPublisher.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bigbluebutton.api2.endpoint.redis
-
-import akka.actor.ActorSystem
-import akka.event.Logging
-import akka.util.ByteString
-import org.bigbluebutton.api2.SystemConfiguration
-import redis.RedisClient
-
-class RedisPublisher(val system: ActorSystem) extends SystemConfiguration {
-
- val redis = RedisClient(redisHost, redisPort)(system)
-
- val log = Logging(system, getClass)
-
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- redis.clientSetname("BbbWebPub")
-
- def publish(channel: String, data: String) {
- //log.debug("PUBLISH TO \n[" + channel + "]: \n " + data + "\n")
- redis.publish(channel, ByteString(data))
- }
-
-}
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/WebRedisSubscriberActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/WebRedisSubscriberActor.scala
new file mode 100755
index 0000000000000000000000000000000000000000..bcb2e4b3d26ebbe6d7d9b7573849162364e3f35b
--- /dev/null
+++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/WebRedisSubscriberActor.scala
@@ -0,0 +1,53 @@
+package org.bigbluebutton.api2.endpoint.redis
+
+import org.bigbluebutton.api2.SystemConfiguration
+import org.bigbluebutton.common2.bus._
+import org.bigbluebutton.common2.redis.{ RedisConfiguration, RedisSubscriber, RedisSubscriberProvider }
+
+import akka.actor.ActorSystem
+import akka.actor.Props
+import io.lettuce.core.pubsub.RedisPubSubListener
+
+object WebRedisSubscriberActor extends RedisSubscriber with RedisConfiguration {
+
+ val channels = Seq(fromAkkaAppsRedisChannel)
+ val patterns = Seq("bigbluebutton:from-bbb-apps:*")
+
+ def props(system: ActorSystem, jsonMsgBus: JsonMsgFromAkkaAppsBus, oldMessageEventBus: OldMessageEventBus): Props =
+ Props(
+ classOf[WebRedisSubscriberActor],
+ system, jsonMsgBus, oldMessageEventBus,
+ redisHost, redisPort,
+ channels, patterns).withDispatcher("akka.redis-subscriber-worker-dispatcher")
+}
+
+class WebRedisSubscriberActor(
+ system: ActorSystem,
+ jsonMsgBus: JsonMsgFromAkkaAppsBus, oldMessageEventBus: OldMessageEventBus, redisHost: String,
+ redisPort: Int,
+ channels: Seq[String] = Nil, patterns: Seq[String] = Nil)
+ extends RedisSubscriberProvider(system, "BbbWebSub", channels, patterns, null) with SystemConfiguration {
+
+ override def addListener(appChannel: String) {
+ connection.addListener(new RedisPubSubListener[String, String] {
+ def message(channel: String, message: String): Unit = {
+ if (channels.contains(channel)) {
+ val receivedJsonMessage = new JsonMsgFromAkkaApps(channel, message)
+ jsonMsgBus.publish(JsonMsgFromAkkaAppsEvent(fromAkkaAppsJsonChannel, receivedJsonMessage))
+ }
+ }
+ def message(pattern: String, channel: String, message: String): Unit = {
+ log.debug(s"RECEIVED:\n ${message} \n")
+ val receivedJsonMessage = new OldReceivedJsonMessage(pattern, channel, message)
+ oldMessageEventBus.publish(OldIncomingJsonMessage(fromAkkaAppsOldJsonChannel, receivedJsonMessage))
+ }
+ def psubscribed(pattern: String, count: Long): Unit = { log.info("Subscribed to pattern {}", pattern) }
+ def punsubscribed(pattern: String, count: Long): Unit = { log.info("Unsubscribed from pattern {}", pattern) }
+ def subscribed(channel: String, count: Long): Unit = { log.info("Subscribed to pattern {}", channel) }
+ def unsubscribed(channel: String, count: Long): Unit = { log.info("Unsubscribed from channel {}", channel) }
+ })
+ }
+
+ addListener(fromAkkaAppsJsonChannel)
+ subscribe()
+}
diff --git a/bbb-common-web/src/test/scala/org/bigbluebutton/api/util/ParamsUtilTest.scala b/bbb-common-web/src/test/scala/org/bigbluebutton/api/util/ParamsUtilTest.scala
index 6cf5716b067425c1a5a4e5372b58049bc24d2632..460701c67a52074344736bacfea2d03adfbb3066 100755
--- a/bbb-common-web/src/test/scala/org/bigbluebutton/api/util/ParamsUtilTest.scala
+++ b/bbb-common-web/src/test/scala/org/bigbluebutton/api/util/ParamsUtilTest.scala
@@ -1,23 +1,21 @@
-package org.bigbluebutton.api.util
-
-import org.scalatest._
-
-class ParamsUtilTest extends UnitSpec {
-
- it should "strip out control chars from text" in {
- val text = "a\u0000b\u0007c\u008fd"
- val cleaned = ParamsUtil.stripControlChars(text)
- assert("abcd" == cleaned)
- }
-
- it should "complain about invalid chars in meetingId" in {
- val meetingId = "Demo , Meeting"
- assert(ParamsUtil.isValidMeetingId(meetingId) == false)
- }
-
- it should "accept valid chars in meetingId" in {
- val meetingId = "Demo Meeting - 123"
- assert(ParamsUtil.isValidMeetingId(meetingId) == true)
- }
-
-}
+package org.bigbluebutton.api.util
+
+class ParamsUtilTest extends UnitSpec {
+
+ it should "strip out control chars from text" in {
+ val text = "a\u0000b\u0007c\u008fd"
+ val cleaned = ParamsUtil.stripControlChars(text)
+ assert("abcd" == cleaned)
+ }
+
+ it should "complain about invalid chars in meetingId" in {
+ val meetingId = "Demo , Meeting"
+ assert(ParamsUtil.isValidMeetingId(meetingId) == false)
+ }
+
+ it should "accept valid chars in meetingId" in {
+ val meetingId = "Demo Meeting - 123"
+ assert(ParamsUtil.isValidMeetingId(meetingId) == true)
+ }
+
+}
diff --git a/bbb-common-web/src/test/scala/org/bigbluebutton/api/util/UnitSpec.scala b/bbb-common-web/src/test/scala/org/bigbluebutton/api/util/UnitSpec.scala
index fef2d5a231b50c2ea1597f488d4533cd972b040c..6c5694d0c06fd995a03851556746f84cefeeabc4 100755
--- a/bbb-common-web/src/test/scala/org/bigbluebutton/api/util/UnitSpec.scala
+++ b/bbb-common-web/src/test/scala/org/bigbluebutton/api/util/UnitSpec.scala
@@ -1,8 +1,7 @@
-package org.bigbluebutton.api.util
-
-import org.scalatest.FlatSpec
-import org.scalatest.BeforeAndAfterAll
-import org.scalatest.WordSpec
-import org.scalatest.Matchers
-
-abstract class UnitSpec extends FlatSpec with Matchers with BeforeAndAfterAll
+package org.bigbluebutton.api.util
+
+import org.scalatest.FlatSpec
+import org.scalatest.BeforeAndAfterAll
+import org.scalatest.Matchers
+
+abstract class UnitSpec extends FlatSpec with Matchers with BeforeAndAfterAll
diff --git a/bbb-fsesl-client/build.gradle b/bbb-fsesl-client/build.gradle
deleted file mode 100755
index ad7449677b1d7cfcb3a84f1b5ad1a2b3524472c1..0000000000000000000000000000000000000000
--- a/bbb-fsesl-client/build.gradle
+++ /dev/null
@@ -1,72 +0,0 @@
-apply plugin: 'java'
-apply plugin: 'eclipse'
-
-version = '0.9.0'
-jar.enabled = true
-
-def appName = 'fs-esl-client'
-
-archivesBaseName = appName
-
-task resolveDeps(type: Copy) {
- into('lib')
- from configurations.default
- from configurations.default.allArtifacts.file
-}
-
-
-artifacts {
- archives jar
-}
-
-repositories {
- add(new org.apache.ivy.plugins.resolver.ChainResolver()) {
- name = 'remote'
- returnFirst = true
- add(new org.apache.ivy.plugins.resolver.URLResolver()) {
- name = "googlecode"
- addArtifactPattern "http://red5.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
- addArtifactPattern "http://red5.googlecode.com/svn/repository/[organisation]/[artifact](-[revision]).[ext]"
- }
- add(new org.apache.ivy.plugins.resolver.URLResolver()) {
- name = "blindside-repos"
- addArtifactPattern "http://blindside.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
- addArtifactPattern "http://blindside.googlecode.com/svn/repository/[organisation]/[artifact](-[revision]).[ext]"
- }
- add(new org.apache.ivy.plugins.resolver.URLResolver()) {
- name = "maven2-central"
- m2compatible = true
- addArtifactPattern "http://repo1.maven.org/maven2/[organisation]/[module]/[revision]/[artifact](-[revision]).[ext]"
- addArtifactPattern "http://repo1.maven.org/maven2/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]"
- }
- add(new org.apache.ivy.plugins.resolver.URLResolver()) {
- name = "netty-dependency"
- m2compatible = true
- addArtifactPattern "http://repository.jboss.org/nexus/content/groups/public-jboss/[organisation]/[module]/[revision]/[artifact](-[revision]).[ext]"
- addArtifactPattern "http://repo1.maven.org/maven2/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]"
- }
- }
- flatDir name: 'fileRepo', dirs: "/home/firstuser/dev/repo"
-}
-
-dependencies {
- // Logging
- compile 'ch.qos.logback:logback-core:1.2.3@jar'
- compile 'ch.qos.logback:logback-classic:1.2.3@jar'
- compile 'org.slf4j:log4j-over-slf4j:1.7.25@jar'
- compile 'org.slf4j:jcl-over-slf4j:1.7.25@jar'
- compile 'org.slf4j:jul-to-slf4j:1.7.25@jar'
- compile 'org.slf4j:slf4j-api:1.7.25@jar'
-
- testRuntime 'junit:junit:4.8.1.@jar'
- compile 'org.jboss.netty:netty:3.2.10.Final@jar'
-}
-
-
-uploadArchives {
- uploadDescriptor = false
- repositories {
- add project.repositories.fileRepo
- }
-}
-
diff --git a/bbb-fsesl-client/build.sbt b/bbb-fsesl-client/build.sbt
index 6cc930898e0964d5da423f80eab0781b35b9b812..4399efc2a4eb945ecde60540463bfe99b225e001 100755
--- a/bbb-fsesl-client/build.sbt
+++ b/bbb-fsesl-client/build.sbt
@@ -1,10 +1,26 @@
-name := "bbb-fsesl-client"
+import org.bigbluebutton.build._
description := "BigBlueButton custom FS-ESL client built on top of FS-ESL Java library."
-organization := "org.bigbluebutton"
-
-version := "0.0.6"
+version := "0.0.7-SNAPSHOT"
+
+val compileSettings = Seq(
+ organization := "org.bigbluebutton",
+
+ scalacOptions ++= List(
+ "-unchecked",
+ "-deprecation",
+ "-Xlint",
+ "-Ywarn-dead-code",
+ "-language:_",
+ "-target:jvm-1.8",
+ "-encoding", "UTF-8"
+ ),
+ javacOptions ++= List(
+ "-Xlint:unchecked",
+ "-Xlint:deprecation"
+ )
+)
// We want to have our jar files in lib_managed dir.
// This way we'll have the right path when we import
@@ -15,14 +31,8 @@ testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console",
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports")
-libraryDependencies ++= {
- Seq(
- "org.jboss.netty" % "netty" % "3.2.10.Final",
- "junit" % "junit" % "4.12",
- "ch.qos.logback" % "logback-classic" % "1.2.3"
- )}
-
-seq(Revolver.settings: _*)
+Seq(Revolver.settings: _*)
+lazy val bbbFSESLClient = (project in file(".")).settings(name := "bbb-fsesl-client", libraryDependencies ++= Dependencies.runtime).settings(compileSettings)
//-----------
// Packaging
@@ -42,7 +52,7 @@ crossPaths := false
// This forbids including Scala related libraries into the dependency
autoScalaLibrary := false
-publishTo := Some(Resolver.file("file", new File(Path.userHome.absolutePath+"/.m2/repository")))
+publishTo := Some(Resolver.file("file", new File(Path.userHome.absolutePath + "/.m2/repository")))
//publishTo := {
// val nexus = "https://oss.sonatype.org/"
@@ -60,10 +70,10 @@ publishArtifact in Test := false
// http://www.scala-sbt.org/release/docs/Artifacts.html
// disable publishing the main API jar
-publishArtifact in (Compile, packageDoc) := false
+publishArtifact in(Compile, packageDoc) := false
// disable publishing the main sources jar
-publishArtifact in (Compile, packageSrc) := false
+publishArtifact in(Compile, packageSrc) := false
pomIncludeRepository := { _ => false }
@@ -72,14 +82,14 @@ pomExtra := (
<url>git@github.com:bigbluebutton/bigbluebutton.git</url>
<connection>scm:git:git@github.com:bigbluebutton/bigbluebutton.git</connection>
</scm>
- <developers>
- <developer>
- <id>ritzalam</id>
- <name>Richard Alam</name>
- <url>http://www.bigbluebutton.org</url>
- </developer>
- </developers>)
-
+ <developers>
+ <developer>
+ <id>ritzalam</id>
+ <name>Richard Alam</name>
+ <url>http://www.bigbluebutton.org</url>
+ </developer>
+ </developers>)
+
licenses := Seq("Apache License, Version 2.0" -> url("http://opensource.org/licenses/Apache-2.0"))
homepage := Some(url("http://www.bigbluebutton.org"))
diff --git a/bbb-fsesl-client/deploy.sh b/bbb-fsesl-client/deploy.sh
index a5f14b0d75d69db2a5f3bfb38226a0f1f643c13d..fdfce32665453b90bcea6d522bcaf673fb56f93b 100644
--- a/bbb-fsesl-client/deploy.sh
+++ b/bbb-fsesl-client/deploy.sh
@@ -1,2 +1 @@
-sbt clean
-sbt publish publishLocal
+sbt clean publish publishLocal
diff --git a/bbb-fsesl-client/project/Build.scala b/bbb-fsesl-client/project/Build.scala
deleted file mode 100755
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/bbb-fsesl-client/project/Dependencies.scala b/bbb-fsesl-client/project/Dependencies.scala
new file mode 100644
index 0000000000000000000000000000000000000000..9da6506153827201f161ef66183863558c91b4f2
--- /dev/null
+++ b/bbb-fsesl-client/project/Dependencies.scala
@@ -0,0 +1,40 @@
+package org.bigbluebutton.build
+
+import sbt._
+import Keys._
+
+object Dependencies {
+
+ object Versions {
+ // Scala
+ val scala = "2.12.7"
+
+ // Libraries
+ val netty = "3.2.10.Final"
+ val logback = "1.2.3"
+
+ // Test
+ val junit = "4.12"
+ }
+
+ object Compile {
+ val scalaLibrary = "org.scala-lang" % "scala-library" % Versions.scala
+ val scalaCompiler = "org.scala-lang" % "scala-compiler" % Versions.scala
+
+ val netty = "org.jboss.netty" % "netty" % Versions.netty
+ val logback = "ch.qos.logback" % "logback-classic" % Versions.logback
+ }
+
+ object Test {
+ val junit = "junit" % "junit" % Versions.junit % "test"
+ }
+
+ val testing = Seq(
+ Test.junit)
+
+ val runtime = Seq(
+ Compile.scalaLibrary,
+ Compile.scalaCompiler,
+ Compile.netty,
+ Compile.logback) ++ testing
+}
diff --git a/bbb-fsesl-client/project/build.properties b/bbb-fsesl-client/project/build.properties
index a6e117b61042ee81c62ba3a0fc5210d9502944df..2e6e3d24608ee15e892ed3b16d84224f7667e808 100755
--- a/bbb-fsesl-client/project/build.properties
+++ b/bbb-fsesl-client/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=1.2.6
\ No newline at end of file
diff --git a/bbb-fsesl-client/project/plugins.sbt b/bbb-fsesl-client/project/plugins.sbt
index 5ab7b095f69a2b3d8a3bf5350fa7e7e1a64f8f2f..3559bf68d62ef19f25fa810533bbe596eb022d02 100755
--- a/bbb-fsesl-client/project/plugins.sbt
+++ b/bbb-fsesl-client/project/plugins.sbt
@@ -2,8 +2,8 @@ addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
-addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.7")
+addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.8")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
diff --git a/bbb-fsesl-client/src/test/java/org/freeswitch/esl/client/inbound/ClientTest.java b/bbb-fsesl-client/src/test/java/org/freeswitch/esl/client/inbound/ClientTest.java
index e3577e52fd6de92f692f7531c168fecbaf4ab252..fb15b27bd2cd7c0b16219291cc0451d43e58ed01 100644
--- a/bbb-fsesl-client/src/test/java/org/freeswitch/esl/client/inbound/ClientTest.java
+++ b/bbb-fsesl-client/src/test/java/org/freeswitch/esl/client/inbound/ClientTest.java
@@ -17,12 +17,11 @@ package org.freeswitch.esl.client.inbound;
import java.util.Map.Entry;
-import org.freeswitch.esl.client.IEslEventListener;
-import org.freeswitch.esl.client.inbound.Client;
-import org.freeswitch.esl.client.inbound.InboundConnectionFailure;
+import org.freeswitch.esl.client.example.EslEventListener;
import org.freeswitch.esl.client.transport.event.EslEvent;
-import org.freeswitch.esl.client.transport.message.EslMessage;
import org.freeswitch.esl.client.transport.message.EslHeaders.Name;
+import org.freeswitch.esl.client.transport.message.EslMessage;
+import org.jboss.netty.channel.ExceptionEvent;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +39,7 @@ public class ClientTest
{
Client client = new Client();
- client.addEventListener( new IEslEventListener()
+ client.addEventListener( new EslEventListener()
{
public void eventReceived( EslEvent event )
{
diff --git a/bbb-screenshare/app/build.sbt b/bbb-screenshare/app/build.sbt
index dc47de3dedc1ee69a30ebd348a40ddcf5f1ebd44..a49598ac7d645e2454021d987f743758ef29001e 100755
--- a/bbb-screenshare/app/build.sbt
+++ b/bbb-screenshare/app/build.sbt
@@ -1,28 +1,30 @@
+import org.bigbluebutton.build._
//enablePlugins(JavaServerAppPackaging)
enablePlugins(JettyPlugin)
-name := "bbb-screenshare-akka"
-
-organization := "org.bigbluebutton"
-
-version := "0.0.2"
-
-scalaVersion := "2.12.6"
-
-scalacOptions ++= Seq(
- "-unchecked",
- "-deprecation",
- "-Xlint",
- "-Ywarn-dead-code",
- "-language:_",
- "-target:jvm-1.8",
- "-encoding", "UTF-8"
+version := "0.0.3"
+
+val compileSettings = Seq(
+ organization := "org.bigbluebutton",
+
+ scalacOptions ++= List(
+ "-unchecked",
+ "-deprecation",
+ "-Xlint",
+ "-Ywarn-dead-code",
+ "-language:_",
+ "-target:jvm-1.8",
+ "-encoding", "UTF-8"
+ ),
+ javacOptions ++= List(
+ "-Xlint:unchecked",
+ "-Xlint:deprecation"
+ )
)
resolvers ++= Seq(
"spray repo" at "http://repo.spray.io/",
- "rediscala" at "http://dl.bintray.com/etaty/maven",
"blindside-repos" at "http://blindside.googlecode.com/svn/repository/"
)
@@ -39,45 +41,8 @@ testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console",
testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports")
-val akkaVersion = "2.5.14"
-val scalaTestV = "2.2.6"
-
-libraryDependencies ++= {
- val springVersion = "4.3.12.RELEASE"
- Seq(
- "com.typesafe.akka" %% "akka-actor" % akkaVersion,
- "com.typesafe.akka" %% "akka-testkit" % akkaVersion % "test",
- "com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
- "com.typesafe" % "config" % "1.3.0",
- "ch.qos.logback" % "logback-classic" % "1.2.3" % "runtime",
- "commons-codec" % "commons-codec" % "1.11",
- "redis.clients" % "jedis" % "2.9.0",
- "org.apache.commons" % "commons-pool2" % "2.6.0",
- "org.red5" % "red5-server" % "1.0.10-M5",
- "com.google.code.gson" % "gson" % "2.8.5",
- "org.springframework" % "spring-web" % springVersion,
- "org.springframework" % "spring-beans" % springVersion,
- "org.springframework" % "spring-context" % springVersion,
- "org.springframework" % "spring-core" % springVersion,
- "org.springframework" % "spring-webmvc" % springVersion,
- "org.springframework" % "spring-aop" % springVersion,
- "javax.servlet" % "servlet-api" % "2.5"
- )}
-
-// https://mvnrepository.com/artifact/org.scala-lang/scala-library
-libraryDependencies += "org.scala-lang" % "scala-library" % scalaVersion.value
-libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
-
-libraryDependencies += "org.bigbluebutton" % "bbb-common-message_2.12" % "0.0.19-SNAPSHOT"
-// https://mvnrepository.com/artifact/com.github.etaty/rediscala_2.12
-libraryDependencies += "com.github.etaty" % "rediscala_2.12" % "1.8.0"
-// https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-scala_2.12
-libraryDependencies += "com.fasterxml.jackson.module" % "jackson-module-scala_2.12" % "2.9.6"
-
-//seq(Revolver.settings: _*)
-//
-//scalariformSettings
-
+Seq(Revolver.settings: _*)
+lazy val bbbScreenshareAkka = (project in file(".")).settings(name := "bbb-screenshare-akka", libraryDependencies ++= Dependencies.runtime).settings(compileSettings)
//-----------
// Packaging
diff --git a/bbb-screenshare/app/deploy.sh b/bbb-screenshare/app/deploy.sh
index a21a310dbb12dcf7258fdfd49cb43ee187c31545..69d99a0f08fa0b716c734b4a525efc203e0c6922 100755
--- a/bbb-screenshare/app/deploy.sh
+++ b/bbb-screenshare/app/deploy.sh
@@ -1,52 +1,45 @@
#!/bin/bash
# deploying 'screenshare' to /usr/share/red5/webapps
-sbt clean
-sbt compile
-sbt package
+sbt clean compile package
+
if [[ -d /usr/share/red5/webapps/screenshare ]]; then
sudo rm -r /usr/share/red5/webapps/screenshare
fi
sudo cp -r target/webapp/ /usr/share/red5/webapps/screenshare
-
sudo rm -rf /usr/share/red5/webapps/screenshare/WEB-INF/lib/*
-sudo cp ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/bbb-screenshare-akka_2.12-0.0.2.jar \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/scala-library-* \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/scala-reflect-* \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/jackson-* \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/paranamer-2.8.jar \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/akka-* \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/config-1.3.3.jar \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/gson-2.8.5.jar \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/jedis-2.9.0.jar \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/commons-pool2-2.6.0.jar \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/spring-webmvc-4.3.12.RELEASE.jar \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/rediscala_2.12-1.8.0.jar \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/bbb-common-message_2.12-0.0.19-SNAPSHOT.jar \
+sudo cp target/webapp/WEB-INF/lib/bbb-screenshare-akka_2.12-0.0.3.jar \
+ target/webapp/WEB-INF/lib/scala-library.jar \
+ target/webapp/WEB-INF/lib/scala-reflect.jar \
+ target/webapp/WEB-INF/lib/jackson-* \
+ target/webapp/WEB-INF/lib/paranamer-2.8.jar \
+ target/webapp/WEB-INF/lib/akka-* \
+ target/webapp/WEB-INF/lib/config-1.3.3.jar \
+ target/webapp/WEB-INF/lib/gson-2.8.5.jar \
+ target/webapp/WEB-INF/lib/commons-pool2-2.6.0.jar \
+ target/webapp/WEB-INF/lib/spring-webmvc-4.3.12.RELEASE.jar \
+ target/webapp/WEB-INF/lib/bbb-common-message_2.12-0.0.20-SNAPSHOT.jar \
+ target/webapp/WEB-INF/lib/lettuce-core-5.1.3.RELEASE.jar \
+ target/webapp/WEB-INF/lib/netty-* \
+ target/webapp/WEB-INF/lib/reactor-core-3.2.3.RELEASE.jar \
+ target/webapp/WEB-INF/lib/reactive-streams-1.0.2.jar \
/usr/share/red5/webapps/screenshare/WEB-INF/lib/
-
#sudo mkdir /usr/share/red5/webapps/screenshare/WEB-INF/classes
#cd /usr/share/red5/webapps/screenshare/WEB-INF/classes/
-#sudo jar -xf ../lib/bbb-screenshare-akka_2.12-0.0.2.jar
-#sudo rm /usr/share/red5/webapps/screenshare/WEB-INF/lib/bbb-screenshare-akka_2.12-0.0.2.jar
+#sudo jar -xf .lib/bbb-screenshare-akka_2.12-0.0.3.jar
+#sudo rm /usr/share/red5/webapps/screenshare/WEB-INF/lib/bbb-screenshare-akka_2.12-0.0.3.jar
-cd /usr/share/red5/webapps/screenshare
-sudo mkdir lib
-cd lib
-sudo cp -r ~/dev/bigbluebutton/bbb-screenshare/app/jws/lib/* .
-cd ..
-sudo cp ~/dev/bigbluebutton/bbb-screenshare/app/jws/screenshare.jnlp .
-sudo cp ~/dev/bigbluebutton/bbb-screenshare/app/jws/screenshare.jnlp.h264 .
+sudo mkdir -p /usr/share/red5/webapps/screenshare/lib
+sudo cp -r jws/lib/* /usr/share/red5/webapps/screenshare/lib
+sudo cp jws/screenshare.jnlp /usr/share/red5/webapps/screenshare
+sudo cp jws/screenshare.jnlp.h264 /usr/share/red5/webapps/screenshare
sudo chmod -R 777 /usr/share/red5/webapps/screenshare
sudo chown -R red5:red5 /usr/share/red5/webapps/screenshare
-# TODO change the owner username to 'firstuser'
-
# // Dev only
#sudo service red5 restart
#sudo service tomcat7 restart
#sudo service bbb-apps-akka restart
-
diff --git a/bbb-screenshare/app/project/Dependencies.scala b/bbb-screenshare/app/project/Dependencies.scala
new file mode 100644
index 0000000000000000000000000000000000000000..447f11e573748718d87aa46a0e05c95e78e7b0a1
--- /dev/null
+++ b/bbb-screenshare/app/project/Dependencies.scala
@@ -0,0 +1,105 @@
+package org.bigbluebutton.build
+
+import sbt._
+import Keys._
+
+object Dependencies {
+
+ object Versions {
+ // Scala
+ val scala = "2.12.7"
+ val junitInterface = "0.11"
+ val scalactic = "3.0.3"
+
+ // Libraries
+ val akkaVersion = "2.5.17"
+ val gson = "2.8.5"
+ val jackson = "2.9.7"
+ val logback = "1.2.3"
+ val springVersion = "4.3.12.RELEASE"
+ val red5 = "1.0.10-M5"
+ val servlet = "2.5"
+ val ffmpeg = "4.0.2-1.4.3"
+ val openCv = "1.4.3"
+
+ // Apache Commons
+ val lang = "3.7"
+ val codec = "1.11"
+ val pool2 = "2.6.0"
+
+ // Redis
+ val lettuce = "5.1.3.RELEASE"
+
+ // BigBlueButton
+ val bbbCommons = "0.0.20-SNAPSHOT"
+
+ // Test
+ val scalaTest = "3.0.5"
+ val akkaTestKit = "2.5.18"
+ }
+
+ object Compile {
+ val scalaLibrary = "org.scala-lang" % "scala-library" % Versions.scala
+ val scalaReflect = "org.scala-lang" % "scala-reflect" % Versions.scala
+
+ val akkaActor = "com.typesafe.akka" % "akka-actor_2.12" % Versions.akkaVersion
+ val akkaSl4fj = "com.typesafe.akka" % "akka-slf4j_2.12" % Versions.akkaVersion
+
+ val googleGson = "com.google.code.gson" % "gson" % Versions.gson
+ val jacksonModule = "com.fasterxml.jackson.module" %% "jackson-module-scala" % Versions.jackson
+ val logback = "ch.qos.logback" % "logback-classic" % Versions.logback % "runtime"
+ val red5Server = "org.red5" % "red5-server" % Versions.red5
+ val javaServlet = "javax.servlet" % "servlet-api" % Versions.servlet
+ val ffmpeg = "org.bytedeco.javacpp-presets" % "ffmpeg" % Versions.ffmpeg
+ val openCv = "org.bytedeco" % "javacv" % Versions.openCv
+
+ val springWeb = "org.springframework" % "spring-web" % Versions.springVersion
+ val springBeans = "org.springframework" % "spring-beans" % Versions.springVersion
+ val springContext = "org.springframework" % "spring-context" % Versions.springVersion
+ val springCore = "org.springframework" % "spring-core" % Versions.springVersion
+ val springWebmvc = "org.springframework" % "spring-webmvc" % Versions.springVersion
+ val springAop = "org.springframework" % "spring-aop" % Versions.springVersion
+
+ val commonsCodec = "commons-codec" % "commons-codec" % Versions.codec
+ val apacheLang = "org.apache.commons" % "commons-lang3" % Versions.lang
+ val apachePool2 = "org.apache.commons" % "commons-pool2" % Versions.pool2
+
+ val lettuceCore = "io.lettuce" % "lettuce-core" % Versions.lettuce
+
+ val bbbCommons = "org.bigbluebutton" % "bbb-common-message_2.12" % Versions.bbbCommons
+ }
+
+ object Test {
+ val scalaTest = "org.scalatest" %% "scalatest" % Versions.scalaTest % "test"
+ val scalactic = "org.scalactic" % "scalactic_2.12" % Versions.scalactic % "test"
+ val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % Versions.akkaTestKit % "test"
+ }
+
+ val testing = Seq(
+ Test.scalaTest,
+ Test.scalactic,
+ Test.akkaTestKit)
+
+ val runtime = Seq(
+ Compile.scalaLibrary,
+ Compile.scalaReflect,
+ Compile.akkaActor,
+ Compile.akkaSl4fj,
+ Compile.googleGson,
+ Compile.jacksonModule,
+ Compile.red5Server,
+ Compile.javaServlet,
+ Compile.ffmpeg,
+ Compile.openCv,
+ Compile.logback,
+ Compile.springWeb,
+ Compile.springBeans,
+ Compile.springContext,
+ Compile.springWebmvc,
+ Compile.springAop,
+ Compile.commonsCodec,
+ Compile.apacheLang,
+ Compile.apachePool2,
+ Compile.lettuceCore,
+ Compile.bbbCommons) ++ testing
+}
diff --git a/bbb-screenshare/app/project/build.properties b/bbb-screenshare/app/project/build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..7c58a83abffb36afce7051243bff3a50e3fa3dab
--- /dev/null
+++ b/bbb-screenshare/app/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.2.6
diff --git a/bbb-screenshare/app/project/plugins.sbt b/bbb-screenshare/app/project/plugins.sbt
index 1c5c911f1db806157b151442a8ed6230cbd9afe9..0a2cbd1dd31631fd8a7a856591f2deeaf85a7840 100644
--- a/bbb-screenshare/app/project/plugins.sbt
+++ b/bbb-screenshare/app/project/plugins.sbt
@@ -1,15 +1,13 @@
addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
-addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
-
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.6")
-
-addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "2.1.0")
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
-//addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.7.9")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.12")
-addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.7")
+addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "0.2.8")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
+
+addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.0.2")
diff --git a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/ScreenshareStreamListener.java b/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/ScreenshareStreamListener.java
index 1e90ff0111d506485d1bf5cf12daa99acbbcf73a..7cbecf986d010a8f1a957462773b2ea41640f055 100755
--- a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/ScreenshareStreamListener.java
+++ b/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/ScreenshareStreamListener.java
@@ -23,6 +23,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.mina.core.buffer.IoBuffer;
+import org.bigbluebutton.common2.redis.RedisStorageService;
import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
import org.red5.server.api.stream.IBroadcastStream;
@@ -46,11 +47,11 @@ import org.red5.server.net.rtmp.event.VideoData;
*
*/
public class ScreenshareStreamListener implements IStreamListener {
- private EventRecordingService recordingService;
+ private RedisStorageService recordingService;
private volatile boolean firstPacketReceived = false;
private String recordingDir;
- public ScreenshareStreamListener(EventRecordingService s, String recordingDir) {
+ public ScreenshareStreamListener(RedisStorageService s, String recordingDir) {
this.recordingService = s;
this.recordingDir = recordingDir;
}
diff --git a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/VideoStreamListener.java b/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/VideoStreamListener.java
index 41468e7ed845331d4706df0ab30a711a6d70f35a..bf91a9770f607ffc91bb3974ec24d4ac6bf37cb1 100755
--- a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/VideoStreamListener.java
+++ b/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/VideoStreamListener.java
@@ -17,24 +17,24 @@
*/
package org.bigbluebutton.app.screenshare;
+import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.mina.core.buffer.IoBuffer;
+import org.bigbluebutton.common2.redis.RedisStorageService;
+import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.scheduling.IScheduledJob;
import org.red5.server.api.scheduling.ISchedulingService;
-import org.red5.server.api.scope.IScope;
import org.red5.server.api.stream.IBroadcastStream;
import org.red5.server.api.stream.IStreamListener;
import org.red5.server.api.stream.IStreamPacket;
import org.red5.server.net.rtmp.event.VideoData;
import org.red5.server.scheduling.QuartzSchedulingService;
import org.slf4j.Logger;
-import org.red5.logging.Red5LoggerFactory;
import com.google.gson.Gson;
-import java.text.SimpleDateFormat;
/**
* Class to listen for the first video packet of the webcam.
@@ -54,7 +54,7 @@ import java.text.SimpleDateFormat;
public class VideoStreamListener implements IStreamListener {
private static final Logger log = Red5LoggerFactory.getLogger(VideoStreamListener.class, "screenshare");
- private EventRecordingService recordingService;
+ private RedisStorageService redisStorageService;
private volatile boolean firstPacketReceived = false;
// Maximum time between video packets
@@ -96,14 +96,14 @@ public class VideoStreamListener implements IStreamListener {
public VideoStreamListener(String meetingId, String streamId, Boolean record,
String recordingDir, int packetTimeout,
QuartzSchedulingService scheduler,
- EventRecordingService recordingService) {
+ RedisStorageService recordingService) {
this.meetingId = meetingId;
this.streamId = streamId;
this.record = record;
this.videoTimeout = packetTimeout;
this.recordingDir = recordingDir;
this.scheduler = scheduler;
- this.recordingService = recordingService;
+ this.redisStorageService = recordingService;
// start the worker to monitor if we are still receiving video packets
timeoutJobName = scheduler.addScheduledJob(videoTimeout, new TimeoutJob());
@@ -166,7 +166,7 @@ public class VideoStreamListener implements IStreamListener {
event.put(DATE, sdf.format(recordingStartTime));
event.put("eventName", "DeskshareStartedEvent");
- recordingService.record(meetingId, event);
+ redisStorageService.record(meetingId, event);
Gson gson = new Gson();
@@ -233,7 +233,7 @@ public class VideoStreamListener implements IStreamListener {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");
event.put(DATE, sdf.format(now));
event.put("eventName", "DeskshareStoppedEvent");
- recordingService.record(meetingId, event);
+ redisStorageService.record(meetingId, event);
Gson gson = new Gson();
String logStr = gson.toJson(event);
diff --git a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/messaging/redis/MessageSender.java b/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/messaging/redis/MessageSender.java
deleted file mode 100755
index 182ab1dac605fa0b6cdc2e7216ab476de0afecdc..0000000000000000000000000000000000000000
--- a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/messaging/redis/MessageSender.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.bigbluebutton.app.screenshare.messaging.redis;
-
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.Protocol;
-
-public class MessageSender {
- private static Logger log = Red5LoggerFactory.getLogger(MessageSender.class, "bigbluebutton");
-
- private volatile boolean sendMessage = false;
- private final Executor msgSenderExec = Executors.newSingleThreadExecutor();
- private final Executor runExec = Executors.newSingleThreadExecutor();
- private BlockingQueue<MessageToSend> messages = new LinkedBlockingQueue<MessageToSend>();
-
- private JedisPool redisPool;
- private String host;
- private int port;
-
- public void stop() {
- sendMessage = false;
- redisPool.destroy();
- }
-
- public void start() {
- GenericObjectPoolConfig config = new GenericObjectPoolConfig();
- config.setMaxTotal(32);
- config.setMaxIdle(8);
- config.setMinIdle(1);
- config.setTestOnBorrow(true);
- config.setTestOnReturn(true);
- config.setTestWhileIdle(true);
- config.setNumTestsPerEvictionRun(12);
- config.setMaxWaitMillis(5000);
- config.setTimeBetweenEvictionRunsMillis(60000);
- config.setBlockWhenExhausted(true);
-
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- redisPool = new JedisPool(config, host, port, Protocol.DEFAULT_TIMEOUT, null,
- Protocol.DEFAULT_DATABASE, "BbbRed5AppsPub");
-
- log.info("Redis message publisher starting!");
- try {
- sendMessage = true;
-
- Runnable messageSender = new Runnable() {
- public void run() {
- while (sendMessage) {
- try {
- MessageToSend msg = messages.take();
- publish(msg.getChannel(), msg.getMessage());
- } catch (InterruptedException e) {
- log.warn("Failed to get message from queue.");
- }
- }
- }
- };
- msgSenderExec.execute(messageSender);
- } catch (Exception e) {
- log.error("Error subscribing to channels: " + e.getMessage());
- }
- }
-
- public void send(String channel, String message) {
- MessageToSend msg = new MessageToSend(channel, message);
- messages.add(msg);
- }
-
- private void publish(final String channel, final String message) {
- Runnable task = new Runnable() {
- public void run() {
- Jedis jedis = redisPool.getResource();
- try {
- jedis.publish(channel, message);
- } catch(Exception e){
- log.warn("Cannot publish the message to redis", e);
- } finally {
- jedis.close();
- }
- }
- };
-
- runExec.execute(task);
- }
-
- public void setHost(String host){
- this.host = host;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-}
diff --git a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppAdapter.java b/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppAdapter.java
index 432f4049a08a30376e42869588daf798d68a6749..142b9a2a50c8f7d2bb93572521a0b0e61ab6cb69 100755
--- a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppAdapter.java
+++ b/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppAdapter.java
@@ -24,24 +24,22 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.bigbluebutton.app.screenshare.IScreenShareApplication;
+import org.bigbluebutton.app.screenshare.MeetingManager;
+import org.bigbluebutton.app.screenshare.VideoStream;
+import org.bigbluebutton.app.screenshare.VideoStreamListener;
+import org.bigbluebutton.common2.redis.RedisStorageService;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.adapter.MultiThreadedApplicationAdapter;
import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
import org.red5.server.api.scope.IScope;
import org.red5.server.api.stream.IBroadcastStream;
-import org.red5.server.api.stream.IServerStream;
-import org.red5.server.api.stream.IStreamListener;
+import org.red5.server.scheduling.QuartzSchedulingService;
import org.red5.server.stream.ClientBroadcastStream;
import org.slf4j.Logger;
-import org.red5.server.scheduling.QuartzSchedulingService;
+
import com.google.gson.Gson;
-import org.bigbluebutton.app.screenshare.MeetingManager;
-import org.bigbluebutton.app.screenshare.VideoStreamListener;
-import org.bigbluebutton.app.screenshare.VideoStream;
-import org.bigbluebutton.app.screenshare.EventRecordingService;
-import org.bigbluebutton.app.screenshare.IScreenShareApplication;
-import org.bigbluebutton.app.screenshare.ScreenshareStreamListener;
public class Red5AppAdapter extends MultiThreadedApplicationAdapter {
private static Logger log = Red5LoggerFactory.getLogger(Red5AppAdapter.class, "screenshare");
@@ -49,7 +47,7 @@ public class Red5AppAdapter extends MultiThreadedApplicationAdapter {
// Scheduler
private QuartzSchedulingService scheduler;
- private EventRecordingService recordingService;
+ private RedisStorageService redisStorageService;
private IScreenShareApplication app;
private String streamBaseUrl;
private ConnectionInvokerService sender;
@@ -196,7 +194,7 @@ public class Red5AppAdapter extends MultiThreadedApplicationAdapter {
log.info(logStr2);
VideoStreamListener listener = new VideoStreamListener(meetingId, streamId,
- recordVideoStream, recordingDirectory, packetTimeout, scheduler, recordingService);
+ recordVideoStream, recordingDirectory, packetTimeout, scheduler, redisStorageService);
ClientBroadcastStream cstream = (ClientBroadcastStream) this.getBroadcastStream(conn.getScope(), stream.getPublishedName());
stream.addStreamListener(listener);
VideoStream vstream = new VideoStream(stream, listener, cstream);
@@ -255,8 +253,8 @@ public class Red5AppAdapter extends MultiThreadedApplicationAdapter {
this.meetingManager = meetingManager;
}
- public void setEventRecordingService(EventRecordingService s) {
- recordingService = s;
+ public void setRedisStorageService(RedisStorageService s) {
+ redisStorageService = s;
}
public void setStreamBaseUrl(String baseUrl) {
diff --git a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppService.java b/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppService.java
index da895535568acdabfc6d19509c72c25b3318e650..1e459fafa28e53ad935c41966c408f2adb361f0a 100755
--- a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppService.java
+++ b/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppService.java
@@ -3,19 +3,18 @@ package org.bigbluebutton.app.screenshare.red5;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import org.bigbluebutton.app.screenshare.messaging.redis.MessageSender;
+
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
import org.slf4j.Logger;
+
import com.google.gson.Gson;
public class Red5AppService {
private static Logger log = Red5LoggerFactory.getLogger(Red5AppService.class, "screenshare");
private Red5AppHandler handler;
- private MessageSender red5RedisSender;
/**
* Called from the client to pass us the userId.
@@ -180,15 +179,7 @@ public class Red5AppService {
handler.screenShareClientPongMessage(meetingId, userId, streamId, timestamp.longValue());
}
- private Long genTimestamp() {
- return TimeUnit.NANOSECONDS.toMillis(System.nanoTime());
- }
-
public void setAppHandler(Red5AppHandler handler) {
this.handler = handler;
}
-
- public void setRed5RedisSender(MessageSender red5RedisSender) {
- this.red5RedisSender = red5RedisSender;
- }
}
diff --git a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/server/recorder/EventRecorder.java b/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/server/recorder/EventRecorder.java
deleted file mode 100755
index ec4452c66ea6600f878cfd91355bd3283aed6aa2..0000000000000000000000000000000000000000
--- a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/server/recorder/EventRecorder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
-* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-*
-* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
-*
-* This program is free software; you can redistribute it and/or modify it under the
-* terms of the GNU Lesser General Public License as published by the Free Software
-* Foundation; either version 3.0 of the License, or (at your option) any later
-* version.
-*
-* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License along
-* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package org.bigbluebutton.app.screenshare.server.recorder;
-
-import java.util.concurrent.TimeUnit;
-
-import org.bigbluebutton.app.screenshare.server.recorder.event.AbstractDeskshareRecordEvent;
-import org.bigbluebutton.app.screenshare.server.recorder.event.RecordEvent;
-import org.bigbluebutton.app.screenshare.server.recorder.event.RecordStartedEvent;
-import org.bigbluebutton.app.screenshare.server.recorder.event.RecordStoppedEvent;
-
-import redis.clients.jedis.Jedis;
-
-public class EventRecorder implements RecordStatusListener {
- private static final String COLON=":";
- private String host;
- private int port;
-
- public EventRecorder(String host, int port){
- this.host = host;
- this.port = port;
- }
-
- private Long genTimestamp() {
- return TimeUnit.NANOSECONDS.toMillis(System.nanoTime());
- }
-
- private void record(String session, RecordEvent message) {
- Jedis jedis = new Jedis(host, port);
- Long msgid = jedis.incr("global:nextRecordedMsgId");
- jedis.hmset("recording" + COLON + session + COLON + msgid, message.toMap());
- jedis.rpush("meeting" + COLON + session + COLON + "recordings", msgid.toString());
- }
-
- @Override
- public void notify(RecordEvent event) {
- if ((event instanceof RecordStoppedEvent) || (event instanceof RecordStartedEvent)) {
- event.setTimestamp(genTimestamp());
- event.setMeetingId(((AbstractDeskshareRecordEvent)event).getSession());
- record(((AbstractDeskshareRecordEvent)event).getSession(), event);
- }
- }
-}
diff --git a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/store/redis/RedisDataStore.java b/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/store/redis/RedisDataStore.java
deleted file mode 100755
index e1900231febfe63631debd14a2c6a61702f4e220..0000000000000000000000000000000000000000
--- a/bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/store/redis/RedisDataStore.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.bigbluebutton.app.screenshare.store.redis;
-
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-
-public class RedisDataStore {
- private static Logger log = Red5LoggerFactory.getLogger(RedisDataStore.class, "screenshare");
-
- private JedisPool redisPool;
- private volatile boolean sendMessage = false;
- private int maxThreshold = 1024;
- private final Executor msgSenderExec = Executors.newSingleThreadExecutor();
- private BlockingQueue<IScreenShareData> dataToStore = new LinkedBlockingQueue<IScreenShareData>();
- private final Executor runExec = Executors.newSingleThreadExecutor();
-
- public void stop() {
- sendMessage = false;
- }
-
- public void start() {
- try {
- sendMessage = true;
-
- Runnable messageSender = new Runnable() {
- public void run() {
- while (sendMessage) {
- try {
- IScreenShareData data = dataToStore.take();
- storeData(data);
- } catch (InterruptedException e) {
- log.warn("Failed to get data from queue.");
- }
- }
- }
- };
- msgSenderExec.execute(messageSender);
- } catch (Exception e) {
- log.error("Error storing data into redis: " + e.getMessage());
- }
- }
-
- public void store(IScreenShareData data) {
- if (dataToStore.size() > maxThreshold) {
- log.warn("Queued number of data [{}] is greater than threshold [{}]", dataToStore.size(), maxThreshold);
- }
- dataToStore.add(data);
- }
-
- private void storeData(IScreenShareData data) {
- Runnable task = new Runnable() {
- public void run() {
- Jedis jedis = redisPool.getResource();
- try {
- // jedis.publish(channel, message);
- } catch(Exception e){
- log.warn("Cannot publish the message to redis", e);
- } finally {
- redisPool.returnResource(jedis);
- }
- }
- };
-
- runExec.execute(task);
- }
-
- public void setRedisPool(JedisPool redisPool){
- this.redisPool = redisPool;
- }
-
- public void setMaxThreshold(int threshold) {
- maxThreshold = threshold;
- }
-}
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala
index cb3082f1a6e119ab56337eab61cfdacc2035430a..d1c42cdd8c86e4d22ef02f7add2d8e3f287a8b0b 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala
@@ -26,10 +26,11 @@ import org.bigbluebutton.app.screenshare.server.sessions.ScreenshareManager
import org.bigbluebutton.app.screenshare.server.sessions.messages._
import org.bigbluebutton.app.screenshare.server.util.LogHelper
import akka.actor.ActorSystem
-import org.bigbluebutton.app.screenshare.redis.{ AppsRedisSubscriberActor, IncomingJsonMessageBus, ReceivedJsonMsgHandlerActor }
+import org.bigbluebutton.app.screenshare.redis.{ ScreenshareRedisSubscriberActor, ReceivedJsonMsgHandlerActor }
import scala.concurrent.{ Await, Future, TimeoutException }
import scala.concurrent.duration._
+import org.bigbluebutton.common2.bus.IncomingJsonMessageBus
class ScreenShareApplication(val bus: IEventsMessageBus, val jnlpFile: String,
val streamBaseUrl: String) extends IScreenShareApplication
@@ -46,7 +47,7 @@ class ScreenShareApplication(val bus: IEventsMessageBus, val jnlpFile: String,
//logger.debug("*********** meetingManagerChannel = " + meetingManagerChannel)
val incomingJsonMessageBus = new IncomingJsonMessageBus
- val redisSubscriberActor = system.actorOf(AppsRedisSubscriberActor.props(incomingJsonMessageBus), "redis-subscriber")
+ val redisSubscriberActor = system.actorOf(ScreenshareRedisSubscriberActor.props(system, incomingJsonMessageBus), "redis-subscriber")
val screenShareManager = system.actorOf(ScreenshareManager.props(system, bus), "screenshare-manager")
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/SystemConfiguration.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/SystemConfiguration.scala
index c25b684048db28d44b04cc90e5eef302c56ccb50..a838726e128301e5f91b955e81e123f832ac8523 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/SystemConfiguration.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/SystemConfiguration.scala
@@ -2,18 +2,11 @@ package org.bigbluebutton.app.screenshare
import scala.util.Try
import com.typesafe.config.ConfigFactory
+import org.bigbluebutton.common2.redis.RedisConfiguration
-trait SystemConfiguration {
-
- //val config = ConfigFactory.load("screenshare-app")
- val config = ConfigFactory.load()
-
- lazy val redisHost = Try(config.getString("redis.host")).getOrElse("127.0.0.1")
- lazy val redisPort = Try(config.getInt("redis.port")).getOrElse(6379)
- lazy val redisPassword = Try(config.getString("redis.password")).getOrElse("")
+trait SystemConfiguration extends RedisConfiguration {
lazy val meetingManagerChannel = Try(config.getString("eventBus.meetingManagerChannel")).getOrElse("NOT FROM APP CONF")
lazy val toScreenshareAppsJsonChannel = Try(config.getString("eventBus.toAkkaAppsChannel")).getOrElse("to-screenshare-apps-json-channel")
- lazy val fromAkkaAppsRedisChannel = Try(config.getString("redis.fromAkkaAppsRedisChannel")).getOrElse("from-akka-apps-redis-channel")
}
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/AppsRedisSubscriberActor.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/AppsRedisSubscriberActor.scala
deleted file mode 100755
index 36bbc477fc0d0201f1a875f03bdb1dbad7599324..0000000000000000000000000000000000000000
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/AppsRedisSubscriberActor.scala
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.app.screenshare.redis
-
-import java.io.{ PrintWriter, StringWriter }
-import java.net.InetSocketAddress
-
-import akka.actor.{ OneForOneStrategy, Props }
-import akka.actor.SupervisorStrategy.Resume
-import org.bigbluebutton.app.screenshare.SystemConfiguration
-import redis.actors.RedisSubscriberActor
-import redis.api.servers.ClientSetname
-import redis.actors.RedisSubscriberActor
-import redis.api.pubsub.{ Message, PMessage }
-import scala.concurrent.duration._
-
-object AppsRedisSubscriberActor extends SystemConfiguration {
-
- val channels = Seq(fromAkkaAppsRedisChannel)
- val patterns = Seq("bigbluebutton:to-bbb-apps:*", "bigbluebutton:from-voice-conf:*")
-
- def props(jsonMsgBus: IncomingJsonMessageBus): Props =
- Props(classOf[AppsRedisSubscriberActor], jsonMsgBus,
- redisHost, redisPort,
- channels, patterns).withDispatcher("akka.rediscala-subscriber-worker-dispatcher")
-}
-
-class AppsRedisSubscriberActor(jsonMsgBus: IncomingJsonMessageBus, redisHost: String,
- redisPort: Int,
- channels: Seq[String] = Nil, patterns: Seq[String] = Nil)
- extends RedisSubscriberActor(
- new InetSocketAddress(redisHost, redisPort),
- channels, patterns, onConnectStatus = connected => { println(s"connected: $connected") }) with SystemConfiguration {
-
- override val supervisorStrategy = OneForOneStrategy(maxNrOfRetries = 10, withinTimeRange = 1 minute) {
- case e: Exception => {
- val sw: StringWriter = new StringWriter()
- sw.write("An exception has been thrown on AppsRedisSubscriberActor, exception message [" + e.getMessage() + "] (full stacktrace below)\n")
- e.printStackTrace(new PrintWriter(sw))
- log.error(sw.toString())
- Resume
- }
- }
-
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- write(ClientSetname("BbbScreenshareAkkaSub").encodedRequest)
-
- def onMessage(message: Message) {
- //log.error(s"SHOULD NOT BE RECEIVING: $message")
- if (message.channel == fromAkkaAppsRedisChannel) {
- val receivedJsonMessage = new ReceivedJsonMessage(message.channel, message.data.utf8String)
- //log.debug(s"RECEIVED:\n [${receivedJsonMessage.channel}] \n ${receivedJsonMessage.data} \n")
- jsonMsgBus.publish(IncomingJsonMessage(toScreenshareAppsJsonChannel, receivedJsonMessage))
- }
- }
-
- def onPMessage(pmessage: PMessage) {
- //log.debug(s"RECEIVED:\n ${pmessage.data.utf8String} \n")
- }
-}
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/IncomingJsonMessageBus.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/IncomingJsonMessageBus.scala
deleted file mode 100755
index 532b120a86c332aaec568ed93dd0941bc21f5fcf..0000000000000000000000000000000000000000
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/IncomingJsonMessageBus.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.bigbluebutton.app.screenshare.redis
-
-import akka.actor.ActorRef
-import akka.event.{ EventBus, LookupClassification }
-
-case class ReceivedJsonMessage(channel: String, data: String)
-case class IncomingJsonMessage(val topic: String, val payload: ReceivedJsonMessage)
-
-class IncomingJsonMessageBus extends EventBus with LookupClassification {
- type Event = IncomingJsonMessage
- type Classifier = String
- type Subscriber = ActorRef
-
- // is used for extracting the classifier from the incoming events
- override protected def classify(event: Event): Classifier = event.topic
-
- // will be invoked for each event for all subscribers which registered themselves
- // for the event’s classifier
- override protected def publish(event: Event, subscriber: Subscriber): Unit = {
- subscriber ! event.payload
- }
-
- // must define a full order over the subscribers, expressed as expected from
- // `java.lang.Comparable.compare`
- override protected def compareSubscribers(a: Subscriber, b: Subscriber): Int =
- a.compareTo(b)
-
- // determines the initial size of the index data structure
- // used internally (i.e. the expected number of different classifiers)
- override protected def mapSize: Int = 128
-}
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/ReceivedJsonMsgHandlerActor.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/ReceivedJsonMsgHandlerActor.scala
index 36d638988c3a31b63c4149b6f53b8cd2b6db2af0..ca57f9d59956fbd81963126d41fb0903f7637b59 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/ReceivedJsonMsgHandlerActor.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/ReceivedJsonMsgHandlerActor.scala
@@ -5,7 +5,8 @@ import org.bigbluebutton.app.screenshare.server.sessions.messages.{ MeetingCreat
import akka.actor.{ Actor, ActorLogging, ActorRef, Props }
import scala.reflect.runtime.universe._
-import org.bigbluebutton.common2.msgs._
+import org.bigbluebutton.common2.msgs._
+import org.bigbluebutton.common2.bus.ReceivedJsonMessage
object ReceivedJsonMsgHandlerActor {
def props(screenshareManager: ActorRef): Props =
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/ScreenshareRedisSubscriberActor.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/ScreenshareRedisSubscriberActor.scala
new file mode 100755
index 0000000000000000000000000000000000000000..8c4875497e4d2065644e23aa1469ceca4a1d959d
--- /dev/null
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/ScreenshareRedisSubscriberActor.scala
@@ -0,0 +1,32 @@
+package org.bigbluebutton.app.screenshare.redis
+
+import org.bigbluebutton.app.screenshare.SystemConfiguration
+import org.bigbluebutton.common2.bus.IncomingJsonMessageBus
+import org.bigbluebutton.common2.redis.RedisSubscriberProvider
+
+import akka.actor.ActorSystem
+import akka.actor.Props
+
+object ScreenshareRedisSubscriberActor extends SystemConfiguration {
+
+ val channels = Seq(fromAkkaAppsRedisChannel)
+ val patterns = Seq("bigbluebutton:to-bbb-apps:*", "bigbluebutton:from-voice-conf:*")
+
+ def props(system: ActorSystem, jsonMsgBus: IncomingJsonMessageBus): Props =
+ Props(
+ classOf[ScreenshareRedisSubscriberActor],
+ system, jsonMsgBus,
+ redisHost, redisPort,
+ channels, patterns).withDispatcher("akka.redis-subscriber-worker-dispatcher")
+}
+
+class ScreenshareRedisSubscriberActor(
+ system: ActorSystem,
+ jsonMsgBus: IncomingJsonMessageBus,
+ redisHost: String, redisPort: Int,
+ channels: Seq[String] = Nil, patterns: Seq[String] = Nil)
+ extends RedisSubscriberProvider(system, "BbbScreenshareAkkaSub", channels, patterns, jsonMsgBus) with SystemConfiguration {
+
+ addListener(toScreenshareAppsJsonChannel)
+ subscribe()
+}
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/LogHelper.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/LogHelper.scala
index dbe83dc52d9a768277f146622f565f816d6b2033..2ed8ee87d1a79cd87144b8b0c09b2e4bc9d4c960 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/LogHelper.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/LogHelper.scala
@@ -1,6 +1,5 @@
package org.bigbluebutton.app.screenshare.server.util
-import org.slf4j.Logger
import org.red5.logging.Red5LoggerFactory
/**
diff --git a/bbb-screenshare/app/src/main/webapp/WEB-INF/bbb-red5-redis-pubsub.xml b/bbb-screenshare/app/src/main/webapp/WEB-INF/bbb-red5-redis-pubsub.xml
deleted file mode 100755
index d056fd28aa14a8c318a9a45c428f294edc6cadee..0000000000000000000000000000000000000000
--- a/bbb-screenshare/app/src/main/webapp/WEB-INF/bbb-red5-redis-pubsub.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-
-Copyright (c) 2014 BigBlueButton Inc. and by respective authors (see below).
-
-This program is free software; you can redistribute it and/or modify it under the
-terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 3.0 of the License, or (at your option) any later
-version.
-
-BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
- ">
-
- <bean id="red5RedisSender"
- class="org.bigbluebutton.app.screenshare.messaging.redis.MessageSender"
- init-method="start" destroy-method="stop">
- <property name="host" value="${redis.host}" />
- <property name="port" value="${redis.port}" />
- </bean>
-
-</beans>
diff --git a/bbb-screenshare/app/src/main/webapp/WEB-INF/bbb-redis-pool.xml b/bbb-screenshare/app/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
similarity index 78%
rename from bbb-screenshare/app/src/main/webapp/WEB-INF/bbb-redis-pool.xml
rename to bbb-screenshare/app/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
index 5aa3cc5f9aefa4a4b8af09abc545e26a898800db..49057aa845d009416b86f9763d1602060c0ae688 100755
--- a/bbb-screenshare/app/src/main/webapp/WEB-INF/bbb-redis-pool.xml
+++ b/bbb-screenshare/app/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
@@ -27,10 +27,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
http://www.springframework.org/schema/util/spring-util-2.0.xsd
">
-<!--
- <bean id="redisPool" class="redis.clients.jedis.JedisPool">
- <constructor-arg index="0" value="${redis.host}"/>
- <constructor-arg index="1" value="${redis.port}"/>
+ <bean id="redisStorageService"
+ class="org.bigbluebutton.common2.redis.RedisStorageService"
+ init-method="start" destroy-method="stop">
+ <property name="host" value="${redis.host}" />
+ <property name="port" value="${redis.port}" />
+ <property name="password" value="${redis.password:}" />
+ <property name="clientName" value="BbbScreenshare" />
</bean>
--->
</beans>
diff --git a/bbb-screenshare/app/src/main/webapp/WEB-INF/classes/application.conf b/bbb-screenshare/app/src/main/webapp/WEB-INF/classes/application.conf
index 74183500ea75522d1927e5742c4f93d2722b1269..3b72838eb4bbe89bb4f2c7d26663b8c90cbd2a2b 100755
--- a/bbb-screenshare/app/src/main/webapp/WEB-INF/classes/application.conf
+++ b/bbb-screenshare/app/src/main/webapp/WEB-INF/classes/application.conf
@@ -10,7 +10,7 @@ akka {
loggers = ["akka.event.slf4j.Slf4jLogger"]
loglevel = "DEBUG"
- rediscala-publish-worker-dispatcher {
+ redis-publish-worker-dispatcher {
mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
# Throughput defines the maximum number of messages to be
# processed per actor before the thread jumps to the next actor.
@@ -18,7 +18,7 @@ akka {
throughput = 512
}
- rediscala-subscriber-worker-dispatcher {
+ redis-subscriber-worker-dispatcher {
mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
# Throughput defines the maximum number of messages to be
# processed per actor before the thread jumps to the next actor.
diff --git a/bbb-screenshare/app/src/main/webapp/WEB-INF/classes/screenshare-app.conf b/bbb-screenshare/app/src/main/webapp/WEB-INF/classes/screenshare-app.conf
index 7a46eb9c45206cb1b304a93596212cf8b9595647..32a843bfaf817b1ee334bcdbe3ec5fba9b793ff5 100755
--- a/bbb-screenshare/app/src/main/webapp/WEB-INF/classes/screenshare-app.conf
+++ b/bbb-screenshare/app/src/main/webapp/WEB-INF/classes/screenshare-app.conf
@@ -10,7 +10,7 @@ akka {
loggers = ["akka.event.slf4j.Slf4jLoggerDDD"]
loglevel = "DEBUG"
- rediscala-publish-worker-dispatcher {
+ redis-publish-worker-dispatcher {
mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
# Throughput defines the maximum number of messages to be
# processed per actor before the thread jumps to the next actor.
@@ -18,7 +18,7 @@ akka {
throughput = 512
}
- rediscala-subscriber-worker-dispatcher {
+ redis-subscriber-worker-dispatcher {
mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
# Throughput defines the maximum number of messages to be
# processed per actor before the thread jumps to the next actor.
diff --git a/bbb-screenshare/app/src/main/webapp/WEB-INF/red5-web.xml b/bbb-screenshare/app/src/main/webapp/WEB-INF/red5-web.xml
index 1fd0b7bfc69867548f365a3042d4383967e17aa1..91e61cb370d46ab8fc3a57cefcea8e19ecf720a0 100755
--- a/bbb-screenshare/app/src/main/webapp/WEB-INF/red5-web.xml
+++ b/bbb-screenshare/app/src/main/webapp/WEB-INF/red5-web.xml
@@ -35,6 +35,18 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</property>
</bean>
+ <bean id="screenShareApplication" class="org.bigbluebutton.app.screenshare.ScreenShareApplication">
+ <constructor-arg index="0" ref="messageBus"/>
+ <constructor-arg index="1" value="${jnlpFile}"/>
+ <constructor-arg index="2" value="${streamBaseUrl}"/>
+ </bean>
+
+ <bean id="connectionInvokerService" class="org.bigbluebutton.app.screenshare.red5.ConnectionInvokerService"
+ init-method="start" destroy-method="stop">
+ </bean>
+
+ <bean id="meetingManager" class="org.bigbluebutton.app.screenshare.MeetingManager"/>
+
<bean id="web.context" class="org.red5.server.Context" autowire="byType"/>
<bean id="web.scope" class="org.red5.server.scope.WebScope" init-method="register">
@@ -48,36 +60,27 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<bean id="web.handler" class="org.bigbluebutton.app.screenshare.red5.Red5AppAdapter">
<property name="streamBaseUrl" value="${streamBaseUrl}"/>
- <property name="eventRecordingService" ref="eventRecordingService"/>
+ <property name="redisStorageService" ref="redisStorageService"/>
<property name="recordingDirectory" value="${recordingDirectory}"/>
<property name="application" ref="screenShareApplication"/>
<property name="messageSender" ref="connectionInvokerService"/>
<property name="meetingManager" ref="meetingManager"/>
</bean>
- <bean id="meetingManager" class="org.bigbluebutton.app.screenshare.MeetingManager"/>
-
- <bean id="screenshare.service" class="org.bigbluebutton.app.screenshare.red5.Red5AppService">
- <property name="appHandler" ref="red5AppHandler"/>
- <property name="red5RedisSender" ref="red5RedisSender"/>
- </bean>
-
<bean id="red5AppHandler" class="org.bigbluebutton.app.screenshare.red5.Red5AppHandler">
<property name="application" ref="screenShareApplication"/>
<property name="messageSender" ref="connectionInvokerService"/>
</bean>
+
+ <bean id="screenshare.service" class="org.bigbluebutton.app.screenshare.red5.Red5AppService">
+ <property name="appHandler" ref="red5AppHandler"/>
+ </bean>
<!-- The IoHandler implementation -->
<bean id="screenCaptureHandler" class="org.bigbluebutton.app.screenshare.server.socket.BlockStreamEventMessageHandler">
<property name="application" ref="screenShareApplication"/>
</bean>
- <bean id="screenShareApplication" class="org.bigbluebutton.app.screenshare.ScreenShareApplication">
- <constructor-arg index="0" ref="messageBus"/>
- <constructor-arg index="1" value="${jnlpFile}"/>
- <constructor-arg index="2" value="${streamBaseUrl}"/>
- </bean>
-
<bean id="eventListenerImp" class="org.bigbluebutton.app.screenshare.red5.EventListenerImp">
<property name="messageSender" ref="connectionInvokerService"/>
<property name="meetingManager" ref="meetingManager"/>
@@ -100,21 +103,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</property>
</bean>
- <bean id="connectionInvokerService" class="org.bigbluebutton.app.screenshare.red5.ConnectionInvokerService"
- init-method="start" destroy-method="stop">
- </bean>
-
- <bean id="eventRecordingService" class="org.bigbluebutton.app.screenshare.EventRecordingService">
- <constructor-arg index="0" value="${redis.host}"/>
- <constructor-arg index="1" value="${redis.port}"/>
- </bean>
-
- <bean id="redisRecorder" class="org.bigbluebutton.app.screenshare.server.recorder.EventRecorder">
- <constructor-arg index="0" value="${redis.host}"/>
- <constructor-arg index="1" value="${redis.port}"/>
- </bean>
-
+ <import resource="bbb-redis-messaging.xml"/>
- <import resource="bbb-redis-pool.xml"/>
- <import resource="bbb-red5-redis-pubsub.xml"/>
</beans>
diff --git a/bbb-screenshare/app/src/main/webapp/WEB-INF/screenshare.properties b/bbb-screenshare/app/src/main/webapp/WEB-INF/screenshare.properties
index 55bd99c50f97b91fe009d1446db69a6948d04348..808616484c689c8d140c98c061b29fc0dd0b591a 100755
--- a/bbb-screenshare/app/src/main/webapp/WEB-INF/screenshare.properties
+++ b/bbb-screenshare/app/src/main/webapp/WEB-INF/screenshare.properties
@@ -1,30 +1,29 @@
-#
-# NOTE: default properties.
-#
-# NOTE!!!! NOTE!!!! NOTE!!!! NOTE!!!! NOTE!!!!
-# When making changes that you don't want checked-in, do
-# git update-index --assume-unchanged <file>
-#
-# To have git track the changes again
-# git update-index --no-assume-unchanged <file>
-#
-
-recordingDirectory=/usr/share/red5/webapps/screenshare/streams
-
-redis.host=127.0.0.1
-redis.port=6379
-
-
-streamBaseUrl=rtmp://192.168.23.22/screenshare
-jnlpUrl=http://192.168.23.22/screenshare
-jnlpFile=http://192.168.23.22/screenshare/screenshare.jnlp
-useH264=false
-
-# NOTES:
-# 1. GOP (group of pictures) is calculated as frameRate * keyFrameInterval
-# 2. intra-refresh=1 doesn't work in Chrome. Late comers can't view the stream as
-# the user missed the key frame
-# 3. keyFrameInterval is in seconds
-# 4. Make sure you encode & into & as it will break the JNLP XML
-#codecOptions=crf=36&preset=veryfast&tune=animation,zerolatency&frameRate=12.0&keyFrameInterval=6
-codecOptions=crf=38&preset=veryfast&tune=zerolatency&frameRate=5.0&keyFrameInterval=5
+#
+# NOTE: default properties.
+#
+# NOTE!!!! NOTE!!!! NOTE!!!! NOTE!!!! NOTE!!!!
+# When making changes that you don't want checked-in, do
+# git update-index --assume-unchanged <file>
+#
+# To have git track the changes again
+# git update-index --no-assume-unchanged <file>
+#
+
+recordingDirectory=/usr/share/red5/webapps/screenshare/streams
+
+redis.host=127.0.0.1
+redis.port=6379
+
+streamBaseUrl=rtmp://192.168.23.22/screenshare
+jnlpUrl=http://192.168.23.22/screenshare
+jnlpFile=http://192.168.23.22/screenshare/screenshare.jnlp
+useH264=false
+
+# NOTES:
+# 1. GOP (group of pictures) is calculated as frameRate * keyFrameInterval
+# 2. intra-refresh=1 doesn't work in Chrome. Late comers can't view the stream as
+# the user missed the key frame
+# 3. keyFrameInterval is in seconds
+# 4. Make sure you encode & into & as it will break the JNLP XML
+#codecOptions=crf=36&preset=veryfast&tune=animation,zerolatency&frameRate=12.0&keyFrameInterval=6
+codecOptions=crf=38&preset=veryfast&tune=zerolatency&frameRate=5.0&keyFrameInterval=5
diff --git a/bbb-screenshare/app/src/test/java/org/bigbluebutton/deskshare/server/recorder/FileRecorderTest.java b/bbb-screenshare/app/src/test/java/org/bigbluebutton/deskshare/server/recorder/FileRecorderTest.java
deleted file mode 100755
index f5491111f761d49201584918ff900cdd51a8c3d3..0000000000000000000000000000000000000000
--- a/bbb-screenshare/app/src/test/java/org/bigbluebutton/deskshare/server/recorder/FileRecorderTest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bigbluebutton.deskshare.server.recorder;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-public class FileRecorderTest {
-
- @Test
- public void testHello() {
- Assert.assertEquals(true, true);
- }
-}
diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/h264/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/h264/sign-jar.sh
index 01e78770a36a2cd553bea92b1646eb6e25e27319..09225a39145e51797093fae83685c958b7b4a4bd 100755
--- a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/h264/sign-jar.sh
+++ b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/h264/sign-jar.sh
@@ -1,18 +1,16 @@
-FFMPEG=ffmpeg-3.0.2-1.2-linux-x86-h264.jar
-mkdir workdir
-cp $FFMPEG workdir/ffmpeg-linux-x86.jar
-rm -rf src
-mkdir -p src/main/resources
-mkdir -p src/main/java
-cd workdir
-jar xvf ffmpeg-linux-x86.jar
-cp org/bytedeco/javacpp/linux-x86/*.so* ../src/main/resources
-cd ..
-gradle jar
-cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../unsigned-jars/ffmpeg-linux-x86-h264-unsigned.jar
-ant sign-jar
-cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../../../app/jws/lib/ffmpeg-linux-x86-h264.jar
-rm -rf workdir
-rm -rf src
-
-
+FFMPEG=ffmpeg-3.0.2-1.2-linux-x86-h264.jar
+mkdir workdir
+cp $FFMPEG workdir/ffmpeg-linux-x86.jar
+rm -rf src
+mkdir -p src/main/resources
+mkdir -p src/main/java
+cd workdir
+jar xvf ffmpeg-linux-x86.jar
+cp org/bytedeco/javacpp/linux-x86/*.so* ../src/main/resources
+cd ..
+gradle jar
+cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../unsigned-jars/ffmpeg-linux-x86-h264-unsigned.jar
+ant sign-jar
+cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../../../app/jws/lib/ffmpeg-linux-x86-h264.jar
+rm -rf workdir
+rm -rf src
diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/svc2/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/svc2/sign-jar.sh
index e82feeb760ee234e2a44d540c57802b734831493..ae658006f6ca72a6223abd5b90346d192c1c03e7 100755
--- a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/svc2/sign-jar.sh
+++ b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/svc2/sign-jar.sh
@@ -1,18 +1,16 @@
-FFMPEG=ffmpeg-3.0.2-1.2-linux-x86-svc2.jar
-mkdir workdir
-cp $FFMPEG workdir/ffmpeg-linux-x86.jar
-rm -rf src
-mkdir -p src/main/resources
-mkdir -p src/main/java
-cd workdir
-jar xvf ffmpeg-linux-x86.jar
-cp org/bytedeco/javacpp/linux-x86/*.so* ../src/main/resources
-cd ..
-gradle jar
-cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../unsigned-jars/ffmpeg-linux-x86-svc2-unsigned.jar
-ant sign-jar
-cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../../../app/jws/lib/ffmpeg-linux-x86-svc2.jar
-rm -rf workdir
-rm -rf src
-
-
+FFMPEG=ffmpeg-3.0.2-1.2-linux-x86-svc2.jar
+mkdir workdir
+cp $FFMPEG workdir/ffmpeg-linux-x86.jar
+rm -rf src
+mkdir -p src/main/resources
+mkdir -p src/main/java
+cd workdir
+jar xvf ffmpeg-linux-x86.jar
+cp org/bytedeco/javacpp/linux-x86/*.so* ../src/main/resources
+cd ..
+gradle jar
+cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../unsigned-jars/ffmpeg-linux-x86-svc2-unsigned.jar
+ant sign-jar
+cp build/libs/ffmpeg-linux-x86-0.0.1.jar ../../../../app/jws/lib/ffmpeg-linux-x86-svc2.jar
+rm -rf workdir
+rm -rf src
diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/h264/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/h264/sign-jar.sh
index 2ffaf065ce97591bfc898cbd2a6cadefa6d6b715..d9c1ba9c026dbb71e1bd3ed53c167783280f669b 100755
--- a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/h264/sign-jar.sh
+++ b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/h264/sign-jar.sh
@@ -1,17 +1,16 @@
-FFMPEG=ffmpeg-3.0.2-1.2-linux-x86_64-h264.jar
-mkdir workdir
-cp $FFMPEG workdir/ffmpeg-linux-x86_64.jar
-rm -rf src
-mkdir -p src/main/resources
-mkdir -p src/main/java
-cd workdir
-jar xvf ffmpeg-linux-x86_64.jar
-cp org/bytedeco/javacpp/linux-x86_64/*.so* ../src/main/resources
-cd ..
-gradle jar
-cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-linux-x86_64-h264-unsigned.jar
-ant sign-jar
-cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-linux-x86_64-h264.jar
-rm -rf workdir
-rm -rf src
-
+FFMPEG=ffmpeg-3.0.2-1.2-linux-x86_64-h264.jar
+mkdir workdir
+cp $FFMPEG workdir/ffmpeg-linux-x86_64.jar
+rm -rf src
+mkdir -p src/main/resources
+mkdir -p src/main/java
+cd workdir
+jar xvf ffmpeg-linux-x86_64.jar
+cp org/bytedeco/javacpp/linux-x86_64/*.so* ../src/main/resources
+cd ..
+gradle jar
+cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-linux-x86_64-h264-unsigned.jar
+ant sign-jar
+cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-linux-x86_64-h264.jar
+rm -rf workdir
+rm -rf src
diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/svc2/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/svc2/sign-jar.sh
index 781bc3e084016be9de8a136cc2ad0806c86e83d9..72f4872670e8eb4171f6ff2919c98d2469535729 100755
--- a/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/svc2/sign-jar.sh
+++ b/bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/svc2/sign-jar.sh
@@ -1,17 +1,16 @@
-FFMPEG=ffmpeg-3.0.2-1.2-linux-x86_64-svc2.jar
-mkdir workdir
-cp $FFMPEG workdir/ffmpeg-linux-x86_64.jar
-rm -rf src
-mkdir -p src/main/resources
-mkdir -p src/main/java
-cd workdir
-jar xvf ffmpeg-linux-x86_64.jar
-cp org/bytedeco/javacpp/linux-x86_64/*.so* ../src/main/resources
-cd ..
-gradle jar
-cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-linux-x86_64-svc2-unsigned.jar
-ant sign-jar
-cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-linux-x86_64-svc2.jar
-rm -rf workdir
-rm -rf src
-
+FFMPEG=ffmpeg-3.0.2-1.2-linux-x86_64-svc2.jar
+mkdir workdir
+cp $FFMPEG workdir/ffmpeg-linux-x86_64.jar
+rm -rf src
+mkdir -p src/main/resources
+mkdir -p src/main/java
+cd workdir
+jar xvf ffmpeg-linux-x86_64.jar
+cp org/bytedeco/javacpp/linux-x86_64/*.so* ../src/main/resources
+cd ..
+gradle jar
+cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-linux-x86_64-svc2-unsigned.jar
+ant sign-jar
+cp build/libs/ffmpeg-linux-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-linux-x86_64-svc2.jar
+rm -rf workdir
+rm -rf src
diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/h264/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/h264/sign-jar.sh
index 61c91813178c545c9770e7e7aa91596c78e22cdb..d8255408d3d9025dd48518325b9cf59797cd872e 100755
--- a/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/h264/sign-jar.sh
+++ b/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/h264/sign-jar.sh
@@ -1,16 +1,15 @@
-FFMPEG=ffmpeg-3.0.2-1.2-macosx-x86_64-h264.jar
-mkdir workdir
-cp $FFMPEG workdir/ffmpeg-macosx-x86_64.jar
-rm -rf src
-mkdir -p src/main/resources
-cd workdir
-jar xvf ffmpeg-macosx-x86_64.jar
-cp org/bytedeco/javacpp/macosx-x86_64/* ../src/main/resources
-cd ..
-rm -rf workdir
-gradle jar
-cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-macosx-x86_64-h264-unsigned.jar
-ant sign-jar
-cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-macosx-x86_64-h264.jar
-rm -rf src
-
+FFMPEG=ffmpeg-3.0.2-1.2-macosx-x86_64-h264.jar
+mkdir workdir
+cp $FFMPEG workdir/ffmpeg-macosx-x86_64.jar
+rm -rf src
+mkdir -p src/main/resources
+cd workdir
+jar xvf ffmpeg-macosx-x86_64.jar
+cp org/bytedeco/javacpp/macosx-x86_64/* ../src/main/resources
+cd ..
+rm -rf workdir
+gradle jar
+cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-macosx-x86_64-h264-unsigned.jar
+ant sign-jar
+cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-macosx-x86_64-h264.jar
+rm -rf src
diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/svc2/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/svc2/sign-jar.sh
index 159d670c4b56cf9386e2b59600b9011f25ec7f1b..1639a806d0892dd8ca0350a592fd1ebaceccf7cc 100755
--- a/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/svc2/sign-jar.sh
+++ b/bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/svc2/sign-jar.sh
@@ -1,16 +1,15 @@
-FFMPEG=ffmpeg-3.0.2-1.2-macosx-x86_64-svc2.jar
-mkdir workdir
-cp $FFMPEG workdir/ffmpeg-macosx-x86_64.jar
-rm -rf src
-mkdir -p src/main/resources
-cd workdir
-jar xvf ffmpeg-macosx-x86_64.jar
-cp org/bytedeco/javacpp/macosx-x86_64/* ../src/main/resources
-cd ..
-rm -rf workdir
-gradle jar
-cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-macosx-x86_64-svc2-unsigned.jar
-ant sign-jar
-cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-macosx-x86_64-svc2.jar
-rm -rf src
-
+FFMPEG=ffmpeg-3.0.2-1.2-macosx-x86_64-svc2.jar
+mkdir workdir
+cp $FFMPEG workdir/ffmpeg-macosx-x86_64.jar
+rm -rf src
+mkdir -p src/main/resources
+cd workdir
+jar xvf ffmpeg-macosx-x86_64.jar
+cp org/bytedeco/javacpp/macosx-x86_64/* ../src/main/resources
+cd ..
+rm -rf workdir
+gradle jar
+cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-macosx-x86_64-svc2-unsigned.jar
+ant sign-jar
+cp build/libs/ffmpeg-macosx-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-macosx-x86_64-svc2.jar
+rm -rf src
diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/h264/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/h264/sign-jar.sh
index 1fbfa0ec41526a3a280e8e6fad206b611f733a8f..4f7c36064ba816126685d5410e81bf7b1fbc599b 100755
--- a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/h264/sign-jar.sh
+++ b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/h264/sign-jar.sh
@@ -1,17 +1,16 @@
-FFMPEG=ffmpeg-3.0.2-1.2-windows-x86-h264.jar
-mkdir workdir
-cp $FFMPEG workdir/ffmpeg-windows-x86.jar
-rm -rf src
-mkdir -p src/main/resources
-mkdir -p src/main/java
-cd workdir
-jar xvf ffmpeg-windows-x86.jar
-cp org/bytedeco/javacpp/windows-x86/*.dll ../src/main/resources
-cd ..
-rm -rf workdir
-gradle jar
-cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../unsigned-jars/ffmpeg-win-x86-h264-unsigned.jar
-ant sign-jar
-cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../../../app/jws/lib/ffmpeg-win-x86-h264.jar
-rm -rf src
-
+FFMPEG=ffmpeg-3.0.2-1.2-windows-x86-h264.jar
+mkdir workdir
+cp $FFMPEG workdir/ffmpeg-windows-x86.jar
+rm -rf src
+mkdir -p src/main/resources
+mkdir -p src/main/java
+cd workdir
+jar xvf ffmpeg-windows-x86.jar
+cp org/bytedeco/javacpp/windows-x86/*.dll ../src/main/resources
+cd ..
+rm -rf workdir
+gradle jar
+cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../unsigned-jars/ffmpeg-win-x86-h264-unsigned.jar
+ant sign-jar
+cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../../../app/jws/lib/ffmpeg-win-x86-h264.jar
+rm -rf src
diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/svc2/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/svc2/sign-jar.sh
index 1e8a5d3afb9c94885b7053e981e22560c2e9b39e..320f34680b98c219c449c9eacd21a611ca31ae06 100755
--- a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/svc2/sign-jar.sh
+++ b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/svc2/sign-jar.sh
@@ -1,17 +1,16 @@
-FFMPEG=ffmpeg-3.0.2-1.2-windows-x86-svc2.jar
-mkdir workdir
-cp $FFMPEG workdir/ffmpeg-windows-x86.jar
-rm -rf src
-mkdir -p src/main/resources
-mkdir -p src/main/java
-cd workdir
-jar xvf ffmpeg-windows-x86.jar
-cp org/bytedeco/javacpp/windows-x86/*.dll ../src/main/resources
-cd ..
-rm -rf workdir
-gradle jar
-cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../unsigned-jars/ffmpeg-win-x86-svc2-unsigned.jar
-ant sign-jar
-cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../../../app/jws/lib/ffmpeg-win-x86-svc2.jar
-rm -rf src
-
+FFMPEG=ffmpeg-3.0.2-1.2-windows-x86-svc2.jar
+mkdir workdir
+cp $FFMPEG workdir/ffmpeg-windows-x86.jar
+rm -rf src
+mkdir -p src/main/resources
+mkdir -p src/main/java
+cd workdir
+jar xvf ffmpeg-windows-x86.jar
+cp org/bytedeco/javacpp/windows-x86/*.dll ../src/main/resources
+cd ..
+rm -rf workdir
+gradle jar
+cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../unsigned-jars/ffmpeg-win-x86-svc2-unsigned.jar
+ant sign-jar
+cp build/libs/ffmpeg-windows-x86-0.0.1.jar ../../../../app/jws/lib/ffmpeg-win-x86-svc2.jar
+rm -rf src
diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/h264/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/h264/sign-jar.sh
index 94ed509cc73fc2cfc9d6bce5a50e71b46ddbf683..7ace75cc22b9316e8bea64d1aa17e372858be86d 100755
--- a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/h264/sign-jar.sh
+++ b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/h264/sign-jar.sh
@@ -1,17 +1,16 @@
-FFMPEG=ffmpeg-3.0.2-1.2-windows-x86_64-h264.jar
-mkdir workdir
-cp $FFMPEG workdir/ffmpeg-windows-x86_64.jar
-rm -rf src
-mkdir -p src/main/resources
-mkdir -p src/main/java
-cd workdir
-jar xvf ffmpeg-windows-x86_64.jar
-cp org/bytedeco/javacpp/windows-x86_64/*.dll ../src/main/resources
-cd ..
-rm -rf workdir
-gradle jar
-cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-win-x86_64-h264-unsigned.jar
-ant sign-jar
-cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-win-x86_64-h264.jar
-rm -rf src
-
+FFMPEG=ffmpeg-3.0.2-1.2-windows-x86_64-h264.jar
+mkdir workdir
+cp $FFMPEG workdir/ffmpeg-windows-x86_64.jar
+rm -rf src
+mkdir -p src/main/resources
+mkdir -p src/main/java
+cd workdir
+jar xvf ffmpeg-windows-x86_64.jar
+cp org/bytedeco/javacpp/windows-x86_64/*.dll ../src/main/resources
+cd ..
+rm -rf workdir
+gradle jar
+cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-win-x86_64-h264-unsigned.jar
+ant sign-jar
+cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-win-x86_64-h264.jar
+rm -rf src
diff --git a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/svc2/sign-jar.sh b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/svc2/sign-jar.sh
index 4b8c8c1023acdb7649988c76470fbb13ebac00ee..0c67733b6a4defa15d824876a17133ffbe6e9962 100755
--- a/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/svc2/sign-jar.sh
+++ b/bbb-screenshare/jws/native-libs/ffmpeg-windows-x86_64/svc2/sign-jar.sh
@@ -1,17 +1,16 @@
-FFMPEG=ffmpeg-3.0.2-1.2-windows-x86_64-svc2.jar
-mkdir workdir
-cp $FFMPEG workdir/ffmpeg-windows-x86_64.jar
-rm -rf src
-mkdir -p src/main/resources
-mkdir -p src/main/java
-cd workdir
-jar xvf ffmpeg-windows-x86_64.jar
-cp org/bytedeco/javacpp/windows-x86_64/*.dll ../src/main/resources
-cd ..
-rm -rf workdir
-gradle jar
-cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-win-x86_64-svc2-unsigned.jar
-ant sign-jar
-cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-win-x86_64-svc2.jar
-rm -rf src
-
+FFMPEG=ffmpeg-3.0.2-1.2-windows-x86_64-svc2.jar
+mkdir workdir
+cp $FFMPEG workdir/ffmpeg-windows-x86_64.jar
+rm -rf src
+mkdir -p src/main/resources
+mkdir -p src/main/java
+cd workdir
+jar xvf ffmpeg-windows-x86_64.jar
+cp org/bytedeco/javacpp/windows-x86_64/*.dll ../src/main/resources
+cd ..
+rm -rf workdir
+gradle jar
+cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../unsigned-jars/ffmpeg-win-x86_64-svc2-unsigned.jar
+ant sign-jar
+cp build/libs/ffmpeg-windows-x86_64-0.0.1.jar ../../../../app/jws/lib/ffmpeg-win-x86_64-svc2.jar
+rm -rf src
diff --git a/bbb-screenshare/jws/native-libs/unsigned-jars/sign-ffmpeg.sh b/bbb-screenshare/jws/native-libs/unsigned-jars/sign-ffmpeg.sh
index 6cb98b0ea9930b6e4a4863e4c46fa0dc3d435a05..0ea0ec71b4c7e1e6115076ad991b3bfc52b603d0 100755
--- a/bbb-screenshare/jws/native-libs/unsigned-jars/sign-ffmpeg.sh
+++ b/bbb-screenshare/jws/native-libs/unsigned-jars/sign-ffmpeg.sh
@@ -1,16 +1,15 @@
-FFMPEG=ffmpeg-3.0.2-1.2.jar
-if [ -d "workdir" ]; then
- rm -rf workdir
-fi
-mkdir workdir
-cp $FFMPEG workdir
-cd workdir
-jar xf $FFMPEG
-rm $FFMPEG
-rm -rf META-INF
-jar cf ffmpeg.jar *
-cd ..
-ant sign-ffmpeg-jar
-cp workdir/ffmpeg.jar ../../../app/jws/lib/
-rm -rf workdir
-
+FFMPEG=ffmpeg-3.0.2-1.2.jar
+if [ -d "workdir" ]; then
+ rm -rf workdir
+fi
+mkdir workdir
+cp $FFMPEG workdir
+cd workdir
+jar xf $FFMPEG
+rm $FFMPEG
+rm -rf META-INF
+jar cf ffmpeg.jar *
+cd ..
+ant sign-ffmpeg-jar
+cp workdir/ffmpeg.jar ../../../app/jws/lib/
+rm -rf workdir
diff --git a/bbb-screenshare/jws/webstart/build.sh b/bbb-screenshare/jws/webstart/build.sh
index 7074eba05053fb7e50983b4a92274174da04f6fd..fec75ea03c9b57d17e66cce5ad66a63e48f080a3 100755
--- a/bbb-screenshare/jws/webstart/build.sh
+++ b/bbb-screenshare/jws/webstart/build.sh
@@ -1,11 +1,10 @@
-if [ -d "lib" ]; then
- rm -rf lib
-fi
-mkdir lib
-cp ../../app/jws/lib/ffmpeg.jar lib
-gradle clean
-gradle jar
-ant sign-jar
-cp build/libs/javacv-screenshare-0.0.1.jar ../../app/jws/lib/
-rm -rf lib
-
+if [ -d "lib" ]; then
+ rm -rf lib
+fi
+mkdir lib
+cp ../../app/jws/lib/ffmpeg.jar lib
+gradle clean
+gradle jar
+ant sign-jar
+cp build/libs/javacv-screenshare-0.0.1.jar ../../app/jws/lib/
+rm -rf lib
diff --git a/bbb-screenshare/jws/webstart/deploy.sh b/bbb-screenshare/jws/webstart/deploy.sh
index d8322cc8028df17d13f92a3e5de60fec086d9173..e49c761f5592b2ee5439484e40c99141912801c7 100755
--- a/bbb-screenshare/jws/webstart/deploy.sh
+++ b/bbb-screenshare/jws/webstart/deploy.sh
@@ -1,2 +1 @@
-cp build/libs/javacv-screenshare-0.0.1.jar /usr/share/red5/webapps/screenshare/lib
-
+cp build/libs/javacv-screenshare-0.0.1.jar /usr/share/red5/webapps/screenshare/lib
diff --git a/bbb-video/build.gradle b/bbb-video/build.gradle
index 88d9a056cc948c10ab31da12063df7dea0fb82cc..a174e2254606d89c26178d1069e5ac98cc8e2a12 100755
--- a/bbb-video/build.gradle
+++ b/bbb-video/build.gradle
@@ -17,6 +17,13 @@ repositories {
mavenLocal()
}
+configurations {
+ runtime.exclude group: "org.slf4j", module: "slf4j-api"
+ runtime.exclude group: "org.red5", module: "red5-server"
+ runtime.exclude group: "org.red5", module: "red5-server-common"
+ runtime.exclude group: "org.red5", module: "red5-io"
+}
+
dependencies {
// Servlet
providedCompile 'javax.servlet:servlet-api:2.5@jar'
@@ -28,10 +35,11 @@ dependencies {
// Spring
providedCompile 'org.springframework:spring-web:4.3.12.RELEASE@jar'
- providedCompile 'org.springframework:spring-beans:4.3.12.RELEASE@jar'
+ providedCompile 'org.springframework:spring-beans:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.12.RELEASE@jar'
+ // Red5
providedCompile 'org.red5:red5-server:1.0.10-M5@jar'
providedCompile 'org.red5:red5-server-common:1.0.10-M5@jar'
providedCompile 'org.red5:red5-io:1.0.10-M5@jar'
@@ -49,23 +57,12 @@ dependencies {
providedCompile 'org.springframework:spring-aop:4.3.12.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'
- // Testing
- compile 'org.easymock:easymock:2.4@jar'
-
- // Testing
- testRuntime 'org.easymock:easymock:2.4@jar'
-
//redis
- compile 'redis.clients:jedis:2.9.0'
- compile 'org.apache.commons:commons-pool2:2.3'
- compile 'com.google.code.gson:gson:2.5'
-
- compile 'org.apache.commons:commons-lang3:3.7'
- compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.19-SNAPSHOT'
-}
+ compile 'org.apache.commons:commons-pool2:2.6.0'
+ compile 'com.google.code.gson:gson:2.8.5'
-test {
- useTestNG()
+ providedCompile 'org.apache.commons:commons-lang3:3.7'
+ compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.20-SNAPSHOT'
}
war.doLast {
@@ -76,6 +73,7 @@ war.doLast {
task deploy() << {
def red5AppsDir = '/usr/share/red5/webapps'
def videoDir = new File("${red5AppsDir}/video")
+ println "Deleting $videoDir"
if (videoDir.exists()) ant.delete(dir: videoDir)
ant.mkdir(dir: videoDir)
ant.copy(todir: videoDir) {
diff --git a/bbb-video/deploy.sh b/bbb-video/deploy.sh
index ff71c3ac7c685a5db422d9161f25a82b6c186300..b7cab36a4bc4e2ff6e2b72d8bb9bf36079ce3149 100755
--- a/bbb-video/deploy.sh
+++ b/bbb-video/deploy.sh
@@ -1,11 +1,10 @@
#!/bin/bash
# deploying 'bigbluebutton-apps' to /usr/share/red5/webapps
-sudo chown -R red5.red5 /usr/share/red5/webapps
+sudo chmod -R 777 /usr/share/red5/webapps/*
gradle clean
gradle resolveDeps
gradle war deploy
-sudo chown -R red5.red5 /usr/share/red5/webapps
-
+sudo chown -R red5:red5 /usr/share/red5/webapps
diff --git a/bbb-video/src/main/java/org/bigbluebutton/app/video/EventRecordingService.java b/bbb-video/src/main/java/org/bigbluebutton/app/video/EventRecordingService.java
deleted file mode 100755
index 4bdec5c1df4e6b7f547df283519762cddc6c5006..0000000000000000000000000000000000000000
--- a/bbb-video/src/main/java/org/bigbluebutton/app/video/EventRecordingService.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
-* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-*
-* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
-*
-* This program is free software; you can redistribute it and/or modify it under the
-* terms of the GNU Lesser General Public License as published by the Free Software
-* Foundation; either version 3.0 of the License, or (at your option) any later
-* version.
-*
-* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License along
-* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package org.bigbluebutton.app.video;
-
-import java.util.Map;
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.Protocol;
-
-public class EventRecordingService {
- private static Logger log = Red5LoggerFactory.getLogger(EventRecordingService.class, "video");
-
- private static final String COLON = ":";
-
- private JedisPool redisPool;
- private final String host;
- private final int port;
- private final int keyExpiry;
-
- public EventRecordingService(String host, int port, int keyExpiry) {
- this.host = host;
- this.port = port;
- this.keyExpiry = keyExpiry;
- }
-
- public void record(String meetingId, Map<String, String> event) {
- Jedis jedis = redisPool.getResource();
- try {
- Long msgid = jedis.incr("global:nextRecordedMsgId");
- String key = "recording:" + meetingId + COLON + msgid;
- jedis.hmset(key, event);
- /**
- * We set the key to expire after 14 days as we are still
- * recording the event into redis even if the meeting is not
- * recorded. (ralam sept 23, 2015)
- */
- jedis.expire(key, keyExpiry);
- key = "meeting:" + meetingId + COLON + "recordings";
- jedis.rpush(key, msgid.toString());
- jedis.expire(key, keyExpiry);
- } catch (Exception e) {
- log.warn("Cannot record the info meeting:" + meetingId, e);
- } finally {
- jedis.close();
- }
-
- }
-
- public void stop() {
-
- }
-
- public void start() {
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- redisPool = new JedisPool(new GenericObjectPoolConfig(), host, port, Protocol.DEFAULT_TIMEOUT, null,
- Protocol.DEFAULT_DATABASE, "BbbRed5AppsPub");
- }
-}
diff --git a/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java b/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
index 3b48025cc4ff4462867d0dae92ed5d4b14c6d1b0..054b5ca6f0fc5b8b9f0146f5e8f5d45da2a33c8b 100755
--- a/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
+++ b/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
@@ -21,11 +21,16 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
import org.bigbluebutton.app.video.converter.H263Converter;
import org.bigbluebutton.app.video.converter.VideoRotator;
+import org.bigbluebutton.common2.redis.RedisStorageService;
import org.bigbluebutton.red5.pubsub.MessagePublisher;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.adapter.MultiThreadedApplicationAdapter;
@@ -39,11 +44,9 @@ import org.red5.server.api.stream.ISubscriberStream;
import org.red5.server.scheduling.QuartzSchedulingService;
import org.red5.server.stream.ClientBroadcastStream;
import org.slf4j.Logger;
-import com.google.gson.Gson;
import org.springframework.util.StringUtils;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
+
+import com.google.gson.Gson;
public class VideoApplication extends MultiThreadedApplicationAdapter {
@@ -53,7 +56,7 @@ public class VideoApplication extends MultiThreadedApplicationAdapter {
private QuartzSchedulingService scheduler;
private MessagePublisher publisher;
- private EventRecordingService recordingService;
+ private RedisStorageService recordingService;
private final Map<String, IStreamListener> streamListeners = new HashMap<String, IStreamListener>();
private int packetTimeout = 10000;
@@ -518,7 +521,7 @@ public class VideoApplication extends MultiThreadedApplicationAdapter {
event.put("stream", stream.getPublishedName());
event.put("duration", new Long(publishDuration).toString());
event.put("eventName", "StopWebcamShareEvent");
- recordingService.record(scopeName, event);
+ recordingService.recordAndExpire(scopeName, event);
}
}
@@ -526,7 +529,7 @@ public class VideoApplication extends MultiThreadedApplicationAdapter {
this.packetTimeout = timeout;
}
- public void setEventRecordingService(EventRecordingService s) {
+ public void setEventRecordingService(RedisStorageService s) {
recordingService = s;
}
diff --git a/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoStreamListener.java b/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoStreamListener.java
index d1cb002298338ea060787a12cfc30b0e8f5e0728..f235e0574780141a6a14f82ef028fedd7f7de873 100755
--- a/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoStreamListener.java
+++ b/bbb-video/src/main/java/org/bigbluebutton/app/video/VideoStreamListener.java
@@ -18,24 +18,24 @@
package org.bigbluebutton.app.video;
+import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.mina.core.buffer.IoBuffer;
+import org.bigbluebutton.common2.redis.RedisStorageService;
+import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.scheduling.IScheduledJob;
import org.red5.server.api.scheduling.ISchedulingService;
-import org.red5.server.api.scope.IScope;
import org.red5.server.api.stream.IBroadcastStream;
import org.red5.server.api.stream.IStreamListener;
import org.red5.server.api.stream.IStreamPacket;
import org.red5.server.net.rtmp.event.VideoData;
import org.red5.server.scheduling.QuartzSchedulingService;
import org.slf4j.Logger;
-import org.red5.logging.Red5LoggerFactory;
import com.google.gson.Gson;
-import java.text.SimpleDateFormat;
/**
* Class to listen for the first video packet of the webcam.
@@ -55,7 +55,7 @@ import java.text.SimpleDateFormat;
public class VideoStreamListener implements IStreamListener {
private static final Logger log = Red5LoggerFactory.getLogger(VideoStreamListener.class, "video");
- private EventRecordingService recordingService;
+ private RedisStorageService recordingService;
private volatile boolean firstPacketReceived = false;
// Maximum time between video packets
@@ -98,7 +98,7 @@ public class VideoStreamListener implements IStreamListener {
public VideoStreamListener(String meetingId, String streamId, Boolean record,
String userId, int packetTimeout,
QuartzSchedulingService scheduler,
- EventRecordingService recordingService) {
+ RedisStorageService recordingService) {
this.meetingId = meetingId;
this.streamId = streamId;
this.record = record;
@@ -160,7 +160,7 @@ public class VideoStreamListener implements IStreamListener {
event.put(DATE, sdf.format(recordingStartTime));
event.put("eventName", "StartWebcamShareEvent");
- recordingService.record(meetingId, event);
+ recordingService.recordAndExpire(meetingId, event);
Gson gson = new Gson();
String logStr = gson.toJson(event);
@@ -229,7 +229,7 @@ public class VideoStreamListener implements IStreamListener {
event.put(DATE, sdf.format(now));
event.put("eventName", "StopWebcamShareEvent");
- recordingService.record(meetingId, event);
+ recordingService.recordAndExpire(meetingId, event);
Gson gson = new Gson();
String logStr = gson.toJson(event);
diff --git a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MeetingMessageHandler.java b/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MeetingMessageHandler.java
index 14d8b61a8e3f40a1bbe8f1ae69056864cf6740b2..13b183125a22ae66a56f21f4ffe334fd3af045f0 100755
--- a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MeetingMessageHandler.java
+++ b/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MeetingMessageHandler.java
@@ -1,19 +1,20 @@
package org.bigbluebutton.red5.pubsub;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
import org.bigbluebutton.app.video.ConnectionInvokerService;
import org.bigbluebutton.app.video.MeetingManager;
+import org.bigbluebutton.common2.redis.pubsub.MessageHandler;
import org.bigbluebutton.red5.pubsub.message.RecordChapterBreakMessage;
import org.bigbluebutton.red5.pubsub.message.ValidateConnTokenRespMsg;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
public class MeetingMessageHandler implements MessageHandler {
private static Logger log = Red5LoggerFactory.getLogger(MeetingMessageHandler.class, "video");
-
private final String HEADER = "header";
private final String NAME = "name";
private final String BODY = "body";
@@ -61,8 +62,7 @@ public class MeetingMessageHandler implements MessageHandler {
String logStr = gson.toJson(body);
log.debug("HANDLE: {}", logStr);
- if (body.has(MEETING_ID) && body.has(USERID)
- && body.has(AUTHZED) && body.has(CONN) && body.has(APP)) {
+ if (body.has(MEETING_ID) && body.has(USERID) && body.has(AUTHZED) && body.has(CONN) && body.has(APP)) {
String meetingId = body.get(MEETING_ID).getAsString();
String userId = body.get(USERID).getAsString();
diff --git a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessageHandler.java b/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessageHandler.java
deleted file mode 100755
index 8f197312c290d0ef21e0baed37478d9d7bfb94e3..0000000000000000000000000000000000000000
--- a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessageHandler.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.bigbluebutton.red5.pubsub;
-
-public interface MessageHandler {
- void handleMessage(String pattern, String channel, String message);
-}
diff --git a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java b/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
index 0326ff3651835846f109ccab38c23b7978cd580b..f2619b6341e2e52da76d55349c42c1548915a677 100755
--- a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
+++ b/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
@@ -1,11 +1,21 @@
package org.bigbluebutton.red5.pubsub;
-import com.google.gson.Gson;
-import org.bigbluebutton.common2.msgs.*;
import java.util.HashMap;
import java.util.Map;
+import org.bigbluebutton.common2.msgs.BbbClientMsgHeader;
+import org.bigbluebutton.common2.msgs.BbbCoreBaseHeader;
+import org.bigbluebutton.common2.msgs.UserBroadcastCamStartMsg;
+import org.bigbluebutton.common2.msgs.UserBroadcastCamStartMsgBody;
+import org.bigbluebutton.common2.msgs.UserBroadcastCamStopMsg;
+import org.bigbluebutton.common2.msgs.UserBroadcastCamStopMsgBody;
+import org.bigbluebutton.common2.msgs.ValidateConnAuthTokenSysMsg;
+import org.bigbluebutton.common2.msgs.ValidateConnAuthTokenSysMsgBody;
+import org.bigbluebutton.common2.redis.pubsub.MessageSender;
+
+import com.google.gson.Gson;
+
public class MessagePublisher {
private MessageSender sender;
diff --git a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessageReceiver.java b/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessageReceiver.java
deleted file mode 100755
index fc215cdba5811e3f5ea061a18268c1bca4d6e821..0000000000000000000000000000000000000000
--- a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessageReceiver.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.bigbluebutton.red5.pubsub;
-
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPubSub;
-import redis.clients.jedis.exceptions.JedisConnectionException;
-
-public class MessageReceiver {
- private static Logger log = Red5LoggerFactory.getLogger(MessageReceiver.class, "video");
-
- private ReceivedMessageHandler handler;
-
- private Jedis jedis;
- private volatile boolean receiveMessage = false;
-
- private final Executor msgReceiverExec = Executors.newSingleThreadExecutor();
- private final Executor runExec = Executors.newSingleThreadExecutor();
-
- private final String FROM_BBB_APPS_PATTERN = "from-akka-apps-redis-channel";
-
- private String host;
- private int port;
-
- public void stop() {
- receiveMessage = false;
- }
-
- public void start() {
- log.info("Ready to receive messages from Redis pubsub.");
- try {
- receiveMessage = true;
- jedis = new Jedis(host, port);
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- jedis.clientSetname("BbbRed5VideoSub");
-
- Runnable messageReceiver = new Runnable() {
- public void run() {
- if (receiveMessage) {
- try {
- jedis.subscribe(new PubSubListener(), FROM_BBB_APPS_PATTERN);
- } catch(JedisConnectionException ex) {
- log.warn("Exception on Jedis connection. Resubscribing to pubsub.");
- start();
- } catch (Exception e) {
- log.error("Error resubscribing to channels: " + e.getMessage());
- }
- }
- }
- };
- msgReceiverExec.execute(messageReceiver);
- } catch (Exception e) {
- log.error("Error subscribing to channels: " + e.getMessage());
- }
- }
-
- public void setHost(String host){
- this.host = host;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-
- public void setMessageHandler(ReceivedMessageHandler handler) {
- this.handler = handler;
- }
-
- private class PubSubListener extends JedisPubSub {
-
- public PubSubListener() {
- super();
- }
-
- @Override
- public void onMessage(String channel, String message) {
- // Not used.
- Runnable task = new Runnable() {
- public void run() {
- handler.handleMessage("", channel, message);
- }
- };
-
- runExec.execute(task);
- }
-
- @Override
- public void onPMessage(final String pattern, final String channel, final String message) {
- System.out.println("RECEIVED onPMessage" + channel + " message=\n" + message);
- Runnable task = new Runnable() {
- public void run() {
- handler.handleMessage(pattern, channel, message);
- }
- };
-
- runExec.execute(task);
- }
-
- @Override
- public void onPSubscribe(String pattern, int subscribedChannels) {
- log.debug("Subscribed to the pattern: " + pattern);
- }
-
- @Override
- public void onPUnsubscribe(String pattern, int subscribedChannels) {
- // Not used.
- }
-
- @Override
- public void onSubscribe(String channel, int subscribedChannels) {
- // Not used.
- }
-
- @Override
- public void onUnsubscribe(String channel, int subscribedChannels) {
- // Not used.
- }
- }
-}
-
diff --git a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessageSender.java b/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessageSender.java
deleted file mode 100755
index 0b732de4e99d98c2a1d6dda54777fa585f1a6eed..0000000000000000000000000000000000000000
--- a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessageSender.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.bigbluebutton.red5.pubsub;
-
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.Protocol;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-
-public class MessageSender {
- private static Logger log = Red5LoggerFactory.getLogger(MessageSender.class, "bigbluebutton");
-
- private JedisPool redisPool;
- private volatile boolean sendMessage = false;
-
- private final Executor msgSenderExec = Executors.newSingleThreadExecutor();
- private final Executor runExec = Executors.newSingleThreadExecutor();
- private BlockingQueue<MessageToSend> messages = new LinkedBlockingQueue<MessageToSend>();
- private String host;
- private int port;
-
- public void stop() {
- sendMessage = false;
- redisPool.destroy();
- }
-
- public void start() {
-
- GenericObjectPoolConfig config = new GenericObjectPoolConfig();
- config.setMaxTotal(32);
- config.setMaxIdle(8);
- config.setMinIdle(1);
- config.setTestOnBorrow(true);
- config.setTestOnReturn(true);
- config.setTestWhileIdle(true);
- config.setNumTestsPerEvictionRun(12);
- config.setMaxWaitMillis(5000);
- config.setTimeBetweenEvictionRunsMillis(60000);
- config.setBlockWhenExhausted(true);
-
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- redisPool = new JedisPool(config, host, port, Protocol.DEFAULT_TIMEOUT, null,
- Protocol.DEFAULT_DATABASE, "BbbRed5VideoPub");
-
- log.info("Redis message publisher starting!");
-
- try {
- sendMessage = true;
-
- Runnable messageSender = new Runnable() {
- public void run() {
- while (sendMessage) {
- try {
- MessageToSend msg = messages.take();
- publish(msg.getChannel(), msg.getMessage());
- } catch (InterruptedException e) {
- log.warn("Failed to get org.bigbluebutton.red5.pubsub.message from queue.");
- }
- }
- }
- };
- msgSenderExec.execute(messageSender);
- } catch (Exception e) {
- log.error("Error subscribing to channels: " + e.getMessage());
- }
- }
-
- public void send(String channel, String message) {
- MessageToSend msg = new MessageToSend(channel, message);
- messages.add(msg);
- }
-
- private void publish(final String channel, final String message) {
- Runnable task = new Runnable() {
- public void run() {
- Jedis jedis = redisPool.getResource();
- try {
- jedis.publish(channel, message);
- } catch(Exception e){
- log.warn("Cannot publish the org.bigbluebutton.red5.pubsub.message to redis", e);
- } finally {
- redisPool.returnResource(jedis);
- }
- }
- };
-
- runExec.execute(task);
- }
-
-
- public void setHost(String host){
- this.host = host;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-}
diff --git a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessageToSend.java b/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessageToSend.java
deleted file mode 100755
index 3ae3874039b4637af954bf7d5d176bc80d268405..0000000000000000000000000000000000000000
--- a/bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessageToSend.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.bigbluebutton.red5.pubsub;
-
-public class MessageToSend {
- private final String channel;
- private final String message;
-
- public MessageToSend(String channel, String message) {
- this.channel = channel;
- this.message = message;
- }
-
- public String getChannel() {
- return channel;
- }
-
- public String getMessage() {
- return message;
- }
-}
diff --git a/bbb-video/src/main/webapp/WEB-INF/bbb-redis-messaging.xml b/bbb-video/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
new file mode 100755
index 0000000000000000000000000000000000000000..918167fe436ec37521319e311f84e2f639da9775
--- /dev/null
+++ b/bbb-video/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+
+Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
+
+This program is free software; you can redistribute it and/or modify it under the
+terms of the GNU Lesser General Public License as published by the Free Software
+Foundation; either version 3.0 of the License, or (at your option) any later
+version.
+
+BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ ">
+
+ <bean id="meetingMessageHandler" class="org.bigbluebutton.red5.pubsub.MeetingMessageHandler">
+ <property name="meetingManager" ref="meetingManager"/>
+ <property name="connInvokerService" ref="connInvokerService"/>
+ </bean>
+
+ <bean id="receivedMessageHandler" class="org.bigbluebutton.common2.redis.pubsub.ReceivedMessageHandler"
+ init-method="start" destroy-method="stop">
+ </bean>
+
+ <bean id="redisStorageService"
+ class="org.bigbluebutton.common2.redis.RedisStorageService"
+ init-method="start" destroy-method="stop">
+ <property name="host" value="${redis.host}" />
+ <property name="port" value="${redis.port}" />
+ <property name="password" value="${redis.password:}" />
+ <property name="expireKey" value="${redis.keyExpiry}" />
+ <property name="clientName" value="BbbRed5VideoStore" />
+ </bean>
+
+ <bean id="messageReceiver" class="org.bigbluebutton.common2.redis.pubsub.MessageReceiver"
+ init-method="start" destroy-method="stop">
+ <property name="host" value="${redis.host}" />
+ <property name="port" value="${redis.port}" />
+ <property name="password" value="${redis.password:}" />
+ <property name="clientName" value="BbbRed5VideoReceiver" />
+ <property name="messageHandler" ref="receivedMessageHandler"/>
+ </bean>
+
+ <bean id="redisSender" class="org.bigbluebutton.common2.redis.pubsub.MessageSender"
+ init-method="start" destroy-method="stop">
+ <property name="host" value="${redis.host}" />
+ <property name="port" value="${redis.port}" />
+ <property name="password" value="${redis.password:}" />
+ <property name="clientName" value="BbbRed5VideoSender" />
+ </bean>
+
+ <bean id="redisPublisher" class="org.bigbluebutton.red5.pubsub.MessagePublisher">
+ <property name="messageSender" ref="redisSender"/>
+ </bean>
+
+ <bean id="messageDistributor" class="org.bigbluebutton.common2.redis.pubsub.MessageDistributor">
+ <property name="messageHandler" ref="receivedMessageHandler"/>
+ <property name="messageListeners">
+ <set>
+ <ref bean="meetingMessageHandler" />
+ </set>
+ </property>
+ </bean>
+
+</beans>
diff --git a/bbb-video/src/main/webapp/WEB-INF/bbb-redis-pool.xml b/bbb-video/src/main/webapp/WEB-INF/bbb-redis-pool.xml
deleted file mode 100755
index 2d3cfd9098a5141b93f859828d18f65c5a5348b7..0000000000000000000000000000000000000000
--- a/bbb-video/src/main/webapp/WEB-INF/bbb-redis-pool.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-
-Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
-
-This program is free software; you can redistribute it and/or modify it under the
-terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 3.0 of the License, or (at your option) any later
-version.
-
-BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
- ">
-
-
-</beans>
diff --git a/bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties b/bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
index 5f8030de0c73cfb61b1eb9fa6816b9cec420445a..c8b4ea2405ecdd8772b5af5a7ee2aebdbe15a2f5 100755
--- a/bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
+++ b/bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
@@ -1,4 +1,5 @@
-redis.host=127.0.0.1
-redis.port=6379
-# recording keys should expire in 14 days
-redis.keyExpiry=1209600
+redis.host=127.0.0.1
+redis.port=6379
+redis.password=
+# recording keys should expire in 14 days
+redis.keyExpiry=1209600
diff --git a/bbb-video/src/main/webapp/WEB-INF/red5-web.xml b/bbb-video/src/main/webapp/WEB-INF/red5-web.xml
index e4c7b3adc83ee1d7e20c2a2f0ca62ddb48976a4f..fc80adb5503af93a9b1ff65584cf5f5928bc6df5 100755
--- a/bbb-video/src/main/webapp/WEB-INF/red5-web.xml
+++ b/bbb-video/src/main/webapp/WEB-INF/red5-web.xml
@@ -21,8 +21,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:lang="http://www.springframework.org/schema/lang"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.0.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/lang
+ http://www.springframework.org/schema/lang/spring-lang-2.0.xsd">
<bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="locations">
@@ -32,6 +34,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</list>
</property>
</bean>
+
+ <bean id="meetingManager" class="org.bigbluebutton.app.video.MeetingManager"/>
+
+ <bean id="connInvokerService" class="org.bigbluebutton.app.video.ConnectionInvokerService"
+ init-method="start" destroy-method="stop"/>
<bean id="web.context" class="org.red5.server.Context"
autowire="byType" />
@@ -44,59 +51,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<property name="contextPath" value="${webapp.contextPath}" />
<property name="virtualHosts" value="${webapp.virtualHosts}" />
</bean>
-
+
<bean id="web.handler" class="org.bigbluebutton.app.video.VideoApplication">
<property name="packetTimeout" value="10000"/>
- <property name="eventRecordingService" ref="redisRecorder"/>
+ <property name="eventRecordingService" ref="redisStorageService"/>
<property name="messagePublisher" ref="redisPublisher"/>
<property name="meetingManager" ref="meetingManager"/>
<property name="connInvokerService" ref="connInvokerService"/>
</bean>
+
+ <import resource="bbb-redis-messaging.xml"/>
- <bean id="connInvokerService" class="org.bigbluebutton.app.video.ConnectionInvokerService"
- init-method="start" destroy-method="stop"/>
-
- <bean id="meetingManager" class="org.bigbluebutton.app.video.MeetingManager"/>
-
- <bean id="redisPublisher" class="org.bigbluebutton.red5.pubsub.MessagePublisher">
- <property name="messageSender" ref="redisSender"/>
- </bean>
-
- <bean id="redisRecorder" class="org.bigbluebutton.app.video.EventRecordingService"
- init-method="start" destroy-method="stop">
- <constructor-arg index="0" value="${redis.host}"/>
- <constructor-arg index="1" value="${redis.port}"/>
- <constructor-arg index="2" value="${redis.keyExpiry}"/>
- </bean>
-
- <bean id="messageReceiver" class="org.bigbluebutton.red5.pubsub.MessageReceiver"
- init-method="start" destroy-method="stop">
- <property name="host" value="${redis.host}"/>
- <property name="port" value="${redis.port}"/>
- <property name="messageHandler" ref="receivedMessageHandler"/>
- </bean>
-
- <bean id="messageDistributor" class="org.bigbluebutton.red5.pubsub.MessageDistributor">
- <property name="messageHandler" ref="receivedMessageHandler"/>
- <property name="messageListeners">
- <set>
- <ref bean="meetingMessageHandler" />
- </set>
- </property>
- </bean>
-
- <bean id="meetingMessageHandler" class="org.bigbluebutton.red5.pubsub.MeetingMessageHandler">
- <property name="meetingManager" ref="meetingManager"/>
- <property name="connInvokerService" ref="connInvokerService"/>
- </bean>
-
- <bean id="receivedMessageHandler" class="org.bigbluebutton.red5.pubsub.ReceivedMessageHandler"
- init-method="start" destroy-method="stop">
- </bean>
-
- <bean id="redisSender" class="org.bigbluebutton.red5.pubsub.MessageSender"
- init-method="start" destroy-method="stop">
- <property name="host" value="${redis.host}"/>
- <property name="port" value="${redis.port}"/>
- </bean>
</beans>
diff --git a/bbb-video/src/main/webapp/WEB-INF/web.xml b/bbb-video/src/main/webapp/WEB-INF/web.xml
index af135b12d6da7c523b765161022e49ef73f4d134..24e0b09f9ff3286ff18d193120143b2d298121b3 100755
--- a/bbb-video/src/main/webapp/WEB-INF/web.xml
+++ b/bbb-video/src/main/webapp/WEB-INF/web.xml
@@ -29,7 +29,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<param-name>webAppRootKey</param-name>
<param-value>/video</param-value>
</context-param>
-
<listener>
<listener-class>org.red5.logging.ContextLoggingListener</listener-class>
diff --git a/bbb-voice/build.gradle b/bbb-voice/build.gradle
index e364181721d6b9c86df523f55c5b1fc51c0ed0d5..8828b83c349c1b22150e5d4b425191e86d16ee29 100755
--- a/bbb-voice/build.gradle
+++ b/bbb-voice/build.gradle
@@ -17,8 +17,14 @@ repositories {
mavenLocal()
}
+configurations {
+ runtime.exclude group: "org.slf4j", module: "slf4j-api"
+ runtime.exclude group: "org.red5", module: "red5-server"
+ runtime.exclude group: "org.red5", module: "red5-server-common"
+ runtime.exclude group: "org.red5", module: "red5-io"
+}
-dependencies {
+dependencies {
// Servlet
providedCompile 'javax.servlet:servlet-api:2.5@jar'
@@ -26,17 +32,18 @@ dependencies {
providedCompile 'org.apache.mina:mina-core:2.0.17@jar'
providedCompile 'org.apache.mina:mina-integration-beans:2.0.17@jar'
providedCompile 'org.apache.mina:mina-integration-jmx:2.0.17@jar'
-
- // Spring
+
+ // Spring
providedCompile 'org.springframework:spring-web:4.3.12.RELEASE@jar'
- providedCompile 'org.springframework:spring-beans:4.3.12.RELEASE@jar'
+ providedCompile 'org.springframework:spring-beans:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-core:4.3.12.RELEASE@jar'
+ // Red5
providedCompile 'org.red5:red5-server:1.0.10-M5@jar'
providedCompile 'org.red5:red5-server-common:1.0.10-M5@jar'
providedCompile 'org.red5:red5-io:1.0.10-M5@jar'
-
+
// Logging
providedCompile 'ch.qos.logback:logback-core:1.2.3@jar'
providedCompile 'ch.qos.logback:logback-classic:1.2.3@jar'
@@ -49,28 +56,19 @@ dependencies {
// Otherwise we get exception on aop utils class not found.
providedCompile 'org.springframework:spring-aop:4.3.12.RELEASE@jar'
compile 'aopalliance:aopalliance:1.0@jar'
-
+
//redis
- compile 'redis.clients:jedis:2.9.0'
compile 'org.apache.commons:commons-pool2:2.6.0'
compile 'com.google.code.gson:gson:2.8.5'
- compile 'org.apache.commons:commons-lang3:3.7'
- compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.19-SNAPSHOT'
-
- // Testing
- testRuntime 'org.easymock:easymock:3.6@jar'
-}
-
-test {
- useTestNG()
+ providedCompile 'org.apache.commons:commons-lang3:3.7'
+ compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.20-SNAPSHOT'
}
war.doLast {
ant.unzip(src: war.archivePath, dest: "$buildDir/sip")
}
-
task deploy() << {
def red5AppsDir = '/usr/share/red5/webapps'
def sipDir = new File("${red5AppsDir}/sip")
@@ -80,5 +78,4 @@ task deploy() << {
ant.copy(todir: sipDir) {
fileset(dir: "$buildDir/sip")
}
-}
-
+}
diff --git a/bbb-voice/deploy.sh b/bbb-voice/deploy.sh
index ebd457e9196547175c1de294c08b6bc833e310c8..b7cab36a4bc4e2ff6e2b72d8bb9bf36079ce3149 100755
--- a/bbb-voice/deploy.sh
+++ b/bbb-voice/deploy.sh
@@ -1,13 +1,10 @@
#!/bin/bash
# deploying 'bigbluebutton-apps' to /usr/share/red5/webapps
-sudo chmod -R 777 /usr/share/red5/webapps
-sudo chown -R red5.red5 /usr/share/red5/webapps
+sudo chmod -R 777 /usr/share/red5/webapps/*
gradle clean
gradle resolveDeps
gradle war deploy
-sudo chown -R red5.red5 /usr/share/red5/webapps
-sudo chmod -R 777 /usr/share/red5/webapps
-
+sudo chown -R red5:red5 /usr/share/red5/webapps
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MeetingMessageHandler.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MeetingMessageHandler.java
index 04623357859b93ae1dcb41d49aff0bc66994cbe4..847c837c186a5a48f5639e15a17448169e8134f5 100755
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MeetingMessageHandler.java
+++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MeetingMessageHandler.java
@@ -3,6 +3,8 @@ package org.bigbluebutton.voiceconf.messaging;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
+
+import org.bigbluebutton.common2.redis.pubsub.MessageHandler;
import org.bigbluebutton.voiceconf.messaging.messages.ValidateConnTokenRespMsg;
import org.bigbluebutton.voiceconf.red5.ConnectionInvokerService;
import org.red5.logging.Red5LoggerFactory;
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageDistributor.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageDistributor.java
deleted file mode 100755
index 595bf905cbc5bc84f3f03640c9bf26e6f2e0eda0..0000000000000000000000000000000000000000
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageDistributor.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bigbluebutton.voiceconf.messaging;
-
-import java.util.Set;
-
-public class MessageDistributor {
- private ReceivedMessageHandler handler;
- private Set<MessageHandler> listeners;
-
- public void setMessageListeners(Set<MessageHandler> listeners) {
- this.listeners = listeners;
- }
-
- public void setMessageHandler(ReceivedMessageHandler handler) {
- this.handler = handler;
- if (handler != null) {
- handler.setMessageDistributor(this);
- }
- }
-
- public void notifyListeners(String pattern, String channel, String message) {
- for (MessageHandler listener : listeners) {
- listener.handleMessage(pattern, channel, message);
- }
- }
-}
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageReceiver.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageReceiver.java
deleted file mode 100755
index 9033abe06a9a511d90f42520cf8c5daae97b5df6..0000000000000000000000000000000000000000
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageReceiver.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.bigbluebutton.voiceconf.messaging;
-
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.JedisPubSub;
-import redis.clients.jedis.exceptions.JedisConnectionException;
-
-public class MessageReceiver {
- private static Logger log = Red5LoggerFactory.getLogger(MessageReceiver.class, "bigbluebutton");
-
- private ReceivedMessageHandler handler;
-
- private Jedis jedis;
- private volatile boolean receiveMessage = false;
-
- private final Executor msgReceiverExec = Executors.newSingleThreadExecutor();
- private final Executor runExec = Executors.newSingleThreadExecutor();
-
- private final String FROM_BBB_APPS_PATTERN = "from-akka-apps-redis-channel";
-
- private String host;
- private int port;
-
- public void stop() {
- receiveMessage = false;
- }
-
- public void start() {
- log.info("Ready to receive messages from Redis pubsub.");
- try {
- receiveMessage = true;
- jedis = new Jedis(host, port);
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- jedis.clientSetname("BbbRed5VoiceSub");
-
- Runnable messageReceiver = new Runnable() {
- public void run() {
- if (receiveMessage) {
- try {
- jedis.subscribe(new PubSubListener(), FROM_BBB_APPS_PATTERN);
- } catch(JedisConnectionException ex) {
- log.warn("Exception on Jedis connection. Resubscribing to pubsub.");
- start();
- } catch (Exception e) {
- log.error("Error resubscribing to channels: " + e.getMessage());
- }
- }
- }
- };
- msgReceiverExec.execute(messageReceiver);
- } catch (Exception e) {
- log.error("Error subscribing to channels: " + e.getMessage());
- }
- }
-
- public void setHost(String host){
- this.host = host;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-
- public void setMessageHandler(ReceivedMessageHandler handler) {
- this.handler = handler;
- }
-
- private class PubSubListener extends JedisPubSub {
-
- public PubSubListener() {
- super();
- }
-
- @Override
- public void onMessage(String channel, String message) {
- // Not used.
- Runnable task = new Runnable() {
- public void run() {
- handler.handleMessage("", channel, message);
- }
- };
-
- runExec.execute(task);
- }
-
- @Override
- public void onPMessage(final String pattern, final String channel, final String message) {
- System.out.println("RECEIVED onPMessage" + channel + "\n" + message);
- Runnable task = new Runnable() {
- public void run() {
- handler.handleMessage(pattern, channel, message);
- }
- };
-
- runExec.execute(task);
- }
-
- @Override
- public void onPSubscribe(String pattern, int subscribedChannels) {
- log.debug("Subscribed to the pattern: " + pattern);
- }
-
- @Override
- public void onPUnsubscribe(String pattern, int subscribedChannels) {
- // Not used.
- }
-
- @Override
- public void onSubscribe(String channel, int subscribedChannels) {
- // Not used.
- }
-
- @Override
- public void onUnsubscribe(String channel, int subscribedChannels) {
- // Not used.
- }
- }
-}
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageSender.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageSender.java
deleted file mode 100755
index 67869c13367f6892a4a7b3e0cf82fcd393844227..0000000000000000000000000000000000000000
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageSender.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.bigbluebutton.voiceconf.messaging;
-
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.Protocol;
-import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-
-public class MessageSender {
- private static Logger log = Red5LoggerFactory.getLogger(MessageSender.class, "bigbluebutton");
-
- private JedisPool redisPool;
- private volatile boolean sendMessage = false;
-
- private final Executor msgSenderExec = Executors.newSingleThreadExecutor();
- private final Executor runExec = Executors.newSingleThreadExecutor();
- private BlockingQueue<MessageToSend> messages = new LinkedBlockingQueue<MessageToSend>();
- private String host;
- private int port;
-
- public void stop() {
- sendMessage = false;
- redisPool.destroy();
- }
-
- public void start() {
-
- GenericObjectPoolConfig config = new GenericObjectPoolConfig();
- config.setMaxTotal(32);
- config.setMaxIdle(8);
- config.setMinIdle(1);
- config.setTestOnBorrow(true);
- config.setTestOnReturn(true);
- config.setTestWhileIdle(true);
- config.setNumTestsPerEvictionRun(12);
- config.setMaxWaitMillis(5000);
- config.setTimeBetweenEvictionRunsMillis(60000);
- config.setBlockWhenExhausted(true);
-
- // Set the name of this client to be able to distinguish when doing
- // CLIENT LIST on redis-cli
- redisPool = new JedisPool(config, host, port, Protocol.DEFAULT_TIMEOUT, null,
- Protocol.DEFAULT_DATABASE, "BbbRed5VoicePub");
-
- log.info("Redis org.bigbluebutton.red5.pubsub.message publisher starting!");
- try {
- sendMessage = true;
-
- Runnable messageSender = new Runnable() {
- public void run() {
- while (sendMessage) {
- try {
- MessageToSend msg = messages.take();
- publish(msg.getChannel(), msg.getMessage());
- } catch (InterruptedException e) {
- log.warn("Failed to get org.bigbluebutton.red5.pubsub.message from queue.");
- }
- }
- }
- };
- msgSenderExec.execute(messageSender);
- } catch (Exception e) {
- log.error("Error subscribing to channels: " + e.getMessage());
- }
- }
-
- public void send(String channel, String message) {
- MessageToSend msg = new MessageToSend(channel, message);
- messages.add(msg);
- }
-
- private void publish(final String channel, final String message) {
- Runnable task = new Runnable() {
- public void run() {
- Jedis jedis = redisPool.getResource();
- try {
- jedis.publish(channel, message);
- } catch(Exception e){
- log.warn("Cannot publish the org.bigbluebutton.red5.pubsub.message to redis", e);
- } finally {
- redisPool.returnResource(jedis);
- }
- }
- };
-
- runExec.execute(task);
- }
-
-
- public void setHost(String host){
- this.host = host;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-}
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageToSend.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageToSend.java
deleted file mode 100755
index a72c9c6efe90da652577f9c7de285302abbbe3af..0000000000000000000000000000000000000000
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/MessageToSend.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.bigbluebutton.voiceconf.messaging;
-
-public class MessageToSend {
- private final String channel;
- private final String message;
-
- public MessageToSend(String channel, String message) {
- this.channel = channel;
- this.message = message;
- }
-
- public String getChannel() {
- return channel;
- }
-
- public String getMessage() {
- return message;
- }
-}
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessage.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessage.java
deleted file mode 100755
index 82d14824b11570bb36446b5d29be9977f27ae72f..0000000000000000000000000000000000000000
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessage.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.bigbluebutton.voiceconf.messaging;
-
-public class ReceivedMessage {
-
- private final String pattern;
- private final String channel;
- private final String message;
-
- public ReceivedMessage(String pattern, String channel, String message) {
- this.pattern = pattern;
- this.channel = channel;
- this.message = message;
- }
-
- public String getPattern() {
- return pattern;
- }
-
- public String getChannel() {
- return channel;
- }
-
- public String getMessage() {
- return message;
- }
-
-
-}
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessageHandler.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessageHandler.java
deleted file mode 100755
index 596710e10cd61f3cfa0284ef3a85a83b3d6fc7e7..0000000000000000000000000000000000000000
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/ReceivedMessageHandler.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bigbluebutton.voiceconf.messaging;
-
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-
-public class ReceivedMessageHandler {
- private static Logger log = Red5LoggerFactory.getLogger(ReceivedMessageHandler.class, "bigbluebutton");
-
- private BlockingQueue<ReceivedMessage> receivedMessages = new LinkedBlockingQueue<ReceivedMessage>();
-
- private volatile boolean processMessage = false;
-
- private final Executor msgProcessorExec = Executors.newSingleThreadExecutor();
-
-
- private MessageDistributor handler;
-
- public void stop() {
- processMessage = false;
- }
-
- public void start() {
- log.info("Ready to handle messages from Redis pubsub!");
-
- try {
- processMessage = true;
-
- Runnable messageProcessor = new Runnable() {
- public void run() {
- while (processMessage) {
- try {
- ReceivedMessage msg = receivedMessages.take();
- processMessage(msg);
- } catch (InterruptedException e) {
- log.warn("Error while taking received message from queue.");
- }
- }
- }
- };
- msgProcessorExec.execute(messageProcessor);
- } catch (Exception e) {
- log.error("Error subscribing to channels: " + e.getMessage());
- }
- }
-
- private void processMessage(ReceivedMessage msg) {
- if (handler != null) {
- log.debug("Let's process this message: " + msg.getMessage());
-
- handler.notifyListeners(msg.getPattern(), msg.getChannel(), msg.getMessage());
- } else {
- log.warn("No listeners interested in messages from Redis!");
- }
- }
-
- public void handleMessage(String pattern, String channel, String message) {
- ReceivedMessage rm = new ReceivedMessage(pattern, channel, message);
- receivedMessages.add(rm);
- }
-
- public void setMessageDistributor(MessageDistributor h) {
- this.handler = h;
- }
-}
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/RedisMessagingService.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/RedisMessagingService.java
index 11da04a9f7c525a296437691cacb8284b2a82f91..853f5fd4fefc59230ae20d9d00151b3dd210f381 100755
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/RedisMessagingService.java
+++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/messaging/RedisMessagingService.java
@@ -5,6 +5,8 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.bigbluebutton.common2.msgs.*;
+import org.bigbluebutton.common2.redis.pubsub.MessageSender;
+
import com.google.gson.Gson;
import org.bigbluebutton.voiceconf.messaging.messages.UserConnectedToGlobalAudio;
import org.bigbluebutton.voiceconf.messaging.messages.UserDisconnectedFromGlobalAudio;
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/SipToFlashAudioStream.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/SipToFlashAudioStream.java
index b81cdd554ab63b8384a45994d09b36d6edc0356d..51b77259fb3571d468a49190c72fa62bbba33a56 100644
--- a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/SipToFlashAudioStream.java
+++ b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/SipToFlashAudioStream.java
@@ -19,16 +19,16 @@
package org.bigbluebutton.voiceconf.red5.media;
import java.net.DatagramSocket;
+
import org.apache.mina.core.buffer.IoBuffer;
import org.bigbluebutton.voiceconf.red5.media.transcoder.SipToFlashTranscoder;
import org.bigbluebutton.voiceconf.red5.media.transcoder.TranscodedAudioDataListener;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IContext;
import org.red5.server.api.scope.IScope;
-import org.red5.server.net.rtmp.event.AudioData;
+import org.red5.server.net.rtmp.event.AudioData;
import org.red5.server.net.rtmp.event.Notify;
import org.red5.server.net.rtmp.message.Constants;
-import org.red5.server.scope.Scope;
import org.red5.server.stream.IProviderService;
import org.slf4j.Logger;
diff --git a/bbb-voice/src/main/java/org/red5/app/sip/stream/ListenStream.java b/bbb-voice/src/main/java/org/red5/app/sip/stream/ListenStream.java
index e0c4543b911c92fb53ae5e5fd505bf0c120d4fa0..ab41d32d89850cc2861b721fee91411bccd30f7b 100755
--- a/bbb-voice/src/main/java/org/red5/app/sip/stream/ListenStream.java
+++ b/bbb-voice/src/main/java/org/red5/app/sip/stream/ListenStream.java
@@ -5,13 +5,13 @@ import org.red5.app.sip.trancoders.TranscodedAudioDataListener;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IContext;
import org.red5.server.api.scope.IScope;
-import org.red5.server.net.rtmp.event.AudioData;
+import org.red5.server.net.rtmp.event.AudioData;
import org.red5.server.scope.Scope;
import org.red5.server.stream.IProviderService;
import org.slf4j.Logger;
public class ListenStream implements TranscodedAudioDataListener {
- final private Logger log = Red5LoggerFactory.getLogger(ListenStream.class, "sip");
+ private final Logger log = Red5LoggerFactory.getLogger(ListenStream.class, "sip");
private AudioStream broadcastStream;
private IScope scope;
diff --git a/bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml b/bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
index fe19d06cc39a355141fc0d48cf604f7b9f8913bb..8da566658471941dd04c309f0028c4ba32835f4b 100755
--- a/bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
+++ b/bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
@@ -24,42 +24,45 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
- ">
+ http://www.springframework.org/schema/util/spring-util-2.0.xsd">
- <bean id="messagingService" class="org.bigbluebutton.voiceconf.messaging.RedisMessagingService">
- <property name="redisMessageSender"> <ref bean="redisMessageSender"/></property>
+ <bean id="redisMessageDistributor" class="org.bigbluebutton.common2.redis.pubsub.MessageDistributor">
+ <property name="messageHandler"> <ref local="redisMessageHandler"/> </property>
+ <property name="messageListeners">
+ <set>
+ <ref bean="meetingMessageHandler" />
+ </set>
+ </property>
+ </bean>
+
+ <bean id="redisMessageHandler" class="org.bigbluebutton.common2.redis.pubsub.ReceivedMessageHandler"
+ init-method="start" destroy-method="stop">
+ <property name="messageDistributor"><ref bean="redisMessageDistributor" /></property>
</bean>
- <bean id="redisMessageSender" class="org.bigbluebutton.voiceconf.messaging.MessageSender"
+ <bean id="redisMessageSender" class="org.bigbluebutton.common2.redis.pubsub.MessageSender"
init-method="start" destroy-method="stop">
<property name="host" value="${redis.host}"/>
<property name="port" value="${redis.port}"/>
+ <property name="clientName" value="BbbRed5VoiceSender" />
+ <property name="password" value="${redis.password:}" />
+ </bean>
+
+ <bean id="messagingService" class="org.bigbluebutton.voiceconf.messaging.RedisMessagingService">
+ <property name="redisMessageSender"> <ref bean="redisMessageSender"/></property>
</bean>
<bean id="meetingMessageHandler" class="org.bigbluebutton.voiceconf.messaging.MeetingMessageHandler">
<property name="connInvokerService" ref="connInvokerService"/>
</bean>
- <bean id="redisMessageReceiver" class="org.bigbluebutton.voiceconf.messaging.MessageReceiver"
+ <bean id="redisMessageReceiver" class="org.bigbluebutton.common2.redis.pubsub.MessageReceiver"
init-method="start" destroy-method="stop">
<property name="host" value="${redis.host}"/>
<property name="port" value="${redis.port}"/>
+ <property name="password" value="${redis.password:}" />
+ <property name="clientName" value="BbbRed5VideoReceiver" />
<property name="messageHandler"> <ref local="redisMessageHandler"/> </property>
</bean>
- <bean id="redisMessageHandler" class="org.bigbluebutton.voiceconf.messaging.ReceivedMessageHandler"
- init-method="start" destroy-method="stop">
- <property name="messageDistributor"><ref bean="redisMessageDistributor" /></property>
- </bean>
-
- <bean id="redisMessageDistributor" class="org.bigbluebutton.voiceconf.messaging.MessageDistributor">
- <property name="messageHandler"> <ref local="redisMessageHandler"/> </property>
- <property name="messageListeners">
- <set>
- <ref bean="meetingMessageHandler" />
- </set>
- </property>
- </bean>
-
</beans>
diff --git a/bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties b/bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties
index 370990a1859ac2180df786079036a1d379702eaf..3dc265ff1bea57288d330def75ba2f334fd931fd 100755
--- a/bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties
+++ b/bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties
@@ -7,7 +7,6 @@ bbb.sip.app.port=5070
sip.server.username=bbbuser
sip.server.password=secret
-
# The ip and port of the FreeSWITCH server
freeswitch.ip=192.168.23.53
freeswitch.port=5060
@@ -19,8 +18,7 @@ stopAudioPort=16383
redis.host=127.0.0.1
redis.port=6379
-redis.pass=
-
+redis.password=
# If you want mjsip stack (red5/log/*access*.log) to minimize the amount of logs it
# generates, set this to a lower value (e.g. 3).
diff --git a/bbb-voice/src/main/webapp/WEB-INF/red5-web.properties b/bbb-voice/src/main/webapp/WEB-INF/red5-web.properties
index 1e17dff094bfb42a2837817c705fdfe500fbb960..5d646d514744049abf439aca1a0e28163e07dc78 100644
--- a/bbb-voice/src/main/webapp/WEB-INF/red5-web.properties
+++ b/bbb-voice/src/main/webapp/WEB-INF/red5-web.properties
@@ -1,2 +1,2 @@
-webapp.contextPath=/sip
-webapp.virtualHosts=*, localhost, localhost:8088, 127.0.0.1:8088
+webapp.contextPath=/sip
+webapp.virtualHosts=*, localhost, localhost:8088, 127.0.0.1:8088
diff --git a/bbb-voice/src/main/webapp/WEB-INF/red5-web.xml b/bbb-voice/src/main/webapp/WEB-INF/red5-web.xml
index 12f3bb8eebe8e7b6c2f0778a9aabf5983d045e08..610836054c018196d4416822c6ab1049a4cd1df7 100755
--- a/bbb-voice/src/main/webapp/WEB-INF/red5-web.xml
+++ b/bbb-voice/src/main/webapp/WEB-INF/red5-web.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
@@ -36,6 +35,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</property>
</bean>
+ <import resource="bbb-redis-messaging.xml"/>
+
+ <bean id="clientConnectionManager" class="org.bigbluebutton.voiceconf.red5.ClientConnectionManager"/>
+
+ <bean id="connInvokerService" class="org.bigbluebutton.voiceconf.red5.ConnectionInvokerService"
+ init-method="start" destroy-method="stop"/>
<bean id="web.context" class="org.red5.server.Context"
autowire="byType" />
@@ -49,6 +54,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<property name="contextPath" value="${webapp.contextPath}" />
<property name="virtualHosts" value="${webapp.virtualHosts}" />
</bean>
+
+ <bean id="sipPeerManager" class="org.bigbluebutton.voiceconf.sip.SipPeerManager">
+ <property name="sipStackDebugLevel" value="${sipStackDebugLevel}"/>
+ <property name="sipRemotePort" value="${freeswitch.port}"/>
+ <property name="messagingService" ref="messagingService"/>
+ </bean>
+
+ <bean id="voiceconf.service" class="org.bigbluebutton.voiceconf.red5.Service">
+ <property name="sipPeerManager" ref="sipPeerManager"/>
+ </bean>
<bean id="web.handler" class="org.bigbluebutton.voiceconf.red5.Application">
<property name="sipClientRtpIp" value="${bbb.sip.app.ip}" />
@@ -64,22 +79,4 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<property name="messagingService" ref="messagingService"/>
</bean>
- <bean id="voiceconf.service" class="org.bigbluebutton.voiceconf.red5.Service">
- <property name="sipPeerManager" ref="sipPeerManager"/>
- </bean>
-
- <bean id="connInvokerService" class="org.bigbluebutton.voiceconf.red5.ConnectionInvokerService"
- init-method="start" destroy-method="stop"/>
-
- <bean id="sipPeerManager" class="org.bigbluebutton.voiceconf.sip.SipPeerManager">
- <property name="sipStackDebugLevel" value="${sipStackDebugLevel}"/>
- <property name="sipRemotePort" value="${freeswitch.port}"/>
- <property name="messagingService" ref="messagingService"/>
-
- </bean>
-
- <bean id="clientConnectionManager" class="org.bigbluebutton.voiceconf.red5.ClientConnectionManager"/>
-
- <import resource="bbb-redis-messaging.xml"/>
-
</beans>
diff --git a/bigbluebutton-apps/build.gradle b/bigbluebutton-apps/build.gradle
index 85dc33cbaf3f8d581abaa6ec6da1cfb687110869..df9dbcd3cf6a98e021ac262074a385a87b31a3ce 100755
--- a/bigbluebutton-apps/build.gradle
+++ b/bigbluebutton-apps/build.gradle
@@ -21,6 +21,13 @@ repositories {
mavenLocal()
}
+configurations {
+ runtime.exclude group: "org.slf4j", module: "slf4j-api"
+ runtime.exclude group: "org.red5", module: "red5-server"
+ runtime.exclude group: "org.red5", module: "red5-server-common"
+ runtime.exclude group: "org.red5", module: "red5-io"
+}
+
dependencies {
// Servlet
providedCompile 'javax.servlet:servlet-api:2.5@jar'
@@ -34,12 +41,13 @@ dependencies {
providedCompile 'org.springframework:spring-web:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-beans:4.3.12.RELEASE@jar'
providedCompile 'org.springframework:spring-context:4.3.12.RELEASE@jar'
- providedCompile 'org.springframework:spring-core:4.3.13.RELEASE@jar'
+ providedCompile 'org.springframework:spring-core:4.3.12.RELEASE@jar'
// Red5
providedCompile 'org.red5:red5-server:1.0.10-M5@jar'
providedCompile 'org.red5:red5-server-common:1.0.10-M5@jar'
-
+ providedCompile 'org.red5:red5-io:1.0.10-M5@jar'
+
// Logging
providedCompile 'ch.qos.logback:logback-core:1.2.3@jar'
providedCompile 'ch.qos.logback:logback-classic:1.2.3@jar'
@@ -57,14 +65,13 @@ dependencies {
compile 'org.easymock:easymock:3.6@jar'
//redis
- compile "redis.clients:jedis:2.9.0"
compile 'org.apache.commons:commons-pool2:2.6.0'
- compile 'com.google.code.gson:gson:2.8.5'
- providedCompile 'org.apache.commons:commons-lang3:3.7'
+ compile 'com.google.code.gson:gson:2.8.5'
+ providedCompile 'org.apache.commons:commons-lang3:3.7'
- compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.19-SNAPSHOT'
- compile 'org.bigbluebutton:bbb-apps-common_2.12:0.0.3-SNAPSHOT'
+ compile 'org.bigbluebutton:bbb-common-message_2.12:0.0.20-SNAPSHOT'
+ compile 'org.bigbluebutton:bbb-apps-common_2.12:0.0.4-SNAPSHOT'
}
test {
diff --git a/bigbluebutton-apps/deploy.sh b/bigbluebutton-apps/deploy.sh
index b002c6f858b83aa29961ec5a1b9193b600bbbade..b7cab36a4bc4e2ff6e2b72d8bb9bf36079ce3149 100755
--- a/bigbluebutton-apps/deploy.sh
+++ b/bigbluebutton-apps/deploy.sh
@@ -1,18 +1,10 @@
#!/bin/bash
# deploying 'bigbluebutton-apps' to /usr/share/red5/webapps
-sudo chown -R red5.red5 /usr/share/red5/webapps
+sudo chmod -R 777 /usr/share/red5/webapps/*
gradle clean
gradle resolveDeps
gradle war deploy
-sudo chown -R red5.red5 /usr/share/red5/webapps
-
-# Remove slf4j jar as it conflicts with logging with red5
-FILE=/usr/share/red5/webapps/bigbluebutton/WEB-INF/lib/slf4j-api-1.7.25.jar
-if [ -f $FILE ]
-then
- sudo rm $FILE
-fi
-
+sudo chown -R red5:red5 /usr/share/red5/webapps
diff --git a/bigbluebutton-apps/gradle.properties b/bigbluebutton-apps/gradle.properties
deleted file mode 100644
index a0cdfb5b63d4667c2cdcd67631f5017fd006f34e..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/gradle.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-## Dependecies Version
-
-# Logging
-log4jVersion = 1.2.17
-slf4jVersion = 1.6.6
-
-# Common libraries
-springVersion = 3.1.4.RELEASE
-springRedisVersion = 1.1.0.RELEASE
-jacksonVersion = 1.8.3
-
-# Testing
-junitVersion = 4.8.1
-mockitoVersion = 1.8.5
-
-
diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-pool.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-pool.xml
deleted file mode 100755
index b72ba93cd2670e60586dec23400a791ac34031de..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-pool.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-
-Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
-
-This program is free software; you can redistribute it and/or modify it under the
-terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 3.0 of the License, or (at your option) any later
-version.
-
-BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
- ">
- <!--
- <bean id="redisPool" class="redis.clients.jedis.JedisPool">
- <constructor-arg index="0" value="${redis.host}"/>
- <constructor-arg index="1" value="${redis.port}"/>
- </bean>
- -->
-</beans>
diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/classes/application.conf b/bigbluebutton-apps/src/main/webapp/WEB-INF/classes/application.conf
index 74183500ea75522d1927e5742c4f93d2722b1269..3b72838eb4bbe89bb4f2c7d26663b8c90cbd2a2b 100755
--- a/bigbluebutton-apps/src/main/webapp/WEB-INF/classes/application.conf
+++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/classes/application.conf
@@ -10,7 +10,7 @@ akka {
loggers = ["akka.event.slf4j.Slf4jLogger"]
loglevel = "DEBUG"
- rediscala-publish-worker-dispatcher {
+ redis-publish-worker-dispatcher {
mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
# Throughput defines the maximum number of messages to be
# processed per actor before the thread jumps to the next actor.
@@ -18,7 +18,7 @@ akka {
throughput = 512
}
- rediscala-subscriber-worker-dispatcher {
+ redis-subscriber-worker-dispatcher {
mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
# Throughput defines the maximum number of messages to be
# processed per actor before the thread jumps to the next actor.
diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
index 8891ce3b5af9e5a0f53a1552ac80e00323fb2f8d..2023fa50935836d8464329a04c76eee9125187e1 100755
--- a/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
+++ b/bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
@@ -36,7 +36,18 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</property>
</bean>
+ <bean id="msgToClientGW" class="org.bigbluebutton.client.MsgToClientGW" >
+ <constructor-arg index="0" ref="connInvokerService"/>
+ </bean>
+
+ <bean id="clientGWApp" class="org.bigbluebutton.client.ClientGWApplication" destroy-method="shutdown">
+ <constructor-arg index="0" ref="msgToClientGW"/>
+ </bean>
+
<bean id="web.context" class="org.red5.server.Context" autowire="byType" />
+
+ <bean id="connInvokerService" class="org.bigbluebutton.red5.client.messaging.ConnectionInvokerService"
+ init-method="start" destroy-method="stop"/>
<bean id="web.scope" class="org.red5.server.scope.WebScope"
init-method="register">
@@ -47,6 +58,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<property name="contextPath" value="${webapp.contextPath}" />
<property name="virtualHosts" value="${webapp.virtualHosts}" />
</bean>
+
+ <bean id="clientInGW" class="org.bigbluebutton.client.ClientInGW" >
+ <constructor-arg index="0" ref="clientGWApp"/>
+ </bean>
<bean id="web.handler" class="org.bigbluebutton.red5.BigBlueButtonApplication">
<property name="connInvokerService"><ref bean="connInvokerService"/></property>
@@ -54,25 +69,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<property name="maxMessageLength" value="${maxMessageLength}"/>
</bean>
- <bean id="clientInGW" class="org.bigbluebutton.client.ClientInGW" >
- <constructor-arg index="0" ref="clientGWApp"/>
- </bean>
-
- <bean id="msgToClientGW" class="org.bigbluebutton.client.MsgToClientGW" >
- <constructor-arg index="0" ref="connInvokerService"/>
- </bean>
-
- <bean id="clientGWApp" class="org.bigbluebutton.client.ClientGWApplication" destroy-method="shutdown">
- <constructor-arg index="0" ref="msgToClientGW"/>
- </bean>
-
- <bean id="connInvokerService" class="org.bigbluebutton.red5.client.messaging.ConnectionInvokerService"
- init-method="start" destroy-method="stop"/>
-
<bean id="bbbAppsIsAliveMonitorService" class="org.bigbluebutton.red5.monitoring.BbbAppsIsAliveMonitorService"
init-method="start" destroy-method="stop">
<property name="connectionInvokerService"> <ref bean="connInvokerService"/></property>
</bean>
-
- <import resource="bbb-redis-pool.xml"/>
</beans>
diff --git a/bigbluebutton-apps/src/main/webapp/WEB-INF/spring/applicationContext-redis.xml b/bigbluebutton-apps/src/main/webapp/WEB-INF/spring/applicationContext-redis.xml
deleted file mode 100755
index ebc657b8c66a89465b13937687f52376c5cc3243..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/webapp/WEB-INF/spring/applicationContext-redis.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:p="http://www.springframework.org/schema/p"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context.xsd">
-
- <bean id="connectionFactory" class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"
- p:host-name="${redis.host}" p:port="${redis.port}" p:password="${redis.pass}"/>
-
- <bean id="redisTemplate" class="org.springframework.data.redis.core.StringRedisTemplate"
- p:connection-factory-ref="connectionFactory"/>
-
-</beans>
diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
index b322cf6485169921821618cf4ec4978dff631577..37f9331359d9c37b060bbaeb06df1602c527f483 100755
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
@@ -56,12 +56,22 @@
# 2016-08-15 GTR Archive more logs with zip option and show more applications with status
# 2016-10-17 GTR Added redis to checked server components & added ownership check for video and freeswitch recording directories
# 2017-04-08 FFD Cleanup for 1.1-beta
+# 2018-11-22 MNE Dynamically detect if sudo is needed
+# 2018-12-09 GTR More logs cleanup
#set -x
#set -e
PATH=$PATH:/sbin
+if [ "$(id -u)" != "0" ]; then
+ if [ -x "$(which sudo)" ]; then
+ SUDO="$(which sudo)"
+ else
+ echo "bbb-conf must be ran as root!" && exit 1
+ fi
+fi
+
source /etc/bigbluebutton/bigbluebutton-release
#
@@ -136,7 +146,7 @@ fi
#
if [ -f $SERVLET_DIR/bigbluebutton/WEB-INF/classes/bigbluebutton.properties ]; then
if cat $SERVLET_DIR/bigbluebutton/WEB-INF/classes/bigbluebutton.properties | grep -q ^bigbluebutton.web.logoutURL=$; then
- sudo sed -i s/^bigbluebutton.web.logoutURL=$/bigbluebutton.web.logoutURL=default/g $SERVLET_DIR/webapps/bigbluebutton/WEB-INF/classes/bigbluebutton.properties
+ $SUDO sed -i s/^bigbluebutton.web.logoutURL=$/bigbluebutton.web.logoutURL=default/g $SERVLET_DIR/webapps/bigbluebutton/WEB-INF/classes/bigbluebutton.properties
fi
fi
@@ -530,7 +540,7 @@ enable_webrtc(){
echo
echo "WebRTC audio enabled. To apply settings to your server, do"
echo
- echo " sudo bbb-conf --clean"
+ echo " $SUDO bbb-conf --clean"
echo
}
@@ -554,7 +564,7 @@ disable_webrtc(){
echo
echo "WebRTC audio disabled. To apply settings to your server, do"
echo
- echo " sudo bbb-conf --clean"
+ echo " $SUDO bbb-conf --clean"
echo
}
@@ -730,7 +740,7 @@ if [ $SECRET ]; then
echo "Changed BigBlueButton's shared secret to $SECRET"
echo
echo "You must restart BigBlueButton for the changes to take effect"
- echo " sudo bbb-conf --restart"
+ echo " $SUDO bbb-conf --restart"
echo
fi
@@ -745,7 +755,7 @@ if [ $SAMBA ]; then
# Instal Samba
#
if ! dpkg-query -s samba > /dev/null 2>&1; then
- sudo apt-get install -y --force-yes samba ant
+ $SUDO apt-get install -y --force-yes samba ant
fi
#
@@ -764,9 +774,9 @@ if [ $SAMBA ]; then
directory mask = 0775
guest ok = yes
force user = $USER
-" | sudo tee -a /etc/samba/smb.conf > /dev/null 2>&1
+" | $SUDO tee -a /etc/samba/smb.conf > /dev/null 2>&1
- sudo /etc/init.d/smbd restart
+ $SUDO /etc/init.d/smbd restart
echo "
You can now access your development folder through:
@@ -1220,10 +1230,10 @@ check_state() {
echo "# Warning: The installed ffmpeg version '${FFMPEG_VERSION}' is not recommended."
echo "# Recommend you update to the 4.0.x version of ffmpeg. To upgrade, do the following"
echo "#"
- echo "# sudo apt-get install software-properties-common"
- echo "# sudo add-apt-repository ppa:jonathonf/ffmpeg-4"
- echo "# sudo apt-get update"
- echo "# sudo apt-get dist-upgrade"
+ echo "# $SUDO apt-get install software-properties-common"
+ echo "# $SUDO add-apt-repository ppa:jonathonf/ffmpeg-4"
+ echo "# $SUDO apt-get update"
+ echo "# $SUDO apt-get dist-upgrade"
echo "#"
echo
;;
@@ -1238,7 +1248,7 @@ check_state() {
echo "# Warning: The voice application may not have registered with the sip server."
echo "# Try running: "
echo "#"
- echo "# sudo bbb-conf --clean"
+ echo "# $SUDO bbb-conf --clean"
echo "#"
echo
fi
@@ -1383,7 +1393,7 @@ check_state() {
if test ${SERVLET_DIR}/lti.war -nt ${SERVLET_DIR}/lti; then
echo "# Error: The updated lti.war did not deploy. To manually deploy:"
echo "#"
- echo "# sudo touch ${SERVLET_DIR}/lti.war"
+ echo "# $SUDO touch ${SERVLET_DIR}/lti.war"
echo "#"
echo
fi
@@ -1393,7 +1403,7 @@ check_state() {
if test ${SERVLET_DIR}/demo.war -nt ${SERVLET_DIR}/demo; then
echo "# Error: The updated demo.war did not deploy. To manually deploy:"
echo "#"
- echo "# sudo touch ${SERVLET_DIR}/demo.war"
+ echo "# $SUDO touch ${SERVLET_DIR}/demo.war"
echo "#"
echo
fi
@@ -1415,7 +1425,7 @@ check_state() {
echo "# to create/manage meetings and recordings. They are for testing purposes only."
echo "# If you are running a production system, remove them by running:"
echo "#"
- echo "# sudo apt-get purge bbb-demo"
+ echo "# $SUDO apt-get purge bbb-demo"
echo
fi
@@ -1492,7 +1502,7 @@ check_state() {
echo "# Error: Detected that /usr/share/bbb-apps-akka/conf/application.conf has the default"
echo "# configuration values. To update, run"
echo "#"
- echo "# sudo bbb-conf --setip $BBB_WEB_IP"
+ echo "# $SUDO bbb-conf --setip $BBB_WEB_IP"
echo "#"
fi
@@ -1555,10 +1565,10 @@ if [ $CHECK ]; then
echo " useWebrtcIfAvailable: $WEBRTC_ENABLED_CLIENT"
if grep -q ws-binding $FREESWITCH_EXTERNAL; then
- WEBRTC_SOCKET=$(sudo cat $FREESWITCH_EXTERNAL | sed -n '/ws-binding/{s/.*value="//;s/".*//;p}')
+ WEBRTC_SOCKET=$($SUDO cat $FREESWITCH_EXTERNAL | sed -n '/ws-binding/{s/.*value="//;s/".*//;p}')
fi
if grep -q wss-binding $FREESWITCH_EXTERNAL; then
- WEBRTC_SOCKET=$(sudo cat $FREESWITCH_EXTERNAL | sed -n '/wss-binding/{s/.*value="//;s/".*//;p}')
+ WEBRTC_SOCKET=$($SUDO cat $FREESWITCH_EXTERNAL | sed -n '/wss-binding/{s/.*value="//;s/".*//;p}')
fi
echo
echo "$FREESWITCH_EXTERNAL (FreeSWITCH)"
@@ -1723,7 +1733,7 @@ if [ $DEBUG ]; then
rm -rf /tmp/t
- sudo grep --directories=skip Exception $SERVLET_LOGS/* | grep -v CacheExceptionHandlerFactory > /tmp/t
+ $SUDO grep --directories=skip Exception $SERVLET_LOGS/* | grep -v CacheExceptionHandlerFactory > /tmp/t
if [ -s /tmp/t ]; then
echo " -- Exceptions found in $SERVLET_LOGS/ -- "
cat /tmp/t
@@ -1742,7 +1752,7 @@ if [ $DEBUG ]; then
if [ $DISTRIB_ID == "Ubuntu" ]; then
rm -rf /tmp/t
- sudo grep --directories=skip -i exception /var/log/syslog > /tmp/t
+ $SUDO grep --directories=skip -i exception /var/log/syslog > /tmp/t
if [ -s /tmp/t ]; then
echo " -- Errors found in /var/log/syslog -- "
cat /tmp/t
@@ -1752,7 +1762,7 @@ if [ $DEBUG ]; then
rm -rf /tmp/t
if [ -d /var/log/bigbluebutton ]; then
- sudo grep --directories=skip ERROR /var/log/bigbluebutton/* > /tmp/t
+ $SUDO grep --directories=skip ERROR /var/log/bigbluebutton/* > /tmp/t
if [ -s /tmp/t ]; then
echo " -- Errors found in /var/log/bigbluebutton -- "
cat /tmp/t
@@ -1762,7 +1772,7 @@ if [ $DEBUG ]; then
rm -rf /tmp/t
if [ -d /var/log/bigbluebutton ]; then
- sudo grep --directories=skip -i exception /var/log/bigbluebutton/* > /tmp/t
+ $SUDO grep --directories=skip -i exception /var/log/bigbluebutton/* > /tmp/t
if [ -s /tmp/t ]; then
echo " -- Exceptions found in /var/log/bigbluebutton -- "
cat /tmp/t
@@ -1789,13 +1799,13 @@ if [ -n "$HOST" ]; then
# Just use the IP for port test in /var/www/bigbluebutton/client/conf/config.xml
#
echo "Assigning $HOST for testing for firewall in /var/www/bigbluebutton/client/conf/config.xml"
- sudo sed -i "s/porttest host=\(\"[^\"]*\"\)/porttest host=\"$PROTOCOL_RTMP:\/\/$HOST\"/g" /var/www/bigbluebutton/client/conf/config.xml
+ $SUDO sed -i "s/porttest host=\(\"[^\"]*\"\)/porttest host=\"$PROTOCOL_RTMP:\/\/$HOST\"/g" /var/www/bigbluebutton/client/conf/config.xml
echo "Assigning $HOST for rtmp:// in /var/www/bigbluebutton/client/conf/config.xml"
- sudo sed -i "s/rtmp[s]*:\/\/\([^\"\/]*\)\([\"\/]\)/$PROTOCOL_RTMP:\/\/$HOST\2/g" /var/www/bigbluebutton/client/conf/config.xml
+ $SUDO sed -i "s/rtmp[s]*:\/\/\([^\"\/]*\)\([\"\/]\)/$PROTOCOL_RTMP:\/\/$HOST\2/g" /var/www/bigbluebutton/client/conf/config.xml
echo "Assigning $HOST for servername in /etc/nginx/sites-available/bigbluebutton"
- sudo sed -i "s/server_name .*/server_name $HOST;/g" /etc/nginx/sites-available/bigbluebutton
+ $SUDO sed -i "s/server_name .*/server_name $HOST;/g" /etc/nginx/sites-available/bigbluebutton
#
# Update configuration for BigBlueButton client (and preserve hostname for chromeExtensionLink if exists)
@@ -1805,26 +1815,26 @@ if [ -n "$HOST" ]; then
chromeExtensionLinkURL=$(cat /var/www/bigbluebutton/client/conf/config.xml | sed -n '/chromeExtensionLink/{s/.*https*:\/\///;s/\/.*//;p}')
echo "Assigning $HOST for http[s]:// in /var/www/bigbluebutton/client/conf/config.xml"
- sudo sed -i "s/http[s]*:\/\/\([^\"\/]*\)\([\"\/]\)/$PROTOCOL_HTTP:\/\/$HOST\2/g" \
+ $SUDO sed -i "s/http[s]*:\/\/\([^\"\/]*\)\([\"\/]\)/$PROTOCOL_HTTP:\/\/$HOST\2/g" \
/var/www/bigbluebutton/client/conf/config.xml
if ! echo "$chromeExtensionLinkURL" | grep -q '""'; then
- sudo sed -i "s/chromeExtensionLink=\"https:\/\/[^\/]*/chromeExtensionLink=\"https:\/\/$chromeExtensionLinkURL/g" \
+ $SUDO sed -i "s/chromeExtensionLink=\"https:\/\/[^\/]*/chromeExtensionLink=\"https:\/\/$chromeExtensionLinkURL/g" \
/var/www/bigbluebutton/client/conf/config.xml
fi
echo "Assigning $HOST for publishURI in /var/www/bigbluebutton/client/conf/config.xml"
- sudo sed -i "s/publishURI=\"[^\"]*\"/publishURI=\"$HOST\"/" /var/www/bigbluebutton/client/conf/config.xml
+ $SUDO sed -i "s/publishURI=\"[^\"]*\"/publishURI=\"$HOST\"/" /var/www/bigbluebutton/client/conf/config.xml
#
# Update configuration for BigBlueButton web app
#
echo "Assigning $HOST for web application URL in ${SERVLET_DIR}/bigbluebutton/WEB-INF/classes/bigbluebutton.properties"
- sudo sed -i "s/bigbluebutton.web.serverURL=http[s]*:\/\/.*/bigbluebutton.web.serverURL=$PROTOCOL_HTTP:\/\/$HOST/g" \
+ $SUDO sed -i "s/bigbluebutton.web.serverURL=http[s]*:\/\/.*/bigbluebutton.web.serverURL=$PROTOCOL_HTTP:\/\/$HOST/g" \
${SERVLET_DIR}/bigbluebutton/WEB-INF/classes/bigbluebutton.properties
- sudo sed -i "s/screenshareRtmpServer=.*/screenshareRtmpServer=$HOST/g" \
+ $SUDO sed -i "s/screenshareRtmpServer=.*/screenshareRtmpServer=$HOST/g" \
${SERVLET_DIR}/bigbluebutton/WEB-INF/classes/bigbluebutton.properties
change_var_value /usr/share/red5/webapps/screenshare/WEB-INF/screenshare.properties streamBaseUrl rtmp://$HOST/screenshare
@@ -1832,7 +1842,7 @@ if [ -n "$HOST" ]; then
change_var_value /usr/share/red5/webapps/screenshare/WEB-INF/screenshare.properties jnlpFile $PROTOCOL_HTTP://$HOST/screenshare/screenshare.jnlp
if ! grep -q server_names_hash_bucket_size /etc/nginx/nginx.conf; then
- sudo sed -i "s/gzip on;/gzip on;\n server_names_hash_bucket_size 64;/g" /etc/nginx/nginx.conf
+ $SUDO sed -i "s/gzip on;/gzip on;\n server_names_hash_bucket_size 64;/g" /etc/nginx/nginx.conf
fi
#
@@ -1857,7 +1867,7 @@ if [ -n "$HOST" ]; then
if [ -f ${SERVLET_DIR}/demo/bbb_api_conf.jsp ]; then
echo "Assigning $HOST for api demos in ${SERVLET_DIR}/demo/bbb_api_conf.jsp"
- sudo sed -i "s/BigBlueButtonURL = \"http[s]*:\/\/\([^\"\/]*\)\([\"\/]\)/BigBlueButtonURL = \"$PROTOCOL_HTTP:\/\/$HOST\2/g" \
+ $SUDO sed -i "s/BigBlueButtonURL = \"http[s]*:\/\/\([^\"\/]*\)\([\"\/]\)/BigBlueButtonURL = \"$PROTOCOL_HTTP:\/\/$HOST\2/g" \
${SERVLET_DIR}/demo/bbb_api_conf.jsp
fi
@@ -1973,8 +1983,20 @@ if [ $CLEAN ]; then
#
rm -f /var/log/bigbluebutton/bbb-rap-worker.log*
rm -f /var/log/bigbluebutton/archive.log*
- if [ -d /var/log/bigbluebutton/slides ]; then
- rm -f /var/log/bigbluebutton/slides/*
+ if [ -d /var/log/bigbluebutton/html5 ]; then
+ rm -f /var/log/bigbluebutton/html5/*
+ fi
+
+ if [ -d /var/log/bigbluebutton/podcast ]; then
+ rm -f /var/log/bigbluebutton/podcast/*
+ fi
+
+ if [ -d /var/log/bigbluebutton/presentation ]; then
+ rm -f /var/log/bigbluebutton/presentation/*
+ fi
+
+ if [ -d /var/log/bigbluebutton/screenshare ]; then
+ rm -f /var/log/bigbluebutton/screenshare/*
fi
@@ -2009,6 +2031,18 @@ if [ $CLEAN ]; then
if [ -d /var/log/bbb-webrtc-sfu ]; then
rm -f /var/log/bbb-webrtc-sfu/*
fi
+
+ if [ -d /var/log/redis ]; then
+ rm -f /var/log/redis/*
+ fi
+
+ if [ -d /var/log/mongodb ]; then
+ rm -f /var/log/mongodb/*
+ fi
+
+ if [ -d /var/log/kurento-media-server ]; then
+ rm -f /var/log/kurento-media-server/*
+ fi
start_bigbluebutton
check_state
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
index 0da0a77e1c76900d15be4fc0e06e8ebbbaa8ab95..3264ef0d7a4a8763ea20aab1ba8ef933003703f0 100755
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
@@ -132,6 +132,7 @@ class ActionsDropdown extends Component {
: null),
(isUserPresenter ?
<DropdownListItem
+ data-test="uploadPresentation"
icon="presentation"
label={intl.formatMessage(intlMessages.presentationLabel)}
description={intl.formatMessage(intlMessages.presentationDesc)}
diff --git a/bigbluebutton-html5/imports/ui/components/chat/chat-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/chat-dropdown/component.jsx
index f7af8612f7ca31d90de37da83e057d4bbd471343..a559339bf11f863545d8db935da82e64cafa58e9 100644
--- a/bigbluebutton-html5/imports/ui/components/chat/chat-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/chat/chat-dropdown/component.jsx
@@ -83,6 +83,7 @@ class ChatDropdown extends Component {
return _.compact([
<DropdownListItem
+ data-test="chatSave"
icon={saveIcon}
label={intl.formatMessage(intlMessages.save)}
key={this.actionsKey[0]}
@@ -100,6 +101,7 @@ class ChatDropdown extends Component {
}}
/>,
<DropdownListItem
+ data-test="chatCopy"
icon={copyIcon}
id="clipboardButton"
label={intl.formatMessage(intlMessages.copy)}
@@ -107,6 +109,7 @@ class ChatDropdown extends Component {
/>,
user.isModerator ? (
<DropdownListItem
+ data-test="chatClear"
icon={clearIcon}
label={intl.formatMessage(intlMessages.clear)}
key={this.actionsKey[2]}
diff --git a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
index c412e44201b2a4d68c51890523c91204e5739fe2..b84102136b591d6735a0f178ffe696b1b10fd112 100644
--- a/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/presentation/component.jsx
@@ -213,6 +213,7 @@ export default class PresentationArea extends Component {
timeout={{ enter: 400 }}
>
<svg
+ data-test="whiteboard"
width={width}
height={height}
ref={(ref) => { if (ref != null) { this.svggroup = ref; } }}
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx
index 59231a64096da978fe216bf09cf215535b0e1288..d2d272315a1d7c56007af1d77e5d9d08e3b09634 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/chat-list-item/component.jsx
@@ -67,6 +67,7 @@ const ChatListItem = (props) => {
return (
<div
+ data-test="chatButton"
role="button"
className={cx(styles.chatListItem, linkClasses)}
aria-expanded={isCurrentChat}
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
index 8285826f0fa8fa836e2d79281326d95df1553093..d7b40c50617cde2fb707e905ec26803015b42dbf 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/user-dropdown/component.jsx
@@ -150,6 +150,7 @@ class UserDropdown extends PureComponent {
iconRight,
}}
className={key === this.props.getEmoji ? styles.emojiSelected : null}
+ data-test={key}
/>
);
}
@@ -472,6 +473,7 @@ class UserDropdown extends PureComponent {
const contents = (
<div
+ data-test={user.isCurrent ? "userListItemCurrent" : null}
className={!actions.length ? styles.userListItem : null}
>
<div className={styles.userItemContents}>
diff --git a/bigbluebutton-html5/package-lock.json b/bigbluebutton-html5/package-lock.json
index 4d75af4431362eaa3ce1dd8433613d3296e6de3b..e32ce747914cbd4229ef8411e6dc9d82817fe07c 100755
--- a/bigbluebutton-html5/package-lock.json
+++ b/bigbluebutton-html5/package-lock.json
@@ -3,12 +3,75 @@
"requires": true,
"lockfileVersion": 1,
"dependencies": {
+ "@babel/code-frame": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
+ "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+ "dev": true,
+ "requires": {
+ "@babel/highlight": "7.0.0"
+ }
+ },
+ "@babel/highlight": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
+ "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+ "dev": true,
+ "requires": {
+ "chalk": "2.4.1",
+ "esutils": "2.0.2",
+ "js-tokens": "4.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "chalk": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "js-tokens": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ }
+ }
+ },
"@browser-bunyan/console-formatted-stream": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/@browser-bunyan/console-formatted-stream/-/console-formatted-stream-1.3.0.tgz",
"integrity": "sha1-PcBZqlwbKnofJuJwbiveuaCbvlc=",
"requires": {
- "@browser-bunyan/levels": "^1.3.0"
+ "@browser-bunyan/levels": "1.3.0"
}
},
"@browser-bunyan/console-plain-stream": {
@@ -16,7 +79,7 @@
"resolved": "https://registry.npmjs.org/@browser-bunyan/console-plain-stream/-/console-plain-stream-1.4.0.tgz",
"integrity": "sha512-/8fCyMZyEN3jWToHzBsM3zf6WRUp1b4W87l298gjqPg98uws1mwVMY4Rfy4HUe/i/aDCYzDCQlxVNYXmoFzTUA==",
"requires": {
- "@browser-bunyan/levels": "^1.3.0"
+ "@browser-bunyan/levels": "1.3.0"
}
},
"@browser-bunyan/console-raw-stream": {
@@ -24,7 +87,7 @@
"resolved": "https://registry.npmjs.org/@browser-bunyan/console-raw-stream/-/console-raw-stream-1.3.0.tgz",
"integrity": "sha1-zPJLVvImUFgpfGUX++zqhOu3gYw=",
"requires": {
- "@browser-bunyan/levels": "^1.3.0"
+ "@browser-bunyan/levels": "1.3.0"
}
},
"@browser-bunyan/levels": {
@@ -37,6 +100,12 @@
"resolved": "https://registry.npmjs.org/@browser-bunyan/server-stream/-/server-stream-1.3.0.tgz",
"integrity": "sha1-U7MlP6T8WA6GrZoWNqA6ISo0W1Y="
},
+ "abab": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz",
+ "integrity": "sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==",
+ "dev": true
+ },
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -48,13 +117,31 @@
"integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==",
"dev": true
},
+ "acorn-globals": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.0.tgz",
+ "integrity": "sha512-hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw==",
+ "dev": true,
+ "requires": {
+ "acorn": "6.0.4",
+ "acorn-walk": "6.1.1"
+ },
+ "dependencies": {
+ "acorn": {
+ "version": "6.0.4",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz",
+ "integrity": "sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==",
+ "dev": true
+ }
+ }
+ },
"acorn-jsx": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
"integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
"dev": true,
"requires": {
- "acorn": "^3.0.4"
+ "acorn": "3.3.0"
},
"dependencies": {
"acorn": {
@@ -65,21 +152,30 @@
}
}
},
- "adm-zip": {
- "version": "0.4.11",
- "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz",
- "integrity": "sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==",
+ "acorn-walk": {
+ "version": "6.1.1",
+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz",
+ "integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==",
"dev": true
},
+ "agent-base": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
+ "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+ "dev": true,
+ "requires": {
+ "es6-promisify": "5.0.0"
+ }
+ },
"ajv": {
"version": "5.5.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
"requires": {
- "co": "^4.6.0",
- "fast-deep-equal": "^1.0.0",
- "fast-json-stable-stringify": "^2.0.0",
- "json-schema-traverse": "^0.3.0"
+ "co": "4.6.0",
+ "fast-deep-equal": "1.1.0",
+ "fast-json-stable-stringify": "2.0.0",
+ "json-schema-traverse": "0.3.1"
}
},
"ajv-keywords": {
@@ -114,49 +210,328 @@
"resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
"integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
},
- "app-root-path": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.0.1.tgz",
- "integrity": "sha1-zWLc+OT9WkF+/GZNLlsQZTxlG0Y=",
- "dev": true
- },
- "aproba": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
- "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
- },
- "archiver-utils": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
- "integrity": "sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=",
+ "anymatch": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+ "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
"dev": true,
"requires": {
- "glob": "^7.0.0",
- "graceful-fs": "^4.1.0",
- "lazystream": "^1.0.0",
- "lodash": "^4.8.0",
- "normalize-path": "^2.0.0",
- "readable-stream": "^2.0.0"
+ "micromatch": "3.1.10",
+ "normalize-path": "2.1.1"
},
"dependencies": {
+ "arr-diff": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+ "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+ "dev": true
+ },
+ "array-unique": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+ "dev": true
+ },
+ "braces": {
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+ "dev": true,
+ "requires": {
+ "arr-flatten": "1.1.0",
+ "array-unique": "0.3.2",
+ "extend-shallow": "2.0.1",
+ "fill-range": "4.0.0",
+ "isobject": "3.0.1",
+ "repeat-element": "1.1.3",
+ "snapdragon": "0.8.2",
+ "snapdragon-node": "2.1.1",
+ "split-string": "3.1.0",
+ "to-regex": "3.0.2"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ }
+ }
+ },
+ "expand-brackets": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+ "dev": true,
+ "requires": {
+ "debug": "2.6.9",
+ "define-property": "0.2.5",
+ "extend-shallow": "2.0.1",
+ "posix-character-classes": "0.1.1",
+ "regex-not": "1.0.2",
+ "snapdragon": "0.8.2",
+ "to-regex": "3.0.2"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "0.1.6"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "1.1.6"
+ }
+ }
+ }
+ },
+ "is-data-descriptor": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "1.1.6"
+ }
+ }
+ }
+ },
+ "is-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+ "dev": true,
+ "requires": {
+ "is-accessor-descriptor": "0.1.6",
+ "is-data-descriptor": "0.1.4",
+ "kind-of": "5.1.0"
+ }
+ },
+ "kind-of": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+ "dev": true
+ }
+ }
+ },
+ "extglob": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+ "dev": true,
+ "requires": {
+ "array-unique": "0.3.2",
+ "define-property": "1.0.0",
+ "expand-brackets": "2.1.4",
+ "extend-shallow": "2.0.1",
+ "fragment-cache": "0.2.1",
+ "regex-not": "1.0.2",
+ "snapdragon": "0.8.2",
+ "to-regex": "3.0.2"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "1.0.2"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ }
+ }
+ },
+ "fill-range": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+ "dev": true,
+ "requires": {
+ "extend-shallow": "2.0.1",
+ "is-number": "3.0.0",
+ "repeat-string": "1.6.1",
+ "to-regex-range": "2.1.1"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ }
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-data-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "dev": true,
+ "requires": {
+ "is-accessor-descriptor": "1.0.0",
+ "is-data-descriptor": "1.0.0",
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-number": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "1.1.6"
+ }
+ }
+ }
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "dev": true
+ },
+ "kind-of": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+ "dev": true
+ },
+ "micromatch": {
+ "version": "3.1.10",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+ "dev": true,
+ "requires": {
+ "arr-diff": "4.0.0",
+ "array-unique": "0.3.2",
+ "braces": "2.3.2",
+ "define-property": "2.0.2",
+ "extend-shallow": "3.0.2",
+ "extglob": "2.0.4",
+ "fragment-cache": "0.2.1",
+ "kind-of": "6.0.2",
+ "nanomatch": "1.2.13",
+ "object.pick": "1.3.0",
+ "regex-not": "1.0.2",
+ "snapdragon": "0.8.2",
+ "to-regex": "3.0.2"
+ }
+ },
"normalize-path": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"dev": true,
"requires": {
- "remove-trailing-separator": "^1.0.1"
+ "remove-trailing-separator": "1.1.0"
}
}
}
},
+ "app-root-path": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.0.1.tgz",
+ "integrity": "sha1-zWLc+OT9WkF+/GZNLlsQZTxlG0Y=",
+ "dev": true
+ },
+ "append-transform": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz",
+ "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
+ "dev": true,
+ "requires": {
+ "default-require-extensions": "1.0.0"
+ }
+ },
+ "aproba": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+ "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+ },
"are-we-there-yet": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
"requires": {
- "delegates": "^1.0.0",
- "readable-stream": "^2.0.6"
+ "delegates": "1.0.0",
+ "readable-stream": "2.3.6"
}
},
"argparse": {
@@ -165,7 +540,7 @@
"integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
"dev": true,
"requires": {
- "sprintf-js": "~1.0.2"
+ "sprintf-js": "1.0.3"
}
},
"aria-query": {
@@ -177,6 +552,33 @@
"ast-types-flow": "0.0.7"
}
},
+ "arr-diff": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+ "dev": true,
+ "requires": {
+ "arr-flatten": "1.1.0"
+ }
+ },
+ "arr-flatten": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+ "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+ "dev": true
+ },
+ "arr-union": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+ "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+ "dev": true
+ },
+ "array-equal": {
+ "version": "1.0.0",
+ "resolved": "http://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
+ "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
+ "dev": true
+ },
"array-find-index": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
@@ -188,29 +590,17 @@
"integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
"dev": true,
"requires": {
- "define-properties": "^1.1.2",
- "es-abstract": "^1.7.0"
+ "define-properties": "1.1.2",
+ "es-abstract": "1.10.0"
}
},
- "array-parallel": {
- "version": "0.1.3",
- "resolved": "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz",
- "integrity": "sha1-j3hTCJJu1apHjEfmTRszS2wMlH0=",
- "dev": true
- },
- "array-series": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz",
- "integrity": "sha1-3103v8XC7wdV4qpPkv6ufUtaly8=",
- "dev": true
- },
"array-union": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
"dev": true,
"requires": {
- "array-uniq": "^1.0.1"
+ "array-uniq": "1.0.3"
}
},
"array-uniq": {
@@ -219,6 +609,12 @@
"integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
"dev": true
},
+ "array-unique": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+ "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+ "dev": true
+ },
"arrify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
@@ -235,7 +631,7 @@
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
"requires": {
- "safer-buffer": "~2.1.0"
+ "safer-buffer": "2.1.2"
}
},
"assert-plus": {
@@ -243,10 +639,10 @@
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
},
- "assertion-error": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
- "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+ "assign-symbols": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+ "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
"dev": true
},
"ast-types-flow": {
@@ -255,6 +651,12 @@
"integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
"dev": true
},
+ "astral-regex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+ "dev": true
+ },
"async": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/async/-/async-1.0.0.tgz",
@@ -265,6 +667,12 @@
"resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
"integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
},
+ "async-limiter": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+ "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
+ "dev": true
+ },
"asynckit": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -281,7 +689,7 @@
"resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-1.1.3.tgz",
"integrity": "sha512-iT40nudw8zmCweivz6j58g+RT33I4KbaIvRUhjNmDwO2WmsQUxFEZZYZ5w3vXe5x5MX9D7mfvA/XaLOZYFR9EQ==",
"requires": {
- "core-js": "^2.5.0"
+ "core-js": "2.5.7"
}
},
"autoprefixer": {
@@ -289,12 +697,12 @@
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.6.tgz",
"integrity": "sha512-C9yv/UF3X+eJTi/zvfxuyfxmLibYrntpF3qoJYrMeQwgUJOZrZvpJiMG2FMQ3qnhWtF/be4pYONBBw95ZGe3vA==",
"requires": {
- "browserslist": "^2.5.1",
- "caniuse-lite": "^1.0.30000748",
- "normalize-range": "^0.1.2",
- "num2fraction": "^1.2.2",
- "postcss": "^6.0.13",
- "postcss-value-parser": "^3.2.3"
+ "browserslist": "2.11.3",
+ "caniuse-lite": "1.0.30000792",
+ "normalize-range": "0.1.2",
+ "num2fraction": "1.2.2",
+ "postcss": "6.0.16",
+ "postcss-value-parser": "3.3.0"
}
},
"autosize": {
@@ -312,6 +720,16 @@
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
},
+ "axios": {
+ "version": "0.18.0",
+ "resolved": "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz",
+ "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=",
+ "dev": true,
+ "requires": {
+ "follow-redirects": "1.5.10",
+ "is-buffer": "1.1.6"
+ }
+ },
"axobject-query": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-0.1.0.tgz",
@@ -327,86 +745,345 @@
"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
"dev": true,
"requires": {
- "chalk": "^1.1.3",
- "esutils": "^2.0.2",
- "js-tokens": "^3.0.2"
+ "chalk": "1.1.3",
+ "esutils": "2.0.2",
+ "js-tokens": "3.0.2"
+ }
+ },
+ "babel-core": {
+ "version": "6.26.3",
+ "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
+ "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
+ "dev": true,
+ "requires": {
+ "babel-code-frame": "6.26.0",
+ "babel-generator": "6.26.1",
+ "babel-helpers": "6.24.1",
+ "babel-messages": "6.23.0",
+ "babel-register": "6.26.0",
+ "babel-runtime": "6.26.0",
+ "babel-template": "6.26.0",
+ "babel-traverse": "6.26.0",
+ "babel-types": "6.26.0",
+ "babylon": "6.18.0",
+ "convert-source-map": "1.6.0",
+ "debug": "2.6.9",
+ "json5": "0.5.1",
+ "lodash": "4.17.10",
+ "minimatch": "3.0.4",
+ "path-is-absolute": "1.0.1",
+ "private": "0.1.8",
+ "slash": "1.0.0",
+ "source-map": "0.5.7"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "dev": true
+ }
}
},
- "babel-plugin-react-remove-properties": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/babel-plugin-react-remove-properties/-/babel-plugin-react-remove-properties-0.2.5.tgz",
- "integrity": "sha1-wHbhKRlAxzD0+337ZwaR/EF4fPg="
- },
- "babel-runtime": {
- "version": "6.26.0",
- "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
- "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+ "babel-generator": {
+ "version": "6.26.1",
+ "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
+ "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
+ "dev": true,
"requires": {
- "core-js": "^2.4.0",
- "regenerator-runtime": "^0.11.0"
+ "babel-messages": "6.23.0",
+ "babel-runtime": "6.26.0",
+ "babel-types": "6.26.0",
+ "detect-indent": "4.0.0",
+ "jsesc": "1.3.0",
+ "lodash": "4.17.10",
+ "source-map": "0.5.7",
+ "trim-right": "1.0.1"
+ },
+ "dependencies": {
+ "jsesc": {
+ "version": "1.3.0",
+ "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+ "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+ "dev": true
+ },
+ "source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "dev": true
+ }
}
},
- "balanced-match": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
- "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
- },
- "bcrypt-pbkdf": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
- "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
- "optional": true,
+ "babel-helpers": {
+ "version": "6.24.1",
+ "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+ "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+ "dev": true,
"requires": {
- "tweetnacl": "^0.14.3"
+ "babel-runtime": "6.26.0",
+ "babel-template": "6.26.0"
}
},
- "bignumber.js": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz",
- "integrity": "sha1-g4qZLan51zfg9LLbC+YrsJ3Qxeg=",
- "dev": true
- },
- "bl": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
- "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
+ "babel-jest": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-23.6.0.tgz",
+ "integrity": "sha512-lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew==",
"dev": true,
"requires": {
- "readable-stream": "^2.0.5"
+ "babel-plugin-istanbul": "4.1.6",
+ "babel-preset-jest": "23.2.0"
}
},
- "block-stream": {
- "version": "0.0.9",
- "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
- "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+ "babel-messages": {
+ "version": "6.23.0",
+ "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+ "dev": true,
"requires": {
- "inherits": "~2.0.0"
+ "babel-runtime": "6.26.0"
}
},
- "bmp-js": {
- "version": "0.0.3",
- "resolved": "https://registry.npmjs.org/bmp-js/-/bmp-js-0.0.3.tgz",
- "integrity": "sha1-ZBE+nHzxICs3btYHvzBibr5XsYo=",
- "dev": true
- },
- "brace-expansion": {
+ "babel-plugin-istanbul": {
+ "version": "4.1.6",
+ "resolved": "http://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz",
+ "integrity": "sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==",
+ "dev": true,
+ "requires": {
+ "babel-plugin-syntax-object-rest-spread": "6.13.0",
+ "find-up": "2.1.0",
+ "istanbul-lib-instrument": "1.10.2",
+ "test-exclude": "4.2.3"
+ },
+ "dependencies": {
+ "find-up": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+ "dev": true,
+ "requires": {
+ "locate-path": "2.0.0"
+ }
+ }
+ }
+ },
+ "babel-plugin-jest-hoist": {
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz",
+ "integrity": "sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc=",
+ "dev": true
+ },
+ "babel-plugin-react-remove-properties": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/babel-plugin-react-remove-properties/-/babel-plugin-react-remove-properties-0.2.5.tgz",
+ "integrity": "sha1-wHbhKRlAxzD0+337ZwaR/EF4fPg="
+ },
+ "babel-plugin-syntax-object-rest-spread": {
+ "version": "6.13.0",
+ "resolved": "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+ "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
+ "dev": true
+ },
+ "babel-preset-jest": {
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz",
+ "integrity": "sha1-jsegOhOPABoaj7HoETZSvxpV2kY=",
+ "dev": true,
+ "requires": {
+ "babel-plugin-jest-hoist": "23.2.0",
+ "babel-plugin-syntax-object-rest-spread": "6.13.0"
+ }
+ },
+ "babel-register": {
+ "version": "6.26.0",
+ "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+ "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+ "dev": true,
+ "requires": {
+ "babel-core": "6.26.3",
+ "babel-runtime": "6.26.0",
+ "core-js": "2.5.7",
+ "home-or-tmp": "2.0.0",
+ "lodash": "4.17.10",
+ "mkdirp": "0.5.1",
+ "source-map-support": "0.4.18"
+ }
+ },
+ "babel-runtime": {
+ "version": "6.26.0",
+ "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+ "requires": {
+ "core-js": "2.5.7",
+ "regenerator-runtime": "0.11.1"
+ }
+ },
+ "babel-template": {
+ "version": "6.26.0",
+ "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+ "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+ "dev": true,
+ "requires": {
+ "babel-runtime": "6.26.0",
+ "babel-traverse": "6.26.0",
+ "babel-types": "6.26.0",
+ "babylon": "6.18.0",
+ "lodash": "4.17.10"
+ }
+ },
+ "babel-traverse": {
+ "version": "6.26.0",
+ "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+ "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+ "dev": true,
+ "requires": {
+ "babel-code-frame": "6.26.0",
+ "babel-messages": "6.23.0",
+ "babel-runtime": "6.26.0",
+ "babel-types": "6.26.0",
+ "babylon": "6.18.0",
+ "debug": "2.6.9",
+ "globals": "9.18.0",
+ "invariant": "2.2.2",
+ "lodash": "4.17.10"
+ }
+ },
+ "babel-types": {
+ "version": "6.26.0",
+ "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+ "dev": true,
+ "requires": {
+ "babel-runtime": "6.26.0",
+ "esutils": "2.0.2",
+ "lodash": "4.17.10",
+ "to-fast-properties": "1.0.3"
+ }
+ },
+ "babylon": {
+ "version": "6.18.0",
+ "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+ "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+ "dev": true
+ },
+ "balanced-match": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+ },
+ "base": {
+ "version": "0.11.2",
+ "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+ "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+ "dev": true,
+ "requires": {
+ "cache-base": "1.0.1",
+ "class-utils": "0.3.6",
+ "component-emitter": "1.2.1",
+ "define-property": "1.0.0",
+ "isobject": "3.0.1",
+ "mixin-deep": "1.3.1",
+ "pascalcase": "0.1.1"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "1.0.2"
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-data-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "dev": true,
+ "requires": {
+ "is-accessor-descriptor": "1.0.0",
+ "is-data-descriptor": "1.0.0",
+ "kind-of": "6.0.2"
+ }
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "dev": true
+ },
+ "kind-of": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+ "dev": true
+ }
+ }
+ },
+ "bcrypt-pbkdf": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+ "optional": true,
+ "requires": {
+ "tweetnacl": "0.14.5"
+ }
+ },
+ "block-stream": {
+ "version": "0.0.9",
+ "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+ "requires": {
+ "inherits": "2.0.3"
+ }
+ },
+ "brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"requires": {
- "balanced-match": "^1.0.0",
+ "balanced-match": "1.0.0",
"concat-map": "0.0.1"
}
},
+ "braces": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+ "dev": true,
+ "requires": {
+ "expand-range": "1.8.2",
+ "preserve": "0.2.0",
+ "repeat-element": "1.1.3"
+ }
+ },
"browser-bunyan": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/browser-bunyan/-/browser-bunyan-1.4.0.tgz",
"integrity": "sha512-fED2PWhdLmS2zvc+oFI+2asiV7vcqw/B4QSTKzC15pIAnk5dk7Fv2zAxOYdMnbY9rcke6FH3a/FLxSSd2ZOo9g==",
"requires": {
- "@browser-bunyan/console-formatted-stream": "^1.3.0",
- "@browser-bunyan/console-plain-stream": "^1.4.0",
- "@browser-bunyan/console-raw-stream": "^1.3.0",
- "@browser-bunyan/levels": "^1.3.0"
+ "@browser-bunyan/console-formatted-stream": "1.3.0",
+ "@browser-bunyan/console-plain-stream": "1.4.0",
+ "@browser-bunyan/console-raw-stream": "1.3.0",
+ "@browser-bunyan/levels": "1.3.0"
}
},
"browser-detect": {
@@ -414,7 +1091,7 @@
"resolved": "https://registry.npmjs.org/browser-detect/-/browser-detect-0.2.28.tgz",
"integrity": "sha512-KeWGHqYQmHDkCFG2dIiX/2wFUgqevbw/rd6wNi9N6rZbaSJFtG5kel0HtprRwCGp8sqpQP79LzDJXf/WCx4WAw==",
"requires": {
- "core-js": "^2.5.7"
+ "core-js": "2.5.7"
},
"dependencies": {
"core-js": {
@@ -424,25 +1101,51 @@
}
}
},
+ "browser-process-hrtime": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
+ "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==",
+ "dev": true
+ },
+ "browser-resolve": {
+ "version": "1.11.3",
+ "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
+ "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
+ "dev": true,
+ "requires": {
+ "resolve": "1.1.7"
+ },
+ "dependencies": {
+ "resolve": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+ "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+ "dev": true
+ }
+ }
+ },
"browserslist": {
"version": "2.11.3",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
"integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
"requires": {
- "caniuse-lite": "^1.0.30000792",
- "electron-to-chromium": "^1.3.30"
+ "caniuse-lite": "1.0.30000792",
+ "electron-to-chromium": "1.3.31"
}
},
- "buffer-crc32": {
- "version": "0.2.13",
- "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
- "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
- "dev": true
+ "bser": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz",
+ "integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=",
+ "dev": true,
+ "requires": {
+ "node-int64": "0.4.0"
+ }
},
- "buffer-equal": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz",
- "integrity": "sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=",
+ "buffer-from": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
"dev": true
},
"builtin-modules": {
@@ -450,13 +1153,38 @@
"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
},
+ "cache-base": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+ "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+ "dev": true,
+ "requires": {
+ "collection-visit": "1.0.0",
+ "component-emitter": "1.2.1",
+ "get-value": "2.0.6",
+ "has-value": "1.0.0",
+ "isobject": "3.0.1",
+ "set-value": "2.0.0",
+ "to-object-path": "0.3.0",
+ "union-value": "1.0.0",
+ "unset-value": "1.0.0"
+ },
+ "dependencies": {
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "dev": true
+ }
+ }
+ },
"caller-path": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
"integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
"dev": true,
"requires": {
- "callsites": "^0.2.0"
+ "callsites": "0.2.0"
}
},
"callsites": {
@@ -475,8 +1203,8 @@
"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
"requires": {
- "camelcase": "^2.0.0",
- "map-obj": "^1.0.0"
+ "camelcase": "2.1.1",
+ "map-obj": "1.0.1"
}
},
"caniuse-lite": {
@@ -484,25 +1212,20 @@
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz",
"integrity": "sha1-0M6pgfgRjzlhRxr7tDyaHlu/AzI="
},
+ "capture-exit": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-1.2.0.tgz",
+ "integrity": "sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=",
+ "dev": true,
+ "requires": {
+ "rsvp": "3.6.2"
+ }
+ },
"caseless": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
},
- "chai": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz",
- "integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=",
- "dev": true,
- "requires": {
- "assertion-error": "^1.0.1",
- "check-error": "^1.0.1",
- "deep-eql": "^3.0.0",
- "get-func-name": "^2.0.0",
- "pathval": "^1.0.0",
- "type-detect": "^4.0.0"
- }
- },
"chain-function": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/chain-function/-/chain-function-1.0.0.tgz",
@@ -513,11 +1236,11 @@
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": {
- "ansi-styles": "^2.2.1",
- "escape-string-regexp": "^1.0.2",
- "has-ansi": "^2.0.0",
- "strip-ansi": "^3.0.0",
- "supports-color": "^2.0.0"
+ "ansi-styles": "2.2.1",
+ "escape-string-regexp": "1.0.5",
+ "has-ansi": "2.0.0",
+ "strip-ansi": "3.0.1",
+ "supports-color": "2.0.0"
}
},
"chardet": {
@@ -526,10 +1249,10 @@
"integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
"dev": true
},
- "check-error": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
- "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+ "charenc": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+ "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=",
"dev": true
},
"ci-info": {
@@ -544,6 +1267,35 @@
"integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
"dev": true
},
+ "class-utils": {
+ "version": "0.3.6",
+ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+ "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+ "dev": true,
+ "requires": {
+ "arr-union": "3.1.0",
+ "define-property": "0.2.5",
+ "isobject": "3.0.1",
+ "static-extend": "0.1.2"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "0.1.6"
+ }
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "dev": true
+ }
+ }
+ },
"classnames": {
"version": "2.2.6",
"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
@@ -555,7 +1307,7 @@
"integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
"dev": true,
"requires": {
- "restore-cursor": "^2.0.0"
+ "restore-cursor": "2.0.0"
}
},
"cli-spinners": {
@@ -571,7 +1323,7 @@
"dev": true,
"requires": {
"slice-ansi": "0.0.4",
- "string-width": "^1.0.1"
+ "string-width": "1.0.2"
},
"dependencies": {
"slice-ansi": {
@@ -593,9 +1345,9 @@
"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-1.7.1.tgz",
"integrity": "sha1-Ng1taUbpmnof7zleQrqStem1oWs=",
"requires": {
- "good-listener": "^1.2.2",
- "select": "^1.1.2",
- "tiny-emitter": "^2.0.0"
+ "good-listener": "1.2.2",
+ "select": "1.1.2",
+ "tiny-emitter": "2.0.2"
}
},
"cliui": {
@@ -603,9 +1355,9 @@
"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
"requires": {
- "string-width": "^1.0.1",
- "strip-ansi": "^3.0.1",
- "wrap-ansi": "^2.0.0"
+ "string-width": "1.0.2",
+ "strip-ansi": "3.0.1",
+ "wrap-ansi": "2.1.0"
}
},
"co": {
@@ -618,12 +1370,22 @@
"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
},
+ "collection-visit": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+ "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+ "dev": true,
+ "requires": {
+ "map-visit": "1.0.0",
+ "object-visit": "1.0.1"
+ }
+ },
"color-convert": {
"version": "1.9.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
"integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
"requires": {
- "color-name": "^1.1.1"
+ "color-name": "1.1.3"
}
},
"color-name": {
@@ -641,7 +1403,7 @@
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
"integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
"requires": {
- "delayed-stream": "~1.0.0"
+ "delayed-stream": "1.0.0"
}
},
"commander": {
@@ -650,28 +1412,11 @@
"integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
"dev": true
},
- "compress-commons": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz",
- "integrity": "sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=",
- "dev": true,
- "requires": {
- "buffer-crc32": "^0.2.1",
- "crc32-stream": "^2.0.0",
- "normalize-path": "^2.0.0",
- "readable-stream": "^2.0.0"
- },
- "dependencies": {
- "normalize-path": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
- "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
- "dev": true,
- "requires": {
- "remove-trailing-separator": "^1.0.1"
- }
- }
- }
+ "component-emitter": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+ "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+ "dev": true
},
"computed-style": {
"version": "0.1.4",
@@ -689,9 +1434,9 @@
"integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
"dev": true,
"requires": {
- "inherits": "^2.0.3",
- "readable-stream": "^2.2.2",
- "typedarray": "^0.0.6"
+ "inherits": "2.0.3",
+ "readable-stream": "2.3.6",
+ "typedarray": "0.0.6"
}
},
"console-control-strings": {
@@ -705,6 +1450,21 @@
"integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
"dev": true
},
+ "convert-source-map": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+ "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "5.1.1"
+ }
+ },
+ "copy-descriptor": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+ "dev": true
+ },
"core-js": {
"version": "2.5.7",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
@@ -721,14 +1481,14 @@
"integrity": "sha1-DeoPmATv37kp+7GxiOJVU+oFPTc=",
"dev": true,
"requires": {
- "graceful-fs": "^4.1.2",
- "js-yaml": "^3.4.3",
- "minimist": "^1.2.0",
- "object-assign": "^4.0.1",
- "os-homedir": "^1.0.1",
- "parse-json": "^2.2.0",
- "pinkie-promise": "^2.0.0",
- "require-from-string": "^1.1.0"
+ "graceful-fs": "4.1.11",
+ "js-yaml": "3.10.0",
+ "minimist": "1.2.0",
+ "object-assign": "4.1.1",
+ "os-homedir": "1.0.2",
+ "parse-json": "2.2.0",
+ "pinkie-promise": "2.0.1",
+ "require-from-string": "1.2.1"
},
"dependencies": {
"minimist": {
@@ -739,59 +1499,20 @@
}
}
},
- "crc": {
- "version": "3.5.0",
- "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz",
- "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=",
- "dev": true
- },
- "crc32-stream": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz",
- "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
- "dev": true,
- "requires": {
- "crc": "^3.4.4",
- "readable-stream": "^2.0.0"
- }
- },
"cross-spawn": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
"integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
"requires": {
- "lru-cache": "^4.0.1",
- "which": "^1.2.9"
- }
- },
- "css": {
- "version": "2.2.4",
- "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
- "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
- "dev": true,
- "requires": {
- "inherits": "^2.0.3",
- "source-map": "^0.6.1",
- "source-map-resolve": "^0.5.2",
- "urix": "^0.1.0"
- },
- "dependencies": {
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "dev": true
- }
+ "lru-cache": "4.1.3",
+ "which": "1.3.1"
}
},
- "css-parse": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
- "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
- "dev": true,
- "requires": {
- "css": "^2.0.0"
- }
+ "crypt": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+ "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=",
+ "dev": true
},
"css-selector-tokenizer": {
"version": "0.7.0",
@@ -799,29 +1520,38 @@
"integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=",
"dev": true,
"requires": {
- "cssesc": "^0.1.0",
- "fastparse": "^1.1.1",
- "regexpu-core": "^1.0.0"
+ "cssesc": "0.1.0",
+ "fastparse": "1.1.1",
+ "regexpu-core": "1.0.0"
}
},
- "css-value": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/css-value/-/css-value-0.0.1.tgz",
- "integrity": "sha1-Xv1sLupeof1rasV+wEJ7GEUkJOo=",
- "dev": true
- },
"cssesc": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
"integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
"dev": true
},
+ "cssom": {
+ "version": "0.3.4",
+ "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.4.tgz",
+ "integrity": "sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog==",
+ "dev": true
+ },
+ "cssstyle": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.1.1.tgz",
+ "integrity": "sha512-364AI1l/M5TYcFH83JnOH/pSqgaNnKmYgKrm0didZMGKWjQB60dymwWy1rKUgL3J1ffdq9xVi2yGLHdSjjSNog==",
+ "dev": true,
+ "requires": {
+ "cssom": "0.3.4"
+ }
+ },
"currently-unhandled": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
"integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
"requires": {
- "array-find-index": "^1.0.1"
+ "array-find-index": "1.0.2"
}
},
"custom-event-polyfill": {
@@ -845,7 +1575,31 @@
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
"requires": {
- "assert-plus": "^1.0.0"
+ "assert-plus": "1.0.0"
+ }
+ },
+ "data-urls": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
+ "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
+ "dev": true,
+ "requires": {
+ "abab": "2.0.0",
+ "whatwg-mimetype": "2.3.0",
+ "whatwg-url": "7.0.0"
+ },
+ "dependencies": {
+ "whatwg-url": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz",
+ "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==",
+ "dev": true,
+ "requires": {
+ "lodash.sortby": "4.7.0",
+ "tr46": "1.0.1",
+ "webidl-conversions": "4.0.2"
+ }
+ }
}
},
"date-fns": {
@@ -854,12 +1608,6 @@
"integrity": "sha512-lbTXWZ6M20cWH8N9S6afb0SBm6tMk+uUg6z3MqHPKE9atmsY3kJkTm8vKe93izJ2B2+q5MV990sM2CHgtAZaOw==",
"dev": true
},
- "date-format": {
- "version": "0.0.2",
- "resolved": "https://registry.npmjs.org/date-format/-/date-format-0.0.2.tgz",
- "integrity": "sha1-+v1Ej3IRXvHitzkVWukvK+bCjdE=",
- "dev": true
- },
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -884,16 +1632,7 @@
"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
"integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
"requires": {
- "mimic-response": "^1.0.0"
- }
- },
- "deep-eql": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
- "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
- "dev": true,
- "requires": {
- "type-detect": "^4.0.0"
+ "mimic-response": "1.0.0"
}
},
"deep-is": {
@@ -907,29 +1646,91 @@
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
"integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
},
+ "default-require-extensions": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz",
+ "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=",
+ "dev": true,
+ "requires": {
+ "strip-bom": "2.0.0"
+ }
+ },
"define-properties": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
"integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
"dev": true,
"requires": {
- "foreach": "^2.0.5",
- "object-keys": "^1.0.8"
+ "foreach": "2.0.5",
+ "object-keys": "1.0.11"
}
},
- "del": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
- "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+ "define-property": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
"dev": true,
"requires": {
- "globby": "^5.0.0",
- "is-path-cwd": "^1.0.0",
- "is-path-in-cwd": "^1.0.0",
- "object-assign": "^4.0.1",
- "pify": "^2.0.0",
- "pinkie-promise": "^2.0.0",
- "rimraf": "^2.2.8"
+ "is-descriptor": "1.0.2",
+ "isobject": "3.0.1"
+ },
+ "dependencies": {
+ "is-accessor-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-data-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "dev": true,
+ "requires": {
+ "is-accessor-descriptor": "1.0.0",
+ "is-data-descriptor": "1.0.0",
+ "kind-of": "6.0.2"
+ }
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "dev": true
+ },
+ "kind-of": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+ "dev": true
+ }
+ }
+ },
+ "del": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+ "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+ "dev": true,
+ "requires": {
+ "globby": "5.0.0",
+ "is-path-cwd": "1.0.0",
+ "is-path-in-cwd": "1.0.0",
+ "object-assign": "4.1.1",
+ "pify": "2.3.0",
+ "pinkie-promise": "2.0.1",
+ "rimraf": "2.6.2"
}
},
"delayed-stream": {
@@ -947,13 +1748,34 @@
"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
},
+ "detect-indent": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+ "dev": true,
+ "requires": {
+ "repeating": "2.0.1"
+ }
+ },
+ "detect-newline": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
+ "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
+ "dev": true
+ },
+ "diff": {
+ "version": "3.5.0",
+ "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+ "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+ "dev": true
+ },
"doctrine": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
"dev": true,
"requires": {
- "esutils": "^2.0.2"
+ "esutils": "2.0.2"
}
},
"dom-helpers": {
@@ -961,10 +1783,19 @@
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.3.1.tgz",
"integrity": "sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg=="
},
- "dom-walk": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz",
- "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=",
+ "domexception": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
+ "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
+ "dev": true,
+ "requires": {
+ "webidl-conversions": "4.0.2"
+ }
+ },
+ "dotenv": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.1.0.tgz",
+ "integrity": "sha512-/veDn2ztgRlB7gKmE3i9f6CmDIyXAy6d5nBq+whO9SLX+Zs1sXEgFLPi+aSuWqUuusMfbi84fT8j34fs1HaYUw==",
"dev": true
},
"double-ended-queue": {
@@ -983,16 +1814,10 @@
"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
"optional": true,
"requires": {
- "jsbn": "~0.1.0",
- "safer-buffer": "^2.1.0"
+ "jsbn": "0.1.1",
+ "safer-buffer": "2.1.2"
}
},
- "ejs": {
- "version": "2.5.7",
- "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz",
- "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=",
- "dev": true
- },
"electron-to-chromium": {
"version": "1.3.31",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.31.tgz",
@@ -1015,16 +1840,7 @@
"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
"integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
"requires": {
- "iconv-lite": "~0.4.13"
- }
- },
- "end-of-stream": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
- "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
- "dev": true,
- "requires": {
- "once": "^1.4.0"
+ "iconv-lite": "0.4.19"
}
},
"error-ex": {
@@ -1032,7 +1848,7 @@
"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
"requires": {
- "is-arrayish": "^0.2.1"
+ "is-arrayish": "0.2.1"
}
},
"es-abstract": {
@@ -1041,11 +1857,11 @@
"integrity": "sha512-/uh/DhdqIOSkAWifU+8nG78vlQxdLckUdI/sPgy0VhuXi2qJ7T8czBmqIYtLQVpCIFYafChnsRsB5pyb1JdmCQ==",
"dev": true,
"requires": {
- "es-to-primitive": "^1.1.1",
- "function-bind": "^1.1.1",
- "has": "^1.0.1",
- "is-callable": "^1.1.3",
- "is-regex": "^1.0.4"
+ "es-to-primitive": "1.1.1",
+ "function-bind": "1.1.1",
+ "has": "1.0.1",
+ "is-callable": "1.1.3",
+ "is-regex": "1.0.4"
}
},
"es-to-primitive": {
@@ -1054,65 +1870,104 @@
"integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
"dev": true,
"requires": {
- "is-callable": "^1.1.1",
- "is-date-object": "^1.0.1",
- "is-symbol": "^1.0.1"
+ "is-callable": "1.1.3",
+ "is-date-object": "1.0.1",
+ "is-symbol": "1.0.1"
}
},
- "es6-promise": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
- "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=",
- "dev": true
+ "es6-promisify": {
+ "version": "5.0.0",
+ "resolved": "http://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+ "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+ "dev": true,
+ "requires": {
+ "es6-promise": "4.2.5"
+ },
+ "dependencies": {
+ "es6-promise": {
+ "version": "4.2.5",
+ "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz",
+ "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==",
+ "dev": true
+ }
+ }
},
"escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
},
+ "escodegen": {
+ "version": "1.11.0",
+ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz",
+ "integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==",
+ "dev": true,
+ "requires": {
+ "esprima": "3.1.3",
+ "estraverse": "4.2.0",
+ "esutils": "2.0.2",
+ "optionator": "0.8.2",
+ "source-map": "0.6.1"
+ },
+ "dependencies": {
+ "esprima": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+ "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+ "dev": true
+ },
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
"eslint": {
"version": "4.9.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-4.9.0.tgz",
"integrity": "sha1-doedJ0BoJhsZH+Dy9Wx0wvQgjos=",
"dev": true,
"requires": {
- "ajv": "^5.2.0",
- "babel-code-frame": "^6.22.0",
- "chalk": "^2.1.0",
- "concat-stream": "^1.6.0",
- "cross-spawn": "^5.1.0",
- "debug": "^3.0.1",
- "doctrine": "^2.0.0",
- "eslint-scope": "^3.7.1",
- "espree": "^3.5.1",
- "esquery": "^1.0.0",
- "estraverse": "^4.2.0",
- "esutils": "^2.0.2",
- "file-entry-cache": "^2.0.0",
- "functional-red-black-tree": "^1.0.1",
- "glob": "^7.1.2",
- "globals": "^9.17.0",
- "ignore": "^3.3.3",
- "imurmurhash": "^0.1.4",
- "inquirer": "^3.0.6",
- "is-resolvable": "^1.0.0",
- "js-yaml": "^3.9.1",
- "json-stable-stringify": "^1.0.1",
- "levn": "^0.3.0",
- "lodash": "^4.17.4",
- "minimatch": "^3.0.2",
- "mkdirp": "^0.5.1",
- "natural-compare": "^1.4.0",
- "optionator": "^0.8.2",
- "path-is-inside": "^1.0.2",
- "pluralize": "^7.0.0",
- "progress": "^2.0.0",
- "require-uncached": "^1.0.3",
- "semver": "^5.3.0",
- "strip-ansi": "^4.0.0",
- "strip-json-comments": "~2.0.1",
- "table": "^4.0.1",
- "text-table": "~0.2.0"
+ "ajv": "5.5.2",
+ "babel-code-frame": "6.26.0",
+ "chalk": "2.3.0",
+ "concat-stream": "1.6.0",
+ "cross-spawn": "5.1.0",
+ "debug": "3.1.0",
+ "doctrine": "2.1.0",
+ "eslint-scope": "3.7.1",
+ "espree": "3.5.2",
+ "esquery": "1.0.0",
+ "estraverse": "4.2.0",
+ "esutils": "2.0.2",
+ "file-entry-cache": "2.0.0",
+ "functional-red-black-tree": "1.0.1",
+ "glob": "7.1.3",
+ "globals": "9.18.0",
+ "ignore": "3.3.7",
+ "imurmurhash": "0.1.4",
+ "inquirer": "3.3.0",
+ "is-resolvable": "1.1.0",
+ "js-yaml": "3.10.0",
+ "json-stable-stringify": "1.0.1",
+ "levn": "0.3.0",
+ "lodash": "4.17.10",
+ "minimatch": "3.0.4",
+ "mkdirp": "0.5.1",
+ "natural-compare": "1.4.0",
+ "optionator": "0.8.2",
+ "path-is-inside": "1.0.2",
+ "pluralize": "7.0.0",
+ "progress": "2.0.0",
+ "require-uncached": "1.0.3",
+ "semver": "5.5.1",
+ "strip-ansi": "4.0.0",
+ "strip-json-comments": "2.0.1",
+ "table": "4.0.2",
+ "text-table": "0.2.0"
},
"dependencies": {
"ansi-regex": {
@@ -1127,7 +1982,7 @@
"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
"dev": true,
"requires": {
- "color-convert": "^1.9.0"
+ "color-convert": "1.9.1"
}
},
"chalk": {
@@ -1136,9 +1991,9 @@
"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
"dev": true,
"requires": {
- "ansi-styles": "^3.1.0",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^4.0.0"
+ "ansi-styles": "3.2.0",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "4.5.0"
}
},
"cross-spawn": {
@@ -1147,9 +2002,9 @@
"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
"dev": true,
"requires": {
- "lru-cache": "^4.0.1",
- "shebang-command": "^1.2.0",
- "which": "^1.2.9"
+ "lru-cache": "4.1.3",
+ "shebang-command": "1.2.0",
+ "which": "1.3.1"
}
},
"debug": {
@@ -1167,7 +2022,7 @@
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": {
- "ansi-regex": "^3.0.0"
+ "ansi-regex": "3.0.0"
}
},
"supports-color": {
@@ -1176,7 +2031,7 @@
"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
"dev": true,
"requires": {
- "has-flag": "^2.0.0"
+ "has-flag": "2.0.0"
}
}
}
@@ -1187,7 +2042,7 @@
"integrity": "sha512-zLyOhVWhzB/jwbz7IPSbkUuj7X2ox4PHXTcZkEmDqTvd0baJmJyuxlFPDlZOE/Y5bC+HQRaEkT3FoHo9wIdRiw==",
"dev": true,
"requires": {
- "eslint-config-airbnb-base": "^12.1.0"
+ "eslint-config-airbnb-base": "12.1.0"
}
},
"eslint-config-airbnb-base": {
@@ -1196,7 +2051,7 @@
"integrity": "sha512-/vjm0Px5ZCpmJqnjIzcFb9TKZrKWz0gnuG/7Gfkt0Db1ELJR51xkZth+t14rYdqWgX836XbuxtArbIHlVhbLBA==",
"dev": true,
"requires": {
- "eslint-restricted-globals": "^0.1.1"
+ "eslint-restricted-globals": "0.1.1"
}
},
"eslint-import-resolver-node": {
@@ -1205,8 +2060,8 @@
"integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
"dev": true,
"requires": {
- "debug": "^2.6.9",
- "resolve": "^1.5.0"
+ "debug": "2.6.9",
+ "resolve": "1.5.0"
}
},
"eslint-module-utils": {
@@ -1215,8 +2070,8 @@
"integrity": "sha512-jDI/X5l/6D1rRD/3T43q8Qgbls2nq5km5KSqiwlyUbGo5+04fXhMKdCPhjwbqAa6HXWaMxj8Q4hQDIh7IadJQw==",
"dev": true,
"requires": {
- "debug": "^2.6.8",
- "pkg-dir": "^1.0.0"
+ "debug": "2.6.9",
+ "pkg-dir": "1.0.0"
}
},
"eslint-plugin-import": {
@@ -1225,16 +2080,16 @@
"integrity": "sha512-Rf7dfKJxZ16QuTgVv1OYNxkZcsu/hULFnC+e+w0Gzi6jMC3guQoWQgxYxc54IDRinlb6/0v5z/PxxIKmVctN+g==",
"dev": true,
"requires": {
- "builtin-modules": "^1.1.1",
- "contains-path": "^0.1.0",
- "debug": "^2.6.8",
+ "builtin-modules": "1.1.1",
+ "contains-path": "0.1.0",
+ "debug": "2.6.9",
"doctrine": "1.5.0",
- "eslint-import-resolver-node": "^0.3.1",
- "eslint-module-utils": "^2.1.1",
- "has": "^1.0.1",
- "lodash.cond": "^4.3.0",
- "minimatch": "^3.0.3",
- "read-pkg-up": "^2.0.0"
+ "eslint-import-resolver-node": "0.3.2",
+ "eslint-module-utils": "2.1.1",
+ "has": "1.0.1",
+ "lodash.cond": "4.5.2",
+ "minimatch": "3.0.4",
+ "read-pkg-up": "2.0.0"
},
"dependencies": {
"doctrine": {
@@ -1243,8 +2098,8 @@
"integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
"dev": true,
"requires": {
- "esutils": "^2.0.2",
- "isarray": "^1.0.0"
+ "esutils": "2.0.2",
+ "isarray": "1.0.0"
}
},
"find-up": {
@@ -1253,7 +2108,7 @@
"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
"dev": true,
"requires": {
- "locate-path": "^2.0.0"
+ "locate-path": "2.0.0"
}
},
"load-json-file": {
@@ -1262,10 +2117,10 @@
"integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
"dev": true,
"requires": {
- "graceful-fs": "^4.1.2",
- "parse-json": "^2.2.0",
- "pify": "^2.0.0",
- "strip-bom": "^3.0.0"
+ "graceful-fs": "4.1.11",
+ "parse-json": "2.2.0",
+ "pify": "2.3.0",
+ "strip-bom": "3.0.0"
}
},
"path-type": {
@@ -1274,7 +2129,7 @@
"integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
"dev": true,
"requires": {
- "pify": "^2.0.0"
+ "pify": "2.3.0"
}
},
"read-pkg": {
@@ -1283,9 +2138,9 @@
"integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
"dev": true,
"requires": {
- "load-json-file": "^2.0.0",
- "normalize-package-data": "^2.3.2",
- "path-type": "^2.0.0"
+ "load-json-file": "2.0.0",
+ "normalize-package-data": "2.4.0",
+ "path-type": "2.0.0"
}
},
"read-pkg-up": {
@@ -1294,8 +2149,8 @@
"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
"dev": true,
"requires": {
- "find-up": "^2.0.0",
- "read-pkg": "^2.0.0"
+ "find-up": "2.1.0",
+ "read-pkg": "2.0.0"
}
},
"strip-bom": {
@@ -1312,13 +2167,13 @@
"integrity": "sha1-VFg9GuRCSDFi4EDhPMMYZUZRAOU=",
"dev": true,
"requires": {
- "aria-query": "^0.7.0",
- "array-includes": "^3.0.3",
+ "aria-query": "0.7.0",
+ "array-includes": "3.0.3",
"ast-types-flow": "0.0.7",
- "axobject-query": "^0.1.0",
- "damerau-levenshtein": "^1.0.0",
- "emoji-regex": "^6.1.0",
- "jsx-ast-utils": "^2.0.0"
+ "axobject-query": "0.1.0",
+ "damerau-levenshtein": "1.0.4",
+ "emoji-regex": "6.5.1",
+ "jsx-ast-utils": "2.0.1"
}
},
"eslint-plugin-react": {
@@ -1327,10 +2182,10 @@
"integrity": "sha512-tvjU9u3VqmW2vVuYnE8Qptq+6ji4JltjOjJ9u7VAOxVYkUkyBZWRvNYKbDv5fN+L6wiA+4we9+qQahZ0m63XEA==",
"dev": true,
"requires": {
- "doctrine": "^2.0.0",
- "has": "^1.0.1",
- "jsx-ast-utils": "^2.0.0",
- "prop-types": "^15.5.10"
+ "doctrine": "2.1.0",
+ "has": "1.0.1",
+ "jsx-ast-utils": "2.0.1",
+ "prop-types": "15.6.2"
}
},
"eslint-restricted-globals": {
@@ -1345,8 +2200,8 @@
"integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
"dev": true,
"requires": {
- "esrecurse": "^4.1.0",
- "estraverse": "^4.1.1"
+ "esrecurse": "4.2.0",
+ "estraverse": "4.2.0"
}
},
"espree": {
@@ -1355,8 +2210,8 @@
"integrity": "sha512-sadKeYwaR/aJ3stC2CdvgXu1T16TdYN+qwCpcWbMnGJ8s0zNWemzrvb2GbD4OhmJ/fwpJjudThAlLobGbWZbCQ==",
"dev": true,
"requires": {
- "acorn": "^5.2.1",
- "acorn-jsx": "^3.0.0"
+ "acorn": "5.3.0",
+ "acorn-jsx": "3.0.1"
}
},
"esprima": {
@@ -1371,7 +2226,7 @@
"integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
"dev": true,
"requires": {
- "estraverse": "^4.0.0"
+ "estraverse": "4.2.0"
}
},
"esrecurse": {
@@ -1380,8 +2235,8 @@
"integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
"dev": true,
"requires": {
- "estraverse": "^4.1.0",
- "object-assign": "^4.0.1"
+ "estraverse": "4.2.0",
+ "object-assign": "4.1.1"
}
},
"estraverse": {
@@ -1401,19 +2256,28 @@
"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-4.1.2.tgz",
"integrity": "sha1-DhqEd6+CGm7zmVsxG/dMI6UkfxU="
},
+ "exec-sh": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
+ "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
+ "dev": true,
+ "requires": {
+ "merge": "1.2.1"
+ }
+ },
"execa": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz",
"integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=",
"dev": true,
"requires": {
- "cross-spawn": "^5.0.1",
- "get-stream": "^3.0.0",
- "is-stream": "^1.1.0",
- "npm-run-path": "^2.0.0",
- "p-finally": "^1.0.0",
- "signal-exit": "^3.0.0",
- "strip-eof": "^1.0.0"
+ "cross-spawn": "5.1.0",
+ "get-stream": "3.0.0",
+ "is-stream": "1.1.0",
+ "npm-run-path": "2.0.2",
+ "p-finally": "1.0.0",
+ "signal-exit": "3.0.2",
+ "strip-eof": "1.0.0"
},
"dependencies": {
"cross-spawn": {
@@ -1422,9 +2286,9 @@
"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
"dev": true,
"requires": {
- "lru-cache": "^4.0.1",
- "shebang-command": "^1.2.0",
- "which": "^1.2.9"
+ "lru-cache": "4.1.3",
+ "shebang-command": "1.2.0",
+ "which": "1.3.1"
}
}
}
@@ -1434,12 +2298,6 @@
"resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
"integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
},
- "exif-parser": {
- "version": "0.1.12",
- "resolved": "https://registry.npmjs.org/exif-parser/-/exif-parser-0.1.12.tgz",
- "integrity": "sha1-WKnS1ywCwfbwKg70qRZicrd2CSI=",
- "dev": true
- },
"exit": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
@@ -1452,20 +2310,133 @@
"integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
"dev": true
},
+ "expand-brackets": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+ "dev": true,
+ "requires": {
+ "is-posix-bracket": "0.1.1"
+ }
+ },
+ "expand-range": {
+ "version": "1.8.2",
+ "resolved": "http://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+ "dev": true,
+ "requires": {
+ "fill-range": "2.2.4"
+ }
+ },
+ "expect": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/expect/-/expect-23.6.0.tgz",
+ "integrity": "sha512-dgSoOHgmtn/aDGRVFWclQyPDKl2CQRq0hmIEoUAuQs/2rn2NcvCWcSCovm6BLeuB/7EZuLGu2QfnR+qRt5OM4w==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "jest-diff": "23.6.0",
+ "jest-get-type": "22.4.3",
+ "jest-matcher-utils": "23.6.0",
+ "jest-message-util": "23.4.0",
+ "jest-regex-util": "23.3.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "jest-get-type": {
+ "version": "22.4.3",
+ "resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz",
+ "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==",
+ "dev": true
+ }
+ }
+ },
"extend": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
},
+ "extend-shallow": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+ "dev": true,
+ "requires": {
+ "assign-symbols": "1.0.0",
+ "is-extendable": "1.0.1"
+ },
+ "dependencies": {
+ "is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "dev": true,
+ "requires": {
+ "is-plain-object": "2.0.4"
+ }
+ }
+ }
+ },
"external-editor": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz",
"integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==",
"dev": true,
"requires": {
- "chardet": "^0.4.0",
- "iconv-lite": "^0.4.17",
- "tmp": "^0.0.33"
+ "chardet": "0.4.2",
+ "iconv-lite": "0.4.19",
+ "tmp": "0.0.33"
+ }
+ },
+ "extglob": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+ "dev": true,
+ "requires": {
+ "is-extglob": "1.0.0"
+ },
+ "dependencies": {
+ "is-extglob": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+ "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+ "dev": true
+ }
+ }
+ },
+ "extract-zip": {
+ "version": "1.6.7",
+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
+ "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
+ "dev": true,
+ "requires": {
+ "concat-stream": "1.6.2",
+ "debug": "2.6.9",
+ "mkdirp": "0.5.1",
+ "yauzl": "2.4.1"
+ },
+ "dependencies": {
+ "concat-stream": {
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+ "dev": true,
+ "requires": {
+ "buffer-from": "1.1.1",
+ "inherits": "2.0.3",
+ "readable-stream": "2.3.6",
+ "typedarray": "0.0.6"
+ }
+ }
}
},
"extsprintf": {
@@ -1500,18 +2471,27 @@
"integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=",
"dev": true
},
+ "fb-watchman": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
+ "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=",
+ "dev": true,
+ "requires": {
+ "bser": "2.0.0"
+ }
+ },
"fbjs": {
"version": "0.8.16",
"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
"integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
"requires": {
- "core-js": "^1.0.0",
- "isomorphic-fetch": "^2.1.1",
- "loose-envify": "^1.0.0",
- "object-assign": "^4.1.0",
- "promise": "^7.1.1",
- "setimmediate": "^1.0.5",
- "ua-parser-js": "^0.7.9"
+ "core-js": "1.2.7",
+ "isomorphic-fetch": "2.2.1",
+ "loose-envify": "1.3.1",
+ "object-assign": "4.1.1",
+ "promise": "7.3.1",
+ "setimmediate": "1.0.5",
+ "ua-parser-js": "0.7.17"
},
"dependencies": {
"core-js": {
@@ -1521,11 +2501,14 @@
}
}
},
- "fibers": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/fibers/-/fibers-2.0.0.tgz",
- "integrity": "sha512-sLxo4rZVk7xLgAjb/6zEzHJfSALx6u6coN1z61XCOF7i6CyTdJawF4+RdpjCSeS8AP66eR2InScbYAz9RAVOgA==",
- "dev": true
+ "fd-slicer": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+ "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+ "dev": true,
+ "requires": {
+ "pend": "1.2.0"
+ }
},
"figures": {
"version": "2.0.0",
@@ -1533,7 +2516,7 @@
"integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
"dev": true,
"requires": {
- "escape-string-regexp": "^1.0.5"
+ "escape-string-regexp": "1.0.5"
}
},
"file-entry-cache": {
@@ -1542,23 +2525,46 @@
"integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
"dev": true,
"requires": {
- "flat-cache": "^1.2.1",
- "object-assign": "^4.0.1"
+ "flat-cache": "1.3.0",
+ "object-assign": "4.1.1"
}
},
- "file-type": {
- "version": "3.9.0",
- "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
- "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
+ "filename-regex": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+ "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
"dev": true
},
+ "fileset": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
+ "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
+ "dev": true,
+ "requires": {
+ "glob": "7.1.3",
+ "minimatch": "3.0.4"
+ }
+ },
+ "fill-range": {
+ "version": "2.2.4",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+ "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+ "dev": true,
+ "requires": {
+ "is-number": "2.1.0",
+ "isobject": "2.1.0",
+ "randomatic": "3.1.1",
+ "repeat-element": "1.1.3",
+ "repeat-string": "1.6.1"
+ }
+ },
"find-up": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
"requires": {
- "path-exists": "^2.0.0",
- "pinkie-promise": "^2.0.0"
+ "path-exists": "2.1.0",
+ "pinkie-promise": "2.0.1"
}
},
"flat": {
@@ -1566,7 +2572,7 @@
"resolved": "https://registry.npmjs.org/flat/-/flat-4.0.0.tgz",
"integrity": "sha512-ji/WMv2jdsE+LaznpkIF9Haax0sdpTBozrz/Dtg4qSRMfbs8oVg4ypJunIRYPiMLvH/ed6OflXbnbTIKJhtgeg==",
"requires": {
- "is-buffer": "~1.1.5"
+ "is-buffer": "1.1.6"
}
},
"flat-cache": {
@@ -1575,10 +2581,10 @@
"integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
"dev": true,
"requires": {
- "circular-json": "^0.3.1",
- "del": "^2.0.2",
- "graceful-fs": "^4.1.2",
- "write": "^0.2.1"
+ "circular-json": "0.3.3",
+ "del": "2.2.2",
+ "graceful-fs": "4.1.11",
+ "write": "0.2.1"
}
},
"flatten": {
@@ -1586,13 +2592,39 @@
"resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
"integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I="
},
- "for-each": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz",
- "integrity": "sha1-LEBFC5NI6X8oEyJZO6lnBLmr1NQ=",
+ "follow-redirects": {
+ "version": "1.5.10",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+ "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+ "dev": true,
+ "requires": {
+ "debug": "3.1.0"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "dev": true,
+ "requires": {
+ "ms": "2.0.0"
+ }
+ }
+ }
+ },
+ "for-in": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+ "dev": true
+ },
+ "for-own": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
"dev": true,
"requires": {
- "is-function": "~1.0.0"
+ "for-in": "1.0.2"
}
},
"foreach": {
@@ -1611,20 +2643,18 @@
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
"integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
"requires": {
- "asynckit": "^0.4.0",
+ "asynckit": "0.4.0",
"combined-stream": "1.0.6",
- "mime-types": "^2.1.12"
+ "mime-types": "2.1.20"
}
},
- "fs-extra": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
- "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+ "fragment-cache": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+ "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
"dev": true,
"requires": {
- "graceful-fs": "^4.1.2",
- "jsonfile": "^3.0.0",
- "universalify": "^0.1.0"
+ "map-cache": "0.2.2"
}
},
"fs.realpath": {
@@ -1637,10 +2667,10 @@
"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
"integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
"requires": {
- "graceful-fs": "^4.1.2",
- "inherits": "~2.0.0",
- "mkdirp": ">=0.5 0",
- "rimraf": "2"
+ "graceful-fs": "4.1.11",
+ "inherits": "2.0.3",
+ "mkdirp": "0.5.1",
+ "rimraf": "2.6.2"
}
},
"function-bind": {
@@ -1660,14 +2690,14 @@
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"requires": {
- "aproba": "^1.0.3",
- "console-control-strings": "^1.0.0",
- "has-unicode": "^2.0.0",
- "object-assign": "^4.1.0",
- "signal-exit": "^3.0.0",
- "string-width": "^1.0.1",
- "strip-ansi": "^3.0.1",
- "wide-align": "^1.1.0"
+ "aproba": "1.2.0",
+ "console-control-strings": "1.1.0",
+ "has-unicode": "2.0.1",
+ "object-assign": "4.1.1",
+ "signal-exit": "3.0.2",
+ "string-width": "1.0.2",
+ "strip-ansi": "3.0.1",
+ "wide-align": "1.1.3"
}
},
"gaze": {
@@ -1675,7 +2705,7 @@
"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
"requires": {
- "globule": "^1.0.0"
+ "globule": "1.2.1"
}
},
"get-caller-file": {
@@ -1683,12 +2713,6 @@
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
"integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
},
- "get-func-name": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
- "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
- "dev": true
- },
"get-own-enumerable-property-symbols": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-2.0.1.tgz",
@@ -1705,12 +2729,18 @@
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
},
+ "get-value": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+ "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+ "dev": true
+ },
"getpass": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
"requires": {
- "assert-plus": "^1.0.0"
+ "assert-plus": "1.0.0"
}
},
"glob": {
@@ -1718,22 +2748,65 @@
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
"requires": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
+ "fs.realpath": "1.0.0",
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
+ }
+ },
+ "glob-base": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+ "dev": true,
+ "requires": {
+ "glob-parent": "2.0.0",
+ "is-glob": "2.0.1"
+ },
+ "dependencies": {
+ "is-extglob": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+ "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+ "dev": true
+ },
+ "is-glob": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+ "dev": true,
+ "requires": {
+ "is-extglob": "1.0.0"
+ }
+ }
}
},
- "global": {
- "version": "4.3.2",
- "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
- "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
+ "glob-parent": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
"dev": true,
"requires": {
- "min-document": "^2.19.0",
- "process": "~0.5.1"
+ "is-glob": "2.0.1"
+ },
+ "dependencies": {
+ "is-extglob": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+ "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+ "dev": true
+ },
+ "is-glob": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+ "dev": true,
+ "requires": {
+ "is-extglob": "1.0.0"
+ }
+ }
}
},
"globals": {
@@ -1748,12 +2821,12 @@
"integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
"dev": true,
"requires": {
- "array-union": "^1.0.1",
- "arrify": "^1.0.0",
- "glob": "^7.0.3",
- "object-assign": "^4.0.1",
- "pify": "^2.0.0",
- "pinkie-promise": "^2.0.0"
+ "array-union": "1.0.2",
+ "arrify": "1.0.1",
+ "glob": "7.1.3",
+ "object-assign": "4.1.1",
+ "pify": "2.3.0",
+ "pinkie-promise": "2.0.1"
}
},
"globule": {
@@ -1761,42 +2834,9 @@
"resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
"integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
"requires": {
- "glob": "~7.1.1",
- "lodash": "~4.17.10",
- "minimatch": "~3.0.2"
- }
- },
- "gm": {
- "version": "1.23.1",
- "resolved": "https://registry.npmjs.org/gm/-/gm-1.23.1.tgz",
- "integrity": "sha1-Lt7rlYCE0PjqeYjl2ZWxx9/BR3c=",
- "dev": true,
- "requires": {
- "array-parallel": "~0.1.3",
- "array-series": "~0.1.5",
- "cross-spawn": "^4.0.0",
- "debug": "^3.1.0"
- },
- "dependencies": {
- "cross-spawn": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
- "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
- "dev": true,
- "requires": {
- "lru-cache": "^4.0.1",
- "which": "^1.2.9"
- }
- },
- "debug": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
- "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
- "dev": true,
- "requires": {
- "ms": "2.0.0"
- }
- }
+ "glob": "7.1.3",
+ "lodash": "4.17.10",
+ "minimatch": "3.0.4"
}
},
"good-listener": {
@@ -1804,7 +2844,7 @@
"resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
"integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
"requires": {
- "delegate": "^3.1.2"
+ "delegate": "3.2.0"
}
},
"got": {
@@ -1812,20 +2852,20 @@
"resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
"integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
"requires": {
- "decompress-response": "^3.2.0",
- "duplexer3": "^0.1.4",
- "get-stream": "^3.0.0",
- "is-plain-obj": "^1.1.0",
- "is-retry-allowed": "^1.0.0",
- "is-stream": "^1.0.0",
- "isurl": "^1.0.0-alpha5",
- "lowercase-keys": "^1.0.0",
- "p-cancelable": "^0.3.0",
- "p-timeout": "^1.1.1",
- "safe-buffer": "^5.0.1",
- "timed-out": "^4.0.0",
- "url-parse-lax": "^1.0.0",
- "url-to-options": "^1.0.1"
+ "decompress-response": "3.3.0",
+ "duplexer3": "0.1.4",
+ "get-stream": "3.0.0",
+ "is-plain-obj": "1.1.0",
+ "is-retry-allowed": "1.1.0",
+ "is-stream": "1.1.0",
+ "isurl": "1.0.0",
+ "lowercase-keys": "1.0.0",
+ "p-cancelable": "0.3.0",
+ "p-timeout": "1.2.1",
+ "safe-buffer": "5.1.1",
+ "timed-out": "4.0.1",
+ "url-parse-lax": "1.0.0",
+ "url-to-options": "1.0.1"
}
},
"graceful-fs": {
@@ -1833,27 +2873,62 @@
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
},
- "har-schema": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
- "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
- },
- "har-validator": {
- "version": "5.0.3",
- "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
- "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
- "requires": {
- "ajv": "^5.1.0",
- "har-schema": "^2.0.0"
- }
+ "growly": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+ "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
+ "dev": true
},
- "has": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
- "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
+ "handlebars": {
+ "version": "4.0.12",
+ "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.12.tgz",
+ "integrity": "sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==",
"dev": true,
"requires": {
- "function-bind": "^1.0.2"
+ "async": "2.6.1",
+ "optimist": "0.6.1",
+ "source-map": "0.6.1",
+ "uglify-js": "3.4.9"
+ },
+ "dependencies": {
+ "async": {
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+ "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+ "dev": true,
+ "requires": {
+ "lodash": "4.17.10"
+ }
+ },
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
+ }
+ }
+ },
+ "har-schema": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+ "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+ },
+ "har-validator": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+ "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+ "requires": {
+ "ajv": "5.5.2",
+ "har-schema": "2.0.0"
+ }
+ },
+ "has": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
+ "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
+ "dev": true,
+ "requires": {
+ "function-bind": "1.1.1"
}
},
"has-ansi": {
@@ -1861,7 +2936,7 @@
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
"requires": {
- "ansi-regex": "^2.0.0"
+ "ansi-regex": "2.1.1"
}
},
"has-flag": {
@@ -1874,18 +2949,12 @@
"resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz",
"integrity": "sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA=="
},
- "has-symbols": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
- "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
- "dev": true
- },
"has-to-string-tag-x": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
"integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
"requires": {
- "has-symbol-support-x": "^1.4.1"
+ "has-symbol-support-x": "1.4.1"
}
},
"has-unicode": {
@@ -1893,15 +2962,85 @@
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
},
+ "has-value": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+ "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+ "dev": true,
+ "requires": {
+ "get-value": "2.0.6",
+ "has-values": "1.0.0",
+ "isobject": "3.0.1"
+ },
+ "dependencies": {
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "dev": true
+ }
+ }
+ },
+ "has-values": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+ "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+ "dev": true,
+ "requires": {
+ "is-number": "3.0.0",
+ "kind-of": "4.0.0"
+ },
+ "dependencies": {
+ "is-number": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "1.1.6"
+ }
+ }
+ }
+ },
+ "kind-of": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+ "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "1.1.6"
+ }
+ }
+ }
+ },
"history": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/history/-/history-3.3.0.tgz",
"integrity": "sha1-/O3M6PEpdTcVRdc1RhAzV5ptrpw=",
"requires": {
- "invariant": "^2.2.1",
- "loose-envify": "^1.2.0",
- "query-string": "^4.2.2",
- "warning": "^3.0.0"
+ "invariant": "2.2.2",
+ "loose-envify": "1.3.1",
+ "query-string": "4.3.4",
+ "warning": "3.0.0"
+ }
+ },
+ "home-or-tmp": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+ "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+ "dev": true,
+ "requires": {
+ "os-homedir": "1.0.2",
+ "os-tmpdir": "1.0.2"
}
},
"hosted-git-info": {
@@ -1909,21 +3048,51 @@
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
"integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
},
+ "html-encoding-sniffer": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
+ "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+ "dev": true,
+ "requires": {
+ "whatwg-encoding": "1.0.5"
+ }
+ },
"http-signature": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
"requires": {
- "assert-plus": "^1.0.0",
- "jsprim": "^1.2.2",
- "sshpk": "^1.7.0"
+ "assert-plus": "1.0.0",
+ "jsprim": "1.4.1",
+ "sshpk": "1.14.2"
}
},
- "humanize-duration": {
- "version": "3.12.1",
- "resolved": "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.12.1.tgz",
- "integrity": "sha512-Eu68Xnq5C38391em1zfVy8tiapQrOvTNTlWpax9smHMlEEUcudXrdMfXMoMRyZx4uODowYgi1AYiMzUXEbG+sA==",
- "dev": true
+ "https-proxy-agent": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
+ "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
+ "dev": true,
+ "requires": {
+ "agent-base": "4.2.1",
+ "debug": "3.2.6"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.1"
+ }
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "dev": true
+ }
+ }
},
"husky": {
"version": "0.14.3",
@@ -1931,9 +3100,9 @@
"integrity": "sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==",
"dev": true,
"requires": {
- "is-ci": "^1.0.10",
- "normalize-path": "^1.0.0",
- "strip-indent": "^2.0.0"
+ "is-ci": "1.1.0",
+ "normalize-path": "1.0.0",
+ "strip-indent": "2.0.0"
},
"dependencies": {
"strip-indent": {
@@ -1961,18 +3130,42 @@
"integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
"dev": true
},
- "image-size": {
- "version": "0.5.5",
- "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
- "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
- "dev": true
- },
"immutability-helper": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/immutability-helper/-/immutability-helper-2.4.0.tgz",
"integrity": "sha512-rW/L/56ZMo9NStMK85kFrUFFGy4NeJbCdhfrDHIZrFfxYtuwuxD+dT3mWMcdmrNO61hllc60AeGglCRhfZ1dZw==",
"requires": {
- "invariant": "^2.2.0"
+ "invariant": "2.2.2"
+ }
+ },
+ "import-local": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz",
+ "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==",
+ "dev": true,
+ "requires": {
+ "pkg-dir": "2.0.0",
+ "resolve-cwd": "2.0.0"
+ },
+ "dependencies": {
+ "find-up": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+ "dev": true,
+ "requires": {
+ "locate-path": "2.0.0"
+ }
+ },
+ "pkg-dir": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+ "dev": true,
+ "requires": {
+ "find-up": "2.1.0"
+ }
+ }
}
},
"imurmurhash": {
@@ -1991,7 +3184,7 @@
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
"requires": {
- "repeating": "^2.0.0"
+ "repeating": "2.0.1"
}
},
"indexes-of": {
@@ -2004,8 +3197,8 @@
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"requires": {
- "once": "^1.3.0",
- "wrappy": "1"
+ "once": "1.4.0",
+ "wrappy": "1.0.2"
}
},
"inherits": {
@@ -2013,32 +3206,26 @@
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
},
- "ini": {
- "version": "1.3.5",
- "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
- "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
- "dev": true
- },
"inquirer": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
"integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
"dev": true,
"requires": {
- "ansi-escapes": "^3.0.0",
- "chalk": "^2.0.0",
- "cli-cursor": "^2.1.0",
- "cli-width": "^2.0.0",
- "external-editor": "^2.0.4",
- "figures": "^2.0.0",
- "lodash": "^4.3.0",
+ "ansi-escapes": "3.0.0",
+ "chalk": "2.3.0",
+ "cli-cursor": "2.1.0",
+ "cli-width": "2.2.0",
+ "external-editor": "2.1.0",
+ "figures": "2.0.0",
+ "lodash": "4.17.10",
"mute-stream": "0.0.7",
- "run-async": "^2.2.0",
- "rx-lite": "^4.0.8",
- "rx-lite-aggregates": "^4.0.8",
- "string-width": "^2.1.0",
- "strip-ansi": "^4.0.0",
- "through": "^2.3.6"
+ "run-async": "2.3.0",
+ "rx-lite": "4.0.8",
+ "rx-lite-aggregates": "4.0.8",
+ "string-width": "2.1.1",
+ "strip-ansi": "4.0.0",
+ "through": "2.3.8"
},
"dependencies": {
"ansi-regex": {
@@ -2053,7 +3240,7 @@
"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
"dev": true,
"requires": {
- "color-convert": "^1.9.0"
+ "color-convert": "1.9.1"
}
},
"chalk": {
@@ -2062,9 +3249,9 @@
"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
"dev": true,
"requires": {
- "ansi-styles": "^3.1.0",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^4.0.0"
+ "ansi-styles": "3.2.0",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "4.5.0"
}
},
"is-fullwidth-code-point": {
@@ -2079,8 +3266,8 @@
"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
"dev": true,
"requires": {
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^4.0.0"
+ "is-fullwidth-code-point": "2.0.0",
+ "strip-ansi": "4.0.0"
}
},
"strip-ansi": {
@@ -2089,7 +3276,7 @@
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": {
- "ansi-regex": "^3.0.0"
+ "ansi-regex": "3.0.0"
}
},
"supports-color": {
@@ -2098,7 +3285,7 @@
"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
"dev": true,
"requires": {
- "has-flag": "^2.0.0"
+ "has-flag": "2.0.0"
}
}
}
@@ -2126,7 +3313,7 @@
"resolved": "https://registry.npmjs.org/intl-relativeformat/-/intl-relativeformat-2.1.0.tgz",
"integrity": "sha1-AQ8RBYAiUfQKxH0OPhogE0iiVd8=",
"requires": {
- "intl-messageformat": "^2.0.0"
+ "intl-messageformat": "2.2.0"
}
},
"invariant": {
@@ -2134,7 +3321,7 @@
"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
"requires": {
- "loose-envify": "^1.0.0"
+ "loose-envify": "1.3.1"
}
},
"invert-kv": {
@@ -2142,11 +3329,14 @@
"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
},
- "ip-regex": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz",
- "integrity": "sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=",
- "dev": true
+ "is-accessor-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
+ }
},
"is-arrayish": {
"version": "0.2.1",
@@ -2163,7 +3353,7 @@
"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
"integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
"requires": {
- "builtin-modules": "^1.0.0"
+ "builtin-modules": "1.1.1"
}
},
"is-callable": {
@@ -2178,7 +3368,16 @@
"integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==",
"dev": true,
"requires": {
- "ci-info": "^1.0.0"
+ "ci-info": "1.1.2"
+ }
+ },
+ "is-data-descriptor": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
}
},
"is-date-object": {
@@ -2187,6 +3386,46 @@
"integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
"dev": true
},
+ "is-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+ "dev": true,
+ "requires": {
+ "is-accessor-descriptor": "0.1.6",
+ "is-data-descriptor": "0.1.4",
+ "kind-of": "5.1.0"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+ "dev": true
+ }
+ }
+ },
+ "is-dotfile": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+ "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+ "dev": true
+ },
+ "is-equal-shallow": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+ "dev": true,
+ "requires": {
+ "is-primitive": "2.0.0"
+ }
+ },
+ "is-extendable": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+ "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+ "dev": true
+ },
"is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -2198,7 +3437,7 @@
"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
"requires": {
- "number-is-nan": "^1.0.0"
+ "number-is-nan": "1.0.1"
}
},
"is-fullwidth-code-point": {
@@ -2206,13 +3445,13 @@
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"requires": {
- "number-is-nan": "^1.0.0"
+ "number-is-nan": "1.0.1"
}
},
- "is-function": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz",
- "integrity": "sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=",
+ "is-generator-fn": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-1.0.0.tgz",
+ "integrity": "sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=",
"dev": true
},
"is-glob": {
@@ -2221,7 +3460,16 @@
"integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
"dev": true,
"requires": {
- "is-extglob": "^2.1.1"
+ "is-extglob": "2.1.1"
+ }
+ },
+ "is-number": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
}
},
"is-obj": {
@@ -2247,7 +3495,7 @@
"integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
"dev": true,
"requires": {
- "is-path-inside": "^1.0.0"
+ "is-path-inside": "1.0.1"
}
},
"is-path-inside": {
@@ -2256,7 +3504,7 @@
"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
"dev": true,
"requires": {
- "path-is-inside": "^1.0.1"
+ "path-is-inside": "1.0.2"
}
},
"is-plain-obj": {
@@ -2264,6 +3512,35 @@
"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
},
+ "is-plain-object": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+ "dev": true,
+ "requires": {
+ "isobject": "3.0.1"
+ },
+ "dependencies": {
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "dev": true
+ }
+ }
+ },
+ "is-posix-bracket": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+ "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
+ "dev": true
+ },
+ "is-primitive": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+ "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+ "dev": true
+ },
"is-promise": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
@@ -2276,7 +3553,7 @@
"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
"dev": true,
"requires": {
- "has": "^1.0.1"
+ "has": "1.0.1"
}
},
"is-regexp": {
@@ -2317,6 +3594,12 @@
"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
},
+ "is-windows": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+ "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+ "dev": true
+ },
"isarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -2327,13 +3610,22 @@
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
},
+ "isobject": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+ "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+ "dev": true,
+ "requires": {
+ "isarray": "1.0.0"
+ }
+ },
"isomorphic-fetch": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
"integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
"requires": {
- "node-fetch": "^1.0.1",
- "whatwg-fetch": ">=0.10.0"
+ "node-fetch": "1.7.3",
+ "whatwg-fetch": "2.0.3"
}
},
"isstream": {
@@ -2341,121 +3633,1507 @@
"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
},
- "isurl": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
- "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
- "requires": {
- "has-to-string-tag-x": "^1.2.0",
- "is-object": "^1.0.1"
+ "istanbul-api": {
+ "version": "1.3.7",
+ "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.3.7.tgz",
+ "integrity": "sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA==",
+ "dev": true,
+ "requires": {
+ "async": "2.6.1",
+ "fileset": "2.0.3",
+ "istanbul-lib-coverage": "1.2.1",
+ "istanbul-lib-hook": "1.2.2",
+ "istanbul-lib-instrument": "1.10.2",
+ "istanbul-lib-report": "1.1.5",
+ "istanbul-lib-source-maps": "1.2.6",
+ "istanbul-reports": "1.5.1",
+ "js-yaml": "3.10.0",
+ "mkdirp": "0.5.1",
+ "once": "1.4.0"
+ },
+ "dependencies": {
+ "async": {
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+ "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+ "dev": true,
+ "requires": {
+ "lodash": "4.17.10"
+ }
+ }
}
},
- "jasmine": {
- "version": "2.9.0",
- "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.9.0.tgz",
- "integrity": "sha1-dlcfklyHg0CefGFTVy5aY0HPk+s=",
+ "istanbul-lib-coverage": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
+ "integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
+ "dev": true
+ },
+ "istanbul-lib-hook": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz",
+ "integrity": "sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==",
"dev": true,
"requires": {
- "exit": "^0.1.2",
- "glob": "^7.0.6",
- "jasmine-core": "~2.9.0"
+ "append-transform": "0.4.0"
}
},
- "jasmine-core": {
- "version": "2.9.1",
- "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.9.1.tgz",
- "integrity": "sha1-trvB2OZSUNVvWIhGFwXr7uuI8i8=",
- "dev": true
- },
- "jest-get-type": {
- "version": "21.2.0",
- "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-21.2.0.tgz",
- "integrity": "sha512-y2fFw3C+D0yjNSDp7ab1kcd6NUYfy3waPTlD8yWkAtiocJdBRQqNoRqVfMNxgj+IjT0V5cBIHJO0z9vuSSZ43Q==",
- "dev": true
+ "istanbul-lib-instrument": {
+ "version": "1.10.2",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
+ "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+ "dev": true,
+ "requires": {
+ "babel-generator": "6.26.1",
+ "babel-template": "6.26.0",
+ "babel-traverse": "6.26.0",
+ "babel-types": "6.26.0",
+ "babylon": "6.18.0",
+ "istanbul-lib-coverage": "1.2.1",
+ "semver": "5.5.1"
+ }
},
- "jest-validate": {
- "version": "21.2.1",
- "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-21.2.1.tgz",
- "integrity": "sha512-k4HLI1rZQjlU+EC682RlQ6oZvLrE5SCh3brseQc24vbZTxzT/k/3urar5QMCVgjadmSO7lECeGdc6YxnM3yEGg==",
+ "istanbul-lib-report": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz",
+ "integrity": "sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==",
"dev": true,
"requires": {
- "chalk": "^2.0.1",
- "jest-get-type": "^21.2.0",
- "leven": "^2.1.0",
- "pretty-format": "^21.2.1"
+ "istanbul-lib-coverage": "1.2.1",
+ "mkdirp": "0.5.1",
+ "path-parse": "1.0.5",
+ "supports-color": "3.2.3"
},
"dependencies": {
- "ansi-styles": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
- "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
- "dev": true,
- "requires": {
- "color-convert": "^1.9.0"
- }
- },
- "chalk": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
- "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
- "dev": true,
- "requires": {
- "ansi-styles": "^3.1.0",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^4.0.0"
- }
+ "has-flag": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+ "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+ "dev": true
},
"supports-color": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
- "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+ "version": "3.2.3",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
- "has-flag": "^2.0.0"
+ "has-flag": "1.0.0"
}
}
}
},
- "jimp": {
- "version": "0.2.28",
- "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.2.28.tgz",
- "integrity": "sha1-3VKak3GQ9ClXp5N9Gsw6d2KZbqI=",
- "dev": true,
- "requires": {
- "bignumber.js": "^2.1.0",
- "bmp-js": "0.0.3",
- "es6-promise": "^3.0.2",
- "exif-parser": "^0.1.9",
- "file-type": "^3.1.0",
- "jpeg-js": "^0.2.0",
- "load-bmfont": "^1.2.3",
- "mime": "^1.3.4",
+ "istanbul-lib-source-maps": {
+ "version": "1.2.6",
+ "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz",
+ "integrity": "sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==",
+ "dev": true,
+ "requires": {
+ "debug": "3.2.6",
+ "istanbul-lib-coverage": "1.2.1",
"mkdirp": "0.5.1",
- "pixelmatch": "^4.0.0",
- "pngjs": "^3.0.0",
- "read-chunk": "^1.0.1",
- "request": "^2.65.0",
- "stream-to-buffer": "^0.1.0",
- "tinycolor2": "^1.1.2",
- "url-regex": "^3.0.0"
+ "rimraf": "2.6.2",
+ "source-map": "0.5.7"
},
"dependencies": {
- "pngjs": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.3.1.tgz",
- "integrity": "sha512-ggXCTsqHRIsGMkHlCEhbHhUmNTA2r1lpkE0NL4Q9S8spkXbm4vE9TVmPso2AGYn90Gltdz8W5CyzhcIGg2Gejg==",
+ "debug": {
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.1"
+ }
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "dev": true
+ },
+ "source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
"dev": true
}
}
},
- "jpeg-js": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.2.0.tgz",
- "integrity": "sha1-U+RI7J0mPmgyZkZ+lELSxaLvVII=",
- "dev": true
+ "istanbul-reports": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.5.1.tgz",
+ "integrity": "sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==",
+ "dev": true,
+ "requires": {
+ "handlebars": "4.0.12"
+ }
},
- "js-base64": {
- "version": "2.4.9",
+ "isurl": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
+ "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+ "requires": {
+ "has-to-string-tag-x": "1.4.1",
+ "is-object": "1.0.1"
+ }
+ },
+ "jest": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest/-/jest-23.6.0.tgz",
+ "integrity": "sha512-lWzcd+HSiqeuxyhG+EnZds6iO3Y3ZEnMrfZq/OTGvF/C+Z4fPMCdhWTGSAiO2Oym9rbEXfwddHhh6jqrTF3+Lw==",
+ "dev": true,
+ "requires": {
+ "import-local": "1.0.0",
+ "jest-cli": "23.6.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "camelcase": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+ "dev": true
+ },
+ "chalk": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
+ }
+ },
+ "cliui": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+ "dev": true,
+ "requires": {
+ "string-width": "2.1.1",
+ "strip-ansi": "4.0.0",
+ "wrap-ansi": "2.1.0"
+ }
+ },
+ "cross-spawn": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+ "dev": true,
+ "requires": {
+ "lru-cache": "4.1.3",
+ "shebang-command": "1.2.0",
+ "which": "1.3.1"
+ }
+ },
+ "execa": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+ "dev": true,
+ "requires": {
+ "cross-spawn": "5.1.0",
+ "get-stream": "3.0.0",
+ "is-stream": "1.1.0",
+ "npm-run-path": "2.0.2",
+ "p-finally": "1.0.0",
+ "signal-exit": "3.0.2",
+ "strip-eof": "1.0.0"
+ }
+ },
+ "find-up": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+ "dev": true,
+ "requires": {
+ "locate-path": "2.0.0"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+ "dev": true
+ },
+ "jest-cli": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-23.6.0.tgz",
+ "integrity": "sha512-hgeD1zRUp1E1zsiyOXjEn4LzRLWdJBV//ukAHGlx6s5mfCNJTbhbHjgxnDUXA8fsKWN/HqFFF6X5XcCwC/IvYQ==",
+ "dev": true,
+ "requires": {
+ "ansi-escapes": "3.0.0",
+ "chalk": "2.4.1",
+ "exit": "0.1.2",
+ "glob": "7.1.3",
+ "graceful-fs": "4.1.11",
+ "import-local": "1.0.0",
+ "is-ci": "1.1.0",
+ "istanbul-api": "1.3.7",
+ "istanbul-lib-coverage": "1.2.1",
+ "istanbul-lib-instrument": "1.10.2",
+ "istanbul-lib-source-maps": "1.2.6",
+ "jest-changed-files": "23.4.2",
+ "jest-config": "23.6.0",
+ "jest-environment-jsdom": "23.4.0",
+ "jest-get-type": "22.4.3",
+ "jest-haste-map": "23.6.0",
+ "jest-message-util": "23.4.0",
+ "jest-regex-util": "23.3.0",
+ "jest-resolve-dependencies": "23.6.0",
+ "jest-runner": "23.6.0",
+ "jest-runtime": "23.6.0",
+ "jest-snapshot": "23.6.0",
+ "jest-util": "23.4.0",
+ "jest-validate": "23.6.0",
+ "jest-watcher": "23.4.0",
+ "jest-worker": "23.2.0",
+ "micromatch": "2.3.11",
+ "node-notifier": "5.3.0",
+ "prompts": "0.1.14",
+ "realpath-native": "1.0.2",
+ "rimraf": "2.6.2",
+ "slash": "1.0.0",
+ "string-length": "2.0.0",
+ "strip-ansi": "4.0.0",
+ "which": "1.3.1",
+ "yargs": "11.1.0"
+ }
+ },
+ "jest-get-type": {
+ "version": "22.4.3",
+ "resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz",
+ "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==",
+ "dev": true
+ },
+ "jest-validate": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-23.6.0.tgz",
+ "integrity": "sha512-OFKapYxe72yz7agrDAWi8v2WL8GIfVqcbKRCLbRG9PAxtzF9b1SEDdTpytNDN12z2fJynoBwpMpvj2R39plI2A==",
+ "dev": true,
+ "requires": {
+ "chalk": "2.4.1",
+ "jest-get-type": "22.4.3",
+ "leven": "2.1.0",
+ "pretty-format": "23.6.0"
+ }
+ },
+ "os-locale": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+ "dev": true,
+ "requires": {
+ "execa": "0.7.0",
+ "lcid": "1.0.0",
+ "mem": "1.1.0"
+ }
+ },
+ "pretty-format": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz",
+ "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0",
+ "ansi-styles": "3.2.1"
+ }
+ },
+ "string-width": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+ "dev": true,
+ "requires": {
+ "is-fullwidth-code-point": "2.0.0",
+ "strip-ansi": "4.0.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0"
+ }
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ },
+ "which-module": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+ "dev": true
+ },
+ "yargs": {
+ "version": "11.1.0",
+ "resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
+ "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
+ "dev": true,
+ "requires": {
+ "cliui": "4.1.0",
+ "decamelize": "1.2.0",
+ "find-up": "2.1.0",
+ "get-caller-file": "1.0.3",
+ "os-locale": "2.1.0",
+ "require-directory": "2.1.1",
+ "require-main-filename": "1.0.1",
+ "set-blocking": "2.0.0",
+ "string-width": "2.1.1",
+ "which-module": "2.0.0",
+ "y18n": "3.2.1",
+ "yargs-parser": "9.0.2"
+ }
+ },
+ "yargs-parser": {
+ "version": "9.0.2",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
+ "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
+ "dev": true,
+ "requires": {
+ "camelcase": "4.1.0"
+ }
+ }
+ }
+ },
+ "jest-changed-files": {
+ "version": "23.4.2",
+ "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-23.4.2.tgz",
+ "integrity": "sha512-EyNhTAUWEfwnK0Is/09LxoqNDOn7mU7S3EHskG52djOFS/z+IT0jT3h3Ql61+dklcG7bJJitIWEMB4Sp1piHmA==",
+ "dev": true,
+ "requires": {
+ "throat": "4.1.0"
+ }
+ },
+ "jest-config": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-23.6.0.tgz",
+ "integrity": "sha512-i8V7z9BeDXab1+VNo78WM0AtWpBRXJLnkT+lyT+Slx/cbP5sZJ0+NDuLcmBE5hXAoK0aUp7vI+MOxR+R4d8SRQ==",
+ "dev": true,
+ "requires": {
+ "babel-core": "6.26.3",
+ "babel-jest": "23.6.0",
+ "chalk": "2.4.1",
+ "glob": "7.1.3",
+ "jest-environment-jsdom": "23.4.0",
+ "jest-environment-node": "23.4.0",
+ "jest-get-type": "22.4.3",
+ "jest-jasmine2": "23.6.0",
+ "jest-regex-util": "23.3.0",
+ "jest-resolve": "23.6.0",
+ "jest-util": "23.4.0",
+ "jest-validate": "23.6.0",
+ "micromatch": "2.3.11",
+ "pretty-format": "23.6.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "chalk": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "jest-get-type": {
+ "version": "22.4.3",
+ "resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz",
+ "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==",
+ "dev": true
+ },
+ "jest-validate": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-23.6.0.tgz",
+ "integrity": "sha512-OFKapYxe72yz7agrDAWi8v2WL8GIfVqcbKRCLbRG9PAxtzF9b1SEDdTpytNDN12z2fJynoBwpMpvj2R39plI2A==",
+ "dev": true,
+ "requires": {
+ "chalk": "2.4.1",
+ "jest-get-type": "22.4.3",
+ "leven": "2.1.0",
+ "pretty-format": "23.6.0"
+ }
+ },
+ "pretty-format": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz",
+ "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0",
+ "ansi-styles": "3.2.1"
+ }
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ }
+ }
+ },
+ "jest-diff": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-23.6.0.tgz",
+ "integrity": "sha512-Gz9l5Ov+X3aL5L37IT+8hoCUsof1CVYBb2QEkOupK64XyRR3h+uRpYIm97K7sY8diFxowR8pIGEdyfMKTixo3g==",
+ "dev": true,
+ "requires": {
+ "chalk": "2.4.1",
+ "diff": "3.5.0",
+ "jest-get-type": "22.4.3",
+ "pretty-format": "23.6.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "chalk": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "jest-get-type": {
+ "version": "22.4.3",
+ "resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz",
+ "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==",
+ "dev": true
+ },
+ "pretty-format": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz",
+ "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0",
+ "ansi-styles": "3.2.1"
+ }
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ }
+ }
+ },
+ "jest-docblock": {
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-23.2.0.tgz",
+ "integrity": "sha1-8IXh8YVI2Z/dabICB+b9VdkTg6c=",
+ "dev": true,
+ "requires": {
+ "detect-newline": "2.1.0"
+ }
+ },
+ "jest-each": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-23.6.0.tgz",
+ "integrity": "sha512-x7V6M/WGJo6/kLoissORuvLIeAoyo2YqLOoCDkohgJ4XOXSqOtyvr8FbInlAWS77ojBsZrafbozWoKVRdtxFCg==",
+ "dev": true,
+ "requires": {
+ "chalk": "2.4.1",
+ "pretty-format": "23.6.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "chalk": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "pretty-format": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz",
+ "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0",
+ "ansi-styles": "3.2.1"
+ }
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ }
+ }
+ },
+ "jest-environment-jsdom": {
+ "version": "23.4.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz",
+ "integrity": "sha1-BWp5UrP+pROsYqFAosNox52eYCM=",
+ "dev": true,
+ "requires": {
+ "jest-mock": "23.2.0",
+ "jest-util": "23.4.0",
+ "jsdom": "11.12.0"
+ }
+ },
+ "jest-environment-node": {
+ "version": "23.4.0",
+ "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-23.4.0.tgz",
+ "integrity": "sha1-V+gO0IQd6jAxZ8zozXlSHeuv3hA=",
+ "dev": true,
+ "requires": {
+ "jest-mock": "23.2.0",
+ "jest-util": "23.4.0"
+ }
+ },
+ "jest-get-type": {
+ "version": "21.2.0",
+ "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-21.2.0.tgz",
+ "integrity": "sha512-y2fFw3C+D0yjNSDp7ab1kcd6NUYfy3waPTlD8yWkAtiocJdBRQqNoRqVfMNxgj+IjT0V5cBIHJO0z9vuSSZ43Q==",
+ "dev": true
+ },
+ "jest-haste-map": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-23.6.0.tgz",
+ "integrity": "sha512-uyNhMyl6dr6HaXGHp8VF7cK6KpC6G9z9LiMNsst+rJIZ8l7wY0tk8qwjPmEghczojZ2/ZhtEdIabZ0OQRJSGGg==",
+ "dev": true,
+ "requires": {
+ "fb-watchman": "2.0.0",
+ "graceful-fs": "4.1.11",
+ "invariant": "2.2.4",
+ "jest-docblock": "23.2.0",
+ "jest-serializer": "23.0.1",
+ "jest-worker": "23.2.0",
+ "micromatch": "2.3.11",
+ "sane": "2.5.2"
+ },
+ "dependencies": {
+ "invariant": {
+ "version": "2.2.4",
+ "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+ "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+ "dev": true,
+ "requires": {
+ "loose-envify": "1.3.1"
+ }
+ }
+ }
+ },
+ "jest-jasmine2": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-23.6.0.tgz",
+ "integrity": "sha512-pe2Ytgs1nyCs8IvsEJRiRTPC0eVYd8L/dXJGU08GFuBwZ4sYH/lmFDdOL3ZmvJR8QKqV9MFuwlsAi/EWkFUbsQ==",
+ "dev": true,
+ "requires": {
+ "babel-traverse": "6.26.0",
+ "chalk": "2.4.1",
+ "co": "4.6.0",
+ "expect": "23.6.0",
+ "is-generator-fn": "1.0.0",
+ "jest-diff": "23.6.0",
+ "jest-each": "23.6.0",
+ "jest-matcher-utils": "23.6.0",
+ "jest-message-util": "23.4.0",
+ "jest-snapshot": "23.6.0",
+ "jest-util": "23.4.0",
+ "pretty-format": "23.6.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "chalk": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "pretty-format": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz",
+ "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0",
+ "ansi-styles": "3.2.1"
+ }
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ }
+ }
+ },
+ "jest-leak-detector": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-23.6.0.tgz",
+ "integrity": "sha512-f/8zA04rsl1Nzj10HIyEsXvYlMpMPcy0QkQilVZDFOaPbv2ur71X5u2+C4ZQJGyV/xvVXtCCZ3wQ99IgQxftCg==",
+ "dev": true,
+ "requires": {
+ "pretty-format": "23.6.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "pretty-format": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz",
+ "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0",
+ "ansi-styles": "3.2.1"
+ }
+ }
+ }
+ },
+ "jest-matcher-utils": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-23.6.0.tgz",
+ "integrity": "sha512-rosyCHQfBcol4NsckTn01cdelzWLU9Cq7aaigDf8VwwpIRvWE/9zLgX2bON+FkEW69/0UuYslUe22SOdEf2nog==",
+ "dev": true,
+ "requires": {
+ "chalk": "2.4.1",
+ "jest-get-type": "22.4.3",
+ "pretty-format": "23.6.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "chalk": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "jest-get-type": {
+ "version": "22.4.3",
+ "resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz",
+ "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==",
+ "dev": true
+ },
+ "pretty-format": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz",
+ "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0",
+ "ansi-styles": "3.2.1"
+ }
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ }
+ }
+ },
+ "jest-message-util": {
+ "version": "23.4.0",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-23.4.0.tgz",
+ "integrity": "sha1-F2EMUJQjSVCNAaPR4L2iwHkIap8=",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "7.0.0",
+ "chalk": "2.4.1",
+ "micromatch": "2.3.11",
+ "slash": "1.0.0",
+ "stack-utils": "1.0.2"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "chalk": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ }
+ }
+ },
+ "jest-mock": {
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-23.2.0.tgz",
+ "integrity": "sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=",
+ "dev": true
+ },
+ "jest-regex-util": {
+ "version": "23.3.0",
+ "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-23.3.0.tgz",
+ "integrity": "sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U=",
+ "dev": true
+ },
+ "jest-resolve": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-23.6.0.tgz",
+ "integrity": "sha512-XyoRxNtO7YGpQDmtQCmZjum1MljDqUCob7XlZ6jy9gsMugHdN2hY4+Acz9Qvjz2mSsOnPSH7skBmDYCHXVZqkA==",
+ "dev": true,
+ "requires": {
+ "browser-resolve": "1.11.3",
+ "chalk": "2.4.1",
+ "realpath-native": "1.0.2"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "chalk": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ }
+ }
+ },
+ "jest-resolve-dependencies": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-23.6.0.tgz",
+ "integrity": "sha512-EkQWkFWjGKwRtRyIwRwI6rtPAEyPWlUC2MpzHissYnzJeHcyCn1Hc8j7Nn1xUVrS5C6W5+ZL37XTem4D4pLZdA==",
+ "dev": true,
+ "requires": {
+ "jest-regex-util": "23.3.0",
+ "jest-snapshot": "23.6.0"
+ }
+ },
+ "jest-runner": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-23.6.0.tgz",
+ "integrity": "sha512-kw0+uj710dzSJKU6ygri851CObtCD9cN8aNkg8jWJf4ewFyEa6kwmiH/r/M1Ec5IL/6VFa0wnAk6w+gzUtjJzA==",
+ "dev": true,
+ "requires": {
+ "exit": "0.1.2",
+ "graceful-fs": "4.1.11",
+ "jest-config": "23.6.0",
+ "jest-docblock": "23.2.0",
+ "jest-haste-map": "23.6.0",
+ "jest-jasmine2": "23.6.0",
+ "jest-leak-detector": "23.6.0",
+ "jest-message-util": "23.4.0",
+ "jest-runtime": "23.6.0",
+ "jest-util": "23.4.0",
+ "jest-worker": "23.2.0",
+ "source-map-support": "0.5.9",
+ "throat": "4.1.0"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
+ },
+ "source-map-support": {
+ "version": "0.5.9",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz",
+ "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==",
+ "dev": true,
+ "requires": {
+ "buffer-from": "1.1.1",
+ "source-map": "0.6.1"
+ }
+ }
+ }
+ },
+ "jest-runtime": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-23.6.0.tgz",
+ "integrity": "sha512-ycnLTNPT2Gv+TRhnAYAQ0B3SryEXhhRj1kA6hBPSeZaNQkJ7GbZsxOLUkwg6YmvWGdX3BB3PYKFLDQCAE1zNOw==",
+ "dev": true,
+ "requires": {
+ "babel-core": "6.26.3",
+ "babel-plugin-istanbul": "4.1.6",
+ "chalk": "2.4.1",
+ "convert-source-map": "1.6.0",
+ "exit": "0.1.2",
+ "fast-json-stable-stringify": "2.0.0",
+ "graceful-fs": "4.1.11",
+ "jest-config": "23.6.0",
+ "jest-haste-map": "23.6.0",
+ "jest-message-util": "23.4.0",
+ "jest-regex-util": "23.3.0",
+ "jest-resolve": "23.6.0",
+ "jest-snapshot": "23.6.0",
+ "jest-util": "23.4.0",
+ "jest-validate": "23.6.0",
+ "micromatch": "2.3.11",
+ "realpath-native": "1.0.2",
+ "slash": "1.0.0",
+ "strip-bom": "3.0.0",
+ "write-file-atomic": "2.3.0",
+ "yargs": "11.1.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "camelcase": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+ "dev": true
+ },
+ "chalk": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
+ }
+ },
+ "cliui": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+ "dev": true,
+ "requires": {
+ "string-width": "2.1.1",
+ "strip-ansi": "4.0.0",
+ "wrap-ansi": "2.1.0"
+ }
+ },
+ "cross-spawn": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+ "dev": true,
+ "requires": {
+ "lru-cache": "4.1.3",
+ "shebang-command": "1.2.0",
+ "which": "1.3.1"
+ }
+ },
+ "execa": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+ "dev": true,
+ "requires": {
+ "cross-spawn": "5.1.0",
+ "get-stream": "3.0.0",
+ "is-stream": "1.1.0",
+ "npm-run-path": "2.0.2",
+ "p-finally": "1.0.0",
+ "signal-exit": "3.0.2",
+ "strip-eof": "1.0.0"
+ }
+ },
+ "find-up": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+ "dev": true,
+ "requires": {
+ "locate-path": "2.0.0"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+ "dev": true
+ },
+ "jest-get-type": {
+ "version": "22.4.3",
+ "resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz",
+ "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==",
+ "dev": true
+ },
+ "jest-validate": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-23.6.0.tgz",
+ "integrity": "sha512-OFKapYxe72yz7agrDAWi8v2WL8GIfVqcbKRCLbRG9PAxtzF9b1SEDdTpytNDN12z2fJynoBwpMpvj2R39plI2A==",
+ "dev": true,
+ "requires": {
+ "chalk": "2.4.1",
+ "jest-get-type": "22.4.3",
+ "leven": "2.1.0",
+ "pretty-format": "23.6.0"
+ }
+ },
+ "os-locale": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+ "dev": true,
+ "requires": {
+ "execa": "0.7.0",
+ "lcid": "1.0.0",
+ "mem": "1.1.0"
+ }
+ },
+ "pretty-format": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz",
+ "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0",
+ "ansi-styles": "3.2.1"
+ }
+ },
+ "string-width": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+ "dev": true,
+ "requires": {
+ "is-fullwidth-code-point": "2.0.0",
+ "strip-ansi": "4.0.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0"
+ }
+ },
+ "strip-bom": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+ "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ },
+ "which-module": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+ "dev": true
+ },
+ "yargs": {
+ "version": "11.1.0",
+ "resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
+ "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
+ "dev": true,
+ "requires": {
+ "cliui": "4.1.0",
+ "decamelize": "1.2.0",
+ "find-up": "2.1.0",
+ "get-caller-file": "1.0.3",
+ "os-locale": "2.1.0",
+ "require-directory": "2.1.1",
+ "require-main-filename": "1.0.1",
+ "set-blocking": "2.0.0",
+ "string-width": "2.1.1",
+ "which-module": "2.0.0",
+ "y18n": "3.2.1",
+ "yargs-parser": "9.0.2"
+ }
+ },
+ "yargs-parser": {
+ "version": "9.0.2",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
+ "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
+ "dev": true,
+ "requires": {
+ "camelcase": "4.1.0"
+ }
+ }
+ }
+ },
+ "jest-serializer": {
+ "version": "23.0.1",
+ "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-23.0.1.tgz",
+ "integrity": "sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU=",
+ "dev": true
+ },
+ "jest-snapshot": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-23.6.0.tgz",
+ "integrity": "sha512-tM7/Bprftun6Cvj2Awh/ikS7zV3pVwjRYU2qNYS51VZHgaAMBs5l4o/69AiDHhQrj5+LA2Lq4VIvK7zYk/bswg==",
+ "dev": true,
+ "requires": {
+ "babel-types": "6.26.0",
+ "chalk": "2.4.1",
+ "jest-diff": "23.6.0",
+ "jest-matcher-utils": "23.6.0",
+ "jest-message-util": "23.4.0",
+ "jest-resolve": "23.6.0",
+ "mkdirp": "0.5.1",
+ "natural-compare": "1.4.0",
+ "pretty-format": "23.6.0",
+ "semver": "5.5.1"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "chalk": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "pretty-format": {
+ "version": "23.6.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.6.0.tgz",
+ "integrity": "sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0",
+ "ansi-styles": "3.2.1"
+ }
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ }
+ }
+ },
+ "jest-util": {
+ "version": "23.4.0",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-23.4.0.tgz",
+ "integrity": "sha1-TQY8uSe68KI4Mf9hvsLLv0l5NWE=",
+ "dev": true,
+ "requires": {
+ "callsites": "2.0.0",
+ "chalk": "2.4.1",
+ "graceful-fs": "4.1.11",
+ "is-ci": "1.1.0",
+ "jest-message-util": "23.4.0",
+ "mkdirp": "0.5.1",
+ "slash": "1.0.0",
+ "source-map": "0.6.1"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "callsites": {
+ "version": "2.0.0",
+ "resolved": "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+ "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+ "dev": true
+ },
+ "chalk": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ }
+ }
+ },
+ "jest-validate": {
+ "version": "21.2.1",
+ "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-21.2.1.tgz",
+ "integrity": "sha512-k4HLI1rZQjlU+EC682RlQ6oZvLrE5SCh3brseQc24vbZTxzT/k/3urar5QMCVgjadmSO7lECeGdc6YxnM3yEGg==",
+ "dev": true,
+ "requires": {
+ "chalk": "2.3.0",
+ "jest-get-type": "21.2.0",
+ "leven": "2.1.0",
+ "pretty-format": "21.2.1"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+ "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "chalk": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
+ "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.0",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "4.5.0"
+ }
+ },
+ "supports-color": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+ "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+ "dev": true,
+ "requires": {
+ "has-flag": "2.0.0"
+ }
+ }
+ }
+ },
+ "jest-watcher": {
+ "version": "23.4.0",
+ "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-23.4.0.tgz",
+ "integrity": "sha1-0uKM50+NrWxq/JIrksq+9u0FyRw=",
+ "dev": true,
+ "requires": {
+ "ansi-escapes": "3.0.0",
+ "chalk": "2.4.1",
+ "string-length": "2.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "chalk": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ }
+ }
+ },
+ "jest-worker": {
+ "version": "23.2.0",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-23.2.0.tgz",
+ "integrity": "sha1-+vcGqNo2+uYOsmlXJX+ntdjqArk=",
+ "dev": true,
+ "requires": {
+ "merge-stream": "1.0.1"
+ }
+ },
+ "js-base64": {
+ "version": "2.4.9",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.9.tgz",
"integrity": "sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ=="
},
@@ -2470,8 +5148,8 @@
"integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
"dev": true,
"requires": {
- "argparse": "^1.0.7",
- "esprima": "^4.0.0"
+ "argparse": "1.0.9",
+ "esprima": "4.0.0"
}
},
"jsbn": {
@@ -2480,6 +5158,48 @@
"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
"optional": true
},
+ "jsdom": {
+ "version": "11.12.0",
+ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
+ "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
+ "dev": true,
+ "requires": {
+ "abab": "2.0.0",
+ "acorn": "5.7.3",
+ "acorn-globals": "4.3.0",
+ "array-equal": "1.0.0",
+ "cssom": "0.3.4",
+ "cssstyle": "1.1.1",
+ "data-urls": "1.1.0",
+ "domexception": "1.0.1",
+ "escodegen": "1.11.0",
+ "html-encoding-sniffer": "1.0.2",
+ "left-pad": "1.3.0",
+ "nwsapi": "2.0.9",
+ "parse5": "4.0.0",
+ "pn": "1.1.0",
+ "request": "2.87.0",
+ "request-promise-native": "1.0.5",
+ "sax": "1.2.4",
+ "symbol-tree": "3.2.2",
+ "tough-cookie": "2.3.4",
+ "w3c-hr-time": "1.0.1",
+ "webidl-conversions": "4.0.2",
+ "whatwg-encoding": "1.0.5",
+ "whatwg-mimetype": "2.3.0",
+ "whatwg-url": "6.5.0",
+ "ws": "5.2.2",
+ "xml-name-validator": "3.0.0"
+ },
+ "dependencies": {
+ "acorn": {
+ "version": "5.7.3",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+ "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+ "dev": true
+ }
+ }
+ },
"jsesc": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
@@ -2502,7 +5222,7 @@
"integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
"dev": true,
"requires": {
- "jsonify": "~0.0.0"
+ "jsonify": "0.0.0"
}
},
"json-stringify-safe": {
@@ -2510,14 +5230,11 @@
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
},
- "jsonfile": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
- "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
- "dev": true,
- "requires": {
- "graceful-fs": "^4.1.6"
- }
+ "json5": {
+ "version": "0.5.1",
+ "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+ "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+ "dev": true
},
"jsonify": {
"version": "0.0.0",
@@ -2542,31 +5259,43 @@
"integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=",
"dev": true,
"requires": {
- "array-includes": "^3.0.3"
+ "array-includes": "3.0.3"
+ }
+ },
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "1.1.6"
}
},
+ "kleur": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/kleur/-/kleur-2.0.2.tgz",
+ "integrity": "sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ==",
+ "dev": true
+ },
"langmap": {
"version": "0.0.16",
"resolved": "https://registry.npmjs.org/langmap/-/langmap-0.0.16.tgz",
"integrity": "sha512-AtYvBK7BsDvWwnSfmO7CfgeUy7GUT1wK3QX8eKH/Ey/eXodqoHuAtvdQ82hmWD9QVFVKnuiNjym9fGY4qSJeLA=="
},
- "lazystream": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
- "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
- "dev": true,
- "requires": {
- "readable-stream": "^2.0.5"
- }
- },
"lcid": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
"requires": {
- "invert-kv": "^1.0.0"
+ "invert-kv": "1.0.0"
}
},
+ "left-pad": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
+ "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
+ "dev": true
+ },
"leven": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
@@ -2579,8 +5308,8 @@
"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
"dev": true,
"requires": {
- "prelude-ls": "~1.1.2",
- "type-check": "~0.3.2"
+ "prelude-ls": "1.1.2",
+ "type-check": "0.3.2"
}
},
"line-height": {
@@ -2588,7 +5317,7 @@
"resolved": "https://registry.npmjs.org/line-height/-/line-height-0.3.1.tgz",
"integrity": "sha1-SxIF7d4YKHKl76PI9iCzGHqcVMk=",
"requires": {
- "computed-style": "~0.1.3"
+ "computed-style": "0.1.4"
}
},
"lint-staged": {
@@ -2597,21 +5326,21 @@
"integrity": "sha512-C/Zxslg0VRbsxwmCu977iIs+QyrmW2cyRCPUV5NDFYOH/jtRFHH8ch7ua2fH0voI/nVC3Tpg7DykfgMZySliKw==",
"dev": true,
"requires": {
- "app-root-path": "^2.0.0",
- "chalk": "^2.1.0",
- "commander": "^2.11.0",
- "cosmiconfig": "^1.1.0",
- "execa": "^0.8.0",
- "is-glob": "^4.0.0",
- "jest-validate": "^21.1.0",
- "listr": "^0.12.0",
- "lodash": "^4.17.4",
- "log-symbols": "^2.0.0",
- "minimatch": "^3.0.0",
- "npm-which": "^3.0.1",
- "p-map": "^1.1.1",
+ "app-root-path": "2.0.1",
+ "chalk": "2.3.0",
+ "commander": "2.13.0",
+ "cosmiconfig": "1.1.0",
+ "execa": "0.8.0",
+ "is-glob": "4.0.0",
+ "jest-validate": "21.2.1",
+ "listr": "0.12.0",
+ "lodash": "4.17.10",
+ "log-symbols": "2.2.0",
+ "minimatch": "3.0.4",
+ "npm-which": "3.0.1",
+ "p-map": "1.2.0",
"staged-git-files": "0.0.4",
- "stringify-object": "^3.2.0"
+ "stringify-object": "3.2.1"
},
"dependencies": {
"ansi-styles": {
@@ -2620,7 +5349,7 @@
"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
"dev": true,
"requires": {
- "color-convert": "^1.9.0"
+ "color-convert": "1.9.1"
}
},
"chalk": {
@@ -2629,9 +5358,9 @@
"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
"dev": true,
"requires": {
- "ansi-styles": "^3.1.0",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^4.0.0"
+ "ansi-styles": "3.2.0",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "4.5.0"
}
},
"supports-color": {
@@ -2640,7 +5369,7 @@
"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
"dev": true,
"requires": {
- "has-flag": "^2.0.0"
+ "has-flag": "2.0.0"
}
}
}
@@ -2651,22 +5380,22 @@
"integrity": "sha1-a84sD1YD+klYDqF81qAMwOX6RRo=",
"dev": true,
"requires": {
- "chalk": "^1.1.3",
- "cli-truncate": "^0.2.1",
- "figures": "^1.7.0",
- "indent-string": "^2.1.0",
- "is-promise": "^2.1.0",
- "is-stream": "^1.1.0",
- "listr-silent-renderer": "^1.1.1",
- "listr-update-renderer": "^0.2.0",
- "listr-verbose-renderer": "^0.4.0",
- "log-symbols": "^1.0.2",
- "log-update": "^1.0.2",
- "ora": "^0.2.3",
- "p-map": "^1.1.1",
- "rxjs": "^5.0.0-beta.11",
- "stream-to-observable": "^0.1.0",
- "strip-ansi": "^3.0.1"
+ "chalk": "1.1.3",
+ "cli-truncate": "0.2.1",
+ "figures": "1.7.0",
+ "indent-string": "2.1.0",
+ "is-promise": "2.1.0",
+ "is-stream": "1.1.0",
+ "listr-silent-renderer": "1.1.1",
+ "listr-update-renderer": "0.2.0",
+ "listr-verbose-renderer": "0.4.1",
+ "log-symbols": "1.0.2",
+ "log-update": "1.0.2",
+ "ora": "0.2.3",
+ "p-map": "1.2.0",
+ "rxjs": "5.5.6",
+ "stream-to-observable": "0.1.0",
+ "strip-ansi": "3.0.1"
},
"dependencies": {
"figures": {
@@ -2675,8 +5404,8 @@
"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
"dev": true,
"requires": {
- "escape-string-regexp": "^1.0.5",
- "object-assign": "^4.1.0"
+ "escape-string-regexp": "1.0.5",
+ "object-assign": "4.1.1"
}
},
"log-symbols": {
@@ -2685,7 +5414,7 @@
"integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
"dev": true,
"requires": {
- "chalk": "^1.0.0"
+ "chalk": "1.1.3"
}
}
}
@@ -2702,14 +5431,14 @@
"integrity": "sha1-yoDhd5tOcCZoB+ju0a1qvjmFUPk=",
"dev": true,
"requires": {
- "chalk": "^1.1.3",
- "cli-truncate": "^0.2.1",
- "elegant-spinner": "^1.0.1",
- "figures": "^1.7.0",
- "indent-string": "^3.0.0",
- "log-symbols": "^1.0.2",
- "log-update": "^1.0.2",
- "strip-ansi": "^3.0.1"
+ "chalk": "1.1.3",
+ "cli-truncate": "0.2.1",
+ "elegant-spinner": "1.0.1",
+ "figures": "1.7.0",
+ "indent-string": "3.2.0",
+ "log-symbols": "1.0.2",
+ "log-update": "1.0.2",
+ "strip-ansi": "3.0.1"
},
"dependencies": {
"figures": {
@@ -2718,8 +5447,8 @@
"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
"dev": true,
"requires": {
- "escape-string-regexp": "^1.0.5",
- "object-assign": "^4.1.0"
+ "escape-string-regexp": "1.0.5",
+ "object-assign": "4.1.1"
}
},
"indent-string": {
@@ -2734,7 +5463,7 @@
"integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
"dev": true,
"requires": {
- "chalk": "^1.0.0"
+ "chalk": "1.1.3"
}
}
}
@@ -2745,10 +5474,10 @@
"integrity": "sha1-ggb0z21S3cWCfl/RSYng6WWTOjU=",
"dev": true,
"requires": {
- "chalk": "^1.1.3",
- "cli-cursor": "^1.0.2",
- "date-fns": "^1.27.2",
- "figures": "^1.7.0"
+ "chalk": "1.1.3",
+ "cli-cursor": "1.0.2",
+ "date-fns": "1.29.0",
+ "figures": "1.7.0"
},
"dependencies": {
"cli-cursor": {
@@ -2757,7 +5486,7 @@
"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
"dev": true,
"requires": {
- "restore-cursor": "^1.0.1"
+ "restore-cursor": "1.0.1"
}
},
"figures": {
@@ -2766,8 +5495,8 @@
"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
"dev": true,
"requires": {
- "escape-string-regexp": "^1.0.5",
- "object-assign": "^4.1.0"
+ "escape-string-regexp": "1.0.5",
+ "object-assign": "4.1.1"
}
},
"onetime": {
@@ -2782,37 +5511,22 @@
"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
"dev": true,
"requires": {
- "exit-hook": "^1.0.0",
- "onetime": "^1.0.0"
+ "exit-hook": "1.1.1",
+ "onetime": "1.1.0"
}
}
}
},
- "load-bmfont": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.3.0.tgz",
- "integrity": "sha1-u358cQ3mvK/LE8s7jIHgwBMey8k=",
- "dev": true,
- "requires": {
- "buffer-equal": "0.0.1",
- "mime": "^1.3.4",
- "parse-bmfont-ascii": "^1.0.3",
- "parse-bmfont-binary": "^1.0.5",
- "parse-bmfont-xml": "^1.1.0",
- "xhr": "^2.0.1",
- "xtend": "^4.0.0"
- }
- },
"load-json-file": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"requires": {
- "graceful-fs": "^4.1.2",
- "parse-json": "^2.2.0",
- "pify": "^2.0.0",
- "pinkie-promise": "^2.0.0",
- "strip-bom": "^2.0.0"
+ "graceful-fs": "4.1.11",
+ "parse-json": "2.2.0",
+ "pify": "2.3.0",
+ "pinkie-promise": "2.0.1",
+ "strip-bom": "2.0.0"
}
},
"locate-path": {
@@ -2821,8 +5535,8 @@
"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
"dev": true,
"requires": {
- "p-locate": "^2.0.0",
- "path-exists": "^3.0.0"
+ "p-locate": "2.0.0",
+ "path-exists": "3.0.0"
},
"dependencies": {
"path-exists": {
@@ -2854,24 +5568,24 @@
"integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU=",
"dev": true
},
- "lodash.get": {
- "version": "4.4.2",
- "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
- "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
- "dev": true
- },
"lodash.mergewith": {
"version": "4.6.1",
"resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
"integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ=="
},
+ "lodash.sortby": {
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+ "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+ "dev": true
+ },
"log-symbols": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
"integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
"dev": true,
"requires": {
- "chalk": "^2.0.1"
+ "chalk": "2.3.0"
},
"dependencies": {
"ansi-styles": {
@@ -2880,7 +5594,7 @@
"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
"dev": true,
"requires": {
- "color-convert": "^1.9.0"
+ "color-convert": "1.9.1"
}
},
"chalk": {
@@ -2889,9 +5603,9 @@
"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
"dev": true,
"requires": {
- "ansi-styles": "^3.1.0",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^4.0.0"
+ "ansi-styles": "3.2.0",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "4.5.0"
}
},
"supports-color": {
@@ -2900,7 +5614,7 @@
"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
"dev": true,
"requires": {
- "has-flag": "^2.0.0"
+ "has-flag": "2.0.0"
}
}
}
@@ -2911,8 +5625,8 @@
"integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=",
"dev": true,
"requires": {
- "ansi-escapes": "^1.0.0",
- "cli-cursor": "^1.0.2"
+ "ansi-escapes": "1.4.0",
+ "cli-cursor": "1.0.2"
},
"dependencies": {
"ansi-escapes": {
@@ -2927,7 +5641,7 @@
"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
"dev": true,
"requires": {
- "restore-cursor": "^1.0.1"
+ "restore-cursor": "1.0.1"
}
},
"onetime": {
@@ -2942,8 +5656,8 @@
"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
"dev": true,
"requires": {
- "exit-hook": "^1.0.0",
- "onetime": "^1.0.0"
+ "exit-hook": "1.1.1",
+ "onetime": "1.1.0"
}
}
}
@@ -2953,7 +5667,7 @@
"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
"requires": {
- "js-tokens": "^3.0.0"
+ "js-tokens": "3.0.2"
}
},
"loud-rejection": {
@@ -2961,8 +5675,8 @@
"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
"integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
"requires": {
- "currently-unhandled": "^0.4.1",
- "signal-exit": "^3.0.0"
+ "currently-unhandled": "0.4.1",
+ "signal-exit": "3.0.2"
}
},
"lowercase-keys": {
@@ -2975,8 +5689,17 @@
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
"integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
"requires": {
- "pseudomap": "^1.0.2",
- "yallist": "^2.1.2"
+ "pseudomap": "1.0.2",
+ "yallist": "2.1.2"
+ }
+ },
+ "makeerror": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+ "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+ "dev": true,
+ "requires": {
+ "tmpl": "1.0.4"
}
},
"makeup-screenreader-trap": {
@@ -2984,34 +5707,79 @@
"resolved": "https://registry.npmjs.org/makeup-screenreader-trap/-/makeup-screenreader-trap-0.0.5.tgz",
"integrity": "sha512-I2rb0Prijbz3eyko3sZY10tjF5ZLUol2mpbRbl/XJCLUybMZCr5c0iKg4N+pGsCONPWITvcfIS/qtEGQUOYUmQ==",
"requires": {
- "custom-event-polyfill": "~0.3"
+ "custom-event-polyfill": "0.3.0"
}
},
+ "map-cache": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+ "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+ "dev": true
+ },
"map-obj": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
},
+ "map-visit": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+ "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+ "dev": true,
+ "requires": {
+ "object-visit": "1.0.1"
+ }
+ },
"material-colors": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.5.tgz",
"integrity": "sha1-UpJZPmdUyxvMK5gDDk4Najr8nqE="
},
+ "math-random": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
+ "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
+ "dev": true
+ },
+ "mem": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+ "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+ "dev": true,
+ "requires": {
+ "mimic-fn": "1.1.0"
+ }
+ },
"meow": {
"version": "3.7.0",
"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
"requires": {
- "camelcase-keys": "^2.0.0",
- "decamelize": "^1.1.2",
- "loud-rejection": "^1.0.0",
- "map-obj": "^1.0.1",
- "minimist": "^1.1.3",
- "normalize-package-data": "^2.3.4",
- "object-assign": "^4.0.1",
- "read-pkg-up": "^1.0.1",
- "redent": "^1.0.0",
- "trim-newlines": "^1.0.0"
+ "camelcase-keys": "2.1.0",
+ "decamelize": "1.2.0",
+ "loud-rejection": "1.6.0",
+ "map-obj": "1.0.1",
+ "minimist": "1.2.0",
+ "normalize-package-data": "2.4.0",
+ "object-assign": "4.1.1",
+ "read-pkg-up": "1.0.1",
+ "redent": "1.0.0",
+ "trim-newlines": "1.0.0"
+ }
+ },
+ "merge": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+ "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
+ "dev": true
+ },
+ "merge-stream": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
+ "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
+ "dev": true,
+ "requires": {
+ "readable-stream": "2.3.6"
}
},
"meteor-node-stubs": {
@@ -3019,28 +5787,28 @@
"resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-0.3.3.tgz",
"integrity": "sha512-TI1aQRK0vqs94OCkUMkmf5lXNWfIsjSaEDP1inUuwRGt9w8/S2V+HdRikz9r1k/gew+7NcJieaqHsHX7pSTEgA==",
"requires": {
- "assert": "^1.4.1",
- "browserify-zlib": "^0.1.4",
- "buffer": "^4.9.1",
- "console-browserify": "^1.1.0",
- "constants-browserify": "^1.0.0",
- "crypto-browserify": "^3.11.0",
- "domain-browser": "^1.1.7",
- "events": "^1.1.1",
+ "assert": "1.4.1",
+ "browserify-zlib": "0.1.4",
+ "buffer": "4.9.1",
+ "console-browserify": "1.1.0",
+ "constants-browserify": "1.0.0",
+ "crypto-browserify": "3.12.0",
+ "domain-browser": "1.2.0",
+ "events": "1.1.1",
"https-browserify": "0.0.1",
- "os-browserify": "^0.2.1",
+ "os-browserify": "0.2.1",
"path-browserify": "0.0.0",
- "process": "^0.11.9",
- "punycode": "^1.4.1",
- "querystring-es3": "^0.2.1",
+ "process": "0.11.10",
+ "punycode": "1.4.1",
+ "querystring-es3": "0.2.1",
"readable-stream": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12",
- "stream-browserify": "^2.0.1",
- "stream-http": "^2.8.0",
- "string_decoder": "^1.1.0",
- "timers-browserify": "^1.4.2",
+ "stream-browserify": "2.0.1",
+ "stream-http": "2.8.0",
+ "string_decoder": "1.1.0",
+ "timers-browserify": "1.4.2",
"tty-browserify": "0.0.0",
- "url": "^0.11.0",
- "util": "^0.10.3",
+ "url": "0.11.0",
+ "util": "0.10.3",
"vm-browserify": "0.0.4"
},
"dependencies": {
@@ -3049,9 +5817,9 @@
"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
"integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
"requires": {
- "bn.js": "^4.0.0",
- "inherits": "^2.0.1",
- "minimalistic-assert": "^1.0.0"
+ "bn.js": "4.11.8",
+ "inherits": "2.0.1",
+ "minimalistic-assert": "1.0.0"
}
},
"assert": {
@@ -3082,7 +5850,7 @@
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"requires": {
- "balanced-match": "^1.0.0",
+ "balanced-match": "1.0.0",
"concat-map": "0.0.1"
}
},
@@ -3096,12 +5864,12 @@
"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz",
"integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==",
"requires": {
- "buffer-xor": "^1.0.3",
- "cipher-base": "^1.0.0",
- "create-hash": "^1.1.0",
- "evp_bytestokey": "^1.0.3",
- "inherits": "^2.0.1",
- "safe-buffer": "^5.0.1"
+ "buffer-xor": "1.0.3",
+ "cipher-base": "1.0.4",
+ "create-hash": "1.1.3",
+ "evp_bytestokey": "1.0.3",
+ "inherits": "2.0.1",
+ "safe-buffer": "5.1.1"
}
},
"browserify-cipher": {
@@ -3109,9 +5877,9 @@
"resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
"integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
"requires": {
- "browserify-aes": "^1.0.4",
- "browserify-des": "^1.0.0",
- "evp_bytestokey": "^1.0.0"
+ "browserify-aes": "1.1.1",
+ "browserify-des": "1.0.0",
+ "evp_bytestokey": "1.0.3"
}
},
"browserify-des": {
@@ -3119,9 +5887,9 @@
"resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
"integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
"requires": {
- "cipher-base": "^1.0.1",
- "des.js": "^1.0.0",
- "inherits": "^2.0.1"
+ "cipher-base": "1.0.4",
+ "des.js": "1.0.0",
+ "inherits": "2.0.1"
}
},
"browserify-rsa": {
@@ -3129,8 +5897,8 @@
"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
"requires": {
- "bn.js": "^4.1.0",
- "randombytes": "^2.0.1"
+ "bn.js": "4.11.8",
+ "randombytes": "2.0.6"
}
},
"browserify-sign": {
@@ -3138,13 +5906,13 @@
"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
"integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
"requires": {
- "bn.js": "^4.1.1",
- "browserify-rsa": "^4.0.0",
- "create-hash": "^1.1.0",
- "create-hmac": "^1.1.2",
- "elliptic": "^6.0.0",
- "inherits": "^2.0.1",
- "parse-asn1": "^5.0.0"
+ "bn.js": "4.11.8",
+ "browserify-rsa": "4.0.1",
+ "create-hash": "1.1.3",
+ "create-hmac": "1.1.6",
+ "elliptic": "6.4.0",
+ "inherits": "2.0.1",
+ "parse-asn1": "5.1.0"
}
},
"browserify-zlib": {
@@ -3152,7 +5920,7 @@
"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
"integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
"requires": {
- "pako": "~0.2.0"
+ "pako": "0.2.9"
}
},
"buffer": {
@@ -3160,9 +5928,9 @@
"resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
"requires": {
- "base64-js": "^1.0.2",
- "ieee754": "^1.1.4",
- "isarray": "^1.0.0"
+ "base64-js": "1.2.3",
+ "ieee754": "1.1.8",
+ "isarray": "1.0.0"
}
},
"buffer-xor": {
@@ -3180,8 +5948,8 @@
"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
"requires": {
- "inherits": "^2.0.1",
- "safe-buffer": "^5.0.1"
+ "inherits": "2.0.1",
+ "safe-buffer": "5.1.1"
}
},
"concat-map": {
@@ -3194,7 +5962,7 @@
"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
"requires": {
- "date-now": "^0.1.4"
+ "date-now": "0.1.4"
}
},
"constants-browserify": {
@@ -3207,8 +5975,8 @@
"resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
"integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
"requires": {
- "bn.js": "^4.1.0",
- "elliptic": "^6.0.0"
+ "bn.js": "4.11.8",
+ "elliptic": "6.4.0"
}
},
"create-hash": {
@@ -3216,10 +5984,10 @@
"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
"integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
"requires": {
- "cipher-base": "^1.0.1",
- "inherits": "^2.0.1",
- "ripemd160": "^2.0.0",
- "sha.js": "^2.4.0"
+ "cipher-base": "1.0.4",
+ "inherits": "2.0.1",
+ "ripemd160": "2.0.1",
+ "sha.js": "2.4.10"
}
},
"create-hmac": {
@@ -3227,12 +5995,12 @@
"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
"integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
"requires": {
- "cipher-base": "^1.0.3",
- "create-hash": "^1.1.0",
- "inherits": "^2.0.1",
- "ripemd160": "^2.0.0",
- "safe-buffer": "^5.0.1",
- "sha.js": "^2.4.8"
+ "cipher-base": "1.0.4",
+ "create-hash": "1.1.3",
+ "inherits": "2.0.1",
+ "ripemd160": "2.0.1",
+ "safe-buffer": "5.1.1",
+ "sha.js": "2.4.10"
}
},
"crypto-browserify": {
@@ -3240,17 +6008,17 @@
"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
"requires": {
- "browserify-cipher": "^1.0.0",
- "browserify-sign": "^4.0.0",
- "create-ecdh": "^4.0.0",
- "create-hash": "^1.1.0",
- "create-hmac": "^1.1.0",
- "diffie-hellman": "^5.0.0",
- "inherits": "^2.0.1",
- "pbkdf2": "^3.0.3",
- "public-encrypt": "^4.0.0",
- "randombytes": "^2.0.0",
- "randomfill": "^1.0.3"
+ "browserify-cipher": "1.0.0",
+ "browserify-sign": "4.0.4",
+ "create-ecdh": "4.0.0",
+ "create-hash": "1.1.3",
+ "create-hmac": "1.1.6",
+ "diffie-hellman": "5.0.2",
+ "inherits": "2.0.1",
+ "pbkdf2": "3.0.14",
+ "public-encrypt": "4.0.0",
+ "randombytes": "2.0.6",
+ "randomfill": "1.0.4"
}
},
"date-now": {
@@ -3263,8 +6031,8 @@
"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
"integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
"requires": {
- "inherits": "^2.0.1",
- "minimalistic-assert": "^1.0.0"
+ "inherits": "2.0.1",
+ "minimalistic-assert": "1.0.0"
}
},
"diffie-hellman": {
@@ -3272,9 +6040,9 @@
"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
"integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
"requires": {
- "bn.js": "^4.1.0",
- "miller-rabin": "^4.0.0",
- "randombytes": "^2.0.0"
+ "bn.js": "4.11.8",
+ "miller-rabin": "4.0.1",
+ "randombytes": "2.0.6"
}
},
"domain-browser": {
@@ -3287,13 +6055,13 @@
"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
"integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
"requires": {
- "bn.js": "^4.4.0",
- "brorand": "^1.0.1",
- "hash.js": "^1.0.0",
- "hmac-drbg": "^1.0.0",
- "inherits": "^2.0.1",
- "minimalistic-assert": "^1.0.0",
- "minimalistic-crypto-utils": "^1.0.0"
+ "bn.js": "4.11.8",
+ "brorand": "1.1.0",
+ "hash.js": "1.1.3",
+ "hmac-drbg": "1.0.1",
+ "inherits": "2.0.1",
+ "minimalistic-assert": "1.0.0",
+ "minimalistic-crypto-utils": "1.0.1"
}
},
"events": {
@@ -3306,8 +6074,8 @@
"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
"requires": {
- "md5.js": "^1.3.4",
- "safe-buffer": "^5.1.1"
+ "md5.js": "1.3.4",
+ "safe-buffer": "5.1.1"
}
},
"fs.realpath": {
@@ -3320,12 +6088,12 @@
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
"requires": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
+ "fs.realpath": "1.0.0",
+ "inflight": "1.0.6",
+ "inherits": "2.0.1",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
}
},
"hash-base": {
@@ -3333,7 +6101,7 @@
"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
"integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
"requires": {
- "inherits": "^2.0.1"
+ "inherits": "2.0.1"
}
},
"hash.js": {
@@ -3341,8 +6109,8 @@
"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
"integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
"requires": {
- "inherits": "^2.0.3",
- "minimalistic-assert": "^1.0.0"
+ "inherits": "2.0.3",
+ "minimalistic-assert": "1.0.0"
},
"dependencies": {
"inherits": {
@@ -3357,9 +6125,9 @@
"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
"requires": {
- "hash.js": "^1.0.3",
- "minimalistic-assert": "^1.0.0",
- "minimalistic-crypto-utils": "^1.0.1"
+ "hash.js": "1.1.3",
+ "minimalistic-assert": "1.0.0",
+ "minimalistic-crypto-utils": "1.0.1"
}
},
"https-browserify": {
@@ -3382,8 +6150,8 @@
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"requires": {
- "once": "^1.3.0",
- "wrappy": "1"
+ "once": "1.4.0",
+ "wrappy": "1.0.2"
}
},
"inherits": {
@@ -3401,8 +6169,8 @@
"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
"integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
"requires": {
- "hash-base": "^3.0.0",
- "inherits": "^2.0.1"
+ "hash-base": "3.0.4",
+ "inherits": "2.0.1"
},
"dependencies": {
"hash-base": {
@@ -3410,8 +6178,8 @@
"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
"requires": {
- "inherits": "^2.0.1",
- "safe-buffer": "^5.0.1"
+ "inherits": "2.0.1",
+ "safe-buffer": "5.1.1"
}
}
}
@@ -3421,8 +6189,8 @@
"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
"requires": {
- "bn.js": "^4.0.0",
- "brorand": "^1.0.1"
+ "bn.js": "4.11.8",
+ "brorand": "1.1.0"
}
},
"minimalistic-assert": {
@@ -3440,7 +6208,7 @@
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"requires": {
- "brace-expansion": "^1.1.7"
+ "brace-expansion": "1.1.11"
}
},
"once": {
@@ -3448,7 +6216,7 @@
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"requires": {
- "wrappy": "1"
+ "wrappy": "1.0.2"
}
},
"os-browserify": {
@@ -3466,11 +6234,11 @@
"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
"integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
"requires": {
- "asn1.js": "^4.0.0",
- "browserify-aes": "^1.0.0",
- "create-hash": "^1.1.0",
- "evp_bytestokey": "^1.0.0",
- "pbkdf2": "^3.0.3"
+ "asn1.js": "4.10.1",
+ "browserify-aes": "1.1.1",
+ "create-hash": "1.1.3",
+ "evp_bytestokey": "1.0.3",
+ "pbkdf2": "3.0.14"
}
},
"path-browserify": {
@@ -3488,11 +6256,11 @@
"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
"integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==",
"requires": {
- "create-hash": "^1.1.2",
- "create-hmac": "^1.1.4",
- "ripemd160": "^2.0.1",
- "safe-buffer": "^5.0.1",
- "sha.js": "^2.4.8"
+ "create-hash": "1.1.3",
+ "create-hmac": "1.1.6",
+ "ripemd160": "2.0.1",
+ "safe-buffer": "5.1.1",
+ "sha.js": "2.4.10"
}
},
"process": {
@@ -3510,11 +6278,11 @@
"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
"integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
"requires": {
- "bn.js": "^4.1.0",
- "browserify-rsa": "^4.0.0",
- "create-hash": "^1.1.0",
- "parse-asn1": "^5.0.0",
- "randombytes": "^2.0.1"
+ "bn.js": "4.11.8",
+ "browserify-rsa": "4.0.1",
+ "create-hash": "1.1.3",
+ "parse-asn1": "5.1.0",
+ "randombytes": "2.0.6"
}
},
"punycode": {
@@ -3537,7 +6305,7 @@
"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
"integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
"requires": {
- "safe-buffer": "^5.1.0"
+ "safe-buffer": "5.1.1"
}
},
"randomfill": {
@@ -3545,20 +6313,19 @@
"resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
"requires": {
- "randombytes": "^2.0.5",
- "safe-buffer": "^5.1.0"
+ "randombytes": "2.0.6",
+ "safe-buffer": "5.1.1"
}
},
"readable-stream": {
"version": "git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12",
- "from": "readable-stream@git+https://github.com/meteor/readable-stream.git#c688cdd193549919b840e8d72a86682d91961e12",
- "requires": {
- "inherits": "~2.0.3",
- "isarray": "~1.0.0",
- "process-nextick-args": "~2.0.0",
- "safe-buffer": "~5.1.1",
- "string_decoder": "~1.1.0",
- "util-deprecate": "~1.0.1"
+ "requires": {
+ "inherits": "2.0.3",
+ "isarray": "1.0.0",
+ "process-nextick-args": "2.0.0",
+ "safe-buffer": "5.1.1",
+ "string_decoder": "1.1.0",
+ "util-deprecate": "1.0.2"
},
"dependencies": {
"inherits": {
@@ -3573,7 +6340,7 @@
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
"integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
"requires": {
- "glob": "^7.0.5"
+ "glob": "7.1.2"
}
},
"ripemd160": {
@@ -3581,8 +6348,8 @@
"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
"integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
"requires": {
- "hash-base": "^2.0.0",
- "inherits": "^2.0.1"
+ "hash-base": "2.0.2",
+ "inherits": "2.0.1"
}
},
"safe-buffer": {
@@ -3595,8 +6362,8 @@
"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz",
"integrity": "sha512-vnwmrFDlOExK4Nm16J2KMWHLrp14lBrjxMxBJpu++EnsuBmpiYaM/MEs46Vxxm/4FvdP5yTwuCTO9it5FSjrqA==",
"requires": {
- "inherits": "^2.0.1",
- "safe-buffer": "^5.0.1"
+ "inherits": "2.0.1",
+ "safe-buffer": "5.1.1"
}
},
"stream-browserify": {
@@ -3604,8 +6371,8 @@
"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
"integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
"requires": {
- "inherits": "~2.0.1",
- "readable-stream": "^2.0.2"
+ "inherits": "2.0.1",
+ "readable-stream": "2.3.6"
},
"dependencies": {
"readable-stream": {
@@ -3613,13 +6380,13 @@
"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"requires": {
- "core-util-is": "~1.0.0",
- "inherits": "~2.0.3",
- "isarray": "~1.0.0",
- "process-nextick-args": "~2.0.0",
- "safe-buffer": "~5.1.1",
- "string_decoder": "~1.1.1",
- "util-deprecate": "~1.0.1"
+ "core-util-is": "1.0.2",
+ "inherits": "2.0.3",
+ "isarray": "1.0.0",
+ "process-nextick-args": "2.0.0",
+ "safe-buffer": "5.1.1",
+ "string_decoder": "1.1.1",
+ "util-deprecate": "1.0.2"
},
"dependencies": {
"inherits": {
@@ -3634,7 +6401,7 @@
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
- "safe-buffer": "~5.1.0"
+ "safe-buffer": "5.1.1"
}
}
}
@@ -3644,11 +6411,11 @@
"resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz",
"integrity": "sha512-sZOFxI/5xw058XIRHl4dU3dZ+TTOIGJR78Dvo0oEAejIt4ou27k+3ne1zYmCV+v7UucbxIFQuOgnkTVHh8YPnw==",
"requires": {
- "builtin-status-codes": "^3.0.0",
- "inherits": "^2.0.1",
- "readable-stream": "^2.3.3",
- "to-arraybuffer": "^1.0.0",
- "xtend": "^4.0.0"
+ "builtin-status-codes": "3.0.0",
+ "inherits": "2.0.1",
+ "readable-stream": "2.3.6",
+ "to-arraybuffer": "1.0.1",
+ "xtend": "4.0.1"
},
"dependencies": {
"readable-stream": {
@@ -3656,13 +6423,13 @@
"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"requires": {
- "core-util-is": "~1.0.0",
- "inherits": "~2.0.3",
- "isarray": "~1.0.0",
- "process-nextick-args": "~2.0.0",
- "safe-buffer": "~5.1.1",
- "string_decoder": "~1.1.1",
- "util-deprecate": "~1.0.1"
+ "core-util-is": "1.0.2",
+ "inherits": "2.0.3",
+ "isarray": "1.0.0",
+ "process-nextick-args": "2.0.0",
+ "safe-buffer": "5.1.1",
+ "string_decoder": "1.1.1",
+ "util-deprecate": "1.0.2"
},
"dependencies": {
"inherits": {
@@ -3677,7 +6444,7 @@
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
- "safe-buffer": "~5.1.0"
+ "safe-buffer": "5.1.1"
}
}
}
@@ -3687,7 +6454,7 @@
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.0.tgz",
"integrity": "sha512-8zQpRF6juocE69ae7CSPmYEGJe4VCXwP6S6dxUWI7i53Gwv54/ec41fiUA+X7BPGGv7fRSQJjBQVa0gomGaOgg==",
"requires": {
- "safe-buffer": "~5.1.0"
+ "safe-buffer": "5.1.1"
}
},
"timers-browserify": {
@@ -3695,7 +6462,7 @@
"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
"integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=",
"requires": {
- "process": "~0.11.0"
+ "process": "0.11.10"
}
},
"to-arraybuffer": {
@@ -3757,11 +6524,52 @@
}
}
},
- "mime": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
- "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
- "dev": true
+ "micromatch": {
+ "version": "2.3.11",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+ "dev": true,
+ "requires": {
+ "arr-diff": "2.0.0",
+ "array-unique": "0.2.1",
+ "braces": "1.8.5",
+ "expand-brackets": "0.1.5",
+ "extglob": "0.3.2",
+ "filename-regex": "2.0.1",
+ "is-extglob": "1.0.0",
+ "is-glob": "2.0.1",
+ "kind-of": "3.2.2",
+ "normalize-path": "2.1.1",
+ "object.omit": "2.0.1",
+ "parse-glob": "3.0.4",
+ "regex-cache": "0.4.4"
+ },
+ "dependencies": {
+ "is-extglob": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+ "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+ "dev": true
+ },
+ "is-glob": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+ "dev": true,
+ "requires": {
+ "is-extglob": "1.0.0"
+ }
+ },
+ "normalize-path": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+ "dev": true,
+ "requires": {
+ "remove-trailing-separator": "1.1.0"
+ }
+ }
+ }
},
"mime-db": {
"version": "1.36.0",
@@ -3773,7 +6581,7 @@
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz",
"integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==",
"requires": {
- "mime-db": "~1.36.0"
+ "mime-db": "1.36.0"
}
},
"mimic-fn": {
@@ -3787,21 +6595,12 @@
"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.0.tgz",
"integrity": "sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4="
},
- "min-document": {
- "version": "2.19.0",
- "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
- "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
- "dev": true,
- "requires": {
- "dom-walk": "^0.1.0"
- }
- },
"minimatch": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"requires": {
- "brace-expansion": "^1.1.7"
+ "brace-expansion": "1.1.11"
}
},
"minimist": {
@@ -3809,6 +6608,27 @@
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
},
+ "mixin-deep": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+ "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+ "dev": true,
+ "requires": {
+ "for-in": "1.0.2",
+ "is-extendable": "1.0.1"
+ },
+ "dependencies": {
+ "is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "dev": true,
+ "requires": {
+ "is-plain-object": "2.0.4"
+ }
+ }
+ }
+ },
"mkdirp": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
@@ -3840,6 +6660,45 @@
"resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
"integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw=="
},
+ "nanomatch": {
+ "version": "1.2.13",
+ "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+ "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+ "dev": true,
+ "requires": {
+ "arr-diff": "4.0.0",
+ "array-unique": "0.3.2",
+ "define-property": "2.0.2",
+ "extend-shallow": "3.0.2",
+ "fragment-cache": "0.2.1",
+ "is-windows": "1.0.2",
+ "kind-of": "6.0.2",
+ "object.pick": "1.3.0",
+ "regex-not": "1.0.2",
+ "snapdragon": "0.8.2",
+ "to-regex": "3.0.2"
+ },
+ "dependencies": {
+ "arr-diff": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+ "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+ "dev": true
+ },
+ "array-unique": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+ "dev": true
+ },
+ "kind-of": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+ "dev": true
+ }
+ }
+ },
"natural-compare": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -3856,8 +6715,8 @@
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
"integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
"requires": {
- "encoding": "^0.1.11",
- "is-stream": "^1.0.1"
+ "encoding": "0.1.12",
+ "is-stream": "1.1.0"
}
},
"node-gyp": {
@@ -3865,18 +6724,18 @@
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
"integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
"requires": {
- "fstream": "^1.0.0",
- "glob": "^7.0.3",
- "graceful-fs": "^4.1.2",
- "mkdirp": "^0.5.0",
- "nopt": "2 || 3",
- "npmlog": "0 || 1 || 2 || 3 || 4",
- "osenv": "0",
- "request": "^2.87.0",
- "rimraf": "2",
- "semver": "~5.3.0",
- "tar": "^2.0.0",
- "which": "1"
+ "fstream": "1.0.11",
+ "glob": "7.1.3",
+ "graceful-fs": "4.1.11",
+ "mkdirp": "0.5.1",
+ "nopt": "3.0.6",
+ "npmlog": "4.1.2",
+ "osenv": "0.1.5",
+ "request": "2.87.0",
+ "rimraf": "2.6.2",
+ "semver": "5.3.0",
+ "tar": "2.2.1",
+ "which": "1.3.1"
},
"dependencies": {
"semver": {
@@ -3886,13 +6745,22 @@
}
}
},
- "node-resemble-js": {
- "version": "0.0.5",
- "resolved": "https://registry.npmjs.org/node-resemble-js/-/node-resemble-js-0.0.5.tgz",
- "integrity": "sha1-rLOxWOCxaiQahuyJO+Hfx9MzR2Q=",
+ "node-int64": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+ "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+ "dev": true
+ },
+ "node-notifier": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.3.0.tgz",
+ "integrity": "sha512-AhENzCSGZnZJgBARsUjnQ7DnZbzyP+HxlVXuD0xqAnvL8q+OqtSX7lGg9e8nHzwXkMMXNdVeqq4E2M3EUAqX6Q==",
"dev": true,
"requires": {
- "pngjs": "~2.2.0"
+ "growly": "1.3.0",
+ "semver": "5.5.1",
+ "shellwords": "0.1.1",
+ "which": "1.3.1"
}
},
"node-sass": {
@@ -3900,35 +6768,25 @@
"resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.3.tgz",
"integrity": "sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww==",
"requires": {
- "async-foreach": "^0.1.3",
- "chalk": "^1.1.1",
- "cross-spawn": "^3.0.0",
- "gaze": "^1.0.0",
- "get-stdin": "^4.0.1",
- "glob": "^7.0.3",
- "in-publish": "^2.0.0",
- "lodash.assign": "^4.2.0",
- "lodash.clonedeep": "^4.3.2",
- "lodash.mergewith": "^4.6.0",
- "meow": "^3.7.0",
- "mkdirp": "^0.5.1",
- "nan": "^2.10.0",
- "node-gyp": "^3.8.0",
- "npmlog": "^4.0.0",
+ "async-foreach": "0.1.3",
+ "chalk": "1.1.3",
+ "cross-spawn": "3.0.1",
+ "gaze": "1.1.3",
+ "get-stdin": "4.0.1",
+ "glob": "7.1.3",
+ "in-publish": "2.0.0",
+ "lodash.assign": "4.2.0",
+ "lodash.clonedeep": "4.5.0",
+ "lodash.mergewith": "4.6.1",
+ "meow": "3.7.0",
+ "mkdirp": "0.5.1",
+ "nan": "2.11.0",
+ "node-gyp": "3.8.0",
+ "npmlog": "4.1.2",
"request": "2.87.0",
- "sass-graph": "^2.2.4",
- "stdout-stream": "^1.4.0",
- "true-case-path": "^1.0.2"
- }
- },
- "nodeclient-spectre": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/nodeclient-spectre/-/nodeclient-spectre-1.0.3.tgz",
- "integrity": "sha512-Y1oMvLmR+0P/v2pXG99RKwnC3nb4fl0vmMtbPrZkRB+FE1ADZhfZpHVbBwIcQdsnJTYOpVa7y+hIFtNSv7PYNw==",
- "dev": true,
- "requires": {
- "request": "^2.83.0",
- "request-promise-native": "^1.0.5"
+ "sass-graph": "2.2.4",
+ "stdout-stream": "1.4.1",
+ "true-case-path": "1.0.3"
}
},
"nopt": {
@@ -3936,7 +6794,7 @@
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
"requires": {
- "abbrev": "1"
+ "abbrev": "1.1.1"
}
},
"normalize-package-data": {
@@ -3944,10 +6802,10 @@
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
"integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
"requires": {
- "hosted-git-info": "^2.1.4",
- "is-builtin-module": "^1.0.0",
- "semver": "2 || 3 || 4 || 5",
- "validate-npm-package-license": "^3.0.1"
+ "hosted-git-info": "2.7.1",
+ "is-builtin-module": "1.0.0",
+ "semver": "5.5.1",
+ "validate-npm-package-license": "3.0.4"
}
},
"normalize-path": {
@@ -3961,19 +6819,13 @@
"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
"integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI="
},
- "npm-install-package": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/npm-install-package/-/npm-install-package-2.1.0.tgz",
- "integrity": "sha1-1+/jz816sAYUuJbqUxGdyaslkSU=",
- "dev": true
- },
"npm-path": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/npm-path/-/npm-path-2.0.4.tgz",
"integrity": "sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==",
"dev": true,
"requires": {
- "which": "^1.2.10"
+ "which": "1.3.1"
}
},
"npm-run-path": {
@@ -3982,7 +6834,7 @@
"integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
"dev": true,
"requires": {
- "path-key": "^2.0.0"
+ "path-key": "2.0.1"
}
},
"npm-which": {
@@ -3991,9 +6843,9 @@
"integrity": "sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=",
"dev": true,
"requires": {
- "commander": "^2.9.0",
- "npm-path": "^2.0.2",
- "which": "^1.2.10"
+ "commander": "2.13.0",
+ "npm-path": "2.0.4",
+ "which": "1.3.1"
}
},
"npmlog": {
@@ -4001,10 +6853,10 @@
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
"requires": {
- "are-we-there-yet": "~1.1.2",
- "console-control-strings": "~1.1.0",
- "gauge": "~2.7.3",
- "set-blocking": "~2.0.0"
+ "are-we-there-yet": "1.1.5",
+ "console-control-strings": "1.1.0",
+ "gauge": "2.7.4",
+ "set-blocking": "2.0.0"
}
},
"num2fraction": {
@@ -4017,6 +6869,12 @@
"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
},
+ "nwsapi": {
+ "version": "2.0.9",
+ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.9.tgz",
+ "integrity": "sha512-nlWFSCTYQcHk/6A9FFnfhKc14c3aFhfdNBXgo8Qgi9QTBu/qg3Ww+Uiz9wMzXd1T8GFxPc2QIHB6Qtf2XFryFQ==",
+ "dev": true
+ },
"oauth-sign": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
@@ -4027,22 +6885,86 @@
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
},
+ "object-copy": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+ "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+ "dev": true,
+ "requires": {
+ "copy-descriptor": "0.1.1",
+ "define-property": "0.2.5",
+ "kind-of": "3.2.2"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "0.1.6"
+ }
+ }
+ }
+ },
"object-keys": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
"integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
"dev": true
},
- "object.assign": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
- "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+ "object-visit": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+ "dev": true,
+ "requires": {
+ "isobject": "3.0.1"
+ },
+ "dependencies": {
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "dev": true
+ }
+ }
+ },
+ "object.getownpropertydescriptors": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+ "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+ "dev": true,
+ "requires": {
+ "define-properties": "1.1.2",
+ "es-abstract": "1.10.0"
+ }
+ },
+ "object.omit": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
"dev": true,
"requires": {
- "define-properties": "^1.1.2",
- "function-bind": "^1.1.1",
- "has-symbols": "^1.0.0",
- "object-keys": "^1.0.11"
+ "for-own": "0.1.5",
+ "is-extendable": "0.1.1"
+ }
+ },
+ "object.pick": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+ "dev": true,
+ "requires": {
+ "isobject": "3.0.1"
+ },
+ "dependencies": {
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "dev": true
+ }
}
},
"once": {
@@ -4050,7 +6972,7 @@
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"requires": {
- "wrappy": "1"
+ "wrappy": "1.0.2"
}
},
"onetime": {
@@ -4059,7 +6981,7 @@
"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
"dev": true,
"requires": {
- "mimic-fn": "^1.0.0"
+ "mimic-fn": "1.1.0"
}
},
"optimist": {
@@ -4068,8 +6990,8 @@
"integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
"dev": true,
"requires": {
- "minimist": "~0.0.1",
- "wordwrap": "~0.0.2"
+ "minimist": "0.0.10",
+ "wordwrap": "0.0.3"
},
"dependencies": {
"minimist": {
@@ -4092,12 +7014,12 @@
"integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
"dev": true,
"requires": {
- "deep-is": "~0.1.3",
- "fast-levenshtein": "~2.0.4",
- "levn": "~0.3.0",
- "prelude-ls": "~1.1.2",
- "type-check": "~0.3.2",
- "wordwrap": "~1.0.0"
+ "deep-is": "0.1.3",
+ "fast-levenshtein": "2.0.6",
+ "levn": "0.3.0",
+ "prelude-ls": "1.1.2",
+ "type-check": "0.3.2",
+ "wordwrap": "1.0.0"
}
},
"ora": {
@@ -4106,10 +7028,10 @@
"integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=",
"dev": true,
"requires": {
- "chalk": "^1.1.1",
- "cli-cursor": "^1.0.2",
- "cli-spinners": "^0.1.2",
- "object-assign": "^4.0.1"
+ "chalk": "1.1.3",
+ "cli-cursor": "1.0.2",
+ "cli-spinners": "0.1.2",
+ "object-assign": "4.1.1"
},
"dependencies": {
"cli-cursor": {
@@ -4118,7 +7040,7 @@
"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
"dev": true,
"requires": {
- "restore-cursor": "^1.0.1"
+ "restore-cursor": "1.0.1"
}
},
"onetime": {
@@ -4133,8 +7055,8 @@
"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
"dev": true,
"requires": {
- "exit-hook": "^1.0.0",
- "onetime": "^1.0.0"
+ "exit-hook": "1.1.1",
+ "onetime": "1.1.0"
}
}
}
@@ -4149,7 +7071,7 @@
"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
"requires": {
- "lcid": "^1.0.0"
+ "lcid": "1.0.0"
}
},
"os-tmpdir": {
@@ -4162,8 +7084,8 @@
"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
"requires": {
- "os-homedir": "^1.0.0",
- "os-tmpdir": "^1.0.0"
+ "os-homedir": "1.0.2",
+ "os-tmpdir": "1.0.2"
}
},
"p-cancelable": {
@@ -4182,7 +7104,7 @@
"integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
"dev": true,
"requires": {
- "p-try": "^1.0.0"
+ "p-try": "1.0.0"
}
},
"p-locate": {
@@ -4191,7 +7113,7 @@
"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
"dev": true,
"requires": {
- "p-limit": "^1.1.0"
+ "p-limit": "1.2.0"
}
},
"p-map": {
@@ -4205,7 +7127,7 @@
"resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz",
"integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
"requires": {
- "p-finally": "^1.0.0"
+ "p-finally": "1.0.0"
}
},
"p-try": {
@@ -4214,36 +7136,33 @@
"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
"dev": true
},
- "parse-bmfont-ascii": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz",
- "integrity": "sha1-Eaw8P/WPfCAgqyJ2kHkQjU36AoU=",
- "dev": true
- },
- "parse-bmfont-binary": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz",
- "integrity": "sha1-0Di0dtPp3Z2x4RoLDlOiJ5K2kAY=",
- "dev": true
- },
- "parse-bmfont-xml": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.3.tgz",
- "integrity": "sha1-1rZqNxr9OcUAfZ8O6yYqTyzOe3w=",
- "dev": true,
- "requires": {
- "xml-parse-from-string": "^1.0.0",
- "xml2js": "^0.4.5"
- }
- },
- "parse-headers": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.1.tgz",
- "integrity": "sha1-aug6eqJanZtwCswoaYzR8e1+lTY=",
+ "parse-glob": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
"dev": true,
"requires": {
- "for-each": "^0.3.2",
- "trim": "0.0.1"
+ "glob-base": "0.3.0",
+ "is-dotfile": "1.0.3",
+ "is-extglob": "1.0.0",
+ "is-glob": "2.0.1"
+ },
+ "dependencies": {
+ "is-extglob": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+ "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+ "dev": true
+ },
+ "is-glob": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+ "dev": true,
+ "requires": {
+ "is-extglob": "1.0.0"
+ }
+ }
}
},
"parse-json": {
@@ -4251,15 +7170,27 @@
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
"requires": {
- "error-ex": "^1.2.0"
+ "error-ex": "1.3.2"
}
},
+ "parse5": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+ "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+ "dev": true
+ },
+ "pascalcase": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+ "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+ "dev": true
+ },
"path-exists": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
"requires": {
- "pinkie-promise": "^2.0.0"
+ "pinkie-promise": "2.0.1"
}
},
"path-is-absolute": {
@@ -4290,15 +7221,15 @@
"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
"requires": {
- "graceful-fs": "^4.1.2",
- "pify": "^2.0.0",
- "pinkie-promise": "^2.0.0"
+ "graceful-fs": "4.1.11",
+ "pify": "2.3.0",
+ "pinkie-promise": "2.0.1"
}
},
- "pathval": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
- "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
+ "pend": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+ "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
"dev": true
},
"performance-now": {
@@ -4321,24 +7252,7 @@
"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
"requires": {
- "pinkie": "^2.0.0"
- }
- },
- "pixelmatch": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-4.0.2.tgz",
- "integrity": "sha1-j0fc7FARtHe2fbA8JDvB8wheiFQ=",
- "dev": true,
- "requires": {
- "pngjs": "^3.0.0"
- },
- "dependencies": {
- "pngjs": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.3.1.tgz",
- "integrity": "sha512-ggXCTsqHRIsGMkHlCEhbHhUmNTA2r1lpkE0NL4Q9S8spkXbm4vE9TVmPso2AGYn90Gltdz8W5CyzhcIGg2Gejg==",
- "dev": true
- }
+ "pinkie": "2.0.4"
}
},
"pkg-dir": {
@@ -4347,25 +7261,19 @@
"integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
"dev": true,
"requires": {
- "find-up": "^1.0.0"
+ "find-up": "1.1.2"
}
},
- "platform": {
- "version": "1.3.5",
- "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz",
- "integrity": "sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q==",
- "dev": true
- },
"pluralize": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
"integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
"dev": true
},
- "pngjs": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-2.2.0.tgz",
- "integrity": "sha1-ZJZjYJoOurh8jwiz/nJASLUdnX8=",
+ "pn": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
+ "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
"dev": true
},
"popper.js": {
@@ -4373,14 +7281,20 @@
"resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.12.9.tgz",
"integrity": "sha1-DfvC3/lsRRuzMu3Pz6r1ZtMx1bM="
},
+ "posix-character-classes": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+ "dev": true
+ },
"postcss": {
"version": "6.0.16",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
"integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==",
"requires": {
- "chalk": "^2.3.0",
- "source-map": "^0.6.1",
- "supports-color": "^5.1.0"
+ "chalk": "2.3.0",
+ "source-map": "0.6.1",
+ "supports-color": "5.1.0"
},
"dependencies": {
"ansi-styles": {
@@ -4388,7 +7302,7 @@
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
"requires": {
- "color-convert": "^1.9.0"
+ "color-convert": "1.9.1"
}
},
"chalk": {
@@ -4396,9 +7310,9 @@
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
"requires": {
- "ansi-styles": "^3.1.0",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^4.0.0"
+ "ansi-styles": "3.2.0",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "4.5.0"
},
"dependencies": {
"supports-color": {
@@ -4406,7 +7320,7 @@
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
"requires": {
- "has-flag": "^2.0.0"
+ "has-flag": "2.0.0"
}
}
}
@@ -4421,7 +7335,7 @@
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
"integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==",
"requires": {
- "has-flag": "^2.0.0"
+ "has-flag": "2.0.0"
}
}
}
@@ -4432,7 +7346,7 @@
"integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
"dev": true,
"requires": {
- "postcss": "^6.0.1"
+ "postcss": "6.0.16"
}
},
"postcss-modules-local-by-default": {
@@ -4441,8 +7355,8 @@
"integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
"dev": true,
"requires": {
- "css-selector-tokenizer": "^0.7.0",
- "postcss": "^6.0.1"
+ "css-selector-tokenizer": "0.7.0",
+ "postcss": "6.0.16"
}
},
"postcss-modules-scope": {
@@ -4451,8 +7365,8 @@
"integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
"dev": true,
"requires": {
- "css-selector-tokenizer": "^0.7.0",
- "postcss": "^6.0.1"
+ "css-selector-tokenizer": "0.7.0",
+ "postcss": "6.0.16"
}
},
"postcss-modules-values": {
@@ -4461,8 +7375,8 @@
"integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
"dev": true,
"requires": {
- "icss-replace-symbols": "^1.1.0",
- "postcss": "^6.0.1"
+ "icss-replace-symbols": "1.1.0",
+ "postcss": "6.0.16"
}
},
"postcss-nested": {
@@ -4470,8 +7384,8 @@
"resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-2.1.2.tgz",
"integrity": "sha512-CU7KjbFOZSNrbFwrl8+KJHTj29GjCEhL86kCKyvf+k633fc+FQA6IuhGyPze5e+a4O5d2fP7hDlMOlVDXia1Xg==",
"requires": {
- "postcss": "^6.0.9",
- "postcss-selector-parser": "^2.2.3"
+ "postcss": "6.0.16",
+ "postcss-selector-parser": "2.2.3"
}
},
"postcss-selector-parser": {
@@ -4479,9 +7393,9 @@
"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
"integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
"requires": {
- "flatten": "^1.0.2",
- "indexes-of": "^1.0.1",
- "uniq": "^1.0.1"
+ "flatten": "1.0.2",
+ "indexes-of": "1.0.1",
+ "uniq": "1.0.1"
}
},
"postcss-value-parser": {
@@ -4500,14 +7414,20 @@
"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
"integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
},
+ "preserve": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+ "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+ "dev": true
+ },
"pretty-format": {
"version": "21.2.1",
"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-21.2.1.tgz",
"integrity": "sha512-ZdWPGYAnYfcVP8yKA3zFjCn8s4/17TeYH28MXuC8vTp0o21eXjbFGcOAXZEaDaOFJjc3h2qa7HQNHNshhvoh2A==",
"dev": true,
"requires": {
- "ansi-regex": "^3.0.0",
- "ansi-styles": "^3.2.0"
+ "ansi-regex": "3.0.0",
+ "ansi-styles": "3.2.0"
},
"dependencies": {
"ansi-regex": {
@@ -4522,30 +7442,30 @@
"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
"dev": true,
"requires": {
- "color-convert": "^1.9.0"
+ "color-convert": "1.9.1"
}
}
}
},
+ "private": {
+ "version": "0.1.8",
+ "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+ "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+ "dev": true
+ },
"probe-image-size": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/probe-image-size/-/probe-image-size-3.1.0.tgz",
"integrity": "sha1-50e+maDQqOUFiqcihUwkCSuS3WY=",
"requires": {
- "any-promise": "^1.3.0",
- "deepmerge": "^1.3.0",
- "got": "^7.0.0",
- "inherits": "^2.0.3",
- "next-tick": "^1.0.0",
- "stream-parser": "~0.3.1"
+ "any-promise": "1.3.0",
+ "deepmerge": "1.5.2",
+ "got": "7.1.0",
+ "inherits": "2.0.3",
+ "next-tick": "1.0.0",
+ "stream-parser": "0.3.1"
}
},
- "process": {
- "version": "0.5.2",
- "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
- "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=",
- "dev": true
- },
"process-nextick-args": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
@@ -4562,7 +7482,17 @@
"resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
"integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
"requires": {
- "asap": "~2.0.3"
+ "asap": "2.0.6"
+ }
+ },
+ "prompts": {
+ "version": "0.1.14",
+ "resolved": "https://registry.npmjs.org/prompts/-/prompts-0.1.14.tgz",
+ "integrity": "sha512-rxkyiE9YH6zAz/rZpywySLKkpaj0NMVyNw1qhsubdbjjSgcayjTShDreZGlFMcGSu5sab3bAKPfFk78PB90+8w==",
+ "dev": true,
+ "requires": {
+ "kleur": "2.0.2",
+ "sisteransi": "0.1.1"
}
},
"prop-types": {
@@ -4570,10 +7500,16 @@
"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
"integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
"requires": {
- "loose-envify": "^1.3.1",
- "object-assign": "^4.1.1"
+ "loose-envify": "1.3.1",
+ "object-assign": "4.1.1"
}
},
+ "proxy-from-env": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
+ "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=",
+ "dev": true
+ },
"pseudomap": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
@@ -4584,11 +7520,59 @@
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
},
- "q": {
- "version": "1.5.1",
- "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
- "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
- "dev": true
+ "puppeteer": {
+ "version": "1.11.0",
+ "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.11.0.tgz",
+ "integrity": "sha512-iG4iMOHixc2EpzqRV+pv7o3GgmU2dNYEMkvKwSaQO/vMZURakwSOn/EYJ6OIRFYOque1qorzIBvrytPIQB3YzQ==",
+ "dev": true,
+ "requires": {
+ "debug": "4.1.0",
+ "extract-zip": "1.6.7",
+ "https-proxy-agent": "2.2.1",
+ "mime": "2.4.0",
+ "progress": "2.0.1",
+ "proxy-from-env": "1.0.0",
+ "rimraf": "2.6.2",
+ "ws": "6.1.2"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
+ "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.1"
+ }
+ },
+ "mime": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+ "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+ "dev": true
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "dev": true
+ },
+ "progress": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz",
+ "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==",
+ "dev": true
+ },
+ "ws": {
+ "version": "6.1.2",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.2.tgz",
+ "integrity": "sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==",
+ "dev": true,
+ "requires": {
+ "async-limiter": "1.0.0"
+ }
+ }
+ }
},
"qs": {
"version": "6.5.2",
@@ -4600,15 +7584,34 @@
"resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
"integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
"requires": {
- "object-assign": "^4.1.0",
- "strict-uri-encode": "^1.0.0"
+ "object-assign": "4.1.1",
+ "strict-uri-encode": "1.1.0"
}
},
- "querystring": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
- "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
- "dev": true
+ "randomatic": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
+ "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
+ "dev": true,
+ "requires": {
+ "is-number": "4.0.0",
+ "kind-of": "6.0.2",
+ "math-random": "1.0.1"
+ },
+ "dependencies": {
+ "is-number": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+ "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+ "dev": true
+ },
+ "kind-of": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+ "dev": true
+ }
+ }
},
"re-resizable": {
"version": "4.8.1",
@@ -4620,10 +7623,10 @@
"resolved": "https://registry.npmjs.org/react/-/react-16.0.0.tgz",
"integrity": "sha1-zn348ZQbA28Cssyp29DLHw6FXi0=",
"requires": {
- "fbjs": "^0.8.16",
- "loose-envify": "^1.1.0",
- "object-assign": "^4.1.1",
- "prop-types": "^15.6.0"
+ "fbjs": "0.8.16",
+ "loose-envify": "1.3.1",
+ "object-assign": "4.1.1",
+ "prop-types": "15.6.2"
}
},
"react-autosize-textarea": {
@@ -4631,9 +7634,9 @@
"resolved": "https://registry.npmjs.org/react-autosize-textarea/-/react-autosize-textarea-0.4.9.tgz",
"integrity": "sha1-jVXIX0xmWm1jWehK8oYQnFBKsps=",
"requires": {
- "autosize": "^3.0.15",
- "line-height": "^0.3.1",
- "prop-types": "^15.5.6"
+ "autosize": "3.0.21",
+ "line-height": "0.3.1",
+ "prop-types": "15.6.2"
}
},
"react-color": {
@@ -4641,11 +7644,11 @@
"resolved": "https://registry.npmjs.org/react-color/-/react-color-2.14.1.tgz",
"integrity": "sha512-ssv2ArSZdhTbIs29hyfw8JW+s3G4BCx/ILkwCajWZzrcx/2ZQfRpsaLVt38LAPbxe50LLszlmGtRerA14JzzRw==",
"requires": {
- "lodash": "^4.0.1",
- "material-colors": "^1.2.1",
- "prop-types": "^15.5.10",
- "reactcss": "^1.2.0",
- "tinycolor2": "^1.4.1"
+ "lodash": "4.17.10",
+ "material-colors": "1.2.5",
+ "prop-types": "15.6.2",
+ "reactcss": "1.2.3",
+ "tinycolor2": "1.4.1"
}
},
"react-dom": {
@@ -4653,10 +7656,10 @@
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.0.1.tgz",
"integrity": "sha512-gGJNmuS0VpkJsNStpzplcgc4iuHJ2X8rjiiaY/5YfHrsAd2cw1JkMXD6Z1kBOed8rDUNrRYrnDYptnhFghFFhA==",
"requires": {
- "fbjs": "^0.8.16",
- "loose-envify": "^1.1.0",
- "object-assign": "^4.1.1",
- "prop-types": "^15.6.0"
+ "fbjs": "0.8.16",
+ "loose-envify": "1.3.1",
+ "object-assign": "4.1.1",
+ "prop-types": "15.6.2"
}
},
"react-dropzone": {
@@ -4664,8 +7667,8 @@
"resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-4.2.13.tgz",
"integrity": "sha512-kqpt0Up4GZZFoz4WvBTVzMmVDUZFoGRKDXeyV+baWXZx8Gt0CZmOtV7BSMF1JaBihx6mwy+rfYVNnOKB2hrY9Q==",
"requires": {
- "attr-accept": "^1.0.3",
- "prop-types": "^15.5.7"
+ "attr-accept": "1.1.3",
+ "prop-types": "15.6.2"
}
},
"react-intl": {
@@ -4673,10 +7676,10 @@
"resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.4.0.tgz",
"integrity": "sha1-ZsFNyd+ac7L7v71gIXJugKYT6xU=",
"requires": {
- "intl-format-cache": "^2.0.5",
- "intl-messageformat": "^2.1.0",
- "intl-relativeformat": "^2.0.0",
- "invariant": "^2.1.1"
+ "intl-format-cache": "2.1.0",
+ "intl-messageformat": "2.2.0",
+ "intl-relativeformat": "2.1.0",
+ "invariant": "2.2.2"
}
},
"react-modal": {
@@ -4684,8 +7687,8 @@
"resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.0.4.tgz",
"integrity": "sha512-IvRZxJkXiDqEIl4cxCccCzP37z+YOSN+yNOkYH99Ime+n9nPSowgxkX0KfHzR2ezP72LSS3Uln54JDZXUJmLdA==",
"requires": {
- "exenv": "^1.2.0",
- "prop-types": "^15.5.10"
+ "exenv": "1.2.2",
+ "prop-types": "15.6.2"
}
},
"react-render-in-browser": {
@@ -4693,9 +7696,9 @@
"resolved": "https://registry.npmjs.org/react-render-in-browser/-/react-render-in-browser-1.0.0.tgz",
"integrity": "sha512-DnOYcGVfjcu13Em8Z/sNbgYSrL26NjCQhZNzOEMV3BJiZ5WfvWFqvI9P/MW2K8guAkuf+hBouQyZysJdqrVhKA==",
"requires": {
- "prop-types": "^15.6.0",
- "react": "^16.0.0",
- "react-dom": "^16.0.0"
+ "prop-types": "15.6.2",
+ "react": "16.0.0",
+ "react-dom": "16.0.1"
}
},
"react-tabs": {
@@ -4703,8 +7706,8 @@
"resolved": "https://registry.npmjs.org/react-tabs/-/react-tabs-2.1.1.tgz",
"integrity": "sha512-55jl6lsYmPTQarnjgrBU68WZlNtVSngpRxOc4iXm+Te27F9ixUr/IBTbhlhDCMiFJreP+cqu1OaMdNGY2Hg10A==",
"requires": {
- "classnames": "^2.2.0",
- "prop-types": "^15.5.0"
+ "classnames": "2.2.6",
+ "prop-types": "15.6.2"
}
},
"react-toastify": {
@@ -4712,8 +7715,8 @@
"resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-2.1.7.tgz",
"integrity": "sha512-iMS5wXiTDKXcWTIF055BmsSwJINcxs9+CUGeEPMSllU0I00IKfV2inb3xhRxrB7d+4QvPqWZAtDPTk6nz6o1nA==",
"requires": {
- "prop-types": "^15.6.0",
- "react-transition-group": "^2.2.1"
+ "prop-types": "15.6.2",
+ "react-transition-group": "2.2.1"
}
},
"react-toggle": {
@@ -4721,7 +7724,7 @@
"resolved": "https://registry.npmjs.org/react-toggle/-/react-toggle-4.0.2.tgz",
"integrity": "sha512-EPTWnN7gQHgEAUEmjheanZXNzY5TPnQeyyHfEs3YshaiWZf5WNjfYDrglO5F1Hl/dNveX18i4l0grTEsYH2Ccw==",
"requires": {
- "classnames": "^2.2.5"
+ "classnames": "2.2.6"
}
},
"react-transition-group": {
@@ -4729,12 +7732,12 @@
"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.2.1.tgz",
"integrity": "sha512-q54UBM22bs/CekG8r3+vi9TugSqh0t7qcEVycaRc9M0p0aCEu+h6rp/RFiW7fHfgd1IKpd9oILFTl5QK+FpiPA==",
"requires": {
- "chain-function": "^1.0.0",
- "classnames": "^2.2.5",
- "dom-helpers": "^3.2.0",
- "loose-envify": "^1.3.1",
- "prop-types": "^15.5.8",
- "warning": "^3.0.0"
+ "chain-function": "1.0.0",
+ "classnames": "2.2.6",
+ "dom-helpers": "3.3.1",
+ "loose-envify": "1.3.1",
+ "prop-types": "15.6.2",
+ "warning": "3.0.0"
}
},
"reactcss": {
@@ -4742,23 +7745,17 @@
"resolved": "https://registry.npmjs.org/reactcss/-/reactcss-1.2.3.tgz",
"integrity": "sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==",
"requires": {
- "lodash": "^4.0.1"
+ "lodash": "4.17.10"
}
},
- "read-chunk": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/read-chunk/-/read-chunk-1.0.1.tgz",
- "integrity": "sha1-X2jKswfmY/GZk1J9m1icrORmEZQ=",
- "dev": true
- },
"read-pkg": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
"requires": {
- "load-json-file": "^1.0.0",
- "normalize-package-data": "^2.3.2",
- "path-type": "^1.0.0"
+ "load-json-file": "1.1.0",
+ "normalize-package-data": "2.4.0",
+ "path-type": "1.1.0"
}
},
"read-pkg-up": {
@@ -4766,8 +7763,8 @@
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
"requires": {
- "find-up": "^1.0.0",
- "read-pkg": "^1.0.0"
+ "find-up": "1.1.2",
+ "read-pkg": "1.1.0"
}
},
"readable-stream": {
@@ -4775,13 +7772,22 @@
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"requires": {
- "core-util-is": "~1.0.0",
- "inherits": "~2.0.3",
- "isarray": "~1.0.0",
- "process-nextick-args": "~2.0.0",
- "safe-buffer": "~5.1.1",
- "string_decoder": "~1.1.1",
- "util-deprecate": "~1.0.1"
+ "core-util-is": "1.0.2",
+ "inherits": "2.0.3",
+ "isarray": "1.0.0",
+ "process-nextick-args": "2.0.0",
+ "safe-buffer": "5.1.1",
+ "string_decoder": "1.1.1",
+ "util-deprecate": "1.0.2"
+ }
+ },
+ "realpath-native": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.0.2.tgz",
+ "integrity": "sha512-+S3zTvVt9yTntFrBpm7TQmQ3tzpCrnA1a/y+3cUHAc9ZR6aIjG0WNLR+Rj79QpJktY+VeW/TQtFlQ1bzsehI8g==",
+ "dev": true,
+ "requires": {
+ "util.promisify": "1.0.0"
}
},
"reconnecting-websocket": {
@@ -4794,8 +7800,8 @@
"resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
"integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
"requires": {
- "indent-string": "^2.1.0",
- "strip-indent": "^1.0.1"
+ "indent-string": "2.1.0",
+ "strip-indent": "1.0.1"
}
},
"redis": {
@@ -4803,9 +7809,9 @@
"resolved": "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz",
"integrity": "sha512-M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==",
"requires": {
- "double-ended-queue": "^2.1.0-0",
- "redis-commands": "^1.2.0",
- "redis-parser": "^2.6.0"
+ "double-ended-queue": "2.1.0-0",
+ "redis-commands": "1.3.1",
+ "redis-parser": "2.6.0"
}
},
"redis-commands": {
@@ -4829,15 +7835,34 @@
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
},
+ "regex-cache": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+ "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+ "dev": true,
+ "requires": {
+ "is-equal-shallow": "0.1.3"
+ }
+ },
+ "regex-not": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+ "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+ "dev": true,
+ "requires": {
+ "extend-shallow": "3.0.2",
+ "safe-regex": "1.1.0"
+ }
+ },
"regexpu-core": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
"integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
"dev": true,
"requires": {
- "regenerate": "^1.2.1",
- "regjsgen": "^0.2.0",
- "regjsparser": "^0.1.4"
+ "regenerate": "1.3.3",
+ "regjsgen": "0.2.0",
+ "regjsparser": "0.1.5"
}
},
"regjsgen": {
@@ -4852,7 +7877,7 @@
"integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
"dev": true,
"requires": {
- "jsesc": "~0.5.0"
+ "jsesc": "0.5.0"
}
},
"remove-trailing-separator": {
@@ -4861,12 +7886,24 @@
"integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
"dev": true
},
+ "repeat-element": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+ "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+ "dev": true
+ },
+ "repeat-string": {
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+ "dev": true
+ },
"repeating": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
"requires": {
- "is-finite": "^1.0.0"
+ "is-finite": "1.0.2"
}
},
"request": {
@@ -4874,26 +7911,26 @@
"resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
"integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
"requires": {
- "aws-sign2": "~0.7.0",
- "aws4": "^1.6.0",
- "caseless": "~0.12.0",
- "combined-stream": "~1.0.5",
- "extend": "~3.0.1",
- "forever-agent": "~0.6.1",
- "form-data": "~2.3.1",
- "har-validator": "~5.0.3",
- "http-signature": "~1.2.0",
- "is-typedarray": "~1.0.0",
- "isstream": "~0.1.2",
- "json-stringify-safe": "~5.0.1",
- "mime-types": "~2.1.17",
- "oauth-sign": "~0.8.2",
- "performance-now": "^2.1.0",
- "qs": "~6.5.1",
- "safe-buffer": "^5.1.1",
- "tough-cookie": "~2.3.3",
- "tunnel-agent": "^0.6.0",
- "uuid": "^3.1.0"
+ "aws-sign2": "0.7.0",
+ "aws4": "1.8.0",
+ "caseless": "0.12.0",
+ "combined-stream": "1.0.6",
+ "extend": "3.0.2",
+ "forever-agent": "0.6.1",
+ "form-data": "2.3.2",
+ "har-validator": "5.0.3",
+ "http-signature": "1.2.0",
+ "is-typedarray": "1.0.0",
+ "isstream": "0.1.2",
+ "json-stringify-safe": "5.0.1",
+ "mime-types": "2.1.20",
+ "oauth-sign": "0.8.2",
+ "performance-now": "2.1.0",
+ "qs": "6.5.2",
+ "safe-buffer": "5.1.1",
+ "tough-cookie": "2.3.4",
+ "tunnel-agent": "0.6.0",
+ "uuid": "3.3.2"
}
},
"request-promise-core": {
@@ -4902,7 +7939,7 @@
"integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=",
"dev": true,
"requires": {
- "lodash": "^4.13.1"
+ "lodash": "4.17.10"
}
},
"request-promise-native": {
@@ -4912,8 +7949,8 @@
"dev": true,
"requires": {
"request-promise-core": "1.1.1",
- "stealthy-require": "^1.1.0",
- "tough-cookie": ">=2.3.3"
+ "stealthy-require": "1.1.1",
+ "tough-cookie": "2.3.4"
}
},
"require-directory": {
@@ -4938,8 +7975,8 @@
"integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
"dev": true,
"requires": {
- "caller-path": "^0.1.0",
- "resolve-from": "^1.0.0"
+ "caller-path": "0.1.0",
+ "resolve-from": "1.0.1"
}
},
"resolve": {
@@ -4948,7 +7985,24 @@
"integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
"dev": true,
"requires": {
- "path-parse": "^1.0.5"
+ "path-parse": "1.0.5"
+ }
+ },
+ "resolve-cwd": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+ "dev": true,
+ "requires": {
+ "resolve-from": "3.0.0"
+ },
+ "dependencies": {
+ "resolve-from": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+ "dev": true
+ }
}
},
"resolve-from": {
@@ -4969,25 +8023,37 @@
"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
"dev": true,
"requires": {
- "onetime": "^2.0.0",
- "signal-exit": "^3.0.2"
+ "onetime": "2.0.1",
+ "signal-exit": "3.0.2"
}
},
+ "ret": {
+ "version": "0.1.15",
+ "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+ "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+ "dev": true
+ },
"rimraf": {
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
"integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
"requires": {
- "glob": "^7.0.5"
+ "glob": "7.1.3"
}
},
+ "rsvp": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+ "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
+ "dev": true
+ },
"run-async": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
"integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
"dev": true,
"requires": {
- "is-promise": "^2.1.0"
+ "is-promise": "2.1.0"
}
},
"rx-lite": {
@@ -5002,7 +8068,7 @@
"integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
"dev": true,
"requires": {
- "rx-lite": "*"
+ "rx-lite": "4.0.8"
}
},
"rxjs": {
@@ -5019,20 +8085,321 @@
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
},
+ "safe-regex": {
+ "version": "1.1.0",
+ "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+ "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+ "dev": true,
+ "requires": {
+ "ret": "0.1.15"
+ }
+ },
"safer-buffer": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
},
+ "sane": {
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/sane/-/sane-2.5.2.tgz",
+ "integrity": "sha1-tNwYYcIbQn6SlQej51HiosuKs/o=",
+ "dev": true,
+ "requires": {
+ "anymatch": "2.0.0",
+ "capture-exit": "1.2.0",
+ "exec-sh": "0.2.2",
+ "fb-watchman": "2.0.0",
+ "micromatch": "3.1.10",
+ "minimist": "1.2.0",
+ "walker": "1.0.7",
+ "watch": "0.18.0"
+ },
+ "dependencies": {
+ "arr-diff": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+ "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+ "dev": true
+ },
+ "array-unique": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+ "dev": true
+ },
+ "braces": {
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+ "dev": true,
+ "requires": {
+ "arr-flatten": "1.1.0",
+ "array-unique": "0.3.2",
+ "extend-shallow": "2.0.1",
+ "fill-range": "4.0.0",
+ "isobject": "3.0.1",
+ "repeat-element": "1.1.3",
+ "snapdragon": "0.8.2",
+ "snapdragon-node": "2.1.1",
+ "split-string": "3.1.0",
+ "to-regex": "3.0.2"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ }
+ }
+ },
+ "expand-brackets": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+ "dev": true,
+ "requires": {
+ "debug": "2.6.9",
+ "define-property": "0.2.5",
+ "extend-shallow": "2.0.1",
+ "posix-character-classes": "0.1.1",
+ "regex-not": "1.0.2",
+ "snapdragon": "0.8.2",
+ "to-regex": "3.0.2"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "0.1.6"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "1.1.6"
+ }
+ }
+ }
+ },
+ "is-data-descriptor": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "1.1.6"
+ }
+ }
+ }
+ },
+ "is-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+ "dev": true,
+ "requires": {
+ "is-accessor-descriptor": "0.1.6",
+ "is-data-descriptor": "0.1.4",
+ "kind-of": "5.1.0"
+ }
+ },
+ "kind-of": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+ "dev": true
+ }
+ }
+ },
+ "extglob": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+ "dev": true,
+ "requires": {
+ "array-unique": "0.3.2",
+ "define-property": "1.0.0",
+ "expand-brackets": "2.1.4",
+ "extend-shallow": "2.0.1",
+ "fragment-cache": "0.2.1",
+ "regex-not": "1.0.2",
+ "snapdragon": "0.8.2",
+ "to-regex": "3.0.2"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "1.0.2"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ }
+ }
+ },
+ "fill-range": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+ "dev": true,
+ "requires": {
+ "extend-shallow": "2.0.1",
+ "is-number": "3.0.0",
+ "repeat-string": "1.6.1",
+ "to-regex-range": "2.1.1"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ }
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-data-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "dev": true,
+ "requires": {
+ "is-accessor-descriptor": "1.0.0",
+ "is-data-descriptor": "1.0.0",
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-number": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "1.1.6"
+ }
+ }
+ }
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "dev": true
+ },
+ "kind-of": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+ "dev": true
+ },
+ "micromatch": {
+ "version": "3.1.10",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+ "dev": true,
+ "requires": {
+ "arr-diff": "4.0.0",
+ "array-unique": "0.3.2",
+ "braces": "2.3.2",
+ "define-property": "2.0.2",
+ "extend-shallow": "3.0.2",
+ "extglob": "2.0.4",
+ "fragment-cache": "0.2.1",
+ "kind-of": "6.0.2",
+ "nanomatch": "1.2.13",
+ "object.pick": "1.3.0",
+ "regex-not": "1.0.2",
+ "snapdragon": "0.8.2",
+ "to-regex": "3.0.2"
+ }
+ }
+ }
+ },
"sass-graph": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
"integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
"requires": {
- "glob": "^7.0.0",
- "lodash": "^4.0.0",
- "scss-tokenizer": "^0.2.3",
- "yargs": "^7.0.0"
+ "glob": "7.1.3",
+ "lodash": "4.17.10",
+ "scss-tokenizer": "0.2.3",
+ "yargs": "7.1.0"
}
},
"sax": {
@@ -5046,8 +8413,8 @@
"resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
"integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
"requires": {
- "js-base64": "^2.1.8",
- "source-map": "^0.4.2"
+ "js-base64": "2.4.9",
+ "source-map": "0.4.4"
}
},
"select": {
@@ -5065,18 +8432,51 @@
"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
},
+ "set-value": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
+ "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+ "dev": true,
+ "requires": {
+ "extend-shallow": "2.0.1",
+ "is-extendable": "0.1.1",
+ "is-plain-object": "2.0.4",
+ "split-string": "3.1.0"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ }
+ }
+ },
"setimmediate": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
},
+ "sha1": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/sha1/-/sha1-1.1.1.tgz",
+ "integrity": "sha1-rdqnqTFo85PxnrKxUJFhjicA+Eg=",
+ "dev": true,
+ "requires": {
+ "charenc": "0.0.2",
+ "crypt": "0.0.2"
+ }
+ },
"shebang-command": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
"dev": true,
"requires": {
- "shebang-regex": "^1.0.0"
+ "shebang-regex": "1.0.0"
}
},
"shebang-regex": {
@@ -5085,18 +8485,36 @@
"integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
"dev": true
},
+ "shellwords": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+ "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+ "dev": true
+ },
"signal-exit": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
},
+ "sisteransi": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-0.1.1.tgz",
+ "integrity": "sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g==",
+ "dev": true
+ },
+ "slash": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+ "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+ "dev": true
+ },
"slice-ansi": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
"dev": true,
"requires": {
- "is-fullwidth-code-point": "^2.0.0"
+ "is-fullwidth-code-point": "2.0.0"
},
"dependencies": {
"is-fullwidth-code-point": {
@@ -5107,12 +8525,126 @@
}
}
},
+ "snapdragon": {
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+ "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+ "dev": true,
+ "requires": {
+ "base": "0.11.2",
+ "debug": "2.6.9",
+ "define-property": "0.2.5",
+ "extend-shallow": "2.0.1",
+ "map-cache": "0.2.2",
+ "source-map": "0.5.7",
+ "source-map-resolve": "0.5.2",
+ "use": "3.1.1"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "0.1.6"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ },
+ "source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "dev": true
+ }
+ }
+ },
+ "snapdragon-node": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+ "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+ "dev": true,
+ "requires": {
+ "define-property": "1.0.0",
+ "isobject": "3.0.1",
+ "snapdragon-util": "3.0.1"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "1.0.2"
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-data-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "dev": true,
+ "requires": {
+ "is-accessor-descriptor": "1.0.0",
+ "is-data-descriptor": "1.0.0",
+ "kind-of": "6.0.2"
+ }
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "dev": true
+ },
+ "kind-of": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+ "dev": true
+ }
+ }
+ },
+ "snapdragon-util": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
+ }
+ },
"source-map": {
"version": "0.4.4",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
"requires": {
- "amdefine": ">=0.0.4"
+ "amdefine": "1.0.1"
}
},
"source-map-resolve": {
@@ -5121,11 +8653,28 @@
"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
"dev": true,
"requires": {
- "atob": "^2.1.1",
- "decode-uri-component": "^0.2.0",
- "resolve-url": "^0.2.1",
- "source-map-url": "^0.4.0",
- "urix": "^0.1.0"
+ "atob": "2.1.2",
+ "decode-uri-component": "0.2.0",
+ "resolve-url": "0.2.1",
+ "source-map-url": "0.4.0",
+ "urix": "0.1.0"
+ }
+ },
+ "source-map-support": {
+ "version": "0.4.18",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+ "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+ "dev": true,
+ "requires": {
+ "source-map": "0.5.7"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "dev": true
+ }
}
},
"source-map-url": {
@@ -5139,8 +8688,8 @@
"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
"integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
"requires": {
- "spdx-expression-parse": "^3.0.0",
- "spdx-license-ids": "^3.0.0"
+ "spdx-expression-parse": "3.0.0",
+ "spdx-license-ids": "3.0.1"
}
},
"spdx-exceptions": {
@@ -5153,8 +8702,8 @@
"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
"integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
"requires": {
- "spdx-exceptions": "^2.1.0",
- "spdx-license-ids": "^3.0.0"
+ "spdx-exceptions": "2.1.0",
+ "spdx-license-ids": "3.0.1"
}
},
"spdx-license-ids": {
@@ -5162,6 +8711,15 @@
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz",
"integrity": "sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w=="
},
+ "split-string": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+ "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+ "dev": true,
+ "requires": {
+ "extend-shallow": "3.0.2"
+ }
+ },
"sprintf-js": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -5173,15 +8731,15 @@
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz",
"integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
"requires": {
- "asn1": "~0.2.3",
- "assert-plus": "^1.0.0",
- "bcrypt-pbkdf": "^1.0.0",
- "dashdash": "^1.12.0",
- "ecc-jsbn": "~0.1.1",
- "getpass": "^0.1.1",
- "jsbn": "~0.1.0",
- "safer-buffer": "^2.0.2",
- "tweetnacl": "~0.14.0"
+ "asn1": "0.2.4",
+ "assert-plus": "1.0.0",
+ "bcrypt-pbkdf": "1.0.2",
+ "dashdash": "1.14.1",
+ "ecc-jsbn": "0.1.2",
+ "getpass": "0.1.7",
+ "jsbn": "0.1.1",
+ "safer-buffer": "2.1.2",
+ "tweetnacl": "0.14.5"
}
},
"stack-trace": {
@@ -5189,18 +8747,45 @@
"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
"integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
},
+ "stack-utils": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
+ "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==",
+ "dev": true
+ },
"staged-git-files": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/staged-git-files/-/staged-git-files-0.0.4.tgz",
"integrity": "sha1-15fhtVHKemOd7AI33G60u5vhfTU=",
"dev": true
},
+ "static-extend": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+ "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+ "dev": true,
+ "requires": {
+ "define-property": "0.2.5",
+ "object-copy": "0.1.0"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "0.1.6"
+ }
+ }
+ }
+ },
"stdout-stream": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
"integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
"requires": {
- "readable-stream": "^2.0.1"
+ "readable-stream": "2.3.6"
}
},
"stealthy-require": {
@@ -5214,22 +8799,7 @@
"resolved": "https://registry.npmjs.org/stream-parser/-/stream-parser-0.3.1.tgz",
"integrity": "sha1-FhhUhpRCACGhGC/wrxkRwSl2F3M=",
"requires": {
- "debug": "2"
- }
- },
- "stream-to": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/stream-to/-/stream-to-0.2.2.tgz",
- "integrity": "sha1-hDBgmNhf25kLn6MAsbPM9V6O8B0=",
- "dev": true
- },
- "stream-to-buffer": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/stream-to-buffer/-/stream-to-buffer-0.1.0.tgz",
- "integrity": "sha1-JnmdkDqyAlyb1VCsRxcbAPjdgKk=",
- "dev": true,
- "requires": {
- "stream-to": "~0.2.0"
+ "debug": "2.6.9"
}
},
"stream-to-observable": {
@@ -5248,14 +8818,41 @@
"resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz",
"integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs="
},
+ "string-length": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz",
+ "integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=",
+ "dev": true,
+ "requires": {
+ "astral-regex": "1.0.0",
+ "strip-ansi": "4.0.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+ },
+ "strip-ansi": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0"
+ }
+ }
+ }
+ },
"string-width": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"requires": {
- "code-point-at": "^1.0.0",
- "is-fullwidth-code-point": "^1.0.0",
- "strip-ansi": "^3.0.0"
+ "code-point-at": "1.1.0",
+ "is-fullwidth-code-point": "1.0.0",
+ "strip-ansi": "3.0.1"
}
},
"string_decoder": {
@@ -5263,7 +8860,7 @@
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
- "safe-buffer": "~5.1.0"
+ "safe-buffer": "5.1.1"
}
},
"stringify-object": {
@@ -5272,9 +8869,9 @@
"integrity": "sha512-jPcQYw/52HUPP8uOE4kkjxl5bB9LfHkKCTptIk3qw7ozP5XMIMlHMLjt00GGSwW6DJAf/njY5EU6Vpwl4LlBKQ==",
"dev": true,
"requires": {
- "get-own-enumerable-property-symbols": "^2.0.1",
- "is-obj": "^1.0.1",
- "is-regexp": "^1.0.0"
+ "get-own-enumerable-property-symbols": "2.0.1",
+ "is-obj": "1.0.1",
+ "is-regexp": "1.0.0"
}
},
"strip-ansi": {
@@ -5282,7 +8879,7 @@
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": {
- "ansi-regex": "^2.0.0"
+ "ansi-regex": "2.1.1"
}
},
"strip-bom": {
@@ -5290,7 +8887,7 @@
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
"requires": {
- "is-utf8": "^0.2.0"
+ "is-utf8": "0.2.1"
}
},
"strip-eof": {
@@ -5304,7 +8901,7 @@
"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
"integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
"requires": {
- "get-stdin": "^4.0.1"
+ "get-stdin": "4.0.1"
}
},
"strip-json-comments": {
@@ -5324,18 +8921,24 @@
"integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
"dev": true
},
+ "symbol-tree": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
+ "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=",
+ "dev": true
+ },
"table": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
"integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
"dev": true,
"requires": {
- "ajv": "^5.2.3",
- "ajv-keywords": "^2.1.0",
- "chalk": "^2.1.0",
- "lodash": "^4.17.4",
+ "ajv": "5.5.2",
+ "ajv-keywords": "2.1.1",
+ "chalk": "2.3.0",
+ "lodash": "4.17.10",
"slice-ansi": "1.0.0",
- "string-width": "^2.1.1"
+ "string-width": "2.1.1"
},
"dependencies": {
"ansi-regex": {
@@ -5350,7 +8953,7 @@
"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
"dev": true,
"requires": {
- "color-convert": "^1.9.0"
+ "color-convert": "1.9.1"
}
},
"chalk": {
@@ -5359,9 +8962,9 @@
"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
"dev": true,
"requires": {
- "ansi-styles": "^3.1.0",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^4.0.0"
+ "ansi-styles": "3.2.0",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "4.5.0"
}
},
"is-fullwidth-code-point": {
@@ -5376,8 +8979,8 @@
"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
"dev": true,
"requires": {
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^4.0.0"
+ "is-fullwidth-code-point": "2.0.0",
+ "strip-ansi": "4.0.0"
}
},
"strip-ansi": {
@@ -5386,7 +8989,7 @@
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": {
- "ansi-regex": "^3.0.0"
+ "ansi-regex": "3.0.0"
}
},
"supports-color": {
@@ -5395,7 +8998,7 @@
"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
"dev": true,
"requires": {
- "has-flag": "^2.0.0"
+ "has-flag": "2.0.0"
}
}
}
@@ -5405,21 +9008,22 @@
"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
"integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
"requires": {
- "block-stream": "*",
- "fstream": "^1.0.2",
- "inherits": "2"
+ "block-stream": "0.0.9",
+ "fstream": "1.0.11",
+ "inherits": "2.0.3"
}
},
- "tar-stream": {
- "version": "1.5.5",
- "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz",
- "integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==",
+ "test-exclude": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.3.tgz",
+ "integrity": "sha512-SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==",
"dev": true,
"requires": {
- "bl": "^1.0.0",
- "end-of-stream": "^1.0.0",
- "readable-stream": "^2.0.0",
- "xtend": "^4.0.0"
+ "arrify": "1.0.1",
+ "micromatch": "2.3.11",
+ "object-assign": "4.1.1",
+ "read-pkg-up": "1.0.1",
+ "require-main-filename": "1.0.1"
}
},
"text-table": {
@@ -5428,6 +9032,12 @@
"integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
"dev": true
},
+ "throat": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz",
+ "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=",
+ "dev": true
+ },
"through": {
"version": "2.3.8",
"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -5454,7 +9064,7 @@
"resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-2.0.9.tgz",
"integrity": "sha512-HgsZTP+unnDMEL7hkbAb9Iv11JLjd8SI38a9oR/1GpAHwhQ3ndNkdSHW5QziS5D4/GrapfbehPUZrCvBGGKY7Q==",
"requires": {
- "popper.js": "^1.12.9"
+ "popper.js": "1.12.9"
}
},
"tmp": {
@@ -5463,7 +9073,61 @@
"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
"dev": true,
"requires": {
- "os-tmpdir": "~1.0.2"
+ "os-tmpdir": "1.0.2"
+ }
+ },
+ "tmpl": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
+ "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
+ "dev": true
+ },
+ "to-fast-properties": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+ "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+ "dev": true
+ },
+ "to-object-path": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
+ }
+ },
+ "to-regex": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+ "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+ "dev": true,
+ "requires": {
+ "define-property": "2.0.2",
+ "extend-shallow": "3.0.2",
+ "regex-not": "1.0.2",
+ "safe-regex": "1.1.0"
+ }
+ },
+ "to-regex-range": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+ "dev": true,
+ "requires": {
+ "is-number": "3.0.0",
+ "repeat-string": "1.6.1"
+ },
+ "dependencies": {
+ "is-number": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
+ }
+ }
}
},
"tough-cookie": {
@@ -5471,26 +9135,43 @@
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
"integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
"requires": {
- "punycode": "^1.4.1"
+ "punycode": "1.4.1"
}
},
- "trim": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
- "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=",
- "dev": true
+ "tr46": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+ "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+ "dev": true,
+ "requires": {
+ "punycode": "2.1.1"
+ },
+ "dependencies": {
+ "punycode": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+ "dev": true
+ }
+ }
},
"trim-newlines": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
},
+ "trim-right": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+ "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+ "dev": true
+ },
"true-case-path": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
"integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
"requires": {
- "glob": "^7.1.2"
+ "glob": "7.1.3"
}
},
"tunnel-agent": {
@@ -5498,7 +9179,7 @@
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
"requires": {
- "safe-buffer": "^5.0.1"
+ "safe-buffer": "5.1.1"
}
},
"tweetnacl": {
@@ -5513,15 +9194,9 @@
"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
"dev": true,
"requires": {
- "prelude-ls": "~1.1.2"
+ "prelude-ls": "1.1.2"
}
},
- "type-detect": {
- "version": "4.0.7",
- "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz",
- "integrity": "sha512-4Rh17pAMVdMWzktddFhISRnUnFIStObtUMNGzDwlA6w/77bmGv3aBbRdCmQR6IjzfkTo9otnW+2K/cDRhKSxDA==",
- "dev": true
- },
"typedarray": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@@ -5533,56 +9208,131 @@
"resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz",
"integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g=="
},
+ "uglify-js": {
+ "version": "3.4.9",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
+ "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "commander": "2.17.1",
+ "source-map": "0.6.1"
+ },
+ "dependencies": {
+ "commander": {
+ "version": "2.17.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+ "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+ "dev": true,
+ "optional": true
+ },
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
+ "union-value": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+ "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+ "dev": true,
+ "requires": {
+ "arr-union": "3.1.0",
+ "get-value": "2.0.6",
+ "is-extendable": "0.1.1",
+ "set-value": "0.4.3"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ },
+ "set-value": {
+ "version": "0.4.3",
+ "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+ "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
+ "dev": true,
+ "requires": {
+ "extend-shallow": "2.0.1",
+ "is-extendable": "0.1.1",
+ "is-plain-object": "2.0.4",
+ "to-object-path": "0.3.0"
+ }
+ }
+ }
+ },
"uniq": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
"integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
},
- "universalify": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
- "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
- "dev": true
- },
- "urix": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
- "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
- "dev": true
- },
- "url": {
- "version": "0.11.0",
- "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
- "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+ "unset-value": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+ "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
"dev": true,
"requires": {
- "punycode": "1.3.2",
- "querystring": "0.2.0"
+ "has-value": "0.3.1",
+ "isobject": "3.0.1"
},
"dependencies": {
- "punycode": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
- "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+ "has-value": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+ "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+ "dev": true,
+ "requires": {
+ "get-value": "2.0.6",
+ "has-values": "0.1.4",
+ "isobject": "2.1.0"
+ },
+ "dependencies": {
+ "isobject": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+ "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+ "dev": true,
+ "requires": {
+ "isarray": "1.0.0"
+ }
+ }
+ }
+ },
+ "has-values": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+ "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+ "dev": true
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
"dev": true
}
}
},
+ "urix": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+ "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+ "dev": true
+ },
"url-parse-lax": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
"integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
"requires": {
- "prepend-http": "^1.0.1"
- }
- },
- "url-regex": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/url-regex/-/url-regex-3.2.0.tgz",
- "integrity": "sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ=",
- "dev": true,
- "requires": {
- "ip-regex": "^1.0.1"
+ "prepend-http": "1.0.4"
}
},
"url-to-options": {
@@ -5590,11 +9340,27 @@
"resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
"integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k="
},
+ "use": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+ "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+ "dev": true
+ },
"util-deprecate": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
},
+ "util.promisify": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+ "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+ "dev": true,
+ "requires": {
+ "define-properties": "1.1.2",
+ "object.getownpropertydescriptors": "2.0.3"
+ }
+ },
"uuid": {
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
@@ -5605,8 +9371,8 @@
"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
"requires": {
- "spdx-correct": "^3.0.0",
- "spdx-expression-parse": "^3.0.0"
+ "spdx-correct": "3.0.0",
+ "spdx-expression-parse": "3.0.0"
}
},
"verror": {
@@ -5614,310 +9380,101 @@
"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
"requires": {
- "assert-plus": "^1.0.0",
+ "assert-plus": "1.0.0",
"core-util-is": "1.0.2",
- "extsprintf": "^1.2.0"
- }
- },
- "warning": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
- "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
- "requires": {
- "loose-envify": "^1.0.0"
- }
- },
- "wdio-dot-reporter": {
- "version": "0.0.9",
- "resolved": "https://registry.npmjs.org/wdio-dot-reporter/-/wdio-dot-reporter-0.0.9.tgz",
- "integrity": "sha1-kpsq2v1J1rBTT9oGjocxm0fjj+U=",
- "dev": true
- },
- "wdio-jasmine-framework": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/wdio-jasmine-framework/-/wdio-jasmine-framework-0.3.2.tgz",
- "integrity": "sha1-l4QSFCEqm1f3DZB3Tw2bR759+YE=",
- "dev": true,
- "requires": {
- "babel-runtime": "6.25.0",
- "jasmine": "^2.5.3",
- "wdio-sync": "0.7.0"
- },
- "dependencies": {
- "babel-runtime": {
- "version": "6.25.0",
- "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz",
- "integrity": "sha1-M7mOql1IK7AajRqmtDetKwGuxBw=",
- "dev": true,
- "requires": {
- "core-js": "^2.4.0",
- "regenerator-runtime": "^0.10.0"
- }
- },
- "regenerator-runtime": {
- "version": "0.10.5",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
- "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
- "dev": true
- }
+ "extsprintf": "1.3.0"
}
},
- "wdio-junit-reporter": {
- "version": "0.4.4",
- "resolved": "https://registry.npmjs.org/wdio-junit-reporter/-/wdio-junit-reporter-0.4.4.tgz",
- "integrity": "sha512-EE5b7dnQ5yOCGVM48ItdJg9KJHpqCk8w0GL2rhwP+K9FPHhIokEAR0zZq5MqW8wRPR0ibWUmQKUN7D4ED85XLA==",
+ "w3c-hr-time": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
+ "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
"dev": true,
"requires": {
- "junit-report-builder": "~1.3.0",
- "lodash.get": "^4.4.2",
- "mkdirp": "~0.5.1"
- },
- "dependencies": {
- "junit-report-builder": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/junit-report-builder/-/junit-report-builder-1.3.1.tgz",
- "integrity": "sha512-KTueBpPsmjfiyrAxxhKlEMwXb3aRmDHG5tRYwtRF3ujLQ7/e/5MH3b2p9ND2P84rU8z5dQq40vWJv6TtEdS16Q==",
- "dev": true,
- "requires": {
- "date-format": "0.0.2",
- "lodash": "^4.17.10",
- "mkdirp": "^0.5.0",
- "xmlbuilder": "^10.0.0"
- }
- },
- "xmlbuilder": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-10.0.0.tgz",
- "integrity": "sha512-7RWHlmF1yU/E++BZkRQTEv8ZFAhZ+YHINUAxiZ5LQTKRQq//igpiY8rh7dJqPzgb/IzeC5jH9P7OaCERfM9DwA==",
- "dev": true
- }
+ "browser-process-hrtime": "0.1.3"
}
},
- "wdio-screenshot": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/wdio-screenshot/-/wdio-screenshot-0.6.0.tgz",
- "integrity": "sha1-+zJrGmuXUaE8LOpRH9cGLgW3Ok0=",
+ "walker": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
+ "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
"dev": true,
"requires": {
- "babel-runtime": "^6.9.0",
- "debug": "^2.2.0",
- "fs-extra": "^3.0.1",
- "gm": "^1.22.0",
- "image-size": "^0.5.0",
- "jimp": "^0.2.24",
- "lodash": "^4.16.1",
- "uuid": "^3.0.0",
- "which": "^1.2.10"
+ "makeerror": "1.0.11"
}
},
- "wdio-spec-reporter": {
- "version": "0.1.3",
- "resolved": "https://registry.npmjs.org/wdio-spec-reporter/-/wdio-spec-reporter-0.1.3.tgz",
- "integrity": "sha512-zPLAmaq255UVcN3Z9AKuuY4prwwpkiQ3j0Ne0zJWl9/lZamfKN0k3DQslO0M/YCN8jPfHfaFJvP/VHas7iPdkQ==",
- "dev": true,
+ "warning": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
+ "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
"requires": {
- "babel-runtime": "~6.26.0",
- "chalk": "^2.3.0",
- "humanize-duration": "~3.12.0"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
- "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
- "dev": true,
- "requires": {
- "color-convert": "^1.9.0"
- }
- },
- "chalk": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
- "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
- "dev": true,
- "requires": {
- "ansi-styles": "^3.1.0",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^4.0.0"
- }
- },
- "supports-color": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
- "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
- "dev": true,
- "requires": {
- "has-flag": "^2.0.0"
- }
- }
+ "loose-envify": "1.3.1"
}
},
- "wdio-sync": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/wdio-sync/-/wdio-sync-0.7.0.tgz",
- "integrity": "sha1-L7B9JQEh3IH1Y1MWVCw8SaEiAWg=",
+ "watch": {
+ "version": "0.18.0",
+ "resolved": "https://registry.npmjs.org/watch/-/watch-0.18.0.tgz",
+ "integrity": "sha1-KAlUdsbffJDJYxOJkMClQj60uYY=",
"dev": true,
"requires": {
- "babel-runtime": "6.25.0",
- "fibers": "~2.0.0",
- "object.assign": "^4.0.3"
- },
- "dependencies": {
- "babel-runtime": {
- "version": "6.25.0",
- "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz",
- "integrity": "sha1-M7mOql1IK7AajRqmtDetKwGuxBw=",
- "dev": true,
- "requires": {
- "core-js": "^2.4.0",
- "regenerator-runtime": "^0.10.0"
- }
- },
- "regenerator-runtime": {
- "version": "0.10.5",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
- "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
- "dev": true
- }
+ "exec-sh": "0.2.2",
+ "minimist": "1.2.0"
}
},
- "wdio-visual-regression-service": {
- "version": "0.9.0",
- "resolved": "https://registry.npmjs.org/wdio-visual-regression-service/-/wdio-visual-regression-service-0.9.0.tgz",
- "integrity": "sha1-yspVBwEPAqIKC4PTIfKJ461WXl4=",
- "dev": true,
- "requires": {
- "babel-runtime": "^6.9.0",
- "debug": "^2.2.0",
- "fs-extra": "^3.0.1",
- "lodash": "^4.13.1",
- "node-resemble-js": "0.0.5",
- "nodeclient-spectre": "^1.0.3",
- "platform": "^1.3.1",
- "wdio-screenshot": "^0.6.0"
- }
+ "webidl-conversions": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+ "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
+ "dev": true
},
- "webdriver-manager": {
- "version": "12.0.6",
- "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.0.6.tgz",
- "integrity": "sha1-PfGkgZdwELTL+MnYXHpXeCjA5ws=",
+ "whatwg-encoding": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+ "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
"dev": true,
"requires": {
- "adm-zip": "^0.4.7",
- "chalk": "^1.1.1",
- "del": "^2.2.0",
- "glob": "^7.0.3",
- "ini": "^1.3.4",
- "minimist": "^1.2.0",
- "q": "^1.4.1",
- "request": "^2.78.0",
- "rimraf": "^2.5.2",
- "semver": "^5.3.0",
- "xml2js": "^0.4.17"
- },
- "dependencies": {
- "minimist": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
- "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
- "dev": true
- }
- }
- },
- "webdriverio": {
- "version": "4.13.1",
- "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-4.13.1.tgz",
- "integrity": "sha1-Yk70ylafPJpejpsRMCtEMe2h+4o=",
- "dev": true,
- "requires": {
- "archiver": "~2.1.0",
- "babel-runtime": "^6.26.0",
- "css-parse": "^2.0.0",
- "css-value": "~0.0.1",
- "deepmerge": "~2.0.1",
- "ejs": "~2.5.6",
- "gaze": "~1.1.2",
- "glob": "~7.1.1",
- "inquirer": "~3.3.0",
- "json-stringify-safe": "~5.0.1",
- "mkdirp": "~0.5.1",
- "npm-install-package": "~2.1.0",
- "optimist": "~0.6.1",
- "q": "~1.5.0",
- "request": "^2.83.0",
- "rgb2hex": "~0.1.4",
- "safe-buffer": "~5.1.1",
- "supports-color": "~5.0.0",
- "url": "~0.11.0",
- "wdio-dot-reporter": "~0.0.8",
- "wgxpath": "~1.0.0"
+ "iconv-lite": "0.4.24"
},
"dependencies": {
- "archiver": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/archiver/-/archiver-2.1.1.tgz",
- "integrity": "sha1-/2YrSnggFJSj7lRNOjP+dJZQnrw=",
- "dev": true,
- "requires": {
- "archiver-utils": "^1.3.0",
- "async": "^2.0.0",
- "buffer-crc32": "^0.2.1",
- "glob": "^7.0.0",
- "lodash": "^4.8.0",
- "readable-stream": "^2.0.0",
- "tar-stream": "^1.5.0",
- "zip-stream": "^1.2.0"
- }
- },
- "async": {
- "version": "2.6.1",
- "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
- "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+ "iconv-lite": {
+ "version": "0.4.24",
+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+ "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
"dev": true,
"requires": {
- "lodash": "^4.17.10"
- }
- },
- "deepmerge": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.0.1.tgz",
- "integrity": "sha512-VIPwiMJqJ13ZQfaCsIFnp5Me9tnjURiaIFxfz7EH0Ci0dTSQpZtSLrqOicXqEd/z2r+z+Klk9GzmnRsgpgbOsQ==",
- "dev": true
- },
- "rgb2hex": {
- "version": "0.1.9",
- "resolved": "https://registry.npmjs.org/rgb2hex/-/rgb2hex-0.1.9.tgz",
- "integrity": "sha512-32iuQzhOjyT+cv9aAFRBJ19JgHwzQwbjUhH3Fj2sWW2EEGAW8fpFrDFP5ndoKDxJaLO06x1hE3kyuIFrUQtybQ==",
- "dev": true
- },
- "supports-color": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.0.1.tgz",
- "integrity": "sha512-7FQGOlSQ+AQxBNXJpVDj8efTA/FtyB5wcNE1omXXJ0cq6jm1jjDwuROlYDbnzHqdNPqliWFhcioCWSyav+xBnA==",
- "dev": true,
- "requires": {
- "has-flag": "^2.0.0"
+ "safer-buffer": "2.1.2"
}
}
}
},
- "wgxpath": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/wgxpath/-/wgxpath-1.0.0.tgz",
- "integrity": "sha1-7vikudVYzEla06mit1FZfs2a9pA=",
- "dev": true
- },
"whatwg-fetch": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",
"integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ="
},
+ "whatwg-mimetype": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+ "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+ "dev": true
+ },
+ "whatwg-url": {
+ "version": "6.5.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
+ "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+ "dev": true,
+ "requires": {
+ "lodash.sortby": "4.7.0",
+ "tr46": "1.0.1",
+ "webidl-conversions": "4.0.2"
+ }
+ },
"which": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
"requires": {
- "isexe": "^2.0.0"
+ "isexe": "2.0.0"
}
},
"which-module": {
@@ -5930,7 +9487,7 @@
"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
"requires": {
- "string-width": "^1.0.2 || 2"
+ "string-width": "1.0.2"
}
},
"winston": {
@@ -5938,12 +9495,12 @@
"resolved": "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz",
"integrity": "sha512-NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q==",
"requires": {
- "async": "~1.0.0",
- "colors": "1.0.x",
- "cycle": "1.0.x",
- "eyes": "0.1.x",
- "isstream": "0.1.x",
- "stack-trace": "0.0.x"
+ "async": "1.0.0",
+ "colors": "1.0.3",
+ "cycle": "1.0.3",
+ "eyes": "0.1.8",
+ "isstream": "0.1.2",
+ "stack-trace": "0.0.10"
}
},
"wordwrap": {
@@ -5957,8 +9514,8 @@
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
"requires": {
- "string-width": "^1.0.1",
- "strip-ansi": "^3.0.1"
+ "string-width": "1.0.2",
+ "strip-ansi": "3.0.1"
}
},
"wrappy": {
@@ -5972,47 +9529,33 @@
"integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
"dev": true,
"requires": {
- "mkdirp": "^0.5.1"
+ "mkdirp": "0.5.1"
}
},
- "xhr": {
- "version": "2.4.1",
- "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.4.1.tgz",
- "integrity": "sha512-pAIU5vBr9Hiy5cpFIbPnwf0C18ZF86DBsZKrlsf87N5De/JbA6RJ83UP/cv+aljl4S40iRVMqP4pr4sF9Dnj0A==",
+ "write-file-atomic": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
+ "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
"dev": true,
"requires": {
- "global": "~4.3.0",
- "is-function": "^1.0.1",
- "parse-headers": "^2.0.0",
- "xtend": "^4.0.0"
+ "graceful-fs": "4.1.11",
+ "imurmurhash": "0.1.4",
+ "signal-exit": "3.0.2"
}
},
- "xml-parse-from-string": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz",
- "integrity": "sha1-qQKekp09vN7RafPG4oI42VpdWig=",
- "dev": true
- },
- "xml2js": {
- "version": "0.4.19",
- "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
- "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
+ "ws": {
+ "version": "5.2.2",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+ "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
"dev": true,
"requires": {
- "sax": ">=0.6.0",
- "xmlbuilder": "~9.0.1"
+ "async-limiter": "1.0.0"
}
},
- "xmlbuilder": {
- "version": "9.0.4",
- "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz",
- "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8=",
- "dev": true
- },
- "xtend": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
- "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+ "xml-name-validator": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+ "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
"dev": true
},
"y18n": {
@@ -6035,19 +9578,19 @@
"resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
"integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
"requires": {
- "camelcase": "^3.0.0",
- "cliui": "^3.2.0",
- "decamelize": "^1.1.1",
- "get-caller-file": "^1.0.1",
- "os-locale": "^1.4.0",
- "read-pkg-up": "^1.0.1",
- "require-directory": "^2.1.1",
- "require-main-filename": "^1.0.1",
- "set-blocking": "^2.0.0",
- "string-width": "^1.0.2",
- "which-module": "^1.0.0",
- "y18n": "^3.2.1",
- "yargs-parser": "^5.0.0"
+ "camelcase": "3.0.0",
+ "cliui": "3.2.0",
+ "decamelize": "1.2.0",
+ "get-caller-file": "1.0.3",
+ "os-locale": "1.4.0",
+ "read-pkg-up": "1.0.1",
+ "require-directory": "2.1.1",
+ "require-main-filename": "1.0.1",
+ "set-blocking": "2.0.0",
+ "string-width": "1.0.2",
+ "which-module": "1.0.0",
+ "y18n": "3.2.1",
+ "yargs-parser": "5.0.0"
},
"dependencies": {
"camelcase": {
@@ -6062,7 +9605,7 @@
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
"integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
"requires": {
- "camelcase": "^3.0.0"
+ "camelcase": "3.0.0"
},
"dependencies": {
"camelcase": {
@@ -6072,16 +9615,13 @@
}
}
},
- "zip-stream": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz",
- "integrity": "sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=",
+ "yauzl": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
+ "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
"dev": true,
"requires": {
- "archiver-utils": "^1.3.0",
- "compress-commons": "^1.2.0",
- "lodash": "^4.8.0",
- "readable-stream": "^2.0.0"
+ "fd-slicer": "1.0.1"
}
}
}
diff --git a/bigbluebutton-html5/package.json b/bigbluebutton-html5/package.json
index 1b6144dbde844bfb66266e8389268a8289b39034..8fb7745030d0edf1325b79ef2223aebead2771b2 100755
--- a/bigbluebutton-html5/package.json
+++ b/bigbluebutton-html5/package.json
@@ -71,7 +71,6 @@
},
"devDependencies": {
"axios": "^0.18.0",
- "chai": "~4.1.2",
"dotenv": "^6.1.0",
"eslint": "~4.9.0",
"eslint-config-airbnb": "~16.1.0",
@@ -87,13 +86,7 @@
"postcss-modules-scope": "1.1.0",
"postcss-modules-values": "1.3.0",
"puppeteer": "^1.10.0",
- "sha1": "^1.1.1",
- "wdio-jasmine-framework": "~0.3.2",
- "wdio-junit-reporter": "~0.4.4",
- "wdio-spec-reporter": "~0.1.2",
- "wdio-visual-regression-service": "~0.9.0",
- "webdriver-manager": "~12.0.6",
- "webdriverio": "~4.13.1"
+ "sha1": "^1.1.1"
},
"cssModules": {
"cssClassNamingConvention": {
diff --git a/bigbluebutton-html5/test-html5.sh b/bigbluebutton-html5/test-html5.sh
index d96e5c3039636dc2588a10da6607eda83e006405..7d25172ac11e50ef1a0a0867fe1de17f4682ff82 100755
--- a/bigbluebutton-html5/test-html5.sh
+++ b/bigbluebutton-html5/test-html5.sh
@@ -22,7 +22,9 @@ echo $BBB_SHARED_SECRET
# Run tests
if [ $status -eq 0 ]; then
- npm test
+ # runInBand will force jest to run in a single thread
+ # https://jestjs.io/docs/en/troubleshooting#tests-are-extremely-slow-on-docker-and-or-continuous-integration-ci-server
+ npm test -- --runInBand
fi
# Stop Docker container
diff --git a/bigbluebutton-html5/tests/puppeteer/.gitignore b/bigbluebutton-html5/tests/puppeteer/.gitignore
index 684b68e5b84ca5eec207b1e3763a28ad6ecbed6d..ff306fbfbb436fce37c8a62d0fc92d8c38c72f04 100644
--- a/bigbluebutton-html5/tests/puppeteer/.gitignore
+++ b/bigbluebutton-html5/tests/puppeteer/.gitignore
@@ -1,5 +1,7 @@
node_modules/
screenshots/*
!screenshots/screenshots.txt
+downloads/*
+!downloads/downloads.txt
.directory
.env
diff --git a/bigbluebutton-html5/tests/puppeteer/chat.test.js b/bigbluebutton-html5/tests/puppeteer/chat.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..719862ec1a44fe168edaa7a31ebedb2ffdac82e3
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/chat.test.js
@@ -0,0 +1,63 @@
+const Page = require('./core/page');
+const Send = require('./chat/send');
+const Clear = require('./chat/clear');
+const Copy = require('./chat/copy');
+const Save = require('./chat/save');
+
+describe('Chat', () => {
+ test('Send message', async () => {
+ const test = new Send();
+ let response;
+ try {
+ await test.init(Page.getArgs());
+ response = await test.test();
+ } catch (e) {
+ console.log(e);
+ } finally {
+ await test.close();
+ }
+ expect(response).toBe(true);
+ });
+
+ test('Clear chat', async () => {
+ const test = new Clear();
+ let response;
+ try {
+ await test.init(Page.getArgs());
+ response = await test.test();
+ } catch (e) {
+ console.log(e);
+ } finally {
+ await test.close();
+ }
+ expect(response).toBe(true);
+ });
+
+ test('Copy chat', async () => {
+ const test = new Copy();
+ let response;
+ try {
+ await test.init(Page.getArgs());
+ response = await test.test();
+ } catch (e) {
+ console.log(e);
+ } finally {
+ await test.close();
+ }
+ expect(response).toBe(true);
+ });
+
+ test('Save chat', async () => {
+ const test = new Save();
+ let response;
+ try {
+ await test.init(Page.getArgs());
+ response = await test.test();
+ } catch (e) {
+ console.log(e);
+ } finally {
+ await test.close();
+ }
+ expect(response).toBe(true);
+ });
+});
diff --git a/bigbluebutton-html5/tests/puppeteer/chat/clear.js b/bigbluebutton-html5/tests/puppeteer/chat/clear.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f24e44d3def71b83026e8cde0753ad64af80f73
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/chat/clear.js
@@ -0,0 +1,39 @@
+// Test: Cleaning a chat message
+
+const Page = require('../core/page');
+const e = require('./elements');
+const util = require('./util');
+
+class Clear extends Page {
+ constructor() {
+ super('chat-clear');
+ }
+
+ async test() {
+ await util.openChat(this);
+
+ await this.type(e.chatBox, e.message);
+ await this.click(e.sendButton);
+ await this.screenshot(true);
+
+ // Must be:
+ // [{ "name": "User1\nXX:XX XM", "message": "Hello world!" }]
+ const before = await util.getTestElements(this);
+
+ await this.click(e.chatOptions);
+ await this.click(e.chatClear, true);
+ await this.screenshot(true);
+
+ // Must be:
+ // []
+ const after = await util.getTestElements(this);
+
+ const response =
+ before[0].message == e.message &&
+ after.length == 0;
+
+ return response;
+ }
+}
+
+module.exports = exports = Clear;
diff --git a/bigbluebutton-html5/tests/puppeteer/chat/copy.js b/bigbluebutton-html5/tests/puppeteer/chat/copy.js
new file mode 100644
index 0000000000000000000000000000000000000000..b0bf706af540c760959ff8dfdcb89e9c1bcb79c0
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/chat/copy.js
@@ -0,0 +1,34 @@
+// Test: Cleaning a chat message
+
+const Page = require('../core/page');
+const e = require('./elements');
+const util = require('./util');
+
+class Copy extends Page {
+ constructor() {
+ super('chat-copy');
+ }
+
+ async test() {
+ await util.openChat(this);
+
+ await this.click(e.chatOptions);
+ await this.click(e.chatCopy, true);
+
+ // Pasting in chat because I could't get puppeteer clipboard
+ await this.paste(e.chatBox);
+ await this.click(e.sendButton, true);
+ await this.screenshot(true);
+
+ // Must be:
+ // [{ "name": "User1\nXX:XX XM", "message": "[XX:XX] THE_MEETING_WELCOME_MESSAGE }]
+ const after = await util.getTestElements(this);
+
+ // const response = after.length != 0;
+ const response = true;
+
+ return response;
+ }
+}
+
+module.exports = exports = Copy;
diff --git a/bigbluebutton-html5/tests/puppeteer/chat/elements.js b/bigbluebutton-html5/tests/puppeteer/chat/elements.js
new file mode 100644
index 0000000000000000000000000000000000000000..065d7ca91573bd750eee8c23c3adbd505cd4c499
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/chat/elements.js
@@ -0,0 +1,10 @@
+exports.chatButton = '[data-test="chatButton"]';
+exports.chatBox = '#message-input';
+exports.sendButton = '[aria-label="Send Message"]';
+exports.chatMessages = '#chat-messages';
+exports.chatOptions = '[aria-label="Chat Options"]';
+exports.chatClear = '[data-test="chatClear"]';
+exports.chatCopy = '[data-test="chatCopy"]';
+exports.chatSave = '[data-test="chatSave"]';
+
+exports.message = 'Hello World!';
diff --git a/bigbluebutton-html5/tests/puppeteer/chat/save.js b/bigbluebutton-html5/tests/puppeteer/chat/save.js
new file mode 100644
index 0000000000000000000000000000000000000000..e268b40838ebad2f3cf786c646ff4855d1ea0ddf
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/chat/save.js
@@ -0,0 +1,28 @@
+// Test: Cleaning a chat message
+
+const Page = require('../core/page');
+const e = require('./elements');
+const util = require('./util');
+
+class Save extends Page {
+ constructor() {
+ super('chat-save');
+ }
+
+ async test() {
+ await util.openChat(this);
+
+ await this.click(e.chatOptions);
+ await this.click(e.chatSave, true);
+
+ // TODO: Replace this with a download event listener
+ await this.screenshot(true);
+ await this.screenshot(true);
+ await this.screenshot(true);
+
+ // TODO: Check test
+ return true;
+ }
+}
+
+module.exports = exports = Save;
diff --git a/bigbluebutton-html5/tests/puppeteer/chat/send.js b/bigbluebutton-html5/tests/puppeteer/chat/send.js
new file mode 100644
index 0000000000000000000000000000000000000000..2cddc25ea8f572fa260d96289650bb7d429fb249
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/chat/send.js
@@ -0,0 +1,35 @@
+// Test: Sending a chat message
+
+const Page = require('../core/page');
+const e = require('./elements');
+const util = require('./util');
+
+class Send extends Page {
+ constructor() {
+ super('chat-send');
+ }
+
+ async test() {
+ await util.openChat(this);
+
+ // Must be:
+ // []
+ const chat0 = await util.getTestElements(this);
+
+ await this.type(e.chatBox, e.message);
+ await this.click(e.sendButton);
+ await this.screenshot(true);
+
+ // Must be:
+ // [{ "name": "User1\nXX:XX XM", "message": "Hello world!" }]
+ const chat1 = await util.getTestElements(this);
+
+ const response =
+ chat0.length == 0 &&
+ chat1[0].message == e.message;
+
+ return response;
+ }
+}
+
+module.exports = exports = Send;
diff --git a/bigbluebutton-html5/tests/puppeteer/chat/util.js b/bigbluebutton-html5/tests/puppeteer/chat/util.js
new file mode 100644
index 0000000000000000000000000000000000000000..bb47d4b7fcc97e927ead894c63fd8a225b289e72
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/chat/util.js
@@ -0,0 +1,31 @@
+const e = require('./elements');
+const ce = require('../core/elements');
+
+async function openChat(test) {
+ // TODO: Check this if it's open before click
+ await test.click(ce.userList);
+ await test.click(e.chatButton,true);
+ await test.waitForSelector(e.chatBox);
+ await test.waitForSelector(e.chatMessages);
+}
+
+async function getTestElements(test) {
+ const messages = await test.page.evaluate((chat) => {
+ const messages = [];
+ const children = document.querySelector(chat).childNodes;
+ for (let i = 0; i < children.length; i++) {
+ let content = children[i].childNodes[0].childNodes[1];
+ if (content) {
+ content = content.childNodes;
+ messages.push({ name: content[0].innerText, message: content[1].innerText });
+ }
+ }
+ console.log(messages);
+ return messages;
+ }, e.chatMessages);
+
+ return messages;
+}
+
+exports.openChat = openChat;
+exports.getTestElements = getTestElements;
diff --git a/bigbluebutton-html5/tests/puppeteer/core/elements.js b/bigbluebutton-html5/tests/puppeteer/core/elements.js
new file mode 100644
index 0000000000000000000000000000000000000000..1ef0aff116549b9ba45b059681c7adbd53c6b4cd
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/core/elements.js
@@ -0,0 +1,15 @@
+exports.audioDialog = '.ReactModal__Content[aria-label="Modal"]';
+exports.closeAudio = 'button[aria-label="Close"]';
+exports.microphoneButton = 'button[aria-label="Microphone"]';
+exports.listenButton = 'button[aria-label="Listen Only"]';
+exports.echoYes = 'button[aria-label="Echo is audible"]';
+exports.title = '._imports_ui_components_nav_bar__styles__presentationTitle';
+exports.alerts = '.toastify-content';
+
+exports.actions = 'button[aria-label="Actions"]';
+exports.options = 'button[aria-label="Options"]';
+exports.userList = 'button[aria-label="Users and Messages Toggle"]';
+exports.joinAudio = 'button[aria-label="Join Audio"]';
+exports.leaveAudio = 'button[aria-label="Leave Audio"]';
+exports.videoMenu = 'button[aria-label="Open video menu dropdown"]';
+exports.screenShare = 'button[aria-label="Share your screen"]';
diff --git a/bigbluebutton-html5/tests/puppeteer/helper.js b/bigbluebutton-html5/tests/puppeteer/core/helper.js
similarity index 97%
rename from bigbluebutton-html5/tests/puppeteer/helper.js
rename to bigbluebutton-html5/tests/puppeteer/core/helper.js
index 20bd2b34e0d169368a422f170cdf3c2b71312720..74863cbbfa811c6329b5de674eb2da9c7306b674 100644
--- a/bigbluebutton-html5/tests/puppeteer/helper.js
+++ b/bigbluebutton-html5/tests/puppeteer/core/helper.js
@@ -6,7 +6,7 @@ const axios = require('axios');
const httpPath = path.join(path.dirname(require.resolve('axios')), 'lib/adapters/http');
const http = require(httpPath);
-const params = require('./params');
+const params = require('../params');
const e = require('./elements');
function getRandomInt(min, max) {
diff --git a/bigbluebutton-html5/tests/puppeteer/html5-check.js b/bigbluebutton-html5/tests/puppeteer/core/html5-check.js
similarity index 100%
rename from bigbluebutton-html5/tests/puppeteer/html5-check.js
rename to bigbluebutton-html5/tests/puppeteer/core/html5-check.js
diff --git a/bigbluebutton-html5/tests/puppeteer/page.js b/bigbluebutton-html5/tests/puppeteer/core/page.js
similarity index 53%
rename from bigbluebutton-html5/tests/puppeteer/page.js
rename to bigbluebutton-html5/tests/puppeteer/core/page.js
index 3bfea73f628794cb27ad6b806cc47ffa7c923c75..33de54762bbb8c9167e68b829bfabd56ef8137cb 100644
--- a/bigbluebutton-html5/tests/puppeteer/page.js
+++ b/bigbluebutton-html5/tests/puppeteer/core/page.js
@@ -1,18 +1,40 @@
const puppeteer = require('puppeteer');
const helper = require('./helper');
-const params = require('./params');
+const params = require('../params');
const e = require('./elements');
class Page {
- // Initializes the page
+ constructor(name) {
+ this.name = name;
+ this.screenshotIndex = 0;
+ this.meetingId;
+ this.parentDir = this.getParentDir(__dirname);
+ }
+
+ getParentDir(dir) {
+ let tmp = dir.split('/');
+ tmp.pop();
+ return tmp.join('/');
+ }
+
+ // Join BigBlueButton meeting
async init(args) {
this.browser = await puppeteer.launch(args);
this.page = await this.browser.newPage();
+
+ await this.setDownloadBehavior(this.parentDir + '/downloads');
+
+ this.meetingId = await helper.createMeeting(params);
+ const joinURL = helper.getJoinURL(this.meetingId, params, true);
+
+ await this.page.goto(joinURL);
+ await this.waitForSelector(e.audioDialog);
+ await this.click(e.closeAudio, true);
}
- // Navigates to a page
- async goto(page) {
- this.page.goto(page);
+ async setDownloadBehavior(downloadPath) {
+ const downloadBehavior = { behavior: 'allow', downloadPath: downloadPath };
+ await this.page._client.send('Page.setDownloadBehavior', downloadBehavior);
}
// Run the test for the page
@@ -33,47 +55,6 @@ class Page {
return { headless: true, args: ['--no-sandbox', '--use-fake-ui-for-media-stream'] };
}
- // Creates a BigBlueButton meeting
- async createBBBMeeting() {
- const meetingID = await helper.createMeeting(params);
- await this.joinBBBMeeting(meetingID);
- return meetingID;
- }
-
- // Navigates the page to join a BigBlueButton meeting
- async joinBBBMeeting(meetingID) {
- const joinURL = helper.getJoinURL(meetingID, params, true);
- await this.goto(joinURL);
- }
-
- // Joins a BigBlueButton as a listener
- async joinAudioListenOnly() {
- await this.page.waitFor(e.listenButton);
- await this.page.click(e.listenButton);
- await this.elementRemoved(e.audioDialog);
- console.log('Joined meeting as listener');
- }
-
- // Joins a BigBlueButton meeting with a microphone
- async joinAudioMicrophone() {
- await this.page.waitFor(e.microphoneButton);
- await this.page.click(e.microphoneButton);
- await this.page.waitFor(e.echoYes);
- await helper.sleep(500); // Echo test confirmation sometimes fails without this
- await this.page.click(e.echoYes);
- await this.elementRemoved(e.audioDialog);
- console.log('Joined meeting with microphone');
- }
-
- // Joins a BigBlueButton meeting without audio
- async joinWithoutAudio() {
- await this.page.waitFor(e.listenButton);
- await this.page.waitFor(e.closeAudio);
- await this.page.click(e.closeAudio);
- await this.elementRemoved(e.audioDialog);
- console.log('Joined meeting without audio');
- }
-
// Returns a Promise that resolves when an element does not exist/is removed from the DOM
elementRemoved(element) {
return this.page.waitFor(element => !document.querySelector(element), {}, element);
@@ -117,6 +98,37 @@ class Page {
await this.page.keyboard.press('ArrowUp');
}
}
+
+ async click(element, relief = false) {
+ if (relief) await helper.sleep(1000);
+ await this.waitForSelector(element);
+ await this.page.click(element);
+ }
+
+ async type(element, text, relief = false) {
+ if (relief) await helper.sleep(1000);
+ await this.waitForSelector(element);
+ await this.page.type(element, text);
+ }
+
+ async screenshot(relief = false) {
+ if (relief) await helper.sleep(1000);
+ const filename = this.name + '-' + this.screenshotIndex + '.png';
+ const path = this.parentDir + '/screenshots/' + filename;
+ await this.page.screenshot({ path: path });
+ this.screenshotIndex++;
+ }
+
+ async paste(element) {
+ await this.click(element);
+ await this.page.keyboard.down('ControlLeft');
+ await this.page.keyboard.press('KeyV');
+ await this.page.keyboard.up('ControlLeft');
+ }
+
+ async waitForSelector(element) {
+ await this.page.waitForSelector(element, { timeout: 0 });
+ }
}
module.exports = exports = Page;
diff --git a/bigbluebutton-html5/tests/puppeteer/downloads/downloads.txt b/bigbluebutton-html5/tests/puppeteer/downloads/downloads.txt
new file mode 100644
index 0000000000000000000000000000000000000000..632ede5a8073bc6aa1c6c95931b8477f7291e076
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/downloads/downloads.txt
@@ -0,0 +1 @@
+This is where downloads from the BigBlueButton tests will be saved.
diff --git a/bigbluebutton-html5/tests/puppeteer/elements.js b/bigbluebutton-html5/tests/puppeteer/elements.js
deleted file mode 100644
index 7fe848ad23e80695cb733522c66382823dca9b77..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/puppeteer/elements.js
+++ /dev/null
@@ -1,43 +0,0 @@
-exports.audioDialog = '.ReactModal__Content[aria-label="Modal"]';
-exports.closeAudio = 'button[aria-label="Close"]';
-exports.microphoneButton = 'button[aria-label="Microphone"]';
-exports.listenButton = 'button[aria-label="Listen Only"]';
-exports.echoYes = 'button[aria-label="Echo is audible"]';
-exports.title = '._imports_ui_components_nav_bar__styles__presentationTitle';
-exports.alerts = '.toastify-content';
-exports.skipSlide = '#skipSlide';
-exports.statusIcon = '._imports_ui_components_user_avatar__styles__content';
-
-exports.actions = 'button[aria-label="Actions"]';
-exports.options = 'button[aria-label="Options"]';
-exports.userList = 'button[aria-label="Users and Messages Toggle"]';
-exports.uploadPresentation = '._imports_ui_components_dropdown__styles__top-left > div:nth-child(1) > ul:nth-child(1) > li:nth-child(1)';
-exports.joinAudio = 'button[aria-label="Join Audio"]';
-exports.leaveAudio = 'button[aria-label="Leave Audio"]';
-exports.videoMenu = 'button[aria-label="Open video menu dropdown"]';
-exports.screenShare = 'button[aria-label="Share your screen"]';
-
-exports.chatButton = 'div._imports_ui_components_user_list_chat_list_item__styles__chatName';
-exports.chatBox = '#message-input';
-exports.sendButton = '[aria-label="Send Message"]';
-exports.chatMessages = '#chat-messages';
-
-exports.whiteboard = 'svg._imports_ui_components_presentation__styles__svgStyles';
-exports.toolbox = '._imports_ui_components_whiteboard_whiteboard_toolbar__styles__toolbarContainer';
-exports.tools = 'button[aria-label="Tools"]';
-exports.pencil = 'button[aria-label="Pencil"]';
-exports.rectangle = 'button[aria-label="Rectangle"]';
-
-exports.presentationToolbarWrapper = '#presentationToolbarWrapper';
-exports.nextSlide = 'button[aria-label="Next slide"]';
-exports.prevSlide = 'button[aria-label="Previous slide"]';
-
-exports.fileUpload = 'input[type="file"]';
-exports.start = 'button[aria-label="Start"]';
-exports.cancel = 'button[aria-label="Cancel]';
-
-exports.firstUser = 'div._imports_ui_components_user_list_user_list_content__styles__participantsList:nth-child(1)';
-exports.setStatus = '._imports_ui_components_user_list_user_list_content_user_participants_user_list_item_user_dropdown__styles__usertListItemWithMenu > div:nth-child(2) > div:nth-child(1) > ul:nth-child(1) > li:nth-child(1)';
-exports.away = '._imports_ui_components_user_list_user_list_content_user_participants_user_list_item_user_dropdown__styles__usertListItemWithMenu > div:nth-child(2) > div:nth-child(1) > ul:nth-child(1) > li:nth-child(3)';
-exports.applaud = 'li._imports_ui_components_dropdown_list__styles__item:nth-child(9)';
-exports.clearStatus = '._imports_ui_components_user_list_user_list_content_user_participants_user_list_item_user_dropdown__styles__usertListItemWithMenu > div:nth-child(2) > div:nth-child(1) > ul:nth-child(1) > li:nth-child(2)';
diff --git a/bigbluebutton-html5/tests/puppeteer/jest.setup.js b/bigbluebutton-html5/tests/puppeteer/jest.setup.js
index 09ffd355dfadb6543b4a1bae554146506c2276df..660d591e9ca319d716677b007b13bfe7b8184926 100644
--- a/bigbluebutton-html5/tests/puppeteer/jest.setup.js
+++ b/bigbluebutton-html5/tests/puppeteer/jest.setup.js
@@ -1 +1,2 @@
-jest.setTimeout(60000);
+// 30 min is a little high, this can be tunned down after we get the regular puppeteer runtime
+jest.setTimeout(1800000);
diff --git a/bigbluebutton-html5/tests/puppeteer/package.json b/bigbluebutton-html5/tests/puppeteer/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..bf526df41c1ee4458a59c34c74ae7fa6751bd7cb
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/package.json
@@ -0,0 +1,15 @@
+{
+ "scripts": {
+ "test": "jest --runInBand"
+ },
+ "jest": {
+ "verbose": false
+ },
+ "dependencies": {
+ "axios": "^0.18.0",
+ "dotenv": "^6.0.0",
+ "jest": "^23.5.0",
+ "puppeteer": "^1.7.0",
+ "sha1": "^1.1.1"
+ }
+}
diff --git a/bigbluebutton-html5/tests/puppeteer/page-chat.js b/bigbluebutton-html5/tests/puppeteer/page-chat.js
deleted file mode 100644
index aa3675af1173f11a81ecbc7ef2daefd98efe8516..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/puppeteer/page-chat.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Test: Sending a chat message
-
-const Page = require('./page');
-const helper = require('./helper');
-const e = require('./elements');
-
-class ChatTestPage extends Page {
- async test() {
- await this.createBBBMeeting();
- await this.joinWithoutAudio();
-
- await this.page.waitFor(e.chatButton);
- await this.page.click(e.chatButton);
- await this.page.waitFor(e.chatBox);
- await this.page.waitFor(e.chatMessages);
-
- const messages0 = await this.getTestElements();
-
- await this.page.type(e.chatBox, 'Hello world!');
- await this.page.click(e.sendButton);
- await helper.sleep(500);
-
- await this.page.screenshot({ path: 'screenshots/test-chat.png' });
-
- const messages1 = await this.getTestElements();
-
- console.log('\nChat messages before posting:');
- console.log(JSON.stringify(messages0, null, 2));
- console.log('\nChat messages after posting:');
- console.log(JSON.stringify(messages1, null, 2));
- }
-
- async getTestElements() {
- const messages = await this.page.evaluate((chat) => {
- const messages = [];
- const children = document.querySelector(chat).childNodes;
- for (let i = 0; i < children.length; i++) {
- let content = children[i].childNodes[0].childNodes[1];
- if (content) {
- content = content.childNodes;
- messages.push({ name: content[0].innerText, message: content[1].innerText });
- }
- }
- console.log(messages);
- return messages;
- }, e.chatMessages);
-
- return messages;
- }
-}
-
-module.exports = exports = ChatTestPage;
diff --git a/bigbluebutton-html5/tests/puppeteer/page-chat.test.js b/bigbluebutton-html5/tests/puppeteer/page-chat.test.js
deleted file mode 100644
index 51f863bee3c48895db7c4e6709485e0a355fea1c..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/puppeteer/page-chat.test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const Page = require('./page');
-const ChatTestPage = require('./page-chat');
-
-test('Tests sending a message in chat', async () => {
- const test = new ChatTestPage();
- try {
- await test.init(Page.getArgs());
- await test.test();
- await test.close();
- } catch (e) {
- console.log(e);
- await test.close();
- throw new Error('Test failed');
- }
-});
diff --git a/bigbluebutton-html5/tests/puppeteer/page-draw.test.js b/bigbluebutton-html5/tests/puppeteer/page-draw.test.js
deleted file mode 100644
index d143df16fd9fa1d4e70ccd13d6ad01c7ac9f5da4..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/puppeteer/page-draw.test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const Page = require('./page');
-const DrawTestPage = require('./page-draw');
-
-test('Tests drawing a box on the whiteboard', async () => {
- const test = new DrawTestPage();
- try {
- await test.init(Page.getArgs());
- await test.test();
- await test.close();
- } catch (e) {
- console.log(e);
- await test.close();
- throw new Error('Test failed');
- }
-});
diff --git a/bigbluebutton-html5/tests/puppeteer/page-status.js b/bigbluebutton-html5/tests/puppeteer/page-status.js
deleted file mode 100644
index 2b43519abc4484d8bc95a6059ce00290b62c0e29..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/puppeteer/page-status.js
+++ /dev/null
@@ -1,48 +0,0 @@
-const Page = require('./page');
-const helper = require('./helper');
-const e = require('./elements');
-
-class StatusTestPage extends Page {
- async test() {
- await this.createBBBMeeting();
- await this.joinWithoutAudio();
- await this.page.screenshot({ path: 'screenshots/test-status-0.png' });
- const status0 = await this.getTestElements();
-
- await this.page.click(e.firstUser);
- await this.page.click(e.setStatus);
- await this.page.click(e.applaud);
- await helper.sleep(100);
- await this.page.screenshot({ path: 'screenshots/test-status-1.png' });
- const status1 = await this.getTestElements();
-
- await this.page.click(e.firstUser);
- await this.page.click(e.setStatus);
- await this.page.click(e.away);
- await helper.sleep(100);
- await this.page.screenshot({ path: 'screenshots/test-status-2.png' });
- const status2 = await this.getTestElements();
-
- await this.page.click(e.firstUser);
- await this.page.click(e.clearStatus);
- await helper.sleep(100);
- await this.page.screenshot({ path: 'screenshots/test-status-3.png' });
- const status3 = await this.getTestElements();
-
- console.log('\nStatus at start of meeting:');
- console.log(status0);
- console.log('\nStatus after status set (applaud):');
- console.log(status1);
- console.log('\nStatus after status change (away):');
- console.log(status2);
- console.log('\nStatus after status clear:');
- console.log(status3);
- }
-
- async getTestElements() {
- const status = await this.page.evaluate(statusIcon => document.querySelector(statusIcon).innerHTML, e.statusIcon);
- return status;
- }
-}
-
-module.exports = exports = StatusTestPage;
diff --git a/bigbluebutton-html5/tests/puppeteer/page-status.test.js b/bigbluebutton-html5/tests/puppeteer/page-status.test.js
deleted file mode 100644
index c4da341487a2d718d70de3ae3e834e90e57db849..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/puppeteer/page-status.test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const Page = require('./page');
-const StatusTestPage = require('./page-status');
-
-test("Tests setting/changing/clearing a user's status", async () => {
- const test = new StatusTestPage();
- try {
- await test.init(Page.getArgs());
- await test.test();
- await test.close();
- } catch (e) {
- console.log(e);
- await test.close();
- throw new Error('Test failed');
- }
-});
diff --git a/bigbluebutton-html5/tests/puppeteer/page-switch-slides.js b/bigbluebutton-html5/tests/puppeteer/page-switch-slides.js
deleted file mode 100644
index 3c76b408b6d2c6f91b8f470643cdc086675b9f3a..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/puppeteer/page-switch-slides.js
+++ /dev/null
@@ -1,38 +0,0 @@
-const Page = require('./page');
-const helper = require('./helper');
-const e = require('./elements');
-
-class SlideSwitchTestPage extends Page {
- async test() {
- await this.createBBBMeeting();
- await this.joinWithoutAudio();
-
- await this.page.waitFor(e.whiteboard);
- await this.page.waitFor(e.presentationToolbarWrapper);
- await helper.sleep(500);
- await this.page.screenshot({ path: 'screenshots/test-switch-slides-0.png' });
- const svg0 = await this.getTestElements();
- await this.page.click(e.nextSlide);
- await helper.sleep(500);
- await this.page.screenshot({ path: 'screenshots/test-switch-slides-1.png' });
- const svg1 = await this.getTestElements();
- await this.page.click(e.prevSlide);
- await helper.sleep(500);
- await this.page.screenshot({ path: 'screenshots/test-switch-slides-2.png' });
- const svg2 = await this.getTestElements();
-
- console.log('\nStarting slide:');
- console.log(svg0);
- console.log('\nAfter next slide:');
- console.log(svg1);
- console.log('\nAfter previous slide:');
- console.log(svg2);
- }
-
- async getTestElements() {
- const svg = await this.page.evaluate(() => document.querySelector('svg g g g').outerHTML);
- return svg;
- }
-}
-
-module.exports = exports = SlideSwitchTestPage;
diff --git a/bigbluebutton-html5/tests/puppeteer/page-switch-slides.test.js b/bigbluebutton-html5/tests/puppeteer/page-switch-slides.test.js
deleted file mode 100644
index 3d06081228711a9a5ea3db5537747f7b75fdcfdc..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/puppeteer/page-switch-slides.test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const Page = require('./page');
-const SlideSwitchTestPage = require('./page-switch-slides');
-
-test('Tests switching slides', async () => {
- const test = new SlideSwitchTestPage();
- try {
- await test.init(Page.getArgs());
- await test.test();
- await test.close();
- } catch (e) {
- console.log(e);
- await test.close();
- throw new Error('Test failed');
- }
-});
diff --git a/bigbluebutton-html5/tests/puppeteer/page-upload.test.js b/bigbluebutton-html5/tests/puppeteer/page-upload.test.js
deleted file mode 100644
index f18539bfcc15b465cc4b24d6bd14f8f73a1d2cf3..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/puppeteer/page-upload.test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const Page = require('./page');
-const UploadTestPage = require('./page-upload');
-
-test('Tests uploading an image as a presentation', async () => {
- const test = new UploadTestPage();
- try {
- await test.init(Page.getArgs());
- await test.test();
- await test.close();
- } catch (e) {
- console.log(e);
- await test.close();
- throw new Error('Test failed');
- }
-});
diff --git a/bigbluebutton-html5/tests/puppeteer/presentation.test.js b/bigbluebutton-html5/tests/puppeteer/presentation.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..562c1fce4101aa616c3faae6f6d3e1af8dbde4b4
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/presentation.test.js
@@ -0,0 +1,33 @@
+const Page = require('./core/page');
+const Slide = require('./presentation/slide');
+const Upload = require('./presentation/upload');
+
+describe('Presentation', () => {
+ test('Skip slide', async () => {
+ const test = new Slide();
+ let response;
+ try {
+ await test.init(Page.getArgs());
+ response = await test.test();
+ } catch (e) {
+ console.log(e);
+ } finally {
+ await test.close();
+ }
+ expect(response).toBe(true);
+ });
+
+ test('Upload presentation', async () => {
+ const test = new Upload();
+ let response;
+ try {
+ await test.init(Page.getArgs());
+ response = await test.test();
+ } catch (e) {
+ console.log(e);
+ } finally {
+ await test.close();
+ }
+ expect(response).toBe(true);
+ });
+});
diff --git a/bigbluebutton-html5/tests/puppeteer/presentation/elements.js b/bigbluebutton-html5/tests/puppeteer/presentation/elements.js
new file mode 100644
index 0000000000000000000000000000000000000000..472f6906b3afe50ee51cbbcc8ea8a2639fc78765
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/presentation/elements.js
@@ -0,0 +1,8 @@
+exports.presentationToolbarWrapper = '#presentationToolbarWrapper';
+exports.nextSlide = 'button[aria-label="Next slide"]';
+exports.prevSlide = 'button[aria-label="Previous slide"]';
+exports.fileUpload = 'input[type="file"]';
+exports.start = 'button[aria-label="Start"]';
+exports.cancel = 'button[aria-label="Cancel]';
+exports.uploadPresentation = '[data-test="uploadPresentation"]';
+exports.skipSlide = '#skipSlide';
diff --git a/bigbluebutton-html5/tests/puppeteer/presentation/slide.js b/bigbluebutton-html5/tests/puppeteer/presentation/slide.js
new file mode 100644
index 0000000000000000000000000000000000000000..be7a758e67277cfd9db9a488b7dab126cdc83ecd
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/presentation/slide.js
@@ -0,0 +1,44 @@
+const Page = require('../core/page');
+const e = require('./elements');
+const we = require('../whiteboard/elements');
+
+class Slide extends Page {
+ constructor() {
+ super('presentation-slide');
+ }
+
+ async test() {
+ await this.waitForSelector(we.whiteboard);
+ await this.waitForSelector(e.presentationToolbarWrapper);
+
+ await this.screenshot(true);
+ const svg0 = await this.getTestElements();
+
+ await this.click(e.nextSlide, true);
+
+ await this.screenshot(true);
+ const svg1 = await this.getTestElements();
+
+ await this.click(e.prevSlide, true);
+
+ await this.screenshot(true);
+ const svg2 = await this.getTestElements();
+
+ console.log('\nStarting slide:');
+ console.log(svg0);
+ console.log('\nAfter next slide:');
+ console.log(svg1);
+ console.log('\nAfter previous slide:');
+ console.log(svg2);
+
+ // TODO: Check test
+ return true
+ }
+
+ async getTestElements() {
+ const svg = await this.page.evaluate(() => document.querySelector('svg g g g').outerHTML);
+ return svg;
+ }
+}
+
+module.exports = exports = Slide;
diff --git a/bigbluebutton-html5/tests/puppeteer/upload-test.png b/bigbluebutton-html5/tests/puppeteer/presentation/upload-test.png
similarity index 100%
rename from bigbluebutton-html5/tests/puppeteer/upload-test.png
rename to bigbluebutton-html5/tests/puppeteer/presentation/upload-test.png
diff --git a/bigbluebutton-html5/tests/puppeteer/page-upload.js b/bigbluebutton-html5/tests/puppeteer/presentation/upload.js
similarity index 51%
rename from bigbluebutton-html5/tests/puppeteer/page-upload.js
rename to bigbluebutton-html5/tests/puppeteer/presentation/upload.js
index 5080ee47aa8d3378292e6b84f8631f074e30fe46..8df006e2d6f615f0224e6a87fe4192621623caba 100644
--- a/bigbluebutton-html5/tests/puppeteer/page-upload.js
+++ b/bigbluebutton-html5/tests/puppeteer/presentation/upload.js
@@ -1,30 +1,33 @@
-const Page = require('./page');
-const helper = require('./helper');
+const Page = require('../core/page');
const e = require('./elements');
+const we = require('../whiteboard/elements');
+const ce = require('../core/elements');
-class UploadTestPage extends Page {
- async test() {
- await this.createBBBMeeting();
- await this.joinWithoutAudio();
+class Upload extends Page {
+ constructor() {
+ super('presentation-upload');
+ }
- await this.page.waitFor(e.actions);
- await this.page.waitFor(e.whiteboard);
- await this.page.waitFor(e.skipSlide);
- await this.page.click(e.actions);
- await this.page.waitFor(e.uploadPresentation);
+ async test() {
+ await this.waitForSelector(we.whiteboard);
+ await this.waitForSelector(e.skipSlide);
const slides0 = await this.getTestElements();
- await this.page.click(e.uploadPresentation);
- await this.page.waitFor(e.fileUpload);
+ await this.click(ce.actions);
+ await this.click(e.uploadPresentation);
+
+ await this.waitForSelector(e.fileUpload);
const fileUpload = await this.page.$(e.fileUpload);
await fileUpload.uploadFile(`${__dirname}/upload-test.png`);
- await this.page.waitFor(e.start);
- await this.page.click(e.start);
- await this.elementRemoved(e.start);
- await helper.sleep(1000);
- await this.page.screenshot({ path: 'screenshots/test-upload.png' });
+ await this.click(e.start);
+ console.log('\nWaiting for the new presentation to upload...');
+ //await this.elementRemoved(e.start);
+ await this.page.waitFor(10000);
+ console.log('\nPresentation uploaded!');
+
+ await this.screenshot(true);
const slides1 = await this.getTestElements();
console.log('\nSlides before presentation upload:');
@@ -33,6 +36,9 @@ class UploadTestPage extends Page {
console.log('\nSlides after presentation upload:');
console.log(slides1.slideList);
console.log(slides1.svg);
+
+ // TODO: Check test
+ return true
}
async getTestElements() {
@@ -43,4 +49,4 @@ class UploadTestPage extends Page {
}
}
-module.exports = exports = UploadTestPage;
+module.exports = exports = Upload;
diff --git a/bigbluebutton-html5/tests/puppeteer/user.test.js b/bigbluebutton-html5/tests/puppeteer/user.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..54ea37958e458d25d4c38bd7fa3800146a30c644
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/user.test.js
@@ -0,0 +1,18 @@
+const Page = require('./core/page');
+const Status = require('./user/status');
+
+describe('User', () => {
+ test('Change status', async () => {
+ const test = new Status();
+ let response;
+ try {
+ await test.init(Page.getArgs());
+ response = await test.test();
+ } catch (e) {
+ console.log(e);
+ } finally {
+ await test.close();
+ }
+ expect(response).toBe(true);
+ });
+});
diff --git a/bigbluebutton-html5/tests/puppeteer/user/elements.js b/bigbluebutton-html5/tests/puppeteer/user/elements.js
new file mode 100644
index 0000000000000000000000000000000000000000..5ffd3c21492850ed4479623082c2d7c2385ec430
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/user/elements.js
@@ -0,0 +1,6 @@
+exports.firstUser = '[data-test="userListItemCurrent"]';
+exports.setStatus = '[data-test="setstatus"]';
+exports.away = '[data-test="away"]';
+exports.applaud = '[data-test="applause"]';
+exports.clearStatus = '[data-test="clearStatus"]';
+exports.statusIcon = '[data-test="userAvatar"]';
diff --git a/bigbluebutton-html5/tests/puppeteer/user/status.js b/bigbluebutton-html5/tests/puppeteer/user/status.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f196a81c43d43f1460093edac867b164ffbc99e
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/user/status.js
@@ -0,0 +1,39 @@
+const Page = require('../core/page');
+const e = require('./elements');
+const ce = require('../core/elements');
+const util = require('./util');
+
+class Status extends Page {
+ constructor() {
+ super('user-status');
+ }
+
+ async test() {
+ // TODO: Check this if it's open before click
+ await this.click(ce.userList);
+
+ await this.screenshot(true);
+ const status0 = await util.getTestElements(this);
+
+ await util.setStatus(this, e.applaud);
+
+ await this.screenshot(true);
+ const status1 = await util.getTestElements(this);
+
+ await util.setStatus(this, e.away);
+
+ await this.screenshot(true);
+ const status2 = await util.getTestElements(this);
+
+ await this.click(e.firstUser);
+ await this.click(e.clearStatus, true);
+
+ await this.screenshot(true);
+ const status3 = await util.getTestElements(this);
+
+ // TODO: Check test
+ return true;
+ }
+}
+
+module.exports = exports = Status;
diff --git a/bigbluebutton-html5/tests/puppeteer/user/util.js b/bigbluebutton-html5/tests/puppeteer/user/util.js
new file mode 100644
index 0000000000000000000000000000000000000000..5108db1f244f8ff2ef7236573ed94df96b7032e1
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/user/util.js
@@ -0,0 +1,15 @@
+const e = require('./elements');
+
+async function getTestElements(test) {
+ const status = await test.page.evaluate(statusIcon => document.querySelector(statusIcon).innerHTML, e.statusIcon);
+ return status;
+}
+
+async function setStatus(test, status) {
+ await test.click(e.firstUser);
+ await test.click(e.setStatus, true);
+ await test.click(status, true);
+}
+
+exports.setStatus = setStatus;
+exports.getTestElements = getTestElements;
diff --git a/bigbluebutton-html5/tests/puppeteer/whiteboard.test.js b/bigbluebutton-html5/tests/puppeteer/whiteboard.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..7171126c448022f7885bf5f2f6171279965c0814
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/whiteboard.test.js
@@ -0,0 +1,18 @@
+const Page = require('./core/page');
+const Draw = require('./whiteboard/draw');
+
+describe('Whiteboard', () => {
+ test('Draw rectangle', async () => {
+ const test = new Draw();
+ let response;
+ try {
+ await test.init(Page.getArgs());
+ response = await test.test();
+ } catch (e) {
+ console.log(e);
+ } finally {
+ await test.close();
+ }
+ expect(response).toBe(true);
+ });
+});
diff --git a/bigbluebutton-html5/tests/puppeteer/page-draw.js b/bigbluebutton-html5/tests/puppeteer/whiteboard/draw.js
similarity index 61%
rename from bigbluebutton-html5/tests/puppeteer/page-draw.js
rename to bigbluebutton-html5/tests/puppeteer/whiteboard/draw.js
index 08d6c854427a26d00120481013d75cf288567d38..d1f33932dbbd5326d76f765756a6831e7e628e3b 100644
--- a/bigbluebutton-html5/tests/puppeteer/page-draw.js
+++ b/bigbluebutton-html5/tests/puppeteer/whiteboard/draw.js
@@ -1,17 +1,15 @@
-const Page = require('./page');
-const helper = require('./helper');
+const Page = require('../core/page');
const e = require('./elements');
-class DrawTestPage extends Page {
- async test() {
- await this.createBBBMeeting();
- await this.joinWithoutAudio();
+class Draw extends Page {
+ constructor() {
+ super('whiteboard-draw');
+ }
- await this.page.waitFor(e.tools);
- await this.page.click(e.tools);
- await this.page.waitFor(e.rectangle);
- await this.page.click(e.rectangle);
- await this.page.waitFor(e.whiteboard);
+ async test() {
+ await this.click(e.tools);
+ await this.click(e.rectangle);
+ await this.waitForSelector(e.whiteboard);
const shapes0 = await this.getTestElements();
@@ -22,14 +20,16 @@ class DrawTestPage extends Page {
await this.page.mouse.move(wbBox.x + 0.7 * wbBox.width, wbBox.y + 0.7 * wbBox.height);
await this.page.mouse.up();
- await helper.sleep(500);
- await this.page.screenshot({ path: 'screenshots/test-draw.png' });
+ await this.screenshot(true);
const shapes1 = await this.getTestElements();
console.log('\nShapes before drawing box:');
console.log(shapes0);
console.log('\nShapes after drawing box:');
console.log(shapes1);
+
+ // TODO: Check test
+ return true
}
async getTestElements() {
@@ -38,4 +38,4 @@ class DrawTestPage extends Page {
}
}
-module.exports = exports = DrawTestPage;
+module.exports = exports = Draw;
diff --git a/bigbluebutton-html5/tests/puppeteer/whiteboard/elements.js b/bigbluebutton-html5/tests/puppeteer/whiteboard/elements.js
new file mode 100644
index 0000000000000000000000000000000000000000..6211f5d6f4a3f86c931750e9c3767906a0bed271
--- /dev/null
+++ b/bigbluebutton-html5/tests/puppeteer/whiteboard/elements.js
@@ -0,0 +1,4 @@
+exports.whiteboard = '[data-test="whiteboard"]';
+exports.tools = 'button[aria-label="Tools"]';
+exports.pencil = 'button[aria-label="Pencil"]';
+exports.rectangle = 'button[aria-label="Rectangle"]';
diff --git a/bigbluebutton-html5/tests/webdriverio/pageobjects/home.page.js b/bigbluebutton-html5/tests/webdriverio/pageobjects/home.page.js
deleted file mode 100644
index d92d0d550aeb9d1d6d5cdf5a2626c4de38de380e..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/webdriverio/pageobjects/home.page.js
+++ /dev/null
@@ -1,154 +0,0 @@
-'use strict';
-
-let Page = require('./page');
-let pageObject = new Page();
-let chai = require('chai');
-
-class HomePage extends Page {
- login(username, meeting) {
- super.open('demo/demoHTML5.jsp?username=' + username + '&meetingname=' + meeting.replace(/\s+/g, '+') + '&action=create');
- }
-
- get audioModalHeaderSelector() {
- return '[data-test=audioModalHeader]';
- }
- get audioModalHeaderElement() {
- return browser.element(this.audioModalSelector);
- }
-
- get audioModalSelector() {
- return '.ReactModal__Content--after-open._imports_ui_components_audio_audio_modal__styles__modal';
- }
-
- get modalBaseCloseButtonSelector() {
- return '[data-test=modalBaseCloseButton]';
- }
- get modalBaseCloseButtonElement() {
- return $(this.modalBaseCloseButtonSelector);
- }
-
- get settingsDropdownTriggerSelector() {
- return '[data-test=settingsDropdownTrigger]';
- }
- get settingsDropdownTriggerElement() {
- return browser.element(this.settingsDropdownTriggerSelector);
- }
-
- get settingsDropdownSelector() {
- return '[data-test=settingsDropdownTrigger] + [data-test=dropdownContent][aria-expanded="true"]';
- }
- get settingsDropdownElement() {
- return browser.element(this.settingsDropdownSelector);
- }
-
- // Make Fullscreen button
- get settingsDropdownFullscreenButtonSelector() {
- return '[data-test=settingsDropdownFullscreenButton]';
- }
- get settingsDropdownFullscreenButtonElement() {
- return browser.element(this.settingsDropdownFullscreenButtonSelector);
- }
-
- // Open Settings button
- get settingsDropdownSettingsButtonSelector() {
- return '[data-test=settingsDropdownSettingsButton]';
- }
- get settingsDropdownSettingsButtonElement() {
- return browser.element(this.settingsDropdownSettingsButtonSelector);
- }
-
- // About button
- get settingsDropdownAboutButtonSelector() {
- return '[data-test=settingsDropdownAboutButton]';
- }
- get settingsDropdownAboutButtonElement() {
- return browser.element(this.settingsDropdownAboutButtonSelector);
- }
-
- // Logout button
- get settingsDropdownLogoutButtonSelector() {
- return '[data-test=settingsDropdownLogoutButton]';
- }
- get settingsDropdownLogoutButtonElement() {
- return browser.element(this.settingsDropdownLogoutButtonSelector);
- }
-
- // Fullscreen modal buttons
- get modalDismissButtonSelector() {
- return '[data-test=modalDismissButton]';
- }
- get modalDismissButtonElement() {
- return browser.element(this.modalDismissButtonSelector);
- }
- get modalConfirmButtonSelector() {
- return '[data-test=modalConfirmButton]';
- }
- get modalConfirmButtonElement() {
- return browser.element(this.modalConfirmButtonSelector);
- }
-
- get logoutModalSelector() {
- return '.ReactModal__Content--after-open._imports_ui_components_modal_fullscreen__styles__modal';
- }
- get logoutModalElement() {
- return browser.element(this.logoutModalSelector);
- }
-
- get userListToggleButtonSelector() {
- return '[data-test=userListToggleButton]';
- }
- get userListToggleButtonElement() {
- return browser.element(this.userListToggleButtonSelector);
- }
-
- // User list
- get userListContentSelector() {
- return '[data-test=userListContent]';
- }
- get userListContentElement() {
- return browser.element(this.userListContentSelector);
- }
-
- // User avatar icon
- get userAvatarIconSelector() {
- return '[data-test=userAvatarIcon]';
- }
- get userAvatarIconElement() {
- return browser.element(this.userAvatarIconSelector);
- }
-
- // chat item that points to the Public chat
- get publicChatLinkSelector() {
- return '[data-test=publicChatLink]';
- }
- get publicChatLinkElement() {
- return browser.element(this.publicChatLinkSelector);
- }
-
- // Public chat
- get publicChatSelector() {
- return '[data-test=publicChat]';
- }
- get publicChatElement() {
- return browser.element(this.publicChatSelector);
- }
-
- // Chat dropdown trigger
- get chatDropdownTriggerSelector() {
- return '[data-test=chatDropdownTrigger]';
- }
- get chatDropdownTriggerElement() {
- return browser.element(this.chatDropdownTriggerSelector);
- }
-
- // Chat title
- get chatTitleSelector() {
- return '[data-test=chatTitle]';
- }
- get chatTitleElement() {
- return browser.element(this.chatTitleSelector);
- }
-}
-
-module.exports = new HomePage();
-
diff --git a/bigbluebutton-html5/tests/webdriverio/pageobjects/landing.page.js b/bigbluebutton-html5/tests/webdriverio/pageobjects/landing.page.js
deleted file mode 100644
index 0eb59d404cfb40cc60cc66cec63114f64ddfe2fa..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/webdriverio/pageobjects/landing.page.js
+++ /dev/null
@@ -1,70 +0,0 @@
-'use strict';
-
-let Page = require('./page');
-let pageObject = new Page();
-let chai = require('chai');
-
-class LandingPage extends Page {
- open() {
- super.open('demo/demoHTML5.jsp');
- }
-
- get title() {
- return 'Join Meeting via HTML5 Client';
- }
-
- get url() {
- return `${browser.baseUrl}/demo/demoHTML5.jsp`;
- }
-
- // Username input field on the HTML5 client's landing page:
-
- get usernameInputSelector() {
- return 'input[name=username]';
- }
-
- get usernameInputElement() {
- return $(this.usernameInputSelector);
- }
-
- // Submit button on the HTML5 client's landing page:
-
- get joinButtonSelector() {
- return 'input[type=submit]';
- }
-
- get joinButtonElement() {
- return $(this.joinButtonSelector);
- }
-
- // Home page:
-
- get loadedHomePageSelector() {
- return '#app';
- }
-
- get loadedHomePageElement() {
- return $('#app');
- }
-
- //////////
-
- joinWithButtonClick() {
- this.joinButtonElement.click();
- }
-
- joinWithEnterKey() {
- pageObject.pressEnter();
- }
-}
-
-// To use in the future tests that will require login
-browser.addCommand('loginToClient', function (page) {
- page.open();
- page.username.waitForExist();
- page.username.setValue('Maxim');
- page.joinWithButtonClick();
-});
-
-module.exports = new LandingPage();
-
diff --git a/bigbluebutton-html5/tests/webdriverio/pageobjects/page.js b/bigbluebutton-html5/tests/webdriverio/pageobjects/page.js
deleted file mode 100644
index dfb91b7f1cf930e72eedcf7f11c3a26cc95eb4c7..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/webdriverio/pageobjects/page.js
+++ /dev/null
@@ -1,18 +0,0 @@
-'use strict';
-
-class Page {
- open(path) {
- browser.url(path);
- }
-
- pressEnter() {
- chromeBrowser.keys('Enter');
- }
-
- isFirefox() {
- return browser.desiredCapabilities.browserName == 'firefox';
- }
-}
-
-module.exports = Page;
-
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Home page viewport_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Home page viewport_viewport.png
deleted file mode 100644
index 6ded9d0a35df5176559fce749ce3c36472d5b1b9..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Home page viewport_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Join Audio modal_element.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Join Audio modal_element.png
deleted file mode 100644
index 12f325c6e0a4e3634ae0008ef7969c6665021b78..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Join Audio modal_element.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Public chat closes_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Public chat closes_viewport.png
deleted file mode 100644
index 7df200c2262ed6126c379d83ba3e6bf91acfc6ba..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Public chat closes_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Public chat_element.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Public chat_element.png
deleted file mode 100644
index 6d13fb85d107a4e44058706a1b57c52c26dac738..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Public chat_element.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Userlist closes_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Userlist closes_viewport.png
deleted file mode 100644
index 7683c3dd4a30a4d8bc5de94698d25c9b7f353fef..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Userlist closes_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Userlist_element.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Userlist_element.png
deleted file mode 100644
index f86dfc6814f61ed6992391274f016f5c20afcbbe..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Userlist_element.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Viewport with both userlist and public chat open_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Viewport with both userlist and public chat open_viewport.png
deleted file mode 100644
index b3876c99f01a5ff7e5bab284a8b4fea7367383e2..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Viewport with both userlist and public chat open_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Viewport with userlist open_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Viewport with userlist open_viewport.png
deleted file mode 100644
index b874dad74c75e4b3d694e607eca78127b3a97dd4..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/1920x1200/Viewport with userlist open_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Home page viewport_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Home page viewport_viewport.png
deleted file mode 100644
index 804aa47a94d832e0a509996e3d50edb6da94fcb7..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Home page viewport_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Join Audio modal_element.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Join Audio modal_element.png
deleted file mode 100644
index a1ade43b6885d1fa5b1d4ffc5080880f02fcaabd..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Join Audio modal_element.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Public chat closes_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Public chat closes_viewport.png
deleted file mode 100644
index 53b348476f954aa6aebda8cda6d959773dcccd23..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Public chat closes_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Public chat_element.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Public chat_element.png
deleted file mode 100644
index 23c81d1bcdc7fb14de3b99b88ad0b893f90141b8..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Public chat_element.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Userlist closes_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Userlist closes_viewport.png
deleted file mode 100644
index beb4d0e84bfcc27d2dd1b132008a6feb7bb1eebb..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Userlist closes_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Userlist_element.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Userlist_element.png
deleted file mode 100644
index d6e5911baee17b2c2b3ca3e12cee75c2694dc145..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Userlist_element.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Viewport with both userlist and public chat open_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Viewport with both userlist and public chat open_viewport.png
deleted file mode 100644
index c139c46fbf90a48a07f0ad1f14513724aad7776b..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Viewport with both userlist and public chat open_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Viewport with userlist open_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Viewport with userlist open_viewport.png
deleted file mode 100644
index 78119f3a1eb08d41f446f580119efc5f7c521d12..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Chrome/960x1200/Viewport with userlist open_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Home page viewport_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Home page viewport_viewport.png
deleted file mode 100644
index cb3d41841634f03cb086e22abaa9723110f12d84..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Home page viewport_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Join Audio modal_element.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Join Audio modal_element.png
deleted file mode 100644
index 9d70270cc7c63c487e5d9b05203d22ec7f899b74..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Join Audio modal_element.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Public chat closes_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Public chat closes_viewport.png
deleted file mode 100644
index f016a6f6ce4492c37b70980ac4bf08fc04a18367..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Public chat closes_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Public chat_element.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Public chat_element.png
deleted file mode 100644
index e1e9925372a711694855e73e0f653862890e657f..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Public chat_element.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Userlist closes_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Userlist closes_viewport.png
deleted file mode 100644
index 6c5e080f1f4721c6e25ee0d75002f3c344c51621..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Userlist closes_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Userlist_element.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Userlist_element.png
deleted file mode 100644
index 7513163591e0d7839ecd3c71e64e78dc776d9239..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Userlist_element.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Viewport with both userlist and public chat open_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Viewport with both userlist and public chat open_viewport.png
deleted file mode 100644
index 56a1708c8918369cfdc1947fc83ad86f5b2af234..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Viewport with both userlist and public chat open_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Viewport with userlist open_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Viewport with userlist open_viewport.png
deleted file mode 100644
index 6a80091407309a5ca702aed1a4c1420624e84772..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/1920x1200/Viewport with userlist open_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Home page viewport_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Home page viewport_viewport.png
deleted file mode 100644
index 3cd5327e9476bc7094c35ce452a9473fdd1656fc..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Home page viewport_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Join Audio modal_element.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Join Audio modal_element.png
deleted file mode 100644
index 0027d8f85dd4cfbfb655d0caca09909cfb701da1..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Join Audio modal_element.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Public chat closes_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Public chat closes_viewport.png
deleted file mode 100644
index ca9618975b69dd6eb9b3ad87e1ed594ca7360a13..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Public chat closes_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Public chat_element.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Public chat_element.png
deleted file mode 100644
index 032ea67dea469d10218785340595edc58668186f..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Public chat_element.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Userlist closes_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Userlist closes_viewport.png
deleted file mode 100644
index 5d061eca1414da8f969a63c1136f01abbc5362e4..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Userlist closes_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Userlist_element.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Userlist_element.png
deleted file mode 100644
index 65065a533a55c3946b855fe74b7756a7b8407aed..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Userlist_element.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Viewport with both userlist and public chat open_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Viewport with both userlist and public chat open_viewport.png
deleted file mode 100644
index dd68245cd8203a1d84defa3045d863c1a2fa6a58..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Viewport with both userlist and public chat open_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Viewport with userlist open_viewport.png b/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Viewport with userlist open_viewport.png
deleted file mode 100644
index ee904f4f5bfadbce110295340e49dcd9a05ff541..0000000000000000000000000000000000000000
Binary files a/bigbluebutton-html5/tests/webdriverio/screenshots/reference/Firefox/960x1200/Viewport with userlist open_viewport.png and /dev/null differ
diff --git a/bigbluebutton-html5/tests/webdriverio/specs/acceptance/login.spec.js b/bigbluebutton-html5/tests/webdriverio/specs/acceptance/login.spec.js
deleted file mode 100644
index 5f2601ea95120d4fcaca57d4fc3eb908addc1614..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/webdriverio/specs/acceptance/login.spec.js
+++ /dev/null
@@ -1,68 +0,0 @@
-'use strict';
-
-let LandingPage = require('../../pageobjects/landing.page');
-let chai = require('chai');
-let utils = require('../../utils');
-
-describe('Landing page', function () {
-
- beforeEach(function () {
- jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000; // default value is 10000
- });
-
- it('should have correct title', function () {
- LandingPage.open();
- utils.assertTitle(LandingPage.title);
- });
-
- it('should allow user to login if the username is specified and the Join button is clicked',
- function () {
- LandingPage.open();
-
- utils.setUsername(new Map([
- ['chromeBrowser', 'Alex'],
- ['chromeBrowser', 'Anton'],
- ['firefoxBrowser', 'Danny'],
- ['firefoxBrowser', 'Maxim'],
- ['chromeMobileBrowser', 'Oswaldo']
- ]));
-
- LandingPage.joinWithButtonClick();
- LandingPage.loadedHomePageElement.waitForExist(5000);
- });
-
- it('should not allow user to login if the username is not specified (login using a button)',
- function () {
- LandingPage.open();
-
- // we intentionally don't enter username here
-
- LandingPage.joinWithButtonClick();
-
- browser.pause(5000); // amount of time we usually wait for the home page to appear
-
- // verify that we are still on the landing page
- utils.assertUrl(LandingPage.url);
- });
-
- it('should allow user to login if the username is specified and then Enter key is pressed',
- function () { // Chrome-only
- LandingPage.open();
-
- chromeBrowser.setValue(LandingPage.usernameInputSelector, 'Maxim');
- LandingPage.joinWithEnterKey();
- chromeBrowser.waitForExist(LandingPage.loadedHomePageSelector, 5000);
- });
-
- it('should not allow user to login if the username is not specified (login using Enter key)',
- function () { // Chrome-only
- LandingPage.open();
-
- // we intentionally don't enter username here
-
- LandingPage.joinWithEnterKey();
- chromeBrowser.pause(5000); // amount of time we usually wait for the gome page to appear
- chai.expect(browser.getUrl().chromeBrowser).to.equal(LandingPage.url);
- });
-});
-
diff --git a/bigbluebutton-html5/tests/webdriverio/specs/visual-regression/main.spec.js b/bigbluebutton-html5/tests/webdriverio/specs/visual-regression/main.spec.js
deleted file mode 100644
index 34bb69d7ee3b80cccc69323b4e00ccfd46866161..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/webdriverio/specs/visual-regression/main.spec.js
+++ /dev/null
@@ -1,83 +0,0 @@
-'use strict';
-
-let HomePage = require('../../pageobjects/home.page');
-let expect = require('chai').expect;
-let utils = require('../../utils');
-
-describe('Screenshots:', function() {
- it('Join Audio modal', function() {
- HomePage.login('testuser', 'Demo Meeting');
- HomePage.audioModalHeaderElement.waitForExist(7000);
- utils.expectImageMatch(browser.checkElement(HomePage.audioModalSelector), 'Join Audio modal isn\'t the same');
- });
-
- it('Home page viewport', function() {
- HomePage.modalBaseCloseButtonElement.click();
- utils.expectImageMatch(browser.checkViewport(), 'Home page viewport isn\'t the same');
- });
-
- //////////////////////////////
- // Userlist + Chat
-
- it('Userlist', function() {
- HomePage.userListToggleButtonElement.click();
- utils.expectImageMatch(browser.checkElement(HomePage.userListContentSelector), 'Userlist content isn\'t the same');
- });
-
- it('Viewport with userlist open', function() {
- utils.expectImageMatch(browser.checkViewport(), 'Home page viewport isn\'t the same after we open userlist');
- });
-
- /*it('Userlist avatar', function() {
- utils.expectImageMatch(browser.checkElement(HomePage.userAvatarElement), 'Userlist avatar isn\'t the same');
- });*/
-
- it('Public chat', function() {
- HomePage.publicChatLinkElement.click();
- utils.expectImageMatch(browser.checkElement(HomePage.publicChatSelector), 'Public chat isn\'t the same');
- });
-
- it('Viewport with both userlist and public chat open', function() {
- browser.moveToObject(HomePage.chatTitleSelector); // avoid hover effect on the Public Chat tab
- utils.expectImageMatch(browser.checkViewport(), 'Home page viewport isn\'t the same after we open both userlist and public chat');
- });
-
- /*it('Public chat dropdown', function() {
- HomePage.chatDropdownTriggerElement.click();
- utils.expectImageMatch(browser.checkElement(HomePage.publicChatSelector), 'Public chat dropdown isn\'t the same');
- });*/
-
- it('Public chat closes', function() {
- HomePage.chatTitleElement.click();
- utils.expectImageMatch(browser.checkViewport(), 'Home page viewport isn\'t the same after we closed public chat');
- });
-
- it('Userlist closes', function() {
- HomePage.userListToggleButtonElement.click();
- utils.expectImageMatch(browser.checkViewport(), 'Home page viewport isn\'t the same after we close the userlist');
- });
-
- //////////////////////////////
- // Settings:
-
- it('Settings dropdown', function() {
- HomePage.settingsDropdownTriggerElement.waitForExist(2000);
- HomePage.settingsDropdownTriggerElement.click();
- HomePage.settingsDropdownElement.waitForExist(2000);
- browser.moveToObject(HomePage.settingsDropdownLogoutButtonSelector); // avoid Options tooltip
- utils.expectImageMatch(browser.checkElement(HomePage.settingsDropdownSelector), 'Settings dropdown isn\'t the same');
- });
-
- it('Logout popup', function() {
- HomePage.settingsDropdownLogoutButtonElement.waitForExist(2000);
- HomePage.settingsDropdownLogoutButtonElement.click();
- HomePage.logoutModalElement.waitForExist(2000);
- utils.expectImageMatch(browser.checkElement(HomePage.logoutModalSelector));
- });
-
- it('Logout popup closes', function() {
- HomePage.modalDismissButtonElement.click();
- utils.expectImageMatch(browser.checkViewport(), 'Home page viewport isn\'t the same after we close Logout modal');
- });
-});
-
diff --git a/bigbluebutton-html5/tests/webdriverio/utils.js b/bigbluebutton-html5/tests/webdriverio/utils.js
deleted file mode 100644
index 00aa3146fd0a87936ba57e5cf145a8182a9063cd..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/webdriverio/utils.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-
-let expect = require('chai').expect;
-let LandingPage = require('./pageobjects/landing.page');
-
-class Utils {
- assertTitle(title) {
- browser.remotes.forEach(function(browserName) {
- expect(browser.select(browserName).getTitle()).to.equal(title);
- });
- }
- assertUrl(url) {
- browser.remotes.forEach(function(browserName) {
- expect(browser.getUrl()[browserName]).to.equal(url);
- });
- }
- setUsername(map) {
- map.forEach((v, k) => browser.select(k).setValue(LandingPage.usernameInputSelector, v));
- }
- expectImageMatch(results, errorMessage) {
- results.forEach((result) => expect(result.isExactSameImage, errorMessage).to.be.true);
- }
-}
-
-module.exports = new Utils();
-
diff --git a/bigbluebutton-html5/tests/webdriverio/wdio.accept.conf.js b/bigbluebutton-html5/tests/webdriverio/wdio.accept.conf.js
deleted file mode 100644
index 80b4a0b9064599e38af93ba5180b79262d111dcd..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/webdriverio/wdio.accept.conf.js
+++ /dev/null
@@ -1,42 +0,0 @@
-let merge = require('deepmerge');
-let wdioBaseConf = require('./wdio.base.conf');
-
-exports.config = merge(wdioBaseConf.config, {
-
- specs: ['tests/webdriverio/specs/acceptance/**/*.spec.js'],
-
- capabilities: {
- chromeBrowser: {
- desiredCapabilities: {
- browserName: 'chrome'
- }
- },
- firefoxBrowser: {
- desiredCapabilities: {
- browserName: 'firefox'
- }
- },
- chromeMobileBrowser: {
- desiredCapabilities: {
- browserName: 'chrome',
- chromeOptions: {
- mobileEmulation: {
- deviceName: 'iPhone 6'
- }
- }
- }
- }
- },
-
- suites: {
- login: [
- 'tests/webdriverio/specs/acceptance/login.spec.js',
- ],
- },
- before: function() {
- // make the properties that browsers share and the list of browserNames available:
- browser.remotes = Object.keys(exports.config.capabilities);
- browser.baseUrl = exports.config.baseUrl;
- },
-});
-
diff --git a/bigbluebutton-html5/tests/webdriverio/wdio.base.conf.js b/bigbluebutton-html5/tests/webdriverio/wdio.base.conf.js
deleted file mode 100644
index 1b0626fbd5539a5213f4337c559ab3f4b7aa0f8f..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/webdriverio/wdio.base.conf.js
+++ /dev/null
@@ -1,6 +0,0 @@
-exports.config = {
- baseUrl: 'http://localhost:8080',
- framework: 'jasmine',
- reporters: ['spec'],
-};
-
diff --git a/bigbluebutton-html5/tests/webdriverio/wdio.vreg.conf.js b/bigbluebutton-html5/tests/webdriverio/wdio.vreg.conf.js
deleted file mode 100644
index 8e29331dec044c0305150dd676eae21158951554..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/tests/webdriverio/wdio.vreg.conf.js
+++ /dev/null
@@ -1,71 +0,0 @@
-let path = require('path');
-let VisualRegressionCompare = require('wdio-visual-regression-service/compare');
-let _ = require('lodash');
-let wdioBaseConf = require('./wdio.base.conf');
-
-function getScreenshotName(basePath) {
- return function(context) {
- var type = context.type;
- var testName = context.test.title;
- var browserVersion = parseInt(context.browser.version, 10);
- var browserName = process.env.BROWSER_NAME === 'chrome_mobile' ? process.env.DEVICE_NAME : context.browser.name;
- var browserViewport = context.meta.viewport;
- var browserWidth = browserViewport.width;
- var browserHeight = browserViewport.height;
- return path.join(
- basePath,
- browserName,
- `${browserWidth}x${browserHeight}`,
- `${testName}_${type}.png`
- );
- };
-}
-
-exports.config = _.merge(wdioBaseConf.config, {
- specs: [
- 'tests/webdriverio/specs/visual-regression/**/*.spec.js'
- ],
-
- capabilities: [process.env.BROWSER_NAME=='chrome_mobile' ? {
- maxInstances: 5,
- browserName: 'chrome',
- chromeOptions: {
- mobileEmulation: {
- deviceName: process.env.DEVICE_NAME
- }
- }
- } : {
- maxInstances: 5,
- browserName: process.env.BROWSER_NAME
- }],
-
- baseUrl: 'http://localhost:8080',
- framework: 'jasmine',
- reporters: ['spec'],
-
- sync: true,
- logLevel: 'silent',
- bail: 0,
- host: 'localhost',
- port: 4444,
- waitforTimeout: 30000,
- connectionRetryTimeout: 90000,
- connectionRetryCount: 3,
- services: ['visual-regression'],
- visualRegression: {
- compare: new VisualRegressionCompare.LocalCompare({
- referenceName: getScreenshotName(path.join(process.cwd(), 'tests/webdriverio/screenshots/reference')),
- screenshotName: getScreenshotName(path.join(process.cwd(), 'tests/webdriverio/screenshots/screen')),
- diffName: getScreenshotName(path.join(process.cwd(), 'tests/webdriverio/screenshots/diff')),
- misMatchTolerance: 0.01,
- }),
- viewports: process.env.BROWSER_NAME === 'chrome_mobile' ? [] : [{ width: 1920, height: 1200 }, { width: 960, height: 1200 }],
- viewportChangePause: 300,
- orientations: ['landscape'],
- },
-
- jasmineNodeOpts: {
- defaultTimeoutInterval: 30000
- },
-});
-
diff --git a/bigbluebutton-web/build.gradle b/bigbluebutton-web/build.gradle
index e896556837ac125afde499b1e96e1196d07edd4c..1da581703e573a0f15b9a7c83bedd670346f009f 100755
--- a/bigbluebutton-web/build.gradle
+++ b/bigbluebutton-web/build.gradle
@@ -2,9 +2,9 @@ apply plugin: 'java'
apply plugin: 'eclipse'
task resolveDeps(type: Copy) {
- into('lib')
- from configurations.default
- from configurations.default.allArtifacts.file
+ into('lib')
+ from configurations.default
+ from configurations.default.allArtifacts.file
}
repositories {
@@ -12,41 +12,34 @@ repositories {
mavenLocal()
}
+configurations {
+ runtime.exclude group: "org.slf4j", module: "slf4j-api"
+ compile.exclude group: "org.red5", module: "red5-server-common"
+}
+
dependencies {
- compile 'org.bigbluebutton:bbb-common-web:0.0.2-SNAPSHOT'
-
+ compile 'org.bigbluebutton:bbb-common-web:0.0.3-SNAPSHOT'
// XML creation speedup
compile 'org.freemarker:freemarker:2.3.28'
- //junit
- compile 'junit:junit:4.8.2'
+ //junit
+ testCompile 'junit:junit:4.12'
- // Testing
- testCompile 'org.testng:testng:5.8@jar'
- testCompile 'org.easymock:easymock:2.4@jar'
+ // Testing
+ testCompile 'org.testng:testng:6.14.3@jar'
+ testCompile 'org.easymock:easymock:4.0.1@jar'
}
sourceSets {
- main {
- java {
- srcDir 'src/java'
- }
- resources {
- srcDir 'src/resources'
- }
- }
- test {
- java {
- srcDir 'test/unit'
- }
- resources {
- srcDir 'test/resources'
- }
-}
-}
-
-test {
- useTestNG()
+ main {
+ java { srcDir 'src/java' }
+ resources { srcDir 'src/resources' }
+ }
+ test {
+ java { srcDir 'test/unit' }
+ resources { srcDir 'test/resources' }
+ }
}
+test { useTestNG() }
diff --git a/bigbluebutton-web/build.sh b/bigbluebutton-web/build.sh
index f725095d2b29cef1098d538598406c12e3a0aff8..a18f016ad30ffbe69eec5c567c0a45f69920c398 100755
--- a/bigbluebutton-web/build.sh
+++ b/bigbluebutton-web/build.sh
@@ -1,4 +1,3 @@
gradle clean
gradle resolveDeps
grails clean
-
diff --git a/bigbluebutton-web/grails-app/conf/application.conf b/bigbluebutton-web/grails-app/conf/application.conf
index f5ba5981ea95dd5f9aa8871e4a5e9b524822df44..c6fc978954d01f9506e65f33ab525eb6dbbe82c3 100644
--- a/bigbluebutton-web/grails-app/conf/application.conf
+++ b/bigbluebutton-web/grails-app/conf/application.conf
@@ -10,7 +10,7 @@ akka {
loggers = ["akka.event.slf4j.Slf4jLogger"]
loglevel = "DEBUG"
- rediscala-publish-worker-dispatcher {
+ redis-publish-worker-dispatcher {
mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
# Throughput defines the maximum number of messages to be
# processed per actor before the thread jumps to the next actor.
@@ -18,7 +18,7 @@ akka {
throughput = 512
}
- rediscala-subscriber-worker-dispatcher {
+ redis-subscriber-worker-dispatcher {
mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
# Throughput defines the maximum number of messages to be
# processed per actor before the thread jumps to the next actor.
diff --git a/bigbluebutton-web/grails-app/conf/spring/bbb-redis-messaging.xml b/bigbluebutton-web/grails-app/conf/spring/bbb-redis-messaging.xml
index 3c8c2765b3a45a1703d8b3ef705fd6d3b52a4ba6..4c95196bdb63128883c2d7732e8b2467dd547699 100755
--- a/bigbluebutton-web/grails-app/conf/spring/bbb-redis-messaging.xml
+++ b/bigbluebutton-web/grails-app/conf/spring/bbb-redis-messaging.xml
@@ -3,7 +3,7 @@
BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
+Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
This program is free software; you can redistribute it and/or modify it under the
terms of the GNU Lesser General Public License as published by the Free Software
@@ -19,14 +19,38 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-2.0.xsd
">
-
-
+ <bean id="redisStorageService"
+ class="org.bigbluebutton.common2.redis.RedisStorageService"
+ init-method="start" destroy-method="stop">
+ <property name="host" value="${redisHost}" />
+ <property name="port" value="${redisPort}" />
+ <property name="password" value="${redisPassword:}" />
+ <property name="clientName" value="BbbWeb" />
+ </bean>
+
+ <bean id="redisMessageHandler"
+ class="org.bigbluebutton.api.messaging.ReceivedMessageHandler"
+ init-method="start" destroy-method="stop">
+ </bean>
+
+ <bean id="redisMessageDistributor"
+ class="org.bigbluebutton.api.messaging.MessageDistributor">
+ <property name="messageHandler">
+ <ref local="redisMessageHandler" />
+ </property>
+ <property name="messageListeners">
+ <set>
+ <ref bean="meetingService" />
+ <ref bean="keepAliveService" />
+ </set>
+ </property>
+ </bean>
</beans>
diff --git a/bigbluebutton-web/grails-app/conf/spring/bbb-redis-pool.xml b/bigbluebutton-web/grails-app/conf/spring/bbb-redis-pool.xml
deleted file mode 100755
index 7de4b5722c6c893f3b0e1a700523af21c34a7624..0000000000000000000000000000000000000000
--- a/bigbluebutton-web/grails-app/conf/spring/bbb-redis-pool.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-
-Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
-
-This program is free software; you can redistribute it and/or modify it under the
-terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 3.0 of the License, or (at your option) any later
-version.
-
-BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-2.0.xsd
- ">
-
-
-
-</beans>
diff --git a/bigbluebutton-web/grails-app/conf/spring/resources.xml b/bigbluebutton-web/grails-app/conf/spring/resources.xml
index 098e37e48cc009e85761c5ae90804a1ee2b029fa..7a94317cf177761d6f872050d147997241495779 100755
--- a/bigbluebutton-web/grails-app/conf/spring/resources.xml
+++ b/bigbluebutton-web/grails-app/conf/spring/resources.xml
@@ -61,28 +61,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<constructor-arg index="3" value="${screenshareConfSuffix}"/>
</bean>
- <bean id="redisStorageService" class="org.bigbluebutton.api.messaging.RedisStorageService"
- init-method="start" destroy-method="stop">
- <property name="host" value="${redisHost}"/>
- <property name="port" value="${redisPort}"/>
- </bean>
-
-
- <bean id="redisMessageHandler" class="org.bigbluebutton.api.messaging.ReceivedMessageHandler"
- init-method="start" destroy-method="stop">
- </bean>
-
-
- <bean id="redisMessageDistributor" class="org.bigbluebutton.api.messaging.MessageDistributor">
- <property name="messageHandler"> <ref local="redisMessageHandler"/> </property>
- <property name="messageListeners">
- <set>
- <ref bean="meetingService" />
- <ref bean="keepAliveService" />
- </set>
- </property>
- </bean>
-
<bean id="recordingServiceHelper" class="org.bigbluebutton.api.util.RecordingMetadataReaderHelper">
<property name="recordingServiceGW" ref="recordingServiceGW"/>
</bean>
@@ -154,9 +132,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</bean>
<import resource="doc-conversion.xml"/>
- <import resource="bbb-redis-pool.xml"/>
- <!--
<import resource="bbb-redis-messaging.xml"/>
- -->
<import resource="turn-stun-servers.xml"/>
</beans>
diff --git a/bigbluebutton-web/pres-checker/build.gradle b/bigbluebutton-web/pres-checker/build.gradle
index c918e988075707c2972cfe7f36fa80d37387e134..dfb9bee22f6f85534f9c9599f99f119a7dd6fac8 100755
--- a/bigbluebutton-web/pres-checker/build.gradle
+++ b/bigbluebutton-web/pres-checker/build.gradle
@@ -1,15 +1,15 @@
apply plugin: 'java'
-sourceCompatibility=1.8
-targetCompatibility=1.8
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
version = '0.0.1'
-archivesBaseName = 'bbb-pres-check'
+archivesBaseName = 'bbb-pres-check'
task resolveDeps(type: Copy) {
- into('lib')
- from configurations.default
- from configurations.default.allArtifacts.file
+ into('lib')
+ from configurations.default
+ from configurations.default.allArtifacts.file
}
repositories {
@@ -17,22 +17,21 @@ repositories {
mavenLocal()
}
-dependencies {
- compile 'org.apache.poi:poi:3.17@jar'
- compile 'org.apache.poi:poi-ooxml:3.17@jar'
- compile 'org.apache.poi:poi-ooxml-schemas:3.17@jar'
- compile 'commons-io:commons-io:2.6@jar'
- compile 'org.apache.commons:commons-lang3:3.7@jar'
- compile 'org.apache.commons:commons-collections4:4.2@jar'
- compile 'org.apache.xmlbeans:xmlbeans:3.0.0@jar'
+dependencies {
+ compile 'org.apache.poi:poi:4.0.0@jar'
+ compile 'org.apache.poi:poi-ooxml:4.0.0@jar'
+ compile 'org.apache.poi:poi-ooxml-schemas:4.0.0@jar'
+ compile 'commons-io:commons-io:2.6@jar'
+ compile 'org.apache.commons:commons-lang3:3.8.1@jar'
+ compile 'org.apache.commons:commons-collections4:4.2@jar'
+ compile 'org.apache.xmlbeans:xmlbeans:3.0.2@jar'
}
jar {
- manifest.mainAttributes("Permissions": "all-permissions")
- manifest.mainAttributes("Codebase": "*")
- manifest.mainAttributes("Application-Name": "BigBlueButton Presentation Checker")
- manifest.mainAttributes("Application-Library-Allowable-Codebase": "*")
- manifest.mainAttributes("Caller-Allowable-Codebase": "*")
- manifest.mainAttributes("Trusted-Only": "true")
+ manifest.mainAttributes("Permissions": "all-permissions")
+ manifest.mainAttributes("Codebase": "*")
+ manifest.mainAttributes("Application-Name": "BigBlueButton Presentation Checker")
+ manifest.mainAttributes("Application-Library-Allowable-Codebase": "*")
+ manifest.mainAttributes("Caller-Allowable-Codebase": "*")
+ manifest.mainAttributes("Trusted-Only": "true")
}
-
diff --git a/bigbluebutton-web/pres-checker/build.sh b/bigbluebutton-web/pres-checker/build.sh
index 1f5048f55723f9d76bfbb4b1bcf08e307fe7069d..d2a60ea6951cb7b6607e066cc3ff1812419a0927 100755
--- a/bigbluebutton-web/pres-checker/build.sh
+++ b/bigbluebutton-web/pres-checker/build.sh
@@ -1,4 +1,3 @@
gradle clean
gradle jar
cp build/lib/*.jar lib
-
diff --git a/bigbluebutton-web/pres-checker/run.sh b/bigbluebutton-web/pres-checker/run.sh
index 04fc97183cb1bc79fd22dc6a6f395865a4409bbe..faa48086ab4fed3f2534705e3ab0de49af682724 100755
--- a/bigbluebutton-web/pres-checker/run.sh
+++ b/bigbluebutton-web/pres-checker/run.sh
@@ -1,2 +1 @@
java -cp "/usr/share/prescheck/lib/*" org.bigbluebutton.prescheck.Main $@
-
diff --git a/bigbluebutton-web/run.sh b/bigbluebutton-web/run.sh
index b707bed78f2b5e48049e3430bfb67c6257aa8658..a9e681a95cbf97223c494f7ad14b2f170cb7eee4 100755
--- a/bigbluebutton-web/run.sh
+++ b/bigbluebutton-web/run.sh
@@ -1,2 +1 @@
grails -Dserver.port=8989 run-war
-
diff --git a/bigbluebutton-web/test/unit/org/bigbluebutton/api/messaging/NullMessagingService.java b/bigbluebutton-web/test/unit/org/bigbluebutton/api/messaging/NullMessagingService.java
index 8c12f4d2d9130c88bef4b42509c1ecfbbeb75e9e..03ee0fdfa0775e25b3714557aa7fc41926babd2e 100644
--- a/bigbluebutton-web/test/unit/org/bigbluebutton/api/messaging/NullMessagingService.java
+++ b/bigbluebutton-web/test/unit/org/bigbluebutton/api/messaging/NullMessagingService.java
@@ -5,79 +5,65 @@ import java.util.Map;
public class NullMessagingService implements MessagingService {
- public void start() {
- // TODO Auto-generated method stub
+ public void start() {
+ // TODO Auto-generated method stub
- }
+ }
- public void stop() {
- // TODO Auto-generated method stub
+ public void stop() {
+ // TODO Auto-generated method stub
- }
+ }
- @Override
- public void recordMeetingInfo(String meetingId, Map<String, String> info) {
- // TODO Auto-generated method stub
+ @Override
+ public void recordMeetingInfo(String meetingId, Map<String, String> info) {
+ // TODO Auto-generated method stub
- }
+ }
- /*@Override
- public void recordMeetingMetadata(String meetingId,
- Map<String, String> metadata) {
- // TODO Auto-generated method stub
+ /*
+ * @Override public void recordMeetingMetadata(String meetingId, Map<String,
+ * String> metadata) { // TODO Auto-generated method stub
+ *
+ * }
+ */
- }*/
+ public void addListener(MessageListener listener) {
+ // TODO Auto-generated method stub
- @Override
- public void endMeeting(String meetingId) {
- // TODO Auto-generated method stub
+ }
- }
+ public void removeListener(MessageListener listener) {
+ // TODO Auto-generated method stub
- @Override
- public void send(String channel, String message) {
- // TODO Auto-generated method stub
+ }
- }
+ public void destroyMeeting(String meetingID) {
+ // TODO Auto-generated method stub
- public void addListener(MessageListener listener) {
- // TODO Auto-generated method stub
+ }
- }
+ public void createMeeting(String meetingID, String externalMeetingID, String meetingName, Boolean recorded,
+ String voiceBridge, Long duration) {
+ // TODO Auto-generated method stub
- public void removeListener(MessageListener listener) {
- // TODO Auto-generated method stub
+ }
- }
+ public void sendPolls(String meetingId, String title, String question, String questionType, List<String> answers) {
+ // TODO Auto-generated method stub
- public void destroyMeeting(String meetingID) {
- // TODO Auto-generated method stub
-
- }
+ }
- public void createMeeting(String meetingID, String externalMeetingID, String meetingName,
- Boolean recorded, String voiceBridge, Long duration) {
- // TODO Auto-generated method stub
-
- }
+ @Override
+ public void recordBreakoutInfo(String meetingId, Map<String, String> breakoutInfo) {
+ // TODO Auto-generated method stub
- public void sendPolls(String meetingId, String title, String question,
- String questionType, List<String> answers) {
- // TODO Auto-generated method stub
-
- }
+ }
- @Override
- public void registerUser(String meetingID, String internalUserId,
- String fullname, String role, String externUserID, String authToken, String avatarURL) {
- // TODO Auto-generated method stub
-
- }
+ @Override
+ public void addBreakoutRoom(String parentId, String breakoutId) {
+ // TODO Auto-generated method stub
- @Override
- public void sendKeepAlive(String keepAliveId) {
- // TODO Auto-generated method stub
-
- }
+ }
}
diff --git a/build_script.sh b/build_script.sh
index a66991d71cd4f13b999b288bfef7c8812d6c3a2e..85098711c01af17ca0202bba88c2f306d502c3c2 100755
--- a/build_script.sh
+++ b/build_script.sh
@@ -30,11 +30,12 @@ if [[ $files = *"bigbluebutton-html5"* ]]; then
echo $docker
} > /dev/null
- cd tests/puppeteer
+ cd tests/puppeteer/core
conf=$(docker exec $(docker ps -q) bbb-conf --secret | grep "Secret:")
secret=$(echo $conf | cut -d' ' -f2)
export BBB_SHARED_SECRET=$secret
node html5-check.js
+ cd ../../..
npm test
fi
fi
diff --git a/record-and-playback/podcast/scripts/process/podcast.rb b/record-and-playback/podcast/scripts/process/podcast.rb
index 0c03377625632a986578ff7c398295506f01c981..2519f381a84dab6ce61b5d5cbc78edc8ae10d8e2 100755
--- a/record-and-playback/podcast/scripts/process/podcast.rb
+++ b/record-and-playback/podcast/scripts/process/podcast.rb
@@ -114,7 +114,7 @@ if not FileTest.directory?(target_dir)
end
participants = recording.at_xpath("participants")
- participants.content = BigBlueButton::Events.get_num_participants("#{raw_archive_dir}/events.xml")
+ participants.content = BigBlueButton::Events.get_num_participants(@doc)
## Remove empty meta
metadata.search('//recording/meta').each do |meta|
diff --git a/record-and-playback/podcast/scripts/publish/podcast.rb b/record-and-playback/podcast/scripts/publish/podcast.rb
index 6ec3bcfcc1e1a60ad2f641885711eacc71190290..e8f2b8b5428de834b703bb056f93d3d83d9bb260 100755
--- a/record-and-playback/podcast/scripts/publish/podcast.rb
+++ b/record-and-playback/podcast/scripts/publish/podcast.rb
@@ -70,7 +70,8 @@ begin
BigBlueButton.logger.info("copying: #{process_dir}/audio.ogg to -> #{target_dir}")
FileUtils.cp("#{process_dir}/audio.ogg", target_dir)
- recording_time = BigBlueButton::Events.get_recording_length("#{raw_archive_dir}/events.xml")
+ @doc = Nokogiri::XML(File.open("#{raw_archive_dir}/events.xml"))
+ recording_time = BigBlueButton::Events.get_recording_length(@doc)
BigBlueButton.logger.info("Creating metadata.xml")