wirejs-deploy-amplify-basic 0.0.107-realtime → 0.0.109-realtime

package/amplify-hosting-assets/compute/default/package.json

@@ -3,6 +3,6 @@
 	"dependencies": {
 		"jsdom": "^25.0.1",
 		"wirejs-dom": "^1.0.41",
-		"wirejs-resources": "^0.1.75-realtime"
+		"wirejs-resources": "^0.1.77-realtime"
 	}
 }

package/dist/client/realtime.d.ts

@@ -1,11 +1,8 @@
-export type Subscriber = {
-    onmessage: (data: any) => void;
-    onclose?: () => void;
-};
+import type { MessageStreamSubscriber } from "wirejs-resources";
 export type ChannelEvent<T = any> = {
-    type: "data" | "broadcast_error" | "ka";
+    type: "subscribe_success" | "data" | "broadcast_error" | "ka";
     id: string;
     event: any;
 };
-export declare function subscribe(url: string, channel: string, token: string, authHost: string, subscriber: Subscriber): void;
-export declare function unsubscribe(url: string, channel: string, subscriber: Subscriber): void;
+export declare function subscribe(url: string, channel: string, token: string, authHost: string, subscriber: MessageStreamSubscriber): void;
+export declare function unsubscribe(url: string, channel: string, subscriber: MessageStreamSubscriber): void;

package/dist/client/realtime.js

@@ -14,6 +14,13 @@ const channelSubs = new Map();
  * subscription ID -> subscriber
  */
 const subscribers = new Map();
+/**
+ * subcription ID -> connection state
+ *
+ * For when new subscribers are added, we'll want to broadcast the current
+ * state of the connection.
+ */
+const subscriptionState = new Map();
 /**
  * Encodes an object into Base64 URL format.
  * From https://docs.aws.amazon.com/appsync/latest/eventapi/event-api-websocket-protocol.html#websocket-connection-handshake
@@ -58,11 +65,23 @@ export function subscribe(url, channel, token, authHost, subscriber) {
                     }
                 }
             }
+            else if (data.type === 'subscribe_success') {
+                subscriptionState.set(data.id, 'open');
+                for (const subscriber of subscribers.get(data.id) || []) {
+                    try {
+                        subscriber.onopen?.();
+                    }
+                    catch (error) {
+                        console.error('Error in subscriber onopen:', error);
+                    }
+                }
+            }
         };
-        ws.onclose = event => {
+        const notifyClosed = () => {
             const subscriptionIds = Array.from(channelSubs.keys())
                 .filter(id => id.startsWith(`${url}#`));
             for (const subscriptionId of subscriptionIds) {
+                subscriptionState.set(subscriptionId, 'closed');
                 const subs = subscribers.get(subscriptionId);
                 if (subs) {
                     for (const subscriber of subs) {
@@ -80,9 +99,12 @@ export function subscribe(url, channel, token, authHost, subscriber) {
             }
             console.log('closed', event);
         };
+        ws.onclose = () => notifyClosed();
+        ws.onerror = () => notifyClosed();
     }
-    if (!channelSubs.has(channel)) {
+    if (!channelSubs.has(fullChannelName)) {
         const subscriptionId = crypto.randomUUID();
+        subscriptionState.set(subscriptionId, 'connecting');
         const ws = connections.get(url);
         const subscribe = () => {
             ws.send(JSON.stringify({
@@ -102,7 +124,14 @@ export function subscribe(url, channel, token, authHost, subscriber) {
         }
     }
     else {
-        subscribers.get(fullChannelName).push(subscriber);
+        const subscriptionId = channelSubs.get(fullChannelName);
+        subscribers.get(subscriptionId).push(subscriber);
+        if (subscriptionState.get(subscriptionId) === 'open') {
+            subscriber.onopen?.();
+        }
+        else if (subscriptionState.get(subscriptionId) === 'closed') {
+            subscriber.onclose?.();
+        }
     }
 }
 export function unsubscribe(url, channel, subscriber) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.0.107-realtime",
+	"version": "0.0.109-realtime",
 	"type": "module",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -41,7 +41,7 @@
 		"recursive-copy": "^2.0.14",
 		"rimraf": "^6.0.1",
 		"wirejs-dom": "^1.0.41",
-		"wirejs-resources": "^0.1.75-realtime"
+		"wirejs-resources": "^0.1.77-realtime"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",