Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 511e732

Browse filesBrowse files
author
Devendra
committed
refactoring, adding dev console changes for state
1 parent f1239c3 commit 511e732
Copy full SHA for 511e732

File tree

Expand file treeCollapse file tree

24 files changed

+437
-408
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

24 files changed

+437
-408
lines changed
Open diff view settings
Collapse file

‎core/pubnub-common.js‎

Copy file name to clipboardExpand all lines: core/pubnub-common.js
+17-18Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ function build_url( url_components, url_params ) {
5656
} );
5757

5858
url += "?" + params.join(PARAMSBIT);
59-
6059
return url;
6160
}
6261

@@ -214,7 +213,7 @@ function PN_API(setup) {
214213
, TIMETOKEN = 0
215214
, RESUMED = false
216215
, CHANNELS = {}
217-
, METADATA = {}
216+
, STATE = {}
218217
, PRESENCE_HB_TIMEOUT = null
219218
, PRESENCE_HB_INTERVAL = validate_presence_heartbeat(setup['pnexpires'] || 0, setup['error'])
220219
, PRESENCE_HB_RUNNING = false
@@ -623,7 +622,7 @@ function PN_API(setup) {
623622
}
624623
if (!CB_CALLED) callback({action : "leave"});
625624
CHANNELS[channel] = 0;
626-
if (channel in METADATA) delete METADATA[channel];
625+
if (channel in STATE) delete STATE[channel];
627626
} );
628627

