@eluvio/elv-client-js 4.2.15 → 4.2.17

package/dist/src/live_recording_config_profiles/live_recording_config_default.js

@@ -0,0 +1,45 @@
+var LiveRecordingConfigDefault = {
+  drm_type: "clear",
+  recording_config: {
+    part_ttl: 86400,
+    reconnect_timeout: 3600,
+    connection_timeout: 3600,
+    copy_mpegts: false
+  },
+  profile: {
+    ladder_specs: {
+      audio: [{
+        bit_rate: 192000,
+        channels: 2,
+        codecs: "mp4a.40.2"
+      }, {
+        bit_rate: 384000,
+        channels: 6,
+        codecs: "mp4a.40.2"
+      }],
+      video: [{
+        bit_rate: 9500000,
+        codecs: "avc1.640028,mp4a.40.2",
+        height: 1080,
+        width: 1920
+      }, {
+        bit_rate: 4500000,
+        codecs: "avc1.640028,mp4a.40.2",
+        height: 720,
+        width: 1280
+      }, {
+        bit_rate: 2000000,
+        codecs: "avc1.640028,mp4a.40.2",
+        height: 540,
+        width: 960
+      }, {
+        bit_rate: 900000,
+        codecs: "avc1.640028,mp4a.40.2",
+        height: 540,
+        width: 960
+      }]
+    },
+    name: "Default"
+  }
+};
+module.exports = LiveRecordingConfigDefault;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.2.15",
+  "version": "4.2.17",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",
@@ -79,6 +79,7 @@
     "lodash": "^4.17.19",
     "lodash.isequal": "^4.5.0",
     "mime-types": "^2.1.24",
+    "moment": "^2.27.0",
     "multihashes": "^0.4.14",
     "node-fetch": "^2.6.7",
     "object-path": "^0.11.8",
@@ -112,7 +113,7 @@
     "eslint": "^9.32.0",
     "jsdoc": "^4.0.0",
     "jsdom": "^26.1.0",
-    "moment": "^2.27.0",
+    "mocha": "^11.7.5",
     "raw-loader": "^0.5.1",
     "shell-quote": "^1.7.2",
     "showdown": "^1.9.1",

package/src/AuthorizationClient.js

