huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #1575 by removing use of Map (#1671)

This commit is contained in:
Andrew Stanton-Nurse 2018-03-21 10:11:18 -07:00 committed by GitHub
parent 6053a34cf3
commit 71c2ddd155
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client-ts/signalr/src/HttpClient.ts
View File

@ -8,7 +8,7 @@ export interface HttpRequest {
method?: string;
url?: string;
content?: string | ArrayBuffer;
headers?: Map<string, string>;
headers?: { [key: string]: string };
responseType?: XMLHttpRequestResponseType;
abortSignal?: AbortSignal;
timeout?: number;
@ -58,7 +58,8 @@ export class DefaultHttpClient extends HttpClient {
xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
if (request.headers) {
request.headers.forEach((value, header) => xhr.setRequestHeader(header, value));
Object.keys(request.headers)
.forEach((header) => xhr.setRequestHeader(header, request.headers[header]));
}
if (request.responseType) {

5
client-ts/signalr/src/HttpConnection.ts
View File

@ -83,8 +83,9 @@ export class HttpConnection implements IConnection {
let headers;
const token = this.options.accessTokenFactory();
if (token) {
headers = new Map<string, string>();
headers.set("Authorization", `Bearer ${token}`);
headers = {
["Authorization"]: `Bearer ${token}`,
};
}
const negotiatePayload = await this.httpClient.post(this.resolveNegotiateUrl(this.baseUrl), {

50
client-ts/signalr/src/HubConnection.ts
View File

@ -25,8 +25,8 @@ export class HubConnection {
private readonly connection: IConnection;
private readonly logger: ILogger;
private protocol: IHubProtocol;
private callbacks: Map<string, (invocationEvent: StreamItemMessage | CompletionMessage, error?: Error) => void>;
private methods: Map<string, Array<(...args: any[]) => void>>;
private callbacks: { [invocationId: string]: (invocationEvent: StreamItemMessage | CompletionMessage, error?: Error) => void };
private methods: { [name: string]: Array<(...args: any[]) => void> };
private id: number;
private closedCallbacks: ConnectionClosed[];
private timeoutHandle: NodeJS.Timer;
@ -53,8 +53,8 @@ export class HubConnection {
this.connection.onreceive = (data: any) => this.processIncomingData(data);
this.connection.onclose = (error?: Error) => this.connectionClosed(error);
this.callbacks = new Map<string, (invocationEvent: HubMessage, error?: Error) => void>();
this.methods = new Map<string, Array<(...args: any[]) => void>>();
this.callbacks = {};
this.methods = {};
this.closedCallbacks = [];
this.id = 0;
}
@ -79,10 +79,10 @@ export class HubConnection {
break;
case MessageType.StreamItem:
case MessageType.Completion:
const callback = this.callbacks.get(message.invocationId);
const callback = this.callbacks[message.invocationId];
if (callback != null) {
if (message.type === MessageType.Completion) {
this.callbacks.delete(message.invocationId);
delete this.callbacks[message.invocationId];
}
callback(message);
}
@ -174,7 +174,7 @@ export class HubConnection {
}
private invokeClientMethod(invocationMessage: InvocationMessage) {
const methods = this.methods.get(invocationMessage.target.toLowerCase());
const methods = this.methods[invocationMessage.target.toLowerCase()];
if (methods) {
methods.forEach((m) => m.apply(this, invocationMessage.arguments));
if (invocationMessage.invocationId) {
@ -189,10 +189,14 @@ export class HubConnection {
}
private connectionClosed(error?: Error) {
this.callbacks.forEach((callback) => {
callback(undefined, error ? error : new Error("Invocation canceled due to connection being closed."));
});
this.callbacks.clear();
const callbacks = this.callbacks;
this.callbacks = {};
Object.keys(callbacks)
.forEach((key) => {
const callback = callbacks[key];
callback(undefined, error ? error : new Error("Invocation canceled due to connection being closed."));
});
this.cleanupTimeout();
@ -228,12 +232,12 @@ export class HubConnection {
const cancelInvocation: CancelInvocationMessage = this.createCancelInvocation(invocationDescriptor.invocationId);
const cancelMessage: any = this.protocol.writeMessage(cancelInvocation);
this.callbacks.delete(invocationDescriptor.invocationId);
delete this.callbacks[invocationDescriptor.invocationId];
return this.connection.send(cancelMessage);
});
this.callbacks.set(invocationDescriptor.invocationId, (invocationEvent: CompletionMessage | StreamItemMessage, error?: Error) => {
this.callbacks[invocationDescriptor.invocationId] = (invocationEvent: CompletionMessage | StreamItemMessage, error?: Error) => {
if (error) {
subject.error(error);
return;
@ -248,14 +252,14 @@ export class HubConnection {
} else {
subject.next((invocationEvent.item) as T);
}
});
};
const message = this.protocol.writeMessage(invocationDescriptor);
this.connection.send(message)
.catch((e) => {
subject.error(e);
this.callbacks.delete(invocationDescriptor.invocationId);
delete this.callbacks[invocationDescriptor.invocationId];
});
return subject;
@ -273,7 +277,7 @@ export class HubConnection {
const invocationDescriptor = this.createInvocation(methodName, args, false);
const p = new Promise<any>((resolve, reject) => {
this.callbacks.set(invocationDescriptor.invocationId, (invocationEvent: StreamItemMessage | CompletionMessage, error?: Error) => {
this.callbacks[invocationDescriptor.invocationId] = (invocationEvent: StreamItemMessage | CompletionMessage, error?: Error) => {
if (error) {
reject(error);
return;
@ -288,14 +292,14 @@ export class HubConnection {
} else {
reject(new Error(`Unexpected message type: ${invocationEvent.type}`));
}
});
};
const message = this.protocol.writeMessage(invocationDescriptor);
this.connection.send(message)
.catch((e) => {
reject(e);
this.callbacks.delete(invocationDescriptor.invocationId);
delete this.callbacks[invocationDescriptor.invocationId];
});
});
@ -308,11 +312,11 @@ export class HubConnection {
}
methodName = methodName.toLowerCase();
if (!this.methods.has(methodName)) {
this.methods.set(methodName, []);
if (!this.methods[methodName]) {
this.methods[methodName] = [];
}
this.methods.get(methodName).push(method);
this.methods[methodName].push(method);
}
public off(methodName: string, method: (...args: any[]) => void) {
@ -321,7 +325,7 @@ export class HubConnection {
}
methodName = methodName.toLowerCase();
const handlers = this.methods.get(methodName);
const handlers = this.methods[methodName];
if (!handlers) {
return;
}
@ -329,7 +333,7 @@ export class HubConnection {
if (removeIdx !== -1) {
handlers.splice(removeIdx, 1);
if (handlers.length === 0) {
this.methods.delete(methodName);
delete this.methods[methodName];
}
}
}

10
client-ts/signalr/src/Transports.ts
View File

@ -238,7 +238,7 @@ export class LongPollingTransport implements ITransport {
private async poll(url: string, transferFormat: TransferFormat): Promise<void> {
const pollOptions: HttpRequest = {
abortSignal: this.pollAbort.signal,
headers: new Map<string, string>(),
headers: {},
timeout: 90000,
};
@ -248,7 +248,8 @@ export class LongPollingTransport implements ITransport {
const token = this.accessTokenFactory();
if (token) {
pollOptions.headers.set("Authorization", `Bearer ${token}`);
// tslint:disable-next-line:no-string-literal
pollOptions.headers["Authorization"] = `Bearer ${token}`;
}
while (!this.pollAbort.signal.aborted) {
@ -316,8 +317,9 @@ async function send(httpClient: HttpClient, url: string, accessTokenFactory: ()
let headers;
const token = accessTokenFactory();
if (token) {
headers = new Map<string, string>();
headers.set("Authorization", `Bearer ${accessTokenFactory()}`);
headers = {
["Authorization"]: `Bearer ${accessTokenFactory()}`,
};
}
await httpClient.post(url, {

2
client-ts/tsconfig-base.json
View File

@ -13,6 +13,6 @@
"noImplicitAny": true,
"suppressImplicitAnyIndexErrors": true,
"noEmitOnError": true,
"lib": [ "es2016", "dom" ]
"lib": [ "es5", "es2015.promise", "es2015.iterable", "dom" ]
}
}