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

package/amplify-backend-assets/constructs/realtime-service/authorizer-lambda.ts

@@ -51,7 +51,11 @@ export const handler = async (event: AuthorizationRequest): Promise<Authorizatio
 	 * 4. Must be for the correct channel
 	 */
 	try {
-		console.log('Authorization event:', JSON.stringify(event, null, 2));
+		console.log(
+			'Authorization request:',
+			event.requestContext.operation,
+			event.requestContext.channel
+		);
 
 		if (event.requestContext.operation === 'EVENT_PUBLISH') {
 			throw new Error('Publish not permitted');
@@ -66,10 +70,15 @@ export const handler = async (event: AuthorizationRequest): Promise<Authorizatio
 			new TextEncoder().encode(await getSecret(event.requestContext.channelNamespaceName))
 		);
 		
-		if (event.requestContext.channel && decoded.payload.channel !== event.requestContext.channel) {
-			throw new Error(`Channel mismatch: expected ${event.requestContext.channel}, got ${decoded.payload.channel}`);
+		// channel from context gets prefixed with a slash
+		if (event.requestContext.channel
+			&& `/${decoded.payload.channel}` !== event.requestContext.channel
+		) {
+			throw new Error(`Channel mismatch: Token is for "/${decoded.payload.channel}", authorization request is for "${event.requestContext.channel}".`);
 		}
 
+		console.log('Authorized.');
+
 		// Default TTL from AppSync is 5 minutes according to construct docstring.
 		return {
 			isAuthorized: true,

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.73-realtime"
+		"wirejs-resources": "^0.1.75-realtime"
 	}
 }

package/dist/services/realtime.d.ts

@@ -8,6 +8,6 @@ export declare class RealtimeService<T = any> extends Resource {
      * The address the client will need to connect to.
      */
     get address(): string;
-    publish(channel: string, data: T | T[]): Promise<void>;
+    publish(channel: string, events: T[]): Promise<any>;
     getStream(channel: string): Promise<any>;
 }

package/dist/services/realtime.js

@@ -52,23 +52,25 @@ export class RealtimeService extends Resource {
     get address() {
         return `wss://${process.env.REALTIME_WS_DOMAIN}/event/realtime`;
     }
-    async publish(channel, data) {
+    async publish(channel, events) {
         this.#validateChannelName(channel);
-        console.log('Publishing to channels:', channel);
-        const events = Array.isArray(data) ? data : [data];
+        console.log('Attempting to publish to channel:', channel);
         // AppSync allows batches of no more than 5. Hence, if we have more than 5,
         // we need to perform batching on our end.
         if (events.length > 5) {
+            // console.log(`More than 5 events received. Batching...`);
+            let results = [];
             let i = 0;
             while (i < events.length) {
                 const batch = events.slice(i, i + 5);
-                await this.publish(channel, batch);
+                results.push(await this.publish(channel, batch));
                 i += 5;
             }
-            return;
+            return results;
         }
         // TODO: Utility for making SigV4 requests a little more concise.
         const credentials = await defaultProvider()();
+        ;
         const signer = new SignatureV4({
             service: 'appsync',
             region: process.env.AWS_REGION || 'us-east-1',
@@ -98,16 +100,16 @@ export class RealtimeService extends Resource {
             headers: signedRequest.headers,
             body: signedRequest.body,
         });
-        await response.text();
-        console.log('Response from publish:', response.status, response.statusText);
+        console.log(`AppSync response status:`, response.status);
         if (!response.ok) {
             throw new Error(`Failed to publish to channel: ${response.statusText}`);
         }
+        return response.json();
     }
     async getStream(channel) {
         this.#validateChannelName(channel);
         const channelString = `${this.#namespace}/${channel}`;
-        const payload = { channel: `/${channelString}` };
+        const payload = { channel: channelString };
         const jwt = await new jose.SignJWT(payload)
             .setProtectedHeader({ alg: 'HS256' })
             .setIssuedAt()

package/package.json

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