generated from nhcarrigan/template
Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0a58b4bff8 | |||
| 4437762002 | |||
| f9761d19e1 | |||
| 0178959397 | |||
| ec9fe32c88 | |||
| a0d814dbb1 | |||
| a06e61b48f | |||
| 13567644ff | |||
| 276cbb845a | |||
| 9afe0d55c2 | |||
| a6ab06eac4 | |||
| db4d125613 | |||
| 113afe9d11 | |||
| ebf60041ad | |||
| 351810856a | |||
| 6c08d431b7 | |||
| 7ee03a413d | |||
| f838a89663 |
+14
-5
@@ -8,22 +8,31 @@ on:
|
||||
- main
|
||||
|
||||
jobs:
|
||||
lint:
|
||||
name: Lint and Test
|
||||
ci:
|
||||
name: CI
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout Source Files
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Use Node.js v22
|
||||
- name: Use Node.js v24
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 22
|
||||
node-version: 24
|
||||
|
||||
- name: Setup pnpm
|
||||
uses: pnpm/action-setup@v2
|
||||
with:
|
||||
version: 9
|
||||
version: 10
|
||||
|
||||
- name: Ensure Dependencies are Pinned
|
||||
uses: naomi-lgbt/dependency-pin-check@main
|
||||
with:
|
||||
language: javascript
|
||||
dev-dependencies: true
|
||||
peer-dependencies: true
|
||||
optional-dependencies: true
|
||||
|
||||
- name: Install Dependencies
|
||||
run: pnpm install
|
||||
|
||||
@@ -0,0 +1,177 @@
|
||||
name: Security Scan and Upload
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ main ]
|
||||
pull_request:
|
||||
branches: [ main ]
|
||||
schedule:
|
||||
- cron: '0 0 * * 1'
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
security-audit:
|
||||
name: Security & DefectDojo Upload
|
||||
runs-on: ubuntu-latest
|
||||
continue-on-error: true
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
# --- AUTO-SETUP PROJECT ---
|
||||
- name: Ensure DefectDojo Product Exists
|
||||
env:
|
||||
DD_URL: ${{ secrets.DD_URL }}
|
||||
DD_TOKEN: ${{ secrets.DD_TOKEN }}
|
||||
PRODUCT_NAME: ${{ github.repository }}
|
||||
PRODUCT_TYPE_ID: 1
|
||||
run: |
|
||||
sudo apt-get install jq -y > /dev/null
|
||||
|
||||
echo "Checking connection to $DD_URL..."
|
||||
|
||||
# Check if product exists - capture HTTP code to debug connection issues
|
||||
RESPONSE=$(curl --write-out "%{http_code}" --silent --output /tmp/response.json \
|
||||
-H "Authorization: Token $DD_TOKEN" \
|
||||
"$DD_URL/api/v2/products/?name=$PRODUCT_NAME")
|
||||
|
||||
# If response is not 200, print error
|
||||
if [ "$RESPONSE" != "200" ]; then
|
||||
echo "::error::Failed to query DefectDojo. HTTP Code: $RESPONSE"
|
||||
cat /tmp/response.json
|
||||
exit 1
|
||||
fi
|
||||
|
||||
COUNT=$(cat /tmp/response.json | jq -r '.count')
|
||||
|
||||
if [ "$COUNT" = "0" ]; then
|
||||
echo "Creating product '$PRODUCT_NAME'..."
|
||||
curl -s -X POST "$DD_URL/api/v2/products/" \
|
||||
-H "Authorization: Token $DD_TOKEN" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{ "name": "'"$PRODUCT_NAME"'", "description": "Auto-created by Gitea Actions", "prod_type": '$PRODUCT_TYPE_ID' }'
|
||||
else
|
||||
echo "Product '$PRODUCT_NAME' already exists."
|
||||
fi
|
||||
|
||||
# --- 1. TRIVY (Dependencies & Misconfig) ---
|
||||
- name: Install Trivy
|
||||
run: |
|
||||
sudo apt-get install wget apt-transport-https gnupg lsb-release -y
|
||||
wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | sudo apt-key add -
|
||||
echo "deb https://aquasecurity.github.io/trivy-repo/deb $(lsb_release -sc) main" | sudo tee -a /etc/apt/sources.list.d/trivy.list
|
||||
sudo apt-get update && sudo apt-get install trivy -y
|
||||
|
||||
- name: Run Trivy (FS Scan)
|
||||
run: |
|
||||
trivy fs . --scanners vuln,misconfig --format json --output trivy-results.json --exit-code 0
|
||||
|
||||
- name: Upload Trivy to DefectDojo
|
||||
env:
|
||||
DD_URL: ${{ secrets.DD_URL }}
|
||||
DD_TOKEN: ${{ secrets.DD_TOKEN }}
|
||||
run: |
|
||||
echo "Uploading Trivy results..."
|
||||
# Generate today's date in YYYY-MM-DD format
|
||||
TODAY=$(date +%Y-%m-%d)
|
||||
|
||||
HTTP_CODE=$(curl --write-out "%{http_code}" --output response.txt --silent -X POST "$DD_URL/api/v2/import-scan/" \
|
||||
-H "Authorization: Token $DD_TOKEN" \
|
||||
-F "active=true" \
|
||||
-F "verified=true" \
|
||||
-F "scan_type=Trivy Scan" \
|
||||
-F "engagement_name=CI/CD Pipeline" \
|
||||
-F "product_name=${{ github.repository }}" \
|
||||
-F "scan_date=$TODAY" \
|
||||
-F "auto_create_context=true" \
|
||||
-F "file=@trivy-results.json")
|
||||
|
||||
if [[ "$HTTP_CODE" != "200" && "$HTTP_CODE" != "201" ]]; then
|
||||
echo "::error::Upload Failed with HTTP $HTTP_CODE"
|
||||
echo "--- SERVER RESPONSE ---"
|
||||
cat response.txt
|
||||
echo "-----------------------"
|
||||
exit 1
|
||||
else
|
||||
echo "Upload Success!"
|
||||
fi
|
||||
|
||||
# --- 2. GITLEAKS (Secrets) ---
|
||||
- name: Install Gitleaks
|
||||
run: |
|
||||
wget -qO gitleaks.tar.gz https://github.com/gitleaks/gitleaks/releases/download/v8.18.0/gitleaks_8.18.0_linux_x64.tar.gz
|
||||
tar -xzf gitleaks.tar.gz
|
||||
sudo mv gitleaks /usr/local/bin/ && chmod +x /usr/local/bin/gitleaks
|
||||
|
||||
- name: Run Gitleaks
|
||||
run: gitleaks detect --source . -v --report-path gitleaks-results.json --report-format json --no-git || true
|
||||
|
||||
- name: Upload Gitleaks to DefectDojo
|
||||
env:
|
||||
DD_URL: ${{ secrets.DD_URL }}
|
||||
DD_TOKEN: ${{ secrets.DD_TOKEN }}
|
||||
run: |
|
||||
echo "Uploading Gitleaks results..."
|
||||
TODAY=$(date +%Y-%m-%d)
|
||||
|
||||
HTTP_CODE=$(curl --write-out "%{http_code}" --output response.txt --silent -X POST "$DD_URL/api/v2/import-scan/" \
|
||||
-H "Authorization: Token $DD_TOKEN" \
|
||||
-F "active=true" \
|
||||
-F "verified=true" \
|
||||
-F "scan_type=Gitleaks Scan" \
|
||||
-F "engagement_name=CI/CD Pipeline" \
|
||||
-F "product_name=${{ github.repository }}" \
|
||||
-F "scan_date=$TODAY" \
|
||||
-F "auto_create_context=true" \
|
||||
-F "file=@gitleaks-results.json")
|
||||
|
||||
if [[ "$HTTP_CODE" != "200" && "$HTTP_CODE" != "201" ]]; then
|
||||
echo "::error::Upload Failed with HTTP $HTTP_CODE"
|
||||
echo "--- SERVER RESPONSE ---"
|
||||
cat response.txt
|
||||
echo "-----------------------"
|
||||
exit 1
|
||||
else
|
||||
echo "Upload Success!"
|
||||
fi
|
||||
|
||||
# --- 3. SEMGREP (SAST) ---
|
||||
- name: Install Semgrep (via pipx)
|
||||
run: |
|
||||
sudo apt-get install pipx -y
|
||||
pipx install semgrep
|
||||
# Add pipx binary path to GITHUB_PATH so next steps can see 'semgrep'
|
||||
echo "$HOME/.local/bin" >> $GITHUB_PATH
|
||||
|
||||
- name: Run Semgrep
|
||||
run: semgrep scan --config=p/security-audit --config=p/owasp-top-ten --json --output semgrep-results.json . || true
|
||||
|
||||
- name: Upload Semgrep to DefectDojo
|
||||
env:
|
||||
DD_URL: ${{ secrets.DD_URL }}
|
||||
DD_TOKEN: ${{ secrets.DD_TOKEN }}
|
||||
run: |
|
||||
echo "Uploading Semgrep results..."
|
||||
TODAY=$(date +%Y-%m-%d)
|
||||
|
||||
HTTP_CODE=$(curl --write-out "%{http_code}" --output response.txt --silent -X POST "$DD_URL/api/v2/import-scan/" \
|
||||
-H "Authorization: Token $DD_TOKEN" \
|
||||
-F "active=true" \
|
||||
-F "verified=true" \
|
||||
-F "scan_type=Semgrep JSON Report" \
|
||||
-F "engagement_name=CI/CD Pipeline" \
|
||||
-F "product_name=${{ github.repository }}" \
|
||||
-F "scan_date=$TODAY" \
|
||||
-F "auto_create_context=true" \
|
||||
-F "file=@semgrep-results.json")
|
||||
|
||||
if [[ "$HTTP_CODE" != "200" && "$HTTP_CODE" != "201" ]]; then
|
||||
echo "::error::Upload Failed with HTTP $HTTP_CODE"
|
||||
echo "--- SERVER RESPONSE ---"
|
||||
cat response.txt
|
||||
echo "-----------------------"
|
||||
exit 1
|
||||
else
|
||||
echo "Upload Success!"
|
||||
fi
|
||||
@@ -8,7 +8,7 @@ This page is currently deployed. [View the live website.](https://www.npmjs.com/
|
||||
|
||||
## Feedback and Bugs
|
||||
|
||||
If you have feedback or a bug report, please feel free to open a GitHub issue!
|
||||
If you have feedback or a bug report, please [log a ticket on our forum](https://support.nhcarrigan.com).
|
||||
|
||||
## Contributing
|
||||
|
||||
|
||||
+5
-4
@@ -1,11 +1,12 @@
|
||||
{
|
||||
"name": "@nhcarrigan/discord-analytics",
|
||||
"version": "0.0.1",
|
||||
"version": "0.0.6",
|
||||
"description": "Package that pairs with our logging tool to provide analytics for our Discord bots.",
|
||||
"type": "module",
|
||||
"private": false,
|
||||
"main": "prod/index.js",
|
||||
"scripts": {
|
||||
"prepublish": "pnpm run lint && pnpm run build",
|
||||
"lint": "eslint src --max-warnings 0",
|
||||
"build": "rm -rf prod && tsc",
|
||||
"test": "echo \"Error: no test specified\" && exit 0"
|
||||
@@ -20,11 +21,11 @@
|
||||
"@types/node": "24.7.0",
|
||||
"@types/node-schedule": "2.1.8",
|
||||
"eslint": "9.37.0",
|
||||
"typescript": "5.9.3"
|
||||
"typescript": "6.0.2"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"discord.js": "^14.0.0",
|
||||
"@nhcarrigan/logger": ">=1.1.0-hotfix"
|
||||
"@nhcarrigan/logger": ">=1.1.0-hotfix",
|
||||
"discord.js": "^14.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"node-schedule": "2.1.1"
|
||||
|
||||
Generated
+84
-73
@@ -20,10 +20,10 @@ importers:
|
||||
devDependencies:
|
||||
'@nhcarrigan/eslint-config':
|
||||
specifier: 5.2.0
|
||||
version: 5.2.0(@typescript-eslint/utils@8.46.0(eslint@9.37.0)(typescript@5.9.3))(eslint@9.37.0)(playwright@1.56.0)(react@19.2.0)(typescript@5.9.3)(vitest@3.2.4(@types/node@24.7.0))
|
||||
version: 5.2.0(@typescript-eslint/utils@8.46.0(eslint@9.37.0)(typescript@6.0.2))(eslint@9.37.0)(playwright@1.56.0)(react@19.2.0)(typescript@6.0.2)(vitest@3.2.4(@types/node@24.7.0))
|
||||
'@nhcarrigan/typescript-config':
|
||||
specifier: 4.0.0
|
||||
version: 4.0.0(typescript@5.9.3)
|
||||
version: 4.0.0(typescript@6.0.2)
|
||||
'@types/node':
|
||||
specifier: 24.7.0
|
||||
version: 24.7.0
|
||||
@@ -34,8 +34,8 @@ importers:
|
||||
specifier: 9.37.0
|
||||
version: 9.37.0
|
||||
typescript:
|
||||
specifier: 5.9.3
|
||||
version: 5.9.3
|
||||
specifier: 6.0.2
|
||||
version: 6.0.2
|
||||
|
||||
packages:
|
||||
|
||||
@@ -384,56 +384,67 @@ packages:
|
||||
resolution: {integrity: sha512-xRiOu9Of1FZ4SxVbB0iEDXc4ddIcjCv2aj03dmW8UrZIW7aIQ9jVJdLBIhxBI+MaTnGAKyvMwPwQnoOEvP7FgQ==}
|
||||
cpu: [arm]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
'@rollup/rollup-linux-arm-musleabihf@4.52.4':
|
||||
resolution: {integrity: sha512-FbhM2p9TJAmEIEhIgzR4soUcsW49e9veAQCziwbR+XWB2zqJ12b4i/+hel9yLiD8pLncDH4fKIPIbt5238341Q==}
|
||||
cpu: [arm]
|
||||
os: [linux]
|
||||
libc: [musl]
|
||||
|
||||
'@rollup/rollup-linux-arm64-gnu@4.52.4':
|
||||
resolution: {integrity: sha512-4n4gVwhPHR9q/g8lKCyz0yuaD0MvDf7dV4f9tHt0C73Mp8h38UCtSCSE6R9iBlTbXlmA8CjpsZoujhszefqueg==}
|
||||
cpu: [arm64]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
'@rollup/rollup-linux-arm64-musl@4.52.4':
|
||||
resolution: {integrity: sha512-u0n17nGA0nvi/11gcZKsjkLj1QIpAuPFQbR48Subo7SmZJnGxDpspyw2kbpuoQnyK+9pwf3pAoEXerJs/8Mi9g==}
|
||||
cpu: [arm64]
|
||||
os: [linux]
|
||||
libc: [musl]
|
||||
|
||||
'@rollup/rollup-linux-loong64-gnu@4.52.4':
|
||||
resolution: {integrity: sha512-0G2c2lpYtbTuXo8KEJkDkClE/+/2AFPdPAbmaHoE870foRFs4pBrDehilMcrSScrN/fB/1HTaWO4bqw+ewBzMQ==}
|
||||
cpu: [loong64]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
'@rollup/rollup-linux-ppc64-gnu@4.52.4':
|
||||
resolution: {integrity: sha512-teSACug1GyZHmPDv14VNbvZFX779UqWTsd7KtTM9JIZRDI5NUwYSIS30kzI8m06gOPB//jtpqlhmraQ68b5X2g==}
|
||||
cpu: [ppc64]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
'@rollup/rollup-linux-riscv64-gnu@4.52.4':
|
||||
resolution: {integrity: sha512-/MOEW3aHjjs1p4Pw1Xk4+3egRevx8Ji9N6HUIA1Ifh8Q+cg9dremvFCUbOX2Zebz80BwJIgCBUemjqhU5XI5Eg==}
|
||||
cpu: [riscv64]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
'@rollup/rollup-linux-riscv64-musl@4.52.4':
|
||||
resolution: {integrity: sha512-1HHmsRyh845QDpEWzOFtMCph5Ts+9+yllCrREuBR/vg2RogAQGGBRC8lDPrPOMnrdOJ+mt1WLMOC2Kao/UwcvA==}
|
||||
cpu: [riscv64]
|
||||
os: [linux]
|
||||
libc: [musl]
|
||||
|
||||
'@rollup/rollup-linux-s390x-gnu@4.52.4':
|
||||
resolution: {integrity: sha512-seoeZp4L/6D1MUyjWkOMRU6/iLmCU2EjbMTyAG4oIOs1/I82Y5lTeaxW0KBfkUdHAWN7j25bpkt0rjnOgAcQcA==}
|
||||
cpu: [s390x]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
'@rollup/rollup-linux-x64-gnu@4.52.4':
|
||||
resolution: {integrity: sha512-Wi6AXf0k0L7E2gteNsNHUs7UMwCIhsCTs6+tqQ5GPwVRWMaflqGec4Sd8n6+FNFDw9vGcReqk2KzBDhCa1DLYg==}
|
||||
cpu: [x64]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
'@rollup/rollup-linux-x64-musl@4.52.4':
|
||||
resolution: {integrity: sha512-dtBZYjDmCQ9hW+WgEkaffvRRCKm767wWhxsFW3Lw86VXz/uJRuD438/XvbZT//B96Vs8oTA8Q4A0AfHbrxP9zw==}
|
||||
cpu: [x64]
|
||||
os: [linux]
|
||||
libc: [musl]
|
||||
|
||||
'@rollup/rollup-openharmony-arm64@4.52.4':
|
||||
resolution: {integrity: sha512-1ox+GqgRWqaB1RnyZXL8PD6E5f7YyRUJYnCqKpNzxzP0TkaUh112NDrR9Tt+C8rJ4x5G9Mk8PQR3o7Ku2RKqKA==}
|
||||
@@ -1938,8 +1949,8 @@ packages:
|
||||
resolution: {integrity: sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==}
|
||||
engines: {node: '>= 0.4'}
|
||||
|
||||
typescript@5.9.3:
|
||||
resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
|
||||
typescript@6.0.2:
|
||||
resolution: {integrity: sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==}
|
||||
engines: {node: '>=14.17'}
|
||||
hasBin: true
|
||||
|
||||
@@ -2311,19 +2322,19 @@ snapshots:
|
||||
|
||||
'@jridgewell/sourcemap-codec@1.5.5': {}
|
||||
|
||||
'@nhcarrigan/eslint-config@5.2.0(@typescript-eslint/utils@8.46.0(eslint@9.37.0)(typescript@5.9.3))(eslint@9.37.0)(playwright@1.56.0)(react@19.2.0)(typescript@5.9.3)(vitest@3.2.4(@types/node@24.7.0))':
|
||||
'@nhcarrigan/eslint-config@5.2.0(@typescript-eslint/utils@8.46.0(eslint@9.37.0)(typescript@6.0.2))(eslint@9.37.0)(playwright@1.56.0)(react@19.2.0)(typescript@6.0.2)(vitest@3.2.4(@types/node@24.7.0))':
|
||||
dependencies:
|
||||
'@eslint-community/eslint-plugin-eslint-comments': 4.4.1(eslint@9.37.0)
|
||||
'@eslint/compat': 1.2.4(eslint@9.37.0)
|
||||
'@eslint/eslintrc': 3.2.0
|
||||
'@eslint/js': 9.17.0
|
||||
'@stylistic/eslint-plugin': 2.12.1(eslint@9.37.0)(typescript@5.9.3)
|
||||
'@typescript-eslint/eslint-plugin': 8.19.0(@typescript-eslint/parser@8.19.0(eslint@9.37.0)(typescript@5.9.3))(eslint@9.37.0)(typescript@5.9.3)
|
||||
'@typescript-eslint/parser': 8.19.0(eslint@9.37.0)(typescript@5.9.3)
|
||||
'@vitest/eslint-plugin': 1.1.24(@typescript-eslint/utils@8.46.0(eslint@9.37.0)(typescript@5.9.3))(eslint@9.37.0)(typescript@5.9.3)(vitest@3.2.4(@types/node@24.7.0))
|
||||
'@stylistic/eslint-plugin': 2.12.1(eslint@9.37.0)(typescript@6.0.2)
|
||||
'@typescript-eslint/eslint-plugin': 8.19.0(@typescript-eslint/parser@8.19.0(eslint@9.37.0)(typescript@6.0.2))(eslint@9.37.0)(typescript@6.0.2)
|
||||
'@typescript-eslint/parser': 8.19.0(eslint@9.37.0)(typescript@6.0.2)
|
||||
'@vitest/eslint-plugin': 1.1.24(@typescript-eslint/utils@8.46.0(eslint@9.37.0)(typescript@6.0.2))(eslint@9.37.0)(typescript@6.0.2)(vitest@3.2.4(@types/node@24.7.0))
|
||||
eslint: 9.37.0
|
||||
eslint-plugin-deprecation: 3.0.0(eslint@9.37.0)(typescript@5.9.3)
|
||||
eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.19.0(eslint@9.37.0)(typescript@5.9.3))(eslint@9.37.0)
|
||||
eslint-plugin-deprecation: 3.0.0(eslint@9.37.0)(typescript@6.0.2)
|
||||
eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.19.0(eslint@9.37.0)(typescript@6.0.2))(eslint@9.37.0)
|
||||
eslint-plugin-jsdoc: 50.6.1(eslint@9.37.0)
|
||||
eslint-plugin-playwright: 2.1.0(eslint@9.37.0)
|
||||
eslint-plugin-react: 7.37.3(eslint@9.37.0)
|
||||
@@ -2332,7 +2343,7 @@ snapshots:
|
||||
globals: 15.14.0
|
||||
playwright: 1.56.0
|
||||
react: 19.2.0
|
||||
typescript: 5.9.3
|
||||
typescript: 6.0.2
|
||||
vitest: 3.2.4(@types/node@24.7.0)
|
||||
transitivePeerDependencies:
|
||||
- '@typescript-eslint/utils'
|
||||
@@ -2342,9 +2353,9 @@ snapshots:
|
||||
|
||||
'@nhcarrigan/logger@1.1.0-hotfix': {}
|
||||
|
||||
'@nhcarrigan/typescript-config@4.0.0(typescript@5.9.3)':
|
||||
'@nhcarrigan/typescript-config@4.0.0(typescript@6.0.2)':
|
||||
dependencies:
|
||||
typescript: 5.9.3
|
||||
typescript: 6.0.2
|
||||
|
||||
'@nodelib/fs.scandir@2.1.5':
|
||||
dependencies:
|
||||
@@ -2437,9 +2448,9 @@ snapshots:
|
||||
|
||||
'@sapphire/snowflake@3.5.3': {}
|
||||
|
||||
'@stylistic/eslint-plugin@2.12.1(eslint@9.37.0)(typescript@5.9.3)':
|
||||
'@stylistic/eslint-plugin@2.12.1(eslint@9.37.0)(typescript@6.0.2)':
|
||||
dependencies:
|
||||
'@typescript-eslint/utils': 8.46.0(eslint@9.37.0)(typescript@5.9.3)
|
||||
'@typescript-eslint/utils': 8.46.0(eslint@9.37.0)(typescript@6.0.2)
|
||||
eslint: 9.37.0
|
||||
eslint-visitor-keys: 4.2.1
|
||||
espree: 10.4.0
|
||||
@@ -2475,41 +2486,41 @@ snapshots:
|
||||
dependencies:
|
||||
'@types/node': 24.7.0
|
||||
|
||||
'@typescript-eslint/eslint-plugin@8.19.0(@typescript-eslint/parser@8.19.0(eslint@9.37.0)(typescript@5.9.3))(eslint@9.37.0)(typescript@5.9.3)':
|
||||
'@typescript-eslint/eslint-plugin@8.19.0(@typescript-eslint/parser@8.19.0(eslint@9.37.0)(typescript@6.0.2))(eslint@9.37.0)(typescript@6.0.2)':
|
||||
dependencies:
|
||||
'@eslint-community/regexpp': 4.12.1
|
||||
'@typescript-eslint/parser': 8.19.0(eslint@9.37.0)(typescript@5.9.3)
|
||||
'@typescript-eslint/parser': 8.19.0(eslint@9.37.0)(typescript@6.0.2)
|
||||
'@typescript-eslint/scope-manager': 8.19.0
|
||||
'@typescript-eslint/type-utils': 8.19.0(eslint@9.37.0)(typescript@5.9.3)
|
||||
'@typescript-eslint/utils': 8.19.0(eslint@9.37.0)(typescript@5.9.3)
|
||||
'@typescript-eslint/type-utils': 8.19.0(eslint@9.37.0)(typescript@6.0.2)
|
||||
'@typescript-eslint/utils': 8.19.0(eslint@9.37.0)(typescript@6.0.2)
|
||||
'@typescript-eslint/visitor-keys': 8.19.0
|
||||
eslint: 9.37.0
|
||||
graphemer: 1.4.0
|
||||
ignore: 5.3.2
|
||||
natural-compare: 1.4.0
|
||||
ts-api-utils: 1.4.3(typescript@5.9.3)
|
||||
typescript: 5.9.3
|
||||
ts-api-utils: 1.4.3(typescript@6.0.2)
|
||||
typescript: 6.0.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
'@typescript-eslint/parser@8.19.0(eslint@9.37.0)(typescript@5.9.3)':
|
||||
'@typescript-eslint/parser@8.19.0(eslint@9.37.0)(typescript@6.0.2)':
|
||||
dependencies:
|
||||
'@typescript-eslint/scope-manager': 8.19.0
|
||||
'@typescript-eslint/types': 8.19.0
|
||||
'@typescript-eslint/typescript-estree': 8.19.0(typescript@5.9.3)
|
||||
'@typescript-eslint/typescript-estree': 8.19.0(typescript@6.0.2)
|
||||
'@typescript-eslint/visitor-keys': 8.19.0
|
||||
debug: 4.4.3
|
||||
eslint: 9.37.0
|
||||
typescript: 5.9.3
|
||||
typescript: 6.0.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
'@typescript-eslint/project-service@8.46.0(typescript@5.9.3)':
|
||||
'@typescript-eslint/project-service@8.46.0(typescript@6.0.2)':
|
||||
dependencies:
|
||||
'@typescript-eslint/tsconfig-utils': 8.46.0(typescript@5.9.3)
|
||||
'@typescript-eslint/tsconfig-utils': 8.46.0(typescript@6.0.2)
|
||||
'@typescript-eslint/types': 8.46.0
|
||||
debug: 4.4.3
|
||||
typescript: 5.9.3
|
||||
typescript: 6.0.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
@@ -2528,18 +2539,18 @@ snapshots:
|
||||
'@typescript-eslint/types': 8.46.0
|
||||
'@typescript-eslint/visitor-keys': 8.46.0
|
||||
|
||||
'@typescript-eslint/tsconfig-utils@8.46.0(typescript@5.9.3)':
|
||||
'@typescript-eslint/tsconfig-utils@8.46.0(typescript@6.0.2)':
|
||||
dependencies:
|
||||
typescript: 5.9.3
|
||||
typescript: 6.0.2
|
||||
|
||||
'@typescript-eslint/type-utils@8.19.0(eslint@9.37.0)(typescript@5.9.3)':
|
||||
'@typescript-eslint/type-utils@8.19.0(eslint@9.37.0)(typescript@6.0.2)':
|
||||
dependencies:
|
||||
'@typescript-eslint/typescript-estree': 8.19.0(typescript@5.9.3)
|
||||
'@typescript-eslint/utils': 8.19.0(eslint@9.37.0)(typescript@5.9.3)
|
||||
'@typescript-eslint/typescript-estree': 8.19.0(typescript@6.0.2)
|
||||
'@typescript-eslint/utils': 8.19.0(eslint@9.37.0)(typescript@6.0.2)
|
||||
debug: 4.4.3
|
||||
eslint: 9.37.0
|
||||
ts-api-utils: 1.4.3(typescript@5.9.3)
|
||||
typescript: 5.9.3
|
||||
ts-api-utils: 1.4.3(typescript@6.0.2)
|
||||
typescript: 6.0.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
@@ -2549,7 +2560,7 @@ snapshots:
|
||||
|
||||
'@typescript-eslint/types@8.46.0': {}
|
||||
|
||||
'@typescript-eslint/typescript-estree@7.18.0(typescript@5.9.3)':
|
||||
'@typescript-eslint/typescript-estree@7.18.0(typescript@6.0.2)':
|
||||
dependencies:
|
||||
'@typescript-eslint/types': 7.18.0
|
||||
'@typescript-eslint/visitor-keys': 7.18.0
|
||||
@@ -2558,13 +2569,13 @@ snapshots:
|
||||
is-glob: 4.0.3
|
||||
minimatch: 9.0.5
|
||||
semver: 7.7.3
|
||||
ts-api-utils: 1.4.3(typescript@5.9.3)
|
||||
ts-api-utils: 1.4.3(typescript@6.0.2)
|
||||
optionalDependencies:
|
||||
typescript: 5.9.3
|
||||
typescript: 6.0.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
'@typescript-eslint/typescript-estree@8.19.0(typescript@5.9.3)':
|
||||
'@typescript-eslint/typescript-estree@8.19.0(typescript@6.0.2)':
|
||||
dependencies:
|
||||
'@typescript-eslint/types': 8.19.0
|
||||
'@typescript-eslint/visitor-keys': 8.19.0
|
||||
@@ -2573,15 +2584,15 @@ snapshots:
|
||||
is-glob: 4.0.3
|
||||
minimatch: 9.0.5
|
||||
semver: 7.7.3
|
||||
ts-api-utils: 1.4.3(typescript@5.9.3)
|
||||
typescript: 5.9.3
|
||||
ts-api-utils: 1.4.3(typescript@6.0.2)
|
||||
typescript: 6.0.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
'@typescript-eslint/typescript-estree@8.46.0(typescript@5.9.3)':
|
||||
'@typescript-eslint/typescript-estree@8.46.0(typescript@6.0.2)':
|
||||
dependencies:
|
||||
'@typescript-eslint/project-service': 8.46.0(typescript@5.9.3)
|
||||
'@typescript-eslint/tsconfig-utils': 8.46.0(typescript@5.9.3)
|
||||
'@typescript-eslint/project-service': 8.46.0(typescript@6.0.2)
|
||||
'@typescript-eslint/tsconfig-utils': 8.46.0(typescript@6.0.2)
|
||||
'@typescript-eslint/types': 8.46.0
|
||||
'@typescript-eslint/visitor-keys': 8.46.0
|
||||
debug: 4.4.3
|
||||
@@ -2589,41 +2600,41 @@ snapshots:
|
||||
is-glob: 4.0.3
|
||||
minimatch: 9.0.5
|
||||
semver: 7.7.3
|
||||
ts-api-utils: 2.1.0(typescript@5.9.3)
|
||||
typescript: 5.9.3
|
||||
ts-api-utils: 2.1.0(typescript@6.0.2)
|
||||
typescript: 6.0.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
'@typescript-eslint/utils@7.18.0(eslint@9.37.0)(typescript@5.9.3)':
|
||||
'@typescript-eslint/utils@7.18.0(eslint@9.37.0)(typescript@6.0.2)':
|
||||
dependencies:
|
||||
'@eslint-community/eslint-utils': 4.9.0(eslint@9.37.0)
|
||||
'@typescript-eslint/scope-manager': 7.18.0
|
||||
'@typescript-eslint/types': 7.18.0
|
||||
'@typescript-eslint/typescript-estree': 7.18.0(typescript@5.9.3)
|
||||
'@typescript-eslint/typescript-estree': 7.18.0(typescript@6.0.2)
|
||||
eslint: 9.37.0
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
- typescript
|
||||
|
||||
'@typescript-eslint/utils@8.19.0(eslint@9.37.0)(typescript@5.9.3)':
|
||||
'@typescript-eslint/utils@8.19.0(eslint@9.37.0)(typescript@6.0.2)':
|
||||
dependencies:
|
||||
'@eslint-community/eslint-utils': 4.9.0(eslint@9.37.0)
|
||||
'@typescript-eslint/scope-manager': 8.19.0
|
||||
'@typescript-eslint/types': 8.19.0
|
||||
'@typescript-eslint/typescript-estree': 8.19.0(typescript@5.9.3)
|
||||
'@typescript-eslint/typescript-estree': 8.19.0(typescript@6.0.2)
|
||||
eslint: 9.37.0
|
||||
typescript: 5.9.3
|
||||
typescript: 6.0.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
'@typescript-eslint/utils@8.46.0(eslint@9.37.0)(typescript@5.9.3)':
|
||||
'@typescript-eslint/utils@8.46.0(eslint@9.37.0)(typescript@6.0.2)':
|
||||
dependencies:
|
||||
'@eslint-community/eslint-utils': 4.9.0(eslint@9.37.0)
|
||||
'@typescript-eslint/scope-manager': 8.46.0
|
||||
'@typescript-eslint/types': 8.46.0
|
||||
'@typescript-eslint/typescript-estree': 8.46.0(typescript@5.9.3)
|
||||
'@typescript-eslint/typescript-estree': 8.46.0(typescript@6.0.2)
|
||||
eslint: 9.37.0
|
||||
typescript: 5.9.3
|
||||
typescript: 6.0.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
@@ -2642,12 +2653,12 @@ snapshots:
|
||||
'@typescript-eslint/types': 8.46.0
|
||||
eslint-visitor-keys: 4.2.1
|
||||
|
||||
'@vitest/eslint-plugin@1.1.24(@typescript-eslint/utils@8.46.0(eslint@9.37.0)(typescript@5.9.3))(eslint@9.37.0)(typescript@5.9.3)(vitest@3.2.4(@types/node@24.7.0))':
|
||||
'@vitest/eslint-plugin@1.1.24(@typescript-eslint/utils@8.46.0(eslint@9.37.0)(typescript@6.0.2))(eslint@9.37.0)(typescript@6.0.2)(vitest@3.2.4(@types/node@24.7.0))':
|
||||
dependencies:
|
||||
'@typescript-eslint/utils': 8.46.0(eslint@9.37.0)(typescript@5.9.3)
|
||||
'@typescript-eslint/utils': 8.46.0(eslint@9.37.0)(typescript@6.0.2)
|
||||
eslint: 9.37.0
|
||||
optionalDependencies:
|
||||
typescript: 5.9.3
|
||||
typescript: 6.0.2
|
||||
vitest: 3.2.4(@types/node@24.7.0)
|
||||
|
||||
'@vitest/expect@3.2.4':
|
||||
@@ -3122,27 +3133,27 @@ snapshots:
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
eslint-module-utils@2.12.1(@typescript-eslint/parser@8.19.0(eslint@9.37.0)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.37.0):
|
||||
eslint-module-utils@2.12.1(@typescript-eslint/parser@8.19.0(eslint@9.37.0)(typescript@6.0.2))(eslint-import-resolver-node@0.3.9)(eslint@9.37.0):
|
||||
dependencies:
|
||||
debug: 3.2.7
|
||||
optionalDependencies:
|
||||
'@typescript-eslint/parser': 8.19.0(eslint@9.37.0)(typescript@5.9.3)
|
||||
'@typescript-eslint/parser': 8.19.0(eslint@9.37.0)(typescript@6.0.2)
|
||||
eslint: 9.37.0
|
||||
eslint-import-resolver-node: 0.3.9
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
eslint-plugin-deprecation@3.0.0(eslint@9.37.0)(typescript@5.9.3):
|
||||
eslint-plugin-deprecation@3.0.0(eslint@9.37.0)(typescript@6.0.2):
|
||||
dependencies:
|
||||
'@typescript-eslint/utils': 7.18.0(eslint@9.37.0)(typescript@5.9.3)
|
||||
'@typescript-eslint/utils': 7.18.0(eslint@9.37.0)(typescript@6.0.2)
|
||||
eslint: 9.37.0
|
||||
ts-api-utils: 1.4.3(typescript@5.9.3)
|
||||
ts-api-utils: 1.4.3(typescript@6.0.2)
|
||||
tslib: 2.8.1
|
||||
typescript: 5.9.3
|
||||
typescript: 6.0.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.19.0(eslint@9.37.0)(typescript@5.9.3))(eslint@9.37.0):
|
||||
eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.19.0(eslint@9.37.0)(typescript@6.0.2))(eslint@9.37.0):
|
||||
dependencies:
|
||||
'@rtsao/scc': 1.1.0
|
||||
array-includes: 3.1.9
|
||||
@@ -3153,7 +3164,7 @@ snapshots:
|
||||
doctrine: 2.1.0
|
||||
eslint: 9.37.0
|
||||
eslint-import-resolver-node: 0.3.9
|
||||
eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.19.0(eslint@9.37.0)(typescript@5.9.3))(eslint-import-resolver-node@0.3.9)(eslint@9.37.0)
|
||||
eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.19.0(eslint@9.37.0)(typescript@6.0.2))(eslint-import-resolver-node@0.3.9)(eslint@9.37.0)
|
||||
hasown: 2.0.2
|
||||
is-core-module: 2.16.1
|
||||
is-glob: 4.0.3
|
||||
@@ -3165,7 +3176,7 @@ snapshots:
|
||||
string.prototype.trimend: 1.0.9
|
||||
tsconfig-paths: 3.15.0
|
||||
optionalDependencies:
|
||||
'@typescript-eslint/parser': 8.19.0(eslint@9.37.0)(typescript@5.9.3)
|
||||
'@typescript-eslint/parser': 8.19.0(eslint@9.37.0)(typescript@6.0.2)
|
||||
transitivePeerDependencies:
|
||||
- eslint-import-resolver-typescript
|
||||
- eslint-import-resolver-webpack
|
||||
@@ -4174,13 +4185,13 @@ snapshots:
|
||||
dependencies:
|
||||
is-number: 7.0.0
|
||||
|
||||
ts-api-utils@1.4.3(typescript@5.9.3):
|
||||
ts-api-utils@1.4.3(typescript@6.0.2):
|
||||
dependencies:
|
||||
typescript: 5.9.3
|
||||
typescript: 6.0.2
|
||||
|
||||
ts-api-utils@2.1.0(typescript@5.9.3):
|
||||
ts-api-utils@2.1.0(typescript@6.0.2):
|
||||
dependencies:
|
||||
typescript: 5.9.3
|
||||
typescript: 6.0.2
|
||||
|
||||
ts-mixer@6.0.4: {}
|
||||
|
||||
@@ -4236,7 +4247,7 @@ snapshots:
|
||||
possible-typed-array-names: 1.1.0
|
||||
reflect.getprototypeof: 1.0.10
|
||||
|
||||
typescript@5.9.3: {}
|
||||
typescript@6.0.2: {}
|
||||
|
||||
unbox-primitive@1.1.0:
|
||||
dependencies:
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
# Security
|
||||
|
||||
# Do not execute any scripts of installed packages (project scripts still run)
|
||||
ignoreDepScripts: true
|
||||
# Do not automatically run pre/post scripts (e.g. preinstall, postbuild)
|
||||
enablePrePostScripts: false
|
||||
# Only allow packages published at least 10 days ago (reduces risk of compromised packages)
|
||||
minimumReleaseAge: 14400
|
||||
# Fail if a package's trust level has decreased compared to previous releases
|
||||
trustPolicy: no-downgrade
|
||||
# Ignore trust policy for packages published more than 1 year ago (predates provenance signing)
|
||||
trustPolicyIgnoreAfter: 525960
|
||||
# Fail if there are missing or invalid peer dependencies
|
||||
strictPeerDependencies: true
|
||||
# Prevent transitive dependencies from using exotic sources (git repos, direct tarball URLs)
|
||||
blockExoticSubdeps: true
|
||||
|
||||
# Lockfile
|
||||
|
||||
# Allow the lockfile to be updated during install (set to true in CI for stricter reproducibility)
|
||||
preferFrozenLockfile: false
|
||||
+12
-71
@@ -4,89 +4,25 @@
|
||||
* @author Naomi Carrigan
|
||||
*/
|
||||
|
||||
import { Logger } from "@nhcarrigan/logger";
|
||||
import { scheduleJob, type Job } from "node-schedule";
|
||||
import type { Logger } from "@nhcarrigan/logger";
|
||||
import type { Events, Client } from "discord.js";
|
||||
|
||||
// eslint-disable-next-line complexity, max-lines-per-function, max-statements -- Justified
|
||||
const flatten = (
|
||||
object: Record<string, unknown>,
|
||||
): Record<string, string | number | boolean> => {
|
||||
const result: Record<string, string | number | boolean> = {};
|
||||
for (const key in object) {
|
||||
const value = object[key];
|
||||
if (value === null || value === undefined) {
|
||||
continue;
|
||||
}
|
||||
if (
|
||||
typeof value === "string"
|
||||
|| typeof value === "number"
|
||||
|| typeof value === "boolean"
|
||||
) {
|
||||
result[key] = value;
|
||||
continue;
|
||||
}
|
||||
if (typeof value === "object" && !Array.isArray(value)) {
|
||||
// eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- Justified
|
||||
const nested = flatten(value as Record<string, unknown>);
|
||||
for (const nestedKey in nested) {
|
||||
const nestedValue = nested[nestedKey];
|
||||
if (nestedValue === undefined) {
|
||||
continue;
|
||||
}
|
||||
result[`${key}_${nestedKey}`] = nestedValue;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (Array.isArray(value)) {
|
||||
for (const [ index, arrayValue ] of value.entries()) {
|
||||
if (
|
||||
typeof arrayValue === "string"
|
||||
|| typeof arrayValue === "number"
|
||||
|| typeof arrayValue === "boolean"
|
||||
) {
|
||||
result[`${key}_${index.toString()}`] = arrayValue;
|
||||
continue;
|
||||
}
|
||||
if (typeof arrayValue === "object" && arrayValue !== null) {
|
||||
// eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- Justified
|
||||
const nested = flatten(arrayValue as Record<string, unknown>);
|
||||
for (const nestedKey in nested) {
|
||||
const nestedValue = nested[nestedKey];
|
||||
// eslint-disable-next-line max-depth -- Justified
|
||||
if (nestedValue === undefined) {
|
||||
continue;
|
||||
}
|
||||
result[`${key}_${index.toString()}_${nestedKey}`] = nestedValue;
|
||||
}
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
};
|
||||
|
||||
/**
|
||||
* A class for logging Discord bot analytics.
|
||||
*/
|
||||
export class DiscordAnalytics {
|
||||
private readonly logger: Logger;
|
||||
private job: Job | null = null;
|
||||
private job: Job | null = null;
|
||||
|
||||
/**
|
||||
* Creates a new instance of the DiscordAnalytics class.
|
||||
* @param client -- The Discord client to monitor.
|
||||
* @param name -- The name of the application.
|
||||
* @param logToken -- Auth token for our logging service.
|
||||
* @param logger -- Instance of @nhcarrigan/logger to use for logging.
|
||||
*/
|
||||
public constructor(
|
||||
private readonly client: Client,
|
||||
name: string,
|
||||
logToken: string,
|
||||
) {
|
||||
this.logger = new Logger(name, logToken);
|
||||
}
|
||||
private readonly logger: Logger,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Starts a CRON job to run at midnight (system time) daily.
|
||||
@@ -98,7 +34,7 @@ export class DiscordAnalytics {
|
||||
if (this.job) {
|
||||
return;
|
||||
}
|
||||
this.job = scheduleJob("metrics", "0 * * * *", async() => {
|
||||
this.job = scheduleJob("metrics", "0 0 * * *", async() => {
|
||||
try {
|
||||
const fakeGuilds = await this.client.guilds.fetch();
|
||||
const guilds = await Promise.all(
|
||||
@@ -150,6 +86,11 @@ export class DiscordAnalytics {
|
||||
event: Events,
|
||||
payload: Record<string, unknown>,
|
||||
): Promise<void> {
|
||||
await this.logger.metric(event, 1, flatten(payload));
|
||||
await this.logger.metric(
|
||||
event,
|
||||
1,
|
||||
// eslint-disable-next-line @typescript-eslint/consistent-type-assertions -- We want to cast this to a specific type.
|
||||
payload as Record<string, string | number>,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user