Skip to content

Update DeclarativeResponse: add binary and writeStatus support. #1182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update DeclarativeResponse: add binary and writeStatus support. #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 18 additions & 6 deletions src/AppWrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,9 +332,9 @@ void uWS_App_get(F f, const FunctionCallbackInfo<Value> &args) {
switch(remainingInstructions[0]) {
case 0: {
/* opCode END */
uint16_t length;
memcpy(&length, remainingInstructions.data() + 1, 2);
remainingInstructions.remove_prefix(3); // Skip opCode and length bytes
uint32_t length;
memcpy(&length, remainingInstructions.data() + 1, 4);
remainingInstructions.remove_prefix(5); // Skip opCode and length bytes

res->end(remainingInstructions.substr(0, length));
remainingInstructions.remove_prefix(length);
Expand Down Expand Up @@ -391,9 +391,9 @@ void uWS_App_get(F f, const FunctionCallbackInfo<Value> &args) {
break;
case 5: {
/* opCode WRITE */
uint16_t length;
memcpy(&length, remainingInstructions.data() + 1, 2);
remainingInstructions.remove_prefix(3); // Skip opCode and length bytes
uint32_t length;
memcpy(&length, remainingInstructions.data() + 1, 4);
remainingInstructions.remove_prefix(5); // Skip opCode and length bytes

std::string_view valueString(remainingInstructions.data(), length);
remainingInstructions.remove_prefix(length);
Expand All @@ -413,6 +413,18 @@ void uWS_App_get(F f, const FunctionCallbackInfo<Value> &args) {
res->write(req->getParameter(keyString));
}
break;
case 7: {
/* opCode WRITE_STATUS */
uint8_t statusLength;
memcpy(&statusLength, remainingInstructions.data() + 1, 1);
remainingInstructions.remove_prefix(2); // Skip opCode and status length bytes

std::string_view statusString(remainingInstructions.data(), statusLength);
remainingInstructions.remove_prefix(statusLength);

res->writeStatus(statusString);
}
break;
}
}

Expand Down
38 changes: 23 additions & 15 deletions src/uws.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,36 @@ module.exports = (() => {
}
})();

const MAX_U8 = Math.pow(2, 8) - 1;
const textEncoder = new TextEncoder();
const toArrayBuffer = (value) => {
if (typeof value === 'string') return textEncoder.encode(value);
else if (!value) return new Uint8Array(0);
else return value;
};

module.exports.DeclarativeResponse = class DeclarativeResponse {
constructor() {
this.instructions = [];
}

// Utility method to encode text and append instruction
_appendInstruction(opcode, ...text) {
// Append instruction and 1-byte length values
_appendInstruction(opcode, ...values) {
this.instructions.push(opcode);
text.forEach(str => {
const bytes = (typeof str === 'string') ? new TextEncoder().encode(str) : str;
this.instructions.push(bytes.length, ...bytes);
values.forEach(value => {
const arrayBuffer = toArrayBuffer(value);
const length = arrayBuffer.length;
if (length > MAX_U8) throw new RangeError('Data length exceeds ' + MAX_U8);
this.instructions.push(length, ...arrayBuffer);
});
}

// Utility method to append 2-byte length text in little-endian format
_appendInstructionWithLength(opcode, text) {
this.instructions.push(opcode);
const bytes = new TextEncoder().encode(text);
const length = bytes.length;
this.instructions.push(length & 0xff, (length >> 8) & 0xff, ...bytes);
// Append instruction and 4-byte length value
_appendInstructionWithLength(opcode, value) {
const arrayBuffer = toArrayBuffer(value);
const lengthBuffer = new Buffer.alloc(4);
lengthBuffer.writeUInt32LE(arrayBuffer.length);
this.instructions.push(opcode, ...lengthBuffer, ...arrayBuffer);
}

writeHeader(key, value) { return this._appendInstruction(1, key, value), this; }
Expand All @@ -51,11 +61,9 @@ module.exports.DeclarativeResponse = class DeclarativeResponse {
writeHeaderValue(key) { return this._appendInstruction(4, key), this; }
write(value) { return this._appendInstructionWithLength(5, value), this; }
writeParameterValue(key) { return this._appendInstruction(6, key), this; }

writeStatus(status) { return this._appendInstruction(7, status), this; }
end(value) {
const bytes = new TextEncoder().encode(value);
const length = bytes.length;
this.instructions.push(0, length & 0xff, (length >> 8) & 0xff, ...bytes);
this._appendInstructionWithLength(0, value);
return new Uint8Array(this.instructions).buffer;
}
}