fix: Fixed sudo requests

Author: kevinwang5658

src/events/context.ts

@@ -47,6 +47,10 @@ export const ctx = new class {
     return this.emitter.on(eventName, listener);
   }
 
+  once(eventName: string | symbol, listener: (...args: any[]) => void): EventEmitter {
+    return this.emitter.once(eventName, listener);
+  }
+
   log(...args: unknown[]) {
     this.emitter.emit(Event.STDOUT, ...args);
   }

src/plugins/plugin-process.ts

@@ -72,22 +72,23 @@ export class PluginProcess {
       }
 
       if (message.cmd === MessageCmd.SUDO_REQUEST) {
-        const { data } = message;
+        const { data, requestId } = message;
         if (!sudoRequestValidator(data)) {
           throw new Error(`Invalid sudo request from plugin ${pluginName}. ${JSON.stringify(sudoRequestValidator.errors, null, 2)}`);
         }
 
-        ctx.sudoRequested(pluginName, data as unknown as SudoRequestData);
-      }
-    })
-
-    // Send out sudo granted events
-    ctx.on(Event.SUDO_REQUEST_GRANTED, (_pluginName, data) => {
-      if (_pluginName === pluginName) {
-        process.send({
-          cmd: returnMessageCmd(MessageCmd.SUDO_REQUEST),
-          data
+        // Send out sudo granted events
+        ctx.once(Event.SUDO_REQUEST_GRANTED, (_pluginName, data) => {
+          if (_pluginName === pluginName) {
+            process.send({
+              cmd: returnMessageCmd(MessageCmd.SUDO_REQUEST),
+              requestId,
+              data
+            })
+          }
         })
+
+        ctx.sudoRequested(pluginName, data as unknown as SudoRequestData);
       }
     })
   }

test/integration/sudo.test.ts

@@ -0,0 +1,44 @@
+import { fork } from 'node:child_process';
+import { type Readable } from 'node:stream';
+import { describe, it, expect, vi } from 'vitest';
+
+import { PluginProcess, returnMessageCmd } from '../../src/plugins/plugin-process.js';
+import { MessageCmd, MessageStatus, SpawnStatus } from 'codify-schemas';
+import { ctx } from '../../src/events/context.js';
+
+vi.mock('node:child_process', async () => {n
+  const { ChildProcess } = await import('node:child_process');
+  const { default: EventEmitter } = await import('node:events');
+
+  const process = new ChildProcess();
+  process.stdout = new EventEmitter() as Readable;
+  process.stderr = new EventEmitter() as Readable
+  process.send = () => true;
+
+  return { fork: () => process };
+})
+
+describe('Message sender tests', async () => {
+  it('Is able to send a message and await a result', async () => {
+    // Uses the child process from the mocks
+    const mockChildProcess = fork('');
+
+    const sudoRequestedSpy = vi.spyOn(ctx, 'sudoRequested');
+    const processSpy = vi.spyOn(mockChildProcess, 'send');
+
+    const plugin = await PluginProcess.start('', 'TestPlugin', false);
+
+    mockChildProcess.emit('message', { cmd: MessageCmd.SUDO_REQUEST, data: { command: 'sudo something' }, requestId: 'requestId' })
+    expect(sudoRequestedSpy).toHaveBeenCalledOnce();
+
+    ctx.sudoRequestGranted('TestPlugin', { status: SpawnStatus.SUCCESS, data: 'success' })
+    expect(processSpy).to.be.lastCalledWith({
+      cmd: returnMessageCmd(MessageCmd.SUDO_REQUEST),
+      requestId: 'requestId',
+      data: expect.objectContaining({
+        status: MessageStatus.SUCCESS,
+        data: 'success',
+      })
+    });
+  })
+});