@eluvio/elv-client-js 4.0.87 → 4.0.89

package/package.json

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

package/src/ElvClient.js

@@ -283,7 +283,7 @@ class ElvClient {
    * @return {Object} - An object using network names as keys and configuration URLs as values.
    */
   static Networks() {
-    return networks;
+    return Object.assign({}, networks);
   }
 
   /**

package/src/Validation.js

@@ -52,8 +52,11 @@ exports.ValidatePartHash = (partHash) => {
   }
 };
 
-exports.ValidateParameters = ({libraryId, objectId, versionHash}) => {
-  if(versionHash) {
+exports.ValidateParameters = ({libraryId, objectId, versionHash, writeToken}) => {
+  if(writeToken) {
+    if(versionHash)  throw Error(`Cannot specify writeToken and versionHash at same time (token:${writeToken}, hash:${versionHash})`);
+    exports.ValidateWriteToken(writeToken);
+  } else if(versionHash) {
     exports.ValidateVersion(versionHash);
   } else {
     exports.ValidateLibrary(libraryId);

package/src/client/ContentAccess.js

@@ -1210,20 +1210,29 @@ exports.AvailableDRMs = async function() {
     return availableDRMs;
   }
 
-  try {
-    const config = [{
-      initDataTypes: ["cenc"],
-      audioCapabilities: [{
-        contentType: "audio/mp4;codecs=\"mp4a.40.2\""
-      }],
-      videoCapabilities: [{
-        contentType: "video/mp4;codecs=\"avc1.42E01E\""
-      }]
-    }];
+  const config = [{
+    initDataTypes: ["cenc"],
+    audioCapabilities: [{
+      contentType: "audio/mp4;codecs=\"mp4a.40.2\""
+    }],
+    videoCapabilities: [{
+      contentType: "video/mp4;codecs=\"avc1.42E01E\""
+    }]
+  }];
 
+  try {
     await navigator.requestMediaKeySystemAccess("com.widevine.alpha", config);
-
     availableDRMs.push("widevine");
+    // console.log("widevine detected");
+    // eslint-disable-next-line no-empty
+  } catch(e) {}
+
+  try {
+    // unused parameters:
+    //   robustness: "2000" // 150, 2000, or 3000 if we know the secruity level
+    await navigator.requestMediaKeySystemAccess("com.microsoft.playready", config);
+    availableDRMs.push("playready");
+    // console.log("playready detected");
     // eslint-disable-next-line no-empty
   } catch(e) {}
 
@@ -1407,7 +1416,7 @@ exports.AvailableOfferings = async function({
  * @param {string=} linkPath - If playing from a link, the path to the link
  * @param {boolean=} signedLink - Specify if linkPath is referring to a signed link
  * @param {Array<string>} protocols=["dash","hls"]] - Acceptable playout protocols ("dash", "hls")
- * @param {Array<string>} drms - Acceptable DRM formats ("clear", "aes-128", "widevine")
+ * @param {Array<string>} drms - Acceptable DRM formats ("aes-128", "clear", "fairplay", "playready", "sample-aes", "widevine")
  * @param {string=} handler=playout - The handler to use for playout (not used with links)
  * @param {string=} offering=default - The offering to play
  * @param {string=} playoutType - The type of playout
@@ -1675,7 +1684,7 @@ exports.PlayoutOptions = async function({
  * @param {string=} linkPath - If playing from a link, the path to the link
  * @param {boolean=} signedLink - Specify if linkPath is referring to a signed link
  * @param {Array<string>} protocols=["dash","hls"]] - Acceptable playout protocols ("dash", "hls")
- * @param {Array<string>} drms - Acceptable DRM formats ("clear", "aes-128", "sample-aes", "widevine")
+ * @param {Array<string>} drms - Acceptable DRM formats ("aes-128", "clear", "fairplay", "playready", "sample-aes", "widevine")
  * @param {string=} handler=playout - The handler to use for playout
  * @param {string=} offering=default - The offering to play
  * @param {string=} playoutType - The type of playout

package/src/client/Files.js

@@ -34,20 +34,22 @@ const {
  * @namedParams
  * @param {string=} libraryId - ID of the library
  * @param {string=} objectId - ID of the object
+ * @param {string=} path - ID of the object
  * @param {string=} versionHash - Hash of the object version - if not specified, most recent version will be used
+ * @param {string=} writeToken - Write token of a draft (incompatible with versionHash)
  */
-exports.ListFiles = async function({libraryId, objectId, versionHash}) {
-  ValidateParameters({libraryId, objectId, versionHash});
+exports.ListFiles = async function({libraryId, objectId, path = "", versionHash, writeToken}) {
+  ValidateParameters({libraryId, objectId, versionHash, writeToken});
 
   if(versionHash) { objectId = this.utils.DecodeVersionHash(versionHash).objectId; }
 
-  let path = UrlJoin("q", versionHash || objectId, "meta", "files");
+  let urlPath = UrlJoin("q", writeToken || versionHash || objectId, "files_list", path);
 
   return this.utils.ResponseToJson(
     this.HttpClient.Request({
       headers: await this.authClient.AuthorizationHeader({libraryId, objectId, versionHash}),
       method: "GET",
-      path: path,
+      path: urlPath,
     })
   );
 };
@@ -554,7 +556,7 @@ exports.UploadFileData = async function({libraryId, objectId, writeToken, encryp
   const jobStatus = await this.UploadJobStatus({libraryId, objectId, writeToken, uploadId, jobId});
 
   // Find the status of this file
-  let fileStatus = jobStatus.files.find(item => item.path == filePath);
+  let fileStatus = jobStatus.files.find(item => item.path === filePath);
   if(encryption && encryption !== "none") {
     fileStatus = fileStatus.encrypted;
   }

package/src/client/LiveConf.js

@@ -301,7 +301,6 @@ class LiveConf {
         break;
       default:
         throw "unsupported frame rate for MPEGTS - " + frameRate;
-        break;
     }
     return seg;
   }
@@ -362,7 +361,6 @@ class LiveConf {
         break;
       default:
         throw "unsupported frame rate for RTMP - " + frameRate;
-        break;
     }
     return seg;
   }

package/src/client/LiveStream.js

@@ -498,6 +498,9 @@ exports.StreamStatus = async function({name, stopLro=false, showParams=false}) {
       state = lroStatus.state;
       status.warnings = lroStatus.custom && lroStatus.custom.warnings;
       status.quality = lroStatus.custom && lroStatus.custom.quality;
+      if(lroStatus.custom && lroStatus.custom.status) {
+        status.recording_status = lroStatus.custom.status;
+      }
     } catch(error) {
       console.log("LRO Status (failed): ", error.response.statusCode);
       status.state = "stopped";
@@ -1954,7 +1957,6 @@ exports.StreamAddWatermark = async function({
 exports.AuditStream = async function({objectId, versionHash, salt, samples}) {
   return await ContentObjectAudit.AuditContentObject({
     client: this,
-    libraryId,
     objectId,
     versionHash,
     salt,

package/testScripts/OfferingEnsureStrongDrm.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 
-// Ensures that an existing offering has only strong DRM playout options (Widevine and Fairplay)
+// Ensures that an existing offering has only strong DRM playout options (FairPlay, PlayReady, and Widevine)
 
 const ScriptOffering = require("./parentClasses/ScriptOffering");
 
@@ -49,7 +49,7 @@ class OfferingEnsureStrongDrm extends ScriptOffering {
     for(let i = 0; i < originalFormatCount; i++) {
       const key = playoutFormatKeys[i];
       const drm = metadata.offerings[offeringKey].playout.playout_formats[key].drm;
-      if(!drm || !["DrmWidevine", "DrmFairplay"].includes(drm.type)) {
+      if(!drm || !["DrmWidevine", "DrmFairplay", "DrmPlayReady"].includes(drm.type)) {
         console.log("Deleting playout format '" + key + "'...");
         delete metadata.offerings[offeringKey].playout.playout_formats[key];
         changesMade = true;

package/testScripts/Test.js

@@ -9,6 +9,9 @@ const Test = async () => {
     const client = await ElvClient.FromNetworkName({
       networkName: "demo"
     });
+    // const client = await ElvClient.FromConfigurationUrl({
+    //   configUrl: "http://localhost:8008/config?qspace=demov3&self"
+    // });
 
     const wallet = client.GenerateWallet();
     const signer = wallet.AddAccount({

package/testScripts/abr_profile_4k_both.json

@@ -126,6 +126,24 @@
       "protocol": {
         "type": "ProtoHls"
       }
+    },
+    "hls-fairplay": {
+      "drm": {
+        "enc_scheme_name": "cbcs",
+        "type": "DrmFairplay"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
+    },
+    "hls-playready-cenc": {
+      "drm": {
+        "enc_scheme_name": "cenc",
+        "type": "DrmPlayReady"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
     }
   },
   "segment_specs": {

package/testScripts/abr_profile_4k_drm.json

@@ -123,6 +123,15 @@
       "protocol": {
         "type": "ProtoHls"
       }
+    },
+    "hls-playready-cenc": {
+      "drm": {
+        "enc_scheme_name": "cenc",
+        "type": "DrmPlayReady"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
     }
   },
   "segment_specs": {

package/testScripts/abr_profile_4k_drm_public_access.json

@@ -113,6 +113,24 @@
       "protocol": {
         "type": "ProtoHls"
       }
+    },
+    "hls-fairplay": {
+      "drm": {
+        "enc_scheme_name": "cbcs",
+        "type": "DrmFairplay"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
+    },
+    "hls-playready-cenc": {
+      "drm": {
+        "enc_scheme_name": "cenc",
+        "type": "DrmPlayReady"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
     }
   },
   "segment_specs": {

package/testScripts/abr_profile_both.json

@@ -1960,6 +1960,24 @@
       "protocol": {
         "type": "ProtoHls"
       }
+    },
+    "hls-fairplay": {
+      "drm": {
+        "enc_scheme_name": "cbcs",
+        "type": "DrmFairplay"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
+    },
+    "hls-playready-cenc": {
+      "drm": {
+        "enc_scheme_name": "cenc",
+        "type": "DrmPlayReady"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
     }
   },
   "segment_specs": {

package/testScripts/abr_profile_drm.json

@@ -1957,6 +1957,15 @@
       "protocol": {
         "type": "ProtoHls"
       }
+    },
+    "hls-playready-cenc": {
+      "drm": {
+        "enc_scheme_name": "cenc",
+        "type": "DrmPlayReady"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
     }
   },
   "segment_specs": {

package/testScripts/abr_profile_drm_public_access.json

@@ -1947,6 +1947,24 @@
       "protocol": {
         "type": "ProtoHls"
       }
+    },
+    "hls-fairplay": {
+      "drm": {
+        "enc_scheme_name": "cbcs",
+        "type": "DrmFairplay"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
+    },
+    "hls-playready-cenc": {
+      "drm": {
+        "enc_scheme_name": "cenc",
+        "type": "DrmPlayReady"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
     }
   },
   "segment_specs": {

package/utilities/example_files/abr_profile_4k_both.json

@@ -126,6 +126,24 @@
       "protocol": {
         "type": "ProtoHls"
       }
+    },
+    "hls-fairplay": {
+      "drm": {
+        "enc_scheme_name": "cbcs",
+        "type": "DrmFairplay"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
+    },
+    "hls-playready-cenc": {
+      "drm": {
+        "enc_scheme_name": "cenc",
+        "type": "DrmPlayReady"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
     }
   },
   "segment_specs": {

package/utilities/example_files/abr_profile_4k_drm.json

@@ -123,6 +123,15 @@
       "protocol": {
         "type": "ProtoHls"
       }
+    },
+    "hls-playready-cenc": {
+      "drm": {
+        "enc_scheme_name": "cenc",
+        "type": "DrmPlayReady"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
     }
   },
   "segment_specs": {

package/utilities/example_files/abr_profile_4k_drm_public_access.json

@@ -113,6 +113,24 @@
       "protocol": {
         "type": "ProtoHls"
       }
+    },
+    "hls-fairplay": {
+      "drm": {
+        "enc_scheme_name": "cbcs",
+        "type": "DrmFairplay"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
+    },
+    "hls-playready-cenc": {
+      "drm": {
+        "enc_scheme_name": "cenc",
+        "type": "DrmPlayReady"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
     }
   },
   "segment_specs": {

package/utilities/example_files/abr_profile_4k_drm_strict.json

@@ -105,6 +105,15 @@
       "protocol": {
         "type": "ProtoHls"
       }
+    },
+    "hls-playready-cenc": {
+      "drm": {
+        "enc_scheme_name": "cenc",
+        "type": "DrmPlayReady"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
     }
   },
   "segment_specs": {

package/utilities/example_files/abr_profile_both.json

@@ -1914,6 +1914,24 @@
       "protocol": {
         "type": "ProtoHls"
       }
+    },
+    "hls-fairplay": {
+      "drm": {
+        "enc_scheme_name": "cbcs",
+        "type": "DrmFairplay"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
+    },
+    "hls-playready-cenc": {
+      "drm": {
+        "enc_scheme_name": "cenc",
+        "type": "DrmPlayReady"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
     }
   },
   "segment_specs": {

package/utilities/example_files/abr_profile_drm.json

@@ -1911,6 +1911,15 @@
       "protocol": {
         "type": "ProtoHls"
       }
+    },
+    "hls-playready-cenc": {
+      "drm": {
+        "enc_scheme_name": "cenc",
+        "type": "DrmPlayReady"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
     }
   },
   "segment_specs": {

package/utilities/example_files/abr_profile_drm_hls_only.json

@@ -1899,6 +1899,15 @@
       "protocol": {
         "type": "ProtoHls"
       }
+    },
+    "hls-playready-cenc": {
+      "drm": {
+        "enc_scheme_name": "cenc",
+        "type": "DrmPlayReady"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
     }
   },
   "segment_specs": {

package/utilities/example_files/abr_profile_drm_public_access.json

@@ -1901,6 +1901,24 @@
       "protocol": {
         "type": "ProtoHls"
       }
+    },
+    "hls-fairplay": {
+      "drm": {
+        "enc_scheme_name": "cbcs",
+        "type": "DrmFairplay"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
+    },
+    "hls-playready-cenc": {
+      "drm": {
+        "enc_scheme_name": "cenc",
+        "type": "DrmPlayReady"
+      },
+      "protocol": {
+        "type": "ProtoHls"
+      }
     }
   },
   "segment_specs": {

package/utilities/example_files/simple_ingest_library_metadata.json

@@ -154,6 +154,15 @@
           "protocol": {
             "type": "ProtoHls"
           }
+        },
+        "hls-playready-cenc": {
+          "drm": {
+            "enc_scheme_name": "cenc",
+            "type": "DrmPlayReady"
+          },
+          "protocol": {
+            "type": "ProtoHls"
+          }
         }
       },
       "segment_specs": {