stream-chat 4.4.1 → 4.4.3-dev.2

package/src/connection.ts

@@ -1,5 +1,5 @@
 import WebSocket from 'isomorphic-ws';
-import { chatCodes, sleep, retryInterval, randomId } from './utils';
+import { chatCodes, convertErrorToJson, sleep, retryInterval, randomId } from './utils';
 import { TokenManager } from './token_manager';
 import {
   buildWsFatalInsight,
@@ -270,7 +270,7 @@ export class StableWSConnection<
       user_token: this.tokenManager.getToken(),
       server_determines_connection_id: true,
       device: this.device,
-      request_id: reqID,
+      client_request_id: reqID,
     };
     const qs = encodeURIComponent(JSON.stringify(params));
     const token = this.tokenManager.getToken();
@@ -388,8 +388,8 @@ export class StableWSConnection<
 
       if (response) {
         this.connectionID = response.connection_id;
-        if (this.insightMetrics.wsConsecutiveFailures > 0) {
-          this.postInsights?.(
+        if (this.insightMetrics.wsConsecutiveFailures > 0 && this.postInsights) {
+          this.postInsights(
             'ws_success_after_failure',
             buildWsSuccessAfterFailureInsight(this),
           );
@@ -399,6 +399,15 @@ export class StableWSConnection<
       }
     } catch (err) {
       this.isConnecting = false;
+
+      if (this.postInsights) {
+        this.insightMetrics.wsConsecutiveFailures++;
+        this.insightMetrics.wsTotalFailures++;
+
+        // @ts-ignore
+        const insights = buildWsFatalInsight(this, convertErrorToJson(err));
+        this.postInsights?.('ws_fatal', insights);
+      }
       throw err;
     }
   }
@@ -587,11 +596,7 @@ export class StableWSConnection<
   };
 
   onclose = (wsID: number, event: WebSocket.CloseEvent) => {
-    if (event.code !== chatCodes.WS_CLOSED_SUCCESS) {
-      this.insightMetrics.wsConsecutiveFailures++;
-      this.insightMetrics.wsTotalFailures++;
-      this.postInsights?.('ws_fatal', buildWsFatalInsight(this, event));
-    }
+    if (this.wsID !== wsID) return;
 
     this.logger('info', 'connection:onclose() - onclose callback - ' + event.code, {
       tags: ['connection'],
@@ -599,15 +604,18 @@ export class StableWSConnection<
       wsID,
     });
 
-    if (this.wsID !== wsID) return;
-
     if (event.code === chatCodes.WS_CLOSED_SUCCESS) {
       // this is a permanent error raised by stream..
       // usually caused by invalid auth details
       const error = new Error(
         `WS connection reject with error ${event.reason}`,
-      ) as Error & { reason?: string };
+      ) as Error & WebSocket.CloseEvent;
+
       error.reason = event.reason;
+      error.code = event.code;
+      error.wasClean = event.wasClean;
+      error.target = event.target;
+
       this.rejectPromise?.(error);
       this.logger(
         'info',

package/src/insights.ts

@@ -1,17 +1,19 @@
 import { StableWSConnection } from './connection';
-import WebSocket from 'isomorphic-ws';
 import { LiteralStringForUnion, UnknownType } from './types';
+import { randomId } from './utils';
 
-export type InsightTypes = 'ws_fatal' | 'ws_success_after_failure';
+export type InsightTypes = 'ws_fatal' | 'ws_success_after_failure' | 'http_beacon_failed';
 export class InsightMetrics {
   connectionStartTimestamp: number | null;
   wsConsecutiveFailures: number;
   wsTotalFailures: number;
+  instanceClientId: string;
 
   constructor() {
     this.connectionStartTimestamp = null;
     this.wsTotalFailures = 0;
     this.wsConsecutiveFailures = 0;
+    this.instanceClientId = randomId();
   }
 }
 
@@ -21,14 +23,10 @@ export function buildWsFatalInsight<
   UserType extends UnknownType = UnknownType
 >(
   connection: StableWSConnection<ChannelType, CommandType, UserType>,
-  event: WebSocket.CloseEvent,
+  event: Record<string, unknown>,
 ) {
   return {
-    err: {
-      wasClean: event.wasClean,
-      code: event.code,
-      reason: event.reason,
-    },
+    ...event,
     ...buildWsBaseInsight(connection),
   };
 }
@@ -56,6 +54,7 @@ function buildWsBaseInsight<
     request_id: connection.requestID,
     online: typeof navigator !== 'undefined' ? navigator?.onLine : null,
     user_agent: typeof navigator !== 'undefined' ? navigator?.userAgent : null,
+    instance_client_id: connection.insightMetrics.instanceClientId,
   };
 }
 

package/src/types.ts

@@ -2163,11 +2163,13 @@ export type DeleteType = 'soft' | 'hard';
   implies that all related objects (messages, flags, etc) will be hard-deleted as well.
   `conversations` soft|hard will delete any 1to1 channels that the user was a member of.
   `messages` soft-hard will delete any messages that the user has sent.
+  `new_channel_owner_id` any channels owned by the hard-deleted user will be transferred to this user ID
  */
 export type DeleteUserOptions = {
   user: DeleteType;
   conversations?: DeleteType;
   messages?: DeleteType;
+  new_channel_owner_id?: string;
 };
 
 export type SegmentData = {

package/src/utils.ts

@@ -198,3 +198,16 @@ function getRandomBytes(length: number): Uint8Array {
   getRandomValues(bytes);
   return bytes;
 }
+
+export function convertErrorToJson(err: unknown) {
+  const jsonObj = {} as Record<string, unknown>;
+
+  if (!err) return jsonObj;
+
+  Object.getOwnPropertyNames(err).forEach((key) => {
+    // @ts-ignore
+    jsonObj[key] = err[key];
+  });
+
+  return jsonObj;
+}