qcloud-iotexplorer-appdev-plugin-wificonf-blecombo - npm Package Compare versions

Comparing version 1.1.5 to 1.1.6

CHANGELOG.md

 ### v1.0.2 (2021-07-05)
 - 更新文档，加入 demo 链接
+
+### v1.1.6 (2021-08-13)
+- 加入双路配网device adapter

lib/protocols/BleComboDualMode/BleComboDualModeDeviceAdapter.d.ts

@@ -18,6 +18,5 @@ import { DeviceFilterFunction } from 'qcloud-iotexplorer-bluetooth-adapter';
     _bleDeviceAdapter: LLSyncDualModeDeviceAdapter;
-    authorized: boolean;
     constructor(props: any);
     toString(): string;
-    get isConnected(): boolean;
+    get authorized(): boolean;
     authenticateConnection(params: any): Promise<never>;
@@ -24,0 +23,0 @@ bindDevice(data: any): Promise<string>;

lib/protocols/BleComboDualMode/BleComboDualModeDeviceAdapter.js

@@ -1,2 +0,2 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.BleComboDualModeDeviceAdapter=void 0;var tslib_1=require("tslib"),qcloud_iotexplorer_bluetooth_adapter_1=require("qcloud-iotexplorer-bluetooth-adapter"),BleComboLLSync_1=require("../BleComboLLSync"),qcloud_iotexplorer_bluetooth_adapter_llsync_1=require("qcloud-iotexplorer-bluetooth-adapter-llsync"),hex2str=qcloud_iotexplorer_bluetooth_adapter_llsync_1.utils.hex2str,REPORT_EVENT_TYPE=qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.REPORT_EVENT_TYPE,arrayBufferToHexStringArray=qcloud_iotexplorer_bluetooth_adapter_1.blueToothHelper.arrayBufferToHexStringArray,DUALMODE_SERVICEID="0000FFE8-65D0-4E20-B56A-E493541BA4E2",DUALMODE_SERVICEID16="0000FFE8-0000-1000-8000-00805F9B34FB",LLSyncDualModeDeviceAdapter=function(e){function t(){return null!==e&&e.apply(this,arguments)||this}return tslib_1.__extends(t,e),t.serviceId16=DUALMODE_SERVICEID16,t.serviceId=DUALMODE_SERVICEID,t}(qcloud_iotexplorer_bluetooth_adapter_llsync_1.LLSyncDeviceAdapter),BleComboDualModeDeviceAdapter=function(e){function t(t){var r=e.call(this,t)||this;return r._bleDeviceAdapter=new LLSyncDualModeDeviceAdapter(t),r.authorized=r._bleDeviceAdapter.authorized,["CONNECT_AUTH","DEVICE_INFO"].forEach((function(e){r.on(e,(function(){for(var t,o=[],i=0;i<arguments.length;i++)o[i]=arguments[i];console.info("emit connect_auth from dualmode adapter",o),(t=r._bleDeviceAdapter).emit.apply(t,tslib_1.__spread([e],o))}))})),r}return tslib_1.__extends(t,e),t.injectOptions=function(e){t.options=e,qcloud_iotexplorer_bluetooth_adapter_llsync_1.LLSyncDeviceAdapter.injectOptions(e)},t.prototype.toString=function(){return"[BleComboDualModeDeviceAdapter]"},Object.defineProperty(t.prototype,"isConnected",{get:function(){return this._bleDeviceAdapter.isConnected},enumerable:!1,configurable:!0}),t.prototype.authenticateConnection=function(e){return this._bleDeviceAdapter.authenticateConnection(e)},t.prototype.bindDevice=function(e){return this._bleDeviceAdapter.bindDevice(e)},t.prototype.unbindDevice=function(e){return this._bleDeviceAdapter.unbindDevice.call(this._bleDeviceAdapter,e)},t.prototype.controlDevice=function(e){return this._bleDeviceAdapter.connectDevice.call(this._bleDeviceAdapter,e)},t.prototype.init=function(){return this._bleDeviceAdapter.init()},t.serviceId16=DUALMODE_SERVICEID16,t.serviceId=DUALMODE_SERVICEID,t.deviceFilter=function(e,r){if(!e.advertisServiceUUIDs||!e.advertisServiceUUIDs.find((function(e){return e===t.serviceId16}))||!e.advertisData)return null;try{var o=Math.floor(10*Math.random())%10==1||!0,i=arrayBufferToHexStringArray(e.advertisData);o&&t.options.reporter.info(REPORT_EVENT_TYPE,{message:"收到广播",serviceId:t.serviceId,hexArr:i.join(",")});var n=parseInt(i[2],16)-(parseInt(i[2],16)>>2<<2),c=parseInt(i[2],16)>>4,l=r.productId&&r.deviceName?r.productId+"/"+r.deviceName:"",a=l?qcloud_iotexplorer_bluetooth_adapter_llsync_1.utils.get8ByteFromStr(""+l.replace("/","")):"",d=!!l,_="",s="",u="",p=qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_STATE_MAP[n],D=[qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_HAS_BINDED,qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_HAS_CONNECTED].indexOf(p)>-1;if(D)u=i.slice(3,11).join("").toLocaleLowerCase(),s=i.slice(11).join("").toLocaleLowerCase(),_=r.productId;else{var v=i.slice(3,9);e.name&&-1===e.name.indexOf("_")&&(e.name=e.name+"_"+v.slice(0,2).join("")),_=hex2str(i.slice(9))}o&&t.options.reporter.info(REPORT_EVENT_TYPE,{message:"解析广播",serviceId:t.serviceId,data:{bindState:p||"x",targetDeviceId:l,targetDeviceIdentify:a,deviceUserIdentify:s||"x",deviceProductId:_||"x",deviceIdentify:u||"x"}});var E=function(){var o=tslib_1.__assign(tslib_1.__assign({},e),{standard:!0,bindState:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_STATE_MAP[p],serviceId:t.serviceId,deviceName:r.deviceName||"",productId:_,extendInfo:{moduleVersion:c}});return console.log("---设备匹配成功---",o),o};return d&&D&&u===a?E():d||D?null:E()}catch(e){console.error("llsync device filter error",e),t.options.reporter.error(REPORT_EVENT_TYPE,{message:"协议广播出错",error:e})}},t}(BleComboLLSync_1.BleComboLLSyncDeviceAdapter);exports.BleComboDualModeDeviceAdapter=BleComboDualModeDeviceAdapter;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.BleComboDualModeDeviceAdapter=void 0;var tslib_1=require("tslib"),qcloud_iotexplorer_bluetooth_adapter_1=require("qcloud-iotexplorer-bluetooth-adapter"),BleComboLLSync_1=require("../BleComboLLSync"),qcloud_iotexplorer_bluetooth_adapter_llsync_1=require("qcloud-iotexplorer-bluetooth-adapter-llsync"),hex2str=qcloud_iotexplorer_bluetooth_adapter_llsync_1.utils.hex2str,REPORT_EVENT_TYPE=qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.REPORT_EVENT_TYPE,arrayBufferToHexStringArray=qcloud_iotexplorer_bluetooth_adapter_1.blueToothHelper.arrayBufferToHexStringArray,DUALMODE_SERVICEID="0000FFE8-65D0-4E20-B56A-E493541BA4E2",DUALMODE_SERVICEID16="0000FFE8-0000-1000-8000-00805F9B34FB",LLSyncDualModeDeviceAdapter=function(e){function t(){return null!==e&&e.apply(this,arguments)||this}return tslib_1.__extends(t,e),t.serviceId16=DUALMODE_SERVICEID16,t.serviceId=DUALMODE_SERVICEID,t}(qcloud_iotexplorer_bluetooth_adapter_llsync_1.LLSyncDeviceAdapter),BleComboDualModeDeviceAdapter=function(e){function t(t){var r=e.call(this,t)||this;return r._bleDeviceAdapter=new LLSyncDualModeDeviceAdapter(t),["CONNECT_AUTH","DEVICE_INFO","BIND_AUTH","UNBIND_AUTH"].forEach((function(e){r.on(e,(function(){for(var t,o=[],i=0;i<arguments.length;i++)o[i]=arguments[i];console.info("emit connect_auth from dualmode adapter",o),(t=r._bleDeviceAdapter).emit.apply(t,tslib_1.__spread([e],o))}))})),r}return tslib_1.__extends(t,e),t.injectOptions=function(e){t.options=e,qcloud_iotexplorer_bluetooth_adapter_llsync_1.LLSyncDeviceAdapter.injectOptions(e)},t.prototype.toString=function(){return"[BleComboDualModeDeviceAdapter]"},Object.defineProperty(t.prototype,"authorized",{get:function(){return this._bleDeviceAdapter.authorized},enumerable:!1,configurable:!0}),t.prototype.authenticateConnection=function(e){return this._bleDeviceAdapter.authenticateConnection(e)},t.prototype.bindDevice=function(e){return this._bleDeviceAdapter.bindDevice(e)},t.prototype.unbindDevice=function(e){return this._bleDeviceAdapter.unbindDevice.call(this._bleDeviceAdapter,e)},t.prototype.controlDevice=function(e){return this._bleDeviceAdapter.connectDevice.call(this._bleDeviceAdapter,e)},t.prototype.init=function(){return this._bleDeviceAdapter.init()},t.serviceId16=DUALMODE_SERVICEID16,t.serviceId=DUALMODE_SERVICEID,t.deviceFilter=function(e,r){if(!e.advertisServiceUUIDs||!e.advertisServiceUUIDs.find((function(e){return e===t.serviceId16}))||!e.advertisData)return null;try{var o=Math.floor(10*Math.random())%10==1||!0,i=arrayBufferToHexStringArray(e.advertisData);o&&t.options.reporter.info(REPORT_EVENT_TYPE,{message:"收到广播",serviceId:t.serviceId,hexArr:i.join(",")});var n=parseInt(i[2],16)-(parseInt(i[2],16)>>2<<2),c=parseInt(i[2],16)>>4,l=r.productId&&r.deviceName?r.productId+"/"+r.deviceName:"",a=l?qcloud_iotexplorer_bluetooth_adapter_llsync_1.utils.get8ByteFromStr(""+l.replace("/","")):"",d=!!l,_="",s="",u="",p=qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_STATE_MAP[n],D=[qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_HAS_BINDED,qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_HAS_CONNECTED].indexOf(p)>-1;if(D)u=i.slice(3,11).join("").toLocaleLowerCase(),s=i.slice(11).join("").toLocaleLowerCase(),_=r.productId;else{var v=i.slice(3,9);e.name&&-1===e.name.indexOf("_")&&(e.name=e.name+"_"+v.slice(0,2).join("")),_=hex2str(i.slice(9))}o&&t.options.reporter.info(REPORT_EVENT_TYPE,{message:"解析广播",serviceId:t.serviceId,data:{bindState:p||"x",targetDeviceId:l,targetDeviceIdentify:a,deviceUserIdentify:s||"x",deviceProductId:_||"x",deviceIdentify:u||"x"}});var E=function(){var o=tslib_1.__assign(tslib_1.__assign({},e),{standard:!0,bindState:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_STATE_MAP[p],serviceId:t.serviceId,deviceName:r.deviceName||"",productId:_,extendInfo:{moduleVersion:c}});return console.log("---设备匹配成功---",o),o};return d&&D&&u===a?E():d||D?null:E()}catch(e){console.error("llsync device filter error",e),t.options.reporter.error(REPORT_EVENT_TYPE,{message:"协议广播出错",error:e})}},t}(BleComboLLSync_1.BleComboLLSyncDeviceAdapter);exports.BleComboDualModeDeviceAdapter=BleComboDualModeDeviceAdapter;
 //# sourceMappingURL=BleComboDualModeDeviceAdapter.js.map

