Fix bug decoding channel token Frankenvalue.

kentonv · kentonv · commit c8019f49ce17 · 2025-12-18T13:47:42.000-06:00
Adds a test for this bug.
diff --git a/src/workerd/api/tests/stub-storage-test.js b/src/workerd/api/tests/stub-storage-test.js
@@ -61,3 +61,43 @@ export let storeServiceBinding = {
     }
   },
 };
+
+// Test that service stubs and actor classes can both be encoded into `props`, the stub with the
+// props can be sent over RPC, and it all still works.
+export class UsePropsTest extends WorkerEntrypoint {
+  async run() {
+    let id = this.ctx.exports.MyActor.idFromName('bar');
+    let stub = this.ctx.exports.MyActor.get(id);
+
+    {
+      await stub.put('foo', this.ctx.props.Greeter);
+      let greeter = await stub.get('foo');
+      assert.strictEqual(await greeter.greet('Alice'), 'Yo, Alice!');
+    }
+
+    {
+      await stub.put('bar', this.ctx.props.MyFacet);
+
+      assert.strictEqual(await stub.useFacet('bar'), 'Hiya, Bob?');
+    }
+  }
+}
+
+export let bindingsInProps = {
+  async test(controller, env, ctx) {
+    let stub = ctx.exports.UsePropsTest({
+      props: {
+        Greeter: ctx.exports.Greeter({ props: { greeting: 'Yo' } }),
+        MyFacet: ctx.exports.MyFacet({ props: { greeting: 'Hiya' } }),
+      },
+    });
+
+    // Send stub over RPC so the props get encoded into a channel token with nested channel
+    // tokens.
+    await ctx.exports.bindingsInProps.run(stub);
+  },
+
+  async run(stub) {
+    await stub.run();
+  },
+};
diff --git a/src/workerd/server/channel-token.c++ b/src/workerd/server/channel-token.c++
@@ -249,7 +249,7 @@ kj::Own<Frankenvalue::CapTableEntry> ChannelTokenHandler::decodeChannelTokenImpl
             capTable.add(decodeSubrequestChannelToken(usage, cap.getSubrequestChannel()));
             continue;
           case ChannelToken::FrankenvalueCapTable::Cap::ACTOR_CLASS_CHANNEL:
-            capTable.add(decodeSubrequestChannelToken(usage, cap.getActorClassChannel()));
+            capTable.add(decodeActorClassChannelToken(usage, cap.getActorClassChannel()));
             continue;
         }
         KJ_FAIL_REQUIRE("unknown cap table type", cap.which());

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ kj::Own<Frankenvalue::CapTableEntry> ChannelTokenHandler::decodeChannelTokenImpl`
`249`	`249`	`capTable.add(decodeSubrequestChannelToken(usage, cap.getSubrequestChannel()));`
`250`	`250`	`continue;`
`251`	`251`	`case ChannelToken::FrankenvalueCapTable::Cap::ACTOR_CLASS_CHANNEL:`
`252`		`- capTable.add(decodeSubrequestChannelToken(usage, cap.getActorClassChannel()));`
	`252`	`+ capTable.add(decodeActorClassChannelToken(usage, cap.getActorClassChannel()));`
`253`	`253`	`continue;`
`254`	`254`	`}`
`255`	`255`	`KJ_FAIL_REQUIRE("unknown cap table type", cap.which());`