Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F3011602
D13382.id44301.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
2 KB
Referenced Files
None
Subscribers
None
D13382.id44301.diff
View Options
diff --git a/lib/tunnelbroker/tunnelbroker-context.js b/lib/tunnelbroker/tunnelbroker-context.js
--- a/lib/tunnelbroker/tunnelbroker-context.js
+++ b/lib/tunnelbroker/tunnelbroker-context.js
@@ -62,6 +62,7 @@
}
| {
+connected: false,
+ +retryCount: number,
};
type TunnelbrokerContextType = {
@@ -87,6 +88,8 @@
+secondaryTunnelbrokerConnection?: SecondaryTunnelbrokerConnection,
};
+const tunnelbrokerConnectionRetryInterval = 5000; // ms
+
function getTunnelbrokerDeviceType(): TunnelbrokerDeviceTypes {
return isWebPlatform(getConfig().platformDetails.platform) ? 'web' : 'mobile';
}
@@ -142,7 +145,7 @@
React.useRef<?TunnelbrokerInitializationMessage>(null);
const [socketState, setSocketState] = React.useState<TunnelbrokerSocketState>(
- { connected: false },
+ { connected: false, retryCount: 0 },
);
const listeners = React.useRef<Set<TunnelbrokerSocketListener>>(new Set());
const socket = React.useRef<?WebSocket>(null);
@@ -165,7 +168,7 @@
stopHeartbeatTimeout();
heartbeatTimeoutID.current = setTimeout(() => {
socket.current?.close();
- setSocketState({ connected: false });
+ setSocketState({ connected: false, retryCount: 0 });
}, tunnelbrokerHeartbeatTimeout);
}, [stopHeartbeatTimeout]);
@@ -220,10 +223,25 @@
tunnelbrokerSocket.onclose = () => {
// this triggers the effect hook again and reconnect
- setSocketState({ connected: false });
+ setSocketState(prev => ({
+ connected: false,
+ retryCount: prev.connected ? 0 : prev.retryCount,
+ }));
onClose?.();
socket.current = null;
console.log('Connection to Tunnelbroker closed');
+ setTimeout(() => {
+ if (!socket.current && initMessage) {
+ console.log(
+ 'Retrying Tunnelbroker connection. Attempt:',
+ socketState.retryCount + 1,
+ );
+ setSocketState(prev => ({
+ connected: false,
+ retryCount: prev.connected ? 0 : prev.retryCount + 1,
+ }));
+ }
+ }, tunnelbrokerConnectionRetryInterval);
};
tunnelbrokerSocket.onerror = e => {
console.log('Tunnelbroker socket error:', e.message);
@@ -272,7 +290,10 @@
'received ConnectionInitializationResponse with status: Success for already connected socket',
);
} else {
- setSocketState({ connected: false });
+ setSocketState(prev => ({
+ connected: false,
+ retryCount: prev.retryCount ?? 0 + 1,
+ }));
console.log(
'creating session with Tunnelbroker error:',
message.status.data,
@@ -320,6 +341,7 @@
onClose,
createInitMessage,
socketState.connected,
+ socketState.retryCount,
]);
const sendMessage: (request: DeviceToTunnelbrokerRequest) => Promise<void> =
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Oct 20, 1:40 AM (18 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2328290
Default Alt Text
D13382.id44301.diff (2 KB)
Attached To
Mode
D13382: [lib] Retry Tunnelbroker connection after closing
Attached
Detach File
Event Timeline
Log In to Comment