opencode fixed my connection errors :)
This commit is contained in:
@@ -1,34 +1,77 @@
|
|||||||
export async function generateEndpoint(
|
export async function generateEndpoint(
|
||||||
startFunction?: (enqueue: (data: any) => void) => void | Promise<void | (() => void)>
|
startFunction?: (enqueue: (data: any) => void) => void | Promise<void | (() => void)>,
|
||||||
|
request?: Request
|
||||||
) {
|
) {
|
||||||
let streamController: ReadableStreamDefaultController | null = null;
|
let streamController: ReadableStreamDefaultController | null = null;
|
||||||
let cleanupFunction: (() => void) | void = undefined;
|
let cleanupFunction: (() => void) | void = undefined;
|
||||||
|
let heartbeatInterval: ReturnType<typeof setInterval> | null = null;
|
||||||
|
let cleanedUp = false;
|
||||||
|
|
||||||
|
const safeCleanup = () => {
|
||||||
|
if (cleanedUp) return;
|
||||||
|
cleanedUp = true;
|
||||||
|
|
||||||
|
if (heartbeatInterval) {
|
||||||
|
clearInterval(heartbeatInterval);
|
||||||
|
heartbeatInterval = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof cleanupFunction === 'function') {
|
||||||
|
cleanupFunction();
|
||||||
|
cleanupFunction = undefined;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const enqueue = (data: any) => {
|
const enqueue = (data: any) => {
|
||||||
|
if (cleanedUp) return;
|
||||||
let transferdata = JSON.stringify(data);
|
let transferdata = JSON.stringify(data);
|
||||||
// stringify data and add to controller queue
|
|
||||||
if (streamController) {
|
if (streamController) {
|
||||||
|
try {
|
||||||
streamController.enqueue(`data: ${transferdata}\n\n`);
|
streamController.enqueue(`data: ${transferdata}\n\n`);
|
||||||
} else {
|
} catch {
|
||||||
console.log('no controller');
|
safeCleanup();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const stream = new ReadableStream({
|
const stream = new ReadableStream({
|
||||||
async start(controller) {
|
async start(controller) {
|
||||||
streamController = controller;
|
streamController = controller;
|
||||||
|
|
||||||
|
heartbeatInterval = setInterval(() => {
|
||||||
|
try {
|
||||||
|
streamController!.enqueue(': keepalive\n\n');
|
||||||
|
} catch {
|
||||||
|
safeCleanup();
|
||||||
|
}
|
||||||
|
}, 30000);
|
||||||
|
heartbeatInterval.unref();
|
||||||
|
|
||||||
if (startFunction) {
|
if (startFunction) {
|
||||||
|
try {
|
||||||
const result = await startFunction(enqueue);
|
const result = await startFunction(enqueue);
|
||||||
if (typeof result === 'function') {
|
if (typeof result === 'function') {
|
||||||
cleanupFunction = result;
|
cleanupFunction = result;
|
||||||
}
|
}
|
||||||
|
} catch (err) {
|
||||||
|
safeCleanup();
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async cancel() {
|
async cancel() {
|
||||||
if (cleanupFunction) cleanupFunction();
|
safeCleanup();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (request?.signal) {
|
||||||
|
if (request.signal.aborted) {
|
||||||
|
safeCleanup();
|
||||||
|
} else {
|
||||||
|
request.signal.addEventListener('abort', () => safeCleanup());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
response: new Response(stream, {
|
response: new Response(stream, {
|
||||||
headers: {
|
headers: {
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { EventEmitter } from 'node:events';
|
import { EventEmitter } from 'node:events';
|
||||||
|
|
||||||
// Main emitter for everything
|
|
||||||
|
|
||||||
export const globalEmitter = new EventEmitter();
|
export const globalEmitter = new EventEmitter();
|
||||||
|
globalEmitter.setMaxListeners(1000);
|
||||||
|
|||||||
@@ -2,10 +2,8 @@ import { getRegisteredEventsWithPlayers } from '$lib/server/databaseManager';
|
|||||||
import { globalEmitter } from '$lib/server/globalEmitter';
|
import { globalEmitter } from '$lib/server/globalEmitter';
|
||||||
import { generateEndpoint } from '$lib/server/endpoint';
|
import { generateEndpoint } from '$lib/server/endpoint';
|
||||||
|
|
||||||
export async function GET() {
|
export async function GET({ request }) {
|
||||||
// Generate stream endpoint
|
|
||||||
const endpoint = generateEndpoint(async (enqueue) => {
|
const endpoint = generateEndpoint(async (enqueue) => {
|
||||||
// Get the all the events with the players seperated into brackets
|
|
||||||
let eventList = async () => {
|
let eventList = async () => {
|
||||||
// Get eventList with structure from database
|
// Get eventList with structure from database
|
||||||
let newEventList = await getRegisteredEventsWithPlayers();
|
let newEventList = await getRegisteredEventsWithPlayers();
|
||||||
@@ -23,7 +21,7 @@ export async function GET() {
|
|||||||
return () => {
|
return () => {
|
||||||
globalEmitter.off('eventUpdate', eventList);
|
globalEmitter.off('eventUpdate', eventList);
|
||||||
};
|
};
|
||||||
});
|
}, request);
|
||||||
return (await endpoint).response;
|
return (await endpoint).response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ export async function POST({ request }: any) {
|
|||||||
return new Response('ok');
|
return new Response('ok');
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function GET() {
|
export async function GET({ request }) {
|
||||||
const endpoint = generateEndpoint(async (enqueue) => {
|
const endpoint = generateEndpoint(async (enqueue) => {
|
||||||
// Function to grab score from database and add it to message queue
|
// Function to grab score from database and add it to message queue
|
||||||
let newScore = async () => {
|
let newScore = async () => {
|
||||||
@@ -26,6 +26,6 @@ export async function GET() {
|
|||||||
return () => {
|
return () => {
|
||||||
globalEmitter.off('scoreUpdate', newScore);
|
globalEmitter.off('scoreUpdate', newScore);
|
||||||
};
|
};
|
||||||
});
|
}, request);
|
||||||
return (await endpoint).response;
|
return (await endpoint).response;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user