@sanctumterra/raknet 1.3.66 → 1.3.67
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAmB,KAAK,MAAM,EAAgB,MAAM,YAAY,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAEN,KAAK,OAAO,EACZ,KAAK,aAAa,EAElB,KAAK,KAAK,EAOV,KAAK,QAAQ,EACb,MAAM,EAGN,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,KAAK,aAAa,EAAwB,MAAM,kBAAkB,CAAC;AAI5E,qBAAa,MAAO,SAAQ,OAAO,CAAC,YAAY,CAAC;IACzC,MAAM,EAAG,MAAM,CAAC;IAChB,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,OAAO,CAAkB;IAC1B,aAAa,EAAG,OAAO,CAAC;IAExB,MAAM,SAAuB;gBAExB,OAAO,GAAE,OAAO,CAAC,aAAa,CAAwB;IAO3D,UAAU;IAeJ,IAAI,IAAI,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAkBrC,OAAO,IAAI,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAmB,KAAK,MAAM,EAAgB,MAAM,YAAY,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAEN,KAAK,OAAO,EACZ,KAAK,aAAa,EAElB,KAAK,KAAK,EAOV,KAAK,QAAQ,EACb,MAAM,EAGN,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,KAAK,aAAa,EAAwB,MAAM,kBAAkB,CAAC;AAI5E,qBAAa,MAAO,SAAQ,OAAO,CAAC,YAAY,CAAC;IACzC,MAAM,EAAG,MAAM,CAAC;IAChB,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,OAAO,CAAkB;IAC1B,aAAa,EAAG,OAAO,CAAC;IAExB,MAAM,SAAuB;gBAExB,OAAO,GAAE,OAAO,CAAC,aAAa,CAAwB;IAO3D,UAAU;IAeJ,IAAI,IAAI,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAkBrC,OAAO,IAAI,OAAO,CAAC,aAAa,CAAC;IA2EvC,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAIjD,IAAI,CAAC,MAAM,EAAE,MAAM;IAcnB,OAAO,IAAI,IAAI;CAQtB"}
|
package/dist/client/client.js
CHANGED
|
@@ -57,39 +57,58 @@ class Client extends emitter_1.Emitter {
|
|
|
57
57
|
}
|
|
58
58
|
this.status = proto_1.Status.Connecting;
|
|
59
59
|
this.initSocket();
|
|
60
|
-
this.timer = setInterval(() => this.emit("tick"),
|
|
60
|
+
this.timer = setInterval(() => this.emit("tick"), 50);
|
|
61
61
|
try {
|
|
62
62
|
const advertisement = await this.ping();
|
|
63
63
|
if (!advertisement)
|
|
64
64
|
throw new Error("Failed to get server advertisement");
|
|
65
65
|
return new Promise((resolve, reject) => {
|
|
66
66
|
let isResolved = false;
|
|
67
|
-
|
|
67
|
+
let shouldContinueSending = true;
|
|
68
|
+
const cleanup = () => {
|
|
69
|
+
clearTimeout(connectionTimeout);
|
|
70
|
+
clearInterval(requestInterval);
|
|
68
71
|
if (!isResolved) {
|
|
72
|
+
utils_1.Logger.error("Could not resolve connection.");
|
|
69
73
|
this.cleanup();
|
|
70
|
-
reject(new Error("Connection timed out"));
|
|
71
74
|
}
|
|
75
|
+
};
|
|
76
|
+
const connectionTimeout = setTimeout(() => {
|
|
77
|
+
cleanup();
|
|
78
|
+
reject(new Error("Connection timed out"));
|
|
72
79
|
}, this.options.timeout);
|
|
73
80
|
const request = new proto_1.OpenConnectionRequestOne();
|
|
74
81
|
request.mtu = this.options.mtuSize;
|
|
75
82
|
request.protocol = this.options.protocolVersion;
|
|
83
|
+
this.on("open-connection-reply-two", (packet) => {
|
|
84
|
+
const mtu = packet.mtu;
|
|
85
|
+
if (mtu > 400 && mtu < 1500) {
|
|
86
|
+
shouldContinueSending = false;
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
cleanup();
|
|
90
|
+
reject(new Error(`Invalid MTU size: ${mtu}`));
|
|
91
|
+
}
|
|
92
|
+
});
|
|
76
93
|
this.emit("open-connection-request-one", request);
|
|
77
94
|
this.send(request.serialize());
|
|
78
95
|
const requestInterval = setInterval(() => {
|
|
79
|
-
if (!isResolved) {
|
|
96
|
+
if (!isResolved && shouldContinueSending) {
|
|
80
97
|
this.send(request.serialize());
|
|
81
98
|
}
|
|
82
|
-
},
|
|
99
|
+
}, 50);
|
|
83
100
|
this.onceAfter("new-incoming-connection", () => {
|
|
84
101
|
if (!isResolved) {
|
|
85
|
-
clearTimeout(connectionTimeout);
|
|
86
|
-
clearInterval(requestInterval);
|
|
87
102
|
isResolved = true;
|
|
88
103
|
this.emit("connect");
|
|
89
104
|
this.status = proto_1.Status.Connected;
|
|
90
105
|
resolve(advertisement);
|
|
91
106
|
}
|
|
92
107
|
});
|
|
108
|
+
this.once("error", (error) => {
|
|
109
|
+
cleanup();
|
|
110
|
+
reject(error);
|
|
111
|
+
});
|
|
93
112
|
});
|
|
94
113
|
}
|
|
95
114
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"framer.d.ts","sourceRoot":"","sources":["../../src/client/framer.ts"],"names":[],"mappings":"AAAA,OAAO,EAIN,KAAK,EAGL,QAAQ,EAWR,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,qBAAa,MAAM;IAClB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,iBAAiB,CAAM;IAC/B,OAAO,CAAC,sBAAsB,CAA0B;IACxD,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,yBAAyB,CAAmC;IACpE,OAAO,CAAC,eAAe,CAAmC;IAC1D,SAAS,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAa;IAC1E,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CACvD;IAEJ,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,gBAAgB,EAAE,QAAQ,CAAC;IAClC,SAAS,CAAC,cAAc,SAAK;IAC7B,SAAS,CAAC,gBAAgB,SAAK;IAC/B,SAAS,CAAC,mBAAmB,SAAK;IAClC,SAAS,CAAC,YAAY,aAAoB;IACnC,YAAY,uBAA8B;gBAErC,MAAM,EAAE,MAAM;IAYnB,IAAI;IA0BJ,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;
|
|
1
|
+
{"version":3,"file":"framer.d.ts","sourceRoot":"","sources":["../../src/client/framer.ts"],"names":[],"mappings":"AAAA,OAAO,EAIN,KAAK,EAGL,QAAQ,EAWR,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,qBAAa,MAAM;IAClB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,iBAAiB,CAAM;IAC/B,OAAO,CAAC,sBAAsB,CAA0B;IACxD,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,yBAAyB,CAAmC;IACpE,OAAO,CAAC,eAAe,CAAmC;IAC1D,SAAS,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAa;IAC1E,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CACvD;IAEJ,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,gBAAgB,EAAE,QAAQ,CAAC;IAClC,SAAS,CAAC,cAAc,SAAK;IAC7B,SAAS,CAAC,gBAAgB,SAAK;IAC/B,SAAS,CAAC,mBAAmB,SAAK;IAClC,SAAS,CAAC,YAAY,aAAoB;IACnC,YAAY,uBAA8B;gBAErC,MAAM,EAAE,MAAM;IAYnB,IAAI;IA0BJ,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU;IAsE1D,OAAO,CAAC,YAAY;IAgDb,MAAM,CAAC,QAAQ,EAAE,QAAQ;IA6ChC,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,aAAa;IAmBrB,OAAO,CAAC,oBAAoB;IAsB5B,OAAO,CAAC,eAAe;IAwBvB,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,4BAA4B;IA6B7B,YAAY,CAClB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,QAA0B,GAClC,IAAI;IAQA,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAuBxD,OAAO,CAAC,kBAAkB;IAkB1B,OAAO,CAAC,gBAAgB;IAwBxB,OAAO,CAAC,UAAU;IAiBX,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAStC"}
|
package/dist/client/framer.js
CHANGED
|
@@ -107,21 +107,6 @@ class Framer {
|
|
|
107
107
|
conReq.useSecurity = false;
|
|
108
108
|
this.client.emit("connection-request", conReq);
|
|
109
109
|
this.client.framer.frameAndSend(conReq.serialize(), proto_1.Priority.Immediate);
|
|
110
|
-
let connectionAttempts = 1;
|
|
111
|
-
const maxAttempts = 3;
|
|
112
|
-
const connectionInterval = setInterval(() => {
|
|
113
|
-
if (connectionAttempts >= maxAttempts) {
|
|
114
|
-
clearInterval(connectionInterval);
|
|
115
|
-
this.client.cleanup();
|
|
116
|
-
this.client.emit("error", new Error("Connection request timed out"));
|
|
117
|
-
return;
|
|
118
|
-
}
|
|
119
|
-
this.client.framer.frameAndSend(conReq.serialize(), proto_1.Priority.Immediate);
|
|
120
|
-
connectionAttempts++;
|
|
121
|
-
}, 30);
|
|
122
|
-
this.client.once("new-incoming-connection", () => {
|
|
123
|
-
clearInterval(connectionInterval);
|
|
124
|
-
});
|
|
125
110
|
break;
|
|
126
111
|
}
|
|
127
112
|
case proto_1.Packet.FrameSet: {
|