@eluvio/elv-client-js 4.2.27 → 4.2.30

package/src/client/LiveStream.js

@@ -1090,9 +1090,9 @@ exports.StreamStatus = async function({name, showParams=false, writeToken}) {
         status.recordingStatus = lroStatus.custom.status;
       }
     } catch(error) {
-      console.log("LRO Status (failed): ", error.response.statusCode);
+      console.log("LRO Status (failed): ", error.response?.statusCode);
       status.state = "stopped";
-      status.error = error.response;
+      status.error = error.response || error.message;
       return status;
     }
 
@@ -3532,6 +3532,13 @@ exports.OutputsList = async function({libraryId, objectId, includeState=true}) {
       method: "live/outputs",
       constant:  true
     });
+  } catch(error) {
+    if(error.status === 404) {
+      // Stream object may have been deleted
+      return {};
+    }
+
+    throw error;
   } finally {
     restore();
   }
@@ -3544,17 +3551,22 @@ exports.OutputsList = async function({libraryId, objectId, includeState=true}) {
       const streamId = value.input?.stream;
       if(!streamId) { return; }
 
-      const [streamLibraryId, streamStatus] = await Promise.all([
-        this.ContentObjectLibraryId({objectId: streamId}),
-        this.StreamStatus({name: streamId})
-      ]);
-
-      value.input.name = await this.ContentObjectMetadata({
-        libraryId: streamLibraryId,
-        objectId: streamId,
-        metadataSubtree: "/public/name",
-      });
-      value.input.status = streamStatus?.state;
+      try {
+        const [streamLibraryId, streamStatus] = await Promise.all([
+          this.ContentObjectLibraryId({objectId: streamId}),
+          this.StreamStatus({name: streamId})
+        ]);
+
+        value.input.name = await this.ContentObjectMetadata({
+          libraryId: streamLibraryId,
+          objectId: streamId,
+          metadataSubtree: "/public/name",
+        });
+        value.input.status = streamStatus?.state;
+      } catch(error) {
+        // Stream object may have been deleted
+        value.input.status = "unavailable";
+      }
     }
   );
 
