@aws-amplify/pubsub 4.5.12-unstable.4 → 4.5.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +24 -0
- package/build.js +5 -0
- package/dist/aws-amplify-pubsub.js +10278 -0
- package/dist/aws-amplify-pubsub.js.map +1 -0
- package/dist/aws-amplify-pubsub.min.js +11 -0
- package/dist/aws-amplify-pubsub.min.js.map +1 -0
- package/index.js +7 -0
- package/lib/Providers/AWSAppSyncProvider.js +102 -20
- package/lib/Providers/AWSAppSyncProvider.js.map +1 -1
- package/lib/Providers/AWSAppSyncRealTimeProvider/index.js +210 -158
- package/lib/Providers/AWSAppSyncRealTimeProvider/index.js.map +1 -1
- package/lib/Providers/AWSIotProvider.js +64 -6
- package/lib/Providers/AWSIotProvider.js.map +1 -1
- package/lib/Providers/MqttOverWSProvider.js +204 -158
- package/lib/Providers/MqttOverWSProvider.js.map +1 -1
- package/lib/Providers/PubSubProvider.js +13 -3
- package/lib/Providers/PubSubProvider.js.map +1 -1
- package/lib/Providers/constants.js +0 -8
- package/lib/Providers/constants.js.map +1 -1
- package/lib/Providers/index.js +20 -13
- package/lib/Providers/index.js.map +1 -1
- package/lib/PubSub.js +56 -8
- package/lib/PubSub.js.map +1 -1
- package/lib/index.js +20 -9
- package/lib/index.js.map +1 -1
- package/lib/types/PubSub.js +12 -2
- package/lib/types/PubSub.js.map +1 -1
- package/lib/types/index.js +4 -2
- package/lib/types/index.js.map +1 -1
- package/lib/utils/ConnectionStateMonitor.js +29 -16
- package/lib/utils/ConnectionStateMonitor.js.map +1 -1
- package/lib/utils/ReachabilityMonitor/index.native.js +4 -2
- package/lib/utils/ReachabilityMonitor/index.native.js.map +1 -1
- package/lib-esm/Providers/AWSAppSyncProvider.js +80 -1
- package/lib-esm/Providers/AWSAppSyncProvider.js.map +1 -1
- package/lib-esm/Providers/AWSAppSyncRealTimeProvider/index.d.ts +0 -8
- package/lib-esm/Providers/AWSAppSyncRealTimeProvider/index.js +168 -126
- package/lib-esm/Providers/AWSAppSyncRealTimeProvider/index.js.map +1 -1
- package/lib-esm/Providers/AWSIotProvider.js +61 -3
- package/lib-esm/Providers/AWSIotProvider.js.map +1 -1
- package/lib-esm/Providers/MqttOverWSProvider.d.ts +4 -2
- package/lib-esm/Providers/MqttOverWSProvider.js +175 -139
- package/lib-esm/Providers/MqttOverWSProvider.js.map +1 -1
- package/lib-esm/Providers/PubSubProvider.js +11 -1
- package/lib-esm/Providers/PubSubProvider.js.map +1 -1
- package/lib-esm/Providers/constants.d.ts +0 -8
- package/lib-esm/Providers/constants.js +0 -8
- package/lib-esm/Providers/constants.js.map +1 -1
- package/lib-esm/Providers/index.d.ts +5 -5
- package/lib-esm/Providers/index.js +17 -7
- package/lib-esm/Providers/index.js.map +1 -1
- package/lib-esm/PubSub.js +48 -3
- package/lib-esm/PubSub.js.map +1 -1
- package/lib-esm/index.d.ts +7 -2
- package/lib-esm/index.js +19 -4
- package/lib-esm/index.js.map +1 -1
- package/lib-esm/types/Provider.d.ts +4 -0
- package/lib-esm/types/PubSub.js +12 -2
- package/lib-esm/types/PubSub.js.map +1 -1
- package/lib-esm/types/index.js.map +1 -1
- package/lib-esm/utils/ConnectionStateMonitor.d.ts +0 -1
- package/lib-esm/utils/ConnectionStateMonitor.js +23 -13
- package/lib-esm/utils/ConnectionStateMonitor.js.map +1 -1
- package/package.json +10 -14
- package/src/Providers/AWSAppSyncProvider.ts +12 -2
- package/src/Providers/AWSAppSyncRealTimeProvider/index.ts +89 -142
- package/src/Providers/AWSIotProvider.ts +12 -2
- package/src/Providers/MqttOverWSProvider.ts +79 -90
- package/src/Providers/PubSubProvider.ts +12 -2
- package/src/Providers/constants.ts +0 -10
- package/src/Providers/index.ts +17 -15
- package/src/PubSub.ts +12 -2
- package/src/index.ts +23 -15
- package/src/types/Provider.ts +17 -2
- package/src/types/PubSub.ts +12 -2
- package/src/types/index.ts +12 -2
- package/src/utils/ConnectionStateMonitor.ts +12 -16
- package/webpack.config.dev.js +6 -0
- package/lib/.tsbuildinfo +0 -3
- package/lib/Providers/AWSAppSyncProvider.d.ts +0 -21
- package/lib/Providers/AWSAppSyncRealTimeProvider/index.d.ts +0 -75
- package/lib/Providers/AWSIotProvider.d.ts +0 -11
- package/lib/Providers/MqttOverWSProvider.d.ts +0 -41
- package/lib/Providers/PubSubProvider.d.ts +0 -13
- package/lib/Providers/constants.d.ts +0 -95
- package/lib/Providers/index.d.ts +0 -5
- package/lib/PubSub.d.ts +0 -51
- package/lib/index.d.ts +0 -4
- package/lib/types/Provider.d.ts +0 -14
- package/lib/types/PubSub.d.ts +0 -24
- package/lib/types/index.d.ts +0 -2
- package/lib/utils/ConnectionStateMonitor.d.ts +0 -41
- package/lib/utils/ReachabilityMonitor/index.d.ts +0 -3
- package/lib/utils/ReachabilityMonitor/index.native.d.ts +0 -3
- package/lib/utils/ReconnectionMonitor.d.ts +0 -29
- package/lib/utils/ReconnectionMonitor.js +0 -73
- package/lib/utils/ReconnectionMonitor.js.map +0 -1
- package/lib-esm/.tsbuildinfo +0 -3
- package/lib-esm/utils/ReconnectionMonitor.d.ts +0 -29
- package/lib-esm/utils/ReconnectionMonitor.js +0 -71
- package/lib-esm/utils/ReconnectionMonitor.js.map +0 -1
- package/src/utils/ReconnectionMonitor.ts +0 -74
|
@@ -1,16 +1,104 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __extends = (this && this.__extends) || (function () {
|
|
3
|
+
var extendStatics = function (d, b) {
|
|
4
|
+
extendStatics = Object.setPrototypeOf ||
|
|
5
|
+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
|
|
6
|
+
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
|
|
7
|
+
return extendStatics(d, b);
|
|
8
|
+
};
|
|
9
|
+
return function (d, b) {
|
|
10
|
+
extendStatics(d, b);
|
|
11
|
+
function __() { this.constructor = d; }
|
|
12
|
+
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
13
|
+
};
|
|
14
|
+
})();
|
|
15
|
+
var __assign = (this && this.__assign) || function () {
|
|
16
|
+
__assign = Object.assign || function(t) {
|
|
17
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
18
|
+
s = arguments[i];
|
|
19
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
20
|
+
t[p] = s[p];
|
|
21
|
+
}
|
|
22
|
+
return t;
|
|
23
|
+
};
|
|
24
|
+
return __assign.apply(this, arguments);
|
|
25
|
+
};
|
|
26
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
27
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
28
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
29
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
30
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
31
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
32
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
33
|
+
});
|
|
34
|
+
};
|
|
35
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
36
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
37
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
38
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
39
|
+
function step(op) {
|
|
40
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
41
|
+
while (_) try {
|
|
42
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
43
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
44
|
+
switch (op[0]) {
|
|
45
|
+
case 0: case 1: t = op; break;
|
|
46
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
47
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
48
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
49
|
+
default:
|
|
50
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
51
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
52
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
53
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
54
|
+
if (t[2]) _.ops.pop();
|
|
55
|
+
_.trys.pop(); continue;
|
|
56
|
+
}
|
|
57
|
+
op = body.call(thisArg, _);
|
|
58
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
59
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
60
|
+
}
|
|
61
|
+
};
|
|
62
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
63
|
+
var t = {};
|
|
64
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
65
|
+
t[p] = s[p];
|
|
66
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
67
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
68
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
69
|
+
t[p[i]] = s[p[i]];
|
|
70
|
+
}
|
|
71
|
+
return t;
|
|
72
|
+
};
|
|
73
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
74
|
+
if (mod && mod.__esModule) return mod;
|
|
75
|
+
var result = {};
|
|
76
|
+
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
|
|
77
|
+
result["default"] = mod;
|
|
78
|
+
return result;
|
|
79
|
+
};
|
|
80
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
81
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
82
|
+
};
|
|
2
83
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
84
|
+
/*
|
|
85
|
+
* Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
86
|
+
*
|
|
87
|
+
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
|
|
88
|
+
* the License. A copy of the License is located at
|
|
89
|
+
*
|
|
90
|
+
* http://aws.amazon.com/apache2.0/
|
|
91
|
+
*
|
|
92
|
+
* or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
|
|
93
|
+
* CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
|
|
94
|
+
* and limitations under the License.
|
|
95
|
+
*/
|
|
96
|
+
var Paho = __importStar(require("paho-mqtt"));
|
|
7
97
|
var uuid_1 = require("uuid");
|
|
8
|
-
var zen_observable_ts_1 =
|
|
98
|
+
var zen_observable_ts_1 = __importDefault(require("zen-observable-ts"));
|
|
9
99
|
var PubSubProvider_1 = require("./PubSubProvider");
|
|
10
|
-
var PubSub_1 = require("../types/PubSub");
|
|
11
100
|
var core_1 = require("@aws-amplify/core");
|
|
12
101
|
var ConnectionStateMonitor_1 = require("../utils/ConnectionStateMonitor");
|
|
13
|
-
var ReconnectionMonitor_1 = require("../utils/ReconnectionMonitor");
|
|
14
102
|
var constants_1 = require("./constants");
|
|
15
103
|
var logger = new core_1.ConsoleLogger('MqttOverWSProvider');
|
|
16
104
|
function mqttTopicMatch(filter, topic) {
|
|
@@ -33,17 +121,16 @@ var ClientsQueue = /** @class */ (function () {
|
|
|
33
121
|
this.promises = new Map();
|
|
34
122
|
}
|
|
35
123
|
ClientsQueue.prototype.get = function (clientId, clientFactory) {
|
|
36
|
-
return
|
|
124
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
37
125
|
var cachedPromise, newPromise;
|
|
38
|
-
|
|
39
|
-
return tslib_1.__generator(this, function (_a) {
|
|
126
|
+
return __generator(this, function (_a) {
|
|
40
127
|
cachedPromise = this.promises.get(clientId);
|
|
41
|
-
if (cachedPromise)
|
|
128
|
+
if (cachedPromise) {
|
|
42
129
|
return [2 /*return*/, cachedPromise];
|
|
130
|
+
}
|
|
43
131
|
if (clientFactory) {
|
|
44
132
|
newPromise = clientFactory(clientId);
|
|
45
133
|
this.promises.set(clientId, newPromise);
|
|
46
|
-
newPromise.catch(function (v) { return _this.promises.delete(clientId); });
|
|
47
134
|
return [2 /*return*/, newPromise];
|
|
48
135
|
}
|
|
49
136
|
return [2 /*return*/, undefined];
|
|
@@ -67,13 +154,12 @@ var dispatchPubSubEvent = function (event, data, message) {
|
|
|
67
154
|
};
|
|
68
155
|
var topicSymbol = typeof Symbol !== 'undefined' ? Symbol('topic') : '@@topic';
|
|
69
156
|
var MqttOverWSProvider = /** @class */ (function (_super) {
|
|
70
|
-
|
|
157
|
+
__extends(MqttOverWSProvider, _super);
|
|
71
158
|
function MqttOverWSProvider(options) {
|
|
72
159
|
if (options === void 0) { options = {}; }
|
|
73
|
-
var _this = _super.call(this,
|
|
160
|
+
var _this = _super.call(this, __assign(__assign({}, options), { clientId: options.clientId || uuid_1.v4() })) || this;
|
|
74
161
|
_this._clientsQueue = new ClientsQueue();
|
|
75
162
|
_this.connectionStateMonitor = new ConnectionStateMonitor_1.ConnectionStateMonitor();
|
|
76
|
-
_this.reconnectionMonitor = new ReconnectionMonitor_1.ReconnectionMonitor();
|
|
77
163
|
_this._topicObservers = new Map();
|
|
78
164
|
_this._clientIdObservers = new Map();
|
|
79
165
|
// Monitor the connection health state and pass changes along to Hub
|
|
@@ -82,15 +168,6 @@ var MqttOverWSProvider = /** @class */ (function (_super) {
|
|
|
82
168
|
provider: _this,
|
|
83
169
|
connectionState: connectionStateChange,
|
|
84
170
|
}, "Connection state is " + connectionStateChange);
|
|
85
|
-
_this.connectionState = connectionStateChange;
|
|
86
|
-
// Trigger reconnection when the connection is disrupted
|
|
87
|
-
if (connectionStateChange === PubSub_1.ConnectionState.ConnectionDisrupted) {
|
|
88
|
-
_this.reconnectionMonitor.record(ReconnectionMonitor_1.ReconnectEvent.START_RECONNECT);
|
|
89
|
-
}
|
|
90
|
-
else if (connectionStateChange !== PubSub_1.ConnectionState.Connecting) {
|
|
91
|
-
// Trigger connected to halt reconnection attempts
|
|
92
|
-
_this.reconnectionMonitor.record(ReconnectionMonitor_1.ReconnectEvent.HALT_RECONNECT);
|
|
93
|
-
}
|
|
94
171
|
});
|
|
95
172
|
return _this;
|
|
96
173
|
}
|
|
@@ -130,9 +207,11 @@ var MqttOverWSProvider = /** @class */ (function (_super) {
|
|
|
130
207
|
return 'MqttOverWSProvider';
|
|
131
208
|
};
|
|
132
209
|
MqttOverWSProvider.prototype.onDisconnect = function (_a) {
|
|
133
|
-
var
|
|
210
|
+
var _this = this;
|
|
211
|
+
var clientId = _a.clientId, errorCode = _a.errorCode, args = __rest(_a, ["clientId", "errorCode"]);
|
|
134
212
|
if (errorCode !== 0) {
|
|
135
|
-
logger.warn(clientId, JSON.stringify(
|
|
213
|
+
logger.warn(clientId, JSON.stringify(__assign({ errorCode: errorCode }, args), null, 2));
|
|
214
|
+
var topicsToDelete_1 = [];
|
|
136
215
|
if (!clientId) {
|
|
137
216
|
return;
|
|
138
217
|
}
|
|
@@ -140,47 +219,59 @@ var MqttOverWSProvider = /** @class */ (function (_super) {
|
|
|
140
219
|
if (!clientIdObservers) {
|
|
141
220
|
return;
|
|
142
221
|
}
|
|
143
|
-
|
|
222
|
+
clientIdObservers.forEach(function (observer) {
|
|
223
|
+
observer.error('Disconnected, error code: ' + errorCode);
|
|
224
|
+
// removing observers for disconnected clientId
|
|
225
|
+
_this._topicObservers.forEach(function (observerForTopic, observerTopic) {
|
|
226
|
+
observerForTopic.delete(observer);
|
|
227
|
+
if (observerForTopic.size === 0) {
|
|
228
|
+
topicsToDelete_1.push(observerTopic);
|
|
229
|
+
}
|
|
230
|
+
});
|
|
231
|
+
});
|
|
232
|
+
// forgiving any trace of clientId
|
|
233
|
+
this._clientIdObservers.delete(clientId);
|
|
234
|
+
// Removing topics that are not listen by an observer
|
|
235
|
+
topicsToDelete_1.forEach(function (topic) {
|
|
236
|
+
_this._topicObservers.delete(topic);
|
|
237
|
+
});
|
|
144
238
|
}
|
|
145
239
|
};
|
|
146
240
|
MqttOverWSProvider.prototype.newClient = function (_a) {
|
|
147
241
|
var url = _a.url, clientId = _a.clientId;
|
|
148
|
-
return
|
|
149
|
-
var client
|
|
242
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
243
|
+
var client;
|
|
150
244
|
var _this = this;
|
|
151
|
-
return
|
|
245
|
+
return __generator(this, function (_b) {
|
|
152
246
|
switch (_b.label) {
|
|
153
247
|
case 0:
|
|
154
248
|
logger.debug('Creating new MQTT client', clientId);
|
|
155
249
|
this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.OPENING_CONNECTION);
|
|
156
250
|
client = new Paho.Client(url, clientId);
|
|
251
|
+
// client.trace = (args) => logger.debug(clientId, JSON.stringify(args, null, 2));
|
|
157
252
|
client.onMessageArrived = function (_a) {
|
|
158
253
|
var topic = _a.destinationName, msg = _a.payloadString;
|
|
159
254
|
_this._onMessage(topic, msg);
|
|
160
255
|
};
|
|
161
256
|
client.onConnectionLost = function (_a) {
|
|
162
|
-
var errorCode = _a.errorCode, args =
|
|
163
|
-
_this.onDisconnect(
|
|
257
|
+
var errorCode = _a.errorCode, args = __rest(_a, ["errorCode"]);
|
|
258
|
+
_this.onDisconnect(__assign({ clientId: clientId, errorCode: errorCode }, args));
|
|
164
259
|
_this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSED);
|
|
165
260
|
};
|
|
166
261
|
return [4 /*yield*/, new Promise(function (resolve, reject) {
|
|
167
262
|
client.connect({
|
|
168
263
|
useSSL: _this.isSSLEnabled,
|
|
169
264
|
mqttVersion: 3,
|
|
170
|
-
onSuccess: function () { return resolve(
|
|
171
|
-
onFailure: function (
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
_this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSED);
|
|
175
|
-
resolve(false);
|
|
265
|
+
onSuccess: function () { return resolve(client); },
|
|
266
|
+
onFailure: function () {
|
|
267
|
+
reject();
|
|
268
|
+
_this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CONNECTION_FAILED);
|
|
176
269
|
},
|
|
177
270
|
});
|
|
178
271
|
})];
|
|
179
272
|
case 1:
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CONNECTION_ESTABLISHED);
|
|
183
|
-
}
|
|
273
|
+
_b.sent();
|
|
274
|
+
this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CONNECTION_ESTABLISHED);
|
|
184
275
|
return [2 /*return*/, client];
|
|
185
276
|
}
|
|
186
277
|
});
|
|
@@ -188,68 +279,52 @@ var MqttOverWSProvider = /** @class */ (function (_super) {
|
|
|
188
279
|
};
|
|
189
280
|
MqttOverWSProvider.prototype.connect = function (clientId, options) {
|
|
190
281
|
if (options === void 0) { options = {}; }
|
|
191
|
-
return
|
|
282
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
192
283
|
var _this = this;
|
|
193
|
-
return
|
|
284
|
+
return __generator(this, function (_a) {
|
|
194
285
|
switch (_a.label) {
|
|
195
|
-
case 0: return [4 /*yield*/, this.clientsQueue.get(clientId, function (clientId) {
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
switch (_a.label) {
|
|
199
|
-
case 0: return [4 /*yield*/, this.newClient(tslib_1.__assign(tslib_1.__assign({}, options), { clientId: clientId }))];
|
|
200
|
-
case 1:
|
|
201
|
-
client = _a.sent();
|
|
202
|
-
if (client) {
|
|
203
|
-
// Once connected, subscribe to all topics registered observers
|
|
204
|
-
this._topicObservers.forEach(function (_value, key) {
|
|
205
|
-
client.subscribe(key);
|
|
206
|
-
});
|
|
207
|
-
}
|
|
208
|
-
return [2 /*return*/, client];
|
|
209
|
-
}
|
|
210
|
-
});
|
|
211
|
-
}); })];
|
|
286
|
+
case 0: return [4 /*yield*/, this.clientsQueue.get(clientId, function (clientId) {
|
|
287
|
+
return _this.newClient(__assign(__assign({}, options), { clientId: clientId }));
|
|
288
|
+
})];
|
|
212
289
|
case 1: return [2 /*return*/, _a.sent()];
|
|
213
290
|
}
|
|
214
291
|
});
|
|
215
292
|
});
|
|
216
293
|
};
|
|
217
294
|
MqttOverWSProvider.prototype.disconnect = function (clientId) {
|
|
218
|
-
return
|
|
295
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
219
296
|
var client;
|
|
220
|
-
return
|
|
297
|
+
return __generator(this, function (_a) {
|
|
221
298
|
switch (_a.label) {
|
|
222
299
|
case 0: return [4 /*yield*/, this.clientsQueue.get(clientId)];
|
|
223
300
|
case 1:
|
|
224
301
|
client = _a.sent();
|
|
225
302
|
if (client && client.isConnected()) {
|
|
226
303
|
client.disconnect();
|
|
304
|
+
this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSED);
|
|
227
305
|
}
|
|
228
306
|
this.clientsQueue.remove(clientId);
|
|
229
|
-
this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSED);
|
|
230
307
|
return [2 /*return*/];
|
|
231
308
|
}
|
|
232
309
|
});
|
|
233
310
|
});
|
|
234
311
|
};
|
|
235
312
|
MqttOverWSProvider.prototype.publish = function (topics, msg) {
|
|
236
|
-
return
|
|
237
|
-
var targetTopics, message, client;
|
|
238
|
-
return
|
|
313
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
314
|
+
var targetTopics, message, url, client;
|
|
315
|
+
return __generator(this, function (_a) {
|
|
239
316
|
switch (_a.label) {
|
|
240
317
|
case 0:
|
|
241
318
|
targetTopics = [].concat(topics);
|
|
242
319
|
message = JSON.stringify(msg);
|
|
243
|
-
return [4 /*yield*/, this.
|
|
320
|
+
return [4 /*yield*/, this.endpoint];
|
|
244
321
|
case 1:
|
|
322
|
+
url = _a.sent();
|
|
323
|
+
return [4 /*yield*/, this.connect(this.clientId, { url: url })];
|
|
324
|
+
case 2:
|
|
245
325
|
client = _a.sent();
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
targetTopics.forEach(function (topic) { return client.send(topic, message); });
|
|
249
|
-
}
|
|
250
|
-
else {
|
|
251
|
-
logger.debug('Publishing to topic(s) failed', targetTopics.join(','), message);
|
|
252
|
-
}
|
|
326
|
+
logger.debug('Publishing to topic(s)', targetTopics.join(','), message);
|
|
327
|
+
targetTopics.forEach(function (topic) { return client.send(topic, message); });
|
|
253
328
|
return [2 /*return*/];
|
|
254
329
|
}
|
|
255
330
|
});
|
|
@@ -280,7 +355,6 @@ var MqttOverWSProvider = /** @class */ (function (_super) {
|
|
|
280
355
|
if (options === void 0) { options = {}; }
|
|
281
356
|
var targetTopics = [].concat(topics);
|
|
282
357
|
logger.debug('Subscribing to topic(s)', targetTopics.join(','));
|
|
283
|
-
var reconnectSubscription;
|
|
284
358
|
return new zen_observable_ts_1.default(function (observer) {
|
|
285
359
|
targetTopics.forEach(function (topic) {
|
|
286
360
|
// this._topicObservers is used to notify the observers according to the topic received on the message
|
|
@@ -291,6 +365,8 @@ var MqttOverWSProvider = /** @class */ (function (_super) {
|
|
|
291
365
|
}
|
|
292
366
|
observersForTopic.add(observer);
|
|
293
367
|
});
|
|
368
|
+
// @ts-ignore
|
|
369
|
+
var client;
|
|
294
370
|
var _a = options.clientId, clientId = _a === void 0 ? _this.clientId : _a;
|
|
295
371
|
// this._clientIdObservers is used to close observers when client gets disconnected
|
|
296
372
|
var observersForClientId = _this._clientIdObservers.get(clientId);
|
|
@@ -299,96 +375,66 @@ var MqttOverWSProvider = /** @class */ (function (_super) {
|
|
|
299
375
|
}
|
|
300
376
|
observersForClientId.add(observer);
|
|
301
377
|
_this._clientIdObservers.set(clientId, observersForClientId);
|
|
302
|
-
(function () { return
|
|
303
|
-
var
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
switch (_a.label) {
|
|
378
|
+
(function () { return __awaiter(_this, void 0, void 0, function () {
|
|
379
|
+
var _a, url, _b, e_1;
|
|
380
|
+
return __generator(this, function (_c) {
|
|
381
|
+
switch (_c.label) {
|
|
307
382
|
case 0:
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
switch (_c.label) {
|
|
312
|
-
case 0:
|
|
313
|
-
_c.trys.push([0, 5, , 6]);
|
|
314
|
-
_a = options.url;
|
|
315
|
-
if (!(_a === void 0)) return [3 /*break*/, 2];
|
|
316
|
-
return [4 /*yield*/, this.endpoint];
|
|
317
|
-
case 1:
|
|
318
|
-
_b = _c.sent();
|
|
319
|
-
return [3 /*break*/, 3];
|
|
320
|
-
case 2:
|
|
321
|
-
_b = _a;
|
|
322
|
-
_c.label = 3;
|
|
323
|
-
case 3:
|
|
324
|
-
url = _b;
|
|
325
|
-
return [4 /*yield*/, this.connect(clientId, { url: url })];
|
|
326
|
-
case 4:
|
|
327
|
-
client_1 = _c.sent();
|
|
328
|
-
if (client_1 !== undefined) {
|
|
329
|
-
targetTopics.forEach(function (topic) {
|
|
330
|
-
client_1.subscribe(topic);
|
|
331
|
-
});
|
|
332
|
-
}
|
|
333
|
-
return [3 /*break*/, 6];
|
|
334
|
-
case 5:
|
|
335
|
-
e_1 = _c.sent();
|
|
336
|
-
logger.debug('Error forming connection', e_1);
|
|
337
|
-
return [3 /*break*/, 6];
|
|
338
|
-
case 6: return [2 /*return*/];
|
|
339
|
-
}
|
|
340
|
-
});
|
|
341
|
-
}); };
|
|
342
|
-
// Establish the initial connection
|
|
343
|
-
return [4 /*yield*/, getClient()];
|
|
383
|
+
_a = options.url;
|
|
384
|
+
if (!(_a === void 0)) return [3 /*break*/, 2];
|
|
385
|
+
return [4 /*yield*/, this.endpoint];
|
|
344
386
|
case 1:
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
387
|
+
_b = _c.sent();
|
|
388
|
+
return [3 /*break*/, 3];
|
|
389
|
+
case 2:
|
|
390
|
+
_b = _a;
|
|
391
|
+
_c.label = 3;
|
|
392
|
+
case 3:
|
|
393
|
+
url = _b;
|
|
394
|
+
_c.label = 4;
|
|
395
|
+
case 4:
|
|
396
|
+
_c.trys.push([4, 6, , 7]);
|
|
397
|
+
return [4 /*yield*/, this.connect(clientId, { url: url })];
|
|
398
|
+
case 5:
|
|
399
|
+
client = _c.sent();
|
|
400
|
+
targetTopics.forEach(function (topic) {
|
|
401
|
+
client.subscribe(topic);
|
|
352
402
|
});
|
|
353
|
-
return [
|
|
403
|
+
return [3 /*break*/, 7];
|
|
404
|
+
case 6:
|
|
405
|
+
e_1 = _c.sent();
|
|
406
|
+
observer.error(e_1);
|
|
407
|
+
return [3 /*break*/, 7];
|
|
408
|
+
case 7: return [2 /*return*/];
|
|
354
409
|
}
|
|
355
410
|
});
|
|
356
411
|
}); })();
|
|
357
|
-
return function () {
|
|
358
|
-
var client;
|
|
359
|
-
var _this = this;
|
|
412
|
+
return function () {
|
|
360
413
|
var _a, _b;
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
// No more observers per client => client not needed anymore
|
|
370
|
-
if (((_b = this._clientIdObservers.get(clientId)) === null || _b === void 0 ? void 0 : _b.size) === 0) {
|
|
371
|
-
this.disconnect(clientId);
|
|
372
|
-
this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSING_CONNECTION);
|
|
373
|
-
this._clientIdObservers.delete(clientId);
|
|
374
|
-
}
|
|
375
|
-
targetTopics.forEach(function (topic) {
|
|
376
|
-
var observersForTopic = _this._topicObservers.get(topic) ||
|
|
377
|
-
new Set();
|
|
378
|
-
observersForTopic.delete(observer);
|
|
379
|
-
// if no observers exists for the topic, topic should be removed
|
|
380
|
-
if (observersForTopic.size === 0) {
|
|
381
|
-
_this._topicObservers.delete(topic);
|
|
382
|
-
if (client.isConnected()) {
|
|
383
|
-
client.unsubscribe(topic);
|
|
384
|
-
}
|
|
385
|
-
}
|
|
386
|
-
});
|
|
387
|
-
}
|
|
388
|
-
return [2 /*return*/, null];
|
|
414
|
+
logger.debug('Unsubscribing from topic(s)', targetTopics.join(','));
|
|
415
|
+
if (client) {
|
|
416
|
+
(_a = _this._clientIdObservers.get(clientId)) === null || _a === void 0 ? void 0 : _a.delete(observer);
|
|
417
|
+
// No more observers per client => client not needed anymore
|
|
418
|
+
if (((_b = _this._clientIdObservers.get(clientId)) === null || _b === void 0 ? void 0 : _b.size) === 0) {
|
|
419
|
+
_this.connectionStateMonitor.record(ConnectionStateMonitor_1.CONNECTION_CHANGE.CLOSING_CONNECTION);
|
|
420
|
+
_this.disconnect(clientId);
|
|
421
|
+
_this._clientIdObservers.delete(clientId);
|
|
389
422
|
}
|
|
390
|
-
|
|
391
|
-
|
|
423
|
+
targetTopics.forEach(function (topic) {
|
|
424
|
+
var observersForTopic = _this._topicObservers.get(topic) ||
|
|
425
|
+
new Set();
|
|
426
|
+
observersForTopic.delete(observer);
|
|
427
|
+
// if no observers exists for the topic, topic should be removed
|
|
428
|
+
if (observersForTopic.size === 0) {
|
|
429
|
+
_this._topicObservers.delete(topic);
|
|
430
|
+
if (client.isConnected()) {
|
|
431
|
+
client.unsubscribe(topic);
|
|
432
|
+
}
|
|
433
|
+
}
|
|
434
|
+
});
|
|
435
|
+
}
|
|
436
|
+
return null;
|
|
437
|
+
};
|
|
392
438
|
});
|
|
393
439
|
};
|
|
394
440
|
return MqttOverWSProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MqttOverWSProvider.js","sourceRoot":"","sources":["../../src/Providers/MqttOverWSProvider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MqttOverWSProvider.js","sourceRoot":"","sources":["../../src/Providers/MqttOverWSProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
2
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
var tslib_1 = require("tslib");
|
|
4
14
|
var core_1 = require("@aws-amplify/core");
|
|
5
15
|
var logger = new core_1.ConsoleLogger('AbstractPubSubProvider');
|
|
6
16
|
var AbstractPubSubProvider = /** @class */ (function () {
|
|
@@ -10,7 +20,7 @@ var AbstractPubSubProvider = /** @class */ (function () {
|
|
|
10
20
|
}
|
|
11
21
|
AbstractPubSubProvider.prototype.configure = function (config) {
|
|
12
22
|
if (config === void 0) { config = {}; }
|
|
13
|
-
this._config =
|
|
23
|
+
this._config = __assign(__assign({}, config), this._config);
|
|
14
24
|
logger.debug("configure " + this.getProviderName(), this._config);
|
|
15
25
|
return this.options;
|
|
16
26
|
};
|
|
@@ -19,7 +29,7 @@ var AbstractPubSubProvider = /** @class */ (function () {
|
|
|
19
29
|
};
|
|
20
30
|
Object.defineProperty(AbstractPubSubProvider.prototype, "options", {
|
|
21
31
|
get: function () {
|
|
22
|
-
return
|
|
32
|
+
return __assign({}, this._config);
|
|
23
33
|
},
|
|
24
34
|
enumerable: true,
|
|
25
35
|
configurable: true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PubSubProvider.js","sourceRoot":"","sources":["../../src/Providers/PubSubProvider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PubSubProvider.js","sourceRoot":"","sources":["../../src/Providers/PubSubProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAcA,0CAA4D;AAE5D,IAAM,MAAM,GAAG,IAAI,oBAAM,CAAC,wBAAwB,CAAC,CAAC;AAEpD;IAGC,gCAAY,OAA6B;QAA7B,wBAAA,EAAA,YAA6B;QACxC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAED,0CAAS,GAAT,UAAU,MAA4B;QAA5B,uBAAA,EAAA,WAA4B;QACrC,IAAI,CAAC,OAAO,yBAAQ,MAAM,GAAK,IAAI,CAAC,OAAO,CAAE,CAAC;QAE9C,MAAM,CAAC,KAAK,CAAC,eAAa,IAAI,CAAC,eAAe,EAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAElE,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAED,4CAAW,GAAX;QACC,OAAO,QAAQ,CAAC;IACjB,CAAC;IAID,sBAAc,2CAAO;aAArB;YACC,oBAAY,IAAI,CAAC,OAAO,EAAG;QAC5B,CAAC;;;OAAA;IAcF,6BAAC;AAAD,CAAC,AArCD,IAqCC;AArCqB,wDAAsB"}
|
|
@@ -92,12 +92,4 @@ exports.DEFAULT_KEEP_ALIVE_TIMEOUT = 5 * 60 * 1000;
|
|
|
92
92
|
* Default Time in milleseconds to alert for missed GQL_CONNECTION_KEEP_ALIVE message
|
|
93
93
|
*/
|
|
94
94
|
exports.DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT = 65 * 1000;
|
|
95
|
-
/**
|
|
96
|
-
* Default delay time in milleseconds between when reconnect is triggered vs when it is attempted
|
|
97
|
-
*/
|
|
98
|
-
exports.RECONNECT_DELAY = 5 * 1000;
|
|
99
|
-
/**
|
|
100
|
-
* Default interval time in milleseconds between when reconnect is re-attempted
|
|
101
|
-
*/
|
|
102
|
-
exports.RECONNECT_INTERVAL = 60 * 1000;
|
|
103
95
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/Providers/constants.ts"],"names":[],"mappings":";;AAAa,QAAA,YAAY,GAAG,IAAI,CAAC;AAEpB,QAAA,mBAAmB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAEtC,QAAA,uBAAuB,GAAG,uBAAuB,CAAC;AAE/D,IAAY,aAmDX;AAnDD,WAAY,aAAa;IACxB;;;OAGG;IACH,wDAAuC,CAAA;IACvC;;;OAGG;IACH,0DAAyC,CAAA;IACzC;;;OAGG;IACH,sDAAqC,CAAA;IACrC;;;OAGG;IACH,oCAAmB,CAAA;IACnB;;;OAGG;IACH,4CAA2B,CAAA;IAC3B;;;OAGG;IACH,kCAAiB,CAAA;IACjB;;;OAGG;IACH,iDAAgC,CAAA;IAChC;;;OAGG;IACH,kCAAiB,CAAA;IACjB;;;OAGG;IACH,0CAAyB,CAAA;IACzB;;;OAGG;IACH,oCAAmB,CAAA;AACpB,CAAC,EAnDW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAmDxB;AAED,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC9B,mEAAO,CAAA;IACP,uEAAS,CAAA;IACT,iEAAM,CAAA;AACP,CAAC,EAJW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAI9B;AAED,IAAY,aAIX;AAJD,WAAY,aAAa;IACxB,qDAAM,CAAA;IACN,mDAAK,CAAA;IACL,6DAAU,CAAA;AACX,CAAC,EAJW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAIxB;AAEY,QAAA,cAAc,GAAG,CAC7B,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,MAAM,CAAC,GAAG,KAAK,UAAU;IAChE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC;IAC/B,CAAC,CAAC,mBAAmB,CACZ,CAAC;AAEC,QAAA,4BAA4B,GAAG;IAC3C,MAAM,EAAE,mCAAmC;IAC3C,kBAAkB,EAAE,SAAS;IAC7B,cAAc,EAAE,iCAAiC;CACjD,CAAC;AAEF;;GAEG;AACU,QAAA,uBAAuB,GAAG,KAAK,CAAC;AAE7C;;GAEG;AACU,QAAA,iBAAiB,GAAG,KAAK,CAAC;AAEvC;;GAEG;AACU,QAAA,0BAA0B,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAExD;;GAEG;AACU,QAAA,gCAAgC,GAAG,EAAE,GAAG,IAAI,CAAC
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/Providers/constants.ts"],"names":[],"mappings":";;AAAa,QAAA,YAAY,GAAG,IAAI,CAAC;AAEpB,QAAA,mBAAmB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAEtC,QAAA,uBAAuB,GAAG,uBAAuB,CAAC;AAE/D,IAAY,aAmDX;AAnDD,WAAY,aAAa;IACxB;;;OAGG;IACH,wDAAuC,CAAA;IACvC;;;OAGG;IACH,0DAAyC,CAAA;IACzC;;;OAGG;IACH,sDAAqC,CAAA;IACrC;;;OAGG;IACH,oCAAmB,CAAA;IACnB;;;OAGG;IACH,4CAA2B,CAAA;IAC3B;;;OAGG;IACH,kCAAiB,CAAA;IACjB;;;OAGG;IACH,iDAAgC,CAAA;IAChC;;;OAGG;IACH,kCAAiB,CAAA;IACjB;;;OAGG;IACH,0CAAyB,CAAA;IACzB;;;OAGG;IACH,oCAAmB,CAAA;AACpB,CAAC,EAnDW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAmDxB;AAED,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC9B,mEAAO,CAAA;IACP,uEAAS,CAAA;IACT,iEAAM,CAAA;AACP,CAAC,EAJW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAI9B;AAED,IAAY,aAIX;AAJD,WAAY,aAAa;IACxB,qDAAM,CAAA;IACN,mDAAK,CAAA;IACL,6DAAU,CAAA;AACX,CAAC,EAJW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAIxB;AAEY,QAAA,cAAc,GAAG,CAC7B,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,MAAM,CAAC,GAAG,KAAK,UAAU;IAChE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC;IAC/B,CAAC,CAAC,mBAAmB,CACZ,CAAC;AAEC,QAAA,4BAA4B,GAAG;IAC3C,MAAM,EAAE,mCAAmC;IAC3C,kBAAkB,EAAE,SAAS;IAC7B,cAAc,EAAE,iCAAiC;CACjD,CAAC;AAEF;;GAEG;AACU,QAAA,uBAAuB,GAAG,KAAK,CAAC;AAE7C;;GAEG;AACU,QAAA,iBAAiB,GAAG,KAAK,CAAC;AAEvC;;GAEG;AACU,QAAA,0BAA0B,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAExD;;GAEG;AACU,QAAA,gCAAgC,GAAG,EAAE,GAAG,IAAI,CAAC"}
|