noble search and connect

.electron-vue/webpack.renderer.config.js

@@ -19,7 +19,7 @@ const { VueLoaderPlugin } = require('vue-loader')
  * that provide pure *.vue files that need compiling
  * https://simulatedgreg.gitbooks.io/electron-vue/content/en/webpack-configurations.html#white-listing-externals
  */
-let whiteListedModules = ['vue']
+let whiteListedModules = ['vue','element-ui']
 
 let rendererConfig = {
   devtool: '#cheap-module-eval-source-map',

src/renderer/components/ble/rt_ble.vue

@@ -5,36 +5,104 @@
     <el-button @click="search">搜索</el-button>
     <el-button @click="connect">连接</el-button>
     <el-button @click="send">发送</el-button>
+    <br/>
+    <el-select v-model="choseDeviceIndex" placeholder="请选择">
+        <el-option
+                v-for="(item,index) in blueDeviceList"
+                :key="'select'+ index"
+                :label="item.localName"
+                :value="index">
+        </el-option>
+      </el-select>
+    <div >
+      <el-table
+              :data="characteristicsList"
+              style="width: 100%;padding-top: 50px">
+        <el-table-column
+                prop="id"
+                label="id"
+                width="150">
+        </el-table-column>
+        <el-table-column
+                prop="uuid"
+                label="seviceUUid"
+                width="90">
+        </el-table-column>
+        <el-table-column
+                prop="name"
+                label="name"
+                width="130">
+          <template slot-scope="scope">
+            <span>{{scope.row.name == null?'未知name':scope.row.name}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+                prop="name"
+                label="characteristicServiceUUid"
+                width="180">
+          <template slot-scope="scope">
+            <span>{{scope.row.characteristic.uuid}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+                prop="name"
+                label="properties"
+                width="180">
+          <template slot-scope="scope">
+            <span v-for="item in scope.row.characteristic.properties">{{item + '、'}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+                prop="name"
+                label="options"
+                width="180">
+          <template slot-scope="scope">
+            <el-button  :disabled ="!canConnect(scope.row.characteristic.properties)"  @click="connect(scope.row)">connect</el-button>
+          </template>
+        </el-table-column>
+
+      </el-table>
 
-    <div>
-      <el-radio v-for="(item,index) in blueDeviceList" v-model="choseBlueDeviceId" :key="'device'+index"
-                :label="item.id">
-        {{item.localName}}
-      </el-radio>
     </div>
 
 
+
+
   </div>
 
 </template>
 
 <script>
-  import {mapGetters} from "vuex"
 
+  import {mapGetters} from "vuex"
   export default {
     name: "rt_ble",
     data() {
       return {
-        choseBlueDeviceId: undefined
+        choseBlueDeviceId: undefined,
+        choseDeviceIndex:-1,
+        characteristicsList:[],
       }
     },
     created() {
       this.search()
     },
-
+    watch:{
+        blueDeviceList:function (val) {
+            if(val.length >0) {
+                console.log(val)
+                this.choseDeviceIndex = 0
+                this.characteristicsList = this.blueDeviceList[0].characteristics
+            }
+        },
+        choseDeviceIndex:function (val) {
+            this.characteristicsList = this.blueDeviceList[val].characteristics
+        }
+    },
     methods: {
       toIndex() {
         this.$router.push('/')
+        console.log(this.blueDeviceList)
       },
       search() {
         this.$socket.emit('ble', {cmd: 'scan'})
@@ -44,14 +112,41 @@
       },
       send() {
         this.$socket.emit('ble', {cmd: 'send', args: {msg: '0123'}})
+      },
+      canConnect(properties) {
+        let bRes = false
+        for(let j of properties) {
+          if (j=='write'||j=='read'||j=='notify') {
+              bRes = true
+          }
+          break;
+        }
+        return bRes
+
+      },
+      connect(row) {
+          let connectArgsObj = {
+              id:row.id,
+              server_uuid:row.uuid,
+              characteristic_uuid : row.characteristic.uuid
+          }
+          this.$socket.emit('ble', {cmd: 'connect', args: connectArgsObj})
       }
     },
     computed: {
       ...mapGetters([
         'blueDeviceList'
-      ])
+      ]),
+      computedDevice :{
+          get:function () {
+
+
+          },
+          set:function (val) {
+
+          }
+      }
     },
-    watch: {}
   }
 </script>
 

src/renderer/store/modules/socket.js

@@ -42,10 +42,8 @@ const mutations = {
         state.blueSendData = func.buf2hex(data)
     },
     SOCKET_blueDeviceList(state, resp) {
-            console.log(resp)
         if (resp.ok) {
             state.blueDeviceList = resp.data;
-
         } else {
             console.log(resp)
         }

static/server/app.js

@@ -178,7 +178,7 @@ io.sockets.on('connection', function (socket) {
             let resp_cb =  function(resp) {
                 io.sockets.emit('blueConnect', resp)
             }
-            nobleWrapper.connect(request.args.id, on_data_cb, resp_cb);
+            nobleWrapper.connect(request.args, on_data_cb, resp_cb);
         } else if (request.cmd === 'send') {
             nobleWrapper.write(request.args.msg, function(resp) {
                 io.sockets.emit('blueSend', resp)
@@ -200,7 +200,6 @@ socketServer.on('connection',(socket)=>{
             connectCount = count
             io.sockets.emit('connectCount', count);
 
-
         }
     });
     socket.on('data', (data)=>{

static/server/ble/nobleWrapper.js

@@ -5,17 +5,17 @@ let inRange = {};
 let blueDeviceList = []
 let blueCharacteristics = []
 
-const ECHO_SERVICE_UUID = 'ec00';
-const ECHO_CHARACTERISTIC_UUID = 'ec0e';
 
 let connectedCharacteristic = null;
 let on_data_callback = null;
 
 noble.on('discover', function (peripheral) {
+  if(peripheral.addressType != 'public') {
+     return;
+  }
   inRange[peripheral.id] = {
     peripheral: peripheral
   };
-
   var blueDevice = {
     'id': peripheral.id,
     'localName': peripheral.advertisement.localName,
@@ -25,9 +25,7 @@ noble.on('discover', function (peripheral) {
     'connectable': peripheral.connectable,
     'rssi': peripheral.rssi,
   }
-
   blueDeviceList.push(blueDevice)
-
   explore(peripheral)
 });
 
@@ -40,7 +38,6 @@ function explore(peripheral) {
           service.discoverCharacteristics([], function (error, characteristics) {
             for (let charIndex = 0; charIndex < characteristics.length; charIndex++) {
               let c = characteristics[charIndex];
-
               let info = {
                 id: peripheral.id,
                 uuid: service.uuid,
@@ -50,14 +47,12 @@ function explore(peripheral) {
                   'properties': c.properties
                 }
               }
-
               blueCharacteristics.push(info)
             }
           })
         })(services[serviceIndex])
 
       }
-
       setTimeout(function () {
         peripheral.disconnect()
       }, 1000)
@@ -69,26 +64,24 @@ function merge_scan_result() {
   for (let i = 0; i < blueDeviceList.length; i++) {
     let device = blueDeviceList[i]
     device.characteristics = []
-
     for (let j = 0; j < blueCharacteristics.length; j++) {
       let character = blueCharacteristics[j]
-      if (device.id === character.id) {
-        device.characteristics.push(character)
+      if (device.id == character.id) {
+          console.log(character)
+          device.characteristics.push(character)
       }
     }
   }
-
+ // console.log(blueDeviceList)
   return blueDeviceList
 }
 
-function connectAndSetUp(peripheral) {
-  peripheral.connect(error => {
+function connectAndSetUp(peripheral,server_uuid,characteristic_uuid) {
+    peripheral.connect(error => {
     console.log('Connected to', peripheral.id);
-
     // specify the services and characteristics to discover
-    const serviceUUIDs = [ECHO_SERVICE_UUID];
-    const characteristicUUIDs = [ECHO_CHARACTERISTIC_UUID];
-
+    const serviceUUIDs = [server_uuid];
+    const characteristicUUIDs = [characteristic_uuid];
     peripheral.discoverSomeServicesAndCharacteristics(
       serviceUUIDs,
       characteristicUUIDs,
@@ -118,29 +111,26 @@ function onServicesAndCharacteristicsDiscovered(error, services, characteristics
       console.log('Subscribed for echoCharacteristic notifications');
     }
   });
-
   connectedCharacteristic = echoCharacteristic
 }
 
 module.exports = {
   scan: function (resp_callback) {
-
     try {
       blueDeviceList = []
       blueCharacteristics = []
-
       setTimeout(() => {
         noble.stopScanning()
         resp_callback(resp.ok_resp(merge_scan_result()))
-      }, 2000);
+      }, 3000);
       noble.startScanning()
     } catch (e) {
       resp_callback(resp.fail_resp(e.message))
     }
   },
-  connect: function (id, on_data_cb, resp_callback) {
+  connect: function (args, on_data_cb, resp_callback) {
     on_data_callback = on_data_cb;
-    connectAndSetUp(inRange[id].peripheral)
+    connectAndSetUp(inRange[args.id].peripheral,args.server_uuid,args.characteristic_uuid)
   },
   write: function (msg, resp_callback) {
     try {