@sogni-ai/sogni-client 4.0.0-alpha.12 → 4.0.0-alpha.13

package/dist/lib/DataEntity.js

@@ -18,9 +18,11 @@ class DataEntity extends TypedEventEmitter_1.default {
     _update(delta) {
         //@ts-ignore
         const changedKeys = Object.keys(delta).filter((key) => this.data[key] !== delta[key]);
-        this.data = Object.assign(Object.assign({}, this.data), delta);
         this.lastUpdated = new Date();
-        this.emit('updated', changedKeys);
+        if (changedKeys.length > 0) {
+            this.data = Object.assign(Object.assign({}, this.data), delta);
+            this.emit('updated', changedKeys);
+        }
     }
     /**
      * Get a copy of the entity's data

package/dist/lib/DataEntity.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataEntity.js","sourceRoot":"","sources":["../../src/lib/DataEntity.ts"],"names":[],"mappings":";;;;;AAAA,mCAAmC;AACnC,4EAAoD;AASpD,MAAe,UAAqD,SAAQ,2BAAoB;IAK9F,YAAY,IAAO;QACjB,KAAK,EAAE,CAAC;QAHA,gBAAW,GAAS,IAAI,IAAI,EAAE,CAAC;QAIvC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED;;;OAGG;IACH,OAAO,CAAC,KAAiB;QACvB,YAAY;QACZ,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACtF,IAAI,CAAC,IAAI,mCAAQ,IAAI,CAAC,IAAI,GAAK,KAAK,CAAE,CAAC;QACvC,IAAI,CAAC,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IACpC,CAAC;IAED;;OAEG;IACH,MAAM;QACJ,OAAO,IAAA,kBAAS,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;CACF;AAED,kBAAe,UAAU,CAAC"}
+{"version":3,"file":"DataEntity.js","sourceRoot":"","sources":["../../src/lib/DataEntity.ts"],"names":[],"mappings":";;;;;AAAA,mCAAmC;AACnC,4EAAoD;AASpD,MAAe,UAAqD,SAAQ,2BAAoB;IAK9F,YAAY,IAAO;QACjB,KAAK,EAAE,CAAC;QAHA,gBAAW,GAAS,IAAI,IAAI,EAAE,CAAC;QAIvC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED;;;OAGG;IACH,OAAO,CAAC,KAAiB;QACvB,YAAY;QACZ,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACtF,IAAI,CAAC,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;QAC9B,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,IAAI,mCAAQ,IAAI,CAAC,IAAI,GAAK,KAAK,CAAE,CAAC;YACvC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,MAAM;QACJ,OAAO,IAAA,kBAAS,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;CACF;AAED,kBAAe,UAAU,CAAC"}

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "4.0.0-alpha.12",
+  "version": "4.0.0-alpha.13",
   "description": "Sogni Supernet Client",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/Account/index.ts

@@ -43,7 +43,12 @@ class AccountApi extends ApiGroup {
 
   constructor(config: ApiConfig) {
     super(config);
+    this.currentAccount._update({
+      networkStatus: this.client.socket.isConnected ? 'connected' : 'disconnected',
+      network: this.client.socket.supernetType
+    });
     this.client.socket.on('balanceUpdate', this.handleBalanceUpdate.bind(this));
+    this.client.socket.on('changeNetwork', this.handleChangeNetwork.bind(this));
     this.client.on('connected', this.handleServerConnected.bind(this));
     this.client.on('disconnected', this.handleServerDisconnected.bind(this));
     this.client.auth.on('updated', this.handleAuthUpdated.bind(this));
@@ -53,6 +58,10 @@ class AccountApi extends ApiGroup {
     this.currentAccount._update({ balance: data });
   }
 
+  private handleChangeNetwork({ network }: { network: SupernetType }) {
+    this.currentAccount._update({ network, networkStatus: 'connected' });
+  }
+
   private handleServerConnected({ network }: { network: SupernetType }) {
     this.currentAccount._update({
       networkStatus: 'connected',
@@ -70,6 +79,8 @@ class AccountApi extends ApiGroup {
   private handleAuthUpdated(isAuthenticated: boolean) {
     if (!isAuthenticated) {
       this.currentAccount._clear();
+    } else {
+      this.me();
     }
   }
 
@@ -137,7 +148,6 @@ class AccountApi extends ApiGroup {
     } else {
       await auth.authenticate();
     }
-    await this.me();
     return res.data;
   }
 
@@ -173,7 +183,6 @@ class AccountApi extends ApiGroup {
     } else {
       await auth.authenticate();
     }
-    await this.me();
     return res.data;
   }
 

package/src/ApiClient/WebSocketClient/BrowserWebSocketClient/BrowserWebSocketClient.ts

@@ -0,0 +1,206 @@
+import { IWebSocketClient, SupernetType } from '../types';
+import { AuthManager, TokenAuthManager } from '../../../lib/AuthManager';
+import { Logger } from '../../../lib/DefaultLogger';
+import WebSocketClient from '../index';
+import RestClient from '../../../lib/RestClient';
+import { ServerDisconnectData, SocketEventMap } from '../events';
+import WSCoordinator from './WSCoordinator';
+import { MessageType, SocketMessageMap } from '../messages';
+import { Heartbeat, SocketEventReceived, SendSocketMessage } from './types';
+
+type EventInterceptor<T extends keyof SocketEventMap = keyof SocketEventMap> = (
+  eventType: T,
+  payload: SocketEventMap[T]
+) => void;
+
+class WrappedClient extends WebSocketClient {
+  private interceptor: EventInterceptor | undefined = undefined;
+  intercept(interceptor: EventInterceptor) {
+    this.interceptor = interceptor;
+  }
+  protected emit<T extends keyof SocketEventMap>(event: T, data: SocketEventMap[T]) {
+    super.emit(event, data);
+    if (this.interceptor) {
+      this.interceptor(event, data);
+    }
+  }
+}
+
+class BrowserWebSocketClient extends RestClient<SocketEventMap> implements IWebSocketClient {
+  appId: string;
+  baseUrl: string;
+  private socketClient: WrappedClient;
+  private coordinator: WSCoordinator;
+  private isPrimary = false;
+  private _isConnected = false;
+  private _supernetType: SupernetType;
+
+  constructor(
+    baseUrl: string,
+    auth: AuthManager,
+    appId: string,
+    supernetType: SupernetType,
+    logger: Logger
+  ) {
+    const socketClient = new WrappedClient(baseUrl, auth, appId, supernetType, logger);
+    super(socketClient.baseUrl, auth, logger);
+    this.socketClient = socketClient;
+    this.appId = appId;
+    this.baseUrl = socketClient.baseUrl;
+    this._supernetType = supernetType;
+    this.coordinator = new WSCoordinator(
+      {
+        onAuthChanged: this.handleAuthChanged.bind(this),
+        onRoleChange: this.handleRoleChange.bind(this),
+        onConnectionToggle: this.handleConnectionToggle.bind(this),
+        onMessageFromPrimary: this.handleMessageFromPrimary.bind(this),
+        onSendRequest: this.handleSendRequest.bind(this)
+      },
+      logger
+    );
+    this.auth.on('updated', this.handleAuthUpdated.bind(this));
+    this.socketClient.intercept(this.handleSocketEvent.bind(this));
+  }
+
+  get isConnected() {
+    return this.isPrimary ? this.socketClient.isConnected : this._isConnected;
+  }
+
+  get supernetType() {
+    return this.isPrimary ? this.socketClient.supernetType : this._supernetType;
+  }
+
+  async connect(): Promise<void> {
+    const isPrimary = await this.coordinator.initialize();
+    this.isPrimary = isPrimary;
+    if (isPrimary) {
+      await this.socketClient.connect();
+    } else {
+      this.coordinator.connect();
+    }
+  }
+
+  disconnect() {
+    if (this.isPrimary) {
+      this.socketClient.disconnect();
+    } else {
+      this.coordinator.disconnect();
+    }
+  }
+
+  async switchNetwork(supernetType: SupernetType): Promise<SupernetType> {
+    if (this.isPrimary) {
+      return this.socketClient.switchNetwork(supernetType);
+    }
+    return new Promise<SupernetType>(async (resolve) => {
+      this.once('changeNetwork', ({ network }) => {
+        this._supernetType = network;
+        resolve(network);
+      });
+      await this.send('changeNetwork', supernetType);
+    });
+  }
+
+  async send<T extends MessageType>(messageType: T, data: SocketMessageMap[T]): Promise<void> {
+    if (this.isPrimary) {
+      return this.socketClient.send(messageType, data);
+    }
+    return this.coordinator.sendToSocket(messageType, data);
+  }
+
+  private handleAuthChanged(isAuthenticated: boolean) {
+    if (this.auth instanceof TokenAuthManager) {
+      throw new Error('TokenAuthManager is not supported in multi client mode');
+    }
+    if (this.auth.isAuthenticated !== isAuthenticated) {
+      if (isAuthenticated) {
+        this.auth.authenticate();
+      } else {
+        this.auth.clear();
+      }
+    }
+  }
+
+  private handleSocketEvent(eventType: keyof SocketEventMap, payload: any) {
+    if (this.isPrimary) {
+      this.coordinator.broadcastSocketEvent(eventType, payload);
+      this.emit(eventType, payload);
+    }
+  }
+
+  private handleAuthUpdated(isAuthenticated: boolean) {
+    this.coordinator.changeAuthState(isAuthenticated);
+  }
+
+  private handleRoleChange(isPrimary: boolean) {
+    this.isPrimary = isPrimary;
+    if (isPrimary && !this.socketClient.isConnected && this.isConnected) {
+      this.socketClient.connect();
+    } else if (!isPrimary && this.socketClient.isConnected) {
+      this.socketClient.disconnect();
+    }
+  }
+
+  private handleConnectionToggle(isConnected: boolean) {
+    if (this.isPrimary) {
+      if (isConnected && !this.socketClient.isConnected) {
+        this.socketClient.connect();
+      } else if (!isConnected && this.socketClient.isConnected) {
+        this.socketClient.disconnect();
+      }
+    }
+  }
+
+  /**
+   * Emit events from socket to listeners
+   * @param message
+   */
+  private handleMessageFromPrimary(message: SocketEventReceived | Heartbeat) {
+    if (this.isPrimary) {
+      throw new Error('Received message from primary socket, but it is primary');
+    }
+    this._logger.debug('Received message from primary client:', message.type, message.payload);
+    if (message.type === 'primary-present') {
+      const shouldUpdateStatus = message.payload.connected !== this._isConnected;
+      if (shouldUpdateStatus) {
+        this._isConnected = message.payload.connected;
+        if (message.payload.connected) {
+          this._logger.debug('Primary socket is active emitting connected event');
+          this.emit('connected', { network: this._supernetType });
+        } else {
+          this._logger.debug('Primary socket is inactive emitting disconnected event');
+          this.emit('disconnected', { code: 5000, reason: 'Primary socket disconnected' });
+        }
+      }
+      return;
+    }
+    const event = message.payload;
+    switch (event.eventType) {
+      case 'connected': {
+        if (!this._isConnected) {
+          this._isConnected = true;
+          this.emit('connected', { network: this._supernetType });
+        }
+        return;
+      }
+      case 'disconnected': {
+        this._isConnected = false;
+        this.emit('disconnected', event.payload as ServerDisconnectData);
+        return;
+      }
+      default: {
+        this.emit(event.eventType, event.payload as any);
+      }
+    }
+  }
+
+  private handleSendRequest(message: SendSocketMessage) {
+    if (!this.isPrimary) {
+      // Should never happen, but just in case
+      return Promise.resolve();
+    }
+    return this.socketClient.send(message.payload.messageType, message.payload.data);
+  }
+}
+
+export default BrowserWebSocketClient;