style: lint

src/core/packet/highway/client.ts

@@ -1,8 +1,8 @@
 import * as stream from 'node:stream';
-import {ReadStream} from "node:fs";
-import {PacketHighwaySig} from "@/core/packet/highway/session";
-import {HighwayHttpUploader, HighwayTcpUploader} from "@/core/packet/highway/uploader";
-import {LogWrapper} from "@/common/log";
+import { ReadStream } from "node:fs";
+import { PacketHighwaySig } from "@/core/packet/highway/session";
+import { HighwayHttpUploader, HighwayTcpUploader } from "@/core/packet/highway/uploader";
+import { LogWrapper } from "@/common/log";
 
 export interface PacketHighwayTrans {
     uin: string;

src/core/packet/highway/session.ts

@@ -1,16 +1,16 @@
 import * as fs from "node:fs";
-import {ChatType, Peer} from "@/core";
-import {LogWrapper} from "@/common/log";
-import {PacketClient} from "@/core/packet/client";
-import {PacketPacker} from "@/core/packet/packer";
-import {NapProtoMsg} from "@/core/packet/proto/NapProto";
-import {HttpConn0x6ff_501Response} from "@/core/packet/proto/action/action";
-import {PacketHighwayClient} from "@/core/packet/highway/client";
-import {NTV2RichMediaResp} from "@/core/packet/proto/oidb/common/Ntv2.RichMediaResp";
-import {OidbSvcTrpcTcpBaseRsp} from "@/core/packet/proto/oidb/OidbBase";
-import {PacketMsgPicElement} from "@/core/packet/msg/element";
-import {NTV2RichMediaHighwayExt} from "@/core/packet/proto/highway/highway";
-import {int32ip2str, oidbIpv4s2HighwayIpv4s} from "@/core/packet/highway/utils";
+import { ChatType, Peer } from "@/core";
+import { LogWrapper } from "@/common/log";
+import { PacketClient } from "@/core/packet/client";
+import { PacketPacker } from "@/core/packet/packer";
+import { NapProtoMsg } from "@/core/packet/proto/NapProto";
+import { HttpConn0x6ff_501Response } from "@/core/packet/proto/action/action";
+import { PacketHighwayClient } from "@/core/packet/highway/client";
+import { NTV2RichMediaResp } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaResp";
+import { OidbSvcTrpcTcpBaseRsp } from "@/core/packet/proto/oidb/OidbBase";
+import { PacketMsgPicElement } from "@/core/packet/msg/element";
+import { NTV2RichMediaHighwayExt } from "@/core/packet/proto/highway/highway";
+import { int32ip2str, oidbIpv4s2HighwayIpv4s } from "@/core/packet/highway/utils";
 
 export const BlockSize = 1024 * 1024;
 
@@ -42,7 +42,7 @@ export class PacketHighwaySession {
             sigSession: null,
             sessionKey: null,
             serverAddr: [],
-        }
+        };
         this.packer = packer;
         this.packetHighwayClient = new PacketHighwayClient(this.sig, this.logger);
     }
@@ -69,8 +69,8 @@ export class PacketHighwaySession {
         const rsp = new NapProtoMsg(HttpConn0x6ff_501Response).decode(
             Buffer.from(req.hex_data, 'hex')
         );
-        this.sig.sigSession = rsp.httpConn.sigSession
-        this.sig.sessionKey = rsp.httpConn.sessionKey
+        this.sig.sigSession = rsp.httpConn.sigSession;
+        this.sig.sessionKey = rsp.httpConn.sessionKey;
         for (const info of rsp.httpConn.serverInfos) {
             if (info.serviceType !== 1) continue;
             for (const addr of info.serverAddrs) {
@@ -78,7 +78,7 @@ export class PacketHighwaySession {
                 this.sig.serverAddr.push({
                     ip: int32ip2str(addr.ip),
                     port: addr.port
-                })
+                });
             }
         }
     }
@@ -118,10 +118,10 @@ export class PacketHighwaySession {
                 hash: {
                     fileSha1: [sha1]
                 }
-            })
+            });
             await this.packetHighwayClient.upload(
                 1004,
-                fs.createReadStream(img.path, {highWaterMark: BlockSize}),
+                fs.createReadStream(img.path, { highWaterMark: BlockSize }),
                 img.size,
                 md5,
                 extend
@@ -157,10 +157,10 @@ export class PacketHighwaySession {
                 hash: {
                     fileSha1: [sha1]
                 }
-            })
+            });
             await this.packetHighwayClient.upload(
                 1003,
-                fs.createReadStream(img.path, {highWaterMark: BlockSize}),
+                fs.createReadStream(img.path, { highWaterMark: BlockSize }),
                 img.size,
                 md5,
                 extend

src/core/packet/highway/uploader.ts

@@ -2,13 +2,13 @@ import * as net from "node:net";
 import * as crypto from "node:crypto";
 import * as http from "node:http";
 import * as stream from "node:stream";
-import {LogWrapper} from "@/common/log";
+import { LogWrapper } from "@/common/log";
 import * as tea from "@/core/packet/utils/crypto/tea";
-import {NapProtoMsg} from "@/core/packet/proto/NapProto";
-import {ReqDataHighwayHead, RespDataHighwayHead} from "@/core/packet/proto/highway/highway";
-import {BlockSize} from "@/core/packet/highway/session";
-import {PacketHighwayTrans} from "@/core/packet/highway/client";
-import {Frame} from "@/core/packet/highway/frame";
+import { NapProtoMsg } from "@/core/packet/proto/NapProto";
+import { ReqDataHighwayHead, RespDataHighwayHead } from "@/core/packet/proto/highway/highway";
+import { BlockSize } from "@/core/packet/highway/session";
+import { PacketHighwayTrans } from "@/core/packet/highway/client";
+import { Frame } from "@/core/packet/highway/frame";
 
 abstract class HighwayUploader {
     readonly trans: PacketHighwayTrans;
@@ -53,7 +53,7 @@ abstract class HighwayUploader {
                 uint32LoginSigType: 8,
                 appId: 1600001604,
             }
-        })
+        });
     }
 
     abstract upload(): Promise<void>;
