From 068097a194ac198a5b02b16f9cc1d2293b467545 Mon Sep 17 00:00:00 2001 From: d07riv Date: Thu, 15 Aug 2019 23:03:53 +0300 Subject: [PATCH] fix websocket --- package-lock.json | 2 +- package.json | 2 +- src/api/game.worker.js | 2 +- src/api/webrtc.js | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index db3ddf3..cdcd330 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "diabloweb", - "version": "1.0.30", + "version": "1.0.31", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index d4fe373..25c3417 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "diabloweb", - "version": "1.0.30", + "version": "1.0.31", "private": true, "dependencies": { "@babel/core": "7.4.3", diff --git a/src/api/game.worker.js b/src/api/game.worker.js index 6dac0ea..4f12bc3 100644 --- a/src/api/game.worker.js +++ b/src/api/game.worker.js @@ -122,7 +122,7 @@ const DApi = { use_websocket(flag) { if (flag) { if (!websocket || websocket.readyState !== 1) { - const sock = websocket = websocket_open('ws://diablo.rivsoft.net/', data => { + const sock = websocket = websocket_open('wss://diablo.rivsoft.net/websocket', data => { if (websocket === sock) { try_api(() => { const ptr = wasm._DApi_AllocPacket(data.byteLength); diff --git a/src/api/webrtc.js b/src/api/webrtc.js index eb3e9fa..ccbb72c 100644 --- a/src/api/webrtc.js +++ b/src/api/webrtc.js @@ -12,6 +12,7 @@ import { buffer_reader, read_packet, write_packet, client_packet, server_packet, }*/ const PeerID = name => `diabloweb_${name}`; +const Options = undefined;//{host: 'diablo.rivsoft.net', port: 80}; const MAX_PLRS = 4; class webrtc_server { @@ -23,7 +24,7 @@ class webrtc_server { this.onMessage = onMessage; this.onClose = onClose; - this.peer = new Peer(PeerID(name)); + this.peer = new Peer(PeerID(name), Options); this.peer.on('connection', conn => this.onConnect(conn)); this.players = []; this.myplr = 0; @@ -159,7 +160,7 @@ class webrtc_client { pending = []; constructor(version, {cookie, name, password}, onMessage, onClose) { - this.peer = new Peer(); + this.peer = new Peer(Options); this.conn = this.peer.connect(PeerID(name)); let needUnreg = true;