SignalR
/
Samples
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Updated to latest version of SignalR

This commit is contained in:
David Fowler 2013-06-21 11:11:45 -07:00
Родитель 1e052359cf
Коммит ab05571522
25 изменённых файлов: 670 добавлений и 330 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
BasicChat.CrossDomain/BasicChat.CrossDomain.csproj
Просмотреть файл

@ -53,8 +53,8 @@
<None Include="Scripts\jquery-1.8.3.intellisense.js" />
<Content Include="Scripts\jquery-1.8.3.js" />
<Content Include="Scripts\jquery-1.8.3.min.js" />
<Content Include="Scripts\jquery.signalR-1.0.1.js" />
<Content Include="Scripts\jquery.signalR-1.0.1.min.js" />
<Content Include="Scripts\jquery.signalR-1.1.2.js" />
<Content Include="Scripts\jquery.signalR-1.1.2.min.js" />
<Content Include="Web.config" />
</ItemGroup>
<ItemGroup>

10
BasicChat.CrossDomain/Scripts/jquery.signalR-1.0.1.min.js поставляемый
Просмотреть файл

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

280
BasicChat.CrossDomain/Scripts/jquery.signalR-1.0.1.js → BasicChat.CrossDomain/Scripts/jquery.signalR-1.1.2.js
Просмотреть файл

