mirror of
https://github.com/lush2020/edgetunnel.git
synced 2026-03-24 17:18:25 +08:00
fix oom issue and upgrade to nx least
This commit is contained in:
@@ -2,13 +2,14 @@
|
||||
export default {
|
||||
displayName: 'vless-js',
|
||||
preset: '../../jest.preset.js',
|
||||
globals: {
|
||||
'ts-jest': {
|
||||
tsconfig: '<rootDir>/tsconfig.spec.json',
|
||||
},
|
||||
},
|
||||
globals: {},
|
||||
transform: {
|
||||
'^.+\\.[tj]s$': 'ts-jest',
|
||||
'^.+\\.[tj]s$': [
|
||||
'ts-jest',
|
||||
{
|
||||
tsconfig: '<rootDir>/tsconfig.spec.json',
|
||||
},
|
||||
],
|
||||
},
|
||||
moduleFileExtensions: ['ts', 'js', 'html'],
|
||||
coverageDirectory: '../../coverage/libs/vless-js',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
export {
|
||||
delay,
|
||||
makeReadableWebSocketStream,
|
||||
closeWebSocket,
|
||||
safeCloseWebSocket as closeWebSocket,
|
||||
processVlessHeader,
|
||||
vlessJs,
|
||||
} from './lib/vless-js';
|
||||
|
||||
@@ -50,7 +50,7 @@ export function makeReadableWebSocketStream(
|
||||
const { earlyData, error } = base64ToArrayBuffer(earlyDataHeader);
|
||||
if (error) {
|
||||
log(`earlyDataHeader has invaild base64`);
|
||||
closeWebSocket(ws);
|
||||
safeCloseWebSocket(ws);
|
||||
return;
|
||||
}
|
||||
if (earlyData) {
|
||||
@@ -68,7 +68,7 @@ export function makeReadableWebSocketStream(
|
||||
return;
|
||||
}
|
||||
readableStreamCancel = true;
|
||||
closeWebSocket(ws);
|
||||
safeCloseWebSocket(ws);
|
||||
},
|
||||
});
|
||||
}
|
||||
@@ -88,9 +88,13 @@ function base64ToArrayBuffer(base64Str: string) {
|
||||
}
|
||||
}
|
||||
|
||||
export function closeWebSocket(socket: WebSocket | any) {
|
||||
if (socket.readyState === socket.OPEN) {
|
||||
socket.close();
|
||||
export function safeCloseWebSocket(socket: WebSocket | any) {
|
||||
try {
|
||||
if (socket.readyState === socket.OPEN) {
|
||||
socket.close();
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('safeCloseWebSocket error', error);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user