@churchapps/content-providers 0.9.1 → 0.9.3

package/dist/index.d.cts

@@ -64,7 +64,7 @@ interface ContentFile {
     type: "file";
     id: string;
     title: string;
-    mediaType: "video" | "image";
+    mediaType: "video" | "image" | "audio";
     thumbnail?: string;
     url: string;
     downloadUrl?: string;
@@ -148,7 +148,7 @@ interface InstructionItem {
     children?: InstructionItem[];
     downloadUrl?: string;
     thumbnail?: string;
-    mediaType?: "video" | "image";
+    mediaType?: "video" | "image" | "audio";
 }
 interface Instructions {
     name?: string;
@@ -259,7 +259,10 @@ declare class OAuthHelper {
 declare function toAuthData(data: Record<string, unknown>, fallbacks?: {
     refreshToken?: string;
     scope?: string;
-}): ContentProviderAuthData;
+    planTypeId?: string;
+}): ContentProviderAuthData & {
+    planTypeId?: string;
+};
 declare class TokenHelper {
     isAuthValid(auth: ContentProviderAuthData | null | undefined): boolean;
     isTokenExpired(auth: ContentProviderAuthData): boolean;
@@ -331,7 +334,11 @@ declare class SignPresenterProvider extends BaseProvider {
     browse(path?: string | null, auth?: ContentProviderAuthData | null): Promise<ContentItem[]>;
     private extractList;
     private getPlaylists;
+    /** image and video/stream slides play directly; web slides only when the url is itself a media file. html/pdf/multi_zone and generic web pages aren't playable in ChurchApps. */
+    private slideMediaType;
+    /** The documented player contract; /content/playlists/:id/messages only covers templates 1 and 3 so most playlists come back empty there. */
     private getMessages;
+    private getLegacyMessages;
     getPlaylist(path: string, auth?: ContentProviderAuthData | null, _resolution?: number): Promise<ContentFile[] | null>;
     getInstructions(path: string, auth?: ContentProviderAuthData | null): Promise<Instructions | null>;
     generateCodeVerifier(): string;

package/dist/index.d.ts

@@ -64,7 +64,7 @@ interface ContentFile {
     type: "file";
     id: string;
     title: string;
-    mediaType: "video" | "image";
+    mediaType: "video" | "image" | "audio";
     thumbnail?: string;
     url: string;
     downloadUrl?: string;
@@ -148,7 +148,7 @@ interface InstructionItem {
     children?: InstructionItem[];
     downloadUrl?: string;
     thumbnail?: string;
-    mediaType?: "video" | "image";
+    mediaType?: "video" | "image" | "audio";
 }
 interface Instructions {
     name?: string;
@@ -259,7 +259,10 @@ declare class OAuthHelper {
 declare function toAuthData(data: Record<string, unknown>, fallbacks?: {
     refreshToken?: string;
     scope?: string;
-}): ContentProviderAuthData;
+    planTypeId?: string;
+}): ContentProviderAuthData & {
+    planTypeId?: string;
+};
 declare class TokenHelper {
     isAuthValid(auth: ContentProviderAuthData | null | undefined): boolean;
     isTokenExpired(auth: ContentProviderAuthData): boolean;
@@ -331,7 +334,11 @@ declare class SignPresenterProvider extends BaseProvider {
     browse(path?: string | null, auth?: ContentProviderAuthData | null): Promise<ContentItem[]>;
     private extractList;
     private getPlaylists;
+    /** image and video/stream slides play directly; web slides only when the url is itself a media file. html/pdf/multi_zone and generic web pages aren't playable in ChurchApps. */
+    private slideMediaType;
+    /** The documented player contract; /content/playlists/:id/messages only covers templates 1 and 3 so most playlists come back empty there. */
     private getMessages;
+    private getLegacyMessages;
     getPlaylist(path: string, auth?: ContentProviderAuthData | null, _resolution?: number): Promise<ContentFile[] | null>;
     getInstructions(path: string, auth?: ContentProviderAuthData | null): Promise<Instructions | null>;
     generateCodeVerifier(): string;

package/dist/index.js

@@ -20,13 +20,15 @@ function navigateToPath(instructions, path) {
 
 // src/helpers/TokenHelper.ts
 function toAuthData(data, fallbacks) {
+  const planTypeId = data.plan_type_id || fallbacks?.planTypeId;
   return {
     access_token: data.access_token,
     refresh_token: data.refresh_token || fallbacks?.refreshToken || "",
     token_type: data.token_type || "Bearer",
     created_at: Math.floor(Date.now() / 1e3),
     expires_in: data.expires_in,
-    scope: data.scope || fallbacks?.scope || ""
+    scope: data.scope || fallbacks?.scope || "",
+    ...planTypeId ? { planTypeId } : {}
   };
 }
 var TokenHelper = class {
@@ -54,7 +56,8 @@ var TokenHelper = class {
         return null;
       }
       const data = await response.json();
-      return toAuthData(data, { refreshToken: auth.refresh_token, scope: auth.scope });
+      const planTypeId = auth.planTypeId;
+      return toAuthData(data, { refreshToken: auth.refresh_token, scope: auth.scope, planTypeId });
     } catch {
       return null;
     }
@@ -191,7 +194,8 @@ var ApiHelper = class {
       const options = { method, headers, ...body ? { body: JSON.stringify(body) } : {} };
       const response = await fetch(url, options);
       if (!response.ok) {
-        console.warn(`[${providerId}] apiRequest failed: ${method} ${url} \u2192 HTTP ${response.status} ${response.statusText}`);
+        const detail = await response.text().catch(() => "");
+        console.warn(`[${providerId}] apiRequest failed: ${method} ${url} \u2192 HTTP ${response.status} ${response.statusText}${detail ? ` ${detail.slice(0, 500)}` : ""}`);
         return null;
       }
       return await response.json();
@@ -252,16 +256,19 @@ var IMAGE_EXTENSIONS = [
   ".tiff",
   ".tif"
 ];
+var AUDIO_EXTENSIONS = [".mp3", ".m4a", ".aac", ".wav", ".flac", ".oga"];
 function detectMediaType(url, explicitType) {
   if (explicitType === "video" || explicitType?.startsWith("video/")) return "video";
   if (explicitType === "image" || explicitType?.startsWith("image/")) return "image";
+  if (explicitType === "audio" || explicitType?.startsWith("audio/")) return "audio";
   const lower = url.toLowerCase();
   if (VIDEO_EXTENSIONS.some((p) => lower.includes(p)) || lower.includes("stream.mux.com")) return "video";
+  if (AUDIO_EXTENSIONS.some((p) => lower.includes(p))) return "audio";
   return "image";
 }
 function isMediaFile(filename) {
   const lower = filename.toLowerCase();
-  return [...VIDEO_EXTENSIONS, ...IMAGE_EXTENSIONS].some((ext) => lower.endsWith(ext));
+  return [...VIDEO_EXTENSIONS, ...IMAGE_EXTENSIONS, ...AUDIO_EXTENSIONS].some((ext) => lower.endsWith(ext));
 }
 function createFolder(id, title, path, thumbnail, isLeaf) {
   return { type: "folder", id, title, path, thumbnail, isLeaf };
@@ -541,13 +548,45 @@ var SignPresenterProvider = class extends BaseProvider {
       isLeaf: true
     }));
   }
+  /** image and video/stream slides play directly; web slides only when the url is itself a media file. html/pdf/multi_zone and generic web pages aren't playable in ChurchApps. */
+  slideMediaType(slideType, url) {
+    if (slideType === "image") return "image";
+    if (slideType === "video" || slideType === "stream") return "video";
+    if (slideType === "web" && isMediaFile(url)) return detectMediaType(url);
+    return null;
+  }
+  /** The documented player contract; /content/playlists/:id/messages only covers templates 1 and 3 so most playlists come back empty there. */
   async getMessages(playlistId, auth) {
+    const response = await this.apiRequest(`/v2/playlists/${playlistId}`, auth);
+    const messages = this.extractList(response, "messages");
+    if (messages.length === 0) return this.getLegacyMessages(playlistId, auth);
+    const files = [];
+    messages.forEach((msg, messageIndex) => {
+      const slides = Array.isArray(msg.slides) ? msg.slides : [];
+      slides.forEach((slide, slideIndex) => {
+        const data = slide.data || {};
+        const url = typeof data.url === "string" ? data.url.trim() : "";
+        const mediaType = url ? this.slideMediaType(slide.type, url) : null;
+        if (!mediaType) return;
+        const file = createFile(`${playlistId}-${messageIndex}-${slideIndex}`, msg.name, url, {
+          mediaType,
+          thumbnail: msg.thumbnail,
+          seconds: slide.seconds,
+          loop: data.loop
+        });
+        file.downloadUrl = url;
+        files.push(file);
+      });
+    });
+    return files;
+  }
+  async getLegacyMessages(playlistId, auth) {
     const response = await this.apiRequest(`/content/playlists/${playlistId}/messages`, auth);
     if (!response) return [];
     const files = [];
     for (const msg of this.extractList(response, "messages")) {
-      if (!msg.url) continue;
-      const url = msg.url;
+      const url = [msg.url, msg.thumbnail, msg.image].map((v) => typeof v === "string" ? v.trim() : "").find(Boolean) || "";
+      if (!url) continue;
       const file = createFile(msg.id, msg.name, url, {
         mediaType: detectMediaType(url, msg.mediaType),
         thumbnail: msg.thumbnail || msg.image,
@@ -1396,9 +1435,7 @@ var B1ChurchProvider = class extends BaseProvider {
   setPairingData(data) {
     if (data && typeof data === "object" && "planTypeId" in data) {
       const planTypeId = data.planTypeId;
-      this.planTypeId = typeof planTypeId === "string" ? planTypeId : null;
-    } else {
-      this.planTypeId = null;
+      if (typeof planTypeId === "string") this.planTypeId = planTypeId;
     }
   }
   async getCurrentPlan(authData) {
@@ -17761,7 +17798,9 @@ var GoogleDriveProvider = class extends BaseProvider {
         orderBy: "folder,name_natural",
         pageSize: "1000",
         supportsAllDrives: "true",
-        includeItemsFromAllDrives: "true"
+        // corpora=user (not includeItemsFromAllDrives) — "root" is only meaningful in the user's own corpus, and
+        // combining it with an all-drives search makes Google reject the query, which browse saw as an empty folder.
+        corpora: "user"
       });
       if (pageToken) params.set("pageToken", pageToken);
       const response = await this.apiRequest(`/files?${params.toString()}`, auth);
@@ -17775,7 +17814,7 @@ var GoogleDriveProvider = class extends BaseProvider {
   async childItems(folderId, auth) {
     const entries = await this.listFiles(`'${folderId}' in parents and trashed=false`, auth);
     const folders = entries.filter((e) => e.mimeType === FOLDER_MIME);
-    const mediaFiles = entries.filter((e) => e.mimeType.startsWith("video/") || e.mimeType.startsWith("image/"));
+    const mediaFiles = entries.filter((e) => e.mimeType !== FOLDER_MIME && !e.mimeType.startsWith("application/vnd.google-apps") && (["video/", "image/", "audio/"].some((prefix) => e.mimeType.startsWith(prefix)) || isMediaFile(e.name)));
     return { folders, mediaFiles };
   }
   /** One batched query marks which sibling folders have subfolders; null = unknown (isLeaf omitted). */
@@ -17932,7 +17971,7 @@ function getAvailableProviders(ids) {
 }
 
 // src/index.ts
-var VERSION = true ? "0.9.1" : "dev";
+var VERSION = true ? "0.9.3" : "dev";
 export {
   APlayProvider,
   B1ChurchProvider,