jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Websock implicit read length 

Callers should be properly aware of how much data they need, as they
need to call rQwait() first to ensure the data is present.
This commit is contained in:
Pierre Ossman 2023-05-14 20:15:12 +02:00
parent 55ffe8fc51
commit e01dd27be4
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/websock.js
View File

@ -125,7 +125,6 @@ export default class Websock {
} }
rQshiftStr(len) { rQshiftStr(len) {
if (typeof(len) === 'undefined') { len = this._rQlen - this._rQi; }
let str = ""; let str = "";
// Handle large arrays in steps to avoid long strings on the stack // Handle large arrays in steps to avoid long strings on the stack
for (let i = 0; i < len; i += 4096) { for (let i = 0; i < len; i += 4096) {
@ -136,20 +135,17 @@ export default class Websock {
} }
rQshiftBytes(len) { rQshiftBytes(len) {
if (typeof(len) === 'undefined') { len = this._rQlen - this._rQi; }
this._rQi += len; this._rQi += len;
return new Uint8Array(this._rQ.buffer, this._rQi - len, len); return new Uint8Array(this._rQ.buffer, this._rQi - len, len);
} }
rQshiftTo(target, len) { rQshiftTo(target, len) {
if (len === undefined) { len = this._rQlen - this._rQi; }
// TODO: make this just use set with views when using a ArrayBuffer to store the rQ // TODO: make this just use set with views when using a ArrayBuffer to store the rQ
target.set(new Uint8Array(this._rQ.buffer, this._rQi, len)); target.set(new Uint8Array(this._rQ.buffer, this._rQi, len));
this._rQi += len; this._rQi += len;
} }
rQpeekBytes(len) { rQpeekBytes(len) {
if (typeof(len) === 'undefined') { len = this._rQlen - this._rQi; }
return new Uint8Array(this._rQ.buffer, this._rQi, len); return new Uint8Array(this._rQ.buffer, this._rQi, len);
} }

18
tests/test.websock.js
View File

@ -67,11 +67,6 @@ describe('Websock', function () {
expect(sock._rQlen - sock._rQi).to.equal(befLen - 3); expect(sock._rQlen - sock._rQi).to.equal(befLen - 3);
}); });
it('should shift the entire rest of the queue off if no length is given', function () {
sock.rQshiftStr();
expect(sock._rQlen - sock._rQi).to.equal(0);
});
it('should be able to handle very large strings', function () { it('should be able to handle very large strings', function () {
const BIG_LEN = 500000; const BIG_LEN = 500000;
const RQ_BIG = new Uint8Array(BIG_LEN); const RQ_BIG = new Uint8Array(BIG_LEN);
@ -90,7 +85,7 @@ describe('Websock', function () {
sock._rQ.set(RQ_BIG); sock._rQ.set(RQ_BIG);
sock._rQlen = RQ_BIG.length; sock._rQlen = RQ_BIG.length;
const shifted = sock.rQshiftStr(); const shifted = sock.rQshiftStr(BIG_LEN);
expect(shifted).to.be.equal(expected); expect(shifted).to.be.equal(expected);
expect(sock._rQlen - sock._rQi).to.equal(0); expect(sock._rQlen - sock._rQi).to.equal(0);
@ -106,11 +101,6 @@ describe('Websock', function () {
expect(shifted).to.array.equal(new Uint8Array(RQ_TEMPLATE.buffer, befRQi, 3)); expect(shifted).to.array.equal(new Uint8Array(RQ_TEMPLATE.buffer, befRQi, 3));
expect(sock._rQlen - sock._rQi).to.equal(befLen - 3); expect(sock._rQlen - sock._rQi).to.equal(befLen - 3);
}); });
it('should shift the entire rest of the queue off if no length is given', function () {
sock.rQshiftBytes();
expect(sock._rQlen - sock._rQi).to.equal(0);
});
}); });
describe('rQpeekBytes', function () { describe('rQpeekBytes', function () {
@ -130,12 +120,6 @@ describe('Websock', function () {
expect(sl).to.array.equal(new Uint8Array(RQ_TEMPLATE.buffer, 0, 2)); expect(sl).to.array.equal(new Uint8Array(RQ_TEMPLATE.buffer, 0, 2));
}); });
it('should use the rest of the receive queue if no end is given', function () {
const sl = sock.rQpeekBytes();
expect(sl).to.have.length(RQ_TEMPLATE.length);
expect(sl).to.array.equal(RQ_TEMPLATE);
});
it('should take the current rQi in to account', function () { it('should take the current rQi in to account', function () {
sock._rQi = 1; sock._rQi = 1;
expect(sock.rQpeekBytes(2)).to.array.equal(new Uint8Array(RQ_TEMPLATE.buffer, 1, 2)); expect(sock.rQpeekBytes(2)).to.array.equal(new Uint8Array(RQ_TEMPLATE.buffer, 1, 2));