browser-extension-manager 1.3.14 → 1.3.15

package/dist/gulp/tasks/publish.js

@@ -320,42 +320,23 @@ async function publishToEdge() {
     'X-ClientID': clientId,
   };
 
-  // Step 1: Try to submit first to check if there's a pending submission
-  // This is faster than uploading first, since upload always succeeds
-  logger.log('[edge] Checking for pending submissions...');
+  // Helper to parse Edge API response (handles empty bodies)
+  async function parseEdgeResponse(response, label) {
+    const text = await response.text();
+    logger.log(`[edge] ${label} - Status: ${response.status}, Body: ${text || '(empty)'}`);
 
-  const publishUrl = `https://api.addons.microsoftedge.microsoft.com/v1/products/${productId}/submissions`;
-  const checkResponse = await fetch(publishUrl, {
-    method: 'POST',
-    headers: {
-      ...edgeHeaders,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      notes: `Check for pending submission`,
-    }),
-  });
-
-  const checkData = await checkResponse.json().catch(() => null);
-
-  // Log the response for debugging
-  logger.log(`[edge] Submission check response: ${JSON.stringify(checkData)}`);
-
-  // Check if there's a pending submission blocking us
-  if (checkData && checkData.status === 'Failed') {
-    if (checkData.errorCode === 'InProgressSubmission') {
-      throw new Error('Extension already has a pending submission in review. Wait for it to complete before publishing again.');
-    }
-    if (checkData.errorCode === 'UnpublishInProgress') {
-      throw new Error('Extension is being unpublished. Wait for unpublish to complete before publishing.');
+    if (!text) {
+      return { status: response.status, data: null };
     }
-    // If it failed for another reason (like no draft package), that's expected - continue to upload
-    if (checkData.errorCode !== 'NoDraftPackage' && checkData.errorCode !== 'NoPackageToPublish') {
-      logger.log(`[edge] Check failed with: ${checkData.errorCode} - ${checkData.message}`);
+
+    try {
+      return { status: response.status, data: JSON.parse(text) };
+    } catch (e) {
+      return { status: response.status, data: text };
     }
   }
 
-  // Step 2: Upload the package
+  // Step 1: Upload the package first
   logger.log('[edge] Uploading to Microsoft Edge Add-ons...');
 
   const zipBuffer = jetpack.read(PATHS.chromium.zip, 'buffer');
@@ -370,17 +351,16 @@ async function publishToEdge() {
     body: zipBuffer,
   });
 
+  const upload = await parseEdgeResponse(uploadResponse, 'Upload response');
+
   if (!uploadResponse.ok) {
-    const errorText = await uploadResponse.text();
-    throw new Error(`Edge upload error: ${uploadResponse.status} - ${errorText}`);
+    throw new Error(`Edge upload error: ${upload.status} - ${JSON.stringify(upload.data)}`);
   }
 
-  const uploadData = await uploadResponse.json().catch(() => null);
-  logger.log(`[edge] Upload response: ${JSON.stringify(uploadData)}`);
-
   logger.log('[edge] Package uploaded, submitting for review...');
 
-  // Step 3: Submit for review
+  // Step 2: Submit for review - this is where we'll get InProgressSubmission if there's a pending review
+  const publishUrl = `https://api.addons.microsoftedge.microsoft.com/v1/products/${productId}/submissions`;
   const publishResponse = await fetch(publishUrl, {
     method: 'POST',
     headers: {
@@ -392,25 +372,33 @@ async function publishToEdge() {
     }),
   });
 
-  const publishData = await publishResponse.json().catch(() => null);
-
-  // Log the full response
-  logger.log(`[edge] Publish response: ${JSON.stringify(publishData)}`);
+  const publish = await parseEdgeResponse(publishResponse, 'Publish response');
 
-  // Check for HTTP errors
+  // Check for HTTP errors (4xx, 5xx)
   if (!publishResponse.ok) {
-    throw new Error(`Edge publish error: ${publishResponse.status} - ${JSON.stringify(publishData)}`);
-  }
-
-  // Check for API-level failures (HTTP 200 but status: "Failed")
-  if (publishData && publishData.status === 'Failed') {
-    if (publishData.errorCode === 'InProgressSubmission') {
+    // Check if it's a 409 Conflict or similar indicating in-progress submission
+    if (publish.status === 409) {
       throw new Error('Extension already has a pending submission in review. Wait for it to complete before publishing again.');
     }
-    if (publishData.errorCode === 'UnpublishInProgress') {
-      throw new Error('Extension is being unpublished. Wait for unpublish to complete before publishing.');
+    throw new Error(`Edge publish error: ${publish.status} - ${JSON.stringify(publish.data)}`);
+  }
+
+  // Check for API-level failures (HTTP 200/202 but status: "Failed" in body)
+  if (publish.data && typeof publish.data === 'object') {
+    if (publish.data.status === 'Failed') {
+      if (publish.data.errorCode === 'InProgressSubmission') {
+        throw new Error('Extension already has a pending submission in review. Wait for it to complete before publishing again.');
+      }
+      if (publish.data.errorCode === 'UnpublishInProgress') {
+        throw new Error('Extension is being unpublished. Wait for unpublish to complete before publishing.');
+      }
+      throw new Error(`Edge publish failed: ${publish.data.message || publish.data.errorCode || 'Unknown error'}`);
     }
-    throw new Error(`Edge publish failed: ${publishData.message || publishData.errorCode || 'Unknown error'}`);
+  }
+
+  // HTTP 202 Accepted means submission was queued successfully
+  if (publish.status === 202) {
+    logger.log('[edge] Submission accepted and queued for review');
   }
 
   logger.log('[edge] Upload complete');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browser-extension-manager",
-  "version": "1.3.14",
+  "version": "1.3.15",
   "description": "Browser Extension Manager dependency manager",
   "main": "dist/index.js",
   "exports": {