qcloud-iotexplorer-bluetooth-adapter-llsync - npm Package Compare versions

Comparing version 2.3.25 to 2.3.27

lib/base/LLSyncDeviceAdapterBase.js

@@ -1,2 +0,2 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LLSyncDeviceAdapterBase=void 0;var tslib_1=require("tslib"),qcloud_iotexplorer_appdev_sdk_1=require("qcloud-iotexplorer-appdev-sdk"),utils=tslib_1.__importStar(require("../libs")),constants=tslib_1.__importStar(require("../constants")),qcloud_iotexplorer_bluetooth_adapter_1=require("qcloud-iotexplorer-bluetooth-adapter"),qcloud_iotexplorer_common_libs_1=require("qcloud-iotexplorer-common-libs"),LLSyncProtocol_1=require("./LLSync/LLSyncProtocol"),libs_1=require("../libs"),_a=qcloud_iotexplorer_appdev_sdk_1.AppDevSdk.utils,genPromise=_a.genPromise,delay=_a.delay,envDetect=_a.envDetect,LLSyncDeviceAdapterBase=function(e){function t(t){var r=e.call(this,t)||this;return r.on("message",r.notifyMessage.bind(r)),r.on("disconnect",(function(){r.writeDataQueue.cancelAllTasks({code:10006,errCode:10006,errno:1509003,errMsg:"no connection",msg:"与蓝牙设备的连接已断开",cause:"LLSyncDeviceAdapter disconnect event"})})),r.writeDataQueue=new qcloud_iotexplorer_common_libs_1.CancelableQueue({autoStart:!0,handler:function(e){var t=e.businessData,n=e.isCancelled;return r.writeDataInternal({params:t,isCancelled:n})},onTaskSuccess:function(e){var t=e.businessData;return"function"==typeof t.onSuccess&&t.onSuccess()},onTaskError:function(e,t){var r=t.businessData;return"function"==typeof r.onError&&r.onError(e)}}),r.llsyncLogger=new qcloud_iotexplorer_common_libs_1.FlowLogger("ble.llsync"),r.llsyncLogger.externalContextGetter=function(){return{productId:r.productId,deviceName:r.deviceName,bleDeviceId:r.deviceId}},r.llsyncLogger.setErrorMsgMap(constants.ERROR_MESSAGES),r}return tslib_1.__extends(t,e),t.prototype.notifyMessage=function(e){var t=void 0===e?{}:e,r=t.type,n=t.data;if("unknown"!==r)return this.emit(r,{type:r,data:n})},t.prototype.handleBLEMessage=function(e){if(this.isEncrypted&&this.authorized&&!LLSyncProtocol_1.isHeartbeatResp(e)){var t=utils.decrypt(e.join(""),this.sessionKey).match(/[\da-f]{2}/gi);if(!t)return this.llsyncLogger.error("decryptLLEventFail","解密 LLEvent 失败",{payload:e.join(""),sessionKey:this.sessionKey}),{};e=t}var r=parseInt(e[0],16);return{type:constants.INDICATE_TYPE_MAP[r]||"unknown",data:e.slice(1)}},t.prototype.wait4EventResponse=function(e,t,r){var n=void 0===r?{}:r,i=n.timeout,o=n.timeoutCode,s=n.timeoutHandler,a=n.wrapSplitDataMode,c=n.shouldWrapSplitDataFn,u=void 0===c||c,l=n.afterBindEvent,d=n.logger;return tslib_1.__awaiter(this,void 0,void 0,(function(){var r,n,c,_,p,f,v,y=this;return tslib_1.__generator(this,(function(h){switch(h.label){case 0:r=genPromise(),n=!1,c=Array.isArray(e)?e:[e],_=null,p=function(){_&&c.forEach((function(e){y.off(e,_)}))},f=function(e){var i=e.data,o=tslib_1.__rest(e,["data"]);if(!n){n=!0,p();try{u?r.resolve(t(i,o)):r.resolve(t(e))}catch(e){r.reject(e)}}},_=u?utils.wrapEventHandler(f,a):f,c.forEach((function(e){y.on(e,_)})),h.label=1;case 1:return h.trys.push([1,5,,6]),"function"!=typeof l?[3,3]:[4,l()];case 2:h.sent(),h.label=3;case 3:return[4,Promise.race([r.promise,new Promise((function(t,r){i&&i>0&&setTimeout((function(){if(!n)if(y.llsyncLogger.debug("waitEventTimeout","等待事件 "+e+" 超时"),n=!0,y.off(e,_),"function"==typeof s)t(s());else{var i={code:o};d&&d.error(o,constants.ERROR_MESSAGES[o],i),r(i)}}),i)}))])];case 4:return[2,h.sent()];case 5:return v=h.sent(),p(),[2,Promise.reject(v)];case 6:return[2]}}))}))},t.prototype.writeAndWait4Response=function(e,t,r,n){var i=void 0===n?{}:n,o=i.timeout,s=i.timeoutCode,a=i.timeoutHandler,c=i.writeId,u=i.wrapSplitDataMode,l=i.shouldWrapSplitDataFn,d=void 0===l||l,_=i.logger;return tslib_1.__awaiter(this,void 0,void 0,(function(){var n=this;return tslib_1.__generator(this,(function(i){return[2,this.wait4EventResponse(t,r,{timeout:o,timeoutCode:s,timeoutHandler:a,wrapSplitDataMode:u,shouldWrapSplitDataFn:d,logger:_,afterBindEvent:function(){return n.writeData(e,{writeId:c}).catch((function(e){return Promise.reject(tslib_1.__assign({code:constants.BLE_WRITE_ERROR},e))}))}})]}))}))},t.prototype.writeMtuResult=function(e){var t="success"===e?0:65535,r=""+constants.DEVICE_INFO_WRITE_PREFIX[constants.WRITE_MTU_RESULT]+libs_1.U16ToHexString(t);this.write(r,{writeId:constants.DEVICE_INFO_WRITE_ID})},t.prototype.sliceData=function(e,t,r){var n=this.mtu;if(this.isEncrypted&&(n=libs_1.getMtuEncrypted(this.mtu)),!this.mtu||e.join("").length<=2*n)return[e.join("")];var i=e.slice(0,r===constants.GET_STATUS?2:1);return utils.sliceData(t,{mtu:n,head:i,mode:r})},t.prototype.writeData=function(e,t){var r=this;return void 0===t&&(t={}),new Promise((function(n,i){r.writeDataQueue.push(tslib_1.__assign({data:e,onSuccess:n,onError:i},t))}))},t.prototype.setMtu=function(e){return tslib_1.__awaiter(this,void 0,void 0,(function(){return tslib_1.__generator(this,(function(t){switch(t.label){case 0:return envDetect.isIOS?[2]:[4,this.llsyncLogger.flow("mtu.negotiate","协商 MTU = "+e+" ",{mtu:e}).wrap(this.setBLEMTU({deviceId:this.deviceId,mtu:e}))];case 1:return[2,t.sent()]}}))}))},t.prototype.writeDataInternal=function(e){var t=e.params,r=e.isCancelled;return tslib_1.__awaiter(this,void 0,void 0,(function(){var e,n,i,o,s,a,c,u,l,d,_;return tslib_1.__generator(this,(function(p){switch(p.label){case 0:e=t.data,n=t.writeId,i=t.waitGap,o=void 0===i?0:i,s=t.retryTime,a=void 0===s?5:s,Array.isArray(e)||(e=[e]),c=0,p.label=1;case 1:return c<e.length?(u=e[c],0!==c&&o>0?[4,delay(o)]:[3,3]):[3,11];case 2:p.sent(),p.label=3;case 3:l=a,p.label=4;case 4:if(r())return[2,Promise.reject({code:constants.WRITE_DATA_CANCEL_ERROR_CODE})];p.label=5;case 5:return p.trys.push([5,7,,9]),[4,this.write(u,{writeId:n})];case 6:return p.sent(),[3,10];case 7:if(d=p.sent(),l<=0)throw this.llsyncLogger.error("write.error","特征值写入失败",d),d;return this.llsyncLogger.warn("write.retry","特征值写入失败, 剩余重试次数 "+l),l--,_=o>0?o:100,[4,delay(Math.min(10*_*(a-l),constants.MAX_WRITE_DATA_WAIT_GAP))];case 8:return p.sent(),[3,9];case 9:if(l>0)return[3,4];p.label=10;case 10:return c++,[3,1];case 11:return[2]}}))}))},Object.defineProperty(t.prototype,"mtu",{get:function(){return this.nonPublicMtu},set:function(e){this.nonPublicMtu!==e&&this.llsyncLogger.info("mtu.change","分片最大长度更新为 "+e),this.nonPublicMtu=e},enumerable:!1,configurable:!0}),t}(qcloud_iotexplorer_bluetooth_adapter_1.DeviceAdapter);exports.LLSyncDeviceAdapterBase=LLSyncDeviceAdapterBase;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.LLSyncDeviceAdapterBase=void 0;var tslib_1=require("tslib"),qcloud_iotexplorer_appdev_sdk_1=require("qcloud-iotexplorer-appdev-sdk"),utils=tslib_1.__importStar(require("../libs")),constants=tslib_1.__importStar(require("../constants")),qcloud_iotexplorer_bluetooth_adapter_1=require("qcloud-iotexplorer-bluetooth-adapter"),qcloud_iotexplorer_common_libs_1=require("qcloud-iotexplorer-common-libs"),LLSyncProtocol_1=require("./LLSync/LLSyncProtocol"),libs_1=require("../libs"),_a=qcloud_iotexplorer_appdev_sdk_1.AppDevSdk.utils,genPromise=_a.genPromise,delay=_a.delay,envDetect=_a.envDetect,LLSyncDeviceAdapterBase=function(e){function t(t){var r=e.call(this,t)||this;return r.on("message",r.notifyMessage.bind(r)),r.on("disconnect",(function(){r.writeDataQueue.cancelAllTasks({code:10006,errCode:10006,errno:1509003,errMsg:"no connection",msg:"与蓝牙设备的连接已断开",cause:"LLSyncDeviceAdapter disconnect event"})})),r.writeDataQueue=new qcloud_iotexplorer_common_libs_1.CancelableQueue({autoStart:!0,handler:function(e){var t=e.businessData,n=e.isCancelled;return r.writeDataInternal({params:t,isCancelled:n})},onTaskSuccess:function(e){var t=e.businessData;return"function"==typeof t.onSuccess&&t.onSuccess()},onTaskError:function(e,t){var r=t.businessData;return"function"==typeof r.onError&&r.onError(e)}}),r.llsyncLogger=new qcloud_iotexplorer_common_libs_1.FlowLogger("ble.llsync"),r.llsyncLogger.externalContextGetter=function(){return{productId:r.productId,deviceName:r.deviceName,bleDeviceId:r.deviceId}},r.llsyncLogger.setErrorMsgMap(constants.ERROR_MESSAGES),r}return tslib_1.__extends(t,e),t.prototype.notifyMessage=function(e){var t=void 0===e?{}:e,r=t.type,n=t.data;if("unknown"!==r)return this.emit(r,{type:r,data:n})},t.prototype.handleBLEMessage=function(e){if(this.isEncrypted&&this.authorized&&!LLSyncProtocol_1.isHeartbeatResp(e)){var t=utils.decrypt(e.join(""),this.sessionKey).match(/[\da-f]{2}/gi);if(!t)return this.llsyncLogger.error("decryptLLEventFail","解密 LLEvent 失败",{payload:e.join(""),sessionKey:this.sessionKey}),{};e=t}var r=parseInt(e[0],16);return{type:constants.INDICATE_TYPE_MAP[r]||"unknown",data:e.slice(1)}},t.prototype.wait4EventResponse=function(e,t,r){var n=void 0===r?{}:r,i=n.timeout,o=n.timeoutCode,s=n.timeoutHandler,a=n.wrapSplitDataMode,c=n.shouldWrapSplitDataFn,u=void 0===c||c,l=n.afterBindEvent,d=n.logger;return tslib_1.__awaiter(this,void 0,void 0,(function(){var r,n,c,_,p,v,f,y=this;return tslib_1.__generator(this,(function(h){switch(h.label){case 0:r=genPromise(),n=!1,c=Array.isArray(e)?e:[e],_=null,p=function(){_&&(_=null,c.forEach((function(e){y.off(e,_)})))},v=function(e){var i=e.data,o=tslib_1.__rest(e,["data"]);if(!n){n=!0,p();try{u?r.resolve(t(i,o)):r.resolve(t(e))}catch(e){r.reject(e)}}},_=u?utils.wrapEventHandler(v,a):v,c.forEach((function(e){y.on(e,_)})),h.label=1;case 1:return h.trys.push([1,5,,6]),"function"!=typeof l?[3,3]:[4,l()];case 2:h.sent(),h.label=3;case 3:return[4,Promise.race([r.promise,new Promise((function(t,r){i&&i>0&&setTimeout((function(){if(!n)if(y.llsyncLogger.debug("waitEventTimeout","等待事件 "+e+" 超时"),n=!0,p(),"function"==typeof s)t(s());else{var i={code:o};d&&d.error(o,constants.ERROR_MESSAGES[o],i),r(i)}}),i)}))])];case 4:return[2,h.sent()];case 5:return f=h.sent(),p(),[2,Promise.reject(f)];case 6:return[2]}}))}))},t.prototype.writeAndWait4Response=function(e,t,r,n){var i=void 0===n?{}:n,o=i.timeout,s=i.timeoutCode,a=i.timeoutHandler,c=i.writeId,u=i.wrapSplitDataMode,l=i.shouldWrapSplitDataFn,d=void 0===l||l,_=i.logger;return tslib_1.__awaiter(this,void 0,void 0,(function(){var n=this;return tslib_1.__generator(this,(function(i){return[2,this.wait4EventResponse(t,r,{timeout:o,timeoutCode:s,timeoutHandler:a,wrapSplitDataMode:u,shouldWrapSplitDataFn:d,logger:_,afterBindEvent:function(){return n.writeData(e,{writeId:c}).catch((function(e){return Promise.reject(tslib_1.__assign({code:constants.BLE_WRITE_ERROR},e))}))}})]}))}))},t.prototype.writeMtuResult=function(e){var t="success"===e?0:65535,r=""+constants.DEVICE_INFO_WRITE_PREFIX[constants.WRITE_MTU_RESULT]+libs_1.U16ToHexString(t);this.write(r,{writeId:constants.DEVICE_INFO_WRITE_ID})},t.prototype.sliceData=function(e,t,r){var n=this.mtu;if(this.isEncrypted&&(n=libs_1.getMtuEncrypted(this.mtu)),!this.mtu||e.join("").length<=2*n)return[e.join("")];var i=e.slice(0,r===constants.GET_STATUS?2:1);return utils.sliceData(t,{mtu:n,head:i,mode:r})},t.prototype.writeData=function(e,t){var r=this;return void 0===t&&(t={}),new Promise((function(n,i){r.writeDataQueue.push(tslib_1.__assign({data:e,onSuccess:n,onError:i},t))}))},t.prototype.setMtu=function(e){return tslib_1.__awaiter(this,void 0,void 0,(function(){return tslib_1.__generator(this,(function(t){switch(t.label){case 0:return envDetect.isIOS?[2]:[4,this.llsyncLogger.flow("mtu.negotiate","协商 MTU = "+e+" ",{mtu:e}).wrap(this.setBLEMTU({deviceId:this.deviceId,mtu:e}))];case 1:return[2,t.sent()]}}))}))},t.prototype.writeDataInternal=function(e){var t=e.params,r=e.isCancelled;return tslib_1.__awaiter(this,void 0,void 0,(function(){var e,n,i,o,s,a,c,u,l,d,_;return tslib_1.__generator(this,(function(p){switch(p.label){case 0:e=t.data,n=t.writeId,i=t.waitGap,o=void 0===i?0:i,s=t.retryTime,a=void 0===s?5:s,Array.isArray(e)||(e=[e]),c=0,p.label=1;case 1:return c<e.length?(u=e[c],0!==c&&o>0?[4,delay(o)]:[3,3]):[3,11];case 2:p.sent(),p.label=3;case 3:l=a,p.label=4;case 4:if(r())return[2,Promise.reject({code:constants.WRITE_DATA_CANCEL_ERROR_CODE})];p.label=5;case 5:return p.trys.push([5,7,,9]),[4,this.write(u,{writeId:n})];case 6:return p.sent(),[3,10];case 7:if(d=p.sent(),l<=0)throw this.llsyncLogger.error("write.error","特征值写入失败",d),d;return this.llsyncLogger.warn("write.retry","特征值写入失败, 剩余重试次数 "+l),l--,_=o>0?o:100,[4,delay(Math.min(10*_*(a-l),constants.MAX_WRITE_DATA_WAIT_GAP))];case 8:return p.sent(),[3,9];case 9:if(l>0)return[3,4];p.label=10;case 10:return c++,[3,1];case 11:return[2]}}))}))},Object.defineProperty(t.prototype,"mtu",{get:function(){return this.nonPublicMtu},set:function(e){this.nonPublicMtu!==e&&this.llsyncLogger.info("mtu.change","分片最大长度更新为 "+e),this.nonPublicMtu=e},enumerable:!1,configurable:!0}),t}(qcloud_iotexplorer_bluetooth_adapter_1.DeviceAdapter);exports.LLSyncDeviceAdapterBase=LLSyncDeviceAdapterBase;
 //# sourceMappingURL=LLSyncDeviceAdapterBase.js.map