@ -1,7 +1,7 @@
/* jquery.signalR.core.js */
/*global window:false */
/*!
* ASP.NET SignalR JavaScript Library v1.0.1
* ASP.NET SignalR JavaScript Library v1.1.2
* http://signalr.net/
*
* Copyright Microsoft Open Technologies, Inc. All rights reserved.
@ -120,6 +120,26 @@
return new signalR.fn.init(url, qs, logging);
};
signalR._ = {
defaultContentType: "application/x-www-form-urlencoded; charset=UTF-8",
ieVersion: (function () {
var version,
matches;
if (window.navigator.appName === 'Microsoft Internet Explorer') {
// Check if the user agent has the pattern "MSIE (one or more numbers).(one or more numbers)";
matches = /MSIE ([0-9]+\.[0-9]+)/.exec(window.navigator.userAgent);
if (matches) {
version = window.parseFloat(matches[1]);
}
}
// undefined value means not IE
return version;
})()
};
signalR.events = events;
signalR.changeState = changeState;
@ -147,6 +167,7 @@
/// <param name="requestedTransport" type="Object">The designated transports that the user has specified.</param>
/// <param name="connection" type="signalR">The connection that will be using the requested transports. Used for logging purposes.</param>
/// <returns type="Object" />
if ($.isArray(requestedTransport)) {
// Go through transport array and remove an "invalid" tranports
for (var i = requestedTransport.length - 1; i >= 0; i--) {
@ -166,6 +187,12 @@
connection.log("Invalid transport: " + requestedTransport.toString());
requestedTransport = null;
}
else if (requestedTransport === "auto" && signalR._.ieVersion <= 8)
{
// If we're doing an auto transport and we're IE8 then force longPolling, #1764
return ["longPolling"];
}
return requestedTransport;
}
@ -225,6 +252,8 @@
ajaxDataType: "json",
contentType: "application/json; charset=UTF-8",
logging: false,
state: signalR.connectionState.disconnected,
@ -331,6 +360,8 @@
connection.log("Using jsonp because this browser doesn't support CORS");
}
}
connection.contentType = signalR._.defaultContentType;
}
connection.ajaxDataType = config.jsonp ? "jsonp" : "json";
@ -347,7 +378,7 @@
if (index >= transports.length) {
if (!connection.transport) {
// No transport initialized successfully
$(connection).triggerHandler(events.onError, "SignalR: No transport could be initialized successfully. Try specifying a different transport or none at all for auto initialization.");
$(connection).triggerHandler(events.onError, ["SignalR: No transport could be initialized successfully. Try specifying a different transport or none at all for auto initialization."]);
deferred.reject("SignalR: No transport could be initialized successfully. Try specifying a different transport or none at all for auto initialization.");
// Stop the connection if it has connected and move it into the disconnected state
connection.stop();
@ -396,6 +427,7 @@
global: false,
cache: false,
type: "GET",
contentType: connection.contentType,
data: {},
dataType: connection.ajaxDataType,
error: function (error) {
@ -436,7 +468,7 @@
}
if (!res.ProtocolVersion || res.ProtocolVersion !== "1.2") {
$(connection).triggerHandler(events.onError, "You are using a version of the client that isn't compatible with the server. Client version 1.2, server version " + res.ProtocolVersion + ".");
$(connection).triggerHandler(events.onError, ["You are using a version of the client that isn't compatible with the server. Client version 1.2, server version " + res.ProtocolVersion + "."]);
deferred.reject("You are using a version of the client that isn't compatible with the server. Client version 1.2, server version " + res.ProtocolVersion + ".");
return;
}
@ -708,6 +740,11 @@
}
}
function isConnectedOrReconnecting(connection) {
return connection.state === signalR.connectionState.connected ||
connection.state === signalR.connectionState.reconnecting;
}
signalR.transports._logic = {
pingServer: function (connection, transport) {
/// <summary>Pings the server</summary>
@ -724,6 +761,7 @@
global: false,
cache: false,
type: "GET",
contentType: connection.contentType,
data: {},
dataType: connection.ajaxDataType,
success: function (data) {
@ -745,7 +783,7 @@
addQs: function (url, connection) {
var appender = url.indexOf("?") !== -1 ? "&" : "?",
firstChar;
if (!connection.qs) {
return url;
}
@ -767,7 +805,7 @@
throw new Error("Connections query string property must be either a string or object.");
},
getUrl: function (connection, transport, reconnecting, appendReconnectUrl) {
getUrl: function (connection, transport, reconnecting, poll) {
/// <summary>Gets the url for making a GET based connect request</summary>
var baseUrl = transport === "webSockets" ? "" : connection.baseUrl,
url = baseUrl + connection.appRelativeUrl,
@ -782,11 +820,15 @@
}
if (!reconnecting) {
url = url + "/connect";
url += "/connect";
} else {
if (appendReconnectUrl) {
url = url + "/reconnect";
if (poll) {
// longPolling transport specific
url += "/poll";
} else {
url += "/reconnect";
}
if (connection.messageId) {
qs += "&messageId=" + window.encodeURIComponent(connection.messageId);
}
@ -821,6 +863,7 @@
url: url,
global: false,
type: connection.ajaxDataType === "jsonp" ? "GET" : "POST",
contentType: signalR._.defaultContentType,
dataType: connection.ajaxDataType,
data: {
data: data
@ -858,6 +901,7 @@
timeout: 1000,
global: false,
type: "POST",
contentType: connection.contentType,
dataType: connection.ajaxDataType,
data: {}
});
@ -894,8 +938,8 @@
this.updateGroups(connection, data.GroupsToken);
if (data.Messages) {
$.each(data.Messages, function () {
$connection.triggerHandler(events.onReceived, [this]);
$.each(data.Messages, function (index, message) {
$connection.triggerHandler(events.onReceived, [message]);
});
}
@ -963,6 +1007,32 @@
return connection.state === signalR.connectionState.reconnecting;
},
clearReconnectTimeout: function (connection) {
if (connection && connection._.reconnectTimeout) {
window.clearTimeout(connection._.reconnectTimeout);
delete connection._.reconnectTimeout;
}
},
reconnect: function (connection, transportName) {
var transport = signalR.transports[transportName],
that = this;
// We should only set a reconnectTimeout if we are currently connected
// and a reconnectTimeout isn't already set.
if (isConnectedOrReconnecting(connection) && !connection._.reconnectTimeout) {
connection._.reconnectTimeout = window.setTimeout(function () {
transport.stop(connection);
if (that.ensureReconnectingState(connection)) {
connection.log(transportName + " reconnecting");
transport.start(connection);
}
}, connection.reconnectDelay);
}
},
foreverFrame: {
count: 0,
connections: {}
@ -989,10 +1059,6 @@
supportsKeepAlive: true,
attemptingReconnect: false,
currentSocketID: 0,
send: function (connection, data) {
connection.socket.send(data);
},
@ -1021,14 +1087,11 @@
connection.log("Connecting to websocket endpoint '" + url + "'");
connection.socket = new window.WebSocket(url);
connection.socket.ID = ++that.currentSocketID;
connection.socket.onopen = function () {
opened = true;
connection.log("Websocket opened");
if (that.attemptingReconnect) {
that.attemptingReconnect = false;
}
transportLogic.clearReconnectTimeout(connection);
if (onSuccess) {
onSuccess();
@ -1043,7 +1106,7 @@
// Only handle a socket close if the close is from the current socket.
// Sometimes on disconnect the server will push down an onclose event
// to an expired socket.
if (this.ID === that.currentSocketID) {
if (this === connection.socket) {
if (!opened) {
if (onFailed) {
onFailed();
@ -1086,24 +1149,7 @@
},
reconnect: function (connection) {
var that = this;
if (connection.state !== signalR.connectionState.disconnected) {
if (!that.attemptingReconnect) {
that.attemptingReconnect = true;
}
window.setTimeout(function () {
if (that.attemptingReconnect) {
that.stop(connection);
}
if (transportLogic.ensureReconnectingState(connection)) {
connection.log("Websocket reconnecting");
that.start(connection);
}
}, connection.reconnectDelay);
}
transportLogic.reconnect(connection, this.name);
},
lostConnection: function (connection) {
@ -1112,6 +1158,9 @@
},
stop: function (connection) {
// Don't trigger a reconnect after stopping
transportLogic.clearReconnectTimeout(connection);
if (connection.socket !== null) {
connection.log("Closing the Websocket");
connection.socket.close();
@ -1143,10 +1192,6 @@
supportsKeepAlive: true,
reconnectTimeout: false,
currentEventSourceID: 0,
timeOut: 3000,
start: function (connection, onSuccess, onFailed) {
@ -1175,7 +1220,6 @@
try {
connection.log("Attempting to connect to SSE endpoint '" + url + "'");
connection.eventSource = new window.EventSource(url);
connection.eventSource.ID = ++that.currentEventSourceID;
}
catch (e) {
connection.log("EventSource failed trying to connect with error " + e.Message);
@ -1226,9 +1270,7 @@
window.clearTimeout(connectTimeOut);
}
if (that.reconnectTimeout) {
window.clearTimeout(that.reconnectTimeout);
}
transportLogic.clearReconnectTimeout(connection);
if (opened === false) {
opened = true;
@ -1257,7 +1299,7 @@
// Only handle an error if the error is from the current Event Source.
// Sometimes on disconnect the server will push down an error event
// to an expired Event Source.
if (this.ID === that.currentEventSourceID) {
if (this === connection.eventSource) {
if (!opened) {
if (onFailed) {
onFailed();
@ -1285,16 +1327,7 @@
},
reconnect: function (connection) {
var that = this;
that.reconnectTimeout = window.setTimeout(function () {
that.stop(connection);
if (transportLogic.ensureReconnectingState(connection)) {
connection.log("EventSource reconnecting");
that.start(connection);
}
}, connection.reconnectDelay);
transportLogic.reconnect(connection, this.name);
},
lostConnection: function (connection) {
@ -1306,14 +1339,17 @@
},
stop: function (connection) {
// Don't trigger a reconnect after stopping
transportLogic.clearReconnectTimeout(connection);
if (connection && connection.eventSource) {
connection.log("EventSource calling close()");
connection.eventSource.ID = null;
connection.eventSource.close();
connection.eventSource = null;
delete connection.eventSource;
}
},
abort: function (connection, async) {
transportLogic.ajaxAbort(connection, async);
}
@ -1332,7 +1368,46 @@
var signalR = $.signalR,
events = $.signalR.events,
changeState = $.signalR.changeState,
transportLogic = signalR.transports._logic;
transportLogic = signalR.transports._logic,
// Used to prevent infinite loading icon spins in older versions of ie
// We build this object inside a closure so we don't pollute the rest of
// the foreverFrame transport with unnecessary functions/utilities.
loadPreventer = (function () {
var loadingFixIntervalId = null,
loadingFixInterval = 1000,
attachedTo = 0;
return {
prevent: function () {
// Prevent additional iframe removal procedures from newer browsers
if (signalR._.ieVersion <= 8) {
// We only ever want to set the interval one time, so on the first attachedTo
if (attachedTo === 0) {
// Create and destroy iframe every 3 seconds to prevent loading icon, super hacky
loadingFixIntervalId = window.setInterval(function () {
var tempFrame = $("<iframe style='position:absolute;top:0;left:0;width:0;height:0;visibility:hidden;' src=''></iframe>");
$("body").append(tempFrame);
tempFrame.remove();
tempFrame = null;
}, loadingFixInterval);
}
attachedTo++;
}
},
cancel: function () {
// Only clear the interval if there's only one more object that the loadPreventer is attachedTo
if (attachedTo === 1) {
window.clearInterval(loadingFixIntervalId);
}
if (attachedTo > 0) {
attachedTo--;
}
}
};
})();
signalR.transports.foreverFrame = {
name: "foreverFrame",
@ -1356,6 +1431,9 @@
return;
}
// Start preventing loading icon
// This will only perform work if the loadPreventer is not attached to another connection.
loadPreventer.prevent();
// Build the url
url = transportLogic.getUrl(connection, this.name);
@ -1434,6 +1512,10 @@
stop: function (connection) {
var cw = null;
// Stop attempting to prevent loading icon
loadPreventer.cancel();
if (connection.frame) {
if (connection.frame.stop) {
connection.frame.stop();
@ -1539,7 +1621,23 @@
initialConnectedFired = true;
onSuccess();
connection.log("Longpolling connected");
};
},
reconnectErrors = 0,
reconnectTimeoutId = null,
fireReconnected = function (instance) {
window.clearTimeout(reconnectTimeoutId);
reconnectTimeoutId = null;
if (changeState(connection,
signalR.connectionState.reconnecting,
signalR.connectionState.connected) === true) {
// Successfully reconnected!
connection.log("Raising the reconnect event");
$(instance).triggerHandler(events.onReconnect);
}
},
// 1 hour
maxFireReconnectedTimeout = 3600000;
if (connection.pollXhr) {
connection.log("Polling xhr requests already exists, aborting.");
@ -1556,7 +1654,8 @@
var messageId = instance.messageId,
connect = (messageId === null),
reconnecting = !connect,
url = transportLogic.getUrl(instance, that.name, reconnecting, raiseReconnect);
polling = !raiseReconnect,
url = transportLogic.getUrl(instance, that.name, reconnecting, polling);
// If we've disconnected during the time we've tried to re-instantiate the poll then stop.
if (isDisconnecting(instance) === true) {
@ -1570,10 +1669,20 @@
cache: false,
type: "GET",
dataType: connection.ajaxDataType,
contentType: connection.contentType,
success: function (minData) {
var delay = 0,
data;
// Reset our reconnect errors so if we transition into a reconnecting state again we trigger
// reconnected quickly
reconnectErrors = 0;
// If there's currently a timeout to trigger reconnect, fire it now before processing messages
if (reconnectTimeoutId !== null) {
fireReconnected();
}
fireConnect();
if (minData) {
@ -1606,11 +1715,21 @@
},
error: function (data, textStatus) {
// Stop trying to trigger reconnect, connection is in an error state
// If we're not in the reconnect state this will noop
window.clearTimeout(reconnectTimeoutId);
reconnectTimeoutId = null;
if (textStatus === "abort") {
connection.log("Aborted xhr requst.");
return;
}
// Increment our reconnect errors, we assume all errors to be reconnect errors
// In the case that it's our first error this will cause Reconnect to be fired
// after 1 second due to reconnectErrors being = 1.
reconnectErrors++;
if (connection.state !== signalR.connectionState.reconnecting) {
connection.log("An error occurred using longPolling. Status = " + textStatus + ". " + data.responseText);
$(instance).triggerHandler(events.onError, [data.responseText]);
@ -1628,15 +1747,15 @@
}
});
// This will only ever pass after an error has occured via the poll ajax procedure.
if (reconnecting && raiseReconnect === true) {
if (changeState(connection,
signalR.connectionState.reconnecting,
signalR.connectionState.connected) === true) {
// Successfully reconnected!
connection.log("Raising the reconnect event");
$(instance).triggerHandler(events.onReconnect);
}
// We wait to reconnect depending on how many times we've failed to reconnect.
// This is essentially a heuristic that will exponentially increase in wait time before
// triggering reconnected. This depends on the "error" handler of Poll to cancel this
// timeout if it triggers before the Reconnected event fires.
// The Math.min at the end is to ensure that the reconnect timeout does not overflow.
reconnectTimeoutId = window.setTimeout(function () { fireReconnected(instance); }, Math.min(1000 * (Math.pow(2, reconnectErrors) - 1), maxFireReconnectedTimeout));
}
}(connection));
@ -1692,20 +1811,17 @@
return event + eventNamespace;
}
// Array.prototype.map
if (!Array.prototype.hasOwnProperty("map")) {
Array.prototype.map = function (fun, thisp) {
var arr = this,
i,
length = arr.length,
result = [];
for (i = 0; i < length; i += 1) {
if (arr.hasOwnProperty(i)) {
result[i] = fun.call(thisp, arr[i], i, arr);
}
// Equivalent to Array.prototype.map
function map(arr, fun, thisp) {
var i,
length = arr.length,
result = [];
for (i = 0; i < length; i += 1) {
if (arr.hasOwnProperty(i)) {
result[i] = fun.call(thisp, arr[i], i, arr);
}
return result;
};
}
return result;
}
function getArgValue(a) {
@ -1814,7 +1930,7 @@
var self = this,
args = $.makeArray(arguments).slice(1),
argValues = args.map(getArgValue),
argValues = map(args, getArgValue),
data = { H: self.hubName, M: methodName, A: argValues, I: callbackId },
d = $.Deferred(),
callback = function (minResult) {
@ -2003,5 +2119,5 @@
/*global window:false */
/// <reference path="jquery.signalR.core.js" />
(function ($) {
$.signalR.version = "1.0.1";
$.signalR.version = "1.1.2";
}(window.jQuery));

