google-ads-api 23.0.1 → 24.1.0

package/build/src/protos/index.d.ts

@@ -1,10 +1,10 @@
 import allProtos, { protos } from "google-ads-node";
-export declare const VERSION: "v23";
-export import common = protos.google.ads.googleads.v23.common;
-export import errors = protos.google.ads.googleads.v23.errors;
-export import resources = protos.google.ads.googleads.v23.resources;
-export import services = protos.google.ads.googleads.v23.services;
-export import internalEnums = protos.google.ads.googleads.v23.enums;
+export declare const VERSION: "v24";
+export import common = protos.google.ads.googleads.v24.common;
+export import errors = protos.google.ads.googleads.v24.errors;
+export import resources = protos.google.ads.googleads.v24.resources;
+export import services = protos.google.ads.googleads.v24.services;
+export import internalEnums = protos.google.ads.googleads.v24.enums;
 export { enums } from "./autogen/enums";
 export { fields, fieldDataTypes } from "./autogen/fields";
 export { GoogleAdsServiceClient } from "google-ads-node";

package/build/src/protos/index.js

@@ -7,12 +7,12 @@ const version_1 = require("../version");
 exports.VERSION = version_1.googleAdsVersion;
 // -- Expose the googleads generated types --
 // The namespace path is shortened for ease of use
-exports.common = google_ads_node_1.protos.google.ads.googleads.v23.common;
-exports.errors = google_ads_node_1.protos.google.ads.googleads.v23.errors;
-exports.resources = google_ads_node_1.protos.google.ads.googleads.v23.resources;
-exports.services = google_ads_node_1.protos.google.ads.googleads.v23.services;
+exports.common = google_ads_node_1.protos.google.ads.googleads.v24.common;
+exports.errors = google_ads_node_1.protos.google.ads.googleads.v24.errors;
+exports.resources = google_ads_node_1.protos.google.ads.googleads.v24.resources;
+exports.services = google_ads_node_1.protos.google.ads.googleads.v24.services;
 // We compile enums ourselves, the Google ones should be used internally only
-exports.internalEnums = google_ads_node_1.protos.google.ads.googleads.v23.enums;
+exports.internalEnums = google_ads_node_1.protos.google.ads.googleads.v24.enums;
 var enums_1 = require("./autogen/enums");
 Object.defineProperty(exports, "enums", { enumerable: true, get: function () { return enums_1.enums; } });
 var fields_1 = require("./autogen/fields");

package/build/src/service.d.ts

@@ -2,12 +2,19 @@ import { ClientOptions } from "./client";
 import { AllServices, errors, GoogleAdsServiceClient, ServiceName, services } from "./protos";
 import { CustomerOptions, CustomerCredentials, RequestOptions, MutateOperation, MutateOptions } from "./types";
 import { Hooks } from "./hooks";
-export declare const FAILURE_KEY = "google.ads.googleads.v23.errors.googleadsfailure-bin";
+import TTLCache from "@isaacs/ttlcache";
+export declare const FAILURE_KEY = "google.ads.googleads.v24.errors.googleadsfailure-bin";
 export interface CallHeaders {
     "developer-token": string;
     "login-customer-id"?: string;
     "linked-customer-id"?: string;
 }
