diff --git a/dist/src/utils/socket.js b/dist/src/utils/socket.js index dad9e24b..e9abcc1c 100644 --- a/dist/src/utils/socket.js +++ b/dist/src/utils/socket.js @@ -31,14 +31,15 @@ function connect(server) { // srvr = new WebSocket.Server({ server, clientTracking:true }) io = socketio(server, { allowEIO3: true, - handlePreflightRequest: (req, res) => { - const headers = { - 'Access-Control-Allow-Headers': 'Content-Type, Accept, x-user-token, X-Requested-With', - 'Access-Control-Allow-Origin': req.headers.origin, - 'Access-Control-Allow-Credentials': true, - }; - res.writeHead(200, headers); - res.end(); + cors: { + origin: true, + allowedHeaders: [ + 'Content-Type', + 'Accept', + 'x-user-token', + 'X-Requested-With', + ], + credentials: true, }, }); io.use((client, next) => __awaiter(this, void 0, void 0, function* () { diff --git a/dist/src/utils/socket.js.map b/dist/src/utils/socket.js.map index 34afdcae..ead94cbc 100644 --- a/dist/src/utils/socket.js.map +++ b/dist/src/utils/socket.js.map @@ -1 +1 @@ -{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../src/utils/socket.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../src/utils/socket.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/utils/socket.ts b/src/utils/socket.ts index 8a53c75c..28877e4b 100644 --- a/src/utils/socket.ts +++ b/src/utils/socket.ts @@ -26,15 +26,15 @@ export function connect(server) { io = socketio(server, { allowEIO3: true, - handlePreflightRequest: (req, res) => { - const headers = { - 'Access-Control-Allow-Headers': - 'Content-Type, Accept, x-user-token, X-Requested-With', - 'Access-Control-Allow-Origin': req.headers.origin, //or the specific origin you want to give access to, - 'Access-Control-Allow-Credentials': true, - } - res.writeHead(200, headers) - res.end() + cors: { + origin: true, + allowedHeaders: [ + 'Content-Type', + 'Accept', + 'x-user-token', + 'X-Requested-With', + ], + credentials: true, }, }) io.use(async (client, next) => {