@eluvio/elv-client-js 3.1.95 → 3.1.96

package/dist/src/AuthorizationClient.js

@@ -353,7 +353,7 @@ var AuthorizationClient = /*#__PURE__*/function () {
                   addr: Utils.FormatAddress(this.client.signer && this.client.signer.address || "")
                 };
 
-                if (!(!(this.noAuth || noAuth) && !this.client.signer.remoteSigner)) {
+                if (this.noAuth || noAuth) {
                   _context3.next = 29;
                   break;
                 }

package/dist/src/client/ContentAccess.js

@@ -4318,6 +4318,15 @@ exports.CreateEncryptionConk = /*#__PURE__*/function () {
         switch (_context46.prev = _context46.next) {
           case 0:
             libraryId = _ref81.libraryId, objectId = _ref81.objectId, versionHash = _ref81.versionHash, writeToken = _ref81.writeToken, _ref81$createKMSConk = _ref81.createKMSConk, createKMSConk = _ref81$createKMSConk === void 0 ? true : _ref81$createKMSConk;
+
+            if (!this.signer.remoteSigner) {
+              _context46.next = 3;
+              break;
+            }
+
+            return _context46.abrupt("return");
+
+          case 3:
             ValidateParameters({
               libraryId: libraryId,
               objectId: objectId,
@@ -4330,21 +4339,21 @@ exports.CreateEncryptionConk = /*#__PURE__*/function () {
             }
 
             if (libraryId) {
-              _context46.next = 8;
+              _context46.next = 10;
               break;
             }
 
-            _context46.next = 7;
+            _context46.next = 9;
             return this.ContentObjectLibraryId({
               objectId: objectId
             });
 
-          case 7:
+          case 9:
             libraryId = _context46.sent;
 
-          case 8:
+          case 10:
             capKey = "eluv.caps.iusr".concat(this.utils.AddressToHash(this.signer.address));
-            _context46.next = 11;
+            _context46.next = 13;
             return this.ContentObjectMetadata({
               libraryId: libraryId,
               objectId: objectId,
@@ -4352,40 +4361,40 @@ exports.CreateEncryptionConk = /*#__PURE__*/function () {
               metadataSubtree: capKey
             });
 
-          case 11:
+          case 13:
             existingUserCap = _context46.sent;
 
             if (!existingUserCap) {
-              _context46.next = 18;
+              _context46.next = 20;
               break;
             }
 
-            _context46.next = 15;
+            _context46.next = 17;
             return this.Crypto.DecryptCap(existingUserCap, this.signer.signingKey.privateKey);
 
-          case 15:
+          case 17:
             this.encryptionConks[objectId] = _context46.sent;
-            _context46.next = 32;
+            _context46.next = 34;
             break;
 
-          case 18:
-            _context46.next = 20;
+          case 20:
+            _context46.next = 22;
             return this.Crypto.GeneratePrimaryConk({
               spaceId: this.contentSpaceId,
               objectId: objectId
             });
 
-          case 20:
+          case 22:
             this.encryptionConks[objectId] = _context46.sent;
             _context46.t0 = this;
             _context46.t1 = libraryId;
             _context46.t2 = objectId;
             _context46.t3 = writeToken;
             _context46.t4 = capKey;
-            _context46.next = 28;
+            _context46.next = 30;
             return this.Crypto.EncryptConk(this.encryptionConks[objectId], this.signer.signingKey.publicKey);
 
-          case 28:
+          case 30:
             _context46.t5 = _context46.sent;
             _context46.t6 = {
               libraryId: _context46.t1,
@@ -4394,32 +4403,32 @@ exports.CreateEncryptionConk = /*#__PURE__*/function () {
               metadataSubtree: _context46.t4,
               metadata: _context46.t5
             };
-            _context46.next = 32;
+            _context46.next = 34;
             return _context46.t0.ReplaceMetadata.call(_context46.t0, _context46.t6);
 
-          case 32:
+          case 34:
             if (!createKMSConk) {
-              _context46.next = 62;
+              _context46.next = 64;
               break;
             }
 
-            _context46.prev = 33;
-            _context46.next = 36;
+            _context46.prev = 35;
+            _context46.next = 38;
             return this.authClient.KMSAddress({
               objectId: objectId
             });
 
-          case 36:
+          case 38:
             kmsAddress = _context46.sent;
-            _context46.next = 39;
+            _context46.next = 41;
             return this.authClient.KMSInfo({
               objectId: objectId
             });
 
-          case 39:
+          case 41:
             kmsPublicKey = _context46.sent.publicKey;
             kmsCapKey = "eluv.caps.ikms".concat(this.utils.AddressToHash(kmsAddress));
-            _context46.next = 43;
+            _context46.next = 45;
             return this.ContentObjectMetadata({
               libraryId: libraryId,
               // Cap may only exist in draft
@@ -4428,11 +4437,11 @@ exports.CreateEncryptionConk = /*#__PURE__*/function () {
               metadataSubtree: kmsCapKey
             });
 
-          case 43:
+          case 45:
             existingKMSCap = _context46.sent;
 
             if (existingKMSCap) {
-              _context46.next = 56;
+              _context46.next = 58;
               break;
             }
 
@@ -4441,10 +4450,10 @@ exports.CreateEncryptionConk = /*#__PURE__*/function () {
             _context46.t9 = objectId;
             _context46.t10 = writeToken;
             _context46.t11 = kmsCapKey;
-            _context46.next = 52;
+            _context46.next = 54;
             return this.Crypto.EncryptConk(this.encryptionConks[objectId], kmsPublicKey);
 
-          case 52:
+          case 54:
             _context46.t12 = _context46.sent;
             _context46.t13 = {
               libraryId: _context46.t8,
@@ -4453,30 +4462,30 @@ exports.CreateEncryptionConk = /*#__PURE__*/function () {
               metadataSubtree: _context46.t11,
               metadata: _context46.t12
             };
-            _context46.next = 56;
+            _context46.next = 58;
             return _context46.t7.ReplaceMetadata.call(_context46.t7, _context46.t13);
 
-          case 56:
-            _context46.next = 62;
+          case 58:
+            _context46.next = 64;
             break;
 
-          case 58:
-            _context46.prev = 58;
-            _context46.t14 = _context46["catch"](33);
+          case 60:
+            _context46.prev = 60;
+            _context46.t14 = _context46["catch"](35);
             // eslint-disable-next-line no-console
             console.error("Failed to create encryption cap for KMS:"); // eslint-disable-next-line no-console
 
             console.error(_context46.t14);
 
-          case 62:
+          case 64:
             return _context46.abrupt("return", this.encryptionConks[objectId]);
 
-          case 63:
+          case 65:
           case "end":
             return _context46.stop();
         }
       }
-    }, _callee46, this, [[33, 58]]);
+    }, _callee46, this, [[35, 60]]);
   }));
 
   return function (_x45) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "3.1.95",
+  "version": "3.1.96",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/ElvClient.js",
   "author": "Kevin Talmadge",
@@ -57,7 +57,7 @@
   "dependencies": {
     "@babel/runtime": "^7.8.4",
     "@eluvio/crypto": ">=1.0.8",
-    "@eluvio/elv-abr-profile": "^0.2.0",
+    "@eluvio/elv-abr-profile": "^1.0.0",
     "@sindresorhus/slugify": "^1.1.0",
     "babel-loader": "^8.0.6",
     "bignumber.js": "^8.0.2",

package/src/AuthorizationClient.js

@@ -204,7 +204,7 @@ class AuthorizationClient {
       addr: Utils.FormatAddress(((this.client.signer && this.client.signer.address) || ""))
     };
 
-    if(!(this.noAuth || noAuth) && !this.client.signer.remoteSigner) {
+    if(!(this.noAuth || noAuth)) {
       const { transactionHash } =  await this.MakeAccessRequest({
         libraryId,
         objectId,

package/src/client/ContentAccess.js

@@ -2332,6 +2332,10 @@ exports.LinkData = async function({libraryId, objectId, versionHash, writeToken,
 /* Encryption */
 
 exports.CreateEncryptionConk = async function({libraryId, objectId, versionHash, writeToken, createKMSConk=true}) {
+  if(this.signer.remoteSigner) {
+    return;
+  }
+
   ValidateParameters({libraryId, objectId, versionHash});
   ValidateWriteToken(writeToken);
 

package/utilities/ObjectSetPermission.js

@@ -9,7 +9,7 @@ const Logger = require("./lib/concerns/Logger");
 
 const permissionTypes = ["owner", "editable", "viewable", "listable", "public"];
 
-class ObjectAddGroupPerms extends Utility {
+class ObjectSetPermission extends Utility {
   blueprint() {
     return {
       concerns: [Logger, ArgObjectId, Client],
@@ -55,7 +55,7 @@ class ObjectAddGroupPerms extends Utility {
 }
 
 if(require.main === module) {
-  Utility.cmdLineInvoke(ObjectAddGroupPerms);
+  Utility.cmdLineInvoke(ObjectSetPermission);
 } else {
-  module.exports = ObjectAddGroupPerms;
-}
+  module.exports = ObjectSetPermission;
+}

package/utilities/SimpleIngest.js

@@ -53,6 +53,10 @@ class SimpleIngest extends Utility {
     const libABRProfile = R.path(["metadata", "abr", "default_profile"], libInfo);
     if(R.isNil(libABRProfile)) throw Error("Library does not specify ABR profile for simple ingests");
 
+    const libMezManageGroups = R.path(["metadata", "abr", "mez_manage_groups"], libInfo);
+
+    const libMezPermission = R.path(["metadata", "abr", "mez_permission_level"], libInfo);
+
     const {drm, libraryId, title} = this.args;
     const encrypt = true;
 
@@ -91,6 +95,7 @@ class SimpleIngest extends Utility {
 
     if(!R.isNil(createMasterResponse.errors) && !R.isEmpty(createMasterResponse.errors)) throw Error(`Error(s) encountered while inspecting uploaded files: ${createMasterResponse.errors.join("\n")}`);
 
+    // TODO: replace with a 'waitForNewObject' call (Finalize.waitForPublish throws exception for brand new object not yet visible)
     await seconds(2);
 
     await this.concerns.Finalize.waitForPublish({
@@ -218,6 +223,42 @@ class SimpleIngest extends Utility {
     const finalizeErrors = finalizeAbrResponse.errors;
     if(!R.isNil(finalizeErrors) && !R.isEmpty(finalizeErrors)) throw Error(`Error(s) encountered while finalizing object: ${finalizeErrors.join("\n")}`);
 
+    if(libMezManageGroups && libMezManageGroups.length > 0){
+      for(const groupAddress of libMezManageGroups){
+        logger.log("Setting access permissions for managers");
+        await client.AddContentObjectGroupPermission({
+          objectId: id,
+          groupAddress,
+          permission: "manage"
+        });
+
+      }
+    }
+
+    if(libMezPermission) {
+      if(!["owner", "editable", "viewable", "listable", "public"].includes(libMezPermission)) {
+        logger.warn(`Bad value for mez_permission_level: '${libMezPermission}', skipping permission setting`);
+      } else {
+        logger.log(`Setting object permission to '${libMezPermission}'`);
+        const prevHash = await client.LatestVersionHash({objectId: id});
+
+        await client.SetPermission({
+          objectId: id,
+          permission: libMezPermission
+        });
+
+        const newHash = await client.LatestVersionHash({objectId: id});
+
+        if(prevHash === newHash) {
+          logger.log("Version hash unchanged: " + newHash );
+        } else {
+          logger.log("Previous version hash: " + prevHash );
+          logger.log("New version hash: " + newHash );
+        }
+        logger.data("version_hash", newHash);
+      }
+    }
+
     logger.logList(
       "",
       "Playable media object created:",

package/utilities/example_files/simple_ingest_library_metadata.json

@@ -0,0 +1,180 @@
+{
+  "abr": {
+    "comments": [
+      "For movies/TV - snapAR is set to true, this profile will attempt to conform aspect ratio to nearby standard",
+      "also specifies 'store encrypted', offers both clear and drm playout formats"
+    ],
+    "mez_content_type": "YOUR_TITLE_(MEZ)_CONTENT_TYPE_ID",
+    "mez_manage_groups": [
+      "ADDRESS_FOR_YOUR_CONTENT_ADMINS_GROUP"
+    ],
+    "mez_permission_level": "ONE_OF_THE_FOLLOWING: owner, editable, viewable, listable, public",
+    "default_profile": {
+      "drm_optional": true,
+      "store_clear": false,
+      "video_parametric_ladder": {
+        "baseAspectRatio": "16/9",
+        "baseFrameRate": "30",
+        "rungSpecs": [
+          {
+            "dim": 2160,
+            "bitrate": 14000000
+          },
+          {
+            "dim": 1440,
+            "bitrate": 11500000
+          },
+          {
+            "dim": 1080,
+            "bitrate": 9500000
+          },
+          {
+            "dim": 720,
+            "bitrate": 4500000
+          },
+          {
+            "dim": 480,
+            "bitrate": 1750000
+          },
+          {
+            "dim": 360,
+            "bitrate": 810000
+          },
+          {
+            "dim": 240,
+            "bitrate": 500000
+          }
+        ],
+        "options": {
+          "upscale": false,
+          "snapAR": true,
+          "maxARSnap": 0.06,
+          "minDimStepdown": 0.12,
+          "frameRateScaleFactor": 0.5
+        },
+        "limits": {
+          "aspectRatioMax": "3",
+          "aspectRatioMin": "1/3",
+          "avgBitrateMax": 100000000,
+          "avgBitrateMin": 100000,
+          "fileSizeMax": 100000000,
+          "fileSizeMin": 10000,
+          "durationMax": 14400,
+          "durationMin": 1,
+          "finalBitrateMax": 30000000,
+          "frameRateMax": "60",
+          "frameRateMin": "15",
+          "heightMax": 5000,
+          "heightMin": 100,
+          "sampleAspectRatioMax": "3/2",
+          "sampleAspectRatioMin": "2/3",
+          "widthMax": 5000,
+          "widthMin": 100
+        }
+      },
+      "ladder_specs": {
+        "{\"media_type\":\"audio\",\"channels\":1}": {
+          "rung_specs": [
+            {
+              "bit_rate": 128000,
+              "media_type": "audio",
+              "pregenerate": true
+            }
+          ]
+        },
+        "{\"media_type\":\"audio\",\"channels\":2}": {
+          "rung_specs": [
+            {
+              "bit_rate": 192000,
+              "media_type": "audio",
+              "pregenerate": true
+            }
+          ]
+        },
+        "{\"media_type\":\"audio\",\"channels\":6}": {
+          "rung_specs": [
+            {
+              "bit_rate": 384000,
+              "media_type": "audio",
+              "pregenerate": true
+            }
+          ]
+        }
+      },
+      "playout_formats": {
+        "dash-widevine": {
+          "drm": {
+            "content_id": "",
+            "enc_scheme_name": "cenc",
+            "license_servers": [],
+            "type": "DrmWidevine"
+          },
+          "protocol": {
+            "min_buffer_length": 2,
+            "type": "ProtoDash"
+          }
+        },
+        "hls-aes128": {
+          "drm": {
+            "enc_scheme_name": "aes-128",
+            "type": "DrmAes128"
+          },
+          "protocol": {
+            "type": "ProtoHls"
+          }
+        },
+        "hls-fairplay": {
+          "drm": {
+            "enc_scheme_name": "cbcs",
+            "license_servers": [],
+            "type": "DrmFairplay"
+          },
+          "protocol": {
+            "type": "ProtoHls"
+          }
+        },
+        "hls-sample-aes": {
+          "drm": {
+            "enc_scheme_name": "cbcs",
+            "type": "DrmSampleAes"
+          },
+          "protocol": {
+            "type": "ProtoHls"
+          }
+        },
+        "dash-clear": {
+          "drm": null,
+          "protocol": {
+            "min_buffer_length": 2,
+            "type": "ProtoDash"
+          }
+        },
+        "hls-clear": {
+          "drm": null,
+          "protocol": {
+            "type": "ProtoHls"
+          }
+        }
+      },
+      "segment_specs": {
+        "audio": {
+          "segs_per_chunk": 15,
+          "target_dur": 2
+        },
+        "video": {
+          "segs_per_chunk": 15,
+          "target_dur": 2
+        }
+      }
+    }
+  },
+  "elv": {
+    "media": {
+      "drm": {
+        "fps": {
+          "cert": "MIIExzCCA6+gAwIBAgIIHyfkXhxLHC4wDQYJKoZIhvcNAQEFBQAwfzELMAkGA1UEBhMCVVMxEzARBgNVBAoMCkFwcGxlIEluYy4xJjAkBgNVBAsMHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MTMwMQYDVQQDDCpBcHBsZSBLZXkgU2VydmljZXMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMjAwOTEyMDMzMjI0WhcNMjIwOTEzMDMzMjI0WjBgMQswCQYDVQQGEwJVUzETMBEGA1UECgwKRWx1dmlvIEluYzETMBEGA1UECwwKMktIOEtDM01NWDEnMCUGA1UEAwweRmFpclBsYXkgU3RyZWFtaW5nOiBFbHV2aW8gSW5jMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDslbBURB6gj07g7VrS7Ojixe7FNZOupomcZt+mtMvyavjg7X7/T4RccmKUQxOoMLKCJcQ6WrdHhIpN8+bciq7lr0mNzaN467zREiUNYOpkVPi13sJLieY2m2MEPOQTbIl52Cu1YyH+4/g1dKPmeguSnzZRo36jsCGHlJBjHq0jkQIDAQABo4IB6DCCAeQwDAYDVR0TAQH/BAIwADAfBgNVHSMEGDAWgBRj5EdUy4VxWUYsg6zMRDFkZwMsvjCB4gYDVR0gBIHaMIHXMIHUBgkqhkiG92NkBQEwgcYwgcMGCCsGAQUFBwICMIG2DIGzUmVsaWFuY2Ugb24gdGhpcyBjZXJ0aWZpY2F0ZSBieSBhbnkgcGFydHkgYXNzdW1lcyBhY2NlcHRhbmNlIG9mIHRoZSB0aGVuIGFwcGxpY2FibGUgc3RhbmRhcmQgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdXNlLCBjZXJ0aWZpY2F0ZSBwb2xpY3kgYW5kIGNlcnRpZmljYXRpb24gcHJhY3RpY2Ugc3RhdGVtZW50cy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5hcHBsZS5jb20va2V5c2VydmljZXMuY3JsMB0GA1UdDgQWBBR4jerseBHEUDC7mU+NQuIzZqHRFDAOBgNVHQ8BAf8EBAMCBSAwOAYLKoZIhvdjZAYNAQMBAf8EJgFuNnNkbHQ2OXFuc3l6eXp5bWFzdmdudGthbWd2bGE1Y212YzdpMC4GCyqGSIb3Y2QGDQEEAQH/BBwBd252bHhlbGV1Y3Vpb2JyZW4yeHZlZmV6N2Y5MA0GCSqGSIb3DQEBBQUAA4IBAQBM17YYquw0soDPAadr1aIM6iC6BQ/kOGYu3y/6AlrwYgAQNFy8DjsQUoqlQWFuA0sigp57bTUymkXEBf9yhUmXXiPafGjbxzsPF5SPFLIciolWbxRCB153L1a/Vh2wg3rhf4IvAZuJpnml6SSg5SjD19bN+gD7zrtp3yWKBKuarLSjDvVIB1SoxEToBs3glAEqoBiA2eZjikBA0aBlbvjUF2gqOmZjZJ7dmG1Tos2Zd4SdGL6ltSpKUeSGSxyv41aqF83vNpymNJmey2t2kPPtC7mt0LM32Ift3AkAl8Za9JbV/pOnc95oAfPhVTOGOI+u2BuB2qaKWjqHwkfqCz4A"
+        }
+      }
+    }
+  }
+}

package/utilities/example_files/simple_ingest_library_metadata_animation_NFTs.json

@@ -0,0 +1,133 @@
+{
+  "abr": {
+    "comments": [
+      "For animation NFTs that are not movie/TV clips - snapAR is set to false",
+      "also specifies 'store clear', only offers clear playout formats (no drm)",
+      "and object permission 'listable'.",
+      "does not include DRM cert @ /elv/media/drm/fps/cert"
+    ],
+    "mez_content_type": "YOUR_TITLE_(NFT)_CONTENT_TYPE_ID",
+    "mez_manage_groups": [
+      "ADDRESS_FOR_YOUR_CONTENT_ADMINS_GROUP"
+    ],
+    "mez_permission_level": "listable",
+    "default_profile": {
+      "drm_optional": true,
+      "store_clear": true,
+      "video_parametric_ladder": {
+        "baseAspectRatio": "16/9",
+        "baseFrameRate": "30",
+        "rungSpecs": [
+          {
+            "dim": 2160,
+            "bitrate": 14000000
+          },
+          {
+            "dim": 1440,
+            "bitrate": 11500000
+          },
+          {
+            "dim": 1080,
+            "bitrate": 9500000
+          },
+          {
+            "dim": 720,
+            "bitrate": 4500000
+          },
+          {
+            "dim": 480,
+            "bitrate": 1750000
+          },
+          {
+            "dim": 360,
+            "bitrate": 810000
+          },
+          {
+            "dim": 240,
+            "bitrate": 500000
+          }
+        ],
+        "options": {
+          "upscale": false,
+          "snapAR": false,
+          "maxARSnap": 0.06,
+          "minDimStepdown": 0.12,
+          "frameRateScaleFactor": 0.5
+        },
+        "limits": {
+          "aspectRatioMax": "3",
+          "aspectRatioMin": "1/3",
+          "avgBitrateMax": 100000000,
+          "avgBitrateMin": 100000,
+          "fileSizeMax": 100000000,
+          "fileSizeMin": 10000,
+          "durationMax": 14400,
+          "durationMin": 1,
+          "finalBitrateMax": 30000000,
+          "frameRateMax": "60",
+          "frameRateMin": "15",
+          "heightMax": 5000,
+          "heightMin": 100,
+          "sampleAspectRatioMax": "3/2",
+          "sampleAspectRatioMin": "2/3",
+          "widthMax": 5000,
+          "widthMin": 100
+        }
+      },
+      "ladder_specs": {
+        "{\"media_type\":\"audio\",\"channels\":1}": {
+          "rung_specs": [
+            {
+              "bit_rate": 128000,
+              "media_type": "audio",
+              "pregenerate": true
+            }
+          ]
+        },
+        "{\"media_type\":\"audio\",\"channels\":2}": {
+          "rung_specs": [
+            {
+              "bit_rate": 192000,
+              "media_type": "audio",
+              "pregenerate": true
+            }
+          ]
+        },
+        "{\"media_type\":\"audio\",\"channels\":6}": {
+          "rung_specs": [
+            {
+              "bit_rate": 384000,
+              "media_type": "audio",
+              "pregenerate": true
+            }
+          ]
+        }
+      },
+      "playout_formats": {
+        "dash-clear": {
+          "drm": null,
+          "protocol": {
+            "min_buffer_length": 2,
+            "type": "ProtoDash"
+          }
+        },
+        "hls-clear": {
+          "drm": null,
+          "protocol": {
+            "type": "ProtoHls"
+          }
+        }
+      },
+      "segment_specs": {
+        "audio": {
+          "segs_per_chunk": 15,
+          "target_dur": 2
+        },
+        "video": {
+          "segs_per_chunk": 15,
+          "target_dur": 2
+        }
+      }
+    }
+  }
+}