@eluvio/elv-client-js 4.2.5 → 4.2.7

package/package.json

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

package/src/ElvClient.js

@@ -1260,7 +1260,7 @@ class ElvClient {
    * @return {string} - The created static token
    */
   CreateStaticToken({libraryId}) {
-    let token = { qspace_id: this.client.contentSpaceId };
+    let token = { qspace_id: this.contentSpaceId };
 
     if(libraryId) {
       token.qlib_id = libraryId;

package/src/client/ABRPublishing.js

@@ -323,7 +323,7 @@ exports.CreateABRMezzanine = async function({
     // determine master object id if a master write token was passed in
     ValidateWriteToken(masterWriteToken);
     masterObjectId = this.utils.DecodeWriteToken(masterWriteToken).objectId;
-    masterLibId = await client.ContentObjectLibraryId({masterObjectId});
+    masterLibId = await client.ContentObjectLibraryId({objectId: masterObjectId});
   }
 
   // if pre-existing mez object id passed in, validate

package/src/client/LiveStream.js

@@ -69,6 +69,7 @@ const CueInfo = async ({eventId, status}) => {
  * @param {Object} client - The client object
  * @param {string} libraryId - ID of the library for the new live stream object
  * @param {string} objectId - ID of the new live stream object
+ * @param {string=} writeToken - Write token of the draft
  * @param {string=} typeAbrMaster - Content type hash
  * @param {string=} typeLiveStream - Content type hash
  * @param {string} streamUrl - Live source URL
@@ -93,6 +94,7 @@ const StreamGenerateOffering = async({
   client,
   libraryId,
   objectId,
+  writeToken,
   typeAbrMaster,
   typeLiveStream,
   streamUrl,
@@ -109,7 +111,8 @@ const StreamGenerateOffering = async({
   vWidth,
   vDisplayAspectRatio,
   vFrameRate,
-  vTimeBase
+  vTimeBase,
+  finalize=true
 }) => {
   // compute duration_ts
   const DUMMY_DURATION = 1001; // should result in integer duration_ts values for both audio and video
@@ -232,27 +235,29 @@ const StreamGenerateOffering = async({
   // construct /production_master
   const production_master = {sources, variants};
 
+  const existingWriteToken = !!writeToken;
+
   // get existing metadata
   console.log("Retrieving current metadata...");
   let metadata = await client.ContentObjectMetadata({
     libraryId,
-    objectId
+    objectId,
+    writeToken
   });
 
   // add /production_master to metadata
   metadata.production_master = production_master;
 
   // write back to object
-  console.log("Getting write token...");
-  let editResponse = await client.EditContentObject({
-    libraryId,
-    objectId,
-    options: {
-      type: typeAbrMaster
-    }
-  });
-  let writeToken = editResponse.write_token;
-  console.log(`New write token: ${writeToken}`);
+  if(!writeToken) {
+    ({writeToken} = await client.EditContentObject({
+      libraryId,
+      objectId,
+      options: {
+        type: typeAbrMaster
+      }
+    }));
+  }
 
   console.log("Writing back metadata with /production_master added...");
   await client.ReplaceMetadata({
@@ -262,20 +267,23 @@ const StreamGenerateOffering = async({
     writeToken
   });
 
-  console.log("Finalizing...");
-  let finalizeResponse = await client.FinalizeContentObject({
-    libraryId,
-    objectId,
-    writeToken
-  });
-  let masterVersionHash = finalizeResponse.hash;
-  console.log(`Finalized, new version hash: ${masterVersionHash}`);
+  let finalizeResponse, masterVersionHash;
+  if(!existingWriteToken) {
+    finalizeResponse = await client.FinalizeContentObject({
+      libraryId,
+      objectId,
+      writeToken
+    });
+    masterVersionHash = finalizeResponse.hash;
+  }
 
   // Generate offering
   const createResponse = await client.CreateABRMezzanine({
     libraryId,
     objectId,
-    masterVersionHash,
+    masterVersionHash: existingWriteToken ? undefined : masterVersionHash,
+    masterWriteToken: existingWriteToken ? writeToken : undefined,
+    writeToken: existingWriteToken ? writeToken : undefined,
     variant: "default",
     offeringKey: "default",
     abrProfile
@@ -292,13 +300,14 @@ const StreamGenerateOffering = async({
   }
 
   let versionHash = createResponse.hash;
-  console.log(`New version hash: ${versionHash}`);
 
   // get new metadata
   console.log("Retrieving revised metadata with offering...");
   metadata = await client.ContentObjectMetadata({
     libraryId,
-    versionHash
+    objectId,
+    writeToken: existingWriteToken ? writeToken : undefined,
+    versionHash: existingWriteToken ? undefined : versionHash
   });
 
   console.log("Moving /abr_mezzanine/offerings to /offerings and removing /abr_mezzanine...");
@@ -308,18 +317,6 @@ const StreamGenerateOffering = async({
   // add items to media_struct needed to use options.json handler
   metadata.offerings.default.media_struct.duration_rat = `${DUMMY_DURATION}`;
 
-  // write back to object
-  console.log("Getting write token...");
-  editResponse = await client.EditContentObject({
-    libraryId,
-    objectId,
-    options: {
-      type: typeLiveStream
-    }
-  });
-  writeToken = editResponse.write_token;
-  console.log(`New write token: ${writeToken}`);
-
   console.log("Writing back metadata with /offerings...");
   await client.ReplaceMetadata({
     libraryId,
@@ -328,17 +325,19 @@ const StreamGenerateOffering = async({
     writeToken
   });
 
-  console.log("Finalizing...");
-  finalizeResponse = await client.FinalizeContentObject({
-    libraryId,
-    objectId,
-    writeToken
-  });
-
-  const finalHash = finalizeResponse.hash;
-  console.log(`Finalized, new version hash: ${finalHash}`);
+  if(finalize) {
+    console.log("Finalizing...");
+    finalizeResponse = await client.FinalizeContentObject({
+      libraryId,
+      objectId,
+      writeToken,
+      commitMessage: "Update offering"
+    });
 
-  return finalHash;
+    const finalHash = finalizeResponse.hash;
+    console.log(`Finalized, new version hash: ${finalHash}`);
+    return finalHash;
+  }
 };
 
 /**
@@ -947,10 +946,18 @@ exports.StreamStopSession = async function({name}) {
  * @param {string=} format - Specify the list of playout formats and DRM to support,
  comma-separated (hls-clear, hls-aes128, hls-sample-aes,
  hls-fairplay)
+ * @param {string=} writeToken - Write token of the draft
+ * @param {boolean=} finalize - If enabled, target object will be finalized after configuration
  *
  * @return {Promise<Object>} - The name, object ID, and state of the stream
  */
-exports.StreamInitialize = async function({name, drm=false, format}) {
+exports.StreamInitialize = async function({
+  name,
+  drm=false,
+  format,
+  writeToken,
+  finalize=true
+}) {
   let typeAbrMaster;
   let typeLiveStream;
 
@@ -979,7 +986,15 @@ exports.StreamInitialize = async function({name, drm=false, format}) {
     return {};
   }
 
-  const res = await this.StreamSetOfferingAndDRM({name, typeAbrMaster, typeLiveStream, drm, format});
+  const res = await this.StreamSetOfferingAndDRM({
+    name,
+    typeAbrMaster,
+    typeLiveStream,
+    drm,
+    format,
+    writeToken,
+    finalize
+  });
 
   return res;
 };
@@ -996,10 +1011,19 @@ exports.StreamInitialize = async function({name, drm=false, format}) {
  * @param {string=} format - A list of playout formats and DRM to support, comma-separated
  * (hls-clear, hls-aes128, hls-sample-aes, hls-fairplay). If specified,
  * this will take precedence over the drm value
+ * @param {string=} writeToken - Write token of the draft
  *
  * @return {Promise<Object>} - The name, object ID, and state of the stream
  */
-exports.StreamSetOfferingAndDRM = async function({name, typeAbrMaster, typeLiveStream, drm=false, format}) {
+exports.StreamSetOfferingAndDRM = async function({
+  name,
+  typeAbrMaster,
+  typeLiveStream,
+  drm=false,
+  format,
+  writeToken,
+  finalize=true
+}) {
   let status = await this.StreamStatus({name});
   if(status.state != "uninitialized" && status.state != "inactive" && status.state != "stopped") {
     return {
@@ -1088,7 +1112,8 @@ exports.StreamSetOfferingAndDRM = async function({name, typeAbrMaster, typeLiveS
   try {
     let mainMeta = await this.ContentObjectMetadata({
       libraryId,
-      objectId
+      objectId,
+      writeToken
     });
 
     let fabURI = mainMeta.live_recording.fabric_config.ingress_node_api;
@@ -1122,7 +1147,9 @@ exports.StreamSetOfferingAndDRM = async function({name, typeAbrMaster, typeLiveS
       vWidth,
       vDisplayAspectRatio,
       vFrameRate,
-      vTimeBase
+      vTimeBase,
+      writeToken,
+      finalize
     });
 
     console.log("Finished generating offering");

package/src/walletClient/index.js

@@ -494,12 +494,13 @@ class ElvWalletClient {
 
     await this.client.SetRemoteSigner({idToken, tenantId, signerURIs, extraData: { ...extraData, share_email: shareEmail }, unsignedPublicAuth: true});
 
-    let fabricToken, expiresAt;
+    let fabricToken, refreshToken, expiresAt;
     if(createRemoteToken && this.client.signer.remoteSigner) {
       expiresAt = Date.now() + tokenDuration * 60 * 60 * 1000;
       const tokenResponse = await this.client.signer.RetrieveCSAT({email, nonce, tenantId, force, duration: tokenDuration});
       fabricToken = tokenResponse.token;
       nonce = tokenResponse.nonce;
+      refreshToken = tokenResponse.refresh_token;
     } else {
       expiresAt = Date.now() + tokenDuration * 60 * 60 * 1000;
       fabricToken = await this.client.CreateFabricToken({
@@ -523,6 +524,7 @@ class ElvWalletClient {
     return {
       authToken: this.SetAuthorization({
         fabricToken,
+        refreshToken,
         tenantId,
         address,
         email,
@@ -536,6 +538,7 @@ class ElvWalletClient {
       signingToken: this.SetAuthorization({
         clusterToken: this.client.signer.authToken,
         fabricToken,
+        refreshToken,
         tenantId,
         address,
         email,
@@ -604,11 +607,12 @@ class ElvWalletClient {
     return this.__authorization.fabricToken;
   }
 
-  SetAuthorization({clusterToken, fabricToken, tenantId, address, email, expiresAt, signerURIs, walletType, walletName, nonce, register=false}) {
+  SetAuthorization({clusterToken, fabricToken, refreshToken, tenantId, address, email, expiresAt, signerURIs, walletType, walletName, nonce, register=false}) {
     address = this.client.utils.FormatAddress(address);
 
     this.__authorization = {
       fabricToken,
+      refreshToken,
       tenantId,
       address,
       email,