package.json

 {
   "name": "qcloud-iotexplorer-bluetooth-adapter-llsync",
-  "version": "2.3.25",
+  "version": "2.3.27",
   "description": "",
@@ -18,6 +18,6 @@ "main": "lib/index.js",
     "event-emitter-for-miniprogram": "^0.11.6",
-    "iotexplorer-ui-dev-config": "^1.8.6",
+    "iotexplorer-ui-dev-config": "^1.8.8",
     "qcloud-iotexplorer-appdev-sdk": "^2.3.13",
-    "qcloud-iotexplorer-bluetooth-adapter": "^0.12.21",
-    "qcloud-iotexplorer-common-libs": "^0.12.16",
+    "qcloud-iotexplorer-bluetooth-adapter": "^0.12.23",
+    "qcloud-iotexplorer-common-libs": "^0.12.18",
     "qcloud-iotexplorer-logger": "^0.0.11",
@@ -31,3 +31,3 @@ "shortid-for-miniprogram": "^2.2.15",
   },
-  "gitHead": "572dae28019e882a5527edc60cd2acb8cc61ac1f"
+  "gitHead": "0a942a41d7af740506ec232e56904d3e91481641"
 }

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

290646

Dependency changes

• Updatediotexplorer-ui-dev-config@^1.8.8

• Updatedqcloud-iotexplorer-bluetooth-adapter@^0.12.23

• Updatedqcloud-iotexplorer-common-libs@^0.12.18