Skip to content

Commit b4df9eb

Browse files
committed
Initial upgrade to v18
1 parent 550c49d commit b4df9eb

6 files changed

Lines changed: 147 additions & 16 deletions

File tree

‎examples/Upgrade.js‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/* A quite detailed WebSockets example */
2+
3+
const uWS = require('../dist/uws.js');
4+
const port = 9001;
5+
6+
const app = uWS./*SSL*/App({
7+
key_file_name: 'misc/key.pem',
8+
cert_file_name: 'misc/cert.pem',
9+
passphrase: '1234'
10+
}).ws('/*', {
11+
/* Options */
12+
compression: 0,
13+
maxPayloadLength: 16 * 1024 * 1024,
14+
idleTimeout: 10,
15+
/* Handlers */
16+
upgrade: (res, req, context) => {
17+
console.log('An Http connection wants to become WebSocket, URL: ' + req.getUrl() + '!');
18+
19+
res.upgrade({url: req.getUrl()}, req.getHeader('sec-websocket-key'),
20+
req.getHeader('sec-websocket-protocol'),
21+
req.getHeader('sec-websocket-extensions'),
22+
context);
23+
},
24+
open: (ws) => {
25+
console.log('A WebSocket connected with URL: ' + ws.userData.url);
26+
},
27+
message: (ws, message, isBinary) => {
28+
/* Ok is false if backpressure was built up, wait for drain */
29+
let ok = ws.send(message, isBinary);
30+
},
31+
drain: (ws) => {
32+
console.log('WebSocket backpressure: ' + ws.getBufferedAmount());
33+
},
34+
close: (ws, code, message) => {
35+
console.log('WebSocket closed');
36+
}
37+
}).any('/*', (res, req) => {
38+
res.end('Nothing to see here!');
39+
}).listen(port, (token) => {
40+
if (token) {
41+
console.log('Listening to port ' + port);
42+
} else {
43+
console.log('Failed to listen to port ' + port);
44+
}
45+
});

