@churchapps/content-providers 0.1.4 → 0.1.6

package/dist/index.d.cts

@@ -620,7 +620,7 @@ declare class HighVoltageKidsProvider implements IProvider {
  *   /                                    -> categories (Feature Films, Series, Collections)
  *   /{category}                          -> list items in category
  *   /{category}/{id}                     -> single video (feature film) or container children (series/collection)
- *   /{category}/{containerId}/{videoId}  -> single video within a container
+ *   /{category}/{...containerIds}/{id}   -> nested containers or single video (supports arbitrary depth)
  */
 declare class JesusFilmProvider implements IProvider {
     readonly id = "jesusfilm";

package/dist/index.d.ts

@@ -620,7 +620,7 @@ declare class HighVoltageKidsProvider implements IProvider {
  *   /                                    -> categories (Feature Films, Series, Collections)
  *   /{category}                          -> list items in category
  *   /{category}/{id}                     -> single video (feature film) or container children (series/collection)
- *   /{category}/{containerId}/{videoId}  -> single video within a container
+ *   /{category}/{...containerIds}/{id}   -> nested containers or single video (supports arbitrary depth)
  */
 declare class JesusFilmProvider implements IProvider {
     readonly id = "jesusfilm";

package/dist/index.js

@@ -486,13 +486,18 @@ var ApiHelper = class {
       const headers = { Accept: "application/json" };
       if (auth) headers["Authorization"] = `Bearer ${auth.access_token}`;
       if (body) headers["Content-Type"] = "application/json";
+      console.log(`[B1Church] apiRequest: ${method} ${url}`);
       const options = { method, headers, ...body ? { body: JSON.stringify(body) } : {} };
       const response = await fetch(url, options);
       if (!response.ok) {
+        console.warn(`[B1Church] apiRequest failed: ${method} ${url} \u2192 HTTP ${response.status} ${response.statusText}`);
         return null;
       }
-      return await response.json();
-    } catch {
+      const data = await response.json();
+      console.log(`[B1Church] apiRequest OK: ${method} ${url} \u2192 ${Array.isArray(data) ? data.length + " items" : typeof data}`);
+      return data;
+    } catch (err) {
+      console.error(`[B1Church] apiRequest error: ${method} ${config.apiBase}${path}`, err);
       return null;
     }
   }
@@ -1367,10 +1372,17 @@ async function authFetch(url, auth) {
     if (auth) {
       headers["Authorization"] = `Bearer ${auth.access_token}`;
     }
+    console.log(`[B1Church] authFetch: ${url}`);
     const response = await fetch(url, { method: "GET", headers });
-    if (!response.ok) return null;
-    return await response.json();
-  } catch {
+    if (!response.ok) {
+      console.warn(`[B1Church] authFetch failed: ${url} \u2192 HTTP ${response.status} ${response.statusText}`);
+      return null;
+    }
+    const data = await response.json();
+    console.log(`[B1Church] authFetch OK: ${url} \u2192 ${Array.isArray(data) ? data.length + " items" : typeof data}`);
+    return data;
+  } catch (err) {
+    console.error(`[B1Church] authFetch error: ${url}`, err);
     return null;
   }
 }
@@ -1389,20 +1401,34 @@ async function fetchPlans(planTypeId, auth) {
 async function fetchVenueFeed(venueId) {
   try {
     const url = `${LESSONS_API_BASE}/venues/public/feed/${venueId}`;
+    console.log(`[B1Church] fetchVenueFeed: ${url}`);
     const response = await fetch(url, { method: "GET", headers: { Accept: "application/json" } });
-    if (!response.ok) return null;
-    return await response.json();
-  } catch {
+    if (!response.ok) {
+      console.warn(`[B1Church] fetchVenueFeed failed: HTTP ${response.status} ${response.statusText} for venueId=${venueId}`);
+      return null;
+    }
+    const data = await response.json();
+    console.log(`[B1Church] fetchVenueFeed OK: venueId=${venueId}, sections=${data?.sections?.length ?? "none"}`);
+    return data;
+  } catch (err) {
+    console.error(`[B1Church] fetchVenueFeed error: venueId=${venueId}`, err);
     return null;
   }
 }
 async function fetchVenueActions(venueId) {
   try {
     const url = `${LESSONS_API_BASE}/venues/public/actions/${venueId}`;
+    console.log(`[B1Church] fetchVenueActions: ${url}`);
     const response = await fetch(url, { method: "GET", headers: { Accept: "application/json" } });
-    if (!response.ok) return null;
-    return await response.json();
-  } catch {
+    if (!response.ok) {
+      console.warn(`[B1Church] fetchVenueActions failed: HTTP ${response.status} ${response.statusText} for venueId=${venueId}`);
+      return null;
+    }
+    const data = await response.json();
+    console.log(`[B1Church] fetchVenueActions OK: venueId=${venueId}`);
+    return data;
+  } catch (err) {
+    console.error(`[B1Church] fetchVenueActions error: venueId=${venueId}`, err);
     return null;
   }
 }
@@ -1418,14 +1444,21 @@ async function fetchFromProviderProxy(method, ministryId, providerId, path, auth
     }
     const body = { ministryId, providerId, path };
     if (resolution !== void 0) body.resolution = resolution;
+    console.log(`[B1Church] providerProxy: ${method} providerId=${providerId} path=${path}`);
     const response = await fetch(url, {
       method: "POST",
       headers,
       body: JSON.stringify(body)
     });
-    if (!response.ok) return null;
-    return await response.json();
-  } catch {
+    if (!response.ok) {
+      console.warn(`[B1Church] providerProxy failed: ${method} \u2192 HTTP ${response.status} ${response.statusText}`);
+      return null;
+    }
+    const data = await response.json();
+    console.log(`[B1Church] providerProxy OK: ${method} \u2192 ${Array.isArray(data) ? data.length + " items" : typeof data}`);
+    return data;
+  } catch (err) {
+    console.error(`[B1Church] providerProxy error: ${method}`, err);
     return null;
   }
 }
@@ -1853,23 +1886,35 @@ var B1ChurchProvider = class {
     return null;
   }
   async getPlaylist(path, authData, resolution) {
+    console.log(`[B1Church] getPlaylist called with path=${path}`);
     const { segments, depth } = parsePath(path);
-    if (depth < 4 || segments[0] !== "ministries") return null;
+    if (depth < 4 || segments[0] !== "ministries") {
+      console.warn(`[B1Church] getPlaylist: invalid path depth=${depth} segments=${JSON.stringify(segments)}`);
+      return null;
+    }
     const ministryId = segments[1];
     const planId = segments[3];
     const planTypeId = segments[2];
+    console.log(`[B1Church] getPlaylist: ministryId=${ministryId}, planTypeId=${planTypeId}, planId=${planId}`);
     const plans = await fetchPlans(planTypeId, authData);
+    console.log(`[B1Church] getPlaylist: fetchPlans returned ${plans.length} plans`);
     const planFolder = plans.find((p) => p.id === planId);
-    if (!planFolder) return null;
+    if (!planFolder) {
+      console.warn(`[B1Church] getPlaylist: plan ${planId} not found in ${plans.length} plans (ids: ${plans.map((p) => p.id).join(", ")})`);
+      return null;
+    }
     const churchId = planFolder.churchId;
     const venueId = planFolder.contentId;
+    console.log(`[B1Church] getPlaylist: planFolder found \u2014 churchId=${churchId}, venueId=${venueId}, providerId=${planFolder.providerId}, providerPlanId=${planFolder.providerPlanId}`);
     if (!churchId) {
       console.warn("[B1Church getPlaylist] planFolder missing churchId:", planFolder.id);
       return null;
     }
     const pathFn = this.config.endpoints.planItems;
     const planItems = await this.apiRequest(pathFn(churchId, planId), authData);
+    console.log(`[B1Church] getPlaylist: planItems=${planItems ? Array.isArray(planItems) ? planItems.length + " sections" : typeof planItems : "null"}`);
     if ((!planItems || planItems.length === 0) && planFolder.providerId && planFolder.providerPlanId) {
+      console.log(`[B1Church] getPlaylist: no planItems, trying external provider ${planFolder.providerId} with path ${planFolder.providerPlanId}`);
       const externalFiles = await fetchFromProviderProxy(
         "getPlaylist",
         ministryId,
@@ -1878,17 +1923,30 @@ var B1ChurchProvider = class {
         authData,
         resolution
       );
+      console.log(`[B1Church] getPlaylist: external provider returned ${externalFiles ? Array.isArray(externalFiles) ? externalFiles.length + " files" : typeof externalFiles : "null"}`);
       return externalFiles || null;
     }
-    if (!planItems || !Array.isArray(planItems)) return null;
+    if (!planItems || !Array.isArray(planItems)) {
+      console.warn(`[B1Church] getPlaylist: planItems is null/not-array and no external provider fallback. providerId=${planFolder.providerId}, providerPlanId=${planFolder.providerPlanId}`);
+      return null;
+    }
+    console.log(`[B1Church] getPlaylist: processing ${planItems.length} sections, venueId=${venueId || "none"}`);
     const venueFeed = venueId ? await fetchVenueFeed(venueId) : null;
+    if (venueId && !venueFeed) {
+      console.warn(`[B1Church] getPlaylist: venueFeed is null for venueId=${venueId}`);
+    }
     const files = [];
     for (const sectionItem of planItems) {
+      console.log(`[B1Church] getPlaylist: section "${sectionItem.label || sectionItem.id}" has ${sectionItem.children?.length || 0} children`);
       for (const child of sectionItem.children || []) {
         const childItemType = child.itemType;
+        console.log(`[B1Church] getPlaylist:   child itemType=${childItemType}, relatedId=${child.relatedId}, providerId=${child.providerId}, providerPath=${child.providerPath}, link=${child.link ? "yes" : "no"}`);
         const isSectionType = childItemType === "section" || childItemType === "lessonSection" || childItemType === "providerSection";
         const canExpandLocally = isSectionType && venueFeed && child.relatedId;
-        if (isExternalProviderItem(child) && child.providerId && child.providerPath) {
+        if (canExpandLocally) {
+          const itemFiles = getFilesFromVenueFeed(venueFeed, childItemType, child.relatedId);
+          files.push(...itemFiles);
+        } else if (isExternalProviderItem(child) && child.providerId && child.providerPath) {
           const cacheKey = `${child.providerId}:${child.providerPath}`;
           if (child.providerContentPath) {
             let externalPlan = this.externalContentCache.plans.get(cacheKey);
@@ -1936,9 +1994,6 @@ var B1ChurchProvider = class {
               files.push(...externalFiles);
             }
           }
-        } else if (canExpandLocally) {
-          const itemFiles = getFilesFromVenueFeed(venueFeed, childItemType, child.relatedId);
-          files.push(...itemFiles);
         } else if ((childItemType === "providerFile" || childItemType === "providerPresentation") && child.link) {
           const file = getFileFromProviderFileItem(child);
           if (file) files.push(file);
@@ -1948,6 +2003,10 @@ var B1ChurchProvider = class {
         }
       }
     }
+    console.log(`[B1Church] getPlaylist: total files collected = ${files.length}`);
+    if (files.length === 0) {
+      console.warn(`[B1Church] getPlaylist: returning null \u2014 no files found for path=${path}`);
+    }
     return files.length > 0 ? files : null;
   }
   supportsDeviceFlow() {
@@ -12441,13 +12500,13 @@ var JesusFilmProvider = class {
     const { segments, depth } = parsePath(path);
     if (depth === 0) return this.getCategories();
     if (depth === 1) return this.getItemsInCategory(segments[0]);
-    if (depth === 2) {
-      const category = segments[0];
-      if (category === "feature-films") return this.getVideoFile(segments[1]);
-      return this.getContainerChildren(segments[1], category);
-    }
-    if (depth === 3) return this.getVideoFile(segments[2]);
-    return [];
+    const category = segments[0];
+    const lastId = segments[depth - 1];
+    if (depth === 2 && category === "feature-films") return this.getVideoFile(lastId);
+    const pathPrefix = "/" + segments.join("/");
+    const children = await this.getContainerChildren(lastId, pathPrefix);
+    if (children.length > 0) return children;
+    return this.getVideoFile(lastId);
   }
   getCategories() {
     return [
@@ -12496,7 +12555,7 @@ var JesusFilmProvider = class {
       })
     ];
   }
-  async getContainerChildren(containerId, category) {
+  async getContainerChildren(containerId, pathPrefix) {
     const linksData = await this.fetchApi(
       `/media-component-links/${containerId}`
     );
@@ -12510,9 +12569,9 @@ var JesusFilmProvider = class {
     return childrenData._embedded.mediaComponents.map((item) => createFolder(
       item.mediaComponentId,
       item.title,
-      `/${category}/${containerId}/${item.mediaComponentId}`,
+      `${pathPrefix}/${item.mediaComponentId}`,
       item.imageUrls.mobileCinematicHigh || item.imageUrls.videoStill || item.imageUrls.thumbnail,
-      true
+      item.containsCount === 0
     ));
   }
   extractMuxPlaybackId(url) {
@@ -12523,10 +12582,13 @@ var JesusFilmProvider = class {
     const { segments, depth } = parsePath(path);
     if (depth < 1) return null;
     const category = segments[0];
-    if (depth === 3) {
-      const items = await this.getVideoFile(segments[2]);
-      if (items.length === 0) return null;
-      return items.filter((item) => item.type === "file");
+    if (depth >= 3) {
+      const lastId = segments[depth - 1];
+      const items = await this.getVideoFile(lastId);
+      const files2 = items.filter((item) => item.type === "file");
+      if (files2.length > 0) return files2;
+      const containerFiles = await this.fetchContainerVideoFiles(lastId);
+      return containerFiles.length > 0 ? containerFiles : null;
     }
     if (depth === 2) {
       if (category === "feature-films") {
@@ -12542,7 +12604,7 @@ var JesusFilmProvider = class {
     const data = await this.fetchApi(
       `/media-components?filter=master&subTypes=${subType}&languageIds=${LANGUAGE_ID}&limit=100`
     );
-    const contentComponents = data._embedded.mediaComponents.filter((item) => item.componentType === "content");
+    const contentComponents = data._embedded.mediaComponents.filter((item) => item.containsCount === 0);
     const files = await this.fetchVideoFiles(contentComponents);
     return files.length > 0 ? files : null;
   }
@@ -12581,7 +12643,14 @@ var JesusFilmProvider = class {
       `/media-components?ids=${idsParam}&languageIds=${LANGUAGE_ID}`
     );
     if (!childrenData._embedded?.mediaComponents) return [];
-    return this.fetchVideoFiles(childrenData._embedded.mediaComponents);
+    const contentItems = childrenData._embedded.mediaComponents.filter((c) => c.containsCount === 0);
+    const containerItems = childrenData._embedded.mediaComponents.filter((c) => c.containsCount > 0);
+    const files = await this.fetchVideoFiles(contentItems);
+    for (const container of containerItems) {
+      const nested = await this.fetchContainerVideoFiles(container.mediaComponentId);
+      files.push(...nested);
+    }
+    return files;
   }
   async buildVideoInstructions(mediaComponentId, category) {
     const items = await this.getVideoFile(mediaComponentId);
@@ -12656,7 +12725,7 @@ var JesusFilmProvider = class {
       const actionItems = await Promise.all(
         data._embedded.mediaComponents.map(async (component) => {
           let downloadUrl;
-          if (component.componentType === "content") {
+          if (component.containsCount === 0) {
             try {
               const variant = await this.fetchApi(
                 `/media-components/${component.mediaComponentId}/languages/${LANGUAGE_ID}?platform=web`
@@ -12694,7 +12763,12 @@ var JesusFilmProvider = class {
       if (category === "feature-films") return this.buildVideoInstructions(segments[1], category);
       return this.buildContainerInstructions(segments[1], category);
     }
-    if (depth === 3) return this.buildVideoInstructions(segments[2], category);
+    if (depth >= 3) {
+      const lastId = segments[depth - 1];
+      const videoResult = await this.buildVideoInstructions(lastId, category);
+      if (videoResult) return videoResult;
+      return this.buildContainerInstructions(lastId, category);
+    }
     return null;
   }
   supportsDeviceFlow() {