629628
// Reset Connection if Count Less
@@ -652,7 +651,7 @@ function PN_API(setup) {
652651
, timetoken = args['timetoken'] || 0
653652
, sub_timeout = args['timeout'] || SUB_TIMEOUT
654653
, windowing = args['windowing'] || SUB_WINDOWING
655-
, metadata = args['metadata']
654+
, state = args['state']
656655
, pnexpires = args['pnexpires']
657656
, restore = args['restore'];
658657

@@ -686,11 +685,11 @@ function PN_API(setup) {
686685
disconnect : disconnect,
687686
reconnect : reconnect
688687
};
689-
if (metadata) {
690-
if (channel in metadata) {
691-
METADATA[channel] = metadata[channel];
688+
if (state) {
689+
if (channel in state) {
690+
STATE[channel] = state[channel];
692691
} else {
693-
METADATA[channel] = metadata;
692+
STATE[channel] = state;
694693
}
695694
}
696695

@@ -768,8 +767,8 @@ function PN_API(setup) {
768767

769768
var data = { 'uuid' : UUID, 'auth' : auth_key };
770769

771-
var md = JSON.stringify(METADATA);
772-
if (md.length > 2) data['metadata'] = JSON.stringify(METADATA);
770+
var st = JSON.stringify(STATE);
771+
if (st.length > 2) data['metadata'] = JSON.stringify(STATE);
773772

774773
if (PRESENCE_HB_INTERVAL) data['pnexpires'] = PRESENCE_HB_INTERVAL;
775774
start_presence_heartbeat();
@@ -892,11 +891,11 @@ function PN_API(setup) {
892891
, channel = args['channel']
893892
, jsonp = jsonp_cb()
894893
, disable_uuids = args['disable_uuids']
895-
, metadata = args['metadata']
894+
, state = args['state']
896895
, data = { 'uuid' : UUID, 'auth' : auth_key };
897896

898897
if (disable_uuids) data['disable_uuids'] = 1;
899-
if (metadata) data['metadata'] = 1;
898+
if (state) data['metadata'] = 1;
900899

901900
// Make sure we have a Channel
902901
if (!callback) return error('Missing Callback');
@@ -963,7 +962,7 @@ function PN_API(setup) {
963962
, err = args['error'] || function(){}
964963
, auth_key = args['auth_key'] || AUTH_KEY
965964
, jsonp = jsonp_cb()
966-
, metadata = args['metadata']
965+
, state = args['state']
967966
, uuid = args['uuid'] || UUID
968967
, channel = args['channel']
969968
, url
@@ -976,11 +975,11 @@ function PN_API(setup) {
976975

977976
if (jsonp != '0') { data['callback'] = jsonp; }
978977

979-
if (CHANNELS[channel].subscribed) METADATA[channel] = metadata;
978+
if (CHANNELS[channel] && CHANNELS[channel].subscribed) STATE[channel] = state;
980979

981-
data['metadata'] = JSON.stringify(metadata);
980+
data['metadata'] = JSON.stringify(state);
982981

983-
if (metadata) {
982+
if (state) {
984983
url = [
985984
STD_ORIGIN, 'v2', 'presence',
986985
'sub-key', SUBSCRIBE_KEY,
@@ -1175,8 +1174,8 @@ function PN_API(setup) {
11751174
var jsonp = jsonp_cb();
11761175
var data = { 'uuid' : UUID, 'auth' : AUTH_KEY };
11771176

1178-
var md = JSON.stringify(METADATA);
1179-
if (md.length > 2) data['metadata'] = JSON.stringify(METADATA);
1177+
var st = JSON.stringify(STATE);
1178+
if (st.length > 2) data['metadata'] = JSON.stringify(STATE);
11801179

11811180
xdr({
11821181
callback : jsonp,
Collapse file

‎modern/pubnub.js‎

Copy file name to clipboardExpand all lines: modern/pubnub.js
+17-18Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ function build_url( url_components, url_params ) {
5757
} );
5858

5959
url += "?" + params.join(PARAMSBIT);
60-
6160
return url;
6261
}
6362

@@ -215,7 +214,7 @@ function PN_API(setup) {
215214
, TIMETOKEN = 0
216215
, RESUMED = false
217216
, CHANNELS = {}
218-
, METADATA = {}
217+
, STATE = {}
219218
, PRESENCE_HB_TIMEOUT = null
220219
, PRESENCE_HB_INTERVAL = validate_presence_heartbeat(setup['pnexpires'] || 0, setup['error'])
221220
, PRESENCE_HB_RUNNING = false
@@ -624,7 +623,7 @@ function PN_API(setup) {
624623
}
625624
if (!CB_CALLED) callback({action : "leave"});
626625
CHANNELS[channel] = 0;
627-
if (channel in METADATA) delete METADATA[channel];
626+
if (channel in STATE) delete STATE[channel];
628627
} );
629628

630629
// Reset Connection if Count Less
@@ -653,7 +652,7 @@ function PN_API(setup) {
653652
, timetoken = args['timetoken'] || 0
654653
, sub_timeout = args['timeout'] || SUB_TIMEOUT
655654
, windowing = args['windowing'] || SUB_WINDOWING
656-
, metadata = args['metadata']
655+
, state = args['state']
657656
, pnexpires = args['pnexpires']
658657
, restore = args['restore'];
659658

@@ -687,11 +686,11 @@ function PN_API(setup) {
687686
disconnect : disconnect,
688687
reconnect : reconnect
689688
};
690-
if (metadata) {
691-
if (channel in metadata) {
692-
METADATA[channel] = metadata[channel];
689+
if (state) {
690+
if (channel in state) {
691+
STATE[channel] = state[channel];
693692
} else {
694-
METADATA[channel] = metadata;
693+
STATE[channel] = state;
695694
}
696695
}
697696

@@ -769,8 +768,8 @@ function PN_API(setup) {
769768

770769
var data = { 'uuid' : UUID, 'auth' : auth_key };
771770

772-
var md = JSON.stringify(METADATA);
773-
if (md.length > 2) data['metadata'] = JSON.stringify(METADATA);
771+
var st = JSON.stringify(STATE);
772+
if (st.length > 2) data['metadata'] = JSON.stringify(STATE);
774773

775774
if (PRESENCE_HB_INTERVAL) data['pnexpires'] = PRESENCE_HB_INTERVAL;
776775
start_presence_heartbeat();
@@ -893,11 +892,11 @@ function PN_API(setup) {
893892
, channel = args['channel']
894893
, jsonp = jsonp_cb()
895894
, disable_uuids = args['disable_uuids']
896-
, metadata = args['metadata']
895+
, state = args['state']
897896
, data = { 'uuid' : UUID, 'auth' : auth_key };
898897

899898
if (disable_uuids) data['disable_uuids'] = 1;
900-
if (metadata) data['metadata'] = 1;
899+
if (state) data['metadata'] = 1;
901900

902901
// Make sure we have a Channel
903902
if (!callback) return error('Missing Callback');
@@ -964,7 +963,7 @@ function PN_API(setup) {
964963
, err = args['error'] || function(){}
965964
, auth_key = args['auth_key'] || AUTH_KEY
966965
, jsonp = jsonp_cb()
967-
, metadata = args['metadata']
966+
, state = args['state']
968967
, uuid = args['uuid'] || UUID
969968
, channel = args['channel']
970969
, url
@@ -977,11 +976,11 @@ function PN_API(setup) {
977976

978977
if (jsonp != '0') { data['callback'] = jsonp; }
979978

980-
if (CHANNELS[channel].subscribed) METADATA[channel] = metadata;
979+
if (CHANNELS[channel] && CHANNELS[channel].subscribed) STATE[channel] = state;
981980

982-
data['metadata'] = JSON.stringify(metadata);
981+
data['metadata'] = JSON.stringify(state);
983982

984-
if (metadata) {
983+
if (state) {
985984
url = [
986985
STD_ORIGIN, 'v2', 'presence',
987986
'sub-key', SUBSCRIBE_KEY,
@@ -1176,8 +1175,8 @@ function PN_API(setup) {
11761175
var jsonp = jsonp_cb();
11771176
var data = { 'uuid' : UUID, 'auth' : AUTH_KEY };
11781177

1179-
var md = JSON.stringify(METADATA);
1180-
if (md.length > 2) data['metadata'] = JSON.stringify(METADATA);
1178+
var st = JSON.stringify(STATE);
1179+
if (st.length > 2) data['metadata'] = JSON.stringify(STATE);
11811180

11821181
xdr({
11831182
callback : jsonp,
Collapse file

‎modern/pubnub.min.js‎

Copy file name to clipboardExpand all lines: modern/pubnub.min.js
+3-3Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Collapse file

‎node.js/pubnub.js‎

Copy file name to clipboardExpand all lines: node.js/pubnub.js
+17-18Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ function build_url( url_components, url_params ) {
5757
} );
5858

5959
url += "?" + params.join(PARAMSBIT);
60-
6160
return url;
6261
}
6362

@@ -215,7 +214,7 @@ function PN_API(setup) {
215214
, TIMETOKEN = 0
216215
, RESUMED = false
217216
, CHANNELS = {}
218-
, METADATA = {}
217+
, STATE = {}
219218
, PRESENCE_HB_TIMEOUT = null
220219
, PRESENCE_HB_INTERVAL = validate_presence_heartbeat(setup['pnexpires'] || 0, setup['error'])
221220
, PRESENCE_HB_RUNNING = false
@@ -624,7 +623,7 @@ function PN_API(setup) {
624623
}
625624
if (!CB_CALLED) callback({action : "leave"});
626625
CHANNELS[channel] = 0;
627-
if (channel in METADATA) delete METADATA[channel];
626+
if (channel in STATE) delete STATE[channel];
628627
} );
629628

630629
// Reset Connection if Count Less
@@ -653,7 +652,7 @@ function PN_API(setup) {
653652
, timetoken = args['timetoken'] || 0
654653
, sub_timeout = args['timeout'] || SUB_TIMEOUT
655654
, windowing = args['windowing'] || SUB_WINDOWING
656-
, metadata = args['metadata']
655+
, state = args['state']
657656
, pnexpires = args['pnexpires']
658657
, restore = args['restore'];
659658

@@ -687,11 +686,11 @@ function PN_API(setup) {
687686
disconnect : disconnect,
688687
reconnect : reconnect
689688
};
690-
if (metadata) {
691-
if (channel in metadata) {
692-
METADATA[channel] = metadata[channel];
689+
if (state) {
690+
if (channel in state) {
691+
STATE[channel] = state[channel];
693692
} else {
694-
METADATA[channel] = metadata;
693+
STATE[channel] = state;
695694
}
696695
}
697696

@@ -769,8 +768,8 @@ function PN_API(setup) {
769768

770769
var data = { 'uuid' : UUID, 'auth' : auth_key };
771770

772-
var md = JSON.stringify(METADATA);
773-
if (md.length > 2) data['metadata'] = JSON.stringify(METADATA);
771+
var st = JSON.stringify(STATE);
772+
if (st.length > 2) data['metadata'] = JSON.stringify(STATE);
774773

775774
if (PRESENCE_HB_INTERVAL) data['pnexpires'] = PRESENCE_HB_INTERVAL;
776775
start_presence_heartbeat();
@@ -893,11 +892,11 @@ function PN_API(setup) {
893892
, channel = args['channel']
894893
, jsonp = jsonp_cb()
895894
, disable_uuids = args['disable_uuids']
896-
, metadata = args['metadata']
895+
, state = args['state']
897896
, data = { 'uuid' : UUID, 'auth' : auth_key };
898897

899898
if (disable_uuids) data['disable_uuids'] = 1;
900-
if (metadata) data['metadata'] = 1;
899+
if (state) data['metadata'] = 1;
901900

902901
// Make sure we have a Channel
903902
if (!callback) return error('Missing Callback');
@@ -964,7 +963,7 @@ function PN_API(setup) {
964963
, err = args['error'] || function(){}
965964
, auth_key = args['auth_key'] || AUTH_KEY
966965
, jsonp = jsonp_cb()
967-
, metadata = args['metadata']
966+
, state = args['state']
968967
, uuid = args['uuid'] || UUID
969968
, channel = args['channel']
970969
, url
@@ -977,11 +976,11 @@ function PN_API(setup) {
977976

978977
if (jsonp != '0') { data['callback'] = jsonp; }
979978

980-
if (CHANNELS[channel].subscribed) METADATA[channel] = metadata;
979+
if (CHANNELS[channel] && CHANNELS[channel].subscribed) STATE[channel] = state;
981980

982-
data['metadata'] = JSON.stringify(metadata);
981+
data['metadata'] = JSON.stringify(state);
983982

984-
if (metadata) {
983+
if (state) {
985984
url = [
986985
STD_ORIGIN, 'v2', 'presence',
987986
'sub-key', SUBSCRIBE_KEY,
@@ -1176,8 +1175,8 @@ function PN_API(setup) {
11761175
var jsonp = jsonp_cb();
11771176
var data = { 'uuid' : UUID, 'auth' : AUTH_KEY };
11781177

1179-
var md = JSON.stringify(METADATA);
1180-
if (md.length > 2) data['metadata'] = JSON.stringify(METADATA);
1178+
var st = JSON.stringify(STATE);
1179+
if (st.length > 2) data['metadata'] = JSON.stringify(STATE);
11811180

11821181
xdr({
11831182
callback : jsonp,

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.