wirejs-deploy-amplify-basic 0.0.115-realtime → 0.0.117-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.83-realtime"
+		"wirejs-resources": "^0.1.85-realtime"
 	}
 }

package/build.js

@@ -5,7 +5,7 @@ import path from 'path';
 import fs from 'fs';
 import { rimraf } from 'rimraf';
 import copy from 'recursive-copy';
-import { exec, execSync } from 'child_process';
+import { execSync } from 'child_process';
 
 const CWD = process.cwd();
 const __filename = import.meta.url.replace(/^file:/, '');
@@ -87,14 +87,13 @@ async function installDeps() {
 async function discoverResources() {
 	console.log("discovering resources")
 	// exploratory import. resources will emit to globalThis.wirejsResources
+	execSync(`cd api && npm run prebuild`);
 	await import(path.join(CWD, 'api', 'dist', 'index.js'));
 	console.log('discovered resources', globalThis.wirejsResources);
 	await fs.promises.writeFile(
 		path.join(BACKEND_DIR, 'generated-resources.ts'),
 		`export default ${JSON.stringify(globalThis.wirejsResources, null, 2)}`
 	);
-
-	return outputPath;
 }
 
 async function deployFrontend() {

package/dist/client/realtime.js

@@ -40,23 +40,41 @@ function getAuthProtocol(authorization) {
     const header = getBase64URLEncoded(authorization);
     return `header-${header}`;
 }
-export function subscribe(url, channel, token, authHost, subscriber) {
+function urlString(url) {
+    if (!url.startsWith('ws://') && !url.startsWith('wss://')) {
+        throw new Error(`Invalid WebSocket URL: ${url}`);
+    }
+    return url;
+}
+function fullChannelNameString(url, channel) {
+    if (!channel || typeof channel !== 'string') {
+        throw new Error(`Invalid channel name: ${channel}`);
+    }
     const fullChannelName = `${url}#${channel}`;
+    return fullChannelName;
+}
+function subscriptionIdString(id) {
+    return id;
+}
+export function subscribe(url, channel, token, authHost, subscriber) {
+    const urlKey = urlString(url);
+    const fullChannelName = fullChannelNameString(urlKey, channel);
     const authorization = {
         Authorization: token,
         host: authHost,
     };
-    if (!connections.has(url)) {
+    if (!connections.has(urlKey)) {
         const ws = new WebSocket(url, [
             'aws-appsync-event-ws',
             getAuthProtocol(authorization)
         ]);
-        connections.set(url, ws);
+        connections.set(urlKey, ws);
         ws.onmessage = event => {
             const data = JSON.parse(event.data);
+            const sid = subscriptionIdString(data.id);
             if (data.type === 'data') {
                 const eventData = JSON.parse(data.event);
-                for (const subscriber of subscribers.get(data.id) || []) {
+                for (const subscriber of subscribers.get(sid) || []) {
                     try {
                         subscriber.onmessage(eventData);
                     }
@@ -66,8 +84,8 @@ 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) || []) {
+                subscriptionState.set(sid, 'open');
+                for (const subscriber of subscribers.get(sid) || []) {
                     try {
                         subscriber.onopen?.();
                     }
@@ -80,7 +98,7 @@ export function subscribe(url, channel, token, authHost, subscriber) {
         const notifyClosed = () => {
             const subscriptionIds = Array.from(channelSubs.entries())
                 .filter(([urlChannel, _subId]) => urlChannel.startsWith(`${url}#`))
-                .map(([_urlChannel, subId]) => subId);
+                .map(([_urlChannel, subId]) => subscriptionIdString(subId));
             for (const subscriptionId of subscriptionIds) {
                 subscriptionState.set(subscriptionId, 'closed');
                 const subs = subscribers.get(subscriptionId);
@@ -104,9 +122,9 @@ export function subscribe(url, channel, token, authHost, subscriber) {
         ws.onerror = () => notifyClosed();
     }
     if (!channelSubs.has(fullChannelName)) {
-        const subscriptionId = crypto.randomUUID();
+        const subscriptionId = subscriptionIdString(crypto.randomUUID());
         subscriptionState.set(subscriptionId, 'connecting');
-        const ws = connections.get(url);
+        const ws = connections.get(urlKey);
         const subscribe = () => {
             ws.send(JSON.stringify({
                 id: subscriptionId,
@@ -136,25 +154,32 @@ export function subscribe(url, channel, token, authHost, subscriber) {
     }
 }
 export function unsubscribe(url, channel, subscriber) {
-    const fullChannelName = `${url}#${channel}`;
-    if (subscribers.has(fullChannelName)) {
-        const subs = subscribers.get(fullChannelName);
-        const index = subs.indexOf(subscriber);
-        if (index !== -1) {
-            subs.splice(index, 1);
-            if (subs.length === 0) {
-                channelSubs.delete(fullChannelName);
-                const urlSubs = Array.from(channelSubs.keys())
-                    .filter(id => id.startsWith(`${url}#`));
-                if (urlSubs.length === 0) {
-                    const ws = connections.get(url);
-                    if (ws) {
-                        ws.close();
-                        connections.delete(url);
-                    }
-                }
-                subscribers.delete(url);
-            }
-        }
+    const urlKey = urlString(url);
+    const ws = connections.get(urlKey);
+    const fullChannelName = fullChannelNameString(urlKey, channel);
+    const subId = channelSubs.get(fullChannelName);
+    const subs = subId && subscribers.get(subId);
+    const sub = subs ? subs.find(s => s === subscriber) : undefined;
+    if (sub && subs) {
+        subs.splice(subs.indexOf(sub), 1);
+        subscribers.set(subId, subs);
+        sub.onclose?.();
+    }
+    if (subs && subs.length === 0) {
+        // No subscribers left for this channel. We can unsubscribe from channel.
+        ws?.send(JSON.stringify({
+            id: subId,
+            type: 'unsubscribe',
+        }));
+        subscriptionState.delete(subId);
+        subscribers.delete(subId);
+        channelSubs.delete(fullChannelName);
+    }
+    const socketSubs = Array.from(channelSubs.keys())
+        .filter(k => k.startsWith(urlKey));
+    if (socketSubs.length === 0) {
+        // No channels left for this URL. We can close the WebSocket connection.
+        ws?.close();
+        connections.delete(urlKey);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.0.115-realtime",
+	"version": "0.0.117-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.83-realtime"
+		"wirejs-resources": "^0.1.85-realtime"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",