{ toLocalTime(clone.summaryDate) }
- { (clone.botType === 'Trader' && isDefined(clone.assetA) ) &&
+ { (clone.botType === 'Trading' && isDefined(clone.assetA) ) &&
{clone.buyAverage}
{clone.sellAverage}
diff --git a/server/src/enums/BotTypes.js b/server/src/enums/BotTypes.js
index 8616c540b..5c716da7d 100644
--- a/server/src/enums/BotTypes.js
+++ b/server/src/enums/BotTypes.js
@@ -1,9 +1,9 @@
-export const Trader = 'Trading'
+export const Trading = 'Trading'
export const Indicator = 'Indicator'
export const Sensor = 'Extraction'
export const BotTypesEnum = [
- Trader,
+ Trading,
Indicator,
Sensor
]
diff --git a/server/src/kubernetes/createClone.js b/server/src/kubernetes/createClone.js
index 8b40b3305..cc05966f9 100644
--- a/server/src/kubernetes/createClone.js
+++ b/server/src/kubernetes/createClone.js
@@ -4,7 +4,7 @@ import { KubernateError } from '../errors'
import { Client, config } from 'kubernetes-client'
import deploymentManifest from '../config/clone-deployment.json'
import { BACKTEST, COMPETITION, LIVE, NO_TIME } from '../enums/CloneMode'
-import { Trader, Indicator, Sensor } from '../enums/BotTypes'
+import { Trading, Indicator, Sensor } from '../enums/BotTypes'
const createClone = async (clone) => {
try {
@@ -82,7 +82,7 @@ const createClone = async (clone) => {
})
logger.debug('createClone Trading Configuration.')
- if (clone.botType === Trader) {
+ if (clone.botType === Trading) {
env.push({
'name': 'RESUME_EXECUTION',
'value': clone.resumeExecution.toString()
From 0af6e810f15709eb60d57841350114850e524dc6 Mon Sep 17 00:00:00 2001
From: Barry Low
Date: Sat, 23 Mar 2019 13:46:45 +0100
Subject: [PATCH 25/42] Publish 0.0.23
---
client/package-lock.json | 2 +-
client/package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/client/package-lock.json b/client/package-lock.json
index 60295d23c..ee733b83d 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "@superalgos/operations-client",
- "version": "0.0.18",
+ "version": "0.0.21",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/client/package.json b/client/package.json
index 483789cf3..2c450f830 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
{
"name": "@superalgos/operations-client",
- "version": "0.0.21",
+ "version": "0.0.23",
"description": "Superalgos Operations client-side web app",
"main": "src/index.js",
"dependencies": {
From b4a2950e48ac95aee49a22e5c45773ab24aa9e61 Mon Sep 17 00:00:00 2001
From: Unknown
Date: Sat, 23 Mar 2019 15:56:01 +0100
Subject: [PATCH 26/42] Making the clones filterable by botType (optional)
---
server/src/schema/queries/HistoryClones.js | 16 +++++++++++-----
server/src/schema/queries/ListClones.js | 15 +++++++++++----
2 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/server/src/schema/queries/HistoryClones.js b/server/src/schema/queries/HistoryClones.js
index 23bcd6d2f..de5ec8232 100644
--- a/server/src/schema/queries/HistoryClones.js
+++ b/server/src/schema/queries/HistoryClones.js
@@ -1,4 +1,4 @@
-import { GraphQLList } from 'graphql'
+import { GraphQLList, GraphQLString } from 'graphql'
import { AuthentificationError, OperationsError } from '../../errors'
import { CloneType } from '../types'
import { Clone } from '../../models'
@@ -6,9 +6,11 @@ import logger from '../../config/logger'
import cloneDetails from '../cloneDetails'
import teamQuery from '../../graphQLCalls/teamQuery'
-const args = {}
+const args = {
+ botType: { type: GraphQLString }
+}
-const resolve = async(parent, args, context) => {
+const resolve = async(parent, { botType }, context) => {
logger.debug('Retrieving History Clones.')
try {
if (!context.userId) {
@@ -25,8 +27,12 @@ const resolve = async(parent, args, context) => {
clones[i] = await cloneDetails(context.userId, team.data.data.teams_TeamById, clones[i])
clones[i].botType = clones[i].kind // Only for listing we show the teams value
}
-
- return clones
+ if (botType) {
+ var filtered = clones.filter((value) => value.botType === botType)
+ return filtered
+ } else {
+ return clones
+ }
} catch (err) {
logger.error('Retrieving History Clones error: %s', err.stack)
throw new OperationsError('There has been an error retrieving history clones.')
diff --git a/server/src/schema/queries/ListClones.js b/server/src/schema/queries/ListClones.js
index bb418b293..bb911dd70 100644
--- a/server/src/schema/queries/ListClones.js
+++ b/server/src/schema/queries/ListClones.js
@@ -1,4 +1,4 @@
-import { GraphQLList } from 'graphql'
+import { GraphQLList, GraphQLString } from 'graphql'
import { AuthentificationError, OperationsError } from '../../errors'
import { CloneType } from '../types'
import { Clone } from '../../models'
@@ -8,9 +8,11 @@ import getCloneLogs from '../../kubernetes/getClonePodLogs'
import cloneDetails from '../cloneDetails'
import teamQuery from '../../graphQLCalls/teamQuery'
-const args = {}
+const args = {
+ botType: { type: GraphQLString }
+}
-const resolve = async(parent, args, context) => {
+const resolve = async (parent, { botType }, context) => {
logger.debug('List Clones -> Entering Fuction.')
try {
if (!context.userId) {
@@ -32,7 +34,12 @@ const resolve = async(parent, args, context) => {
clones[i].botType = clones[i].kind // Only for listing we show the teams value
clones[i].botSlug = clones[i].botSlug
}
- return clones
+ if (botType) {
+ var filtered = clones.filter((value) => value.botType === botType)
+ return filtered
+ } else {
+ return clones
+ }
} catch (err) {
logger.error('List Clones error: %s', err.stack)
throw new OperationsError('There has been an error listing the clones.')
From 799def9d49dd0d08fa444f45736fef9d76e74c02 Mon Sep 17 00:00:00 2001
From: Matias
Date: Tue, 26 Mar 2019 18:59:30 +0100
Subject: [PATCH 27/42] Adding Begin Date to indicators
---
client/package.json | 2 +-
client/src/views/Clone/Add/index.js | 43 ++++++++++++++++++++++--
server/src/kubernetes/createClone.js | 49 +++++++++++++++-------------
3 files changed, 69 insertions(+), 25 deletions(-)
diff --git a/client/package.json b/client/package.json
index 75cfcd46e..8baf90ea8 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
{
"name": "@superalgos/operations-client",
- "version": "0.0.22",
+ "version": "0.0.24",
"description": "Superalgos Operations client-side web app",
"main": "src/index.js",
"dependencies": {
diff --git a/client/src/views/Clone/Add/index.js b/client/src/views/Clone/Add/index.js
index 7cab25671..08ec9b9dc 100644
--- a/client/src/views/Clone/Add/index.js
+++ b/client/src/views/Clone/Add/index.js
@@ -25,7 +25,7 @@ class AddClone extends Component {
user: JSON.parse(user),
selectedBot: {'id':''},
mode: '',
- resumeExecution: false,
+ resumeExecution: true,
beginDatetime: DateTime.local().minus({ days: 8 }).startOf('day'),
endDatetime: DateTime.local(),
waitTime: 1,
@@ -436,6 +436,44 @@ class AddClone extends Component {
}
+
+ { this.state.mode === "noTime" &&
+
+
+ The Resume Execution option let's you pick up the context of
+ the last execution and continue from there.
+
+ this.setState({resumeExecution:e.target.checked })}
+ value="resumeExecution"
+ color="primary"
+ />
+ }
+ label="Resume Execution"
+ className={classNames(classes.form, classes.textField)}
+ />
+ { !this.state.resumeExecution &&
+ }
+ rightArrowIcon={}
+ value={this.state.beginDatetime}
+ label='Start Date'
+ onChange={newVal => this.setState({ beginDatetime: newVal })}
+ className={classNames(classes.form, classes.textField)}
+ fullWidth
+ />
+ }
+
+
+ }
}
@@ -539,6 +577,7 @@ class AddClone extends Component {
variables.clone.endYear = this.state.endYear
variables.clone.month = this.state.month
variables.clone.runAsTeam = true
+ variables.clone.beginDatetime = this.state.beginDatetime.valueOf() / 1000|0
}
return this.props.addCloneMutation({
@@ -568,7 +607,7 @@ class AddClone extends Component {
this.setState({
selectedBot: {'id':''},
mode: '',
- resumeExecution: false,
+ resumeExecution: true,
beginDatetime: DateTime.local().minus({ days: 8 }).startOf('day'),
endDatetime: DateTime.local(),
waitTime: 1,
diff --git a/server/src/kubernetes/createClone.js b/server/src/kubernetes/createClone.js
index 2ab718fc5..4f68af15b 100644
--- a/server/src/kubernetes/createClone.js
+++ b/server/src/kubernetes/createClone.js
@@ -9,7 +9,7 @@ import { Trading, Indicator, Sensor } from '../enums/BotTypes'
const createClone = async (clone) => {
try {
logger.debug('createClone %s', clone.id)
- const client = new Client({config: config.fromKubeconfig(), version: '1.9'})
+ const client = new Client({ config: config.fromKubeconfig(), version: '1.9' })
deploymentManifest.metadata.name = clone.id
logger.debug('createClone Environment and Auth Configuration.')
@@ -131,7 +131,12 @@ const createClone = async (clone) => {
})
}
} else if (clone.botType === Indicator || clone.botType === Sensor) {
- if (clone.mode !== NO_TIME) {
+ if (clone.mode === NO_TIME) {
+ env.push({
+ 'name': 'BEGIN_DATE_TIME',
+ 'value': isDefined(clone.startYear) ? clone.startYear.toString() : ''
+ })
+ } else {
env.push({
'name': 'MIN_YEAR',
'value': isDefined(clone.startYear) ? clone.startYear.toString() : ''
@@ -162,27 +167,27 @@ const createClone = async (clone) => {
}
}
-function datasetNames(){
+function datasetNames() {
let dataSetMap = new Map()
- dataSetMap.set("24-hs","Multi-Period-Market")
- dataSetMap.set("12-hs","Multi-Period-Market")
- dataSetMap.set("08-hs","Multi-Period-Market")
- dataSetMap.set("06-hs","Multi-Period-Market")
- dataSetMap.set("04-hs","Multi-Period-Market")
- dataSetMap.set("03-hs","Multi-Period-Market")
- dataSetMap.set("02-hs","Multi-Period-Market")
- dataSetMap.set("01-hs","Multi-Period-Market")
- dataSetMap.set("45-min","Multi-Period-Daily")
- dataSetMap.set("40-min","Multi-Period-Daily")
- dataSetMap.set("30-min","Multi-Period-Daily")
- dataSetMap.set("20-min","Multi-Period-Daily")
- dataSetMap.set("15-min","Multi-Period-Daily")
- dataSetMap.set("10-min","Multi-Period-Daily")
- dataSetMap.set("05-min","Multi-Period-Daily")
- dataSetMap.set("04-min","Multi-Period-Daily")
- dataSetMap.set("03-min","Multi-Period-Daily")
- dataSetMap.set("02-min","Multi-Period-Daily")
- dataSetMap.set("01-min","Multi-Period-Daily")
+ dataSetMap.set("24-hs", "Multi-Period-Market")
+ dataSetMap.set("12-hs", "Multi-Period-Market")
+ dataSetMap.set("08-hs", "Multi-Period-Market")
+ dataSetMap.set("06-hs", "Multi-Period-Market")
+ dataSetMap.set("04-hs", "Multi-Period-Market")
+ dataSetMap.set("03-hs", "Multi-Period-Market")
+ dataSetMap.set("02-hs", "Multi-Period-Market")
+ dataSetMap.set("01-hs", "Multi-Period-Market")
+ dataSetMap.set("45-min", "Multi-Period-Daily")
+ dataSetMap.set("40-min", "Multi-Period-Daily")
+ dataSetMap.set("30-min", "Multi-Period-Daily")
+ dataSetMap.set("20-min", "Multi-Period-Daily")
+ dataSetMap.set("15-min", "Multi-Period-Daily")
+ dataSetMap.set("10-min", "Multi-Period-Daily")
+ dataSetMap.set("05-min", "Multi-Period-Daily")
+ dataSetMap.set("04-min", "Multi-Period-Daily")
+ dataSetMap.set("03-min", "Multi-Period-Daily")
+ dataSetMap.set("02-min", "Multi-Period-Daily")
+ dataSetMap.set("01-min", "Multi-Period-Daily")
return dataSetMap
}
From 4a34ca3cdafd5a349134650837708a5c6952eca8 Mon Sep 17 00:00:00 2001
From: Matias
Date: Tue, 26 Mar 2019 23:35:00 +0100
Subject: [PATCH 28/42] Fixing begin time
---
server/src/kubernetes/createClone.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/src/kubernetes/createClone.js b/server/src/kubernetes/createClone.js
index 4f68af15b..4be157ae3 100644
--- a/server/src/kubernetes/createClone.js
+++ b/server/src/kubernetes/createClone.js
@@ -134,7 +134,7 @@ const createClone = async (clone) => {
if (clone.mode === NO_TIME) {
env.push({
'name': 'BEGIN_DATE_TIME',
- 'value': isDefined(clone.startYear) ? clone.startYear.toString() : ''
+ 'value': isDefined(clone.beginDatetime) ? clone.beginDatetime.toString() : ''
})
} else {
env.push({
From 26ea666c543fe3b7dd33df37107a2e316f5a75c9 Mon Sep 17 00:00:00 2001
From: Matias
Date: Tue, 26 Mar 2019 23:48:56 +0100
Subject: [PATCH 29/42] Fixing begin time
---
server/src/kubernetes/createClone.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/src/kubernetes/createClone.js b/server/src/kubernetes/createClone.js
index 4be157ae3..750b75d4b 100644
--- a/server/src/kubernetes/createClone.js
+++ b/server/src/kubernetes/createClone.js
@@ -134,7 +134,7 @@ const createClone = async (clone) => {
if (clone.mode === NO_TIME) {
env.push({
'name': 'BEGIN_DATE_TIME',
- 'value': isDefined(clone.beginDatetime) ? clone.beginDatetime.toString() : ''
+ 'value': toPlatformDatetime(clone.beginDatetime)
})
} else {
env.push({
From 39f2e205bd0c6eac9e8dd24b6577fb81ec5e874b Mon Sep 17 00:00:00 2001
From: Matias
Date: Wed, 27 Mar 2019 12:03:55 +0100
Subject: [PATCH 30/42] Adding time only when resumeExecution is false
---
server/src/kubernetes/createClone.js | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/server/src/kubernetes/createClone.js b/server/src/kubernetes/createClone.js
index 750b75d4b..775888a4e 100644
--- a/server/src/kubernetes/createClone.js
+++ b/server/src/kubernetes/createClone.js
@@ -132,10 +132,12 @@ const createClone = async (clone) => {
}
} else if (clone.botType === Indicator || clone.botType === Sensor) {
if (clone.mode === NO_TIME) {
- env.push({
- 'name': 'BEGIN_DATE_TIME',
- 'value': toPlatformDatetime(clone.beginDatetime)
- })
+ if (!clone.resumeExecution) {
+ env.push({
+ 'name': 'BEGIN_DATE_TIME',
+ 'value': toPlatformDatetime(clone.beginDatetime)
+ })
+ }
} else {
env.push({
'name': 'MIN_YEAR',
From a913686e04d0b9ac2fc53a759c3be79b8fa333cf Mon Sep 17 00:00:00 2001
From: Matias
Date: Wed, 27 Mar 2019 18:54:41 +0100
Subject: [PATCH 31/42] Improving clone listing
---
client/package.json | 2 +-
client/src/GraphQL/Calls/clones.js | 2 +-
server/src/graphQLCalls/teamQuery.js | 45 ++++++++-------
server/src/kubernetes/getClonePodStatus.js | 4 +-
server/src/schema/cloneDetails.js | 64 +++++++---------------
server/src/schema/queries/HistoryClones.js | 20 +++++--
server/src/schema/queries/ListClones.js | 43 ++++++++++-----
7 files changed, 91 insertions(+), 89 deletions(-)
diff --git a/client/package.json b/client/package.json
index 8baf90ea8..5b7406958 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
{
"name": "@superalgos/operations-client",
- "version": "0.0.24",
+ "version": "0.0.25",
"description": "Superalgos Operations client-side web app",
"main": "src/index.js",
"dependencies": {
diff --git a/client/src/GraphQL/Calls/clones.js b/client/src/GraphQL/Calls/clones.js
index 7d4c1aff6..54becf398 100644
--- a/client/src/GraphQL/Calls/clones.js
+++ b/client/src/GraphQL/Calls/clones.js
@@ -12,7 +12,7 @@ const OPERATIONS_ADD_CLONE = gql`
const OPERATIONS_LIST_CLONES = gql`
query Operations_Clones{
- operations_Clones {
+ operations_Clones(queryLogs: true) {
...clone
}
}
diff --git a/server/src/graphQLCalls/teamQuery.js b/server/src/graphQLCalls/teamQuery.js
index b38833ee5..ed7b2a35e 100644
--- a/server/src/graphQLCalls/teamQuery.js
+++ b/server/src/graphQLCalls/teamQuery.js
@@ -1,7 +1,7 @@
import logger from '../config/logger'
import axios from 'axios'
-const teamQuery = (authorization, teamId) => {
+const teamQuery = (authorization, botId) => {
logger.debug('teamQuery -> Entering function')
return axios({
@@ -9,32 +9,35 @@ const teamQuery = (authorization, teamId) => {
method: 'post',
data: {
query: `
- query Teams_Team($teamId: String!){
- teams_TeamById(teamId:$teamId) {
- id
- name
- slug
- fb {
- id
- name
- slug
- kind
- avatar
- }
- members {
- member {
- alias
- authId
+ query teams_FbByOwner($fbId: String){
+ teams_FbByOwner(fbId: $fbId) {
+ edges{
+ node{
+ id
+ kind
+ name
+ slug
+ avatar
+ team{
+ id
+ name
+ slug
+ profile{
+ avatar
+ }
+ members{
+ member{
+ alias
+ }
+ }
+ }
}
}
- profile{
- avatar
- }
}
}
`,
variables: {
- teamId: teamId
+ fbId: botId
}
},
headers: {
diff --git a/server/src/kubernetes/getClonePodStatus.js b/server/src/kubernetes/getClonePodStatus.js
index e2f70932e..cad8cc97a 100644
--- a/server/src/kubernetes/getClonePodStatus.js
+++ b/server/src/kubernetes/getClonePodStatus.js
@@ -4,7 +4,7 @@ import { Client, config } from 'kubernetes-client'
const getClonePodStatus = async (cloneName) => {
try {
- logger.debug('getClonePodStatus on kubernates started. ')
+ logger.debug('getClonePodStatus on kubernates started.')
const client = new Client({ config: config.fromKubeconfig(), version: '1.9' })
let query = {
@@ -26,7 +26,7 @@ const getClonePodStatus = async (cloneName) => {
return JSON.stringify(clonePodStatus, null, 2)
} else {
- logger.warn('getClonePodStatus pod not found %s: ', cloneName)
+ logger.warn('getClonePodStatus pod not found: %s', cloneName)
return " Clone not found on the server. "
}
} catch (err) {
diff --git a/server/src/schema/cloneDetails.js b/server/src/schema/cloneDetails.js
index b8cab3c23..ae5d37f1b 100644
--- a/server/src/schema/cloneDetails.js
+++ b/server/src/schema/cloneDetails.js
@@ -1,54 +1,28 @@
import logger from '../config/logger'
-import { isDefined } from '../config/utils'
-import { AutorizationError } from '../errors'
-const cloneDetails = (authId, team, clone) => {
+const cloneDetails = (authId, selectedBot, clone) => {
logger.debug('cloneDetails -> Entering function.')
- if (!(authId === (process.env.AUTH_CLIENT_ID + '@clients') || isAuthorized(team, authId))) {
- logger.debug('User %s is not authorized to manage team %s.', authId, team.slug)
- throw new AutorizationError()
+ if (selectedBot !== undefined) {
+ clone.botId = selectedBot.id
+ clone.kind = selectedBot.kind
+ clone.botName = selectedBot.name
+ clone.botSlug = selectedBot.slug
+ clone.botAvatar = selectedBot.avatar
+
+ clone.teamId = selectedBot.team.id
+ clone.teamName = selectedBot.team.name
+ clone.teamSlug = selectedBot.team.slug
+
+ clone.teamAvatar = selectedBot.team.profile.avatar
+
+ clone.userLoggedIn = selectedBot.team.members[0].member.alias // TODO change by context info if possible
+
+ clone.botType = selectedBot.kind // Only for listing we show the teams value
+
+ logger.debug('cloneDetails -> Retrieving clone details complete.')
}
-
- let selectedBot = getSelectedBot(team, clone.botId)
- clone.teamId = team.id
- clone.botId = selectedBot.id
- clone.kind = selectedBot.kind
- clone.teamSlug = team.slug
- clone.botSlug = selectedBot.slug
- clone.teamName = team.name
- clone.botName = selectedBot.name
- clone.botAvatar = selectedBot.avatar
- clone.teamAvatar = team.profile.avatar
- clone.userLoggedIn = team.members[0].member.alias // TODO change by context info if possible
-
- logger.debug('cloneDetails -> Retrieving clone details complete.')
return clone
}
-function getSelectedBot (team, selectedBotId) {
- logger.debug('cloneDetails -> Getting selected bot.')
- if (isDefined(team)) {
- for (var i = 0; i < team.fb.length; i++) {
- if (team.fb[i].id === selectedBotId) {
- return team.fb[i]
- }
- }
- }
-}
-
-function isAuthorized (team, authId) {
- logger.debug('cloneDetails -> Checking if the user is authorized by the teams module.')
- let authorized = false
- if (isDefined(team)) {
- for (var i = 0; i < team.members.length; i++) {
- if (team.members[i].member.authId === authId) {
- authorized = true
- break
- }
- }
- }
- return authorized
-}
-
export default cloneDetails
diff --git a/server/src/schema/queries/HistoryClones.js b/server/src/schema/queries/HistoryClones.js
index de5ec8232..446124699 100644
--- a/server/src/schema/queries/HistoryClones.js
+++ b/server/src/schema/queries/HistoryClones.js
@@ -22,16 +22,26 @@ const resolve = async(parent, { botType }, context) => {
active: false
}).sort({createDatetime: -1})
+ let cloneResponse = []
+ let allUserBotsResponse = await teamQuery(context.authorization, null)
+ let allUserBots = allUserBotsResponse.data.data.teams_FbByOwner.edges
+
for (var i = 0; i < clones.length; i++) {
- let team = await teamQuery(context.authorization, clones[i].teamId)
- clones[i] = await cloneDetails(context.userId, team.data.data.teams_TeamById, clones[i])
- clones[i].botType = clones[i].kind // Only for listing we show the teams value
+ for (var j = 0; j < allUserBots.length; j++) {
+ let bot = allUserBots[j].node
+ if(clones[i].botId === bot.id){
+ let clone = cloneDetails(context.userId, bot, clones[i])
+ cloneResponse.push(clone)
+ break
+ }
+ }
}
+
if (botType) {
- var filtered = clones.filter((value) => value.botType === botType)
+ var filtered = cloneResponse.filter((value) => value.botType === botType)
return filtered
} else {
- return clones
+ return cloneResponse
}
} catch (err) {
logger.error('Retrieving History Clones error: %s', err.stack)
diff --git a/server/src/schema/queries/ListClones.js b/server/src/schema/queries/ListClones.js
index bb911dd70..390201f17 100644
--- a/server/src/schema/queries/ListClones.js
+++ b/server/src/schema/queries/ListClones.js
@@ -1,4 +1,4 @@
-import { GraphQLList, GraphQLString } from 'graphql'
+import { GraphQLList, GraphQLString, GraphQLBoolean } from 'graphql'
import { AuthentificationError, OperationsError } from '../../errors'
import { CloneType } from '../types'
import { Clone } from '../../models'
@@ -9,10 +9,11 @@ import cloneDetails from '../cloneDetails'
import teamQuery from '../../graphQLCalls/teamQuery'
const args = {
- botType: { type: GraphQLString }
+ botType: { type: GraphQLString },
+ queryLogs: { type: GraphQLBoolean }
}
-const resolve = async (parent, { botType }, context) => {
+const resolve = async (parent, { botType, queryLogs }, context) => {
logger.debug('List Clones -> Entering Fuction.')
try {
if (!context.userId) {
@@ -22,23 +23,37 @@ const resolve = async (parent, { botType }, context) => {
let clones = await Clone.find({
authId: context.userId,
active: true
- }).sort({createDatetime: -1})
+ }).sort({ createDatetime: -1 })
+
+ let cloneResponse = []
+ let allUserBotsResponse = await teamQuery(context.authorization, null)
+ let allUserBots = allUserBotsResponse.data.data.teams_FbByOwner.edges
for (var i = 0; i < clones.length; i++) {
- let team = await teamQuery(context.authorization, clones[i].teamId)
- clones[i] = await cloneDetails(context.userId, team.data.data.teams_TeamById, clones[i])
- let state = await getCloneStatus(clones[i].id)
- clones[i].state = state.substring(1, state.length - 1)
- let lastLogs = await getCloneLogs(clones[i].id)
- clones[i].lastLogs = lastLogs.substring(1, lastLogs.length - 1)
- clones[i].botType = clones[i].kind // Only for listing we show the teams value
- clones[i].botSlug = clones[i].botSlug
+ for (var j = 0; j < allUserBots.length; j++) {
+ let bot = allUserBots[j].node
+ if(clones[i].botId === bot.id){
+ let clone = cloneDetails(context.userId, bot, clones[i])
+ cloneResponse.push(clone)
+ break
+ }
+ }
+ }
+
+ if (queryLogs) {
+ for (var i = 0; i < cloneResponse.length; i++) {
+ let state = await getCloneStatus(cloneResponse[i].id)
+ cloneResponse[i].state = state.substring(1, state.length - 1)
+
+ let lastLogs = await getCloneLogs(cloneResponse[i].id)
+ cloneResponse[i].lastLogs = lastLogs.substring(1, lastLogs.length - 1)
+ }
}
if (botType) {
- var filtered = clones.filter((value) => value.botType === botType)
+ var filtered = cloneResponse.filter((value) => value.botType === botType)
return filtered
} else {
- return clones
+ return cloneResponse
}
} catch (err) {
logger.error('List Clones error: %s', err.stack)
From a73805f222c008559b504aea0011eaf8cbc43549 Mon Sep 17 00:00:00 2001
From: Matias
Date: Wed, 27 Mar 2019 19:38:42 +0100
Subject: [PATCH 32/42] Clone Details method update
---
server/src/kubernetes/createClone.js | 2 +-
server/src/schema/cloneDetails.js | 16 +++-------------
server/src/schema/mutations/AddCloneMutation.js | 5 +++--
.../src/schema/mutations/RemoveCloneMutation.js | 5 +++--
.../schema/mutations/UpdateExecutionSummary.js | 5 +++--
server/src/schema/queries/HistoryClones.js | 2 +-
server/src/schema/queries/ListClones.js | 2 +-
7 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/server/src/kubernetes/createClone.js b/server/src/kubernetes/createClone.js
index 775888a4e..cf5927177 100644
--- a/server/src/kubernetes/createClone.js
+++ b/server/src/kubernetes/createClone.js
@@ -159,7 +159,7 @@ const createClone = async (clone) => {
}
deploymentManifest.spec.template.spec.containers[0].env = env
-
+ logger.debug('ENV %s: ', JSON.stringify(env))
await client.apis.batch.v1.namespaces('default').jobs.post(
{ body: deploymentManifest })
diff --git a/server/src/schema/cloneDetails.js b/server/src/schema/cloneDetails.js
index ae5d37f1b..d0dff70b3 100644
--- a/server/src/schema/cloneDetails.js
+++ b/server/src/schema/cloneDetails.js
@@ -1,26 +1,16 @@
-import logger from '../config/logger'
-
-const cloneDetails = (authId, selectedBot, clone) => {
- logger.debug('cloneDetails -> Entering function.')
-
+const cloneDetails = (selectedBot, clone) => {
if (selectedBot !== undefined) {
clone.botId = selectedBot.id
clone.kind = selectedBot.kind
clone.botName = selectedBot.name
clone.botSlug = selectedBot.slug
clone.botAvatar = selectedBot.avatar
-
clone.teamId = selectedBot.team.id
clone.teamName = selectedBot.team.name
clone.teamSlug = selectedBot.team.slug
-
clone.teamAvatar = selectedBot.team.profile.avatar
-
- clone.userLoggedIn = selectedBot.team.members[0].member.alias // TODO change by context info if possible
-
- clone.botType = selectedBot.kind // Only for listing we show the teams value
-
- logger.debug('cloneDetails -> Retrieving clone details complete.')
+ clone.userLoggedIn = selectedBot.team.members[0].member.alias
+ clone.botType = selectedBot.kind
}
return clone
}
diff --git a/server/src/schema/mutations/AddCloneMutation.js b/server/src/schema/mutations/AddCloneMutation.js
index edaf47e4d..549f9651f 100644
--- a/server/src/schema/mutations/AddCloneMutation.js
+++ b/server/src/schema/mutations/AddCloneMutation.js
@@ -41,8 +41,9 @@ const resolve = async (parent, { clone }, context) => {
}
try {
- let team = await teamQuery(context.authorization, clone.teamId)
- clone = await cloneDetails(context.userId, team.data.data.teams_TeamById, clone)
+ let allUserBotsResponse = await teamQuery(context.authorization, clone.botId)
+ let bot = allUserBotsResponse.data.data.teams_FbByOwner.edges[0].node
+ clone = cloneDetails(bot, clone)
clone.createDatetime = new Date().valueOf() / 1000 | 0
clone.active = true
diff --git a/server/src/schema/mutations/RemoveCloneMutation.js b/server/src/schema/mutations/RemoveCloneMutation.js
index 43eebde78..5e4fa9ed0 100644
--- a/server/src/schema/mutations/RemoveCloneMutation.js
+++ b/server/src/schema/mutations/RemoveCloneMutation.js
@@ -30,8 +30,9 @@ const resolve = async (parent, { id }, context) => {
throw new OperationsError('You are not authorized to remove this clone.')
}
- let team = await teamQuery(context.authorization, clone.teamId)
- clone = await cloneDetails(context.userId, team.data.data.teams_TeamById, clone)
+ let allUserBotsResponse = await teamQuery(context.authorization, clone.botId)
+ let bot = allUserBotsResponse.data.data.teams_FbByOwner.edges[0].node
+ clone = cloneDetails(bot, clone)
if ((clone.mode === LIVE || clone.mode === COMPETITION) && isDefined(clone.keyId)) {
logger.debug('removeClone -> Release the clone key.')
diff --git a/server/src/schema/mutations/UpdateExecutionSummary.js b/server/src/schema/mutations/UpdateExecutionSummary.js
index dfe434e7d..de5729f6d 100644
--- a/server/src/schema/mutations/UpdateExecutionSummary.js
+++ b/server/src/schema/mutations/UpdateExecutionSummary.js
@@ -44,8 +44,9 @@ const resolve = async (parent,
return 'Clone not found.'
}
- let team = await teamQuery(context.authorization, clone.teamId)
- clone = await cloneDetails(context.userId, team.data.data.teams_TeamById, clone)
+ let allUserBotsResponse = await teamQuery(context.authorization, clone.botId)
+ let bot = allUserBotsResponse.data.data.teams_FbByOwner.edges[0].node
+ clone = cloneDetails(bot, clone)
const query = { _id: id }
const options = { new: true }
diff --git a/server/src/schema/queries/HistoryClones.js b/server/src/schema/queries/HistoryClones.js
index 446124699..f9a3ee731 100644
--- a/server/src/schema/queries/HistoryClones.js
+++ b/server/src/schema/queries/HistoryClones.js
@@ -30,7 +30,7 @@ const resolve = async(parent, { botType }, context) => {
for (var j = 0; j < allUserBots.length; j++) {
let bot = allUserBots[j].node
if(clones[i].botId === bot.id){
- let clone = cloneDetails(context.userId, bot, clones[i])
+ let clone = cloneDetails(bot, clones[i])
cloneResponse.push(clone)
break
}
diff --git a/server/src/schema/queries/ListClones.js b/server/src/schema/queries/ListClones.js
index 390201f17..60f5e4e1a 100644
--- a/server/src/schema/queries/ListClones.js
+++ b/server/src/schema/queries/ListClones.js
@@ -33,7 +33,7 @@ const resolve = async (parent, { botType, queryLogs }, context) => {
for (var j = 0; j < allUserBots.length; j++) {
let bot = allUserBots[j].node
if(clones[i].botId === bot.id){
- let clone = cloneDetails(context.userId, bot, clones[i])
+ let clone = cloneDetails(bot, clones[i])
cloneResponse.push(clone)
break
}
From 43cff60e9532f130816d8a20c9c703f7fd0f30b4 Mon Sep 17 00:00:00 2001
From: Matias
Date: Wed, 27 Mar 2019 22:18:58 +0100
Subject: [PATCH 33/42] Changing authorization on the update execution
---
.../schema/mutations/UpdateExecutionSummary.js | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/server/src/schema/mutations/UpdateExecutionSummary.js b/server/src/schema/mutations/UpdateExecutionSummary.js
index de5729f6d..876f2b07d 100644
--- a/server/src/schema/mutations/UpdateExecutionSummary.js
+++ b/server/src/schema/mutations/UpdateExecutionSummary.js
@@ -8,8 +8,6 @@ import {
import { OperationsError } from '../../errors'
import { Clone } from '../../models'
import logger from '../../config/logger'
-import teamQuery from '../../graphQLCalls/teamQuery'
-import cloneDetails from '../cloneDetails'
import { isDefined } from '../../config/utils'
const args = {
@@ -25,15 +23,20 @@ const args = {
}
const resolve = async (parent,
- { id, summaryDate, buyAverage, sellAverage, marketRate, combinedProfitsA,
- combinedProfitsB, assetA, assetB
- }, context) => {
+ { id, summaryDate, buyAverage, sellAverage, marketRate, combinedProfitsA,
+ combinedProfitsB, assetA, assetB
+ }, context) => {
logger.debug('UpdateExecutionSummary -> Entering Function.')
if (!context.userId) {
throw new AuthentificationError()
}
+ if (!(context.userId === process.env.AACLOUD_ID)) {
+ logger.debug('User %s is not authorized to manage team %s.', authId, team.slug)
+ throw new AutorizationError()
+ }
+
try {
let clone = await Clone.findOne({
_id: id,
@@ -44,10 +47,6 @@ const resolve = async (parent,
return 'Clone not found.'
}
- let allUserBotsResponse = await teamQuery(context.authorization, clone.botId)
- let bot = allUserBotsResponse.data.data.teams_FbByOwner.edges[0].node
- clone = cloneDetails(bot, clone)
-
const query = { _id: id }
const options = { new: true }
const update = {
From 8f6c7d7cf1dcd067ab7dea18aba8bb9e7b159c09 Mon Sep 17 00:00:00 2001
From: Matias
Date: Wed, 27 Mar 2019 23:03:02 +0100
Subject: [PATCH 34/42] Extraction Type
---
server/src/enums/BotTypes.js | 4 ++--
server/src/kubernetes/createClone.js | 4 ++--
server/src/schema/cloneDetails.js | 1 -
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/server/src/enums/BotTypes.js b/server/src/enums/BotTypes.js
index 5c716da7d..02145b032 100644
--- a/server/src/enums/BotTypes.js
+++ b/server/src/enums/BotTypes.js
@@ -1,11 +1,11 @@
export const Trading = 'Trading'
export const Indicator = 'Indicator'
-export const Sensor = 'Extraction'
+export const Extraction = 'Extraction'
export const BotTypesEnum = [
Trading,
Indicator,
- Sensor
+ Extraction
]
export default BotTypesEnum
diff --git a/server/src/kubernetes/createClone.js b/server/src/kubernetes/createClone.js
index cf5927177..ccab8aa6d 100644
--- a/server/src/kubernetes/createClone.js
+++ b/server/src/kubernetes/createClone.js
@@ -4,7 +4,7 @@ import { KubernateError } from '../errors'
import { Client, config } from 'kubernetes-client'
import deploymentManifest from '../config/clone-deployment.json'
import { BACKTEST, COMPETITION, LIVE, NO_TIME } from '../enums/CloneMode'
-import { Trading, Indicator, Sensor } from '../enums/BotTypes'
+import { Trading, Indicator, Extraction } from '../enums/BotTypes'
const createClone = async (clone) => {
try {
@@ -130,7 +130,7 @@ const createClone = async (clone) => {
'value': clone.keyId
})
}
- } else if (clone.botType === Indicator || clone.botType === Sensor) {
+ } else if (clone.botType === Indicator || clone.botType === Extraction) {
if (clone.mode === NO_TIME) {
if (!clone.resumeExecution) {
env.push({
diff --git a/server/src/schema/cloneDetails.js b/server/src/schema/cloneDetails.js
index d0dff70b3..1d8acc9f6 100644
--- a/server/src/schema/cloneDetails.js
+++ b/server/src/schema/cloneDetails.js
@@ -10,7 +10,6 @@ const cloneDetails = (selectedBot, clone) => {
clone.teamSlug = selectedBot.team.slug
clone.teamAvatar = selectedBot.team.profile.avatar
clone.userLoggedIn = selectedBot.team.members[0].member.alias
- clone.botType = selectedBot.kind
}
return clone
}
From b64b61c01bff64221ca3b8dbf518e81d3050d67a Mon Sep 17 00:00:00 2001
From: Matias
Date: Thu, 28 Mar 2019 11:15:54 +0100
Subject: [PATCH 35/42] Adding bot kind on list
---
server/src/schema/queries/HistoryClones.js | 1 +
server/src/schema/queries/ListClones.js | 1 +
2 files changed, 2 insertions(+)
diff --git a/server/src/schema/queries/HistoryClones.js b/server/src/schema/queries/HistoryClones.js
index f9a3ee731..9cd860499 100644
--- a/server/src/schema/queries/HistoryClones.js
+++ b/server/src/schema/queries/HistoryClones.js
@@ -31,6 +31,7 @@ const resolve = async(parent, { botType }, context) => {
let bot = allUserBots[j].node
if(clones[i].botId === bot.id){
let clone = cloneDetails(bot, clones[i])
+ clone.botType = bot.kind
cloneResponse.push(clone)
break
}
diff --git a/server/src/schema/queries/ListClones.js b/server/src/schema/queries/ListClones.js
index 60f5e4e1a..afb70d263 100644
--- a/server/src/schema/queries/ListClones.js
+++ b/server/src/schema/queries/ListClones.js
@@ -34,6 +34,7 @@ const resolve = async (parent, { botType, queryLogs }, context) => {
let bot = allUserBots[j].node
if(clones[i].botId === bot.id){
let clone = cloneDetails(bot, clones[i])
+ clone.botType = bot.kind
cloneResponse.push(clone)
break
}
From 9a2d671a97a618c1b4bb323bc7e4e7fbcaa27342 Mon Sep 17 00:00:00 2001
From: Matias
Date: Mon, 1 Apr 2019 12:09:16 +0200
Subject: [PATCH 36/42] Sync with latest version of clone executor
---
client/package.json | 2 +-
client/src/GraphQL/Fragments/clone.js | 36 -
client/src/GraphQL/Fragments/index.js | 39 +-
client/src/GraphQL/models.js | 40 +-
client/src/views/Clone/Add/index.js | 768 +++++++++++----------
server/.gitignore | 2 -
server/README.md | 14 +-
server/src/config/clone-deployment.json | 31 +
server/src/enums/BotTypes.js | 4 +-
server/src/kubernetes/createClone.js | 10 +-
server/src/schema/cloneDetails.js | 1 +
server/src/schema/queries/HistoryClones.js | 1 -
server/src/schema/queries/ListClones.js | 1 -
server/src/schema/types/input/Clone.js | 3 +-
14 files changed, 500 insertions(+), 452 deletions(-)
delete mode 100644 client/src/GraphQL/Fragments/clone.js
create mode 100644 server/src/config/clone-deployment.json
diff --git a/client/package.json b/client/package.json
index 5b7406958..a1fdc2e36 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
{
"name": "@superalgos/operations-client",
- "version": "0.0.25",
+ "version": "0.0.27",
"description": "Superalgos Operations client-side web app",
"main": "src/index.js",
"dependencies": {
diff --git a/client/src/GraphQL/Fragments/clone.js b/client/src/GraphQL/Fragments/clone.js
deleted file mode 100644
index 3fc772000..000000000
--- a/client/src/GraphQL/Fragments/clone.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import gql from 'graphql-tag'
-
-export const clone = gql`
- fragment clone on operations_Clone {
- id
- authId
- teamId
- botId
- mode
- resumeExecution
- beginDatetime
- endDatetime
- waitTime
- state
- stateDatetime
- createDatetime
- lastLogs
- runAsTeam
- summaryDate
- buyAverage
- sellAverage
- marketRate
- combinedProfitsA
- combinedProfitsB
- assetA
- assetB
- botType
- teamName
- botName
- botAvatar
- teamAvatar
- processName
- keyId
- botSlug
- }
-`
diff --git a/client/src/GraphQL/Fragments/index.js b/client/src/GraphQL/Fragments/index.js
index d916b776d..3fc772000 100644
--- a/client/src/GraphQL/Fragments/index.js
+++ b/client/src/GraphQL/Fragments/index.js
@@ -1,5 +1,36 @@
-import { clone } from './clone'
+import gql from 'graphql-tag'
-export {
- clone
-}
+export const clone = gql`
+ fragment clone on operations_Clone {
+ id
+ authId
+ teamId
+ botId
+ mode
+ resumeExecution
+ beginDatetime
+ endDatetime
+ waitTime
+ state
+ stateDatetime
+ createDatetime
+ lastLogs
+ runAsTeam
+ summaryDate
+ buyAverage
+ sellAverage
+ marketRate
+ combinedProfitsA
+ combinedProfitsB
+ assetA
+ assetB
+ botType
+ teamName
+ botName
+ botAvatar
+ teamAvatar
+ processName
+ keyId
+ botSlug
+ }
+`
diff --git a/client/src/GraphQL/models.js b/client/src/GraphQL/models.js
index 0ce6667fc..4704c7b65 100644
--- a/client/src/GraphQL/models.js
+++ b/client/src/GraphQL/models.js
@@ -29,22 +29,36 @@ const tradingStartModesList = {
const indicatorStartModes = {
allMonths: 'All Months',
oneMonth: 'One Month',
- noTime: 'No Time'
+ noTime: 'Head of the Market'
}
-const processNames = {
+const sensorProcessNames = {
+ Live: "Live-Trades",
+ HoleFixing: "Hole-Fixing"
+}
+
+const indicatorProcessNames = {
Daily: 'Multi-Period-Daily',
- Market: 'Multi-Period-Market',
- Min: "One-Min-Daily-Candles-Volumes",
- Live: "Poloniex-Live-Trades",
- HoleFixing: "Poloniex-Hole-Fixing"
+ Market: 'Multi-Period-Market'
}
-const exchanges = [
- {
- id: '1',
- name: 'Poloniex'
- }
-]
+const tradingProcessNames = {
+ TradingProcess: "Trading-Process"
+}
-export { tradingStartModes, tradingStartModesList, exchanges, indicatorStartModes, availableMonths, processNames, availableTimePeriods }
+const botTypes = {
+ Trading: "Trading",
+ Indicator: "Indicator",
+ Sensor: "Sensor"
+}
+
+const exchanges = {
+ Coss: "Coss",
+ Poloniex: "Poloniex",
+ Binance: "Binance"
+}
+
+export {
+ tradingStartModes, tradingStartModesList, exchanges, indicatorStartModes, availableMonths,
+ availableTimePeriods, sensorProcessNames, indicatorProcessNames, tradingProcessNames, botTypes
+}
diff --git a/client/src/views/Clone/Add/index.js b/client/src/views/Clone/Add/index.js
index 08ec9b9dc..99aa9ae77 100644
--- a/client/src/views/Clone/Add/index.js
+++ b/client/src/views/Clone/Add/index.js
@@ -6,24 +6,28 @@ import TopBar from '../../BannerTopBar'
import { withStyles } from '@material-ui/core/styles'
import classNames from 'classnames'
import styles from './styles'
-import { tradingStartModes, indicatorStartModes, availableMonths, processNames, availableTimePeriods } from '../../../GraphQL/models'
import { isDefined, getIndicatorYears } from '../../../utils'
import {
- MenuItem, Button, TextField, FormControl, InputLabel, Input, Typography,
- Paper, Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions,
- Select, FormControlLabel, Checkbox, FormHelperText
+ tradingStartModes, indicatorStartModes, availableMonths, availableTimePeriods,
+ sensorProcessNames, indicatorProcessNames, tradingProcessNames, botTypes, exchanges
+} from '../../../GraphQL/models'
+
+import {
+ MenuItem, Button, TextField, FormControl, InputLabel, Input, Typography,
+ Paper, Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions,
+ Select, FormControlLabel, Checkbox, FormHelperText
} from '@material-ui/core'
import { DateTimePicker } from 'material-ui-pickers'
import { ChevronLeft, ChevronRight } from '@material-ui/icons'
class AddClone extends Component {
- constructor(props){
+ constructor(props) {
super(props)
let user = localStorage.getItem('user')
this.state = {
user: JSON.parse(user),
- selectedBot: {'id':''},
+ selectedBot: { 'id': '' },
mode: '',
resumeExecution: true,
beginDatetime: DateTime.local().minus({ days: 8 }).startOf('day'),
@@ -36,12 +40,13 @@ class AddClone extends Component {
teams: [],
teamId: '',
keyId: '',
+ exchangeName: exchanges.Coss,
+ processName: '',
// Indicator Bot
startYear: 2019,
endYear: 2019,
month: 1,
- processName: '',
//TradingBot
timePeriod: '01-hs',
@@ -61,7 +66,7 @@ class AddClone extends Component {
render() {
const { classes } = this.props
- if( !isDefined(this.state.user) ) {
+ if (!isDefined(this.state.user)) {
return (
)
} else return (
-
-
+
+
-
+
@@ -511,19 +525,19 @@ class AddClone extends Component {
-
+
updateExection are
called n number
of times
+Note left of Clone Executor: signTransaction and
updateExection are
called n number
of times
User ->> Clones: getCloneExecutionInformation
-Cloud ->> Clones: cloneExecutionComplete
+Clone Executor ->> Clones: cloneExecutionComplete
User ->> Clones: deleteClone
Clones ->> Keys: releaseKey
```
diff --git a/server/src/config/clone-deployment.json b/server/src/config/clone-deployment.json
new file mode 100644
index 000000000..e350cc3c9
--- /dev/null
+++ b/server/src/config/clone-deployment.json
@@ -0,0 +1,31 @@
+{
+ "apiVersion": "batch/v1",
+ "kind": "Job",
+ "metadata": {
+ "labels": {
+ "app": "clone-executor"
+ },
+ "name": "clone-executor"
+ },
+ "spec": {
+ "template": {
+ "spec": {
+ "restartPolicy": "OnFailure",
+ "containers": [
+ {
+ "name": "clone-executor",
+ "image": "superalgos/clone-executor:v1.0",
+ "command": ["node", "Run.js"],
+ "env": [
+ ]
+ }
+ ]
+ },
+ "metadata": {
+ "labels": {
+ "app": "clone-executor"
+ }
+ }
+ }
+ }
+}
diff --git a/server/src/enums/BotTypes.js b/server/src/enums/BotTypes.js
index 02145b032..d6993d277 100644
--- a/server/src/enums/BotTypes.js
+++ b/server/src/enums/BotTypes.js
@@ -1,11 +1,11 @@
export const Trading = 'Trading'
export const Indicator = 'Indicator'
-export const Extraction = 'Extraction'
+export const Sensor = 'Sensor'
export const BotTypesEnum = [
Trading,
Indicator,
- Extraction
+ Sensor
]
export default BotTypesEnum
diff --git a/server/src/kubernetes/createClone.js b/server/src/kubernetes/createClone.js
index ccab8aa6d..7a748540c 100644
--- a/server/src/kubernetes/createClone.js
+++ b/server/src/kubernetes/createClone.js
@@ -4,7 +4,7 @@ import { KubernateError } from '../errors'
import { Client, config } from 'kubernetes-client'
import deploymentManifest from '../config/clone-deployment.json'
import { BACKTEST, COMPETITION, LIVE, NO_TIME } from '../enums/CloneMode'
-import { Trading, Indicator, Extraction } from '../enums/BotTypes'
+import { Trading, Indicator, Sensor } from '../enums/BotTypes'
const createClone = async (clone) => {
try {
@@ -80,6 +80,10 @@ const createClone = async (clone) => {
'name': 'PROCESS',
'value': clone.processName
})
+ env.push({
+ 'name': 'EXCHANGE_NAME',
+ 'value': clone.exchangeName
+ })
logger.debug('createClone Trading Configuration.')
if (clone.botType === Trading) {
@@ -130,7 +134,7 @@ const createClone = async (clone) => {
'value': clone.keyId
})
}
- } else if (clone.botType === Indicator || clone.botType === Extraction) {
+ } else if (clone.botType === Indicator || clone.botType === Sensor) {
if (clone.mode === NO_TIME) {
if (!clone.resumeExecution) {
env.push({
@@ -159,7 +163,7 @@ const createClone = async (clone) => {
}
deploymentManifest.spec.template.spec.containers[0].env = env
- logger.debug('ENV %s: ', JSON.stringify(env))
+
await client.apis.batch.v1.namespaces('default').jobs.post(
{ body: deploymentManifest })
diff --git a/server/src/schema/cloneDetails.js b/server/src/schema/cloneDetails.js
index 1d8acc9f6..d0dff70b3 100644
--- a/server/src/schema/cloneDetails.js
+++ b/server/src/schema/cloneDetails.js
@@ -10,6 +10,7 @@ const cloneDetails = (selectedBot, clone) => {
clone.teamSlug = selectedBot.team.slug
clone.teamAvatar = selectedBot.team.profile.avatar
clone.userLoggedIn = selectedBot.team.members[0].member.alias
+ clone.botType = selectedBot.kind
}
return clone
}
diff --git a/server/src/schema/queries/HistoryClones.js b/server/src/schema/queries/HistoryClones.js
index 9cd860499..f9a3ee731 100644
--- a/server/src/schema/queries/HistoryClones.js
+++ b/server/src/schema/queries/HistoryClones.js
@@ -31,7 +31,6 @@ const resolve = async(parent, { botType }, context) => {
let bot = allUserBots[j].node
if(clones[i].botId === bot.id){
let clone = cloneDetails(bot, clones[i])
- clone.botType = bot.kind
cloneResponse.push(clone)
break
}
diff --git a/server/src/schema/queries/ListClones.js b/server/src/schema/queries/ListClones.js
index afb70d263..60f5e4e1a 100644
--- a/server/src/schema/queries/ListClones.js
+++ b/server/src/schema/queries/ListClones.js
@@ -34,7 +34,6 @@ const resolve = async (parent, { botType, queryLogs }, context) => {
let bot = allUserBots[j].node
if(clones[i].botId === bot.id){
let clone = cloneDetails(bot, clones[i])
- clone.botType = bot.kind
cloneResponse.push(clone)
break
}
diff --git a/server/src/schema/types/input/Clone.js b/server/src/schema/types/input/Clone.js
index 3b106dafa..d4ad654b4 100644
--- a/server/src/schema/types/input/Clone.js
+++ b/server/src/schema/types/input/Clone.js
@@ -25,7 +25,8 @@ const Type = new GraphQLInputObjectType({
processName: { type: new GraphQLNonNull(GraphQLString) },
botType: { type: new GraphQLNonNull(GraphQLString) },
keyId: { type: GraphQLString },
- timePeriod: { type: GraphQLString }
+ timePeriod: { type: GraphQLString },
+ exchangeName: { type: GraphQLString }
})
})
From a5c3426372bb556064f8cc91085d6fe072a9d0b9 Mon Sep 17 00:00:00 2001
From: Matias
Date: Thu, 4 Apr 2019 18:08:05 +0200
Subject: [PATCH 37/42] Adding testing scripts
---
.gitignore | 10 +
client/package.json | 2 +-
client/src/GraphQL/models.js | 1 +
package-lock.json | 1903 ++++++++++++++++++++++++++++++++++
package.json | 17 +
server/.env.sample | 27 +
test/cloneAdminTest.js | 142 +++
7 files changed, 2101 insertions(+), 1 deletion(-)
create mode 100644 package-lock.json
create mode 100644 package.json
create mode 100644 server/.env.sample
create mode 100644 test/cloneAdminTest.js
diff --git a/.gitignore b/.gitignore
index 66374a65a..208fa65b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,12 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.
.scannerwork
+
+\.env
+
+\.nyc_output/
+
+coverage/
+
+node_modules/**
+
+test/activeCloneList\.js
diff --git a/client/package.json b/client/package.json
index a1fdc2e36..91748be1d 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
{
"name": "@superalgos/operations-client",
- "version": "0.0.27",
+ "version": "0.0.28",
"description": "Superalgos Operations client-side web app",
"main": "src/index.js",
"dependencies": {
diff --git a/client/src/GraphQL/models.js b/client/src/GraphQL/models.js
index 4704c7b65..4ce450894 100644
--- a/client/src/GraphQL/models.js
+++ b/client/src/GraphQL/models.js
@@ -38,6 +38,7 @@ const sensorProcessNames = {
}
const indicatorProcessNames = {
+ Single: 'Single-Period-Daily',
Daily: 'Multi-Period-Daily',
Market: 'Multi-Period-Market'
}
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..efb7b319c
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,1903 @@
+{
+ "name": "operations-test",
+ "version": "1.0.0",
+ "lockfileVersion": 1,
+ "requires": true,
+ "dependencies": {
+ "ansi-colors": {
+ "version": "3.2.3",
+ "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+ "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="
+ },
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+ },
+ "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==",
+ "requires": {
+ "color-convert": "^1.9.0"
+ }
+ },
+ "argparse": {
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+ "requires": {
+ "sprintf-js": "~1.0.2"
+ }
+ },
+ "arr-diff": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+ "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+ },
+ "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=="
+ },
+ "arr-union": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+ "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
+ },
+ "array-unique": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+ },
+ "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="
+ },
+ "atob": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
+ },
+ "axios": {
+ "version": "0.18.0",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz",
+ "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=",
+ "requires": {
+ "follow-redirects": "^1.3.0",
+ "is-buffer": "^1.1.5"
+ }
+ },
+ "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==",
+ "requires": {
+ "cache-base": "^1.0.1",
+ "class-utils": "^0.3.5",
+ "component-emitter": "^1.2.1",
+ "define-property": "^1.0.0",
+ "isobject": "^3.0.1",
+ "mixin-deep": "^1.2.0",
+ "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=",
+ "requires": {
+ "is-descriptor": "^1.0.0"
+ }
+ },
+ "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==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "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==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "requires": {
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
+ }
+ }
+ }
+ },
+ "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",
+ "concat-map": "0.0.1"
+ }
+ },
+ "braces": {
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+ "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.2",
+ "snapdragon": "^0.8.1",
+ "snapdragon-node": "^2.0.1",
+ "split-string": "^3.0.2",
+ "to-regex": "^3.0.1"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ }
+ }
+ },
+ "browser-stdout": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+ "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="
+ },
+ "cache-base": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+ "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+ "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"
+ }
+ },
+ "camelcase": {
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+ },
+ "chai": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
+ "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
+ "requires": {
+ "assertion-error": "^1.1.0",
+ "check-error": "^1.0.2",
+ "deep-eql": "^3.0.1",
+ "get-func-name": "^2.0.0",
+ "pathval": "^1.1.0",
+ "type-detect": "^4.0.5"
+ }
+ },
+ "chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "requires": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ },
+ "dependencies": {
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ }
+ }
+ },
+ "check-error": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+ "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII="
+ },
+ "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==",
+ "requires": {
+ "arr-union": "^3.1.0",
+ "define-property": "^0.2.5",
+ "isobject": "^3.0.0",
+ "static-extend": "^0.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=",
+ "requires": {
+ "is-descriptor": "^0.1.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==",
+ "requires": {
+ "string-width": "^2.1.1",
+ "strip-ansi": "^4.0.0",
+ "wrap-ansi": "^2.0.0"
+ }
+ },
+ "code-point-at": {
+ "version": "1.1.0",
+ "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=",
+ "requires": {
+ "map-visit": "^1.0.0",
+ "object-visit": "^1.0.0"
+ }
+ },
+ "color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "requires": {
+ "color-name": "1.1.3"
+ }
+ },
+ "color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+ },
+ "component-emitter": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+ "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+ },
+ "concat-map": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+ },
+ "copy-descriptor": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+ },
+ "cross-spawn": {
+ "version": "6.0.5",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+ "requires": {
+ "nice-try": "^1.0.4",
+ "path-key": "^2.0.1",
+ "semver": "^5.5.0",
+ "shebang-command": "^1.2.0",
+ "which": "^1.2.9"
+ }
+ },
+ "debug": {
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
+ "decamelize": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+ },
+ "decode-uri-component": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+ },
+ "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==",
+ "requires": {
+ "type-detect": "^4.0.0"
+ }
+ },
+ "define-properties": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+ "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+ "requires": {
+ "object-keys": "^1.0.12"
+ }
+ },
+ "define-property": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+ "requires": {
+ "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==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "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==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "requires": {
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
+ }
+ }
+ }
+ },
+ "detect-file": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+ "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc="
+ },
+ "diff": {
+ "version": "3.5.0",
+ "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+ "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
+ },
+ "dotenv": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz",
+ "integrity": "sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g=="
+ },
+ "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==",
+ "requires": {
+ "once": "^1.4.0"
+ }
+ },
+ "es-abstract": {
+ "version": "1.13.0",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
+ "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+ "requires": {
+ "es-to-primitive": "^1.2.0",
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3",
+ "is-callable": "^1.1.4",
+ "is-regex": "^1.0.4",
+ "object-keys": "^1.0.12"
+ }
+ },
+ "es-to-primitive": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+ "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+ "requires": {
+ "is-callable": "^1.1.4",
+ "is-date-object": "^1.0.1",
+ "is-symbol": "^1.0.2"
+ }
+ },
+ "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="
+ },
+ "esprima": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+ },
+ "execa": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+ "requires": {
+ "cross-spawn": "^6.0.0",
+ "get-stream": "^4.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"
+ }
+ },
+ "expand-brackets": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+ "requires": {
+ "debug": "^2.3.3",
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "posix-character-classes": "^0.1.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "requires": {
+ "is-descriptor": "^0.1.0"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ }
+ }
+ },
+ "expand-tilde": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+ "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+ "requires": {
+ "homedir-polyfill": "^1.0.1"
+ }
+ },
+ "extend-shallow": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+ "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==",
+ "requires": {
+ "is-plain-object": "^2.0.4"
+ }
+ }
+ }
+ },
+ "extglob": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+ "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.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^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=",
+ "requires": {
+ "is-descriptor": "^1.0.0"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ },
+ "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==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "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==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "requires": {
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
+ }
+ }
+ }
+ },
+ "fill-range": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+ "requires": {
+ "extend-shallow": "^2.0.1",
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1",
+ "to-regex-range": "^2.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=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ }
+ }
+ },
+ "find-up": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+ "requires": {
+ "locate-path": "^3.0.0"
+ }
+ },
+ "findup-sync": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+ "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+ "requires": {
+ "detect-file": "^1.0.0",
+ "is-glob": "^3.1.0",
+ "micromatch": "^3.0.4",
+ "resolve-dir": "^1.0.1"
+ }
+ },
+ "flat": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
+ "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==",
+ "requires": {
+ "is-buffer": "~2.0.3"
+ },
+ "dependencies": {
+ "is-buffer": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
+ "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
+ }
+ }
+ },
+ "follow-redirects": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
+ "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
+ "requires": {
+ "debug": "^3.2.6"
+ }
+ },
+ "for-in": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
+ },
+ "fragment-cache": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+ "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+ "requires": {
+ "map-cache": "^0.2.2"
+ }
+ },
+ "fs.realpath": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+ },
+ "function-bind": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+ },
+ "get-caller-file": {
+ "version": "1.0.3",
+ "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="
+ },
+ "get-stream": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+ "requires": {
+ "pump": "^3.0.0"
+ }
+ },
+ "get-value": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+ "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+ },
+ "glob": {
+ "version": "7.1.3",
+ "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"
+ }
+ },
+ "global-modules": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+ "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+ "requires": {
+ "global-prefix": "^1.0.1",
+ "is-windows": "^1.0.1",
+ "resolve-dir": "^1.0.0"
+ }
+ },
+ "global-prefix": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+ "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+ "requires": {
+ "expand-tilde": "^2.0.2",
+ "homedir-polyfill": "^1.0.1",
+ "ini": "^1.3.4",
+ "is-windows": "^1.0.1",
+ "which": "^1.2.14"
+ }
+ },
+ "growl": {
+ "version": "1.10.5",
+ "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+ "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA=="
+ },
+ "has": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+ "requires": {
+ "function-bind": "^1.1.1"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+ },
+ "has-symbols": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+ "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+ },
+ "has-value": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+ "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+ "requires": {
+ "get-value": "^2.0.6",
+ "has-values": "^1.0.0",
+ "isobject": "^3.0.0"
+ }
+ },
+ "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=",
+ "requires": {
+ "is-number": "^3.0.0",
+ "kind-of": "^4.0.0"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+ "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "he": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
+ },
+ "homedir-polyfill": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+ "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+ "requires": {
+ "parse-passwd": "^1.0.0"
+ }
+ },
+ "inflight": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+ "requires": {
+ "once": "^1.3.0",
+ "wrappy": "1"
+ }
+ },
+ "inherits": {
+ "version": "2.0.3",
+ "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=="
+ },
+ "invert-kv": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+ "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
+ },
+ "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=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "is-buffer": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+ },
+ "is-callable": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+ "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+ },
+ "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=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "is-date-object": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+ "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+ },
+ "is-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+ "requires": {
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.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=="
+ }
+ }
+ },
+ "is-extendable": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+ "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
+ },
+ "is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+ },
+ "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="
+ },
+ "is-glob": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+ "requires": {
+ "is-extglob": "^2.1.0"
+ }
+ },
+ "is-number": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "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==",
+ "requires": {
+ "isobject": "^3.0.1"
+ }
+ },
+ "is-regex": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+ "requires": {
+ "has": "^1.0.1"
+ }
+ },
+ "is-stream": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+ },
+ "is-symbol": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+ "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+ "requires": {
+ "has-symbols": "^1.0.0"
+ }
+ },
+ "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=="
+ },
+ "isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+ },
+ "isexe": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+ },
+ "js-yaml": {
+ "version": "3.12.0",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
+ "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+ "requires": {
+ "argparse": "^1.0.7",
+ "esprima": "^4.0.0"
+ }
+ },
+ "kind-of": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+ },
+ "lcid": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+ "requires": {
+ "invert-kv": "^2.0.0"
+ }
+ },
+ "locate-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+ "requires": {
+ "p-locate": "^3.0.0",
+ "path-exists": "^3.0.0"
+ }
+ },
+ "lodash": {
+ "version": "4.17.11",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+ "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+ },
+ "log-symbols": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+ "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+ "requires": {
+ "chalk": "^2.0.1"
+ }
+ },
+ "map-age-cleaner": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+ "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+ "requires": {
+ "p-defer": "^1.0.0"
+ }
+ },
+ "map-cache": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+ "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
+ },
+ "map-visit": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+ "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+ "requires": {
+ "object-visit": "^1.0.0"
+ }
+ },
+ "mem": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+ "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+ "requires": {
+ "map-age-cleaner": "^0.1.1",
+ "mimic-fn": "^2.0.0",
+ "p-is-promise": "^2.0.0"
+ }
+ },
+ "micromatch": {
+ "version": "3.1.10",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+ "requires": {
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "braces": "^2.3.1",
+ "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.9",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.2"
+ }
+ },
+ "mimic-fn": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+ },
+ "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"
+ }
+ },
+ "minimist": {
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+ },
+ "mixin-deep": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+ "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+ "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==",
+ "requires": {
+ "is-plain-object": "^2.0.4"
+ }
+ }
+ }
+ },
+ "mkdirp": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+ "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+ "requires": {
+ "minimist": "0.0.8"
+ }
+ },
+ "mocha": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.0.2.tgz",
+ "integrity": "sha512-RtTJsmmToGyeTznSOMoM6TPEk1A84FQaHIciKrRqARZx+B5ccJ5tXlmJzEKGBxZdqk9UjpRsesZTUkZmR5YnuQ==",
+ "requires": {
+ "ansi-colors": "3.2.3",
+ "browser-stdout": "1.3.1",
+ "debug": "3.2.6",
+ "diff": "3.5.0",
+ "escape-string-regexp": "1.0.5",
+ "findup-sync": "2.0.0",
+ "glob": "7.1.3",
+ "growl": "1.10.5",
+ "he": "1.2.0",
+ "js-yaml": "3.12.0",
+ "log-symbols": "2.2.0",
+ "minimatch": "3.0.4",
+ "mkdirp": "0.5.1",
+ "ms": "2.1.1",
+ "node-environment-flags": "1.0.4",
+ "object.assign": "4.1.0",
+ "strip-json-comments": "2.0.1",
+ "supports-color": "6.0.0",
+ "which": "1.3.1",
+ "wide-align": "1.1.3",
+ "yargs": "12.0.5",
+ "yargs-parser": "11.1.1",
+ "yargs-unparser": "1.5.0"
+ }
+ },
+ "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=="
+ },
+ "nanomatch": {
+ "version": "1.2.13",
+ "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+ "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+ "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.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
+ }
+ },
+ "nice-try": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+ },
+ "node-environment-flags": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.4.tgz",
+ "integrity": "sha512-M9rwCnWVLW7PX+NUWe3ejEdiLYinRpsEre9hMkU/6NS4h+EEulYaDH1gCEZ2gyXsmw+RXYDaV2JkkTNcsPDJ0Q==",
+ "requires": {
+ "object.getownpropertydescriptors": "^2.0.3"
+ }
+ },
+ "npm-run-path": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+ "requires": {
+ "path-key": "^2.0.0"
+ }
+ },
+ "number-is-nan": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+ },
+ "object-copy": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+ "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+ "requires": {
+ "copy-descriptor": "^0.1.0",
+ "define-property": "^0.2.5",
+ "kind-of": "^3.0.3"
+ },
+ "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=",
+ "requires": {
+ "is-descriptor": "^0.1.0"
+ }
+ },
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "object-keys": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
+ "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
+ },
+ "object-visit": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+ "requires": {
+ "isobject": "^3.0.0"
+ }
+ },
+ "object.assign": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+ "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+ "requires": {
+ "define-properties": "^1.1.2",
+ "function-bind": "^1.1.1",
+ "has-symbols": "^1.0.0",
+ "object-keys": "^1.0.11"
+ }
+ },
+ "object.getownpropertydescriptors": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+ "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+ "requires": {
+ "define-properties": "^1.1.2",
+ "es-abstract": "^1.5.1"
+ }
+ },
+ "object.pick": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+ "requires": {
+ "isobject": "^3.0.1"
+ }
+ },
+ "once": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+ "requires": {
+ "wrappy": "1"
+ }
+ },
+ "os-locale": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+ "requires": {
+ "execa": "^1.0.0",
+ "lcid": "^2.0.0",
+ "mem": "^4.0.0"
+ }
+ },
+ "p-defer": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+ "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
+ },
+ "p-finally": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+ "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+ },
+ "p-is-promise": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz",
+ "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg=="
+ },
+ "p-limit": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+ "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+ "requires": {
+ "p-try": "^2.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+ "requires": {
+ "p-limit": "^2.0.0"
+ }
+ },
+ "p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+ },
+ "parse-passwd": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+ "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY="
+ },
+ "pascalcase": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+ "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
+ },
+ "path-exists": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+ "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+ },
+ "path-is-absolute": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+ },
+ "path-key": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+ "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+ },
+ "pathval": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
+ "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA="
+ },
+ "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="
+ },
+ "pump": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+ "requires": {
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
+ }
+ },
+ "regex-not": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+ "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+ "requires": {
+ "extend-shallow": "^3.0.2",
+ "safe-regex": "^1.1.0"
+ }
+ },
+ "repeat-element": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+ "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
+ },
+ "repeat-string": {
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+ },
+ "require-directory": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+ "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+ },
+ "require-main-filename": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+ "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+ },
+ "resolve-dir": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+ "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+ "requires": {
+ "expand-tilde": "^2.0.0",
+ "global-modules": "^1.0.0"
+ }
+ },
+ "resolve-url": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
+ },
+ "ret": {
+ "version": "0.1.15",
+ "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+ "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
+ },
+ "safe-regex": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+ "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+ "requires": {
+ "ret": "~0.1.10"
+ }
+ },
+ "semver": {
+ "version": "5.7.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+ "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+ },
+ "set-blocking": {
+ "version": "2.0.0",
+ "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==",
+ "requires": {
+ "extend-shallow": "^2.0.1",
+ "is-extendable": "^0.1.1",
+ "is-plain-object": "^2.0.3",
+ "split-string": "^3.0.1"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ }
+ }
+ },
+ "shebang-command": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+ "requires": {
+ "shebang-regex": "^1.0.0"
+ }
+ },
+ "shebang-regex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+ },
+ "signal-exit": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+ },
+ "snapdragon": {
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+ "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+ "requires": {
+ "base": "^0.11.1",
+ "debug": "^2.2.0",
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "map-cache": "^0.2.2",
+ "source-map": "^0.5.6",
+ "source-map-resolve": "^0.5.0",
+ "use": "^3.1.0"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "requires": {
+ "is-descriptor": "^0.1.0"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ }
+ }
+ },
+ "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==",
+ "requires": {
+ "define-property": "^1.0.0",
+ "isobject": "^3.0.0",
+ "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=",
+ "requires": {
+ "is-descriptor": "^1.0.0"
+ }
+ },
+ "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==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "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==",
+ "requires": {
+ "kind-of": "^6.0.0"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "requires": {
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
+ }
+ }
+ }
+ },
+ "snapdragon-util": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+ "requires": {
+ "kind-of": "^3.2.0"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+ },
+ "source-map-resolve": {
+ "version": "0.5.2",
+ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+ "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+ "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"
+ }
+ },
+ "source-map-url": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
+ },
+ "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==",
+ "requires": {
+ "extend-shallow": "^3.0.0"
+ }
+ },
+ "sprintf-js": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+ },
+ "static-extend": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+ "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+ "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=",
+ "requires": {
+ "is-descriptor": "^0.1.0"
+ }
+ }
+ }
+ },
+ "string-width": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+ "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=",
+ "requires": {
+ "ansi-regex": "^3.0.0"
+ }
+ },
+ "strip-eof": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+ "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+ },
+ "strip-json-comments": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+ "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+ },
+ "supports-color": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
+ "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ },
+ "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=",
+ "requires": {
+ "kind-of": "^3.0.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "to-regex": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+ "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+ "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=",
+ "requires": {
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1"
+ }
+ },
+ "type-detect": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+ "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
+ },
+ "union-value": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+ "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+ "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=",
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ },
+ "set-value": {
+ "version": "0.4.3",
+ "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+ "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
+ "requires": {
+ "extend-shallow": "^2.0.1",
+ "is-extendable": "^0.1.1",
+ "is-plain-object": "^2.0.1",
+ "to-object-path": "^0.3.0"
+ }
+ }
+ }
+ },
+ "unset-value": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+ "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+ "requires": {
+ "has-value": "^0.3.1",
+ "isobject": "^3.0.0"
+ },
+ "dependencies": {
+ "has-value": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+ "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+ "requires": {
+ "get-value": "^2.0.3",
+ "has-values": "^0.1.4",
+ "isobject": "^2.0.0"
+ },
+ "dependencies": {
+ "isobject": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+ "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+ "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="
+ }
+ }
+ },
+ "urix": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+ "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+ },
+ "use": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+ "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
+ },
+ "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"
+ }
+ },
+ "which-module": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+ },
+ "wide-align": {
+ "version": "1.1.3",
+ "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"
+ }
+ },
+ "wrap-ansi": {
+ "version": "2.1.0",
+ "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"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+ },
+ "is-fullwidth-code-point": {
+ "version": "1.0.0",
+ "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"
+ }
+ },
+ "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"
+ }
+ },
+ "strip-ansi": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+ "requires": {
+ "ansi-regex": "^2.0.0"
+ }
+ }
+ }
+ },
+ "wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+ },
+ "y18n": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+ "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
+ },
+ "yargs": {
+ "version": "12.0.5",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+ "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+ "requires": {
+ "cliui": "^4.0.0",
+ "decamelize": "^1.2.0",
+ "find-up": "^3.0.0",
+ "get-caller-file": "^1.0.1",
+ "os-locale": "^3.0.0",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^1.0.1",
+ "set-blocking": "^2.0.0",
+ "string-width": "^2.0.0",
+ "which-module": "^2.0.0",
+ "y18n": "^3.2.1 || ^4.0.0",
+ "yargs-parser": "^11.1.1"
+ }
+ },
+ "yargs-parser": {
+ "version": "11.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+ "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+ "requires": {
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
+ }
+ },
+ "yargs-unparser": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.5.0.tgz",
+ "integrity": "sha512-HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw==",
+ "requires": {
+ "flat": "^4.1.0",
+ "lodash": "^4.17.11",
+ "yargs": "^12.0.5"
+ }
+ }
+ }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..f3fbb3174
--- /dev/null
+++ b/package.json
@@ -0,0 +1,17 @@
+{
+ "name": "operations-test",
+ "version": "1.0.0",
+ "description": "Superalgos Operations backend API",
+ "main": "src/index.js",
+ "scripts": {
+ "test": "./node_modules/.bin/mocha --reporter spec"
+ },
+ "author": "",
+ "license": "ISC",
+ "dependencies": {
+ "axios": "0.18.0",
+ "chai": "^4.2.0",
+ "dotenv": "^7.0.0",
+ "mocha": "^6.0.2"
+ }
+}
diff --git a/server/.env.sample b/server/.env.sample
new file mode 100644
index 000000000..f25d5149a
--- /dev/null
+++ b/server/.env.sample
@@ -0,0 +1,27 @@
+NODE_ENV=production
+
+VIRTUAL_HOST=VIRTUAL_HOST
+LETSENCRYPT_HOST=LETSENCRYPT_HOST
+LETSENCRYPT_EMAIL=LETSENCRYPT_EMAIL
+VIRTUAL_PORT=4003
+
+PORT=4003
+
+DB_USERNAME=DB_USERNAME
+DB_PASSWORD=DB_PASSWORD
+DB_DOMAIN=DB_DOMAIN
+
+GATEWAY_ENDPOINT=GATEWAY_ENDPOINT
+OPERATIONS_API_PRESHARED=OPERATIONS_API_PRESHARED
+
+# Clone Executor Integration
+PLATFORM_ENVIRONMENT=PLATFORM_ENVIRONMENT
+STORAGE_BASE_URL=STORAGE_BASE_URL
+STORAGE_CONNECTION_STRING=STORAGE_CONNECTION_STRING
+
+# Auth Config
+AUTH_URL=AUTH_URL
+AUTH_CLIENT_ID=AUTH_CLIENT_ID
+AUTH_CLIENT_SECRET=AUTH_CLIENT_SECRET
+AUTH_AUDIENCE=AUTH_AUDIENCE
+
diff --git a/test/cloneAdminTest.js b/test/cloneAdminTest.js
new file mode 100644
index 000000000..d83fe3e6d
--- /dev/null
+++ b/test/cloneAdminTest.js
@@ -0,0 +1,142 @@
+var assert = require('chai').assert
+const axios = require('axios')
+const { activeCloneList } = require('activeCloneList')
+require('dotenv').config()
+
+describe('Admin clones Clones', function () {
+ it('Remove clones', async function () {
+ this.timeout(300000)
+ var error
+ try {
+ var clones = await getClones()
+ for (let clone of clones) {
+ await removeClone(clone.id, clone.botName)
+ }
+ } catch (err) {
+ console.log('Error: ' + err)
+ error = err
+ }
+ assert.equal(error, undefined)
+ })
+ it('Add COSS Live Indicator Clones', async function () {
+ this.timeout(300000)
+ var error
+ var clones = activeCloneList("Coss")
+ try {
+ for (let clone of clones) {
+ await removeClone(clone.id, clone.botName)
+ }
+ } catch (err) {
+ console.log('Error: ' + err)
+ error = err
+ }
+ assert.equal(error, undefined)
+ })
+ it('Add POLONIEX Live Indicator Clones', async function () {
+ this.timeout(300000)
+ var error
+ var clones = activeCloneList("Poloniex")
+ try {
+ for (let clone of clones) {
+ await removeClone(clone.id, clone.botName)
+ }
+ } catch (err) {
+ console.log('Error: ' + err)
+ error = err
+ }
+ assert.equal(error, undefined)
+ })
+})
+
+async function getClones() {
+ try {
+ const clones = await axios({
+ url: process.env.GATEWAY_ENDPOINT,
+ method: 'post',
+ data: {
+ query: `
+ query {
+ operations_Clones(queryLogs: false) {
+ id
+ botName
+ }
+ }
+ `,
+ },
+ headers: {
+ authorization: 'Bearer ' + process.env.ACCESS_TOKEN
+ }
+ })
+
+ console.log('getClones ok ')
+ return clones.data.data.operations_Clones
+ } catch (error) {
+ console.log('getClones error: ' + error.response.data.errors[0])
+ throw error
+ }
+}
+
+async function removeClone(cloneId, botName) {
+ try {
+ await axios({
+ url: process.env.GATEWAY_ENDPOINT,
+ method: 'post',
+ data: {
+ query: `
+ mutation ($id: ID!){
+ operations_RemoveClone(
+ id: $id
+ )
+ }
+ `,
+ variables: {
+ id: cloneId
+ },
+ },
+ headers: {
+ authorization: 'Bearer ' + process.env.ACCESS_TOKEN
+ }
+ })
+
+ console.log('removeClone ok: ' + botName)
+ return true
+ } catch (error) {
+ console.log('removeClone error: ' + error.response.data.errors[0])
+ throw error
+ }
+}
+
+async function createClone(clone) {
+ try {
+ const clones = await axios({
+ url: process.env.GATEWAY_ENDPOINT,
+ method: 'post',
+ data: {
+ query: `
+ mutation ($clone: operations_CloneInput){
+ operations_AddClone(
+ clone: $clone
+ ) {
+ id
+ teamName
+ botName
+ processName
+ }
+ }
+ `,
+ variables: {
+ clone: clone
+ },
+ },
+ headers: {
+ authorization: 'Bearer ' + process.env.ACCESS_TOKEN
+ }
+ })
+
+ console.log('createClone id: ' + clones.data.data.operations_AddClone.id + ', botId: ' + clone.botId)
+ return clones.data.data.operations_AddClone
+ } catch (error) {
+ console.log('createClone error: ' + error.response.data.errors[0])
+ throw error
+ }
+}
From 2e12d4d01ec865cf2d356e40933e62991a94c79f Mon Sep 17 00:00:00 2001
From: Matias
Date: Thu, 4 Apr 2019 22:50:58 +0200
Subject: [PATCH 38/42] Require issue
---
test/cloneAdminTest.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/cloneAdminTest.js b/test/cloneAdminTest.js
index d83fe3e6d..150f3ccd1 100644
--- a/test/cloneAdminTest.js
+++ b/test/cloneAdminTest.js
@@ -1,6 +1,6 @@
var assert = require('chai').assert
const axios = require('axios')
-const { activeCloneList } = require('activeCloneList')
+const { activeCloneList } = require('./activeCloneList')
require('dotenv').config()
describe('Admin clones Clones', function () {
From e1c1a5139ffead13ccb634145c6714ef9de5fdb8 Mon Sep 17 00:00:00 2001
From: Matias
Date: Fri, 5 Apr 2019 17:39:08 +0200
Subject: [PATCH 39/42] Adding coss exchange
---
client/package-lock.json | 2 +-
client/package.json | 2 +-
client/src/GraphQL/Calls/clones.js | 2 +-
client/src/GraphQL/Calls/keys.js | 1 +
client/src/GraphQL/models.js | 3 +-
client/src/views/Clone/Add/index.js | 46 ++++++++++++++---------------
test/cloneAdminTest.js | 4 +--
7 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/client/package-lock.json b/client/package-lock.json
index ee733b83d..5e17d3b9d 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "@superalgos/operations-client",
- "version": "0.0.21",
+ "version": "0.0.29",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/client/package.json b/client/package.json
index 91748be1d..a6356f216 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
{
"name": "@superalgos/operations-client",
- "version": "0.0.28",
+ "version": "0.0.30",
"description": "Superalgos Operations client-side web app",
"main": "src/index.js",
"dependencies": {
diff --git a/client/src/GraphQL/Calls/clones.js b/client/src/GraphQL/Calls/clones.js
index 54becf398..b215a578d 100644
--- a/client/src/GraphQL/Calls/clones.js
+++ b/client/src/GraphQL/Calls/clones.js
@@ -21,7 +21,7 @@ const OPERATIONS_LIST_CLONES = gql`
const OPERATIONS_HISTORY_CLONES = gql`
query Operations_HistoryClones{
- operations_HistoryClones {
+ operations_HistoryClones(botType: "Trading") {
...clone
}
}
diff --git a/client/src/GraphQL/Calls/keys.js b/client/src/GraphQL/Calls/keys.js
index 0f6e8006a..23d3ffed3 100644
--- a/client/src/GraphQL/Calls/keys.js
+++ b/client/src/GraphQL/Calls/keys.js
@@ -6,6 +6,7 @@ export const GET_ALL_KEYS = gql`
id
key
description
+ exchange
}
}
`
diff --git a/client/src/GraphQL/models.js b/client/src/GraphQL/models.js
index 4ce450894..022fb3ada 100644
--- a/client/src/GraphQL/models.js
+++ b/client/src/GraphQL/models.js
@@ -55,8 +55,7 @@ const botTypes = {
const exchanges = {
Coss: "Coss",
- Poloniex: "Poloniex",
- Binance: "Binance"
+ Poloniex: "Poloniex"
}
export {
diff --git a/client/src/views/Clone/Add/index.js b/client/src/views/Clone/Add/index.js
index 99aa9ae77..2bacda39d 100644
--- a/client/src/views/Clone/Add/index.js
+++ b/client/src/views/Clone/Add/index.js
@@ -160,6 +160,20 @@ class AddClone extends Component {
{this.state.selectedBot.kind}
+ this.setState({ exchangeName: e.target.value })}
+ fullWidth
+ >
+ {Object.keys(exchanges).map((option, index) => (
+
+ ))}
+
+
{this.state.selectedBot.kind === botTypes.Trading &&
@@ -253,9 +267,9 @@ class AddClone extends Component {
);
if (error) return `Error! ${error.message}`;
const list = data.keyVault_AvailableKeys.map((key) => (
-
+
));
return (
this.setState({ startYear: e.target.value })}
fullWidth
>
- {getIndicatorYears().map((option, index) => (
-
}
- this.setState({ exchangeName: e.target.value })}
- fullWidth
- >
- {Object.keys(exchanges).map((option, index) => (
-
- ))}
-
-
You will be able to see the clone information under Active Clones.
Whenever you decide to stop the clone you can delete it. On History Clones will find all deleted clones.
diff --git a/test/cloneAdminTest.js b/test/cloneAdminTest.js
index 150f3ccd1..d1ef7fbc8 100644
--- a/test/cloneAdminTest.js
+++ b/test/cloneAdminTest.js
@@ -24,7 +24,7 @@ describe('Admin clones Clones', function () {
var clones = activeCloneList("Coss")
try {
for (let clone of clones) {
- await removeClone(clone.id, clone.botName)
+ await createClone(clone)
}
} catch (err) {
console.log('Error: ' + err)
@@ -38,7 +38,7 @@ describe('Admin clones Clones', function () {
var clones = activeCloneList("Poloniex")
try {
for (let clone of clones) {
- await removeClone(clone.id, clone.botName)
+ await createClone(clone)
}
} catch (err) {
console.log('Error: ' + err)
From bbec65837efee72f223140056e1b21d029e6b822 Mon Sep 17 00:00:00 2001
From: Matias
Date: Tue, 9 Apr 2019 21:30:51 +0200
Subject: [PATCH 40/42] Updating module description and adding minio config
---
client/src/views/Clone/Add/index.js | 4 ++--
client/src/views/Clone/History/index.js | 16 +++++++--------
client/src/views/Clone/List/index.js | 16 +++++++--------
client/src/views/Home.js | 27 +++++++++++++++++--------
server/src/kubernetes/createClone.js | 22 ++++++++++++++++++++
5 files changed, 59 insertions(+), 26 deletions(-)
diff --git a/client/src/views/Clone/Add/index.js b/client/src/views/Clone/Add/index.js
index 2bacda39d..c8448728a 100644
--- a/client/src/views/Clone/Add/index.js
+++ b/client/src/views/Clone/Add/index.js
@@ -72,7 +72,7 @@ class AddClone extends Component {
size='big'
title='Create a bot clone'
text="Please login to create a bot clone."
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
)
} else return (
@@ -81,7 +81,7 @@ class AddClone extends Component {
size='medium'
title='Create a bot clone'
text='Create a bot clone here.'
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
diff --git a/client/src/views/Clone/History/index.js b/client/src/views/Clone/History/index.js
index 4ccaed243..170c34094 100644
--- a/client/src/views/Clone/History/index.js
+++ b/client/src/views/Clone/History/index.js
@@ -23,7 +23,7 @@ class HistoryClones extends Component {
size='big'
title='Bot Clone History'
text='Loading your Bot Clones...'
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
)
} else if (data.operations_HistoryClones && data.operations_HistoryClones.length > 0) {
@@ -33,7 +33,7 @@ class HistoryClones extends Component {
size='medium'
title='Bot Clone History'
text='All your Bot Clones are here.'
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
@@ -53,7 +53,7 @@ class HistoryClones extends Component {
size='big'
title='Bot Clone History'
text='Please login to gain access to your Bot Clones.'
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
)
} else {
@@ -62,7 +62,7 @@ class HistoryClones extends Component {
size='big'
title='Bot Clone History'
text="You don't have any Clone yet. Once you create one you will find it here."
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
)
}
@@ -75,7 +75,7 @@ class HistoryClones extends Component {
size='big'
title='Manage your Bot Clones'
text='Loading Bot Clones...'
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
)
} else if (data.operations_HistoryClones && data.operations_HistoryClones.length > 0) {
@@ -85,7 +85,7 @@ class HistoryClones extends Component {
size='big'
title='Manage your Bot Clones'
text='Loading Bot Clones...'
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
@@ -105,7 +105,7 @@ class HistoryClones extends Component {
size='big'
title='No Bot Clones to display'
text='Please Login to access your Bot Clones.'
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
)
} else {
@@ -115,7 +115,7 @@ class HistoryClones extends Component {
size='big'
title='No Bot Clones to display'
text="You don't have any Bot Clone yet. After you create a new Clone, it will be listed here."
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
)
}
diff --git a/client/src/views/Clone/List/index.js b/client/src/views/Clone/List/index.js
index 6df628fa4..4cf60b48b 100644
--- a/client/src/views/Clone/List/index.js
+++ b/client/src/views/Clone/List/index.js
@@ -23,7 +23,7 @@ class BrowseClones extends Component {
size='big'
title='Your Bot Clones'
text='Loading your Bot Clones...'
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
)
} else if (data.operations_Clones && data.operations_Clones.length > 0) {
@@ -33,7 +33,7 @@ class BrowseClones extends Component {
size='medium'
title='Your Bot Clones'
text='All your Bot Clones are here.'
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
@@ -53,7 +53,7 @@ class BrowseClones extends Component {
size='big'
title='Your Bot Clones'
text='Please login to gain access to your Bot Clones.'
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
)
} else {
@@ -62,7 +62,7 @@ class BrowseClones extends Component {
size='big'
title='Your Bot Clones'
text="You don't have any Bot Clone yet. Once you create one you will find it here."
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
)
}
@@ -75,7 +75,7 @@ class BrowseClones extends Component {
size='big'
title='Manage your Bot Clones'
text='Loading Bot Clones...'
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
)
} else if (data.operations_Clones && data.operations_Clones.length > 0) {
@@ -85,7 +85,7 @@ class BrowseClones extends Component {
size='big'
title='Manage your Bot Clones'
text='Loading Bot Clones...'
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
@@ -105,7 +105,7 @@ class BrowseClones extends Component {
size='big'
title='No Bot Clones to display'
text='Please Login to access your Bot Clones.'
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
)
} else {
@@ -115,7 +115,7 @@ class BrowseClones extends Component {
size='big'
title='No Bot Clones to display'
text="You don't have any Bot Clone yet. After you create a new Clone, it will be listed here."
- backgroundUrl='https://superalgos.org/img/photos/ecosystem.jpg'
+ backgroundUrl='https://superalgos.org/img/photos/clones-original.jpg'
/>
)
}
diff --git a/client/src/views/Home.js b/client/src/views/Home.js
index 02e13a7cf..90892a4c8 100644
--- a/client/src/views/Home.js
+++ b/client/src/views/Home.js
@@ -4,31 +4,42 @@ import TopBar from './BannerTopBar'
class Home extends Component {
- render () {
+ render() {
return (
- Welcome to the Clones Module!
+ Clones Module
- Responsible for manage bot clones.
+ Creating and managing bot clones
- The Clones module allows you to create instances of your bots
- that will be executed on a virtual machine.
+ The clones module allows creating and managing the execution of bot’s code.
+ It also stores the metadata information of the clones and handles the interaction
+ with the orchestration software.
+
+
+ It integrates with other system modules to enable secure and encapsulated execution of the
+ bots. On the clone creation process the encapsulation is achieved by deploying a Clone Executor
+ Image on a Kubernetes container.
-
+
+ Bots are executed using the common framework called Clone Executor which provides support for commonly used resources.
+
+
+ When creating a new clone, specific execution parameters are selected, for example the exchange and the time period that the bot will operate in.
+
diff --git a/server/src/kubernetes/createClone.js b/server/src/kubernetes/createClone.js
index 7a748540c..00bbcd394 100644
--- a/server/src/kubernetes/createClone.js
+++ b/server/src/kubernetes/createClone.js
@@ -47,6 +47,28 @@ const createClone = async (clone) => {
'value': process.env.AUTH_AUDIENCE
})
+ // MINIO
+ env.push({
+ 'name': 'MINIO_END_POINT',
+ 'value': process.env.MINIO_END_POINT
+ })
+ env.push({
+ 'name': 'MINIO_PORT',
+ 'value': process.env.MINIO_PORT
+ })
+ env.push({
+ 'name': 'MINIO_USE_SSL',
+ 'value': process.env.MINIO_USE_SSL
+ })
+ env.push({
+ 'name': 'MINIO_ACCESS_KEY',
+ 'value': process.env.MINIO_ACCESS_KEY
+ })
+ env.push({
+ 'name': 'MINIO_SECRET_KEY',
+ 'value': process.env.MINIO_SECRET_KEY
+ })
+
logger.debug('createClone General Financial Being Configuration.')
env.push({
'name': 'DEV_TEAM',
From 540f29093e02bc1c095edb3643e16aa5f7d570d7 Mon Sep 17 00:00:00 2001
From: Matias
Date: Tue, 9 Apr 2019 21:45:37 +0200
Subject: [PATCH 41/42] Changing to minio
---
server/src/kubernetes/createClone.js | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/server/src/kubernetes/createClone.js b/server/src/kubernetes/createClone.js
index 00bbcd394..86ab0839f 100644
--- a/server/src/kubernetes/createClone.js
+++ b/server/src/kubernetes/createClone.js
@@ -48,6 +48,10 @@ const createClone = async (clone) => {
})
// MINIO
+ env.push({
+ 'name': 'STORAGE_PROVIDER',
+ 'value': process.env.STORAGE_PROVIDER
+ })
env.push({
'name': 'MINIO_END_POINT',
'value': process.env.MINIO_END_POINT
@@ -69,6 +73,7 @@ const createClone = async (clone) => {
'value': process.env.MINIO_SECRET_KEY
})
+
logger.debug('createClone General Financial Being Configuration.')
env.push({
'name': 'DEV_TEAM',
From 37d4e5e5a5c95264692a9786c901ce837b9590d1 Mon Sep 17 00:00:00 2001
From: Matias
Date: Wed, 10 Apr 2019 11:09:54 +0200
Subject: [PATCH 42/42] Demo preparation
---
client/package.json | 2 +-
client/src/GraphQL/models.js | 1 -
client/src/views/Clone/Add/index.js | 123 +++---------------
.../src/schema/mutations/AddCloneMutation.js | 24 +++-
4 files changed, 38 insertions(+), 112 deletions(-)
diff --git a/client/package.json b/client/package.json
index a6356f216..a79bd9079 100644
--- a/client/package.json
+++ b/client/package.json
@@ -1,6 +1,6 @@
{
"name": "@superalgos/operations-client",
- "version": "0.0.30",
+ "version": "0.0.31",
"description": "Superalgos Operations client-side web app",
"main": "src/index.js",
"dependencies": {
diff --git a/client/src/GraphQL/models.js b/client/src/GraphQL/models.js
index 022fb3ada..997c57bc1 100644
--- a/client/src/GraphQL/models.js
+++ b/client/src/GraphQL/models.js
@@ -38,7 +38,6 @@ const sensorProcessNames = {
}
const indicatorProcessNames = {
- Single: 'Single-Period-Daily',
Daily: 'Multi-Period-Daily',
Market: 'Multi-Period-Market'
}
diff --git a/client/src/views/Clone/Add/index.js b/client/src/views/Clone/Add/index.js
index c8448728a..013b752f9 100644
--- a/client/src/views/Clone/Add/index.js
+++ b/client/src/views/Clone/Add/index.js
@@ -28,8 +28,8 @@ class AddClone extends Component {
this.state = {
user: JSON.parse(user),
selectedBot: { 'id': '' },
- mode: '',
- resumeExecution: true,
+ mode: "noTime",
+ resumeExecution: false,
beginDatetime: DateTime.local().minus({ days: 8 }).startOf('day'),
endDatetime: DateTime.local(),
waitTime: 1,
@@ -41,7 +41,7 @@ class AddClone extends Component {
teamId: '',
keyId: '',
exchangeName: exchanges.Coss,
- processName: '',
+ processName: indicatorProcessNames.Daily,
// Indicator Bot
startYear: 2019,
@@ -267,9 +267,9 @@ class AddClone extends Component {
);
if (error) return `Error! ${error.message}`;
const list = data.keyVault_AvailableKeys.map((key) => (
-
+
));
return (
}
- {(this.state.selectedBot.kind === botTypes.Indicator
- || this.state.selectedBot.kind === botTypes.Sensor) &&
-
- this.setState({ mode: e.target.value })}
- onBlur={(e) => this.setState({ modeError: false })}
- error={this.state.modeError}
- fullWidth
- >
- {Object.keys(indicatorStartModes).map(option => (
-
- ))}
-
-
- {this.state.mode === "allMonths" &&
-
- this.setState({ startYear: e.target.value })}
- fullWidth
- >
- {getIndicatorYears().map(option => (
-
- ))}
-
-
- this.setState({ endYear: e.target.value })}
- fullWidth
- >
- {getIndicatorYears().map(option => (
-
- ))}
-
-
- }
-
- {this.state.mode === "oneMonth" &&
-
- this.setState({ startYear: e.target.value })}
- fullWidth
- >
- {getIndicatorYears().map(option => (
-
- ))}
-
-
- this.setState({ month: e.target.value })}
- fullWidth
- >
- {availableMonths.map((option, index) => (
-
- ))}
-
-
- }
-
- }
-
-
- {(this.state.mode === "noTime" && this.state.selectedBot.kind !== botTypes.Sensor ) &&
+ {(this.state.mode === "noTime" && this.state.selectedBot.kind !== botTypes.Sensor) &&
The Resume Execution option let's you pick up the context of
@@ -612,8 +518,8 @@ class AddClone extends Component {
if (!this.state.serverError)
this.setState({
selectedBot: { 'id': '' },
- mode: '',
- resumeExecution: true,
+ mode: 'noTime',
+ resumeExecution: false,
beginDatetime: DateTime.local().minus({ days: 8 }).startOf('day'),
endDatetime: DateTime.local(),
waitTime: 1,
@@ -621,11 +527,20 @@ class AddClone extends Component {
stateDatetime: 0,
createDatetime: 0,
runAsTeam: false,
- processName: '',
+ exchangeName: exchanges.Coss,
+ processName: indicatorProcessNames.Daily,
teams: [],
teamId: '',
keyId: '',
+ // Indicator Bot
+ startYear: 2019,
+ endYear: 2019,
+ month: 1,
+
+ //TradingBot
+ timePeriod: '01-hs',
+
//Error handlers
nameError: false,
teamError: false,
diff --git a/server/src/schema/mutations/AddCloneMutation.js b/server/src/schema/mutations/AddCloneMutation.js
index 549f9651f..5f72a3739 100644
--- a/server/src/schema/mutations/AddCloneMutation.js
+++ b/server/src/schema/mutations/AddCloneMutation.js
@@ -40,13 +40,25 @@ const resolve = async (parent, { clone }, context) => {
throw new WrongArgumentsError('The key was not provided to run the clone.')
}
- try {
- let allUserBotsResponse = await teamQuery(context.authorization, clone.botId)
- let bot = allUserBotsResponse.data.data.teams_FbByOwner.edges[0].node
- clone = cloneDetails(bot, clone)
- clone.createDatetime = new Date().valueOf() / 1000 | 0
- clone.active = true
+ let allUserBotsResponse = await teamQuery(context.authorization, clone.botId)
+ let bot = allUserBotsResponse.data.data.teams_FbByOwner.edges[0].node
+ clone = cloneDetails(bot, clone)
+ clone.createDatetime = new Date().valueOf() / 1000 | 0
+ clone.active = true
+ // TODO Temporary Limitation on bot creation
+ if (!(clone.teamSlug === "AAMasters" || clone.teamSlug === "AAVikings")) {
+ let clones = await Clone.find({
+ authId: context.userId,
+ active: true
+ })
+
+ if (clones !== undefined && clones.length >= 5) {
+ throw new Error('Currently maximum number of clones per user is 5. You can delete an existing clone and try again.')
+ }
+ }
+
+ try {
let newClone = new Clone(clone)
newClone.authId = context.userId
clone.id = newClone._id