Compare commits
10 Commits
ai/issue-3
...
d567b5d171
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d567b5d171 | ||
| ef343dbdd8 | |||
| 909d403435 | |||
|
|
4505365f21 | ||
| 2c78ad039a | |||
|
|
1d3d978cda | ||
| e11c6fc4f3 | |||
| 8fa852d859 | |||
| 4e15b28bf6 | |||
|
|
9820a375dc |
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: |
|
||||
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
|
||||
run: |
|
||||
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_TAG=$(git describe --tags --abbrev=0) \
|
||||
--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
|
||||
|
||||
- name: Build backend
|
||||
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
|
||||
|
||||
- name: Build discord bot
|
||||
run: |
|
||||
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
|
||||
|
||||
- name: Copy files
|
||||
|
||||
@@ -28,4 +28,8 @@ jobs:
|
||||
fi
|
||||
|
||||
- name: Run tests
|
||||
run: npm test
|
||||
# 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'
|
||||
|
||||
30
AGENTS.md
30
AGENTS.md
@@ -14,7 +14,7 @@ items, maps, dice widgets, sounds).
|
||||
- `discord-bot/` — Discord bot (slash commands) that talks to the backend with a shared service secret, no login.
|
||||
- `dragonroll-foundry/` — Foundry VTT module (`scripts/api.js`) + optional read-only snapshot bridge.
|
||||
- `obsidian-plugin/` — plain JavaScript Obsidian plugin that imports/pushes campaign notes.
|
||||
- `tests/` — `npm test` (`node --test`, no dependencies installed): Foundry sync toggle and pairing status, map pins, sidebar entries.
|
||||
- `tests/` — `npm test` (`node --test`, no dependencies installed): Foundry sync toggle and pairing status, map pins and tokens, sidebar entries.
|
||||
|
||||
No DB seeding, no migrations, no linter/formatter, no Pinia/Vuex. Git: default branch `master` on a
|
||||
self-hosted Gitea; `.gitea/workflows/deploy.yml` builds and deploys Docker images on push to `master`,
|
||||
@@ -22,16 +22,24 @@ self-hosted Gitea; `.gitea/workflows/deploy.yml` builds and deploys Docker image
|
||||
|
||||
## 2. Commands
|
||||
|
||||
`pnpm` comes from corepack (`packageManager` in `package.json`); `COREPACK_ENABLE_DOWNLOAD_PROMPT=0`
|
||||
keeps corepack from asking in non-interactive shells.
|
||||
|
||||
```bash
|
||||
npm install --prefix backend && npm install --prefix frontend # root `npm install` = concurrently only
|
||||
npm run dev # backend :5000 + frontend :3000 + discord-bot + scripts/run-foundry.js
|
||||
npm --prefix backend run dev # or --prefix frontend run dev | build | preview
|
||||
npm test
|
||||
pnpm install # whole workspace, one lockfile (`-r` / `--filter <pkg>` for a single one)
|
||||
pnpm dev # backend :5000 + frontend :3000 + discord-bot + scripts/run-foundry.js
|
||||
pnpm dev:backend # or dev:frontend | dev:discord-bot
|
||||
pnpm --filter ./frontend run build # or preview
|
||||
pnpm test
|
||||
```
|
||||
|
||||
No `start` script in backend/frontend and no lint command. Verification = run the dev server and
|
||||
exercise the flow (`GET /api/test` returns a JSON hello).
|
||||
|
||||
There is no PM2 and no `ecosystem.config.js`: `pnpm dev` starts every dev process at the same time
|
||||
through the workspace (`concurrently` only labels them and kills them together), and production runs
|
||||
from the compose images (`CMD` of each `Dockerfile`).
|
||||
|
||||
Env: `backend/.env` (`PORT` is read but ignored, `DB_URI`), `frontend/.env` (`NUXT_PUBLIC_API_BASE_URL`),
|
||||
both gitignored; the `.env.production` files are committed. `backend/src/index.js` loads `.env.$NODE_ENV`
|
||||
when `NODE_ENV` is set, otherwise `.env`. The server always listens on **5000**.
|
||||
@@ -79,7 +87,7 @@ campaign, and handlers check ownership with a `userOwnsCampaign(campaignId, user
|
||||
- `Folder` — `name*`, `campaign*`, `parentFolder` (null = root, self-ref), `color`
|
||||
- `Actor` — `name*`, `campaign*`, `foundryActorId` (unique per campaign), plus free-form sheet fields (`type`, `species`, `className`, `level`, `abilityScores`, `armorClass`, `speed`, `proficiencies`, `traits`, `spells`, `image`) and `inventory[{name,quantity,weight}]` (flattened Foundry items, **not** `Item` docs)
|
||||
- `Item` — `name*`, `campaign*`, `foundryItemId` (unique per campaign), `foundryNames`, `category`, `rarity`, `quantity`, `weight`, `properties`, `description`
|
||||
- `Map` — `name*`, `campaign*`, `image` (filename in `src/uploads`), `gridSize`/`offsetX`/`offsetY`/`scale` (image px), `pins[{note→Note, x, y}]` (addressed by the pin's own `_id`)
|
||||
- `Map` — `name*`, `campaign*`, `image` (filename in `src/uploads`), `gridSize`/`offsetX`/`offsetY`/`scale` (image px), `pins[{note→Note, x, y}]` (addressed by the pin's own `_id`), `tokens[{actor→Actor, x, y}]` (the centre of the grid cell the token stands in, also addressed by its own `_id`)
|
||||
- `ServiceLinkRequest` — the pending/completed service pairings of §4; `DiscordGuildLink` maps a Discord guild to the Dragonroll user who claimed it
|
||||
|
||||
**API surface** (all under `/api`, all `{status,msg}`):
|
||||
@@ -90,7 +98,7 @@ campaign, and handlers check ownership with a `userOwnsCampaign(campaignId, user
|
||||
- `folder` — `list`, `create`, `update`, `rename`, `delete` (recursive: inner notes go to `folder: null`, subfolders re-parent then delete)
|
||||
- `actor` — `list`, `create`, `update` (partial, ownership checked), `upload-image?actor=` (multipart), `delete`
|
||||
- `item` — `list`, `create`, `update` (partial), `delete`
|
||||
- `map` — `list`, `create` (multipart `image` or JSON), `update` (multipart to replace the photo), `delete`, `pin` (`{id,note,x,y}`, re-pinning moves the marker), `unpin` (`{id,pin}`)
|
||||
- `map` — `list`, `create` (multipart `image` or JSON), `update` (multipart to replace the photo), `delete`, `pin` (`{id,note,x,y}`, re-pinning moves the marker), `unpin` (`{id,pin}`), `place-token` (`{id,actor,x,y}`, snapped to a cell centre, re-placing moves the token), `remove-token` (`{id,token}`)
|
||||
- `foundry` — read-only proxy over the bridge (`/world`, `/actors`, `/characters`, `/items`, `/actors/:id`, `/items/:id`, `/actors/:id/items`), needs `FOUNDRY_API_URL`
|
||||
|
||||
## 4. Service integrations (Foundry, Discord, Obsidian)
|
||||
@@ -130,7 +138,9 @@ campaign workspace (`TopBar` + `ContentSidebar` + note column + `StatusBar`), tu
|
||||
(`ActivePane` / `AnchoredMap` / `AnchorMap` in `services/Content.js`); `viewer/map/MapViewerPane.vue`
|
||||
renders it both there and in the detached `map_viewer` window. Right-clicking that map pins a campaign
|
||||
note at the spot (`services/MapPins.js` translates image px ↔ screen), clicking the marker opens
|
||||
`pinned_note`.
|
||||
`pinned_note`. Dragging an actor row out of the sidebar onto the map makes it stand on that grid cell
|
||||
as a token (`services/MapTokens.js` snaps to cell centres and sizes the token by its cell); the token
|
||||
drags on with the pointer, steps over the grid with the arrow keys, and Delete takes it off.
|
||||
|
||||
### 5.2 The window system
|
||||
|
||||
@@ -154,7 +164,7 @@ DOM ids these services depend on — **do not rename**: `window-wrapper-{id}`, `
|
||||
writes `localStorage.selectedCampaignId`, `RestoreCampaign`), `Content.js` (§5.1), `Emitter.js`
|
||||
(`mitt()` bus), `Toaster.js`, `Tooltip.js`, `ContextMenu.js`, `Sound.js` (`AddSound` binds
|
||||
`snap.wav` to `.sound-click`), `Marker.js` (marked + widgets), `ActionRegistry.js` (command palette:
|
||||
`register/unregister/search/execute`), `Windows.js` / `WindowDefinitions.js`, `MapPins.js`,
|
||||
`register/unregister/search/execute`), `Windows.js` / `WindowDefinitions.js`, `MapPins.js`, `MapTokens.js`,
|
||||
`widgets/DiceParser.js`.
|
||||
|
||||
### 5.4 Markdown → widgets
|
||||
@@ -214,7 +224,7 @@ new string to all three locales.** Namespaces in use: `general`, `login`, `regis
|
||||
4. `POST /api/note/delete` has **no ownership check** (any authenticated user can delete any note id); the other `note.js` handlers and `folder.js` do check.
|
||||
5. `/api/user/*` is mounted before the JWT guard: new routes there are public unless they authenticate inline (`/api/discord` is also before it, but every route there is gated by `requireBot`, the shared bot-secret header). `services/middleware.js`'s `isAdmin` is imported but applied to no route.
|
||||
6. `composables/useEmitter.ts` reads `$emitter` from `useNuxtApp()` and no plugin provides it — use `~/services/Emitter`.
|
||||
7. App-wide CORS only whitelists `http://localhost:3000`; `.env.production` files are committed with internal hosts; `ecosystem.config.js` runs `npm start`, which backend/frontend do not define (PM2 is dead, compose + nginx is the real deploy).
|
||||
7. App-wide CORS only whitelists `http://localhost:3000`; `.env.production` files are committed with internal hosts.
|
||||
8. `Windows.js`: `getComponent` caches `defineAsyncComponent` per type for the whole process (restart the dev server if a new window misbehaves), `SetupHandle` attaches `document` mouse listeners per window and never removes them, and `ClearAll()` iterates `Object.keys(windows)` instead of `windows.value`.
|
||||
9. The frontend treats the JWT as the user cache: `settings` changes need `GetUserSetting`/`SetUserSetting` round-trips, the token payload goes stale.
|
||||
|
||||
|
||||
@@ -1,23 +1,29 @@
|
||||
# Use official Node.js runtime
|
||||
FROM node:20-alpine
|
||||
|
||||
# pnpm is served by corepack and pinned by "packageManager" in the root package.json
|
||||
RUN corepack enable
|
||||
|
||||
# Create app directory
|
||||
WORKDIR /usr/src/app
|
||||
|
||||
# Copy package files first (better caching)
|
||||
COPY package*.json ./
|
||||
# Copy the workspace manifests first (better caching)
|
||||
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
|
||||
RUN npm ci --only=production
|
||||
# Install the production dependencies of the backend package
|
||||
RUN pnpm install --frozen-lockfile --prod --filter ./backend...
|
||||
|
||||
# Copy application source
|
||||
COPY . .
|
||||
|
||||
# Expose the app port
|
||||
# EXPOSE 3000
|
||||
COPY backend ./backend
|
||||
|
||||
# Environment variable
|
||||
ENV NODE_ENV=production
|
||||
|
||||
# The app reads .env.production from its working directory
|
||||
WORKDIR /usr/src/app/backend
|
||||
|
||||
# Start the application
|
||||
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
@@ -19,6 +19,14 @@ const MapSchema = new Schema({
|
||||
x: { type: Number, default: 0 },
|
||||
y: { type: Number, default: 0 }
|
||||
}],
|
||||
// Actors dragged onto the map to stand on it as tokens. x/y are image pixels of the centre of the
|
||||
// token, like a pin, and the viewer keeps them snapped onto a grid cell so a token sits where the
|
||||
// square it stands in is.
|
||||
tokens: [{
|
||||
actor: { type: Schema.Types.ObjectId, ref: 'Actor', required: true },
|
||||
x: { type: Number, default: 0 },
|
||||
y: { type: Number, default: 0 }
|
||||
}],
|
||||
campaign: {
|
||||
type: Schema.Types.ObjectId,
|
||||
ref: 'Campaign',
|
||||
|
||||
@@ -5,6 +5,7 @@ const upload = require('../services/storage');
|
||||
|
||||
const Campaign = require('../models/Campaign');
|
||||
const Actor = require('../models/Actor');
|
||||
const Map = require('../models/Map');
|
||||
|
||||
async function userOwnsCampaign(campaignId, userId) {
|
||||
const campaign = await Campaign.findOne({ _id: campaignId, createdBy: userId }).lean();
|
||||
@@ -101,6 +102,11 @@ router.post('/delete', async (req, res) => {
|
||||
if (!actor) return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||
if (!(await userOwnsCampaign(actor.campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
|
||||
await actor.deleteOne();
|
||||
|
||||
// A token pointing at an actor that is gone would stand on the maps for nothing: drop those
|
||||
// along with the actor, like the pins of a deleted note.
|
||||
await Map.updateMany({ 'tokens.actor': id }, { $pull: { tokens: { actor: id } } });
|
||||
|
||||
res.json({ status: 'ok' });
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
|
||||
@@ -6,6 +6,7 @@ const upload = require('../services/storage');
|
||||
const Campaign = require('../models/Campaign');
|
||||
const Map = require('../models/Map');
|
||||
const Note = require('../models/Note');
|
||||
const Actor = require('../models/Actor');
|
||||
|
||||
async function userOwnsCampaign(campaignId, userId) {
|
||||
const campaign = await Campaign.findOne({ _id: campaignId, createdBy: userId }).lean();
|
||||
@@ -93,8 +94,9 @@ router.post('/delete', async (req, res) => {
|
||||
}
|
||||
});
|
||||
|
||||
// A pin is a note placed at a spot of the map, in image pixels. Coordinates arrive as strings with
|
||||
// multipart requests and are never negative: the viewer clamps them to the image already.
|
||||
// A pin is a note placed at a spot of the map, in image pixels, and so is the centre of a token.
|
||||
// Coordinates arrive as strings with multipart requests and are never negative: the viewer clamps
|
||||
// them to the image already.
|
||||
function toCoordinate(value) {
|
||||
const number = Number(value);
|
||||
if (!Number.isFinite(number)) return 0;
|
||||
@@ -152,4 +154,69 @@ router.post('/unpin', async (req, res) => {
|
||||
}
|
||||
});
|
||||
|
||||
// A token is an actor standing on the map, at the middle of a grid cell. Anywhere it is dropped in a
|
||||
// cell lands it in that cell, whatever the grid is drawn from: same rounding as the viewer does while
|
||||
// it drags, so the token does not jump when the move is saved.
|
||||
function toCellCoordinate(value, size, offset) {
|
||||
const grid = Math.max(1, Number(size) || 50);
|
||||
const origin = Number(offset) || 0;
|
||||
const cell = Math.floor((toCoordinate(value) - origin) / grid);
|
||||
return Math.max(0, Math.round(origin + (cell + 0.5) * grid));
|
||||
}
|
||||
|
||||
router.post('/place-token', async (req, res) => {
|
||||
try {
|
||||
const { id, actor, x, y } = req.body;
|
||||
if (!id || !actor) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
||||
|
||||
const map = await Map.findById(id);
|
||||
if (!map) return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||
if (!(await userOwnsCampaign(map.campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
|
||||
|
||||
// Only an actor of the same campaign can stand on one of its maps.
|
||||
const actorDoc = await Actor.findOne({ _id: actor, campaign: map.campaign }).select('_id').lean();
|
||||
if (!actorDoc) return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||
|
||||
// An actor stands on a map once: placing it again moves its token instead of adding a twin.
|
||||
const token = map.tokens.find((current) => String(current.actor) === String(actor));
|
||||
const spot = {
|
||||
x: toCellCoordinate(x, map.gridSize, map.offsetX),
|
||||
y: toCellCoordinate(y, map.gridSize, map.offsetY)
|
||||
};
|
||||
if (token) {
|
||||
token.x = spot.x;
|
||||
token.y = spot.y;
|
||||
} else {
|
||||
map.tokens.push({ actor, ...spot });
|
||||
}
|
||||
|
||||
await map.save();
|
||||
res.json({ status: 'ok', map });
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
res.json({ status: 'error', msg: 'errors.internal' });
|
||||
}
|
||||
});
|
||||
|
||||
router.post('/remove-token', async (req, res) => {
|
||||
try {
|
||||
const { id, token } = req.body;
|
||||
if (!id || !token) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
||||
|
||||
const map = await Map.findById(id);
|
||||
if (!map) return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||
if (!(await userOwnsCampaign(map.campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
|
||||
|
||||
// `_id` stays with the tokens that remain, the same way the pins are removed.
|
||||
map.tokens = map.tokens
|
||||
.filter((current) => String(current._id) !== String(token))
|
||||
.map((current) => ({ _id: current._id, actor: current.actor, x: current.x, y: current.y }));
|
||||
await map.save();
|
||||
res.json({ status: 'ok', map });
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
res.json({ status: 'error', msg: 'errors.internal' });
|
||||
}
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
|
||||
@@ -1,21 +1,30 @@
|
||||
# Use official Node.js runtime
|
||||
FROM node:20-alpine
|
||||
|
||||
# pnpm is served by corepack and pinned by "packageManager" in the root package.json
|
||||
RUN corepack enable
|
||||
|
||||
# Create app directory
|
||||
WORKDIR /usr/src/app
|
||||
|
||||
# Copy package files first (better caching)
|
||||
COPY package*.json ./
|
||||
# Copy the workspace manifests first (better caching)
|
||||
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
|
||||
RUN npm ci --only=production
|
||||
# Install the production dependencies of the bot package
|
||||
RUN pnpm install --frozen-lockfile --prod --filter ./discord-bot...
|
||||
|
||||
# Copy application source
|
||||
COPY . .
|
||||
COPY discord-bot ./discord-bot
|
||||
|
||||
# Environment variable
|
||||
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),
|
||||
# it does not listen on a port.
|
||||
# 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
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
module.exports = {
|
||||
apps: [
|
||||
{
|
||||
name: "backend",
|
||||
cwd: "./backend",
|
||||
script: "npm",
|
||||
args: "start",
|
||||
env: {
|
||||
NODE_ENV: "production"
|
||||
}
|
||||
},
|
||||
{
|
||||
name: "frontend",
|
||||
cwd: "./frontend",
|
||||
script: "npm",
|
||||
args: "start",
|
||||
env: {
|
||||
NODE_ENV: "production"
|
||||
}
|
||||
}
|
||||
]
|
||||
};
|
||||
@@ -1,6 +1,9 @@
|
||||
# ---------- Build Stage ----------
|
||||
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_TAG
|
||||
ARG NUXT_PUBLIC_GIT_BRANCH
|
||||
@@ -11,18 +14,21 @@ ENV NUXT_PUBLIC_GIT_BRANCH=$NUXT_PUBLIC_GIT_BRANCH
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Copy package files
|
||||
COPY package*.json ./
|
||||
# Copy the workspace manifests (pnpm needs every package.json of the workspace)
|
||||
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
|
||||
RUN npm install
|
||||
# Install the dependencies of the frontend package
|
||||
RUN pnpm install --frozen-lockfile --filter ./frontend...
|
||||
|
||||
# Copy project files
|
||||
ARG CACHEBUST=1
|
||||
COPY . .
|
||||
COPY frontend ./frontend
|
||||
|
||||
# Build the Nuxt app
|
||||
RUN npm run build
|
||||
RUN pnpm --filter ./frontend run build
|
||||
|
||||
# ---------- Production Stage ----------
|
||||
FROM node:20-alpine
|
||||
@@ -30,7 +36,7 @@ FROM node:20-alpine
|
||||
WORKDIR /app
|
||||
|
||||
# Copy built output
|
||||
COPY --from=builder /app/.output ./.output
|
||||
COPY --from=builder /app/frontend/.output ./.output
|
||||
|
||||
# Expose Nuxt port
|
||||
EXPOSE 3000
|
||||
|
||||
@@ -8,6 +8,7 @@ import { emitter } from '~/services/Emitter';
|
||||
import Server from '~/services/Server';
|
||||
import { ClearWindow, CreateWindow, GetFirstWindowId } from '~/services/Windows';
|
||||
import { HideContextMenu, ShowContextMenu } from '~/services/ContextMenu';
|
||||
import { ACTOR_DRAG_TYPE } from '~/services/MapTokens';
|
||||
import NestedNoteList from './NestedNoteList.vue';
|
||||
|
||||
const { Campaign } = useCampaignService();
|
||||
@@ -44,6 +45,14 @@ async function handleSidebarDrop(event) {
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
// An actor row is dragged out of the sidebar onto a map, where it stands as a token. The map viewer
|
||||
// reads that type back on its drop (see MapViewerPane.vue); a note drag carries 'text/plain'
|
||||
// instead, so the two never land where the other belongs.
|
||||
function startActorDrag(event, actor) {
|
||||
event.dataTransfer.setData(ACTOR_DRAG_TYPE, String(actor._id));
|
||||
event.dataTransfer.effectAllowed = 'copyMove';
|
||||
}
|
||||
|
||||
function toggleExpandedFolder(folderId) {
|
||||
const arr = expandedFolderIds.value;
|
||||
const idx = arr.indexOf(folderId);
|
||||
@@ -488,7 +497,7 @@ onBeforeUnmount(() => {
|
||||
<div v-if="loadingEntries" class="sidebar-state">{{ t('campaigns.states.loading') }}</div>
|
||||
<div v-else-if="entriesError" class="sidebar-state error">{{ entriesError }}</div>
|
||||
<div v-else-if="actors.length === 0" class="sidebar-state">{{ t('campaigns.states.empty-actors') }}</div>
|
||||
<div v-for="actor in actors" :key="actor._id" class="entity-entry" role="button" tabindex="0" @click="openCharacterSheet(actor)" @keydown.enter="openCharacterSheet(actor)" @keydown.space.prevent="openCharacterSheet(actor)" @contextmenu.prevent="showEntryMenu(actor, 'actor')">
|
||||
<div v-for="actor in actors" :key="actor._id" class="entity-entry" role="button" tabindex="0" draggable="true" :title="t('campaigns.map.tokens.drag')" @click="openCharacterSheet(actor)" @keydown.enter="openCharacterSheet(actor)" @keydown.space.prevent="openCharacterSheet(actor)" @dragstart="startActorDrag($event, actor)" @contextmenu.prevent="showEntryMenu(actor, 'actor')">
|
||||
<span class="entity-entry-name">{{ actor.name }}</span>
|
||||
<span class="entity-entry-meta">{{ entrySummary(actor) }}</span>
|
||||
</div>
|
||||
|
||||
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
|
||||
import { ClearWindow, CreateWindow, GetFirstWindowId } from '@/services/Windows';
|
||||
import { HideContextMenu, ShowContextMenu } from '~/services/ContextMenu';
|
||||
import { BuildNoteOptions, OptionLabel, ToImagePoint, ToScreenPoint } from '~/services/MapPins';
|
||||
import { ActorDragId, CellCentre, IsActorDrag, MoveByCells, TokenSize } from '~/services/MapTokens';
|
||||
import { DisplayToast } from '~/services/Toaster';
|
||||
import Server, { getBaseUrl } from '~/services/Server';
|
||||
import { emitter } from '~/services/Emitter';
|
||||
@@ -227,27 +228,29 @@ function onPinContextMenu(pin) {
|
||||
}
|
||||
|
||||
async function savePin(noteId, spot) {
|
||||
await updatePins('/map/pin', { id: map.value?._id, note: noteId, x: spot.x, y: spot.y });
|
||||
await updateMap('/map/pin', { id: map.value?._id, note: noteId, x: spot.x, y: spot.y }, t('campaigns.map.pins.error'));
|
||||
}
|
||||
|
||||
async function removePin(pin) {
|
||||
await updatePins('/map/unpin', { id: map.value?._id, pin: pin?._id });
|
||||
await updateMap('/map/unpin', { id: map.value?._id, pin: pin?._id }, t('campaigns.map.pins.error'));
|
||||
}
|
||||
|
||||
// Both pin changes answer with the whole map, which keeps the sidebar entry and the anchored map in
|
||||
// step with what is on screen.
|
||||
async function updatePins(route, body) {
|
||||
if (!body.id) return;
|
||||
// Every pin and token change answers with the whole map, which keeps the sidebar entry and the
|
||||
// anchored map in step with what is on screen.
|
||||
async function updateMap(route, body, failure) {
|
||||
if (!body.id) return false;
|
||||
try {
|
||||
const response = await Server().post(route, body);
|
||||
if (response.data.status !== 'ok') {
|
||||
DisplayToast('red', t('campaigns.map.pins.error'), 3000);
|
||||
return;
|
||||
DisplayToast('red', failure, 3000);
|
||||
return false;
|
||||
}
|
||||
map.value = { ...response.data.map };
|
||||
emitter.emit('campaign-entry-updated', { entityType: 'map', entry: response.data.map });
|
||||
return true;
|
||||
} catch (error) {
|
||||
DisplayToast('red', t('campaigns.map.pins.error'), 3000);
|
||||
DisplayToast('red', failure, 3000);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -274,27 +277,252 @@ function handlePinnedNoteRenamed({ key, title }) {
|
||||
option.label = OptionLabel(option);
|
||||
}
|
||||
|
||||
// --- Actors standing on the map as tokens ---
|
||||
// An actor dragged out of the sidebar lands on the cell it is dropped on, and its token can then be
|
||||
// dragged (or nudged with the arrow keys) from cell to cell. Tokens are kept in image pixels like the
|
||||
// pins, so moving one only writes the middle of the cell it moved to.
|
||||
|
||||
const actors = ref([]);
|
||||
const actorsById = computed(() => new Map(actors.value.map((actor) => [String(actor._id), actor])));
|
||||
// Actor portraits that will not load (a Foundry path, say) fall back to the initials of the actor.
|
||||
const brokenImages = ref(new Set());
|
||||
const draggingActor = ref(false);
|
||||
// The token a pointer is holding, and the cell centre it is held at: the move stays local until the
|
||||
// pointer lets go, so a drag across the map is one save and not one per mouse move.
|
||||
const movingToken = ref(null);
|
||||
|
||||
const grid = computed(() => ({
|
||||
gridSize: map.value?.gridSize,
|
||||
offsetX: map.value?.offsetX,
|
||||
offsetY: map.value?.offsetY
|
||||
}));
|
||||
|
||||
const tokens = computed(() => map.value?.tokens ?? []);
|
||||
|
||||
// The actor names and portraits the tokens are drawn from. An actor that is not (or no longer) in the
|
||||
// campaign is not dropped from the map here: the backend does that, and the next read of the map is
|
||||
// the one that shows it gone.
|
||||
async function fetchTokenActors() {
|
||||
if (!campaignId.value) {
|
||||
actors.value = [];
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const response = await Server().get('/actor/list', { params: { campaign: campaignId.value } });
|
||||
actors.value = response.data.status === 'ok' ? (response.data.actors ?? []) : [];
|
||||
} catch (error) {
|
||||
actors.value = [];
|
||||
}
|
||||
}
|
||||
|
||||
function tokenActor(token) {
|
||||
return actorsById.value.get(String(token?.actor)) ?? null;
|
||||
}
|
||||
|
||||
function tokenLabel(token) {
|
||||
return tokenActor(token)?.name ?? '';
|
||||
}
|
||||
|
||||
function tokenInitials(token) {
|
||||
const name = String(tokenLabel(token) ?? '').trim();
|
||||
if (!name) return '?';
|
||||
return name.split(/\s+/).slice(0, 2).map((part) => part.charAt(0).toUpperCase()).join('');
|
||||
}
|
||||
|
||||
function tokenImage(token) {
|
||||
const image = tokenActor(token)?.image;
|
||||
if (!image || brokenImages.value.has(String(token?.actor))) return '';
|
||||
return /^(https?:|data:|\/\/)/i.test(image) ? image : `${getBaseUrl()}/public/${image}`;
|
||||
}
|
||||
|
||||
function onTokenImageError(token) {
|
||||
brokenImages.value = new Set(brokenImages.value).add(String(token?.actor));
|
||||
}
|
||||
|
||||
// Tokens are drawn in screen space too, but they are sized by the cell they stand on: unlike a pin, a
|
||||
// token covers ground, so it grows and shrinks with the map.
|
||||
function tokenStyle(token) {
|
||||
const held = movingToken.value && String(movingToken.value.token?._id) === String(token?._id)
|
||||
? movingToken.value
|
||||
: token;
|
||||
const point = ToScreenPoint(held, viewState());
|
||||
const size = TokenSize(grid.value, zoom.value);
|
||||
return {
|
||||
left: `${point.x}px`,
|
||||
top: `${point.y}px`,
|
||||
width: `${size}px`,
|
||||
height: `${size}px`,
|
||||
// The initials of an actor with no portrait are read at the size of its token.
|
||||
fontSize: `${Math.min(18, Math.max(9, Math.round(size * 0.36)))}px`
|
||||
};
|
||||
}
|
||||
|
||||
// The spot of the viewport a drop or a drag is over, in image pixels, or null outside of the image.
|
||||
function imagePointOf(event) {
|
||||
const bounds = viewport.value?.getBoundingClientRect();
|
||||
if (!bounds) return null;
|
||||
return ToImagePoint({ x: event.clientX - bounds.left, y: event.clientY - bounds.top }, viewState());
|
||||
}
|
||||
|
||||
function onMapDragOver(event) {
|
||||
if (!imageUrl.value || !IsActorDrag(event)) return;
|
||||
// Saying so is what lets the browser deliver the drop at all.
|
||||
event.preventDefault();
|
||||
draggingActor.value = true;
|
||||
}
|
||||
|
||||
function onMapDragLeave(event) {
|
||||
// Crossing into a child of the viewport is not leaving it.
|
||||
if (event.relatedTarget && viewport.value?.contains(event.relatedTarget)) return;
|
||||
draggingActor.value = false;
|
||||
}
|
||||
|
||||
async function onMapDrop(event) {
|
||||
draggingActor.value = false;
|
||||
const actorId = ActorDragId(event);
|
||||
if (!actorId || !imageUrl.value || !map.value?._id) return;
|
||||
|
||||
const spot = imagePointOf(event);
|
||||
if (!spot) return;
|
||||
await placeToken(actorId, spot);
|
||||
}
|
||||
|
||||
// An actor stands on the map once: dropping it again on a map it already occupies moves it there, the
|
||||
// same way re-pinning a note moves its marker.
|
||||
async function placeToken(actorId, spot) {
|
||||
const centre = CellCentre(spot, grid.value);
|
||||
if (!centre) return false;
|
||||
return updateMap('/map/place-token', {
|
||||
id: map.value?._id, actor: actorId, x: centre.x, y: centre.y
|
||||
}, t('campaigns.map.tokens.error'));
|
||||
}
|
||||
|
||||
async function removeToken(token) {
|
||||
await updateMap('/map/remove-token', { id: map.value?._id, token: token?._id }, t('campaigns.map.tokens.error'));
|
||||
}
|
||||
|
||||
let tokenPointerId = null;
|
||||
|
||||
function onTokenPointerDown(event, token) {
|
||||
// The token is what is being held here: the map must not start panning under the pointer.
|
||||
event.stopPropagation();
|
||||
if (event.button !== 0) return;
|
||||
|
||||
tokenPointerId = event.pointerId;
|
||||
event.currentTarget.setPointerCapture?.(event.pointerId);
|
||||
movingToken.value = { token: { ...token }, x: Number(token.x) || 0, y: Number(token.y) || 0 };
|
||||
}
|
||||
|
||||
function onTokenPointerMove(event) {
|
||||
if (!movingToken.value || event.pointerId !== tokenPointerId) return;
|
||||
|
||||
const spot = imagePointOf(event);
|
||||
// Dragged off the image, the token keeps the cell it had: an actor is never lost over the edge.
|
||||
if (!spot) return;
|
||||
const centre = CellCentre(spot, grid.value);
|
||||
if (!centre) return;
|
||||
movingToken.value = { ...movingToken.value, x: centre.x, y: centre.y };
|
||||
}
|
||||
|
||||
async function onTokenPointerUp(event) {
|
||||
if (!movingToken.value || event.pointerId !== tokenPointerId) return;
|
||||
|
||||
const { token, x, y } = movingToken.value;
|
||||
tokenPointerId = null;
|
||||
movingToken.value = null;
|
||||
event.currentTarget?.releasePointerCapture?.(event.pointerId);
|
||||
|
||||
if (x === Number(token.x) && y === Number(token.y)) return;
|
||||
await placeToken(token.actor, { x, y });
|
||||
}
|
||||
|
||||
const CELL_STEPS = {
|
||||
ArrowLeft: [-1, 0],
|
||||
ArrowRight: [1, 0],
|
||||
ArrowUp: [0, -1],
|
||||
ArrowDown: [0, 1]
|
||||
};
|
||||
|
||||
// A focused token answers to the keyboard too: arrows walk it over the grid, Delete takes it off.
|
||||
async function onTokenKeydown(event, token) {
|
||||
const step = CELL_STEPS[event.key];
|
||||
if (step) {
|
||||
event.preventDefault();
|
||||
const centre = MoveByCells(token, grid.value, step[0], step[1]);
|
||||
if (centre) await placeToken(token.actor, centre);
|
||||
return;
|
||||
}
|
||||
if (event.key === 'Delete' || event.key === 'Backspace') {
|
||||
event.preventDefault();
|
||||
await removeToken(token);
|
||||
}
|
||||
}
|
||||
|
||||
function onTokenContextMenu(token) {
|
||||
const actor = tokenActor(token);
|
||||
const menuItems = [];
|
||||
|
||||
if (actor) {
|
||||
menuItems.push({
|
||||
name: t('campaigns.map.tokens.open'),
|
||||
icon: '/icons/iconoir/regular/user.svg',
|
||||
action: () => { HideContextMenu(); openActorSheet(actor); }
|
||||
});
|
||||
menuItems.push({ divider: true });
|
||||
}
|
||||
|
||||
menuItems.push({
|
||||
name: t('campaigns.map.tokens.remove'),
|
||||
icon: '/icons/iconoir/regular/xmark-circle.svg',
|
||||
action: () => { HideContextMenu(); removeToken(token); }
|
||||
});
|
||||
ShowContextMenu(menuItems);
|
||||
}
|
||||
|
||||
async function openActorSheet(actor) {
|
||||
// One sheet at a time, like the sidebar opens it.
|
||||
const existingWindowId = GetFirstWindowId('character_sheet');
|
||||
if (existingWindowId !== undefined) ClearWindow({ id: existingWindowId });
|
||||
await nextTick();
|
||||
CreateWindow('character_sheet', { actor });
|
||||
}
|
||||
|
||||
function handleActorEntry({ entityType, entry }) {
|
||||
if (entityType !== 'actor' || !entry?._id) return;
|
||||
if (entry.campaign && String(entry.campaign) !== String(campaignId.value)) return;
|
||||
actors.value = [entry, ...actors.value.filter((current) => String(current._id) !== String(entry._id))];
|
||||
}
|
||||
|
||||
// A different map was anchored while this pane was already mounted.
|
||||
watch(() => props.map, (incoming, previous) => {
|
||||
if (incoming === previous) return;
|
||||
map.value = incoming ? { ...incoming } : null;
|
||||
imageSize.value = { width: 0, height: 0 };
|
||||
movingToken.value = null;
|
||||
draggingActor.value = false;
|
||||
});
|
||||
|
||||
watch(campaignId, () => {
|
||||
noteOptions.value = [];
|
||||
fetchPinnableNotes();
|
||||
actors.value = [];
|
||||
fetchTokenActors();
|
||||
});
|
||||
|
||||
onMounted(() => {
|
||||
emitter.on('campaign-entry-updated', handleMapUpdated);
|
||||
emitter.on('campaign-entry-created', handleActorEntry);
|
||||
emitter.on('campaign-entry-updated', handleActorEntry);
|
||||
emitter.on('delete-note', handlePinnedNoteDeleted);
|
||||
emitter.on('title-updated', handlePinnedNoteRenamed);
|
||||
fetchPinnableNotes();
|
||||
fetchTokenActors();
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
emitter.off('campaign-entry-updated', handleMapUpdated);
|
||||
emitter.off('campaign-entry-created', handleActorEntry);
|
||||
emitter.off('campaign-entry-updated', handleActorEntry);
|
||||
emitter.off('delete-note', handlePinnedNoteDeleted);
|
||||
emitter.off('title-updated', handlePinnedNoteRenamed);
|
||||
});
|
||||
@@ -342,6 +570,9 @@ onBeforeUnmount(() => {
|
||||
@pointerup="onPointerUp"
|
||||
@pointercancel="onPointerUp"
|
||||
@contextmenu.prevent="onMapContextMenu"
|
||||
@dragover="onMapDragOver"
|
||||
@dragleave="onMapDragLeave"
|
||||
@drop.prevent="onMapDrop"
|
||||
>
|
||||
<template v-if="imageUrl">
|
||||
<img class="map-image" :src="imageUrl" :style="stageStyle" :alt="map?.name" draggable="false" @load="onImageLoaded">
|
||||
@@ -363,6 +594,30 @@ onBeforeUnmount(() => {
|
||||
<span class="pin-label">{{ pinLabel(pin) }}</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="map-tokens">
|
||||
<button
|
||||
v-for="token in tokens"
|
||||
:key="token._id"
|
||||
class="map-token"
|
||||
:class="{ moving: movingToken && String(movingToken.token?._id) === String(token._id) }"
|
||||
type="button"
|
||||
:style="tokenStyle(token)"
|
||||
:title="tokenLabel(token) || $t('campaigns.map.tokens.token')"
|
||||
:aria-label="tokenLabel(token) || $t('campaigns.map.tokens.token')"
|
||||
draggable="false"
|
||||
@pointerdown="onTokenPointerDown($event, token)"
|
||||
@pointermove="onTokenPointerMove"
|
||||
@pointerup="onTokenPointerUp"
|
||||
@pointercancel="onTokenPointerUp"
|
||||
@contextmenu.stop.prevent="onTokenContextMenu(token)"
|
||||
@keydown="onTokenKeydown($event, token)"
|
||||
>
|
||||
<span class="token-initials" aria-hidden="true">{{ tokenInitials(token) }}</span>
|
||||
<img v-if="tokenImage(token)" class="token-image" :src="tokenImage(token)" alt="" draggable="false" @error="onTokenImageError(token)">
|
||||
<span class="token-label">{{ tokenLabel(token) }}</span>
|
||||
</button>
|
||||
</div>
|
||||
<div v-if="draggingActor" class="map-drop-hint">{{ $t('campaigns.map.tokens.drop-hint') }}</div>
|
||||
</template>
|
||||
<div v-else class="map-empty">
|
||||
{{ $t('campaigns.map.no-image') }}
|
||||
@@ -404,6 +659,35 @@ onBeforeUnmount(() => {
|
||||
/* The note's name only when it is asked for: a map full of labels is a map nobody can read. */
|
||||
.pin-label { display: none; max-width: 200px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||
.map-pin:hover .pin-label, .map-pin:focus-visible .pin-label { display: inline; }
|
||||
/* Tokens are the actors standing on the map: drawn in screen space like the pins, but sized by the
|
||||
grid cell they occupy, so a token covers its square whatever the zoom is (see TokenSize). */
|
||||
.map-tokens { position: absolute; inset: 0; pointer-events: none; }
|
||||
.map-token {
|
||||
position: absolute; transform: translate(-50%, -50%); pointer-events: auto;
|
||||
display: flex; align-items: center; justify-content: center; margin: 0; padding: 0;
|
||||
border: 2px solid var(--color-link); border-radius: 50%;
|
||||
background: var(--color-background-soft); color: var(--color-text);
|
||||
cursor: grab; user-select: none; box-shadow: 0px 0px 6px -1px rgba(0,0,0,0.55);
|
||||
}
|
||||
.map-token:hover { border-color: var(--color-text); }
|
||||
.map-token:focus-visible { outline: 1px solid var(--color-link); outline-offset: 2px; }
|
||||
.map-token.moving { cursor: grabbing; }
|
||||
.token-image { position: absolute; inset: 0; box-sizing: border-box; width: 100%; height: 100%; object-fit: cover; border-radius: 50%; }
|
||||
/* No portrait (or one that will not load): the token shows the initials of its actor instead. */
|
||||
.token-initials { opacity: .8; white-space: nowrap; }
|
||||
.token-label {
|
||||
display: none; position: absolute; top: 100%; left: 50%; transform: translateX(-50%); margin-top: 3px;
|
||||
max-width: 160px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
|
||||
font-size: 11px; text-shadow: 0px 0px 4px rgba(0,0,0,0.8);
|
||||
}
|
||||
.map-token:hover .token-label, .map-token:focus-visible .token-label { display: block; }
|
||||
/* Shown while an actor is carried over the map from the sidebar, so the spot to let go of it has. */
|
||||
.map-drop-hint {
|
||||
position: absolute; top: 10px; left: 50%; transform: translateX(-50%);
|
||||
padding: 5px 10px; border: 1px dashed var(--color-link); border-radius: 7px;
|
||||
background: var(--color-background-soft); color: var(--color-text); font-size: 12px;
|
||||
pointer-events: none; box-shadow: 0px 0px 6px -1px rgba(0,0,0,0.55);
|
||||
}
|
||||
.map-empty { width: 100%; height: 100%; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 8px; font-size: 13px; opacity: .8; }
|
||||
.map-edit { border: 1px solid var(--color-border); border-radius: 7px; padding: 6px 11px; background: var(--color-background-soft); color: var(--color-text); font-size: 12px; cursor: pointer; }
|
||||
.map-edit:hover { background: var(--color-button-hover); }
|
||||
|
||||
@@ -89,9 +89,11 @@ onMounted(() => {
|
||||
.steps {
|
||||
margin-left: 8px;
|
||||
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){
|
||||
display: inline-flex;
|
||||
|
||||
69
frontend/app/services/MapTokens.js
Normal file
69
frontend/app/services/MapTokens.js
Normal file
@@ -0,0 +1,69 @@
|
||||
// The rules behind the actor tokens of a map (drag an actor from the sidebar onto a map, move the
|
||||
// token from cell to cell). Like the pins, a token is stored in image pixels, so these helpers only
|
||||
// translate and snap: they hold no state and talk to no API.
|
||||
|
||||
// What the sidebar puts into a drag when an actor row is pulled out of it, so the map knows an actor
|
||||
// is on its way and nothing else dropped on it (a note, a file) is taken for one.
|
||||
const ACTOR_DRAG_TYPE = 'application/x-dragonroll-actor';
|
||||
|
||||
// The actor id carried by a drag event, or null when the drag carries no actor. `types` is what a
|
||||
// dragover can see: the data itself is protected until the drop.
|
||||
function IsActorDrag(event) {
|
||||
return Array.from(event?.dataTransfer?.types ?? []).includes(ACTOR_DRAG_TYPE);
|
||||
}
|
||||
|
||||
function ActorDragId(event) {
|
||||
return String(event?.dataTransfer?.getData?.(ACTOR_DRAG_TYPE) ?? '').trim() || null;
|
||||
}
|
||||
|
||||
// The middle of the grid cell a point of the image stands in, in image pixels: this is what a token
|
||||
// is stored at, so it always stands in a square of the grid. The backend snaps the same way, so a
|
||||
// token does not move when a drag lands.
|
||||
function CellCentre(point, grid) {
|
||||
const size = Math.max(1, Number(grid?.gridSize) || 50);
|
||||
const offsetX = Number(grid?.offsetX) || 0;
|
||||
const offsetY = Number(grid?.offsetY) || 0;
|
||||
|
||||
const x = Number(point?.x);
|
||||
const y = Number(point?.y);
|
||||
if (!Number.isFinite(x) || !Number.isFinite(y)) return null;
|
||||
|
||||
// Spots off the top left corner count from the corner itself, and only whole pixels count: both
|
||||
// the way the route reads a coordinate, so the token a drag shows is the token that gets saved.
|
||||
const column = Math.floor((Math.max(0, Math.round(x)) - offsetX) / size);
|
||||
const row = Math.floor((Math.max(0, Math.round(y)) - offsetY) / size);
|
||||
return {
|
||||
x: Math.max(0, Math.round(offsetX + (column + 0.5) * size)),
|
||||
y: Math.max(0, Math.round(offsetY + (row + 0.5) * size))
|
||||
};
|
||||
}
|
||||
|
||||
// A token moved by whole cells (the arrow keys of a focused token): the same cell width the grid is
|
||||
// drawn with, so a token steps from one square to the next and never in between.
|
||||
function MoveByCells(centre, grid, columns, rows) {
|
||||
const size = Math.max(1, Number(grid?.gridSize) || 50);
|
||||
const x = Number(centre?.x);
|
||||
const y = Number(centre?.y);
|
||||
if (!Number.isFinite(x) || !Number.isFinite(y)) return null;
|
||||
|
||||
return {
|
||||
x: Math.max(0, Math.round(x + Number(columns) * size)),
|
||||
y: Math.max(0, Math.round(y + Number(rows) * size))
|
||||
};
|
||||
}
|
||||
|
||||
// The side of a token in screen pixels: one grid cell, so a token covers the square it stands in at
|
||||
// every zoom. Never smaller than an icon, or a zoomed-out map would hide its actors.
|
||||
function TokenSize(grid, zoom) {
|
||||
const cell = Math.max(1, Number(grid?.gridSize) || 50) * (Number(zoom) || 1);
|
||||
return Math.round(Math.max(18, cell));
|
||||
}
|
||||
|
||||
export {
|
||||
ACTOR_DRAG_TYPE,
|
||||
ActorDragId,
|
||||
CellCentre,
|
||||
IsActorDrag,
|
||||
MoveByCells,
|
||||
TokenSize
|
||||
};
|
||||
@@ -19,7 +19,7 @@ function ShowTooltip(){
|
||||
animate(tooltip, {
|
||||
opacity: [0, 1],
|
||||
translateY: [20, 0]
|
||||
}, {duration: 0.1, ease: 'ease-out'});
|
||||
}, {duration: 0.1, ease: 'easeOut'});
|
||||
showed = true;
|
||||
hided = false;
|
||||
}
|
||||
@@ -33,7 +33,7 @@ function HideTooltip(){
|
||||
animate(tooltip, {
|
||||
opacity: [1, 0],
|
||||
translateY: [0, 20]
|
||||
}, {duration: 0.1, ease: 'ease-in'}).finished.then(() => tooltip.style.display = "none")
|
||||
}, {duration: 0.1, ease: 'easeIn'}).finished.then(() => tooltip.style.display = "none")
|
||||
hided = true;
|
||||
showed = false;
|
||||
}
|
||||
|
||||
@@ -84,6 +84,12 @@
|
||||
"open": "Obre la nota", "remove": "Treu el marcador",
|
||||
"error": "No s'han pogut canviar els marcadors d'aquest mapa.",
|
||||
"note-error": "No s'ha pogut llegir aquesta nota. Potser s'ha suprimit."
|
||||
},
|
||||
"tokens": {
|
||||
"token": "Fitxa", "drag": "Arrossega aquest actor sobre un mapa per posar-lo",
|
||||
"drop-hint": "Deixa anar per posar l'actor en aquest mapa",
|
||||
"open": "Obre la fitxa de personatge", "remove": "Treu la fitxa",
|
||||
"error": "No s'han pogut canviar les fitxes d'aquest mapa."
|
||||
}
|
||||
},
|
||||
"character-sheet": {
|
||||
|
||||
@@ -88,6 +88,12 @@
|
||||
"open": "Open note", "remove": "Remove pin",
|
||||
"error": "Unable to change the pins of this map.",
|
||||
"note-error": "This note could not be read. It may have been deleted."
|
||||
},
|
||||
"tokens": {
|
||||
"token": "Token", "drag": "Drag this actor onto a map to place it there",
|
||||
"drop-hint": "Drop to place the actor on this map",
|
||||
"open": "Open character sheet", "remove": "Remove token",
|
||||
"error": "Unable to change the tokens of this map."
|
||||
}
|
||||
},
|
||||
"character-sheet": {
|
||||
|
||||
@@ -84,6 +84,12 @@
|
||||
"open": "Abrir nota", "remove": "Quitar el marcador",
|
||||
"error": "No se pudieron cambiar los marcadores de este mapa.",
|
||||
"note-error": "No se pudo leer esta nota. Puede que se haya eliminado."
|
||||
},
|
||||
"tokens": {
|
||||
"token": "Ficha", "drag": "Arrastra este actor sobre un mapa para colocarlo",
|
||||
"drop-hint": "Suelta para colocar al actor en este mapa",
|
||||
"open": "Abrir hoja de personaje", "remove": "Quitar la ficha",
|
||||
"error": "No se pudieron cambiar las fichas de este mapa."
|
||||
}
|
||||
},
|
||||
"character-sheet": {
|
||||
|
||||
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": {
|
||||
"concurrently": "^9.2.1"
|
||||
},
|
||||
"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/"
|
||||
}
|
||||
}
|
||||
|
||||
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
|
||||
// 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 fs = require('node:fs');
|
||||
const path = require('node:path');
|
||||
|
||||
@@ -83,6 +83,8 @@ function loadMapRoutes({ ownsCampaign = true, maps = [], notes = [] } = {}) {
|
||||
: null
|
||||
),
|
||||
},
|
||||
// The pins do not ask after actors, only the token routes below do.
|
||||
"../models/Actor": { findOne: () => mongooseQuery(null) },
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
344
tests/map-tokens.test.js
Normal file
344
tests/map-tokens.test.js
Normal file
@@ -0,0 +1,344 @@
|
||||
// Tests for the actor tokens of a map (Syndria98/dragonroll#38): an actor dragged out of the campaign
|
||||
// sidebar lands on the map as a token, and that token is then moved from cell to cell of the grid.
|
||||
//
|
||||
// Same set-up as tests/map-pins.test.js, which the repository root runs without installing anything:
|
||||
// the express routers are loaded into `node:vm` with their models stubbed, `MapTokens.js` is loaded as
|
||||
// a plain function, and the last checks read the templates, where the drag and drop wiring itself is
|
||||
// what has to stay right.
|
||||
//
|
||||
// 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 vm = require("node:vm");
|
||||
|
||||
function readRepoFile(...parts) {
|
||||
return fs.readFileSync(path.join(__dirname, "..", ...parts), "utf8");
|
||||
}
|
||||
|
||||
// A mongoose query answers whatever `await query` and `query.lean()` answer with, and lets `select()`
|
||||
// and `sort()` sit in between.
|
||||
function mongooseQuery(value) {
|
||||
const result = {
|
||||
select: () => result,
|
||||
sort: () => result,
|
||||
lean: () => Promise.resolve(value),
|
||||
then: (onFulfilled, onRejected) => Promise.resolve(value).then(onFulfilled, onRejected),
|
||||
};
|
||||
return result;
|
||||
}
|
||||
|
||||
// Loads an express router file with every module it requires stubbed out.
|
||||
function loadRouter(relativeParts, stubs) {
|
||||
const routes = new Map();
|
||||
const router = {
|
||||
get: (route, ...handlers) => routes.set(`GET ${route}`, handlers),
|
||||
post: (route, ...handlers) => routes.set(`POST ${route}`, handlers),
|
||||
};
|
||||
|
||||
const requireStub = (id) => {
|
||||
if (id === "express") return { Router: () => router };
|
||||
if (id === "../services/storage") return { single: () => (req, res, next) => next() };
|
||||
if (!(id in stubs)) throw new Error(`require("${id}") is not stubbed`);
|
||||
return stubs[id];
|
||||
};
|
||||
|
||||
const moduleStub = { exports: {} };
|
||||
vm.compileFunction(readRepoFile(...relativeParts), ["require", "module", "exports"])(
|
||||
requireStub, moduleStub, moduleStub.exports
|
||||
);
|
||||
|
||||
async function call(route, { body = {}, query = {}, params = {}, user = { id: "user-1" } } = {}) {
|
||||
const handlers = routes.get(route);
|
||||
assert.ok(handlers, `${route} is not mounted`);
|
||||
const res = { payload: null, json(payload) { this.payload = payload; } };
|
||||
await handlers[handlers.length - 1]({ body, query, params, user }, res);
|
||||
return res.payload;
|
||||
}
|
||||
|
||||
return { routes, call };
|
||||
}
|
||||
|
||||
function makeMap(tokens = [], grid = {}) {
|
||||
return {
|
||||
_id: "map-1", campaign: "campaign-1", tokens,
|
||||
gridSize: 50, offsetX: 0, offsetY: 0,
|
||||
...grid,
|
||||
save: async () => {}
|
||||
};
|
||||
}
|
||||
|
||||
function loadMapRoutes({ ownsCampaign = true, maps = [], actors = [] } = {}) {
|
||||
return loadRouter(["backend", "src", "routes", "map.js"], {
|
||||
"../models/Campaign": { findOne: () => mongooseQuery(ownsCampaign ? { _id: "campaign-1" } : null) },
|
||||
"../models/Map": { findById: (id) => mongooseQuery(maps.find((map) => map._id === id) ?? null) },
|
||||
"../models/Note": { findOne: () => mongooseQuery(null) },
|
||||
"../models/Actor": {
|
||||
findOne: (filter) => mongooseQuery(
|
||||
actors.some((actor) => actor._id === String(filter._id) && String(actor.campaign) === String(filter.campaign))
|
||||
? { _id: String(filter._id) }
|
||||
: null
|
||||
),
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function placeTokenRouteTests() {
|
||||
test("an actor dropped on the map stands in the middle of the cell it landed on", async () => {
|
||||
const map = makeMap();
|
||||
const api = loadMapRoutes({ maps: [map], actors: [{ _id: "actor-1", campaign: "campaign-1" }] });
|
||||
|
||||
const response = await api.call("POST /place-token", { body: { id: "map-1", actor: "actor-1", x: 124, y: 76 } });
|
||||
|
||||
assert.equal(response.status, "ok");
|
||||
// 50 px cells: 124 falls in the column centred on 125, 76 in the row centred on 75.
|
||||
assert.deepEqual(map.tokens, [{ actor: "actor-1", x: 125, y: 75 }]);
|
||||
});
|
||||
|
||||
test("a token lands in the cell of a grid that does not start at the corner of the image", async () => {
|
||||
const map = makeMap([], { gridSize: 40, offsetX: 10, offsetY: 4 });
|
||||
const api = loadMapRoutes({ maps: [map], actors: [{ _id: "actor-1", campaign: "campaign-1" }] });
|
||||
|
||||
await api.call("POST /place-token", { body: { id: "map-1", actor: "actor-1", x: 55, y: 20 } });
|
||||
|
||||
assert.deepEqual(map.tokens, [{ actor: "actor-1", x: 70, y: 24 }]);
|
||||
});
|
||||
|
||||
test("an actor of another campaign cannot be made to stand on a map", async () => {
|
||||
const map = makeMap();
|
||||
const api = loadMapRoutes({ maps: [map], actors: [{ _id: "actor-2", campaign: "campaign-2" }] });
|
||||
|
||||
const response = await api.call("POST /place-token", { body: { id: "map-1", actor: "actor-2", x: 10, y: 10 } });
|
||||
|
||||
assert.equal(response.msg, "errors.notfound");
|
||||
assert.deepEqual(map.tokens, []);
|
||||
});
|
||||
|
||||
test("a map of somebody else's campaign answers unauthorized", async () => {
|
||||
const map = makeMap();
|
||||
const api = loadMapRoutes({ ownsCampaign: false, maps: [map], actors: [{ _id: "actor-1", campaign: "campaign-1" }] });
|
||||
|
||||
const response = await api.call("POST /place-token", { body: { id: "map-1", actor: "actor-1", x: 10, y: 10 } });
|
||||
|
||||
assert.equal(response.msg, "unauthorized");
|
||||
assert.deepEqual(map.tokens, []);
|
||||
});
|
||||
|
||||
test("placing an actor again moves its token instead of adding a twin", async () => {
|
||||
const map = makeMap([{ _id: "token-1", actor: "actor-1", x: 25, y: 25 }]);
|
||||
const api = loadMapRoutes({ maps: [map], actors: [{ _id: "actor-1", campaign: "campaign-1" }] });
|
||||
|
||||
await api.call("POST /place-token", { body: { id: "map-1", actor: "actor-1", x: 300, y: 224 } });
|
||||
|
||||
assert.equal(map.tokens.length, 1);
|
||||
assert.deepEqual({ ...map.tokens[0] }, { _id: "token-1", actor: "actor-1", x: 325, y: 225 });
|
||||
});
|
||||
|
||||
test("placing a token needs both a map and an actor", async () => {
|
||||
const map = makeMap();
|
||||
const api = loadMapRoutes({ maps: [map], actors: [{ _id: "actor-1", campaign: "campaign-1" }] });
|
||||
|
||||
assert.equal((await api.call("POST /place-token", { body: { actor: "actor-1", x: 1, y: 1 } })).msg, "errors.missing-data");
|
||||
assert.equal((await api.call("POST /place-token", { body: { id: "map-1", x: 1, y: 1 } })).msg, "errors.missing-data");
|
||||
assert.deepEqual(map.tokens, []);
|
||||
});
|
||||
|
||||
test("removing a token takes the one it is given and keeps the others", async () => {
|
||||
const map = makeMap([
|
||||
{ _id: "token-1", actor: "actor-1", x: 25, y: 25 },
|
||||
{ _id: "token-2", actor: "actor-2", x: 75, y: 25 },
|
||||
]);
|
||||
const api = loadMapRoutes({ maps: [map] });
|
||||
|
||||
const response = await api.call("POST /remove-token", { body: { id: "map-1", token: "token-1" } });
|
||||
|
||||
assert.equal(response.status, "ok");
|
||||
assert.deepEqual(map.tokens.map((token) => token._id), ["token-2"]);
|
||||
});
|
||||
|
||||
test("removing a token of a map of somebody else keeps its tokens", async () => {
|
||||
const map = makeMap([{ _id: "token-1", actor: "actor-1", x: 25, y: 25 }]);
|
||||
const api = loadMapRoutes({ ownsCampaign: false, maps: [map] });
|
||||
|
||||
const response = await api.call("POST /remove-token", { body: { id: "map-1", token: "token-1" } });
|
||||
|
||||
assert.equal(response.msg, "unauthorized");
|
||||
assert.equal(map.tokens.length, 1);
|
||||
});
|
||||
}
|
||||
|
||||
function loadActorRoutes({ ownsCampaign = true, actors = [], deletedCount = 1 } = {}) {
|
||||
const tokensPulled = [];
|
||||
const api = loadRouter(["backend", "src", "routes", "actor.js"], {
|
||||
"../models/Campaign": { findOne: () => mongooseQuery(ownsCampaign ? { _id: "campaign-1" } : null) },
|
||||
"../models/Actor": {
|
||||
findById: (id) => mongooseQuery(
|
||||
actors.find((actor) => actor._id === id)
|
||||
? { ...actors.find((actor) => actor._id === id), deleteOne: async () => ({ deletedCount }) }
|
||||
: null
|
||||
),
|
||||
},
|
||||
"../models/Map": {
|
||||
// The driver drops the tokens of the actor from every map holding one; what is worth
|
||||
// keeping here is the filter it is asked to do that with.
|
||||
updateMany: async (filter, update) => {
|
||||
tokensPulled.push({ filter, update });
|
||||
return { modifiedCount: 1 };
|
||||
},
|
||||
},
|
||||
});
|
||||
return { api, tokensPulled };
|
||||
}
|
||||
|
||||
function actorDeletionTests() {
|
||||
test("deleting an actor takes its tokens off the maps", async () => {
|
||||
const { api, tokensPulled } = loadActorRoutes({ actors: [{ _id: "actor-1", campaign: "campaign-1" }] });
|
||||
|
||||
const response = await api.call("POST /delete", { body: { id: "actor-1" } });
|
||||
|
||||
assert.equal(response.status, "ok");
|
||||
assert.deepEqual(tokensPulled, [{ filter: { "tokens.actor": "actor-1" }, update: { $pull: { tokens: { actor: "actor-1" } } } }]);
|
||||
});
|
||||
|
||||
test("a token is not left behind by an actor that could not be deleted", async () => {
|
||||
const { api, tokensPulled } = loadActorRoutes({ ownsCampaign: false, actors: [{ _id: "actor-1", campaign: "campaign-1" }] });
|
||||
|
||||
const response = await api.call("POST /delete", { body: { id: "actor-1" } });
|
||||
|
||||
assert.equal(response.msg, "unauthorized");
|
||||
assert.deepEqual(tokensPulled, []);
|
||||
});
|
||||
}
|
||||
|
||||
function loadMapTokensService() {
|
||||
const source = readRepoFile("frontend", "app", "services", "MapTokens.js");
|
||||
const body = source
|
||||
.replace(/import\s*\{[^}]*\}\s*from\s*['"]vue['"];?/, "")
|
||||
.replace(/export\s*\{/, "return {")
|
||||
.concat("\n;");
|
||||
|
||||
return vm.compileFunction(body, [])();
|
||||
}
|
||||
|
||||
function mapTokensServiceTests() {
|
||||
const service = loadMapTokensService();
|
||||
const grid = { gridSize: 50, offsetX: 0, offsetY: 0 };
|
||||
|
||||
test("a spot of the image becomes the middle of the cell it stands in", () => {
|
||||
assert.deepEqual(service.CellCentre({ x: 124, y: 76 }, grid), { x: 125, y: 75 });
|
||||
assert.deepEqual(service.CellCentre({ x: 125, y: 75 }, grid), { x: 125, y: 75 });
|
||||
});
|
||||
|
||||
test("cells are counted from the grid origin, not from the corner of the image", () => {
|
||||
const shifted = { gridSize: 40, offsetX: 10, offsetY: 4 };
|
||||
assert.deepEqual(service.CellCentre({ x: 55, y: 20 }, shifted), { x: 70, y: 24 });
|
||||
});
|
||||
|
||||
test("a token never stands off the top left corner of the map", () => {
|
||||
assert.deepEqual(service.CellCentre({ x: -8, y: -1 }, grid), { x: 25, y: 25 });
|
||||
// A grid starting off the image still cannot put a token at a negative pixel.
|
||||
assert.deepEqual(service.CellCentre({ x: -8, y: -1 }, { gridSize: 40, offsetX: -30, offsetY: 0 }), { x: 0, y: 20 });
|
||||
});
|
||||
|
||||
test("a grid with nothing set is the 50 px grid the backend defaults to", () => {
|
||||
assert.deepEqual(service.CellCentre({ x: 10, y: 10 }, {}), { x: 25, y: 25 });
|
||||
assert.deepEqual(service.CellCentre({ x: 10, y: 10 }, undefined), { x: 25, y: 25 });
|
||||
});
|
||||
|
||||
test("a spot that is not a spot centres on nothing", () => {
|
||||
assert.equal(service.CellCentre({ x: NaN, y: 10 }, grid), null);
|
||||
assert.equal(service.CellCentre({}, grid), null);
|
||||
assert.equal(service.CellCentre(undefined, grid), null);
|
||||
});
|
||||
|
||||
test("the arrow keys walk a token over whole cells", () => {
|
||||
assert.deepEqual(service.MoveByCells({ x: 125, y: 75 }, grid, -1, 2), { x: 75, y: 175 });
|
||||
assert.deepEqual(service.MoveByCells({ x: 25, y: 25 }, grid, -3, -1), { x: 0, y: 0 });
|
||||
assert.equal(service.MoveByCells({ x: 25 }, grid, 1, 0), null);
|
||||
});
|
||||
|
||||
test("a token covers the cell it stands on and never shrinks below an icon", () => {
|
||||
assert.equal(service.TokenSize(grid, 1), 50);
|
||||
assert.equal(service.TokenSize(grid, 0.2), 18);
|
||||
assert.equal(service.TokenSize({ gridSize: 80 }, 2), 160);
|
||||
});
|
||||
|
||||
test("the map tells an actor drag from any other drag dropped on it", () => {
|
||||
const actorDrag = {
|
||||
dataTransfer: {
|
||||
types: [service.ACTOR_DRAG_TYPE],
|
||||
getData: (type) => (type === service.ACTOR_DRAG_TYPE ? "actor-1" : "")
|
||||
}
|
||||
};
|
||||
const noteDrag = { dataTransfer: { types: ["text/plain"], getData: (type) => (type === "text/plain" ? "note-1" : "") } };
|
||||
|
||||
assert.equal(service.IsActorDrag(actorDrag), true);
|
||||
assert.equal(service.ActorDragId(actorDrag), "actor-1");
|
||||
assert.equal(service.IsActorDrag(noteDrag), false);
|
||||
assert.equal(service.ActorDragId(noteDrag), null);
|
||||
assert.equal(service.IsActorDrag(undefined), false);
|
||||
assert.equal(service.ActorDragId(undefined), null);
|
||||
});
|
||||
|
||||
test("the viewer and the route agree on where a token stands", async () => {
|
||||
// A drop is snapped while it is dragged and again when it is saved: the token must not jump.
|
||||
const map = makeMap([], { gridSize: 40, offsetX: 10, offsetY: 4 });
|
||||
const api = loadMapRoutes({ maps: [map], actors: [{ _id: "actor-1", campaign: "campaign-1" }] });
|
||||
|
||||
const spot = { x: 300, y: 220 };
|
||||
await api.call("POST /place-token", { body: { id: "map-1", actor: "actor-1", ...spot } });
|
||||
|
||||
assert.deepEqual({ x: map.tokens[0].x, y: map.tokens[0].y }, service.CellCentre(spot, map));
|
||||
});
|
||||
}
|
||||
|
||||
function mapViewerTokenWiringTests() {
|
||||
const pane = readRepoFile("frontend", "app", "components", "viewer", "map", "MapViewerPane.vue");
|
||||
const sidebar = readRepoFile("frontend", "app", "components", "partials", "ContentSidebar.vue");
|
||||
|
||||
test("an actor row of the sidebar can be dragged out of it", () => {
|
||||
const actorRow = /<div v-for="actor in actors"[^>]*>/.exec(sidebar)?.[0];
|
||||
assert.ok(actorRow, "expected the actor rows of the sidebar");
|
||||
assert.match(actorRow, /draggable="true"/);
|
||||
assert.match(actorRow, /@dragstart="startActorDrag\(\$event, actor\)"/);
|
||||
assert.match(sidebar, /setData\(ACTOR_DRAG_TYPE, String\(actor\._id\)\)/);
|
||||
});
|
||||
|
||||
test("the map viewport takes the actor drag and places it", () => {
|
||||
const viewport = /<div[^>]*ref="viewport"[\s\S]*?>/.exec(pane)?.[0];
|
||||
assert.ok(viewport, "expected the map viewport element");
|
||||
assert.match(viewport, /@dragover="onMapDragOver"/);
|
||||
assert.match(viewport, /@drop\.prevent="onMapDrop"/);
|
||||
});
|
||||
|
||||
test("tokens are drawn in screen space, sized by their cell, and only they catch the mouse", () => {
|
||||
assert.match(pane, /class="map-token"[^>]*:style="tokenStyle\(token\)"/);
|
||||
assert.match(pane, /\.map-tokens\s*\{[^}]*pointer-events:\s*none/);
|
||||
assert.match(pane, /\.map-token\s*\{[^}]*pointer-events:\s*auto/);
|
||||
});
|
||||
|
||||
test("dragging a token moves it and does not pan the map", () => {
|
||||
assert.match(pane, /@pointerdown="onTokenPointerDown\(\$event, token\)"/);
|
||||
assert.match(pane, /@pointermove="onTokenPointerMove"/);
|
||||
assert.match(pane, /@pointerup="onTokenPointerUp"/);
|
||||
// The pane stops the pointer before the viewport ever sees it, so holding a token never pans.
|
||||
assert.match(pane, /function onTokenPointerDown\(event, token\) \{[^}]*?event\.stopPropagation\(\)/);
|
||||
});
|
||||
|
||||
test("a token answers to the keyboard and its own menu", () => {
|
||||
assert.match(pane, /@keydown="onTokenKeydown\(\$event, token\)"/);
|
||||
assert.match(pane, /@contextmenu\.stop\.prevent="onTokenContextMenu\(token\)"/);
|
||||
});
|
||||
|
||||
test("tokens are saved and taken off through the map routes", () => {
|
||||
assert.match(pane, /['"]\/map\/place-token['"]/);
|
||||
assert.match(pane, /['"]\/map\/remove-token['"]/);
|
||||
});
|
||||
}
|
||||
|
||||
placeTokenRouteTests();
|
||||
actorDeletionTests();
|
||||
mapTokensServiceTests();
|
||||
mapViewerTokenWiringTests();
|
||||
75
tests/motion-easing.test.js
Normal file
75
tests/motion-easing.test.js
Normal file
@@ -0,0 +1,75 @@
|
||||
// Tests for the motion error of Syndria98/dragonroll#34: the tooltip animated itself with
|
||||
// `ease: 'ease-in'`, and motion throws `Invalid easing type 'ease-in'` on that. Motion's easing
|
||||
// options are its own names (`easeIn`, `easeOut`, ...), not the CSS keywords, so every string ease
|
||||
// option in the frontend has to be one of the names motion accepts.
|
||||
//
|
||||
// `frontend/app/services/Tooltip.js` imports `vue` and `motion` and the repository root installs no
|
||||
// dependencies, so the checks read the sources the way `tests/map-viewer.test.js` reads them.
|
||||
//
|
||||
// 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");
|
||||
|
||||
// The strings motion accepts for `ease` (https://motion.dev/troubleshooting/invalid-easing-type).
|
||||
const VALID_EASINGS = [
|
||||
"linear",
|
||||
"easeIn",
|
||||
"easeInOut",
|
||||
"easeOut",
|
||||
"circIn",
|
||||
"circInOut",
|
||||
"circOut",
|
||||
"backIn",
|
||||
"backInOut",
|
||||
"backOut",
|
||||
"anticipate",
|
||||
];
|
||||
|
||||
function frontendSources(dir = path.join(__dirname, "..", "frontend", "app")) {
|
||||
const found = [];
|
||||
for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
|
||||
const full = path.join(dir, entry.name);
|
||||
if (entry.isDirectory()) found.push(...frontendSources(full));
|
||||
else if (/\.(js|ts|vue)$/.test(entry.name)) found.push({ file: full, source: fs.readFileSync(full, "utf8") });
|
||||
}
|
||||
return found;
|
||||
}
|
||||
|
||||
// An ease option is the `ease` key of a JS object (motion's options), so it is always quoted. CSS
|
||||
// `transition: ... ease` declarations have no colon after `ease` and never match.
|
||||
function easeOptions(source) {
|
||||
return [...source.matchAll(/\bease:\s*(['"])([^'"]*)\1/g)].map((match) => match[2]);
|
||||
}
|
||||
|
||||
function readTooltip() {
|
||||
return fs.readFileSync(
|
||||
path.join(__dirname, "..", "frontend", "app", "services", "Tooltip.js"),
|
||||
"utf8"
|
||||
);
|
||||
}
|
||||
|
||||
test("the tooltip keeps animating itself in and out", () => {
|
||||
const ease = easeOptions(readTooltip());
|
||||
// Guards the checks below against silently matching nothing.
|
||||
assert.equal(ease.length, 2, `expected the show and the hide ease option, found ${ease.length}`);
|
||||
});
|
||||
|
||||
test("the tooltip options use easing names motion accepts", () => {
|
||||
for (const value of easeOptions(readTooltip())) {
|
||||
assert.ok(VALID_EASINGS.includes(value), `invalid easing type '${value}'`);
|
||||
}
|
||||
});
|
||||
|
||||
test("no frontend animation uses a CSS keyword as motion easing", () => {
|
||||
for (const { file, source } of frontendSources()) {
|
||||
for (const value of easeOptions(source)) {
|
||||
assert.ok(
|
||||
VALID_EASINGS.includes(value),
|
||||
`${path.relative(path.join(__dirname, ".."), file)} uses invalid easing type '${value}'`
|
||||
);
|
||||
}
|
||||
}
|
||||
});
|
||||
154
tests/pnpm-workspace.test.js
Normal file
154
tests/pnpm-workspace.test.js
Normal file
@@ -0,0 +1,154 @@
|
||||
// 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/);
|
||||
});
|
||||
|
||||
// Syndria98/dragonroll#33: PM2 and its `ecosystem.config.js` are gone. It started backend and frontend
|
||||
// with `npm start`, a script neither package defines; production runs from the compose images (the `CMD`
|
||||
// of each Dockerfile) and every dev process is started together by `pnpm dev`, checked above. These
|
||||
// checks keep the PM2 ecosystem from creeping back in.
|
||||
test("PM2 plays no part in running the monorepo", () => {
|
||||
const ecosystems = [
|
||||
"ecosystem.config.js",
|
||||
"ecosystem.config.cjs",
|
||||
"ecosystem.config.json",
|
||||
"ecosystem.json",
|
||||
].filter((file) => fs.existsSync(path.join(root, file)));
|
||||
assert.deepEqual(ecosystems, [], `no PM2 ecosystem file may exist, found ${ecosystems.join(", ")}`);
|
||||
|
||||
const manifests = [[null, rootManifest], ...apps.map((pkg) => [pkg, packageJsonOf(pkg)])];
|
||||
for (const [pkg, manifest] of manifests) {
|
||||
const dependencies = { ...manifest.dependencies, ...manifest.devDependencies, ...manifest.optionalDependencies };
|
||||
assert.ok(!dependencies.pm2, `${pkg ?? "the workspace root"} must not depend on pm2`);
|
||||
}
|
||||
|
||||
// Neither the images nor the workflows nor compose may fall back to PM2.
|
||||
const runbooks = [
|
||||
".gitea/workflows/deploy.yml",
|
||||
".gitea/workflows/test.yml",
|
||||
"docker-compose.yml",
|
||||
...apps.map((pkg) => `${pkg}/Dockerfile`),
|
||||
];
|
||||
for (const file of runbooks) {
|
||||
const text = read(...file.split("/"));
|
||||
assert.ok(!/\bpm2\b|ecosystem\.config/i.test(text), `${file} must not mention PM2`);
|
||||
}
|
||||
});
|
||||
|
||||
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`);
|
||||
}
|
||||
});
|
||||
Reference in New Issue
Block a user