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

Merge development into main

.github/workflows/update-configuration.yml

@@ -1,12 +1,12 @@
-name: "Update Configuration"
+name: "Update Configuration and Build"
 
 on:
   workflow_dispatch:
   push:
 
 jobs:
   update:
-    name: "Update Configuration in manifest.json"
+    name: "Update Configuration & Build"
     runs-on: ubuntu-latest
     permissions: write-all
 

.github/workflows/worker-deploy.yml

@@ -1,31 +1,38 @@
 name: Deploy Worker
 
 on:
-  push:
   workflow_dispatch:
+  workflow_run:
+    workflows: ["Update Configuration and Build"]
+    types:
+      - completed
+
+env:
+  APP_ID: ${{ secrets.APP_ID }}
+  APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
 
 jobs:
   deploy-to-cloudflare:
     runs-on: ubuntu-latest
     name: Automatic Cloudflare Deploy
     environment: ${{ github.ref == 'refs/heads/main' && 'main' || 'development' }}
+    permissions:
+      contents: write
+
     steps:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version: "20.10.0"
 
-      - name: Enable corepack
-        run: corepack enable
-
       - 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')
+          branch_name=$(echo '${{ github.ref }}' | sed 's#refs/heads/##' | sed 's#[^a-zA-Z0-9]#-#g')
           # Extract base name from wrangler.toml
           base_name=$(grep '^name = ' wrangler.toml | sed 's/^name = "\(.*\)"$/\1/')
           # Concatenate branch name with base name
@@ -56,6 +63,46 @@ jobs:
           CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 
+      - name: Update manifest.json worker url
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const fs = require('fs');
+            const path = require('path');
+
+            const manifestPath = path.resolve("${{ github.workspace }}", './manifest.json');
+            const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
+
+            manifest["homepage_url"] = "${{ steps.wrangler_deploy.outputs.deployment-url }}";
+
+            const updatedManifest = JSON.stringify(manifest, null, 2);
+            fs.writeFileSync(manifestPath, updatedManifest);
+            console.log('Updated manifest:', updatedManifest);
+
+      - name: Get GitHub App token
+        if: env.APP_ID != '' && env.APP_PRIVATE_KEY != ''
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ env.APP_ID }}
+          private-key: ${{ env.APP_PRIVATE_KEY }}
+
+      - name: Format manifest.json using Prettier
+        shell: bash
+        run: |
+          bun add -DE prettier
+          bun prettier --write .
+
+      - name: Commit file
+        uses: swinton/[email protected]
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token || secrets.GITHUB_TOKEN }}
+        with:
+          files: |
+            manifest.json
+          commit-message: "chore: [skip ci] update manifest.json url"
+          ref: ${{ github.ref }}
+
       - name: Write Deployment URL to Summary
         run: |
           echo "### Deployment URL" >> $GITHUB_STEP_SUMMARY

manifest.json

@@ -22,8 +22,10 @@
     "properties": {
       "allowPublicQuery": {
         "default": true,
+        "description": "Allows any user to query anyone else. If false, only org members can query others.",
         "type": "boolean"
       }
     }
-  }
+  },
+  "homepage_url": "https://ubiquity-os-command-query-user-development.ubiquity.workers.dev"
 }

src/types/plugin-input.ts

@@ -4,7 +4,7 @@ export const pluginSettingsSchema = T.Object({
   /**
    * Allows any user to query anyone else. If false, only org members can query others.
    */
-  allowPublicQuery: T.Optional(T.Boolean({ default: true })),
+  allowPublicQuery: T.Optional(T.Boolean({ default: true, description: "Allows any user to query anyone else. If false, only org members can query others." })),
 });
 
 export type PluginSettings = StaticDecode<typeof pluginSettingsSchema>;