Skip to content

Commit 94c5f91

Browse files
kum-deepakkum-deepak
committed
Committed by Github action
master: { "stompjs": "6.1.2", "rx-stomp": "1.1.4" } develop: { "stompjs": "7.0.0-beta5", "rx-stomp": "2.0.0-beta2" }
1 parent 34dccaa commit 94c5f91

27 files changed

+105
-100
lines changed

‎_data/versions/develop.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"stompjs": "7.0.0-beta4",
2+
"stompjs": "7.0.0-beta5",
33
"rx-stomp": "2.0.0-beta2"
44
}

‎api-docs/develop/classes/Client.html

Lines changed: 45 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="x-ua-compatible" content="ie=edge">
6-
<title>[email protected]beta4, [email protected]</title>
6+
<title>[email protected]beta5, [email protected]</title>
77
<meta name="description" content="">
88
<meta name="viewport" content="width=device-width, initial-scale=1">
99

@@ -15,7 +15,7 @@
1515
<body>
1616

1717
<div class="navbar navbar-default navbar-fixed-top visible-xs">
18-
<a href="../" class="navbar-brand">[email protected]beta4, [email protected]</a>
18+
<a href="../" class="navbar-brand">[email protected]beta5, [email protected]</a>
1919
<button type="button" class="btn btn-default btn-menu ion-ios-menu" id="btn-menu"></button>
2020
</div>
2121

@@ -1380,8 +1380,8 @@ <h3 id="methods">
13801380

13811381
<tr>
13821382
<td class="col-md-4">
1383-
<div class="io-line">Defined in <a href="" data-line="811"
1384-
class="link-to-prism">consolidated/stompjs/src/client.ts:811</a></div>
1383+
<div class="io-line">Defined in <a href="" data-line="816"
1384+
class="link-to-prism">consolidated/stompjs/src/client.ts:816</a></div>
13851385
</td>
13861386
</tr>
13871387

@@ -1457,8 +1457,8 @@ <h3 id="methods">
14571457

14581458
<tr>
14591459
<td class="col-md-4">
1460-
<div class="io-line">Defined in <a href="" data-line="830"
1461-
class="link-to-prism">consolidated/stompjs/src/client.ts:830</a></div>
1460+
<div class="io-line">Defined in <a href="" data-line="835"
1461+
class="link-to-prism">consolidated/stompjs/src/client.ts:835</a></div>
14621462
</td>
14631463
</tr>
14641464

@@ -1612,8 +1612,8 @@ <h3 id="methods">
16121612

16131613
<tr>
16141614
<td class="col-md-4">
1615-
<div class="io-line">Defined in <a href="" data-line="776"
1616-
class="link-to-prism">consolidated/stompjs/src/client.ts:776</a></div>
1615+
<div class="io-line">Defined in <a href="" data-line="781"
1616+
class="link-to-prism">consolidated/stompjs/src/client.ts:781</a></div>
16171617
</td>
16181618
</tr>
16191619

@@ -1687,8 +1687,8 @@ <h3 id="methods">
16871687

16881688
<tr>
16891689
<td class="col-md-4">
1690-
<div class="io-line">Defined in <a href="" data-line="794"
1691-
class="link-to-prism">consolidated/stompjs/src/client.ts:794</a></div>
1690+
<div class="io-line">Defined in <a href="" data-line="799"
1691+
class="link-to-prism">consolidated/stompjs/src/client.ts:799</a></div>
16921692
</td>
16931693
</tr>
16941694

@@ -1838,8 +1838,8 @@ <h3 id="methods">
18381838

18391839
<tr>
18401840
<td class="col-md-4">
1841-
<div class="io-line">Defined in <a href="" data-line="563"
1842-
class="link-to-prism">consolidated/stompjs/src/client.ts:563</a></div>
1841+
<div class="io-line">Defined in <a href="" data-line="568"
1842+
class="link-to-prism">consolidated/stompjs/src/client.ts:568</a></div>
18431843
</td>
18441844
</tr>
18451845

@@ -1930,8 +1930,8 @@ <h3 id="methods">
19301930

