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

Comparing version 1.1.5 to 1.1.6

lib/utils/UdpServer.js

@@ -1,2 +0,2 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.UdpServer=void 0;var tslib_1=require("tslib"),qcloud_iotexplorer_appdev_sdk_1=require("qcloud-iotexplorer-appdev-sdk"),decodeUdpMsg=function(e){var r=new Uint8Array(e),s=String.fromCharCode.apply(null,r);return decodeURIComponent(escape(s))},UdpServer=function(){function e(e){var r=this,s=e.address,t=e.port,o=e.sdk,n=e.retryTime,d=void 0===n?5:n,i=e.retryGap,a=void 0===i?2e3:i,p=e.messageNoParse,c=void 0!==p&&p;Object.assign(this,{address:s,port:t,sdk:o,retryTime:d,retryGap:a,messageNoParse:c});var u=this.socket=wx.createUDPSocket();u.bind();var l=function(e){return r._onErrorHandler(e)},h=function(e){return r._onMessageHandler(e)};u.onError(l),u.onMessage(h),this.destroy=function(){r.socket.offError(l),r.socket.offMessage(h),r.socket.close()}}return e.prototype._onErrorHandler=function(e){"function"==typeof this._errorHandler?this._errorHandler(e):console.warn("UdpServer unhandled error",e)},e.prototype._onMessageHandler=function(e){try{if(this.messageNoParse){var r=decodeUdpMsg(e.message);return this.sdk&&this.sdk.reporter.info("udp-on-message",{data:{message:r}}),void("function"==typeof this._msgHandler?this._msgHandler(r):console.warn("UdpServer unhandled msg",r))}var s=JSON.parse(decodeUdpMsg(e.message));this.sdk&&this.sdk.reporter.info("udp-on-message",{data:{message:s}}),this._cmdTypeHandler(s)}catch(e){this.sdk&&this.sdk.reporter.info("udp-parse-message-error",{error:e})}},e.prototype._cmdTypeHandler=function(e){var r=this,s=function(e){"function"==typeof r._msgHandler?r._msgHandler(e):console.warn("UdpServer unhandled msg",e)};switch(console.log("------",e),+e.cmdType){case 2:"Current_Error"===e.deviceReply?this._onProgressErrorHandler({code:"BUSINESS_DEVICE_ERROR",detail:e}):"Previous_Error"===e.deviceReply?this.sdk&&this.sdk.reporter.info("softap-receive-prev-error",{data:{message:e}}):s(e);break;case 5:s(e)}},e.prototype._onProgressErrorHandler=function(e){"function"==typeof this._progressErrorHandler?this._progressErrorHandler(e):console.warn("UdpServer unhandled progress error",e)},e.prototype.onError=function(e){return this._errorHandler=e,this},e.prototype.onProgressError=function(e){return this._progressErrorHandler=e,this},e.prototype.onMessage=function(e){return this._msgHandler=e,this},e.prototype._send=function(e){"string"!=typeof e&&(e=JSON.stringify(e)),this.socket.send({address:this.address,port:this.port,message:e})},e.prototype.send=function(e,r){var s=this,t=(void 0===r?{}:r).validateResponse;return this.aborted=!1,new Promise((function(r,o){return tslib_1.__awaiter(s,void 0,void 0,(function(){var s,n,d,i,a=this;return tslib_1.__generator(this,(function(p){switch(p.label){case 0:p.trys.push([0,4,,5]),s=!0,n=0,this.onMessage((function(e){try{s=!1,(!t||"function"==typeof t&&!0===t(e))&&r(e)}catch(e){o(e)}})),(d=function(){n++,a.sdk&&a.sdk.reporter.info("udp-send-msg",{data:{msg:e,retryCount:n}}),a._send(e)})(),p.label=1;case 1:return!this.aborted&&s&&n<=this.retryTime?[4,qcloud_iotexplorer_appdev_sdk_1.AppDevSdk.utils.delay(this.retryGap)]:[3,3];case 2:return p.sent(),this.aborted?[2,o(null)]:s?(d(),[3,1]):[2];case 3:return this.aborted?[2,o(null)]:(o({code:"UDP_NOT_RESPONSE"}),[3,5]);case 4:return i=p.sent(),o(tslib_1.__assign({code:"UDP_SEND_MSG_FAIL"},i)),[3,5];case 5:return[2]}}))}))}))},e.prototype.abort=function(){this.aborted=!0},e}();exports.UdpServer=UdpServer;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.UdpServer=void 0;var tslib_1=require("tslib"),qcloud_iotexplorer_appdev_sdk_1=require("qcloud-iotexplorer-appdev-sdk"),decodeUdpMsg=function(e){var r=new Uint8Array(e),o=String.fromCharCode.apply(null,r);return decodeURIComponent(escape(o))},UdpServer=function(){function e(e){var r=this,o=e.address,t=e.port,s=e.sdk,n=e.retryTime,d=void 0===n?5:n,i=e.retryGap,a=void 0===i?2e3:i,p=e.messageNoParse,c=void 0!==p&&p;Object.assign(this,{address:o,port:t,sdk:s,retryTime:d,retryGap:a,messageNoParse:c});var u=this.socket=wx.createUDPSocket();u.bind();var l=function(e){return r._onErrorHandler(e)},_=function(e){return r._onMessageHandler(e)};u.onError(l),u.onMessage(_),this.destroy=function(){r.socket.offError(l),r.socket.offMessage(_),r.socket.close()}}return e.prototype._onErrorHandler=function(e){"function"==typeof this._errorHandler?this._errorHandler(e):console.warn("UdpServer unhandled error",e)},e.prototype._onMessageHandler=function(e){var r,o,t;try{if(this.messageNoParse){var s=decodeUdpMsg(e.message);return null===(r=this.sdk)||void 0===r||r.reporter.info("udp-on-message",{data:{message:s}}),void("function"==typeof this._msgHandler?this._msgHandler(s):console.warn("UdpServer unhandled msg",s))}var n=JSON.parse(decodeUdpMsg(e.message));null===(o=this.sdk)||void 0===o||o.reporter.info("udp-on-message",{data:{message:n}}),this._cmdTypeHandler(n)}catch(e){null===(t=this.sdk)||void 0===t||t.reporter.info("udp-parse-message-error",{error:e})}},e.prototype._cmdTypeHandler=function(e){var r,o=this,t=function(e){"function"==typeof o._msgHandler?o._msgHandler(e):console.warn("UdpServer unhandled msg",e)};switch(console.log("------",e),+e.cmdType){case 2:"Current_Error"===e.deviceReply?this._onProgressErrorHandler({code:"BUSINESS_DEVICE_ERROR",detail:e}):"Previous_Error"===e.deviceReply?null===(r=this.sdk)||void 0===r||r.reporter.info("softap-receive-prev-error",{data:{message:e}}):t(e);break;case 5:t(e)}},e.prototype._onProgressErrorHandler=function(e){"function"==typeof this._progressErrorHandler?this._progressErrorHandler(e):console.warn("UdpServer unhandled progress error",e)},e.prototype.onError=function(e){return this._errorHandler=e,this},e.prototype.onProgressError=function(e){return this._progressErrorHandler=e,this},e.prototype.onMessage=function(e){return this._msgHandler=e,this},e.prototype._send=function(e){"string"!=typeof e&&(e=JSON.stringify(e)),this.socket.send({address:this.address,port:this.port,message:e})},e.prototype.send=function(e,r){var o=this,t=(void 0===r?{}:r).validateResponse;return this.aborted=!1,new Promise((function(r,s){return tslib_1.__awaiter(o,void 0,void 0,(function(){var o,n,d,i,a=this;return tslib_1.__generator(this,(function(p){switch(p.label){case 0:p.trys.push([0,4,,5]),o=!0,n=0,this.onMessage((function(e){try{o=!1,(!t||"function"==typeof t&&!0===t(e))&&r(e)}catch(e){s(e)}})),(d=function(){var r;n++,null===(r=a.sdk)||void 0===r||r.reporter.info("udp-send-msg",{data:{msg:e,retryCount:n}}),a._send(e)})(),p.label=1;case 1:return!this.aborted&&o&&n<=this.retryTime?[4,qcloud_iotexplorer_appdev_sdk_1.AppDevSdk.utils.delay(this.retryGap)]:[3,3];case 2:return p.sent(),this.aborted?[2,s(null)]:o?(d(),[3,1]):[2];case 3:return this.aborted?[2,s(null)]:(s({code:"UDP_NOT_RESPONSE"}),[3,5]);case 4:return i=p.sent(),s(tslib_1.__assign({code:"UDP_SEND_MSG_FAIL"},i)),[3,5];case 5:return[2]}}))}))}))},e.prototype.abort=function(){this.aborted=!0},e}();exports.UdpServer=UdpServer;
 //# sourceMappingURL=UdpServer.js.map

