@eluvio/elv-client-js 4.0.88 → 4.0.90

package/src/client/Files.js

@@ -45,13 +45,11 @@ exports.ListFiles = async function({libraryId, objectId, path = "", versionHash,
 
   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: urlPath,
-    })
-  );
+  return this.HttpClient.RequestJsonBody({
+    headers: await this.authClient.AuthorizationHeader({libraryId, objectId, versionHash}),
+    method: "GET",
+    path: urlPath,
+  });
 };
 
 /**
@@ -121,7 +119,11 @@ exports.UploadFilesFromS3 = async function({
     }
   }
 
-  this.Log(`Uploading files from S3: ${libraryId} ${objectId} ${writeToken}`);
+  if(copy) {
+    this.Log(`Copying files from S3: ${libraryId} ${objectId} ${writeToken}`);
+  } else {
+    this.Log(`Adding links to files in S3: ${libraryId} ${objectId} ${writeToken}`);
+  }
 
   let encryption_key;
   if(encryption === "cgck") {
@@ -485,15 +487,13 @@ exports.CreateFileUploadJob = async function({libraryId, objectId, writeToken, o
 
   const path = UrlJoin("q", writeToken, "file_jobs");
 
-  return this.utils.ResponseToJson(
-    this.HttpClient.Request({
-      headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true, encryption}),
-      method: "POST",
-      path: path,
-      body,
-      allowFailover: false
-    })
-  );
+  return this.HttpClient.RequestJsonBody({
+    headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true, encryption}),
+    method: "POST",
+    path: path,
+    body,
+    allowFailover: false
+  });
 };
 
 exports.UploadStatus = async function({libraryId, objectId, writeToken, uploadId}) {
@@ -815,13 +815,11 @@ exports.ContentParts = async function({libraryId, objectId, versionHash}) {
 
   const path = UrlJoin("q", versionHash || objectId, "parts");
 
-  const response = await this.utils.ResponseToJson(
-    this.HttpClient.Request({
-      headers: await this.authClient.AuthorizationHeader({libraryId, objectId, versionHash}),
-      method: "GET",
-      path: path
-    })
-  );
+  const response = await this.HttpClient.RequestJsonBody({
+    headers: await this.authClient.AuthorizationHeader({libraryId, objectId, versionHash}),
+    method: "GET",
+    path: path
+  });
 
   return response.parts;
 };
@@ -849,13 +847,11 @@ exports.ContentPart = async function({libraryId, objectId, versionHash, partHash
 
   let path = UrlJoin("q", versionHash || objectId, "parts", partHash);
 
-  return await this.utils.ResponseToJson(
-    this.HttpClient.Request({
-      headers: await this.authClient.AuthorizationHeader({libraryId, objectId, versionHash}),
-      method: "GET",
-      path: path
-    })
-  );
+  return await this.HttpClient.RequestJsonBody({
+    headers: await this.authClient.AuthorizationHeader({libraryId, objectId, versionHash}),
+    method: "GET",
+    path: path
+  });
 };
 
 /**
@@ -1079,16 +1075,14 @@ exports.CreatePart = async function({libraryId, objectId, writeToken, encryption
 
   const path = UrlJoin("q", writeToken, "parts");
 
-  const openResponse = await this.utils.ResponseToJson(
-    this.HttpClient.Request({
-      headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true, encryption}),
-      method: "POST",
-      path,
-      bodyType: "BINARY",
-      body: "",
-      allowFailover: false
-    })
-  );
+  const openResponse = await this.HttpClient.RequestJsonBody({
+    headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true, encryption}),
+    method: "POST",
+    path,
+    bodyType: "BINARY",
+    body: "",
+    allowFailover: false
+  });
 
   return openResponse.part.write_token;
 };
@@ -1149,16 +1143,14 @@ exports.FinalizePart = async function({libraryId, objectId, writeToken, partWrit
   ValidateWriteToken(writeToken);
 
   const path = UrlJoin("q", writeToken, "parts");
-  return await this.utils.ResponseToJson(
-    await this.HttpClient.Request({
-      headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true, encryption}),
-      method: "POST",
-      path: UrlJoin(path, partWriteToken),
-      bodyType: "BINARY",
-      body: "",
-      allowFailover: false
-    })
-  );
+  return await this.HttpClient.RequestJsonBody({
+    headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true, encryption}),
+    method: "POST",
+    path: UrlJoin(path, partWriteToken),
+    bodyType: "BINARY",
+    body: "",
+    allowFailover: false
+  });
 };
 
 /**

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,8 +498,8 @@ 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
+      if(lroStatus.custom && lroStatus.custom.status) {
+        status.recording_status = lroStatus.custom.status;
       }
     } catch(error) {
       console.log("LRO Status (failed): ", error.response.statusCode);
@@ -1350,7 +1350,11 @@ exports.StreamConfig = async function({name, customSettings={}, probeMetadata})
   status.user_config = userConfig;
 
   // Get node URI from user config
-  const hostName = userConfig.url.replace("udp://", "").replace("rtmp://", "").replace("srt://", "").split(":")[0];
+  const parsedName = userConfig.url
+    .replace("udp://", "https://")
+    .replace("rtmp://", "https://")
+    .replace("srt://", "https://");
+  const hostName = new URL(parsedName).hostname;
   const streamUrl = new URL(userConfig.url);
 
   console.log("Retrieving nodes - matching", hostName);

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": {