Skip to content

Commit 68ee31b

Browse files
jumperchenjumperchen
committed
Fix dart analyzing issues
1 parent 9962da7 commit 68ee31b

12 files changed

+88
-95
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.0.3+1
2+
3+
Fix dart analyzing issues
4+
15
## 2.0.3
26

37
**New Feature:**

‎analysis_options.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include: package:pedantic/analysis_options.yaml
1+
include: package:lints/recommended.yaml
22

33
analyzer:
44
# exclude:
@@ -15,4 +15,6 @@ linter:
1515
list_remove_unrelated_type: true
1616
test_types_in_equals: true
1717
unrelated_type_equality_checks: true
18-
valid_regexps: true
18+
valid_regexps: true
19+
implementation_imports: false
20+
overridden_fields: false

‎lib/src/engine/parseqs.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ String encode(Map obj) {
1515

1616
for (var i in obj.keys) {
1717
if (str.isNotEmpty) str += '&';
18-
str += Uri.encodeComponent('$i') + '=' + Uri.encodeComponent('${obj[i]}');
18+
str += '${Uri.encodeComponent('$i')}=${Uri.encodeComponent('${obj[i]}')}';
1919
}
2020

2121
return str;

‎lib/src/engine/socket.dart

+23-24
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ class Socket extends EventEmitter {
4343
bool? forceBase64;
4444
bool? enablesXDR;
4545
String? timestampParam;
46-
var timestampRequests;
46+
dynamic timestampRequests;
4747
late List<String> transports;
4848
late Map transportOptions;
4949
String readyState = '';
5050
List writeBuffer = [];
5151
int prevBufferLen = 0;
5252
int? policyPort;
5353
bool? rememberUpgrade;
54-
var binaryType;
54+
dynamic binaryType;
5555
bool? onlyBinaryUpgrades;
5656
late Map perMessageDeflate;
5757
String? id;
@@ -103,10 +103,9 @@ class Socket extends EventEmitter {
103103
}
104104

105105
upgrade = opts['upgrade'] != false;
106-
path = (opts['path'] ?? '/engine.io')
106+
path = '${(opts['path'] ?? '/engine.io')
107107
.toString()
108-
.replaceFirst(RegExp(r'\/$'), '') +
109-
'/';
108+
.replaceFirst(RegExp(r'\/$'), '')}/';
110109
forceJSONP = opts['forceJSONP'] == true;
111110
jsonp = opts['jsonp'] != false;
112111
forceBase64 = opts['forceBase64'] == true;
@@ -239,7 +238,7 @@ class Socket extends EventEmitter {
239238
///
240239
/// @api private
241240
void open() {
242-
var transport;
241+
dynamic transport;
243242
if (rememberUpgrade != null &&
244243
priorWebsocketSuccess &&
245244
transports.contains('websocket')) {
@@ -298,10 +297,10 @@ class Socket extends EventEmitter {
298297
_logger.fine('probing transport "$name"');
299298
Transport? transport = createTransport(name, {'probe': true});
300299
var failed = false;
301-
var cleanup;
300+
dynamic cleanup;
302301
priorWebsocketSuccess = false;
303302

304-
var onTransportOpen = (_) {
303+
onTransportOpen(_) {
305304
if (onlyBinaryUpgrades == true) {
306305
var upgradeLosesBinary =
307306
supportsBinary == false && transport!.supportsBinary == false;
@@ -347,9 +346,9 @@ class Socket extends EventEmitter {
347346
{'error': 'probe error', 'transport': transport!.name});
348347
}
349348
});
350-
};
349+
}
351350

352-
var freezeTransport = () {
351+
freezeTransport() {
353352
if (failed) return;
354353

355354
// Any callback called by transport should be ignored since now
@@ -359,31 +358,31 @@ class Socket extends EventEmitter {
359358

360359
transport!.close();
361360
transport = null;
362-
};
361+
}
363362

364363
// Handle any error that happens while probing
365-
var onerror = (err) {
364+
onerror(err) {
366365
final oldTransport = transport;
367366
freezeTransport();
368367

369368
_logger.fine('probe transport "$name" failed because of error: $err');
370369

371370
emit('upgradeError',
372371
{'error': 'probe error: $err', 'transport': oldTransport!.name});
373-
};
372+
}
374373

375-
var onTransportClose = (_) => onerror('transport closed');
374+
onTransportClose(_) => onerror('transport closed');
376375

377376
// When the socket is closed while we're probing
378-
var onclose = (_) => onerror('socket closed');
377+
onclose(_) => onerror('socket closed');
379378

380379
// When the socket is upgraded while we're probing
381-
var onupgrade = (to) {
380+
onupgrade(to) {
382381
if (transport != null && to.name != transport!.name) {
383382
_logger.fine('"${to?.name}" works - aborting "${transport?.name}"');
384383
freezeTransport();
385384
}
386-
};
385+
}
387386

388387
// Remove all listeners on the transport and on self
389388
cleanup = () {
@@ -604,27 +603,27 @@ class Socket extends EventEmitter {
604603
///
605604
/// @api private
606605
Socket close() {
607-
var close = () {
606+
close() {
608607
onClose('forced close');
609608
_logger.fine('socket closing - telling transport to close');
610609
transport!.close();
611-
};
610+
}
612611

613-
var temp;
614-
var cleanupAndClose = (_) {
612+
dynamic temp;
613+
cleanupAndClose(_) {
615614
off('upgrade', temp);
616615
off('upgradeError', temp);
617616
close();
618-
};
617+
}
619618

620619
// a workaround for dart to access the local variable;
621620
temp = cleanupAndClose;
622621

623-
var waitForUpgrade = () {
622+
waitForUpgrade() {
624623
// wait for upgrade to finish since we can't send packets while pausing a transport
625624
once('upgrade', cleanupAndClose);
626625
once('upgradeError', cleanupAndClose);
627-
};
626+
}
628627

629628
if ('opening' == readyState || 'open' == readyState) {
630629
readyState = 'closing';

‎lib/src/engine/transport/io_websocket_transport.dart

+6-11
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class IOWebSocketTransport extends Transport {
1717

1818
@override
1919
String? name = 'websocket';
20-
var protocols;
20+
dynamic protocols;
2121

2222
@override
2323
bool? supportsBinary;
@@ -76,7 +76,7 @@ class IOWebSocketTransport extends Transport {
7676
void write(List packets) {
7777
writable = false;
7878

79-
var done = () {
79+
done() {
8080
emit('flush');
8181

8282
// fake drain
@@ -85,12 +85,12 @@ class IOWebSocketTransport extends Transport {
8585
writable = true;
8686
emit('drain');
8787
});
88-
};
88+
}
8989

9090
var total = packets.length;
9191
// encodePacket efficient as it uses WS framing
9292
// no need for encodePayload
93-
packets.forEach((packet) {
93+
for (var packet in packets) {
9494
PacketParser.encodePacket(packet,
9595
supportsBinary: supportsBinary, fromClient: true, callback: (data) {
9696
// Sometimes the websocket has already been closed but the browser didn't
@@ -109,7 +109,7 @@ class IOWebSocketTransport extends Transport {
109109

110110
if (--total == 0) done();
111111
});
112-
});
112+
}
113113
}
114114

115115
///
@@ -156,12 +156,7 @@ class IOWebSocketTransport extends Transport {
156156
}
157157

158158
var ipv6 = hostname.contains(':');
159-
return schema +
160-
'://' +
161-
(ipv6 ? '[' + hostname + ']' : hostname) +
162-
port +
163-
path +
164-
queryString;
159+
return '$schema://${ipv6 ? '[$hostname]' : hostname}$port$path$queryString';
165160
}
166161
//
167162
/////

‎lib/src/engine/transport/jsonp_transport.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ final RegExp rEscapedNewline = RegExp(r'\\n');
2424

2525
///
2626
/// Global JSONP callbacks.
27-
var callbacks;
27+
dynamic callbacks;
2828

2929
class JSONPTransport extends PollingTransport {
3030
// static var empty = (_) => '';
@@ -164,7 +164,7 @@ class JSONPTransport extends PollingTransport {
164164

165165
form!.action = uri();
166166

167-
var initIframe = () {
167+
initIframe() {
168168
if (iframe != null) {
169169
try {
170170
iframe!.remove();
@@ -181,7 +181,7 @@ class JSONPTransport extends PollingTransport {
181181

182182
form!.append(iframe!);
183183
iframe = iframe;
184-
};
184+
}
185185

186186
initIframe();
187187

‎lib/src/engine/transport/polling_transport.dart

+9-14
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ abstract class PollingTransport extends Transport {
5959

6060
readyState = 'pausing';
6161

62-
var pause = () {
62+
pause() {
6363
_logger.fine('paused');
6464
self.readyState = 'paused';
6565
onPause();
66-
};
66+
}
6767

6868
if (polling == true || writable != true) {
6969
var total = 0;
@@ -109,7 +109,7 @@ abstract class PollingTransport extends Transport {
109109
void onData(data) {
110110
var self = this;
111111
_logger.fine('polling got data $data');
112-
var callback = (packet, [index, total]) {
112+
callback(packet, [index, total]) {
113113
// if its the first message we consider the transport open
114114
if ('opening' == self.readyState) {
115115
self.onOpen();
@@ -124,7 +124,7 @@ abstract class PollingTransport extends Transport {
124124
// otherwise bypass onData and handle the message
125125
self.onPacket(packet);
126126
return null;
127-
};
127+
}
128128

129129
// decode payload
130130
PacketParser.decodePayload(data, socket!.binaryType).forEach(callback);
@@ -151,12 +151,12 @@ abstract class PollingTransport extends Transport {
151151
void doClose() {
152152
var self = this;
153153

154-
var close = ([_]) {
154+
close([_]) {
155155
_logger.fine('writing close packet');
156156
self.write([
157157
{'type': 'close'}
158158
]);
159-
};
159+
}
160160

161161
if ('open' == readyState) {
162162
_logger.fine('transport open - closing');
@@ -179,10 +179,10 @@ abstract class PollingTransport extends Transport {
179179
void write(List packets) {
180180
var self = this;
181181
writable = false;
182-
var callbackfn = (_) {
182+
callbackfn(_) {
183183
self.writable = true;
184184
self.emit('drain');
185-
};
185+
}
186186

187187
PacketParser.encodePayload(packets, callback: (data) {
188188
self.doWrite(data, callbackfn);
@@ -223,12 +223,7 @@ abstract class PollingTransport extends Transport {
223223
}
224224

225225
var ipv6 = hostname.contains(':');
226-
return schema +
227-
'://' +
228-
(ipv6 ? '[' + hostname + ']' : hostname) +
229-
port +
230-
path +
231-
queryString;
226+
return '$schema://${ipv6 ? '[$hostname]' : hostname}$port$path$queryString';
232227
}
233228

234229
void doWrite(data, callback);

‎lib/src/engine/transport/websocket_transport.dart

+6-11
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class WebSocketTransport extends Transport {
1515

1616
@override
1717
String? name = 'websocket';
18-
late var protocols;
18+
late dynamic protocols;
1919

2020
@override
2121
bool? supportsBinary;
@@ -70,7 +70,7 @@ class WebSocketTransport extends Transport {
7070
void write(List packets) {
7171
writable = false;
7272

73-
var done = () {
73+
done() {
7474
emit('flush');
7575

7676
// fake drain
@@ -79,12 +79,12 @@ class WebSocketTransport extends Transport {
7979
writable = true;
8080
emit('drain');
8181
});
82-
};
82+
}
8383

8484
var total = packets.length;
8585
// encodePacket efficient as it uses WS framing
8686
// no need for encodePayload
87-
packets.forEach((packet) {
87+
for (var packet in packets) {
8888
PacketParser.encodePacket(packet,
8989
supportsBinary: supportsBinary, fromClient: true, callback: (data) {
9090
// Sometimes the websocket has already been closed but the browser didn't
@@ -99,7 +99,7 @@ class WebSocketTransport extends Transport {
9999

100100
if (--total == 0) done();
101101
});
102-
});
102+
}
103103
}
104104

105105
/// Closes socket.
@@ -144,12 +144,7 @@ class WebSocketTransport extends Transport {
144144
}
145145

146146
var ipv6 = hostname.contains(':');
147-
return schema +
148-
'://' +
149-
(ipv6 ? '[' + hostname + ']' : hostname) +
150-
port +
151-
path +
152-
queryString;
147+
return '$schema://${ipv6 ? '[$hostname]' : hostname}$port$path$queryString';
153148
}
154149
/////
155150
///// Feature detection for WebSocket.

0 commit comments

Comments
 (0)