+export declare function disposeService(service: {
+    close: () => Promise<void>;
+}): void;
+export declare const serviceCache: TTLCache<unknown, {
+    close: () => Promise<void>;
+}>;
 export declare class Service {
     protected readonly clientOptions: ClientOptions;
     protected readonly customerOptions: CustomerOptions;
@@ -17,7 +24,9 @@ export declare class Service {
     protected get callHeaders(): CallHeaders;
     private getCredentials;
     getAccessToken(): Promise<string>;
-    protected loadService<T = AllServices>(service: ServiceName): T;
+    protected loadService<T = AllServices>(service: ServiceName, options?: {
+        skipCache?: boolean;
+    }): T;
     protected getGoogleAdsError(error: Error): errors.GoogleAdsFailure | Error;
     private decodeGoogleAdsFailureBuffer;
     protected decodePartialFailureError<T>(response: T): T;

package/build/src/service.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Service = exports.FAILURE_KEY = void 0;
+exports.Service = exports.serviceCache = exports.FAILURE_KEY = void 0;
+exports.disposeService = disposeService;
 const google_gax_1 = require("google-gax");
 const google_auth_library_1 = require("google-auth-library");
 const protos_1 = require("./protos");
@@ -12,14 +13,18 @@ const version_1 = require("./version");
 const ttlcache_1 = __importDefault(require("@isaacs/ttlcache"));
 // Make sure to update this version number when upgrading
 exports.FAILURE_KEY = `google.ads.googleads.${version_1.googleAdsVersion}.errors.googleadsfailure-bin`;
+// Close connections when services are removed from the cache
+function disposeService(service) {
+    Promise.resolve()
+        .then(() => service.close())
+        .catch(() => null);
+}
 // A global service cache to avoid re-initialising services
-const serviceCache = new ttlcache_1.default({
+exports.serviceCache = new ttlcache_1.default({
     max: 1_000,
     ttl: 10 * 60 * 1000, // 10 minutes
-    dispose: async (service) => {
-        // Close connections when services are removed from the cache
-        await service.close();
-    },
+    checkAgeOnGet: true,
+    dispose: disposeService,
 });
 // A global access token cache used by REST calls. Issued tokens expire after 1 hour, so we cache them for 50 minutes.
 const accessTokenCache = new ttlcache_1.default({
@@ -80,10 +85,13 @@ class Service {
         accessTokenCache.set(this.customerOptions.refresh_token, token);
         return token;
     }
-    loadService(service) {
+    loadService(service, options) {
         const serviceCacheKey = `${service}_${this.clientOptions.client_id}_${this.customerOptions.refresh_token}`;
-        if (serviceCache.has(serviceCacheKey)) {
-            return serviceCache.get(serviceCacheKey);
+        if (!options?.skipCache) {
+            const cachedService = exports.serviceCache.get(serviceCacheKey);
+            if (cachedService) {
+                return cachedService;
+            }
         }
         // eslint-disable-next-line @typescript-eslint/no-var-requires
         const { [service]: protoService } = require("google-ads-node");
@@ -94,7 +102,9 @@ class Service {
         const client = new protoService({
             sslCreds: this.getCredentials(),
         });
-        serviceCache.set(serviceCacheKey, client);
+        if (!options?.skipCache) {
+            exports.serviceCache.set(serviceCacheKey, client);
+        }
         return client;
     }
     getGoogleAdsError(error) {

package/build/src/utils.d.ts

@@ -45,5 +45,5 @@ export declare function toCamelCase(str: string): string;
  * const snakeCaseString = toSnakeCase("adGroupCriterionSimulation") // "ad_group_criterion_simulation"
  */
 export declare function toSnakeCase(str: string): string;
-export declare function recursiveFieldMaskSearch(data: Record<string, any>): string[];
+export declare function recursiveFieldMaskSearch(data: Record<string, any>, ancestors?: Set<object>): string[];
 export declare function getFieldMask(data: Record<string, any>): protobuf.FieldMask;

package/build/src/utils.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fromMicros = fromMicros;
 exports.toMicros = toMicros;
@@ -8,6 +11,7 @@ exports.toCamelCase = toCamelCase;
 exports.toSnakeCase = toSnakeCase;
 exports.recursiveFieldMaskSearch = recursiveFieldMaskSearch;
 exports.getFieldMask = getFieldMask;
+const long_1 = __importDefault(require("long"));
 const protos_1 = require("./protos");
 /**
  * @param micros Money value in micros format
@@ -73,7 +77,13 @@ function toSnakeCase(str) {
         .replace(/(?<!(^|_))([A-Z])/g, (pattern) => "_" + pattern) // places an underscore before any capital chars, unless there is already an underscore or it is the first char of the string
         .toLowerCase();
 }
-function recursiveFieldMaskSearch(data) {
+function recursiveFieldMaskSearch(data, 
+// eslint-disable-next-line @typescript-eslint/ban-types
+ancestors = new Set()) {
+    if (ancestors.has(data)) {
+        throw new Error("Cannot build a field mask from an object containing a circular reference");
+    }
+    ancestors.add(data);
     const paths = [];
     for (const key of Object.keys(data)) {
         if (key === "resourceName") {
@@ -81,12 +91,16 @@ function recursiveFieldMaskSearch(data) {
         }
         const fieldKey = toSnakeCase(key);
         const value = data[key];
-        if (typeof value === "object" && !Array.isArray(value) && value !== null) {
+        if (typeof value === "object" &&
+            !Array.isArray(value) &&
+            !ArrayBuffer.isView(value) &&
+            !long_1.default.isLong(value) &&
+            value !== null) {
             if (Object.keys(value).length === 0) {
                 paths.push(fieldKey);
             }
             else {
-                const children = recursiveFieldMaskSearch(value);
+                const children = recursiveFieldMaskSearch(value, ancestors);
                 for (const child of children) {
                     paths.push(`${fieldKey}.${child}`);
                 }
@@ -95,6 +109,7 @@ function recursiveFieldMaskSearch(data) {
         }
         paths.push(fieldKey);
     }
+    ancestors.delete(data);
     return paths;
 }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/build/src/version.d.ts

@@ -1 +1 @@
-export declare const googleAdsVersion = "v23";
+export declare const googleAdsVersion = "v24";

package/build/src/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.googleAdsVersion = void 0;
-exports.googleAdsVersion = "v23";
+exports.googleAdsVersion = "v24";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-ads-api",
-  "version": "23.0.1",
+  "version": "24.1.0",
   "description": "Google Ads API Client Library for Node.js",
   "repository": "https://github.com/Opteo/google-ads-api",
   "main": "build/src/index.js",
@@ -18,12 +18,12 @@
   "author": "Opteo",
   "license": "MIT",
   "dependencies": {
-    "@isaacs/ttlcache": "^1.2.2",
+    "@isaacs/ttlcache": "^1.4.0",
     "axios": "^1.6.7",
     "circ-json": "^1.0.4",
-    "google-ads-node": "23.0.0",
+    "google-ads-node": "24.1.0",
     "google-auth-library": "^9.15.1",
-    "google-gax": "^5.0.6",
+    "google-gax": "^5.0.7",
     "long": "^4.0.0",
     "stream-json": "^1.8.0"
   },