‎examples/WebSockets.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ const app = uWS./*SSL*/App({
1313
maxPayloadLength: 16 * 1024 * 1024,
1414
idleTimeout: 10,
1515
/* Handlers */
16-
open: (ws, req) => {
17-
console.log('A WebSocket connected via URL: ' + req.getUrl() + '!');
16+
open: (ws) => {
17+
console.log('A WebSocket connected!');
1818
},
1919
message: (ws, message, isBinary) => {
2020
/* Ok is false if backpressure was built up, wait for drain */

‎src/AppWrapper.h‎

Lines changed: 40 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,14 @@ void uWS_App_ws(const FunctionCallbackInfo<Value> &args) {
2020
return;
2121
}
2222

23+
UniquePersistent<Function> upgradePf;
2324
UniquePersistent<Function> openPf;
2425
UniquePersistent<Function> messagePf;
2526
UniquePersistent<Function> drainPf;
2627
UniquePersistent<Function> closePf;
2728
UniquePersistent<Function> pingPf;
2829
UniquePersistent<Function> pongPf;
2930

30-
struct PerSocketData {
31-
UniquePersistent<Object> *socketPf;
32-
};
33-
3431
/* Get the behavior object */
3532
if (args.Length() == 2) {
3633
Local<Object> behaviorObject = Local<Object>::Cast(args[1]);
@@ -59,6 +56,8 @@ void uWS_App_ws(const FunctionCallbackInfo<Value> &args) {
5956
behavior.maxBackpressure = maybeMaxBackpressure.ToLocalChecked()->Int32Value(isolate->GetCurrentContext()).ToChecked();
6057
}
6158

59+
/* Upgrade */
60+
upgradePf.Reset(args.GetIsolate(), Local<Function>::Cast(behaviorObject->Get(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "upgrade", NewStringType::kNormal).ToLocalChecked()).ToLocalChecked()));
6261
/* Open */
6362
openPf.Reset(args.GetIsolate(), Local<Function>::Cast(behaviorObject->Get(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "open", NewStringType::kNormal).ToLocalChecked()).ToLocalChecked()));
6463
/* Message */
@@ -74,28 +73,58 @@ void uWS_App_ws(const FunctionCallbackInfo<Value> &args) {
7473

7574
}
7675

76+
/* Upgrade handler is always optional */
77+
if (upgradePf != Undefined(isolate)) {
78+
behavior.upgrade = [upgradePf = std::move(upgradePf), perContextData](auto *res, auto *req, auto *context) {
79+
Isolate *isolate = perContextData->isolate;
80+
HandleScope hs(isolate);
81+
82+
Local<Function> upgradeLf = Local<Function>::New(isolate, upgradePf);
83+
Local<Object> resObject = perContextData->resTemplate[getAppTypeIndex<APP>()].Get(isolate)->Clone();
84+
resObject->SetAlignedPointerInInternalField(0, res);
85+
86+
Local<Object> reqObject = perContextData->reqTemplate.Get(isolate)->Clone();
87+
reqObject->SetAlignedPointerInInternalField(0, req);
88+
89+
Local<Value> argv[3] = {resObject, reqObject, External::New(isolate, (void *) context)};
90+
CallJS(isolate, upgradeLf, 3, argv);
91+
92+
/* Properly invalidate req */
93+
reqObject->SetAlignedPointerInInternalField(0, nullptr);
94+
95+
/* µWS itself will terminate if not responded and not attached
96+
* onAborted handler, so we can assume it's done */
97+
};
98+
}
99+
77100
/* Open handler is NOT optional for the wrapper */
78-
behavior.open = [openPf = std::move(openPf), perContextData](auto *ws, auto *req) {
101+
behavior.open = [openPf = std::move(openPf), perContextData](auto *ws) {
79102
Isolate *isolate = perContextData->isolate;
80103
HandleScope hs(isolate);
81104

105+
printf("Open event called!\n");
106+
107+
/* Retrieve temporary userData object */
108+
PerSocketData *perSocketData = (PerSocketData *) ws->getUserData();
109+
110+
// if socketPf is nullptr we have nothing to copy
111+
Local<Object> userData = Local<Object>::New(isolate, *(perSocketData->socketPf));
112+
82113
/* Create a new websocket object */
83114
Local<Object> wsObject = perContextData->wsTemplate[getAppTypeIndex<APP>()].Get(isolate)->Clone();
84115
wsObject->SetAlignedPointerInInternalField(0, ws);
85116

86-
/* Create the HttpRequest wrapper */
87-
Local<Object> reqObject = perContextData->reqTemplate.Get(isolate)->Clone();
88-
reqObject->SetAlignedPointerInInternalField(0, req);
117+
/* Copy entires from userData */
118+
wsObject->Set(isolate->GetCurrentContext(), String::NewFromUtf8(isolate, "userData"), userData);
89119

90120
/* Attach a new V8 object with pointer to us, to us */
91-
PerSocketData *perSocketData = (PerSocketData *) ws->getUserData();
92121
perSocketData->socketPf = new UniquePersistent<Object>;
93122
perSocketData->socketPf->Reset(isolate, wsObject);
94123

95124
Local<Function> openLf = Local<Function>::New(isolate, openPf);
96125
if (!openLf->IsUndefined()) {
97-
Local<Value> argv[] = {wsObject, reqObject};
98-
CallJS(isolate, openLf, 2, argv);
126+
Local<Value> argv[] = {wsObject};
127+
CallJS(isolate, openLf, 1, argv);
99128
}
100129
};
101130

‎src/HttpResponseWrapper.h‎

Lines changed: 55 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ struct HttpResponseWrapper {
226226
if (value.isInvalid(args)) {
227227
return;
228228
}
229-
res->writeHeader(header.getString(),value.getString());
229+
res->writeHeader(header.getString(), value.getString());
230230

231231
args.GetReturnValue().Set(args.Holder());
232232
}
@@ -248,6 +248,58 @@ struct HttpResponseWrapper {
248248
}
249249
}
250250

251+
template <bool SSL>
252+
static void res_upgrade(const FunctionCallbackInfo<Value> &args) {
253+
Isolate *isolate = args.GetIsolate();
254+
auto *res = getHttpResponse<SSL>(args);
255+
if (res) {
256+
257+
printf("Calling upgrade!\n");
258+
259+
if (args.Length() != 5) {
260+
return;
261+
}
262+
263+
/* We are being passed userData (wsObject) */
264+
//Local<Object> wsObject = args[0];
265+
//Local<String> secWebSocketKey = args[1];
266+
//Local<String> secWebSocketProtocol = args[2];
267+
//Local<String> secWebSocketExtensions = args[3];
268+
//Local<External> context = args[4];
269+
270+
271+
NativeString secWebSocketKey(args.GetIsolate(), args[1]);
272+
if (secWebSocketKey.isInvalid(args)) {
273+
return;
274+
}
275+
276+
NativeString secWebSocketProtocol(args.GetIsolate(), args[2]);
277+
if (secWebSocketProtocol.isInvalid(args)) {
278+
return;
279+
}
280+
281+
NativeString secWebSocketExtensions(args.GetIsolate(), args[3]);
282+
if (secWebSocketExtensions.isInvalid(args)) {
283+
return;
284+
}
285+
286+
auto *context = (struct us_socket_context_t *) Local<External>::Cast(args[4])->Value();
287+
288+
invalidateResObject(args);
289+
290+
UniquePersistent<Object> userData;
291+
userData.Reset(isolate, Local<Object>::Cast(args[0]));
292+
293+
printf("Upgrading now!\n");
294+
res->template upgrade<PerSocketData>({
295+
.socketPf = &userData
296+
}, secWebSocketKey.getString(), secWebSocketProtocol.getString(),
297+
secWebSocketExtensions.getString(), context);
298+
299+
/* Nothing is returned */
300+
}
301+
}
302+
251303
template <bool SSL>
252304
static Local<Object> init(Isolate *isolate) {
253305
Local<FunctionTemplate> resTemplateLocal = FunctionTemplate::New(isolate);
@@ -271,10 +323,11 @@ struct HttpResponseWrapper {
271323
resTemplateLocal->PrototypeTemplate()->Set(String::NewFromUtf8(isolate, "onData", NewStringType::kNormal).ToLocalChecked(), FunctionTemplate::New(isolate, res_onData<SSL>));
272324
resTemplateLocal->PrototypeTemplate()->Set(String::NewFromUtf8(isolate, "getRemoteAddress", NewStringType::kNormal).ToLocalChecked(), FunctionTemplate::New(isolate, res_getRemoteAddress<SSL>));
273325
resTemplateLocal->PrototypeTemplate()->Set(String::NewFromUtf8(isolate, "cork", NewStringType::kNormal).ToLocalChecked(), FunctionTemplate::New(isolate, res_cork<SSL>));
326+
resTemplateLocal->PrototypeTemplate()->Set(String::NewFromUtf8(isolate, "upgrade", NewStringType::kNormal).ToLocalChecked(), FunctionTemplate::New(isolate, res_upgrade<SSL>));
274327

275328
/* Create our template */
276329
Local<Object> resObjectLocal = resTemplateLocal->GetFunction(isolate->GetCurrentContext()).ToLocalChecked()->NewInstance(isolate->GetCurrentContext()).ToLocalChecked();
277-
330+
278331
return resObjectLocal;
279332
}
280333
};

‎src/Utilities.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ MaybeLocal<Value> CallJS(Isolate *isolate, Local<Function> f, int argc, Local<Va
1717
}
1818
}
1919

20+
struct PerSocketData {
21+
UniquePersistent<Object> *socketPf = nullptr;
22+
};
23+
2024
struct PerContextData {
2125
Isolate *isolate;
2226
UniquePersistent<Object> reqTemplate;

0 commit comments

Comments
 (0)