@@ -1013,7 +1013,8 @@ class AuthorizationClient {
     }
 
     const kmsHttpClient = new HttpClient({
-      uris: kmsUrls
+      uris: kmsUrls,
+      networkName: this.client.networkName
     });
 
     return await kmsHttpClient.Request({

package/src/ContentObjectAudit.js

@@ -49,7 +49,10 @@ const ContentObjectAudit = {
     ]
       .filter((v, i, s) => s.indexOf(v) === i);
 
-    const httpClient = new HttpClient({uris});
+    const httpClient = new HttpClient({
+      uris,
+      networkName: client.networkName
+    });
 
     let path = UrlJoin("qlibs", libraryId, "q", versionHash || objectId, live ? "call/live/audit" : "audit");
     let responses = await httpClient.RequestAll({

package/src/ElvClient.js

@@ -11,6 +11,7 @@ const HttpClient = require("./HttpClient");
 const RemoteSigner = require("./RemoteSigner");
 const Utils = require("./Utils");
 const Crypto = require("./Crypto");
+const NetworkUrls = require("./NetworkUrls");
 const {LogMessage} = require("./LogMessage");
 
 const Pako = require("pako");
@@ -21,14 +22,6 @@ const {
 } = require("./Validation");
 const UrlJoin = require("url-join");
 
-const networks = {
-  "main": "https://main.net955305.contentfabric.io",
-  "demo": "https://demov3.net955210.contentfabric.io",
-  "demov3": "https://demov3.net955210.contentfabric.io",
-  "local": "http://127.0.0.1:8008/config?qspace=dev&self",
-  "test": "https://test.net955203.contentfabric.io"
-};
-
 if(Utils.Platform() === Utils.PLATFORM_NODE) {
   // Define Response in node
   // eslint-disable-next-line no-global-assign
@@ -302,7 +295,7 @@ class ElvClient {
    * @return {Object} - An object using network names as keys and configuration URLs as values.
    */
   static Networks() {
-    return Object.assign({}, networks);
+    return Object.assign({}, NetworkUrls);
   }
 
   /**
@@ -332,7 +325,7 @@ class ElvClient {
     noAuth=false,
     assumeV3
   }) {
-    const configUrl = networks[networkName];
+    const configUrl = this.Networks()[networkName];
 
     if(!configUrl) { throw Error("Invalid network name: " + networkName); }
 
@@ -430,10 +423,10 @@ class ElvClient {
     this.inaccessibleLibraries = {};
 
     const uris = this.service === "search" ? this.searchURIs : this.fabricURIs;
-    this.HttpClient = new HttpClient({uris, debug: this.debug});
-    this.AuthHttpClient = new HttpClient({uris: this.authServiceURIs, debug: this.debug});
-    this.FileServiceHttpClient = new HttpClient({uris: this.fileServiceURIs, debug: this.debug});
-    this.SearchHttpClient = new HttpClient({uris: this.searchURIs || [], debug: this.debug});
+    this.HttpClient = new HttpClient({uris, networkName: this.networkName, debug: this.debug});
+    this.AuthHttpClient = new HttpClient({uris: this.authServiceURIs, networkName: this.networkName, debug: this.debug});
+    this.FileServiceHttpClient = new HttpClient({uris: this.fileServiceURIs, networkName: this.networkName, debug: this.debug});
+    this.SearchHttpClient = new HttpClient({uris: this.searchURIs || [], networkName: this.networkName, debug: this.debug});
     this.ethClient = new EthClient({client: this, uris: this.ethereumURIs, networkId: this.networkId, debug: this.debug, timeout: this.ethereumContractTimeout});
 
     if(!this.signer) {
@@ -1224,7 +1217,7 @@ class ElvClient {
       this.oauthToken = token;
 
       const path = "/ks/jwt/wlt";
-      const httpClient = new HttpClient({uris: this.kmsURIs, debug: this.debug});
+      const httpClient = new HttpClient({uris: this.kmsURIs, networkName: this.networkName, debug: this.debug});
 
       const response = await this.utils.ResponseToJson(
         httpClient.Request({

package/src/FrameClient.js

@@ -447,6 +447,15 @@ class FrameClient {
       "Nodes",
       "NTPInstance",
       "ObjectCleanup",
+      "OutputsCreate",
+      "OutputsDelete",
+      "OutputsList",
+      "OutputsListItem",
+      "OutputsModify",
+      "OutputsModifyBatch",
+      "OutputsResolveSrtPullUrls",
+      "OutputsState",
+      "OutputsStop",
       "Permission",
       "PlayoutOptions",
       "PlayoutPathResolution",
@@ -472,6 +481,7 @@ class FrameClient {
       "RevokeShare",
       "SendFunds",
       "SetAccessCharge",
+      "StreamApplyProfile",
       "SetAuth",
       "SetAuthContext",
       "SetAuthPolicy",
@@ -496,17 +506,28 @@ class FrameClient {
       "SpaceNodes",
       "StartABRMezzanineJobs",
       "StreamAddWatermark",
+      "StreamApplyProfile",
+      "StreamAssignProfile",
       "StreamConfig",
+      "StreamConfigProfile",
+      "StreamConfigProfiles",
       "StreamCopyToVod",
       "StreamCreate",
       "StreamInitialize",
       "StreamInsertion",
+      "StreamLinkToSite",
       "StreamListUrls",
+      "StreamRemoveLinkToSite",
       "StreamRemoveWatermark",
+      "StreamSaveConfigProfile",
       "StreamSetOfferingAndDRM",
-      "StreamStatus",
+      "StreamSiteSettings",
+      "StreamStartRecording",
       "StreamStartOrStopOrReset",
-      "StreamStopSession",
+      "StreamStatus",
+      "StreamStopRecording",
+      "StreamUnassignProfile",
+      "StreamUpdateConfig",
       "SuspendNTPInstance",
       "TenantContractId",
       "TenantId",

package/src/HttpClient.js

@@ -2,17 +2,20 @@ const URI = require("urijs");
 const Fetch = typeof fetch !== "undefined" ? fetch : require("node-fetch").default;
 const {LogMessage} = require("./LogMessage");
 const Utils = require("./Utils");
+const UrlJoin = require("url-join");
+const NetworkUrls = require("./NetworkUrls");
 
 class HttpClient {
   Log(message, error=false) {
     LogMessage(this, message, error);
   }
 
-  constructor({uris, debug}) {
+  constructor({uris, networkName, debug}) {
     this.uris = uris;
     this.uriIndex = 0;
     this.debug = debug;
     this.draftURIs = {};
+    this.networkName = networkName;
     this.retries = Math.max(3, uris.length);
   }
 
@@ -77,6 +80,19 @@ class HttpClient {
         // Use saved write token URI
         baseURI = this.draftURIs[writeToken];
       } else {
+        // Retrieve the node that this write token is for to ensure it is correct.
+        if(this.networkName) {
+          try {
+            const configUrl = new URL(NetworkUrls[this.networkName]);
+            configUrl.pathname = UrlJoin("/s", this.networkName, "nodes");
+            configUrl.searchParams.set("token", writeToken);
+            baseURI = new URI((await (await fetch(configUrl)).json()).nodes[0].services.fabric_api.urls[0]);
+          } catch(error) {
+            this.Log("Failed to retrieve write token node for " + writeToken);
+            this.Log(error);
+          }
+        }
+
         // Save current URI for all future requests involving this write token
         this.draftURIs[writeToken] = baseURI;
       }

package/src/NetworkUrls.js

@@ -0,0 +1,9 @@
+const networks = {
+  "main": "https://main.net955305.contentfabric.io",
+  "demo": "https://demov3.net955210.contentfabric.io",
+  "demov3": "https://demov3.net955210.contentfabric.io",
+  "local": "http://127.0.0.1:8008/config?qspace=dev&self",
+  "test": "https://test.net955203.contentfabric.io"
+};
+
+module.exports = networks;

package/src/abr_profiles/abr_profile_live_drm.js

@@ -1863,16 +1863,6 @@ const AbrProfileLiveDrm = {
     }
   },
   "playout_formats": {
-    "dash-playready-cenc": {
-      "drm": {
-        "enc_scheme_name": "cenc",
-        "type": "DrmPlayReady"
-      },
-      "protocol": {
-        "min_buffer_length": 2,
-        "type": "ProtoDash"
-      }
-    },
     "dash-widevine": {
       "drm": {
         "content_id": "",

package/src/client/ContentAccess.js

@@ -1786,17 +1786,14 @@ exports.GlobalUrl = async function({
   );
 
   // Pull auth out of query params
-  if(
-    queryParams.authorization &&
-    (
-      typeof queryParams.authorization === "string" ||
-      (Array.isArray(queryParams.authorization) && queryParams.authorization.length === 1)
-    )
-  ) {
+  if(!queryParams.authorization) {
     queryParams = {...queryParams};
-    authorizationToken = typeof queryParams.authorization === "string" ?
-      queryParams.authorization :
-      queryParams.authorization[0];
+    queryParams.authorization = await this.authClient.AuthorizationToken({
+      libraryId,
+      objectId,
+      versionHash,
+      noAuth
+    });
   }
 
   if(writeToken) {
@@ -1808,18 +1805,6 @@ exports.GlobalUrl = async function({
   }
 
   let urlPath = UrlJoin("s", network);
-  if(!noAuth || authorizationToken) {
-    urlPath = UrlJoin(
-      "t",
-      authorizationToken || await this.authClient.AuthorizationToken({
-        libraryId,
-        objectId,
-        versionHash,
-        noAuth
-      })
-    );
-  }
-
   if(versionHash) {
     objectId = this.utils.DecodeVersionHash(versionHash).objectId;
   } else {
@@ -2838,7 +2823,7 @@ exports.EncryptionConk = async function({libraryId, objectId, versionHash, write
   const owner = await this.authClient.Owner({id: objectId});
 
   const ownerCapKey = `eluv.caps.iusr${this.utils.AddressToHash(this.signer.address)}`;
-  const ownerCap = await this.ContentObjectMetadata({libraryId, objectId, versionHash, metadataSubtree: ownerCapKey});
+  const ownerCap = await this.ContentObjectMetadata({libraryId, objectId, versionHash, writeToken, metadataSubtree: ownerCapKey});
 
   if(!this.utils.EqualAddress(owner, this.signer.address) && !ownerCap) {
     if(download) {