stream-chat 4.4.1 → 4.4.3-dev.2

package/dist/index.js

@@ -954,6 +954,16 @@ function getRandomBytes(length) {
   return bytes;
 }
 
+function convertErrorToJson(err) {
+  var jsonObj = {};
+  if (!err) return jsonObj;
+  Object.getOwnPropertyNames(err).forEach(function (key) {
+    // @ts-ignore
+    jsonObj[key] = err[key];
+  });
+  return jsonObj;
+}
+
 function _createForOfIteratorHelper$2(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$2(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray$2(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$2(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$2(o, minLen); }
@@ -3448,7 +3458,6 @@ var ClientState = /*#__PURE__*/function () {
 function ownKeys$2(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$2(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$2(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
 var InsightMetrics = function InsightMetrics() {
   _classCallCheck__default['default'](this, InsightMetrics);
 
@@ -3458,18 +3467,15 @@ var InsightMetrics = function InsightMetrics() {
 
   _defineProperty__default['default'](this, "wsTotalFailures", void 0);
 
+  _defineProperty__default['default'](this, "instanceClientId", void 0);
+
   this.connectionStartTimestamp = null;
   this.wsTotalFailures = 0;
   this.wsConsecutiveFailures = 0;
+  this.instanceClientId = randomId();
 };
 function buildWsFatalInsight(connection, event) {
-  return _objectSpread$2({
-    err: {
-      wasClean: event.wasClean,
-      code: event.code,
-      reason: event.reason
-    }
-  }, buildWsBaseInsight(connection));
+  return _objectSpread$2(_objectSpread$2({}, event), buildWsBaseInsight(connection));
 }
 
 function buildWsBaseInsight(connection) {
@@ -3492,7 +3498,8 @@ function buildWsBaseInsight(connection) {
     ws_total_failures: connection.insightMetrics.wsTotalFailures,
     request_id: connection.requestID,
     online: typeof navigator !== 'undefined' ? (_navigator = navigator) === null || _navigator === void 0 ? void 0 : _navigator.onLine : null,
-    user_agent: typeof navigator !== 'undefined' ? (_navigator2 = navigator) === null || _navigator2 === void 0 ? void 0 : _navigator2.userAgent : null
+    user_agent: typeof navigator !== 'undefined' ? (_navigator2 = navigator) === null || _navigator2 === void 0 ? void 0 : _navigator2.userAgent : null,
+    instance_client_id: connection.insightMetrics.instanceClientId
   };
 }
 
@@ -3621,7 +3628,7 @@ var StableWSConnection = /*#__PURE__*/function () {
         user_token: _this.tokenManager.getToken(),
         server_determines_connection_id: true,
         device: _this.device,
-        request_id: reqID
+        client_request_id: reqID
       };
       var qs = encodeURIComponent(JSON.stringify(params));
 
@@ -3706,13 +3713,7 @@ var StableWSConnection = /*#__PURE__*/function () {
     });
 
     _defineProperty__default['default'](this, "onclose", function (wsID, event) {
-      if (event.code !== chatCodes.WS_CLOSED_SUCCESS) {
-        var _this$postInsights;
-
-        _this.insightMetrics.wsConsecutiveFailures++;
-        _this.insightMetrics.wsTotalFailures++;
-        (_this$postInsights = _this.postInsights) === null || _this$postInsights === void 0 ? void 0 : _this$postInsights.call(_this, 'ws_fatal', buildWsFatalInsight(_this, event));
-      }
+      if (_this.wsID !== wsID) return;
 
       _this.logger('info', 'connection:onclose() - onclose callback - ' + event.code, {
         tags: ['connection'],
@@ -3720,8 +3721,6 @@ var StableWSConnection = /*#__PURE__*/function () {
         wsID: wsID
       });
 
-      if (_this.wsID !== wsID) return;
-
       if (event.code === chatCodes.WS_CLOSED_SUCCESS) {
         var _this$rejectPromise2;
 
@@ -3729,6 +3728,9 @@ var StableWSConnection = /*#__PURE__*/function () {
         // usually caused by invalid auth details
         var error = new Error("WS connection reject with error ".concat(event.reason));
         error.reason = event.reason;
+        error.code = event.code;
+        error.wasClean = event.wasClean;
+        error.target = event.target;
         (_this$rejectPromise2 = _this.rejectPromise) === null || _this$rejectPromise2 === void 0 ? void 0 : _this$rejectPromise2.call(_this, error);
 
         _this.logger('info', "connection:onclose() - WS connection reject with error ".concat(event.reason), {
@@ -4259,7 +4261,7 @@ var StableWSConnection = /*#__PURE__*/function () {
     key: "_connect",
     value: function () {
       var _connect3 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee5() {
-        var wsURL, response, _this$postInsights2;
+        var wsURL, response, _this$postInsights, insights;
 
         return _regeneratorRuntime__default['default'].wrap(function _callee5$(_context5) {
           while (1) {
@@ -4304,24 +4306,33 @@ var StableWSConnection = /*#__PURE__*/function () {
 
                 this.connectionID = response.connection_id;
 
-                if (this.insightMetrics.wsConsecutiveFailures > 0) {
-                  (_this$postInsights2 = this.postInsights) === null || _this$postInsights2 === void 0 ? void 0 : _this$postInsights2.call(this, 'ws_success_after_failure', buildWsSuccessAfterFailureInsight(this));
+                if (this.insightMetrics.wsConsecutiveFailures > 0 && this.postInsights) {
+                  this.postInsights('ws_success_after_failure', buildWsSuccessAfterFailureInsight(this));
                   this.insightMetrics.wsConsecutiveFailures = 0;
                 }
 
                 return _context5.abrupt("return", response);
 
               case 23:
-                _context5.next = 29;
+                _context5.next = 30;
                 break;
 
               case 25:
                 _context5.prev = 25;
                 _context5.t0 = _context5["catch"](5);
                 this.isConnecting = false;
+
+                if (this.postInsights) {
+                  this.insightMetrics.wsConsecutiveFailures++;
+                  this.insightMetrics.wsTotalFailures++; // @ts-ignore
+
+                  insights = buildWsFatalInsight(this, convertErrorToJson(_context5.t0));
+                  (_this$postInsights = this.postInsights) === null || _this$postInsights === void 0 ? void 0 : _this$postInsights.call(this, 'ws_fatal', insights);
+                }
+
                 throw _context5.t0;
 
-              case 29:
+              case 30:
               case "end":
                 return _context5.stop();
             }
@@ -5124,7 +5135,9 @@ var StreamChat = /*#__PURE__*/function () {
         var options,
             requestConfig,
             response,
+            _requestConfig$header,
             _args4 = arguments;
+
         return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
@@ -5203,45 +5216,46 @@ var StreamChat = /*#__PURE__*/function () {
               case 39:
                 _context4.prev = 39;
                 _context4.t1 = _context4["catch"](4);
+                _context4.t1.client_request_id = (_requestConfig$header = requestConfig.headers) === null || _requestConfig$header === void 0 ? void 0 : _requestConfig$header['x-client-request-id'];
 
                 _this._logApiError(type, url, _context4.t1);
 
                 _this.consecutiveFailures += 1;
 
                 if (!_context4.t1.response) {
-                  _context4.next = 55;
+                  _context4.next = 56;
                   break;
                 }
 
                 if (!(_context4.t1.response.data.code === chatCodes.TOKEN_EXPIRED && !_this.tokenManager.isStatic())) {
-                  _context4.next = 52;
+                  _context4.next = 53;
                   break;
                 }
 
                 if (!(_this.consecutiveFailures > 1)) {
-                  _context4.next = 48;
+                  _context4.next = 49;
                   break;
                 }
 
-                _context4.next = 48;
+                _context4.next = 49;
                 return sleep(retryInterval(_this.consecutiveFailures));
 
-              case 48:
+              case 49:
                 _this.tokenManager.loadToken();
 
-                _context4.next = 51;
+                _context4.next = 52;
                 return _this.doAxiosRequest(type, url, data, options);
 
-              case 51:
+              case 52:
                 return _context4.abrupt("return", _context4.sent);
 
-              case 52:
+              case 53:
                 return _context4.abrupt("return", _this.handleResponse(_context4.t1.response));
 
-              case 55:
+              case 56:
                 throw _context4.t1;
 
-              case 56:
+              case 57:
               case "end":
                 return _context4.stop();
             }
@@ -5560,7 +5574,7 @@ var StreamChat = /*#__PURE__*/function () {
 
                 _context6.prev = 3;
                 _context6.next = 6;
-                return _this.axiosInstance.post("https://insights.stream-io-api.com/insights/".concat(insightType), insights);
+                return _this.axiosInstance.post("https://chat-insights.getstream.io/insights/".concat(insightType), insights);
 
               case 6:
                 _context6.next = 14;
@@ -5635,7 +5649,7 @@ var StreamChat = /*#__PURE__*/function () {
     }
 
     this.axiosInstance = axios__default['default'].create(this.options);
-    this.setBaseURL(this.options.baseURL || 'https://chat-us-east-1.stream-io-api.com');
+    this.setBaseURL(this.options.baseURL || 'https://chat.stream-io-api.com');
 
     if (typeof process !== 'undefined' && process.env.STREAM_LOCAL_TEST_RUN) {
       this.setBaseURL('http://localhost:3030');
@@ -6469,7 +6483,7 @@ var StreamChat = /*#__PURE__*/function () {
      */
     function () {
       var _connect = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee15() {
-        var client, warmUpPromise, handshake;
+        var client;
         return _regeneratorRuntime__default['default'].wrap(function _callee15$(_context15) {
           while (1) {
             switch (_context15.prev = _context15.next) {
@@ -6501,7 +6515,11 @@ var StreamChat = /*#__PURE__*/function () {
                 throw Error('clientID is not set');
 
               case 8:
-                // The StableWSConnection handles all the reconnection logic.
+                if (!this.wsConnection && (this.options.warmUp || this.options.enableInsights)) {
+                  this.sendBeacon();
+                } // The StableWSConnection handles all the reconnection logic.
+
+
                 this.wsConnection = new StableWSConnection({
                   wsBaseURL: client.wsBaseURL,
                   clientID: client.clientID,
@@ -6519,40 +6537,18 @@ var StreamChat = /*#__PURE__*/function () {
                   postInsights: this.options.enableInsights ? this.postInsights : undefined,
                   insightMetrics: this.insightMetrics
                 });
-
-                if (this.options.warmUp) {
-                  warmUpPromise = this.doAxiosRequest('options', this.baseURL + '/connect');
-                }
-
                 _context15.next = 12;
                 return this.wsConnection.connect();
 
               case 12:
-                handshake = _context15.sent;
-                _context15.prev = 13;
-                _context15.next = 16;
-                return warmUpPromise;
-
-              case 16:
-                _context15.next = 21;
-                break;
-
-              case 18:
-                _context15.prev = 18;
-                _context15.t0 = _context15["catch"](13);
-                this.logger('error', 'Warmup request failed', {
-                  error: _context15.t0
-                });
-
-              case 21:
-                return _context15.abrupt("return", handshake);
+                return _context15.abrupt("return", _context15.sent);
 
-              case 22:
+              case 13:
               case "end":
                 return _context15.stop();
             }
           }
-        }, _callee15, this, [[13, 18]]);
+        }, _callee15, this);
       }));
 
       function connect() {
@@ -6561,6 +6557,25 @@ var StreamChat = /*#__PURE__*/function () {
 
       return connect;
     }()
+  }, {
+    key: "sendBeacon",
+    value: function sendBeacon() {
+      var _this4 = this;
+
+      var client_request_id = randomId();
+      var opts = {
+        headers: {
+          'x-client-request-id': client_request_id
+        }
+      };
+      this.doAxiosRequest('get', this.baseURL + '/beacon', null, opts).catch(function (e) {
+        _this4.postInsights('http_beacon_failed', {
+          api_key: _this4.key,
+          err: e,
+          client_request_id: client_request_id
+        });
+      });
+    }
     /**
      * queryUsers - Query users and watch user presence
      *
@@ -8372,7 +8387,7 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "getUserAgent",
     value: function getUserAgent() {
-      return this.userAgent || "stream-chat-javascript-client-".concat(this.node ? 'node' : 'browser', "-", "4.4.1");
+      return this.userAgent || "stream-chat-javascript-client-".concat(this.node ? 'node' : 'browser', "-", "4.4.3-dev.2");
     }
   }, {
     key: "setUserAgent",
@@ -8386,7 +8401,7 @@ var StreamChat = /*#__PURE__*/function () {
   }, {
     key: "_enrichAxiosOptions",
     value: function _enrichAxiosOptions() {
-      var _this$wsConnection4;
+      var _options$headers, _this$wsConnection4;
 
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
         params: {},
@@ -8396,6 +8411,12 @@ var StreamChat = /*#__PURE__*/function () {
 
       var token = this._getToken();
 
+      if (!((_options$headers = options.headers) !== null && _options$headers !== void 0 && _options$headers['x-client-request-id'])) {
+        options.headers = {
+          'x-client-request-id': randomId()
+        };
+      }
+
       return _objectSpread({
         params: _objectSpread(_objectSpread({
           user_id: this.userID