@eluvio/elv-client-js 4.0.89 → 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/LiveStream.js

@@ -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);