Merge branch 'v20250816' into device-mgr

jensen.d.ts

@@ -301,6 +301,8 @@ declare class Jensen {
   
   // 更新设备UAC固件
   updateUAC: (data: Uint8Array, seconds?: number) => Promise<ReturnStruct['common']>;
+
+  dump: (void);
 }
 
 export = Jensen;

src/utils/jensen.js

@@ -244,6 +244,10 @@ function Jensen(log, conn) {
     return device;
   }
 
+  this.busy = function() {
+    return Boolean(current);
+  }
+
   this.setUSBDevice = function (dev) {
     device = dev;
     ready = false;
@@ -290,15 +294,13 @@ function Jensen(log, conn) {
 
     let data = cmd.make();
     current = 'cmd-' + cmd.command + '-' + cmd.index;
-    Logger.debug('jensen', 'sendNext', pid + '-command: ' + cmd.command + ', data bytes: ' + data.byteLength);
+    Logger.debug('jensen', 'sendNext', pid + '-command: ' + current + ', data bytes: ' + data.byteLength);
 
     self.timewait = cmd.command == TRANSFER_FILE || cmd.command == GET_FILE_BLOCK ? 1000 : 10;
     console.log(pid + '-send', data);
-    if (self.onprogress && (cmd.command == TRANSFER_FILE || cmd.command == GET_FILE_BLOCK))
+    if (self.onprogress && cmd.command == TRANSFER_FILE)
     {
-      self.transferStartTime = new Date().getTime();
-      Logger.debug('jensen', 'file-transfer', new Date().getTime());
-      try { self.onprogress(0); } catch(e) { }
+      try { self.onprogress(0); } catch(e) {}
     }
     await device.transferOut(1, data).catch((e) => crash('sendNext', e));
     if (cmd.onprogress) cmd.onprogress(1, 1);
@@ -337,9 +339,11 @@ function Jensen(log, conn) {
           timeout(tag);
         }, seconds * 1000)
       : null;
+    Logger.debug('jensen', 'register', tag);
     return new Promise((resolve, reject) => {
       actions[tag] = {
         tag: tag,
+        createtime: new Date().getTime(),
         resolve: resolve,
         reject: reject,
         timeout: t
@@ -353,18 +357,21 @@ function Jensen(log, conn) {
 
   const trigger = function (resp, msgid) {
     if (current == null) return;
-    Logger.debug('jensen', 'trigger', pid + ':trigger - ' + current.substring(0, current.lastIndexOf('-')) + ' <---> cmd-' + (msgid || 'err'));
+    Logger.debug('jensen', 'trigger', pid + ':trigger - ' + current + ' <---> cmd-' + (msgid || 'err'));
     if (current.substring(0, current.lastIndexOf('-')) != 'cmd-' + msgid) {
       // current = null;
+      Logger.info('jensen', 'trigger', 'return cuz cmd mismatched');
       return;
     }
     if (current in actions == false) {
       Logger.debug('jensen', 'trigger', pid + ':no action registered');
+      current = null;
       return;
     }
     let p = actions[current];
     if (p.timeout) clearTimeout(p.timeout);
     p.resolve(resp);
+    Logger.info('jensen', 'trigger', p.tag + ', cost: ' + (new Date().getTime() - p.createtime) + 'ms');
     delete actions[current];
     current = null;
   };
@@ -381,13 +388,14 @@ function Jensen(log, conn) {
     console.log('pending commands', commands);
     console.log('current', current);
     console.log('device', device);
+    return {
+      'actions': actions,
+      'commands': commands,
+      'current': current,
+      'device': device
+    }
   };
 
-  this.busy = function() {
-    return Boolean(current);
-    // return false
-  }
-
   const tryReceive = function () {
     if (device)
       // console.log('trace', device);
@@ -474,7 +482,7 @@ function Jensen(log, conn) {
           Logger.debug(
             'jensen',
             'receive',
-            pid + '-recv: ' + cname + ', seq: ' + msg.sequence + ', data bytes: ' + msg.body?.byteLength + ', data: ' + heading.join(' ')
+            pid + '-recv: cmd=' + msg.id + ', seq: ' + msg.sequence + ', data bytes: ' + msg.body?.byteLength + ', data: ' + heading.join(' ')
           );
         try {
           let handler = handlers[msg.id];
@@ -1013,18 +1021,22 @@ Jensen.prototype.getFile = async function (filename, length, ondata, onprogress)
   };
   // this.onreceive = onprogress;
   this._progress_report = {};
+  // try { onprogress(0); } catch(e) {}
+  let self = this;
+  this.onprogress = onprogress;
   this.onreceive = function(recvBytes)
   {
     let percent = Math.floor(recvBytes / length * 100);
     let k = 't' + percent;
-    if (percent % 5 == 0 && percent > 0 && percent < 100)
+    if (percent > 0 && percent < 100)
     {
-      this._progress_report[k] && onprogress?.(recvBytes);
-      this._progress_report[k] = true;
+      if (!(k in self._progress_report)) onprogress?.(recvBytes);
+      self._progress_report[k] = true;
     }
-    if (percent == 100)
+    if (percent >= 100 && !(k in self._progress_report))
     {
-      onprogress?.(recvBytes);
+      onprogress?.(length);
+      self._progress_report[k] = true;
     }
   }
   this.registerHandler(TRANSFER_FILE, handler);
@@ -1139,11 +1151,10 @@ Jensen.prototype.getFileBlock = async function (filename, length, ondata) {
 Jensen.prototype.getBatteryStatus = function(seconds)
 {
   if (this.model != 'hidock-p1') return null;
-  // 如果正在处理其它消息任务，则直接取消电池电量查询消息
   if (this.busy())
   {
-    // Logger.info('jensen', 'dispatcher', 'cancel battery status query...');
-    // return null;
+    Logger.debug('jensen', 'dispatcher', 'cancel getBatteryStatus cuz busy');
+    return;
   }
   return this.send(new Command(GET_BATTERY_STATUS), seconds);
 }