npm - @graphql-yoga/plugin-apollo-usage-report - Versions diffs - 0.8.0 → 0.8.1 - Mend

@graphql-yoga/plugin-apollo-usage-report 0.8.0 → 0.8.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/cjs/index.js CHANGED Viewed

@@ -6,6 +6,7 @@ const graphql_1 = require("graphql");
 const graphql_yoga_1 = require("graphql-yoga");
 const usage_reporting_protobuf_1 = require("@apollo/usage-reporting-protobuf");
 const plugin_apollo_inline_trace_1 = require("@graphql-yoga/plugin-apollo-inline-trace");
+const promise_helpers_1 = require("@whatwg-node/promise-helpers");
 function getEnvVar(name, defaultValue) {
     return globalThis.process?.env?.[name] || defaultValue || undefined;
 }
@@ -42,7 +43,7 @@ function useApolloUsageReport(options = {}) {
                 },
                 onSchemaChange({ schema }) {
                     if (schema) {
-                        schemaIdSet$ = hashSHA256((0, graphql_1.printSchema)(schema), yoga.fetchAPI).then(id => {
+                        schemaIdSet$ = (0, promise_helpers_1.handleMaybePromise)(() => hashSHA256((0, graphql_1.printSchema)(schema), yoga.fetchAPI), id => {
                             schemaId = id;
                             schemaIdSet$ = undefined;
                         });
@@ -108,50 +109,48 @@ function useApolloUsageReport(options = {}) {
         },
     };
 }
-async function hashSHA256(str, api = globalThis) {
-    const { crypto, TextEncoder } = api;
-    const textEncoder = new TextEncoder();
-    const utf8 = textEncoder.encode(str);
-    const hashBuffer = await crypto.subtle.digest('SHA-256', utf8);
-    let hashHex = '';
-    for (const bytes of new Uint8Array(hashBuffer)) {
-        hashHex += bytes.toString(16).padStart(2, '0');
-    }
-    return hashHex;
+function hashSHA256(text, api = globalThis) {
+    const inputUint8Array = new api.TextEncoder().encode(text);
+    return (0, promise_helpers_1.handleMaybePromise)(() => api.crypto.subtle.digest({ name: 'SHA-256' }, inputUint8Array), arrayBuf => {
+        const outputUint8Array = new Uint8Array(arrayBuf);
+        let hash = '';
+        for (const byte of outputUint8Array) {
+            const hex = byte.toString(16);
+            hash += '00'.slice(0, Math.max(0, 2 - hex.length)) + hex;
+        }
+        return hash;
+    });
 }
-async function sendTrace(options, logger, fetch, schemaId, tracesPerQuery, agentVersion) {
+function sendTrace(options, logger, fetch, schemaId, tracesPerQuery, agentVersion) {
     const { graphRef = getEnvVar('APOLLO_GRAPH_REF'), apiKey = getEnvVar('APOLLO_KEY'), endpoint = DEFAULT_REPORTING_ENDPOINT, } = options;
-    try {
-        const body = usage_reporting_protobuf_1.Report.encode({
-            header: {
-                agentVersion,
-                graphRef,
-                executableSchemaId: schemaId,
-            },
-            operationCount: 1,
-            tracesPerQuery,
-        }).finish();
-        const response = await fetch(endpoint, {
-            method: 'POST',
-            headers: {
-                'content-type': 'application/protobuf',
-                // The presence of the api key is already checked at Yoga initialization time
-                'x-api-key': apiKey,
-                accept: 'application/json',
-            },
-            body,
-        });
-        const responseText = await response.text();
+    const body = usage_reporting_protobuf_1.Report.encode({
+        header: {
+            agentVersion,
+            graphRef,
+            executableSchemaId: schemaId,
+        },
+        operationCount: 1,
+        tracesPerQuery,
+    }).finish();
+    return (0, promise_helpers_1.handleMaybePromise)(() => fetch(endpoint, {
+        method: 'POST',
+        headers: {
+            'content-type': 'application/protobuf',
+            // The presence of the api key is already checked at Yoga initialization time
+            'x-api-key': apiKey,
+            accept: 'application/json',
+        },
+        body,
+    }), response => (0, promise_helpers_1.handleMaybePromise)(() => response.text(), responseText => {
         if (response.ok) {
             logger.debug('Traces sent:', responseText);
         }
         else {
             logger.error('Failed to send trace:', responseText);
         }
-    }
-    catch (err) {
+    }), err => {
         logger.error('Failed to send trace:', err);
-    }
+    });
 }
 function isDocumentNode(data) {
     const isObject = (data) => !!data && typeof data === 'object';

package/esm/index.js CHANGED Viewed

@@ -2,6 +2,7 @@ import { getOperationAST, Kind, printSchema, stripIgnoredCharacters } from 'grap
 import { isAsyncIterable, } from 'graphql-yoga';
 import { Report } from '@apollo/usage-reporting-protobuf';
 import { useApolloInstrumentation, } from '@graphql-yoga/plugin-apollo-inline-trace';
+import { handleMaybePromise } from '@whatwg-node/promise-helpers';
 function getEnvVar(name, defaultValue) {
     return globalThis.process?.env?.[name] || defaultValue || undefined;
 }
@@ -38,7 +39,7 @@ export function useApolloUsageReport(options = {}) {
                 },
                 onSchemaChange({ schema }) {
                     if (schema) {
-                        schemaIdSet$ = hashSHA256(printSchema(schema), yoga.fetchAPI).then(id => {
+                        schemaIdSet$ = handleMaybePromise(() => hashSHA256(printSchema(schema), yoga.fetchAPI), id => {
                             schemaId = id;
                             schemaIdSet$ = undefined;
                         });
@@ -104,50 +105,48 @@ export function useApolloUsageReport(options = {}) {
         },
     };
 }
-export async function hashSHA256(str, api = globalThis) {
-    const { crypto, TextEncoder } = api;
-    const textEncoder = new TextEncoder();
-    const utf8 = textEncoder.encode(str);
-    const hashBuffer = await crypto.subtle.digest('SHA-256', utf8);
-    let hashHex = '';
-    for (const bytes of new Uint8Array(hashBuffer)) {
-        hashHex += bytes.toString(16).padStart(2, '0');
-    }
-    return hashHex;
+export function hashSHA256(text, api = globalThis) {
+    const inputUint8Array = new api.TextEncoder().encode(text);
+    return handleMaybePromise(() => api.crypto.subtle.digest({ name: 'SHA-256' }, inputUint8Array), arrayBuf => {
+        const outputUint8Array = new Uint8Array(arrayBuf);
+        let hash = '';
+        for (const byte of outputUint8Array) {
+            const hex = byte.toString(16);
+            hash += '00'.slice(0, Math.max(0, 2 - hex.length)) + hex;
+        }
+        return hash;
+    });
 }
-async function sendTrace(options, logger, fetch, schemaId, tracesPerQuery, agentVersion) {
+function sendTrace(options, logger, fetch, schemaId, tracesPerQuery, agentVersion) {
     const { graphRef = getEnvVar('APOLLO_GRAPH_REF'), apiKey = getEnvVar('APOLLO_KEY'), endpoint = DEFAULT_REPORTING_ENDPOINT, } = options;
-    try {
-        const body = Report.encode({
-            header: {
-                agentVersion,
-                graphRef,
-                executableSchemaId: schemaId,
-            },
-            operationCount: 1,
-            tracesPerQuery,
-        }).finish();
-        const response = await fetch(endpoint, {
-            method: 'POST',
-            headers: {
-                'content-type': 'application/protobuf',
-                // The presence of the api key is already checked at Yoga initialization time
-                'x-api-key': apiKey,
-                accept: 'application/json',
-            },
-            body,
-        });
-        const responseText = await response.text();
+    const body = Report.encode({
+        header: {
+            agentVersion,
+            graphRef,
+            executableSchemaId: schemaId,
+        },
+        operationCount: 1,
+        tracesPerQuery,
+    }).finish();
+    return handleMaybePromise(() => fetch(endpoint, {
+        method: 'POST',
+        headers: {
+            'content-type': 'application/protobuf',
+            // The presence of the api key is already checked at Yoga initialization time
+            'x-api-key': apiKey,
+            accept: 'application/json',
+        },
+        body,
+    }), response => handleMaybePromise(() => response.text(), responseText => {
         if (response.ok) {
             logger.debug('Traces sent:', responseText);
         }
         else {
             logger.error('Failed to send trace:', responseText);
         }
-    }
-    catch (err) {
+    }), err => {
         logger.error('Failed to send trace:', err);
-    }
+    });
 }
 function isDocumentNode(data) {
     const isObject = (data) => !!data && typeof data === 'object';

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-yoga/plugin-apollo-usage-report",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Apollo's GraphOS usage report plugin for GraphQL Yoga.",
   "peerDependencies": {
     "graphql": "^15.2.0 || ^16.0.0",
@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "@apollo/usage-reporting-protobuf": "^4.1.1",
+    "@whatwg-node/promise-helpers": "^1.2.4",
     "tslib": "^2.8.1",
     "@graphql-yoga/plugin-apollo-inline-trace": "^3.13.0"
   },

package/typings/index.d.cts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { type Maybe, type Plugin, type YogaInitialContext } from 'graphql-yoga';
+import { type Maybe, type Plugin, type PromiseOrValue, type YogaInitialContext } from 'graphql-yoga';
 import { ApolloInlineGraphqlTraceContext, ApolloInlineRequestTraceContext, ApolloInlineTracePluginOptions } from '@graphql-yoga/plugin-apollo-inline-trace';
 type ApolloUsageReportOptions = ApolloInlineTracePluginOptions & {
     /**
@@ -47,8 +47,8 @@ export interface ApolloUsageReportGraphqlContext extends ApolloInlineGraphqlTrac
 }
 type StringFromRequestFn = (req: Request) => Maybe<string>;
 export declare function useApolloUsageReport(options?: ApolloUsageReportOptions): Plugin;
-export declare function hashSHA256(str: string, api?: {
+export declare function hashSHA256(text: string, api?: {
     crypto: Crypto;
     TextEncoder: (typeof globalThis)['TextEncoder'];
-}): Promise<string>;
+}): PromiseOrValue<string>;
 export {};

package/typings/index.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { type Maybe, type Plugin, type YogaInitialContext } from 'graphql-yoga';
+import { type Maybe, type Plugin, type PromiseOrValue, type YogaInitialContext } from 'graphql-yoga';
 import { ApolloInlineGraphqlTraceContext, ApolloInlineRequestTraceContext, ApolloInlineTracePluginOptions } from '@graphql-yoga/plugin-apollo-inline-trace';
 type ApolloUsageReportOptions = ApolloInlineTracePluginOptions & {
     /**
@@ -47,8 +47,8 @@ export interface ApolloUsageReportGraphqlContext extends ApolloInlineGraphqlTrac
 }
 type StringFromRequestFn = (req: Request) => Maybe<string>;
 export declare function useApolloUsageReport(options?: ApolloUsageReportOptions): Plugin;
-export declare function hashSHA256(str: string, api?: {
+export declare function hashSHA256(text: string, api?: {
     crypto: Crypto;
     TextEncoder: (typeof globalThis)['TextEncoder'];
-}): Promise<string>;
+}): PromiseOrValue<string>;
 export {};