Merge pull request #97 from ubiquity-os-marketplace/development

Merge development into main

.cspell.json

@@ -1,7 +1,17 @@
 {
   "$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
   "version": "0.2",
-  "ignorePaths": ["**/*.json", "**/*.css", "node_modules", "**/*.log", "./src/adapters/supabase/**/**.ts"],
+  "ignorePaths": [
+    "**/*.json",
+    "**/*.css",
+    "bun.lockb",
+    "tests/http/**",
+    "node_modules",
+    "**/*.log",
+    "./src/adapters/supabase/**/**.ts",
+    "dist/**",
+    "coverage/**"
+  ],
   "useGitignore": true,
   "language": "en",
   "words": [

.github/knip.ts

@@ -6,7 +6,7 @@ const config: KnipConfig = {
   ignore: ["src/types/config.ts", "**/__mocks__/**", "**/__fixtures__/**", "src/worker.ts"],
   ignoreExportsUsedInFile: true,
   // eslint can also be safely ignored as per the docs: https://knip.dev/guides/handling-issues#eslint--jest
-  ignoreDependencies: ["eslint-config-prettier", "eslint-plugin-prettier", "@types/jest"],
+  ignoreDependencies: ["eslint-config-prettier", "eslint-plugin-prettier", "ts-node", "@octokit/rest"],
   eslint: true,
 };
 

.github/workflows/formatting-checks.yml

@@ -0,0 +1,28 @@
+name: Formatting Check
+
+on:
+  push:
+
+jobs:
+  format-check:
+    name: Check for formatting errors
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
+      - name: Install toolchain
+        run: bun install --frozen-lockfile
+
+      - name: Eslint
+        run: bun run eslint --fix-dry-run
+
+      - name: Cspell
+        run: bun run format:cspell
+
+      - name: Prettier
+        run: bun run prettier --check .

.github/workflows/jest-testing.yml

@@ -21,11 +21,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Enable corepack
-        run: corepack enable
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
+      - name: Install toolchain
+        run: bun install --frozen-lockfile
 
       - name: Jest With Coverage
-        run: yarn install && yarn test
+        run: bun run test
 
       - name: Add Jest Report to Summary
         if: always()

.github/workflows/knip.yml

@@ -16,17 +16,17 @@ jobs:
         with:
           node-version: 20.10.0
 
-      - name: Enable corepack
-        run: corepack enable
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
 
       - name: Install toolchain
-        run: yarn install
+        run: bun install --frozen-lockfile
 
       - name: Store PR number
         run: echo ${{ github.event.number }} > pr-number.txt
 
       - name: Run Knip
-        run: yarn knip || yarn knip --reporter json > knip-results.json
+        run: bun run knip || bun run knip --reporter json > knip-results.json
 
       - name: Upload knip result
         if: failure()

.github/workflows/update-configuration.yml

@@ -1,61 +1,21 @@
-name: "Update Configuration"
+name: Update Manifest and Commit Changes
 
 on:
   workflow_dispatch:
   push:
 
 jobs:
-  update:
-    name: "Update Configuration in manifest.json"
+  update-manifest:
+    name: "Update Manifest and Commit Changes"
     runs-on: ubuntu-latest
     permissions: write-all
 
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20.10.0"
-
-      - name: Enable corepack
-        run: corepack enable
-
-      - name: Install deps and run configuration update
-        run: |
-          yarn install
-          yarn tsc --noCheck --project tsconfig.json
-
-      - name: Update manifest configuration using GitHub Script
-        uses: actions/github-script@v7
+      - name: Update Manifest and Commit Changes
+        uses: ubiquity-os/action-deploy-plugin@main
         with:
-          script: |
-            const fs = require('fs');
-            const path = require('path');
-
-            const { pluginSettingsSchema } = require('./src/types/plugin-input');
-
-            const manifestPath = path.resolve("${{ github.workspace }}", './manifest.json');
-            const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
-
-            const configuration = JSON.stringify(pluginSettingsSchema);
-
-            manifest["configuration"] = JSON.parse(configuration);
-
-            const updatedManifest = JSON.stringify(manifest, null, 2);
-            console.log('Updated manifest:', updatedManifest);
-            fs.writeFileSync(manifestPath, updatedManifest);
-
-      - name: Commit and Push generated types
-        run: |
-          git config --global user.name 'ubiquity-os[bot]'
-          git config --global user.email 'ubiquity-os[bot]@users.noreply.github.com'
-          git add ./manifest.json
-          if [ -n "$(git diff-index --cached --name-only HEAD)" ]; then
-            git commit -m "chore: updated generated configuration" || echo "Lint-staged check failed"
-            git push origin HEAD:${{ github.ref_name }}
-          else
-            echo "No changes to commit"
-          fi
+          treatAsEsm: false
+          sourcemap: false
+          pluginEntry: ${{ github.workspace }}/src/index.ts
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/worker-deploy.yml

@@ -20,6 +20,9 @@ jobs:
 
       - uses: actions/checkout@v4
 
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
       - name: Update wrangler.toml Name Field
         run: |
           branch_name=$(echo '${{ github.event.ref }}' | sed 's#refs/heads/##' | sed 's#[^a-zA-Z0-9]#-#g')
@@ -32,21 +35,24 @@ jobs:
           # Update the wrangler.toml file
           sed -i "s/^name = .*/name = \"$new_name\"/" wrangler.toml
           echo "Updated wrangler.toml name to: $new_name"
+
       - name: Deploy with Wrangler
         id: wrangler_deploy
         uses: cloudflare/wrangler-action@v3
         with:
-          wranglerVersion: "3.79.0"
+          wranglerVersion: "3.87.0"
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           secrets: |
             SUPABASE_URL
             SUPABASE_KEY
             BOT_USER_ID
+            ${{ secrets.KERNEL_PUBLIC_KEY && secrets.KERNEL_PUBLIC_KEY != '' && 'KERNEL_PUBLIC_KEY' || '' }}
         env:
           SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
           SUPABASE_KEY: ${{ secrets.SUPABASE_KEY }}
           BOT_USER_ID: ${{ secrets.BOT_USER_ID }}
+          KERNEL_PUBLIC_KEY: ${{ secrets.KERNEL_PUBLIC_KEY }}
 
       - name: Write Deployment URL to Summary
         run: |

.husky/commit-msg

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn commitlint --edit "$1"
+bun commitlint --edit "$1"

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn lint-staged
+bun lint-staged

.prettierignore

@@ -0,0 +1,2 @@
+dist/
+coverage/

README.md

@@ -26,7 +26,7 @@ To stop a task, a hunter should use the `/stop` command. This will unassign them
 
 #### Note: The command name is `"start"` when configuring your `.ubiquity-os.config.yml` file.
 
-To configure your Ubiquibot to run this plugin, add the following to the `.ubiquity-os.config.yml` file in your organization configuration repository.
+To configure your Ubiquity Kernel to run this plugin, add the following to the `.ubiquity-os.config.yml` file in your organization configuration repository.
 
 ```yml
 - plugin: http://localhost:4000 # or the URL where the plugin is hosted

eslint.config.mjs

@@ -9,7 +9,7 @@ export default tsEslint.config({
     "@typescript-eslint": tsEslint.plugin,
     "check-file": checkFile,
   },
-  ignores: [".github/knip.ts", ".github/cspell.ts", ".wrangler/**/*.ts", ".wrangler/**/*.js"],
+  ignores: [".github/knip.ts", ".github/cspell.ts", ".wrangler/**/*.ts", ".wrangler/**/*.js", "dist/**", "eslint.config.mjs"],
   extends: [eslint.configs.recommended, ...tsEslint.configs.recommended, sonarjs.configs.recommended],
   languageOptions: {
     parser: tsEslint.parser,

jest.config.ts

@@ -0,0 +1,27 @@
+import type { Config } from "jest";
+
+const cfg: Config = {
+  transform: {
+    "^.+\\.tsx?$": [
+      "ts-jest",
+      {
+        useESM: true,
+      },
+    ],
+  },
+  moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
+  coveragePathIgnorePatterns: ["node_modules", "mocks"],
+  collectCoverage: true,
+  coverageReporters: ["json", "lcov", "text", "clover", "json-summary"],
+  reporters: ["default", "jest-junit", "jest-md-dashboard"],
+  coverageDirectory: "coverage",
+  testTimeout: 20000,
+  roots: ["<rootDir>", "tests"],
+  extensionsToTreatAsEsm: [".ts"],
+  moduleNameMapper: {
+    "^(\\.{1,2}/.*)\\.js$": "$1",
+  },
+  setupFilesAfterEnv: ["dotenv/config"],
+};
+
+export default cfg;