@@ -3569,9 +3581,13 @@ exports.OutputsList = async function({libraryId, objectId, includeState=true}) {
 
   const nodeUrls = {};
   await this.utils.LimitedMap(10, nodeIds, async nodeId => {
-    const nodes = await this.SpaceNodes({matchNodeId: nodeId});
-    const fabricUrl = nodes?.[0]?.services?.fabric_api?.urls?.[0];
-    if(fabricUrl) { nodeUrls[nodeId] = fabricUrl; }
+    try {
+      const nodes = await this.SpaceNodes({matchNodeId: nodeId});
+      const fabricUrl = nodes?.[0]?.services?.fabric_api?.urls?.[0];
+      if(fabricUrl) { nodeUrls[nodeId] = fabricUrl; }
+    } catch(error) {
+      this.Log(`Failed to resolve node ${nodeId}: ${error.message}`, true);
+    }
   });
 
   // Rewrite fabric-generated srt_pull URLs to the egress host, and group outputs by node

package/utilities/MigrateEncryptionConkForNewUser.js

@@ -0,0 +1,62 @@
+const {NewOpt} = require("./lib/options");
+const Utility = require("./lib/Utility");
+
+const Client = require("./lib/concerns/Client");
+const Edit = require("./lib/concerns/Edit");
+
+class MigrateEncryptionConkForNewUser extends Utility {
+  blueprint() {
+    return {
+      concerns: [Client, Edit],
+      options: [
+        NewOpt("objectId",
+          {
+            descTemplate: "object Id",
+            type: "string",
+            demand: true
+          }),
+        NewOpt("publicKey",
+          {
+            descTemplate: "new user public key with/without encoded form",
+            type: "string",
+            demand: true
+          })
+      ]
+    };
+  }
+
+  async body() {
+    const logger = this.logger;
+    const {objectId, publicKey} = this.args;
+
+    const client = await this.concerns.Client.get();
+    const libraryId = await client.ContentObjectLibraryId({objectId});
+
+    const res =  await client.EditContentObject({libraryId, objectId});
+
+    await client.MigrateEncryptionConkForUserProvided({
+      libraryId,
+      objectId,
+      writeToken: res.writeToken,
+      newEncodedUserPublicKey: publicKey
+    });
+    logger.log("Migration of encryption conk is complete...");
+
+    const versionHash = await this.concerns.Edit.finalize({
+      libraryId,
+      objectId,
+      writeToken:res.writeToken
+    });
+    logger.log("version hash", versionHash);
+  }
+
+  header() {
+    return `Add encryption conk for user provided '${this.args.objectId}':`;
+  }
+}
+
+if(require.main === module) {
+  Utility.cmdLineInvoke(MigrateEncryptionConkForNewUser);
+} else {
+  module.exports = MigrateEncryptionConkForNewUser;
+}

package/utilities/ObjectAddFiles.js

@@ -1,6 +1,6 @@
 // Create new production master from specified file(s)
 
-const {ModOpt, StdOpt} = require("./lib/options");
+const {ModOpt, StdOpt, NewOpt} = require("./lib/options");
 const Utility = require("./lib/Utility");
 
 const ArgNoWait = require("./lib/concerns/ArgNoWait");
@@ -16,14 +16,19 @@ class ObjectAddFiles extends Utility {
       concerns: [Logger, ExistObj, Edit, ArgNoWait, LocalFile, CloudFile],
       options: [
         ModOpt("files", {X: "to add"}),
-        StdOpt("encrypt", {X: "uploaded files"})
+        StdOpt("encrypt", {X: "uploaded files"}),
+        NewOpt("resume", {
+          descTemplate: "If specified, resume jobs for the given write token (--resume 'write_token')",
+          group: "Main",
+          type: "string"
+        })
       ]
     };
   }
 
   async body() {
     const logger = this.logger;
-    const {encrypt, noWait} = this.args;
+    const {encrypt, noWait, resume: resumeArg} = this.args;
 
     let access;
     if(this.args.s3Reference || this.args.s3Copy) access = this.concerns.CloudFile.credentialSet();
@@ -35,10 +40,22 @@ class ObjectAddFiles extends Utility {
 
     const {libraryId, objectId} = await this.concerns.ExistObj.argsProc();
 
-    const writeToken = await this.concerns.Edit.getWriteToken({
-      libraryId,
-      objectId
-    });
+    let writeToken;
+    let resume=false;
+    if(resumeArg) {
+      writeToken = resumeArg;
+      resume=true;
+    } else {
+      // create new write token
+      writeToken = await this.concerns.Edit.getWriteToken({
+        libraryId,
+        objectId
+      });
+    }
+    logger.data("WRITE_TOKEN", writeToken);
+    // eslint-disable-next-line no-console
+    console.log("Using write token:", writeToken);
+
 
     if(access) {
       await this.concerns.CloudFile.add({
@@ -47,7 +64,8 @@ class ObjectAddFiles extends Utility {
         writeToken,
         access,
         fileInfo,
-        encrypt
+        encrypt,
+        resume,
       });
     } else {
       await this.concerns.LocalFile.add({
@@ -55,12 +73,14 @@ class ObjectAddFiles extends Utility {
         objectId,
         writeToken,
         fileInfo,
-        encrypt
+        encrypt,
+        resume,
       });
       // Close file handles
       this.concerns.LocalFile.closeFileHandles(fileHandles);
     }
 
+    // finalize the write token
     const hash = await this.concerns.Edit.finalize({
       libraryId,
       noWait,

package/utilities/lib/concerns/CloudFile.js

@@ -95,7 +95,7 @@ const New = context => {
     );
   };
 
-  const add = async ({libraryId, objectId, writeToken, files, access, encrypt, copy}) => {
+  const add = async ({libraryId, objectId, writeToken, files, access, encrypt, copy, resume}) => {
     if(kindOf(copy) === "undefined") copy = isCopy();
     files = files || context.args.files;
     const groupedFiles = groupByPathMatch(access, files);
@@ -125,6 +125,7 @@ const New = context => {
         secret,
         signedUrl,
         copy,
+        resume,
         callback,
         encryption: encrypt ? "cgck" : "none"
       });

package/utilities/lib/concerns/LocalFile.js

@@ -19,7 +19,7 @@ const blueprint = {
 
 const New = context => {
 
-  const add = async ({libraryId, objectId, writeToken, fileInfo, encrypt}) => {
+  const add = async ({libraryId, objectId, writeToken, fileInfo, encrypt, resume}) => {
     const client = await context.concerns.Client.get();
     await client.UploadFiles({
       libraryId,
@@ -27,6 +27,7 @@ const New = context => {
       writeToken,
       fileInfo,
       callback,
+      resume,
       encryption: encrypt ? "cgck" : "none"
     });
   };

package/dist/src/ContentObjectVerification.js

@@ -1,281 +0,0 @@
-var _regeneratorRuntime = require("@babel/runtime/regenerator");
-var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
-function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-var CBOR = require("cbor");
-var SJCL = require("sjcl");
-var MultiHash = require("multihashes");
-var DeepEqual = require("deep-equal");
-var Utils = require("./Utils");
-var ContentObjectVerification = {
-  VerifyContentObject: function VerifyContentObject(_ref) {
-    return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var client, libraryId, objectId, versionHash, response, partHash, qpartsResponse, partVerification, qmdHash, metadataPartHash, metadataPartResponse, metadataVerification, metadata, qstructHash, structPartHash, structPartResponse, structVerification;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            client = _ref.client, libraryId = _ref.libraryId, objectId = _ref.objectId, versionHash = _ref.versionHash;
-            response = {
-              hash: versionHash
-            };
-            partHash = Utils.DecodeVersionHash(versionHash).partHash;
-            _context.next = 5;
-            return client.QParts({
-              libraryId: libraryId,
-              objectId: objectId,
-              partHash: partHash,
-              format: "arrayBuffer"
-            }).then(function (response) {
-              return Buffer.from(response);
-            });
-          case 5:
-            qpartsResponse = _context.sent;
-            partVerification = ContentObjectVerification._VerifyPart({
-              partHash: partHash,
-              qpartsResponse: qpartsResponse
-            });
-            if (partVerification.valid) {
-              response.qref = {
-                valid: true
-              };
-            } else {
-              response.qref = {
-                valid: false,
-                error: partVerification.error.message
-              };
-            }
-            response.qref.hash = partHash;
-            if (!response.qref.valid) {
-              _context.next = 32;
-              break;
-            }
-            // Validate Metadata
-            qmdHash = partVerification.cbor.QmdHash.value;
-            metadataPartHash = "hqp_" + MultiHash.toB58String(qmdHash.slice(1, qmdHash.length));
-            _context.next = 14;
-            return client.QParts({
-              libraryId: libraryId,
-              objectId: objectId,
-              partHash: metadataPartHash,
-              format: "arrayBuffer"
-            }).then(function (response) {
-              return Buffer.from(response);
-            });
-          case 14:
-            metadataPartResponse = _context.sent;
-            metadataVerification = ContentObjectVerification._VerifyPart({
-              partHash: metadataPartHash,
-              qpartsResponse: metadataPartResponse
-            });
-            if (metadataVerification.valid) {
-              response.qmd = {
-                valid: true
-              };
-            } else {
-              response.qmd = {
-                valid: false,
-                error: metadataVerification.error.message
-              };
-            }
-            response.qmd.hash = metadataPartHash;
-            if (!(response.qmd.valid && libraryId)) {
-              _context.next = 23;
-              break;
-            }
-            _context.next = 21;
-            return client.ContentObjectMetadata({
-              libraryId: libraryId,
-              objectId: objectId,
-              versionHash: partHash.replace("hqp_", "hq__")
-            });
-          case 21:
-            metadata = _context.sent;
-            response.qmd.check = ContentObjectVerification._VerifyMetadata({
-              metadataCbor: metadataVerification.cbor,
-              metadata: metadata
-            });
-          case 23:
-            // Validate Qstruct
-            qstructHash = partVerification.cbor.QstructHash.value;
-            structPartHash = "hqp_" + MultiHash.toB58String(qstructHash.slice(1, qstructHash.length));
-            _context.next = 27;
-            return client.QParts({
-              libraryId: libraryId,
-              objectId: objectId,
-              partHash: structPartHash,
-              format: "arrayBuffer"
-            }).then(function (response) {
-              return Buffer.from(response);
-            });
-          case 27:
-            structPartResponse = _context.sent;
-            structVerification = ContentObjectVerification._VerifyPart({
-              partHash: structPartHash,
-              qpartsResponse: structPartResponse
-            });
-            if (structVerification.valid) {
-              response.qstruct = {
-                valid: true
-              };
-            } else {
-              response.qstruct = {
-                valid: false,
-                error: structVerification.error.message
-              };
-            }
-            response.qstruct.hash = structPartHash;
-            if (response.qstruct.valid) {
-              response.qstruct.parts = ContentObjectVerification._FormatQStruct(structVerification.cbor.Parts);
-            }
-          case 32:
-            response.valid = response.qref.valid && response.qmd.valid && response.qstruct.valid && (!response.qmd.check || response.qmd.check.valid);
-            return _context.abrupt("return", response);
-          case 34:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }))();
-  },
-  // Content verification methods //
-  _FormatQStruct: function _FormatQStruct(structParts) {
-    if (!structParts) {
-      return [];
-    }
-    return structParts.map(function (structPart) {
-      return {
-        hash: "hqp_" + MultiHash.toB58String(structPart.Hash.value.slice(1, structPart.Hash.length)),
-        size: structPart.Size
-      };
-    });
-  },
-  _Hash: function _Hash(thing) {
-    function fromBits(arr) {
-      var out = [],
-        bl = SJCL.bitArray.bitLength(arr),
-        i,
-        tmp;
-      for (i = 0; i < bl / 8; i++) {
-        if ((i & 3) === 0) {
-          tmp = arr[i / 4];
-        }
-        out.push(tmp >>> 24);
-        tmp <<= 8;
-      }
-      return out;
-    }
-    function toBits(bytes) {
-      var out = [],
-        i,
-        tmp = 0;
-      for (i = 0; i < bytes.length; i++) {
-        tmp = tmp << 8 | bytes[i];
-        if ((i & 3) === 3) {
-          out.push(tmp);
-          tmp = 0;
-        }
-      }
-      if (i & 3) {
-        out.push(SJCL.bitArray.partial(8 * (i & 3), tmp));
-      }
-      return out;
-    }
-    var digest = SJCL.hash.sha256.hash(toBits(thing));
-    var bytes = fromBits(digest);
-    var out = Buffer.from(bytes, "binary");
-    return MultiHash.toB58String(MultiHash.encode(out, "sha2-256"));
-  },
-  _ParseCBOR: function _ParseCBOR(cborResponse) {
-    var buffer = cborResponse.slice(7, cborResponse.length);
-    var hex = buffer.toString("hex");
-    return CBOR.decodeFirstSync(hex);
-  },
-  _VerifyPart: function _VerifyPart(_ref2) {
-    var partHash = _ref2.partHash,
-      qpartsResponse = _ref2.qpartsResponse;
-    try {
-      if (ContentObjectVerification._Hash(qpartsResponse) !== partHash.replace("hqp_", "")) {
-        throw Error("Hashes do not match");
-      }
-      var cbor = ContentObjectVerification._ParseCBOR(qpartsResponse);
-      return {
-        valid: true,
-        cbor: cbor
-      };
-    } catch (error) {
-      return {
-        valid: false,
-        error: error
-      };
-    }
-  },
-  _VerifyMetadata: function _VerifyMetadata(_ref3) {
-    var metadataCbor = _ref3.metadataCbor,
-      metadata = _ref3.metadata;
-    if (!metadataCbor) {
-      metadataCbor = {};
-    }
-    if (!metadata) {
-      metadata = {};
-    }
-    var response = {
-      valid: true,
-      invalidValues: []
-    };
-    var cborKeys = Object.keys(metadataCbor);
-    var metadataKeys = Object.keys(metadata);
-
-    // Find any difference between top level keys
-    var differentKeys = cborKeys.filter(function (x) {
-      return !metadataKeys.includes(x);
-    }).concat(metadataKeys.filter(function (x) {
-      return !cborKeys.includes(x);
-    }));
-    var _iterator = _createForOfIteratorHelper(differentKeys),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var key = _step.value;
-        var cborValue = metadataCbor[key];
-        var metadataValue = metadata[key];
-        response.invalidValues.push({
-          key: key,
-          cborValue: cborValue,
-          metadataValue: metadataValue
-        });
-      }
-
-      // Deep comparison of up to 5 keys
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-    var _iterator2 = _createForOfIteratorHelper(Object.keys(metadataCbor).slice(0, 5)),
-      _step2;
-    try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        var fieldToValidate = _step2.value;
-        var _cborValue = metadataCbor[fieldToValidate];
-        var _metadataValue = metadata[fieldToValidate];
-        if (!DeepEqual(_cborValue, _metadataValue)) {
-          response.invalidValues.push({
-            key: fieldToValidate,
-            cborValue: _cborValue,
-            metadataValue: _metadataValue
-          });
-        }
-      }
-    } catch (err) {
-      _iterator2.e(err);
-    } finally {
-      _iterator2.f();
-    }
-    if (response.invalidValues.length !== 0) {
-      response.valid = false;
-    }
-    return response;
-  }
-};
-module.exports = ContentObjectVerification;