fix(si): import NamedMediaGroup from internal-media-core lib (#3542)

webex · Apr 19, 2024 · 3e14330 · 3e14330
1 parent 4d419d5
commit 3e14330
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 16 deletions.
diff --git a/packages/@webex/media-helpers/package.json b/packages/@webex/media-helpers/package.json
@@ -22,7 +22,7 @@
     "deploy:npm": "yarn npm publish"
   },
   "dependencies": {
-    "@webex/internal-media-core": "2.3.0",
+    "@webex/internal-media-core": "2.3.2",
     "@webex/ts-events": "^1.1.0",
     "@webex/web-media-effects": "^2.15.6"
   },

diff --git a/packages/@webex/plugin-meetings/package.json b/packages/@webex/plugin-meetings/package.json
@@ -62,7 +62,7 @@
   },
   "dependencies": {
     "@webex/common": "workspace:*",
-    "@webex/internal-media-core": "2.3.0",
+    "@webex/internal-media-core": "2.3.2",
     "@webex/internal-plugin-conversation": "workspace:*",
     "@webex/internal-plugin-device": "workspace:*",
     "@webex/internal-plugin-llm": "workspace:*",

diff --git a/packages/@webex/plugin-meetings/src/multistream/mediaRequestManager.ts b/packages/@webex/plugin-meetings/src/multistream/mediaRequestManager.ts
@@ -8,10 +8,10 @@ import {
   H264Codec,
   getRecommendedMaxBitrateForFrameSize,
   RecommendedOpusBitrates,
+  NamedMediaGroup,
 } from '@webex/internal-media-core';
 import {cloneDeepWith, debounce, isEmpty} from 'lodash';
 
-import {NamedMediaGroup} from '@webex/json-multistream';
 import LoggerProxy from '../common/logs/logger-proxy';
 
 import {ReceiveSlot, ReceiveSlotEvents} from './receiveSlot';

diff --git a/packages/@webex/plugin-meetings/src/multistream/remoteMediaGroup.ts b/packages/@webex/plugin-meetings/src/multistream/remoteMediaGroup.ts
@@ -2,7 +2,7 @@
 /* eslint-disable require-jsdoc */
 /* eslint-disable import/prefer-default-export */
 import {forEach} from 'lodash';
-import {NamedMediaGroup} from '@webex/json-multistream';
+import {NamedMediaGroup} from '@webex/internal-media-core';
 import LoggerProxy from '../common/logs/logger-proxy';
 
 import {getMaxFs, RemoteMedia, RemoteVideoResolution} from './remoteMedia';

diff --git a/packages/@webex/plugin-meetings/src/multistream/remoteMediaManager.ts b/packages/@webex/plugin-meetings/src/multistream/remoteMediaManager.ts
@@ -1,8 +1,7 @@
 /* eslint-disable valid-jsdoc */
 import {cloneDeep, forEach, remove} from 'lodash';
 import {EventMap} from 'typed-emitter';
-import {MediaType} from '@webex/internal-media-core';
-import {NamedMediaGroup} from '@webex/json-multistream';
+import {MediaType, NamedMediaGroup} from '@webex/internal-media-core';
 
 import LoggerProxy from '../common/logs/logger-proxy';
 import EventsScope from '../common/events/events-scope';

diff --git a/packages/@webex/plugin-meetings/src/multistream/sendSlotManager.ts b/packages/@webex/plugin-meetings/src/multistream/sendSlotManager.ts
@@ -3,10 +3,9 @@ import {
   MediaType,
   LocalStream,
   MultistreamRoapMediaConnection,
+  NamedMediaGroup,
 } from '@webex/internal-media-core';
 
-import {NamedMediaGroup} from '@webex/json-multistream';
-
 export default class SendSlotManager {
   private readonly slots: Map<MediaType, SendSlot> = new Map();
   private readonly LoggerProxy: any;

diff --git a/packages/@webex/plugin-meetings/test/unit/spec/multistream/remoteMediaGroup.ts b/packages/@webex/plugin-meetings/test/unit/spec/multistream/remoteMediaGroup.ts
@@ -6,7 +6,6 @@ import {RemoteMedia} from '@webex/plugin-meetings/src/multistream/remoteMedia';
 import {ReceiveSlot} from '@webex/plugin-meetings/src/multistream/receiveSlot';
 import sinon from 'sinon';
 import {assert} from '@webex/test-helper-chai';
-import { NamedMediaGroup } from "@webex/json-multistream";
 
 class FakeSlot extends EventEmitter {
   public mediaType: MediaType;

diff --git a/packages/@webex/plugin-meetings/test/unit/spec/multistream/remoteMediaManager.ts b/packages/@webex/plugin-meetings/test/unit/spec/multistream/remoteMediaManager.ts
@@ -18,7 +18,6 @@ import testUtils from '../../../utils/testUtils';
 import LoggerProxy from '@webex/plugin-meetings/src/common/logs/logger-proxy';
 import LoggerConfig from '@webex/plugin-meetings/src/common/logs/logger-config';
 import { expect } from 'chai';
-import { NamedMediaGroup } from "@webex/json-multistream";
 
 class FakeSlot extends EventEmitter {
   public mediaType: MediaType;

diff --git a/yarn.lock b/yarn.lock
@@ -6914,9 +6914,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webex/internal-media-core@npm:2.3.0":
-  version: 2.3.0
-  resolution: "@webex/internal-media-core@npm:2.3.0"
+"@webex/internal-media-core@npm:2.3.2":
+  version: 2.3.2
+  resolution: "@webex/internal-media-core@npm:2.3.2"
   dependencies:
     "@babel/runtime": "npm:^7.18.9"
     "@webex/ts-sdp": "npm:1.6.0"
@@ -6926,7 +6926,7 @@ __metadata:
     uuid: "npm:^8.3.2"
     webrtc-adapter: "npm:^8.1.2"
     xstate: "npm:^4.30.6"
-  checksum: c29f611569ce1af447506677ce7fec1af47663f2dc9978d84a3cb53a4884f74972026fbd274d16e7797c418fd212a535cad911d31c2587c1383bb3919db90782
+  checksum: 816447c9e8334888145631e480b7174cf6535688f2da54e841445d6f305d9ebb8c515737744fdfd1198250d672a151cc314fd4540aa5027749bb4c00d5518d7f
   languageName: node
   linkType: hard
 
@@ -7687,7 +7687,7 @@ __metadata:
     "@babel/preset-typescript": 7.22.11
     "@webex/babel-config-legacy": "workspace:*"
     "@webex/eslint-config-legacy": "workspace:*"
-    "@webex/internal-media-core": 2.3.0
+    "@webex/internal-media-core": 2.3.2
     "@webex/jest-config-legacy": "workspace:*"
     "@webex/legacy-tools": "workspace:*"
     "@webex/test-helper-chai": "workspace:*"
@@ -7923,7 +7923,7 @@ __metadata:
     "@webex/babel-config-legacy": "workspace:*"
     "@webex/common": "workspace:*"
     "@webex/eslint-config-legacy": "workspace:*"
-    "@webex/internal-media-core": 2.3.0
+    "@webex/internal-media-core": 2.3.2
     "@webex/internal-plugin-conversation": "workspace:*"
     "@webex/internal-plugin-device": "workspace:*"
     "@webex/internal-plugin-llm": "workspace:*"