Merge pull request #237 from ubiquity-os/development

Merge development into main
ubiquity-os · Jan 21, 2025 · 9147d15 · 9147d15
2 parents 74136a1 + cacf27f
commit 9147d15
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 32 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -67,6 +67,7 @@
     "console-log-level": "^1.4.1",
     "dotenv": "16.4.5",
     "hono": "^4.6.12",
+    "js-yaml": "^4.1.0",
     "openai": "^4.70.2",
     "typebox-validators": "0.3.5",
     "yaml": "^2.7.0"
@@ -87,6 +88,7 @@
     "@swc/jest": "0.2.36",
     "@types/console-log-level": "^1.4.5",
     "@types/jest": "29.5.12",
+    "@types/js-yaml": "^4.0.9",
     "@types/node": "20.14.10",
     "@types/node-rsa": "^1.1.4",
     "azure-functions-core-tools": "^4.0.6610",

diff --git a/src/github/handlers/index.ts b/src/github/handlers/index.ts
@@ -104,14 +104,14 @@ async function handleEvent(event: EmitterWebhookEvent, eventHandler: InstanceTyp
     try {
       console.log(`Dispatching event for ${JSON.stringify(plugin)}`);
       if (!isGithubPluginObject) {
-        await dispatchWorker(plugin, await inputs.getWorkerInputs());
+        await dispatchWorker(plugin, await inputs.getInputs());
       } else {
         await dispatchWorkflow(context, {
           owner: plugin.owner,
           repository: plugin.repo,
           workflowId: plugin.workflowId,
           ref: plugin.ref,
-          inputs: await inputs.getWorkflowInputs(),
+          inputs: await inputs.getInputs(),
         });
       }
       console.log(`Event dispatched for ${JSON.stringify(plugin)}`);

diff --git a/src/github/handlers/issue-comment-created.ts b/src/github/handlers/issue-comment-created.ts
@@ -195,14 +195,14 @@ The input will include the following fields:
 
   try {
     if (!isGithubPluginObject) {
-      await dispatchWorker(plugin, await inputs.getWorkerInputs());
+      await dispatchWorker(plugin, await inputs.getInputs());
     } else {
       await dispatchWorkflow(context, {
         owner: plugin.owner,
         repository: plugin.repo,
         workflowId: plugin.workflowId,
         ref: ref,
-        inputs: await inputs.getWorkflowInputs(),
+        inputs: await inputs.getInputs(),
       });
     }
   } catch (e) {

diff --git a/src/github/handlers/repository-dispatch.ts b/src/github/handlers/repository-dispatch.ts
@@ -73,10 +73,10 @@ export async function repositoryDispatch(context: GitHubContext<"repository_disp
       repository: nextPlugin.plugin.repo,
       ref: nextPlugin.plugin.ref,
       workflowId: nextPlugin.plugin.workflowId,
-      inputs: await inputs.getWorkflowInputs(),
+      inputs: await inputs.getInputs(),
     });
   } else {
-    await dispatchWorker(nextPlugin.plugin, await inputs.getWorkerInputs());
+    await dispatchWorker(nextPlugin.plugin, await inputs.getInputs());
   }
 }
 

diff --git a/src/github/types/plugin.ts b/src/github/types/plugin.ts
@@ -44,7 +44,7 @@ export class PluginInput<T extends EmitterWebhookEventName = EmitterWebhookEvent
     this.command = command;
   }
 
-  public async getWorkflowInputs() {
+  public async getInputs() {
     const inputs = {
       stateId: this.stateId,
       eventName: this.eventName,
@@ -60,23 +60,6 @@ export class PluginInput<T extends EmitterWebhookEventName = EmitterWebhookEvent
       signature,
     };
   }
-
-  public async getWorkerInputs() {
-    const inputs = {
-      stateId: this.stateId,
-      eventName: this.eventName,
-      eventPayload: this.eventPayload,
-      settings: this.settings,
-      authToken: this.authToken,
-      ref: this.ref,
-      command: this.command,
-    };
-    const signature = await this.eventHandler.signPayload(JSON.stringify(inputs));
-    return {
-      ...inputs,
-      signature,
-    };
-  }
 }
 
 export type PluginChainState<T extends EmitterWebhookEventName = EmitterWebhookEventName> = {

diff --git a/src/github/utils/config.ts b/src/github/utils/config.ts
@@ -1,5 +1,6 @@
 import { TransformDecodeCheckError, Value, ValueError } from "@sinclair/typebox/value";
-import YAML, { YAMLError } from "yaml";
+import { YAMLError } from "yaml";
+import YAML from "js-yaml";
 import { GitHubContext } from "../github-context";
 import { expressionRegex } from "../types/plugin";
 import { configSchema, configSchemaValidator, PluginConfiguration } from "../types/plugin-configuration";
@@ -186,8 +187,7 @@ export function parseYaml(data: null | string) {
   console.log("Will attempt to parse YAML data:", data);
   try {
     if (data) {
-      console.log("Before parsing", data);
-      const parsedData = YAML.parse(data);
+      const parsedData = YAML.load(data);
       console.log("Parsed YAML data", parsedData);
       return { yaml: parsedData ?? null, errors: null };
     }

diff --git a/src/github/utils/plugins.ts b/src/github/utils/plugins.ts
@@ -8,7 +8,6 @@ import { Value } from "@sinclair/typebox/value";
 const _manifestCache: Record<string, Manifest> = {};
 
 export function getPluginsForEvent(plugins: PluginConfiguration["plugins"], event: EmitterWebhookEventName) {
-  console.log("getPluginsForEvent", plugins, event);
   return plugins.filter((plugin) => {
     return plugin.uses?.[0].runsOn?.includes(event);
   });

diff --git a/tests/dispatch.test.ts b/tests/dispatch.test.ts
@@ -29,16 +29,16 @@ jest.mock("../src/github/types/plugin", () => {
   return {
     ...originalModule,
     PluginInput: class extends originalModule.PluginInput {
-      async getWorkerInputs() {
+      async getInputs() {
         return {
           stateId: this.stateId,
           eventName: this.eventName,
-          eventPayload: this.eventPayload,
-          settings: this.settings,
+          eventPayload: JSON.stringify(this.eventPayload),
+          settings: JSON.stringify(this.settings),
           authToken: this.authToken,
           ref: this.ref,
           signature: "",
-          command: this.command,
+          command: JSON.stringify(this.command),
         };
       }
     },