fix unit tests

kaltura · Jun 16, 2024 · dea51c9 · dea51c9
1 parent de15dbc
commit dea51c9
Show file tree

Hide file tree

Showing 3 changed files with 110 additions and 87 deletions.
diff --git a/src/dash-adapter.ts b/src/dash-adapter.ts
@@ -790,28 +790,28 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
     // called when a resource is downloaded
     this.shaka!.getNetworkingEngine()?.registerResponseFilter((type, response) => {
       switch (type) {
-      case shaka.net.NetworkingEngine.RequestType.SEGMENT:
-        this._trigger(EventType.FRAG_LOADED, {
-          miliSeconds: response.timeMs,
-          bytes: response.data.byteLength,
-          url: response.uri
-        });
-        if (this.isLive()) {
-          this._dispatchNativeEvent(EventType.DURATION_CHANGE);
-        }
-        break;
-      case shaka.net.NetworkingEngine.RequestType.MANIFEST:
-        this._parseManifest(response.data);
-        this._playbackActualUri = response.uri;
-        this._trigger(EventType.MANIFEST_LOADED, {miliSeconds: response.timeMs});
-        setTimeout(() => {
-          this._isLive = this._isLive || (this.shaka?.isLive() as boolean);
-          if (this._isLive && !this.shaka?.isLive() && !this._isStaticLive && this._config.switchDynamicToStatic) {
+        case shaka.net.NetworkingEngine.RequestType.SEGMENT:
+          this._trigger(EventType.FRAG_LOADED, {
+            miliSeconds: response.timeMs,
+            bytes: response.data.byteLength,
+            url: response.uri
+          });
+          if (this.isLive()) {
+            this._dispatchNativeEvent(EventType.DURATION_CHANGE);
+          }
+          break;
+        case shaka.net.NetworkingEngine.RequestType.MANIFEST:
+          this._parseManifest(response.data);
+          this._playbackActualUri = response.uri;
+          this._trigger(EventType.MANIFEST_LOADED, {miliSeconds: response.timeMs});
+          setTimeout(() => {
+            this._isLive = this._isLive || (this.shaka?.isLive() as boolean);
+            if (this._isLive && !this.shaka?.isLive() && !this._isStaticLive && this._config.switchDynamicToStatic) {
               this._sourceObj!.url = response.uri;
               this._switchFromDynamicToStatic();
-          }
-        });
-        break;
+            }
+          });
+          break;
       }
     });
   }
@@ -939,19 +939,25 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
   public destroy(): Promise<void> {
     this._isDestroyInProgress = true;
 
-    let shakaInstanceToDestroy;
-    if (this.shaka) {
-      this.shaka.unload();
+    return new Promise(async (resolve, reject) => {
+      let shakaInstanceToDestroy;
 
-      if (!this.assetCache?.list().length) {
-        shakaInstanceToDestroy = this.shaka;
+      if (this.shaka) {
+        // explicitly pass undefined to restore the default drm configuration
+        this.shaka.configure('drm', undefined);
 
-        DashAdapter._shakaInstanceMap.delete(this._videoElement.id);
-        DashAdapter._assetCacheMap.delete(this._videoElement.id);
+        if (this.assetCache?.list().length) {
+          if (this._videoElement.src) {
+            await this.shaka.unload();
+          }
+          await this.shaka.detach();
+        } else {
+          shakaInstanceToDestroy = this.shaka;
+          DashAdapter._shakaInstanceMap.delete(this._videoElement.id);
+          DashAdapter._assetCacheMap.delete(this._videoElement.id);
+        }
       }
-    }
 
-    return new Promise((resolve, reject) => {
       super.destroy().then(() => {
         DashAdapter._logger.debug('destroy');
         this._loadPromise = undefined;