lib/WifiConfProtocolBase/queryTokenStateAndBind.js

@@ -1,2 +0,2 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.queryTokenStateAndBind=void 0;var tslib_1=require("tslib"),qcloud_iotexplorer_appdev_sdk_1=require("qcloud-iotexplorer-appdev-sdk"),constants_1=require("../constants"),utils_1=require("../utils"),getBindState=function(e,t){return e.requestApi("AppGetDeviceBindTokenState",{Token:t},{isTokenApi:!0})};function queryTokenStateAndBind(e){var t=e.token,o=e.productId,r=e.deviceName,n=e.familyId,i=e.roomId,s=e.onProgress,d=e.sdk;return tslib_1.__awaiter(this,void 0,void 0,(function(){var e,_,a,u,c,S,p;return tslib_1.__generator(this,(function(l){switch(l.label){case 0:e="2.0",_=Date.now(),s({code:constants_1.WifiConfStepCode.BUSINESS_QUERY_TOKEN_STATE_START,detail:{data:{Token:t}}}),l.label=1;case 1:return l.trys.push([1,3,,4]),console.log("use pollRequest"),[4,utils_1.pollRequest({request:function(){return getBindState(d,t)},checkResp:function(e){return 2===e.State},reporter:d.reporter})];case 2:if(a=l.sent(),!o&&(u=a.ProductId,c=a.DeviceName,o=u,r=c,!u))throw{code:"BUSINESS_QUERY_PRODUCTID_NOT_FOUND"};return[3,4];case 3:throw(S=l.sent())&&"POLL_REQUEST_TIMEOUT"===S.code?{code:"BUSINESS_QUERY_BIND_TOKEN_TIMEOUT"}:{code:"BUSINESS_QUERY_BIND_TOKEN_FAIL",detail:S,msg:qcloud_iotexplorer_appdev_sdk_1.AppDevSdk.utils.tips.getErrorMsg(S),reqId:S&&S.reqId};case 4:s({code:constants_1.WifiConfStepCode.BUSINESS_QUERY_TOKEN_STATE_SUCCESS,detail:{protoVersion:e,timeCost:Date.now()-_}}),s({code:constants_1.WifiConfStepCode.BUSINESS_ADD_DEVICE_START,detail:{data:{Token:t,ProductId:o,DeviceName:r,FamilyId:n,RoomId:i},protoVersion:e}}),l.label=5;case 5:return l.trys.push([5,7,,8]),[4,utils_1.tryRequest((function(){return d.requestApi("AppTokenBindDeviceFamily",{FamilyId:n,ProductId:o,DeviceName:r,Token:t,RoomId:i},{isTokenApi:!0})}),{reporter:d.reporter})];case 6:return l.sent(),[3,8];case 7:return p=l.sent(),[2,Promise.reject({code:"BUSINESS_ADD_DEVICE_FAIL",detail:p,msg:qcloud_iotexplorer_appdev_sdk_1.AppDevSdk.utils.tips.getErrorMsg(p),reqId:p.reqId})];case 8:return s({code:constants_1.WifiConfStepCode.BUSINESS_ADD_DEVICE_SUCCESS}),[2]}}))}))}exports.queryTokenStateAndBind=queryTokenStateAndBind;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.queryTokenStateAndBind=void 0;var tslib_1=require("tslib"),qcloud_iotexplorer_appdev_sdk_1=require("qcloud-iotexplorer-appdev-sdk"),constants_1=require("../constants"),utils_1=require("../utils"),getBindState=function(e,t){return e.requestApi("AppGetDeviceBindTokenState",{Token:t},{isTokenApi:!0})};function queryTokenStateAndBind(e){var t=e.token,o=e.productId,r=e.deviceName,n=e.familyId,i=e.roomId,s=e.onProgress,d=e.sdk;return tslib_1.__awaiter(this,void 0,void 0,(function(){var e,_,a,u,c,S,p;return tslib_1.__generator(this,(function(l){switch(l.label){case 0:e="2.0",_=Date.now(),s({code:constants_1.WifiConfStepCode.BUSINESS_QUERY_TOKEN_STATE_START,detail:{data:{Token:t}}}),l.label=1;case 1:return l.trys.push([1,3,,4]),console.log("use pollRequest"),[4,utils_1.pollRequest({request:function(){return getBindState(d,t)},checkResp:function(e){return 2===e.State},reporter:d.reporter})];case 2:if(a=l.sent(),!o&&(u=a.ProductId,c=a.DeviceName,o=u,r=c,!u))throw{code:"BUSINESS_QUERY_PRODUCTID_NOT_FOUND"};return[3,4];case 3:throw(S=l.sent())&&"POLL_REQUEST_TIMEOUT"===S.code?{code:"BUSINESS_QUERY_BIND_TOKEN_TIMEOUT"}:{code:"BUSINESS_QUERY_BIND_TOKEN_FAIL",detail:S,msg:qcloud_iotexplorer_appdev_sdk_1.AppDevSdk.utils.tips.getErrorMsg(S),reqId:null==S?void 0:S.reqId};case 4:s({code:constants_1.WifiConfStepCode.BUSINESS_QUERY_TOKEN_STATE_SUCCESS,detail:{protoVersion:e,timeCost:Date.now()-_}}),s({code:constants_1.WifiConfStepCode.BUSINESS_ADD_DEVICE_START,detail:{data:{Token:t,ProductId:o,DeviceName:r,FamilyId:n,RoomId:i},protoVersion:e}}),l.label=5;case 5:return l.trys.push([5,7,,8]),[4,utils_1.tryRequest((function(){return d.requestApi("AppTokenBindDeviceFamily",{FamilyId:n,ProductId:o,DeviceName:r,Token:t,RoomId:i},{isTokenApi:!0})}),{reporter:d.reporter})];case 6:return l.sent(),[3,8];case 7:return p=l.sent(),[2,Promise.reject({code:"BUSINESS_ADD_DEVICE_FAIL",detail:p,msg:qcloud_iotexplorer_appdev_sdk_1.AppDevSdk.utils.tips.getErrorMsg(p),reqId:p.reqId})];case 8:return s({code:constants_1.WifiConfStepCode.BUSINESS_ADD_DEVICE_SUCCESS}),[2]}}))}))}exports.queryTokenStateAndBind=queryTokenStateAndBind;
 //# sourceMappingURL=queryTokenStateAndBind.js.map

package.json

 {
   "name": "qcloud-iotexplorer-appdev-plugin-wificonf-core",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "",
@@ -16,6 +16,6 @@ "main": "lib/index.js",
   "dependencies": {
-    "qcloud-iotexplorer-appdev-sdk": "^1.1.5",
+    "qcloud-iotexplorer-appdev-sdk": "^1.1.6",
     "tslib": "^2.0.1"
   },
-  "gitHead": "76db9140b54f5ae549b62016598b99a8460aff2e"
+  "gitHead": "5592538962556310e5455375487b9cca2bf7d81c"
 }

No alert changes

Improved metrics

Total package byte prevSize

88692

increased by0.13%

Dependency changes

• Updatedqcloud-iotexplorer-appdev-sdk@^1.1.6