19311931
<tr>
19321932
<td class="col-md-4">
1933-
<div class="io-line">Defined in <a href="" data-line="616"
1934-
class="link-to-prism">consolidated/stompjs/src/client.ts:616</a></div>
1933+
<div class="io-line">Defined in <a href="" data-line="621"
1934+
class="link-to-prism">consolidated/stompjs/src/client.ts:621</a></div>
19351935
</td>
19361936
</tr>
19371937

@@ -1974,8 +1974,8 @@ <h3 id="methods">
19741974

19751975
<tr>
19761976
<td class="col-md-4">
1977-
<div class="io-line">Defined in <a href="" data-line="853"
1978-
class="link-to-prism">consolidated/stompjs/src/client.ts:853</a></div>
1977+
<div class="io-line">Defined in <a href="" data-line="858"
1978+
class="link-to-prism">consolidated/stompjs/src/client.ts:858</a></div>
19791979
</td>
19801980
</tr>
19811981

@@ -2085,8 +2085,8 @@ <h3 id="methods">
20852085

20862086
<tr>
20872087
<td class="col-md-4">
2088-
<div class="io-line">Defined in <a href="" data-line="665"
2089-
class="link-to-prism">consolidated/stompjs/src/client.ts:665</a></div>
2088+
<div class="io-line">Defined in <a href="" data-line="670"
2089+
class="link-to-prism">consolidated/stompjs/src/client.ts:670</a></div>
20902090
</td>
20912091
</tr>
20922092

@@ -2182,8 +2182,8 @@ <h3 id="methods">
21822182

21832183
<tr>
21842184
<td class="col-md-4">
2185-
<div class="io-line">Defined in <a href="" data-line="742"
2186-
class="link-to-prism">consolidated/stompjs/src/client.ts:742</a></div>
2185+
<div class="io-line">Defined in <a href="" data-line="747"
2186+
class="link-to-prism">consolidated/stompjs/src/client.ts:747</a></div>
21872187
</td>
21882188
</tr>
21892189

@@ -2303,8 +2303,8 @@ <h3 id="methods">
23032303

23042304
<tr>
23052305
<td class="col-md-4">
2306-
<div class="io-line">Defined in <a href="" data-line="764"
2307-
class="link-to-prism">consolidated/stompjs/src/client.ts:764</a></div>
2306+
<div class="io-line">Defined in <a href="" data-line="769"
2307+
class="link-to-prism">consolidated/stompjs/src/client.ts:769</a></div>
23082308
</td>
23092309
</tr>
23102310

@@ -2398,8 +2398,8 @@ <h3 id="methods">
23982398

23992399
<tr>
24002400
<td class="col-md-4">
2401-
<div class="io-line">Defined in <a href="" data-line="712"
2402-
class="link-to-prism">consolidated/stompjs/src/client.ts:712</a></div>
2401+
<div class="io-line">Defined in <a href="" data-line="717"
2402+
class="link-to-prism">consolidated/stompjs/src/client.ts:717</a></div>
24032403
</td>
24042404
</tr>
24052405

