Merge branches 'device-mgr' and 'device-mgr' of...

Merge branches 'device-mgr' and 'device-mgr' of https://gitlab.jing.zone/skye/jensen into device-mgr

jensen.d.ts

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

src/index.tsx

@@ -15,9 +15,16 @@ export function Home() {
     jensen.onconnect = () => {
       console.log('connect successfully');
       jensen.getDeviceInfo().then((info) => {
+        console.log('getDeviceInfo', info);
         alert(info.sn + ' connected');
+      }).catch((e) => {
+        console.log('getDeviceInfo error', e);
       });
     };
+    // jensen.onerror = (e) => {
+    //   console.log('onerror', e);
+    //   alert('此设备已经在其它已打开的HiNotes网页上建立连接');
+    // };
   }, []);
 
   const getFilePart = () => {
@@ -40,6 +47,25 @@ export function Home() {
     setDevices(devices);
     setGreeting(null)
   }
+  const connecty = async () => {
+    const usb = (navigator as any).usb;
+    let conn = await usb.requestDevice({
+        filters: [{ vendorId: 0x10d6 }, { vendorId: 0x3887 }]
+    });
+    if (conn == null) return null;
+    // if (conn.opened) throw new Error('device_already_opened');
+    await conn.open();
+    let jensen = new Jensen(Logger, conn);
+    jensen.onerror = (e) => {
+      console.log('onerror', e);
+      alert('此设备已经在其它已打开的HiNotes网页上建立连接');
+    };
+    await jensen.initialize();
+    let dinfo = await jensen.getDeviceInfo();
+    if (dinfo)
+    console.log('dinfo', dinfo);
+    return null;
+}
 
   const connect = async () => {
     await jensen.connect();
@@ -221,6 +247,7 @@ export function Home() {
   return (
     <>
     <div style={{ display: 'flex', flexDirection: 'row', gap: '16px', padding: '16px', alignItems: 'center', flexWrap: 'wrap' }}>
+      <button onClick={connecty}>连接新设备</button>
       <button onClick={connect}>连接</button>
       <button onClick={getFilePart}>获取文件</button>
       <button onClick={writeSN}>SN写号</button>

src/utils/jensen.js

@@ -99,6 +99,7 @@ function Jensen(log, conn) {
   this.isStopConnectionCheck = false;
   this.onconnect = null;
   this.onreceive = null;
+  this.onerror = null;
 
   const RECV_BUFF_SIZE = 51200;
 
@@ -382,7 +383,11 @@ function Jensen(log, conn) {
         Logger.save?.('jensen', 'tryReceive', r?.data);
         console.log(pid + ' Receive', r?.data);
         receive(r);
+      }).catch((e) => {
+        console.log('tryReceive error', e)
+        self.onerror?.(e);
       });
+      
   };
 
   const read_int = function (a, b, c, d) {
@@ -394,6 +399,10 @@ function Jensen(log, conn) {
   };
 
   const receive = function (result) {
+    if(result instanceof Error) {
+      console.log('receive error', result);
+      return 
+    }
     totalBytes += result.data.byteLength;
     // 做一个回调，怎么样找到它呢？
     blocks.push(result.data);