@eluvio/elv-client-js 3.2.30 → 3.2.32

package/dist/src/walletClient/Configuration.js

@@ -22,7 +22,7 @@ var WalletConfiguration = {
       appUrl: "https://wallet.contentfabric.io"
     }
   },
-  __MARKETPLACE_ORDER: ["PREVIEW", "wwe-marketplace-main", "realcannonballrun-marketplace", "maskverse-marketplace", "dolly-marketplace", "oc-marketplace", "cirkay-marketplace", "emp-marketplace", "microsoft", "indieflix-marketplace", "angels-airwaves-marketplace"]
+  __MARKETPLACE_ORDER: ["PREVIEW", "wwe-marketplace-main", "realcannonballrun-marketplace", "maskverse-marketplace", "dolly-marketplace", "eluvio-live-marketplace-sonark", "cirkay-marketplace", "oc-marketplace", "emp-marketplace", "microsoft", "indieflix-marketplace", "angels-airwaves-marketplace"]
 }; // No production environment on demo
 
 WalletConfiguration.demo.production = WalletConfiguration.demo.staging; // Allow demo to be referred to as demov3

package/dist/src/walletClient/index.js

@@ -1259,6 +1259,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 _context15.next = 12;
                 return Promise.all(marketplace.items.map( /*#__PURE__*/function () {
                   var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(item, index) {
+                    var authorizationToken;
                     return _regeneratorRuntime.wrap(function _callee14$(_context14) {
                       while (1) {
                         switch (_context14.prev = _context14.next) {
@@ -1273,16 +1274,19 @@ var ElvWalletClient = /*#__PURE__*/function () {
                               break;
                             }
 
-                            item.authorized = false;
-                            _context14.next = 14;
-                            break;
+                            _context14.next = 4;
+                            return _this5.client.CreateFabricToken({});
+
+                          case 4:
+                            authorizationToken = _context14.sent;
 
                           case 5:
                             _context14.prev = 5;
                             _context14.next = 8;
                             return _this5.client.ContentObjectMetadata({
                               versionHash: LinkTargetHash(item.nft_template),
-                              metadataSubtree: "permissioned"
+                              metadataSubtree: "permissioned",
+                              authorizationToken: authorizationToken
                             });
 
                           case 8:

package/package.json

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

package/src/walletClient/Configuration.js

@@ -28,8 +28,9 @@ let WalletConfiguration = {
     "realcannonballrun-marketplace",
     "maskverse-marketplace",
     "dolly-marketplace",
-    "oc-marketplace",
+    "eluvio-live-marketplace-sonark",
     "cirkay-marketplace",
+    "oc-marketplace",
     "emp-marketplace",
     "microsoft",
     "indieflix-marketplace",

package/src/walletClient/index.js

@@ -764,19 +764,23 @@ class ElvWalletClient {
       marketplace.items = await Promise.all(
         marketplace.items.map(async (item, index) => {
           if(item.requires_permissions) {
+            let authorizationToken;
             if(!this.loggedIn) {
+              // If not logged in, generated a dummy signed token
+              // Authorization may be based on geo-restriction, which doesn't require login
+              authorizationToken = await this.client.CreateFabricToken({});
+            }
+
+            try {
+              await this.client.ContentObjectMetadata({
+                versionHash: LinkTargetHash(item.nft_template),
+                metadataSubtree: "permissioned",
+                authorizationToken
+              });
+
+              item.authorized = true;
+            } catch(error) {
               item.authorized = false;
-            } else {
-              try {
-                await this.client.ContentObjectMetadata({
-                  versionHash: LinkTargetHash(item.nft_template),
-                  metadataSubtree: "permissioned"
-                });
-
-                item.authorized = true;
-              } catch(error) {
-                item.authorized = false;
-              }
             }
           }
 

package/testScripts/DraftFinalize.js

@@ -0,0 +1,51 @@
+/* eslint-disable no-console */
+
+const ScriptBase = require("./parentClasses/ScriptBase");
+
+class DraftFinalize extends ScriptBase {
+
+  async body() {
+    const client = await this.client();
+
+    const libraryId = this.args.libraryId;
+    const objectId = this.args.objectId;
+    const writeToken = this.args.writeToken;
+
+    console.log("Finalizing object...");
+    const finalizeResponse = await client.FinalizeContentObject({
+      libraryId,
+      objectId,
+      writeToken
+    });
+    console.log("New version hash: " + finalizeResponse.hash);
+  }
+
+  header() {
+    return "Finalize draft " + this.args.writeToken + "'... ";
+  }
+
+  options() {
+    return super.options()
+      .option("libraryId", {
+        alias: "library-id",
+        demandOption: true,
+        describe: "Library ID (should start with 'ilib')",
+        type: "string"
+      })
+      .option("objectId", {
+        alias: "object-id",
+        demandOption: true,
+        describe: "Object ID (should start with 'iq__')",
+        type: "string"
+      })
+      .option("writeToken", {
+        alias: "write-token",
+        demandOption: true,
+        describe: "Write token of draft",
+        type: "string"
+      });
+  }
+}
+
+const script = new DraftFinalize;
+script.run();

package/testScripts/OfferingEnsureStrongDrm.js

@@ -0,0 +1,86 @@
+/* eslint-disable no-console */
+
+// Ensures that an existing offering has only strong DRM playout options (Widevine and Fairplay)
+
+const ScriptOffering = require("./parentClasses/ScriptOffering");
+
+class OfferingEnsureStrongDrm extends ScriptOffering {
+
+  async body() {
+    const client = await this.client();
+
+    const libraryId = this.args.libraryId;
+    const objectId = this.args.objectId;
+    const offeringKey = this.args.offeringKey;
+    const force = this.args.force;
+
+    let changesMade = false;
+
+    let metadata = await client.ContentObjectMetadata({
+      libraryId,
+      objectId
+    });
+
+    this.validateOffering(metadata, offeringKey);
+
+    // if offering has store_clear: false, abort
+    if(metadata.offerings[offeringKey].store_clear) {
+      if(force){
+        console.warn("WARNING: Offering '" + offeringKey + "' has 'store_clear' set to true, this is insecure! Proceeding anyway due to --force being specified...");
+      } else {
+        this.throwError("Offering '" + offeringKey + "' has 'store_clear' set to true. Use --force to execute command anyway.");
+      }
+    }
+
+    if(metadata.offerings[offeringKey].drm_optional) {
+      console.log("Offering '" + offeringKey + "' has 'drm_optional' set to true: changing to false...");
+      metadata.offerings[offeringKey].drm_optional = false;
+      changesMade = true;
+    }
+
+
+    // loop through playout formats, delete ones where drm is null or is weak
+    const playoutFormatKeys = Object.keys(metadata.offerings[offeringKey].playout.playout_formats);
+    const originalFormatCount = playoutFormatKeys.length;
+    if(originalFormatCount === 0){
+      this.throwError("Offering '" + offeringKey + "' has no playout formats.");
+    }
+
+    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)) {
+        console.log("Deleting playout format '" + key + "'...");
+        delete metadata.offerings[offeringKey].playout.playout_formats[key];
+        changesMade = true;
+      }
+    }
+
+    const newFormatCount = Object.keys(metadata.offerings[offeringKey].playout.playout_formats).length;
+    if(newFormatCount === 0) {
+      this.throwError("Offering '" + offeringKey + "' would have no playout formats remaining after this operation.");
+    }
+
+    if(changesMade) {
+      console.log(newFormatCount + " playout format(s) remaining after operation.");
+      await this.metadataWrite(metadata);
+    } else {
+      console.log("No playout formats removed.");
+    }
+  }
+
+  header() {
+    return "Removing playout formats with weak (or no) DRM from mezzanine offering '" + this.args.offeringKey + "'... ";
+  }
+
+  options() {
+    return super.options()
+      .option("force", {
+        describe: "Force operation, even if 'store_clear' is set to 'true'",
+        type: "boolean"
+      });
+  }
+}
+
+const script = new OfferingEnsureStrongDrm;
+script.run();

package/testScripts/abr_profile_4k_both.json

@@ -14,7 +14,16 @@
     "{\"media_type\":\"audio\",\"channels\":2}": {
       "rung_specs": [
         {
-          "bit_rate": 128000,
+          "bit_rate": 192000,
+          "media_type": "audio",
+          "pregenerate": true
+        }
+      ]
+    },
+    "{\"media_type\":\"audio\",\"channels\":6}": {
+      "rung_specs": [
+        {
+          "bit_rate": 384000,
           "media_type": "audio",
           "pregenerate": true
         }
@@ -34,28 +43,28 @@
           "height": 1080,
           "media_type": "video",
           "pregenerate": false,
-          "width": 1920 
+          "width": 1920
         },
         {
           "bit_rate": 4500000,
           "height":720 ,
           "media_type": "video",
           "pregenerate": false,
-          "width": 1280 
+          "width": 1280
         },
         {
           "bit_rate": 2000000,
           "height": 540,
           "media_type": "video",
           "pregenerate": false,
-          "width": 960 
+          "width": 960
         },
         {
           "bit_rate": 1100000,
           "height": 432,
           "media_type": "video",
           "pregenerate": false,
-          "width": 768 
+          "width": 768
         },
         {
           "bit_rate": 810000,
@@ -127,7 +136,7 @@
       "protocol": {
         "type": "ProtoHls"
       }
-    }      
+    }
   },
   "segment_specs": {
     "audio": {

package/testScripts/abr_profile_4k_clear.json

@@ -14,7 +14,16 @@
     "{\"media_type\":\"audio\",\"channels\":2}": {
       "rung_specs": [
         {
-          "bit_rate": 128000,
+          "bit_rate": 192000,
+          "media_type": "audio",
+          "pregenerate": true
+        }
+      ]
+    },
+    "{\"media_type\":\"audio\",\"channels\":6}": {
+      "rung_specs": [
+        {
+          "bit_rate": 384000,
           "media_type": "audio",
           "pregenerate": true
         }
@@ -34,28 +43,28 @@
           "height": 1080,
           "media_type": "video",
           "pregenerate": false,
-          "width": 1920 
+          "width": 1920
         },
         {
           "bit_rate": 4500000,
           "height": 720,
           "media_type": "video",
           "pregenerate": false,
-          "width": 1280 
+          "width": 1280
         },
         {
           "bit_rate": 2000000,
           "height": 540,
           "media_type": "video",
           "pregenerate": false,
-          "width": 960 
+          "width": 960
         },
         {
           "bit_rate": 1100000,
           "height": 432,
           "media_type": "video",
           "pregenerate": false,
-          "width": 768 
+          "width": 768
         },
         {
           "bit_rate": 810000,

package/testScripts/abr_profile_4k_drm.json

@@ -14,7 +14,16 @@
     "{\"media_type\":\"audio\",\"channels\":2}": {
       "rung_specs": [
         {
-          "bit_rate": 128000,
+          "bit_rate": 192000,
+          "media_type": "audio",
+          "pregenerate": true
+        }
+      ]
+    },
+    "{\"media_type\":\"audio\",\"channels\":6}": {
+      "rung_specs": [
+        {
+          "bit_rate": 384000,
           "media_type": "audio",
           "pregenerate": true
         }
@@ -34,28 +43,28 @@
           "height": 1080,
           "media_type": "video",
           "pregenerate": false,
-          "width": 1920 
+          "width": 1920
         },
         {
           "bit_rate": 4500000,
           "height":720 ,
           "media_type": "video",
           "pregenerate": false,
-          "width": 1280 
+          "width": 1280
         },
         {
           "bit_rate": 2000000,
           "height": 540,
           "media_type": "video",
           "pregenerate": false,
-          "width": 960 
+          "width": 960
         },
         {
           "bit_rate": 1100000,
           "height": 432,
           "media_type": "video",
           "pregenerate": false,
-          "width": 768 
+          "width": 768
         },
         {
           "bit_rate": 810000,

package/testScripts/abr_profile_both.json

@@ -14,7 +14,16 @@
     "{\"media_type\":\"audio\",\"channels\":2}": {
       "rung_specs": [
         {
-          "bit_rate": 128000,
+          "bit_rate": 192000,
+          "media_type": "audio",
+          "pregenerate": true
+        }
+      ]
+    },
+    "{\"media_type\":\"audio\",\"channels\":6}": {
+      "rung_specs": [
+        {
+          "bit_rate": 384000,
           "media_type": "audio",
           "pregenerate": true
         }

package/testScripts/abr_profile_clear.json

@@ -14,7 +14,16 @@
     "{\"media_type\":\"audio\",\"channels\":2}": {
       "rung_specs": [
         {
-          "bit_rate": 128000,
+          "bit_rate": 192000,
+          "media_type": "audio",
+          "pregenerate": true
+        }
+      ]
+    },
+    "{\"media_type\":\"audio\",\"channels\":6}": {
+      "rung_specs": [
+        {
+          "bit_rate": 384000,
           "media_type": "audio",
           "pregenerate": true
         }

package/testScripts/abr_profile_drm.json

@@ -14,7 +14,16 @@
     "{\"media_type\":\"audio\",\"channels\":2}": {
       "rung_specs": [
         {
-          "bit_rate": 128000,
+          "bit_rate": 192000,
+          "media_type": "audio",
+          "pregenerate": true
+        }
+      ]
+    },
+    "{\"media_type\":\"audio\",\"channels\":6}": {
+      "rung_specs": [
+        {
+          "bit_rate": 384000,
           "media_type": "audio",
           "pregenerate": true
         }

package/utilities/WriteTokenDecode.js

@@ -0,0 +1,36 @@
+// Retrieve part list from object
+const Utility = require("./lib/Utility");
+
+const Draft = require("./lib/concerns/Draft");
+const {NewOpt} = require("./lib/options");
+
+class WriteTokenDecode extends Utility {
+  blueprint() {
+    return {
+      concerns: [Draft],
+      options: [
+        NewOpt("writeToken", {
+          demand: true,
+          descTemplate: "Write token to decode",
+          type: "string"
+        })
+      ]
+    };
+  }
+
+  async body() {
+    const {writeToken} = this.args;
+    // eslint-disable-next-line no-console
+    console.log(JSON.stringify(this.concerns.Draft.decode({writeToken}), null, 2));
+  }
+
+  header() {
+    return `Decode write token ${this.args.writeToken}`;
+  }
+}
+
+if(require.main === module) {
+  Utility.cmdLineInvoke(WriteTokenDecode);
+} else {
+  module.exports = WriteTokenDecode;
+}

package/utilities/example_files/abr_profile_4k_both.json

@@ -14,7 +14,16 @@
     "{\"media_type\":\"audio\",\"channels\":2}": {
       "rung_specs": [
         {
-          "bit_rate": 128000,
+          "bit_rate": 192000,
+          "media_type": "audio",
+          "pregenerate": true
+        }
+      ]
+    },
+    "{\"media_type\":\"audio\",\"channels\":6}": {
+      "rung_specs": [
+        {
+          "bit_rate": 384000,
           "media_type": "audio",
           "pregenerate": true
         }
@@ -34,28 +43,28 @@
           "height": 1080,
           "media_type": "video",
           "pregenerate": false,
-          "width": 1920 
+          "width": 1920
         },
         {
           "bit_rate": 4500000,
           "height":720 ,
           "media_type": "video",
           "pregenerate": false,
-          "width": 1280 
+          "width": 1280
         },
         {
           "bit_rate": 2000000,
           "height": 540,
           "media_type": "video",
           "pregenerate": false,
-          "width": 960 
+          "width": 960
         },
         {
           "bit_rate": 1100000,
           "height": 432,
           "media_type": "video",
           "pregenerate": false,
-          "width": 768 
+          "width": 768
         },
         {
           "bit_rate": 810000,
@@ -127,7 +136,7 @@
       "protocol": {
         "type": "ProtoHls"
       }
-    }      
+    }
   },
   "segment_specs": {
     "audio": {

package/utilities/example_files/abr_profile_4k_clear.json

@@ -14,7 +14,16 @@
     "{\"media_type\":\"audio\",\"channels\":2}": {
       "rung_specs": [
         {
-          "bit_rate": 128000,
+          "bit_rate": 192000,
+          "media_type": "audio",
+          "pregenerate": true
+        }
+      ]
+    },
+    "{\"media_type\":\"audio\",\"channels\":6}": {
+      "rung_specs": [
+        {
+          "bit_rate": 384000,
           "media_type": "audio",
           "pregenerate": true
         }
@@ -34,28 +43,28 @@
           "height": 1080,
           "media_type": "video",
           "pregenerate": false,
-          "width": 1920 
+          "width": 1920
         },
         {
           "bit_rate": 4500000,
           "height": 720,
           "media_type": "video",
           "pregenerate": false,
-          "width": 1280 
+          "width": 1280
         },
         {
           "bit_rate": 2000000,
           "height": 540,
           "media_type": "video",
           "pregenerate": false,
-          "width": 960 
+          "width": 960
         },
         {
           "bit_rate": 1100000,
           "height": 432,
           "media_type": "video",
           "pregenerate": false,
-          "width": 768 
+          "width": 768
         },
         {
           "bit_rate": 810000,

package/utilities/example_files/abr_profile_4k_drm.json

@@ -14,7 +14,16 @@
     "{\"media_type\":\"audio\",\"channels\":2}": {
       "rung_specs": [
         {
-          "bit_rate": 128000,
+          "bit_rate": 192000,
+          "media_type": "audio",
+          "pregenerate": true
+        }
+      ]
+    },
+    "{\"media_type\":\"audio\",\"channels\":6}": {
+      "rung_specs": [
+        {
+          "bit_rate": 384000,
           "media_type": "audio",
           "pregenerate": true
         }
@@ -34,28 +43,28 @@
           "height": 1080,
           "media_type": "video",
           "pregenerate": false,
-          "width": 1920 
+          "width": 1920
         },
         {
           "bit_rate": 4500000,
           "height":720 ,
           "media_type": "video",
           "pregenerate": false,
-          "width": 1280 
+          "width": 1280
         },
         {
           "bit_rate": 2000000,
           "height": 540,
           "media_type": "video",
           "pregenerate": false,
-          "width": 960 
+          "width": 960
         },
         {
           "bit_rate": 1100000,
           "height": 432,
           "media_type": "video",
           "pregenerate": false,
-          "width": 768 
+          "width": 768
         },
         {
           "bit_rate": 810000,

package/utilities/example_files/abr_profile_both.json

@@ -14,7 +14,16 @@
     "{\"media_type\":\"audio\",\"channels\":2}": {
       "rung_specs": [
         {
-          "bit_rate": 128000,
+          "bit_rate": 192000,
+          "media_type": "audio",
+          "pregenerate": true
+        }
+      ]
+    },
+    "{\"media_type\":\"audio\",\"channels\":6}": {
+      "rung_specs": [
+        {
+          "bit_rate": 384000,
           "media_type": "audio",
           "pregenerate": true
         }