@@ -89,8 +89,8 @@ export class HighwayTcpUploader extends HighwayUploader {
         const highwayTransForm = new HighwayTcpUploaderTransform(this);
         const upload = new Promise<void>((resolve, _) => {
             const socket = net.connect(this.trans.port, this.trans.server, () => {
-                this.trans.data.pipe(highwayTransForm).pipe(socket, {end: false});
-            })
+                this.trans.data.pipe(highwayTransForm).pipe(socket, { end: false });
+            });
             const handleRspHeader = (header: Buffer) => {
                 const rsp = new NapProtoMsg(RespDataHighwayHead).decode(header);
                 if (rsp.errorCode !== 0) {
@@ -111,25 +111,25 @@ export class HighwayTcpUploader extends HighwayUploader {
                 } catch (e) {
                     this.logger.logError(`[Highway] tcpUpload parse response error: ${e}`);
                 }
-            })
+            });
             socket.on('close', () => {
                 this.logger.logDebug('[Highway] tcpUpload socket closed.');
                 resolve();
-            })
+            });
             socket.on('error', (err) => {
                 this.logger.logError('[Highway] tcpUpload socket.on error:', err);
-            })
+            });
             this.trans.data.on('error', (err) => {
                 this.logger.logError('[Highway] tcpUpload readable error:', err);
                 socket.end();
-            })
-        })
+            });
+        });
         const timeout = new Promise<void>((_, reject) => {
             setTimeout(() => {
-                reject(new Error(`[Highway] tcpUpload timeout after ${this.trans.timeout}s`))
+                reject(new Error(`[Highway] tcpUpload timeout after ${this.trans.timeout}s`));
             }, (this.trans.timeout ?? Infinity) * 1000
-            )
-        })
+            );
+        });
         await Promise.race([upload, timeout]);
     }
 }
@@ -139,7 +139,7 @@ export class HighwayHttpUploader extends HighwayUploader {
     async upload(): Promise<void> {
         let offset = 0;
         for await (const chunk of this.trans.data) {
-            let block = chunk as Buffer;
+            const block = chunk as Buffer;
             try {
                 await this.uploadBlock(block, offset);
             } catch (err) {
@@ -153,7 +153,7 @@ export class HighwayHttpUploader extends HighwayUploader {
     private async uploadBlock(block: Buffer, offset: number): Promise<void> {
         const chunkMD5 = crypto.createHash('md5').update(block).digest();
         const payload = this.buildPicUpHead(offset, block.length, chunkMD5);
-        const frame = Frame.pack(Buffer.from(payload), block)
+        const frame = Frame.pack(Buffer.from(payload), block);
         const resp = await this.httpPostHighwayContent(frame, `http://${this.trans.server}:${this.trans.port}/cgi-bin/httpconn?htcmd=0x6FF0087&uin=${this.trans.uin}`);
         const [head, body] = Frame.unpack(resp);
         const headData = new NapProtoMsg(RespDataHighwayHead).decode(head);

src/core/packet/highway/utils.ts

@@ -1,11 +1,11 @@
-import {NapProtoEncodeStructType} from "@/core/packet/proto/NapProto";
-import {IPv4} from "@/core/packet/proto/oidb/common/Ntv2.RichMediaResp";
-import {NTHighwayIPv4} from "@/core/packet/proto/highway/highway";
+import { NapProtoEncodeStructType } from "@/core/packet/proto/NapProto";
+import { IPv4 } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaResp";
+import { NTHighwayIPv4 } from "@/core/packet/proto/highway/highway";
 
 export const int32ip2str = (ip: number) => {
     ip = ip & 0xffffffff;
     return [ip & 0xff, (ip & 0xff00) >> 8, (ip & 0xff0000) >> 16, ((ip & 0xff000000) >> 24) & 0xff].join('.');
-}
+};
 
 export const oidbIpv4s2HighwayIpv4s = (ipv4s: NapProtoEncodeStructType<typeof IPv4>[]): NapProtoEncodeStructType<typeof NTHighwayIPv4>[] =>{
     return ipv4s.map((ip) => {
@@ -15,6 +15,6 @@ export const oidbIpv4s2HighwayIpv4s = (ipv4s: NapProtoEncodeStructType<typeof IP
                 ip: int32ip2str(ip.outIP!),
             },
             port: ip.outPort!
-        } as NapProtoEncodeStructType<typeof NTHighwayIPv4>
-    })
-}
+        } as NapProtoEncodeStructType<typeof NTHighwayIPv4>;
+    });
+};