@@ -3100,31 +3100,36 @@ <h3 id="accessors">
31003100
* Call [Client#deactivate]{@link Client#deactivate} to disconnect and stop reconnection attempts.
31013101
*/
31023102
public activate(): void {
3103-
if (this.state &#x3D;&#x3D;&#x3D; ActivationState.DEACTIVATING) {
3104-
this.debug(
3105-
&#x27;Still DEACTIVATING, please await call to deactivate before trying to re-activate&#x27;
3106-
);
3107-
throw new Error(&#x27;Still DEACTIVATING, can not activate now&#x27;);
3108-
}
3103+
const _activate &#x3D; () &#x3D;&gt; {
3104+
if (this.active) {
3105+
this.debug(&#x27;Already ACTIVE, ignoring request to activate&#x27;);
3106+
return;
3107+
}
31093108

3110-
if (this.active) {
3111-
this.debug(&#x27;Already ACTIVE, ignoring request to activate&#x27;);
3112-
return;
3113-
}
3109+
this._changeState(ActivationState.ACTIVE);
31143110

3115-
this._changeState(ActivationState.ACTIVE);
3111+
this._connect();
3112+
};
31163113

3117-
this._connect();
3114+
// if it is deactivating, wait for it to complete before activating.
3115+
if (this.state &#x3D;&#x3D;&#x3D; ActivationState.DEACTIVATING) {
3116+
this.debug(&#x27;Waiting for deactivation to finish before activating&#x27;);
3117+
this.deactivate().then(() &#x3D;&gt; {
3118+
_activate();
3119+
});
3120+
} else {
3121+
_activate();
3122+
}
31183123
}
31193124

31203125
private async _connect(): Promise&lt;void&gt; {
3121-
if (this.connected) {
3122-
this.debug(&#x27;STOMP: already connected, nothing to do&#x27;);
3126+
await this.beforeConnect();
3127+
3128+
if (this._stompHandler) {
3129+
this.debug(&#x27;There is already a stompHandler, skipping the call to connect&#x27;);
31233130
return;
31243131
}
31253132

3126-
await this.beforeConnect();
3127-
31283133
if (!this.active) {
31293134
this.debug(
31303135
&#x27;Client has been marked inactive, will not attempt to connect&#x27;

‎api-docs/develop/classes/CompatClient.html

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="x-ua-compatible" content="ie=edge">
6-
<title>[email protected]beta4, [email protected]</title>
6+
<title>[email protected]beta5, [email protected]</title>
77
<meta name="description" content="">
88
<meta name="viewport" content="width=device-width, initial-scale=1">
99

@@ -15,7 +15,7 @@
1515
<body>
1616

1717
<div class="navbar navbar-default navbar-fixed-top visible-xs">
18-
<a href="../" class="navbar-brand">[email protected]beta4, [email protected]</a>
18+
<a href="../" class="navbar-brand">[email protected]beta5, [email protected]</a>
1919
<button type="button" class="btn btn-default btn-menu ion-ios-menu" id="btn-menu"></button>
2020
</div>
2121

@@ -1890,7 +1890,7 @@ <h3 id="methods">
18901890
</tr>
18911891
<tr>
18921892
<td class="col-md-4">
1893-
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:811</a></code>
1893+
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:816</a></code>
18941894
</div>
18951895
</td>
18961896
</tr>
@@ -1973,7 +1973,7 @@ <h3 id="methods">
19731973
</tr>
19741974
<tr>
19751975
<td class="col-md-4">
1976-
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:830</a></code>
1976+
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:835</a></code>
19771977
</div>
19781978
</td>
19791979
</tr>
@@ -2140,7 +2140,7 @@ <h3 id="methods">
21402140
</tr>
21412141
<tr>
21422142
<td class="col-md-4">
2143-
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:776</a></code>
2143+
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:781</a></code>
21442144
</div>
21452145
</td>
21462146
</tr>
@@ -2221,7 +2221,7 @@ <h3 id="methods">
22212221
</tr>
22222222
<tr>
22232223
<td class="col-md-4">
2224-
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:794</a></code>
2224+
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:799</a></code>
22252225
</div>
22262226
</td>
22272227
</tr>
@@ -2384,7 +2384,7 @@ <h3 id="methods">
23842384
</tr>
23852385
<tr>
23862386
<td class="col-md-4">
2387-
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:563</a></code>
2387+
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:568</a></code>
23882388
</div>
23892389
</td>
23902390
</tr>
@@ -2482,7 +2482,7 @@ <h3 id="methods">
24822482
</tr>
24832483
<tr>
24842484
<td class="col-md-4">
2485-
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:616</a></code>
2485+
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:621</a></code>
24862486
</div>
24872487
</td>
24882488
</tr>
@@ -2532,7 +2532,7 @@ <h3 id="methods">
25322532
</tr>
25332533
<tr>
25342534
<td class="col-md-4">
2535-
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:853</a></code>
2535+
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:858</a></code>
25362536
</div>
25372537
</td>
25382538
</tr>
@@ -2649,7 +2649,7 @@ <h3 id="methods">
26492649
</tr>
26502650
<tr>
26512651
<td class="col-md-4">
2652-
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:665</a></code>
2652+
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:670</a></code>
26532653
</div>
26542654
</td>
26552655
</tr>
@@ -2752,7 +2752,7 @@ <h3 id="methods">
27522752
</tr>
27532753
<tr>
27542754
<td class="col-md-4">
2755-
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:742</a></code>
2755+
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:747</a></code>
27562756
</div>
27572757
</td>
27582758
</tr>
@@ -2879,7 +2879,7 @@ <h3 id="methods">
28792879
</tr>
28802880
<tr>
28812881
<td class="col-md-4">
2882-
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:764</a></code>
2882+
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:769</a></code>
28832883
</div>
28842884
</td>
28852885
</tr>
@@ -2980,7 +2980,7 @@ <h3 id="methods">
29802980
</tr>
29812981
<tr>
29822982
<td class="col-md-4">
2983-
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:712</a></code>
2983+
<div class="io-line">Defined in <code><a href="../classess/Client.html#source" target="_self" >Client:717</a></code>
29842984
</div>
29852985
</td>
29862986
</tr>

‎api-docs/develop/classes/RxStomp.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="x-ua-compatible" content="ie=edge">
6-
<title>[email protected]beta4, [email protected]</title>
6+
<title>[email protected]beta5, [email protected]</title>
77
<meta name="description" content="">
88
<meta name="viewport" content="width=device-width, initial-scale=1">
99

@@ -15,7 +15,7 @@
1515
<body>
1616

1717
<div class="navbar navbar-default navbar-fixed-top visible-xs">
18-
<a href="../" class="navbar-brand">[email protected]beta4, [email protected]</a>
18+
<a href="../" class="navbar-brand">[email protected]beta5, [email protected]</a>
1919
<button type="button" class="btn btn-default btn-menu ion-ios-menu" id="btn-menu"></button>
2020
</div>
2121

‎api-docs/develop/classes/RxStompConfig.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="x-ua-compatible" content="ie=edge">
6-
<title>[email protected]beta4, [email protected]</title>
6+
<title>[email protected]beta5, [email protected]</title>
77
<meta name="description" content="">
88
<meta name="viewport" content="width=device-width, initial-scale=1">
99

@@ -15,7 +15,7 @@
1515
<body>
1616

1717
<div class="navbar navbar-default navbar-fixed-top visible-xs">
18-
<a href="../" class="navbar-brand">[email protected]beta4, [email protected]</a>
18+
<a href="../" class="navbar-brand">[email protected]beta5, [email protected]</a>
1919
<button type="button" class="btn btn-default btn-menu ion-ios-menu" id="btn-menu"></button>
2020
</div>
2121

‎api-docs/develop/classes/RxStompRPC.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="x-ua-compatible" content="ie=edge">
6-
<title>[email protected]beta4, [email protected]</title>
6+
<title>[email protected]beta5, [email protected]</title>
77
<meta name="description" content="">
88
<meta name="viewport" content="width=device-width, initial-scale=1">
99

@@ -15,7 +15,7 @@
1515
<body>
1616

1717
<div class="navbar navbar-default navbar-fixed-top visible-xs">
18-
<a href="../" class="navbar-brand">[email protected]beta4, [email protected]</a>
18+
<a href="../" class="navbar-brand">[email protected]beta5, [email protected]</a>
1919
<button type="button" class="btn btn-default btn-menu ion-ios-menu" id="btn-menu"></button>
2020
</div>
2121

‎api-docs/develop/classes/RxStompRPCConfig.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="x-ua-compatible" content="ie=edge">
6-
<title>[email protected]beta4, [email protected]</title>
6+
<title>[email protected]beta5, [email protected]</title>
77
<meta name="description" content="">
88
<meta name="viewport" content="width=device-width, initial-scale=1">
99

@@ -15,7 +15,7 @@
1515
<body>
1616

1717
<div class="navbar navbar-default navbar-fixed-top visible-xs">
18-
<a href="../" class="navbar-brand">[email protected]beta4, [email protected]</a>
18+
<a href="../" class="navbar-brand">[email protected]beta5, [email protected]</a>
1919
<button type="button" class="btn btn-default btn-menu ion-ios-menu" id="btn-menu"></button>
2020
</div>
2121

0 commit comments

Comments
 (0)