run qia only in process

Author: stevevista

.electron/webpack.renderer.config.js

@@ -87,7 +87,10 @@ const rendererConfig = {
             loader: 'babel-loader',
             options: {
               presets: ['@babel/react', '@babel/env'],
-              plugins: ['@babel/plugin-proposal-class-properties']
+              plugins: [
+                '@babel/plugin-proposal-class-properties',
+                ["import", { "libraryName": "antd", "libraryDirectory": "es", "style": true }]
+              ]
             }
           }
         ],

README.md

@@ -1 +1,17 @@
 ## Qualcomm interface node demo
+
+* integret electron with react/vue/d3
+* scripting Qualocmm QDART QLib/QSPR Interface
+
+## setup
+```
+cd qshell
+npm i
+npm run rebuild
+npm run dev
+```
+
+## build
+```
+npm run build
+```

package-lock.json

@@ -68,31 +68,20 @@
     "@babel/preset-env": "^7.1.0",
     "@babel/preset-react": "^7.0.0",
     "@babel/runtime": "^7.1.2",
-    "babel-minify-webpack-plugin": "^0.3.1",
     "babel-eslint": "^10.0.1",
     "babel-loader": "^8.0.4",
+    "babel-minify-webpack-plugin": "^0.3.1",
+    "babel-plugin-import": "^1.10.0",
     "chalk": "^2.4.1",
+    "clean-webpack-plugin": "^0.1.19",
+    "copy-webpack-plugin": "^4.5.2",
+    "css-loader": "^1.0.0",
     "del": "^3.0.0",
     "electron": "^2.0.11",
     "electron-builder": "^20.28.4",
     "electron-debug": "^2.0.0",
     "electron-rebuild": "^1.8.2",
     "eslint": "^5.7.0",
-    "less": "^3.8.1",
-    "webpack": "^4.20.2",
-    "webpack-dev-server": "^3.1.9",
-    "webpack-hot-middleware": "^2.24.3",
-    "file-loader": "^2.0.0",
-    "html-webpack-plugin": "^3.2.0",
-    "less-loader": "^4.1.0",
-    "mini-css-extract-plugin": "^0.4.3",
-    "multispinner": "^0.2.1",
-    "clean-webpack-plugin": "^0.1.19",
-    "copy-webpack-plugin": "^4.5.2",
-    "css-loader": "^1.0.0",
-    "node-loader": "^0.6.0",
-    "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "url-loader": "^1.1.1",
     "eslint-config-standard": "^12.0.0",
     "eslint-friendly-formatter": "^4.0.1",
     "eslint-loader": "^2.1.1",
@@ -102,8 +91,20 @@
     "eslint-plugin-promise": "^4.0.1",
     "eslint-plugin-react": "^7.11.1",
     "eslint-plugin-standard": "^4.0.0",
+    "file-loader": "^2.0.0",
+    "html-webpack-plugin": "^3.2.0",
+    "less": "^3.8.1",
+    "less-loader": "^4.1.0",
+    "mini-css-extract-plugin": "^0.4.3",
+    "multispinner": "^0.2.1",
+    "node-loader": "^0.6.0",
+    "optimize-css-assets-webpack-plugin": "^5.0.1",
+    "url-loader": "^1.1.1",
     "vue-loader": "^15.4.2",
     "vue-template-compiler": "^2.5.17",
