q6161992/Haru
q6161992/Haru
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace Buffer with Uint8Array

Browse Source
This commit is contained in:
Merijn Hendriks 2021-12-28 17:53:37 +01:00
parent 8d654bfee2
commit 8eef231d69
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/Haru.Http.ts
View File

@ -92,11 +92,11 @@ export class HttpServer implements IServer
private handlePost(req: IncomingMessage, res: ServerResponse, service: Service): void private handlePost(req: IncomingMessage, res: ServerResponse, service: Service): void
{ {
let data = Buffer.from(""); let data = new Uint8Array();
req.on("data", (chunk: Buffer) => req.on("data", (chunk: Uint8Array) =>
{ {
data = Buffer.concat([data, chunk]); data = new Uint8Array([ ...data, ...chunk ]);
}); });
req.on("end", () => req.on("end", () =>
@ -114,7 +114,7 @@ export class HttpServer implements IServer
export class Service export class Service
{ {
protected send(res: ServerResponse, data: Buffer, type: string, compress: boolean = true): void protected send(res: ServerResponse, data: Uint8Array, type: string, compress: boolean = true): void
{ {
const bytes = (compress) ? Zlib.compress(data) : data; const bytes = (compress) ? Zlib.compress(data) : data;
const headers = { const headers = {
@ -127,7 +127,7 @@ export class Service
protected sendJson(res: ServerResponse, data: string, compress: boolean = true): void protected sendJson(res: ServerResponse, data: string, compress: boolean = true): void
{ {
const bytes = Buffer.from(data); const bytes = new TextEncoder().encode(data);
this.send(res, bytes, "json", compress); this.send(res, bytes, "json", compress);
} }
@ -212,7 +212,7 @@ export class WsServer implements IServer
public canSendMessage(url: string) public canSendMessage(url: string)
{ {
const ws = this.clients[url]; const ws = this.clients[url];
return (!ws) ? false : ws.readyState == WebSocket.OPEN; return (!ws) ? false : (ws.readyState == WebSocket.OPEN);
} }
private close(ws: WebSocket): void private close(ws: WebSocket): void

10
src/common/Haru.Utils.ts
View File

@ -37,7 +37,7 @@ export class Vfs
return readFileSync(filepath); return readFileSync(filepath);
} }
public static writeFile(filepath: string, data: Buffer | string, append: boolean = false): void public static writeFile(filepath: string, data: Uint8Array | string, append: boolean = false): void
{ {
if (!Vfs.exists(filepath)) if (!Vfs.exists(filepath))
{ {
@ -94,17 +94,17 @@ export class Log
export class Zlib export class Zlib
{ {
public static compress(data: Buffer): Buffer public static compress(data: Uint8Array, level: number = 9): Uint8Array
{ {
return deflateSync(data); return deflateSync(data, { "level": level });
} }
public static decompress(data: Buffer): Buffer public static decompress(data: Uint8Array): Uint8Array
{ {
return inflateSync(data); return inflateSync(data);
} }
public static isCompressed(data: Buffer): boolean public static isCompressed(data: Uint8Array): boolean
{ {
// Level | CM/CI FLG // Level | CM/CI FLG
// ----- | --------- // ----- | ---------