google-ads-api 23.0.1 → 24.1.0

package/build/src/client.js

@@ -18,7 +18,7 @@ class Client {
             refresh_token: refreshToken,
         });
         // @ts-expect-error Protected usage is fine here
-        const customerService = await service.loadService("CustomerServiceClient");
+        const customerService = service.loadService("CustomerServiceClient", { skipCache: true });
         try {
             // @ts-expect-error Type definition is incorrect, response is an array
             const [response] = await customerService.listAccessibleCustomers({}, {
@@ -35,6 +35,10 @@ class Client {
             // @ts-expect-error Protected usage is fine here
             throw service.getGoogleAdsError(err);
         }
+        finally {
+            // @ts-expect-error close() exists on the gax client but not on the proto type
+            await customerService.close().catch(() => null);
+        }
     }
 }
 exports.Client = Client;

package/build/src/customer.js

@@ -337,21 +337,28 @@ class Customer extends serviceFactory_1.default {
             });
             const pipeline = (0, stream_chain_1.chain)([stream, parser, (0, StreamArray_1.streamArray)()]);
             let count = 0;
-            for await (const data of pipeline) {
-                const results = data.value.results ??
-                    (data.value.summaryRow ? [data.value.summaryRow] : undefined) ??
-                    [];
-                count += results.length;
-                if (this.clientOptions.max_reporting_rows &&
-                    count > this.clientOptions.max_reporting_rows &&
-                    !this.gaqlQueryStringIncludesLimit(gaqlQuery)) {
-                    throw this.generateTooManyRowsError();
-                }
-                for (const row of results) {
-                    const parsed = this.decamelizeKeysIfNeeded(row);
-                    yield parsed;
+            try {
+                for await (const data of pipeline) {
+                    const results = data.value.results ??
+                        (data.value.summaryRow ? [data.value.summaryRow] : undefined) ??
+                        [];
+                    count += results.length;
+                    if (this.clientOptions.max_reporting_rows &&
+                        count > this.clientOptions.max_reporting_rows &&
+                        !this.gaqlQueryStringIncludesLimit(gaqlQuery)) {
+                        throw this.generateTooManyRowsError();
+                    }
+                    for (const row of results) {
+                        const parsed = this.decamelizeKeysIfNeeded(row);
+                        yield parsed;
+                    }
                 }
             }
+            finally {
+                pipeline.destroy();
+                parser.destroy();
+                stream.destroy();
+            }
             return;
         }
         catch (e) {

package/build/src/parser.js

@@ -87,6 +87,27 @@ function parseRows(rows, fields) {
     }
     return newRows;
 }
+function convertLongsToNumbers(value) {
+    const isPrimitive = value === null || typeof value !== "object";
+    if (isPrimitive) {
+        return value;
+    }
+    if (long_1.default.isLong(value)) {
+        return value.toNumber();
+    }
+    if (Array.isArray(value)) {
+        return value.map(convertLongsToNumbers);
+    }
+    const isBytesField = ArrayBuffer.isView(value);
+    if (isBytesField) {
+        return value;
+    }
+    const converted = {};
+    for (const [key, nestedValue] of Object.entries(value)) {
+        converted[key] = convertLongsToNumbers(nestedValue);
+    }
+    return converted;
+}
 function parseNestedValues(row, data, field, paths) {
     if (!data)
         return null;
@@ -94,11 +115,7 @@ function parseNestedValues(row, data, field, paths) {
     if (!row)
         row = {};
     if (childFields.length === 0) {
-        const rawVal = data[parentField];
-        const parsedVal = long_1.default.isLong(rawVal)
-            ? new long_1.default(rawVal.low, rawVal.high, rawVal.unsigned).toNumber()
-            : rawVal;
-        row[parentField] = parsedVal;
+        row[parentField] = convertLongsToNumbers(data[parentField]);
         return row;
     }
     row[parentField] = parseNestedValues(row[parentField], data[parentField], parentField, childFields);