-
Notifications
You must be signed in to change notification settings - Fork 223
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
15 changed files
with
151 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 104 additions & 0 deletions
104
...ctName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr-client.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| var abp = abp || {}; | ||
| (function () { | ||
|
|
||
| // Check if SignalR is defined | ||
| if (!signalR) { | ||
| return; | ||
| } | ||
|
|
||
| // Create namespaces | ||
| abp.signalr = abp.signalr || {}; | ||
| abp.signalr.hubs = abp.signalr.hubs || {}; | ||
|
|
||
| // Configure the connection | ||
| function configureConnection(connection) { | ||
| // Set the common hub | ||
| abp.signalr.hubs.common = connection; | ||
|
|
||
| // Reconnect if hub disconnects | ||
| connection.onclose(function (e) { | ||
| if (e) { | ||
| abp.log.debug('Connection closed with error: ' + e); | ||
| } | ||
| else { | ||
| abp.log.debug('Disconnected'); | ||
| } | ||
|
|
||
| if (!abp.signalr.autoConnect) { | ||
| return; | ||
| } | ||
|
|
||
| setTimeout(function () { | ||
| if ($.connection.hub.state === $.signalR.connectionState.disconnected) { | ||
| $.connection.hub.start(); | ||
| } | ||
| }, 5000); | ||
| }); | ||
|
|
||
| // Register to get notifications | ||
| connection.on('getNotification', function (notification) { | ||
| abp.event.trigger('abp.notifications.received', notification); | ||
| }); | ||
| } | ||
|
|
||
| // Connect to the server | ||
| abp.signalr.connect = function() { | ||
| var url = abp.signalr.url || '/signalr'; | ||
|
|
||
| // Add query string: https://github.com/aspnet/SignalR/issues/680 | ||
| if (abp.signalr.qs) { | ||
| url += '?' + abp.signalr.qs; | ||
| } | ||
|
|
||
| // Start the connection. | ||
| startConnection(url, configureConnection).then(function (connection) { | ||
| abp.log.debug('Connected to SignalR server!'); //TODO: Remove log | ||
| abp.event.trigger('abp.signalr.connected'); | ||
| // Call the Register method on the hub. | ||
| connection.invoke('register').then(function () { | ||
| abp.log.debug('Registered to the SignalR server!'); //TODO: Remove log | ||
| }); | ||
| }) | ||
| .catch(error => { | ||
| abp.log.debug(error.message); | ||
| }); | ||
| }; | ||
|
|
||
| // Starts a connection with transport fallback - if the connection cannot be started using | ||
| // the webSockets transport the function will fallback to the serverSentEvents transport and | ||
| // if this does not work it will try longPolling. If the connection cannot be started using | ||
| // any of the available transports the function will return a rejected Promise. | ||
| function startConnection(url, configureConnection) { | ||
| return function start(transport) { | ||
| abp.log.debug(`Starting connection using ${signalR.TransportType[transport]} transport`); | ||
| var connection = new signalR.HubConnection(url, {transport: transport}); | ||
| if (configureConnection && typeof configureConnection === 'function') { | ||
| configureConnection(connection); | ||
| } | ||
|
|
||
| return connection.start() | ||
| .then(function() { | ||
| return connection; | ||
| }) | ||
| .catch(function(error) { | ||
| abp.log.debug(`Cannot start the connection using ${signalR.TransportType[transport]} transport. ${error.message}`); | ||
| if (transport !== signalR.TransportType.LongPolling) { | ||
| return start(transport + 1); | ||
| } | ||
|
|
||
| return Promise.reject(error); | ||
| }); | ||
| }(signalR.TransportType.WebSockets); | ||
| } | ||
|
|
||
| abp.signalr.startConnection = startConnection; | ||
|
|
||
| if (abp.signalr.autoConnect === undefined) { | ||
| abp.signalr.autoConnect = true; | ||
| } | ||
|
|
||
| if (abp.signalr.autoConnect) { | ||
| abp.signalr.connect(); | ||
| } | ||
|
|
||
| })(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,10 @@ | |
|
|
||
| let autoConnect: boolean; | ||
|
|
||
| let qs: string; | ||
|
|
||
| let url: string; | ||
|
|
||
| function connect(): any; | ||
|
|
||
| namespace hubs { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/package.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/packages.config
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="Abp.Web.Resources" version="3.2.3" targetFramework="net461" /> | ||
| <package id="Abp.Web.Resources" version="3.3.0" targetFramework="net461" /> | ||
| </packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters