@graphql-hive/apollo 0.43.0 → 0.44.0

package/cjs/index.js

@@ -4,45 +4,59 @@ exports.createSupergraphSDLFetcher = exports.createServicesFetcher = exports.cre
 exports.createSupergraphManager = createSupergraphManager;
 exports.createHive = createHive;
 exports.useHive = useHive;
-const tslib_1 = require("tslib");
 const graphql_1 = require("graphql");
 const core_1 = require("@graphql-hive/core");
+const logger_1 = require("@graphql-hive/logger");
 const version_js_1 = require("./version.js");
 var core_2 = require("@graphql-hive/core");
 Object.defineProperty(exports, "atLeastOnceSampler", { enumerable: true, get: function () { return core_2.atLeastOnceSampler; } });
 Object.defineProperty(exports, "createSchemaFetcher", { enumerable: true, get: function () { return core_2.createSchemaFetcher; } });
 Object.defineProperty(exports, "createServicesFetcher", { enumerable: true, get: function () { return core_2.createServicesFetcher; } });
 Object.defineProperty(exports, "createSupergraphSDLFetcher", { enumerable: true, get: function () { return core_2.createSupergraphSDLFetcher; } });
-function createSupergraphManager(_a) {
-    var { pollIntervalInMs } = _a, superGraphFetcherOptions = tslib_1.__rest(_a, ["pollIntervalInMs"]);
-    pollIntervalInMs = pollIntervalInMs !== null && pollIntervalInMs !== void 0 ? pollIntervalInMs : 30000;
-    const fetchSupergraph = (0, core_1.createSupergraphSDLFetcher)(superGraphFetcherOptions);
+function createSupergraphManager(args) {
+    var _a, _b, _c, _d;
+    const logger = (_a = args.logger) !== null && _a !== void 0 ? _a : new logger_1.Logger({ level: false });
+    const pollIntervalInMs = (_b = args.pollIntervalInMs) !== null && _b !== void 0 ? _b : 30000;
+    let endpoints = Array.isArray(args.endpoint) ? args.endpoint : [args.endpoint];
+    const endpoint = endpoints.map(endpoint => endpoint.endsWith('/supergraph') ? endpoint : (0, core_1.joinUrl)(endpoint, 'supergraph'));
+    const artifactsFetcher = (0, core_1.createCDNArtifactFetcher)({
+        endpoint: endpoint,
+        accessKey: args.key,
+        client: {
+            name: (_c = args.name) !== null && _c !== void 0 ? _c : '@graphql-hive/apollo',
+            version: (_d = args.version) !== null && _d !== void 0 ? _d : version_js_1.version,
+        },
+        logger,
+        fetch: args.fetchImplementation,
+        circuitBreaker: args.circuitBreaker,
+    });
     let timer = null;
     return {
         async initialize(hooks) {
-            const initialResult = await fetchSupergraph();
+            const initialResult = await artifactsFetcher.fetch();
             function poll() {
                 timer = setTimeout(async () => {
                     var _a;
                     try {
-                        const result = await fetchSupergraph();
-                        if (result.supergraphSdl) {
-                            (_a = hooks.update) === null || _a === void 0 ? void 0 : _a.call(hooks, result.supergraphSdl);
+                        const result = await artifactsFetcher.fetch();
+                        if (result.contents) {
+                            (_a = hooks.update) === null || _a === void 0 ? void 0 : _a.call(hooks, result.contents);
                         }
                     }
                     catch (error) {
-                        console.error(`Failed to update supergraph: ${error instanceof Error ? error.message : error}`);
+                        logger.error({ error }, `Failed to update supergraph.`);
                     }
                     poll();
                 }, pollIntervalInMs);
             }
             poll();
             return {
-                supergraphSdl: initialResult.supergraphSdl,
+                supergraphSdl: initialResult.contents,
                 cleanup: async () => {
                     if (timer) {
                         clearTimeout(timer);
                     }
+                    artifactsFetcher.dispose();
                 },
             };
         },

package/cjs/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-exports.version = '0.43.0';
+exports.version = '0.44.0';

package/esm/index.js

@@ -1,38 +1,52 @@
-import { __rest } from "tslib";
 import { GraphQLError } from 'graphql';
-import { autoDisposeSymbol, createHive as createHiveClient, createSupergraphSDLFetcher, isHiveClient, } from '@graphql-hive/core';
+import { autoDisposeSymbol, createCDNArtifactFetcher, createHive as createHiveClient, isHiveClient, joinUrl, } from '@graphql-hive/core';
+import { Logger } from '@graphql-hive/logger';
 import { version } from './version.js';
 export { atLeastOnceSampler, createSchemaFetcher, createServicesFetcher, createSupergraphSDLFetcher, } from '@graphql-hive/core';
-export function createSupergraphManager(_a) {
-    var { pollIntervalInMs } = _a, superGraphFetcherOptions = __rest(_a, ["pollIntervalInMs"]);
-    pollIntervalInMs = pollIntervalInMs !== null && pollIntervalInMs !== void 0 ? pollIntervalInMs : 30000;
-    const fetchSupergraph = createSupergraphSDLFetcher(superGraphFetcherOptions);
+export function createSupergraphManager(args) {
+    var _a, _b, _c, _d;
+    const logger = (_a = args.logger) !== null && _a !== void 0 ? _a : new Logger({ level: false });
+    const pollIntervalInMs = (_b = args.pollIntervalInMs) !== null && _b !== void 0 ? _b : 30000;
+    let endpoints = Array.isArray(args.endpoint) ? args.endpoint : [args.endpoint];
+    const endpoint = endpoints.map(endpoint => endpoint.endsWith('/supergraph') ? endpoint : joinUrl(endpoint, 'supergraph'));
+    const artifactsFetcher = createCDNArtifactFetcher({
+        endpoint: endpoint,
+        accessKey: args.key,
+        client: {
+            name: (_c = args.name) !== null && _c !== void 0 ? _c : '@graphql-hive/apollo',
+            version: (_d = args.version) !== null && _d !== void 0 ? _d : version,
+        },
+        logger,
+        fetch: args.fetchImplementation,
+        circuitBreaker: args.circuitBreaker,
+    });
     let timer = null;
     return {
         async initialize(hooks) {
-            const initialResult = await fetchSupergraph();
+            const initialResult = await artifactsFetcher.fetch();
             function poll() {
                 timer = setTimeout(async () => {
                     var _a;
                     try {
-                        const result = await fetchSupergraph();
-                        if (result.supergraphSdl) {
-                            (_a = hooks.update) === null || _a === void 0 ? void 0 : _a.call(hooks, result.supergraphSdl);
+                        const result = await artifactsFetcher.fetch();
+                        if (result.contents) {
+                            (_a = hooks.update) === null || _a === void 0 ? void 0 : _a.call(hooks, result.contents);
                         }
                     }
                     catch (error) {
-                        console.error(`Failed to update supergraph: ${error instanceof Error ? error.message : error}`);
+                        logger.error({ error }, `Failed to update supergraph.`);
                     }
                     poll();
                 }, pollIntervalInMs);
             }
             poll();
             return {
-                supergraphSdl: initialResult.supergraphSdl,
+                supergraphSdl: initialResult.contents,
                 cleanup: async () => {
                     if (timer) {
                         clearTimeout(timer);
                     }
+                    artifactsFetcher.dispose();
                 },
             };
         },

package/esm/version.js

@@ -1 +1 @@
-export const version = '0.43.0';
+export const version = '0.44.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-hive/apollo",
-  "version": "0.43.0",
+  "version": "0.44.0",
   "description": "GraphQL Hive + Apollo Server",
   "sideEffects": false,
   "peerDependencies": {
@@ -8,7 +8,8 @@
     "graphql": "^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-hive/core": "0.16.0"
+    "@graphql-hive/logger": "^1.0.9",
+    "@graphql-hive/core": "0.17.0"
   },
   "repository": {
     "type": "git",

package/typings/index.d.cts

@@ -1,10 +1,43 @@
 import type { ApolloServerPlugin } from '@apollo/server';
-import { HiveClient, HivePluginOptions, SupergraphSDLFetcherOptions } from '@graphql-hive/core';
+import { HiveClient, HivePluginOptions, type CircuitBreakerConfiguration } from '@graphql-hive/core';
+import { Logger } from '@graphql-hive/logger';
 export { atLeastOnceSampler, createSchemaFetcher, createServicesFetcher, createSupergraphSDLFetcher, } from '@graphql-hive/core';
+/** @deprecated Use {CreateSupergraphManagerArgs} instead */
 export type { SupergraphSDLFetcherOptions } from '@graphql-hive/core';
-export declare function createSupergraphManager({ pollIntervalInMs, ...superGraphFetcherOptions }: {
+/**
+ * Configuration for {createSupergraphManager}.
+ */
+export type CreateSupergraphManagerArgs = {
+    /**
+     * The artifact endpoint to poll.
+     * E.g. `https://cdn.graphql-hive.com/<uuid>/supergraph`
+     */
+    endpoint: string | [string, string];
+    /**
+     * The CDN access key for fetching artifact.
+     */
+    key: string;
+    logger?: Logger;
+    /**
+     * The supergraph poll interval in milliseconds
+     * Default: 30_000
+     */
     pollIntervalInMs?: number;
-} & SupergraphSDLFetcherOptions): {
+    /** Circuit breaker configuration override. */
+    circuitBreaker?: CircuitBreakerConfiguration;
+    fetchImplementation?: typeof fetch;
+    /**
+     * Client name override
+     * Default: `@graphql-hive/apollo`
+     */
+    name?: string;
+    /**
+     * Client version override
+     * Default: currents package version
+     */
+    version?: string;
+};
+export declare function createSupergraphManager(args: CreateSupergraphManagerArgs): {
     initialize(hooks: {
         update(supergraphSdl: string): void;
     }): Promise<{

package/typings/index.d.ts

@@ -1,10 +1,43 @@
 import type { ApolloServerPlugin } from '@apollo/server';
-import { HiveClient, HivePluginOptions, SupergraphSDLFetcherOptions } from '@graphql-hive/core';
+import { HiveClient, HivePluginOptions, type CircuitBreakerConfiguration } from '@graphql-hive/core';
+import { Logger } from '@graphql-hive/logger';
 export { atLeastOnceSampler, createSchemaFetcher, createServicesFetcher, createSupergraphSDLFetcher, } from '@graphql-hive/core';
+/** @deprecated Use {CreateSupergraphManagerArgs} instead */
 export type { SupergraphSDLFetcherOptions } from '@graphql-hive/core';
-export declare function createSupergraphManager({ pollIntervalInMs, ...superGraphFetcherOptions }: {
+/**
+ * Configuration for {createSupergraphManager}.
+ */
+export type CreateSupergraphManagerArgs = {
+    /**
+     * The artifact endpoint to poll.
+     * E.g. `https://cdn.graphql-hive.com/<uuid>/supergraph`
+     */
+    endpoint: string | [string, string];
+    /**
+     * The CDN access key for fetching artifact.
+     */
+    key: string;
+    logger?: Logger;
+    /**
+     * The supergraph poll interval in milliseconds
+     * Default: 30_000
+     */
     pollIntervalInMs?: number;
-} & SupergraphSDLFetcherOptions): {
+    /** Circuit breaker configuration override. */
+    circuitBreaker?: CircuitBreakerConfiguration;
+    fetchImplementation?: typeof fetch;
+    /**
+     * Client name override
+     * Default: `@graphql-hive/apollo`
+     */
+    name?: string;
+    /**
+     * Client version override
+     * Default: currents package version
+     */
+    version?: string;
+};
+export declare function createSupergraphManager(args: CreateSupergraphManagerArgs): {
     initialize(hooks: {
         update(supergraphSdl: string): void;
     }): Promise<{

package/typings/version.d.cts

@@ -1,2 +1,2 @@
-export declare const version = "0.43.0";
+export declare const version = "0.44.0";
 //# sourceMappingURL=version.d.ts.map

package/typings/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "0.43.0";
+export declare const version = "0.44.0";
 //# sourceMappingURL=version.d.ts.map