@eluvio/elv-client-js 4.0.135 → 4.0.136

package/utilities/lib/concerns/ArgTenant.js

@@ -0,0 +1,23 @@
+// code related to tenant
+
+const Tenant = require("./Tenant");
+
+const blueprint = {
+  name: "ArgTenant",
+  concerns: [Tenant],
+  options: []
+};
+
+const New = context => {
+  const tenantInfo = async () => await context.concerns.Tenant.info();
+
+  // instance interface
+  return {
+    tenantInfo
+  };
+};
+
+module.exports = {
+  blueprint,
+  New
+};

package/utilities/lib/concerns/ContentType.js

@@ -46,4 +46,4 @@ const New = context => {
   };
 };
 
-module.exports = {blueprint, New};
+module.exports = {blueprint, New};

package/utilities/lib/concerns/Finalize.js

@@ -35,12 +35,17 @@ const New = context => {
     let publishFinished = false;
     let latestObjectData = {};
     while(!publishFinished) {
-      latestObjectData = await client.ContentObject({libraryId, objectId});
-      if(latestObjectData.hash === latestHash) {
-        logger.log("New object version now available");
-        publishFinished = true;
-      } else {
-        logger.log("  new version not available yet, waiting 15 seconds...");
+      try {
+        latestObjectData = await client.ContentObject({libraryId, objectId});
+        if(latestObjectData.hash === latestHash) {
+          logger.log("New object version now available");
+          publishFinished = true;
+        } else {
+          logger.log("  new version not available yet, waiting 15 seconds...");
+          await seconds(15);
+        }
+      } catch(error) {
+        console.error(`Waiting for master object publishing hash: ${latestHash}. Retrying.`, error);
         await seconds(15);
       }
     }
@@ -52,4 +57,4 @@ const New = context => {
 module.exports = {
   blueprint,
   New
-};
+};

package/utilities/lib/concerns/LRO.js

@@ -73,9 +73,9 @@ const New = context => {
     statusEntry.run_state = state;
   };
 
-  const status = async ({libraryId, objectId}) => {
+  const status = async ({libraryId, objectId, writeToken}) => {
     const client = await context.concerns.Client.get();
-    const statusMap = await client.LROStatus({libraryId, objectId}); // TODO: check how offering key is used, if at all
+    const statusMap = await client.LROStatus({libraryId, objectId, writeToken}); // TODO: check how offering key is used, if at all
 
     if(kindOf(statusMap)==="undefined") throw Error("Received no job status information from server - object already finalized?");
     return statusMapProcess(statusMap);
@@ -151,4 +151,4 @@ module.exports = {
   STATE_STALLED,
   STATE_BAD_PCT,
   STATE_ERROR,
-};
+};

package/utilities/lib/concerns/Tenant.js

@@ -0,0 +1,47 @@
+// code related to tenant data
+const Client = require("./Client");
+const Logger = require("./Logger");
+
+const blueprint = {
+  name: "Tenant",
+  concerns: [Client, Logger]
+};
+
+const New = context => {
+  const logger = context.concerns.Logger;
+
+  const info = async () => {
+    const client = await context.concerns.Client.get();
+    const tenantId = await client.userProfileClient.TenantContractId();
+    logger.log(`Getting info for tenant ${tenantId}...`);
+
+    const metadata = await client.ContentObjectMetadata({
+      libraryId: tenantId.replace("iten", "ilib"),
+      objectId: tenantId.replace("iten", "iq__"),
+      metadataSubtree: "public",
+      select: [
+        "sites/live_streams",
+        "content_types/live_stream",
+        "content_types/title"
+      ]
+    });
+
+    const typeTitle = metadata.content_types && metadata.content_types.title;
+    const typeLiveStream = metadata.content_types && metadata.content_types.live_stream;
+    const sitesLiveStream = metadata.sites && metadata.sites.live_streams;
+
+    return {
+      typeTitle,
+      typeLiveStream,
+      sitesLiveStream,
+      tenantId
+    };
+  };
+
+  return {info};
+};
+
+module.exports = {
+  blueprint,
+  New
+};