Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,212 changes: 2,272 additions & 1,940 deletions package-lock.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "netcode",
"version": "1.0.9",
"version": "1.0.10",
"description": "NetCode for web video games",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
Expand Down Expand Up @@ -28,12 +28,12 @@
"websocket-driver": "^0.7.0"
},
"devDependencies": {
"babel-core": "^6.26.3",
"babel-loader": "^7.1.5",
"babel-preset-env": "^1.7.0",
"eslint": "^5.8.0",
"@babel/core": "^7.2.0",
"@babel/preset-env": "^7.2.0",
"babel-loader": "^8.0.4",
"eslint": "^5.9.0",
"mocha": "^5.2.0",
"webpack": "^4.25.1",
"webpack": "^4.27.0",
"webpack-cli": "^3.1.2"
}
}
4 changes: 2 additions & 2 deletions src/client/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Client from 'netcode/src/client/Client';
import BinaryEncoder from 'netcode/src/client/BinaryEncoder';
import JsonEncoder from 'netcode/src/encoder/JsonEncoder';
import BinaryEncoder from 'netcode/src/encoder/BinaryEncoder';
import Codec from 'netcode/src/encoder/codec/Codec';
import Int8Codec from 'netcode/src/encoder/codec/Int8Codec';
import Int16Codec from 'netcode/src/encoder/codec/Int16Codec';
Expand All @@ -10,7 +10,7 @@ import BooleanCodec from 'netcode/src/encoder/codec/BooleanCodec';
import StringCodec from 'netcode/src/encoder/codec/StringCodec';
import LongStringCodec from 'netcode/src/encoder/codec/LongStringCodec';

module.exports = {
export {
Client,
JsonEncoder,
BinaryEncoder,
Expand Down
4 changes: 2 additions & 2 deletions src/encoder/BinaryEncoder.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default class BinaryEncoder {
* @param {String} name
* @param {Object|Number|Boolean|String|null} data
*
* @return {String}
* @return {ArrayBuffer}
*/
encode(name, data) {
const handler = this.handlersByName.get(name);
Expand All @@ -61,7 +61,7 @@ export default class BinaryEncoder {
/**
* Decode event
*
* @param {Buffer} buffer
* @param {ArrayBuffer} buffer
*
* @return {Object}
*/
Expand Down
2 changes: 1 addition & 1 deletion src/encoder/codec/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import LongIntCodec from 'netcode/src/encoder/codec/LongIntCodec';
import StringCodec from 'netcode/src/encoder/codec/StringCodec';
import LongStringCodec from 'netcode/src/encoder/codec/LongStringCodec';

module.exports = {
export {
Codec,
BooleanCodec,
Int8Codec,
Expand Down
5 changes: 5 additions & 0 deletions src/server/Server.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ export default class Server extends EventEmitter {
const ip = request.headers['x-real-ip'] || request.connection.remoteAddress;
const driver = WebSocket.http(request, this.options);

socket.on('error', () => {
driver.close();
socket.end();
});

driver.io.write(body);
socket.pipe(driver.io).pipe(socket);

Expand Down
2 changes: 1 addition & 1 deletion src/server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import BooleanCodec from 'netcode/src/encoder/codec/BooleanCodec';
import StringCodec from 'netcode/src/encoder/codec/StringCodec';
import LongStringCodec from 'netcode/src/encoder/codec/LongStringCodec';

module.exports = {
export {
Server,
JsonEncoder,
BinaryEncoder,
Expand Down
39 changes: 24 additions & 15 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
const rules = [
{
test: /\.js$/,
exclude: /node_modules/,
use: {
loader: 'babel-loader',
options: {
presets: ['babel-preset-env']
}
}
}
];

const resolve = {
alias: {
'netcode': `${__dirname}/`,
Expand All @@ -26,7 +13,18 @@ const clientConfig = {
library: 'netcode',
libraryTarget: 'umd'
},
module: { rules },
module: {
rules: [
{
test: /\.js$/,
exclude: /node_modules/,
use: {
loader: 'babel-loader',
options: { presets: ['@babel/preset-env'] }
}
}
]
},
resolve,
};

Expand All @@ -39,7 +37,18 @@ const serverConfig = {
library: 'netcode',
libraryTarget: 'umd'
},
module: { rules },
module: {
rules: [
{
test: /\.js$/,
exclude: /node_modules/,
use: {
loader: 'babel-loader',
options: { presets: [[ '@babel/preset-env', { targets: { node: true } } ]] }
}
}
]
},
resolve,
};

Expand Down