api-def 0.15.0-alpha.1 → 0.15.0-alpha.2
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.
|
@@ -23,14 +23,70 @@ const makeWebSocketRequest = (context, webSocketConstructor) => {
|
|
|
23
23
|
? String(protocolHeader)
|
|
24
24
|
: undefined;
|
|
25
25
|
const webSocket = new webSocketConstructor(url.href, protocols);
|
|
26
|
+
let settled = false;
|
|
27
|
+
let handleOpen;
|
|
28
|
+
let handleError;
|
|
29
|
+
let handleClose;
|
|
30
|
+
const removeEventListener = (type, listener) => {
|
|
31
|
+
if ("removeEventListener" in webSocket) {
|
|
32
|
+
webSocket.removeEventListener(type, listener);
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
const addEventListener = (type, listener) => {
|
|
36
|
+
if ("addEventListener" in webSocket) {
|
|
37
|
+
webSocket.addEventListener(type, listener);
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
const property = `on${type}`;
|
|
41
|
+
webSocket[property] = listener;
|
|
42
|
+
};
|
|
43
|
+
const cleanup = () => {
|
|
44
|
+
removeEventListener("open", handleOpen);
|
|
45
|
+
removeEventListener("error", handleError);
|
|
46
|
+
removeEventListener("close", handleClose);
|
|
47
|
+
};
|
|
48
|
+
const promise = new Promise((resolve, reject) => {
|
|
49
|
+
handleOpen = () => {
|
|
50
|
+
settled = true;
|
|
51
|
+
cleanup();
|
|
52
|
+
resolve({
|
|
53
|
+
status: 101,
|
|
54
|
+
headers: new Headers(),
|
|
55
|
+
url: url.href,
|
|
56
|
+
webSocket,
|
|
57
|
+
});
|
|
58
|
+
};
|
|
59
|
+
handleError = (event) => {
|
|
60
|
+
settled = true;
|
|
61
|
+
cleanup();
|
|
62
|
+
reject(Object.assign(new Error("[api-def] WebSocket connection failed before opening"), {
|
|
63
|
+
cause: event,
|
|
64
|
+
}));
|
|
65
|
+
};
|
|
66
|
+
handleClose = (event) => {
|
|
67
|
+
if (settled) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
settled = true;
|
|
71
|
+
cleanup();
|
|
72
|
+
reject(Object.assign(new Error("[api-def] WebSocket connection closed before opening"), {
|
|
73
|
+
cause: event,
|
|
74
|
+
}));
|
|
75
|
+
};
|
|
76
|
+
addEventListener("open", handleOpen);
|
|
77
|
+
addEventListener("error", handleError);
|
|
78
|
+
addEventListener("close", handleClose);
|
|
79
|
+
if (webSocket.readyState === 1) {
|
|
80
|
+
handleOpen(new Event("open"));
|
|
81
|
+
}
|
|
82
|
+
});
|
|
26
83
|
return {
|
|
27
|
-
promise
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
}
|
|
33
|
-
canceler: () => webSocket.close(),
|
|
84
|
+
promise,
|
|
85
|
+
canceler: () => {
|
|
86
|
+
if (!settled) {
|
|
87
|
+
webSocket.close();
|
|
88
|
+
}
|
|
89
|
+
},
|
|
34
90
|
};
|
|
35
91
|
};
|
|
36
92
|
exports.makeWebSocketRequest = makeWebSocketRequest;
|
|
@@ -19,13 +19,69 @@ export const makeWebSocketRequest = (context, webSocketConstructor) => {
|
|
|
19
19
|
? String(protocolHeader)
|
|
20
20
|
: undefined;
|
|
21
21
|
const webSocket = new webSocketConstructor(url.href, protocols);
|
|
22
|
+
let settled = false;
|
|
23
|
+
let handleOpen;
|
|
24
|
+
let handleError;
|
|
25
|
+
let handleClose;
|
|
26
|
+
const removeEventListener = (type, listener) => {
|
|
27
|
+
if ("removeEventListener" in webSocket) {
|
|
28
|
+
webSocket.removeEventListener(type, listener);
|
|
29
|
+
}
|
|
30
|
+
};
|
|
31
|
+
const addEventListener = (type, listener) => {
|
|
32
|
+
if ("addEventListener" in webSocket) {
|
|
33
|
+
webSocket.addEventListener(type, listener);
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
const property = `on${type}`;
|
|
37
|
+
webSocket[property] = listener;
|
|
38
|
+
};
|
|
39
|
+
const cleanup = () => {
|
|
40
|
+
removeEventListener("open", handleOpen);
|
|
41
|
+
removeEventListener("error", handleError);
|
|
42
|
+
removeEventListener("close", handleClose);
|
|
43
|
+
};
|
|
44
|
+
const promise = new Promise((resolve, reject) => {
|
|
45
|
+
handleOpen = () => {
|
|
46
|
+
settled = true;
|
|
47
|
+
cleanup();
|
|
48
|
+
resolve({
|
|
49
|
+
status: 101,
|
|
50
|
+
headers: new Headers(),
|
|
51
|
+
url: url.href,
|
|
52
|
+
webSocket,
|
|
53
|
+
});
|
|
54
|
+
};
|
|
55
|
+
handleError = (event) => {
|
|
56
|
+
settled = true;
|
|
57
|
+
cleanup();
|
|
58
|
+
reject(Object.assign(new Error("[api-def] WebSocket connection failed before opening"), {
|
|
59
|
+
cause: event,
|
|
60
|
+
}));
|
|
61
|
+
};
|
|
62
|
+
handleClose = (event) => {
|
|
63
|
+
if (settled) {
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
settled = true;
|
|
67
|
+
cleanup();
|
|
68
|
+
reject(Object.assign(new Error("[api-def] WebSocket connection closed before opening"), {
|
|
69
|
+
cause: event,
|
|
70
|
+
}));
|
|
71
|
+
};
|
|
72
|
+
addEventListener("open", handleOpen);
|
|
73
|
+
addEventListener("error", handleError);
|
|
74
|
+
addEventListener("close", handleClose);
|
|
75
|
+
if (webSocket.readyState === 1) {
|
|
76
|
+
handleOpen(new Event("open"));
|
|
77
|
+
}
|
|
78
|
+
});
|
|
22
79
|
return {
|
|
23
|
-
promise
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
}
|
|
29
|
-
canceler: () => webSocket.close(),
|
|
80
|
+
promise,
|
|
81
|
+
canceler: () => {
|
|
82
|
+
if (!settled) {
|
|
83
|
+
webSocket.close();
|
|
84
|
+
}
|
|
85
|
+
},
|
|
30
86
|
};
|
|
31
87
|
};
|