Skip to content

Commit 2f65ca1

Browse files
mohitpubnubmohitpubnub
authored
refactor/objects cleanup (#270)
* ref:removed objects v1 code
1 parent 1720e6e commit 2f65ca1

40 files changed

+636
-7832
lines changed

‎dist/web/pubnub.js

Lines changed: 502 additions & 1996 deletions
Large diffs are not rendered by default.

‎dist/web/pubnub.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/core/pubnub-common.js

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ var push_payload_1 = require("./components/push_payload");
4444
var listener_manager_1 = require("./components/listener_manager");
4545
var token_manager_1 = require("./components/token_manager");
4646
var endpoint_1 = require("./components/endpoint");
47-
var utils_1 = require("./utils");
4847
var addChannelsChannelGroupConfig = require("./endpoints/channel_groups/add_channels");
4948
var removeChannelsChannelGroupConfig = require("./endpoints/channel_groups/remove_channels");
5049
var deleteChannelGroupConfig = require("./endpoints/channel_groups/delete_group");
@@ -85,25 +84,6 @@ var get_3 = require("./endpoints/objects/member/get");
8584
var set_3 = require("./endpoints/objects/member/set");
8685
var get_4 = require("./endpoints/objects/membership/get");
8786
var set_4 = require("./endpoints/objects/membership/set");
88-
// Objects API
89-
var createUserEndpointConfig = require("./endpoints/users/create_user");
90-
var updateUserEndpointConfig = require("./endpoints/users/update_user");
91-
var deleteUserEndpointConfig = require("./endpoints/users/delete_user");
92-
var getUserEndpointConfig = require("./endpoints/users/get_user");
93-
var getUsersEndpointConfig = require("./endpoints/users/get_users");
94-
var createSpaceEndpointConfig = require("./endpoints/spaces/create_space");
95-
var updateSpaceEndpointConfig = require("./endpoints/spaces/update_space");
96-
var deleteSpaceEndpointConfig = require("./endpoints/spaces/delete_space");
97-
var getSpacesEndpointConfig = require("./endpoints/spaces/get_spaces");
98-
var getSpaceEndpointConfig = require("./endpoints/spaces/get_space");
99-
var getMembersEndpointConfig = require("./endpoints/memberships/get_members");
100-
var addMembersEndpointConfig = require("./endpoints/memberships/add_members");
101-
var updateMembersEndpointConfig = require("./endpoints/memberships/update_members");
102-
var removeMembersEndpointConfig = require("./endpoints/memberships/remove_members");
103-
var getMembershipsEndpointConfig = require("./endpoints/memberships/get_memberships");
104-
var updateMembershipsEndpointConfig = require("./endpoints/memberships/update_memberships");
105-
var joinSpacesEndpointConfig = require("./endpoints/memberships/join_spaces");
106-
var leaveSpacesEndpointConfig = require("./endpoints/memberships/leave_spaces");
10787
var auditEndpointConfig = require("./endpoints/access_manager/audit");
10888
var grantEndpointConfig = require("./endpoints/access_manager/grant");
10989
var grantTokenEndpointConfig = require("./endpoints/access_manager/grant_token");
@@ -302,25 +282,46 @@ var default_1 = /** @class */ (function () {
302282
set_4.default, __assign({ type: 'delete' }, parameters)], __read(rest), false));
303283
},
304284
};
305-
// Objects API
306-
this.createUser = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, createUserEndpointConfig));
307-
this.updateUser = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, updateUserEndpointConfig));
308-
this.deleteUser = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, deleteUserEndpointConfig));
309-
this.getUser = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, getUserEndpointConfig));
310-
this.getUsers = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, getUsersEndpointConfig));
311-
this.createSpace = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, createSpaceEndpointConfig));
312-
this.updateSpace = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, updateSpaceEndpointConfig));
313-
this.deleteSpace = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, deleteSpaceEndpointConfig));
314-
this.getSpaces = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, getSpacesEndpointConfig));
315-
this.getSpace = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, getSpaceEndpointConfig));
316-
this.addMembers = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, addMembersEndpointConfig));
317-
this.updateMembers = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, updateMembersEndpointConfig));
318-
this.removeMembers = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, removeMembersEndpointConfig));
319-
this.getMembers = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, getMembersEndpointConfig));
320-
this.getMemberships = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, getMembershipsEndpointConfig));
321-
this.joinSpaces = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, joinSpacesEndpointConfig));
322-
this.updateMemberships = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, updateMembershipsEndpointConfig));
323-
this.leaveSpaces = (0, utils_1.deprecated)(endpoint_1.default.bind(this, modules, leaveSpacesEndpointConfig));
285+
// User entity
286+
this.setUser = function (args) {
287+
return _this.objects.setUUIDMetadata({
288+
uuid: args.userId,
289+
data: args.data,
290+
include: args.include,
291+
});
292+
};
293+
this.deleteUser = function (args) {
294+
return _this.objects.removeUUIDMetadata({
295+
uuid: args === null || args === void 0 ? void 0 : args.userId,
296+
});
297+
};
298+
this.getUser = function (args) {
299+
return _this.objects.getUUIDMetadata({
300+
uuid: args === null || args === void 0 ? void 0 : args.userId,
301+
include: args === null || args === void 0 ? void 0 : args.include,
302+
});
303+
};
304+
this.getUsers = this.objects.getAllUUIDMetadata;
305+
// Space entity
306+
this.setSpace = function (args) {
307+
return _this.objects.setChannelMetadata({
308+
channel: args.spaceId,
309+
data: args.data,
310+
include: args.include,
311+
});
312+
};
313+
this.deleteSpace = function (args) {
314+
return _this.objects.removeChannelMetadata({
315+
channel: args.spaceId,
316+
});
317+
};
318+
this.getSpace = function (args) {
319+
return _this.objects.getChannelMetadata({
320+
channel: args.spaceId,
321+
include: args.include,
322+
});
323+
};
324+
this.getSpaces = this.objects.getAllChannelMetadata;
324325
this.time = timeEndpoint;
325326
// --- deprecated ------------------
326327
this.stop = this.destroy; // --------

