diff --git a/.github/workflows/catalog-sync.yml b/.github/workflows/catalog-sync.yml index 610539f9b..fadc3b85d 100644 --- a/.github/workflows/catalog-sync.yml +++ b/.github/workflows/catalog-sync.yml @@ -11,9 +11,9 @@ on: workflow_dispatch: # Manual trigger env: - # Centralized config: update these when URLs or versions change - PROD_API_URL: https://api.osc.earth/nemar - DEV_API_URL: https://nemar-api-dev.shirazi-10f.workers.dev + # Centralized config: update these when URLs or versions change. + PROD_API_URL: https://api.nemar.org + DEV_API_URL: https://nemar-api-dev.sccn-org.workers.dev NEMAR_API_URL: https://nemar.org/api/dataexplorer/datapipeline jobs: diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index 62a59d2c7..470ef8bb2 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -52,15 +52,15 @@ jobs: env: CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - # Dev has its own D1 database (nemar-db-dev) since v0.7.21 - run: npx wrangler d1 migrations apply nemar-db-dev --remote --env dev + # Dev has its own D1 database (nemar-db-dev) since v0.7.21. + run: npx wrangler d1 migrations apply nemar-db-dev --remote --env dev -c wrangler-sccn.toml - name: Deploy to Cloudflare Workers (dev) working-directory: backend env: CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - run: npx wrangler deploy --env dev + run: npx wrangler deploy --env dev -c wrangler-sccn.toml deploy-production: needs: detect-environment @@ -89,11 +89,11 @@ jobs: env: CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - run: npx wrangler d1 migrations apply nemar-db --remote + run: npx wrangler d1 migrations apply nemar-db --remote -c wrangler-sccn.toml - name: Deploy to Cloudflare Workers (production) working-directory: backend env: CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }} CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - run: npx wrangler deploy + run: npx wrangler deploy -c wrangler-sccn.toml diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e66513d27..77dc10be1 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -49,4 +49,5 @@ jobs: with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - command: pages deploy site --project-name=nemar-cli + # nemar-docs Pages project is bound to docs.nemar.org. + command: pages deploy site --project-name=nemar-docs diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index ab86a4cf7..fa9429157 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -142,9 +142,9 @@ jobs: if: steps.version.outputs.branch == 'dev' run: | echo "Replacing production API URL with dev API URL in dist/index.js" - sed -i 's|https://api.osc.earth/nemar|https://nemar-api-dev.shirazi-10f.workers.dev|g' dist/index.js + sed -i 's|https://api.nemar.org|https://nemar-api-dev.sccn-org.workers.dev|g' dist/index.js echo "Verifying replacement:" - grep -c "nemar-api-dev.shirazi-10f.workers.dev" dist/index.js || (echo "ERROR: URL replacement failed" && exit 1) + grep -c "nemar-api-dev.sccn-org.workers.dev" dist/index.js || (echo "ERROR: URL replacement failed" && exit 1) echo "✓ Dev backend URL injected successfully" - name: Publish to npm diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6b4767185..fe9c64e21 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -97,7 +97,7 @@ jobs: - name: Run CLI unit tests env: # Use dev API - no rate limiting - TEST_API_URL: https://nemar-api-dev.shirazi-10f.workers.dev + TEST_API_URL: https://nemar-api-dev.sccn-org.workers.dev TEST_ADMIN_API_KEY: ${{ secrets.TEST_ADMIN_API_KEY }} TEST_USER_API_KEY: ${{ secrets.TEST_USER_API_KEY }} run: bun test test/cli.test.ts @@ -127,7 +127,7 @@ jobs: - name: Run API tests against dev environment env: # Use dev API - no rate limiting - TEST_API_URL: https://nemar-api-dev.shirazi-10f.workers.dev + TEST_API_URL: https://nemar-api-dev.sccn-org.workers.dev TEST_ADMIN_API_KEY: ${{ secrets.TEST_ADMIN_API_KEY }} TEST_USER_API_KEY: ${{ secrets.TEST_USER_API_KEY }} run: bun test test/api.test.ts @@ -192,7 +192,7 @@ jobs: - name: Run E2E sandbox tests env: - TEST_API_URL: https://nemar-api-dev.shirazi-10f.workers.dev + TEST_API_URL: https://nemar-api-dev.sccn-org.workers.dev TEST_USER_API_KEY: ${{ secrets.TEST_USER_API_KEY }} NPM_TAG: ${{ steps.npm-tag.outputs.tag }} run: bun test test/e2e-sandbox.test.ts @@ -235,7 +235,7 @@ jobs: - name: Run E2E upload tests against dev environment env: - TEST_API_URL: https://nemar-api-dev.shirazi-10f.workers.dev + TEST_API_URL: https://nemar-api-dev.sccn-org.workers.dev TEST_ADMIN_API_KEY: ${{ secrets.TEST_ADMIN_API_KEY }} TEST_USER_API_KEY: ${{ secrets.TEST_USER_API_KEY }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -267,7 +267,7 @@ jobs: - name: Run Zenodo sandbox tests env: - TEST_API_URL: https://nemar-api-dev.shirazi-10f.workers.dev + TEST_API_URL: https://nemar-api-dev.sccn-org.workers.dev TEST_ADMIN_API_KEY: ${{ secrets.TEST_ADMIN_API_KEY }} RUN_ZENODO_TESTS: "true" TEST_DATASET_ID: "nm099999" diff --git a/CLAUDE.md b/CLAUDE.md index b66a6871f..1ce53bfd7 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -43,9 +43,14 @@ The backend code (`ORG_NAME = "nemarDatasets"` in `backend/src/services/github.t ## Architecture Overview ### Backend Infrastructure -- **API URL:** `https://api.osc.earth/nemar` (production) +- **API URL:** `https://api.nemar.org` (canonical production, SCCN account) +- **Workers URL:** `https://nemar-api.sccn-org.workers.dev` (SCCN account fallback for the same worker) +- **Legacy URL:** `https://api.osc.earth/nemar` (personal account, MAINTENANCE_MODE=read-only buffer for old CLIs; sunset in Phase 11) - **Platform:** Cloudflare Workers + D1 (SQLite) -- **Note:** Old `nemar-api.shirazi-10f.workers.dev` URL is disabled +- **Cloudflare accounts:** Managed via `npx cfman wrangler --account ` + - `neuromechanist` - Personal account (current production) + - `sccn` - SCCN institutional account (migration target, Epic #314) +- **Wrangler configs:** `backend/wrangler.toml` (personal), `backend/wrangler-sccn.toml` (SCCN) ### S3 Bucket Structure ``` diff --git a/backend/bun.lock b/backend/bun.lock index c017273a5..12fce2519 100644 --- a/backend/bun.lock +++ b/backend/bun.lock @@ -9,31 +9,30 @@ "aws4fetch": "^1.0.20", "bcryptjs": "^2.4.3", "hono": "^4.6.0", - "resend": "^4.0.0", "zod": "^3.23.0", }, "devDependencies": { "@cloudflare/workers-types": "^4.20241112.0", "@types/bcryptjs": "^2.4.6", "typescript": "^5.6.0", - "wrangler": "^3.91.0", + "wrangler": "^4.85.0", }, }, }, "packages": { - "@cloudflare/kv-asset-handler": ["@cloudflare/kv-asset-handler@0.3.4", "", { "dependencies": { "mime": "^3.0.0" } }, "sha512-YLPHc8yASwjNkmcDMQMY35yiWjoKAKnhUbPRszBRS0YgH+IXtsMp61j+yTcnCE3oO2DgP0U3iejLC8FTtKDC8Q=="], + "@cloudflare/kv-asset-handler": ["@cloudflare/kv-asset-handler@0.4.2", "", {}, "sha512-SIOD2DxrRRwQ+jgzlXCqoEFiKOFqaPjhnNTGKXSRLvp1HiOvapLaFG2kEr9dYQTYe8rKrd9uvDUzmAITeNyaHQ=="], - "@cloudflare/unenv-preset": ["@cloudflare/unenv-preset@2.0.2", "", { "peerDependencies": { "unenv": "2.0.0-rc.14", "workerd": "^1.20250124.0" }, "optionalPeers": ["workerd"] }, "sha512-nyzYnlZjjV5xT3LizahG1Iu6mnrCaxglJ04rZLpDwlDVDZ7v46lNsfxhV3A/xtfgQuSHmLnc6SVI+KwBpc3Lwg=="], + "@cloudflare/unenv-preset": ["@cloudflare/unenv-preset@2.16.1", "", { "peerDependencies": { "unenv": "2.0.0-rc.24", "workerd": ">1.20260305.0 <2.0.0-0" }, "optionalPeers": ["workerd"] }, "sha512-ECxObrMfyTl5bhQf/lZCXwo5G6xX9IAUo+nDMKK4SZ8m4Jvvxp52vilxyySSWh2YTZz8+HQ07qGH/2rEom1vDw=="], - "@cloudflare/workerd-darwin-64": ["@cloudflare/workerd-darwin-64@1.20250718.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-FHf4t7zbVN8yyXgQ/r/GqLPaYZSGUVzeR7RnL28Mwj2djyw2ZergvytVc7fdGcczl6PQh+VKGfZCfUqpJlbi9g=="], + "@cloudflare/workerd-darwin-64": ["@cloudflare/workerd-darwin-64@1.20260424.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-yFR1XaJbSDLg/qbwtrYaU2xwFXatIPKR5nrMQCN1q/m6+Qe/j6r+kCnFEvOJjMZOm9iCKsE6Qly5clgl4u32qw=="], - "@cloudflare/workerd-darwin-arm64": ["@cloudflare/workerd-darwin-arm64@1.20250718.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-fUiyUJYyqqp4NqJ0YgGtp4WJh/II/YZsUnEb6vVy5Oeas8lUOxnN+ZOJ8N/6/5LQCVAtYCChRiIrBbfhTn5Z8Q=="], + "@cloudflare/workerd-darwin-arm64": ["@cloudflare/workerd-darwin-arm64@1.20260424.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-LqWKcE7x/9KyC2iQvKPeb20hKST3dYXDZlYTvFymgR1DfLS0OFOCzVGTloVNd7WqvK4SkdzBYfxo7QMIAeBK0w=="], - "@cloudflare/workerd-linux-64": ["@cloudflare/workerd-linux-64@1.20250718.0", "", { "os": "linux", "cpu": "x64" }, "sha512-5+eb3rtJMiEwp08Kryqzzu8d1rUcK+gdE442auo5eniMpT170Dz0QxBrqkg2Z48SFUPYbj+6uknuA5tzdRSUSg=="], + "@cloudflare/workerd-linux-64": ["@cloudflare/workerd-linux-64@1.20260424.1", "", { "os": "linux", "cpu": "x64" }, "sha512-YlEBFbAYZHe/ylzl8WEYQEU/jr+0XMqXaST2oBk5oVjksdb1NGuJaggluCdZAzuJJ8UqdTmyhY5u/qrasbiFWA=="], - "@cloudflare/workerd-linux-arm64": ["@cloudflare/workerd-linux-arm64@1.20250718.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-Aa2M/DVBEBQDdATMbn217zCSFKE+ud/teS+fFS+OQqKABLn0azO2qq6ANAHYOIE6Q3Sq4CxDIQr8lGdaJHwUog=="], + "@cloudflare/workerd-linux-arm64": ["@cloudflare/workerd-linux-arm64@1.20260424.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-qJ0X0m6cL8fWDUPDg8K4IxYZXNJI6XbeOihqjnqKbAClrjdPDn8VUSd+z2XiCQ5NylMtMrpa/skC9UfaR6mh8g=="], - "@cloudflare/workerd-windows-64": ["@cloudflare/workerd-windows-64@1.20250718.0", "", { "os": "win32", "cpu": "x64" }, "sha512-dY16RXKffmugnc67LTbyjdDHZn5NoTF1yHEf2fN4+OaOnoGSp3N1x77QubTDwqZ9zECWxgQfDLjddcH8dWeFhg=="], + "@cloudflare/workerd-windows-64": ["@cloudflare/workerd-windows-64@1.20260424.1", "", { "os": "win32", "cpu": "x64" }, "sha512-tZ7Z9qmYNAP6z1/+8r/zKbk8F8DZmpmwNzMeN+zkde2Wnhfr3FBqOkJXT/5zmli8HPoWrIXxSiyqcNDMy8V2Zg=="], "@cloudflare/workers-types": ["@cloudflare/workers-types@4.20260115.0", "", {}, "sha512-vi68ZODh6m9fH9wdBOzDsyWgrYRIZbzZEAGGkvFn4b1FQSukxaWS8NAtSd/h9mL4gVK9hG8FEYq/jipdOo4RJg=="], @@ -41,250 +40,178 @@ "@emnapi/runtime": ["@emnapi/runtime@1.8.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg=="], - "@esbuild-plugins/node-globals-polyfill": ["@esbuild-plugins/node-globals-polyfill@0.2.3", "", { "peerDependencies": { "esbuild": "*" } }, "sha512-r3MIryXDeXDOZh7ih1l/yE9ZLORCd5e8vWg02azWRGj5SPTuoh69A2AIyn0Z31V/kHBfZ4HgWJ+OK3GTTwLmnw=="], + "@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.27.3", "", { "os": "aix", "cpu": "ppc64" }, "sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg=="], - "@esbuild-plugins/node-modules-polyfill": ["@esbuild-plugins/node-modules-polyfill@0.2.2", "", { "dependencies": { "escape-string-regexp": "^4.0.0", "rollup-plugin-node-polyfills": "^0.2.1" }, "peerDependencies": { "esbuild": "*" } }, "sha512-LXV7QsWJxRuMYvKbiznh+U1ilIop3g2TeKRzUxOG5X3YITc8JyyTa90BmLwqqv0YnX4v32CSlG+vsziZp9dMvA=="], + "@esbuild/android-arm": ["@esbuild/android-arm@0.27.3", "", { "os": "android", "cpu": "arm" }, "sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA=="], - "@esbuild/android-arm": ["@esbuild/android-arm@0.17.19", "", { "os": "android", "cpu": "arm" }, "sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A=="], + "@esbuild/android-arm64": ["@esbuild/android-arm64@0.27.3", "", { "os": "android", "cpu": "arm64" }, "sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg=="], - "@esbuild/android-arm64": ["@esbuild/android-arm64@0.17.19", "", { "os": "android", "cpu": "arm64" }, "sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA=="], + "@esbuild/android-x64": ["@esbuild/android-x64@0.27.3", "", { "os": "android", "cpu": "x64" }, "sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ=="], - "@esbuild/android-x64": ["@esbuild/android-x64@0.17.19", "", { "os": "android", "cpu": "x64" }, "sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww=="], + "@esbuild/darwin-arm64": ["@esbuild/darwin-arm64@0.27.3", "", { "os": "darwin", "cpu": "arm64" }, "sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg=="], - "@esbuild/darwin-arm64": ["@esbuild/darwin-arm64@0.17.19", "", { "os": "darwin", "cpu": "arm64" }, "sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg=="], + "@esbuild/darwin-x64": ["@esbuild/darwin-x64@0.27.3", "", { "os": "darwin", "cpu": "x64" }, "sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg=="], - "@esbuild/darwin-x64": ["@esbuild/darwin-x64@0.17.19", "", { "os": "darwin", "cpu": "x64" }, "sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw=="], + "@esbuild/freebsd-arm64": ["@esbuild/freebsd-arm64@0.27.3", "", { "os": "freebsd", "cpu": "arm64" }, "sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w=="], - "@esbuild/freebsd-arm64": ["@esbuild/freebsd-arm64@0.17.19", "", { "os": "freebsd", "cpu": "arm64" }, "sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ=="], + "@esbuild/freebsd-x64": ["@esbuild/freebsd-x64@0.27.3", "", { "os": "freebsd", "cpu": "x64" }, "sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA=="], - "@esbuild/freebsd-x64": ["@esbuild/freebsd-x64@0.17.19", "", { "os": "freebsd", "cpu": "x64" }, "sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ=="], + "@esbuild/linux-arm": ["@esbuild/linux-arm@0.27.3", "", { "os": "linux", "cpu": "arm" }, "sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw=="], - "@esbuild/linux-arm": ["@esbuild/linux-arm@0.17.19", "", { "os": "linux", "cpu": "arm" }, "sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA=="], + "@esbuild/linux-arm64": ["@esbuild/linux-arm64@0.27.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg=="], - "@esbuild/linux-arm64": ["@esbuild/linux-arm64@0.17.19", "", { "os": "linux", "cpu": "arm64" }, "sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg=="], + "@esbuild/linux-ia32": ["@esbuild/linux-ia32@0.27.3", "", { "os": "linux", "cpu": "ia32" }, "sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg=="], - "@esbuild/linux-ia32": ["@esbuild/linux-ia32@0.17.19", "", { "os": "linux", "cpu": "ia32" }, "sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ=="], + "@esbuild/linux-loong64": ["@esbuild/linux-loong64@0.27.3", "", { "os": "linux", "cpu": "none" }, "sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA=="], - "@esbuild/linux-loong64": ["@esbuild/linux-loong64@0.17.19", "", { "os": "linux", "cpu": "none" }, "sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ=="], + "@esbuild/linux-mips64el": ["@esbuild/linux-mips64el@0.27.3", "", { "os": "linux", "cpu": "none" }, "sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw=="], - "@esbuild/linux-mips64el": ["@esbuild/linux-mips64el@0.17.19", "", { "os": "linux", "cpu": "none" }, "sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A=="], + "@esbuild/linux-ppc64": ["@esbuild/linux-ppc64@0.27.3", "", { "os": "linux", "cpu": "ppc64" }, "sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA=="], - "@esbuild/linux-ppc64": ["@esbuild/linux-ppc64@0.17.19", "", { "os": "linux", "cpu": "ppc64" }, "sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg=="], + "@esbuild/linux-riscv64": ["@esbuild/linux-riscv64@0.27.3", "", { "os": "linux", "cpu": "none" }, "sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ=="], - "@esbuild/linux-riscv64": ["@esbuild/linux-riscv64@0.17.19", "", { "os": "linux", "cpu": "none" }, "sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA=="], + "@esbuild/linux-s390x": ["@esbuild/linux-s390x@0.27.3", "", { "os": "linux", "cpu": "s390x" }, "sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw=="], - "@esbuild/linux-s390x": ["@esbuild/linux-s390x@0.17.19", "", { "os": "linux", "cpu": "s390x" }, "sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q=="], + "@esbuild/linux-x64": ["@esbuild/linux-x64@0.27.3", "", { "os": "linux", "cpu": "x64" }, "sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA=="], - "@esbuild/linux-x64": ["@esbuild/linux-x64@0.17.19", "", { "os": "linux", "cpu": "x64" }, "sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw=="], + "@esbuild/netbsd-arm64": ["@esbuild/netbsd-arm64@0.27.3", "", { "os": "none", "cpu": "arm64" }, "sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA=="], - "@esbuild/netbsd-x64": ["@esbuild/netbsd-x64@0.17.19", "", { "os": "none", "cpu": "x64" }, "sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q=="], + "@esbuild/netbsd-x64": ["@esbuild/netbsd-x64@0.27.3", "", { "os": "none", "cpu": "x64" }, "sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA=="], - "@esbuild/openbsd-x64": ["@esbuild/openbsd-x64@0.17.19", "", { "os": "openbsd", "cpu": "x64" }, "sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g=="], + "@esbuild/openbsd-arm64": ["@esbuild/openbsd-arm64@0.27.3", "", { "os": "openbsd", "cpu": "arm64" }, "sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw=="], - "@esbuild/sunos-x64": ["@esbuild/sunos-x64@0.17.19", "", { "os": "sunos", "cpu": "x64" }, "sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg=="], + "@esbuild/openbsd-x64": ["@esbuild/openbsd-x64@0.27.3", "", { "os": "openbsd", "cpu": "x64" }, "sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ=="], - "@esbuild/win32-arm64": ["@esbuild/win32-arm64@0.17.19", "", { "os": "win32", "cpu": "arm64" }, "sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag=="], + "@esbuild/openharmony-arm64": ["@esbuild/openharmony-arm64@0.27.3", "", { "os": "none", "cpu": "arm64" }, "sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g=="], - "@esbuild/win32-ia32": ["@esbuild/win32-ia32@0.17.19", "", { "os": "win32", "cpu": "ia32" }, "sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw=="], + "@esbuild/sunos-x64": ["@esbuild/sunos-x64@0.27.3", "", { "os": "sunos", "cpu": "x64" }, "sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA=="], - "@esbuild/win32-x64": ["@esbuild/win32-x64@0.17.19", "", { "os": "win32", "cpu": "x64" }, "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA=="], + "@esbuild/win32-arm64": ["@esbuild/win32-arm64@0.27.3", "", { "os": "win32", "cpu": "arm64" }, "sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA=="], - "@fastify/busboy": ["@fastify/busboy@2.1.1", "", {}, "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA=="], + "@esbuild/win32-ia32": ["@esbuild/win32-ia32@0.27.3", "", { "os": "win32", "cpu": "ia32" }, "sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q=="], + + "@esbuild/win32-x64": ["@esbuild/win32-x64@0.27.3", "", { "os": "win32", "cpu": "x64" }, "sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA=="], "@hono/zod-validator": ["@hono/zod-validator@0.4.3", "", { "peerDependencies": { "hono": ">=3.9.0", "zod": "^3.19.1" } }, "sha512-xIgMYXDyJ4Hj6ekm9T9Y27s080Nl9NXHcJkOvkXPhubOLj8hZkOL8pDnnXfvCf5xEE8Q4oMFenQUZZREUY2gqQ=="], - "@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.0.4" }, "os": "darwin", "cpu": "arm64" }, "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ=="], + "@img/colour": ["@img/colour@1.1.0", "", {}, "sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ=="], - "@img/sharp-darwin-x64": ["@img/sharp-darwin-x64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-x64": "1.0.4" }, "os": "darwin", "cpu": "x64" }, "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q=="], + "@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.2.4" }, "os": "darwin", "cpu": "arm64" }, "sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w=="], - "@img/sharp-libvips-darwin-arm64": ["@img/sharp-libvips-darwin-arm64@1.0.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg=="], + "@img/sharp-darwin-x64": ["@img/sharp-darwin-x64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-x64": "1.2.4" }, "os": "darwin", "cpu": "x64" }, "sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw=="], - "@img/sharp-libvips-darwin-x64": ["@img/sharp-libvips-darwin-x64@1.0.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ=="], + "@img/sharp-libvips-darwin-arm64": ["@img/sharp-libvips-darwin-arm64@1.2.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g=="], - "@img/sharp-libvips-linux-arm": ["@img/sharp-libvips-linux-arm@1.0.5", "", { "os": "linux", "cpu": "arm" }, "sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g=="], + "@img/sharp-libvips-darwin-x64": ["@img/sharp-libvips-darwin-x64@1.2.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg=="], - "@img/sharp-libvips-linux-arm64": ["@img/sharp-libvips-linux-arm64@1.0.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA=="], + "@img/sharp-libvips-linux-arm": ["@img/sharp-libvips-linux-arm@1.2.4", "", { "os": "linux", "cpu": "arm" }, "sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A=="], - "@img/sharp-libvips-linux-s390x": ["@img/sharp-libvips-linux-s390x@1.0.4", "", { "os": "linux", "cpu": "s390x" }, "sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA=="], + "@img/sharp-libvips-linux-arm64": ["@img/sharp-libvips-linux-arm64@1.2.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw=="], - "@img/sharp-libvips-linux-x64": ["@img/sharp-libvips-linux-x64@1.0.4", "", { "os": "linux", "cpu": "x64" }, "sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw=="], + "@img/sharp-libvips-linux-ppc64": ["@img/sharp-libvips-linux-ppc64@1.2.4", "", { "os": "linux", "cpu": "ppc64" }, "sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA=="], - "@img/sharp-libvips-linuxmusl-arm64": ["@img/sharp-libvips-linuxmusl-arm64@1.0.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA=="], + "@img/sharp-libvips-linux-riscv64": ["@img/sharp-libvips-linux-riscv64@1.2.4", "", { "os": "linux", "cpu": "none" }, "sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA=="], - "@img/sharp-libvips-linuxmusl-x64": ["@img/sharp-libvips-linuxmusl-x64@1.0.4", "", { "os": "linux", "cpu": "x64" }, "sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw=="], + "@img/sharp-libvips-linux-s390x": ["@img/sharp-libvips-linux-s390x@1.2.4", "", { "os": "linux", "cpu": "s390x" }, "sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ=="], - "@img/sharp-linux-arm": ["@img/sharp-linux-arm@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm": "1.0.5" }, "os": "linux", "cpu": "arm" }, "sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ=="], + "@img/sharp-libvips-linux-x64": ["@img/sharp-libvips-linux-x64@1.2.4", "", { "os": "linux", "cpu": "x64" }, "sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw=="], - "@img/sharp-linux-arm64": ["@img/sharp-linux-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm64": "1.0.4" }, "os": "linux", "cpu": "arm64" }, "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA=="], + "@img/sharp-libvips-linuxmusl-arm64": ["@img/sharp-libvips-linuxmusl-arm64@1.2.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw=="], - "@img/sharp-linux-s390x": ["@img/sharp-linux-s390x@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-s390x": "1.0.4" }, "os": "linux", "cpu": "s390x" }, "sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q=="], + "@img/sharp-libvips-linuxmusl-x64": ["@img/sharp-libvips-linuxmusl-x64@1.2.4", "", { "os": "linux", "cpu": "x64" }, "sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg=="], - "@img/sharp-linux-x64": ["@img/sharp-linux-x64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-x64": "1.0.4" }, "os": "linux", "cpu": "x64" }, "sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA=="], + "@img/sharp-linux-arm": ["@img/sharp-linux-arm@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm": "1.2.4" }, "os": "linux", "cpu": "arm" }, "sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw=="], - "@img/sharp-linuxmusl-arm64": ["@img/sharp-linuxmusl-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-arm64": "1.0.4" }, "os": "linux", "cpu": "arm64" }, "sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g=="], + "@img/sharp-linux-arm64": ["@img/sharp-linux-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm64": "1.2.4" }, "os": "linux", "cpu": "arm64" }, "sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg=="], - "@img/sharp-linuxmusl-x64": ["@img/sharp-linuxmusl-x64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-x64": "1.0.4" }, "os": "linux", "cpu": "x64" }, "sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw=="], + "@img/sharp-linux-ppc64": ["@img/sharp-linux-ppc64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-ppc64": "1.2.4" }, "os": "linux", "cpu": "ppc64" }, "sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA=="], - "@img/sharp-wasm32": ["@img/sharp-wasm32@0.33.5", "", { "dependencies": { "@emnapi/runtime": "^1.2.0" }, "cpu": "none" }, "sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg=="], + "@img/sharp-linux-riscv64": ["@img/sharp-linux-riscv64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-riscv64": "1.2.4" }, "os": "linux", "cpu": "none" }, "sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw=="], - "@img/sharp-win32-ia32": ["@img/sharp-win32-ia32@0.33.5", "", { "os": "win32", "cpu": "ia32" }, "sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ=="], + "@img/sharp-linux-s390x": ["@img/sharp-linux-s390x@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-s390x": "1.2.4" }, "os": "linux", "cpu": "s390x" }, "sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg=="], - "@img/sharp-win32-x64": ["@img/sharp-win32-x64@0.33.5", "", { "os": "win32", "cpu": "x64" }, "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg=="], + "@img/sharp-linux-x64": ["@img/sharp-linux-x64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-x64": "1.2.4" }, "os": "linux", "cpu": "x64" }, "sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ=="], - "@jridgewell/resolve-uri": ["@jridgewell/resolve-uri@3.1.2", "", {}, "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="], + "@img/sharp-linuxmusl-arm64": ["@img/sharp-linuxmusl-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-arm64": "1.2.4" }, "os": "linux", "cpu": "arm64" }, "sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg=="], - "@jridgewell/sourcemap-codec": ["@jridgewell/sourcemap-codec@1.5.5", "", {}, "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og=="], + "@img/sharp-linuxmusl-x64": ["@img/sharp-linuxmusl-x64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-x64": "1.2.4" }, "os": "linux", "cpu": "x64" }, "sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q=="], - "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.9", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" } }, "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="], + "@img/sharp-wasm32": ["@img/sharp-wasm32@0.34.5", "", { "dependencies": { "@emnapi/runtime": "^1.7.0" }, "cpu": "none" }, "sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw=="], - "@react-email/render": ["@react-email/render@1.1.2", "", { "dependencies": { "html-to-text": "^9.0.5", "prettier": "^3.5.3", "react-promise-suspense": "^0.3.4" }, "peerDependencies": { "react": "^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^18.0 || ^19.0 || ^19.0.0-rc" } }, "sha512-RnRehYN3v9gVlNMehHPHhyp2RQo7+pSkHDtXPvg3s0GbzM9SQMW4Qrf8GRNvtpLC4gsI+Wt0VatNRUFqjvevbw=="], + "@img/sharp-win32-arm64": ["@img/sharp-win32-arm64@0.34.5", "", { "os": "win32", "cpu": "arm64" }, "sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g=="], - "@selderee/plugin-htmlparser2": ["@selderee/plugin-htmlparser2@0.11.0", "", { "dependencies": { "domhandler": "^5.0.3", "selderee": "^0.11.0" } }, "sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ=="], + "@img/sharp-win32-ia32": ["@img/sharp-win32-ia32@0.34.5", "", { "os": "win32", "cpu": "ia32" }, "sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg=="], - "@types/bcryptjs": ["@types/bcryptjs@2.4.6", "", {}, "sha512-9xlo6R2qDs5uixm0bcIqCeMCE6HiQsIyel9KQySStiyqNl2tnj2mP3DX1Nf56MD6KMenNNlBBsy3LJ7gUEQPXQ=="], - - "acorn": ["acorn@8.14.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA=="], + "@img/sharp-win32-x64": ["@img/sharp-win32-x64@0.34.5", "", { "os": "win32", "cpu": "x64" }, "sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw=="], - "acorn-walk": ["acorn-walk@8.3.2", "", {}, "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A=="], + "@jridgewell/resolve-uri": ["@jridgewell/resolve-uri@3.1.2", "", {}, "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="], - "as-table": ["as-table@1.0.55", "", { "dependencies": { "printable-characters": "^1.0.42" } }, "sha512-xvsWESUJn0JN421Xb9MQw6AsMHRCUknCe0Wjlxvjud80mU4E6hQf1A6NzQKcYNmYw62MfzEtXc+badstZP3JpQ=="], + "@jridgewell/sourcemap-codec": ["@jridgewell/sourcemap-codec@1.5.5", "", {}, "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og=="], - "aws4fetch": ["aws4fetch@1.0.20", "", {}, "sha512-/djoAN709iY65ETD6LKCtyyEI04XIBP5xVvfmNxsEP0uJB5tyaGBztSryRr4HqMStr9R06PisQE7m9zDTXKu6g=="], + "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.9", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" } }, "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="], - "bcryptjs": ["bcryptjs@2.4.3", "", {}, "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="], + "@poppinss/colors": ["@poppinss/colors@4.1.6", "", { "dependencies": { "kleur": "^4.1.5" } }, "sha512-H9xkIdFswbS8n1d6vmRd8+c10t2Qe+rZITbbDHHkQixH5+2x1FDGmi/0K+WgWiqQFKPSlIYB7jlH6Kpfn6Fleg=="], - "blake3-wasm": ["blake3-wasm@2.1.5", "", {}, "sha512-F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g=="], + "@poppinss/dumper": ["@poppinss/dumper@0.6.5", "", { "dependencies": { "@poppinss/colors": "^4.1.5", "@sindresorhus/is": "^7.0.2", "supports-color": "^10.0.0" } }, "sha512-NBdYIb90J7LfOI32dOewKI1r7wnkiH6m920puQ3qHUeZkxNkQiFnXVWoE6YtFSv6QOiPPf7ys6i+HWWecDz7sw=="], - "color": ["color@4.2.3", "", { "dependencies": { "color-convert": "^2.0.1", "color-string": "^1.9.0" } }, "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A=="], + "@poppinss/exception": ["@poppinss/exception@1.2.3", "", {}, "sha512-dCED+QRChTVatE9ibtoaxc+WkdzOSjYTKi/+uacHWIsfodVfpsueo3+DKpgU5Px8qXjgmXkSvhXvSCz3fnP9lw=="], - "color-convert": ["color-convert@2.0.1", "", { "dependencies": { "color-name": "~1.1.4" } }, "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="], + "@sindresorhus/is": ["@sindresorhus/is@7.2.0", "", {}, "sha512-P1Cz1dWaFfR4IR+U13mqqiGsLFf1KbayybWwdd2vfctdV6hDpUkgCY0nKOLLTMSoRd/jJNjtbqzf13K8DCCXQw=="], - "color-name": ["color-name@1.1.4", "", {}, "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="], + "@speed-highlight/core": ["@speed-highlight/core@1.2.15", "", {}, "sha512-BMq1K3DsElxDWawkX6eLg9+CKJrTVGCBAWVuHXVUV2u0s2711qiChLSId6ikYPfxhdYocLNt3wWwSvDiTvFabw=="], - "color-string": ["color-string@1.9.1", "", { "dependencies": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" } }, "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg=="], + "@types/bcryptjs": ["@types/bcryptjs@2.4.6", "", {}, "sha512-9xlo6R2qDs5uixm0bcIqCeMCE6HiQsIyel9KQySStiyqNl2tnj2mP3DX1Nf56MD6KMenNNlBBsy3LJ7gUEQPXQ=="], - "cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="], + "aws4fetch": ["aws4fetch@1.0.20", "", {}, "sha512-/djoAN709iY65ETD6LKCtyyEI04XIBP5xVvfmNxsEP0uJB5tyaGBztSryRr4HqMStr9R06PisQE7m9zDTXKu6g=="], - "data-uri-to-buffer": ["data-uri-to-buffer@2.0.2", "", {}, "sha512-ND9qDTLc6diwj+Xe5cdAgVTbLVdXbtxTJRXRhli8Mowuaan+0EJOtdqJ0QCHNSSPyoXGx9HX2/VMnKeC34AChA=="], + "bcryptjs": ["bcryptjs@2.4.3", "", {}, "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="], - "deepmerge": ["deepmerge@4.3.1", "", {}, "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="], + "blake3-wasm": ["blake3-wasm@2.1.5", "", {}, "sha512-F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g=="], - "defu": ["defu@6.1.4", "", {}, "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg=="], + "cookie": ["cookie@1.1.1", "", {}, "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ=="], "detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="], - "dom-serializer": ["dom-serializer@2.0.0", "", { "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.2", "entities": "^4.2.0" } }, "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg=="], - - "domelementtype": ["domelementtype@2.3.0", "", {}, "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="], - - "domhandler": ["domhandler@5.0.3", "", { "dependencies": { "domelementtype": "^2.3.0" } }, "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w=="], - - "domutils": ["domutils@3.2.2", "", { "dependencies": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", "domhandler": "^5.0.3" } }, "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw=="], - - "entities": ["entities@4.5.0", "", {}, "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="], - - "esbuild": ["esbuild@0.17.19", "", { "optionalDependencies": { "@esbuild/android-arm": "0.17.19", "@esbuild/android-arm64": "0.17.19", "@esbuild/android-x64": "0.17.19", "@esbuild/darwin-arm64": "0.17.19", "@esbuild/darwin-x64": "0.17.19", "@esbuild/freebsd-arm64": "0.17.19", "@esbuild/freebsd-x64": "0.17.19", "@esbuild/linux-arm": "0.17.19", "@esbuild/linux-arm64": "0.17.19", "@esbuild/linux-ia32": "0.17.19", "@esbuild/linux-loong64": "0.17.19", "@esbuild/linux-mips64el": "0.17.19", "@esbuild/linux-ppc64": "0.17.19", "@esbuild/linux-riscv64": "0.17.19", "@esbuild/linux-s390x": "0.17.19", "@esbuild/linux-x64": "0.17.19", "@esbuild/netbsd-x64": "0.17.19", "@esbuild/openbsd-x64": "0.17.19", "@esbuild/sunos-x64": "0.17.19", "@esbuild/win32-arm64": "0.17.19", "@esbuild/win32-ia32": "0.17.19", "@esbuild/win32-x64": "0.17.19" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw=="], + "error-stack-parser-es": ["error-stack-parser-es@1.0.5", "", {}, "sha512-5qucVt2XcuGMcEGgWI7i+yZpmpByQ8J1lHhcL7PwqCwu9FPP3VUXzT4ltHe5i2z9dePwEHcDVOAfSnHsOlCXRA=="], - "escape-string-regexp": ["escape-string-regexp@4.0.0", "", {}, "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="], - - "estree-walker": ["estree-walker@0.6.1", "", {}, "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="], - - "exit-hook": ["exit-hook@2.2.1", "", {}, "sha512-eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw=="], - - "exsolve": ["exsolve@1.0.8", "", {}, "sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA=="], - - "fast-deep-equal": ["fast-deep-equal@2.0.1", "", {}, "sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w=="], + "esbuild": ["esbuild@0.27.3", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.27.3", "@esbuild/android-arm": "0.27.3", "@esbuild/android-arm64": "0.27.3", "@esbuild/android-x64": "0.27.3", "@esbuild/darwin-arm64": "0.27.3", "@esbuild/darwin-x64": "0.27.3", "@esbuild/freebsd-arm64": "0.27.3", "@esbuild/freebsd-x64": "0.27.3", "@esbuild/linux-arm": "0.27.3", "@esbuild/linux-arm64": "0.27.3", "@esbuild/linux-ia32": "0.27.3", "@esbuild/linux-loong64": "0.27.3", "@esbuild/linux-mips64el": "0.27.3", "@esbuild/linux-ppc64": "0.27.3", "@esbuild/linux-riscv64": "0.27.3", "@esbuild/linux-s390x": "0.27.3", "@esbuild/linux-x64": "0.27.3", "@esbuild/netbsd-arm64": "0.27.3", "@esbuild/netbsd-x64": "0.27.3", "@esbuild/openbsd-arm64": "0.27.3", "@esbuild/openbsd-x64": "0.27.3", "@esbuild/openharmony-arm64": "0.27.3", "@esbuild/sunos-x64": "0.27.3", "@esbuild/win32-arm64": "0.27.3", "@esbuild/win32-ia32": "0.27.3", "@esbuild/win32-x64": "0.27.3" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg=="], "fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="], - "get-source": ["get-source@2.0.12", "", { "dependencies": { "data-uri-to-buffer": "^2.0.0", "source-map": "^0.6.1" } }, "sha512-X5+4+iD+HoSeEED+uwrQ07BOQr0kEDFMVqqpBuI+RaZBpBpHCuXxo70bjar6f0b0u/DQJsJ7ssurpP0V60Az+w=="], - - "glob-to-regexp": ["glob-to-regexp@0.4.1", "", {}, "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="], - "hono": ["hono@4.11.4", "", {}, "sha512-U7tt8JsyrxSRKspfhtLET79pU8K+tInj5QZXs1jSugO1Vq5dFj3kmZsRldo29mTBfcjDRVRXrEZ6LS63Cog9ZA=="], - "html-to-text": ["html-to-text@9.0.5", "", { "dependencies": { "@selderee/plugin-htmlparser2": "^0.11.0", "deepmerge": "^4.3.1", "dom-serializer": "^2.0.0", "htmlparser2": "^8.0.2", "selderee": "^0.11.0" } }, "sha512-qY60FjREgVZL03vJU6IfMV4GDjGBIoOyvuFdpBDIX9yTlDw0TjxVBQp+P8NvpdIXNJvfWBTNul7fsAQJq2FNpg=="], + "kleur": ["kleur@4.1.5", "", {}, "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ=="], - "htmlparser2": ["htmlparser2@8.0.2", "", { "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.3", "domutils": "^3.0.1", "entities": "^4.4.0" } }, "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA=="], - - "is-arrayish": ["is-arrayish@0.3.4", "", {}, "sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA=="], - - "leac": ["leac@0.6.0", "", {}, "sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg=="], - - "magic-string": ["magic-string@0.25.9", "", { "dependencies": { "sourcemap-codec": "^1.4.8" } }, "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="], - - "mime": ["mime@3.0.0", "", { "bin": { "mime": "cli.js" } }, "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="], - - "miniflare": ["miniflare@3.20250718.3", "", { "dependencies": { "@cspotcode/source-map-support": "0.8.1", "acorn": "8.14.0", "acorn-walk": "8.3.2", "exit-hook": "2.2.1", "glob-to-regexp": "0.4.1", "stoppable": "1.1.0", "undici": "^5.28.5", "workerd": "1.20250718.0", "ws": "8.18.0", "youch": "3.3.4", "zod": "3.22.3" }, "bin": { "miniflare": "bootstrap.js" } }, "sha512-JuPrDJhwLrNLEJiNLWO7ZzJrv/Vv9kZuwMYCfv0LskQDM6Eonw4OvywO3CH/wCGjgHzha/qyjUh8JQ068TjDgQ=="], - - "mustache": ["mustache@4.2.0", "", { "bin": { "mustache": "bin/mustache" } }, "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ=="], - - "ohash": ["ohash@2.0.11", "", {}, "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ=="], - - "parseley": ["parseley@0.12.1", "", { "dependencies": { "leac": "^0.6.0", "peberminta": "^0.9.0" } }, "sha512-e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw=="], + "miniflare": ["miniflare@4.20260424.0", "", { "dependencies": { "@cspotcode/source-map-support": "0.8.1", "sharp": "^0.34.5", "undici": "7.24.8", "workerd": "1.20260424.1", "ws": "8.18.0", "youch": "4.1.0-beta.10" }, "bin": { "miniflare": "bootstrap.js" } }, "sha512-B6MKBBd5TJ19daUc3Ae9rWctn1nDA/VCXykXfCsp9fTxyfGxnZY27tJs1caxgE9MWEMMKGbGHouqVtgKbKGxmw=="], "path-to-regexp": ["path-to-regexp@6.3.0", "", {}, "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ=="], "pathe": ["pathe@2.0.3", "", {}, "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w=="], - "peberminta": ["peberminta@0.9.0", "", {}, "sha512-XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ=="], - - "prettier": ["prettier@3.8.0", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-yEPsovQfpxYfgWNhCfECjG5AQaO+K3dp6XERmOepyPDVqcJm+bjyCVO3pmU+nAPe0N5dDvekfGezt/EIiRe1TA=="], - - "printable-characters": ["printable-characters@1.0.42", "", {}, "sha512-dKp+C4iXWK4vVYZmYSd0KBH5F/h1HoZRsbJ82AVKRO3PEo8L4lBS/vLwhVtpwwuYcoIsVY+1JYKR268yn480uQ=="], - - "react": ["react@19.2.3", "", {}, "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA=="], - - "react-dom": ["react-dom@19.2.3", "", { "dependencies": { "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.3" } }, "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg=="], - - "react-promise-suspense": ["react-promise-suspense@0.3.4", "", { "dependencies": { "fast-deep-equal": "^2.0.1" } }, "sha512-I42jl7L3Ze6kZaq+7zXWSunBa3b1on5yfvUW6Eo/3fFOj6dZ5Bqmcd264nJbTK/gn1HjjILAjSwnZbV4RpSaNQ=="], - - "resend": ["resend@4.8.0", "", { "dependencies": { "@react-email/render": "1.1.2" } }, "sha512-R8eBOFQDO6dzRTDmaMEdpqrkmgSjPpVXt4nGfWsZdYOet0kqra0xgbvTES6HmCriZEXbmGk3e0DiGIaLFTFSHA=="], - - "rollup-plugin-inject": ["rollup-plugin-inject@3.0.2", "", { "dependencies": { "estree-walker": "^0.6.1", "magic-string": "^0.25.3", "rollup-pluginutils": "^2.8.1" } }, "sha512-ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w=="], - - "rollup-plugin-node-polyfills": ["rollup-plugin-node-polyfills@0.2.1", "", { "dependencies": { "rollup-plugin-inject": "^3.0.0" } }, "sha512-4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA=="], - - "rollup-pluginutils": ["rollup-pluginutils@2.8.2", "", { "dependencies": { "estree-walker": "^0.6.1" } }, "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ=="], - - "scheduler": ["scheduler@0.27.0", "", {}, "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q=="], - - "selderee": ["selderee@0.11.0", "", { "dependencies": { "parseley": "^0.12.0" } }, "sha512-5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA=="], - "semver": ["semver@7.7.3", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q=="], - "sharp": ["sharp@0.33.5", "", { "dependencies": { "color": "^4.2.3", "detect-libc": "^2.0.3", "semver": "^7.6.3" }, "optionalDependencies": { "@img/sharp-darwin-arm64": "0.33.5", "@img/sharp-darwin-x64": "0.33.5", "@img/sharp-libvips-darwin-arm64": "1.0.4", "@img/sharp-libvips-darwin-x64": "1.0.4", "@img/sharp-libvips-linux-arm": "1.0.5", "@img/sharp-libvips-linux-arm64": "1.0.4", "@img/sharp-libvips-linux-s390x": "1.0.4", "@img/sharp-libvips-linux-x64": "1.0.4", "@img/sharp-libvips-linuxmusl-arm64": "1.0.4", "@img/sharp-libvips-linuxmusl-x64": "1.0.4", "@img/sharp-linux-arm": "0.33.5", "@img/sharp-linux-arm64": "0.33.5", "@img/sharp-linux-s390x": "0.33.5", "@img/sharp-linux-x64": "0.33.5", "@img/sharp-linuxmusl-arm64": "0.33.5", "@img/sharp-linuxmusl-x64": "0.33.5", "@img/sharp-wasm32": "0.33.5", "@img/sharp-win32-ia32": "0.33.5", "@img/sharp-win32-x64": "0.33.5" } }, "sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw=="], - - "simple-swizzle": ["simple-swizzle@0.2.4", "", { "dependencies": { "is-arrayish": "^0.3.1" } }, "sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw=="], + "sharp": ["sharp@0.34.5", "", { "dependencies": { "@img/colour": "^1.0.0", "detect-libc": "^2.1.2", "semver": "^7.7.3" }, "optionalDependencies": { "@img/sharp-darwin-arm64": "0.34.5", "@img/sharp-darwin-x64": "0.34.5", "@img/sharp-libvips-darwin-arm64": "1.2.4", "@img/sharp-libvips-darwin-x64": "1.2.4", "@img/sharp-libvips-linux-arm": "1.2.4", "@img/sharp-libvips-linux-arm64": "1.2.4", "@img/sharp-libvips-linux-ppc64": "1.2.4", "@img/sharp-libvips-linux-riscv64": "1.2.4", "@img/sharp-libvips-linux-s390x": "1.2.4", "@img/sharp-libvips-linux-x64": "1.2.4", "@img/sharp-libvips-linuxmusl-arm64": "1.2.4", "@img/sharp-libvips-linuxmusl-x64": "1.2.4", "@img/sharp-linux-arm": "0.34.5", "@img/sharp-linux-arm64": "0.34.5", "@img/sharp-linux-ppc64": "0.34.5", "@img/sharp-linux-riscv64": "0.34.5", "@img/sharp-linux-s390x": "0.34.5", "@img/sharp-linux-x64": "0.34.5", "@img/sharp-linuxmusl-arm64": "0.34.5", "@img/sharp-linuxmusl-x64": "0.34.5", "@img/sharp-wasm32": "0.34.5", "@img/sharp-win32-arm64": "0.34.5", "@img/sharp-win32-ia32": "0.34.5", "@img/sharp-win32-x64": "0.34.5" } }, "sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg=="], - "source-map": ["source-map@0.6.1", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="], - - "sourcemap-codec": ["sourcemap-codec@1.4.8", "", {}, "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="], - - "stacktracey": ["stacktracey@2.1.8", "", { "dependencies": { "as-table": "^1.0.36", "get-source": "^2.0.12" } }, "sha512-Kpij9riA+UNg7TnphqjH7/CzctQ/owJGNbFkfEeve4Z4uxT5+JapVLFXcsurIfN34gnTWZNJ/f7NMG0E8JDzTw=="], - - "stoppable": ["stoppable@1.1.0", "", {}, "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw=="], + "supports-color": ["supports-color@10.2.2", "", {}, "sha512-SS+jx45GF1QjgEXQx4NJZV9ImqmO2NPz5FNsIHrsDjh2YsHnawpan7SNQ1o8NuhrbHZy9AZhIoCUiCeaW/C80g=="], "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="], - "ufo": ["ufo@1.6.3", "", {}, "sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q=="], + "undici": ["undici@7.24.8", "", {}, "sha512-6KQ/+QxK49Z/p3HO6E5ZCZWNnCasyZLa5ExaVYyvPxUwKtbCPMKELJOqh7EqOle0t9cH/7d2TaaTRRa6Nhs4YQ=="], - "undici": ["undici@5.29.0", "", { "dependencies": { "@fastify/busboy": "^2.0.0" } }, "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg=="], + "unenv": ["unenv@2.0.0-rc.24", "", { "dependencies": { "pathe": "^2.0.3" } }, "sha512-i7qRCmY42zmCwnYlh9H2SvLEypEFGye5iRmEMKjcGi7zk9UquigRjFtTLz0TYqr0ZGLZhaMHl/foy1bZR+Cwlw=="], - "unenv": ["unenv@2.0.0-rc.14", "", { "dependencies": { "defu": "^6.1.4", "exsolve": "^1.0.1", "ohash": "^2.0.10", "pathe": "^2.0.3", "ufo": "^1.5.4" } }, "sha512-od496pShMen7nOy5VmVJCnq8rptd45vh6Nx/r2iPbrba6pa6p+tS2ywuIHRZ/OBvSbQZB0kWvpO9XBNVFXHD3Q=="], + "workerd": ["workerd@1.20260424.1", "", { "optionalDependencies": { "@cloudflare/workerd-darwin-64": "1.20260424.1", "@cloudflare/workerd-darwin-arm64": "1.20260424.1", "@cloudflare/workerd-linux-64": "1.20260424.1", "@cloudflare/workerd-linux-arm64": "1.20260424.1", "@cloudflare/workerd-windows-64": "1.20260424.1" }, "bin": { "workerd": "bin/workerd" } }, "sha512-oKsB0Xo/mfkYMdSACoS06XZg09VUK4rXwHfF/1t3P++sMbwzf4UHQvMO57+zxpEB2nVrY/ZkW0bYFGq4GdAFSQ=="], - "workerd": ["workerd@1.20250718.0", "", { "optionalDependencies": { "@cloudflare/workerd-darwin-64": "1.20250718.0", "@cloudflare/workerd-darwin-arm64": "1.20250718.0", "@cloudflare/workerd-linux-64": "1.20250718.0", "@cloudflare/workerd-linux-arm64": "1.20250718.0", "@cloudflare/workerd-windows-64": "1.20250718.0" }, "bin": { "workerd": "bin/workerd" } }, "sha512-kqkIJP/eOfDlUyBzU7joBg+tl8aB25gEAGqDap+nFWb+WHhnooxjGHgxPBy3ipw2hnShPFNOQt5lFRxbwALirg=="], - - "wrangler": ["wrangler@3.114.17", "", { "dependencies": { "@cloudflare/kv-asset-handler": "0.3.4", "@cloudflare/unenv-preset": "2.0.2", "@esbuild-plugins/node-globals-polyfill": "0.2.3", "@esbuild-plugins/node-modules-polyfill": "0.2.2", "blake3-wasm": "2.1.5", "esbuild": "0.17.19", "miniflare": "3.20250718.3", "path-to-regexp": "6.3.0", "unenv": "2.0.0-rc.14", "workerd": "1.20250718.0" }, "optionalDependencies": { "fsevents": "~2.3.2", "sharp": "^0.33.5" }, "peerDependencies": { "@cloudflare/workers-types": "^4.20250408.0" }, "optionalPeers": ["@cloudflare/workers-types"], "bin": { "wrangler": "bin/wrangler.js", "wrangler2": "bin/wrangler.js" } }, "sha512-tAvf7ly+tB+zwwrmjsCyJ2pJnnc7SZhbnNwXbH+OIdVas3zTSmjcZOjmLKcGGptssAA3RyTKhcF9BvKZzMUycA=="], + "wrangler": ["wrangler@4.85.0", "", { "dependencies": { "@cloudflare/kv-asset-handler": "0.4.2", "@cloudflare/unenv-preset": "2.16.1", "blake3-wasm": "2.1.5", "esbuild": "0.27.3", "miniflare": "4.20260424.0", "path-to-regexp": "6.3.0", "unenv": "2.0.0-rc.24", "workerd": "1.20260424.1" }, "optionalDependencies": { "fsevents": "~2.3.2" }, "peerDependencies": { "@cloudflare/workers-types": "^4.20260424.1" }, "optionalPeers": ["@cloudflare/workers-types"], "bin": { "wrangler": "bin/wrangler.js", "wrangler2": "bin/wrangler.js" } }, "sha512-93cwt2RPb1qdcmEgPzH7ybiLN4BIKoWpscIX6SywjHrQOeIZrQk2haoc3XMLKtQTmzapxza9OuDD+kMHpsuuhg=="], "ws": ["ws@8.18.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw=="], - "youch": ["youch@3.3.4", "", { "dependencies": { "cookie": "^0.7.1", "mustache": "^4.2.0", "stacktracey": "^2.1.8" } }, "sha512-UeVBXie8cA35DS6+nBkls68xaBBXCye0CNznrhszZjTbRVnJKQuNsyLKBTTL4ln1o1rh2PKtv35twV7irj5SEg=="], + "youch": ["youch@4.1.0-beta.10", "", { "dependencies": { "@poppinss/colors": "^4.1.5", "@poppinss/dumper": "^0.6.4", "@speed-highlight/core": "^1.2.7", "cookie": "^1.0.2", "youch-core": "^0.3.3" } }, "sha512-rLfVLB4FgQneDr0dv1oddCVZmKjcJ6yX6mS4pU82Mq/Dt9a3cLZQ62pDBL4AUO+uVrCvtWz3ZFUL2HFAFJ/BXQ=="], - "zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="], + "youch-core": ["youch-core@0.3.3", "", { "dependencies": { "@poppinss/exception": "^1.2.2", "error-stack-parser-es": "^1.0.5" } }, "sha512-ho7XuGjLaJ2hWHoK8yFnsUGy2Y5uDpqSTq1FkHLK4/oqKtyUU1AFbOOxY4IpC9f0fTLjwYbslUz0Po5BpD1wrA=="], - "miniflare/zod": ["zod@3.22.3", "", {}, "sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug=="], + "zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="], } } diff --git a/backend/package.json b/backend/package.json index 1f6b5b67f..71ee7975a 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "nemar-api", - "version": "0.1.0", + "version": "0.8.0", "private": true, "scripts": { "dev": "wrangler dev", @@ -20,7 +20,7 @@ }, "devDependencies": { "@cloudflare/workers-types": "^4.20241112.0", - "wrangler": "^3.91.0", + "wrangler": "^4.85.0", "typescript": "^5.6.0", "@types/bcryptjs": "^2.4.6" } diff --git a/backend/src/db/migrations/0019_user_description.sql b/backend/src/db/migrations/0019_user_description.sql new file mode 100644 index 000000000..98940f59e --- /dev/null +++ b/backend/src/db/migrations/0019_user_description.sql @@ -0,0 +1,3 @@ +-- Add description column to users table +-- This column stores the user's reason for requesting NEMAR access +ALTER TABLE users ADD COLUMN description TEXT; diff --git a/backend/src/index.ts b/backend/src/index.ts index cd6e9ceaf..9b97593ed 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -3,8 +3,9 @@ * * Handles user authentication, dataset management, and admin workflows. * - * Production route: api.osc.earth/nemar/* - * Dev route: nemar-api-dev.shirazi-10f.workers.dev/* + * Production route: api.nemar.org (SCCN account) + * Dev route: nemar-api-dev.sccn-org.workers.dev (SCCN account) + * Legacy route: api.osc.earth/nemar (personal account, read-only buffer) */ import { Hono } from "hono"; @@ -12,6 +13,12 @@ import { cors } from "hono/cors"; import { logger } from "hono/logger"; import { secureHeaders } from "hono/secure-headers"; +// Single source of truth for the version. The worker reads the repo-root +// package.json (the npm-published CLI's manifest). backend/package.json is +// private and exists only for wrangler tooling; scripts/bump-version.sh +// keeps both in lockstep and asserts equality post-bump, so drift between +// the two manifests fails the bump rather than silently shipping. +import pkg from "../../package.json" with { type: "json" }; import { optionalAuthMiddleware } from "./middleware/auth"; import { maintenanceMode } from "./middleware/maintenance"; import { rateLimiter } from "./middleware/rateLimit"; @@ -63,7 +70,7 @@ api.get("/health", (c) => { return c.json({ status: "ok", timestamp: new Date().toISOString(), - version: "0.1.0", + version: pkg.version, }); }); @@ -71,7 +78,7 @@ api.get("/health", (c) => { api.get("/", (c) => { return c.json({ name: "NEMAR API", - version: "0.1.0", + version: pkg.version, description: "Backend API for NEMAR CLI", base_url: c.env.API_BASE_URL, endpoints: { @@ -143,13 +150,11 @@ api.onError((err, c) => { ); }); -// Create root app that mounts API at both /nemar (production) and / (dev) +// Mount the API at both / and /nemar so the same worker answers +// api.nemar.org/* (and *.workers.dev/*) at root and the legacy +// api.osc.earth/nemar/* prefix. const app = new Hono<{ Bindings: Bindings; Variables: Variables }>(); - -// Mount at /nemar for production (api.osc.earth/nemar/*) app.route("/nemar", api); - -// Also mount at root for dev environment and workers.dev domain app.route("/", api); /** diff --git a/backend/src/routes/admin.ts b/backend/src/routes/admin.ts index b26e3b22a..4aed7c9f9 100644 --- a/backend/src/routes/admin.ts +++ b/backend/src/routes/admin.ts @@ -34,6 +34,7 @@ import { } from "../services/doi"; import { parseEmailPreferences, + resolveEmailConfig, sendKeyReadyEmail, sendPublicationApprovedEmail, sendPublicationDeniedEmail, @@ -493,7 +494,8 @@ adminRoutes.post("/approve/:username", async (c) => { // Send approval notification email let emailSent = false; try { - await sendKeyReadyEmail(user.email, user.username, c.env.RESEND_API_KEY); + const { fromEmail, replyTo } = resolveEmailConfig(c.env); + await sendKeyReadyEmail(user.email, user.username, c.env.RESEND_API_KEY, fromEmail, replyTo); emailSent = true; } catch (error) { console.error("Failed to send approval email:", error); @@ -724,7 +726,8 @@ adminRoutes.post("/revoke/:username", async (c) => { // Send revocation email let emailSent = false; try { - await sendRevocationEmail(user.email, user.username, c.env.RESEND_API_KEY); + const { fromEmail, replyTo } = resolveEmailConfig(c.env); + await sendRevocationEmail(user.email, user.username, c.env.RESEND_API_KEY, fromEmail, replyTo); emailSent = true; } catch (error) { console.error("Failed to send revocation email:", error); @@ -2492,12 +2495,15 @@ adminRoutes.post("/publish/:id/deny", zValidator("json", denySchema), async (c) .first<{ username: string; email: string }>(); if (user) { + const { fromEmail, replyTo } = resolveEmailConfig(c.env); await sendPublicationDeniedEmail( user.email, user.username, datasetId, reason, c.env.RESEND_API_KEY, + fromEmail, + replyTo, ); } } catch (emailError) { @@ -3958,12 +3964,15 @@ adminRoutes.post("/publish/:id/approve", zValidator("json", approveSchema), asyn .bind(datasetId) .first<{ concept_doi: string | null }>(); + const { fromEmail, replyTo } = resolveEmailConfig(c.env); await sendPublicationApprovedEmail( dataset.owner_email, dataset.owner_username, datasetId, updatedDataset?.concept_doi || null, c.env.RESEND_API_KEY, + fromEmail, + replyTo, ); await updateProgress("notify_user"); @@ -5065,13 +5074,20 @@ adminRoutes.post("/notify", zValidator("json", broadcastSchema), async (c) => { }); } - const result = await sendBroadcast(db, c.env.RESEND_API_KEY, { - sentById: user.id, - group: body.to, - subject: body.subject, - bodyMarkdown: body.body, - recipients, - }); + const { fromEmail, replyTo } = resolveEmailConfig(c.env); + const result = await sendBroadcast( + db, + c.env.RESEND_API_KEY, + fromEmail, + { + sentById: user.id, + group: body.to, + subject: body.subject, + bodyMarkdown: body.body, + recipients, + }, + replyTo, + ); return c.json(result); }); diff --git a/backend/src/routes/auth.ts b/backend/src/routes/auth.ts index 4d19c9ccb..10b02a21c 100644 --- a/backend/src/routes/auth.ts +++ b/backend/src/routes/auth.ts @@ -9,6 +9,7 @@ import { Hono } from "hono"; import { z } from "zod"; import { getAdminEmailsForCategory, + resolveEmailConfig, sendAdminNotificationEmail, sendKeyReadyEmail, sendKeyRegenerationVerificationEmail, @@ -237,7 +238,15 @@ authRoutes.post("/signup", zValidator("json", signupSchema), async (c) => { let emailSent = false; try { - await sendVerificationEmail(email, username, verificationUrl, c.env.RESEND_API_KEY); + const { fromEmail, replyTo } = resolveEmailConfig(c.env); + await sendVerificationEmail( + email, + username, + verificationUrl, + c.env.RESEND_API_KEY, + fromEmail, + replyTo, + ); emailSent = true; } catch (emailError) { console.error("Failed to send verification email:", emailError); @@ -409,6 +418,7 @@ authRoutes.get("/verify", async (c) => { try { const adminEmails = await getAdminEmailsForCategory(db, "user_approval"); if (adminEmails.length > 0) { + const { fromEmail, replyTo } = resolveEmailConfig(c.env); await sendAdminNotificationEmail( adminEmails, { @@ -418,6 +428,8 @@ authRoutes.get("/verify", async (c) => { description: user.description || "No description provided", }, c.env.RESEND_API_KEY, + fromEmail, + replyTo, ); } } catch (emailError) { @@ -603,7 +615,15 @@ authRoutes.post("/resend-verification", zValidator("json", resendSchema), async // Send email const verificationUrl = `${c.env.API_BASE_URL}/auth/verify?token=${verificationToken}`; - await sendVerificationEmail(email, user.username, verificationUrl, c.env.RESEND_API_KEY); + const { fromEmail, replyTo } = resolveEmailConfig(c.env); + await sendVerificationEmail( + email, + user.username, + verificationUrl, + c.env.RESEND_API_KEY, + fromEmail, + replyTo, + ); return c.json({ message: "Verification email sent" }); }); @@ -783,11 +803,14 @@ authRoutes.post("/request-key-regeneration", zValidator("json", regenRequestSche // Send verification email const confirmUrl = `${c.env.API_BASE_URL}/auth/confirm-key-regeneration?token=${regenToken}`; try { + const { fromEmail, replyTo } = resolveEmailConfig(c.env); await sendKeyRegenerationVerificationEmail( user.email, user.username, confirmUrl, c.env.RESEND_API_KEY, + fromEmail, + replyTo, ); } catch (emailError) { console.error("Failed to send key regeneration email:", emailError); diff --git a/backend/src/routes/datasets.ts b/backend/src/routes/datasets.ts index b79bb48bd..c9e6386f1 100644 --- a/backend/src/routes/datasets.ts +++ b/backend/src/routes/datasets.ts @@ -11,7 +11,11 @@ import { authMiddleware, optionalAuthMiddleware } from "../middleware/auth"; import { cliVersionGuard } from "../middleware/cliVersion"; import { semanticSearch, textSearch } from "../services/dataset-search"; import { generateDatasetId, isValidDatasetId } from "../services/datasetId"; -import { getAdminEmailsForCategory, sendPublicationRequestEmail } from "../services/email"; +import { + getAdminEmailsForCategory, + resolveEmailConfig, + sendPublicationRequestEmail, +} from "../services/email"; import { type GitHubRepo, addCollaborator, @@ -1802,11 +1806,14 @@ datasetRoutes.post("/:id/publish/request", authMiddleware, async (c) => { try { const adminEmails = await getAdminEmailsForCategory(db, "publication_request"); if (adminEmails.length > 0) { + const { fromEmail, replyTo } = resolveEmailConfig(c.env); await sendPublicationRequestEmail( adminEmails, datasetId, currentUser.username, c.env.RESEND_API_KEY, + fromEmail, + replyTo, ); } } catch (emailError) { @@ -1950,11 +1957,14 @@ datasetRoutes.post("/:id/publish/resend", authMiddleware, async (c) => { try { const adminEmails = await getAdminEmailsForCategory(db, "publication_request"); if (adminEmails.length > 0) { + const { fromEmail, replyTo } = resolveEmailConfig(c.env); await sendPublicationRequestEmail( adminEmails, datasetId, currentUser.username, c.env.RESEND_API_KEY, + fromEmail, + replyTo, ); } } catch (emailError) { diff --git a/backend/src/services/broadcast.ts b/backend/src/services/broadcast.ts index b3b79afea..73417ddd4 100644 --- a/backend/src/services/broadcast.ts +++ b/backend/src/services/broadcast.ts @@ -22,7 +22,6 @@ interface UserRow { } const RESEND_BATCH_URL = "https://api.resend.com/emails/batch"; -const FROM_EMAIL = "NEMAR "; const BATCH_SIZE = 100; /** @@ -176,6 +175,7 @@ interface ResendBatchItem { to: string[]; subject: string; html: string; + reply_to?: string; } interface ResendBatchResponseItem { @@ -190,6 +190,7 @@ interface ResendBatchResponseItem { export async function sendBroadcast( db: D1Database, resendApiKey: string, + fromEmail: string, params: { sentById: number; group: RecipientGroup; @@ -197,6 +198,7 @@ export async function sendBroadcast( bodyMarkdown: string; recipients: string[]; }, + replyTo?: string, ): Promise { const bodyHtml = markdownToEmailHtml(params.bodyMarkdown); const html = buildBroadcastHtml(params.subject, bodyHtml); @@ -207,10 +209,11 @@ export async function sendBroadcast( for (let i = 0; i < params.recipients.length; i += BATCH_SIZE) { const chunk = params.recipients.slice(i, i + BATCH_SIZE); const batch: ResendBatchItem[] = chunk.map((email) => ({ - from: FROM_EMAIL, + from: fromEmail, to: [email], subject: params.subject, html, + ...(replyTo ? { reply_to: replyTo } : {}), })); try { diff --git a/backend/src/services/email.ts b/backend/src/services/email.ts index 29b1c6240..2a1cc2a93 100644 --- a/backend/src/services/email.ts +++ b/backend/src/services/email.ts @@ -6,9 +6,42 @@ * Uses fetch directly for Cloudflare Workers compatibility. */ -const FROM_EMAIL = "NEMAR "; +/** Fallback sender when FROM_EMAIL env var is unset. */ +export const DEFAULT_FROM_EMAIL = "NEMAR "; const RESEND_API_URL = "https://api.resend.com/emails"; +let warnedMissingFromEmail = false; + +/** + * Resolve sender + reply-to from Workers env. + * `fromEmail` falls back to DEFAULT_FROM_EMAIL when unset, empty, or whitespace. + * `replyTo` passes through as-is (undefined when unset or empty/whitespace). + * Callers pass `c.env` to avoid repeating the fallback at every site. + * + * NOTE: The domain in FROM_EMAIL must be verified in the Resend account tied + * to RESEND_API_KEY, otherwise Resend will reject the send. A deploy that + * forgets FROM_EMAIL silently falls back to the legacy osc.earth address; + * on accounts where that domain is not verified, every send fails. We log + * once per worker instance to surface this in Workers Logs. + */ +export function resolveEmailConfig(env: { FROM_EMAIL?: string; REPLY_TO?: string }): { + fromEmail: string; + replyTo?: string; +} { + const from = env.FROM_EMAIL?.trim(); + const reply = env.REPLY_TO?.trim(); + if (!from && !warnedMissingFromEmail) { + warnedMissingFromEmail = true; + console.error( + `FROM_EMAIL env var is unset; falling back to ${DEFAULT_FROM_EMAIL}. If the Resend account tied to this worker does not verify osc.earth, every email will fail. Set FROM_EMAIL in wrangler config.`, + ); + } + return { + fromEmail: from || DEFAULT_FROM_EMAIL, + replyTo: reply || undefined, + }; +} + export interface EmailPreferences { user_approval: boolean; publication_request: boolean; @@ -93,24 +126,30 @@ async function sendEmail( subject: string, html: string, resendApiKey: string, + fromEmail: string, + replyTo?: string, ): Promise { + const body: Record = { + from: fromEmail, + to: [to], + subject, + html, + }; + if (replyTo) body.reply_to = replyTo; const response = await fetch(RESEND_API_URL, { method: "POST", headers: { Authorization: `Bearer ${resendApiKey}`, "Content-Type": "application/json", }, - body: JSON.stringify({ - from: FROM_EMAIL, - to: [to], - subject, - html, - }), + body: JSON.stringify(body), }); if (!response.ok) { const error: ResendResponse = await response.json(); - throw new Error(`Failed to send email: ${error.message || response.statusText}`); + throw new Error( + `Failed to send email from ${fromEmail} to ${to}: ${error.message || response.statusText}`, + ); } } @@ -122,6 +161,8 @@ export async function sendVerificationEmail( username: string, verificationUrl: string, resendApiKey: string, + fromEmail: string, + replyTo?: string, ): Promise { const html = ` @@ -168,7 +209,7 @@ export async function sendVerificationEmail( `; - await sendEmail(to, "Verify your NEMAR account", html, resendApiKey); + await sendEmail(to, "Verify your NEMAR account", html, resendApiKey, fromEmail, replyTo); } /** @@ -179,6 +220,8 @@ export async function sendKeyReadyEmail( to: string, username: string, resendApiKey: string, + fromEmail: string, + replyTo?: string, ): Promise { const html = ` @@ -222,7 +265,14 @@ nemar auth login `; - await sendEmail(to, "Your NEMAR account has been approved!", html, resendApiKey); + await sendEmail( + to, + "Your NEMAR account has been approved!", + html, + resendApiKey, + fromEmail, + replyTo, + ); } /** @@ -233,6 +283,8 @@ export async function sendKeyRegenerationVerificationEmail( username: string, confirmUrl: string, resendApiKey: string, + fromEmail: string, + replyTo?: string, ): Promise { const html = ` @@ -276,7 +328,7 @@ export async function sendKeyRegenerationVerificationEmail( `; - await sendEmail(to, "NEMAR API Key Regeneration", html, resendApiKey); + await sendEmail(to, "NEMAR API Key Regeneration", html, resendApiKey, fromEmail, replyTo); } /** @@ -292,6 +344,8 @@ export async function sendAdminNotificationEmail( description: string; }, resendApiKey: string, + fromEmail: string, + replyTo?: string, ): Promise { const html = ` @@ -357,6 +411,8 @@ export async function sendAdminNotificationEmail( `[NEMAR] New user awaiting approval: ${user.username}`, html, resendApiKey, + fromEmail, + replyTo, ); } catch (error) { console.error(`Failed to send admin notification to ${adminEmail}:`, error); @@ -371,6 +427,8 @@ export async function sendRevocationEmail( to: string, username: string, resendApiKey: string, + fromEmail: string, + replyTo?: string, ): Promise { const html = ` @@ -398,7 +456,7 @@ export async function sendRevocationEmail( `; - await sendEmail(to, "NEMAR account access revoked", html, resendApiKey); + await sendEmail(to, "NEMAR account access revoked", html, resendApiKey, fromEmail, replyTo); } /** @@ -421,6 +479,8 @@ export async function sendPublicationRequestEmail( datasetId: string, username: string, resendApiKey: string, + fromEmail: string, + replyTo?: string, ): Promise { const html = ` @@ -463,6 +523,8 @@ export async function sendPublicationRequestEmail( `[NEMAR] Publication request: ${datasetId} by ${username}`, html, resendApiKey, + fromEmail, + replyTo, ); } catch (error) { console.error(`Failed to send publication request email to ${adminEmail}:`, error); @@ -479,6 +541,8 @@ export async function sendPublicationDeniedEmail( datasetId: string, reason: string, resendApiKey: string, + fromEmail: string, + replyTo?: string, ): Promise { const html = ` @@ -513,7 +577,14 @@ export async function sendPublicationDeniedEmail( `; - await sendEmail(to, `Publication request denied: ${datasetId}`, html, resendApiKey); + await sendEmail( + to, + `Publication request denied: ${datasetId}`, + html, + resendApiKey, + fromEmail, + replyTo, + ); } /** @@ -525,6 +596,8 @@ export async function sendPublicationApprovedEmail( datasetId: string, doi: string | null, resendApiKey: string, + fromEmail: string, + replyTo?: string, ): Promise { const safeDoi = doi ? escapeHtml(doi) : ""; const doiSection = doi @@ -565,5 +638,5 @@ export async function sendPublicationApprovedEmail( `; - await sendEmail(to, `Dataset published: ${datasetId}`, html, resendApiKey); + await sendEmail(to, `Dataset published: ${datasetId}`, html, resendApiKey, fromEmail, replyTo); } diff --git a/backend/src/services/github.ts b/backend/src/services/github.ts index c3b30a46d..d78801d90 100644 --- a/backend/src/services/github.ts +++ b/backend/src/services/github.ts @@ -1053,7 +1053,7 @@ jobs: echo "Triggering LLM enrichment for $REPO_NAME (force=$FORCE)" RESPONSE=$(curl -s -w "\\n%{http_code}" -X POST \\ - "https://api.osc.earth/nemar/webhooks/llm-enrich" \\ + "https://api.nemar.org/webhooks/llm-enrich" \\ -H "Content-Type: application/json" \\ -H "X-Webhook-Token: $NEMAR_WEBHOOK_TOKEN" \\ -d "{\\"dataset_id\\": \\"$REPO_NAME\\", \\"force\\": $FORCE}") @@ -1111,7 +1111,7 @@ jobs: fi RESPONSE=$(curl -s -w "\\n%{http_code}" -X POST \\ - "https://api.osc.earth/nemar/webhooks/publish-version-doi" \\ + "https://api.nemar.org/webhooks/publish-version-doi" \\ -H "Content-Type: application/json" \\ -H "X-Webhook-Token: $NEMAR_WEBHOOK_TOKEN" \\ -d "{ diff --git a/backend/src/types/bindings.ts b/backend/src/types/bindings.ts index 7e0e51003..a86dbc9a5 100644 --- a/backend/src/types/bindings.ts +++ b/backend/src/types/bindings.ts @@ -20,6 +20,14 @@ export interface Bindings { S3_BUCKET: string; /** Undefined is treated as "off". See backend/src/types/maintenance.ts. */ MAINTENANCE_MODE?: MaintenanceMode; + /** Sender for outbound Resend emails, e.g. "NEMAR ". + * Falls back to DEFAULT_FROM_EMAIL in email.ts if unset/empty. + * The domain must be verified in the Resend account tied to RESEND_API_KEY, + * otherwise Resend rejects the send (caught and logged per-site). */ + FROM_EMAIL?: string; + /** Reply-To address (e.g. "info@nemar.org") when FROM is a no-reply mailbox. + * Omitted when unset/empty. */ + REPLY_TO?: string; // Secrets GITHUB_ADMIN_PAT: string; diff --git a/backend/test/email-config.test.ts b/backend/test/email-config.test.ts new file mode 100644 index 000000000..74fc1fcb9 --- /dev/null +++ b/backend/test/email-config.test.ts @@ -0,0 +1,50 @@ +import { describe, expect, test } from "bun:test"; +import { DEFAULT_FROM_EMAIL, resolveEmailConfig } from "../src/services/email"; + +describe("resolveEmailConfig", () => { + test("returns both env values when set", () => { + const result = resolveEmailConfig({ + FROM_EMAIL: "NEMAR Archive ", + REPLY_TO: "info@nemar.org", + }); + expect(result).toEqual({ + fromEmail: "NEMAR Archive ", + replyTo: "info@nemar.org", + }); + }); + + test("falls back to DEFAULT_FROM_EMAIL when FROM_EMAIL unset", () => { + expect(resolveEmailConfig({})).toEqual({ + fromEmail: DEFAULT_FROM_EMAIL, + replyTo: undefined, + }); + }); + + test("uses FROM_EMAIL without replyTo when only FROM_EMAIL set", () => { + const result = resolveEmailConfig({ FROM_EMAIL: "NEMAR " }); + expect(result).toEqual({ + fromEmail: "NEMAR ", + replyTo: undefined, + }); + }); + + test("falls back when FROM_EMAIL is empty or whitespace-only", () => { + expect(resolveEmailConfig({ FROM_EMAIL: "" }).fromEmail).toBe(DEFAULT_FROM_EMAIL); + expect(resolveEmailConfig({ FROM_EMAIL: " " }).fromEmail).toBe(DEFAULT_FROM_EMAIL); + expect(resolveEmailConfig({ FROM_EMAIL: "\t\n" }).fromEmail).toBe(DEFAULT_FROM_EMAIL); + }); + + test("drops replyTo when empty or whitespace-only", () => { + expect(resolveEmailConfig({ REPLY_TO: "" }).replyTo).toBeUndefined(); + expect(resolveEmailConfig({ REPLY_TO: " " }).replyTo).toBeUndefined(); + }); + + test("trims surrounding whitespace from env values", () => { + const result = resolveEmailConfig({ + FROM_EMAIL: " NEMAR ", + REPLY_TO: " reply@y.com ", + }); + expect(result.fromEmail).toBe("NEMAR "); + expect(result.replyTo).toBe("reply@y.com"); + }); +}); diff --git a/backend/wrangler-sccn.toml b/backend/wrangler-sccn.toml new file mode 100644 index 000000000..4094361a4 --- /dev/null +++ b/backend/wrangler-sccn.toml @@ -0,0 +1,99 @@ +# NEMAR API - SCCN Cloudflare account, canonical production config. +# Multi-account deploys use cfman; see CLAUDE.md. + +name = "nemar-api" +main = "src/index.ts" +compatibility_date = "2024-12-01" +compatibility_flags = ["nodejs_compat"] + +# api.nemar.org is bound as a Workers Custom Domain. +# custom_domain=true lets Cloudflare auto-manage DNS + TLS for the whole +# hostname (no /* path pattern, no separate DNS record). Zone must live +# on the same account. +routes = [ + { pattern = "api.nemar.org", custom_domain = true } +] +# workers.dev fallback hostname so the worker stays reachable if the +# custom domain ever misbehaves. +workers_dev = true + +# Scheduled cleanup: daily at 3 AM UTC +[triggers] +crons = ["0 3 * * *"] + +# D1 Database (SCCN account) +[[d1_databases]] +binding = "DB" +database_name = "nemar-db" +database_id = "009b1a44-a385-4ecf-812d-ec8341587cb5" +migrations_dir = "src/db/migrations" + +# Workers AI (for dataset search embeddings) +[ai] +binding = "AI" + +# Vectorize (for semantic dataset search, 384 dims, cosine, bge-small-en-v1.5) +[[vectorize]] +binding = "VECTORIZE" +index_name = "nemar-dataset-index" + +# Environment variables +[vars] +ENVIRONMENT = "production" +API_BASE_URL = "https://api.nemar.org" +FRONTEND_URL = "https://nemar.org" +AWS_REGION = "us-east-2" +S3_BUCKET = "nemar" +# Sender + reply-to for Resend emails. The domain in FROM_EMAIL must be +# verified in the Resend account tied to RESEND_API_KEY; otherwise sends +# 403 and resolveEmailConfig logs once but does not propagate the failure. +FROM_EMAIL = "NEMAR Archive " +REPLY_TO = "info@nemar.org" + +# Secrets (set via: npx cfman wrangler --account sccn secret put -c backend/wrangler-sccn.toml) +# - GITHUB_ADMIN_PAT +# - AWS_ACCESS_KEY_ID +# - AWS_SECRET_ACCESS_KEY +# - ENCRYPTION_KEY (AES-GCM key -- MUST be identical to personal account; mismatch makes stored credentials undecryptable) +# - RESEND_API_KEY +# - TEST_BYPASS_TOKEN +# - GITHUB_WEBHOOK_SECRET +# - EZID_USERNAME +# - EZID_PASSWORD +# - EZID_SANDBOX_USERNAME +# - EZID_SANDBOX_PASSWORD +# - OPENROUTER_API_KEY +# - NEMAR_USERNAME +# - NEMAR_PASSWORD +# - ZENODO_API_KEY +# - ZENODO_SANDBOX_API_KEY + +# Development environment (SCCN account) +[env.dev] +name = "nemar-api-dev" +workers_dev = true +routes = [] + +[[env.dev.d1_databases]] +binding = "DB" +database_name = "nemar-db-dev" +database_id = "017d8f4e-a591-4a3d-944b-01b5ffe5101d" +migrations_dir = "src/db/migrations" + +# Workers AI for dev (not inherited from top-level) +[env.dev.ai] +binding = "AI" + +# Vectorize for dev (not inherited from top-level, 384 dims, cosine) +[[env.dev.vectorize]] +binding = "VECTORIZE" +index_name = "nemar-dataset-index-dev" + +[env.dev.vars] +ENVIRONMENT = "development" +API_BASE_URL = "https://nemar-api-dev.sccn-org.workers.dev" +FRONTEND_URL = "https://nemar.org" +AWS_REGION = "us-east-2" +S3_BUCKET = "nemar" +FROM_EMAIL = "NEMAR Archive " +REPLY_TO = "info@nemar.org" diff --git a/backend/wrangler.toml b/backend/wrangler.toml index 825b8618d..d5baf71c8 100644 --- a/backend/wrangler.toml +++ b/backend/wrangler.toml @@ -1,11 +1,13 @@ -# NEMAR API - Cloudflare Workers Configuration +# NEMAR API - LEGACY personal-account config, kept as a read-only buffer +# for old CLIs still pointed at api.osc.earth/nemar. Canonical production +# config is wrangler-sccn.toml. Do not deploy CI from this file. name = "nemar-api" main = "src/index.ts" compatibility_date = "2024-12-01" compatibility_flags = ["nodejs_compat"] -# Route configuration for api.osc.earth/nemar/* -# This intercepts /nemar/* while letting /osa/* pass through to origin (hedtools.ucsd.edu) +# Routes intercept /nemar/* on api.osc.earth while letting /osa/* pass +# through to the origin (hedtools.ucsd.edu). routes = [ { pattern = "api.osc.earth/nemar", zone_id = "adce8c117d3373bda82d3aba2dfd5b13" }, { pattern = "api.osc.earth/nemar/*", zone_id = "adce8c117d3373bda82d3aba2dfd5b13" } @@ -42,6 +44,9 @@ API_BASE_URL = "https://api.osc.earth/nemar" FRONTEND_URL = "https://nemar.org" AWS_REGION = "us-east-2" S3_BUCKET = "nemar" +# Sender for Resend emails. Personal account uses osc.earth domain. +# REPLY_TO intentionally unset here; nemar@osc.earth is monitored. +FROM_EMAIL = "NEMAR " # Redeploy to change. Valid: off, read-only, full. See backend/src/types/maintenance.ts. MAINTENANCE_MODE = "read-only" @@ -58,6 +63,10 @@ MAINTENANCE_MODE = "read-only" # - EZID_PASSWORD # - EZID_SANDBOX_USERNAME # - EZID_SANDBOX_PASSWORD +# - GITHUB_WEBHOOK_SECRET +# - OPENROUTER_API_KEY +# - NEMAR_USERNAME +# - NEMAR_PASSWORD # Development environment [env.dev] @@ -85,6 +94,7 @@ API_BASE_URL = "https://nemar-api-dev.shirazi-10f.workers.dev" FRONTEND_URL = "https://nemar.org" AWS_REGION = "us-east-2" S3_BUCKET = "nemar" +FROM_EMAIL = "NEMAR " MAINTENANCE_MODE = "off" # Note: Rate limiting is disabled in development diff --git a/mkdocs.yml b/mkdocs.yml index 3a8209959..7f22580b9 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,6 +1,6 @@ site_name: NEMAR CLI site_description: Command-line interface for NEMAR dataset management -site_url: https://nemar-cli.pages.dev +site_url: https://docs.nemar.org repo_url: https://github.com/nemarOrg/nemar-cli repo_name: nemarOrg/nemar-cli diff --git a/package.json b/package.json index 027b8ea02..b1557126a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nemar-cli", - "version": "0.7.26", + "version": "0.8.0", "description": "CLI for NEMAR (Neuroelectromagnetic Data Archive and Tools Resource) dataset management", "type": "module", "main": "dist/index.js", diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index 040d003f5..7f1523b6a 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -163,12 +163,29 @@ echo "New version: $NEW_VERSION" # Update package.json using jq jq --arg v "$NEW_VERSION" '.version = $v' package.json > package.json.tmp && mv package.json.tmp package.json +# Keep backend/package.json in sync (powers the version reported by /health +# and / on api.nemar.org). CLI and backend ship together; single version. +if [ -f backend/package.json ]; then + jq --arg v "$NEW_VERSION" '.version = $v' backend/package.json > backend/package.json.tmp \ + && mv backend/package.json.tmp backend/package.json +fi + +# Restore both files to their pre-bump version (called from each failure path +# so an aborted bump never leaves the working tree half-modified). +restore_versions() { + jq --arg v "$CURRENT_VERSION" '.version = $v' package.json > package.json.tmp \ + && mv package.json.tmp package.json + if [ -f backend/package.json ]; then + jq --arg v "$CURRENT_VERSION" '.version = $v' backend/package.json > backend/package.json.tmp \ + && mv backend/package.json.tmp backend/package.json + fi +} + # Build to verify everything works echo "Building..." if ! bun run build > /dev/null 2>&1; then echo "Error: Build failed" - # Restore original version - jq --arg v "$CURRENT_VERSION" '.version = $v' package.json > package.json.tmp && mv package.json.tmp package.json + restore_versions exit 1 fi @@ -178,20 +195,36 @@ chmod +x dist/index.js # Verify version is correct in build if ! BUILD_VERSION=$(./dist/index.js --version 2>&1); then echo "Error: Failed to run built CLI" - jq --arg v "$CURRENT_VERSION" '.version = $v' package.json > package.json.tmp && mv package.json.tmp package.json + restore_versions exit 1 fi if [ "$BUILD_VERSION" != "$NEW_VERSION" ]; then echo "Error: Build version ($BUILD_VERSION) doesn't match expected ($NEW_VERSION)" - jq --arg v "$CURRENT_VERSION" '.version = $v' package.json > package.json.tmp && mv package.json.tmp package.json + restore_versions exit 1 fi +# Sanity check: root package.json is the runtime source of truth (backend +# imports it via ../../package.json). backend/package.json is kept synced for +# tooling. If they drift, bail with a loud error rather than shipping a +# package whose two manifests disagree. +if [ -f backend/package.json ]; then + BACKEND_VERSION=$(jq -r '.version' backend/package.json) + if [ "$BACKEND_VERSION" != "$NEW_VERSION" ]; then + echo "Error: backend/package.json version ($BACKEND_VERSION) does not match root ($NEW_VERSION)" + restore_versions + exit 1 + fi +fi + echo "Build verified: $BUILD_VERSION" # Stage and commit git add package.json +if [ -f backend/package.json ]; then + git add backend/package.json +fi if ! git diff --cached --quiet; then git commit -m "chore: bump version to $NEW_VERSION" else diff --git a/scripts/generate-docs.ts b/scripts/generate-docs.ts index e97897bc6..f88f9d5a9 100644 --- a/scripts/generate-docs.ts +++ b/scripts/generate-docs.ts @@ -1054,7 +1054,7 @@ NEMAR CLI communicates with the NEMAR API. This reference is for advanced users. ## Base URL \`\`\` -https://api.osc.earth/nemar +https://api.nemar.org \`\`\` ## Authentication diff --git a/scripts/hallu-sync.sh b/scripts/hallu-sync.sh index fc9db429e..67fe8b30a 100755 --- a/scripts/hallu-sync.sh +++ b/scripts/hallu-sync.sh @@ -46,7 +46,7 @@ ZIP_DIR="${ZIP_DIR:-${DATA_DIR}/zip_files}" MANIFEST_FILE="${MANIFEST_FILE:-${DATA_DIR}/.nm-sync-manifest.json}" LOG_FILE="${LOG_FILE:-${DATA_DIR}/.nm-sync.log}" LOCK_FILE="${LOCK_FILE:-${DATA_DIR}/.nm-sync.lock}" -API_BASE="${API_BASE:-https://api.osc.earth/nemar}" +API_BASE="${API_BASE:-https://api.nemar.org}" S3_BASE="${S3_BASE:-https://nemar.s3.us-east-2.amazonaws.com}" NEMAR_GROUP="${NEMAR_GROUP:-nemar}" DOWNLOAD_JOBS="${DOWNLOAD_JOBS:-4}" diff --git a/src/commands/auth.ts b/src/commands/auth.ts index 16a725a48..1e9080382 100644 --- a/src/commands/auth.ts +++ b/src/commands/auth.ts @@ -31,6 +31,7 @@ import { signup, } from "../lib/api.js"; import { + DEFAULT_API_URL, clearAllConfig, clearConfig, getAccounts, @@ -143,7 +144,7 @@ export async function loginAction(options: { key?: string } & ConfirmOptions): P // Store credentials as a named account and set as active storeAccount(result.user.username, { apiKey, - apiUrl: "https://api.osc.earth/nemar", + apiUrl: DEFAULT_API_URL, username: result.user.username, email: result.user.email, githubUsername: result.user.github_username, diff --git a/src/lib/api.ts b/src/lib/api.ts index 9542aaa7e..832e09a68 100644 --- a/src/lib/api.ts +++ b/src/lib/api.ts @@ -9,7 +9,7 @@ import { getConfig } from "./config.js"; import { printMaintenanceBanner } from "./maintenance-banner.js"; import { version } from "./version.js"; -const DEFAULT_API_URL = "https://api.osc.earth/nemar"; +const DEFAULT_API_URL = "https://api.nemar.org"; /** ORCID identifier format: XXXX-XXXX-XXXX-XXXX (last char may be X) */ export const ORCID_REGEX = /^\d{4}-\d{4}-\d{4}-\d{3}[\dX]$/; diff --git a/src/lib/config.ts b/src/lib/config.ts index ca559ef82..441593fcc 100644 --- a/src/lib/config.ts +++ b/src/lib/config.ts @@ -22,7 +22,15 @@ import { join } from "node:path"; import Conf from "conf"; import { z } from "zod"; -const DEFAULT_API_URL = "https://api.osc.earth/nemar"; +export const DEFAULT_API_URL = "https://api.nemar.org"; + +/** + * Old default URL pre-Phase-9. Rewritten to DEFAULT_API_URL on CLI launch by + * migrateApiUrl(). The legacy redirect on personal Cloudflare keeps stale + * configs working too, but we proactively rewrite so users don't ride the + * redirect forever. + */ +const LEGACY_DEFAULT_API_URL = "https://api.osc.earth/nemar"; /** * Standardized config directory: ~/.config/nemar/ on all platforms. @@ -180,6 +188,46 @@ export function migrateConfig(): void { // Run migration on module load migrateConfig(); +/** + * Rewrite stored apiUrl entries that still point at the pre-cutover legacy + * URL. The server-side redirect on the legacy host keeps old configs working, + * but we rewrite proactively so users converge on the canonical host. + * + * Only rewrites *exact* matches of the legacy default. Custom URLs (dev + * builds, self-hosted, workers.dev fallbacks) are left alone. + * + * Idempotent and safe under concurrent CLI launches: the exact-match guard + * means a second run is a no-op, and Conf writes via atomic file replace, so + * a racing process sees pre- or post-state, never partial. + * + * If the underlying config write fails (EACCES, ENOSPC, FS race), we log and + * continue rather than abort CLI startup. The legacy redirect is the safety + * net, so the user's next command still works against the pre-rewrite URL. + */ +export function migrateApiUrl(): void { + const accounts = config.get("accounts") as Record | undefined; + if (!accounts) return; + let changed = false; + for (const [name, account] of Object.entries(accounts)) { + if (account?.apiUrl === LEGACY_DEFAULT_API_URL) { + accounts[name] = { ...account, apiUrl: DEFAULT_API_URL }; + changed = true; + } + } + if (changed) { + try { + config.store = { ...config.store, accounts }; + } catch (error) { + console.error( + "API URL migration failed (legacy URL preserved, redirect still works):", + error, + ); + } + } +} + +migrateApiUrl(); + /** * Get the active account name */ diff --git a/test/api.test.ts b/test/api.test.ts index dd1f94278..d6782d5f0 100644 --- a/test/api.test.ts +++ b/test/api.test.ts @@ -6,6 +6,7 @@ */ import { beforeAll, beforeEach, describe, expect, test } from "bun:test"; +import rootPkg from "../package.json"; import { TEST_CONFIG, sleep, testRequest } from "./setup"; // Add delay between tests to avoid rate limiting @@ -19,7 +20,13 @@ describe("API Health", () => { expect(status).toBe(200); expect(data.status).toBe("ok"); - expect(data.version).toBeDefined(); + // /health must echo a semver from the worker's bundled package.json. + // We don't lock to rootPkg.version because api-test runs against the + // already-deployed dev backend and races deploy-dev (deploy-dev + // re-rolls the worker on the same push). The shape check still + // catches the original failure mode where the import resolved to an + // unexpected file and version came back undefined or empty. + expect(data.version).toMatch(/^\d+\.\d+\.\d+(-[\w.]+)?$/); }); test("GET / returns 200 or 404 (no dedicated root handler)", async () => { @@ -445,7 +452,8 @@ describe("Datasets API", () => { describe("GET /datasets/:id", () => { test("non-existent dataset returns 404", async () => { - const { status } = await testRequest("/datasets/nm999999"); + // Valid format within MAX_NUMBER=99999 cap, but unlikely to be allocated. + const { status } = await testRequest("/datasets/nm099998"); expect(status).toBe(404); }); diff --git a/test/cli.test.ts b/test/cli.test.ts index e9651db6c..89b9bcfe9 100644 --- a/test/cli.test.ts +++ b/test/cli.test.ts @@ -575,7 +575,8 @@ describe("CLI Dataset Status", () => { }); test("nemar dataset status with non-existent dataset shows error", async () => { - const { stdout, exitCode } = await runCli(["dataset", "status", "nm999999"]); + // Valid format within MAX_NUMBER=99999 cap, but unlikely to be allocated. + const { stdout, exitCode } = await runCli(["dataset", "status", "nm099998"]); expect(stdout).toContain("not found"); }); diff --git a/test/config-migrate-api-url.test.ts b/test/config-migrate-api-url.test.ts new file mode 100644 index 000000000..30eff5591 --- /dev/null +++ b/test/config-migrate-api-url.test.ts @@ -0,0 +1,64 @@ +import { afterAll, beforeAll, describe, expect, test } from "bun:test"; +import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; + +const LEGACY_URL = "https://api.osc.earth/nemar"; +const NEW_URL = "https://api.nemar.org"; +const DEV_URL = "https://nemar-api-dev.sccn-org.workers.dev"; +const CUSTOM_URL = "https://api.example.com/nemar"; + +// Module-level state in src/lib/config.ts captures NEMAR_CONFIG_DIR at first +// import. Bun caches modules across tests, so we set up the config once, +// import once, and assert all migration scenarios from one snapshot. + +const testDir = join(tmpdir(), `nemar-cfg-migrate-${Date.now()}-${process.pid}`); + +beforeAll(() => { + mkdirSync(testDir, { recursive: true }); + process.env.NEMAR_CONFIG_DIR = testDir; + writeFileSync( + join(testDir, "config.json"), + JSON.stringify({ + activeAccount: "alice", + accounts: { + alice: { apiUrl: LEGACY_URL, apiKey: "k1" }, + bob: { apiUrl: LEGACY_URL, apiKey: "k2" }, + carol: { apiUrl: NEW_URL, apiKey: "k3" }, + dev: { apiUrl: DEV_URL, apiKey: "k4" }, + custom: { apiUrl: CUSTOM_URL, apiKey: "k5" }, + // Legacy-flat migration produces accounts with no apiUrl when none + // was stored. Optional chaining in migrateApiUrl must not crash here + // and must leave the field absent. + partial: { apiKey: "k6" }, + }, + }), + ); +}); + +afterAll(() => { + delete process.env.NEMAR_CONFIG_DIR; + if (existsSync(testDir)) rmSync(testDir, { recursive: true, force: true }); +}); + +describe("migrateApiUrl", () => { + test("importing config.ts triggers migration of all stored apiUrl entries", async () => { + // Module load runs migrateApiUrl() at top level + await import("../src/lib/config.ts"); + + const after = JSON.parse(await Bun.file(join(testDir, "config.json")).text()) as { + accounts: Record; + }; + + // Both legacy URLs rewritten + expect(after.accounts.alice.apiUrl).toBe(NEW_URL); + expect(after.accounts.bob.apiUrl).toBe(NEW_URL); + // Already-correct URL stays + expect(after.accounts.carol.apiUrl).toBe(NEW_URL); + // Non-default URLs untouched + expect(after.accounts.dev.apiUrl).toBe(DEV_URL); + expect(after.accounts.custom.apiUrl).toBe(CUSTOM_URL); + // Account with no apiUrl: must not crash, must not invent one + expect(after.accounts.partial.apiUrl).toBeUndefined(); + }); +}); diff --git a/test/e2e-sandbox.test.ts b/test/e2e-sandbox.test.ts index 189a271aa..f36313ed9 100644 --- a/test/e2e-sandbox.test.ts +++ b/test/e2e-sandbox.test.ts @@ -17,7 +17,7 @@ import { tmpdir } from "node:os"; import { join } from "node:path"; // Test configuration -const TEST_API_URL = process.env.TEST_API_URL || "https://nemar-api-dev.shirazi-10f.workers.dev"; +const TEST_API_URL = process.env.TEST_API_URL || "https://nemar-api-dev.sccn-org.workers.dev"; const TEST_USER_API_KEY = process.env.TEST_USER_API_KEY; const NPM_TAG = process.env.NPM_TAG || "dev"; const TEST_DIR = join(tmpdir(), `nemar-e2e-${Date.now()}`); diff --git a/test/setup.ts b/test/setup.ts index 9696143f9..f34f214e2 100644 --- a/test/setup.ts +++ b/test/setup.ts @@ -4,9 +4,19 @@ * Loads test environment and provides test utilities. */ -import { existsSync, readFileSync } from "node:fs"; +import { existsSync, mkdtempSync, readFileSync } from "node:fs"; +import { tmpdir } from "node:os"; import { join } from "node:path"; +// Force every test process to use an isolated config dir before any module +// (notably src/lib/config.ts) can capture the user's real ~/.config/nemar/ +// path at import time. Tests that explicitly need a different dir override +// NEMAR_CONFIG_DIR locally; the shared default just keeps the developer's +// real config out of the blast radius. +if (!process.env.NEMAR_CONFIG_DIR) { + process.env.NEMAR_CONFIG_DIR = mkdtempSync(join(tmpdir(), "nemar-test-cfg-")); +} + // Load test environment variables const envPath = join(import.meta.dir, ".env.test"); if (existsSync(envPath)) { @@ -25,7 +35,7 @@ if (existsSync(envPath)) { // Test configuration export const TEST_CONFIG = { - apiUrl: process.env.TEST_API_URL || "https://api.osc.earth/nemar", + apiUrl: process.env.TEST_API_URL || "https://api.nemar.org", password: process.env.TEST_PASSWORD || "TestPassword123!", adminApiKey: process.env.TEST_ADMIN_API_KEY || "", userApiKey: process.env.TEST_USER_API_KEY || "", diff --git a/test/workflow-yaml.test.ts b/test/workflow-yaml.test.ts index 57f06ae68..5cdf217d4 100644 --- a/test/workflow-yaml.test.ts +++ b/test/workflow-yaml.test.ts @@ -37,6 +37,17 @@ describe("CI workflow templates", () => { } }); + test("webhook URLs target the canonical api.nemar.org host", () => { + for (const { path, content } of templates) { + // The legacy api.osc.earth host is in read-only buffer mode and will be + // sunset; templates emitted into dataset repos must target SCCN prod. + expect(content).not.toContain("api.osc.earth"); + if (content.includes("/webhooks/")) { + expect(content).toMatch(/https:\/\/api\.nemar\.org\/webhooks\//); + } + } + }); + test("no literal newlines inside shell strings (escape regression)", () => { for (const { path, content } of templates) { // In valid YAML, printf format strings and jq arguments should