@owox/connectors 0.13.0-next-20251118090139 → 0.13.0-next-20251118110411

package/dist/index.cjs

@@ -973,11 +973,9 @@ async function _resolveShortLinks(shortLinks) {
       const response = await HttpUtils.fetch(linkObj.originalUrl, {
         method: "GET"
       });
-      const headers = response.getHeaders();
-      const resolvedUrl = headers.Location || headers.location || linkObj.originalUrl;
       return {
         originalUrl: linkObj.originalUrl,
-        resolvedUrl
+        resolvedUrl: response.getUrl()
       };
     } catch (error) {
       console.log(`Failed to resolve short link ${linkObj.originalUrl}: ${error.message}`);
@@ -1143,17 +1141,21 @@ var HttpUtils = class HttpUtils2 {
     if (options.body) {
       fetchOptions.body = options.body;
     }
+    if (options.redirect !== void 0) {
+      fetchOptions.redirect = options.redirect;
+    }
     const response = await fetch(url, fetchOptions);
-    return this._wrapNodeResponse(response);
+    return this._wrapNodeResponse(response, url);
   }
   /**
    * Wraps the response from the Node environment.
    * Not use directly, only for internal purposes.
    *
    * @param {Response} response - Native fetch Response object
+   * @param {string} originalUrl - Original URL that was requested
    * @returns {FetchResponse}
    */
-  static _wrapNodeResponse(response) {
+  static _wrapNodeResponse(response, originalUrl) {
     let textCache = null;
     let blobCache = null;
     const getText = async () => {
@@ -1184,7 +1186,8 @@ var HttpUtils = class HttpUtils2 {
       getContent: () => getText(),
       getContentText: () => getText(),
       getBlob: () => getBlob(),
-      getResponseCode: () => response.status
+      getResponseCode: () => response.status,
+      getUrl: () => response.url || originalUrl
     };
   }
 };
@@ -14377,7 +14380,7 @@ const GoogleAds = (function() {
           isRequired: true,
           requiredType: "string",
           label: "Customer ID",
-          description: "Google Ads Customer ID (format: 123-456-7890)"
+          description: "Google Ads Customer ID (format: 1234567890)"
         },
         AuthType: {
           requiredType: "object",
@@ -14621,7 +14624,7 @@ const GoogleAds = (function() {
      * @returns {Array<Object>} - API response data
      */
     async makeRequest({ customerId, query, nodeName, fields }) {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e;
       const accessToken = await this.getAccessToken();
       const url = `https://googleads.googleapis.com/v21/customers/${customerId}/googleAds:search`;
       console.log(`Google Ads API Request URL: ${url}`);
@@ -14636,12 +14639,13 @@ const GoogleAds = (function() {
           requestBody.pageToken = nextPageToken;
         }
         const loginCustomerId = (_b = (_a = this.config.AuthType.items) == null ? void 0 : _a.LoginCustomerId) == null ? void 0 : _b.value;
+        const shouldIncludeLoginCustomerIdHeader = loginCustomerId && loginCustomerId !== customerId;
         const headers = {
           "Authorization": `Bearer ${accessToken}`,
           "developer-token": (_d = (_c = this.config.AuthType.items) == null ? void 0 : _c.DeveloperToken) == null ? void 0 : _d.value,
           "Content-Type": "application/json"
         };
-        if (loginCustomerId) {
+        if (shouldIncludeLoginCustomerIdHeader) {
           headers["login-customer-id"] = loginCustomerId;
         }
         const options = {
@@ -14651,10 +14655,19 @@ const GoogleAds = (function() {
           body: JSON.stringify(requestBody),
           muteHttpExceptions: true
         };
-        const response = await this.urlFetchWithRetry(url, options);
+        let response;
+        try {
+          response = await this.urlFetchWithRetry(url, options);
+        } catch (error) {
+          if ((_e = error.payload) == null ? void 0 : _e.error) {
+            this.config.logMessage(`Google Ads API error payload: ${JSON.stringify(error.payload.error, null, 2)}`);
+          }
+          throw error;
+        }
         const text = await response.getContentText();
         const jsonData = JSON.parse(text);
         if (jsonData.error) {
+          this.config.logMessage(`Google Ads API error payload: ${JSON.stringify(jsonData.error, null, 2)}`);
           throw new Error(`Google Ads API error: ${jsonData.error.message}`);
         }
         if (jsonData.results) {

package/dist/index.js

@@ -978,11 +978,9 @@ var require_index = __commonJS({
           const response = await HttpUtils.fetch(linkObj.originalUrl, {
             method: "GET"
           });
-          const headers = response.getHeaders();
-          const resolvedUrl = headers.Location || headers.location || linkObj.originalUrl;
           return {
             originalUrl: linkObj.originalUrl,
-            resolvedUrl
+            resolvedUrl: response.getUrl()
           };
         } catch (error) {
           console.log(`Failed to resolve short link ${linkObj.originalUrl}: ${error.message}`);
@@ -1148,17 +1146,21 @@ var require_index = __commonJS({
         if (options.body) {
           fetchOptions.body = options.body;
         }
+        if (options.redirect !== void 0) {
+          fetchOptions.redirect = options.redirect;
+        }
         const response = await fetch(url, fetchOptions);
-        return this._wrapNodeResponse(response);
+        return this._wrapNodeResponse(response, url);
       }
       /**
        * Wraps the response from the Node environment.
        * Not use directly, only for internal purposes.
        *
        * @param {Response} response - Native fetch Response object
+       * @param {string} originalUrl - Original URL that was requested
        * @returns {FetchResponse}
        */
-      static _wrapNodeResponse(response) {
+      static _wrapNodeResponse(response, originalUrl) {
         let textCache = null;
         let blobCache = null;
         const getText = async () => {
@@ -1189,7 +1191,8 @@ var require_index = __commonJS({
           getContent: () => getText(),
           getContentText: () => getText(),
           getBlob: () => getBlob(),
-          getResponseCode: () => response.status
+          getResponseCode: () => response.status,
+          getUrl: () => response.url || originalUrl
         };
       }
     };
@@ -14382,7 +14385,7 @@ API Response: ${JSON.stringify(statusResult, null, 2)}`);
               isRequired: true,
               requiredType: "string",
               label: "Customer ID",
-              description: "Google Ads Customer ID (format: 123-456-7890)"
+              description: "Google Ads Customer ID (format: 1234567890)"
             },
             AuthType: {
               requiredType: "object",
@@ -14626,7 +14629,7 @@ API Response: ${JSON.stringify(statusResult, null, 2)}`);
          * @returns {Array<Object>} - API response data
          */
         async makeRequest({ customerId, query, nodeName, fields }) {
-          var _a, _b, _c, _d;
+          var _a, _b, _c, _d, _e;
           const accessToken = await this.getAccessToken();
           const url = `https://googleads.googleapis.com/v21/customers/${customerId}/googleAds:search`;
           console.log(`Google Ads API Request URL: ${url}`);
@@ -14641,12 +14644,13 @@ API Response: ${JSON.stringify(statusResult, null, 2)}`);
               requestBody.pageToken = nextPageToken;
             }
             const loginCustomerId = (_b = (_a = this.config.AuthType.items) == null ? void 0 : _a.LoginCustomerId) == null ? void 0 : _b.value;
+            const shouldIncludeLoginCustomerIdHeader = loginCustomerId && loginCustomerId !== customerId;
             const headers = {
               "Authorization": `Bearer ${accessToken}`,
               "developer-token": (_d = (_c = this.config.AuthType.items) == null ? void 0 : _c.DeveloperToken) == null ? void 0 : _d.value,
               "Content-Type": "application/json"
             };
-            if (loginCustomerId) {
+            if (shouldIncludeLoginCustomerIdHeader) {
               headers["login-customer-id"] = loginCustomerId;
             }
             const options = {
@@ -14656,10 +14660,19 @@ API Response: ${JSON.stringify(statusResult, null, 2)}`);
               body: JSON.stringify(requestBody),
               muteHttpExceptions: true
             };
-            const response = await this.urlFetchWithRetry(url, options);
+            let response;
+            try {
+              response = await this.urlFetchWithRetry(url, options);
+            } catch (error) {
+              if ((_e = error.payload) == null ? void 0 : _e.error) {
+                this.config.logMessage(`Google Ads API error payload: ${JSON.stringify(error.payload.error, null, 2)}`);
+              }
+              throw error;
+            }
             const text = await response.getContentText();
             const jsonData = JSON.parse(text);
             if (jsonData.error) {
+              this.config.logMessage(`Google Ads API error payload: ${JSON.stringify(jsonData.error, null, 2)}`);
               throw new Error(`Google Ads API error: ${jsonData.error.message}`);
             }
             if (jsonData.results) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owox/connectors",
-  "version": "0.13.0-next-20251118090139",
+  "version": "0.13.0-next-20251118110411",
   "description": "Connectors and storages for different data sources",
   "license": "MIT",
   "publishConfig": {