@eluvio/elv-client-js 4.0.61 → 4.0.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.0.61",
+  "version": "4.0.62",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",

package/src/Utils.js

@@ -743,36 +743,47 @@ const Utils = {
     }
   },
 
-  LiveHLSJSSettings({lowLatency=false, ultraLowLatency=false}) {
+  HLSJSSettings({profile="default"}={}) {
     const isSafari =
       typeof window !== "undefined" &&
       typeof window.navigator !== "undefined" &&
       /^((?!chrome|android).)*safari/i.test(window.navigator.userAgent);
 
-    if(ultraLowLatency && !isSafari) {
+    const defaultSettings = {
+      "maxBufferHole": 2.2,
+      "nudgeOffset": 0.2,
+      "nudgeMaxRetry": 12,
+      "highBufferWatchdogPeriod": 1
+    };
+
+    if(!isSafari && ["ull", "ultraLowLatency"].includes(profile)) {
       return {
-        "capLevelToPlayerSize": false,
-        "enableWorker": true,
         "lowLatencyMode": true,
-        "maxBufferLength": 8,
-        "backBufferLength": 4,
         "liveSyncDuration": 4,
         "liveMaxLatencyDuration": 5,
         "liveDurationInfinity": false,
-        "highBufferWatchdogPeriod": 1
+        "maxBufferLength": 8,
+        "backBufferLength": 4,
+        ...defaultSettings
+      };
+    } else if(["ll", "lowLatency", "ull", "ultraLowLatency"].includes(profile)) {
+      return {
+        "lowLatencyMode": true,
+        "liveSyncDuration": 5,
+        "liveMaxLatencyDuration": isSafari ? 15 : 10,
+        "liveDurationInfinity": false,
+        "maxBufferLength": 5,
+        "backBufferLength": 5,
+        ...defaultSettings
       };
+    } else {
+      return defaultSettings;
     }
+  },
 
-    return {
-      "enableWorker": true,
-      "lowLatencyMode": true,
-      "maxBufferLength": 5,
-      "backBufferLength": 5,
-      "liveSyncDuration": 5,
-      "liveMaxLatencyDuration": !lowLatency || isSafari ? 15 : 10,
-      "liveDurationInfinity": false,
-      "highBufferWatchdogPeriod": 1
-    };
+  // Alias for HLSJSSettings
+  LiveHLSJSSettings({lowLatency=false, ultraLowLatency=false}) {
+    return Utils.HLSJSSettings({profile: ultraLowLatency ? "ull" : lowLatency ? "ll" : "default"});
   }
 };
 

package/src/client/LiveConf.js

@@ -161,57 +161,50 @@ class LiveConf {
   }
 
   calcSegDuration({sourceTimescale}) {
-
     let videoStream = this.getStreamDataForCodecType("video");
     let frameRate = videoStream.frame_rate;
 
-    let seg ={};
+    let seg = {};
+    seg.audio = 29.76 * 48000;
+
     switch(frameRate) {
       case "24":
         seg.video = 30 * sourceTimescale;
-        seg.audio = 30 * 48000;
         seg.keyint = 48;
         seg.duration = "30";
         break;
       case "25":
         seg.video = 30 * sourceTimescale;
-        seg.audio = 30 * 48000;
         seg.keyint = 50;
         seg.duration = "30";
         break;
       case "30":
         seg.video = 30 * sourceTimescale;
-        seg.audio = 30 * 48000;
         seg.keyint = 60;
         seg.duration = "30";
         break;
       case "30000/1001":
         seg.video = 30.03 * sourceTimescale;
-        seg.audio = 29.76 * 48000;
         seg.keyint = 60;
         seg.duration = "30.03";
         break;
       case "48":
         seg.video = 30 * sourceTimescale;
-        seg.audio = 30 * 48000;
         seg.keyint = 96;
         seg.duration = "30";
         break;
       case "50":
         seg.video = 30 * sourceTimescale;
-        seg.audio = 30 * 48000;
         seg.keyint = 100;
         seg.duration = "30";
         break;
       case "60":
         seg.video = 30 * sourceTimescale;
-        seg.audio = 30 * 48000;
         seg.keyint = 120;
         seg.duration = "30";
         break;
       case "60000/1001":
         seg.video = 30.03 * sourceTimescale;
-        seg.audio = 29.76 * 48000;
         seg.keyint = 120;
         seg.duration = "30.03";
         break;

package/src/walletClient/index.js

@@ -861,8 +861,8 @@ class ElvWalletClient {
   async LatestMarketplaceHash({marketplaceParams}) {
     const marketplaceInfo = await this.MarketplaceInfo({marketplaceParams});
 
-    if(this.previewMarketplaceId && this.previewMarketplaceId === marketplaceInfo.marketplaceId) {
-      return this.availableMarketplaces[marketplaceInfo.tenantSlug][marketplaceInfo.marketplaceSlug]["."].source;
+    if(this.previewMarketplaceId && Utils.EqualHash(this.previewMarketplaceId, marketplaceInfo.marketplaceId)) {
+      return this.previewMarketplaceHash;
     }
 
     const marketplaceLink = await this.client.ContentObjectMetadata({
@@ -887,18 +887,37 @@ class ElvWalletClient {
     }
 
     if(!this.cachedMarketplaces[marketplaceId]) {
-      let marketplace = await this.client.ContentObjectMetadata({
-        libraryId: this.mainSiteLibraryId,
-        objectId: this.mainSiteId,
-        metadataSubtree: UrlJoin("/public", "asset_metadata", "tenants", marketplaceInfo.tenantSlug, "marketplaces", marketplaceInfo.marketplaceSlug, "info"),
-        localizationSubtree: this.localization ? UrlJoin("public", "asset_metadata", "localizations", this.localization, "info") : "",
-        linkDepthLimit: 1,
-        resolveLinks: true,
-        resolveIgnoreErrors: true,
-        resolveIncludeSource: true,
-        produceLinkUrls: true,
-        authorizationToken: this.publicStaticToken
-      });
+      let marketplace;
+      if(this.previewMarketplaceId && Utils.EqualHash(marketplaceId, this.previewMarketplaceId)) {
+        // Load preview marketplace
+        marketplace = await this.client.ContentObjectMetadata({
+          versionHash: this.previewMarketplaceHash,
+          metadataSubtree: "/public/asset_metadata/info",
+          localizationSubtree: this.localization ? UrlJoin("public", "asset_metadata", "localizations", this.localization, "info") : undefined,
+          linkDepthLimit: 1,
+          resolveLinks: true,
+          resolveIgnoreErrors: true,
+          resolveIncludeSource: true,
+          produceLinkUrls: true,
+          authorizationToken: this.publicStaticToken
+        });
+      } else {
+        // Load marketplace from main site tree
+        marketplace = await this.client.ContentObjectMetadata({
+          libraryId: this.mainSiteLibraryId,
+          objectId: this.mainSiteId,
+          metadataSubtree: UrlJoin("/public", "asset_metadata", "tenants", marketplaceInfo.tenantSlug, "marketplaces", marketplaceInfo.marketplaceSlug, "info"),
+          localizationSubtree: this.localization ?
+            UrlJoin("/public", "asset_metadata", "tenants", marketplaceInfo.tenantSlug, "marketplaces", marketplaceInfo.marketplaceSlug, "localizations", this.localization, "info") :
+            undefined,
+          linkDepthLimit: 1,
+          resolveLinks: true,
+          resolveIgnoreErrors: true,
+          resolveIncludeSource: true,
+          produceLinkUrls: true,
+          authorizationToken: this.publicStaticToken
+        });
+      }
 
       if(marketplace.branding.use_tenant_styling) {
         marketplace.tenantBranding = (await this.client.ContentObjectMetadata({