+    "webpack": "^4.20.2",
+    "webpack-dev-server": "^3.1.9",
+    "webpack-hot-middleware": "^2.24.3",
     "yml-loader": "^2.1.0"
   },
   "dependencies": {

package.json

@@ -1,71 +1,8 @@
-import {Scheduler, XTTStructParser} from 'qia'
-import {dialog} from 'electron'
+import {XTTStructParser} from 'qia'
 import log from 'electron-log'
-// import cluster from 'cluster'
 import { startProcess } from '../processes'
 
-let win
-const runners = []
-const procs = []
-
-class Runner {
-  constructor (id) {
-    const object = new Scheduler(id)
-
-    object.on('TEST_START', (msg) => {
-      if (win) {
-        win.send('xttRunMsg', 'test_start', msg)
-      }
-    })
-
-    object.on('TEST_RESULT', (msg) => {
-      if (win) {
-        win.send('xttRunMsg', 'test_result', msg)
-      }
-    })
-
-    object.on('UNIT_START', (msg) => {
-      if (win) {
-        msg.xttPath = object.openedXttPath()
-        win.send('xttRunMsg', 'unit_start', msg)
-      }
-    })
-
-    object.on('UNIT_END', (msg) => {
-      if (win) {
-        win.send('xttRunMsg', 'unit_end', msg)
-      }
-    })
-
-    object.on('FOLDER_START', (msg) => {
-      if (win) {
-        win.send('xttRunMsg', 'folder_start', msg)
-      }
-    })
-
-    object.on('FOLDER_END', (msg) => {
-      if (win) {
-        win.send('xttRunMsg', 'folder_end', msg)
-      }
-    })
-
-    this.object = object
-  }
-
-  async runXTT (pathname) {
-    let testTree
-    try {
-      if (this.object.openedXttPath() === pathname) {
-        testTree = this.object.tree
-      } else {
-        testTree = await this.object.openXTT(pathname)
-      }
-      await testTree.runTree()
-    } catch (e) {
-      log.error(e)
-    }
-  }
-}
+const procs = {}
 
 function loadStrucure (pathname, evt) {
   return new Promise((resolve, reject) => {
@@ -99,74 +36,41 @@ function loadStrucure (pathname, evt) {
   })
 }
 
-try {
-  runners.push(new Runner(0))
-} catch (e) {
-  log.error(e)
-}
-
-const executeXTT = (evt, optinos, counts) => {
-  if (runners.length === 0) {
-    evt.sender.send('xttRunError', 'not-installed')
-    return
-  }
-
+const executeXTT = async (evt, xttPath, counts) => {
   if (typeof counts !== 'number') {
     counts = 1
   }
 
-  dialog.showOpenDialog({
-    properties: ['openFile'],
-    filters: [{name: 'XTT file', extensions: ['xtt']}]
-  }, async filePaths => {
-    if (!filePaths) {
-      return
-    }
-
-    win = evt.sender
-    if (optinos.includes('preload')) {
-      await loadStrucure(filePaths[0], evt)
-    }
+  await loadStrucure(xttPath, evt)
 
-    if (optinos.includes('process')) {
-      while (procs.length > 0) {
-        procs.pop()
+  for (let i = 0; i < counts; i++) {
+    const proc = startProcess('qspr', xttPath)
+    proc.on('message', data => {
+      if (data.type === 'run-result') {
+        evt.sender.send('xttRunMsg', i, data.runType, data.msg)
+      } else if (data.type === 'error') {
+        log.error(i, data.error)
       }
-      for (let i = 0; i < counts; i++) {
-        const proc = startProcess('qspr', filePaths[0], i)
-        proc.on('message', data => {
-          evt.sender.send('xttRunMsg', data.type, data.msg)
-        })
-        procs.push(proc)
-      }
-    } else {
-      runners[0].runXTT(filePaths[0])
-      if (counts > 1) {
-        for (let i = 1; i < counts; i++) {
-          if (runners.length < (i + 1)) {
-            runners.push(new Runner(i))
-          }
-          runners[i].runXTT(filePaths[0])
-        }
+    })
+    proc.on('exit', () => {
+      console.log('qia exit')
+      if (procs[i] === proc) {
+        delete procs[i]
       }
-    }
-
-    /*
-    if (style === 'multiple') {
-      runner.runXTT(filePaths[0])
-      runner1.runXTT(filePaths[0])
-    }
-    */
-  })
+    })
+    procs[i] = proc
+  }
 }
 
 const stopXTT = async (evt, optinos) => {
-  for (const r of runners) {
-    if (r.object && r.object.tree) {
-      await r.object.tree.stopTest()
-      console.log('stopped')
-    }
+  for (const k in procs) {
+    procs[k].send({type: 'stop'})
   }
+  setTimeout(() => {
+    for (const k in procs) {
+      procs[k].send({type: 'exit'})
+    }
+  }, 3000)
 }
 
 export default {

src/main/handlers/qspr.js

@@ -8,8 +8,6 @@ if (process.env.NODE_ENV !== 'development') {
   global.__static = require('path').join(__dirname, '/static').replace(/\\/g, '\\\\')
 }
 
-let proceesRoutnie = captureProcessRequest()
-
-if (!proceesRoutnie) {
+if (!captureProcessRequest()) {
   require('./start')
 }

src/main/index.js

@@ -6,7 +6,7 @@ function captureProcessRequest () {
       if (i + 1 < process.argv.length) {
         const name = process.argv[i + 1]
         const args = process.argv.slice(i + 2)
-        require(`./${name}`).default(args)
+        require(`./${name}`).default(...args)
         return true
       }
     }