‎lib/core/utils.js

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,4 @@
11
"use strict";
2-
/* */
3-
var __read = (this && this.__read) || function (o, n) {
4-
var m = typeof Symbol === "function" && o[Symbol.iterator];
5-
if (!m) return o;
6-
var i = m.call(o), r, ar = [], e;
7-
try {
8-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
9-
}
10-
catch (error) { e = { error: error }; }
11-
finally {
12-
try {
13-
if (r && !r.done && (m = i["return"])) m.call(i);
14-
}
15-
finally { if (e) throw e.error; }
16-
}
17-
return ar;
18-
};
19-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
20-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
21-
if (ar || !(i in from)) {
22-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
23-
ar[i] = from[i];
24-
}
25-
}
26-
return to.concat(ar || Array.prototype.slice.call(from));
27-
};
282
function objectToList(o) {
293
var l = [];
304
Object.keys(o).forEach(function (key) { return l.push(key); });
@@ -52,27 +26,9 @@ function createPromise() {
5226
});
5327
return { promise: promise, reject: failureResolve, fulfill: successResolve };
5428
}
55-
var deprecationMessage = "The Objects v1 API has been deprecated.\nYou can learn more about Objects v2 API at https://www.pubnub.com/docs/web-javascript/api-reference-objects.\nIf you have questions about the Objects v2 API or require additional help with migrating to the new data model,\nplease contact PubNub Support at [email protected].";
56-
function deprecated(fn) {
57-
return function () {
58-
var _a;
59-
var args = [];
60-
for (var _i = 0; _i < arguments.length; _i++) {
61-
args[_i] = arguments[_i];
62-
}
63-
if (typeof process !== 'undefined') {
64-
if (((_a = process === null || process === void 0 ? void 0 : process.env) === null || _a === void 0 ? void 0 : _a.NODE_ENV) !== 'test') {
65-
// eslint-disable-next-line no-console
66-
console.warn(deprecationMessage);
67-
}
68-
}
69-
return fn.apply(void 0, __spreadArray([], __read(args), false));
70-
};
71-
}
7229
module.exports = {
7330
signPamFromParams: signPamFromParams,
7431
endsWith: endsWith,
7532
createPromise: createPromise,
7633
encodeString: encodeString,
77-
deprecated: deprecated,
7834
};

