@ray-js/ray-ipc-player 2.0.11 → 2.0.13

package/lib/index.js

@@ -5,6 +5,8 @@ import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/es.promise.js";
 import "core-js/modules/es.array.concat.js";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+
+/* eslint-disable no-unneeded-ternary */
 import React, { useEffect, useRef, useCallback } from 'react';
 import { useImmer } from 'use-immer';
 import { IpcPlayer, View, CoverView } from '@ray-js/components';
@@ -13,7 +15,7 @@ import { usePageEvent } from 'ray';
 import locals from './i18n';
 import Styles from './index.module.less';
 import { IpcFailCode } from './constant';
-import { putDpData } from './utils';
+import { putDpData, getIsConnected, getIsOnPreview } from './utils';
 
 var Player = function (props) {
   var _props$updateLayout = props.updateLayout,
@@ -83,24 +85,33 @@ var Player = function (props) {
 
   var muteRef = useRef(defaultMute); // 静音
 
-  usePageEvent('onShow', useCallback(function () {
-    // console.log('show');
-    if (ipcCtx.current && playState.connectState) {
-      startPreview('');
-    } else if (ipcCtx.current) {
-      retry();
-    }
-  }, [playState.connectState, privateState]));
-  usePageEvent('onHide', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+  usePageEvent('onShow', useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) {
         switch (_context.prev = _context.next) {
+          case 0:
+            // 视图准备就绪
+            if (playState.initLy && ipcCtx.current) {
+              retry();
+            }
+
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  })), [playState.connectState, privateState, playState.initLy]));
+  usePageEvent('onHide', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    return _regeneratorRuntime.wrap(function (_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
           case 0:
             // console.log('hide');
             setPlayState(function (d) {
               d.loadingState = true;
             });
-            _context.next = 3;
+            _context2.next = 3;
             return getCurMute();
 
           case 3:
@@ -108,10 +119,10 @@ var Player = function (props) {
 
           case 4:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
       }
-    }, _callee);
+    }, _callee2);
   })));
   useEffect(function () {
     onlineStatus && createIpcCtx(devId);
@@ -146,46 +157,47 @@ var Player = function (props) {
   }, [onlineStatus, playState.initLy, privateState]); // 重试
 
   var _retry = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(connectState) {
-      return _regeneratorRuntime.wrap(function (_context2) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      var connectState, isOnPreview;
+      return _regeneratorRuntime.wrap(function (_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
+              _context3.next = 2;
+              return getIsConnected(ipcCtx.current);
+
+            case 2:
+              connectState = _context3.sent;
+              _context3.next = 5;
+              return getIsOnPreview(ipcCtx.current);
+
+            case 5:
+              isOnPreview = _context3.sent;
               setPlayState(function (d) {
-                d.connectState = false;
+                d.connectState = connectState ? true : false;
                 d.errorMsg = '';
                 d.errorState = false;
-                d.loadingState = true;
-              });
-              _context2.t0 = connectState;
-
-              if (!_context2.t0) {
-                _context2.next = 5;
-                break;
-              }
-
-              _context2.next = 5;
-              return disconnect();
+                d.loadingState = isOnPreview ? false : true;
+              }); // !prePlayRef.current && connectState && (await disconnect());
 
-            case 5:
               ipcCtx.current && createConnect();
 
-            case 6:
+            case 8:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2);
+      }, _callee3);
     }));
 
     return function () {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
 
   var retry = useCallback(function () {
     // console.log('retry:', muteRef.current);
-    !privateState && _retry(playState.connectState);
+    !privateState && _retry();
   }, [playState.connectState, privateState]); // 创建ipc实例
 
   var createIpcCtx = function (id) {
@@ -201,42 +213,57 @@ var Player = function (props) {
   }; // 建立连接
 
 
-  var createConnect = function (params) {
-    var _ipcCtx$current;
+  var createConnect = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(params) {
+      var _ipcCtx$current;
 
-    // console.log('建立连接:', devId);
-    setPlayState(function (d) {
-      d.loadingState = true;
-    });
-    (_ipcCtx$current = ipcCtx.current) === null || _ipcCtx$current === void 0 ? void 0 : _ipcCtx$current.connect({
-      success: function success() {
-        // console.log('建立连接成功:', devId);
-        setPlayState(function (d) {
-          d.connectState = true;
-          d.errorState = false;
-          d.errorMsg = '';
-        });
-        onChangeStreamStatus && onChangeStreamStatus(1001);
-        startPreview(params);
-      },
-      fail: function fail() {
-        // console.log('建立连接失败:', devId);
-        setPlayState(function (d) {
-          d.connectState = false;
-          d.errorState = true;
-          d.errorMsg = locals.getLang('ipc_player_connect_fail');
-          d.loadingState = false;
-        });
-        onChangeStreamStatus && onChangeStreamStatus(-1001);
-      }
-    });
-  }; // 视图层准备就绪，开始建立连接
+      return _regeneratorRuntime.wrap(function (_context4) {
+        while (1) {
+          switch (_context4.prev = _context4.next) {
+            case 0:
+              // console.log('建立连接前:', devId, Date.now());
+              (_ipcCtx$current = ipcCtx.current) === null || _ipcCtx$current === void 0 ? void 0 : _ipcCtx$current.connect({
+                success: function success() {
+                  // console.log('建立连接成功:', devId, Date.now());
+                  setPlayState(function (d) {
+                    d.connectState = true;
+                    d.errorState = false;
+                    d.errorMsg = '';
+                  });
+                  onChangeStreamStatus && onChangeStreamStatus(1001);
+                  startPreview(params);
+                },
+                fail: function fail() {
+                  // console.error('建立连接失败---------:', e, devId, Date.now());
+                  setPlayState(function (d) {
+                    d.connectState = false;
+                    d.errorState = true;
+                    d.errorMsg = locals.getLang('ipc_player_connect_fail');
+                    d.loadingState = false;
+                  });
+                  onChangeStreamStatus && onChangeStreamStatus(-1001);
+                }
+              });
+
+            case 1:
+            case "end":
+              return _context4.stop();
+          }
+        }
+      }, _callee4);
+    }));
+
+    return function () {
+      return _ref4.apply(this, arguments);
+    };
+  }(); // 视图层准备就绪，开始建立连接
 
 
   // 开启预览
   var startPreview = function (params) {
     var _ipcCtx$current2;
 
+    // console.log('开启预览前');
     (_ipcCtx$current2 = ipcCtx.current) === null || _ipcCtx$current2 === void 0 ? void 0 : _ipcCtx$current2.startPreview({
       success: function success() {
         // console.log('开启预览：', devId);
@@ -249,7 +276,7 @@ var Player = function (props) {
         onChangeStreamStatus && onChangeStreamStatus(1002);
       },
       fail: function fail() {
-        // console.log('开启失败：', devId);
+        // console.error('开启失败：', devId);
         setPlayState(function (d) {
           d.errorState = true;
           d.loadingState = false;
@@ -340,6 +367,7 @@ var Player = function (props) {
     return new Promise(function (resolve, reject) {
       var _ipcCtx$current6;
 
+      // console.log('断开连接前');
       (_ipcCtx$current6 = ipcCtx.current) === null || _ipcCtx$current6 === void 0 ? void 0 : _ipcCtx$current6.disconnect({
         success: function success(res) {
           // console.log('断开连接成功：', devId);
@@ -350,7 +378,7 @@ var Player = function (props) {
           onChangeStreamStatus && onChangeStreamStatus(1009);
         },
         fail: function fail(e) {
-          // console.log('断开连接失败：', devId);
+          // console.error('断开连接失败：', devId);
           reject(e);
           onChangeStreamStatus && onChangeStreamStatus(-1009);
         }
@@ -365,26 +393,26 @@ var Player = function (props) {
 
 
   var handleReWakeCamera = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-      return _regeneratorRuntime.wrap(function (_context3) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+      return _regeneratorRuntime.wrap(function (_context5) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
-              _context3.next = 2;
+              _context5.next = 2;
               return putDpData({
                 105: false
               }, devId);
 
             case 2:
             case "end":
-              return _context3.stop();
+              return _context5.stop();
           }
         }
-      }, _callee3);
+      }, _callee5);
     }));
 
     return function () {
-      return _ref3.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 

package/lib/utils.d.ts

@@ -1 +1,13 @@
 export declare const putDpData: (dpIds: Record<number, boolean>, deviceId?: string) => Promise<unknown>;
+/**
+ * 获取当前是否Connected （p2p连接状态）
+ * @param ipcCtx
+ * @returns
+ */
+export declare const getIsConnected: (ipcCtx: any) => Promise<unknown>;
+/**
+ * 获取当前是否已经在拉流状态
+ * @param ipcCtx
+ * @returns
+ */
+export declare const getIsOnPreview: (ipcCtx: any) => Promise<unknown>;

package/lib/utils.js

@@ -16,4 +16,52 @@ export var putDpData = function (dpIds, deviceId) {
       }
     });
   });
+};
+/**
+ * 获取当前是否Connected （p2p连接状态）
+ * @param ipcCtx 
+ * @returns 
+ */
+
+export var getIsConnected = function (ipcCtx) {
+  return new Promise(function (resolve) {
+    if (typeof (ipcCtx === null || ipcCtx === void 0 ? void 0 : ipcCtx.isConnected) === 'function') {
+      ipcCtx === null || ipcCtx === void 0 ? void 0 : ipcCtx.isConnected({
+        success: function success(res) {
+          // console.log(res, 'getIsConnected---');
+          resolve(res);
+        },
+        fail: function fail() {
+          // console.error(e, 'getIsConnected---');
+          resolve(false);
+        }
+      });
+    } else {
+      resolve(false);
+    }
+  });
+};
+/**
+ * 获取当前是否已经在拉流状态
+ * @param ipcCtx 
+ * @returns 
+ */
+
+export var getIsOnPreview = function (ipcCtx) {
+  return new Promise(function (resolve) {
+    if (typeof (ipcCtx === null || ipcCtx === void 0 ? void 0 : ipcCtx.isOnPreview) === 'function') {
+      ipcCtx === null || ipcCtx === void 0 ? void 0 : ipcCtx.isOnPreview({
+        success: function success(res) {
+          // console.log(res, 'getIsOnPreview---');
+          resolve(res);
+        },
+        fail: function fail() {
+          // console.error(e, 'getIsOnPreview---');
+          resolve(false);
+        }
+      });
+    } else {
+      resolve(false);
+    }
+  });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ray-ipc-player",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "description": "ray小程序播放器",
   "keywords": [
     "tuya-miniapp",
@@ -25,13 +25,13 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@ray-js/ray": "latest",
     "@ray-js/panel-sdk": "latest",
     "immer": "^9.0.15",
     "use-immer": "^0.5.1",
     "classnames": "^2.3.1"
   },
   "devDependencies": {
+    "@ray-js/ray": "latest",
     "@commitlint/cli": "^7.2.1",
     "@commitlint/config-conventional": "^9.0.1",
     "@ray-js/babel-preset-standard": "latest",