@theia/core 1.45.0 → 1.45.1
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.
- package/README.md +6 -6
- package/lib/browser/messaging/ws-connection-source.d.ts +2 -0
- package/lib/browser/messaging/ws-connection-source.d.ts.map +1 -1
- package/lib/browser/messaging/ws-connection-source.js +38 -22
- package/lib/browser/messaging/ws-connection-source.js.map +1 -1
- package/lib/node/messaging/websocket-frontend-connection-service.d.ts +2 -1
- package/lib/node/messaging/websocket-frontend-connection-service.d.ts.map +1 -1
- package/lib/node/messaging/websocket-frontend-connection-service.js +8 -3
- package/lib/node/messaging/websocket-frontend-connection-service.js.map +1 -1
- package/package.json +6 -6
- package/src/browser/messaging/ws-connection-source.ts +41 -21
- package/src/node/messaging/websocket-frontend-connection-service.ts +10 -5
package/README.md
CHANGED
|
@@ -84,12 +84,12 @@ export class SomeClass {
|
|
|
84
84
|
- `@phosphor/signaling` (from [`@phosphor/signaling@1`](https://www.npmjs.com/package/@phosphor/signaling))
|
|
85
85
|
- `@phosphor/virtualdom` (from [`@phosphor/virtualdom@1`](https://www.npmjs.com/package/@phosphor/virtualdom))
|
|
86
86
|
- `@phosphor/widgets` (from [`@phosphor/widgets@1`](https://www.npmjs.com/package/@phosphor/widgets))
|
|
87
|
-
- `@theia/application-package` (from [`@theia/application-package@1.45.
|
|
88
|
-
- `@theia/application-package/lib/api` (from [`@theia/application-package@1.45.
|
|
89
|
-
- `@theia/application-package/lib/environment` (from [`@theia/application-package@1.45.
|
|
90
|
-
- `@theia/request` (from [`@theia/request@1.45.
|
|
91
|
-
- `@theia/request/lib/proxy` (from [`@theia/request@1.45.
|
|
92
|
-
- `@theia/request/lib/node-request-service` (from [`@theia/request@1.45.
|
|
87
|
+
- `@theia/application-package` (from [`@theia/application-package@1.45.1`](https://www.npmjs.com/package/@theia/application-package/v/1.45.1))
|
|
88
|
+
- `@theia/application-package/lib/api` (from [`@theia/application-package@1.45.1`](https://www.npmjs.com/package/@theia/application-package/v/1.45.1))
|
|
89
|
+
- `@theia/application-package/lib/environment` (from [`@theia/application-package@1.45.1`](https://www.npmjs.com/package/@theia/application-package/v/1.45.1))
|
|
90
|
+
- `@theia/request` (from [`@theia/request@1.45.1`](https://www.npmjs.com/package/@theia/request/v/1.45.1))
|
|
91
|
+
- `@theia/request/lib/proxy` (from [`@theia/request@1.45.1`](https://www.npmjs.com/package/@theia/request/v/1.45.1))
|
|
92
|
+
- `@theia/request/lib/node-request-service` (from [`@theia/request@1.45.1`](https://www.npmjs.com/package/@theia/request/v/1.45.1))
|
|
93
93
|
- `fs-extra` (from [`fs-extra@^4.0.2`](https://www.npmjs.com/package/fs-extra))
|
|
94
94
|
- `fuzzy` (from [`fuzzy@^0.1.3`](https://www.npmjs.com/package/fuzzy))
|
|
95
95
|
- `inversify` (from [`inversify@^6.0.1`](https://www.npmjs.com/package/inversify))
|
|
@@ -20,6 +20,8 @@ export declare class WebSocketConnectionSource implements ConnectionSource {
|
|
|
20
20
|
get onIncomingMessageActivity(): Event<void>;
|
|
21
21
|
constructor();
|
|
22
22
|
openSocket(): void;
|
|
23
|
+
protected negogiateReconnect(): void;
|
|
24
|
+
protected negotiateInitialConnect(): void;
|
|
23
25
|
protected handleSocketConnected(): void;
|
|
24
26
|
connectNewChannel(): void;
|
|
25
27
|
protected createChannel(): AbstractChannel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-connection-source.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-source.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAoC,OAAO,EAAE,KAAK,EAAgB,MAAM,cAAc,CAAC;AACxH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAM,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAK5D,qBACa,yBAA0B,YAAW,gBAAgB;IAC9D,MAAM,CAAC,QAAQ,CAAC,aAAa,YAAY;IAGzC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAE1D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA2B;IAEvD,OAAO,CAAC,OAAO,CAAS;IACxB,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,SAAS,CAAC,cAAc,EAAE,eAAe,CAAC;IAE1C,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,OAAO,CAAC,OAAO,CAAC,CAAiB;IAChF,IAAI,mBAAmB,IAAI,KAAK,CAAC,OAAO,CAAC,CAExC;IAED,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACzE,IAAI,eAAe,IAAI,KAAK,CAAC,IAAI,CAAC,CAEjC;IAED,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IAC1E,IAAI,gBAAgB,IAAI,KAAK,CAAC,IAAI,CAAC,CAElC;IAED,SAAS,CAAC,QAAQ,CAAC,gCAAgC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACnF,IAAI,yBAAyB,IAAI,KAAK,CAAC,IAAI,CAAC,CAE3C;;IAMD,UAAU,IAAI,IAAI;IAqBlB,SAAS,CAAC,qBAAqB,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"ws-connection-source.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-source.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAoC,OAAO,EAAE,KAAK,EAAgB,MAAM,cAAc,CAAC;AACxH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAM,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAK5D,qBACa,yBAA0B,YAAW,gBAAgB;IAC9D,MAAM,CAAC,QAAQ,CAAC,aAAa,YAAY;IAGzC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAE1D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA2B;IAEvD,OAAO,CAAC,OAAO,CAAS;IACxB,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,SAAS,CAAC,cAAc,EAAE,eAAe,CAAC;IAE1C,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,OAAO,CAAC,OAAO,CAAC,CAAiB;IAChF,IAAI,mBAAmB,IAAI,KAAK,CAAC,OAAO,CAAC,CAExC;IAED,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACzE,IAAI,eAAe,IAAI,KAAK,CAAC,IAAI,CAAC,CAEjC;IAED,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IAC1E,IAAI,gBAAgB,IAAI,KAAK,CAAC,IAAI,CAAC,CAElC;IAED,SAAS,CAAC,QAAQ,CAAC,gCAAgC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACnF,IAAI,yBAAyB,IAAI,KAAK,CAAC,IAAI,CAAC,CAE3C;;IAMD,UAAU,IAAI,IAAI;IAqBlB,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAyBpC,SAAS,CAAC,uBAAuB,IAAI,IAAI;IAazC,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAQvC,iBAAiB,IAAI,IAAI;IAUzB,SAAS,CAAC,aAAa,IAAI,eAAe;IAoC1C;;OAEG;IACH,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAMlD,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAItD,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ;IAIhD;;OAEG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAe9C;;OAEG;IACH,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAUhE"}
|
|
@@ -76,40 +76,56 @@ let WebSocketConnectionSource = class WebSocketConnectionSource {
|
|
|
76
76
|
});
|
|
77
77
|
this._socket.connect();
|
|
78
78
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
79
|
+
negogiateReconnect() {
|
|
80
|
+
const reconnectListener = (hasConnection) => {
|
|
81
|
+
this._socket.off(connection_management_1.ConnectionManagementMessages.RECONNECT, reconnectListener);
|
|
82
|
+
if (hasConnection) {
|
|
83
|
+
console.info(`reconnect succeeded on ${this.socket.id}`);
|
|
84
|
+
this.writeBuffer.flush(this.socket);
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
if (frontend_application_config_provider_1.FrontendApplicationConfigProvider.get().reloadOnReconnect) {
|
|
88
|
+
window.location.reload(); // this might happen in the preload module, when we have no window service yet
|
|
85
89
|
}
|
|
86
90
|
else {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
91
|
+
console.info(`reconnect failed on ${this.socket.id}`);
|
|
92
|
+
this.currentChannel.onCloseEmitter.fire({ reason: 'reconnecting channel' });
|
|
93
|
+
this.currentChannel.close();
|
|
94
|
+
this.writeBuffer.drain();
|
|
95
|
+
this.socket.disconnect();
|
|
96
|
+
this.socket.connect();
|
|
97
|
+
this.negotiateInitialConnect();
|
|
93
98
|
}
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
|
|
99
|
+
}
|
|
100
|
+
};
|
|
101
|
+
this._socket.on(connection_management_1.ConnectionManagementMessages.RECONNECT, reconnectListener);
|
|
102
|
+
console.info(`sending reconnect on ${this.socket.id}`);
|
|
103
|
+
this._socket.emit(connection_management_1.ConnectionManagementMessages.RECONNECT, this.frontendIdProvider.getId());
|
|
104
|
+
}
|
|
105
|
+
negotiateInitialConnect() {
|
|
106
|
+
const initialConnectListener = () => {
|
|
107
|
+
console.info(`initial connect received on ${this.socket.id}`);
|
|
108
|
+
this._socket.off(connection_management_1.ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
|
|
109
|
+
this.connectNewChannel();
|
|
110
|
+
};
|
|
111
|
+
this._socket.on(connection_management_1.ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
|
|
112
|
+
console.info(`sending initial connect on ${this.socket.id}`);
|
|
113
|
+
this._socket.emit(connection_management_1.ConnectionManagementMessages.INITIAL_CONNECT, this.frontendIdProvider.getId());
|
|
114
|
+
}
|
|
115
|
+
handleSocketConnected() {
|
|
116
|
+
if (this.currentChannel) {
|
|
117
|
+
this.negogiateReconnect();
|
|
97
118
|
}
|
|
98
119
|
else {
|
|
99
|
-
|
|
100
|
-
this._socket.off(connection_management_1.ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
|
|
101
|
-
this.connectNewChannel();
|
|
102
|
-
};
|
|
103
|
-
this._socket.on(connection_management_1.ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
|
|
104
|
-
this._socket.emit(connection_management_1.ConnectionManagementMessages.INITIAL_CONNECT, this.frontendIdProvider.getId());
|
|
120
|
+
this.negotiateInitialConnect();
|
|
105
121
|
}
|
|
106
122
|
}
|
|
107
123
|
connectNewChannel() {
|
|
108
124
|
if (this.currentChannel) {
|
|
109
|
-
this.writeBuffer.drain();
|
|
110
125
|
this.currentChannel.close();
|
|
111
126
|
this.currentChannel.onCloseEmitter.fire({ reason: 'reconnecting channel' });
|
|
112
127
|
}
|
|
128
|
+
this.writeBuffer.drain();
|
|
113
129
|
this.currentChannel = this.createChannel();
|
|
114
130
|
this.onConnectionDidOpenEmitter.fire(this.currentChannel);
|
|
115
131
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-connection-source.js","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-source.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;;;;;;;;;AAEhF,yCAAwH;AAExH,uDAA8C;AAC9C,0CAAuC;AACvC,8DAAqE;AACrE,oGAAkH;AAClH,yCAA8D;AAC9D,iEAA4D;AAC5D,kGAA4F;AAC5F,oFAA+E;AAC/E,wFAA4F;AAG5F,IAAa,yBAAyB,GAAtC,MAAa,yBAAyB;IAmClC;QA7BiB,gBAAW,GAAG,IAAI,uCAAiB,EAAE,CAAC;QASpC,+BAA0B,GAAqB,IAAI,gBAAO,EAAE,CAAC;QAK7D,2BAAsB,GAAkB,IAAI,gBAAO,EAAE,CAAC;QAKtD,4BAAuB,GAAkB,IAAI,gBAAO,EAAE,CAAC;QAKvD,qCAAgC,GAAkB,IAAI,gBAAO,EAAE,CAAC;IAMnF,CAAC;IA3BD,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAKD,IAAI,mBAAmB;QACnB,OAAO,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;IACjD,CAAC;IAGD,IAAI,eAAe;QACf,OAAO,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC;IAC7C,CAAC;IAGD,IAAI,gBAAgB;QAChB,OAAO,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC;IAC9C,CAAC;IAGD,IAAI,yBAAyB;QACzB,OAAO,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC;IACvD,CAAC;IAMD,UAAU;QACN,MAAM,GAAG,GAAG,IAAI,CAAC,kBAAkB,CAAC,qBAAY,CAAC,CAAC;QAClD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAEzC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YAC5B,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC;YACnC,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE;YAC/B,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE;YAC9B,IAAI,IAAI,CAAC,cAAc,EAAE;gBACrB,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACnD;YAAA,CAAC;QACN,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAES,
|
|
1
|
+
{"version":3,"file":"ws-connection-source.js","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-source.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,8 @@ export declare class WebsocketFrontendConnectionService implements FrontendConne
|
|
|
15
15
|
registerConnectionHandler(spec: string, callback: (params: MessagingService.PathParams, channel: Channel) => void): void;
|
|
16
16
|
protected handleConnection(socket: Socket, channelCreatedHandler: (channel: Channel) => void): Promise<void>;
|
|
17
17
|
protected closeConnection(frontEndId: string, reason: string): void;
|
|
18
|
-
protected createConnection(socket: Socket, frontEndId: string):
|
|
18
|
+
protected createConnection(socket: Socket, frontEndId: string): ReconnectableSocketChannel;
|
|
19
|
+
handleSocketDisconnect(socket: Socket, channel: ReconnectableSocketChannel, frontEndId: string): void;
|
|
19
20
|
markForClose(channelId: string): void;
|
|
20
21
|
}
|
|
21
22
|
declare class ReconnectableSocketChannel extends AbstractChannel {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-frontend-connection-service.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/websocket-frontend-connection-service.ts"],"names":[],"mappings":";AAeA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAGnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAIzD,qBACa,kCAAmC,YAAW,yBAAyB;IAGhF,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,iBAAiB,CAAC;IAEtD,SAAS,CAAC,QAAQ,CAAC,UAAU,8BAA4B;IACzD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,0CAAiD;IACzF,SAAS,CAAC,QAAQ,CAAC,aAAa,8BAAqC;IACrE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,cAAqB;IAE9D,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,gBAAgB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI;cAIxG,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"websocket-frontend-connection-service.d.ts","sourceRoot":"","sources":["../../../src/node/messaging/websocket-frontend-connection-service.ts"],"names":[],"mappings":";AAeA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAGnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAIzD,qBACa,kCAAmC,YAAW,yBAAyB;IAGhF,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,iBAAiB,CAAC;IAEtD,SAAS,CAAC,QAAQ,CAAC,UAAU,8BAA4B;IACzD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,0CAAiD;IACzF,SAAS,CAAC,QAAQ,CAAC,aAAa,8BAAqC;IACrE,SAAS,CAAC,QAAQ,CAAC,sBAAsB,cAAqB;IAE9D,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,gBAAgB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,IAAI;cAIxG,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAoClH,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAcnE,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,0BAA0B;IAS1F,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,0BAA0B,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAoBrG,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;CAGxC;AAED,cAAM,0BAA2B,SAAQ,eAAe;IACpD,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,YAAY,CAA2B;IAC/C,OAAO,CAAC,WAAW,CAA8B;IAEjD,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAyB7B,UAAU,IAAI,IAAI;IAKT,cAAc,IAAI,WAAW;CAWzC"}
|
|
@@ -52,7 +52,9 @@ let WebsocketFrontendConnectionService = class WebsocketFrontendConnectionServic
|
|
|
52
52
|
if (this.connectionsByFrontend.has(frontEndId)) {
|
|
53
53
|
this.closeConnection(frontEndId, 'reconnecting same front end');
|
|
54
54
|
}
|
|
55
|
-
|
|
55
|
+
const channel = this.createConnection(socket, frontEndId);
|
|
56
|
+
this.handleSocketDisconnect(socket, channel, frontEndId);
|
|
57
|
+
channelCreatedHandler(channel);
|
|
56
58
|
socket.emit(connection_management_1.ConnectionManagementMessages.INITIAL_CONNECT);
|
|
57
59
|
};
|
|
58
60
|
reconnectListener = (frontEndId) => {
|
|
@@ -63,6 +65,7 @@ let WebsocketFrontendConnectionService = class WebsocketFrontendConnectionServic
|
|
|
63
65
|
console.info(`Reconnecting to front end ${frontEndId}`);
|
|
64
66
|
socket.emit(connection_management_1.ConnectionManagementMessages.RECONNECT, true);
|
|
65
67
|
channel.connect(socket);
|
|
68
|
+
this.handleSocketDisconnect(socket, channel, frontEndId);
|
|
66
69
|
const pendingTimeout = this.closeTimeouts.get(frontEndId);
|
|
67
70
|
clearTimeout(pendingTimeout);
|
|
68
71
|
this.closeTimeouts.delete(frontEndId);
|
|
@@ -89,6 +92,10 @@ let WebsocketFrontendConnectionService = class WebsocketFrontendConnectionServic
|
|
|
89
92
|
console.info(`creating connection for ${frontEndId}`);
|
|
90
93
|
const channel = new ReconnectableSocketChannel();
|
|
91
94
|
channel.connect(socket);
|
|
95
|
+
this.connectionsByFrontend.set(frontEndId, channel);
|
|
96
|
+
return channel;
|
|
97
|
+
}
|
|
98
|
+
handleSocketDisconnect(socket, channel, frontEndId) {
|
|
92
99
|
socket.on('disconnect', evt => {
|
|
93
100
|
console.info('socked closed');
|
|
94
101
|
channel.disconnect();
|
|
@@ -108,8 +115,6 @@ let WebsocketFrontendConnectionService = class WebsocketFrontendConnectionServic
|
|
|
108
115
|
// timeout < 0: never close the back end
|
|
109
116
|
}
|
|
110
117
|
});
|
|
111
|
-
this.connectionsByFrontend.set(frontEndId, channel);
|
|
112
|
-
return channel;
|
|
113
118
|
}
|
|
114
119
|
markForClose(channelId) {
|
|
115
120
|
this.channelsMarkedForClose.add(channelId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-frontend-connection-service.js","sourceRoot":"","sources":["../../../src/node/messaging/websocket-frontend-connection-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;;;;;;;;;;;;AAIhF,yCAA+C;AAE/C,2EAAiE;AACjE,oFAA+E;AAE/E,8DAAmE;AACnE,oGAAkH;AAClH,gGAA0F;AAC1F,6DAAyD;AACzD,wFAA4F;AAC5F,yCAAgE;AAGhE,IAAa,kCAAkC,GAA/C,MAAa,kCAAkC;IAA/C;QAKuB,eAAU,GAAG,IAAI,8CAAkB,EAAE,CAAC;QACtC,0BAAqB,GAAG,IAAI,GAAG,EAAsC,CAAC;QACtE,kBAAa,GAAG,IAAI,GAAG,EAA0B,CAAC;QAClD,2BAAsB,GAAG,IAAI,GAAG,EAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"websocket-frontend-connection-service.js","sourceRoot":"","sources":["../../../src/node/messaging/websocket-frontend-connection-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;;;;;;;;;;;;AAIhF,yCAA+C;AAE/C,2EAAiE;AACjE,oFAA+E;AAE/E,8DAAmE;AACnE,oGAAkH;AAClH,gGAA0F;AAC1F,6DAAyD;AACzD,wFAA4F;AAC5F,yCAAgE;AAGhE,IAAa,kCAAkC,GAA/C,MAAa,kCAAkC;IAA/C;QAKuB,eAAU,GAAG,IAAI,8CAAkB,EAAE,CAAC;QACtC,0BAAqB,GAAG,IAAI,GAAG,EAAsC,CAAC;QACtE,kBAAa,GAAG,IAAI,GAAG,EAA0B,CAAC;QAClD,2BAAsB,GAAG,IAAI,GAAG,EAAU,CAAC;IAwFlE,CAAC;IAtFG,yBAAyB,CAAC,IAAY,EAAE,QAAyE;QAC7G,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAClJ,CAAC;IAES,KAAK,CAAC,gBAAgB,CAAC,MAAc,EAAE,qBAAiD;QAC9F,wCAAwC;QACxC,IAAI,iBAA+C,CAAC;QACpD,MAAM,sBAAsB,GAAG,CAAC,UAAkB,EAAE,EAAE;YAClD,MAAM,CAAC,GAAG,CAAC,oDAA4B,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAAC;YACjF,MAAM,CAAC,GAAG,CAAC,oDAA4B,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;YACtE,IAAI,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBAC5C,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,6BAA6B,CAAC,CAAC;aACnE;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;YAC1D,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;YACzD,qBAAqB,CAAC,OAAO,CAAC,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,oDAA4B,CAAC,eAAe,CAAC,CAAC;QAC9D,CAAC,CAAC;QAEF,iBAAiB,GAAG,CAAC,UAAkB,EAAE,EAAE;YACvC,MAAM,CAAC,GAAG,CAAC,oDAA4B,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAAC;YACjF,MAAM,CAAC,GAAG,CAAC,oDAA4B,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;YACtE,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC3D,IAAI,OAAO,EAAE;gBACT,OAAO,CAAC,IAAI,CAAC,6BAA6B,UAAU,EAAE,CAAC,CAAC;gBACxD,MAAM,CAAC,IAAI,CAAC,oDAA4B,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;gBAC1D,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBACxB,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;gBACzD,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAC1D,YAAY,CAAC,cAAc,CAAC,CAAC;gBAC7B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;aACzC;iBAAM;gBACH,OAAO,CAAC,IAAI,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;gBACtD,MAAM,CAAC,IAAI,CAAC,oDAA4B,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;aAC9D;QACL,CAAC,CAAC;QACF,MAAM,CAAC,EAAE,CAAC,oDAA4B,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAAC;QAChF,MAAM,CAAC,EAAE,CAAC,oDAA4B,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;IACzE,CAAC;IAES,eAAe,CAAC,UAAkB,EAAE,MAAc;QACxD,OAAO,CAAC,IAAI,CAAC,0BAA0B,UAAU,EAAE,CAAC,CAAC;QACrD,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,CAAC,2CAA2C;QAE3G,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAE9C,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC1D,YAAY,CAAC,cAAc,CAAC,CAAC;QAC7B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAEtC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3C,UAAU,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAES,gBAAgB,CAAC,MAAc,EAAE,UAAkB;QACzD,OAAO,CAAC,IAAI,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,IAAI,0BAA0B,EAAE,CAAC;QACjD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAExB,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACpD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,sBAAsB,CAAC,MAAc,EAAE,OAAmC,EAAE,UAAkB;QAC1F,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,CAAC,EAAE;YAC1B,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC9B,OAAO,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,OAAO,GAAG,sEAAgC,CAAC,GAAG,EAAE,CAAC,yBAAyB,CAAC;YACjF,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACxE,IAAI,OAAO,KAAK,CAAC,IAAI,gBAAgB,EAAE;gBACnC,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;aACzC;iBAAM,IAAI,OAAO,GAAG,CAAC,EAAE;gBACpB,OAAO,CAAC,IAAI,CAAC,gCAAgC,UAAU,OAAO,OAAO,EAAE,CAAC,CAAC;gBACzE,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,EAAE;oBAC3B,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;gBAC1C,CAAC,EAAE,OAAO,CAAC,CAAC;gBACZ,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;aAC9C;iBAAM;gBACH,wCAAwC;aAC3C;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,YAAY,CAAC,SAAiB;QAC1B,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAA;AA7FG;IADC,IAAA,kBAAM,EAAC,sCAAiB,CAAC;8BACU,sCAAiB;2EAAC;AAH7C,kCAAkC;IAD9C,IAAA,sBAAU,GAAE;GACA,kCAAkC,CAgG9C;AAhGY,gFAAkC;AAkG/C,MAAM,0BAA2B,SAAQ,yBAAe;IAAxD;;QAEY,iBAAY,GAAG,IAAI,uCAAiB,EAAE,CAAC;QACvC,gBAAW,GAAG,IAAI,6BAAoB,EAAE,CAAC;IA2CrD,CAAC;IAzCG,OAAO,CAAC,MAAc;QAClB,IAAI,CAAC,WAAW,GAAG,IAAI,6BAAoB,EAAE,CAAC;QAC9C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,MAAM,YAAY,GAAG,CAAC,GAAU,EAAE,EAAE;YAChC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClC,CAAC,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YACzC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC,CAAC;QACJ,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAEjC,8DAA8D;QAC9D,MAAM,YAAY,GAAG,CAAC,IAAS,EAAE,EAAE;YAC/B,4EAA4E;YAC5E,+FAA+F;YAC/F,MAAM,MAAM,GAAG,IAAI,YAAY,WAAW,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACzE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,iDAAoB,CAAC,MAAM,CAAC,CAAC,CAAC;QACvE,CAAC,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YACzC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC,CAAC;QACJ,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACnC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;IAED,UAAU;QACN,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC5B,CAAC;IAEQ,cAAc;QACnB,MAAM,WAAW,GAAG,IAAI,kDAAqB,EAAE,CAAC;QAChD,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;;YACxB,IAAI,MAAA,IAAI,CAAC,MAAM,0CAAE,SAAS,EAAE;gBACxB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC1B;iBAAM;gBACH,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aAClC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,WAAW,CAAC;IACvB,CAAC;CACJ"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/core",
|
|
3
|
-
"version": "1.45.
|
|
3
|
+
"version": "1.45.1",
|
|
4
4
|
"description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
|
|
5
5
|
"main": "lib/common/index.js",
|
|
6
6
|
"typings": "lib/common/index.d.ts",
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
"@phosphor/signaling": "1",
|
|
17
17
|
"@phosphor/virtualdom": "1",
|
|
18
18
|
"@phosphor/widgets": "1",
|
|
19
|
-
"@theia/application-package": "1.45.
|
|
20
|
-
"@theia/request": "1.45.
|
|
19
|
+
"@theia/application-package": "1.45.1",
|
|
20
|
+
"@theia/request": "1.45.1",
|
|
21
21
|
"@types/body-parser": "^1.16.4",
|
|
22
22
|
"@types/cookie": "^0.3.3",
|
|
23
23
|
"@types/dompurify": "^2.2.2",
|
|
@@ -200,12 +200,12 @@
|
|
|
200
200
|
"watch": "theiaext watch"
|
|
201
201
|
},
|
|
202
202
|
"devDependencies": {
|
|
203
|
-
"@theia/ext-scripts": "1.45.
|
|
204
|
-
"@theia/re-exports": "1.45.
|
|
203
|
+
"@theia/ext-scripts": "1.45.1",
|
|
204
|
+
"@theia/re-exports": "1.45.1",
|
|
205
205
|
"minimist": "^1.2.0"
|
|
206
206
|
},
|
|
207
207
|
"nyc": {
|
|
208
208
|
"extends": "../../configs/nyc.json"
|
|
209
209
|
},
|
|
210
|
-
"gitHead": "
|
|
210
|
+
"gitHead": "3837c50544190b80d0ad8e87aa9fa9f286c70fcc"
|
|
211
211
|
}
|
|
@@ -87,38 +87,58 @@ export class WebSocketConnectionSource implements ConnectionSource {
|
|
|
87
87
|
this._socket.connect();
|
|
88
88
|
}
|
|
89
89
|
|
|
90
|
-
protected
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
90
|
+
protected negogiateReconnect(): void {
|
|
91
|
+
const reconnectListener = (hasConnection: boolean) => {
|
|
92
|
+
this._socket.off(ConnectionManagementMessages.RECONNECT, reconnectListener);
|
|
93
|
+
if (hasConnection) {
|
|
94
|
+
console.info(`reconnect succeeded on ${this.socket.id}`);
|
|
95
|
+
this.writeBuffer!.flush(this.socket);
|
|
96
|
+
} else {
|
|
97
|
+
if (FrontendApplicationConfigProvider.get().reloadOnReconnect) {
|
|
98
|
+
window.location.reload(); // this might happen in the preload module, when we have no window service yet
|
|
96
99
|
} else {
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
100
|
+
console.info(`reconnect failed on ${this.socket.id}`);
|
|
101
|
+
this.currentChannel.onCloseEmitter.fire({ reason: 'reconnecting channel' });
|
|
102
|
+
this.currentChannel.close();
|
|
103
|
+
this.writeBuffer.drain();
|
|
104
|
+
this.socket.disconnect();
|
|
105
|
+
this.socket.connect();
|
|
106
|
+
this.negotiateInitialConnect();
|
|
102
107
|
}
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
|
|
108
|
+
}
|
|
109
|
+
};
|
|
110
|
+
this._socket.on(ConnectionManagementMessages.RECONNECT, reconnectListener);
|
|
111
|
+
console.info(`sending reconnect on ${this.socket.id}`);
|
|
112
|
+
this._socket.emit(ConnectionManagementMessages.RECONNECT, this.frontendIdProvider.getId());
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
protected negotiateInitialConnect(): void {
|
|
116
|
+
const initialConnectListener = () => {
|
|
117
|
+
console.info(`initial connect received on ${this.socket.id}`);
|
|
118
|
+
|
|
119
|
+
this._socket.off(ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
|
|
120
|
+
this.connectNewChannel();
|
|
121
|
+
};
|
|
122
|
+
this._socket.on(ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
|
|
123
|
+
console.info(`sending initial connect on ${this.socket.id}`);
|
|
124
|
+
|
|
125
|
+
this._socket.emit(ConnectionManagementMessages.INITIAL_CONNECT, this.frontendIdProvider.getId());
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
protected handleSocketConnected(): void {
|
|
129
|
+
if (this.currentChannel) {
|
|
130
|
+
this.negogiateReconnect();
|
|
106
131
|
} else {
|
|
107
|
-
|
|
108
|
-
this._socket.off(ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
|
|
109
|
-
this.connectNewChannel();
|
|
110
|
-
};
|
|
111
|
-
this._socket.on(ConnectionManagementMessages.INITIAL_CONNECT, initialConnectListener);
|
|
112
|
-
this._socket.emit(ConnectionManagementMessages.INITIAL_CONNECT, this.frontendIdProvider.getId());
|
|
132
|
+
this.negotiateInitialConnect();
|
|
113
133
|
}
|
|
114
134
|
}
|
|
115
135
|
|
|
116
136
|
connectNewChannel(): void {
|
|
117
137
|
if (this.currentChannel) {
|
|
118
|
-
this.writeBuffer.drain();
|
|
119
138
|
this.currentChannel.close();
|
|
120
139
|
this.currentChannel.onCloseEmitter.fire({ reason: 'reconnecting channel' });
|
|
121
140
|
}
|
|
141
|
+
this.writeBuffer.drain();
|
|
122
142
|
this.currentChannel = this.createChannel();
|
|
123
143
|
this.onConnectionDidOpenEmitter.fire(this.currentChannel);
|
|
124
144
|
}
|
|
@@ -51,7 +51,9 @@ export class WebsocketFrontendConnectionService implements FrontendConnectionSer
|
|
|
51
51
|
if (this.connectionsByFrontend.has(frontEndId)) {
|
|
52
52
|
this.closeConnection(frontEndId, 'reconnecting same front end');
|
|
53
53
|
}
|
|
54
|
-
|
|
54
|
+
const channel = this.createConnection(socket, frontEndId);
|
|
55
|
+
this.handleSocketDisconnect(socket, channel, frontEndId);
|
|
56
|
+
channelCreatedHandler(channel);
|
|
55
57
|
socket.emit(ConnectionManagementMessages.INITIAL_CONNECT);
|
|
56
58
|
};
|
|
57
59
|
|
|
@@ -63,6 +65,7 @@ export class WebsocketFrontendConnectionService implements FrontendConnectionSer
|
|
|
63
65
|
console.info(`Reconnecting to front end ${frontEndId}`);
|
|
64
66
|
socket.emit(ConnectionManagementMessages.RECONNECT, true);
|
|
65
67
|
channel.connect(socket);
|
|
68
|
+
this.handleSocketDisconnect(socket, channel, frontEndId);
|
|
66
69
|
const pendingTimeout = this.closeTimeouts.get(frontEndId);
|
|
67
70
|
clearTimeout(pendingTimeout);
|
|
68
71
|
this.closeTimeouts.delete(frontEndId);
|
|
@@ -89,11 +92,16 @@ export class WebsocketFrontendConnectionService implements FrontendConnectionSer
|
|
|
89
92
|
connection.close();
|
|
90
93
|
}
|
|
91
94
|
|
|
92
|
-
protected createConnection(socket: Socket, frontEndId: string):
|
|
95
|
+
protected createConnection(socket: Socket, frontEndId: string): ReconnectableSocketChannel {
|
|
93
96
|
console.info(`creating connection for ${frontEndId}`);
|
|
94
97
|
const channel = new ReconnectableSocketChannel();
|
|
95
98
|
channel.connect(socket);
|
|
96
99
|
|
|
100
|
+
this.connectionsByFrontend.set(frontEndId, channel);
|
|
101
|
+
return channel;
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
handleSocketDisconnect(socket: Socket, channel: ReconnectableSocketChannel, frontEndId: string): void {
|
|
97
105
|
socket.on('disconnect', evt => {
|
|
98
106
|
console.info('socked closed');
|
|
99
107
|
channel.disconnect();
|
|
@@ -111,9 +119,6 @@ export class WebsocketFrontendConnectionService implements FrontendConnectionSer
|
|
|
111
119
|
// timeout < 0: never close the back end
|
|
112
120
|
}
|
|
113
121
|
});
|
|
114
|
-
|
|
115
|
-
this.connectionsByFrontend.set(frontEndId, channel);
|
|
116
|
-
return channel;
|
|
117
122
|
}
|
|
118
123
|
|
|
119
124
|
markForClose(channelId: string): void {
|