worked on different things.

backend/src/interfaces.js

@@ -25,7 +25,6 @@ const HOST = os.hostname()
 
 const state = {
   workers: [],
-  interfaces: [],
   ports: [],
   connections: [],
   lastScan: {
@@ -136,7 +135,7 @@ async function findWorkers () {
     const { data, error, pythonError } = await workerProcess.spawn()
     if (error) throw new Error(error)
     if (pythonError) throw new Error(pythonError)
-    // c. Save the worker in the state.
+    // d. Save the worker in the state.
     state.workers.push({
       id: md5(`${interfaceName}${workerScript}${mtime}`),
       interfaceName,
@@ -156,6 +155,9 @@ async function workers (parent, args, context, info) {
   await findWorkers()
   return state.workers.map(worker => ({
     ...worker,
+    // Find ports
+    ports: ports(worker.interfaceName, args, context, info),
+    // Serialize worker process
     workerProcess: workerProcess(worker.workerProcess, args, context, info)
   }))
 }
@@ -172,7 +174,10 @@ async function worker (parent, args, context, info) {
   if (!worker) {
     throw new Error(`Worker id=${id}, interfaceName=${interfaceName} not found`)
   }
-  return worker
+  return {
+    ...worker,
+    workerProcess: workerProcess(worker.workerProcess, args, context, info)
+  }
 }
 
 function workerProcess (parent, args, ctx, info) {
@@ -197,7 +202,7 @@ function workerProcess (parent, args, ctx, info) {
 /**
  * PORTS SECTION
  */
-async function findPorts (interfaceName) {
+async function findPorts () {
   console.log('find ports.')
   // 1. Make sure, workers are updated.
   await findWorkers()
@@ -206,66 +211,80 @@ async function findPorts (interfaceName) {
   // if (state.lastScan.ports + 1000 > Date.now()) return null
   // state.lastScan.ports = Date.now()
 
-  const portsPromises = state.workers.map(worker => {})
-  // Generate all ports for the interface
-  const iface = state.interfaces.find(
-    iface => iface.interfaceName === interfaceName
-  )
-
-  const { data, error, pythonError } = await iface.worker.send({
-    type: 'ports'
-  })
-  if (error) throw new Error(error)
-  if (pythonError) throw new Error(pythonError)
-  console.log(data)
-  data.forEach(port => {
-    const id = port.name || port.device
-    // Skip existing ports
-    if (state.ports.find(port => port.id === id)) return null
-    const newPort = {
-      id,
-      interfaceName,
-      host: HOST,
-      ...port
-    }
-    state.ports.push(newPort)
-    iface.ports.push(newPort)
+  // 3. Loop through all workers to find available ports.
+  const portsPromises = state.workers.map(async worker => {
+    // a) Ask worker for ports.
+    const { data, error, pythonError } = await worker.workerProcess.send({
+      type: 'ports'
+    })
+    if (error) throw new Error(error)
+    if (pythonError) throw new Error(pythonError)
+    console.log(data)
+    // b) Add all ports that are not in the list.
+    data.forEach(port => {
+      const id = port.name || port.device
+      if (state.ports.find(port => port.id === id)) return null
+      const newPort = {
+        id,
+        interfaceName: worker.interfaceName,
+        host: os.hostname(),
+        ...port
+      }
+      state.ports.push(newPort)
+      worker.ports.push(newPort)
+    })
   })
+  await Promise.all(portsPromises)
+
   console.log('found ports.')
 }
 
 async function ports (parent, args, ctx, info) {
-  const { force, interfaceName } = args
+  await findPorts()
+  const { interfaceName } = args
   const ifName = interfaceName || parent
 
+  console.log(ifName)
   if (ifName) {
-    const iface = state.interfaces.find(iface => iface.interfaceName === ifName)
-
-    // Try to find ports if necessary
-    if (!iface.ports.length || force) await findPorts(ifName)
+    const iface = state.workers.find(iface => iface.interfaceName === ifName)
+    if (!iface) throw new Error(`Interface ${ifName} not found.`)
     return iface.ports
   } else {
     return state.ports
   }
 }
 
-/**
- * OPTIONS SECTION
- */
-async function findOptions (interfaceName) {
-  const iface = state.interfaces.find(
-    iface => iface.interfaceName === interfaceName
-  )
-  const { data, error, pythonError } = await iface.worker.send({
-    type: 'options'
+async function port (parent, args, ctx, info) {
+  await findPorts()
+  const { id } = args
+  if (!id) throw new Error('Need an id.')
+  const port = state.ports.find(port => port.id === id)
+  return port
+}
+
+async function findOptions () {
+  // 1. Make sure, workers are updated.
+  await findWorkers()
+
+  // 2. Don't check more frequently than once per second.
+  // if (state.lastScan.options + 1000 > Date.now()) return null
+  // state.lastScan.options = Date.now()
+
+  const optionPromises = state.workers.map(async worker => {
+    const {
+      data,
+      error,
+      pythonError
+    } = await worker.workerProcess.pythonShell.send({ type: 'options' })
+    if (error) throw new Error(error)
+    if (pythonError) throw new Error(pythonError)
+    iface.options.push(...data)
   })
-  if (error) throw new Error(error)
-  if (pythonError) throw new Error(pythonError)
-  iface.options.push(...data)
+  await Promise.all(optionPromises)
 }
 
 async function options (parent, args, ctx, info) {
-  if (!parent) throw new Error('Parent needed.')
+  if (!parent) throw new Error('Need a parent.')
   const iface = state.interfaces.find(iface => iface.interfaceName === parent)
 
   // Try to find options if necessary

frontend/components/Characterization.js

@@ -8,9 +8,9 @@ class Characterization extends React.Component {
       <div>
         <h1>{name}</h1>
         <ProjectVersion data={projectVersion} />
-        {measurementRuns.map(measurementRun =>
-          <MeasurementRun key={measurementRun.id} data={measurementRun} />)
-        }
+        {measurementRuns.map(measurementRun => (
+          <MeasurementRun key={measurementRun.id} data={measurementRun} />
+        ))}
       </div>
     )
   }

frontend/components/CharacterizationForm.js

@@ -1,4 +1,4 @@
-import { Query, Mutation } from 'react-apollo';
+import { Query, Mutation } from 'react-apollo'
 import gql from 'graphql-tag'
 import { QUERY_PROJECTS } from './ProjectList'
 
@@ -21,7 +21,7 @@ const ADD_CHARACTERIZATION = gql`
 
 const QUERY_PROJECT_VERSIONS = gql`
   query QUERY_PROJECT_VERSIONS($projectId: ID!) {
-    projectVersions(where: {project: {id: $projectId}}) {
+    projectVersions(where: { project: { id: $projectId } }) {
       id
       name
     }
@@ -40,52 +40,87 @@ class CharacterziationForm extends React.Component {
     this.setState({ [event.target.name]: event.target.value })
   }
 
-  render() {
+  render () {
     return (
       <Mutation mutation={ADD_CHARACTERIZATION} variables={this.state}>
         {(addCharacterization, { data, error, loading }) => (
-          <form onSubmit={async event => {
-            event.preventDefault()
-            const { data } = await addCharacterization()
-            const { createCharacterization } = data
-            this.setState({ id: createCharacterization.id })
-          }}>
+          <form
+            onSubmit={async event => {
+              event.preventDefault()
+              const { data } = await addCharacterization()
+              const { createCharacterization } = data
+              this.setState({ id: createCharacterization.id })
+            }}
+          >
             <fieldset>
-              <label htmlFor="name">Characterization name</label>
-              <input type="text" name="name" id="name"
-                placeholder="Characterization name"
+              <label htmlFor='name'>Characterization name</label>
+              <input
+                type='text'
+                name='name'
+                id='name'
+                placeholder='Characterization name'
                 value={this.state.name}
                 onChange={this.toState}
               />
               <Query query={QUERY_PROJECTS}>
                 {({ data, error, loading }) => {
-                  if (error) return (<p>Error loading project: ${error.message}</p>)
-                  if (loading) return (<p>Loading data...</p>)
-                  if (!data || !data.projects.length) return (<p>No project found.</p>)
+                  if (error) { return <p>Error loading project: ${error.message}</p> }
+                  if (loading) return <p>Loading data...</p>
+                  if (!data || !data.projects.length) { return <p>No project found.</p> }
 
                   const { projects } = data
-                  if (!this.state.project && projects.length) this.setState({ project: projects[0].id })
+                  if (!this.state.project && projects.length) { this.setState({ project: projects[0].id }) }
                   return (
                     <>
-                      <label htmlFor="project">Project</label>
-                      <select name="project" id="project" onChange={this.toState}>
-                        {data.projects.map(project => <option key={project.id} value={project.id}>{project.name}</option>)}
+                      <label htmlFor='project'>Project</label>
+                      <select
+                        name='project'
+                        id='project'
+                        onChange={this.toState}
+                      >
+                        {data.projects.map(project => (
+                          <option key={project.id} value={project.id}>
+                            {project.name}
+                          </option>
+                        ))}
                       </select>
-                      <Query query={QUERY_PROJECT_VERSIONS} variables={{ projectId: this.state.project }}>
+                      <Query
+                        query={QUERY_PROJECT_VERSIONS}
+                        variables={{ projectId: this.state.project }}
+                      >
                         {({ data, error, loading }) => {
-                          if (error) return (<p>Error loading project version: ${error.message}</p>)
-                          if (loading) return (<p>Loading data...</p>)
-                          if (!data || !data.projectVersions.length) return (<p>No project version found.</p>)
+                          if (error) {
+                            return (
+                              <p>
+                                Error loading project version: ${error.message}
+                              </p>
+                            )
+                          }
+                          if (loading) return <p>Loading data...</p>
+                          if (!data || !data.projectVersions.length) { return <p>No project version found.</p> }
 
                           const { projectVersions } = data
-                          if (!this.state.projectVersion) this.setState({ projectVersion: projectVersions[0].id })
+                          if (!this.state.projectVersion) {
+                            this.setState({
+                              projectVersion: projectVersions[0].id
+                            })
+                          }
                           return (
                             <>
-                              <label htmlFor="projectVersion"></label>
-                              <select name="projectVersion" id="projectVersion" onChange={this.toState}>
-                                {data.projectVersions.map(projectVersion =>
-                                  <option key={projectVersion.id} value={projectVersion.id}>{projectVersion.name}</option>
-                                )}
+                              <label htmlFor='projectVersion' />
+                              <select
+                                name='projectVersion'
+                                id='projectVersion'
+                                onChange={this.toState}
+                              >
+                                {data.projectVersions.map(projectVersion => (
+                                  <option
+                                    key={projectVersion.id}
+                                    value={projectVersion.id}
+                                  >
+                                    {projectVersion.name}
+                                  </option>
+                                ))}
                               </select>
                             </>
                           )
@@ -95,7 +130,7 @@ class CharacterziationForm extends React.Component {
                   )
                 }}
               </Query>
-              <button type="submit">{data ? "Save" : "Add"}</button>
+              <button type='submit'>{data ? 'Save' : 'Add'}</button>
             </fieldset>
           </form>
         )}
@@ -104,4 +139,4 @@ class CharacterziationForm extends React.Component {
   }
 }
 
-export default CharacterziationForm
+export default CharacterziationForm

frontend/components/Comment.js

@@ -1,5 +1,3 @@
-const Comment = props => (
-  <div>This is a comment</div>
-)
+const Comment = props => <div>This is a comment</div>
 
 export default Comment

frontend/components/Connection.js

@@ -20,8 +20,18 @@ const StyledConnection = styled.div`
 `
 
 const CONNECTION_COMMAND = gql`
-  mutation CONNECTION_COMMAND($connectionId: ID!, $type: String!, $string: String!, $options: String) {
-    connectionCommand(connectionId: $connectionId, type: $type, string: $string, options: $options)
+  mutation CONNECTION_COMMAND(
+    $connectionId: ID!
+    $type: String!
+    $string: String!
+    $options: String
+  ) {
+    connectionCommand(
+      connectionId: $connectionId
+      type: $type
+      string: $string
+      options: $options
+    )
   }
 `
 
@@ -47,7 +57,7 @@ class Connection extends React.Component {
     this.setState({ [event.target.id]: event.target.value })
   }
 
-  render() {
+  render () {
     const { id, device, interfaceName } = this.props.data
     console.log(id, device, interfaceName)
     return (
@@ -59,28 +69,46 @@ class Connection extends React.Component {
           string: this.state.command
         }}
         refetchQueries={[{ query: INTERFACES_FULL }]}
-        fetchPolicy='no-cache'>
+        fetchPolicy='no-cache'
+      >
         {(connectionCommand, { data, error, loading }) => (
           <StyledConnection>
             <h1>Connection</h1>
             <fieldset>
               <label htmlFor='command'>Command</label>
-              <input type='text' value={this.state.command} onChange={this.changeInput} id='command' placeholder='Command' />
+              <input
+                type='text'
+                value={this.state.command}
+                onChange={this.changeInput}
+                id='command'
+                placeholder='Command'
+              />
             </fieldset>
-            <button type='submit' onClick={connectionCommand} disabled={loading}>Send</button>
-            <textarea id='response' value={data && data.connectionCommand} readOnly={true} />
-            <textarea id='error' value={error} readOnly={true} />
+            <button
+              type='submit'
+              onClick={connectionCommand}
+              disabled={loading}
+            >
+              Send
+            </button>
+            <textarea
+              id='response'
+              value={data && data.connectionCommand}
+              readOnly
+            />
+            <textarea id='error' value={error} readOnly />
             <Query query={CONNECTION_QUERY} variables={{ id }}>
               {({ data, error, loading }) => {
                 if (loading) return null
                 if (error) return null
                 console.log(data)
-                const { connection: { workerInfo } } = data
+                const {
+                  connection: { workerInfo }
+                } = data
                 return (
                   <>
                     <p>pid: {workerInfo.pid}</p>
                     <p>killed: {workerInfo.killed ? 'yes' : 'no'}</p>
-
                   </>
                 )
               }}

frontend/package-lock.json

@@ -4911,6 +4911,68 @@
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
     },
+    "prettier-standard": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/prettier-standard/-/prettier-standard-9.1.1.tgz",
+      "integrity": "sha512-d23Hbdf7tIJ5qeEPEv+7B9cGGczJBOyq188kiKGPk/lvlrM3J8umWC8rR9LIbWmuMzbl5iDSL7kG1/wZgh3EYg==",
+      "requires": {
+        "find-up": "^3.0.0",
+        "get-stdin": "^6.0.0",
+        "minimist": "^1.2.0",
+        "prettierx": "0.3.0",
+        "stream-mock": "1.2.0"
+      },
+      "dependencies": {
+        "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"
+          }
+        },
+        "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"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        },
+        "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=="
+        }
+      }
+    },
+    "prettierx": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/prettierx/-/prettierx-0.3.0.tgz",
+      "integrity": "sha512-cMtPQ1+mhWsMPAJycwUqVYQBL30TrVJnVz8K888WN67mpXMHAHGY53jLgFR2Pr3v3YE8Rz9kxZCB7S7vAfz1iA=="
+    },
     "private": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
@@ -5872,6 +5934,14 @@
         "xtend": "^4.0.0"
       }
     },
+    "stream-mock": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/stream-mock/-/stream-mock-1.2.0.tgz",
+      "integrity": "sha1-9otVI8Dhz+YZ6gnX0QlykPQFuWo=",
+      "requires": {
+        "babel-runtime": "^6.26.0"
+      }
+    },
     "stream-shift": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",

frontend/package.json

@@ -26,6 +26,7 @@
     "next-link": "^2.0.0",
     "next-with-apollo": "^3.4.0",
     "nprogress": "^0.2.0",
+    "prettier-standard": "^9.1.1",
     "react": "^16.8.6",
     "react-adopt": "^0.6.0",
     "react-apollo": "^2.5.4",