feat(activate): allow retireDeviceId to free a device slot on migration
Supports client migration from per-user UUID to machine fingerprint without consuming an extra maxDevices slot. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -60,7 +60,7 @@ npm test
|
|||||||
|
|
||||||
## API
|
## API
|
||||||
|
|
||||||
- `POST /v1/activate` — `{ "productKey": "...", "deviceId": "..." }` → `{ token, sub }`.
|
- `POST /v1/activate` — `{ "productKey": "...", "deviceId": "...", "retireDeviceId?": "..." }` → `{ token, sub }`. `retireDeviceId` (опционально) удаляет старый слот устройства при миграции (не занимает лишний `maxDevices`).
|
||||||
- `GET /v1/status?sub=...` → `{ revoked: boolean }`.
|
- `GET /v1/status?sub=...` → `{ revoked: boolean }`.
|
||||||
- `POST /v1/track/download` — `{ "platform": "windows"|"macos"|"linux" }` → учёт скачиваний в `data.json` → `downloadStats.byMonth`.
|
- `POST /v1/track/download` — `{ "platform": "windows"|"macos"|"linux" }` → учёт скачиваний в `data.json` → `downloadStats.byMonth`.
|
||||||
- `POST /v1/admin/revoke` — `Authorization: Bearer <LICENSE_ADMIN_TOKEN>`, тело `{ "key": "TTRPG-..." }` или `{ "sub": "..." }`.
|
- `POST /v1/admin/revoke` — `Authorization: Bearer <LICENSE_ADMIN_TOKEN>`, тело `{ "key": "TTRPG-..." }` или `{ "sub": "..." }`.
|
||||||
|
|||||||
+13
-4
@@ -175,6 +175,8 @@ export function createServer(options = {}) {
|
|||||||
const body = JSON.parse(raw || '{}');
|
const body = JSON.parse(raw || '{}');
|
||||||
const productKey = body.productKey;
|
const productKey = body.productKey;
|
||||||
const deviceId = body.deviceId;
|
const deviceId = body.deviceId;
|
||||||
|
const retireDeviceId =
|
||||||
|
typeof body.retireDeviceId === 'string' ? body.retireDeviceId.trim() : '';
|
||||||
if (!productKey || !deviceId) return json(res, 400, { error: 'productKey_and_deviceId_required' });
|
if (!productKey || !deviceId) return json(res, 400, { error: 'productKey_and_deviceId_required' });
|
||||||
|
|
||||||
const data = readData();
|
const data = readData();
|
||||||
@@ -184,8 +186,13 @@ export function createServer(options = {}) {
|
|||||||
|
|
||||||
data.activations ??= {};
|
data.activations ??= {};
|
||||||
const list = data.activations[pk.sub] ?? [];
|
const list = data.activations[pk.sub] ?? [];
|
||||||
const already = list.includes(deviceId);
|
// Миграция со старого per-user UUID: освобождаем слот retireDeviceId перед проверкой лимита.
|
||||||
if (!already && list.length >= pk.maxDevices) {
|
let next = [...list];
|
||||||
|
if (retireDeviceId && retireDeviceId !== deviceId) {
|
||||||
|
next = next.filter((d) => d !== retireDeviceId);
|
||||||
|
}
|
||||||
|
const already = next.includes(deviceId);
|
||||||
|
if (!already && next.length >= pk.maxDevices) {
|
||||||
return json(res, 403, { error: 'too_many_devices' });
|
return json(res, 403, { error: 'too_many_devices' });
|
||||||
}
|
}
|
||||||
const now = Math.floor(Date.now() / 1000);
|
const now = Math.floor(Date.now() / 1000);
|
||||||
@@ -199,8 +206,10 @@ export function createServer(options = {}) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!already) {
|
if (!already) {
|
||||||
list.push(deviceId);
|
next.push(deviceId);
|
||||||
data.activations[pk.sub] = list;
|
}
|
||||||
|
if (next.length !== list.length || next.some((d, i) => d !== list[i])) {
|
||||||
|
data.activations[pk.sub] = next;
|
||||||
dataChanged = true;
|
dataChanged = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -162,6 +162,50 @@ void test('POST /v1/activate period key re-activation keeps same exp', async ()
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
void test('POST /v1/activate retireDeviceId освобождает слот при миграции', async () => {
|
||||||
|
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'lic-'));
|
||||||
|
const dataPath = path.join(tmp, 'data.json');
|
||||||
|
writeData(
|
||||||
|
dataPath,
|
||||||
|
[
|
||||||
|
{
|
||||||
|
key: 'TTRPG-MIGRATE',
|
||||||
|
sub: 'lic_migrate',
|
||||||
|
pid: 'dnd_player',
|
||||||
|
maxDevices: 1,
|
||||||
|
expiresAtSec: 1893456000,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
{ lic_migrate: ['legacy-user-uuid'] },
|
||||||
|
);
|
||||||
|
|
||||||
|
const server = await makeServer(dataPath);
|
||||||
|
const port = await listen(server);
|
||||||
|
try {
|
||||||
|
const blocked = await request(port, 'POST', '/v1/activate', {
|
||||||
|
body: { productKey: 'TTRPG-MIGRATE', deviceId: 'machine-fp-1' },
|
||||||
|
});
|
||||||
|
assert.equal(blocked.status, 403);
|
||||||
|
assert.equal(blocked.body.error, 'too_many_devices');
|
||||||
|
|
||||||
|
const res = await request(port, 'POST', '/v1/activate', {
|
||||||
|
body: {
|
||||||
|
productKey: 'TTRPG-MIGRATE',
|
||||||
|
deviceId: 'machine-fp-1',
|
||||||
|
retireDeviceId: 'legacy-user-uuid',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
assert.equal(res.status, 200);
|
||||||
|
assert.equal(tokenPayload(res.body.token).did, 'machine-fp-1');
|
||||||
|
|
||||||
|
const data = JSON.parse(fs.readFileSync(dataPath, 'utf8'));
|
||||||
|
assert.deepEqual(data.activations.lic_migrate, ['machine-fp-1']);
|
||||||
|
} finally {
|
||||||
|
server.close();
|
||||||
|
fs.rmSync(tmp, { recursive: true, force: true });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
void test('POST /v1/activate period key second device shares license exp', async () => {
|
void test('POST /v1/activate period key second device shares license exp', async () => {
|
||||||
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'lic-'));
|
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'lic-'));
|
||||||
const dataPath = path.join(tmp, 'data.json');
|
const dataPath = path.join(tmp, 'data.json');
|
||||||
|
|||||||
Reference in New Issue
Block a user