@aws-amplify/api-graphql 4.7.4-unstable.b8f57f2.0 → 4.7.4-websocket-event.29583bc.0

package/src/Providers/AWSWebSocketProvider/index.ts

@@ -255,6 +255,11 @@ export abstract class AWSWebSocketProvider {
 
 		return new Promise((resolve, reject) => {
 			if (this.awsRealTimeSocket) {
+				const timeoutId = setTimeout(() => {
+					cleanup();
+					reject(new Error('Publish operation timed out'));
+				}, 30000); // 30 seconds timeout
+
 				const publishListener = (event: MessageEvent) => {
 					const data = JSON.parse(event.data);
 					if (data.id === subscriptionId && data.type === 'publish_success') {
@@ -263,22 +268,47 @@ export abstract class AWSWebSocketProvider {
 								'message',
 								publishListener,
 							);
-
+						cleanup();
 						resolve();
 					}
 
 					if (data.erroredEvents && data.erroredEvents.length > 0) {
 						// TODO: handle errors
+						const errors = data.erroredEvents.map(
+							(errorEvent: any) => errorEvent.error,
+						);
+						cleanup();
+						reject(new Error(`Publish errors: ${errors.join(', ')}`));
 					}
 				};
-				this.awsRealTimeSocket.addEventListener('message', publishListener);
-				this.awsRealTimeSocket.addEventListener('close', () => {
+
+				const errorListener = (error: Event) => {
+					cleanup();
+					reject(new Error(`WebSocket error: ${error}`));
+				};
+
+				const closeListener = () => {
+					cleanup();
 					reject(new Error('WebSocket is closed'));
-				});
-				//
-				// this.awsRealTimeSocket.addEventListener('error', publishListener);
+				};
+
+				const cleanup = () => {
+					clearTimeout(timeoutId);
+					this.awsRealTimeSocket?.removeEventListener(
+						'message',
+						publishListener,
+					);
+					this.awsRealTimeSocket?.removeEventListener('error', errorListener);
+					this.awsRealTimeSocket?.removeEventListener('close', closeListener);
+				};
+
+				this.awsRealTimeSocket.addEventListener('message', publishListener);
+				this.awsRealTimeSocket.addEventListener('error', errorListener);
+				this.awsRealTimeSocket.addEventListener('close', closeListener);
 
 				this.awsRealTimeSocket.send(serializedSubscriptionMessage);
+			} else {
+				reject(new Error('WebSocket is not connected'));
 			}
 		});
 	}

package/src/internals/events/index.ts

@@ -70,7 +70,7 @@ async function connect(
 	};
 
 	// WS publish is not enabled in the service yet. It will be a follow up feature
-	const _pub = async (
+	const pub = async (
 		event: DocumentType,
 		pubOptions?: EventsOptions,
 	): Promise<any> => {
@@ -94,7 +94,7 @@ async function connect(
 	return {
 		subscribe: sub,
 		close,
-		// publish: pub,
+		publish: pub,
 	};
 }
 

package/src/internals/events/types.ts

@@ -3,6 +3,7 @@
 
 import { Subscription } from 'rxjs';
 import type { GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
+import { DocumentType } from '@aws-amplify/core/internals/utils';
 
 export interface SubscriptionObserver<T> {
 	next(value: T): void;
@@ -51,6 +52,15 @@ export interface EventsChannel {
 	 *
 	 */
 	close(): void;
+	/**
+	 *
+	 * @param event
+	 * @param pubOptions
+	 *
+	 * @example
+	 * await channel.publish({ some: "data" });
+	 */
+	publish(event: DocumentType, pubOptions?: EventsOptions): Promise<any>;
 }
 
 export type ResolvedGraphQLAuthModes = Exclude<GraphQLAuthMode, 'identityPool'>;

package/src/internals/events/utils.ts

@@ -47,7 +47,7 @@ export const configure = () => {
 };
 
 /**
- * Event API expects and array of JSON strings
+ * Event API expects an array of JSON strings
  *
  * @param events - JSON-serializable value or an array of values
  * @returns array of JSON strings