@dxos/edge-client 0.8.1 → 0.8.2-main.12df754

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/edge-client",
-  "version": "0.8.1",
+  "version": "0.8.2-main.12df754",
   "description": "EDGE Client",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -36,21 +36,21 @@
   "dependencies": {
     "isomorphic-ws": "^5.0.0",
     "ws": "^8.14.2",
-    "@dxos/async": "0.8.1",
-    "@dxos/context": "0.8.1",
-    "@dxos/credentials": "0.8.1",
-    "@dxos/crypto": "0.8.1",
-    "@dxos/debug": "0.8.1",
-    "@dxos/invariant": "0.8.1",
-    "@dxos/keys": "0.8.1",
-    "@dxos/log": "0.8.1",
-    "@dxos/node-std": "0.8.1",
-    "@dxos/keyring": "0.8.1",
-    "@dxos/protocols": "0.8.1",
-    "@dxos/util": "0.8.1"
+    "@dxos/async": "0.8.2-main.12df754",
+    "@dxos/crypto": "0.8.2-main.12df754",
+    "@dxos/credentials": "0.8.2-main.12df754",
+    "@dxos/context": "0.8.2-main.12df754",
+    "@dxos/debug": "0.8.2-main.12df754",
+    "@dxos/invariant": "0.8.2-main.12df754",
+    "@dxos/keyring": "0.8.2-main.12df754",
+    "@dxos/keys": "0.8.2-main.12df754",
+    "@dxos/log": "0.8.2-main.12df754",
+    "@dxos/node-std": "0.8.2-main.12df754",
+    "@dxos/protocols": "0.8.2-main.12df754",
+    "@dxos/util": "0.8.2-main.12df754"
   },
   "devDependencies": {
-    "@dxos/test-utils": "0.8.1"
+    "@dxos/test-utils": "0.8.2-main.12df754"
   },
   "publishConfig": {
     "access": "public"

package/src/edge-client.test.ts

@@ -7,6 +7,7 @@ import { describe, expect, onTestFinished, test } from 'vitest';
 import { Trigger } from '@dxos/async';
 import { Keyring } from '@dxos/keyring';
 import { TextMessageSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+import { EdgeStatus } from '@dxos/protocols/proto/dxos/client/services';
 import { openAndClose } from '@dxos/test-utils';
 
 import { createEphemeralEdgeIdentity, createTestHaloEdgeIdentity } from './auth';
@@ -40,17 +41,17 @@ describe('EdgeClient', () => {
 
     const { client } = await openNewClient(endpoint);
 
-    expect(client.isConnected).toBeFalsy();
+    expect(client.status).toBe(EdgeStatus.NOT_CONNECTED);
     admitConnection.wake();
-    await expect.poll(() => client.isConnected).toBeTruthy();
+    await expect.poll(() => client.status).toBe(EdgeStatus.CONNECTED);
 
     admitConnection.reset();
     await closeConnection();
     expect(client.isOpen).is.true;
-    await expect.poll(() => client.isConnected).toBeFalsy();
+    await expect.poll(() => client.status).toBe(EdgeStatus.NOT_CONNECTED);
 
     admitConnection.wake();
-    await expect.poll(() => client.isConnected).toBeTruthy();
+    await expect.poll(() => client.status).toBe(EdgeStatus.CONNECTED);
   });
 
   test('set identity reconnects', async () => {

package/src/edge-client.ts

@@ -2,10 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Trigger, scheduleMicroTask, TriggerState, PersistentLifecycle } from '@dxos/async';
+import { Trigger, scheduleMicroTask, TriggerState, PersistentLifecycle, Event } from '@dxos/async';
 import { Resource, type Lifecycle } from '@dxos/context';
 import { log, logInfo } from '@dxos/log';
 import { type Message } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+import { EdgeStatus } from '@dxos/protocols/proto/dxos/client/services';
 
 import { protocol } from './defs';
 import { type EdgeIdentity, handleAuthChallenge } from './edge-identity';
@@ -20,11 +21,12 @@ export type MessageListener = (message: Message) => void;
 export type ReconnectListener = () => void;
 
 export interface EdgeConnection extends Required<Lifecycle> {
+  statusChanged: Event<EdgeStatus>;
   get info(): any;
   get identityKey(): string;
   get peerKey(): string;
   get isOpen(): boolean;
-  get isConnected(): boolean;
+  get status(): EdgeStatus;
   setIdentity(identity: EdgeIdentity): void;
   onMessage(listener: MessageListener): () => void;
   onReconnected(listener: ReconnectListener): () => void;
@@ -45,6 +47,8 @@ export type MessengerConfig = {
  *  - Dispatches connection state and message notifications.
  */
 export class EdgeClient extends Resource implements EdgeConnection {
+  public readonly statusChanged = new Event<EdgeStatus>();
+
   private readonly _persistentLifecycle = new PersistentLifecycle<EdgeWsConnection>({
     start: async () => this._connect(),
     stop: async (state: EdgeWsConnection) => this._disconnect(state),
@@ -52,10 +56,8 @@ export class EdgeClient extends Resource implements EdgeConnection {
 
   private readonly _messageListeners = new Set<MessageListener>();
   private readonly _reconnectListeners = new Set<ReconnectListener>();
-
   private readonly _baseWsUrl: string;
   private readonly _baseHttpUrl: string;
-
   private _currentConnection?: EdgeWsConnection = undefined;
   private _ready = new Trigger();
 
@@ -72,13 +74,16 @@ export class EdgeClient extends Resource implements EdgeConnection {
   public get info() {
     return {
       open: this.isOpen,
+      status: this.status,
       identity: this._identity.identityKey,
       device: this._identity.peerKey,
     };
   }
 
-  get isConnected() {
-    return Boolean(this._currentConnection) && this._ready.state === TriggerState.RESOLVED;
+  get status(): EdgeStatus {
+    return Boolean(this._currentConnection) && this._ready.state === TriggerState.RESOLVED
+      ? EdgeStatus.CONNECTED
+      : EdgeStatus.NOT_CONNECTED;
   }
 
   get identityKey() {
@@ -201,15 +206,18 @@ export class EdgeClient extends Resource implements EdgeConnection {
 
   private async _disconnect(state: EdgeWsConnection) {
     await state.close();
+    this.statusChanged.emit(this.status);
   }
 
   private _closeCurrentConnection(error: Error = new EdgeConnectionClosedError()) {
     this._currentConnection = undefined;
     this._ready.throw(error);
     this._ready.reset();
+    this.statusChanged.emit(this.status);
   }
 
   private _notifyReconnected() {
+    this.statusChanged.emit(this.status);
     for (const listener of this._reconnectListeners) {
       try {
         listener();