Compare commits
15 Commits
ai/issue-2
...
4e15b28bf6
| Author | SHA1 | Date | |
|---|---|---|---|
| 4e15b28bf6 | |||
|
|
9820a375dc | ||
| a6ad14a1b5 | |||
| b02ecca7d4 | |||
| 26c0a0b0a1 | |||
|
|
59a4c1dd0c | ||
| e3248ac4dc | |||
| 969e559c57 | |||
| ae7d64a09a | |||
|
|
9d93e6f79b | ||
| 0541d82a85 | |||
| 35252e0d13 | |||
| 8260c588ac | |||
|
|
b0acd689bb | ||
|
|
0a8452b3c8 |
9
.dockerignore
Normal file
9
.dockerignore
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
# Images are built from the repository root (see .gitea/workflows/deploy.yml:
|
||||||
|
# `docker build -f <package>/Dockerfile .`), so this is the ignore file that counts.
|
||||||
|
.git
|
||||||
|
**/node_modules
|
||||||
|
**/*.log
|
||||||
|
**/.env
|
||||||
|
frontend/.nuxt
|
||||||
|
frontend/.output
|
||||||
|
frontend/dist
|
||||||
@@ -32,24 +32,28 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login git.aranroig.com -u "${{ secrets.REGISTRY_USER }}" --password-stdin
|
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login git.aranroig.com -u "${{ secrets.REGISTRY_USER }}" --password-stdin
|
||||||
|
|
||||||
|
# pnpm workspace: every image is built from the repository root so the
|
||||||
|
# Dockerfiles can read pnpm-workspace.yaml, pnpm-lock.yaml and the other
|
||||||
|
# package.json files of the workspace.
|
||||||
- name: Build frontend
|
- name: Build frontend
|
||||||
run: |
|
run: |
|
||||||
docker build -t git.aranroig.com/${{ secrets.REGISTRY_USER }}/dragonroll-frontend:latest \
|
docker build -t git.aranroig.com/${{ secrets.REGISTRY_USER }}/dragonroll-frontend:latest \
|
||||||
--build-arg NUXT_PUBLIC_GIT_COMMIT=$(git rev-parse --short HEAD) \
|
--build-arg NUXT_PUBLIC_GIT_COMMIT=$(git rev-parse --short HEAD) \
|
||||||
--build-arg NUXT_PUBLIC_GIT_TAG=$(git describe --tags --abbrev=0) \
|
--build-arg NUXT_PUBLIC_GIT_TAG=$(git describe --tags --abbrev=0) \
|
||||||
--build-arg NUXT_PUBLIC_GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD) \
|
--build-arg NUXT_PUBLIC_GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD) \
|
||||||
./frontend
|
-f ./frontend/Dockerfile .
|
||||||
docker push git.aranroig.com/${{ secrets.REGISTRY_USER }}/dragonroll-frontend:latest
|
docker push git.aranroig.com/${{ secrets.REGISTRY_USER }}/dragonroll-frontend:latest
|
||||||
|
|
||||||
- name: Build backend
|
- name: Build backend
|
||||||
run: |
|
run: |
|
||||||
docker build -t git.aranroig.com/${{ secrets.REGISTRY_USER }}/dragonroll-backend:latest ./backend
|
docker build -t git.aranroig.com/${{ secrets.REGISTRY_USER }}/dragonroll-backend:latest \
|
||||||
|
-f ./backend/Dockerfile .
|
||||||
docker push git.aranroig.com/${{ secrets.REGISTRY_USER }}/dragonroll-backend:latest
|
docker push git.aranroig.com/${{ secrets.REGISTRY_USER }}/dragonroll-backend:latest
|
||||||
|
|
||||||
- name: Build discord bot
|
- name: Build discord bot
|
||||||
run: |
|
run: |
|
||||||
docker build -t git.aranroig.com/${{ secrets.REGISTRY_USER }}/dragonroll-discord-bot:latest \
|
docker build -t git.aranroig.com/${{ secrets.REGISTRY_USER }}/dragonroll-discord-bot:latest \
|
||||||
./discord-bot
|
-f ./discord-bot/Dockerfile .
|
||||||
docker push git.aranroig.com/${{ secrets.REGISTRY_USER }}/dragonroll-discord-bot:latest
|
docker push git.aranroig.com/${{ secrets.REGISTRY_USER }}/dragonroll-discord-bot:latest
|
||||||
|
|
||||||
- name: Copy files
|
- name: Copy files
|
||||||
|
|||||||
35
.gitea/workflows/test.yml
Normal file
35
.gitea/workflows/test.yml
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
name: Test
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: ['**']
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test:
|
||||||
|
runs-on: docker
|
||||||
|
|
||||||
|
steps:
|
||||||
|
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Node
|
||||||
|
run: |
|
||||||
|
# The suite runs on Node's built-in test runner and needs Node 18+. The container the
|
||||||
|
# docker runner starts jobs in is not guaranteed to ship one, so fall back to the
|
||||||
|
# official LTS tarball. The tests themselves install no dependencies.
|
||||||
|
if node -e 'process.exit(Number(process.versions.node.split(".")[0]) >= 18 ? 0 : 1)' 2>/dev/null; then
|
||||||
|
node --version
|
||||||
|
else
|
||||||
|
apt-get update -y && apt-get install -y curl ca-certificates xz-utils
|
||||||
|
curl -fsSL https://nodejs.org/dist/v22.12.0/node-v22.12.0-linux-x64.tar.xz -o /tmp/node.tar.xz
|
||||||
|
tar -xJf /tmp/node.tar.xz -C /usr/local --strip-components=1
|
||||||
|
node --version
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
# The repository is a pnpm workspace: run the root script through corepack,
|
||||||
|
# which picks the pnpm version pinned by "packageManager" in package.json.
|
||||||
|
run: corepack pnpm test
|
||||||
|
env:
|
||||||
|
COREPACK_ENABLE_DOWNLOAD_PROMPT: '0'
|
||||||
49
AGENTS.md
49
AGENTS.md
@@ -14,13 +14,23 @@ dice widgets, shared markdown, sounds). It is a two-app monorepo:
|
|||||||
|
|
||||||
There is **no** database seeding, no ORM migrations, no linter/formatter config, no Pinia/Vuex, and no
|
There is **no** database seeding, no ORM migrations, no linter/formatter config, no Pinia/Vuex, and no
|
||||||
Vue Router pages (see §5.1 — the UI is a window manager, not routed pages). The only automated tests
|
Vue Router pages (see §5.1 — the UI is a window manager, not routed pages). The only automated tests
|
||||||
are `tests/*.test.js` (`npm test`, Node's built-in runner), which exercise the Foundry module's sync
|
are `tests/*.test.js` (`pnpm test`, Node's built-in runner), which exercise the Foundry module's sync
|
||||||
logic against stubbed Foundry globals.
|
logic against stubbed Foundry globals.
|
||||||
|
|
||||||
|
Package management is a **pnpm workspace** (`pnpm-workspace.yaml` lists `backend`, `frontend` and
|
||||||
|
`discord-bot`). One `pnpm-lock.yaml` at the root, no `package-lock.json` anywhere; `packageManager` in
|
||||||
|
the root `package.json` pins pnpm for corepack. The three packages do not depend on each other, so
|
||||||
|
nothing uses the `workspace:` protocol yet, and `dragonroll-foundry/bridge` stays outside the workspace
|
||||||
|
(it needs nothing but Node built-ins).
|
||||||
|
|
||||||
Git: default branch `master`, hosted on a self-hosted Gitea (`git.aranroig.com/BinarySandia04/Dragonroll`).
|
Git: default branch `master`, hosted on a self-hosted Gitea (`git.aranroig.com/BinarySandia04/Dragonroll`).
|
||||||
CI (`.gitea/workflows/deploy.yml`) builds two Docker images on every push to `master`, pushes them to
|
CI (`.gitea/workflows/deploy.yml`) builds three Docker images on every push to `master` — always from
|
||||||
`git.aranroig.com/<user>/dragonroll-{frontend,backend}:latest`, copies `docker-compose.yml` +
|
the **repository root as build context** (`docker build -f <package>/Dockerfile .`, the Dockerfiles read
|
||||||
|
the workspace manifests) — pushes them to
|
||||||
|
`git.aranroig.com/<user>/dragonroll-{frontend,backend,discord-bot}:latest`, copies `docker-compose.yml` +
|
||||||
`nginx.conf` to the deploy host and runs `docker compose pull && up -d`.
|
`nginx.conf` to the deploy host and runs `docker compose pull && up -d`.
|
||||||
|
`.gitea/workflows/test.yml` runs the `corepack pnpm test` suite (frontend + Foundry module tests, no
|
||||||
|
dependencies installed) on every push to any branch, not just `master`.
|
||||||
|
|
||||||
## 2. Root layout
|
## 2. Root layout
|
||||||
|
|
||||||
@@ -28,44 +38,49 @@ CI (`.gitea/workflows/deploy.yml`) builds two Docker images on every push to `ma
|
|||||||
dragonroll/
|
dragonroll/
|
||||||
├── backend/ Express API (CommonJS, entry: src/index.js)
|
├── backend/ Express API (CommonJS, entry: src/index.js)
|
||||||
├── frontend/ Nuxt 4 app (entry: app/app.vue)
|
├── frontend/ Nuxt 4 app (entry: app/app.vue)
|
||||||
|
├── discord-bot/ discord.js slash commands reading the API
|
||||||
├── obsidian-plugin/ Plain JavaScript Obsidian plugin for campaign note import/push
|
├── obsidian-plugin/ Plain JavaScript Obsidian plugin for campaign note import/push
|
||||||
|
├── pnpm-workspace.yaml workspace packages + the dependencies allowed to run install scripts
|
||||||
|
├── pnpm-lock.yaml the only lockfile (root of the workspace)
|
||||||
├── docker-compose.yml nginx :3000 -> frontend :3000, /api -> backend :5000
|
├── docker-compose.yml nginx :3000 -> frontend :3000, /api -> backend :5000
|
||||||
├── nginx.conf reverse proxy rules for the compose stack
|
├── nginx.conf reverse proxy rules for the compose stack
|
||||||
├── ecosystem.config.js PM2 config (stale: runs `npm start`, which does not exist — see §9)
|
├── ecosystem.config.js PM2 config (stale: runs `npm start`, which does not exist — see §9)
|
||||||
├── .gitea/workflows/deploy.yml
|
├── .gitea/workflows/deploy.yml
|
||||||
├── static/media/ README logo images only
|
├── static/media/ README logo images only
|
||||||
├── tests/ `node --test` tests (Foundry module sync toggle)
|
├── tests/ `node --test` tests (Foundry module sync toggle)
|
||||||
├── package.json root: only `concurrently`, used by `npm run dev`
|
├── package.json root workspace: `concurrently`, the `dev` scripts and `test`
|
||||||
└── README.md install/run instructions are STALE (see §9)
|
└── README.md install/run instructions are STALE (see §9)
|
||||||
```
|
```
|
||||||
|
|
||||||
## 3. Commands
|
## 3. Commands
|
||||||
|
|
||||||
|
`pnpm` comes from corepack (`packageManager` in `package.json`); `COREPACK_ENABLE_DOWNLOAD_PROMPT=0`
|
||||||
|
keeps corepack from asking in non-interactive shells.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npm install # root: installs `concurrently` only
|
pnpm install # the whole workspace, once, from the root
|
||||||
npm install --prefix backend
|
# (frontend's `nuxt prepare` runs as its postinstall)
|
||||||
npm install --prefix frontend # runs `nuxt prepare` via postinstall
|
|
||||||
|
|
||||||
npm run dev # both apps: backend (nodemon, :5000) + frontend (nuxt dev, :3000)
|
pnpm dev # backend (nodemon, :5000) + frontend (nuxt dev, :3000)
|
||||||
# also runs the Foundry VTT start script from root .env
|
# + discord-bot, plus the Foundry VTT start script from root .env
|
||||||
# (FOUNDRY_START_SCRIPT, via scripts/run-foundry.js)
|
# (FOUNDRY_START_SCRIPT, via scripts/run-foundry.js)
|
||||||
npm --prefix backend run dev # backend only
|
pnpm dev:backend # one package, also `pnpm dev:frontend` / `pnpm dev:discord-bot`
|
||||||
npm --prefix frontend run dev # frontend only
|
pnpm --filter ./frontend run build # nuxt build --dotenv .env.production
|
||||||
npm --prefix frontend run build # nuxt build --dotenv .env.production
|
pnpm --filter ./frontend run preview
|
||||||
npm --prefix frontend run preview
|
cd frontend && pnpm run build # --filter and `cd` are equivalent inside the workspace
|
||||||
|
|
||||||
npm test # node --test tests/ (Foundry module sync logic, no dependencies)
|
pnpm test # node --test tests/ (Foundry module sync logic, no dependencies)
|
||||||
```
|
```
|
||||||
|
|
||||||
There is no `start` script in either package and no lint command.
|
There is no `start` script in either app package and no lint command (`discord-bot` has `start`).
|
||||||
Verification = run the dev server and exercise the flow (`/api/test` returns a JSON hello);
|
Verification = run the dev server and exercise the flow (`/api/test` returns a JSON hello);
|
||||||
`npm test` covers the Foundry character/item sync toggle and per-actor force sync.
|
`pnpm test` covers the Foundry character/item sync toggle and per-actor force sync.
|
||||||
|
|
||||||
### Environment files
|
### Environment files
|
||||||
|
|
||||||
| File | Contents | Notes |
|
| File | Contents | Notes |
|
||||||
|---|---|---|
|
|---|---|---|
|
||||||
| `.env` (root) | `FOUNDRY_START_SCRIPT=<path to Foundry VTT start.sh>` | gitignored; consumed by `scripts/run-foundry.js` during `npm run dev` |
|
| `.env` (root) | `FOUNDRY_START_SCRIPT=<path to Foundry VTT start.sh>` | gitignored; consumed by `scripts/run-foundry.js` during `pnpm dev` |
|
||||||
| `backend/.env` | `PORT=5000`, `DB_URI=mongodb://localhost:27017/dragonroll`, `NODE_ENV=development` | gitignored |
|
| `backend/.env` | `PORT=5000`, `DB_URI=mongodb://localhost:27017/dragonroll`, `NODE_ENV=development` | gitignored |
|
||||||
| `backend/.env.production` | same shape, `DB_URI=mongodb://192.168.1.7:27017/dragonroll` | **committed** |
|
| `backend/.env.production` | same shape, `DB_URI=mongodb://192.168.1.7:27017/dragonroll` | **committed** |
|
||||||
| `frontend/.env` | `NUXT_PUBLIC_API_BASE_URL=http://localhost:5000/api` | gitignored |
|
| `frontend/.env` | `NUXT_PUBLIC_API_BASE_URL=http://localhost:5000/api` | gitignored |
|
||||||
|
|||||||
@@ -1,23 +1,29 @@
|
|||||||
# Use official Node.js runtime
|
# Use official Node.js runtime
|
||||||
FROM node:20-alpine
|
FROM node:20-alpine
|
||||||
|
|
||||||
|
# pnpm is served by corepack and pinned by "packageManager" in the root package.json
|
||||||
|
RUN corepack enable
|
||||||
|
|
||||||
# Create app directory
|
# Create app directory
|
||||||
WORKDIR /usr/src/app
|
WORKDIR /usr/src/app
|
||||||
|
|
||||||
# Copy package files first (better caching)
|
# Copy the workspace manifests first (better caching)
|
||||||
COPY package*.json ./
|
COPY pnpm-workspace.yaml pnpm-lock.yaml package.json ./
|
||||||
|
COPY backend/package.json ./backend/
|
||||||
|
COPY frontend/package.json ./frontend/
|
||||||
|
COPY discord-bot/package.json ./discord-bot/
|
||||||
|
|
||||||
# Install dependencies
|
# Install the production dependencies of the backend package
|
||||||
RUN npm ci --only=production
|
RUN pnpm install --frozen-lockfile --prod --filter ./backend...
|
||||||
|
|
||||||
# Copy application source
|
# Copy application source
|
||||||
COPY . .
|
COPY backend ./backend
|
||||||
|
|
||||||
# Expose the app port
|
|
||||||
# EXPOSE 3000
|
|
||||||
|
|
||||||
# Environment variable
|
# Environment variable
|
||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=production
|
||||||
|
|
||||||
|
# The app reads .env.production from its working directory
|
||||||
|
WORKDIR /usr/src/app/backend
|
||||||
|
|
||||||
# Start the application
|
# Start the application
|
||||||
CMD ["node", "src/index.js"]
|
CMD ["node", "src/index.js"]
|
||||||
|
|||||||
1770
backend/package-lock.json
generated
1770
backend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -40,32 +40,40 @@ require('./services/passport')(passport);
|
|||||||
// CORS
|
// CORS
|
||||||
app.use(cookieParser());
|
app.use(cookieParser());
|
||||||
|
|
||||||
const foundryCorsPaths = [
|
// Services talk to Dragonroll from their own application (a Foundry world, an
|
||||||
'/api/foundry/link/complete', '/foundry/link/complete',
|
// Obsidian vault, the Discord bot), so their link routes cannot be limited to
|
||||||
|
// one origin. What they may do is decided by the link code each of them holds.
|
||||||
|
const openCorsPaths = [
|
||||||
'/api/foundry/sync', '/foundry/sync',
|
'/api/foundry/sync', '/foundry/sync',
|
||||||
|
'/api/link/start', '/link/start',
|
||||||
|
'/api/link/pickup', '/link/pickup',
|
||||||
];
|
];
|
||||||
const foundryCors = cors({
|
const openCors = cors({
|
||||||
origin: true,
|
origin: true,
|
||||||
methods: ['GET', 'POST', 'OPTIONS'],
|
methods: ['GET', 'POST', 'OPTIONS'],
|
||||||
allowedHeaders: ['Authorization', 'Content-Type'],
|
allowedHeaders: ['Authorization', 'Content-Type', 'X-Dragonroll-Discord-Bot-Secret'],
|
||||||
});
|
});
|
||||||
app.use('/api/foundry/link/complete', foundryCors);
|
for (const path of openCorsPaths) {
|
||||||
app.use('/foundry/link/complete', foundryCors);
|
app.use(path, openCors);
|
||||||
app.use('/api/foundry/sync', foundryCors);
|
}
|
||||||
app.use('/foundry/sync', foundryCors);
|
|
||||||
|
|
||||||
const appCors = cors({
|
const appCors = cors({
|
||||||
origin: 'http://localhost:3000',
|
origin: 'http://localhost:3000',
|
||||||
credentials: true, // if using cookies/auth
|
credentials: true, // if using cookies/auth
|
||||||
});
|
});
|
||||||
app.use((req, res, next) => {
|
app.use((req, res, next) => {
|
||||||
if (foundryCorsPaths.some((path) => req.path === path || req.path.startsWith(`${path}/`))) return next();
|
if (openCorsPaths.some((path) => req.path === path || req.path.startsWith(`${path}/`))) return next();
|
||||||
appCors(req, res, next);
|
appCors(req, res, next);
|
||||||
});
|
});
|
||||||
|
|
||||||
// ROUTES (NO AUTH)
|
// ROUTES (NO AUTH)
|
||||||
app.use('/api/user', require('./routes/user'));
|
app.use('/api/user', require('./routes/user'));
|
||||||
app.use('/api/discord', require('./routes/discord'));
|
app.use('/api/discord', require('./routes/discord'));
|
||||||
|
// The one way every service (Foundry, Discord, Obsidian) links itself to a
|
||||||
|
// campaign: it asks for a sign-up link, a user opens it and picks the campaign.
|
||||||
|
// Each service authenticates with its own proof: the Discord bot with its
|
||||||
|
// secret, Foundry and Obsidian with the link code they were handed.
|
||||||
|
app.use('/api/link', require('./routes/service-link'));
|
||||||
app.use('/api/foundry', require('./routes/foundry-link'));
|
app.use('/api/foundry', require('./routes/foundry-link'));
|
||||||
app.use('/foundry', require('./routes/foundry-link'));
|
app.use('/foundry', require('./routes/foundry-link'));
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
const mongoose = require('mongoose');
|
|
||||||
const Schema = mongoose.Schema;
|
|
||||||
|
|
||||||
const DiscordLinkRequestSchema = new Schema({
|
|
||||||
codeHash: { type: String, required: true, unique: true },
|
|
||||||
guildId: { type: String, required: true },
|
|
||||||
guildName: { type: String, required: true },
|
|
||||||
discordUserId: { type: String, required: true },
|
|
||||||
discordUserName: { type: String, required: true },
|
|
||||||
dragonrollUser: { type: Schema.Types.ObjectId, ref: 'User' },
|
|
||||||
createdAt: { type: Date, default: Date.now },
|
|
||||||
expiresAt: { type: Date, required: true },
|
|
||||||
completedAt: { type: Date },
|
|
||||||
// Quan el bot ja ha confirmat a Discord que aquesta autoritzacio s'ha fet.
|
|
||||||
notifiedAt: { type: Date }
|
|
||||||
});
|
|
||||||
|
|
||||||
DiscordLinkRequestSchema.index({ expiresAt: 1 }, { expireAfterSeconds: 0 });
|
|
||||||
|
|
||||||
module.exports = mongoose.model('DiscordLinkRequest', DiscordLinkRequestSchema);
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
const mongoose = require('mongoose');
|
|
||||||
const Schema = mongoose.Schema;
|
|
||||||
|
|
||||||
const FoundryLinkRequestSchema = new Schema({
|
|
||||||
codeHash: { type: String, required: true, unique: true },
|
|
||||||
// Kept in clear text so the campaign settings screen can re-display a pending
|
|
||||||
// pairing code after a reload or a backend restart. It is only ever returned
|
|
||||||
// to the user who created the request and is cleared once the link completes.
|
|
||||||
code: { type: String },
|
|
||||||
source: { type: String, enum: ['dragonroll'], required: true },
|
|
||||||
campaign: { type: Schema.Types.ObjectId, ref: 'Campaign' },
|
|
||||||
createdBy: { type: Schema.Types.ObjectId, ref: 'User' },
|
|
||||||
worldId: { type: String },
|
|
||||||
worldTitle: { type: String },
|
|
||||||
system: { type: String },
|
|
||||||
foundryUrl: { type: String },
|
|
||||||
createdAt: { type: Date, default: Date.now },
|
|
||||||
expiresAt: { type: Date, required: true },
|
|
||||||
completedAt: { type: Date }
|
|
||||||
});
|
|
||||||
|
|
||||||
FoundryLinkRequestSchema.index({ expiresAt: 1 }, { expireAfterSeconds: 0 });
|
|
||||||
|
|
||||||
module.exports = mongoose.model('FoundryLinkRequest', FoundryLinkRequestSchema);
|
|
||||||
44
backend/src/models/ServiceLinkRequest.js
Normal file
44
backend/src/models/ServiceLinkRequest.js
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
const mongoose = require('mongoose');
|
||||||
|
const Schema = mongoose.Schema;
|
||||||
|
|
||||||
|
// One row per service installation that wants to use a campaign: a Foundry
|
||||||
|
// world, a Discord server, an Obsidian vault. Asking for a link resets the row
|
||||||
|
// to a fresh pending request, so a service always has one row and that row is
|
||||||
|
// also the record of the link that is active right now.
|
||||||
|
//
|
||||||
|
// The service starts the request and shows the sign-up link it gets back; a
|
||||||
|
// Dragonroll user then signs in through that link and picks the campaign. The
|
||||||
|
// service picks its credential up with the same code it was given.
|
||||||
|
const ServiceLinkRequestSchema = new Schema({
|
||||||
|
service: { type: String, enum: ['foundry', 'discord', 'obsidian'], required: true },
|
||||||
|
// Who is asking, in its own terms: Foundry world id, Discord guild id, vault id.
|
||||||
|
targetId: { type: String },
|
||||||
|
targetName: { type: String },
|
||||||
|
// The person who asked, as far as the service knows: GM name, Discord user...
|
||||||
|
targetUser: { type: String },
|
||||||
|
// Whatever else the service describes itself with (Foundry system and URL).
|
||||||
|
targetMeta: { type: Object },
|
||||||
|
codeHash: { type: String, required: true, unique: true },
|
||||||
|
campaign: { type: Schema.Types.ObjectId, ref: 'Campaign' },
|
||||||
|
dragonrollUser: { type: Schema.Types.ObjectId, ref: 'User' },
|
||||||
|
// 'pending' until a Dragonroll user picks a campaign through the sign-up
|
||||||
|
// link, 'linked' while that choice stands, 'revoked' once the campaign
|
||||||
|
// unlinked the service again.
|
||||||
|
state: { type: String, enum: ['pending', 'linked', 'revoked'], default: 'pending' },
|
||||||
|
// What the service gets when it picks the link up: the Foundry sync token,
|
||||||
|
// the Obsidian session. Dropped as soon as it has been delivered.
|
||||||
|
credentials: { type: Object, select: false },
|
||||||
|
createdAt: { type: Date, default: Date.now },
|
||||||
|
// Only a request nobody answers expires: an empty value keeps the link.
|
||||||
|
expiresAt: { type: Date },
|
||||||
|
linkedAt: { type: Date },
|
||||||
|
pickedUpAt: { type: Date },
|
||||||
|
// The Discord bot has confirmed this authorization in Discord.
|
||||||
|
notifiedAt: { type: Date }
|
||||||
|
});
|
||||||
|
|
||||||
|
ServiceLinkRequestSchema.index({ expiresAt: 1 }, { expireAfterSeconds: 0 });
|
||||||
|
ServiceLinkRequestSchema.index({ service: 1, targetId: 1 });
|
||||||
|
ServiceLinkRequestSchema.index({ campaign: 1, service: 1, state: 1 });
|
||||||
|
|
||||||
|
module.exports = mongoose.model('ServiceLinkRequest', ServiceLinkRequestSchema);
|
||||||
@@ -1,24 +1,28 @@
|
|||||||
const express = require('express')
|
const express = require('express')
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
const crypto = require('node:crypto');
|
|
||||||
|
|
||||||
const Campaign = require("../models/Campaign");
|
const Campaign = require("../models/Campaign");
|
||||||
const FoundryLinkRequest = require('../models/FoundryLinkRequest');
|
const User = require('../models/User');
|
||||||
|
const serviceLinks = require('../services/service-links');
|
||||||
|
|
||||||
const FOUNDRY_LINK_TTL_MS = 10 * 60 * 1000;
|
// Every service links to a campaign through the same sign-up link
|
||||||
|
// (routes/service-link.js); a campaign only drops one of them again.
|
||||||
function foundryCodeHash(code) {
|
async function unlinkService(campaign, service) {
|
||||||
return crypto.createHash('sha256').update(String(code ?? '').trim()).digest('hex');
|
if (service === 'foundry') {
|
||||||
|
campaign.foundryWorldId = undefined;
|
||||||
|
campaign.foundryWorldTitle = undefined;
|
||||||
|
campaign.foundrySystem = undefined;
|
||||||
|
campaign.set('foundrySyncTokenHash', undefined);
|
||||||
|
} else if (service === 'discord') {
|
||||||
|
// The Discord account the bot answers to stays: the server is simply
|
||||||
|
// left without a campaign until somebody picks one again.
|
||||||
|
campaign.discordGuildId = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function expirePendingFoundryLinks(campaignId, userId) {
|
await campaign.save();
|
||||||
const filter = {
|
// A link a service still holds becomes invalid, and it finds that out the
|
||||||
source: 'dragonroll',
|
// next time it asks where its link stands.
|
||||||
campaign: campaignId,
|
await serviceLinks.revokeServiceLink(service, campaign._id);
|
||||||
createdBy: userId,
|
|
||||||
completedAt: null
|
|
||||||
};
|
|
||||||
await FoundryLinkRequest.updateMany(filter, { $set: { expiresAt: new Date() } });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
router.post('/create', async (req, res) => {
|
router.post('/create', async (req, res) => {
|
||||||
@@ -74,73 +78,26 @@ router.post('/update', async (req, res) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
router.post('/foundry-link/start', async (req, res) => {
|
// Which services a campaign has connected, and the account each of them was
|
||||||
try {
|
// authorized with.
|
||||||
const campaign = await Campaign.findOne({ _id: req.body.campaignId, createdBy: req.user.id });
|
router.get('/services', async (req, res) => {
|
||||||
if (!campaign) return res.json({ status: 'error', msg: 'errors.notfound' });
|
|
||||||
|
|
||||||
await expirePendingFoundryLinks(campaign._id, req.user.id);
|
|
||||||
const code = crypto.randomBytes(24).toString('base64url');
|
|
||||||
const expiresAt = new Date(Date.now() + FOUNDRY_LINK_TTL_MS);
|
|
||||||
const request = await FoundryLinkRequest.create({
|
|
||||||
codeHash: foundryCodeHash(code),
|
|
||||||
code,
|
|
||||||
source: 'dragonroll',
|
|
||||||
campaign: campaign._id,
|
|
||||||
createdBy: req.user.id,
|
|
||||||
expiresAt
|
|
||||||
});
|
|
||||||
|
|
||||||
res.set('Cache-Control', 'no-store');
|
|
||||||
res.json({ status: 'ok', code, requestId: request.id, expiresAt });
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err);
|
|
||||||
res.json({ status: 'error', msg: 'errors.internal' });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
router.get('/foundry-link/status/:requestId', async (req, res) => {
|
|
||||||
try {
|
|
||||||
const request = await FoundryLinkRequest.findOne({
|
|
||||||
_id: req.params.requestId,
|
|
||||||
source: 'dragonroll',
|
|
||||||
createdBy: req.user.id
|
|
||||||
});
|
|
||||||
if (!request) return res.json({ status: 'ok', state: 'expired' });
|
|
||||||
if (!request.completedAt && request.expiresAt <= new Date()) {
|
|
||||||
return res.json({ status: 'ok', state: 'expired' });
|
|
||||||
}
|
|
||||||
if (!request.completedAt) return res.json({ status: 'ok', state: 'pending' });
|
|
||||||
|
|
||||||
const campaign = await Campaign.findOne({ _id: request.campaign, createdBy: req.user.id });
|
|
||||||
if (!campaign) return res.json({ status: 'error', msg: 'errors.notfound' });
|
|
||||||
res.json({ status: 'ok', state: 'complete', campaign });
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err);
|
|
||||||
res.json({ status: 'error', msg: 'errors.internal' });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Returns the still-valid pending pairing request for a campaign, so the
|
|
||||||
// settings window can restore its pairing code across reloads and restarts.
|
|
||||||
router.get('/foundry-link/pending', async (req, res) => {
|
|
||||||
try {
|
try {
|
||||||
const campaign = await Campaign.findOne({ _id: req.query.campaignId, createdBy: req.user.id });
|
const campaign = await Campaign.findOne({ _id: req.query.campaignId, createdBy: req.user.id });
|
||||||
if (!campaign) return res.json({ status: 'error', msg: 'errors.notfound' });
|
if (!campaign) return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||||
|
|
||||||
const request = await FoundryLinkRequest.findOne({
|
const links = await serviceLinks.listLinkedServices(campaign._id);
|
||||||
source: 'dragonroll',
|
const userIds = [...new Set(links.map((link) => String(link.dragonrollUser ?? '')).filter(Boolean))];
|
||||||
campaign: campaign._id,
|
const users = userIds.length
|
||||||
createdBy: req.user.id,
|
? await User.find({ _id: { $in: userIds } }).select('username name').lean()
|
||||||
completedAt: null,
|
: [];
|
||||||
expiresAt: { $gt: new Date() }
|
const names = new Map(users.map((user) => [String(user._id), user.username || user.name]));
|
||||||
}).sort({ createdAt: -1 });
|
|
||||||
if (!request) return res.json({ status: 'ok', request: null });
|
|
||||||
|
|
||||||
res.set('Cache-Control', 'no-store');
|
|
||||||
res.json({
|
res.json({
|
||||||
status: 'ok',
|
status: 'ok',
|
||||||
request: { requestId: request.id, code: request.code, expiresAt: request.expiresAt }
|
services: links.map((link) => ({
|
||||||
|
...link,
|
||||||
|
dragonrollUserName: names.get(String(link.dragonrollUser ?? '')) || null
|
||||||
|
}))
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err);
|
console.error(err);
|
||||||
@@ -148,18 +105,16 @@ router.get('/foundry-link/pending', async (req, res) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
router.post('/foundry-unlink', async (req, res) => {
|
router.post('/service-unlink', async (req, res) => {
|
||||||
try {
|
try {
|
||||||
|
const service = String(req.body.service || '').trim();
|
||||||
|
if (!serviceLinks.isService(service)) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
||||||
|
|
||||||
const campaign = await Campaign.findOne({ _id: req.body.campaignId, createdBy: req.user.id });
|
const campaign = await Campaign.findOne({ _id: req.body.campaignId, createdBy: req.user.id });
|
||||||
if (!campaign) return res.json({ status: 'error', msg: 'errors.notfound' });
|
if (!campaign) return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||||
|
|
||||||
campaign.foundryWorldId = undefined;
|
await unlinkService(campaign, service);
|
||||||
campaign.foundryWorldTitle = undefined;
|
res.json({ status: 'ok', campaign, services: await serviceLinks.listLinkedServices(campaign._id) });
|
||||||
campaign.foundrySystem = undefined;
|
|
||||||
campaign.set('foundrySyncTokenHash', undefined);
|
|
||||||
await campaign.save();
|
|
||||||
await expirePendingFoundryLinks(campaign._id, req.user.id);
|
|
||||||
res.json({ status: 'ok', campaign });
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err);
|
console.error(err);
|
||||||
res.json({ status: 'error', msg: 'errors.internal' });
|
res.json({ status: 'error', msg: 'errors.internal' });
|
||||||
|
|||||||
@@ -1,124 +1,25 @@
|
|||||||
const crypto = require('node:crypto');
|
|
||||||
const express = require('express');
|
const express = require('express');
|
||||||
const passport = require('passport');
|
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
|
|
||||||
const Actor = require('../models/Actor');
|
const Actor = require('../models/Actor');
|
||||||
const Campaign = require('../models/Campaign');
|
const Campaign = require('../models/Campaign');
|
||||||
const DiscordGuildLink = require('../models/DiscordGuildLink');
|
const DiscordGuildLink = require('../models/DiscordGuildLink');
|
||||||
const DiscordLinkRequest = require('../models/DiscordLinkRequest');
|
const ServiceLinkRequest = require('../models/ServiceLinkRequest');
|
||||||
const User = require('../models/User');
|
const User = require('../models/User');
|
||||||
|
const serviceLinks = require('../services/service-links');
|
||||||
|
|
||||||
const LINK_TTL_MS = 10 * 60 * 1000;
|
|
||||||
const NOTIFICATION_WINDOW_MS = 15 * 60 * 1000;
|
|
||||||
const NOTIFICATION_LIMIT = 10;
|
const NOTIFICATION_LIMIT = 10;
|
||||||
|
|
||||||
|
const requireBot = serviceLinks.requireDiscordBot;
|
||||||
|
|
||||||
function validGuildId(value) {
|
function validGuildId(value) {
|
||||||
return /^\d{5,25}$/.test(String(value ?? ''));
|
return /^\d{5,25}$/.test(String(value ?? ''));
|
||||||
}
|
}
|
||||||
|
|
||||||
function codeHash(code) {
|
// Connecting a Discord server is the service link of issue: the bot asks
|
||||||
return crypto.createHash('sha256').update(String(code ?? '')).digest('hex');
|
// /api/link/start for a sign-up link, and whoever opens it signs in and picks the
|
||||||
}
|
// campaign this server may read. What is left here is what the bot needs once
|
||||||
|
// that link exists: confirming it in Discord and working with its campaign.
|
||||||
function requireBot(req, res, next) {
|
|
||||||
const configuredSecret = process.env.DRAGONROLL_DISCORD_BOT_SECRET?.trim() || '';
|
|
||||||
const suppliedSecret = req.get('x-dragonroll-discord-bot-secret') || '';
|
|
||||||
const expected = Buffer.from(configuredSecret);
|
|
||||||
const supplied = Buffer.from(suppliedSecret);
|
|
||||||
|
|
||||||
if (!expected.length || expected.length !== supplied.length || !crypto.timingSafeEqual(expected, supplied)) {
|
|
||||||
return res.status(401).json({ status: 'error', msg: 'errors.unauthorized' });
|
|
||||||
}
|
|
||||||
return next();
|
|
||||||
}
|
|
||||||
|
|
||||||
function frontendAuthorizeUrl() {
|
|
||||||
const frontendUrl = (process.env.DRAGONROLL_FRONTEND_URL || 'http://localhost:3000').trim().replace(/\/+$/, '');
|
|
||||||
return `${frontendUrl}/discord/authorize`;
|
|
||||||
}
|
|
||||||
|
|
||||||
// La pantalla d'autorització l'serveix el frontend. El codi viatja al fragment de la URL i el
|
|
||||||
// navegador no l'envia mai al servidor, així que els enllaços antics del bot arriben a la
|
|
||||||
// pantalla sense codi i demanen de tornar a executar /dragonroll connect.
|
|
||||||
router.get('/authorize', (req, res) => {
|
|
||||||
res.set('Cache-Control', 'no-store');
|
|
||||||
res.set('Referrer-Policy', 'no-referrer');
|
|
||||||
res.set('X-Content-Type-Options', 'nosniff');
|
|
||||||
res.redirect(302, frontendAuthorizeUrl());
|
|
||||||
});
|
|
||||||
|
|
||||||
router.post('/link/start', requireBot, async (req, res) => {
|
|
||||||
try {
|
|
||||||
const { guildId, guildName, discordUserId, discordUserName } = req.body;
|
|
||||||
if (!validGuildId(guildId) || !/^\d{5,25}$/.test(String(discordUserId ?? '')) || !guildName || !discordUserName) {
|
|
||||||
return res.json({ status: 'error', msg: 'errors.missing-data' });
|
|
||||||
}
|
|
||||||
|
|
||||||
const code = crypto.randomBytes(32).toString('base64url');
|
|
||||||
await DiscordLinkRequest.create({
|
|
||||||
codeHash: codeHash(code),
|
|
||||||
guildId: String(guildId),
|
|
||||||
guildName: String(guildName).slice(0, 100),
|
|
||||||
discordUserId: String(discordUserId),
|
|
||||||
discordUserName: String(discordUserName).slice(0, 100),
|
|
||||||
expiresAt: new Date(Date.now() + LINK_TTL_MS)
|
|
||||||
});
|
|
||||||
|
|
||||||
res.json({ status: 'ok', code, expiresAt: new Date(Date.now() + LINK_TTL_MS) });
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err);
|
|
||||||
res.json({ status: 'error', msg: 'errors.internal' });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
router.post('/link/details', async (req, res) => {
|
|
||||||
try {
|
|
||||||
res.set('Cache-Control', 'no-store');
|
|
||||||
const request = await DiscordLinkRequest.findOne({
|
|
||||||
codeHash: codeHash(req.body.code),
|
|
||||||
expiresAt: { $gt: new Date() },
|
|
||||||
completedAt: null
|
|
||||||
}).lean();
|
|
||||||
if (!request) return res.json({ status: 'error', msg: 'discord.errors.link-expired' });
|
|
||||||
|
|
||||||
res.json({ status: 'ok', guildName: request.guildName, discordUserName: request.discordUserName });
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err);
|
|
||||||
res.json({ status: 'error', msg: 'errors.internal' });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
router.post('/link/complete', passport.authenticate('jwt', { session: false }), async (req, res) => {
|
|
||||||
try {
|
|
||||||
const request = await DiscordLinkRequest.findOneAndUpdate({
|
|
||||||
codeHash: codeHash(req.body.code),
|
|
||||||
expiresAt: { $gt: new Date() },
|
|
||||||
completedAt: null
|
|
||||||
}, {
|
|
||||||
$set: { completedAt: new Date(), dragonrollUser: req.user.id }
|
|
||||||
}, { new: true });
|
|
||||||
if (!request) return res.json({ status: 'error', msg: 'discord.errors.link-expired' });
|
|
||||||
|
|
||||||
await Campaign.updateMany(
|
|
||||||
{ discordGuildId: request.guildId, createdBy: { $ne: req.user.id } },
|
|
||||||
{ $unset: { discordGuildId: 1 } }
|
|
||||||
);
|
|
||||||
|
|
||||||
await DiscordGuildLink.findOneAndUpdate({ guildId: request.guildId }, {
|
|
||||||
$set: {
|
|
||||||
discordUserId: request.discordUserId,
|
|
||||||
dragonrollUser: req.user.id,
|
|
||||||
connectedAt: new Date()
|
|
||||||
}
|
|
||||||
}, { new: true, upsert: true, setDefaultsOnInsert: true });
|
|
||||||
|
|
||||||
res.json({ status: 'ok', guildName: request.guildName });
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err);
|
|
||||||
res.json({ status: 'error', msg: 'errors.internal' });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
async function dragonrollUserNames(requests) {
|
async function dragonrollUserNames(requests) {
|
||||||
const userIds = [...new Set(requests.map((request) => String(request.dragonrollUser ?? '')).filter(Boolean))];
|
const userIds = [...new Set(requests.map((request) => String(request.dragonrollUser ?? '')).filter(Boolean))];
|
||||||
@@ -132,16 +33,18 @@ async function dragonrollUserNames(requests) {
|
|||||||
// mateix evita que dos processos del bot confirmïn la mateixa vegada.
|
// mateix evita que dos processos del bot confirmïn la mateixa vegada.
|
||||||
router.post('/bot/link-requests/notifications', requireBot, async (req, res) => {
|
router.post('/bot/link-requests/notifications', requireBot, async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const pending = await DiscordLinkRequest.find({
|
const pending = await ServiceLinkRequest.find({
|
||||||
completedAt: { $gte: new Date(Date.now() - NOTIFICATION_WINDOW_MS) },
|
service: 'discord',
|
||||||
|
state: 'linked',
|
||||||
|
linkedAt: { $gte: new Date(Date.now() - serviceLinks.NOTIFICATION_WINDOW_MS) },
|
||||||
notifiedAt: null
|
notifiedAt: null
|
||||||
}).select('_id guildId guildName discordUserId discordUserName dragonrollUser')
|
}).select('_id targetId targetName targetUser targetMeta dragonrollUser campaign')
|
||||||
.limit(NOTIFICATION_LIMIT)
|
.limit(NOTIFICATION_LIMIT)
|
||||||
.lean();
|
.lean();
|
||||||
|
|
||||||
const claimed = [];
|
const claimed = [];
|
||||||
for (const request of pending) {
|
for (const request of pending) {
|
||||||
const taken = await DiscordLinkRequest.findOneAndUpdate(
|
const taken = await ServiceLinkRequest.findOneAndUpdate(
|
||||||
{ _id: request._id, notifiedAt: null },
|
{ _id: request._id, notifiedAt: null },
|
||||||
{ $set: { notifiedAt: new Date() } },
|
{ $set: { notifiedAt: new Date() } },
|
||||||
{ new: true }
|
{ new: true }
|
||||||
@@ -150,15 +53,22 @@ router.post('/bot/link-requests/notifications', requireBot, async (req, res) =>
|
|||||||
}
|
}
|
||||||
|
|
||||||
const names = await dragonrollUserNames(claimed);
|
const names = await dragonrollUserNames(claimed);
|
||||||
|
const campaignIds = [...new Set(claimed.map((request) => String(request.campaign ?? '')).filter(Boolean))];
|
||||||
|
const campaigns = campaignIds.length
|
||||||
|
? await Campaign.find({ _id: { $in: campaignIds } }).select('_id name').lean()
|
||||||
|
: [];
|
||||||
|
const campaignNames = new Map(campaigns.map((campaign) => [String(campaign._id), campaign.name]));
|
||||||
|
|
||||||
res.json({
|
res.json({
|
||||||
status: 'ok',
|
status: 'ok',
|
||||||
notifications: claimed.map((request) => ({
|
notifications: claimed.map((request) => ({
|
||||||
id: String(request._id),
|
id: String(request._id),
|
||||||
guildId: request.guildId,
|
guildId: request.targetId,
|
||||||
guildName: request.guildName,
|
guildName: request.targetName,
|
||||||
discordUserId: request.discordUserId,
|
discordUserId: request.targetMeta?.userId || '',
|
||||||
discordUserName: request.discordUserName,
|
discordUserName: request.targetUser,
|
||||||
dragonrollUserName: names.get(String(request.dragonrollUser ?? '')) || null
|
dragonrollUserName: names.get(String(request.dragonrollUser ?? '')) || null,
|
||||||
|
campaignName: campaignNames.get(String(request.campaign ?? '')) || null
|
||||||
}))
|
}))
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|||||||
@@ -1,18 +1,14 @@
|
|||||||
const crypto = require('node:crypto');
|
const crypto = require('node:crypto');
|
||||||
const express = require('express');
|
const express = require('express');
|
||||||
const rateLimit = require('express-rate-limit');
|
|
||||||
const mongoose = require('mongoose');
|
const mongoose = require('mongoose');
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
|
|
||||||
const Campaign = require('../models/Campaign');
|
const Campaign = require('../models/Campaign');
|
||||||
const Actor = require('../models/Actor');
|
const Actor = require('../models/Actor');
|
||||||
const Item = require('../models/Item');
|
const Item = require('../models/Item');
|
||||||
const FoundryLinkRequest = require('../models/FoundryLinkRequest');
|
|
||||||
const { foundryActorToCharacter } = require('../services/actor-foundry');
|
const { foundryActorToCharacter } = require('../services/actor-foundry');
|
||||||
const { foundryItemToItemData } = require('../services/item-foundry');
|
const { foundryItemToItemData } = require('../services/item-foundry');
|
||||||
|
|
||||||
const linkRateLimit = rateLimit({ windowMs: 15 * 60 * 1000, max: 20 });
|
|
||||||
|
|
||||||
// Upper bound for the Foundry names remembered per synced item (see Item model).
|
// Upper bound for the Foundry names remembered per synced item (see Item model).
|
||||||
const MAX_FOUNDRY_NAMES = 20;
|
const MAX_FOUNDRY_NAMES = 20;
|
||||||
|
|
||||||
@@ -129,113 +125,9 @@ async function syncFoundryItems(campaign, sources, fullSync = false) {
|
|||||||
return items;
|
return items;
|
||||||
}
|
}
|
||||||
|
|
||||||
function readWorld(body) {
|
// Linking a world to a campaign happens through the sign-up link every service
|
||||||
const world = body?.world;
|
// uses (routes/service-link.js); what stays here is the sync that world keeps up
|
||||||
if (!world || typeof world.id !== 'string' || !world.id.trim()) return null;
|
// with the campaign once that link has handed it its token.
|
||||||
|
|
||||||
let foundryUrl = '';
|
|
||||||
if (typeof world.url === 'string') {
|
|
||||||
try {
|
|
||||||
const url = new URL(world.url);
|
|
||||||
if (url.protocol === 'http:' || url.protocol === 'https:') foundryUrl = url.origin;
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
worldId: world.id.trim().slice(0, 120),
|
|
||||||
worldTitle: typeof world.title === 'string' ? world.title.trim().slice(0, 200) : '',
|
|
||||||
system: typeof world.system === 'string' ? world.system.trim().slice(0, 120) : '',
|
|
||||||
foundryUrl
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
async function attachWorldToCampaign(campaign, world) {
|
|
||||||
const linkedElsewhere = await Campaign.findOne({
|
|
||||||
foundryWorldId: world.worldId,
|
|
||||||
_id: { $ne: campaign._id }
|
|
||||||
}).select('_id');
|
|
||||||
if (linkedElsewhere) return false;
|
|
||||||
|
|
||||||
campaign.foundryWorldId = world.worldId;
|
|
||||||
campaign.foundryWorldTitle = world.worldTitle;
|
|
||||||
campaign.foundrySystem = world.system;
|
|
||||||
if (world.foundryUrl) {
|
|
||||||
const settings = campaign.settings && typeof campaign.settings === 'object' ? campaign.settings : {};
|
|
||||||
const integrations = settings.integrations && typeof settings.integrations === 'object'
|
|
||||||
? settings.integrations
|
|
||||||
: {};
|
|
||||||
campaign.settings = {
|
|
||||||
...settings,
|
|
||||||
integrations: {
|
|
||||||
...integrations,
|
|
||||||
foundryUrl: integrations.foundryUrl || world.foundryUrl
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
await campaign.save();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function expireOtherPendingLinks(campaignId, userId, requestId) {
|
|
||||||
await FoundryLinkRequest.updateMany({
|
|
||||||
source: 'dragonroll',
|
|
||||||
campaign: campaignId,
|
|
||||||
createdBy: userId,
|
|
||||||
completedAt: null,
|
|
||||||
_id: { $ne: requestId }
|
|
||||||
}, { $set: { expiresAt: new Date() } });
|
|
||||||
}
|
|
||||||
|
|
||||||
router.post('/link/complete', linkRateLimit, async (req, res) => {
|
|
||||||
try {
|
|
||||||
const world = readWorld(req.body);
|
|
||||||
if (!world || typeof req.body.code !== 'string' || !req.body.code.trim()) {
|
|
||||||
return res.json({ status: 'error', msg: 'errors.missing-data' });
|
|
||||||
}
|
|
||||||
|
|
||||||
const request = await FoundryLinkRequest.findOne({
|
|
||||||
codeHash: codeHash(req.body.code),
|
|
||||||
source: 'dragonroll',
|
|
||||||
expiresAt: { $gt: new Date() },
|
|
||||||
completedAt: null
|
|
||||||
});
|
|
||||||
if (!request) return res.json({ status: 'error', msg: 'foundry.errors.link-expired' });
|
|
||||||
|
|
||||||
const campaign = await Campaign.findOne({ _id: request.campaign, createdBy: request.createdBy });
|
|
||||||
if (!campaign) return res.json({ status: 'error', msg: 'errors.notfound' });
|
|
||||||
|
|
||||||
const attached = await attachWorldToCampaign(campaign, world);
|
|
||||||
if (!attached) return res.json({ status: 'error', msg: 'foundry.errors.world-already-linked' });
|
|
||||||
|
|
||||||
const syncToken = crypto.randomBytes(32).toString('base64url');
|
|
||||||
campaign.foundrySyncTokenHash = codeHash(syncToken);
|
|
||||||
await campaign.save();
|
|
||||||
|
|
||||||
request.worldId = world.worldId;
|
|
||||||
request.worldTitle = world.worldTitle;
|
|
||||||
request.system = world.system;
|
|
||||||
request.foundryUrl = world.foundryUrl;
|
|
||||||
request.completedAt = new Date();
|
|
||||||
request.code = undefined; // Redeemed: keep only the hash from now on.
|
|
||||||
await request.save();
|
|
||||||
await expireOtherPendingLinks(campaign._id, request.createdBy, request._id);
|
|
||||||
|
|
||||||
const bridgeUrl = process.env.FOUNDRY_API_CLIENT_URL || process.env.FOUNDRY_API_URL;
|
|
||||||
const pushToken = process.env.FOUNDRY_API_PUSH_TOKEN;
|
|
||||||
res.set('Cache-Control', 'no-store');
|
|
||||||
res.json({
|
|
||||||
status: 'ok',
|
|
||||||
campaign: { id: campaign.id, name: campaign.name },
|
|
||||||
world: { id: world.worldId, title: world.worldTitle, system: world.system },
|
|
||||||
syncToken,
|
|
||||||
bridgeConfig: bridgeUrl && pushToken ? { url: bridgeUrl, pushToken } : null
|
|
||||||
});
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err);
|
|
||||||
if (err.code === 11000) return res.json({ status: 'error', msg: 'foundry.errors.world-already-linked' });
|
|
||||||
res.json({ status: 'error', msg: 'errors.internal' });
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// The Foundry module shows this in its settings: the sync token alone only proves
|
// The Foundry module shows this in its settings: the sync token alone only proves
|
||||||
// a link was made once, so the module asks which campaign it belongs to and hears
|
// a link was made once, so the module asks which campaign it belongs to and hears
|
||||||
|
|||||||
209
backend/src/routes/service-link.js
Normal file
209
backend/src/routes/service-link.js
Normal file
@@ -0,0 +1,209 @@
|
|||||||
|
const crypto = require('node:crypto');
|
||||||
|
const express = require('express');
|
||||||
|
const jwt = require('jsonwebtoken');
|
||||||
|
const passport = require('passport');
|
||||||
|
const rateLimit = require('express-rate-limit');
|
||||||
|
const router = express.Router();
|
||||||
|
|
||||||
|
const Campaign = require('../models/Campaign');
|
||||||
|
const DiscordGuildLink = require('../models/DiscordGuildLink');
|
||||||
|
const secret = require('../services/keys').secret;
|
||||||
|
const serviceLinks = require('../services/service-links');
|
||||||
|
|
||||||
|
const linkRateLimit = rateLimit({ windowMs: 15 * 60 * 1000, max: 40 });
|
||||||
|
|
||||||
|
const GUILD_ID = /^\d{5,25}$/;
|
||||||
|
|
||||||
|
// What the sign-up screen shows about the request behind a code.
|
||||||
|
function publicRequest(request) {
|
||||||
|
return {
|
||||||
|
service: request.service,
|
||||||
|
serviceName: serviceLinks.serviceName(request.service),
|
||||||
|
targetName: request.targetName,
|
||||||
|
targetUser: request.targetUser,
|
||||||
|
system: request.targetMeta?.system || '',
|
||||||
|
expiresAt: request.expiresAt
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// A session for a service that keeps working once the browser which authorised
|
||||||
|
// it is gone: Obsidian gets the same kind of session signing in gives, so its
|
||||||
|
// notes keep travelling over the routes they always used.
|
||||||
|
function userSession(user) {
|
||||||
|
const payload = {
|
||||||
|
_id: user._id,
|
||||||
|
username: user.username,
|
||||||
|
name: user.name,
|
||||||
|
email: user.email,
|
||||||
|
admin: user.admin,
|
||||||
|
settings: user.settings
|
||||||
|
};
|
||||||
|
return jwt.sign(payload, secret, { expiresIn: 172800 });
|
||||||
|
}
|
||||||
|
|
||||||
|
// A Foundry world tells Dragonroll who it is when it asks for its link, so the
|
||||||
|
// user only has to say which campaign the world may work on.
|
||||||
|
async function completeFoundryLink(campaign, request) {
|
||||||
|
const linkedElsewhere = await Campaign.findOne({
|
||||||
|
foundryWorldId: request.targetId,
|
||||||
|
_id: { $ne: campaign._id }
|
||||||
|
}).select('_id');
|
||||||
|
if (linkedElsewhere) return { msg: 'foundry.errors.world-already-linked' };
|
||||||
|
|
||||||
|
campaign.foundryWorldId = request.targetId;
|
||||||
|
campaign.foundryWorldTitle = request.targetName;
|
||||||
|
campaign.foundrySystem = request.targetMeta?.system || '';
|
||||||
|
|
||||||
|
const settings = campaign.settings && typeof campaign.settings === 'object' ? campaign.settings : {};
|
||||||
|
const integrations = settings.integrations && typeof settings.integrations === 'object' ? settings.integrations : {};
|
||||||
|
const foundryUrl = request.targetMeta?.url || '';
|
||||||
|
if (foundryUrl && !integrations.foundryUrl) {
|
||||||
|
campaign.settings = { ...settings, integrations: { ...integrations, foundryUrl } };
|
||||||
|
}
|
||||||
|
|
||||||
|
const syncToken = crypto.randomBytes(32).toString('base64url');
|
||||||
|
campaign.foundrySyncTokenHash = serviceLinks.codeHash(syncToken);
|
||||||
|
await campaign.save();
|
||||||
|
|
||||||
|
const bridgeUrl = process.env.FOUNDRY_API_CLIENT_URL || process.env.FOUNDRY_API_URL;
|
||||||
|
const pushToken = process.env.FOUNDRY_API_PUSH_TOKEN;
|
||||||
|
return {
|
||||||
|
credentials: {
|
||||||
|
syncToken,
|
||||||
|
bridgeConfig: bridgeUrl && pushToken ? { url: bridgeUrl, pushToken } : null
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// The Discord account behind the request is the one the bot answers to; a new
|
||||||
|
// authorization takes the server over from whoever held it before.
|
||||||
|
async function completeDiscordLink(campaign, request, user) {
|
||||||
|
await Campaign.updateMany(
|
||||||
|
{ discordGuildId: request.targetId, createdBy: { $ne: user.id } },
|
||||||
|
{ $unset: { discordGuildId: 1 } }
|
||||||
|
);
|
||||||
|
|
||||||
|
await DiscordGuildLink.findOneAndUpdate({ guildId: request.targetId }, {
|
||||||
|
$set: {
|
||||||
|
discordUserId: request.targetMeta?.userId || request.targetId,
|
||||||
|
dragonrollUser: user.id,
|
||||||
|
connectedAt: new Date()
|
||||||
|
}
|
||||||
|
}, { new: true, upsert: true, setDefaultsOnInsert: true });
|
||||||
|
|
||||||
|
campaign.discordGuildId = request.targetId;
|
||||||
|
await campaign.save();
|
||||||
|
}
|
||||||
|
|
||||||
|
// A service asks for a sign-up link and shows it to whoever is sitting in front
|
||||||
|
// of it. Nothing is linked until a Dragonroll user opens that link, signs in and
|
||||||
|
// picks one of their campaigns.
|
||||||
|
router.post('/start', linkRateLimit, async (req, res) => {
|
||||||
|
try {
|
||||||
|
const service = String(req.body.service || '').trim();
|
||||||
|
if (!serviceLinks.isService(service)) return res.json({ status: 'error', msg: 'link.errors.unknown-service' });
|
||||||
|
|
||||||
|
// A service that can prove who it is gets its link checked: a Discord
|
||||||
|
// server is claimed by whoever runs the bot, not by whoever knows its id.
|
||||||
|
if (serviceLinks.isBotOnly(service) && !serviceLinks.isDiscordBot(req)) {
|
||||||
|
return res.status(401).json({ status: 'error', msg: 'errors.unauthorized' });
|
||||||
|
}
|
||||||
|
|
||||||
|
const target = serviceLinks.readTarget(req.body);
|
||||||
|
if (!target.targetId) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
||||||
|
if (service === 'discord' && (!GUILD_ID.test(target.targetId) || !target.targetName || !target.targetUser)) {
|
||||||
|
return res.json({ status: 'error', msg: 'errors.missing-data' });
|
||||||
|
}
|
||||||
|
|
||||||
|
const link = await serviceLinks.startServiceLink(service, target);
|
||||||
|
res.set('Cache-Control', 'no-store');
|
||||||
|
res.json({ status: 'ok', service, code: link.code, linkUrl: link.url, expiresAt: link.expiresAt });
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
res.json({ status: 'error', msg: 'errors.internal' });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// What a sign-up link is about, so the screen can name the world, Discord server
|
||||||
|
// or vault that is waiting, and the person who asked.
|
||||||
|
router.post('/details', async (req, res) => {
|
||||||
|
try {
|
||||||
|
res.set('Cache-Control', 'no-store');
|
||||||
|
const request = await serviceLinks.findServiceLinkByCode(req.body.code);
|
||||||
|
if (!request || serviceLinks.linkIsExpired(request)) {
|
||||||
|
return res.json({ status: 'error', msg: 'link.errors.expired' });
|
||||||
|
}
|
||||||
|
|
||||||
|
res.json({ status: 'ok', ...publicRequest(request) });
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
res.json({ status: 'error', msg: 'errors.internal' });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// The user who signs in through a link owns the campaigns listed there, so
|
||||||
|
// picking one of them is the whole authorization.
|
||||||
|
router.post('/complete', passport.authenticate('jwt', { session: false }), async (req, res) => {
|
||||||
|
try {
|
||||||
|
res.set('Cache-Control', 'no-store');
|
||||||
|
const request = await serviceLinks.findServiceLinkByCode(req.body.code);
|
||||||
|
if (!request || serviceLinks.linkIsExpired(request)) {
|
||||||
|
return res.json({ status: 'error', msg: 'link.errors.expired' });
|
||||||
|
}
|
||||||
|
|
||||||
|
const campaign = await Campaign.findOne({ _id: req.body.campaignId, createdBy: req.user.id });
|
||||||
|
if (!campaign) return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||||
|
if (request.service === 'discord' && campaign.discordGuildId && campaign.discordGuildId !== request.targetId) {
|
||||||
|
return res.json({ status: 'error', msg: 'discord.errors.campaign-already-linked' });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (request.service === 'foundry') {
|
||||||
|
const linked = await completeFoundryLink(campaign, request);
|
||||||
|
if (linked.msg) return res.json({ status: 'error', msg: linked.msg });
|
||||||
|
await serviceLinks.completeServiceLink(request, campaign, req.user, linked.credentials);
|
||||||
|
} else if (request.service === 'discord') {
|
||||||
|
await completeDiscordLink(campaign, request, req.user);
|
||||||
|
await serviceLinks.completeServiceLink(request, campaign, req.user);
|
||||||
|
} else {
|
||||||
|
await serviceLinks.completeServiceLink(request, campaign, req.user, { token: userSession(req.user) });
|
||||||
|
}
|
||||||
|
|
||||||
|
res.json({ status: 'ok', service: request.service, campaign: { id: campaign.id, name: campaign.name } });
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
if (err.code === 11000) return res.json({ status: 'error', msg: 'foundry.errors.world-already-linked' });
|
||||||
|
res.json({ status: 'error', msg: 'errors.internal' });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Where a link stands, and what the service that asked for it gets out of it.
|
||||||
|
// A credential is delivered once: a service that loses it asks for a new link.
|
||||||
|
router.post('/pickup', async (req, res) => {
|
||||||
|
try {
|
||||||
|
res.set('Cache-Control', 'no-store');
|
||||||
|
const request = await serviceLinks.findServiceLinkByCode(req.body.code);
|
||||||
|
if (!request || serviceLinks.linkIsExpired(request)) {
|
||||||
|
return res.json({ status: 'ok', state: 'expired' });
|
||||||
|
}
|
||||||
|
if (request.state !== 'linked') {
|
||||||
|
return res.json({ status: 'ok', state: request.state, campaign: null });
|
||||||
|
}
|
||||||
|
|
||||||
|
const campaign = await Campaign.findOne({ _id: request.campaign }).select('_id name').lean();
|
||||||
|
const credentials = await serviceLinks.takeServiceLinkCredentials(request);
|
||||||
|
res.json({
|
||||||
|
status: 'ok',
|
||||||
|
state: 'linked',
|
||||||
|
service: request.service,
|
||||||
|
campaign: campaign ? { id: String(campaign._id), name: campaign.name } : null,
|
||||||
|
syncToken: credentials?.syncToken || '',
|
||||||
|
bridgeConfig: credentials?.bridgeConfig || null,
|
||||||
|
token: credentials?.token || ''
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
res.json({ status: 'error', msg: 'errors.internal' });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
module.exports = router;
|
||||||
254
backend/src/services/service-links.js
Normal file
254
backend/src/services/service-links.js
Normal file
@@ -0,0 +1,254 @@
|
|||||||
|
const crypto = require('node:crypto');
|
||||||
|
const jwt = require('jsonwebtoken');
|
||||||
|
|
||||||
|
const ServiceLinkRequest = require('../models/ServiceLinkRequest');
|
||||||
|
const Campaign = require('../models/Campaign');
|
||||||
|
const keys = require('./keys');
|
||||||
|
|
||||||
|
// How long a sign-up link waits for somebody to open it.
|
||||||
|
const LINK_TTL_MS = 10 * 60 * 1000;
|
||||||
|
// How long the Discord bot can still confirm an authorization it was away for.
|
||||||
|
const NOTIFICATION_WINDOW_MS = 15 * 60 * 1000;
|
||||||
|
// The token the Obsidian plugin gets back is its long-lived credential: a plugin cannot ask
|
||||||
|
// somebody to open the sign-up link again every 48 hours. It carries the id of the link so that
|
||||||
|
// revoking the link works right away — see services/passport.js.
|
||||||
|
const OBSIDIAN_TOKEN_TTL = '365d';
|
||||||
|
|
||||||
|
// Every service that connects to a campaign does it the same way: it asks the
|
||||||
|
// backend for a sign-up link, shows it to the person sitting in front of it,
|
||||||
|
// and picks its credential up once a Dragonroll user has signed in through that
|
||||||
|
// link and chosen a campaign. `botOnly` services are the ones that can prove
|
||||||
|
// who they are to the backend; the others can only be trusted with their own
|
||||||
|
// link, which is why what they get from a link is decided by the user.
|
||||||
|
const SERVICES = {
|
||||||
|
foundry: { name: 'Foundry VTT' },
|
||||||
|
discord: { name: 'Discord', botOnly: true },
|
||||||
|
obsidian: { name: 'Obsidian' },
|
||||||
|
};
|
||||||
|
|
||||||
|
function isService(value) {
|
||||||
|
return Object.prototype.hasOwnProperty.call(SERVICES, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
function serviceName(service) {
|
||||||
|
return SERVICES[service]?.name || service;
|
||||||
|
}
|
||||||
|
|
||||||
|
function isBotOnly(service) {
|
||||||
|
return SERVICES[service]?.botOnly === true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function codeHash(code) {
|
||||||
|
return crypto.createHash('sha256').update(String(code ?? '').trim()).digest('hex');
|
||||||
|
}
|
||||||
|
|
||||||
|
function newLinkCode() {
|
||||||
|
return crypto.randomBytes(32).toString('base64url');
|
||||||
|
}
|
||||||
|
|
||||||
|
function frontendBaseUrl() {
|
||||||
|
return (process.env.DRAGONROLL_FRONTEND_URL || 'http://localhost:3000').trim().replace(/\/+$/, '');
|
||||||
|
}
|
||||||
|
|
||||||
|
// The sign-up link a service shows: it opens the Dragonroll page where somebody
|
||||||
|
// signs in and picks the campaign. The code travels in the fragment, so the
|
||||||
|
// browser never sends it to the server.
|
||||||
|
function signUpLinkUrl(service, code) {
|
||||||
|
return `${frontendBaseUrl()}/link/authorize?service=${encodeURIComponent(service)}#code=${encodeURIComponent(code)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The bot talks to the backend with a shared secret instead of a login, so a
|
||||||
|
// Discord server cannot be claimed by somebody who merely knows its id.
|
||||||
|
function isDiscordBot(req) {
|
||||||
|
const configuredSecret = process.env.DRAGONROLL_DISCORD_BOT_SECRET?.trim() || '';
|
||||||
|
const suppliedSecret = req.get('x-dragonroll-discord-bot-secret') || '';
|
||||||
|
const expected = Buffer.from(configuredSecret);
|
||||||
|
const supplied = Buffer.from(suppliedSecret);
|
||||||
|
|
||||||
|
return !!expected.length
|
||||||
|
&& expected.length === supplied.length
|
||||||
|
&& crypto.timingSafeEqual(expected, supplied);
|
||||||
|
}
|
||||||
|
|
||||||
|
function requireDiscordBot(req, res, next) {
|
||||||
|
if (!isDiscordBot(req)) {
|
||||||
|
return res.status(401).json({ status: 'error', msg: 'errors.unauthorized' });
|
||||||
|
}
|
||||||
|
return next();
|
||||||
|
}
|
||||||
|
|
||||||
|
function readText(value, max) {
|
||||||
|
return typeof value === 'string' ? value.trim().slice(0, max) : '';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Whatever else a service says about itself: the Foundry system it runs, the
|
||||||
|
// Discord user id behind the person who asked... Values are kept short and
|
||||||
|
// plain, because they come from a service and end up shown to a user.
|
||||||
|
function readMeta(source) {
|
||||||
|
const meta = {};
|
||||||
|
for (const [key, value] of Object.entries(source).slice(0, MAX_META_ENTRIES)) {
|
||||||
|
if (value === null || value === undefined || typeof value === 'boolean') {
|
||||||
|
if (typeof value === 'boolean') meta[key] = value;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (typeof value !== 'string' && typeof value !== 'number') continue;
|
||||||
|
meta[key] = String(value).trim().slice(0, MAX_META_VALUE_LENGTH);
|
||||||
|
}
|
||||||
|
return meta;
|
||||||
|
}
|
||||||
|
|
||||||
|
// How a service describes itself: which world/server/vault is asking, on whose
|
||||||
|
// behalf, and the little that goes with it.
|
||||||
|
function readTarget(body) {
|
||||||
|
const source = body?.target && typeof body.target === 'object' ? body.target : {};
|
||||||
|
|
||||||
|
const target = {
|
||||||
|
targetId: readText(source.id, 120),
|
||||||
|
targetName: readText(source.name, 200),
|
||||||
|
targetUser: readText(source.user, 120),
|
||||||
|
targetMeta: source.meta && typeof source.meta === 'object' && !Array.isArray(source.meta)
|
||||||
|
? readMeta(source.meta)
|
||||||
|
: {}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (typeof target.targetMeta.url === 'string') {
|
||||||
|
try {
|
||||||
|
const url = new URL(target.targetMeta.url);
|
||||||
|
target.targetMeta.url = url.protocol === 'http:' || url.protocol === 'https:' ? url.origin : '';
|
||||||
|
} catch {
|
||||||
|
target.targetMeta.url = '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return target;
|
||||||
|
}
|
||||||
|
|
||||||
|
function linkIsExpired(request) {
|
||||||
|
return request?.state === 'pending' && (!request.expiresAt || request.expiresAt <= new Date());
|
||||||
|
}
|
||||||
|
|
||||||
|
// A service asking again reuses its own row: one world, one Discord server and
|
||||||
|
// one vault each have a single link, and asking for it replaces the last one.
|
||||||
|
async function startServiceLink(service, target) {
|
||||||
|
const code = newLinkCode();
|
||||||
|
const expiresAt = new Date(Date.now() + LINK_TTL_MS);
|
||||||
|
const request = await ServiceLinkRequest.findOneAndUpdate(
|
||||||
|
{ service: service, targetId: target.targetId },
|
||||||
|
{
|
||||||
|
$set: {
|
||||||
|
service: service,
|
||||||
|
targetId: target.targetId,
|
||||||
|
targetName: target.targetName,
|
||||||
|
targetUser: target.targetUser,
|
||||||
|
targetMeta: target.targetMeta,
|
||||||
|
codeHash: codeHash(code),
|
||||||
|
state: 'pending',
|
||||||
|
expiresAt: expiresAt
|
||||||
|
},
|
||||||
|
$unset: {
|
||||||
|
campaign: 1,
|
||||||
|
dragonrollUser: 1,
|
||||||
|
credentials: 1,
|
||||||
|
linkedAt: 1,
|
||||||
|
pickedUpAt: 1,
|
||||||
|
notifiedAt: 1
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ new: true, upsert: true, setDefaultsOnInsert: true }
|
||||||
|
);
|
||||||
|
|
||||||
|
return { request, code, url: signUpLinkUrl(service, code), expiresAt };
|
||||||
|
}
|
||||||
|
|
||||||
|
async function findServiceLinkByCode(code) {
|
||||||
|
if (!code) return null;
|
||||||
|
return ServiceLinkRequest.findOne({ codeHash: codeHash(code) }).select('+credentials').lean();
|
||||||
|
}
|
||||||
|
|
||||||
|
// The credential that belongs to a link is handed over once and then dropped:
|
||||||
|
// whoever loses it starts the link again from the service, which is where they
|
||||||
|
// got the link from in the first place.
|
||||||
|
async function takeServiceLinkCredentials(request) {
|
||||||
|
const credentials = request?.credentials || null;
|
||||||
|
if (!credentials) return null;
|
||||||
|
|
||||||
|
await ServiceLinkRequest.updateOne(
|
||||||
|
{ _id: request._id },
|
||||||
|
{ $set: { pickedUpAt: new Date() }, $unset: { credentials: 1 } }
|
||||||
|
);
|
||||||
|
return credentials;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The user who owns the campaign picked it for this link.
|
||||||
|
async function completeServiceLink(request, campaign, user, credentials = null) {
|
||||||
|
request.campaign = campaign._id;
|
||||||
|
request.dragonrollUser = user.id;
|
||||||
|
request.state = 'linked';
|
||||||
|
request.linkedAt = new Date();
|
||||||
|
request.pickedUpAt = null;
|
||||||
|
request.notifiedAt = null;
|
||||||
|
request.credentials = credentials || undefined;
|
||||||
|
// An answered link is the record of a live connection: it stays until the
|
||||||
|
// service re-links or the campaign unlinks it.
|
||||||
|
request.expiresAt = null;
|
||||||
|
await request.save();
|
||||||
|
return request;
|
||||||
|
}
|
||||||
|
|
||||||
|
// A campaign dropping a service: the link stops being valid, and the service
|
||||||
|
// finds that out the next time it asks.
|
||||||
|
async function revokeServiceLink(service, campaignId) {
|
||||||
|
const result = await ServiceLinkRequest.updateMany(
|
||||||
|
{ service: service, campaign: campaignId, state: 'linked' },
|
||||||
|
{
|
||||||
|
$set: { state: 'revoked', campaign: null },
|
||||||
|
$unset: { credentials: 1, linkedAt: 1 }
|
||||||
|
}
|
||||||
|
);
|
||||||
|
return result.matchedCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
// What a campaign has connected to it, newest link first and one row per
|
||||||
|
// service, so the campaign settings can list its services together.
|
||||||
|
async function listLinkedServices(campaignId) {
|
||||||
|
const links = await ServiceLinkRequest.find({ campaign: campaignId, state: 'linked' })
|
||||||
|
.sort({ linkedAt: -1 })
|
||||||
|
.lean();
|
||||||
|
|
||||||
|
const seen = new Set();
|
||||||
|
const services = [];
|
||||||
|
for (const link of links) {
|
||||||
|
if (seen.has(link.service)) continue;
|
||||||
|
seen.add(link.service);
|
||||||
|
services.push({
|
||||||
|
service: link.service,
|
||||||
|
name: serviceName(link.service),
|
||||||
|
targetId: link.targetId || '',
|
||||||
|
targetName: link.targetName || '',
|
||||||
|
targetUser: link.targetUser || '',
|
||||||
|
dragonrollUser: link.dragonrollUser || null,
|
||||||
|
linkedAt: link.linkedAt
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return services;
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
LINK_TTL_MS,
|
||||||
|
NOTIFICATION_WINDOW_MS,
|
||||||
|
SERVICES,
|
||||||
|
codeHash,
|
||||||
|
completeServiceLink,
|
||||||
|
findServiceLinkByCode,
|
||||||
|
isBotOnly,
|
||||||
|
isDiscordBot,
|
||||||
|
isService,
|
||||||
|
linkIsExpired,
|
||||||
|
listLinkedServices,
|
||||||
|
readTarget,
|
||||||
|
requireDiscordBot,
|
||||||
|
revokeServiceLink,
|
||||||
|
serviceName,
|
||||||
|
signUpLinkUrl,
|
||||||
|
startServiceLink,
|
||||||
|
takeServiceLinkCredentials
|
||||||
|
};
|
||||||
@@ -1,21 +1,30 @@
|
|||||||
# Use official Node.js runtime
|
# Use official Node.js runtime
|
||||||
FROM node:20-alpine
|
FROM node:20-alpine
|
||||||
|
|
||||||
|
# pnpm is served by corepack and pinned by "packageManager" in the root package.json
|
||||||
|
RUN corepack enable
|
||||||
|
|
||||||
# Create app directory
|
# Create app directory
|
||||||
WORKDIR /usr/src/app
|
WORKDIR /usr/src/app
|
||||||
|
|
||||||
# Copy package files first (better caching)
|
# Copy the workspace manifests first (better caching)
|
||||||
COPY package*.json ./
|
COPY pnpm-workspace.yaml pnpm-lock.yaml package.json ./
|
||||||
|
COPY backend/package.json ./backend/
|
||||||
|
COPY frontend/package.json ./frontend/
|
||||||
|
COPY discord-bot/package.json ./discord-bot/
|
||||||
|
|
||||||
# Install dependencies
|
# Install the production dependencies of the bot package
|
||||||
RUN npm ci --only=production
|
RUN pnpm install --frozen-lockfile --prod --filter ./discord-bot...
|
||||||
|
|
||||||
# Copy application source
|
# Copy application source
|
||||||
COPY . .
|
COPY discord-bot ./discord-bot
|
||||||
|
|
||||||
# Environment variable
|
# Environment variable
|
||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=production
|
||||||
|
|
||||||
|
# The bot reads .env from its working directory
|
||||||
|
WORKDIR /usr/src/app/discord-bot
|
||||||
|
|
||||||
# The bot only makes outbound connections (Discord gateway + Dragonroll API),
|
# The bot only makes outbound connections (Discord gateway + Dragonroll API),
|
||||||
# it does not listen on a port.
|
# it does not listen on a port.
|
||||||
# Start the application
|
# Start the application
|
||||||
|
|||||||
327
discord-bot/package-lock.json
generated
327
discord-bot/package-lock.json
generated
@@ -1,327 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "dragonroll-discord-bot",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"lockfileVersion": 3,
|
|
||||||
"requires": true,
|
|
||||||
"packages": {
|
|
||||||
"": {
|
|
||||||
"name": "dragonroll-discord-bot",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"dependencies": {
|
|
||||||
"discord.js": "^14.27.0",
|
|
||||||
"dotenv": "^17.2.3"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=20"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@discordjs/builders": {
|
|
||||||
"version": "1.14.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.14.1.tgz",
|
|
||||||
"integrity": "sha512-gSKkhXLqs96TCzk66VZuHHl8z2bQMJFGwrXC0f33ngK+FLNau4hU1PYny3DNJfNdSH+gVMzE85/d5FQ2BpcNwQ==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"@discordjs/formatters": "^0.6.2",
|
|
||||||
"@discordjs/util": "^1.2.0",
|
|
||||||
"@sapphire/shapeshift": "^4.0.0",
|
|
||||||
"discord-api-types": "^0.38.40",
|
|
||||||
"fast-deep-equal": "^3.1.3",
|
|
||||||
"ts-mixer": "^6.0.4",
|
|
||||||
"tslib": "^2.6.3"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=16.11.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/discordjs/discord.js?sponsor"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@discordjs/collection": {
|
|
||||||
"version": "1.5.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-1.5.3.tgz",
|
|
||||||
"integrity": "sha512-SVb428OMd3WO1paV3rm6tSjM4wC+Kecaa1EUGX7vc6/fddvw/6lg90z4QtCqm21zvVe92vMMDt9+DkIvjXImQQ==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=16.11.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@discordjs/formatters": {
|
|
||||||
"version": "0.6.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@discordjs/formatters/-/formatters-0.6.2.tgz",
|
|
||||||
"integrity": "sha512-y4UPwWhH6vChKRkGdMB4odasUbHOUwy7KL+OVwF86PvT6QVOwElx+TiI1/6kcmcEe+g5YRXJFiXSXUdabqZOvQ==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"discord-api-types": "^0.38.33"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=16.11.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/discordjs/discord.js?sponsor"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@discordjs/rest": {
|
|
||||||
"version": "2.6.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-2.6.3.tgz",
|
|
||||||
"integrity": "sha512-wvOylxNYJkwKjctS/Mn5GP1w9r3/rzyH+ThD1JlAca6zEdlHs8QWBBUQJpU5Q+W6DoIj/Ljh1IPlZs7hTU+UAg==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"@discordjs/collection": "^2.1.1",
|
|
||||||
"@discordjs/util": "^1.2.0",
|
|
||||||
"@sapphire/async-queue": "^1.5.3",
|
|
||||||
"@sapphire/snowflake": "^3.5.5",
|
|
||||||
"@vladfrangu/async_event_emitter": "^2.4.6",
|
|
||||||
"discord-api-types": "^0.38.50",
|
|
||||||
"magic-bytes.js": "^1.13.0",
|
|
||||||
"tslib": "^2.6.3",
|
|
||||||
"undici": "^6.27.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/discordjs/discord.js?sponsor"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@discordjs/rest/node_modules/@discordjs/collection": {
|
|
||||||
"version": "2.1.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-2.1.1.tgz",
|
|
||||||
"integrity": "sha512-LiSusze9Tc7qF03sLCujF5iZp7K+vRNEDBZ86FT9aQAv3vxMLihUvKvpsCWiQ2DJq1tVckopKm1rxomgNUc9hg==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/discordjs/discord.js?sponsor"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@discordjs/util": {
|
|
||||||
"version": "1.2.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@discordjs/util/-/util-1.2.0.tgz",
|
|
||||||
"integrity": "sha512-3LKP7F2+atl9vJFhaBjn4nOaSWahZ/yWjOvA4e5pnXkt2qyXRCHLxoBQy81GFtLGCq7K9lPm9R517M1U+/90Qg==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"discord-api-types": "^0.38.33"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/discordjs/discord.js?sponsor"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@discordjs/ws": {
|
|
||||||
"version": "1.2.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/@discordjs/ws/-/ws-1.2.3.tgz",
|
|
||||||
"integrity": "sha512-wPlQDxEmlDg5IxhJPuxXr3Vy9AjYq5xCvFWGJyD7w7Np8ZGu+Mc+97LCoEc/+AYCo2IDpKioiH0/c/mj5ZR9Uw==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"@discordjs/collection": "^2.1.0",
|
|
||||||
"@discordjs/rest": "^2.5.1",
|
|
||||||
"@discordjs/util": "^1.1.0",
|
|
||||||
"@sapphire/async-queue": "^1.5.2",
|
|
||||||
"@types/ws": "^8.5.10",
|
|
||||||
"@vladfrangu/async_event_emitter": "^2.2.4",
|
|
||||||
"discord-api-types": "^0.38.1",
|
|
||||||
"tslib": "^2.6.2",
|
|
||||||
"ws": "^8.17.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=16.11.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/discordjs/discord.js?sponsor"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@discordjs/ws/node_modules/@discordjs/collection": {
|
|
||||||
"version": "2.1.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-2.1.1.tgz",
|
|
||||||
"integrity": "sha512-LiSusze9Tc7qF03sLCujF5iZp7K+vRNEDBZ86FT9aQAv3vxMLihUvKvpsCWiQ2DJq1tVckopKm1rxomgNUc9hg==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/discordjs/discord.js?sponsor"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@sapphire/async-queue": {
|
|
||||||
"version": "1.5.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.5.5.tgz",
|
|
||||||
"integrity": "sha512-cvGzxbba6sav2zZkH8GPf2oGk9yYoD5qrNWdu9fRehifgnFZJMV+nuy2nON2roRO4yQQ+v7MK/Pktl/HgfsUXg==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=v14.0.0",
|
|
||||||
"npm": ">=7.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@sapphire/shapeshift": {
|
|
||||||
"version": "4.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@sapphire/shapeshift/-/shapeshift-4.0.0.tgz",
|
|
||||||
"integrity": "sha512-d9dUmWVA7MMiKobL3VpLF8P2aeanRTu6ypG2OIaEv/ZHH/SUQ2iHOVyi5wAPjQ+HmnMuL0whK9ez8I/raWbtIg==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"fast-deep-equal": "^3.1.3",
|
|
||||||
"lodash": "^4.17.21"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=v16"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@sapphire/snowflake": {
|
|
||||||
"version": "3.5.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.5.tgz",
|
|
||||||
"integrity": "sha512-xzvBr1Q1c4lCe7i6sRnrofxeO1QTP/LKQ6A6qy0iB4x5yfiSfARMEQEghojzTNALDTcv8En04qYNIco9/K9eZQ==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=v14.0.0",
|
|
||||||
"npm": ">=7.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@types/node": {
|
|
||||||
"version": "26.6.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.5.tgz",
|
|
||||||
"integrity": "sha512-uMzsv9stDdofIZBx4UGh4Z9ZgXnGC9seRDscilBcTHAeOFk67MZg/k9bWVfO+bk4qZmG+l52hRnLwUiH2LnJTg==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"undici-types": "~8.9.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@types/ws": {
|
|
||||||
"version": "8.18.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.2.tgz",
|
|
||||||
"integrity": "sha512-67MQl+fpWKVTT1NYdnmo3U4sc/xPo/zQBncVnI74qmQa0z/b+1g6iYqNmGCPbxO+zz2aklb08a0oHfegiVd0/w==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@types/node": "*"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@vladfrangu/async_event_emitter": {
|
|
||||||
"version": "2.4.7",
|
|
||||||
"resolved": "https://registry.npmjs.org/@vladfrangu/async_event_emitter/-/async_event_emitter-2.4.7.tgz",
|
|
||||||
"integrity": "sha512-Xfe6rpCTxSxfbswi/W/Pz7zp1WWSNn4A0eW4mLkQUewCrXXtMj31lCg+iQyTkh/CkusZSq9eDflu7tjEDXUY6g==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=v14.0.0",
|
|
||||||
"npm": ">=7.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/discord-api-types": {
|
|
||||||
"version": "0.38.56",
|
|
||||||
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.38.56.tgz",
|
|
||||||
"integrity": "sha512-Hti4RZsGvF5C7SM8rF2MDHtIm0Hyfrlk84GpEA29nj91tvVVMvX+oQSCodu10t2ZcjFGofq8TX0YyC04B2E69Q==",
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/discord.js": {
|
|
||||||
"version": "14.27.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.27.0.tgz",
|
|
||||||
"integrity": "sha512-qHbFlFG2N7y3LjPySYsL6A1+BnX6bkTVgo842EX0CqVPk/KTMwZkojPHEXKsQUpWZNyz5BISNHK1cPpQw0+m4A==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"@discordjs/builders": "^1.14.1",
|
|
||||||
"@discordjs/collection": "1.5.3",
|
|
||||||
"@discordjs/formatters": "^0.6.2",
|
|
||||||
"@discordjs/rest": "^2.6.2",
|
|
||||||
"@discordjs/util": "^1.2.0",
|
|
||||||
"@discordjs/ws": "^1.2.3",
|
|
||||||
"@sapphire/snowflake": "3.5.5",
|
|
||||||
"discord-api-types": "^0.38.49",
|
|
||||||
"fast-deep-equal": "3.1.3",
|
|
||||||
"lodash.snakecase": "4.1.1",
|
|
||||||
"magic-bytes.js": "^1.13.0",
|
|
||||||
"tslib": "^2.6.3",
|
|
||||||
"undici": "^6.27.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/discordjs/discord.js?sponsor"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/dotenv": {
|
|
||||||
"version": "17.4.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.2.tgz",
|
|
||||||
"integrity": "sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==",
|
|
||||||
"license": "BSD-2-Clause",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://dotenvx.com"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/fast-deep-equal": {
|
|
||||||
"version": "3.1.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
|
|
||||||
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/lodash": {
|
|
||||||
"version": "4.18.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
|
|
||||||
"integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/lodash.snakecase": {
|
|
||||||
"version": "4.1.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz",
|
|
||||||
"integrity": "sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==",
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/magic-bytes.js": {
|
|
||||||
"version": "1.13.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.13.1.tgz",
|
|
||||||
"integrity": "sha512-x5sn4UX2k5gCWlcfmoFwG4TPie8+dctESyqOBdhB5p6MsgWXdBKGmt9nXPObj/JI50TTL928lc5Yt1WntMn1bw==",
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/ts-mixer": {
|
|
||||||
"version": "6.0.4",
|
|
||||||
"resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.4.tgz",
|
|
||||||
"integrity": "sha512-ufKpbmrugz5Aou4wcr5Wc1UUFWOLhq+Fm6qa6P0w0K5Qw2yhaUoiWszhCVuNQyNwrlGiscHOmqYoAox1PtvgjA==",
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/tslib": {
|
|
||||||
"version": "2.8.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
|
|
||||||
"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
|
|
||||||
"license": "0BSD"
|
|
||||||
},
|
|
||||||
"node_modules/undici": {
|
|
||||||
"version": "6.29.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/undici/-/undici-6.29.0.tgz",
|
|
||||||
"integrity": "sha512-R+RODBqp6i2pPflGdq+xIOUkl+RNfGgHwoinecKu/JCuf2uO06cOKoDbI2P7Dn6KcswdKwrczbU6IYJ6K8X+wg==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18.17"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/undici-types": {
|
|
||||||
"version": "8.9.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.9.0.tgz",
|
|
||||||
"integrity": "sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==",
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/ws": {
|
|
||||||
"version": "8.22.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.22.0.tgz",
|
|
||||||
"integrity": "sha512-Ydggc987+RO0AnWtZ/7Wq9FtNvcrL1b/RO0ud9mWjUPgDrsAAwQSF51sm2hm1XofbU/4jkpGEsLFsZZxU+1DOg==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10.0.0"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"bufferutil": "^4.0.1",
|
|
||||||
"utf-8-validate": ">=5.0.2"
|
|
||||||
},
|
|
||||||
"peerDependenciesMeta": {
|
|
||||||
"bufferutil": {
|
|
||||||
"optional": true
|
|
||||||
},
|
|
||||||
"utf-8-validate": {
|
|
||||||
"optional": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -47,11 +47,23 @@ function createDragonrollApi(config) {
|
|||||||
return payload;
|
return payload;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The backend hands out the sign-up link the person opens to pick a campaign,
|
||||||
|
// so the bot never builds one itself: every service shows the same link.
|
||||||
async function startAuthorization(guildId, guildName, discordUserId, discordUserName) {
|
async function startAuthorization(guildId, guildName, discordUserId, discordUserName) {
|
||||||
return request('/discord/link/start', {
|
const payload = await request('/link/start', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
body: JSON.stringify({ guildId, guildName, discordUserId, discordUserName })
|
body: JSON.stringify({
|
||||||
|
service: 'discord',
|
||||||
|
target: {
|
||||||
|
id: String(guildId),
|
||||||
|
name: guildName,
|
||||||
|
user: discordUserName,
|
||||||
|
meta: { userId: String(discordUserId) }
|
||||||
|
}
|
||||||
|
})
|
||||||
});
|
});
|
||||||
|
if (!payload.linkUrl) throw new Error('Dragonroll did not provide a sign-up link. Update the Dragonroll backend.');
|
||||||
|
return payload;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function claimLinkNotifications() {
|
async function claimLinkNotifications() {
|
||||||
|
|||||||
@@ -4,25 +4,24 @@ const SETTING_PUSH_TOKEN = "pushToken";
|
|||||||
const SETTING_BRIDGE_CONFIG = "bridgeConfig";
|
const SETTING_BRIDGE_CONFIG = "bridgeConfig";
|
||||||
const SETTING_DRAGONROLL_API_URL = "dragonrollApiUrl";
|
const SETTING_DRAGONROLL_API_URL = "dragonrollApiUrl";
|
||||||
const SETTING_LINK_CODE = "linkCode";
|
const SETTING_LINK_CODE = "linkCode";
|
||||||
|
const SETTING_LINK_URL = "linkUrl";
|
||||||
const SETTING_PAIRING_STATUS = "pairingStatus";
|
const SETTING_PAIRING_STATUS = "pairingStatus";
|
||||||
const SETTING_SYNC_TOKEN = "syncToken";
|
const SETTING_SYNC_TOKEN = "syncToken";
|
||||||
const SETTING_AUTO_SYNC = "autoSync";
|
const SETTING_AUTO_SYNC = "autoSync";
|
||||||
|
// How often a world asks Dragonroll whether its sign-up link has been answered.
|
||||||
|
const LINK_POLL_MS = 5000;
|
||||||
let syncTimeout;
|
let syncTimeout;
|
||||||
let syncInProgress = false;
|
let syncInProgress = false;
|
||||||
let syncRequested = false;
|
let syncRequested = false;
|
||||||
let handlingLinkCode = false;
|
let askingForLink = false;
|
||||||
let updatingLinkCodeSetting = false;
|
let checkingLink = false;
|
||||||
let linkRetriesDisabled = false;
|
let updatingLinkSetting = false;
|
||||||
const FATAL_LINK_ERRORS = new Set([
|
|
||||||
"foundry.errors.link-expired",
|
|
||||||
"foundry.errors.world-already-linked",
|
|
||||||
]);
|
|
||||||
// Marks a pairing Dragonroll honoured once and no longer accepts: the campaign
|
// Marks a pairing Dragonroll honoured once and no longer accepts: the campaign
|
||||||
// unlinked this world, so the token this client holds is dead.
|
// unlinked this world, so the token this client holds is dead.
|
||||||
const PAIRING_REVOKED = "revoked";
|
const PAIRING_REVOKED = "revoked";
|
||||||
let updatingPairingStatus = false;
|
let updatingPairingStatus = false;
|
||||||
let linkedCampaignName = "";
|
let linkedCampaignName = "";
|
||||||
let pairingProblem = "";
|
let linkProblem = "";
|
||||||
let actorSyncTimeout;
|
let actorSyncTimeout;
|
||||||
let characterSyncRunning = false;
|
let characterSyncRunning = false;
|
||||||
let actorSyncErrorLogged = false;
|
let actorSyncErrorLogged = false;
|
||||||
@@ -138,18 +137,24 @@ Hooks.once("init", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
game.settings.register(MODULE_ID, SETTING_LINK_CODE, {
|
game.settings.register(MODULE_ID, SETTING_LINK_CODE, {
|
||||||
name: "Dragonroll Campaign Pairing Code",
|
name: "Dragonroll Connection Link Code",
|
||||||
hint: "Paste a pairing code created in Dragonroll campaign settings.",
|
|
||||||
scope: "client",
|
scope: "client",
|
||||||
config: true,
|
config: false,
|
||||||
|
type: String,
|
||||||
|
default: "",
|
||||||
|
});
|
||||||
|
|
||||||
|
game.settings.register(MODULE_ID, SETTING_LINK_URL, {
|
||||||
|
name: "Dragonroll Connection Link",
|
||||||
|
scope: "client",
|
||||||
|
config: false,
|
||||||
type: String,
|
type: String,
|
||||||
default: "",
|
default: "",
|
||||||
onChange: handleLinkCodeChange,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
game.settings.register(MODULE_ID, SETTING_PAIRING_STATUS, {
|
game.settings.register(MODULE_ID, SETTING_PAIRING_STATUS, {
|
||||||
name: "Dragonroll Pairing Status",
|
name: "Dragonroll Pairing Status",
|
||||||
hint: "Whether this world is connected to a Dragonroll campaign. The module keeps this text up to date and the pairing lives in the browser of whoever linked the world: there is nothing to set here.",
|
hint: "Whether this world is connected to a Dragonroll campaign. The module keeps this text up to date: it asks Dragonroll for a sign-up link, and whoever opens that link picks the campaign. There is nothing to set here.",
|
||||||
scope: "client",
|
scope: "client",
|
||||||
config: true,
|
config: true,
|
||||||
type: String,
|
type: String,
|
||||||
@@ -218,39 +223,54 @@ async function getDragonroll(path, token) {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
function linkErrorMessage(error) {
|
// --- Connecting a world ----------------------------------------------------
|
||||||
const messages = {
|
// A world does not paste a code into its settings any more: it asks Dragonroll
|
||||||
"foundry.errors.link-expired": "The pairing code is invalid, expired, or already used.",
|
// for the same sign-up link every service gets, the GM opens it and picks the
|
||||||
"foundry.errors.world-already-linked": "This Foundry world is already linked to another campaign.",
|
// campaign this world may work on. That link then hands the world its token.
|
||||||
|
|
||||||
|
function worldLinkRequest() {
|
||||||
|
const world = api.getWorld();
|
||||||
|
return {
|
||||||
|
service: "foundry",
|
||||||
|
target: {
|
||||||
|
id: world.id,
|
||||||
|
name: world.title,
|
||||||
|
user: game.user?.name || "",
|
||||||
|
meta: { system: world.system, url: world.url },
|
||||||
|
},
|
||||||
};
|
};
|
||||||
return messages[error.message] || error.message;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function setLinkCode(value) {
|
async function setLink(code, url) {
|
||||||
updatingLinkCodeSetting = true;
|
updatingLinkSetting = true;
|
||||||
try {
|
try {
|
||||||
await game.settings.set(MODULE_ID, SETTING_LINK_CODE, value);
|
await game.settings.set(MODULE_ID, SETTING_LINK_CODE, code);
|
||||||
|
await game.settings.set(MODULE_ID, SETTING_LINK_URL, url);
|
||||||
} finally {
|
} finally {
|
||||||
updatingLinkCodeSetting = false;
|
updatingLinkSetting = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleLinkCodeChange(value) {
|
async function requestDragonrollLink() {
|
||||||
if (updatingLinkCodeSetting || handlingLinkCode || !value?.trim()) return;
|
if (askingForLink || !game.user?.isGM || !game.world) return;
|
||||||
linkRetriesDisabled = false;
|
askingForLink = true;
|
||||||
// A code typed by hand supersedes whatever went wrong with the last one.
|
|
||||||
pairingProblem = "";
|
|
||||||
setPairingStatus(pairingStatusText());
|
|
||||||
completeDragonrollCampaignLink(value.trim());
|
|
||||||
}
|
|
||||||
|
|
||||||
async function completeDragonrollCampaignLink(code, options = {}) {
|
|
||||||
if (handlingLinkCode) return;
|
|
||||||
handlingLinkCode = true;
|
|
||||||
const notifyOnError = options.notifyOnError !== false;
|
|
||||||
try {
|
try {
|
||||||
if (!game.user?.isGM || !game.world) throw new Error("Open the world as a GM to link it.");
|
const result = await postDragonroll("link/start", worldLinkRequest());
|
||||||
const result = await postDragonroll("foundry/link/complete", { code, world: api.getWorld() });
|
linkProblem = "";
|
||||||
|
await setLink(String(result.code || ""), String(result.linkUrl || ""));
|
||||||
|
ui.notifications?.info(`Open this link to pick the Dragonroll campaign for this world: ${result.linkUrl}`);
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`${MODULE_ID} | Could not get a Dragonroll connection link.`, error);
|
||||||
|
linkProblem = error.message;
|
||||||
|
} finally {
|
||||||
|
askingForLink = false;
|
||||||
|
await setPairingStatus(pairingStatusText());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// What a link leaves this client with once a campaign has been picked: the token
|
||||||
|
// its sync runs on, and the bridge settings that came with it.
|
||||||
|
async function applyDragonrollLink(result) {
|
||||||
let syncTokenStored = false;
|
let syncTokenStored = false;
|
||||||
if (result.syncToken) {
|
if (result.syncToken) {
|
||||||
try {
|
try {
|
||||||
@@ -265,43 +285,51 @@ async function completeDragonrollCampaignLink(code, options = {}) {
|
|||||||
await game.settings.set(MODULE_ID, SETTING_BRIDGE_CONFIG, result.bridgeConfig);
|
await game.settings.set(MODULE_ID, SETTING_BRIDGE_CONFIG, result.bridgeConfig);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`${MODULE_ID} | Could not save the bridge configuration.`, error);
|
console.error(`${MODULE_ID} | Could not save the bridge configuration.`, error);
|
||||||
ui.notifications?.warn("The world was linked, but its bridge settings could not be saved on this client.");
|
ui.notifications?.warn("This world was linked, but its bridge settings could not be saved on this client.");
|
||||||
}
|
|
||||||
}
|
|
||||||
// Keep an unprocessed pairing code in the setting when its sync token could
|
|
||||||
// not be saved, so the retry below can complete the link again.
|
|
||||||
if (syncTokenStored || !result.syncToken) await setLinkCode("");
|
|
||||||
if (!syncTokenStored) {
|
|
||||||
ui.notifications?.warn("The world was linked, but character sync is unavailable. Update Dragonroll and link the world again.");
|
|
||||||
}
|
|
||||||
scheduleSnapshotSync(0);
|
|
||||||
setTimeout(initializeCharacterSync, 0);
|
|
||||||
setTimeout(reconcileDragonrollItems, 2000);
|
|
||||||
linkedCampaignName = String(result.campaign?.name || "").trim();
|
|
||||||
ui.notifications?.info("This Foundry world is now linked to the Dragonroll campaign.");
|
|
||||||
await setPairingStatus(pairingStatusText());
|
|
||||||
} catch (error) {
|
|
||||||
console.error(`${MODULE_ID} | Could not complete the campaign link.`, error);
|
|
||||||
// Expired or already-used codes will never redeem, so stop the background
|
|
||||||
// retry; any error keeps retrying (the Dragonroll server may be restarting).
|
|
||||||
linkRetriesDisabled = FATAL_LINK_ERRORS.has(error.message);
|
|
||||||
// Only a code that can never be redeemed belongs in the status: while the
|
|
||||||
// retry is still running, waiting for Dragonroll is the honest text.
|
|
||||||
if (linkRetriesDisabled) pairingProblem = linkErrorMessage(error);
|
|
||||||
if (notifyOnError) ui.notifications?.error(linkErrorMessage(error));
|
|
||||||
await setPairingStatus(pairingStatusText());
|
|
||||||
} finally {
|
|
||||||
handlingLinkCode = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// A pairing code entered while the Dragonroll server was unreachable (or just
|
linkedCampaignName = String(result.campaign?.name || "").trim();
|
||||||
// before Foundry restarted) stays in the setting; redeem it on world start so
|
await setLink("", "");
|
||||||
// the connection survives restarts without typing the code in again.
|
if (syncTokenStored) {
|
||||||
async function resumePendingDragonrollLink(options = {}) {
|
ui.notifications?.info("This Foundry world is now linked to the Dragonroll campaign.");
|
||||||
if (handlingLinkCode || !game.user?.isGM || !game.world) return;
|
scheduleSnapshotSync(0);
|
||||||
|
setTimeout(initializeCharacterSync, 0);
|
||||||
|
setTimeout(reconcileDragonrollItems, 2000);
|
||||||
|
} else {
|
||||||
|
// Without a token this client cannot sync, and only a fresh link gives one.
|
||||||
|
linkProblem = "this client could not save the token it was given";
|
||||||
|
ui.notifications?.warn("This world is linked to a Dragonroll campaign, but character sync is unavailable. Update Dragonroll and link the world again.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Where the sign-up link stands: still waiting for the GM to pick a campaign,
|
||||||
|
// finished and handing its token over, or gone, in which case there is a new
|
||||||
|
// link to show instead of a world that quietly stops trying.
|
||||||
|
async function advanceDragonrollLink() {
|
||||||
|
if (askingForLink || checkingLink || !game.user?.isGM || !game.world || getSyncToken()) return;
|
||||||
const code = game.settings.get(MODULE_ID, SETTING_LINK_CODE)?.trim();
|
const code = game.settings.get(MODULE_ID, SETTING_LINK_CODE)?.trim();
|
||||||
if (code) await completeDragonrollCampaignLink(code, options);
|
if (!code) return requestDragonrollLink();
|
||||||
|
|
||||||
|
checkingLink = true;
|
||||||
|
try {
|
||||||
|
const result = await postDragonroll("link/pickup", { code });
|
||||||
|
if (result.state === "pending") return;
|
||||||
|
if (result.state === "linked") await applyDragonrollLink(result);
|
||||||
|
else if (result.state === "revoked") {
|
||||||
|
linkProblem = PAIRING_REVOKED;
|
||||||
|
await setLink("", "");
|
||||||
|
} else {
|
||||||
|
await setLink("", "");
|
||||||
|
await requestDragonrollLink();
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
// Dragonroll may be restarting: the next check asks again.
|
||||||
|
console.warn(`${MODULE_ID} | Could not check the Dragonroll connection link.`, error);
|
||||||
|
} finally {
|
||||||
|
checkingLink = false;
|
||||||
|
await setPairingStatus(pairingStatusText());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Pairing status --------------------------------------------------------
|
// --- Pairing status --------------------------------------------------------
|
||||||
@@ -310,19 +338,22 @@ async function resumePendingDragonrollLink(options = {}) {
|
|||||||
// reads correctly from the first frame and is corrected by refreshPairingStatus.
|
// reads correctly from the first frame and is corrected by refreshPairingStatus.
|
||||||
|
|
||||||
function pairingStatusText() {
|
function pairingStatusText() {
|
||||||
if (pairingProblem === PAIRING_REVOKED) {
|
const link = game.settings.get(MODULE_ID, SETTING_LINK_URL)?.trim();
|
||||||
return "Not connected: this world is no longer linked to the Dragonroll campaign it was paired with. Create a new pairing code there to link it again.";
|
if (linkProblem === PAIRING_REVOKED) {
|
||||||
|
return link
|
||||||
|
? `Not connected: this world is no longer linked to the Dragonroll campaign it was paired with. Open ${link} to pick a campaign again.`
|
||||||
|
: "Not connected: this world is no longer linked to the Dragonroll campaign it was paired with. Its settings will show a link to pick one again.";
|
||||||
}
|
}
|
||||||
if (getSyncToken()) {
|
if (getSyncToken()) {
|
||||||
return linkedCampaignName
|
return linkedCampaignName
|
||||||
? `Connected to the Dragonroll campaign "${linkedCampaignName}".`
|
? `Connected to the Dragonroll campaign "${linkedCampaignName}".`
|
||||||
: "Connected to a Dragonroll campaign.";
|
: "Connected to a Dragonroll campaign.";
|
||||||
}
|
}
|
||||||
if (pairingProblem) return `Not connected: Dragonroll did not accept that pairing code (${pairingProblem})`;
|
if (linkProblem) return `Not connected: Dragonroll did not answer this world's link (${linkProblem})`;
|
||||||
if (game.settings.get(MODULE_ID, SETTING_LINK_CODE)?.trim()) {
|
if (link) {
|
||||||
return "Not connected yet: waiting for Dragonroll to accept this pairing code.";
|
return `Not connected yet: open ${link} in a browser, sign in and pick the campaign for this world.`;
|
||||||
}
|
}
|
||||||
return "Not connected to a Dragonroll campaign. Paste a pairing code from that campaign's settings to link this world.";
|
return "Not connected to a Dragonroll campaign. Set the Dragonroll Endpoint in these settings, then reload this world to get a sign-up link.";
|
||||||
}
|
}
|
||||||
|
|
||||||
async function setPairingStatus(text) {
|
async function setPairingStatus(text) {
|
||||||
@@ -357,12 +388,19 @@ async function refreshPairingStatus() {
|
|||||||
try {
|
try {
|
||||||
const result = await getDragonroll("foundry/sync/status", token);
|
const result = await getDragonroll("foundry/sync/status", token);
|
||||||
linkedCampaignName = String(result.campaign?.name || "").trim();
|
linkedCampaignName = String(result.campaign?.name || "").trim();
|
||||||
if (pairingProblem === PAIRING_REVOKED) pairingProblem = "";
|
if (linkProblem === PAIRING_REVOKED) linkProblem = "";
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// An unauthorized token is a campaign that unlinked this world. Any other
|
// An unauthorized token is a campaign that unlinked this world. Any other
|
||||||
// failure (an unreachable Dragonroll, or one old enough to have no status
|
// failure (an unreachable Dragonroll, or one old enough to have no status
|
||||||
// route) says nothing about the pairing, so keep showing what we know.
|
// route) says nothing about the pairing, so keep showing what we know.
|
||||||
if (error.message === "unauthorized") pairingProblem = PAIRING_REVOKED;
|
if (error.message === "unauthorized") {
|
||||||
|
linkProblem = PAIRING_REVOKED;
|
||||||
|
linkedCampaignName = "";
|
||||||
|
// The dead token is dropped so the world stops pushing to a campaign that
|
||||||
|
// no longer wants it, and its link check asks for a sign-up link again.
|
||||||
|
await game.settings.set(MODULE_ID, SETTING_SYNC_TOKEN, "");
|
||||||
|
ui.notifications?.warn("This world is no longer linked to its Dragonroll campaign. Its settings show the link to pick one again.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
await setPairingStatus(pairingStatusText());
|
await setPairingStatus(pairingStatusText());
|
||||||
}
|
}
|
||||||
@@ -1140,11 +1178,13 @@ async function publishHeartbeat() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Hooks.once("ready", () => {
|
Hooks.once("ready", () => {
|
||||||
resumePendingDragonrollLink().then(refreshPairingStatus);
|
advanceDragonrollLink().then(refreshPairingStatus);
|
||||||
|
// While this world has no campaign, its sign-up link is what the GM has to
|
||||||
|
// work with: keep showing it and keep asking whether it has been answered.
|
||||||
setInterval(() => {
|
setInterval(() => {
|
||||||
if (linkRetriesDisabled) return;
|
if (getSyncToken()) return;
|
||||||
resumePendingDragonrollLink({ notifyOnError: false });
|
advanceDragonrollLink();
|
||||||
}, 60000);
|
}, LINK_POLL_MS);
|
||||||
setInterval(refreshPairingStatus, 60000);
|
setInterval(refreshPairingStatus, 60000);
|
||||||
scheduleSnapshotSync(0);
|
scheduleSnapshotSync(0);
|
||||||
setInterval(publishHeartbeat, 60000);
|
setInterval(publishHeartbeat, 60000);
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
# ---------- Build Stage ----------
|
# ---------- Build Stage ----------
|
||||||
FROM node:20-alpine AS builder
|
FROM node:20-alpine AS builder
|
||||||
|
|
||||||
|
# pnpm is served by corepack and pinned by "packageManager" in the root package.json
|
||||||
|
RUN corepack enable
|
||||||
|
|
||||||
ARG NUXT_PUBLIC_GIT_COMMIT
|
ARG NUXT_PUBLIC_GIT_COMMIT
|
||||||
ARG NUXT_PUBLIC_GIT_TAG
|
ARG NUXT_PUBLIC_GIT_TAG
|
||||||
ARG NUXT_PUBLIC_GIT_BRANCH
|
ARG NUXT_PUBLIC_GIT_BRANCH
|
||||||
@@ -11,18 +14,21 @@ ENV NUXT_PUBLIC_GIT_BRANCH=$NUXT_PUBLIC_GIT_BRANCH
|
|||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Copy package files
|
# Copy the workspace manifests (pnpm needs every package.json of the workspace)
|
||||||
COPY package*.json ./
|
COPY pnpm-workspace.yaml pnpm-lock.yaml package.json ./
|
||||||
|
COPY backend/package.json ./backend/
|
||||||
|
COPY frontend/package.json ./frontend/
|
||||||
|
COPY discord-bot/package.json ./discord-bot/
|
||||||
|
|
||||||
# Install dependencies
|
# Install the dependencies of the frontend package
|
||||||
RUN npm install
|
RUN pnpm install --frozen-lockfile --filter ./frontend...
|
||||||
|
|
||||||
# Copy project files
|
# Copy project files
|
||||||
ARG CACHEBUST=1
|
ARG CACHEBUST=1
|
||||||
COPY . .
|
COPY frontend ./frontend
|
||||||
|
|
||||||
# Build the Nuxt app
|
# Build the Nuxt app
|
||||||
RUN npm run build
|
RUN pnpm --filter ./frontend run build
|
||||||
|
|
||||||
# ---------- Production Stage ----------
|
# ---------- Production Stage ----------
|
||||||
FROM node:20-alpine
|
FROM node:20-alpine
|
||||||
@@ -30,7 +36,7 @@ FROM node:20-alpine
|
|||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Copy built output
|
# Copy built output
|
||||||
COPY --from=builder /app/.output ./.output
|
COPY --from=builder /app/frontend/.output ./.output
|
||||||
|
|
||||||
# Expose Nuxt port
|
# Expose Nuxt port
|
||||||
EXPOSE 3000
|
EXPOSE 3000
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
import ContentManager from './components/managers/ContentManager.vue';
|
import ContentManager from './components/managers/ContentManager.vue';
|
||||||
import ToastManager from './components/managers/ToastManager.vue';
|
import ToastManager from './components/managers/ToastManager.vue';
|
||||||
import WindowManager from './components/managers/WindowManager.vue';
|
import WindowManager from './components/managers/WindowManager.vue';
|
||||||
import DiscordAuthorize from './components/views/DiscordAuthorize.vue';
|
import ServiceLinkAuthorize from './components/views/ServiceLinkAuthorize.vue';
|
||||||
|
|
||||||
import { CreateWindow } from '@/services/Windows'
|
import { CreateWindow } from '@/services/Windows'
|
||||||
import { GetUser, HasAdmin } from './services/User';
|
import { GetUser, HasAdmin } from './services/User';
|
||||||
@@ -12,10 +12,14 @@ import { useCampaignService } from './services/Campaign';
|
|||||||
|
|
||||||
const { RestoreCampaign } = useCampaignService();
|
const { RestoreCampaign } = useCampaignService();
|
||||||
|
|
||||||
// El bot de Discord enllaça amb aquesta pantalla; no és part de l'aplicació i no ha d'arrencar
|
// Els serveis (Discord, Foundry, Obsidian) enllacen amb aquesta pantalla única; no són part
|
||||||
// les finestres normals.
|
// de l'aplicació i no han d'arrencar les finestres normals. La ruta antiga de Discord també
|
||||||
|
// hi porta, perquè els enllaços que ja corren per Discord no queden morts.
|
||||||
const requestUrl = useRequestURL();
|
const requestUrl = useRequestURL();
|
||||||
const isDiscordAuthorize = computed(() => requestUrl.pathname.replace(/\/+$/, '') === '/discord/authorize');
|
const isServiceLink = computed(() => {
|
||||||
|
const path = requestUrl.pathname.replace(/\/+$/, '');
|
||||||
|
return path === '/link/authorize' || path === '/discord/authorize';
|
||||||
|
});
|
||||||
|
|
||||||
async function start(){
|
async function start(){
|
||||||
if(GetUser()){
|
if(GetUser()){
|
||||||
@@ -46,14 +50,14 @@ useHead({
|
|||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
setupTheme();
|
setupTheme();
|
||||||
setTheme('dark');
|
setTheme('dark');
|
||||||
if(!isDiscordAuthorize.value){
|
if(!isServiceLink.value){
|
||||||
start();
|
start();
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<DiscordAuthorize v-if="isDiscordAuthorize"></DiscordAuthorize>
|
<ServiceLinkAuthorize v-if="isServiceLink"></ServiceLinkAuthorize>
|
||||||
<div v-else class="viewer">
|
<div v-else class="viewer">
|
||||||
<ToastManager></ToastManager>
|
<ToastManager></ToastManager>
|
||||||
<TooltipManager></TooltipManager>
|
<TooltipManager></TooltipManager>
|
||||||
|
|||||||
@@ -665,7 +665,11 @@ onBeforeUnmount(() => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.entity-entry {
|
.entity-entry {
|
||||||
width: 100%; padding: 9px 10px; border: 1px solid transparent; border-radius: 8px;
|
/* These rows are divs (the note and folder rows are buttons) and there is no global box-sizing
|
||||||
|
reset, so without border-box the padding and border add onto the 100% width and the entry
|
||||||
|
sticks out of the sidebar. */
|
||||||
|
width: 100%; min-width: 0; box-sizing: border-box; padding: 9px 10px; border: 1px solid transparent;
|
||||||
|
border-radius: 8px;
|
||||||
background: transparent; color: var(--color-text); text-align: left; display: flex; flex-direction: column;
|
background: transparent; color: var(--color-text); text-align: left; display: flex; flex-direction: column;
|
||||||
gap: 3px; cursor: pointer;
|
gap: 3px; cursor: pointer;
|
||||||
}
|
}
|
||||||
@@ -673,8 +677,8 @@ onBeforeUnmount(() => {
|
|||||||
.entity-entry:focus-visible { outline: 1px solid var(--color-link); }
|
.entity-entry:focus-visible { outline: 1px solid var(--color-link); }
|
||||||
/* The map currently anchored on the note container. */
|
/* The map currently anchored on the note container. */
|
||||||
.entity-entry.anchored { border-color: var(--color-link); background: var(--color-background-soft); }
|
.entity-entry.anchored { border-color: var(--color-link); background: var(--color-background-soft); }
|
||||||
.entity-entry-name-row { display: flex; align-items: baseline; gap: 6px; }
|
.entity-entry-name-row { display: flex; align-items: baseline; gap: 6px; min-width: 0; }
|
||||||
.entity-entry-name { font-weight: bold; }
|
.entity-entry-name { font-weight: bold; min-width: 0; word-break: break-word; }
|
||||||
.entity-entry-sync {
|
.entity-entry-sync {
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
letter-spacing: 0.04em;
|
letter-spacing: 0.04em;
|
||||||
|
|||||||
@@ -89,9 +89,11 @@ onMounted(() => {
|
|||||||
.steps {
|
.steps {
|
||||||
margin-left: 8px;
|
margin-left: 8px;
|
||||||
height: 22px;
|
height: 22px;
|
||||||
> {
|
|
||||||
font-size: 12px;
|
|
||||||
}
|
}
|
||||||
|
/* No nested `> {}` here: the scoped style transform turns it into a dangling
|
||||||
|
combinator, which the current CSS minifier rejects. */
|
||||||
|
.steps > * {
|
||||||
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
.steps :deep(.roll-val){
|
.steps :deep(.roll-val){
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
|
|||||||
@@ -1,260 +0,0 @@
|
|||||||
<script setup>
|
|
||||||
import { onMounted, ref } from 'vue';
|
|
||||||
import Server from '~/services/Server';
|
|
||||||
import { GetUser, SetUser } from '~/services/User';
|
|
||||||
import { AddSound } from '~/services/Sound';
|
|
||||||
import Spinner from '../partials/Spinner.vue';
|
|
||||||
|
|
||||||
// Pantalla autònoma que el bot obre des de Discord: l'usuari s'identifica aquí
|
|
||||||
// i autoritza el servidor de Discord que s'ha rebut per la URL.
|
|
||||||
useHead({ title: 'Connect Dragonroll to Discord' });
|
|
||||||
|
|
||||||
const card = ref(null);
|
|
||||||
|
|
||||||
const code = ref('');
|
|
||||||
const guildName = ref('');
|
|
||||||
const discordUserName = ref('');
|
|
||||||
const signedInAs = ref('');
|
|
||||||
const connectedGuild = ref('');
|
|
||||||
|
|
||||||
// 'checking' | 'login' | 'approve' | 'connected' | 'error'
|
|
||||||
const status = ref('checking');
|
|
||||||
const messageKey = ref('');
|
|
||||||
|
|
||||||
const username = ref('');
|
|
||||||
const password = ref('');
|
|
||||||
const busy = ref(false);
|
|
||||||
|
|
||||||
function readCode() {
|
|
||||||
const hash = new URLSearchParams(window.location.hash.slice(1));
|
|
||||||
const search = new URLSearchParams(window.location.search);
|
|
||||||
return hash.get('code') || search.get('code') || '';
|
|
||||||
}
|
|
||||||
|
|
||||||
function ShowError(key) {
|
|
||||||
messageKey.value = key;
|
|
||||||
}
|
|
||||||
|
|
||||||
function PrepareApproval() {
|
|
||||||
const user = GetUser();
|
|
||||||
if (!user) {
|
|
||||||
status.value = 'login';
|
|
||||||
messageKey.value = '';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
signedInAs.value = user.username || user.name || user.email || 'Dragonroll';
|
|
||||||
status.value = 'approve';
|
|
||||||
messageKey.value = '';
|
|
||||||
}
|
|
||||||
|
|
||||||
async function LoadRequest() {
|
|
||||||
const response = await Server().post('/discord/link/details', { code: code.value });
|
|
||||||
const details = response.data;
|
|
||||||
if (details.status !== 'ok') {
|
|
||||||
status.value = 'error';
|
|
||||||
ShowError('discord.errors.link-expired');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
guildName.value = details.guildName;
|
|
||||||
discordUserName.value = details.discordUserName;
|
|
||||||
PrepareApproval();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function SignIn() {
|
|
||||||
busy.value = true;
|
|
||||||
messageKey.value = '';
|
|
||||||
try {
|
|
||||||
const response = await Server().post('/user/login', {
|
|
||||||
usermail: username.value,
|
|
||||||
password: password.value
|
|
||||||
});
|
|
||||||
|
|
||||||
if (response.data.status !== 'ok' || !response.data.token) {
|
|
||||||
ShowError(response.data.msg || 'discord.errors.sign-in-failed');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// El token passa al servei d'usuari perquè el client el reutilitzi en autoritzar.
|
|
||||||
SetUser(response.data.token);
|
|
||||||
password.value = '';
|
|
||||||
PrepareApproval();
|
|
||||||
} catch {
|
|
||||||
ShowError('discord.errors.sign-in-failed');
|
|
||||||
} finally {
|
|
||||||
busy.value = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function Authorize() {
|
|
||||||
busy.value = true;
|
|
||||||
try {
|
|
||||||
const response = await Server().post('/discord/link/complete', { code: code.value });
|
|
||||||
|
|
||||||
if (response.data.status !== 'ok') {
|
|
||||||
status.value = 'error';
|
|
||||||
ShowError('discord.errors.link-expired');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
connectedGuild.value = response.data.guildName;
|
|
||||||
status.value = 'connected';
|
|
||||||
messageKey.value = '';
|
|
||||||
// El codi ja s'ha fet servir, treu-lo de la barra d'adreces.
|
|
||||||
window.history.replaceState(null, '', window.location.pathname);
|
|
||||||
} catch (error) {
|
|
||||||
if (error?.response?.status === 401) {
|
|
||||||
status.value = 'login';
|
|
||||||
ShowError('discord.errors.session-expired');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
status.value = 'error';
|
|
||||||
ShowError('discord.errors.link-expired');
|
|
||||||
} finally {
|
|
||||||
busy.value = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
AddSound(card.value);
|
|
||||||
code.value = readCode();
|
|
||||||
|
|
||||||
if (!code.value) {
|
|
||||||
status.value = 'error';
|
|
||||||
ShowError('discord.errors.missing-code');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
LoadRequest().catch(() => {
|
|
||||||
status.value = 'error';
|
|
||||||
ShowError('discord.errors.internal');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<template>
|
|
||||||
<div class="discord-authorize">
|
|
||||||
<main class="authorize-card" ref="card">
|
|
||||||
<h1>{{ $t('discord.title') }}</h1>
|
|
||||||
|
|
||||||
<p v-if="guildName" class="summary">
|
|
||||||
{{ $t('discord.summary', { guild: guildName, user: discordUserName }) }}
|
|
||||||
</p>
|
|
||||||
<p v-else-if="status !== 'error'" class="summary">
|
|
||||||
<Spinner v-if="status === 'checking'"></Spinner>
|
|
||||||
<span v-else>{{ $t('discord.checking') }}</span>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<form v-if="status === 'login'" v-on:submit.prevent="SignIn">
|
|
||||||
<p>{{ $t('discord.sign-in-lead') }}</p>
|
|
||||||
<div class="form-field">
|
|
||||||
<label for="discord-authorize-usermail">{{ $t('login.username') }}</label>
|
|
||||||
<input
|
|
||||||
id="discord-authorize-usermail"
|
|
||||||
type="text"
|
|
||||||
:placeholder="$t('login.username-placeholder')"
|
|
||||||
name="usermail"
|
|
||||||
autocomplete="username"
|
|
||||||
v-model="username"
|
|
||||||
required
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
<div class="form-field">
|
|
||||||
<label for="discord-authorize-password">{{ $t('login.password') }}</label>
|
|
||||||
<input
|
|
||||||
id="discord-authorize-password"
|
|
||||||
type="password"
|
|
||||||
name="password"
|
|
||||||
autocomplete="current-password"
|
|
||||||
v-model="password"
|
|
||||||
required
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
<button class="btn-primary sound-click" type="submit" :disabled="busy">
|
|
||||||
<Spinner v-if="busy"></Spinner>
|
|
||||||
<span v-else>{{ $t('login.log-in') }}</span>
|
|
||||||
</button>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<section v-if="status === 'approve'">
|
|
||||||
<p>{{ $t('discord.signed-in-as', { user: signedInAs }) }}</p>
|
|
||||||
<p class="hint">{{ $t('discord.next-step') }}</p>
|
|
||||||
<p class="hint">{{ $t('discord.replace-warning') }}</p>
|
|
||||||
<button class="btn-primary sound-click" type="button" :disabled="busy" v-on:click="Authorize">
|
|
||||||
<Spinner v-if="busy"></Spinner>
|
|
||||||
<span v-else>{{ $t('discord.approve') }}</span>
|
|
||||||
</button>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section v-if="status === 'connected'">
|
|
||||||
<p class="success">{{ $t('discord.connected', { guild: connectedGuild }) }}</p>
|
|
||||||
<p class="hint">{{ $t('discord.next-step') }}</p>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<p v-if="messageKey" class="error" role="status">
|
|
||||||
{{ $t(messageKey) }}
|
|
||||||
</p>
|
|
||||||
</main>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.discord-authorize {
|
|
||||||
display: grid;
|
|
||||||
place-items: center;
|
|
||||||
width: 100%;
|
|
||||||
min-height: 100vh;
|
|
||||||
padding: 24px;
|
|
||||||
box-sizing: border-box;
|
|
||||||
background-color: var(--color-background);
|
|
||||||
color: var(--color-text);
|
|
||||||
}
|
|
||||||
|
|
||||||
.authorize-card {
|
|
||||||
width: min(100%, 460px);
|
|
||||||
padding: 28px;
|
|
||||||
box-sizing: border-box;
|
|
||||||
background-color: var(--color-window-background);
|
|
||||||
border: 1px solid var(--color-window-border);
|
|
||||||
border-radius: 12px;
|
|
||||||
box-shadow: 0 8px 24px var(--color-window-shadow);
|
|
||||||
text-align: center;
|
|
||||||
user-select: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.authorize-card h1 {
|
|
||||||
margin-top: 0;
|
|
||||||
font-family: 'MrEavesRemake', serif;
|
|
||||||
font-size: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.authorize-card p {
|
|
||||||
line-height: 1.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
.summary {
|
|
||||||
color: var(--color-gray);
|
|
||||||
}
|
|
||||||
|
|
||||||
form,
|
|
||||||
section {
|
|
||||||
margin-top: 18px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.hint {
|
|
||||||
color: var(--color-gray);
|
|
||||||
font-size: 0.95rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.success {
|
|
||||||
color: var(--color-green);
|
|
||||||
}
|
|
||||||
|
|
||||||
.error {
|
|
||||||
color: var(--color-red);
|
|
||||||
}
|
|
||||||
|
|
||||||
button {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
395
frontend/app/components/views/ServiceLinkAuthorize.vue
Normal file
395
frontend/app/components/views/ServiceLinkAuthorize.vue
Normal file
@@ -0,0 +1,395 @@
|
|||||||
|
<script setup>
|
||||||
|
import { computed, onMounted, ref } from 'vue';
|
||||||
|
import Server from '~/services/Server';
|
||||||
|
import { GetUser, SetUser } from '~/services/User';
|
||||||
|
import { AddSound } from '~/services/Sound';
|
||||||
|
import Spinner from '../partials/Spinner.vue';
|
||||||
|
|
||||||
|
// Pantalla única d'enllaç de serveis (Discord, Foundry, Obsidian): el servei demana
|
||||||
|
// l'enllaç al backend, l'usuari hi entra, s'identifica i tria la campanya que el
|
||||||
|
// servei podrà fer servir. Abans cada servei tenia la seva pròpia pantalla.
|
||||||
|
const card = ref(null);
|
||||||
|
|
||||||
|
const service = ref('');
|
||||||
|
const serviceName = ref('Dragonroll');
|
||||||
|
const code = ref('');
|
||||||
|
const targetName = ref('');
|
||||||
|
const targetUser = ref('');
|
||||||
|
const system = ref('');
|
||||||
|
const signedInAs = ref('');
|
||||||
|
|
||||||
|
const campaigns = ref([]);
|
||||||
|
const selectedCampaign = ref('');
|
||||||
|
const connectedCampaign = ref('');
|
||||||
|
|
||||||
|
// 'checking' | 'login' | 'pick' | 'connected' | 'error'
|
||||||
|
const status = ref('checking');
|
||||||
|
const messageKey = ref('');
|
||||||
|
|
||||||
|
const username = ref('');
|
||||||
|
const password = ref('');
|
||||||
|
const busy = ref(false);
|
||||||
|
|
||||||
|
// El nom propi del servei és l'últim recurs: el backend el dona amb la petició.
|
||||||
|
const serviceLabel = computed(() => serviceName.value || serviceNameOf(service.value));
|
||||||
|
// Cada servei explica d'una manera què és el que demana i què cal fer després.
|
||||||
|
const targetKey = computed(() => `link.target.${service.value || 'other'}`);
|
||||||
|
const nextKey = computed(() => `link.next.${service.value || 'other'}`);
|
||||||
|
|
||||||
|
function serviceNameOf(value) {
|
||||||
|
if (value === 'discord') return 'Discord';
|
||||||
|
if (value === 'foundry') return 'Foundry VTT';
|
||||||
|
if (value === 'obsidian') return 'Obsidian';
|
||||||
|
return 'Dragonroll';
|
||||||
|
}
|
||||||
|
|
||||||
|
// El codi viatja al fragment de la URL, així que el navegador no l'envia mai al
|
||||||
|
// servidor. El servei, que és qui demana l'enllaç, hi posa també el seu nom.
|
||||||
|
function readLinkParams() {
|
||||||
|
const hash = new URLSearchParams(window.location.hash.slice(1));
|
||||||
|
const search = new URLSearchParams(window.location.search);
|
||||||
|
return {
|
||||||
|
code: hash.get('code') || search.get('code') || '',
|
||||||
|
service: hash.get('service') || search.get('service') || ''
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function ShowError(key) {
|
||||||
|
messageKey.value = key;
|
||||||
|
}
|
||||||
|
|
||||||
|
function AskForLogin() {
|
||||||
|
const user = GetUser();
|
||||||
|
if (!user) {
|
||||||
|
status.value = 'login';
|
||||||
|
messageKey.value = '';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
signedInAs.value = user.username || user.name || user.email || 'Dragonroll';
|
||||||
|
status.value = 'pick';
|
||||||
|
messageKey.value = '';
|
||||||
|
LoadCampaigns();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function LoadLinkDetails() {
|
||||||
|
const response = await Server().post('/link/details', { code: code.value });
|
||||||
|
const details = response.data;
|
||||||
|
if (details.status !== 'ok') {
|
||||||
|
status.value = 'error';
|
||||||
|
ShowError('link.errors.expired');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
service.value = details.service || service.value;
|
||||||
|
serviceName.value = details.serviceName || serviceNameOf(service.value);
|
||||||
|
targetName.value = details.targetName || '';
|
||||||
|
targetUser.value = details.targetUser || '';
|
||||||
|
system.value = details.system || '';
|
||||||
|
AskForLogin();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function LoadCampaigns() {
|
||||||
|
try {
|
||||||
|
const response = await Server().get('/campaign/list');
|
||||||
|
campaigns.value = (response.data.status === 'ok' && Array.isArray(response.data.campaigns))
|
||||||
|
? response.data.campaigns
|
||||||
|
: [];
|
||||||
|
if (campaigns.value.length === 1) selectedCampaign.value = String(campaigns.value[0]._id);
|
||||||
|
} catch {
|
||||||
|
campaigns.value = [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function SignIn() {
|
||||||
|
busy.value = true;
|
||||||
|
messageKey.value = '';
|
||||||
|
try {
|
||||||
|
const response = await Server().post('/user/login', {
|
||||||
|
usermail: username.value,
|
||||||
|
password: password.value
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.data.status !== 'ok' || !response.data.token) {
|
||||||
|
ShowError(response.data.msg || 'link.errors.sign-in-failed');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// El token passa al servei d'usuari perquè el client el reutilitzi en connectar.
|
||||||
|
SetUser(response.data.token);
|
||||||
|
password.value = '';
|
||||||
|
AskForLogin();
|
||||||
|
} catch {
|
||||||
|
ShowError('link.errors.sign-in-failed');
|
||||||
|
} finally {
|
||||||
|
busy.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A campaign that already has this very service on it is being re-connected, and
|
||||||
|
// saying so is what keeps the picker honest.
|
||||||
|
function AlreadyLinked(campaign) {
|
||||||
|
if (service.value === 'foundry') return !!campaign.foundryWorldId;
|
||||||
|
if (service.value === 'discord') return !!campaign.discordGuildId;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function Connect() {
|
||||||
|
if (!selectedCampaign.value) {
|
||||||
|
ShowError('link.errors.no-campaign');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
busy.value = true;
|
||||||
|
messageKey.value = '';
|
||||||
|
try {
|
||||||
|
const response = await Server().post('/link/complete', {
|
||||||
|
code: code.value,
|
||||||
|
campaignId: selectedCampaign.value
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.data.status !== 'ok') {
|
||||||
|
ShowError(response.data.msg || 'link.errors.expired');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
connectedCampaign.value = response.data.campaign?.name || '';
|
||||||
|
status.value = 'connected';
|
||||||
|
// El codi ja s'ha fet servir, treu-lo de la barra d'adreces.
|
||||||
|
window.history.replaceState(null, '', window.location.pathname);
|
||||||
|
} catch (error) {
|
||||||
|
if (error?.response?.status === 401) {
|
||||||
|
status.value = 'login';
|
||||||
|
ShowError('link.errors.session-expired');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ShowError('link.errors.internal');
|
||||||
|
} finally {
|
||||||
|
busy.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
useHead({
|
||||||
|
title: computed(() => `Connect ${serviceLabel.value} to Dragonroll`)
|
||||||
|
});
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
AddSound(card.value);
|
||||||
|
const params = readLinkParams();
|
||||||
|
code.value = params.code;
|
||||||
|
service.value = params.service || (window.location.pathname.startsWith('/discord') ? 'discord' : '');
|
||||||
|
|
||||||
|
if (!code.value) {
|
||||||
|
status.value = 'error';
|
||||||
|
ShowError('link.errors.missing-code');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
LoadLinkDetails().catch(() => {
|
||||||
|
status.value = 'error';
|
||||||
|
ShowError('link.errors.internal');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="service-link">
|
||||||
|
<main class="link-card" ref="card">
|
||||||
|
<h1>{{ $t('link.title', { service: serviceLabel }) }}</h1>
|
||||||
|
|
||||||
|
<p v-if="targetName" class="summary">
|
||||||
|
{{ $t(targetKey, {
|
||||||
|
target: targetName,
|
||||||
|
user: targetUser,
|
||||||
|
system: system ? $t('link.system', { system }) : ''
|
||||||
|
}) }}
|
||||||
|
</p>
|
||||||
|
<p v-else-if="status !== 'error'" class="summary">
|
||||||
|
<Spinner v-if="status === 'checking'"></Spinner>
|
||||||
|
<span v-else>{{ $t('link.checking') }}</span>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<form v-if="status === 'login'" v-on:submit.prevent="SignIn">
|
||||||
|
<p>{{ $t('link.sign-in-lead', { service: serviceLabel }) }}</p>
|
||||||
|
<div class="form-field">
|
||||||
|
<label for="service-link-usermail">{{ $t('login.username') }}</label>
|
||||||
|
<input
|
||||||
|
id="service-link-usermail"
|
||||||
|
type="text"
|
||||||
|
:placeholder="$t('login.username-placeholder')"
|
||||||
|
name="usermail"
|
||||||
|
autocomplete="username"
|
||||||
|
v-model="username"
|
||||||
|
required
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
<div class="form-field">
|
||||||
|
<label for="service-link-password">{{ $t('login.password') }}</label>
|
||||||
|
<input
|
||||||
|
id="service-link-password"
|
||||||
|
type="password"
|
||||||
|
name="password"
|
||||||
|
autocomplete="current-password"
|
||||||
|
v-model="password"
|
||||||
|
required
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
<button class="btn-primary sound-click" type="submit" :disabled="busy">
|
||||||
|
<Spinner v-if="busy"></Spinner>
|
||||||
|
<span v-else>{{ $t('login.log-in') }}</span>
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<section v-if="status === 'pick'">
|
||||||
|
<p>{{ $t('link.signed-in-as', { user: signedInAs }) }}</p>
|
||||||
|
<p class="question">{{ $t('link.pick-campaign', { service: serviceLabel }) }}</p>
|
||||||
|
|
||||||
|
<p v-if="!campaigns.length" class="hint">{{ $t('link.no-campaigns') }}</p>
|
||||||
|
<ul v-else class="campaigns">
|
||||||
|
<li v-for="campaign in campaigns" :key="campaign._id">
|
||||||
|
<label class="campaign" :class="{ selected: selectedCampaign === String(campaign._id) }">
|
||||||
|
<input
|
||||||
|
type="radio"
|
||||||
|
name="campaign"
|
||||||
|
:value="String(campaign._id)"
|
||||||
|
v-model="selectedCampaign"
|
||||||
|
>
|
||||||
|
<span class="swatch" :style="{ backgroundColor: campaign.color || 'var(--color-accent)' }"></span>
|
||||||
|
<span class="campaign-name">{{ campaign.name }}</span>
|
||||||
|
<span v-if="AlreadyLinked(campaign)" class="badge">
|
||||||
|
{{ $t('link.already-linked', { service: serviceLabel }) }}
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<p class="hint">{{ $t('link.trust-warning', { service: serviceLabel }) }}</p>
|
||||||
|
<p class="hint">{{ $t('link.replace-warning') }}</p>
|
||||||
|
<button
|
||||||
|
class="btn-primary sound-click"
|
||||||
|
type="button"
|
||||||
|
:disabled="busy || !selectedCampaign"
|
||||||
|
v-on:click="Connect"
|
||||||
|
>
|
||||||
|
<Spinner v-if="busy"></Spinner>
|
||||||
|
<span v-else>{{ $t('link.connect', { service: serviceLabel }) }}</span>
|
||||||
|
</button>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section v-if="status === 'connected'">
|
||||||
|
<p class="success">{{ $t('link.connected', { campaign: connectedCampaign }) }}</p>
|
||||||
|
<p class="hint">{{ $t(nextKey, { service: serviceLabel }) }}</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<p v-if="messageKey" class="error" role="status">
|
||||||
|
{{ $t(messageKey) }}
|
||||||
|
</p>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.service-link {
|
||||||
|
display: grid;
|
||||||
|
place-items: center;
|
||||||
|
width: 100%;
|
||||||
|
min-height: 100vh;
|
||||||
|
padding: 24px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
background-color: var(--color-background);
|
||||||
|
color: var(--color-text);
|
||||||
|
}
|
||||||
|
|
||||||
|
.link-card {
|
||||||
|
width: min(100%, 460px);
|
||||||
|
padding: 28px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
background-color: var(--color-window-background);
|
||||||
|
border: 1px solid var(--color-window-border);
|
||||||
|
border-radius: 12px;
|
||||||
|
box-shadow: 0 8px 24px var(--color-window-shadow);
|
||||||
|
text-align: center;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.link-card h1 {
|
||||||
|
margin-top: 0;
|
||||||
|
font-family: 'MrEavesRemake', serif;
|
||||||
|
font-size: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.link-card p {
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.summary {
|
||||||
|
color: var(--color-gray);
|
||||||
|
}
|
||||||
|
|
||||||
|
form,
|
||||||
|
section {
|
||||||
|
margin-top: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.question {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.campaigns {
|
||||||
|
list-style: none;
|
||||||
|
margin: 0 0 14px 0;
|
||||||
|
padding: 0;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 8px;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
.campaign {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 10px;
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
border-radius: 8px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.campaign.selected {
|
||||||
|
border-color: var(--color-accent);
|
||||||
|
background-color: var(--color-background-soft);
|
||||||
|
}
|
||||||
|
|
||||||
|
.swatch {
|
||||||
|
width: 14px;
|
||||||
|
height: 14px;
|
||||||
|
border-radius: 4px;
|
||||||
|
flex: 0 0 auto;
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
.campaign-name {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.badge {
|
||||||
|
font-size: 0.8rem;
|
||||||
|
color: var(--color-gray);
|
||||||
|
}
|
||||||
|
|
||||||
|
.hint {
|
||||||
|
color: var(--color-gray);
|
||||||
|
font-size: 0.95rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.success {
|
||||||
|
color: var(--color-green);
|
||||||
|
}
|
||||||
|
|
||||||
|
.error {
|
||||||
|
color: var(--color-red);
|
||||||
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { onBeforeUnmount, onMounted, ref } from 'vue';
|
import { onMounted, ref } from 'vue';
|
||||||
import WindowHandle from './partials/WindowHandle.vue';
|
import WindowHandle from './partials/WindowHandle.vue';
|
||||||
import Tabs from '../layouts/Tabs.vue';
|
import Tabs from '../layouts/Tabs.vue';
|
||||||
import { SetupHandle, SetSize, ResetPosition, Top, SetResizable, SetMinSize } from '@/services/Windows';
|
import { SetupHandle, SetSize, ResetPosition, Top, SetResizable, SetMinSize } from '@/services/Windows';
|
||||||
@@ -17,18 +17,20 @@ const name = ref(campaign.name || '');
|
|||||||
const color = ref(campaign.color || '#6b6b6b');
|
const color = ref(campaign.color || '#6b6b6b');
|
||||||
const settings = ref(campaign.settings && typeof campaign.settings === 'object' ? campaign.settings : {});
|
const settings = ref(campaign.settings && typeof campaign.settings === 'object' ? campaign.settings : {});
|
||||||
const foundryUrl = ref(settings.value.integrations?.foundryUrl || '');
|
const foundryUrl = ref(settings.value.integrations?.foundryUrl || '');
|
||||||
const pairingCode = ref('');
|
|
||||||
const requestId = ref('');
|
|
||||||
const linking = ref(false);
|
|
||||||
const id = data.id;
|
const id = data.id;
|
||||||
let statusPoll;
|
|
||||||
let checkingStatus = false;
|
// Els serveis s'enllacen tots igual: ells mostren un enllaç de Dragonroll i aquí
|
||||||
|
// només es mira què té connectat la campanya i se'n desenllaça el que calgui.
|
||||||
|
const services = ref([]);
|
||||||
|
const unlinked = ref('');
|
||||||
|
|
||||||
const rows = [
|
const rows = [
|
||||||
{ id: 'basic', value: 'campaigns.settings.tabs.basic' },
|
{ id: 'basic', value: 'campaigns.settings.tabs.basic' },
|
||||||
{ id: 'integrations', value: 'campaigns.settings.tabs.integrations' }
|
{ id: 'integrations', value: 'campaigns.settings.tabs.integrations' }
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const serviceKeys = ['foundry', 'discord', 'obsidian'];
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
Top(wrapper);
|
Top(wrapper);
|
||||||
SetupHandle(id, handle);
|
SetupHandle(id, handle);
|
||||||
@@ -36,11 +38,7 @@ onMounted(() => {
|
|||||||
ResetPosition(id, 'center');
|
ResetPosition(id, 'center');
|
||||||
SetResizable(id, true);
|
SetResizable(id, true);
|
||||||
SetMinSize(id, { width: 440, height: 340 });
|
SetMinSize(id, { width: 440, height: 340 });
|
||||||
ResumePendingFoundryLink();
|
LoadServices();
|
||||||
});
|
|
||||||
|
|
||||||
onBeforeUnmount(() => {
|
|
||||||
clearInterval(statusPoll);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
function ApplyCampaignUpdate(updatedCampaign) {
|
function ApplyCampaignUpdate(updatedCampaign) {
|
||||||
@@ -100,95 +98,56 @@ async function SaveSettings() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function StartFoundryLink() {
|
async function LoadServices() {
|
||||||
linking.value = true;
|
|
||||||
try {
|
try {
|
||||||
const response = await Server().post('/campaign/foundry-link/start', { campaignId: campaign._id });
|
const response = await Server().get(`/campaign/services?campaignId=${campaign._id}`);
|
||||||
if (response.data.status !== 'ok') {
|
services.value = response.data.status === 'ok' && Array.isArray(response.data.services)
|
||||||
DisplayToast('red', $t(response.data.msg || 'errors.internal'), 3000);
|
? response.data.services
|
||||||
return;
|
: [];
|
||||||
}
|
|
||||||
|
|
||||||
pairingCode.value = response.data.code;
|
|
||||||
requestId.value = response.data.requestId;
|
|
||||||
clearInterval(statusPoll);
|
|
||||||
statusPoll = setInterval(CheckFoundryLinkStatus, 2500);
|
|
||||||
} catch {
|
} catch {
|
||||||
DisplayToast('red', $t('errors.internal'), 3000);
|
services.value = [];
|
||||||
} finally {
|
|
||||||
linking.value = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// The pairing code lives server-side until it expires, so re-attach to it when
|
function LinkFor(service) {
|
||||||
// the window opens again after a reload, restart or closing the window.
|
return services.value.find((link) => link.service === service) || null;
|
||||||
async function ResumePendingFoundryLink() {
|
}
|
||||||
|
|
||||||
|
// El món de Foundry es descriu amb el que la campanya ja en sap, per si el món
|
||||||
|
// es va enllaçar abans que els serveis tinguessin un registre comú.
|
||||||
|
function ServiceTarget(service, link) {
|
||||||
|
if (link?.targetName) return link.targetName;
|
||||||
|
if (service === 'foundry' && campaign.foundryWorldTitle) return campaign.foundryWorldTitle;
|
||||||
|
if (service === 'discord' && campaign.discordGuildId) return campaign.discordGuildId;
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
function WhoConnected(link) {
|
||||||
|
return link?.dragonrollUserName ? $t('campaigns.settings.services.connected-by', { user: link.dragonrollUserName }) : '';
|
||||||
|
}
|
||||||
|
|
||||||
|
async function Unlink(service) {
|
||||||
|
unlinked.value = service;
|
||||||
try {
|
try {
|
||||||
const response = await Server().get(`/campaign/foundry-link/pending?campaignId=${campaign._id}`);
|
const response = await Server().post('/campaign/service-unlink', {
|
||||||
if (response.data.status !== 'ok' || !response.data.request) return;
|
campaignId: campaign._id,
|
||||||
|
service
|
||||||
|
});
|
||||||
|
|
||||||
pairingCode.value = response.data.request.code || '';
|
|
||||||
requestId.value = response.data.request.requestId;
|
|
||||||
clearInterval(statusPoll);
|
|
||||||
statusPoll = setInterval(CheckFoundryLinkStatus, 2500);
|
|
||||||
} catch {
|
|
||||||
// Showing the stored pairing code is best-effort; ignore resume failures.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function CheckFoundryLinkStatus() {
|
|
||||||
if (!requestId.value || checkingStatus) return;
|
|
||||||
checkingStatus = true;
|
|
||||||
try {
|
|
||||||
const response = await Server().get(`/campaign/foundry-link/status/${requestId.value}`);
|
|
||||||
if (response.data.status !== 'ok' || response.data.state === 'expired') {
|
|
||||||
clearInterval(statusPoll);
|
|
||||||
pairingCode.value = '';
|
|
||||||
requestId.value = '';
|
|
||||||
const error = response.data.state === 'expired'
|
|
||||||
? 'campaigns.settings.errors.link-expired'
|
|
||||||
: response.data.msg || 'campaigns.settings.errors.link-expired';
|
|
||||||
DisplayToast('red', $t(error), 3000);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (response.data.state === 'complete') {
|
|
||||||
ApplyCampaignUpdate(response.data.campaign);
|
|
||||||
clearInterval(statusPoll);
|
|
||||||
pairingCode.value = '';
|
|
||||||
requestId.value = '';
|
|
||||||
DisplayToast('green', $t('campaigns.settings.linked'), 3000);
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
// Keep polling while the Foundry module completes the pairing.
|
|
||||||
} finally {
|
|
||||||
checkingStatus = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function UnlinkFoundry() {
|
|
||||||
linking.value = true;
|
|
||||||
try {
|
|
||||||
const response = await Server().post('/campaign/foundry-unlink', { campaignId: campaign._id });
|
|
||||||
if (response.data.status !== 'ok') {
|
if (response.data.status !== 'ok') {
|
||||||
DisplayToast('red', $t(response.data.msg || 'errors.internal'), 3000);
|
DisplayToast('red', $t(response.data.msg || 'errors.internal'), 3000);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ApplyCampaignUpdate(response.data.campaign);
|
ApplyCampaignUpdate(response.data.campaign);
|
||||||
DisplayToast('green', $t('campaigns.settings.unlinked'), 3000);
|
services.value = Array.isArray(response.data.services) ? response.data.services : [];
|
||||||
|
DisplayToast('green', $t('campaigns.settings.services.unlinked', {
|
||||||
|
service: $t(`campaigns.settings.services.${service}.name`)
|
||||||
|
}), 3000);
|
||||||
} catch {
|
} catch {
|
||||||
DisplayToast('red', $t('errors.internal'), 3000);
|
DisplayToast('red', $t('errors.internal'), 3000);
|
||||||
} finally {
|
} finally {
|
||||||
linking.value = false;
|
unlinked.value = '';
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function CopyPairingCode() {
|
|
||||||
try {
|
|
||||||
await navigator.clipboard.writeText(pairingCode.value);
|
|
||||||
DisplayToast('green', $t('campaigns.settings.code-copied'), 2000);
|
|
||||||
} catch {
|
|
||||||
DisplayToast('red', $t('campaigns.settings.errors.copy-code'), 3000);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@@ -212,29 +171,33 @@ async function CopyPairingCode() {
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template #integrations>
|
<template #integrations>
|
||||||
|
<p class="help-text standalone">{{ $t('campaigns.settings.services.help') }}</p>
|
||||||
<div class="settings-fields">
|
<div class="settings-fields">
|
||||||
<div class="world-link">
|
<div v-for="service in serviceKeys" :key="service" class="service">
|
||||||
<div v-if="campaign.foundryWorldId" class="linked-world">
|
<div class="service-head">
|
||||||
<strong>{{ campaign.foundryWorldTitle || campaign.foundryWorldId }}</strong>
|
<strong>{{ $t(`campaigns.settings.services.${service}.name`) }}</strong>
|
||||||
<span v-if="campaign.foundrySystem">{{ campaign.foundrySystem }}</span>
|
<button
|
||||||
<button class="btn-primary sound-click" type="button" :disabled="linking" @click="UnlinkFoundry">
|
v-if="LinkFor(service)"
|
||||||
{{ $t('campaigns.settings.unlink-foundry') }}
|
class="btn-primary sound-click"
|
||||||
|
type="button"
|
||||||
|
:disabled="unlinked !== ''"
|
||||||
|
@click="Unlink(service)"
|
||||||
|
>
|
||||||
|
{{ $t('campaigns.settings.services.unlink') }}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<p v-else class="help-text standalone">{{ $t('campaigns.settings.no-foundry-world') }}</p>
|
<p class="service-state" :class="{ linked: LinkFor(service) }">
|
||||||
|
{{ ServiceTarget(service, LinkFor(service)) || $t('campaigns.settings.services.not-connected') }}
|
||||||
<button class="btn-primary sound-click" type="button" :disabled="linking" @click="StartFoundryLink">
|
<span v-if="WhoConnected(LinkFor(service))" class="who">
|
||||||
{{ $t('campaigns.settings.start-foundry-link') }}
|
{{ WhoConnected(LinkFor(service)) }}
|
||||||
</button>
|
</span>
|
||||||
<p class="help-text standalone">{{ $t('campaigns.settings.start-foundry-link-help') }}</p>
|
</p>
|
||||||
<div v-if="pairingCode" class="pairing-code">
|
<p class="help-text standalone">
|
||||||
<code>{{ pairingCode }}</code>
|
{{ $t(`campaigns.settings.services.${service}.how`) }}
|
||||||
<button class="btn-primary sound-click" type="button" @click="CopyPairingCode">
|
</p>
|
||||||
{{ $t('campaigns.settings.copy-code') }}
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="settings-fields">
|
||||||
<label class="field">
|
<label class="field">
|
||||||
<span>{{ $t('campaigns.settings.foundry-url') }}</span>
|
<span>{{ $t('campaigns.settings.foundry-url') }}</span>
|
||||||
<input
|
<input
|
||||||
@@ -313,40 +276,36 @@ input {
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.world-link {
|
.service {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 10px;
|
gap: 6px;
|
||||||
padding-bottom: 14px;
|
padding-bottom: 14px;
|
||||||
border-bottom: 1px solid var(--color-border);
|
border-bottom: 1px solid var(--color-border);
|
||||||
}
|
}
|
||||||
|
|
||||||
.linked-world {
|
.service-head {
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 10px;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.linked-world span {
|
|
||||||
opacity: 0.75;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pairing-code {
|
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
gap: 10px;
|
gap: 10px;
|
||||||
padding: 10px;
|
|
||||||
border: 1px solid var(--color-border);
|
|
||||||
border-radius: 6px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.pairing-code code {
|
.service-state {
|
||||||
user-select: text;
|
margin: 0;
|
||||||
|
font-size: 14px;
|
||||||
overflow-wrap: anywhere;
|
overflow-wrap: anywhere;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.service-state.linked {
|
||||||
|
color: var(--color-green);
|
||||||
|
}
|
||||||
|
|
||||||
|
.who {
|
||||||
|
opacity: 0.75;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
.actions {
|
.actions {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
|
|||||||
@@ -10,21 +10,30 @@
|
|||||||
"color": "Color de la campanya",
|
"color": "Color de la campanya",
|
||||||
"foundry-url": "URL de Foundry VTT",
|
"foundry-url": "URL de Foundry VTT",
|
||||||
"foundry-url-help": "Introdueix l'URL base de la instància de Foundry VTT que executa el mòdul Dragonroll Foundry.",
|
"foundry-url-help": "Introdueix l'URL base de la instància de Foundry VTT que executa el mòdul Dragonroll Foundry.",
|
||||||
"no-foundry-world": "Aquesta campanya no té cap món de Foundry enllaçat.",
|
|
||||||
"start-foundry-link": "Crea un codi per a Foundry",
|
|
||||||
"start-foundry-link-help": "Copia aquest codi a l'opció Dragonroll Campaign Pairing Code del mòdul de Foundry. Dragonroll Endpoint utilitza https://dragonroll.aranroig.com de manera predeterminada. El codi caduca al cap de 10 minuts.",
|
|
||||||
"unlink-foundry": "Desenllaça",
|
|
||||||
"saved": "S'ha desat la configuració de la campanya.",
|
"saved": "S'ha desat la configuració de la campanya.",
|
||||||
"linked": "S'ha enllaçat el món de Foundry amb aquesta campanya.",
|
|
||||||
"unlinked": "S'ha desenllaçat el món de Foundry d'aquesta campanya.",
|
|
||||||
"copy-code": "Copia el codi",
|
|
||||||
"code-copied": "S'ha copiat el codi d'enllaç.",
|
|
||||||
"saving": "Desant...",
|
"saving": "Desant...",
|
||||||
|
"services": {
|
||||||
|
"help": "Tots els serveis es connecten igual: demanen a Dragonroll un enllaç de registre, te'l mostren i tries aquesta campanya allà. Des d'aquí no es connecta res.",
|
||||||
|
"not-connected": "No connectat",
|
||||||
|
"unlink": "Desenllaça",
|
||||||
|
"unlinked": "{service} ja no està connectat amb aquesta campanya.",
|
||||||
|
"connected-by": "connectat per {user}",
|
||||||
|
"foundry": {
|
||||||
|
"name": "Foundry VTT",
|
||||||
|
"how": "Obre l'enllaç de Dragonroll des de la configuració del mòdul del teu món i tria aquesta campanya."
|
||||||
|
},
|
||||||
|
"discord": {
|
||||||
|
"name": "Discord",
|
||||||
|
"how": "Executa /dragonroll connect al teu servidor i tria aquesta campanya."
|
||||||
|
},
|
||||||
|
"obsidian": {
|
||||||
|
"name": "Obsidian",
|
||||||
|
"how": "Prem Connect to Dragonroll a la configuració del connector d'Obsidian i tria aquesta campanya."
|
||||||
|
}
|
||||||
|
},
|
||||||
"errors": {
|
"errors": {
|
||||||
"name-required": "Introdueix un nom per a la campanya.",
|
"name-required": "Introdueix un nom per a la campanya.",
|
||||||
"invalid-foundry-url": "Introdueix una URL vàlida de Foundry VTT amb http o https.",
|
"invalid-foundry-url": "Introdueix una URL vàlida de Foundry VTT amb http o https."
|
||||||
"link-expired": "El codi d'enllaç ha caducat. Crea'n un de nou.",
|
|
||||||
"copy-code": "No s'ha pogut copiar el codi d'enllaç."
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sidebar-label": "Campanya",
|
"sidebar-label": "Campanya",
|
||||||
|
|||||||
35
frontend/i18n/locales/ca/link.json
Normal file
35
frontend/i18n/locales/ca/link.json
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
{
|
||||||
|
"title": "Connecta {service} amb Dragonroll",
|
||||||
|
"checking": "Comprovant aquest enllaç…",
|
||||||
|
"system": " · {system}",
|
||||||
|
"target": {
|
||||||
|
"discord": "Servidor de Discord: {target}. Sol·licitat per {user}.",
|
||||||
|
"foundry": "Món de Foundry: {target}{system}. Sol·licitat per {user}.",
|
||||||
|
"obsidian": "Vault d'Obsidian: {target}.",
|
||||||
|
"other": "{target} vol fer servir una de les teves campanyes."
|
||||||
|
},
|
||||||
|
"sign-in-lead": "Inicia sessió amb el compte de Dragonroll propietari de la campanya que ha de fer servir {service}.",
|
||||||
|
"signed-in-as": "Has iniciat sessió com a {user}.",
|
||||||
|
"pick-campaign": "Quina campanya pot fer servir {service}?",
|
||||||
|
"no-campaigns": "Aquest compte encara no té campanyes. Crea'n una primer a Dragonroll.",
|
||||||
|
"already-linked": "ja connectat a un {service}",
|
||||||
|
"connect": "Connecta aquesta campanya",
|
||||||
|
"connected": "Aquesta campanya ja està connectada amb {target}.",
|
||||||
|
"trust-warning": "Connecta només serveis de confiança: poden llegir i modificar el que conté la seva campanya.",
|
||||||
|
"replace-warning": "Connectar una campanya reemplaça el que aquest servei tenia connectat abans.",
|
||||||
|
"next": {
|
||||||
|
"discord": "Torna a Discord: el bot hi confirmarà la connexió.",
|
||||||
|
"foundry": "Torna a Foundry: el mòdul es connectarà sol.",
|
||||||
|
"obsidian": "Torna a Obsidian: el connector ho agafarà sol.",
|
||||||
|
"other": "Torna al servei d'on vens."
|
||||||
|
},
|
||||||
|
"errors": {
|
||||||
|
"missing-code": "A aquest enllaç li falta el codi. Demana'n un de nou al servei.",
|
||||||
|
"expired": "Aquest enllaç no és vàlid o ha caducat. Demana'n un de nou al servei.",
|
||||||
|
"sign-in-failed": "No s'ha pogut iniciar sessió a Dragonroll. Revisa l'usuari i la contrasenya.",
|
||||||
|
"session-expired": "La teva sessió de Dragonroll ha caducat. Inicia sessió de nou per continuar.",
|
||||||
|
"no-campaign": "Tria la campanya que ha de fer servir aquest servei.",
|
||||||
|
"notfound": "Aquesta campanya no és teva. Inicia sessió amb el compte propietari.",
|
||||||
|
"internal": "No s'ha pogut carregar aquest enllaç."
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,21 +14,30 @@
|
|||||||
"color": "Campaign color",
|
"color": "Campaign color",
|
||||||
"foundry-url": "Foundry VTT URL",
|
"foundry-url": "Foundry VTT URL",
|
||||||
"foundry-url-help": "Enter the base URL of the Foundry VTT instance running the Dragonroll Foundry module.",
|
"foundry-url-help": "Enter the base URL of the Foundry VTT instance running the Dragonroll Foundry module.",
|
||||||
"no-foundry-world": "No Foundry world is linked to this campaign.",
|
|
||||||
"start-foundry-link": "Create a code for Foundry",
|
|
||||||
"start-foundry-link-help": "Copy this code into the Dragonroll Campaign Pairing Code setting in the Foundry module. The Dragonroll Endpoint defaults to https://dragonroll.aranroig.com. The code expires after 10 minutes.",
|
|
||||||
"unlink-foundry": "Unlink",
|
|
||||||
"saved": "Campaign settings saved.",
|
"saved": "Campaign settings saved.",
|
||||||
"linked": "Foundry world linked to this campaign.",
|
|
||||||
"unlinked": "Foundry world unlinked from this campaign.",
|
|
||||||
"copy-code": "Copy code",
|
|
||||||
"code-copied": "Pairing code copied.",
|
|
||||||
"saving": "Saving...",
|
"saving": "Saving...",
|
||||||
|
"services": {
|
||||||
|
"help": "Every service connects the same way: it asks Dragonroll for a sign-up link, shows it to you, and you pick this campaign there. Nothing connects from here.",
|
||||||
|
"not-connected": "Not connected",
|
||||||
|
"unlink": "Unlink",
|
||||||
|
"unlinked": "{service} is no longer connected to this campaign.",
|
||||||
|
"connected-by": "connected by {user}",
|
||||||
|
"foundry": {
|
||||||
|
"name": "Foundry VTT",
|
||||||
|
"how": "Open the Dragonroll link from the module settings of your world and pick this campaign."
|
||||||
|
},
|
||||||
|
"discord": {
|
||||||
|
"name": "Discord",
|
||||||
|
"how": "Run /dragonroll connect in your server and pick this campaign."
|
||||||
|
},
|
||||||
|
"obsidian": {
|
||||||
|
"name": "Obsidian",
|
||||||
|
"how": "Press Connect to Dragonroll in the Obsidian plugin settings and pick this campaign."
|
||||||
|
}
|
||||||
|
},
|
||||||
"errors": {
|
"errors": {
|
||||||
"name-required": "Enter a campaign name.",
|
"name-required": "Enter a campaign name.",
|
||||||
"invalid-foundry-url": "Enter a valid Foundry VTT URL using http or https.",
|
"invalid-foundry-url": "Enter a valid Foundry VTT URL using http or https."
|
||||||
"link-expired": "This pairing code expired. Create a new one.",
|
|
||||||
"copy-code": "Unable to copy the pairing code."
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sidebar-label": "Campaign",
|
"sidebar-label": "Campaign",
|
||||||
|
|||||||
35
frontend/i18n/locales/en/link.json
Normal file
35
frontend/i18n/locales/en/link.json
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
{
|
||||||
|
"title": "Connect {service} to Dragonroll",
|
||||||
|
"checking": "Checking this link…",
|
||||||
|
"system": " · {system}",
|
||||||
|
"target": {
|
||||||
|
"discord": "Discord server: {target}. Requested by {user}.",
|
||||||
|
"foundry": "Foundry world: {target}{system}. Requested by {user}.",
|
||||||
|
"obsidian": "Obsidian vault: {target}.",
|
||||||
|
"other": "{target} wants to use one of your campaigns."
|
||||||
|
},
|
||||||
|
"sign-in-lead": "Sign in with the Dragonroll account that owns the campaign {service} should use.",
|
||||||
|
"signed-in-as": "Signed in as {user}.",
|
||||||
|
"pick-campaign": "Which campaign may {service} use?",
|
||||||
|
"no-campaigns": "This account has no campaigns yet. Create one in Dragonroll first.",
|
||||||
|
"already-linked": "already connected to a {service}",
|
||||||
|
"connect": "Connect this campaign",
|
||||||
|
"connected": "This campaign is now connected to {target}.",
|
||||||
|
"trust-warning": "Only connect a service you trust: it can read and change what its campaign holds.",
|
||||||
|
"replace-warning": "Connecting a campaign replaces whatever this service was connected to before.",
|
||||||
|
"next": {
|
||||||
|
"discord": "Return to Discord: the bot confirms the connection there.",
|
||||||
|
"foundry": "Return to Foundry: the module connects on its own.",
|
||||||
|
"obsidian": "Return to Obsidian: the plugin picks this up on its own.",
|
||||||
|
"other": "Return to the service you came from."
|
||||||
|
},
|
||||||
|
"errors": {
|
||||||
|
"missing-code": "This link is missing its code. Ask the service for a new one.",
|
||||||
|
"expired": "This link is invalid or has expired. Ask the service for a new one.",
|
||||||
|
"sign-in-failed": "Dragonroll sign in failed. Check your username and password.",
|
||||||
|
"session-expired": "Your Dragonroll session has expired. Sign in again to continue.",
|
||||||
|
"no-campaign": "Choose the campaign this service should use.",
|
||||||
|
"notfound": "That campaign is not one of yours. Sign in with the account that owns it.",
|
||||||
|
"internal": "Could not load this link."
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,21 +10,30 @@
|
|||||||
"color": "Color de la campaña",
|
"color": "Color de la campaña",
|
||||||
"foundry-url": "URL de Foundry VTT",
|
"foundry-url": "URL de Foundry VTT",
|
||||||
"foundry-url-help": "Introduce la URL base de la instancia de Foundry VTT que ejecuta el módulo Dragonroll Foundry.",
|
"foundry-url-help": "Introduce la URL base de la instancia de Foundry VTT que ejecuta el módulo Dragonroll Foundry.",
|
||||||
"no-foundry-world": "Esta campaña no tiene ningún mundo de Foundry vinculado.",
|
|
||||||
"start-foundry-link": "Crear un código para Foundry",
|
|
||||||
"start-foundry-link-help": "Copia este código en el ajuste Dragonroll Campaign Pairing Code del módulo de Foundry. Dragonroll Endpoint usa https://dragonroll.aranroig.com de forma predeterminada. El código caduca en 10 minutos.",
|
|
||||||
"unlink-foundry": "Desvincular",
|
|
||||||
"saved": "Se han guardado los ajustes de la campaña.",
|
"saved": "Se han guardado los ajustes de la campaña.",
|
||||||
"linked": "El mundo de Foundry se ha vinculado a esta campaña.",
|
|
||||||
"unlinked": "Se ha desvinculado el mundo de Foundry de esta campaña.",
|
|
||||||
"copy-code": "Copiar código",
|
|
||||||
"code-copied": "Código de vinculación copiado.",
|
|
||||||
"saving": "Guardando...",
|
"saving": "Guardando...",
|
||||||
|
"services": {
|
||||||
|
"help": "Todos los servicios se conectan igual: piden a Dragonroll un enlace de registro, te lo muestran y eliges esta campaña allí. Desde aquí no se conecta nada.",
|
||||||
|
"not-connected": "Sin conectar",
|
||||||
|
"unlink": "Desvincular",
|
||||||
|
"unlinked": "{service} ya no está conectado a esta campaña.",
|
||||||
|
"connected-by": "conectado por {user}",
|
||||||
|
"foundry": {
|
||||||
|
"name": "Foundry VTT",
|
||||||
|
"how": "Abre el enlace de Dragonroll desde los ajustes del módulo de tu mundo y elige esta campaña."
|
||||||
|
},
|
||||||
|
"discord": {
|
||||||
|
"name": "Discord",
|
||||||
|
"how": "Ejecuta /dragonroll connect en tu servidor y elige esta campaña."
|
||||||
|
},
|
||||||
|
"obsidian": {
|
||||||
|
"name": "Obsidian",
|
||||||
|
"how": "Pulsa Connect to Dragonroll en los ajustes del plugin de Obsidian y elige esta campaña."
|
||||||
|
}
|
||||||
|
},
|
||||||
"errors": {
|
"errors": {
|
||||||
"name-required": "Introduce un nombre para la campaña.",
|
"name-required": "Introduce un nombre para la campaña.",
|
||||||
"invalid-foundry-url": "Introduce una URL válida de Foundry VTT con http o https.",
|
"invalid-foundry-url": "Introduce una URL válida de Foundry VTT con http o https."
|
||||||
"link-expired": "El código de vinculación ha caducado. Crea uno nuevo.",
|
|
||||||
"copy-code": "No se pudo copiar el código de vinculación."
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sidebar-label": "Campaña",
|
"sidebar-label": "Campaña",
|
||||||
|
|||||||
35
frontend/i18n/locales/es/link.json
Normal file
35
frontend/i18n/locales/es/link.json
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
{
|
||||||
|
"title": "Conectar {service} con Dragonroll",
|
||||||
|
"checking": "Comprobando este enlace…",
|
||||||
|
"system": " · {system}",
|
||||||
|
"target": {
|
||||||
|
"discord": "Servidor de Discord: {target}. Solicitado por {user}.",
|
||||||
|
"foundry": "Mundo de Foundry: {target}{system}. Solicitado por {user}.",
|
||||||
|
"obsidian": "Vault de Obsidian: {target}.",
|
||||||
|
"other": "{target} quiere usar una de tus campañas."
|
||||||
|
},
|
||||||
|
"sign-in-lead": "Inicia sesión con la cuenta de Dragonroll propietaria de la campaña que debe usar {service}.",
|
||||||
|
"signed-in-as": "Has iniciado sesión como {user}.",
|
||||||
|
"pick-campaign": "¿Qué campaña puede usar {service}?",
|
||||||
|
"no-campaigns": "Esta cuenta todavía no tiene campañas. Crea una primero en Dragonroll.",
|
||||||
|
"already-linked": "ya conectado a un {service}",
|
||||||
|
"connect": "Conectar esta campaña",
|
||||||
|
"connected": "Esta campaña ya está conectada a {target}.",
|
||||||
|
"trust-warning": "Conecta solo servicios de confianza: pueden leer y modificar lo que contenga su campaña.",
|
||||||
|
"replace-warning": "Conectar una campaña reemplaza lo que este servicio tuviera conectado antes.",
|
||||||
|
"next": {
|
||||||
|
"discord": "Vuelve a Discord: el bot confirmará la conexión allí.",
|
||||||
|
"foundry": "Vuelve a Foundry: el módulo se conectará solo.",
|
||||||
|
"obsidian": "Vuelve a Obsidian: el plugin lo detectará solo.",
|
||||||
|
"other": "Vuelve al servicio desde el que has venido."
|
||||||
|
},
|
||||||
|
"errors": {
|
||||||
|
"missing-code": "A este enlace le falta el código. Pide uno nuevo al servicio.",
|
||||||
|
"expired": "Este enlace no es válido o ha caducado. Pide uno nuevo al servicio.",
|
||||||
|
"sign-in-failed": "No se ha podido iniciar sesión en Dragonroll. Revisa el usuario y la contraseña.",
|
||||||
|
"session-expired": "Tu sesión de Dragonroll ha caducado. Inicia sesión de nuevo para continuar.",
|
||||||
|
"no-campaign": "Elige la campaña que debe usar este servicio.",
|
||||||
|
"notfound": "Esa campaña no es tuya. Inicia sesión con la cuenta propietaria.",
|
||||||
|
"internal": "No se ha podido cargar este enlace."
|
||||||
|
}
|
||||||
|
}
|
||||||
12707
frontend/package-lock.json
generated
12707
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
326
package-lock.json
generated
326
package-lock.json
generated
@@ -1,326 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "dragonroll",
|
|
||||||
"lockfileVersion": 3,
|
|
||||||
"requires": true,
|
|
||||||
"packages": {
|
|
||||||
"": {
|
|
||||||
"devDependencies": {
|
|
||||||
"concurrently": "^9.2.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/ansi-regex": {
|
|
||||||
"version": "5.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
|
|
||||||
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/ansi-styles": {
|
|
||||||
"version": "4.3.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
|
|
||||||
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"color-convert": "^2.0.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/chalk": {
|
|
||||||
"version": "4.1.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
|
|
||||||
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"ansi-styles": "^4.1.0",
|
|
||||||
"supports-color": "^7.1.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/chalk/chalk?sponsor=1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/chalk/node_modules/supports-color": {
|
|
||||||
"version": "7.2.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
|
|
||||||
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"has-flag": "^4.0.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/cliui": {
|
|
||||||
"version": "8.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
|
|
||||||
"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"string-width": "^4.2.0",
|
|
||||||
"strip-ansi": "^6.0.1",
|
|
||||||
"wrap-ansi": "^7.0.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/color-convert": {
|
|
||||||
"version": "2.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
|
|
||||||
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"color-name": "~1.1.4"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=7.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/color-name": {
|
|
||||||
"version": "1.1.4",
|
|
||||||
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
|
|
||||||
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/concurrently": {
|
|
||||||
"version": "9.2.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.2.1.tgz",
|
|
||||||
"integrity": "sha512-fsfrO0MxV64Znoy8/l1vVIjjHa29SZyyqPgQBwhiDcaW8wJc2W3XWVOGx4M3oJBnv/zdUZIIp1gDeS98GzP8Ng==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"chalk": "4.1.2",
|
|
||||||
"rxjs": "7.8.2",
|
|
||||||
"shell-quote": "1.8.3",
|
|
||||||
"supports-color": "8.1.1",
|
|
||||||
"tree-kill": "1.2.2",
|
|
||||||
"yargs": "17.7.2"
|
|
||||||
},
|
|
||||||
"bin": {
|
|
||||||
"conc": "dist/bin/concurrently.js",
|
|
||||||
"concurrently": "dist/bin/concurrently.js"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/open-cli-tools/concurrently?sponsor=1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/emoji-regex": {
|
|
||||||
"version": "8.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
|
|
||||||
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/escalade": {
|
|
||||||
"version": "3.2.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
|
|
||||||
"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=6"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/get-caller-file": {
|
|
||||||
"version": "2.0.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
|
|
||||||
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "ISC",
|
|
||||||
"engines": {
|
|
||||||
"node": "6.* || 8.* || >= 10.*"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/has-flag": {
|
|
||||||
"version": "4.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
|
|
||||||
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/is-fullwidth-code-point": {
|
|
||||||
"version": "3.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
|
|
||||||
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/require-directory": {
|
|
||||||
"version": "2.1.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
|
|
||||||
"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.10.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/rxjs": {
|
|
||||||
"version": "7.8.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
|
|
||||||
"integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.1.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/shell-quote": {
|
|
||||||
"version": "1.8.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz",
|
|
||||||
"integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 0.4"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/ljharb"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/string-width": {
|
|
||||||
"version": "4.2.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
|
|
||||||
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"emoji-regex": "^8.0.0",
|
|
||||||
"is-fullwidth-code-point": "^3.0.0",
|
|
||||||
"strip-ansi": "^6.0.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/strip-ansi": {
|
|
||||||
"version": "6.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
|
|
||||||
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"ansi-regex": "^5.0.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/supports-color": {
|
|
||||||
"version": "8.1.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
|
|
||||||
"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"has-flag": "^4.0.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/chalk/supports-color?sponsor=1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/tree-kill": {
|
|
||||||
"version": "1.2.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
|
|
||||||
"integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"bin": {
|
|
||||||
"tree-kill": "cli.js"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/tslib": {
|
|
||||||
"version": "2.8.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
|
|
||||||
"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "0BSD"
|
|
||||||
},
|
|
||||||
"node_modules/wrap-ansi": {
|
|
||||||
"version": "7.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
|
|
||||||
"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"ansi-styles": "^4.0.0",
|
|
||||||
"string-width": "^4.1.0",
|
|
||||||
"strip-ansi": "^6.0.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/y18n": {
|
|
||||||
"version": "5.0.8",
|
|
||||||
"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
|
|
||||||
"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "ISC",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/yargs": {
|
|
||||||
"version": "17.7.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
|
|
||||||
"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"cliui": "^8.0.1",
|
|
||||||
"escalade": "^3.1.1",
|
|
||||||
"get-caller-file": "^2.0.5",
|
|
||||||
"require-directory": "^2.1.1",
|
|
||||||
"string-width": "^4.2.3",
|
|
||||||
"y18n": "^5.0.5",
|
|
||||||
"yargs-parser": "^21.1.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/yargs-parser": {
|
|
||||||
"version": "21.1.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
|
|
||||||
"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
|
|
||||||
"dev": true,
|
|
||||||
"license": "ISC",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,9 +1,15 @@
|
|||||||
{
|
{
|
||||||
|
"name": "dragonroll-workspace",
|
||||||
|
"private": true,
|
||||||
|
"packageManager": "pnpm@10.28.2",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"concurrently": "^9.2.1"
|
"concurrently": "^9.2.1"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "concurrently -k -n BACKEND,FRONTEND,DISCORD-BOT,FOUNDRY -c blue,green,yellow,magenta \"DEBUG=* npm --prefix backend run dev\" \"npm --prefix frontend run dev\" \"npm --prefix discord-bot start\" \"node scripts/run-foundry.js\"",
|
"dev": "concurrently -k -n BACKEND,FRONTEND,DISCORD-BOT,FOUNDRY -c blue,green,yellow,magenta \"DEBUG=* pnpm --filter ./backend run dev\" \"pnpm --filter ./frontend run dev\" \"pnpm --filter ./discord-bot run start\" \"node scripts/run-foundry.js\"",
|
||||||
|
"dev:backend": "DEBUG=* pnpm --filter ./backend run dev",
|
||||||
|
"dev:frontend": "pnpm --filter ./frontend run dev",
|
||||||
|
"dev:discord-bot": "pnpm --filter ./discord-bot run start",
|
||||||
"test": "node --test tests/"
|
"test": "node --test tests/"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
9814
pnpm-lock.yaml
generated
Normal file
9814
pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
10
pnpm-workspace.yaml
Normal file
10
pnpm-workspace.yaml
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
packages:
|
||||||
|
- backend
|
||||||
|
- frontend
|
||||||
|
- discord-bot
|
||||||
|
|
||||||
|
# pnpm blocks install scripts of dependencies by default; these two place their
|
||||||
|
# native binaries through theirs and have to be allowed to run them.
|
||||||
|
onlyBuiltDependencies:
|
||||||
|
- '@parcel/watcher'
|
||||||
|
- esbuild
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
// Runs the Foundry Virtual Tabletop start script defined by FOUNDRY_START_SCRIPT
|
// Runs the Foundry Virtual Tabletop start script defined by FOUNDRY_START_SCRIPT
|
||||||
// in the root .env file. Used by `npm run dev` via concurrently.
|
// in the root .env file. Used by `pnpm dev` via concurrently.
|
||||||
const { spawn } = require('node:child_process');
|
const { spawn } = require('node:child_process');
|
||||||
const fs = require('node:fs');
|
const fs = require('node:fs');
|
||||||
const path = require('node:path');
|
const path = require('node:path');
|
||||||
|
|||||||
@@ -1,8 +1,12 @@
|
|||||||
// Tests for the pairing status the Dragonroll Foundry module shows in its
|
// Tests for how the Dragonroll Foundry module connects a world to a campaign
|
||||||
// settings (Syndria98/dragonroll#17). Like foundry-sync-toggle.test.js, the module
|
// (Syndria98/dragonroll#17 and #19). Like foundry-sync-toggle.test.js, the module
|
||||||
// script runs inside a `node:vm` context of stubbed Foundry globals; here each
|
// script runs inside a `node:vm` context of stubbed Foundry globals; here each
|
||||||
// test also decides what Dragonroll answers, because the status is that answer
|
// test also decides what Dragonroll answers, because the pairing status is that
|
||||||
// plus what this client holds (its sync token and any pairing code).
|
// answer plus what this client holds (its sync token and its sign-up link).
|
||||||
|
//
|
||||||
|
// The world no longer redeems a code typed into its settings: it asks Dragonroll
|
||||||
|
// for the same sign-up link every service gets, shows it, and picks its token up
|
||||||
|
// once a user has answered that link.
|
||||||
//
|
//
|
||||||
// Run with `npm test` from the repository root, or `node --test tests/`.
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
@@ -19,12 +23,19 @@ const MODULE_SOURCE = fs.readFileSync(
|
|||||||
);
|
);
|
||||||
|
|
||||||
const LINKED_CAMPAIGN = { id: "campaign-1", name: "Curse of Strahd" };
|
const LINKED_CAMPAIGN = { id: "campaign-1", name: "Curse of Strahd" };
|
||||||
|
const SIGN_UP_LINK = "http://frontend.test/link/authorize?service=foundry#code=link-code-1";
|
||||||
|
|
||||||
// The stub starts as a world that finished pairing (`syncToken: ""` is one that
|
// The stub starts as a world that finished pairing (`syncToken: ""` is one that
|
||||||
// never did). `answers` maps a route fragment to the JSON Dragonroll replies
|
// never did), optionally holding a sign-up link it is waiting on. `answers` maps
|
||||||
// with; a route that is not listed answers `{status:"ok"}`, and one mapped to
|
// a route fragment to the JSON Dragonroll replies with; a route that is not
|
||||||
// null answers HTML, like a Dragonroll old enough not to have that route at all.
|
// listed answers `{status:"ok"}`, and one mapped to null answers HTML, like a
|
||||||
function makeStubWorld({ syncToken = "sync-token-1", linkCode = "", answers = {} } = {}) {
|
// Dragonroll old enough not to have that route at all.
|
||||||
|
function makeStubWorld({
|
||||||
|
syncToken = "sync-token-1",
|
||||||
|
linkCode = "",
|
||||||
|
linkUrl = "",
|
||||||
|
answers = {},
|
||||||
|
} = {}) {
|
||||||
const state = {
|
const state = {
|
||||||
hooks: new Map(),
|
hooks: new Map(),
|
||||||
registered: new Map(),
|
registered: new Map(),
|
||||||
@@ -36,6 +47,7 @@ function makeStubWorld({ syncToken = "sync-token-1", linkCode = "", answers = {}
|
|||||||
autoSync: true,
|
autoSync: true,
|
||||||
syncToken,
|
syncToken,
|
||||||
linkCode,
|
linkCode,
|
||||||
|
linkUrl,
|
||||||
dragonrollApiUrl: "http://backend.test:5000",
|
dragonrollApiUrl: "http://backend.test:5000",
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -60,7 +72,7 @@ function makeStubWorld({ syncToken = "sync-token-1", linkCode = "", answers = {}
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
// The pairing status never waits on a timer: it is written when the world is
|
// The pairing status never waits on a timer: it is written when the world is
|
||||||
// ready and whenever a pairing attempt answers, so dropping these keeps the
|
// ready and whenever a link check answers, so dropping these keeps the
|
||||||
// snapshot and reconcile loops out of these tests.
|
// snapshot and reconcile loops out of these tests.
|
||||||
setTimeout: () => 0,
|
setTimeout: () => 0,
|
||||||
clearTimeout: () => {},
|
clearTimeout: () => {},
|
||||||
@@ -71,6 +83,7 @@ function makeStubWorld({ syncToken = "sync-token-1", linkCode = "", answers = {}
|
|||||||
state.requests.push({
|
state.requests.push({
|
||||||
href,
|
href,
|
||||||
method: options.method,
|
method: options.method,
|
||||||
|
body: options.body ? JSON.parse(options.body) : null,
|
||||||
authorization: options.headers?.Authorization || "",
|
authorization: options.headers?.Authorization || "",
|
||||||
});
|
});
|
||||||
const route = Object.keys(answers).find((fragment) => href.includes(fragment));
|
const route = Object.keys(answers).find((fragment) => href.includes(fragment));
|
||||||
@@ -85,7 +98,7 @@ function makeStubWorld({ syncToken = "sync-token-1", linkCode = "", answers = {}
|
|||||||
};
|
};
|
||||||
|
|
||||||
sandbox.game = {
|
sandbox.game = {
|
||||||
user: { isGM: true },
|
user: { isGM: true, name: "Test GM" },
|
||||||
world: { id: "world-1", title: "Test World" },
|
world: { id: "world-1", title: "Test World" },
|
||||||
system: { id: "dnd5e" },
|
system: { id: "dnd5e" },
|
||||||
modules: { get: () => ({}) },
|
modules: { get: () => ({}) },
|
||||||
@@ -108,8 +121,11 @@ function makeStubWorld({ syncToken = "sync-token-1", linkCode = "", answers = {}
|
|||||||
vm.runInContext(MODULE_SOURCE, sandbox);
|
vm.runInContext(MODULE_SOURCE, sandbox);
|
||||||
|
|
||||||
state.game = sandbox.game;
|
state.game = sandbox.game;
|
||||||
|
state.setting = (key) => settingsStore[key];
|
||||||
state.status = () => settingsStore.pairingStatus;
|
state.status = () => settingsStore.pairingStatus;
|
||||||
state.statusRequests = () => state.requests.filter((request) => request.href.includes("foundry/sync/status"));
|
state.statusRequests = () => state.requests.filter((request) => request.href.includes("foundry/sync/status"));
|
||||||
|
state.linkStarts = () => state.requests.filter((request) => request.href.includes("link/start"));
|
||||||
|
state.linkPickups = () => state.requests.filter((request) => request.href.includes("link/pickup"));
|
||||||
|
|
||||||
// The module's own awaits run in the vm's promise intrinsics, so a few turns of
|
// The module's own awaits run in the vm's promise intrinsics, so a few turns of
|
||||||
// the event loop are what it takes for a written status to be observable.
|
// the event loop are what it takes for a written status to be observable.
|
||||||
@@ -122,11 +138,6 @@ function makeStubWorld({ syncToken = "sync-token-1", linkCode = "", answers = {}
|
|||||||
await state.settle();
|
await state.settle();
|
||||||
};
|
};
|
||||||
|
|
||||||
state.configure = async (key, value) => {
|
|
||||||
await sandbox.game.settings.set(MODULE_ID, key, value);
|
|
||||||
await state.settle();
|
|
||||||
};
|
|
||||||
|
|
||||||
state.start = async () => {
|
state.start = async () => {
|
||||||
await state.fire("init");
|
await state.fire("init");
|
||||||
await state.fire("ready");
|
await state.fire("ready");
|
||||||
@@ -145,20 +156,31 @@ test("the pairing status is a setting the module configures", async () => {
|
|||||||
assert.equal(setting.scope, "client", "the pairing status belongs to this client, like the token it comes from");
|
assert.equal(setting.scope, "client", "the pairing status belongs to this client, like the token it comes from");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("a world that was never paired says it is not connected", async () => {
|
test("an unpaired world asks Dragonroll for a sign-up link and shows it", async () => {
|
||||||
const world = await makeStubWorld({ syncToken: "" }).start();
|
const world = await makeStubWorld({
|
||||||
|
syncToken: "",
|
||||||
|
answers: { "link/start": { status: "ok", code: "link-code-1", linkUrl: SIGN_UP_LINK } },
|
||||||
|
}).start();
|
||||||
|
|
||||||
assert.match(world.status(), /^Not connected/, "an unpaired world says so plainly");
|
const started = world.linkStarts()[0];
|
||||||
assert.match(world.status(), /Dragonroll campaign/, "and names what it is not connected to");
|
assert.ok(started, "the world asks for a link of its own");
|
||||||
assert.deepEqual(world.statusRequests(), [], "there is nothing to verify without a sync token");
|
assert.equal(started.body.service, "foundry", "and says which service it is");
|
||||||
|
assert.equal(started.body.target.id, "world-1", "the world tells Dragonroll who it is");
|
||||||
|
assert.equal(started.body.target.name, "Test World");
|
||||||
|
assert.equal(started.body.target.meta.system, "dnd5e");
|
||||||
|
|
||||||
|
assert.match(world.status(), /^Not connected yet/);
|
||||||
|
assert.ok(world.status().includes(SIGN_UP_LINK), "the status is the link the GM has to open");
|
||||||
|
assert.equal(world.setting("linkCode"), "link-code-1", "the code behind the link is kept to ask with");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("a paired world names the Dragonroll campaign it is connected to", async () => {
|
test("a world that holds a token neither asks for a link nor waits on one", async () => {
|
||||||
const world = await makeStubWorld({
|
const world = await makeStubWorld({
|
||||||
answers: { "foundry/sync/status": { status: "ok", campaign: LINKED_CAMPAIGN, worldId: "world-1" } },
|
answers: { "foundry/sync/status": { status: "ok", campaign: LINKED_CAMPAIGN, worldId: "world-1" } },
|
||||||
}).start();
|
}).start();
|
||||||
|
|
||||||
assert.equal(world.status(), `Connected to the Dragonroll campaign "${LINKED_CAMPAIGN.name}".`);
|
assert.equal(world.status(), `Connected to the Dragonroll campaign "${LINKED_CAMPAIGN.name}".`);
|
||||||
|
assert.deepEqual(world.linkStarts(), [], "a paired world has nothing to link");
|
||||||
assert.equal(world.statusRequests()[0].authorization, "Bearer sync-token-1", "the campaign is asked with the sync token");
|
assert.equal(world.statusRequests()[0].authorization, "Bearer sync-token-1", "the campaign is asked with the sync token");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -169,6 +191,7 @@ test("a campaign that unlinked this world stops being reported as connected", as
|
|||||||
|
|
||||||
assert.match(world.status(), /^Not connected/);
|
assert.match(world.status(), /^Not connected/);
|
||||||
assert.match(world.status(), /no longer linked/);
|
assert.match(world.status(), /no longer linked/);
|
||||||
|
assert.equal(world.setting("syncToken"), "", "the dead token is dropped, so nothing keeps pushing to that campaign");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("an unreachable Dragonroll keeps the pairing this client already knows", async () => {
|
test("an unreachable Dragonroll keeps the pairing this client already knows", async () => {
|
||||||
@@ -178,44 +201,58 @@ test("an unreachable Dragonroll keeps the pairing this client already knows", as
|
|||||||
"a Dragonroll without the status route says nothing, so the token speaks");
|
"a Dragonroll without the status route says nothing, so the token speaks");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("a code that cannot be redeemed explains why the world is not connected", async () => {
|
test("a link still waiting on its GM says the world is not connected yet", async () => {
|
||||||
const world = await makeStubWorld({
|
const world = await makeStubWorld({
|
||||||
syncToken: "",
|
syncToken: "",
|
||||||
answers: { "foundry/link/complete": { status: "error", msg: "foundry.errors.link-expired" } },
|
linkCode: "link-code-1",
|
||||||
});
|
linkUrl: SIGN_UP_LINK,
|
||||||
await world.start();
|
answers: { "link/pickup": { status: "ok", state: "pending" } },
|
||||||
|
}).start();
|
||||||
|
|
||||||
await world.configure("linkCode", "AN-EXPIRED-CODE");
|
assert.equal(world.linkPickups()[0].body.code, "link-code-1", "the world asks with the code it was given");
|
||||||
|
assert.deepEqual(world.linkStarts(), [], "an unanswered link is kept, not replaced");
|
||||||
assert.match(world.status(), /^Not connected/);
|
assert.match(world.status(), /^Not connected yet/);
|
||||||
assert.match(world.status(), /pairing code is invalid, expired, or already used/);
|
assert.ok(world.status().includes(SIGN_UP_LINK), "and it is still the link to open");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("a code still waiting on Dragonroll says the pairing is not finished", async () => {
|
test("a picked-up link connects the world, hands over its token and is dropped", async () => {
|
||||||
const world = await makeStubWorld({
|
|
||||||
syncToken: "",
|
|
||||||
answers: { "foundry/link/complete": { status: "error", msg: "errors.internal" } },
|
|
||||||
});
|
|
||||||
await world.start();
|
|
||||||
|
|
||||||
await world.configure("linkCode", "A-CODE-TO-RETRY");
|
|
||||||
|
|
||||||
assert.equal(world.status(), "Not connected yet: waiting for Dragonroll to accept this pairing code.");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("redeeming a pairing code connects the world to its campaign", async () => {
|
|
||||||
const world = await makeStubWorld({
|
const world = await makeStubWorld({
|
||||||
syncToken: "",
|
syncToken: "",
|
||||||
|
linkCode: "link-code-1",
|
||||||
|
linkUrl: SIGN_UP_LINK,
|
||||||
answers: {
|
answers: {
|
||||||
"foundry/link/complete": { status: "ok", campaign: LINKED_CAMPAIGN, syncToken: "sync-token-2" },
|
"link/pickup": {
|
||||||
|
status: "ok",
|
||||||
|
state: "linked",
|
||||||
|
campaign: LINKED_CAMPAIGN,
|
||||||
|
syncToken: "sync-token-2",
|
||||||
|
bridgeConfig: { url: "http://bridge.test", pushToken: "push-1" },
|
||||||
},
|
},
|
||||||
});
|
// The token this link handed over is the one the campaign is asked with.
|
||||||
await world.start();
|
"foundry/sync/status": { status: "ok", campaign: LINKED_CAMPAIGN, worldId: "world-1" },
|
||||||
|
},
|
||||||
await world.configure("linkCode", "A-FRESH-CODE");
|
}).start();
|
||||||
|
|
||||||
assert.equal(world.status(), `Connected to the Dragonroll campaign "${LINKED_CAMPAIGN.name}".`);
|
assert.equal(world.status(), `Connected to the Dragonroll campaign "${LINKED_CAMPAIGN.name}".`);
|
||||||
assert.equal(world.game.settings.get(MODULE_ID, "linkCode"), "", "a redeemed code is not kept");
|
assert.equal(world.setting("syncToken"), "sync-token-2", "the token the link came with is what sync runs on");
|
||||||
|
assert.deepEqual(world.setting("bridgeConfig"), { url: "http://bridge.test", pushToken: "push-1" });
|
||||||
|
assert.equal(world.setting("linkCode"), "", "a link that delivered its token is not asked about again");
|
||||||
|
assert.equal(world.setting("linkUrl"), "");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("an expired link is replaced by one the GM can still open", async () => {
|
||||||
|
const world = await makeStubWorld({
|
||||||
|
syncToken: "",
|
||||||
|
linkCode: "link-code-1",
|
||||||
|
linkUrl: SIGN_UP_LINK,
|
||||||
|
answers: {
|
||||||
|
"link/pickup": { status: "ok", state: "expired" },
|
||||||
|
"link/start": { status: "ok", code: "link-code-2", linkUrl: "http://frontend.test/link/authorize?service=foundry#code=link-code-2" },
|
||||||
|
},
|
||||||
|
}).start();
|
||||||
|
|
||||||
|
assert.equal(world.setting("linkCode"), "link-code-2", "the world keeps a link nobody has to guess at");
|
||||||
|
assert.match(world.status(), /link-code-2/, "and shows the new one");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("whatever is typed into the status is replaced by the real one", async () => {
|
test("whatever is typed into the status is replaced by the real one", async () => {
|
||||||
@@ -224,7 +261,8 @@ test("whatever is typed into the status is replaced by the real one", async () =
|
|||||||
});
|
});
|
||||||
await world.start();
|
await world.start();
|
||||||
|
|
||||||
await world.configure("pairingStatus", "My own status text");
|
await world.game.settings.set(MODULE_ID, "pairingStatus", "My own status text");
|
||||||
|
await world.settle();
|
||||||
|
|
||||||
assert.equal(world.status(), `Connected to the Dragonroll campaign "${LINKED_CAMPAIGN.name}".`);
|
assert.equal(world.status(), `Connected to the Dragonroll campaign "${LINKED_CAMPAIGN.name}".`);
|
||||||
});
|
});
|
||||||
|
|||||||
122
tests/pnpm-workspace.test.js
Normal file
122
tests/pnpm-workspace.test.js
Normal file
@@ -0,0 +1,122 @@
|
|||||||
|
// Tests for Syndria98/dragonroll#29: the monorepo is a pnpm workspace, so running or installing it
|
||||||
|
// goes through pnpm (`pnpm install`, `pnpm dev`, `pnpm test`) and the images are built with the
|
||||||
|
// workspace manifests instead of one npm lockfile per package.
|
||||||
|
//
|
||||||
|
// These checks only read the manifests, the Dockerfiles and the workflows, so they need no installed
|
||||||
|
// dependencies. They fail when a package is added to the repository without joining the workspace, or
|
||||||
|
// when a build step slips back to npm and its deleted `package-lock.json`.
|
||||||
|
//
|
||||||
|
// Run with `pnpm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
|
||||||
|
const root = path.join(__dirname, "..");
|
||||||
|
|
||||||
|
const read = (...parts) => fs.readFileSync(path.join(root, ...parts), "utf8");
|
||||||
|
|
||||||
|
const workspace = read("pnpm-workspace.yaml");
|
||||||
|
const rootManifest = JSON.parse(read("package.json"));
|
||||||
|
|
||||||
|
// `dragonroll-foundry/bridge` is deliberately left out: it depends on nothing but Node built-ins, it
|
||||||
|
// is not part of `pnpm dev`, and its README runs it with `npm start --prefix foundry/bridge`.
|
||||||
|
const apps = ["backend", "frontend", "discord-bot"];
|
||||||
|
|
||||||
|
function packageJsonOf(pkg) {
|
||||||
|
return JSON.parse(read(pkg, "package.json"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// The items of a top-level `key:` list of pnpm-workspace.yaml, quotes dropped.
|
||||||
|
function yamlList(key) {
|
||||||
|
const block = new RegExp(`${key}\\n((?:\\s+-.*\\n?)+)`).exec(workspace)?.[1] ?? "";
|
||||||
|
return [...block.matchAll(/^\s+-\s+'?([^'\s]+)'?\s*$/gm)].map((match) => match[1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
test("every app package of the monorepo belongs to the pnpm workspace", () => {
|
||||||
|
const listed = yamlList("packages:");
|
||||||
|
for (const pkg of apps) {
|
||||||
|
assert.ok(listed.includes(pkg), `${pkg} must be listed in pnpm-workspace.yaml`);
|
||||||
|
assert.ok(fs.existsSync(path.join(root, pkg, "package.json")), `${pkg} must have a package.json`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the workspace root is private and pins one pnpm version for corepack", () => {
|
||||||
|
assert.equal(rootManifest.private, true, "the workspace root must not be publishable");
|
||||||
|
assert.match(rootManifest.packageManager, /^pnpm@\d+\.\d+\.\d+$/, "packageManager must pin pnpm");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("npm lockfiles stay gone and pnpm-lock.yaml is the only lockfile", () => {
|
||||||
|
const lockfiles = ["", ...apps].flatMap((pkg) => [
|
||||||
|
path.join(root, pkg, "package-lock.json"),
|
||||||
|
path.join(root, pkg, "yarn.lock"),
|
||||||
|
]);
|
||||||
|
const present = lockfiles.filter((lockfile) => fs.existsSync(lockfile));
|
||||||
|
assert.deepEqual(present, [], `only pnpm-lock.yaml may exist, found ${present.join(", ")}`);
|
||||||
|
assert.ok(fs.existsSync(path.join(root, "pnpm-lock.yaml")), "pnpm-lock.yaml must be committed");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("`pnpm dev` runs the whole monorepo through the workspace instead of npm --prefix", () => {
|
||||||
|
const dev = rootManifest.scripts.dev;
|
||||||
|
assert.match(dev, /^concurrently -k/, "the dev script keeps running every app together");
|
||||||
|
assert.ok(!/\bnpm\b/.test(dev), "the dev script must not call npm");
|
||||||
|
for (const pkg of apps) {
|
||||||
|
assert.ok(
|
||||||
|
dev.includes(`pnpm --filter ./${pkg}`),
|
||||||
|
`the dev script must run ${pkg} through the workspace: ${dev}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
// The Foundry launcher is not a package, so concurrently keeps driving it.
|
||||||
|
assert.match(dev, /node scripts\/run-foundry\.js/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every app package can be started on its own", () => {
|
||||||
|
// `pnpm dev:<package>`; building stays `pnpm --filter ./frontend run build`.
|
||||||
|
for (const pkg of apps) {
|
||||||
|
const script = rootManifest.scripts[`dev:${pkg}`];
|
||||||
|
assert.ok(script, `the root needs a dev:${pkg} script`);
|
||||||
|
assert.match(script, new RegExp(`pnpm --filter ./${pkg} run \\w+`));
|
||||||
|
const packageScript = packageJsonOf(pkg).scripts[/run (\w+)$/.exec(script)[1]];
|
||||||
|
assert.ok(packageScript, `${pkg} must define the script dev:${pkg} runs`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the Dockerfiles install with pnpm from the workspace root", () => {
|
||||||
|
for (const pkg of apps) {
|
||||||
|
const dockerfile = read(pkg, "Dockerfile");
|
||||||
|
assert.match(dockerfile, /corepack enable/, `${pkg}: pnpm must come from corepack`);
|
||||||
|
assert.match(
|
||||||
|
dockerfile,
|
||||||
|
/COPY pnpm-workspace\.yaml pnpm-lock\.yaml package.json/,
|
||||||
|
`${pkg}: the workspace manifests must be copied before installing`
|
||||||
|
);
|
||||||
|
assert.match(
|
||||||
|
dockerfile,
|
||||||
|
new RegExp(`pnpm install --frozen-lockfile[^\\n]*--filter \\./${pkg}`),
|
||||||
|
`${pkg}: dependencies must be installed from the lockfile, filtered to this package`
|
||||||
|
);
|
||||||
|
assert.ok(!/\bnpm (ci|install)\b/.test(dockerfile), `${pkg}: must not fall back to npm install`);
|
||||||
|
}
|
||||||
|
// The images are built from the repository root, so the manifests are in the context.
|
||||||
|
const deploy = read(".gitea", "workflows", "deploy.yml");
|
||||||
|
for (const pkg of apps) {
|
||||||
|
assert.ok(
|
||||||
|
deploy.includes(`-f ./${pkg}/Dockerfile .`),
|
||||||
|
`${pkg} must be built with the repository root as build context`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the test workflow runs the suite through pnpm", () => {
|
||||||
|
assert.match(read(".gitea", "workflows", "test.yml"), /corepack pnpm test/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the workspace allows the dependencies that build native binaries to run their scripts", () => {
|
||||||
|
// pnpm skips install scripts of dependencies by default; the frontend build needs these two to
|
||||||
|
// place their native binary.
|
||||||
|
const allowed = yamlList("onlyBuiltDependencies:");
|
||||||
|
for (const dependency of ["esbuild", "@parcel/watcher"]) {
|
||||||
|
assert.ok(allowed.includes(dependency), `${dependency} must be listed in onlyBuiltDependencies`);
|
||||||
|
}
|
||||||
|
});
|
||||||
88
tests/sidebar-entity-entry.test.js
Normal file
88
tests/sidebar-entity-entry.test.js
Normal file
@@ -0,0 +1,88 @@
|
|||||||
|
// Tests for the entity-entry sizing problem of Syndria98/dragonroll#21: the actor / item / map rows
|
||||||
|
// in the campaign sidebar were wider than the sidebar itself, so their hover border and the anchored
|
||||||
|
// state of a map poked outside of it.
|
||||||
|
//
|
||||||
|
// The repository root installs no dependencies, so the checks read the sidebar component the same way
|
||||||
|
// `tests/map-viewer.test.js` reads its window: the rules are about the box of the elements themselves.
|
||||||
|
//
|
||||||
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
|
||||||
|
const source = fs.readFileSync(
|
||||||
|
path.join(__dirname, "..", "frontend", "app", "components", "partials", "ContentSidebar.vue"),
|
||||||
|
"utf8"
|
||||||
|
);
|
||||||
|
|
||||||
|
// `selector` is inserted verbatim, so escape the `.` of a class combination (`entity-entry\\.anchored`).
|
||||||
|
// A trailing `\.entity-entry\s*\{` cannot match `.entity-entry:hover` or `.entity-entry-name`, so the
|
||||||
|
// plain rule is always the one that comes back. Comments are dropped: they explain a rule, they are
|
||||||
|
// not part of it.
|
||||||
|
function ruleFor(selector) {
|
||||||
|
const rule = new RegExp(`\\.${selector}\\s*\\{([^}]*)\\}`).exec(source)?.[0];
|
||||||
|
return rule?.replace(/\/\*[\s\S]*?\*\//g, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
function declaration(rule, property) {
|
||||||
|
return new RegExp(`${property}:\\s*([^;]*)`).exec(rule)?.[1].trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
test("the sidebar list the entity entries live in is border-box sized", () => {
|
||||||
|
const wrap = ruleFor("sidebar-list-drop-wrap");
|
||||||
|
assert.ok(wrap, "expected a .sidebar-list-drop-wrap style rule");
|
||||||
|
// Its fixed width already includes the padding the entries sit in; the entries' 100% resolves
|
||||||
|
// against that padded content box.
|
||||||
|
assert.match(wrap, /box-sizing:\s*border-box/);
|
||||||
|
assert.match(wrap, /padding:/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every section renders its entries inside the sidebar list", () => {
|
||||||
|
const list = /class="sidebar-list-drop-wrap"[\s\S]*?\n {12}<\/div>\n {8}<\/aside>/.exec(source);
|
||||||
|
assert.ok(list, "expected the sidebar list wrapper to be followed by the closing aside");
|
||||||
|
// actors, items and maps all use the same row
|
||||||
|
const rendered = list[0].match(/class="entity-entry"/g) || [];
|
||||||
|
assert.ok(rendered.length >= 3, `expected every section to render entity entries, found ${rendered.length}`);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("an entity entry measures its padding and border inside the sidebar width", () => {
|
||||||
|
const entry = ruleFor("entity-entry");
|
||||||
|
assert.ok(entry, "expected a .entity-entry style rule");
|
||||||
|
|
||||||
|
const width = declaration(entry, "width");
|
||||||
|
const padding = declaration(entry, "padding");
|
||||||
|
const border = declaration(entry, "border");
|
||||||
|
assert.ok(width, "the entry must fill the sidebar list");
|
||||||
|
assert.ok(padding && border, "the entry has inner padding and a border to fit");
|
||||||
|
|
||||||
|
// These rows are divs and the app ships no global box-sizing reset, so with the default
|
||||||
|
// content-box the padding and the border were added on top of the 100% width and the box — border
|
||||||
|
// and all — overflowed the sidebar.
|
||||||
|
assert.equal(
|
||||||
|
declaration(entry, "box-sizing"),
|
||||||
|
"border-box",
|
||||||
|
"an entry sized at 100% with padding and a border needs box-sizing: border-box"
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the hovered and anchored states keep the entry the same size", () => {
|
||||||
|
const entry = ruleFor("entity-entry");
|
||||||
|
// The resting border is transparent instead of `none`, so showing it on hover or when a map is
|
||||||
|
// anchored only recolours it and never grows the row.
|
||||||
|
assert.match(declaration(entry, "border"), /transparent/);
|
||||||
|
|
||||||
|
for (const selector of ["entity-entry:hover", "entity-entry\\.anchored"]) {
|
||||||
|
const rule = ruleFor(selector);
|
||||||
|
assert.ok(rule, `expected a .${selector} style rule`);
|
||||||
|
assert.doesNotMatch(rule, /border(-width)?\s*:\s*[^;]*\d+px/, `.${selector} must not widen the border`);
|
||||||
|
assert.match(rule, /border-color:/, `.${selector} is a state that shows the border`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a long entry name wraps instead of pushing the entry out of the sidebar", () => {
|
||||||
|
const name = ruleFor("entity-entry-name");
|
||||||
|
assert.ok(name, "expected a .entity-entry-name style rule");
|
||||||
|
assert.match(name, /(word-break|overflow-wrap):/, "an unbreakable name has to wrap inside the entry");
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user