@churchapps/content-providers 0.9.3 → 0.10.0

package/dist/index.d.cts

@@ -116,6 +116,11 @@ interface FeedFileInterface {
     seconds?: number;
     fileType?: string;
     thumbnail?: string;
+    bytes?: number;
+}
+interface FeedDownloadInterface {
+    name?: string;
+    files?: FeedFileInterface[];
 }
 interface FeedActionInterface {
     id?: string;
@@ -135,6 +140,7 @@ interface FeedVenueInterface {
     lessonName?: string;
     lessonDescription?: string;
     lessonImage?: string;
+    downloads?: FeedDownloadInterface[];
     sections?: FeedSectionInterface[];
 }
 interface InstructionItem {
@@ -150,9 +156,18 @@ interface InstructionItem {
     thumbnail?: string;
     mediaType?: "video" | "image" | "audio";
 }
+/** An extra file the teacher downloads/prints (zip, PDF, leader guide) — never part of the presented playlist. */
+interface ContentDownload {
+    id?: string;
+    title: string;
+    url: string;
+    fileType?: string;
+    bytes?: number;
+}
 interface Instructions {
     name?: string;
     items: InstructionItem[];
+    downloads?: ContentDownload[];
 }
 interface MessageFileInterface {
     id?: string;
@@ -263,10 +278,13 @@ declare function toAuthData(data: Record<string, unknown>, fallbacks?: {
 }): ContentProviderAuthData & {
     planTypeId?: string;
 };
+declare function authIsExpired(auth: ContentProviderAuthData | null | undefined, nowMs?: number): boolean;
 declare class TokenHelper {
+    private static inflight;
     isAuthValid(auth: ContentProviderAuthData | null | undefined): boolean;
     isTokenExpired(auth: ContentProviderAuthData): boolean;
     refreshToken(config: ContentProviderConfig, auth: ContentProviderAuthData): Promise<ContentProviderAuthData | null>;
+    private doRefresh;
 }
 
 declare class DeviceFlowHelper {
@@ -377,6 +395,8 @@ declare class LessonsChurchProvider extends BaseProvider {
     private getAddOnFiles;
     private getAddOnCategories;
     private getAddOnsByCategory;
+    /** Flatten feed download bundles into printable files, keeping playlist media (videos already in the run-of-show) out. */
+    private convertFeedDownloads;
     getInstructions(path: string, _auth?: ContentProviderAuthData | null): Promise<Instructions | null>;
 }
 
@@ -586,4 +606,4 @@ declare function getAvailableProviders(ids?: string[]): ProviderInfo[];
  */
 declare const VERSION: string;
 
-export { APlayProvider, type AuthType, B1ChurchProvider, BaseProvider, BibleProjectProvider, CbnProvider, type ContentFile, type ContentFolder, type ContentItem, type ContentProviderAuthData, type ContentProviderConfig, type CurrentPlan, type DeviceAuthorizationResponse, DeviceFlowHelper, type DeviceFlowPollResult, type DeviceFlowState, DropboxProvider, type EndpointValue, type EndpointsConfig, type FeedActionInterface, type FeedFileInterface, type FeedSectionInterface, type FeedVenueInterface, HighVoltageKidsProvider, type IProvider, type InstructionItem, type Instructions, JesusFilmProvider, LessonsChurchProvider, LifeChurchProvider, type MediaLicenseResult, type MediaLicenseStatus, type MessageFileInterface, OAuthHelper, type Plan, type PlanPresentation, type PlanSection, type PlanTimelineItem, PlanningCenterProvider, type ProviderCapabilities, type ProviderInfo, type ProviderLogos, SignPresenterProvider, TokenHelper, VERSION, type VenueActionInterface, type VenueActionsResponseInterface, type VenueSectionActionsInterface, getAllProviders, getAvailableProviders, getProvider, getProviderConfig, isContentFile, isContentFolder, navigateToPath, registerProvider, setProviderSecret, toAuthData };
+export { APlayProvider, type AuthType, B1ChurchProvider, BaseProvider, BibleProjectProvider, CbnProvider, type ContentDownload, type ContentFile, type ContentFolder, type ContentItem, type ContentProviderAuthData, type ContentProviderConfig, type CurrentPlan, type DeviceAuthorizationResponse, DeviceFlowHelper, type DeviceFlowPollResult, type DeviceFlowState, DropboxProvider, type EndpointValue, type EndpointsConfig, type FeedActionInterface, type FeedDownloadInterface, type FeedFileInterface, type FeedSectionInterface, type FeedVenueInterface, HighVoltageKidsProvider, type IProvider, type InstructionItem, type Instructions, JesusFilmProvider, LessonsChurchProvider, LifeChurchProvider, type MediaLicenseResult, type MediaLicenseStatus, type MessageFileInterface, OAuthHelper, type Plan, type PlanPresentation, type PlanSection, type PlanTimelineItem, PlanningCenterProvider, type ProviderCapabilities, type ProviderInfo, type ProviderLogos, SignPresenterProvider, TokenHelper, VERSION, type VenueActionInterface, type VenueActionsResponseInterface, type VenueSectionActionsInterface, authIsExpired, getAllProviders, getAvailableProviders, getProvider, getProviderConfig, isContentFile, isContentFolder, navigateToPath, registerProvider, setProviderSecret, toAuthData };

package/dist/index.d.ts

@@ -116,6 +116,11 @@ interface FeedFileInterface {
     seconds?: number;
     fileType?: string;
     thumbnail?: string;
+    bytes?: number;
+}
+interface FeedDownloadInterface {
+    name?: string;
+    files?: FeedFileInterface[];
 }
 interface FeedActionInterface {
     id?: string;
@@ -135,6 +140,7 @@ interface FeedVenueInterface {
     lessonName?: string;
     lessonDescription?: string;
     lessonImage?: string;
+    downloads?: FeedDownloadInterface[];
     sections?: FeedSectionInterface[];
 }
 interface InstructionItem {
@@ -150,9 +156,18 @@ interface InstructionItem {
     thumbnail?: string;
     mediaType?: "video" | "image" | "audio";
 }
+/** An extra file the teacher downloads/prints (zip, PDF, leader guide) — never part of the presented playlist. */
+interface ContentDownload {
+    id?: string;
+    title: string;
+    url: string;
+    fileType?: string;
+    bytes?: number;
+}
 interface Instructions {
     name?: string;
     items: InstructionItem[];
+    downloads?: ContentDownload[];
 }
 interface MessageFileInterface {
     id?: string;
@@ -263,10 +278,13 @@ declare function toAuthData(data: Record<string, unknown>, fallbacks?: {
 }): ContentProviderAuthData & {
     planTypeId?: string;
 };
+declare function authIsExpired(auth: ContentProviderAuthData | null | undefined, nowMs?: number): boolean;
 declare class TokenHelper {
+    private static inflight;
     isAuthValid(auth: ContentProviderAuthData | null | undefined): boolean;
     isTokenExpired(auth: ContentProviderAuthData): boolean;
     refreshToken(config: ContentProviderConfig, auth: ContentProviderAuthData): Promise<ContentProviderAuthData | null>;
+    private doRefresh;
 }
 
 declare class DeviceFlowHelper {
@@ -377,6 +395,8 @@ declare class LessonsChurchProvider extends BaseProvider {
     private getAddOnFiles;
     private getAddOnCategories;
     private getAddOnsByCategory;
+    /** Flatten feed download bundles into printable files, keeping playlist media (videos already in the run-of-show) out. */
+    private convertFeedDownloads;
     getInstructions(path: string, _auth?: ContentProviderAuthData | null): Promise<Instructions | null>;
 }
 
@@ -586,4 +606,4 @@ declare function getAvailableProviders(ids?: string[]): ProviderInfo[];
  */
 declare const VERSION: string;
 
-export { APlayProvider, type AuthType, B1ChurchProvider, BaseProvider, BibleProjectProvider, CbnProvider, type ContentFile, type ContentFolder, type ContentItem, type ContentProviderAuthData, type ContentProviderConfig, type CurrentPlan, type DeviceAuthorizationResponse, DeviceFlowHelper, type DeviceFlowPollResult, type DeviceFlowState, DropboxProvider, type EndpointValue, type EndpointsConfig, type FeedActionInterface, type FeedFileInterface, type FeedSectionInterface, type FeedVenueInterface, HighVoltageKidsProvider, type IProvider, type InstructionItem, type Instructions, JesusFilmProvider, LessonsChurchProvider, LifeChurchProvider, type MediaLicenseResult, type MediaLicenseStatus, type MessageFileInterface, OAuthHelper, type Plan, type PlanPresentation, type PlanSection, type PlanTimelineItem, PlanningCenterProvider, type ProviderCapabilities, type ProviderInfo, type ProviderLogos, SignPresenterProvider, TokenHelper, VERSION, type VenueActionInterface, type VenueActionsResponseInterface, type VenueSectionActionsInterface, getAllProviders, getAvailableProviders, getProvider, getProviderConfig, isContentFile, isContentFolder, navigateToPath, registerProvider, setProviderSecret, toAuthData };
+export { APlayProvider, type AuthType, B1ChurchProvider, BaseProvider, BibleProjectProvider, CbnProvider, type ContentDownload, type ContentFile, type ContentFolder, type ContentItem, type ContentProviderAuthData, type ContentProviderConfig, type CurrentPlan, type DeviceAuthorizationResponse, DeviceFlowHelper, type DeviceFlowPollResult, type DeviceFlowState, DropboxProvider, type EndpointValue, type EndpointsConfig, type FeedActionInterface, type FeedDownloadInterface, type FeedFileInterface, type FeedSectionInterface, type FeedVenueInterface, HighVoltageKidsProvider, type IProvider, type InstructionItem, type Instructions, JesusFilmProvider, LessonsChurchProvider, LifeChurchProvider, type MediaLicenseResult, type MediaLicenseStatus, type MessageFileInterface, OAuthHelper, type Plan, type PlanPresentation, type PlanSection, type PlanTimelineItem, PlanningCenterProvider, type ProviderCapabilities, type ProviderInfo, type ProviderLogos, SignPresenterProvider, TokenHelper, VERSION, type VenueActionInterface, type VenueActionsResponseInterface, type VenueSectionActionsInterface, authIsExpired, getAllProviders, getAvailableProviders, getProvider, getProviderConfig, isContentFile, isContentFolder, navigateToPath, registerProvider, setProviderSecret, toAuthData };

package/dist/index.js

@@ -31,18 +31,32 @@ function toAuthData(data, fallbacks) {
     ...planTypeId ? { planTypeId } : {}
   };
 }
-var TokenHelper = class {
+function authIsExpired(auth, nowMs = Date.now()) {
+  if (!auth?.created_at || !auth.expires_in) return true;
+  const lifetimeMs = auth.expires_in * 1e3;
+  const expiresAt = (auth.created_at + auth.expires_in) * 1e3;
+  const bufferMs = Math.min(5 * 60 * 1e3, Math.floor(lifetimeMs / 10));
+  return nowMs > expiresAt - bufferMs;
+}
+var _TokenHelper = class _TokenHelper {
   isAuthValid(auth) {
-    if (!auth) return false;
-    return !this.isTokenExpired(auth);
+    return !authIsExpired(auth);
   }
   isTokenExpired(auth) {
-    if (!auth.created_at || !auth.expires_in) return true;
-    const expiresAt = (auth.created_at + auth.expires_in) * 1e3;
-    return Date.now() > expiresAt - 5 * 60 * 1e3;
+    return authIsExpired(auth);
   }
   async refreshToken(config, auth) {
     if (!auth.refresh_token) return null;
+    const key = `${config.oauthBase}|${config.clientId}|${auth.refresh_token}`;
+    const existing = _TokenHelper.inflight.get(key);
+    if (existing) return existing;
+    const pending = this.doRefresh(config, auth).finally(() => {
+      _TokenHelper.inflight.delete(key);
+    });
+    _TokenHelper.inflight.set(key, pending);
+    return pending;
+  }
+  async doRefresh(config, auth) {
     try {
       const params = new URLSearchParams({
         grant_type: "refresh_token",
@@ -63,6 +77,8 @@ var TokenHelper = class {
     }
   }
 };
+_TokenHelper.inflight = /* @__PURE__ */ new Map();
+var TokenHelper = _TokenHelper;
 
 // src/helpers/OAuthHelper.ts
 function generateCodeVerifier() {
@@ -270,6 +286,12 @@ function isMediaFile(filename) {
   const lower = filename.toLowerCase();
   return [...VIDEO_EXTENSIONS, ...IMAGE_EXTENSIONS, ...AUDIO_EXTENSIONS].some((ext) => lower.endsWith(ext));
 }
+function isPlaylistMedia(url, fileType, name) {
+  if (fileType?.startsWith("video/") || fileType?.startsWith("audio/") || fileType === "video" || fileType === "audio") return true;
+  const haystack = `${url} ${name || ""}`.toLowerCase();
+  if (haystack.includes("stream.mux.com") || haystack.includes("externalvideos/download")) return true;
+  return [...VIDEO_EXTENSIONS, ...AUDIO_EXTENSIONS].some((ext) => haystack.includes(ext));
+}
 function createFolder(id, title, path, thumbnail, isLeaf) {
   return { type: "folder", id, title, path, thumbnail, isLeaf };
 }
@@ -943,6 +965,18 @@ var LessonsChurchProvider = class extends BaseProvider {
     const filtered = allAddOns.filter((a) => a.category === decodedCategory);
     return filtered.map((addOn) => createFolder(addOn.id, addOn.name, `${currentPath}/${addOn.id}`, addOn.image, true));
   }
+  /** Flatten feed download bundles into printable files, keeping playlist media (videos already in the run-of-show) out. */
+  convertFeedDownloads(bundles) {
+    const result = [];
+    for (const bundle of bundles || []) {
+      const files = (bundle.files || []).filter((f) => f.url && !isPlaylistMedia(f.url, f.fileType, f.name));
+      for (const file of files) {
+        const title = (files.length === 1 ? bundle.name || file.name : file.name || bundle.name) || "Download";
+        result.push({ id: file.id, title, url: file.url, fileType: file.fileType, bytes: file.bytes });
+      }
+    }
+    return result;
+  }
   async getInstructions(path, _auth) {
     const venueId = getSegment(path, 4);
     if (venueId) {
@@ -954,7 +988,8 @@ var LessonsChurchProvider = class extends BaseProvider {
       if (!planItemsResponse) return null;
       const lessonImage = feedResponse?.lessonImage;
       const sectionActionsMap = buildSectionActionsMap(actionsResponse, lessonImage, feedResponse);
-      return { name: planItemsResponse.venueName, items: (planItemsResponse.items || []).map((item) => processInstructionItem(item, sectionActionsMap, lessonImage)) };
+      const downloads = this.convertFeedDownloads(feedResponse?.downloads);
+      return { name: planItemsResponse.venueName, items: (planItemsResponse.items || []).map((item) => processInstructionItem(item, sectionActionsMap, lessonImage)), downloads: downloads.length > 0 ? downloads : void 0 };
     }
     const { segments } = parsePath(path);
     if (segments[0] === "addons" && segments.length === 3) {
@@ -17724,7 +17759,10 @@ var GoCurriculumProvider = class extends BaseProvider {
     if (!files) return null;
     const collection = (await this.getData()).catalog.find((c) => c.id === segments[0]);
     const lesson = collection?.lessons.find((l) => l.id === segments[1]);
-    return filesToInstructions(lesson?.name || "Lesson", files);
+    const instructions = filesToInstructions(lesson?.name || "Lesson", files);
+    const downloads = (lesson?.resources || []).filter((r) => r.url && !isPlaylistMedia(r.url, void 0, r.file)).map((r) => ({ id: slugify(r.file || r.title), title: r.title || r.file, url: r.url }));
+    if (downloads.length > 0) instructions.downloads = downloads;
+    return instructions;
   }
   generateCodeVerifier() {
     return this.oauthHelper.generateCodeVerifier();
@@ -17971,7 +18009,7 @@ function getAvailableProviders(ids) {
 }
 
 // src/index.ts
-var VERSION = true ? "0.9.3" : "dev";
+var VERSION = true ? "0.10.0" : "dev";
 export {
   APlayProvider,
   B1ChurchProvider,
@@ -17989,6 +18027,7 @@ export {
   SignPresenterProvider,
   TokenHelper,
   VERSION,
+  authIsExpired,
   getAllProviders,
   getAvailableProviders,
   getProvider,