@artinstack/migrator 0.1.18 → 0.1.20

package/dist/{chunk-PZADAGBA.js → chunk-CG5ON2RW.js}

@@ -644,6 +644,10 @@ var ALBUM_IMAGES_CONFIG = {
     }
   }
 };
+function asSmugMugList(value) {
+  if (value == null) return [];
+  return Array.isArray(value) ? value : [value];
+}
 function oauthPercentEncode(value) {
   return encodeURIComponent(value).replace(
     /[!'()*]/g,
@@ -861,6 +865,14 @@ function readSmugMugCredentialsFromEnv(env = process.env) {
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function resolveSmugMugUriLink(link, label) {
+  if (typeof link === "string" && link.trim()) return link.trim();
+  if (link && typeof link === "object") {
+    const uri = link.Uri;
+    if (typeof uri === "string" && uri.trim()) return uri.trim();
+  }
+  throw new Error(`SmugMug response missing ${label} URI`);
+}
 function albumKeyFromUri(uri) {
   const match = uri.match(/\/album\/([^/?!]+)/i);
   if (!match?.[1]) {
@@ -871,7 +883,8 @@ function albumKeyFromUri(uri) {
 function mapAlbumImage(albumImage, portfolioSourceId, sort) {
   const image = albumImage.Image;
   const metadata = image?.ImageMetadata ?? albumImage.ImageMetadata;
-  const originalUrl = image?.ImageSizeDetails?.OriginalImageUrl ?? albumImage.LargestImage?.Url ?? albumImage.WebUri;
+  const sizeDetails = image?.ImageSizeDetails;
+  const originalUrl = sizeDetails?.OriginalImageUrl ?? sizeDetails?.ImageSizeOriginal?.Url ?? albumImage.LargestImage?.Url ?? albumImage.WebUri;
   const fileName = image?.FileName ?? albumImage.FileName;
   return {
     sourceId: albumImage.ImageKey,
@@ -908,10 +921,13 @@ var SmugMugApiClient = class {
     this.requestIntervalMs = parsed.requestIntervalMs;
     this.fetchImpl = parsed.fetchImpl ?? fetch;
   }
-  /** Validate credentials against `GET /user/!authuser`. */
+  /** Validate credentials against `GET /api/v2!authuser`. */
   async validateCredentials() {
     const user = await this.getAuthUser();
-    return { nick: user.NickName, rootNodeUri: user.Uris.Node };
+    return {
+      nick: user.NickName,
+      rootNodeUri: resolveSmugMugUriLink(user.Uris.Node, "User.Uris.Node")
+    };
   }
   /** Crawl the authenticated user's node tree into flat export tables for `parse-node.ts`. */
   async crawlExport() {
@@ -919,7 +935,8 @@ var SmugMugApiClient = class {
     const folders = [];
     const albums = [];
     const images = [];
-    await this.walkNode(user.Uris.Node, void 0, folders, albums, images);
+    const rootNodeUri = resolveSmugMugUriLink(user.Uris.Node, "User.Uris.Node");
+    await this.walkNode(rootNodeUri, void 0, folders, albums, images);
     return {
       exportVersion: 1,
       exportedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -929,7 +946,12 @@ var SmugMugApiClient = class {
     };
   }
   async getAuthUser() {
-    const envelope = await this.requestJson(`${SMUGMUG_API_BASE}/user/!authuser`);
+    const envelope = await this.requestJson(
+      `${SMUGMUG_API_BASE}!authuser`
+    );
+    if (envelope.Response.User?.Uris?.Node != null) {
+      return envelope.Response.User;
+    }
     return envelope.Response;
   }
   async walkNode(nodeUri, parentFolderId, folders, albums, images) {
@@ -956,13 +978,30 @@ var SmugMugApiClient = class {
           description: child.Description,
           url: child.WebUri
         });
-        const albumUri = child.Uris?.Album;
+        const albumUri = await this.resolveAlbumUri(child);
         if (albumUri) {
           await this.collectAlbumImages(albumUri, child.NodeID, images);
         }
       }
     }
   }
+  /**
+   * Album nodes usually expose `Uris.Album`; if missing, re-fetch the node with `_filteruri=Album`.
+   */
+  async resolveAlbumUri(child) {
+    if (child.Uris?.Album != null) {
+      return resolveSmugMugUriLink(child.Uris.Album, "Node.Uris.Album");
+    }
+    try {
+      const envelope = await this.requestJson(`${child.Uri}?_filteruri=Album`);
+      const node = envelope.Response.Node ?? envelope.Response;
+      if (node.Uris?.Album != null) {
+        return resolveSmugMugUriLink(node.Uris.Album, "Node.Uris.Album");
+      }
+    } catch {
+    }
+    return null;
+  }
   async collectAlbumImages(albumUri, portfolioSourceId, images) {
     const albumKey = albumKeyFromUri(albumUri);
     const configQuery = `_config=${encodeURIComponent(JSON.stringify(ALBUM_IMAGES_CONFIG))}`;
@@ -975,14 +1014,14 @@ var SmugMugApiClient = class {
   }
   async *paginateNodes(path) {
     for await (const page of this.paginate(path)) {
-      for (const node of page.Node ?? []) {
+      for (const node of asSmugMugList(page.Node)) {
         yield node;
       }
     }
   }
   async *paginateAlbumImages(path) {
     for await (const page of this.paginate(path)) {
-      for (const albumImage of page.AlbumImage ?? []) {
+      for (const albumImage of asSmugMugList(page.AlbumImage)) {
         yield albumImage;
       }
     }
@@ -995,17 +1034,37 @@ var SmugMugApiClient = class {
       nextPath = envelope.Response.Pages?.NextPage;
     }
   }
+  /**
+   * OAuth-signed GET for private original/media URLs (and API endpoints).
+   * Hosts should prefer this over anonymous `fetch` when downloading vault images.
+   */
+  async fetchAuthenticated(url, options) {
+    return this.requestWithRetry(toAbsoluteUrl(url), {
+      accept: options?.accept ?? "*/*"
+    });
+  }
+  /** Convenience: signed GET → bytes (for MigrationSink `resolveAssetStream`). */
+  async fetchAuthenticatedBytes(url) {
+    const response = await this.fetchAuthenticated(url);
+    const buffer = new Uint8Array(await response.arrayBuffer());
+    return {
+      body: buffer,
+      contentType: response.headers.get("content-type") ?? void 0,
+      contentLength: buffer.byteLength
+    };
+  }
   async requestJson(pathOrUrl) {
     const url = toAbsoluteUrl(pathOrUrl);
-    const response = await this.requestWithRetry(url);
+    const response = await this.requestWithRetry(url, { accept: "application/json" });
     const body = await response.json();
     if (body.Code !== 200) {
       throw new Error(`SmugMug API error ${body.Code}: ${body.Message}`);
     }
     return body;
   }
-  async requestWithRetry(url) {
+  async requestWithRetry(url, options) {
     let attempt = 0;
+    const accept = options?.accept ?? "application/json";
     while (true) {
       await this.throttle();
       const authorization = buildSmugMugAuthorizationHeader({
@@ -1016,7 +1075,7 @@ var SmugMugApiClient = class {
       const response = await this.fetchImpl(url, {
         method: "GET",
         headers: {
-          Accept: "application/json",
+          Accept: accept,
           Authorization: authorization
         }
       });
@@ -2701,6 +2760,7 @@ export {
   SMUGMUG_OAUTH_ENDPOINTS,
   smugMugConsumerCredentialsSchema,
   smugMugCredentialsSchema,
+  asSmugMugList,
   signSmugMugOAuthRequest,
   buildSmugMugAuthorizationHeader,
   parseSmugMugOAuthFormBody,
@@ -2709,6 +2769,7 @@ export {
   getSmugMugAccessToken,
   createSmugMugOAuthSession,
   readSmugMugCredentialsFromEnv,
+  resolveSmugMugUriLink,
   SmugMugApiClient,
   smugmugAdapter,
   squarespaceAdapter,
@@ -2717,4 +2778,4 @@ export {
   wixAdapter,
   getAdapter
 };
-//# sourceMappingURL=chunk-PZADAGBA.js.map
+//# sourceMappingURL=chunk-CG5ON2RW.js.map