joes edits

Author: taylordowns2000

packages/ws-worker/src/channels/worker-queue.ts

@@ -74,9 +74,7 @@ const connectToWorkerQueue = (
       didOpen = true;
       shouldReportConnectionError = true;
 
-      // Build join payload with capacity if provided
-      const joinPayload = capacity !== undefined ? { capacity } : {};
-
+      const joinPayload = { capacity };
       const channel = socket.channel('worker:queue', joinPayload) as Channel;
 
       channel.onMessage = (ev, load) => {

packages/ws-worker/src/mock/sockets.ts

@@ -125,11 +125,8 @@ export class MockSocket {
     if (!this.allChannels[topic]) {
       this.allChannels[topic] = mockChannel();
     }
-    // Store params on the channel for testing purposes
-    if (params) {
-      // @ts-ignore
-      this.allChannels[topic]._joinParams = params;
-    }
+    // @ts-ignore
+    this.allChannels[topic]._joinParams = params;
     return this.allChannels[topic];
   }
 }

packages/ws-worker/test/channels/worker-queue.test.ts

@@ -108,55 +108,26 @@ test('should fail to connect with an invalid auth token', async (t) => {
 
 test('should pass capacity in join payload when provided', (t) => {
   return new Promise((done) => {
-    function createSocket(endpoint: string, _options: any) {
-      const socket = new MockSocket(endpoint, {}, async () => {});
-
-      // Override channel method to capture join params
-      const originalChannel = socket.channel.bind(socket);
-      socket.channel = (topic: string, params?: any) => {
-        const channel = originalChannel(topic, params);
-        if (topic === 'worker:queue') {
-          t.truthy(params);
-          t.is(params.capacity, 10);
-        }
-        return channel;
-      };
-
-      return socket;
-    }
-
     connectToWorkerQueue('www', 'a', 'secret', logger, {
       capacity: 10,
-      SocketConstructor: createSocket as any,
-    }).on('connect', () => {
-      t.pass('connected with capacity');
+      SocketConstructor: MockSocket as any,
+    }).on('connect', ({ socket }) => {
+      const channel = socket.allChannels['worker:queue'];
+      // @ts-ignore - accessing test property
+      t.is(channel._joinParams.capacity, 10);
       done();
     });
   });
 });
 
-test('should not pass capacity in join payload when not provided', (t) => {
+test('should pass capacity in join payload when not provided', (t) => {
   return new Promise((done) => {
-    function createSocket(endpoint: string, _options: any) {
-      const socket = new MockSocket(endpoint, {}, async () => {});
-
-      // Override channel method to capture join params
-      const originalChannel = socket.channel.bind(socket);
-      socket.channel = (topic: string, params?: any) => {
-        const channel = originalChannel(topic, params);
-        if (topic === 'worker:queue') {
-          t.deepEqual(params, {});
-        }
-        return channel;
-      };
-
-      return socket;
-    }
-
     connectToWorkerQueue('www', 'a', 'secret', logger, {
-      SocketConstructor: createSocket as any,
-    }).on('connect', () => {
-      t.pass('connected without capacity');
+      SocketConstructor: MockSocket as any,
+    }).on('connect', ({ socket }) => {
+      const channel = socket.allChannels['worker:queue'];
+      // @ts-ignore - accessing test property
+      t.is(channel._joinParams.capacity, undefined);
       done();
     });
   });

packages/ws-worker/test/util/cli.test.ts

@@ -108,19 +108,3 @@ test('cli should handle array options correctly for env variables', (t) => {
 
   t.deepEqual(args.statePropsToRemove, ['prop1', 'prop2', 'prop3']);
 });
-
-test('cli should parse WORKER_CAPACITY from env', (t) => {
-  process.env.WORKER_CAPACITY = '10';
-  const argv = 'pnpm start'.split(' ');
-  const args = cli(argv);
-
-  t.is(args.capacity, 10);
-});
-
-test('cli should override WORKER_CAPACITY env with --capacity arg', (t) => {
-  process.env.WORKER_CAPACITY = '10';
-  const argv = 'pnpm start --capacity 20'.split(' ');
-  const args = cli(argv);
-
-  t.is(args.capacity, 20);
-});