deepblue/diabloweb
1
0
Fork 0
mirror of https://github.com/d07RiV/diabloweb.git synced 2026-07-03 11:51:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix websocket

Browse Source
This commit is contained in:
d07riv
2019-08-15 23:03:53 +03:00
parent fe5da2c807
commit 068097a194
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{ {
"name": "diabloweb", "name": "diabloweb",
"version": "1.0.30", "version": "1.0.31",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "diabloweb", "name": "diabloweb",
"version": "1.0.30", "version": "1.0.31",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@babel/core": "7.4.3", "@babel/core": "7.4.3",

2
src/api/game.worker.js
View File

@@ -122,7 +122,7 @@ const DApi = {
use_websocket(flag) { use_websocket(flag) {
if (flag) { if (flag) {
if (!websocket || websocket.readyState !== 1) { 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) { if (websocket === sock) {
try_api(() => { try_api(() => {
const ptr = wasm._DApi_AllocPacket(data.byteLength); const ptr = wasm._DApi_AllocPacket(data.byteLength);

5
src/api/webrtc.js
View File

@@ -12,6 +12,7 @@ import { buffer_reader, read_packet, write_packet, client_packet, server_packet,
}*/ }*/
const PeerID = name => `diabloweb_${name}`; const PeerID = name => `diabloweb_${name}`;
const Options = undefined;//{host: 'diablo.rivsoft.net', port: 80};
const MAX_PLRS = 4; const MAX_PLRS = 4;
class webrtc_server { class webrtc_server {
@@ -23,7 +24,7 @@ class webrtc_server {
this.onMessage = onMessage; this.onMessage = onMessage;
this.onClose = onClose; 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.peer.on('connection', conn => this.onConnect(conn));
this.players = []; this.players = [];
this.myplr = 0; this.myplr = 0;
@@ -159,7 +160,7 @@ class webrtc_client {
pending = []; pending = [];
constructor(version, {cookie, name, password}, onMessage, onClose) { constructor(version, {cookie, name, password}, onMessage, onClose) {
this.peer = new Peer(); this.peer = new Peer(Options);
this.conn = this.peer.connect(PeerID(name)); this.conn = this.peer.connect(PeerID(name));
let needUnreg = true; let needUnreg = true;