@eluvio/elv-client-js 4.0.128 → 4.0.130

package/package.json

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

package/src/ElvClient.js

@@ -953,6 +953,8 @@ class ElvClient {
    * @param {boolean} allowDecryption=false - If specified, the re-encryption key will be included in the token,
    * enabling the user of this token to download encrypted content from the specified object
    * @param {Object=} context - Additional JSON context
+   * @param {number=} issueTime - Issue Time in milliseconds
+   * @param {number=} expirationTime - Expiration Time in milliseconds
    */
   async CreateSignedToken({
     libraryId,
@@ -963,7 +965,9 @@ class ElvClient {
     grantType="read",
     allowDecryption=false,
     duration,
-    context={}
+    context={},
+    issueTime,
+    expirationTime
   }) {
     if(!subject) {
       subject = `iusr${this.utils.AddressToHash(await this.CurrentAccountAddress())}`;
@@ -973,12 +977,14 @@ class ElvClient {
       context["elv:delegation-id"] = policyId;
     }
 
+    const issueDateTime = issueTime || Date.now();
+
     let token = {
       adr: Buffer.from(await this.CurrentAccountAddress().replace(/^0x/, ""), "hex").toString("base64"),
       sub: subject,
       spc: await this.ContentSpaceId(),
-      iat: Date.now(),
-      exp: Date.now() + duration,
+      iat: issueDateTime,
+      exp: expirationTime || (issueDateTime + duration),
       gra: grantType,
       ctx: context
     };

package/src/HttpClient.js

@@ -114,10 +114,10 @@ class HttpClient {
     } catch(error) {
       response = {
         ok: false,
-        status: 500,
+        status: (error && error.status) || 500,
         statusText: "ElvClient Error: " + error.message,
         url: uri.toString(),
-        stack: error.stack
+        error
       };
     }
 
@@ -167,7 +167,8 @@ class HttpClient {
         message: response.statusText,
         url: uri.toString(),
         body: errorBody,
-        requestParams: fetchParameters
+        requestParams: fetchParameters,
+        response
       };
 
       if(this.debug) this.Log(

package/src/client/ContentAccess.js

@@ -934,8 +934,8 @@ exports.ContentObjectMetadata = async function({
     // For a 404 error, check if error was due to write token not found
     const errQwtoken = objectPath.get(error.body, "errors.0.cause.cause.cause.qwtoken");
     if(errQwtoken) {
-      // if so, re-throw rather than suppress error
-      throw error;
+      // if so, throw more specific/informative error rather than the generic 'Not found' error
+      throw new Error(`Write token ${errQwtoken} not found`);
     } else {
       // For all other 404 errors (not just 'subtree not found'), suppress error and
       // return an empty value. (there are function call chains that depend on this behavior,

package/src/client/ContentManagement.js

@@ -251,11 +251,11 @@ exports.CreateContentType = async function({name, metadata={}, bitcode}) {
  * @param {string} name - Library name
  * @param {string=} description - Library description
  * @param {blob=} image - Image associated with the library
- * @param {string=} - imageName - Name of the image associated with the library (required if image specified)
+ * @param {string=} imageName - Name of the image associated with the library (required if image specified)
  * @param {Object=} metadata - Metadata of library object
  * @param {string=} kmsId - ID of the KMS to use for content in this library. If not specified,
  * the default KMS will be used.
- * @param {string=} tenantId - ID of the tenant to use for this library
+ * @param {string=} tenantContractId - ID of the tenant to use for this library
  *
  * @returns {Promise<string>} - Library ID of created library
  */
@@ -420,26 +420,25 @@ exports.SetContentObjectImage = async function({libraryId, objectId, writeToken,
  * @param {string} libraryId - ID of the library to delete
  */
 exports.DeleteContentLibrary = async function({libraryId}) {
-  throw Error("Not supported");
-
-  // eslint-disable-next-line no-unreachable
-  ValidateLibrary(libraryId);
-
-  let path = UrlJoin("qlibs", libraryId);
-
-  const authorizationHeader = await this.authClient.AuthorizationHeader({libraryId, update: true});
-
-  await this.CallContractMethodAndWait({
-    contractAddress: this.utils.HashToAddress(libraryId),
-    methodName: "kill",
-    methodArgs: []
-  });
-
-  await this.HttpClient.Request({
-    headers: authorizationHeader,
-    method: "DELETE",
-    path: path
-  });
+  throw Error(`Delete library not supported. (${libraryId})`);
+
+  // ValidateLibrary(libraryId);
+  //
+  // let path = UrlJoin("qlibs", libraryId);
+  //
+  // const authorizationHeader = await this.authClient.AuthorizationHeader({libraryId, update: true});
+  //
+  // await this.CallContractMethodAndWait({
+  //   contractAddress: this.utils.HashToAddress(libraryId),
+  //   methodName: "kill",
+  //   methodArgs: []
+  // });
+  //
+  // await this.HttpClient.Request({
+  //   headers: authorizationHeader,
+  //   method: "DELETE",
+  //   path: path
+  // });
 };
 
 /* Library Content Type Management */
@@ -542,7 +541,11 @@ exports.RemoveLibraryContentType = async function({libraryId, typeId, typeName,
  *
  * meta: Metadata to use for the new object
  *
- * @returns {Promise<Object>} - Response containing the object ID and write token of the draft
+ * noEncryptionConk: Set to true to prevent creation of an encryption conk for the object
+ *
+ * createKMSConk: Set to true to create a KMS conk for object (usually for sharing a playable object) (incompatible with noEncryptionConk: true)
+ *
+ * @returns {Promise<Object>} - Response containing the object ID and write token of the draft, as well as the url of the node that created the write token.
  */
 exports.CreateContentObject = async function({libraryId, objectId, options={}}) {
   ValidateLibrary(libraryId);
@@ -550,6 +553,8 @@ exports.CreateContentObject = async function({libraryId, objectId, options={}})
 
   this.Log(`Creating content object: ${libraryId} ${objectId || ""}`);
 
+  if(options.noEncryptionConk && options.createKMSConk) throw new Error("Incompatible options: noEncryptionConk and createKMSConk both set to true");
+
   // Look up content type, if specified
   let typeId;
   if(options.type) {
@@ -605,10 +610,15 @@ exports.CreateContentObject = async function({libraryId, objectId, options={}})
     headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}),
     method: "POST",
     path: path,
-    body: options
+    body: {      // filter out options not recognized by server (noEncryptionConk, createKMSConk)
+      type: options.type,
+      meta: options.meta
+    }
   });
+
   // extract the url for the node that handled the request
-  // TODO: remove/simplify after we start using /nodes API call to get node URLs for write tokens
+  // (not strictly needed now that we can quickly look up node URL for a write token,
+  // but still convenient)
   const nodeUrl = (new URL(rawCreateResponse.url)).origin;
   const createResponse = await this.utils.ResponseToJson(
     rawCreateResponse,
@@ -616,6 +626,16 @@ exports.CreateContentObject = async function({libraryId, objectId, options={}})
     this.HttpClient.Log.bind(this.HttpClient)
   );
 
+  // create EncryptionConk and possibly KMSConk depending on options
+  if(!options.noEncryptionConk) await this.CreateEncryptionConk(
+    {
+      libraryId,
+      objectId,
+      writeToken: createResponse.write_token,
+      createKMSConk: options.createKMSConk
+    }
+  );
+
   // Record the node used in creating this write token
   this.RecordWriteToken({writeToken: createResponse.write_token, fabricNodeUrl: nodeUrl});
 
@@ -1449,14 +1469,14 @@ exports.CreateLinks = async function({
     10,
     links,
     async info => {
-      const path = info.path.replace(/^(\/|\.)+/, "");
+      const path = info.path.replace(/^([/.])+/, "");
 
       let type = (info.type || "file") === "file" ? "files" : info.type;
       if(type === "metadata") { type = "meta"; }
 
       let target;
       let authTarget;
-      target = authTarget = info.target.replace(/^(\/|\.)+/, "");
+      target = authTarget = info.target.replace(/^([/.])+/, "");
       if(info.targetHash) {
         target = `/qfab/${info.targetHash}/${type}/${target}`;
       } else {

package/src/client/LiveConf.js

@@ -443,6 +443,10 @@ class LiveConf {
       conf.live_recording.recording_config.recording_params.part_ttl = customSettings.part_ttl;
     }
 
+    if(Object.hasOwn(customSettings, "persistent")) {
+      conf.live_recording.recording_config.recording_params.persistent = customSettings.persistent;
+    }
+
     if(customSettings.connection_timeout) {
       conf.live_recording.recording_config.recording_params.xc_params.connection_timeout = customSettings.connection_timeout;
     }
@@ -451,6 +455,10 @@ class LiveConf {
       conf.live_recording.recording_config.recording_params.reconnect_timeout = customSettings.reconnect_timeout;
     }
 
+    if(Object.hasOwn(customSettings, "copy_mpegts")) {
+      conf.live_recording.recording_config.recording_params.xc_params.copy_mpegts = customSettings.copy_mpegts;
+    }
+
     // Fill in specifics for protocol
     switch(this.probeKind()) {
       case "udp":