lib/protocols/BleComboLLSync/BleComboLLSyncDeviceAdapter.js

@@ -1,2 +0,2 @@
-"use strict";var _a;Object.defineProperty(exports,"__esModule",{value:!0}),exports.BleComboLLSyncDeviceAdapter=exports.LLSyncComboConfig=void 0;var tslib_1=require("tslib"),qcloud_iotexplorer_appdev_sdk_1=require("qcloud-iotexplorer-appdev-sdk"),qcloud_iotexplorer_bluetooth_adapter_1=require("qcloud-iotexplorer-bluetooth-adapter"),qcloud_iotexplorer_bluetooth_adapter_llsync_1=require("qcloud-iotexplorer-bluetooth-adapter-llsync"),hex2str=qcloud_iotexplorer_bluetooth_adapter_llsync_1.utils.hex2str,U16ToHexString=qcloud_iotexplorer_bluetooth_adapter_llsync_1.utils.U16ToHexString,U8ToHexString=qcloud_iotexplorer_bluetooth_adapter_llsync_1.utils.U8ToHexString,REPORT_EVENT_TYPE=qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.REPORT_EVENT_TYPE,arrayBufferToHexStringArray=qcloud_iotexplorer_bluetooth_adapter_1.blueToothHelper.arrayBufferToHexStringArray,byteUtil=qcloud_iotexplorer_appdev_sdk_1.AppDevSdk.utils.byteUtil;exports.LLSyncComboConfig={waitGetDeviceInfoTime:1e4,waitSetWiFiModeTime:1e4,waitSetWiFiInfoTime:1e4,waitSetWiFiConnectTime:2e4,waitSetWiFiTokenTime:1e4,waitDevLogInfoTime:1e4},exports.BleComboLLSyncDeviceAdapter=qcloud_iotexplorer_bluetooth_adapter_1.AdapterDeviceAdapter4Mp(((_a=function(t){function e(){var o=null!==t&&t.apply(this,arguments)||this;return o.reporter={info:function(t,_){void 0===t&&(t=""),void 0===_&&(_={});var r=_.message,n=void 0===r?"":r,i=tslib_1.__rest(_,["message"]),l=o,s=l.explorerDeviceId,a=l.deviceId,c=l.isConnected;e.options.reporter.info(qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.REPORT_EVENT_TYPE,{serviceId:e.serviceId,message:n||(t&&qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.ACTION_DESC[t]?t+"("+qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.ACTION_DESC[t]+")":t),timeCost:i.timeCost||0,action:t,data:tslib_1.__assign({deviceId:s,bleDeviceId:a,isConnected:c},i)})},error:function(t,_){void 0===t&&(t=""),void 0===_&&(_={});var r=_.error,n=tslib_1.__rest(_,["error"]),i=o,l=i.explorerDeviceId,s=i.deviceId,a=i.isConnected;r.code&&qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.ERROR_MESSAGES[r.code]&&(r.msg=qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.ERROR_MESSAGES[r.code]),e.options.reporter.error(qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.REPORT_EVENT_TYPE,{message:t&&qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.ERROR_MESSAGES[t]&&t+"("+qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.ERROR_MESSAGES[t]+"："+(r&&(r.message||r.errMsg||r.msg||r.code))+")",timeCost:n.timeCost||0,action:t,error:r,data:tslib_1.__assign(tslib_1.__assign({deviceId:l,bleDeviceId:s,isConnected:a},n),r)})}},o}return tslib_1.__extends(e,t),e.injectOptions=function(t){e.options=t},e.prototype.notifyMessage=function(t){var e=void 0===t?{}:t,o=e.type,_=e.data;if(console.log("start to notify message from 辅助配网:",{type:o,data:_}),"unknown"!==o)return console.log("check this in notifyMessage",this,{type:o,data:_}),this.emit(o,{type:o,data:_})},e.prototype.connectDevice=function(e){return tslib_1.__awaiter(this,void 0,void 0,(function(){return tslib_1.__generator(this,(function(o){switch(o.label){case 0:return[4,t.prototype.connectDevice.call(this,e)];case 1:return o.sent(),[4,this.afterConnectDevice()];case 2:return o.sent(),[2]}}))}))},e.prototype.afterConnectDevice=function(){return tslib_1.__awaiter(this,void 0,void 0,(function(){var t,e,o,_,r;return tslib_1.__generator(this,(function(n){switch(n.label){case 0:return[4,this.getDeviceInfo()];case 1:if(t=n.sent(),e=t.version,o=t.mtu,_=t.needSetMtu,r=t.deviceName,this.deviceName=r,this.bleVersion=e,this.mtu=o,this.reporter.info("CONNECT_DEVICE",{data:{version:e,mtu:o,needSetMtu:_,deviceName:r}}),!_)return[3,5];n.label=2;case 2:return n.trys.push([2,4,,5]),[4,this.setMtu(this.mtu)];case 3:return n.sent(),this.writeMtuResult("success"),[3,5];case 4:return n.sent(),this.writeMtuResult("fail"),[3,5];case 5:return[2,r]}}))}))},e.prototype.getDeviceInfo=function(){return this.writeAndWait4Response(qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_PREFIX[qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.GET_DEVICE_INFO],qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO,(function(t){if(!t.length)throw{code:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_INVALID};var e=parseInt(t.slice(2,3).join(""),16),o=parseInt(t.slice(3,5).join(""),16),_=!!(o>>15),r=8191&o,n=parseInt(t[5],16),i=hex2str(t.slice(6).join(""));if(n!==i.length)throw{code:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_INVALID};return{version:e,mtu:r,needSetMtu:_,deviceName:i}}),{timeout:exports.LLSyncComboConfig.waitGetDeviceInfoTime,timeoutCode:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.WAIT_GET_DEVICE_INFO_TIMEOUT,writeId:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_ID})},e.prototype.setWiFiMode=function(t){void 0===t&&(t=qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.STA_WIFI_MODE);var e=""+qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_PREFIX[qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_MODE]+U8ToHexString(qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.WIFI_MODE_MAP[t]);return this.writeAndWait4Response(e,qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_MODE_RESULT,(function(t){if(!t.length)throw{code:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_MODE_RESULT_INVALID};return!parseInt(t.slice(2,3).join(""),16)}),{timeout:exports.LLSyncComboConfig.waitSetWiFiModeTime,timeoutCode:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_MODE_RESULT_TIMEOUT,writeId:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_ID})},e.prototype.setWiFiInfo=function(t){var e=t.ssid,o=t.password,_=byteUtil.hexString2hexArray(byteUtil.byteArrayToHex(byteUtil.getBytesByString(e)))||[],r=byteUtil.hexString2hexArray(byteUtil.byteArrayToHex(byteUtil.getBytesByString(o)))||[];console.log("----data----",{ssid:e,password:o,ssidHexArray:_,passwordHexArray:r});var n=this.sliceData(tslib_1.__spread([qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_PREFIX[qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_INFO],U16ToHexString(_.length+r.length),U8ToHexString(_.length)],_,[U8ToHexString(r.length)],r),[tslib_1.__spread([U8ToHexString(_.length)],_),tslib_1.__spread([U8ToHexString(r.length)],r)],qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_INFO);return this.writeAndWait4Response(n,qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_INFO_RESULT,(function(t){if(!t.length)throw{code:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_INFO_RESULT_INVALID};return!parseInt(t.slice(2,3).join(""),16)}),{timeout:exports.LLSyncComboConfig.waitSetWiFiInfoTime,timeoutCode:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_INFO_RESULT_TIMEOUT,writeId:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_ID})},e.prototype.sendConnectWiFiAndGetWiFiConnectState=function(){var t=""+qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_PREFIX[qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_CONNECT];return this.writeAndWait4Response(t,qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_CONNECT_RESULT,(function(t){if(!t.length)throw{code:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_CONNECT_RESULT_INVALID};var e=parseInt(t.slice(3,4).join(""),16),o=parseInt(t.slice(5,6).join(""),16),_="";return o&&(_=hex2str(t.slice(6,6+o))),{connected:!e,ssid:_}}),{timeout:exports.LLSyncComboConfig.waitSetWiFiConnectTime,timeoutCode:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_CONNECT_RESULT_TIMEOUT,writeId:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_ID})},e.prototype.sendToken=function(t){var e=t.token,o=byteUtil.hexString2hexArray(byteUtil.byteArrayToHex(byteUtil.getBytesByString(e)));console.log("----data----",{token:e,tokenHexArray:o});var _=this.sliceData(tslib_1.__spread([qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_PREFIX[qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_TOKEN],U16ToHexString(o.length)],o),[o],qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_TOKEN);return this.writeAndWait4Response(_,qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_TOKEN_RESULT,(function(t){if(!t.length)throw{code:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_TOKEN_RESULT_INVALID};return!parseInt(t.slice(2,3).join(""),16)}),{timeout:exports.LLSyncComboConfig.waitSetWiFiTokenTime,timeoutCode:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_TOKEN_RESULT_TIMEOUT,writeId:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_ID})},e.prototype.getModuleLog=function(){var t=""+qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_PREFIX[qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.GET_DEV_LOG];return this.writeAndWait4Response(t,qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.GET_DEV_LOG_INFO,(function(t){if(!t.length)throw{code:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.GET_DEV_LOG_INFO_INVALID};var e=parseInt(t.slice(1,3).join(""),16);return{logStr:hex2str(t.slice(4,4+e))}}),{timeout:exports.LLSyncComboConfig.waitDevLogInfoTime,timeoutCode:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.GET_DEV_LOG_INFO_TIMEOUT,writeId:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_ID})},e}(qcloud_iotexplorer_bluetooth_adapter_llsync_1.LLSyncDeviceAdapterBase)).options={reporter:console},_a.serviceId16="0000FFF0-0000-1000-8000-00805F9B34FB",_a.serviceId="0000FFF0-65D0-4E20-B56A-E493541BA4E2",_a.deviceFilter=function(t){if(!t.advertisServiceUUIDs||!t.advertisServiceUUIDs.find((function(t){return t===_a.serviceId16}))||!t.advertisData)return null;try{var e=Math.floor(10*Math.random())%10==1||!0,o=arrayBufferToHexStringArray(t.advertisData);e&&_a.options.reporter.info(qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.REPORT_EVENT_TYPE,{message:"收到广播",serviceId:_a.serviceId,hexArr:o.join(",")});var _,r=parseInt(o[2],16)>>4,n=o.slice(3,9);return t.name&&-1===t.name.indexOf("_")&&(t.name=t.name+"_"+n.slice(0,2).join("")),_=hex2str(o.slice(9)),e&&_a.options.reporter.info(REPORT_EVENT_TYPE,{message:"解析广播",serviceId:_a.serviceId,data:{deviceProductId:_||"x"}}),tslib_1.__assign(tslib_1.__assign({},t),{standardBleCombo:!0,serviceId:_a.serviceId,deviceName:"",productId:_,extendInfo:{moduleVersion:r}})}catch(t){_a.options.reporter.error(REPORT_EVENT_TYPE,{message:"协议广播出错",error:t})}},_a));
+"use strict";var _a;Object.defineProperty(exports,"__esModule",{value:!0}),exports.BleComboLLSyncDeviceAdapter=exports.LLSyncComboConfig=void 0;var tslib_1=require("tslib"),qcloud_iotexplorer_appdev_sdk_1=require("qcloud-iotexplorer-appdev-sdk"),qcloud_iotexplorer_bluetooth_adapter_1=require("qcloud-iotexplorer-bluetooth-adapter"),qcloud_iotexplorer_bluetooth_adapter_llsync_1=require("qcloud-iotexplorer-bluetooth-adapter-llsync"),hex2str=qcloud_iotexplorer_bluetooth_adapter_llsync_1.utils.hex2str,U16ToHexString=qcloud_iotexplorer_bluetooth_adapter_llsync_1.utils.U16ToHexString,U8ToHexString=qcloud_iotexplorer_bluetooth_adapter_llsync_1.utils.U8ToHexString,REPORT_EVENT_TYPE=qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.REPORT_EVENT_TYPE,arrayBufferToHexStringArray=qcloud_iotexplorer_bluetooth_adapter_1.blueToothHelper.arrayBufferToHexStringArray,byteUtil=qcloud_iotexplorer_appdev_sdk_1.AppDevSdk.utils.byteUtil;exports.LLSyncComboConfig={waitGetDeviceInfoTime:1e4,waitSetWiFiModeTime:1e4,waitSetWiFiInfoTime:1e4,waitSetWiFiConnectTime:2e4,waitSetWiFiTokenTime:1e4,waitDevLogInfoTime:1e4},exports.BleComboLLSyncDeviceAdapter=qcloud_iotexplorer_bluetooth_adapter_1.AdapterDeviceAdapter4Mp(((_a=function(t){function e(){var o=null!==t&&t.apply(this,arguments)||this;return o.reporter={info:function(t,_){void 0===t&&(t=""),void 0===_&&(_={});var r=_.message,n=void 0===r?"":r,i=tslib_1.__rest(_,["message"]),l=o,s=l.explorerDeviceId,a=l.deviceId,c=l.isConnected;e.options.reporter.info(qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.REPORT_EVENT_TYPE,{serviceId:e.serviceId,message:n||(t&&qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.ACTION_DESC[t]?t+"("+qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.ACTION_DESC[t]+")":t),timeCost:i.timeCost||0,action:t,data:tslib_1.__assign({deviceId:s,bleDeviceId:a,isConnected:c},i)})},error:function(t,_){void 0===t&&(t=""),void 0===_&&(_={});var r=_.error,n=tslib_1.__rest(_,["error"]),i=o,l=i.explorerDeviceId,s=i.deviceId,a=i.isConnected;r.code&&qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.ERROR_MESSAGES[r.code]&&(r.msg=qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.ERROR_MESSAGES[r.code]),e.options.reporter.error(qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.REPORT_EVENT_TYPE,{message:t&&qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.ERROR_MESSAGES[t]&&t+"("+qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.ERROR_MESSAGES[t]+"："+(r&&(r.message||r.errMsg||r.msg||r.code))+")",timeCost:n.timeCost||0,action:t,error:r,data:tslib_1.__assign(tslib_1.__assign({deviceId:l,bleDeviceId:s,isConnected:a},n),r)})}},o}return tslib_1.__extends(e,t),e.injectOptions=function(t){e.options=t},e.prototype.notifyMessage=function(t){var e=void 0===t?{}:t,o=e.type,_=e.data;if("unknown"!==o)return console.log("check this in notifyMessage",this,{type:o,data:_}),this.emit(o,{type:o,data:_})},e.prototype.connectDevice=function(e){return tslib_1.__awaiter(this,void 0,void 0,(function(){return tslib_1.__generator(this,(function(o){switch(o.label){case 0:return[4,t.prototype.connectDevice.call(this,e)];case 1:return o.sent(),[4,this.afterConnectDevice()];case 2:return o.sent(),[2]}}))}))},e.prototype.afterConnectDevice=function(){return tslib_1.__awaiter(this,void 0,void 0,(function(){var t,e,o,_,r;return tslib_1.__generator(this,(function(n){switch(n.label){case 0:return[4,this.getDeviceInfo()];case 1:if(t=n.sent(),e=t.version,o=t.mtu,_=t.needSetMtu,r=t.deviceName,this.deviceName=r,this.bleVersion=e,this.mtu=o,this.reporter.info("CONNECT_DEVICE",{data:{version:e,mtu:o,needSetMtu:_,deviceName:r}}),!_)return[3,5];n.label=2;case 2:return n.trys.push([2,4,,5]),[4,this.setMtu(this.mtu)];case 3:return n.sent(),this.writeMtuResult("success"),[3,5];case 4:return n.sent(),this.writeMtuResult("fail"),[3,5];case 5:return[2,r]}}))}))},e.prototype.getDeviceInfo=function(){return this.writeAndWait4Response(qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_PREFIX[qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.GET_DEVICE_INFO],qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO,(function(t){if(!t.length)throw{code:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_INVALID};var e=parseInt(t.slice(2,3).join(""),16),o=parseInt(t.slice(3,5).join(""),16),_=!!(o>>15),r=8191&o,n=parseInt(t[5],16),i=hex2str(t.slice(6).join(""));if(n!==i.length)throw{code:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_INVALID};return{version:e,mtu:r,needSetMtu:_,deviceName:i}}),{timeout:exports.LLSyncComboConfig.waitGetDeviceInfoTime,timeoutCode:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.WAIT_GET_DEVICE_INFO_TIMEOUT,writeId:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_ID})},e.prototype.setWiFiMode=function(t){void 0===t&&(t=qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.STA_WIFI_MODE);var e=""+qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_PREFIX[qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_MODE]+U8ToHexString(qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.WIFI_MODE_MAP[t]);return this.writeAndWait4Response(e,qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_MODE_RESULT,(function(t){if(!t.length)throw{code:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_MODE_RESULT_INVALID};return!parseInt(t.slice(2,3).join(""),16)}),{timeout:exports.LLSyncComboConfig.waitSetWiFiModeTime,timeoutCode:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_MODE_RESULT_TIMEOUT,writeId:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_ID})},e.prototype.setWiFiInfo=function(t){var e=t.ssid,o=t.password,_=byteUtil.hexString2hexArray(byteUtil.byteArrayToHex(byteUtil.getBytesByString(e)))||[],r=byteUtil.hexString2hexArray(byteUtil.byteArrayToHex(byteUtil.getBytesByString(o)))||[];console.log("----data----",{ssid:e,password:o,ssidHexArray:_,passwordHexArray:r});var n=this.sliceData(tslib_1.__spread([qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_PREFIX[qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_INFO],U16ToHexString(_.length+r.length),U8ToHexString(_.length)],_,[U8ToHexString(r.length)],r),[tslib_1.__spread([U8ToHexString(_.length)],_),tslib_1.__spread([U8ToHexString(r.length)],r)],qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_INFO);return this.writeAndWait4Response(n,qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_INFO_RESULT,(function(t){if(!t.length)throw{code:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_INFO_RESULT_INVALID};return!parseInt(t.slice(2,3).join(""),16)}),{timeout:exports.LLSyncComboConfig.waitSetWiFiInfoTime,timeoutCode:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_INFO_RESULT_TIMEOUT,writeId:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_ID})},e.prototype.sendConnectWiFiAndGetWiFiConnectState=function(){var t=""+qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_PREFIX[qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_CONNECT];return this.writeAndWait4Response(t,qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_CONNECT_RESULT,(function(t){if(!t.length)throw{code:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_CONNECT_RESULT_INVALID};var e=parseInt(t.slice(3,4).join(""),16),o=parseInt(t.slice(5,6).join(""),16),_="";return o&&(_=hex2str(t.slice(6,6+o))),{connected:!e,ssid:_}}),{timeout:exports.LLSyncComboConfig.waitSetWiFiConnectTime,timeoutCode:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_CONNECT_RESULT_TIMEOUT,writeId:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_ID})},e.prototype.sendToken=function(t){var e=t.token,o=byteUtil.hexString2hexArray(byteUtil.byteArrayToHex(byteUtil.getBytesByString(e)));console.log("----data----",{token:e,tokenHexArray:o});var _=this.sliceData(tslib_1.__spread([qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_PREFIX[qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_TOKEN],U16ToHexString(o.length)],o),[o],qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_TOKEN);return this.writeAndWait4Response(_,qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_TOKEN_RESULT,(function(t){if(!t.length)throw{code:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_TOKEN_RESULT_INVALID};return!parseInt(t.slice(2,3).join(""),16)}),{timeout:exports.LLSyncComboConfig.waitSetWiFiTokenTime,timeoutCode:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.SET_WIFI_TOKEN_RESULT_TIMEOUT,writeId:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_ID})},e.prototype.getModuleLog=function(){var t=""+qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_PREFIX[qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.GET_DEV_LOG];return this.writeAndWait4Response(t,qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.GET_DEV_LOG_INFO,(function(t){if(!t.length)throw{code:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.GET_DEV_LOG_INFO_INVALID};var e=parseInt(t.slice(1,3).join(""),16);return{logStr:hex2str(t.slice(4,4+e))}}),{timeout:exports.LLSyncComboConfig.waitDevLogInfoTime,timeoutCode:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.GET_DEV_LOG_INFO_TIMEOUT,writeId:qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.DEVICE_INFO_WRITE_ID})},e}(qcloud_iotexplorer_bluetooth_adapter_llsync_1.LLSyncDeviceAdapterBase)).options={reporter:console},_a.serviceId16="0000FFF0-0000-1000-8000-00805F9B34FB",_a.serviceId="0000FFF0-65D0-4E20-B56A-E493541BA4E2",_a.deviceFilter=function(t){if(!t.advertisServiceUUIDs||!t.advertisServiceUUIDs.find((function(t){return t===_a.serviceId16}))||!t.advertisData)return null;try{var e=Math.floor(10*Math.random())%10==1||!0,o=arrayBufferToHexStringArray(t.advertisData);e&&_a.options.reporter.info(qcloud_iotexplorer_bluetooth_adapter_llsync_1.constants.REPORT_EVENT_TYPE,{message:"收到广播",serviceId:_a.serviceId,hexArr:o.join(",")});var _,r=parseInt(o[2],16)>>4,n=o.slice(3,9);return t.name&&-1===t.name.indexOf("_")&&(t.name=t.name+"_"+n.slice(0,2).join("")),_=hex2str(o.slice(9)),e&&_a.options.reporter.info(REPORT_EVENT_TYPE,{message:"解析广播",serviceId:_a.serviceId,data:{deviceProductId:_||"x"}}),tslib_1.__assign(tslib_1.__assign({},t),{standardBleCombo:!0,serviceId:_a.serviceId,deviceName:"",productId:_,extendInfo:{moduleVersion:r}})}catch(t){_a.options.reporter.error(REPORT_EVENT_TYPE,{message:"协议广播出错",error:t})}},_a));
 //# sourceMappingURL=BleComboLLSyncDeviceAdapter.js.map

package.json

 {
   "name": "qcloud-iotexplorer-appdev-plugin-wificonf-blecombo",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

64155

decreased by-0.09%

Lines of code

630

decreased by-0.32%

No dependency changes