@aws-amplify/api-graphql 4.0.1-console-preview.8f82e46.0 → 4.0.1-console-preview.b278dcb.0

package/lib-esm/Providers/AWSAppSyncRealTimeProvider/index.js

@@ -3,16 +3,15 @@ import { __assign, __awaiter, __generator, __read } from "tslib";
 // SPDX-License-Identifier: Apache-2.0
 import { Observable } from 'rxjs';
 import { GraphQLError } from 'graphql';
-import * as url from 'url';
 import { Buffer } from 'buffer';
-import { Hub, fetchAuthSession } from '@aws-amplify/core';
+import { Hub, fetchAuthSession, ConsoleLogger } from '@aws-amplify/core';
 import { signRequest } from '@aws-amplify/core/internals/aws-client-utils';
-import { Logger, NonRetryableError, USER_AGENT_HEADER, getAmplifyUserAgent, isNonRetryableError, jitteredExponentialRetry, amplifyUuid, AmplifyUrl, } from '@aws-amplify/core/internals/utils';
+import { NonRetryableError, USER_AGENT_HEADER, getAmplifyUserAgent, isNonRetryableError, jitteredExponentialRetry, amplifyUuid, AmplifyUrl, } from '@aws-amplify/core/internals/utils';
 import { CONTROL_MSG, ConnectionState, } from '../../types/PubSub';
 import { AMPLIFY_SYMBOL, AWS_APPSYNC_REALTIME_HEADERS, CONNECTION_INIT_TIMEOUT, DEFAULT_KEEP_ALIVE_TIMEOUT, DEFAULT_KEEP_ALIVE_ALERT_TIMEOUT, MAX_DELAY_MS, MESSAGE_TYPES, NON_RETRYABLE_CODES, SOCKET_STATUS, START_ACK_TIMEOUT, SUBSCRIPTION_STATUS, CONNECTION_STATE_CHANGE, } from '../constants';
 import { ConnectionStateMonitor, CONNECTION_CHANGE, } from '../../utils/ConnectionStateMonitor';
 import { ReconnectEvent, ReconnectionMonitor, } from '../../utils/ReconnectionMonitor';
-var logger = new Logger('AWSAppSyncRealTimeProvider');
+var logger = new ConsoleLogger('AWSAppSyncRealTimeProvider');
 var dispatchApiEvent = function (payload) {
     Hub.dispatch('api', payload, 'PubSub', AMPLIFY_SYMBOL);
 };
@@ -697,7 +696,9 @@ var AWSAppSyncRealTimeProvider = /** @class */ (function () {
                         return [2 /*return*/, undefined];
                     case 1:
                         handler = headerHandler[authenticationType];
-                        host = url.parse(appSyncGraphqlEndpoint !== null && appSyncGraphqlEndpoint !== void 0 ? appSyncGraphqlEndpoint : '').host;
+                        host = appSyncGraphqlEndpoint
+                            ? new AmplifyUrl(appSyncGraphqlEndpoint).host
+                            : undefined;
                         logger.debug("Authenticating with " + JSON.stringify(authenticationType));
                         resolvedApiKey = void 0;
                         if (authenticationType === 'apiKey') {

package/lib-esm/internals/InternalGraphQLAPI.js

@@ -2,14 +2,15 @@ import { __assign, __awaiter, __generator, __read } from "tslib";
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { print, parse, GraphQLError, } from 'graphql';
-import { ConsoleLogger as Logger, getAmplifyUserAgent, AmplifyUrl, } from '@aws-amplify/core/internals/utils';
+import { ConsoleLogger } from '@aws-amplify/core';
+import { getAmplifyUserAgent, AmplifyUrl, } from '@aws-amplify/core/internals/utils';
 import { GraphQLAuthError, } from '../types';
 import { isCancelError as isCancelErrorREST } from '@aws-amplify/api-rest';
 import { post, cancel as cancelREST, updateRequestToBeCancellable, } from '@aws-amplify/api-rest/internals';
 import { AWSAppSyncRealTimeProvider } from '../Providers/AWSAppSyncRealTimeProvider';
 import { resolveConfig, resolveLibraryOptions } from '../utils';
 var USER_AGENT_HEADER = 'x-amz-user-agent';
-var logger = new Logger('GraphQLAPI');
+var logger = new ConsoleLogger('GraphQLAPI');
 export var graphqlOperation = function (query, variables, authToken) {
     if (variables === void 0) { variables = {}; }
     return ({