feat(internal-plugin-llm): llmrefactor - renamed disconnectLLM in channel (#5083)

Author: shnaaz

packages/@webex/internal-plugin-llm/src/llm-plugin.ts

@@ -87,7 +87,7 @@ export class LLMPlugin extends (WebexPlugin as any) {
       return Promise.resolve(false);
     }
 
-    return channel.disconnectLLM(options).then(() => {
+    return channel.disconnect(options).then(() => {
       this.sessions.delete(sessionId);
 
       return true;
@@ -96,7 +96,7 @@ export class LLMPlugin extends (WebexPlugin as any) {
 
   public disconnectAllLLM(options?: {code: number; reason: string}): Promise<void> {
     const promises = Array.from(this.sessions.entries()).map(([sessionId, channel]) =>
-      channel.disconnectLLM(options).then(() => this.sessions.delete(sessionId))
+      channel.disconnect(options).then(() => this.sessions.delete(sessionId))
     );
 
     return Promise.all(promises).then(() => undefined);

packages/@webex/internal-plugin-llm/src/llm.ts

@@ -231,20 +231,20 @@ export default class LLMChannel extends (Mercury as any) implements ILLMChannel
 
   /**
    * Disconnects the WebSocket and clears all connection state.
+   * Overrides Mercury's disconnect to also clear LLM-specific state.
    * @param {object} [options]
    * @returns {Promise<void>}
    */
-  public disconnectLLM = (options?: {code: number; reason: string}): Promise<void> => {
-    return this.disconnect(options).then(() => {
-      this.webSocketUrl = undefined;
-      this.binding = undefined;
-      this.locusUrl = undefined;
-      this.datachannelUrl = undefined;
-      this.datachannelToken = undefined;
-      this.refreshHandler = undefined;
-      this.ownerMeetingId = undefined;
-    });
-  };
+  public async disconnect(options?: {code: number; reason: string}): Promise<void> {
+    await super.disconnect(options);
+    this.webSocketUrl = undefined;
+    this.binding = undefined;
+    this.locusUrl = undefined;
+    this.datachannelUrl = undefined;
+    this.datachannelToken = undefined;
+    this.refreshHandler = undefined;
+    this.ownerMeetingId = undefined;
+  }
 
   /**
    * Matches a request URL to a stored datachannel registration URL.

packages/@webex/internal-plugin-llm/src/llm.types.ts

@@ -16,11 +16,7 @@ interface ILLMChannel {
   getBinding: () => string | undefined;
   getLocusUrl: () => string | undefined;
   getDatachannelUrl: () => string | undefined;
-  disconnectLLM: (
-    options: {code: number; reason: string},
-    sessionId?: string,
-    ownerMeetingId?: string
-  ) => Promise<boolean>;
+  disconnect: (options?: {code: number; reason: string}) => Promise<void>;
   disconnectAllLLM: (options?: {code: number; reason: string}) => Promise<void>;
   setOwnerMeetingId: (ownerMeetingId: string | undefined, sessionId?: string) => void;
   getOwnerMeetingId: (sessionId?: string) => string | undefined;

packages/@webex/internal-plugin-llm/test/unit/spec/llm-plugin.js

@@ -13,7 +13,7 @@ describe('plugin-llm', () => {
 
     const createMockChannel = () => ({
       registerAndConnect: sinon.stub().resolves(),
-      disconnectLLM: sinon.stub().resolves(),
+      disconnect: sinon.stub().resolves(),
       isConnected: sinon.stub().returns(false),
       getBinding: sinon.stub().returns('binding'),
       getLocusUrl: sinon.stub().returns('locusUrl'),
@@ -58,7 +58,7 @@ describe('plugin-llm', () => {
           'meeting-1'
         );
 
-        sinon.assert.calledOnceWithExactly(mockChannel.disconnectLLM, {code: 3000, reason: 'bye'});
+        sinon.assert.calledOnceWithExactly(mockChannel.disconnect, {code: 3000, reason: 'bye'});
         assert.equal(plugin.sessions.has(LLM_DEFAULT_SESSION), false);
         assert.equal(result, true);
       });
@@ -82,7 +82,7 @@ describe('plugin-llm', () => {
           'meeting-2'
         );
 
-        sinon.assert.notCalled(mockChannel.disconnectLLM);
+        sinon.assert.notCalled(mockChannel.disconnect);
         assert.equal(plugin.sessions.has(LLM_DEFAULT_SESSION), true);
         assert.equal(result, false);
       });
@@ -97,7 +97,7 @@ describe('plugin-llm', () => {
           'meeting-1'
         );
 
-        sinon.assert.calledOnce(mockChannel.disconnectLLM);
+        sinon.assert.calledOnce(mockChannel.disconnect);
         assert.equal(plugin.sessions.has(LLM_DEFAULT_SESSION), false);
         assert.equal(result, true);
       });
@@ -112,7 +112,7 @@ describe('plugin-llm', () => {
           'meeting-1'
         );
 
-        sinon.assert.calledOnce(mockChannel.disconnectLLM);
+        sinon.assert.calledOnce(mockChannel.disconnect);
         assert.equal(result, true);
       });
 
@@ -121,7 +121,7 @@ describe('plugin-llm', () => {
 
         await plugin.disconnectLLM({code: 1000, reason: 'test'});
 
-        sinon.assert.calledOnce(mockChannel.disconnectLLM);
+        sinon.assert.calledOnce(mockChannel.disconnect);
         assert.equal(plugin.sessions.has(LLM_DEFAULT_SESSION), false);
       });
 
@@ -130,7 +130,7 @@ describe('plugin-llm', () => {
 
         await plugin.disconnectLLM({code: 1000, reason: 'test'}, 'custom-session');
 
-        sinon.assert.calledOnceWithExactly(mockChannel.disconnectLLM, {code: 1000, reason: 'test'});
+        sinon.assert.calledOnceWithExactly(mockChannel.disconnect, {code: 1000, reason: 'test'});
         assert.equal(plugin.sessions.has('custom-session'), false);
       });
     });
@@ -145,8 +145,8 @@ describe('plugin-llm', () => {
 
         await plugin.disconnectAllLLM({code: 1000, reason: 'cleanup'});
 
-        sinon.assert.calledOnceWithExactly(channel1.disconnectLLM, {code: 1000, reason: 'cleanup'});
-        sinon.assert.calledOnceWithExactly(channel2.disconnectLLM, {code: 1000, reason: 'cleanup'});
+        sinon.assert.calledOnceWithExactly(channel1.disconnect, {code: 1000, reason: 'cleanup'});
+        sinon.assert.calledOnceWithExactly(channel2.disconnect, {code: 1000, reason: 'cleanup'});
         assert.equal(plugin.sessions.size, 0);
       });
 

packages/@webex/internal-plugin-llm/test/unit/spec/llm.js

@@ -25,7 +25,8 @@ describe('plugin-llm', () => {
       };
 
       llmChannel = webex.internal.llm;
-      llmChannel.disconnect = sinon.stub().resolves();
+      // Stub Mercury's prototype disconnect so super.disconnect() works in tests
+      sinon.stub(Object.getPrototypeOf(Object.getPrototypeOf(llmChannel)), 'disconnect').resolves();
       llmChannel.request = sinon.stub().resolves({
         headers: {},
         body: {
@@ -207,8 +208,8 @@ describe('plugin-llm', () => {
       });
     });
 
-    describe('#disconnectLLM', () => {
-      it('calls disconnect and clears all connection state', async () => {
+    describe('#disconnect', () => {
+      it('calls super.disconnect and clears all connection state', async () => {
         await llmChannel.registerAndConnect(locusUrl, datachannelUrl);
         llmChannel.setDatachannelToken('token123');
         llmChannel.ownerMeetingId = 'meeting-1';
@@ -220,9 +221,8 @@ describe('plugin-llm', () => {
         assert.equal(llmChannel.getDatachannelToken(), 'token123');
         assert.equal(llmChannel.ownerMeetingId, 'meeting-1');
 
-        await llmChannel.disconnectLLM({code: 1000, reason: 'test'});
+        await llmChannel.disconnect({code: 1000, reason: 'test'});
 
-        sinon.assert.calledOnceWithExactly(llmChannel.disconnect, {code: 1000, reason: 'test'});
         assert.equal(llmChannel.getLocusUrl(), undefined);
         assert.equal(llmChannel.getDatachannelUrl(), undefined);
         assert.equal(llmChannel.getBinding(), undefined);
@@ -233,17 +233,20 @@ describe('plugin-llm', () => {
       it('works without options', async () => {
         await llmChannel.registerAndConnect(locusUrl, datachannelUrl);
 
-        await llmChannel.disconnectLLM();
+        await llmChannel.disconnect();
 
-        sinon.assert.calledOnceWithExactly(llmChannel.disconnect, undefined);
+        assert.equal(llmChannel.getLocusUrl(), undefined);
       });
 
       it('propagates disconnect errors', async () => {
         await llmChannel.registerAndConnect(locusUrl, datachannelUrl);
-        llmChannel.disconnect = sinon.stub().rejects(new Error('disconnect failed'));
+        // Change the existing stub to reject
+        Object.getPrototypeOf(Object.getPrototypeOf(llmChannel)).disconnect.rejects(
+          new Error('disconnect failed')
+        );
 
         try {
-          await llmChannel.disconnectLLM({code: 1000, reason: 'test'});
+          await llmChannel.disconnect({code: 1000, reason: 'test'});
           assert.fail('should have thrown');
         } catch (error) {
           assert.equal(error.message, 'disconnect failed');
@@ -357,12 +360,12 @@ describe('plugin-llm', () => {
         assert.equal(llmChannel.ownerMeetingId, undefined);
       });
 
-      it('is cleared by disconnectLLM', async () => {
+      it('is cleared by disconnect', async () => {
         await llmChannel.registerAndConnect(locusUrl, datachannelUrl);
         llmChannel.ownerMeetingId = 'meeting-1';
         assert.equal(llmChannel.ownerMeetingId, 'meeting-1');
 
-        await llmChannel.disconnectLLM({code: 1000, reason: 'test'});
+        await llmChannel.disconnect({code: 1000, reason: 'test'});
 
         assert.equal(llmChannel.ownerMeetingId, undefined);
       });