‎lib/node/index.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
"use strict";
2-
/* */
32
var __extends = (this && this.__extends) || (function () {
43
var extendStatics = function (d, b) {
54
extendStatics = Object.setPrototypeOf ||
@@ -19,8 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
1918
var cbor_sync_1 = require("cbor-sync");
2019
var pubnub_common_1 = require("../core/pubnub-common");
2120
var networking_1 = require("../networking");
22-
var common_1 = require("../db/common");
23-
var common_2 = require("../cbor/common");
21+
var common_1 = require("../cbor/common");
2422
var web_node_1 = require("../networking/modules/web-node");
2523
var node_1 = require("../networking/modules/node");
2624
var node_2 = require("../crypto/modules/node");
@@ -29,8 +27,7 @@ var default_1 = /** @class */ (function (_super) {
2927
__extends(default_1, _super);
3028
function default_1(setup) {
3129
var _this = this;
32-
setup.db = new common_1.default();
33-
setup.cbor = new common_2.default(cbor_sync_1.default.decode, function (base64String) { return Buffer.from(base64String, 'base64'); });
30+
setup.cbor = new common_1.default(cbor_sync_1.default.decode, function (base64String) { return Buffer.from(base64String, 'base64'); });
3431
setup.networking = new networking_1.default({
3532
keepAlive: node_1.keepAlive,
3633
del: web_node_1.del,

‎lib/react_native/index.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
"use strict";
2-
/* */
32
var __extends = (this && this.__extends) || (function () {
43
var extendStatics = function (d, b) {
54
extendStatics = Object.setPrototypeOf ||
@@ -20,8 +19,7 @@ var cbor_sync_1 = require("cbor-sync");
2019
var buffer_1 = require("buffer");
2120
var pubnub_common_1 = require("../core/pubnub-common");
2221
var networking_1 = require("../networking");
23-
var common_1 = require("../db/common");
24-
var common_2 = require("../cbor/common");
22+
var common_1 = require("../cbor/common");
2523
var web_node_1 = require("../networking/modules/web-node");
2624
var react_native_1 = require("../networking/modules/react_native");
2725
var react_native_2 = require("../file/modules/react-native");
@@ -30,8 +28,7 @@ var default_1 = /** @class */ (function (_super) {
3028
__extends(default_1, _super);
3129
function default_1(setup) {
3230
var _this = this;
33-
setup.db = new common_1.default();
34-
setup.cbor = new common_2.default(cbor_sync_1.default.decode, function (base64String) { return buffer_1.Buffer.from(base64String, 'base64'); });
31+
setup.cbor = new common_1.default(cbor_sync_1.default.decode, function (base64String) { return buffer_1.Buffer.from(base64String, 'base64'); });
3532
setup.PubNubFile = react_native_2.default;
3633
setup.networking = new networking_1.default({
3734
del: web_node_1.del,

‎lib/titanium/index.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
"use strict";
2-
/* */
32
var __extends = (this && this.__extends) || (function () {
43
var extendStatics = function (d, b) {
54
extendStatics = Object.setPrototypeOf ||
@@ -20,15 +19,13 @@ exports.default = void 0;
2019
var cbor_sync_1 = require("cbor-sync");
2120
var pubnub_common_1 = require("../core/pubnub-common");
2221
var networking_1 = require("../networking");
23-
var common_1 = require("../db/common");
24-
var common_2 = require("../cbor/common");
22+
var common_1 = require("../cbor/common");
2523
var titanium_1 = require("../networking/modules/titanium");
2624
var PubNub = /** @class */ (function (_super) {
2725
__extends(PubNub, _super);
2826
function PubNub(setup) {
2927
var _this = this;
30-
setup.db = new common_1.default();
31-
setup.cbor = new common_2.default(cbor_sync_1.default.decode, function (base64String) { return Buffer.from(base64String, 'base64'); });
28+
setup.cbor = new common_1.default(cbor_sync_1.default.decode, function (base64String) { return Buffer.from(base64String, 'base64'); });
3229
setup.sdkFamily = 'TitaniumSDK';
3330
setup.networking = new networking_1.default({
3431
del: titanium_1.del,

‎lib/web/index.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
"use strict";
2-
/* */
32
/* eslint no-bitwise: ["error", { "allow": ["~", "&", ">>"] }] */
43
/* global navigator, window */
54
var __extends = (this && this.__extends) || (function () {
@@ -22,11 +21,10 @@ var cbor_js_1 = require("cbor-js");
2221
var pubnub_common_1 = require("../core/pubnub-common");
2322
var networking_1 = require("../networking");
2423
var hmac_sha256_1 = require("../core/components/cryptography/hmac-sha256");
25-
var web_1 = require("../db/web");
2624
var common_1 = require("../cbor/common");
2725
var web_node_1 = require("../networking/modules/web-node");
28-
var web_2 = require("../crypto/modules/web");
29-
var web_3 = require("../file/modules/web");
26+
var web_1 = require("../crypto/modules/web");
27+
var web_2 = require("../file/modules/web");
3028
function sendBeacon(url) {
3129
if (navigator && navigator.sendBeacon) {
3230
navigator.sendBeacon(url);
@@ -95,7 +93,6 @@ var default_1 = /** @class */ (function (_super) {
9593
var _this = this;
9694
// extract config.
9795
var _a = setup.listenToBrowserNetworkEvents, listenToBrowserNetworkEvents = _a === void 0 ? true : _a;
98-
setup.db = web_1.default;
9996
setup.sdkFamily = 'Web';
10097
setup.networking = new networking_1.default({
10198
del: web_node_1.del,
@@ -107,8 +104,8 @@ var default_1 = /** @class */ (function (_super) {
107104
postfile: web_node_1.postfile,
108105
});
109106
setup.cbor = new common_1.default(function (arrayBuffer) { return stringifyBufferKeys(cbor_js_1.default.decode(arrayBuffer)); }, base64ToBinary);
110-
setup.PubNubFile = web_3.default;
111-
setup.cryptography = new web_2.default();
107+
setup.PubNubFile = web_2.default;
108+
setup.cryptography = new web_1.default();
112109
_this = _super.call(this, setup) || this;
113110
if (listenToBrowserNetworkEvents) {
114111
// mount network events.

0 commit comments

Comments
 (0)