@eluvio/elv-client-js 3.2.38 → 3.2.40

package/dist/src/Utils.js

@@ -466,7 +466,8 @@ var Utils = {
     return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
   },
   B64: function B64(str) {
-    return Buffer.from(str, "utf-8").toString("base64");
+    var encoding = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "utf-8";
+    return Buffer.from(str, encoding).toString("base64");
   },
   FromB64: function FromB64(str) {
     return Buffer.from(str, "base64").toString("utf-8");

package/dist/src/client/ABRPublishing.js

@@ -42,7 +42,7 @@ var _require = require("../Validation"),
  * @param {string} contentTypeName - Name of the content type to use
  * @param {Object=} metadata - Additional metadata for the content object
  * @param {Array<Object>=} fileInfo - Files to upload (See UploadFiles/UploadFilesFromS3 method)
- * @param {boolean=} encrypt=false - (Local files only) - If specified, files will be encrypted
+ * @param {boolean=} encrypt=true - (Local or copied files only) - Unless `false` is passed in explicitly, any uploaded/copied files will be stored encrypted
  * @param {boolean=} copy=false - (S3) If specified, files will be copied from S3
  * @param {function=} callback - Progress callback for file upload (See UploadFiles/UploadFilesFromS3 method)
  * @param {Array<Object>=} access=[] - Array of cloud credentials, along with path matching regex strings - Required if any files in the masters are cloud references (currently only AWS S3 is supported)
@@ -87,7 +87,7 @@ exports.CreateProductionMaster = /*#__PURE__*/function () {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            libraryId = _ref.libraryId, type = _ref.type, name = _ref.name, description = _ref.description, _ref$metadata = _ref.metadata, metadata = _ref$metadata === void 0 ? {} : _ref$metadata, fileInfo = _ref.fileInfo, _ref$encrypt = _ref.encrypt, encrypt = _ref$encrypt === void 0 ? false : _ref$encrypt, _ref$access = _ref.access, access = _ref$access === void 0 ? [] : _ref$access, _ref$copy = _ref.copy, copy = _ref$copy === void 0 ? false : _ref$copy, callback = _ref.callback;
+            libraryId = _ref.libraryId, type = _ref.type, name = _ref.name, description = _ref.description, _ref$metadata = _ref.metadata, metadata = _ref$metadata === void 0 ? {} : _ref$metadata, fileInfo = _ref.fileInfo, _ref$encrypt = _ref.encrypt, encrypt = _ref$encrypt === void 0 ? true : _ref$encrypt, _ref$access = _ref.access, access = _ref$access === void 0 ? [] : _ref$access, _ref$copy = _ref.copy, copy = _ref$copy === void 0 ? false : _ref$copy, callback = _ref.callback;
             ValidateLibrary(libraryId);
             _context.next = 4;
             return this.CreateContentObject({

package/dist/src/client/ContentManagement.js

@@ -2646,7 +2646,8 @@ exports.UpdateContentObjectGraph = /*#__PURE__*/function () {
       target: string (path to link target),
       type: string ("file", "meta" | "metadata", "rep" - default "metadata")
       targetHash: string (optional, for cross-object links),
-      autoUpdate: boolean (if specified, link will be automatically updated to latest version by UpdateContentObjectGraph method)
+      autoUpdate: boolean (if specified, link will be automatically updated to latest version by UpdateContentObjectGraph method),
+      authContainer: string (optional, object id of container object if creating a signed link)
     }
  ]
 
@@ -2678,7 +2679,7 @@ exports.CreateLinks = /*#__PURE__*/function () {
             _context33.next = 5;
             return this.utils.LimitedMap(10, links, /*#__PURE__*/function () {
               var _ref57 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee31(info) {
-                var path, type, target, link;
+                var path, type, target, authTarget, link, linkMetadata;
                 return _regeneratorRuntime.wrap(function _callee31$(_context32) {
                   while (1) {
                     switch (_context32.prev = _context32.next) {
@@ -2690,7 +2691,7 @@ exports.CreateLinks = /*#__PURE__*/function () {
                           type = "meta";
                         }
 
-                        target = info.target.replace(/^(\/|\.)+/, "");
+                        target = authTarget = info.target.replace(/^(\/|\.)+/, "");
 
                         if (info.targetHash) {
                           target = "/qfab/".concat(info.targetHash, "/").concat(type, "/").concat(target);
@@ -2708,9 +2709,48 @@ exports.CreateLinks = /*#__PURE__*/function () {
                               tag: "latest"
                             }
                           };
+                        } // Sign link
+
+
+                        if (!info.authContainer) {
+                          _context32.next = 17;
+                          break;
                         }
 
-                        _context32.next = 9;
+                        _context32.next = 10;
+                        return _this6.ContentObjectMetadata({
+                          libraryId: libraryId,
+                          objectId: objectId,
+                          metadataSubtree: path
+                        });
+
+                      case 10:
+                        linkMetadata = _context32.sent;
+
+                        if (linkMetadata) {
+                          link["/"] = linkMetadata["/"];
+                          link["."] = linkMetadata["."];
+                        }
+
+                        if (!link["."]) link["."] = {};
+
+                        if (linkMetadata["."]["authorization"]) {
+                          _context32.next = 17;
+                          break;
+                        }
+
+                        _context32.next = 16;
+                        return _this6.authClient.GenerateSignedLinkToken({
+                          containerId: info.authContainer,
+                          versionHash: info.targetHash,
+                          link: "./".concat(type, "/").concat(authTarget)
+                        });
+
+                      case 16:
+                        link["."]["authorization"] = _context32.sent;
+
+                      case 17:
+                        _context32.next = 19;
                         return _this6.ReplaceMetadata({
                           libraryId: libraryId,
                           objectId: objectId,
@@ -2719,7 +2759,7 @@ exports.CreateLinks = /*#__PURE__*/function () {
                           metadata: link
                         });
 
-                      case 9:
+                      case 19:
                       case "end":
                         return _context32.stop();
                     }

package/dist/src/walletClient/Utils.js

@@ -65,13 +65,24 @@ var FormatNFTDetails = function FormatNFTDetails(entry) {
   var isListing = !!entry.id;
   var metadata = (isListing ? entry.nft : entry.meta) || {};
   var info = isListing ? entry.info : entry;
+  var paymentAccounts = entry.accepts || [];
   var details = {
-    USDCAccepted: !!(entry.accepts || []).find(function (entry) {
-      return entry.type === "sol";
+    USDCAccepted: paymentAccounts.length > 0,
+    USDCOnly: !!paymentAccounts.find(function (entry) {
+      return entry.preferred;
+    }),
+    EthUSDCAccepted: !!paymentAccounts.find(function (account) {
+      return account.type === "eth";
+    }),
+    EthUSDCOnly: !!paymentAccounts.find(function (account) {
+      return account.type === "eth" && account.preferred;
+    }),
+    SolUSDCAccepted: !!paymentAccounts.find(function (account) {
+      return account.type === "eth";
+    }),
+    SolUSDCOnly: !!paymentAccounts.find(function (account) {
+      return account.type === "eth" && account.preferred;
     }),
-    USDCOnly: ((entry.accepts || []).find(function (entry) {
-      return entry.type === "sol";
-    }) || {}).preferred,
     TenantId: entry.tenant || entry.tenant_id,
     ContractAddr: info.contract_addr,
     ContractId: "ictr".concat(Utils.AddressToHash(info.contract_addr)),

package/package.json

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

package/src/AuthorizationClient.js

@@ -3,6 +3,8 @@ const Ethers = require("ethers");
 const Utils = require("./Utils");
 const UrlJoin = require("url-join");
 const {LogMessage} = require("./LogMessage");
+const {ValidateObject} = require("./Validation");
+const Pako = require("pako");
 
 /*
 // -- Contract javascript files built using build/BuildContracts.js
@@ -240,6 +242,47 @@ class AuthorizationClient {
     return `${token}.${Utils.B64(multiSig)}`;
   }
 
+  async GenerateSignedLinkToken({containerId, versionHash, link}) {
+    ValidateObject(containerId);
+    const canEdit = await this.client.CallContractMethod({
+      contractAddress: Utils.HashToAddress(containerId),
+      methodName: "canEdit"
+    });
+
+    const { objectId } = Utils.DecodeVersionHash(versionHash);
+
+    if(!canEdit) {
+      throw Error(`Current user does not have permission to edit content object ${objectId}`);
+    }
+
+    const signerAddress = this.client.CurrentAccountAddress();
+
+    let token = {
+      adr: Utils.B64(signerAddress.replace("0x", ""), "hex"),
+      spc: await this.client.ContentSpaceId(),
+      lib: await this.client.ContentObjectLibraryId({objectId}),
+      qid: objectId,
+      sub: Utils.FormatAddress(signerAddress),
+      gra: "read",
+      iat: Date.now(),
+      exp: Date.now() + 3600000,
+      ctx: {
+        elv: {
+          lnk: link,
+          src: containerId
+        }
+      }
+    };
+
+    const compressedToken = Pako.deflateRaw(Buffer.from(JSON.stringify(token), "utf-8"));
+    const signature = await this.Sign(Ethers.utils.keccak256(compressedToken));
+
+    return `aslsjc${Utils.B58(Buffer.concat([
+      Buffer.from(signature.replace(/^0x/, ""), "hex"),
+      Buffer.from(compressedToken)
+    ]))}`;
+  }
+
   async MakeAccessRequest({
     libraryId,
     objectId,

package/src/Utils.js

@@ -433,8 +433,8 @@ const Utils = {
     return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
   },
 
-  B64: str => {
-    return Buffer.from(str, "utf-8").toString("base64");
+  B64: (str, encoding="utf-8") => {
+    return Buffer.from(str, encoding).toString("base64");
   },
 
   FromB64: str => {

package/src/client/ABRPublishing.js

@@ -31,7 +31,7 @@ const {
  * @param {string} contentTypeName - Name of the content type to use
  * @param {Object=} metadata - Additional metadata for the content object
  * @param {Array<Object>=} fileInfo - Files to upload (See UploadFiles/UploadFilesFromS3 method)
- * @param {boolean=} encrypt=false - (Local files only) - If specified, files will be encrypted
+ * @param {boolean=} encrypt=true - (Local or copied files only) - Unless `false` is passed in explicitly, any uploaded/copied files will be stored encrypted
  * @param {boolean=} copy=false - (S3) If specified, files will be copied from S3
  * @param {function=} callback - Progress callback for file upload (See UploadFiles/UploadFilesFromS3 method)
  * @param {Array<Object>=} access=[] - Array of cloud credentials, along with path matching regex strings - Required if any files in the masters are cloud references (currently only AWS S3 is supported)
@@ -73,7 +73,7 @@ exports.CreateProductionMaster = async function({
   description,
   metadata={},
   fileInfo,
-  encrypt=false,
+  encrypt=true,
   access=[],
   copy=false,
   callback

package/src/client/ContentManagement.js

@@ -1319,7 +1319,8 @@ exports.UpdateContentObjectGraph = async function({libraryId, objectId, versionH
       target: string (path to link target),
       type: string ("file", "meta" | "metadata", "rep" - default "metadata")
       targetHash: string (optional, for cross-object links),
-      autoUpdate: boolean (if specified, link will be automatically updated to latest version by UpdateContentObjectGraph method)
+      autoUpdate: boolean (if specified, link will be automatically updated to latest version by UpdateContentObjectGraph method),
+      authContainer: string (optional, object id of container object if creating a signed link)
     }
  ]
 
@@ -1348,7 +1349,9 @@ exports.CreateLinks = async function({
       let type = (info.type || "file") === "file" ? "files" : info.type;
       if(type === "metadata") { type = "meta"; }
 
-      let target = info.target.replace(/^(\/|\.)+/, "");
+      let target;
+      let authTarget;
+      target = authTarget = info.target.replace(/^(\/|\.)+/, "");
       if(info.targetHash) {
         target = `/qfab/${info.targetHash}/${type}/${target}`;
       } else {
@@ -1363,6 +1366,30 @@ exports.CreateLinks = async function({
         link["."] = { auto_update: { tag: "latest"} };
       }
 
+      // Sign link
+      if(info.authContainer) {
+        const linkMetadata = await this.ContentObjectMetadata({
+          libraryId,
+          objectId,
+          metadataSubtree: path
+        });
+
+        if(linkMetadata) {
+          link["/"] = linkMetadata["/"];
+          link["."] = linkMetadata["."];
+        }
+
+        if(!link["."]) link["."] = {};
+
+        if(!linkMetadata["."]["authorization"]) {
+          link["."]["authorization"] = await this.authClient.GenerateSignedLinkToken({
+            containerId: info.authContainer,
+            versionHash: info.targetHash,
+            link: `./${type}/${authTarget}`
+          });
+        }
+      }
+
       await this.ReplaceMetadata({
         libraryId,
         objectId,

package/src/walletClient/Utils.js

@@ -48,9 +48,16 @@ const FormatNFTDetails = function(entry) {
   const metadata = (isListing ? entry.nft : entry.meta) || {};
   const info = (isListing ? entry.info : entry);
 
+  const paymentAccounts = entry.accepts || [];
+
   let details = {
-    USDCAccepted: !!(entry.accepts || []).find(entry => entry.type === "sol"),
-    USDCOnly: ((entry.accepts || []).find(entry => entry.type === "sol") || {}).preferred,
+    USDCAccepted: paymentAccounts.length > 0,
+    USDCOnly: !!paymentAccounts.find(entry => entry.preferred),
+    EthUSDCAccepted: !!paymentAccounts.find(account => account.type === "eth"),
+    EthUSDCOnly: !!paymentAccounts.find(account => account.type === "eth" && account.preferred),
+    SolUSDCAccepted: !!paymentAccounts.find(account => account.type === "eth"),
+    SolUSDCOnly: !!paymentAccounts.find(account => account.type === "eth" && account.preferred),
+
     TenantId: entry.tenant || entry.tenant_id,
     ContractAddr: info.contract_addr,
     ContractId: `ictr${Utils.AddressToHash(info.contract_addr)}`,

package/testScripts/CreateProductionMaster.js

@@ -41,7 +41,11 @@ const argv = yargs
   })
   .option("encrypt", {
     type: "boolean",
-    description: "If specified, files will be encrypted (local files only)"
+    description: "DEPRECATED, HAS NO EFFECT: uploaded/copied files will always be stored encrypted unless --unencrypted specified."
+  })
+  .option("unencrypted", {
+    type: "boolean",
+    description: "Store uploaded/copied files unencrypted on server"
   })
   .option("s3-copy", {
     type: "boolean",
@@ -85,13 +89,19 @@ const Create = async ({
   slug,
   metadata,
   files,
-  encrypt = false,
+  encrypt,
+  unencrypted,
   s3Reference,
   s3Copy,
   credentials,
   debug
 }) => {
 
+  if(encrypt && unencrypted) {
+    console.error("Cannot specify both --encrypted and --unencrypted");
+    return;
+  }
+
   // force ipTitleId to be a string, if present
   if(ipTitleId) {
     ipTitleId = ipTitleId.toString();
@@ -220,9 +230,7 @@ const Create = async ({
       type = await client.ContentType({name: type});
     }
 
-    if(!type) {
-      throw Error(`Unable to find content type "${originalType}"`);
-    }
+    if(!type) throw Error(`Unable to find content type "${originalType}"`);
 
     type = type.hash;
 
@@ -234,7 +242,7 @@ const Create = async ({
         description: "Production Master for " + title,
         metadata,
         fileInfo,
-        encrypt,
+        encrypt: !unencrypted,
         access,
         copy: s3Copy && !s3Reference,
         callback: progress => {

package/testScripts/abr_profile_4k_clear_store_encrypted.json

@@ -0,0 +1,111 @@
+{
+  "drm_optional": true,
+  "store_clear": false,
+  "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
+        }
+      ]
+    },
+    "{\"media_type\":\"video\",\"aspect_ratio_height\":9,\"aspect_ratio_width\":16}": {
+      "rung_specs": [
+        {
+          "bit_rate": 20000000,
+          "height": 2160,
+          "media_type": "video",
+          "pregenerate": true,
+          "width": 3840
+        },
+        {
+          "bit_rate": 9500000,
+          "height": 1080,
+          "media_type": "video",
+          "pregenerate": false,
+          "width": 1920
+        },
+        {
+          "bit_rate": 4500000,
+          "height": 720,
+          "media_type": "video",
+          "pregenerate": false,
+          "width": 1280
+        },
+        {
+          "bit_rate": 2000000,
+          "height": 540,
+          "media_type": "video",
+          "pregenerate": false,
+          "width": 960
+        },
+        {
+          "bit_rate": 1100000,
+          "height": 432,
+          "media_type": "video",
+          "pregenerate": false,
+          "width": 768
+        },
+        {
+          "bit_rate": 810000,
+          "height": 360,
+          "media_type": "video",
+          "pregenerate": false,
+          "width": 640
+        },
+        {
+          "bit_rate": 520000,
+          "height": 360,
+          "media_type": "video",
+          "pregenerate": false,
+          "width": 640
+        }
+      ]
+    }
+  },
+  "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
+    }
+  }
+}