@aws-amplify/pubsub 5.5.6-api-v6-models.b3abc9b.0 → 6.0.0

package/src/index.ts

@@ -1,17 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-export { PubSub } from './PubSub';
 export { CONNECTION_STATE_CHANGE } from './Providers/constants';
 export { ConnectionState, CONTROL_MSG } from './types';
-export {
-	AWSAppSyncRealTimeProvider,
-	AWSAppSyncRealTimeProviderOptions,
-	AWSIoTProvider,
-	AWSIoTProviderOptions,
-	AbstractPubSubProvider,
-	MqttOverWSProvider,
-	MqttProviderOptions,
-	ObserverQuery,
-	mqttTopicMatch,
-} from './Providers';
+export { mqttTopicMatch } from './Providers';
+
+export { PubSub, PubSubOptions } from './clients/iot';

package/src/types/PubSub.ts

@@ -1,7 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { ZenObservable } from 'zen-observable-ts';
-
+import { Observer, Observable } from 'rxjs';
 export interface SubscriptionObserver<T> {
 	closed: boolean;
 	next(value: T): void;
@@ -53,6 +52,30 @@ export enum ConnectionState {
 	ConnectedPendingKeepAlive = 'ConnectedPendingKeepAlive',
 }
 
-export type PubSubContent = Record<string, unknown> | string;
-export type PubSubContentObserver =
-	ZenObservable.SubscriptionObserver<PubSubContent>;
+export type PubSubContent = Record<string, unknown>;
+export type PubSubContentObserver = Observer<PubSubContent>;
+
+export interface PubSubOptions {
+	[key: string]: any;
+	provider?: string | symbol;
+}
+
+export interface PubSubBase {
+	// configure your provider
+	configure(config: Record<string, unknown>): Record<string, unknown>;
+
+	publish(input: PublishInput): void;
+
+	subscribe(input: SubscribeInput): Observable<PubSubContent>;
+}
+
+export type PublishInput = {
+	topics: string[] | string;
+	message: PubSubContent;
+	options?: PubSubOptions;
+};
+
+export type SubscribeInput = {
+	topics: string[] | string;
+	options?: PubSubOptions;
+};

package/src/types/index.ts

@@ -1,4 +1,3 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-export * from './Provider';
 export { SubscriptionObserver, CONTROL_MSG, ConnectionState } from './PubSub';

package/src/utils/ConnectionStateMonitor.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import Observable, { ZenObservable } from 'zen-observable-ts';
+import { Observable, Observer, SubscriptionLike, map, filter } from 'rxjs';
 import { ConnectionState } from '../types/PubSub';
 import { ReachabilityMonitor } from './ReachabilityMonitor';
 
@@ -50,9 +50,9 @@ export class ConnectionStateMonitor {
 	 */
 	private _linkedConnectionState: LinkedConnectionStates;
 	private _linkedConnectionStateObservable: Observable<LinkedConnectionStates>;
-	private _linkedConnectionStateObserver: ZenObservable.SubscriptionObserver<LinkedConnectionStates>;
-	private _networkMonitoringSubscription?: ZenObservable.Subscription;
-	private _initialNetworkStateSubscription?: ZenObservable.Subscription;
+	private _linkedConnectionStateObserver?: Observer<LinkedConnectionStates>;
+	private _networkMonitoringSubscription?: SubscriptionLike;
+	private _initialNetworkStateSubscription?: SubscriptionLike;
 
 	constructor() {
 		this._networkMonitoringSubscription = undefined;
@@ -121,14 +121,18 @@ export class ConnectionStateMonitor {
 
 		// After translating from linked states to ConnectionState, then remove any duplicates
 		return this._linkedConnectionStateObservable
-			.map(value => {
-				return this.connectionStatesTranslator(value);
-			})
-			.filter(current => {
-				const toInclude = current !== previous;
-				previous = current;
-				return toInclude;
-			});
+			.pipe(
+				map(value => {
+					return this.connectionStatesTranslator(value);
+				})
+			)
+			.pipe(
+				filter(current => {
+					const toInclude = current !== previous;
+					previous = current;
+					return toInclude;
+				})
+			);
 	}
 
 	/*
@@ -150,7 +154,7 @@ export class ConnectionStateMonitor {
 
 		this._linkedConnectionState = { ...newSocketStatus };
 
-		this._linkedConnectionStateObserver.next(this._linkedConnectionState);
+		this._linkedConnectionStateObserver?.next(this._linkedConnectionState);
 	}
 
 	/*

package/src/utils/ReachabilityMonitor/index.native.ts

@@ -1,6 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Reachability } from '@aws-amplify/core';
+
+import { Reachability } from '@aws-amplify/core/internals/utils';
 import { default as NetInfo } from '@react-native-community/netinfo';
 
 export const ReachabilityMonitor = () =>

package/src/utils/ReachabilityMonitor/index.ts

@@ -1,5 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Reachability } from '@aws-amplify/core';
+import { Reachability } from '@aws-amplify/core/internals/utils';
 
 export const ReachabilityMonitor = () => new Reachability().networkMonitor();

package/src/utils/ReconnectionMonitor.ts

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Observer } from 'zen-observable-ts';
+import { Observer } from 'rxjs';
 import { RECONNECT_DELAY, RECONNECT_INTERVAL } from '../Providers/constants';
 
 export enum ReconnectEvent {

package/internals/package.json

@@ -1,8 +0,0 @@
-{
-	"name": "@aws-amplify/pubsub/internals",
-	"types": "../lib-esm/internals/index.d.ts",
-	"main": "../lib/internals/index.js",
-	"module": "../lib-esm/internals/index.js",
-	"react-native": "../lib-esm/internals/index.js",
-	"sideEffects": false
-}

package/lib/.tsbuildinfo

@@ -1,3 +0,0 @@
-{
-  "version": "3.8.3"
-}

package/lib/Providers/AWSAppSyncRealTimeProvider/index.d.ts

@@ -1,77 +0,0 @@
-import Observable from 'zen-observable-ts';
-import { ProviderOptions } from '../../types/Provider';
-import { CustomUserAgentDetails } from '@aws-amplify/core';
-import { GRAPHQL_AUTH_MODE } from '@aws-amplify/auth';
-import { AbstractPubSubProvider } from '../PubSubProvider';
-import { PubSubContent, PubSubContentObserver } from '../../types/PubSub';
-import { SUBSCRIPTION_STATUS } from '../constants';
-export declare type ObserverQuery = {
-    observer: PubSubContentObserver;
-    query: string;
-    variables: Record<string, unknown>;
-    subscriptionState: SUBSCRIPTION_STATUS;
-    subscriptionReadyCallback?: Function;
-    subscriptionFailedCallback?: Function;
-    startAckTimeoutId?: ReturnType<typeof setTimeout>;
-};
-declare type GraphqlAuthModes = keyof typeof GRAPHQL_AUTH_MODE;
-export interface AWSAppSyncRealTimeProviderOptions extends ProviderOptions {
-    appSyncGraphqlEndpoint?: string;
-    authenticationType?: GraphqlAuthModes;
-    query?: string;
-    variables?: Record<string, unknown>;
-    apiKey?: string;
-    region?: string;
-    graphql_headers?: () => {} | (() => Promise<{}>);
-    additionalHeaders?: {
-        [key: string]: string;
-    };
-}
-export declare class AWSAppSyncRealTimeProvider extends AbstractPubSubProvider<AWSAppSyncRealTimeProviderOptions> {
-    private awsRealTimeSocket?;
-    private socketStatus;
-    private keepAliveTimeoutId?;
-    private keepAliveTimeout;
-    private keepAliveAlertTimeoutId?;
-    private subscriptionObserverMap;
-    private promiseArray;
-    private connectionState;
-    private readonly connectionStateMonitor;
-    private readonly reconnectionMonitor;
-    private connectionStateMonitorSubscription;
-    constructor(options?: ProviderOptions);
-    /**
-     * Mark the socket closed and release all active listeners
-     */
-    close(): void;
-    getNewWebSocket(url: string, protocol: string): WebSocket;
-    getProviderName(): string;
-    newClient(): Promise<any>;
-    publish(_topics: string[] | string, _msg: PubSubContent, _options?: AWSAppSyncRealTimeProviderOptions): Promise<void>;
-    private isCustomDomain;
-    subscribe(_topics: string[] | string, options?: AWSAppSyncRealTimeProviderOptions, customUserAgentDetails?: CustomUserAgentDetails): Observable<Record<string, unknown>>;
-    protected get isSSLEnabled(): boolean;
-    private _startSubscriptionWithAWSAppSyncRealTime;
-    private _logStartSubscriptionError;
-    private _waitForSubscriptionToBeConnected;
-    private _sendUnsubscriptionMessage;
-    private _removeSubscriptionObserver;
-    private _closeSocketIfRequired;
-    private _handleIncomingSubscriptionMessage;
-    private _errorDisconnect;
-    private _timeoutStartSubscriptionAck;
-    private _initializeWebSocketConnection;
-    private _initializeRetryableHandshake;
-    private _initializeHandshake;
-    private _awsRealTimeHeaderBasedAuth;
-    private _awsRealTimeCUPHeader;
-    private _awsRealTimeOPENIDHeader;
-    private _awsRealTimeApiKeyHeader;
-    private _awsRealTimeIAMHeader;
-    private _customAuthHeader;
-    /**
-     * @private
-     */
-    _ensureCredentials(): any;
-}
-export {};