Merge branch 'v20250816' into device-mgr

jensen.d.ts

@@ -142,6 +142,7 @@ declare class Jensen {
   onconnect: () => void;
   // 事件：当连接异常时触发
   onerror: (e: Error) => void;
+  onwakeup: () => void;
   // 主动断开连接（单连接时适用）
   disconnect: () => void;
   // 事件：当连接断开时触发

src/index.tsx

@@ -14,6 +14,9 @@ export function Home() {
     jensen.connect();
     jensen.onconnect = () => {
       console.log('connect successfully');
+      jensen.onwakeup = function() {
+        console.log('从休眠中恢复过来了？');
+      }
       jensen.getDeviceInfo().then((info) => {
         console.log('getDeviceInfo', info);
         alert(info.sn + ' connected');
@@ -25,6 +28,10 @@ export function Home() {
     //   console.log('onerror', e);
     //   alert('此设备已经在其它已打开的HiNotes网页上建立连接');
     // };
+    setInterval(function()
+    {
+      Logger.info('hearbeat', 'tick', 'xxxx');
+    }, 5000);
   }, []);
 
   const getFilePart = () => {

src/utils/jensen.js

@@ -102,6 +102,10 @@ function Jensen(log, conn) {
   this.onconnect = null;
   this.onreceive = null;
   this.onerror = null;
+  this.onwakeup = null;
+
+  this.sleepChecker = null;
+  this.lastTimerInvoked = new Date().getTime();
 
   const RECV_BUFF_SIZE = 512000;
 
@@ -154,7 +158,9 @@ function Jensen(log, conn) {
       self.model = determineModel(device.productId);
       Logger.info('jensen', 'connect', 'device pid: ' + device.productId);
     } catch (e) {
-      Logger.error('jensen', 'setup', String(e));
+      let err = String(e);
+      Logger.error('jensen', 'setup', err);
+      if (err.indexOf('Unable to claim interface.') > -1 && typeof(self?.onerror) == 'function') self?.onerror(e);
     }
     if (!disableOnConnect) _check_conn_status();
     current = null;
@@ -166,6 +172,16 @@ function Jensen(log, conn) {
     } catch (err) {
       Logger.error('jensen', 'setup', err);
     }
+    if (self.sleepChecker) window.clearInterval(self.sleepChecker);
+    self.sleepChecker = setInterval(function() {
+      let now = new Date().getTime();
+      if (now - self.lastTimerInvoked > 6000)
+      {
+        if (typeof(self.onwakeup) == 'function') self.onwakeup();
+      }
+      self.lastTimerInvoked = now;
+    }, 5000);
+    console.log('休眠检测准备完毕');
   };
 
   this.initialize = async function() {
@@ -408,7 +424,7 @@ function Jensen(log, conn) {
         receive(r);
       }).catch((e) => {
         console.log('tryReceive error', e)
-        if (!channelHealthy) self.onerror?.(e);
+        // if (!channelHealthy) self.onerror?.(e);
       });
       
   };
@@ -1041,14 +1057,14 @@ Jensen.prototype.getFile = async function (filename, length, ondata, onprogress)
   this.onprogress = onprogress;
   this.onreceive = function(recvBytes)
   {
-    let percent = Math.floor(recvBytes / length * 100);
+    let percent = Math.floor(recvBytes / length * 1000);
     let k = 't' + percent;
-    if (percent > 0 && percent < 100)
+    if (percent > 0 && percent < 1000)
     {
       if (!(k in self._progress_report)) onprogress?.(recvBytes);
       self._progress_report[k] = true;
     }
-    if (percent >= 100 && !(k in self._progress_report))
+    if (percent >= 1000 && !(k in self._progress_report))
     {
       onprogress?.(length);
       self._progress_report[k] = true;