@eluvio/elv-client-js 4.0.84 → 4.0.86

package/dist/src/client/NFT.js

@@ -1,8 +1,8 @@
 var _regeneratorRuntime = require("@babel/runtime/regenerator");
 var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 /**
  * Methods for creating and managing NFTs
  *

package/dist/src/walletClient/ClientMethods.js

@@ -1,8 +1,8 @@
 var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _regeneratorRuntime = require("@babel/runtime/regenerator");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Utils = require("../Utils");
 var UrlJoin = require("url-join");
 var _require = require("./Utils"),

package/dist/src/walletClient/Profile.js

@@ -2,8 +2,8 @@ var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _typeof = require("@babel/runtime/helpers/typeof");
 var _regeneratorRuntime = require("@babel/runtime/regenerator");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Utils = require("../Utils");
 var UrlJoin = require("url-join");
 var StateStorePath = function StateStorePath(_ref) {

package/dist/src/walletClient/Utils.js

@@ -2,8 +2,8 @@ var _regeneratorRuntime = require("@babel/runtime/regenerator");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _slicedToArray = require("@babel/runtime/helpers/slicedToArray");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var Utils = require("../Utils");
 var RarityToPercentage = function RarityToPercentage(rarity) {
   if (!rarity) {

package/dist/src/walletClient/index.js

@@ -5,8 +5,8 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
 var _createClass = require("@babel/runtime/helpers/createClass");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var _require = require("../ElvClient"),
   ElvClient = _require.ElvClient;
 var Configuration = require("./Configuration");

package/package.json

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

package/src/ElvClient.js

@@ -20,12 +20,13 @@ const Pako = require("pako");
 const {
   ValidatePresence
 } = require("./Validation");
-const CBOR = require("cbor-x");
+const UrlJoin = require("url-join");
 
 const networks = {
   "main": "https://main.net955305.contentfabric.io",
   "demo": "https://demov3.net955210.contentfabric.io",
   "demov3": "https://demov3.net955210.contentfabric.io",
+  "local": "http://127.0.0.1:8008/config?qspace=dev&self",
   "test": "https://test.net955203.contentfabric.io"
 };
 
@@ -134,7 +135,7 @@ class ElvClient {
    * @param {Array<string>=} searchURIs - A list of full URIs to search service endpoints
    * @param {number=} ethereumContractTimeout=10 - Number of seconds to wait for contract calls
    * @param {string=} trustAuthorityId - (OAuth) The ID of the trust authority to use for OAuth authentication
-   * @param {string=} staticToken - Static token that will be used for all authorization in place of normal auth
+   * @param {string=} staticToken - Static token that will be used for all authorization in place of normal auth. Also known as an anonymous token containing the space
    * @param {boolean=} noCache=false - If enabled, blockchain transactions will not be cached
    * @param {boolean=} noAuth=false - If enabled, blockchain authorization will not be performed
    * @param {boolean=} assumeV3=false - If enabled, V3 fabric will be assumed
@@ -274,6 +275,17 @@ class ElvClient {
     }
   }
 
+  /**
+   * Return a list of valid Eluvio Content Fabric network names and their associated configuration URLs
+   *
+   * @methodGroup Miscellaneous
+   *
+   * @return {Object} - An object using network names as keys and configuration URLs as values.
+   */
+  static Networks() {
+    return networks;
+  }
+
   /**
    * Create a new ElvClient for the specified network
    *
@@ -574,78 +586,65 @@ class ElvClient {
    * @param {string=} matchEndpoint - Return node(s) matching the specified endpoint
    * @param {string=} matchNodeId - Return node(s) matching the specified node ID
    *
-   * @return {Array<Object>} - A list of nodes in the space matching the parameters
+   * @return {Promise<Array<Object>>} - A list of nodes in the space matching the parameters
    */
   async SpaceNodes({matchEndpoint, matchNodeId}={}) {
-    let bign = await this.CallContractMethod({
-      contractAddress: this.contentSpaceAddress,
-      methodName: "numActiveNodes",
-    });
-    let n = bign.toNumber();
-
-    return (await Utils.LimitedMap(
-      5,
-      [...new Array(n)],
-      async (_, index) => {
-        let bigi = Ethers.BigNumber.from(index);
-        let addr = await this.CallContractMethod({
-          contractAddress: this.contentSpaceAddress,
-          methodName: "activeNodeAddresses",
-          methodArgs: [bigi],
-          formatArguments: true
-        });
-
-        let nodeId = this.utils.AddressToNodeId(addr);
-
-        if(matchNodeId && nodeId !== matchNodeId) {
-          return;
-        }
-
-        let locatorsHex = await this.CallContractMethod({
-          contractAddress: this.contentSpaceAddress,
-          methodName: "activeNodeLocators",
-          methodArgs: [bigi]
-        });
-
-        let node = {id: nodeId, endpoints: []};
+    let nodes;
+    this.SetStaticToken();
+
+    if(matchEndpoint) {
+      ({nodes} = await this.utils.ResponseToJson(
+        this.HttpClient.Request({
+          path: UrlJoin("nodes"),
+          method: "GET",
+          headers: {
+            Authorization: `Bearer ${this.staticToken}`
+          }
+        })
+      ));
 
-        // Parse locators CBOR
-        let locators = CBOR.decodeMultiple(
-          Buffer.from(
-            locatorsHex.slice(2, locatorsHex.length),
-            "hex"
-          )
-        );
+      if(!nodes || !Array.isArray(nodes) || nodes.length === 0) {
+        return [];
+      }
 
+      return nodes.filter(node => {
         let match = false;
 
-        if(locators.length >= 5) {
-          let fabArray = locators[4].fab;
-          if(fabArray) {
-            for(let i = 0; i < fabArray.length; i ++) {
-              let host = fabArray[i].host;
+        if(
+          node.services &&
+          node.services.fabric_api &&
+          node.services.fabric_api.urls
+        ) {
+          const results = (node.services.fabric_api.urls || []).find(url => url.includes(matchEndpoint));
 
-              if(matchEndpoint && !matchEndpoint.includes(host)) {
-                continue; // Not a match
-              }
+          if(results) {
+            match = true;
+          }
+        }
 
-              match = true;
-              let endpoint = fabArray[i].scheme + "://" + host;
+        if(matchNodeId && node.id === matchNodeId) {
+          match = true;
+        }
 
-              if(fabArray[i].port) {
-                endpoint = endpoint + ":" + fabArray[i].port;
-              }
+        this.ClearStaticToken();
 
-              endpoint = endpoint + "/" + fabArray[i].path;
-              node.endpoints.push(endpoint);
-            }
+        return match;
+      });
+    } else if(matchNodeId) {
+      this.SetStaticToken();
+      let node = await this.utils.ResponseToJson(
+        this.HttpClient.Request({
+          path: UrlJoin("nodes", matchNodeId),
+          method: "GET",
+          headers: {
+            Authorization: `Bearer ${this.staticToken}`
           }
-        }
+        })
+      );
 
-        return match ? node : undefined;
-      }
-    ))
-      .filter(n => n);
+      this.ClearStaticToken();
+      return [node];
+    }
   }
 
   /**
@@ -991,11 +990,11 @@ class ElvClient {
    * @param {string} messasge - A JSON object representing the message to sign
    */
   async CreateSignedMessageJSON({
-      message
+    message
   }) {
 
     // Only one kind of signature supported currently
-    const type = "mje_" // JSON message, EIP192 signature
+    const type = "mje_"; // JSON message, EIP192 signature
 
     const msg = JSON.stringify(message);
     const signature = await this.PersonalSign({message: msg, addEthereumPrefix: true});
@@ -1020,23 +1019,23 @@ class ElvClient {
   })  {
     const type = signedMessage.slice(0,4);
     switch(type) {
-        case "mje_":
-            const msgBytes = Utils.FromB58(signedMessage.slice(4));
-            const signature = msgBytes.slice(0, 65);
-            const msg = msgBytes.slice(65);
-            const obj = JSON.parse(msg);
-
-            const prefixedMsgHash = Ethers.utils.keccak256(Buffer.from(`\x19Ethereum Signed Message:\n${msg.length}${msg}`, "utf-8"));
-            const signerAddr = Ethers.utils.recoverAddress(prefixedMsgHash, signature);
-
-            return {
-                type: type,
-                message: obj,
-                signerAddress: signerAddr,
-                signature: "0x" + signature.toString("hex")
-            };
-        default:
-            throw new Error(`Bad message type: ${type}`);
+      case "mje_":
+        const msgBytes = Utils.FromB58(signedMessage.slice(4));
+        const signature = msgBytes.slice(0, 65);
+        const msg = msgBytes.slice(65);
+        const obj = JSON.parse(msg);
+
+        const prefixedMsgHash = Ethers.utils.keccak256(Buffer.from(`\x19Ethereum Signed Message:\n${msg.length}${msg}`, "utf-8"));
+        const signerAddr = Ethers.utils.recoverAddress(prefixedMsgHash, signature);
+
+        return {
+          type: type,
+          message: obj,
+          signerAddress: signerAddr,
+          signature: "0x" + signature.toString("hex")
+        };
+      default:
+        throw new Error(`Bad message type: ${type}`);
     }
   }
 

package/src/RemoteSigner.js

@@ -2,6 +2,7 @@ const Ethers = require("ethers");
 const Utils = require("./Utils");
 const HttpClient = require("./HttpClient");
 const UrlJoin = require("url-join");
+const UUID = require("uuid");
 
 class RemoteSigner extends Ethers.Signer {
   constructor({
@@ -72,6 +73,59 @@ class RemoteSigner extends Ethers.Signer {
     this.signer = this.provider.getSigner(this.address);
   }
 
+  async RetrieveCSAT({email, nonce, force=false}) {
+    nonce = nonce || Utils.B58(UUID.parse(UUID.v4()));
+
+    let response = await Utils.ResponseToJson(
+      this.HttpClient.Request({
+        method: "POST",
+        body: {
+          email,
+          nonce,
+          force
+        },
+        path: UrlJoin("as", "wlt", "sign", "csat"),
+        headers: {
+          Authorization: `Bearer ${this.authToken}`
+        },
+      })
+    );
+
+    response.nonce = nonce;
+
+    return response;
+  }
+
+  async CSATStatus({accessToken}) {
+    try {
+      const response = await Utils.ResponseToJson(
+        this.HttpClient.Request({
+          method: "POST",
+          path: UrlJoin("as", "wlt", "login", "status"),
+          headers: {
+            Authorization: `Bearer ${accessToken}`
+          },
+        })
+      );
+
+      return response && response.is_active;
+    } catch(error) {
+      return !error || error.status !== 403;
+    }
+  }
+
+  async ReleaseCSAT({accessToken}) {
+    return await Utils.ResponseToJson(
+      this.HttpClient.Request({
+        method: "POST",
+        path: UrlJoin("as", "wlt", "login", "release"),
+        headers: {
+          Authorization: `Bearer ${accessToken}`
+        },
+      })
+    );
+  }
+
   // Overrides
 
   getAddress() {

package/src/client/ContentAccess.js

@@ -1152,8 +1152,8 @@ exports.LatestVersionHashV2 = async function({objectId, versionHash}) {
     latestHash = q.hash;
 
   } catch(error) {
-    console.log("ERROR", error);
-    throw Error(`Unable to determine latest version hash for ${versionHash || objectId}`);
+    error.message = `Unable to determine latest version hash for ${versionHash || objectId}`;
+    throw error;
   }
   return latestHash;
 };
@@ -2322,17 +2322,17 @@ exports.EmbedUrl = async function({
         break;
       case "useTicketCodes":
         embedUrl.searchParams.set("ptk", "");
-        if (options.tenantId) {
+        if(options.tenantId) {
           embedUrl.searchParams.set("ten", options.tenantId);
         }
-        if (options.ntpId) {
+        if(options.ntpId) {
           embedUrl.searchParams.set("ntp", options.ntpId);
         }
-        if (options.ticketCode) {
+        if(options.ticketCode) {
           embedUrl.searchParams.set("tk", Buffer.from(options.ticketCode).toString("base64"));
 
         }
-        if (options.ticketSubject) {
+        if(options.ticketSubject) {
           embedUrl.searchParams.set("sbj", Buffer.from(options.ticketSubject).toString("base64"));
         }
         break;

package/src/client/ContentManagement.js

@@ -1054,13 +1054,27 @@ exports.PublishContentVersion = async function({objectId, versionHash, awaitComm
   if(awaitCommitConfirmation) {
     const pollingInterval = 500; // ms
     let tries = 20;
-    while (tries > 0) {
-      const h = await this.LatestVersionHashV2({objectId});
-      if (h == versionHash) {
-        this.Log(`Commit confirmed on fabric node: ${versionHash}`);
-        break;
+    while(tries > 0) {
+      let h;
+
+      try {
+        h = await this.LatestVersionHashV2({objectId});
+
+        if(h === versionHash) {
+          this.Log(`Commit confirmed on fabric node: ${versionHash}`);
+          break;
+        } else {
+          tries--;
+          await new Promise(resolve => setTimeout(resolve, pollingInterval));
+        }
+      } catch(error) {
+        if(error.status !== 404) {
+          throw error;
+        }
+
+        tries--;
+        await new Promise(resolve => setTimeout(resolve, pollingInterval));
       }
-      await new Promise(resolve => setTimeout(resolve, pollingInterval));
     }
   }
 

package/src/client/LiveConf.js

@@ -232,13 +232,13 @@ class LiveConf {
     return seg;
   }
 
- /*
+  /*
   * Calculate output timebase from the encoder (codec) timebase. The videoTimeBase parameter
   * represents the encoder timebase. The format muxer will change it so it is greater than 10000.
   */
   calcOutputTimebase(codecTimebase) {
     let outputTimebase = codecTimebase;
-    while (outputTimebase < 10000)
+    while(outputTimebase < 10000)
       outputTimebase = outputTimebase * 2;
     return outputTimebase;
   }
@@ -404,7 +404,7 @@ class LiveConf {
     }
 
     // If no audio streams specified in custom config, set up all the suitable audio streams in the probe
-    if (Object.keys(audioStreams).length == 0) {
+    if (!customSettings.audio) {
       audioStreams = this.getAudioStreamsFromProbe();
     }
 

package/src/client/LiveStream.js

@@ -29,18 +29,18 @@ const CueInfo = async ({eventId, status}) => {
     const lroStatusResponse = await this.utils.ResponseToJson(
       await HttpClient.Fetch(status.lro_status_url)
     );
-    console.log("lroStatusResponse", lroStatusResponse)
+    console.log("lroStatusResponse", lroStatusResponse);
     cues = lroStatusResponse.custom.cues;
-  } catch (error) {
+  } catch(error) {
     console.log("LRO status failed", error);
     return {error: "failed to retrieve status", eventId};
   }
 
   let eventStart, eventEnd;
-  for (const value of Object.values(cues)) {
-    for (const event of Object.values(value.descriptors)) {
-      if (event.id == eventId) {
-        switch (event.type_id) {
+  for(const value of Object.values(cues)) {
+    for(const event of Object.values(value.descriptors)) {
+      if(event.id == eventId) {
+        switch(event.type_id) {
           case 32:
           case 16:
             eventStart = value.insertion_time;
@@ -56,7 +56,7 @@ const CueInfo = async ({eventId, status}) => {
   }
 
   return {eventStart, eventEnd, eventId};
-}
+};
 
 /**
  * Set the offering for the live stream
@@ -860,7 +860,7 @@ exports.StreamStopSession = async function({name}) {
         return {
           state: status.state,
           error: "The stream must be stopped before terminating"
-        }
+        };
       }
 
       await this.DeleteWriteToken({
@@ -1355,7 +1355,10 @@ exports.StreamConfig = async function({name, customSettings={}, probeMetadata})
     status.error = "No node matching stream URL " + streamUrl.href;
     return status;
   }
-  const node = nodes[0];
+  const node = {
+    endpoints: nodes[0].services.fabric_api.urls,
+    id: nodes[0].id
+  };
   status.node = node;
   let endpoint = node.endpoints[0];
 
@@ -1547,7 +1550,7 @@ exports.StreamListUrls = async function({siteId}={}) {
           url,
           active: activeUrlMap[url] || false
         };
-      })
+      });
     });
 
     return streamUrlStatus;

package/src/walletClient/index.js

@@ -395,7 +395,15 @@ class ElvWalletClient {
    *
    * @methodGroup Login
    */
-  LogOut() {
+  async LogOut() {
+    if(this.__authorization.nonce) {
+      try {
+        await this.client.signer.ReleaseCSAT({accessToken: this.AuthToken()});
+      } catch(error) {
+        this.Log("Failed to release token", true, error);
+      }
+    }
+
     this.__authorization = {};
     this.loggedIn = false;
 
@@ -410,6 +418,14 @@ class ElvWalletClient {
     }
   }
 
+  async TokenStatus() {
+    if(!this.__authorization || !this.__authorization.nonce) {
+      return true;
+    }
+
+    return await this.client.signer.CSATStatus({accessToken: this.AuthToken()});
+  }
+
   /**
    * Authenticate with an ElvWalletClient authorization token
    *
@@ -457,7 +473,7 @@ class ElvWalletClient {
    * - signingToken - Identical to `authToken`, but also includes the ability to perform arbitrary signatures with the custodial wallet. This token should be protected and should not be
    * shared with third parties.
    */
-  async AuthenticateOAuth({idToken, tenantId, email, signerURIs, shareEmail=false}) {
+  async AuthenticateOAuth({idToken, tenantId, email, signerURIs, shareEmail=false, extraData={}, nonce, createRemoteToken=true, force=false}) {
     let tokenDuration = 24;
 
     if(!tenantId && this.selectedMarketplaceInfo) {
@@ -466,13 +482,21 @@ class ElvWalletClient {
       tenantId = this.selectedMarketplaceInfo.tenantId;
     }
 
-    await this.client.SetRemoteSigner({idToken, tenantId, signerURIs, extraData: { share_email: shareEmail }, unsignedPublicAuth: true});
+    await this.client.SetRemoteSigner({idToken, tenantId, signerURIs, extraData: { ...extraData, share_email: shareEmail }, unsignedPublicAuth: true});
 
-    const expiresAt = Date.now() + tokenDuration * 60 * 60 * 1000;
-    const fabricToken = await this.client.CreateFabricToken({
-      duration: tokenDuration * 60 * 60 * 1000,
-      //context: email ? {usr: {email}} : {}
-    });
+    let fabricToken, expiresAt;
+    if(createRemoteToken && this.client.signer.remoteSigner) {
+      expiresAt = Date.now() + 24 * 60 * 60 * 1000;
+      const tokenResponse = await this.client.signer.RetrieveCSAT({email, nonce, force});
+      fabricToken = tokenResponse.token;
+      nonce = tokenResponse.nonce;
+    } else {
+      expiresAt = Date.now() + tokenDuration * 60 * 60 * 1000;
+      fabricToken = await this.client.CreateFabricToken({
+        duration: tokenDuration * 60 * 60 * 1000,
+        context: email ? {usr: {email}} : {}
+      });
+    }
     const address = this.client.utils.FormatAddress(this.client.CurrentAccountAddress());
 
     if(!email) {
@@ -496,7 +520,8 @@ class ElvWalletClient {
         signerURIs,
         walletType: "Custodial",
         walletName: "Eluvio",
-        register: true
+        register: true,
+        nonce
       }),
       signingToken: this.SetAuthorization({
         clusterToken: this.client.signer.authToken,
@@ -507,7 +532,8 @@ class ElvWalletClient {
         expiresAt,
         signerURIs,
         walletType: "Custodial",
-        walletName: "Eluvio"
+        walletName: "Eluvio",
+        nonce
       })
     };
   }
@@ -568,7 +594,7 @@ class ElvWalletClient {
     return this.__authorization.fabricToken;
   }
 
-  SetAuthorization({clusterToken, fabricToken, tenantId, address, email, expiresAt, signerURIs, walletType, walletName, register=false}) {
+  SetAuthorization({clusterToken, fabricToken, tenantId, address, email, expiresAt, signerURIs, walletType, walletName, nonce, register=false}) {
     address = this.client.utils.FormatAddress(address);
 
     this.__authorization = {
@@ -578,7 +604,8 @@ class ElvWalletClient {
       email,
       expiresAt,
       walletType,
-      walletName
+      walletName,
+      nonce
     };
 
     if(clusterToken) {
@@ -1328,7 +1355,7 @@ class ElvWalletClient {
 
           if(op === "nft-claim-entitlement") {
             let [op, marketplace, sku, purchaseId ] = status.op.split(":");
-            confirmationId = purchaseId
+            confirmationId = purchaseId;
             if(status.extra && status.extra["0"]) {
               address = status.extra["0"].token_addr;
               tokenId = status.extra["0"].token_id;