Skip to content

Commit 8d8a7d4

Browse files
committed
tweak(game): remove custom header
1 parent d5d8915 commit 8d8a7d4

4 files changed

Lines changed: 7 additions & 21 deletions

File tree

game/client/bootstrap.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ onNet('screencapture:captureScreen', (token: string, options: object, dataType:
1313
uploadToken: token,
1414
dataType,
1515
action: 'capture',
16-
serverEndpoint: `http://${GetCurrentServerEndpoint()}/${GetCurrentResourceName()}/image`,
16+
serverEndpoint: `http://${GetCurrentServerEndpoint()}/${GetCurrentResourceName()}/upload`,
1717
});
1818
});
1919

@@ -121,7 +121,7 @@ function createImageCaptureMessage(options: CaptureRequest) {
121121
SendNUIMessage({
122122
...options,
123123
action: 'capture',
124-
serverEndpoint: `http://${GetCurrentServerEndpoint()}/${GetCurrentResourceName()}/image`,
124+
serverEndpoint: `http://${GetCurrentServerEndpoint()}/${GetCurrentResourceName()}/upload`,
125125
});
126126
}
127127

game/nui/src/capture-stream.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,9 @@ export class CaptureStream {
9999

100100
try {
101101
// Fetch without setting 'Content-Type' manually
102-
const response = await fetch(request.serverEndpoint, {
102+
const response = await fetch(`${request.serverEndpoint}/${request.uploadToken}`, {
103103
method: 'POST',
104-
headers: {
105-
'X-ScreenCapture-Token': request.uploadToken, // Add custom headers
106-
},
107-
body: formData, // Browser handles Content-Type
104+
body: formData,
108105
});
109106

110107
if (!response.ok) {

game/nui/src/capture.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,9 @@ export class Capture {
124124

125125
if (request.serverEndpoint) {
126126
try {
127-
await fetch(request.serverEndpoint, {
127+
await fetch(`${request.serverEndpoint}/${request.uploadToken}`, {
128128
method: 'POST',
129129
mode: 'cors',
130-
headers: {
131-
'X-ScreenCapture-Token': request.uploadToken,
132-
},
133130
body: reqBody,
134131
});
135132
} catch (err) {

game/server/koa-router.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,8 @@ export async function createServer(uploadStore: UploadStore) {
2222
const app = new Koa();
2323
const router = new Router();
2424

25-
router.options('/image', (ctx) => {
26-
ctx.status = 200;
27-
ctx.set('Access-Control-Allow-Origin', `${ctx.request.headers['origin']}`);
28-
ctx.set('Access-Control-Allow-Methods', 'POST, OPTIONS');
29-
ctx.set('Access-Control-Allow-Headers', 'x-screencapture-token');
30-
return;
31-
});
32-
33-
router.post('/image', upload.single('file') as any, async (ctx) => {
34-
const token = ctx.request.headers['x-screencapture-token'] as string;
25+
router.post('/upload/:token', upload.single('file') as any, async (ctx) => {
26+
const token = ctx.params['token'] as string;
3527
if (!token) {
3628
ctx.status = 401;
3729
ctx.body = { status: 'error', message: 'No token provided' };

0 commit comments

Comments
 (0)