hunter-open-sdk 2.0.0-beta.18 → 2.0.0-beta.19

package/lib/abilities/reboot/index.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.reboot = reboot;
 var _webWorker = _interopRequireDefault(require("web-worker"));
 var _url = _interopRequireDefault(require("url"));
-var _utils = require("../../utils/utils.path");
+var _utils = require("../../utils/utils.common");
+var _utils2 = require("../../utils/utils.path");
+var _utils3 = require("../../utils/utils.ability");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class Reboot {
   constructor() {
@@ -15,33 +17,24 @@ class Reboot {
   }
   worker = null;
   callback = null;
-  exec(params, callback) {
-    this.callback = callback;
+  exec(payload, callback) {
+    this.callback = typeof callback === 'function' ? callback : _utils3.defaultCallback;
     this.worker && this.worker.postMessage({
-      type: 'reboot',
-      params
+      payload
     });
   }
   initWorkerListener() {
     this.worker && this.worker.addEventListener('message', event => {
       const {
-        type,
-        data
+        payload
       } = event.data;
-      switch (type) {
-        case 'rebootSuccess':
-          this.callback(data);
-          break;
-        case 'rebootFail':
-          this.callback(data);
-          break;
-      }
+      this.callback(payload);
       this.callback = null;
     });
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
+      const workerPath = new _url.default.URL('file://' + (0, _utils2.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: "module"
       });
@@ -49,6 +42,7 @@ class Reboot {
   }
 }
 const entity = new Reboot();
-function reboot(paramStr, callback) {
-  entity.exec(paramStr, callback);
+function reboot(params, callback) {
+  const payload = (0, _utils.parsePayload)(params);
+  entity.exec(payload, callback);
 }

package/lib/abilities/reboot/worker.js

@@ -3,28 +3,17 @@
 const {
   initWorkerNodePath
 } = require("../../utils/utils.worker");
+
+// 先注册NodePath后才能正常使用node包，请勿挪动位置
 initWorkerNodePath();
 const {
-  rebootCallKit
+  abilityCallKit
 } = require("../../utils/utils.global");
 function onMainMessage(event) {
   const {
-    type,
-    params
+    payload
   } = event.data;
-  switch (type) {
-    case 'reboot':
-      {
-        if (!params) {
-          return {
-            code: -1,
-            message: '【reboot】方法缺少必要参数'
-          };
-        }
-        const res = rebootCallKit(params);
-        postMessage(res);
-        break;
-      }
-  }
+  const res = abilityCallKit('reboot', payload);
+  postMessage(res);
 }
 addEventListener('message', onMainMessage);

package/lib/abilities/shutdown/index.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.shutdown = shutdown;
 var _webWorker = _interopRequireDefault(require("web-worker"));
 var _url = _interopRequireDefault(require("url"));
-var _utils = require("../../utils/utils.path");
+var _utils = require("../../utils/utils.common");
+var _utils2 = require("../../utils/utils.path");
+var _utils3 = require("../../utils/utils.ability");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class Shutdown {
   constructor() {
@@ -15,33 +17,24 @@ class Shutdown {
   }
   worker = null;
   callback = null;
-  exec(params, callback) {
-    this.callback = callback;
+  exec(payload, callback) {
+    this.callback = typeof callback === 'function' ? callback : _utils3.defaultCallback;
     this.worker && this.worker.postMessage({
-      type: 'shutdown',
-      params
+      payload
     });
   }
   initWorkerListener() {
     this.worker && this.worker.addEventListener('message', event => {
       const {
-        type,
-        data
+        payload
       } = event.data;
-      switch (type) {
-        case 'shutdownSuccess':
-          this.callback(data);
-          break;
-        case 'shutdownFail':
-          this.callback(data);
-          break;
-      }
+      this.callback(payload);
       this.callback = null;
     });
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
+      const workerPath = new _url.default.URL('file://' + (0, _utils2.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: "module"
       });
@@ -49,6 +42,7 @@ class Shutdown {
   }
 }
 const entity = new Shutdown();
-function shutdown(paramStr, callback) {
-  entity.exec(paramStr, callback);
+function shutdown(params, callback) {
+  const payload = (0, _utils.parsePayload)(params);
+  entity.exec(payload, callback);
 }

package/lib/abilities/shutdown/worker.js

@@ -3,28 +3,17 @@
 const {
   initWorkerNodePath
 } = require("../../utils/utils.worker");
+
+// 先注册NodePath后才能正常使用node包，请勿挪动位置
 initWorkerNodePath();
 const {
-  shutdownCallKit
+  abilityCallKit
 } = require("../../utils/utils.global");
 function onMainMessage(event) {
   const {
-    type,
-    params
+    payload
   } = event.data;
-  switch (type) {
-    case 'shutdown':
-      {
-        if (!params) {
-          return {
-            code: -1,
-            message: '【shutdown】方法缺少必要参数'
-          };
-        }
-        const res = shutdownCallKit(params);
-        postMessage(res);
-        break;
-      }
-  }
+  const res = abilityCallKit('shutdown', payload);
+  postMessage(res);
 }
 addEventListener('message', onMainMessage);

package/lib/abilities/skip/index.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.skip = skip;
 var _webWorker = _interopRequireDefault(require("web-worker"));
 var _url = _interopRequireDefault(require("url"));
-var _utils = require("../../utils/utils.path");
+var _utils = require("../../utils/utils.common");
+var _utils2 = require("../../utils/utils.path");
+var _utils3 = require("../../utils/utils.ability");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class Skip {
   constructor() {
@@ -15,33 +17,24 @@ class Skip {
   }
   worker = null;
   callback = null;
-  exec(params, callback) {
-    this.callback = callback;
+  exec(payload, callback) {
+    this.callback = typeof callback === 'function' ? callback : _utils3.defaultCallback;
     this.worker && this.worker.postMessage({
-      type: 'skip',
-      params
+      payload
     });
   }
   initWorkerListener() {
     this.worker && this.worker.addEventListener('message', event => {
       const {
-        type,
-        data
+        payload
       } = event.data;
-      switch (type) {
-        case 'skipSuccess':
-          this.callback(data);
-          break;
-        case 'skipFail':
-          this.callback(data);
-          break;
-      }
+      this.callback(payload);
       this.callback = null;
     });
   }
   initWorker() {
     if (!this.worker) {
-      const workerPath = new _url.default.URL('file://' + (0, _utils.getCurrentEnvPath)(__dirname, './worker.js'));
+      const workerPath = new _url.default.URL('file://' + (0, _utils2.getCurrentEnvPath)(__dirname, './worker.js'));
       this.worker = new _webWorker.default(workerPath, {
         type: 'module'
       });
@@ -49,6 +42,7 @@ class Skip {
   }
 }
 const entity = new Skip();
-function skip(paramStr, callback) {
-  entity.exec(paramStr, callback);
+function skip(params, callback) {
+  const payload = (0, _utils.parsePayload)(params);
+  entity.exec(payload, callback);
 }

package/lib/abilities/skip/worker.js

@@ -3,28 +3,17 @@
 const {
   initWorkerNodePath
 } = require("../../utils/utils.worker");
+
+// 先注册NodePath后才能正常使用node包，请勿挪动位置
 initWorkerNodePath();
 const {
-  skipCallKit
+  abilityCallKit
 } = require("../../utils/utils.global");
 function onMainMessage(event) {
   const {
-    type,
-    params
+    payload
   } = event.data;
-  switch (type) {
-    case 'skip':
-      {
-        if (!params) {
-          return {
-            code: -1,
-            message: '【skip】方法缺少必要参数'
-          };
-        }
-        const res = skipCallKit(params);
-        postMessage(res);
-        break;
-      }
-  }
+  const res = abilityCallKit('skip', payload);
+  postMessage(res);
 }
 addEventListener('message', onMainMessage);

package/lib/index.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _registerEvent = require("./registerEvent");
-var _getAndroidSn = require("./getAndroidSn");
+var _getAndroidSn = require("./abilities/getAndroidSn");
+var _eventManager = require("./abilities/eventManager");
 var _getSaaSReport = require("./abilities/getSaaSReport");
 var _getGeneralReport = require("./abilities/getGeneralReport");
 var _erase = require("./abilities/erase");
@@ -13,6 +13,7 @@ var _activate = require("./abilities/activate");
 var _skip = require("./abilities/skip");
 var _reboot = require("./abilities/reboot");
 var _shutdown = require("./abilities/shutdown");
+var _installApp = require("./abilities/installApp");
 const Sentry = require('@sentry/browser');
 Sentry.init({
   dsn: 'https://8a5296c59083430fbac0756f56ddbf5d@sentry.zhuanzhuan.com/2300',
@@ -21,15 +22,16 @@ Sentry.init({
 console.log('Sentry initialized');
 // 初始化
 var _default = exports.default = {
-  registerEvent: _registerEvent.RegisterEvent,
-  unregisterEvent: _registerEvent.UnregisterEvent,
-  getAndroidSn: _getAndroidSn.GetAndroidSn,
-  unregisterAndroidSn: _getAndroidSn.UnregisterAndroidSn,
+  registerEvent: _eventManager.registerEvent,
+  unregisterEvent: _eventManager.unregisterEvent,
+  registerGetAndroidSn: _getAndroidSn.registerGetAndroidSn,
+  unregisterGetAndroidSn: _getAndroidSn.unregisterGetAndroidSn,
   getSaaSReport: _getSaaSReport.getSaaSReport,
   getGeneralReport: _getGeneralReport.getGeneralReport,
   erase: _erase.erase,
   activate: _activate.activate,
   skip: _skip.skip,
   reboot: _reboot.reboot,
-  shutdown: _shutdown.shutdown
+  shutdown: _shutdown.shutdown,
+  installApp: _installApp.installApp
 };

package/lib/resources/version.online

@@ -1 +1 @@
-0.3.2
+0.4.0

package/lib/utils/utils.ability.js

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.defaultCallback = defaultCallback;
+function defaultCallback(payload) {
+  console.log('命令执行结果', payload);
+}

package/lib/utils/utils.common.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.parsePayload = parsePayload;
 exports.sleep = void 0;
 const sleep = () => {
   return new Promise(resolve => {
@@ -11,4 +12,15 @@ const sleep = () => {
     }, 1000);
   });
 };
-exports.sleep = sleep;
+
+// 解析参数
+exports.sleep = sleep;
+function parsePayload(params) {
+  let oParams = typeof params === 'string' ? JSON.parse(params) : params;
+  const payloadParams = oParams.params ?? oParams;
+  const payloadBiz = oParams.biz ?? oParams;
+  return {
+    params: typeof payloadParams === 'object' ? JSON.stringify(payloadParams) : payloadParams,
+    biz: typeof payloadBiz === 'object' ? JSON.stringify(payloadBiz) : payloadBiz
+  };
+}