10
BasicChat.CrossDomain/Scripts/jquery.signalR-1.1.2.min.js поставляемый Normal file
Просмотреть файл

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

2
BasicChat.CrossDomain/index.html
Просмотреть файл

@ -9,7 +9,7 @@
<ul id="message">
</ul>
<script src="Scripts/jquery-1.8.3.min.js"></script>
<script src="Scripts/jquery.signalR-1.0.1.min.js"></script>
<script src="Scripts/jquery.signalR-1.1.2.min.js"></script>
<script src="http://localhost:44914/signalR/hubs"></script>
<script>
$(function () {

2
BasicChat.CrossDomain/noproxy.html
Просмотреть файл

@ -9,7 +9,7 @@
<ul id="message">
</ul>
<script src="Scripts/jquery-1.8.3.min.js"></script>
<script src="Scripts/jquery.signalR-1.0.1.min.js"></script>
<script src="Scripts/jquery.signalR-1.1.2.min.js"></script>
<script>
$(function () {
// Open a connection to the remote server

2
BasicChat.CrossDomain/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="jQuery" version="1.8.3" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.JS" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.JS" version="1.1.2" targetFramework="net45" />
</packages>

17
BasicChat.Mvc/BasicChat.Mvc.csproj
Просмотреть файл

@ -41,17 +41,17 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNet.SignalR.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.AspNet.SignalR.Core, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.0.1\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.1.2\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.AspNet.SignalR.Owin, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.SignalR.Owin.1.0.1\lib\net45\Microsoft.AspNet.SignalR.Owin.dll</HintPath>
<HintPath>..\packages\Microsoft.AspNet.SignalR.Owin.1.1.2\lib\net45\Microsoft.AspNet.SignalR.Owin.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.SystemWeb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.AspNet.SignalR.SystemWeb, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.SignalR.SystemWeb.1.0.1\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll</HintPath>
<HintPath>..\packages\Microsoft.AspNet.SignalR.SystemWeb.1.1.2\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Owin.Host.SystemWeb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@ -280,9 +280,8 @@
<Content Include="Scripts\jquery-1.8.3.min.js" />
<Content Include="Scripts\jquery-ui-1.8.20.js" />
<Content Include="Scripts\jquery-ui-1.8.20.min.js" />
<Content Include="Scripts\jquery.signalR-1.0.0.min.js" />
<Content Include="Scripts\jquery.signalR-1.0.1.js" />
<Content Include="Scripts\jquery.signalR-1.0.1.min.js" />
<Content Include="Scripts\jquery.signalR-1.1.2.js" />
<Content Include="Scripts\jquery.signalR-1.1.2.min.js" />
<Content Include="Scripts\jquery.unobtrusive-ajax.js" />
<Content Include="Scripts\jquery.unobtrusive-ajax.min.js" />
<Content Include="Scripts\jquery.validate.js" />

10
BasicChat.Mvc/Scripts/jquery.signalR-1.0.0.min.js поставляемый
Просмотреть файл

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

10
BasicChat.Mvc/Scripts/jquery.signalR-1.0.1.min.js поставляемый
Просмотреть файл

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

280
BasicChat/Scripts/jquery.signalR-1.0.1.js → BasicChat.Mvc/Scripts/jquery.signalR-1.1.2.js
Просмотреть файл

@ -1,7 +1,7 @@
/* jquery.signalR.core.js */
/*global window:false */
/*!
* ASP.NET SignalR JavaScript Library v1.0.1
* ASP.NET SignalR JavaScript Library v1.1.2
* http://signalr.net/
*
* Copyright Microsoft Open Technologies, Inc. All rights reserved.
@ -120,6 +120,26 @@
return new signalR.fn.init(url, qs, logging);
};
signalR._ = {
defaultContentType: "application/x-www-form-urlencoded; charset=UTF-8",
ieVersion: (function () {
var version,
matches;
if (window.navigator.appName === 'Microsoft Internet Explorer') {
// Check if the user agent has the pattern "MSIE (one or more numbers).(one or more numbers)";
matches = /MSIE ([0-9]+\.[0-9]+)/.exec(window.navigator.userAgent);
if (matches) {
version = window.parseFloat(matches[1]);
}
}
// undefined value means not IE
return version;
})()
};
signalR.events = events;
signalR.changeState = changeState;
@ -147,6 +167,7 @@
/// <param name="requestedTransport" type="Object">The designated transports that the user has specified.</param>
/// <param name="connection" type="signalR">The connection that will be using the requested transports. Used for logging purposes.</param>
/// <returns type="Object" />
if ($.isArray(requestedTransport)) {
// Go through transport array and remove an "invalid" tranports
for (var i = requestedTransport.length - 1; i >= 0; i--) {
@ -166,6 +187,12 @@
connection.log("Invalid transport: " + requestedTransport.toString());
requestedTransport = null;
}
else if (requestedTransport === "auto" && signalR._.ieVersion <= 8)
{
// If we're doing an auto transport and we're IE8 then force longPolling, #1764
return ["longPolling"];
}
return requestedTransport;
}
@ -225,6 +252,8 @@
ajaxDataType: "json",
contentType: "application/json; charset=UTF-8",
logging: false,
state: signalR.connectionState.disconnected,
@ -331,6 +360,8 @@
connection.log("Using jsonp because this browser doesn't support CORS");
}
}
connection.contentType = signalR._.defaultContentType;
}
connection.ajaxDataType = config.jsonp ? "jsonp" : "json";
@ -347,7 +378,7 @@
if (index >= transports.length) {
if (!connection.transport) {
// No transport initialized successfully
$(connection).triggerHandler(events.onError, "SignalR: No transport could be initialized successfully. Try specifying a different transport or none at all for auto initialization.");
$(connection).triggerHandler(events.onError, ["SignalR: No transport could be initialized successfully. Try specifying a different transport or none at all for auto initialization."]);
deferred.reject("SignalR: No transport could be initialized successfully. Try specifying a different transport or none at all for auto initialization.");
// Stop the connection if it has connected and move it into the disconnected state
connection.stop();
@ -396,6 +427,7 @@
global: false,
cache: false,
type: "GET",
contentType: connection.contentType,
data: {},
dataType: connection.ajaxDataType,
error: function (error) {
@ -436,7 +468,7 @@
}
if (!res.ProtocolVersion || res.ProtocolVersion !== "1.2") {
$(connection).triggerHandler(events.onError, "You are using a version of the client that isn't compatible with the server. Client version 1.2, server version " + res.ProtocolVersion + ".");
$(connection).triggerHandler(events.onError, ["You are using a version of the client that isn't compatible with the server. Client version 1.2, server version " + res.ProtocolVersion + "."]);
deferred.reject("You are using a version of the client that isn't compatible with the server. Client version 1.2, server version " + res.ProtocolVersion + ".");
return;
}
@ -708,6 +740,11 @@
}
}
function isConnectedOrReconnecting(connection) {
return connection.state === signalR.connectionState.connected ||
connection.state === signalR.connectionState.reconnecting;
}
signalR.transports._logic = {
pingServer: function (connection, transport) {
/// <summary>Pings the server</summary>
@ -724,6 +761,7 @@
global: false,
cache: false,
type: "GET",
contentType: connection.contentType,
data: {},
dataType: connection.ajaxDataType,
success: function (data) {
@ -745,7 +783,7 @@
addQs: function (url, connection) {
var appender = url.indexOf("?") !== -1 ? "&" : "?",
firstChar;
if (!connection.qs) {
return url;
}
@ -767,7 +805,7 @@
throw new Error("Connections query string property must be either a string or object.");
},
getUrl: function (connection, transport, reconnecting, appendReconnectUrl) {
getUrl: function (connection, transport, reconnecting, poll) {
/// <summary>Gets the url for making a GET based connect request</summary>
var baseUrl = transport === "webSockets" ? "" : connection.baseUrl,
url = baseUrl + connection.appRelativeUrl,
@ -782,11 +820,15 @@
}
if (!reconnecting) {
url = url + "/connect";
url += "/connect";
} else {
if (appendReconnectUrl) {
url = url + "/reconnect";
if (poll) {
// longPolling transport specific
url += "/poll";
} else {
url += "/reconnect";
}
if (connection.messageId) {
qs += "&messageId=" + window.encodeURIComponent(connection.messageId);
}
@ -821,6 +863,7 @@
url: url,
global: false,
type: connection.ajaxDataType === "jsonp" ? "GET" : "POST",
contentType: signalR._.defaultContentType,
dataType: connection.ajaxDataType,
data: {
data: data
@ -858,6 +901,7 @@
timeout: 1000,
global: false,
type: "POST",
contentType: connection.contentType,
dataType: connection.ajaxDataType,
data: {}
});
@ -894,8 +938,8 @@
this.updateGroups(connection, data.GroupsToken);
if (data.Messages) {
$.each(data.Messages, function () {
$connection.triggerHandler(events.onReceived, [this]);
$.each(data.Messages, function (index, message) {
$connection.triggerHandler(events.onReceived, [message]);
});
}
@ -963,6 +1007,32 @@
return connection.state === signalR.connectionState.reconnecting;
},
clearReconnectTimeout: function (connection) {
if (connection && connection._.reconnectTimeout) {
window.clearTimeout(connection._.reconnectTimeout);
delete connection._.reconnectTimeout;
}
},
reconnect: function (connection, transportName) {
var transport = signalR.transports[transportName],
that = this;
// We should only set a reconnectTimeout if we are currently connected
// and a reconnectTimeout isn't already set.
if (isConnectedOrReconnecting(connection) && !connection._.reconnectTimeout) {
connection._.reconnectTimeout = window.setTimeout(function () {
transport.stop(connection);
if (that.ensureReconnectingState(connection)) {
connection.log(transportName + " reconnecting");
transport.start(connection);
}
}, connection.reconnectDelay);
}
},
foreverFrame: {
count: 0,
connections: {}
@ -989,10 +1059,6 @@
supportsKeepAlive: true,
attemptingReconnect: false,
currentSocketID: 0,
send: function (connection, data) {
connection.socket.send(data);
},
@ -1021,14 +1087,11 @@
connection.log("Connecting to websocket endpoint '" + url + "'");
connection.socket = new window.WebSocket(url);
connection.socket.ID = ++that.currentSocketID;
connection.socket.onopen = function () {
opened = true;
connection.log("Websocket opened");
if (that.attemptingReconnect) {
that.attemptingReconnect = false;
}
transportLogic.clearReconnectTimeout(connection);
if (onSuccess) {
onSuccess();
@ -1043,7 +1106,7 @@
// Only handle a socket close if the close is from the current socket.
// Sometimes on disconnect the server will push down an onclose event
// to an expired socket.
if (this.ID === that.currentSocketID) {
if (this === connection.socket) {
if (!opened) {
if (onFailed) {
onFailed();
@ -1086,24 +1149,7 @@
},
reconnect: function (connection) {
var that = this;
if (connection.state !== signalR.connectionState.disconnected) {
if (!that.attemptingReconnect) {
that.attemptingReconnect = true;
}
window.setTimeout(function () {
if (that.attemptingReconnect) {
that.stop(connection);
}
if (transportLogic.ensureReconnectingState(connection)) {
connection.log("Websocket reconnecting");
that.start(connection);
}
}, connection.reconnectDelay);
}
transportLogic.reconnect(connection, this.name);
},
lostConnection: function (connection) {
@ -1112,6 +1158,9 @@
},
stop: function (connection) {
// Don't trigger a reconnect after stopping
transportLogic.clearReconnectTimeout(connection);
if (connection.socket !== null) {
connection.log("Closing the Websocket");
connection.socket.close();
@ -1143,10 +1192,6 @@
supportsKeepAlive: true,
reconnectTimeout: false,
currentEventSourceID: 0,
timeOut: 3000,
start: function (connection, onSuccess, onFailed) {
@ -1175,7 +1220,6 @@
try {
connection.log("Attempting to connect to SSE endpoint '" + url + "'");
connection.eventSource = new window.EventSource(url);
connection.eventSource.ID = ++that.currentEventSourceID;
}
catch (e) {
connection.log("EventSource failed trying to connect with error " + e.Message);
@ -1226,9 +1270,7 @@
window.clearTimeout(connectTimeOut);
}
if (that.reconnectTimeout) {
window.clearTimeout(that.reconnectTimeout);
}
transportLogic.clearReconnectTimeout(connection);
if (opened === false) {
opened = true;
@ -1257,7 +1299,7 @@
// Only handle an error if the error is from the current Event Source.
// Sometimes on disconnect the server will push down an error event
// to an expired Event Source.
if (this.ID === that.currentEventSourceID) {
if (this === connection.eventSource) {
if (!opened) {
if (onFailed) {
onFailed();
@ -1285,16 +1327,7 @@
},
reconnect: function (connection) {
var that = this;
that.reconnectTimeout = window.setTimeout(function () {
that.stop(connection);
if (transportLogic.ensureReconnectingState(connection)) {
connection.log("EventSource reconnecting");
that.start(connection);
}
}, connection.reconnectDelay);
transportLogic.reconnect(connection, this.name);
},
lostConnection: function (connection) {
@ -1306,14 +1339,17 @@
},
stop: function (connection) {
// Don't trigger a reconnect after stopping
transportLogic.clearReconnectTimeout(connection);
if (connection && connection.eventSource) {
connection.log("EventSource calling close()");
connection.eventSource.ID = null;
connection.eventSource.close();
connection.eventSource = null;
delete connection.eventSource;
}
},
abort: function (connection, async) {
transportLogic.ajaxAbort(connection, async);
}
@ -1332,7 +1368,46 @@
var signalR = $.signalR,
events = $.signalR.events,
changeState = $.signalR.changeState,
transportLogic = signalR.transports._logic;
transportLogic = signalR.transports._logic,
// Used to prevent infinite loading icon spins in older versions of ie
// We build this object inside a closure so we don't pollute the rest of
// the foreverFrame transport with unnecessary functions/utilities.
loadPreventer = (function () {
var loadingFixIntervalId = null,
loadingFixInterval = 1000,
attachedTo = 0;
return {
prevent: function () {
// Prevent additional iframe removal procedures from newer browsers
if (signalR._.ieVersion <= 8) {
// We only ever want to set the interval one time, so on the first attachedTo
if (attachedTo === 0) {
// Create and destroy iframe every 3 seconds to prevent loading icon, super hacky
loadingFixIntervalId = window.setInterval(function () {
var tempFrame = $("<iframe style='position:absolute;top:0;left:0;width:0;height:0;visibility:hidden;' src=''></iframe>");
$("body").append(tempFrame);
tempFrame.remove();
tempFrame = null;
}, loadingFixInterval);
}
attachedTo++;
}
},
cancel: function () {
// Only clear the interval if there's only one more object that the loadPreventer is attachedTo
if (attachedTo === 1) {
window.clearInterval(loadingFixIntervalId);
}
if (attachedTo > 0) {
attachedTo--;
}
}
};
})();
signalR.transports.foreverFrame = {
name: "foreverFrame",
@ -1356,6 +1431,9 @@
return;
}
// Start preventing loading icon
// This will only perform work if the loadPreventer is not attached to another connection.
loadPreventer.prevent();
// Build the url
url = transportLogic.getUrl(connection, this.name);
@ -1434,6 +1512,10 @@
stop: function (connection) {
var cw = null;
// Stop attempting to prevent loading icon
loadPreventer.cancel();
if (connection.frame) {
if (connection.frame.stop) {
connection.frame.stop();
@ -1539,7 +1621,23 @@
initialConnectedFired = true;
onSuccess();
connection.log("Longpolling connected");
};
},
reconnectErrors = 0,
reconnectTimeoutId = null,
fireReconnected = function (instance) {
window.clearTimeout(reconnectTimeoutId);
reconnectTimeoutId = null;
if (changeState(connection,
signalR.connectionState.reconnecting,
signalR.connectionState.connected) === true) {
// Successfully reconnected!
connection.log("Raising the reconnect event");
$(instance).triggerHandler(events.onReconnect);
}
},
// 1 hour
maxFireReconnectedTimeout = 3600000;
if (connection.pollXhr) {
connection.log("Polling xhr requests already exists, aborting.");
@ -1556,7 +1654,8 @@
var messageId = instance.messageId,
connect = (messageId === null),
reconnecting = !connect,
url = transportLogic.getUrl(instance, that.name, reconnecting, raiseReconnect);
polling = !raiseReconnect,
url = transportLogic.getUrl(instance, that.name, reconnecting, polling);
// If we've disconnected during the time we've tried to re-instantiate the poll then stop.
if (isDisconnecting(instance) === true) {
@ -1570,10 +1669,20 @@
cache: false,
type: "GET",
dataType: connection.ajaxDataType,
contentType: connection.contentType,
success: function (minData) {
var delay = 0,
data;
// Reset our reconnect errors so if we transition into a reconnecting state again we trigger
// reconnected quickly
reconnectErrors = 0;
// If there's currently a timeout to trigger reconnect, fire it now before processing messages
if (reconnectTimeoutId !== null) {
fireReconnected();
}
fireConnect();
if (minData) {
@ -1606,11 +1715,21 @@
},
error: function (data, textStatus) {
// Stop trying to trigger reconnect, connection is in an error state
// If we're not in the reconnect state this will noop
window.clearTimeout(reconnectTimeoutId);
reconnectTimeoutId = null;
if (textStatus === "abort") {
connection.log("Aborted xhr requst.");
return;
}
// Increment our reconnect errors, we assume all errors to be reconnect errors
// In the case that it's our first error this will cause Reconnect to be fired
// after 1 second due to reconnectErrors being = 1.
reconnectErrors++;
if (connection.state !== signalR.connectionState.reconnecting) {
connection.log("An error occurred using longPolling. Status = " + textStatus + ". " + data.responseText);
$(instance).triggerHandler(events.onError, [data.responseText]);
@ -1628,15 +1747,15 @@
}
});
// This will only ever pass after an error has occured via the poll ajax procedure.
if (reconnecting && raiseReconnect === true) {
if (changeState(connection,
signalR.connectionState.reconnecting,
signalR.connectionState.connected) === true) {
// Successfully reconnected!
connection.log("Raising the reconnect event");
$(instance).triggerHandler(events.onReconnect);
}
// We wait to reconnect depending on how many times we've failed to reconnect.
// This is essentially a heuristic that will exponentially increase in wait time before
// triggering reconnected. This depends on the "error" handler of Poll to cancel this
// timeout if it triggers before the Reconnected event fires.
// The Math.min at the end is to ensure that the reconnect timeout does not overflow.
reconnectTimeoutId = window.setTimeout(function () { fireReconnected(instance); }, Math.min(1000 * (Math.pow(2, reconnectErrors) - 1), maxFireReconnectedTimeout));
}
}(connection));
@ -1692,20 +1811,17 @@
return event + eventNamespace;
}
// Array.prototype.map
if (!Array.prototype.hasOwnProperty("map")) {
Array.prototype.map = function (fun, thisp) {
var arr = this,
i,
length = arr.length,
result = [];
for (i = 0; i < length; i += 1) {
if (arr.hasOwnProperty(i)) {
result[i] = fun.call(thisp, arr[i], i, arr);
}
// Equivalent to Array.prototype.map
function map(arr, fun, thisp) {
var i,
length = arr.length,
result = [];
for (i = 0; i < length; i += 1) {
if (arr.hasOwnProperty(i)) {
result[i] = fun.call(thisp, arr[i], i, arr);
}
return result;
};
}
return result;
}
function getArgValue(a) {
@ -1814,7 +1930,7 @@
var self = this,
args = $.makeArray(arguments).slice(1),
argValues = args.map(getArgValue),
argValues = map(args, getArgValue),
data = { H: self.hubName, M: methodName, A: argValues, I: callbackId },
d = $.Deferred(),
callback = function (minResult) {
@ -2003,5 +2119,5 @@
/*global window:false */
/// <reference path="jquery.signalR.core.js" />
(function ($) {
$.signalR.version = "1.0.1";
$.signalR.version = "1.1.2";
}(window.jQuery));

10
BasicChat.Mvc/Scripts/jquery.signalR-1.1.2.min.js поставляемый Normal file
Просмотреть файл

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

2
BasicChat.Mvc/Views/Home/Index.cshtml
Просмотреть файл

@ -19,7 +19,7 @@
</section>
}
@section scripts {
<script src="~/Scripts/jquery.signalR-1.0.1.min.js"></script>
<script src="~/Scripts/jquery.signalR-1.1.2.min.js"></script>
<script src="~/signalR/hubs"></script>
<script>
$(function () {

10
BasicChat.Mvc/packages.config
Просмотреть файл

@ -14,11 +14,11 @@
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="2.0.20715.0" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Core" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.JS" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Owin" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.SystemWeb" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR" version="1.1.2" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Core" version="1.1.2" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.JS" version="1.1.2" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Owin" version="1.1.2" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.SystemWeb" version="1.1.2" targetFramework="net45" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi" version="4.0.20710.0" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.20710.0" targetFramework="net45" />

10
BasicChat.SelfHost/BasicChat.SelfHost.csproj
Просмотреть файл

@ -34,11 +34,13 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNet.SignalR.Core">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.0.1\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
<Reference Include="Microsoft.AspNet.SignalR.Core, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.1.2\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.Owin">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Owin.1.0.1\lib\net45\Microsoft.AspNet.SignalR.Owin.dll</HintPath>
<Reference Include="Microsoft.AspNet.SignalR.Owin, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.SignalR.Owin.1.1.2\lib\net45\Microsoft.AspNet.SignalR.Owin.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.Host.HttpListener">
<HintPath>..\packages\Microsoft.Owin.Host.HttpListener.0.18.0-alpha\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>

4
BasicChat.SelfHost/packages.config
Просмотреть файл

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.AspNet.SignalR.Core" version="1.1.2" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Owin" version="1.1.2" targetFramework="net45" />
<package id="Microsoft.Owin.Host.HttpListener" version="0.18.0-alpha" targetFramework="net45" />
<package id="Microsoft.Owin.Hosting" version="0.18.0-alpha" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Core" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Owin" version="1.0.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
</packages>

16
BasicChat/BasicChat.csproj
Просмотреть файл

@ -40,17 +40,17 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNet.SignalR.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.AspNet.SignalR.Core, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.0.1\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.1.2\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.AspNet.SignalR.Owin, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.SignalR.Owin.1.0.1\lib\net45\Microsoft.AspNet.SignalR.Owin.dll</HintPath>
<HintPath>..\packages\Microsoft.AspNet.SignalR.Owin.1.1.2\lib\net45\Microsoft.AspNet.SignalR.Owin.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.SystemWeb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.AspNet.SignalR.SystemWeb, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.SignalR.SystemWeb.1.0.1\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll</HintPath>
<HintPath>..\packages\Microsoft.AspNet.SignalR.SystemWeb.1.1.2\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Owin.Host.SystemWeb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@ -91,8 +91,8 @@
<None Include="Scripts\jquery-1.8.3.intellisense.js" />
<Content Include="Scripts\jquery-1.8.3.js" />
<Content Include="Scripts\jquery-1.8.3.min.js" />
<Content Include="Scripts\jquery.signalR-1.0.1.js" />
<Content Include="Scripts\jquery.signalR-1.0.1.min.js" />
<Content Include="Scripts\jquery.signalR-1.1.2.js" />
<Content Include="Scripts\jquery.signalR-1.1.2.min.js" />
<Content Include="Web.config" />
</ItemGroup>
<ItemGroup>

10
BasicChat/Scripts/jquery.signalR-1.0.1.min.js поставляемый
Просмотреть файл

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

280
BasicChat.Mvc/Scripts/jquery.signalR-1.0.1.js → BasicChat/Scripts/jquery.signalR-1.1.2.js
Просмотреть файл

@ -1,7 +1,7 @@
/* jquery.signalR.core.js */
/*global window:false */
/*!
* ASP.NET SignalR JavaScript Library v1.0.1
* ASP.NET SignalR JavaScript Library v1.1.2
* http://signalr.net/
*
* Copyright Microsoft Open Technologies, Inc. All rights reserved.
@ -120,6 +120,26 @@
return new signalR.fn.init(url, qs, logging);
};
signalR._ = {
defaultContentType: "application/x-www-form-urlencoded; charset=UTF-8",
ieVersion: (function () {
var version,
matches;
if (window.navigator.appName === 'Microsoft Internet Explorer') {
// Check if the user agent has the pattern "MSIE (one or more numbers).(one or more numbers)";
matches = /MSIE ([0-9]+\.[0-9]+)/.exec(window.navigator.userAgent);
if (matches) {
version = window.parseFloat(matches[1]);
}
}
// undefined value means not IE
return version;
})()
};
signalR.events = events;
signalR.changeState = changeState;
@ -147,6 +167,7 @@
/// <param name="requestedTransport" type="Object">The designated transports that the user has specified.</param>
/// <param name="connection" type="signalR">The connection that will be using the requested transports. Used for logging purposes.</param>
/// <returns type="Object" />
if ($.isArray(requestedTransport)) {
// Go through transport array and remove an "invalid" tranports
for (var i = requestedTransport.length - 1; i >= 0; i--) {
@ -166,6 +187,12 @@
connection.log("Invalid transport: " + requestedTransport.toString());
requestedTransport = null;
}
else if (requestedTransport === "auto" && signalR._.ieVersion <= 8)
{
// If we're doing an auto transport and we're IE8 then force longPolling, #1764
return ["longPolling"];
}
return requestedTransport;
}
@ -225,6 +252,8 @@
ajaxDataType: "json",
contentType: "application/json; charset=UTF-8",
logging: false,
state: signalR.connectionState.disconnected,
@ -331,6 +360,8 @@
connection.log("Using jsonp because this browser doesn't support CORS");
}
}
connection.contentType = signalR._.defaultContentType;
}
connection.ajaxDataType = config.jsonp ? "jsonp" : "json";
@ -347,7 +378,7 @@
if (index >= transports.length) {
if (!connection.transport) {
// No transport initialized successfully
$(connection).triggerHandler(events.onError, "SignalR: No transport could be initialized successfully. Try specifying a different transport or none at all for auto initialization.");
$(connection).triggerHandler(events.onError, ["SignalR: No transport could be initialized successfully. Try specifying a different transport or none at all for auto initialization."]);
deferred.reject("SignalR: No transport could be initialized successfully. Try specifying a different transport or none at all for auto initialization.");
// Stop the connection if it has connected and move it into the disconnected state
connection.stop();
@ -396,6 +427,7 @@
global: false,
cache: false,
type: "GET",
contentType: connection.contentType,
data: {},
dataType: connection.ajaxDataType,
error: function (error) {
@ -436,7 +468,7 @@
}
if (!res.ProtocolVersion || res.ProtocolVersion !== "1.2") {
$(connection).triggerHandler(events.onError, "You are using a version of the client that isn't compatible with the server. Client version 1.2, server version " + res.ProtocolVersion + ".");
$(connection).triggerHandler(events.onError, ["You are using a version of the client that isn't compatible with the server. Client version 1.2, server version " + res.ProtocolVersion + "."]);
deferred.reject("You are using a version of the client that isn't compatible with the server. Client version 1.2, server version " + res.ProtocolVersion + ".");
return;
}
@ -708,6 +740,11 @@
}
}
function isConnectedOrReconnecting(connection) {
return connection.state === signalR.connectionState.connected ||
connection.state === signalR.connectionState.reconnecting;
}
signalR.transports._logic = {
pingServer: function (connection, transport) {
/// <summary>Pings the server</summary>
@ -724,6 +761,7 @@
global: false,
cache: false,
type: "GET",
contentType: connection.contentType,
data: {},
dataType: connection.ajaxDataType,
success: function (data) {
@ -745,7 +783,7 @@
addQs: function (url, connection) {
var appender = url.indexOf("?") !== -1 ? "&" : "?",
firstChar;
if (!connection.qs) {
return url;
}
@ -767,7 +805,7 @@
throw new Error("Connections query string property must be either a string or object.");
},
getUrl: function (connection, transport, reconnecting, appendReconnectUrl) {
getUrl: function (connection, transport, reconnecting, poll) {
/// <summary>Gets the url for making a GET based connect request</summary>
var baseUrl = transport === "webSockets" ? "" : connection.baseUrl,
url = baseUrl + connection.appRelativeUrl,
@ -782,11 +820,15 @@
}
if (!reconnecting) {
url = url + "/connect";
url += "/connect";
} else {
if (appendReconnectUrl) {
url = url + "/reconnect";
if (poll) {
// longPolling transport specific
url += "/poll";
} else {
url += "/reconnect";
}
if (connection.messageId) {
qs += "&messageId=" + window.encodeURIComponent(connection.messageId);
}
@ -821,6 +863,7 @@
url: url,
global: false,
type: connection.ajaxDataType === "jsonp" ? "GET" : "POST",
contentType: signalR._.defaultContentType,
dataType: connection.ajaxDataType,
data: {
data: data
@ -858,6 +901,7 @@
timeout: 1000,
global: false,
type: "POST",
contentType: connection.contentType,
dataType: connection.ajaxDataType,
data: {}
});
@ -894,8 +938,8 @@
this.updateGroups(connection, data.GroupsToken);
if (data.Messages) {
$.each(data.Messages, function () {
$connection.triggerHandler(events.onReceived, [this]);
$.each(data.Messages, function (index, message) {
$connection.triggerHandler(events.onReceived, [message]);
});
}
@ -963,6 +1007,32 @@
return connection.state === signalR.connectionState.reconnecting;
},
clearReconnectTimeout: function (connection) {
if (connection && connection._.reconnectTimeout) {
window.clearTimeout(connection._.reconnectTimeout);
delete connection._.reconnectTimeout;
}
},
reconnect: function (connection, transportName) {
var transport = signalR.transports[transportName],
that = this;
// We should only set a reconnectTimeout if we are currently connected
// and a reconnectTimeout isn't already set.
if (isConnectedOrReconnecting(connection) && !connection._.reconnectTimeout) {
connection._.reconnectTimeout = window.setTimeout(function () {
transport.stop(connection);
if (that.ensureReconnectingState(connection)) {
connection.log(transportName + " reconnecting");
transport.start(connection);
}
}, connection.reconnectDelay);
}
},
foreverFrame: {
count: 0,
connections: {}
@ -989,10 +1059,6 @@
supportsKeepAlive: true,
attemptingReconnect: false,
currentSocketID: 0,
send: function (connection, data) {
connection.socket.send(data);
},
@ -1021,14 +1087,11 @@
connection.log("Connecting to websocket endpoint '" + url + "'");
connection.socket = new window.WebSocket(url);
connection.socket.ID = ++that.currentSocketID;
connection.socket.onopen = function () {
opened = true;
connection.log("Websocket opened");
if (that.attemptingReconnect) {
that.attemptingReconnect = false;
}
transportLogic.clearReconnectTimeout(connection);
if (onSuccess) {
onSuccess();
@ -1043,7 +1106,7 @@
// Only handle a socket close if the close is from the current socket.
// Sometimes on disconnect the server will push down an onclose event
// to an expired socket.
if (this.ID === that.currentSocketID) {
if (this === connection.socket) {
if (!opened) {
if (onFailed) {
onFailed();
@ -1086,24 +1149,7 @@
},
reconnect: function (connection) {
var that = this;
if (connection.state !== signalR.connectionState.disconnected) {
if (!that.attemptingReconnect) {
that.attemptingReconnect = true;
}
window.setTimeout(function () {
if (that.attemptingReconnect) {
that.stop(connection);
}
if (transportLogic.ensureReconnectingState(connection)) {
connection.log("Websocket reconnecting");
that.start(connection);
}
}, connection.reconnectDelay);
}
transportLogic.reconnect(connection, this.name);
},
lostConnection: function (connection) {
@ -1112,6 +1158,9 @@
},
stop: function (connection) {
// Don't trigger a reconnect after stopping
transportLogic.clearReconnectTimeout(connection);
if (connection.socket !== null) {
connection.log("Closing the Websocket");
connection.socket.close();
@ -1143,10 +1192,6 @@
supportsKeepAlive: true,
reconnectTimeout: false,
currentEventSourceID: 0,
timeOut: 3000,
start: function (connection, onSuccess, onFailed) {
@ -1175,7 +1220,6 @@
try {
connection.log("Attempting to connect to SSE endpoint '" + url + "'");
connection.eventSource = new window.EventSource(url);
connection.eventSource.ID = ++that.currentEventSourceID;
}
catch (e) {
connection.log("EventSource failed trying to connect with error " + e.Message);
@ -1226,9 +1270,7 @@
window.clearTimeout(connectTimeOut);
}
if (that.reconnectTimeout) {
window.clearTimeout(that.reconnectTimeout);
}
transportLogic.clearReconnectTimeout(connection);
if (opened === false) {
opened = true;
@ -1257,7 +1299,7 @@
// Only handle an error if the error is from the current Event Source.
// Sometimes on disconnect the server will push down an error event
// to an expired Event Source.
if (this.ID === that.currentEventSourceID) {
if (this === connection.eventSource) {
if (!opened) {
if (onFailed) {
onFailed();
@ -1285,16 +1327,7 @@
},
reconnect: function (connection) {
var that = this;
that.reconnectTimeout = window.setTimeout(function () {
that.stop(connection);
if (transportLogic.ensureReconnectingState(connection)) {
connection.log("EventSource reconnecting");
that.start(connection);
}
}, connection.reconnectDelay);
transportLogic.reconnect(connection, this.name);
},
lostConnection: function (connection) {
@ -1306,14 +1339,17 @@
},
stop: function (connection) {
// Don't trigger a reconnect after stopping
transportLogic.clearReconnectTimeout(connection);
if (connection && connection.eventSource) {
connection.log("EventSource calling close()");
connection.eventSource.ID = null;
connection.eventSource.close();
connection.eventSource = null;
delete connection.eventSource;
}
},
abort: function (connection, async) {
transportLogic.ajaxAbort(connection, async);
}
@ -1332,7 +1368,46 @@
var signalR = $.signalR,
events = $.signalR.events,
changeState = $.signalR.changeState,
transportLogic = signalR.transports._logic;
transportLogic = signalR.transports._logic,
// Used to prevent infinite loading icon spins in older versions of ie
// We build this object inside a closure so we don't pollute the rest of
// the foreverFrame transport with unnecessary functions/utilities.
loadPreventer = (function () {
var loadingFixIntervalId = null,
loadingFixInterval = 1000,
attachedTo = 0;
return {
prevent: function () {
// Prevent additional iframe removal procedures from newer browsers
if (signalR._.ieVersion <= 8) {
// We only ever want to set the interval one time, so on the first attachedTo
if (attachedTo === 0) {
// Create and destroy iframe every 3 seconds to prevent loading icon, super hacky
loadingFixIntervalId = window.setInterval(function () {
var tempFrame = $("<iframe style='position:absolute;top:0;left:0;width:0;height:0;visibility:hidden;' src=''></iframe>");
$("body").append(tempFrame);
tempFrame.remove();
tempFrame = null;
}, loadingFixInterval);
}
attachedTo++;
}
},
cancel: function () {
// Only clear the interval if there's only one more object that the loadPreventer is attachedTo
if (attachedTo === 1) {
window.clearInterval(loadingFixIntervalId);
}
if (attachedTo > 0) {
attachedTo--;
}
}
};
})();
signalR.transports.foreverFrame = {
name: "foreverFrame",
@ -1356,6 +1431,9 @@
return;
}
// Start preventing loading icon
// This will only perform work if the loadPreventer is not attached to another connection.
loadPreventer.prevent();
// Build the url
url = transportLogic.getUrl(connection, this.name);
@ -1434,6 +1512,10 @@
stop: function (connection) {
var cw = null;
// Stop attempting to prevent loading icon
loadPreventer.cancel();
if (connection.frame) {
if (connection.frame.stop) {
connection.frame.stop();
@ -1539,7 +1621,23 @@
initialConnectedFired = true;
onSuccess();
connection.log("Longpolling connected");
};
},
reconnectErrors = 0,
reconnectTimeoutId = null,
fireReconnected = function (instance) {
window.clearTimeout(reconnectTimeoutId);
reconnectTimeoutId = null;
if (changeState(connection,
signalR.connectionState.reconnecting,
signalR.connectionState.connected) === true) {
// Successfully reconnected!
connection.log("Raising the reconnect event");
$(instance).triggerHandler(events.onReconnect);
}
},
// 1 hour
maxFireReconnectedTimeout = 3600000;
if (connection.pollXhr) {
connection.log("Polling xhr requests already exists, aborting.");
@ -1556,7 +1654,8 @@
var messageId = instance.messageId,
connect = (messageId === null),
reconnecting = !connect,
url = transportLogic.getUrl(instance, that.name, reconnecting, raiseReconnect);
polling = !raiseReconnect,
url = transportLogic.getUrl(instance, that.name, reconnecting, polling);
// If we've disconnected during the time we've tried to re-instantiate the poll then stop.
if (isDisconnecting(instance) === true) {
@ -1570,10 +1669,20 @@
cache: false,
type: "GET",
dataType: connection.ajaxDataType,
contentType: connection.contentType,
success: function (minData) {
var delay = 0,
data;
// Reset our reconnect errors so if we transition into a reconnecting state again we trigger
// reconnected quickly
reconnectErrors = 0;
// If there's currently a timeout to trigger reconnect, fire it now before processing messages
if (reconnectTimeoutId !== null) {
fireReconnected();
}
fireConnect();
if (minData) {
@ -1606,11 +1715,21 @@
},
error: function (data, textStatus) {
// Stop trying to trigger reconnect, connection is in an error state
// If we're not in the reconnect state this will noop
window.clearTimeout(reconnectTimeoutId);
reconnectTimeoutId = null;
if (textStatus === "abort") {
connection.log("Aborted xhr requst.");
return;
}
// Increment our reconnect errors, we assume all errors to be reconnect errors
// In the case that it's our first error this will cause Reconnect to be fired
// after 1 second due to reconnectErrors being = 1.
reconnectErrors++;
if (connection.state !== signalR.connectionState.reconnecting) {
connection.log("An error occurred using longPolling. Status = " + textStatus + ". " + data.responseText);
$(instance).triggerHandler(events.onError, [data.responseText]);
@ -1628,15 +1747,15 @@
}
});
// This will only ever pass after an error has occured via the poll ajax procedure.
if (reconnecting && raiseReconnect === true) {
if (changeState(connection,
signalR.connectionState.reconnecting,
signalR.connectionState.connected) === true) {
// Successfully reconnected!
connection.log("Raising the reconnect event");
$(instance).triggerHandler(events.onReconnect);
}
// We wait to reconnect depending on how many times we've failed to reconnect.
// This is essentially a heuristic that will exponentially increase in wait time before
// triggering reconnected. This depends on the "error" handler of Poll to cancel this
// timeout if it triggers before the Reconnected event fires.
// The Math.min at the end is to ensure that the reconnect timeout does not overflow.
reconnectTimeoutId = window.setTimeout(function () { fireReconnected(instance); }, Math.min(1000 * (Math.pow(2, reconnectErrors) - 1), maxFireReconnectedTimeout));
}
}(connection));
@ -1692,20 +1811,17 @@
return event + eventNamespace;
}
// Array.prototype.map
if (!Array.prototype.hasOwnProperty("map")) {
Array.prototype.map = function (fun, thisp) {
var arr = this,
i,
length = arr.length,
result = [];
for (i = 0; i < length; i += 1) {
if (arr.hasOwnProperty(i)) {
result[i] = fun.call(thisp, arr[i], i, arr);
}
// Equivalent to Array.prototype.map
function map(arr, fun, thisp) {
var i,
length = arr.length,
result = [];
for (i = 0; i < length; i += 1) {
if (arr.hasOwnProperty(i)) {
result[i] = fun.call(thisp, arr[i], i, arr);
}
return result;
};
}
return result;
}
function getArgValue(a) {
@ -1814,7 +1930,7 @@
var self = this,
args = $.makeArray(arguments).slice(1),
argValues = args.map(getArgValue),
argValues = map(args, getArgValue),
data = { H: self.hubName, M: methodName, A: argValues, I: callbackId },
d = $.Deferred(),
callback = function (minResult) {
@ -2003,5 +2119,5 @@
/*global window:false */
/// <reference path="jquery.signalR.core.js" />
(function ($) {
$.signalR.version = "1.0.1";
$.signalR.version = "1.1.2";
}(window.jQuery));

10
BasicChat/Scripts/jquery.signalR-1.1.2.min.js поставляемый Normal file
Просмотреть файл

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

2
BasicChat/chat-tracking.html
Просмотреть файл

@ -9,7 +9,7 @@
<ul id="message">
</ul>
<script src="Scripts/jquery-1.8.3.min.js"></script>
<script src="Scripts/jquery.signalR-1.0.1.min.js"></script>
<script src="Scripts/jquery.signalR-1.1.2.min.js"></script>
<script src="signalR/hubs"></script>
<script>
$(function () {

2
BasicChat/index.html
Просмотреть файл

@ -9,7 +9,7 @@
<ul id="message">
</ul>
<script src="Scripts/jquery-1.8.3.min.js"></script>
<script src="Scripts/jquery.signalR-1.0.1.min.js"></script>
<script src="Scripts/jquery.signalR-1.1.2.min.js"></script>
<script src="signalR/hubs"></script>
<script>
$(function () {

10
BasicChat/packages.config
Просмотреть файл

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="jQuery" version="1.8.3" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Core" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.JS" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Owin" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.SystemWeb" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR" version="1.1.2" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Core" version="1.1.2" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.JS" version="1.1.2" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Owin" version="1.1.2" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.SystemWeb" version="1.1.2" targetFramework="net45" />
<package id="Microsoft.Owin.Host.SystemWeb" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />

5
BasicChatConsole/BasicChatConsole.csproj
Просмотреть файл

@ -34,8 +34,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNet.SignalR.Client">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Client.1.0.1\lib\net45\Microsoft.AspNet.SignalR.Client.dll</HintPath>
<Reference Include="Microsoft.AspNet.SignalR.Client, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.SignalR.Client.1.1.2\lib\net45\Microsoft.AspNet.SignalR.Client.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>

2
BasicChatConsole/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.AspNet.SignalR.Client" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Client" version="1.1.2" targetFramework="net45" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
</packages>