@vex-chat/spire 1.0.0 → 1.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +38 -38
- package/dist/ClientManager.d.ts +1 -3
- package/dist/ClientManager.js +7 -50
- package/dist/ClientManager.js.map +1 -1
- package/dist/Database.d.ts +49 -6
- package/dist/Database.js +255 -80
- package/dist/Database.js.map +1 -1
- package/dist/Spire.d.ts +0 -3
- package/dist/Spire.js +116 -81
- package/dist/Spire.js.map +1 -1
- package/dist/db/schema.d.ts +1 -0
- package/dist/migrations/2026-04-14_argon2id-password-hashing.d.ts +3 -0
- package/dist/migrations/2026-04-14_argon2id-password-hashing.js +12 -0
- package/dist/migrations/2026-04-14_argon2id-password-hashing.js.map +1 -0
- package/dist/run.js +0 -1
- package/dist/run.js.map +1 -1
- package/dist/server/avatar.d.ts +1 -3
- package/dist/server/avatar.js +7 -11
- package/dist/server/avatar.js.map +1 -1
- package/dist/server/errors.d.ts +3 -6
- package/dist/server/errors.js +2 -28
- package/dist/server/errors.js.map +1 -1
- package/dist/server/file.d.ts +1 -2
- package/dist/server/file.js +5 -7
- package/dist/server/file.js.map +1 -1
- package/dist/server/index.d.ts +1 -2
- package/dist/server/index.js +35 -33
- package/dist/server/index.js.map +1 -1
- package/dist/server/invite.d.ts +1 -2
- package/dist/server/invite.js +1 -1
- package/dist/server/invite.js.map +1 -1
- package/dist/server/rateLimit.d.ts +13 -3
- package/dist/server/rateLimit.js +57 -6
- package/dist/server/rateLimit.js.map +1 -1
- package/dist/server/user.d.ts +1 -2
- package/dist/server/user.js +10 -8
- package/dist/server/user.js.map +1 -1
- package/dist/utils/jwtSecret.d.ts +3 -3
- package/dist/utils/jwtSecret.js +5 -6
- package/dist/utils/jwtSecret.js.map +1 -1
- package/dist/utils/loadEnv.js +1 -1
- package/dist/utils/loadEnv.js.map +1 -1
- package/package.json +17 -8
- package/src/ClientManager.ts +7 -60
- package/src/Database.ts +308 -89
- package/src/Spire.ts +122 -119
- package/src/__tests__/Database.spec.ts +0 -17
- package/src/db/schema.ts +1 -0
- package/src/migrations/2026-04-14_argon2id-password-hashing.ts +18 -0
- package/src/run.ts +0 -1
- package/src/server/avatar.ts +7 -14
- package/src/server/errors.ts +3 -32
- package/src/server/file.ts +5 -10
- package/src/server/index.ts +37 -37
- package/src/server/invite.ts +0 -2
- package/src/server/rateLimit.ts +43 -9
- package/src/server/user.ts +9 -9
- package/src/utils/jwtSecret.ts +5 -6
- package/src/utils/loadEnv.ts +1 -1
- package/dist/__tests__/Database.spec.d.ts +0 -1
- package/dist/__tests__/Database.spec.js +0 -136
- package/dist/__tests__/Database.spec.js.map +0 -1
- package/dist/utils/createLogger.d.ts +0 -5
- package/dist/utils/createLogger.js +0 -35
- package/dist/utils/createLogger.js.map +0 -1
- package/src/utils/createLogger.ts +0 -47
package/dist/Spire.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { EventEmitter } from "events";
|
|
2
2
|
import { execSync } from "node:child_process";
|
|
3
3
|
import * as fs from "node:fs";
|
|
4
|
+
import { freemem, loadavg, totalmem } from "node:os";
|
|
4
5
|
import path from "node:path";
|
|
5
6
|
import { fileURLToPath } from "node:url";
|
|
6
7
|
import express from "express";
|
|
@@ -12,11 +13,10 @@ import { stringify as uuidStringify } from "uuid";
|
|
|
12
13
|
import { WebSocketServer } from "ws";
|
|
13
14
|
import { z } from "zod/v4";
|
|
14
15
|
import { ClientManager } from "./ClientManager.js";
|
|
15
|
-
import { Database,
|
|
16
|
+
import { Database, hashPasswordArgon2, verifyPassword } from "./Database.js";
|
|
16
17
|
import { initApp, protect } from "./server/index.js";
|
|
17
|
-
import { authLimiter } from "./server/rateLimit.js";
|
|
18
|
+
import { authLimiter, devApiKeySkipsRateLimits } from "./server/rateLimit.js";
|
|
18
19
|
import { censorUser, getParam, getUser } from "./server/utils.js";
|
|
19
|
-
import { createLogger } from "./utils/createLogger.js";
|
|
20
20
|
import { getJwtSecret } from "./utils/jwtSecret.js";
|
|
21
21
|
import { msgpack } from "./utils/msgpack.js";
|
|
22
22
|
// expiry of regkeys = 24hr
|
|
@@ -101,8 +101,6 @@ export class Spire extends EventEmitter {
|
|
|
101
101
|
db;
|
|
102
102
|
dbReady = false;
|
|
103
103
|
deviceChallenges = new Map();
|
|
104
|
-
log;
|
|
105
|
-
options;
|
|
106
104
|
queuedRequestIncrements = 0;
|
|
107
105
|
requestsTotal = 0;
|
|
108
106
|
requestsTotalLoaded = false;
|
|
@@ -110,7 +108,10 @@ export class Spire extends EventEmitter {
|
|
|
110
108
|
signKeys;
|
|
111
109
|
startedAt = new Date();
|
|
112
110
|
version = getAppVersion();
|
|
113
|
-
wss = new WebSocketServer({
|
|
111
|
+
wss = new WebSocketServer({
|
|
112
|
+
maxPayload: 4096,
|
|
113
|
+
noServer: true,
|
|
114
|
+
});
|
|
114
115
|
constructor(SK, options) {
|
|
115
116
|
super();
|
|
116
117
|
this.signKeys = xSignKeyPairFromSecret(XUtils.decodeHex(SK));
|
|
@@ -123,38 +124,35 @@ export class Spire extends EventEmitter {
|
|
|
123
124
|
this.db = new Database(options);
|
|
124
125
|
this.db.on("ready", () => {
|
|
125
126
|
this.dbReady = true;
|
|
126
|
-
this.bootstrapRequestCounter().catch((
|
|
127
|
-
|
|
127
|
+
this.bootstrapRequestCounter().catch((_err) => {
|
|
128
|
+
// debugger: bootstrap request counter failed
|
|
128
129
|
});
|
|
129
130
|
});
|
|
130
|
-
this.log = createLogger("spire", options?.logLevel || "error");
|
|
131
131
|
this.init(options?.apiPort || 16777);
|
|
132
|
-
this.options = options;
|
|
133
132
|
}
|
|
134
133
|
async close() {
|
|
135
134
|
this.wss.clients.forEach((ws) => {
|
|
136
135
|
ws.terminate();
|
|
137
136
|
});
|
|
138
|
-
this.wss.on("close", () => {
|
|
139
|
-
this.log.info("ws: closed.");
|
|
140
|
-
});
|
|
141
|
-
this.server?.on("close", () => {
|
|
142
|
-
this.log.info("http: closed.");
|
|
143
|
-
});
|
|
144
137
|
this.server?.close();
|
|
145
138
|
this.wss.close();
|
|
146
139
|
await this.db.close();
|
|
147
|
-
return;
|
|
148
140
|
}
|
|
149
141
|
async bootstrapRequestCounter() {
|
|
150
142
|
const persistedTotal = await this.db.getRequestsTotal();
|
|
143
|
+
// Between the await above and this synchronous block, requests may
|
|
144
|
+
// have incremented both `requestsTotal` and `queuedRequestIncrements`.
|
|
145
|
+
// Capture the queue, mark loaded, then merge — never overwrite
|
|
146
|
+
// `requestsTotal` (which already includes in-flight increments).
|
|
151
147
|
const startupIncrements = this.queuedRequestIncrements;
|
|
152
148
|
this.queuedRequestIncrements = 0;
|
|
153
|
-
this.
|
|
149
|
+
this.requestsTotalLoaded = true;
|
|
150
|
+
// Add the persisted baseline on top of whatever the middleware
|
|
151
|
+
// already counted in-memory, instead of overwriting it.
|
|
152
|
+
this.requestsTotal += persistedTotal;
|
|
154
153
|
if (startupIncrements > 0) {
|
|
155
154
|
await this.db.incrementRequestsTotal(startupIncrements);
|
|
156
155
|
}
|
|
157
|
-
this.requestsTotalLoaded = true;
|
|
158
156
|
}
|
|
159
157
|
createActionToken(scope) {
|
|
160
158
|
const token = {
|
|
@@ -166,8 +164,9 @@ export class Spire extends EventEmitter {
|
|
|
166
164
|
return token;
|
|
167
165
|
}
|
|
168
166
|
deleteActionToken(key) {
|
|
169
|
-
|
|
170
|
-
|
|
167
|
+
const idx = this.actionTokens.indexOf(key);
|
|
168
|
+
if (idx !== -1) {
|
|
169
|
+
this.actionTokens.splice(idx, 1);
|
|
171
170
|
}
|
|
172
171
|
}
|
|
173
172
|
init(apiPort) {
|
|
@@ -177,21 +176,18 @@ export class Spire extends EventEmitter {
|
|
|
177
176
|
this.queuedRequestIncrements += 1;
|
|
178
177
|
}
|
|
179
178
|
else {
|
|
180
|
-
this.db.incrementRequestsTotal(1).catch((
|
|
181
|
-
|
|
182
|
-
String(err));
|
|
179
|
+
this.db.incrementRequestsTotal(1).catch((_err) => {
|
|
180
|
+
// debugger: failed to persist request counter
|
|
183
181
|
});
|
|
184
182
|
}
|
|
185
183
|
next();
|
|
186
184
|
});
|
|
187
185
|
// initialize the expression app configuration with loose routes/handlers
|
|
188
|
-
initApp(this.api, this.db, this.
|
|
186
|
+
initApp(this.api, this.db, this.validateToken.bind(this), this.signKeys, this.notify.bind(this));
|
|
189
187
|
// WS auth: client sends { type: "auth", token } as first message
|
|
190
188
|
this.wss.on("connection", (ws) => {
|
|
191
|
-
this.log.info("WS connection established, waiting for auth...");
|
|
192
189
|
const AUTH_TIMEOUT = 10_000;
|
|
193
190
|
const timer = setTimeout(() => {
|
|
194
|
-
this.log.warn("WS auth timeout — closing.");
|
|
195
191
|
ws.close();
|
|
196
192
|
}, AUTH_TIMEOUT);
|
|
197
193
|
const onFirstMessage = (data) => {
|
|
@@ -216,26 +212,19 @@ export class Spire extends EventEmitter {
|
|
|
216
212
|
JSON.stringify(jwtResult.error.issues));
|
|
217
213
|
}
|
|
218
214
|
const userDetails = jwtResult.data.user;
|
|
219
|
-
|
|
220
|
-
const client = new ClientManager(ws, this.db, this.notify.bind(this), userDetails, this.options);
|
|
215
|
+
const client = new ClientManager(ws, this.db, this.notify.bind(this), userDetails);
|
|
221
216
|
client.on("fail", () => {
|
|
222
|
-
this.
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
this.clients.splice(this.clients.indexOf(client), 1);
|
|
217
|
+
const idx = this.clients.indexOf(client);
|
|
218
|
+
if (idx !== -1) {
|
|
219
|
+
this.clients.splice(idx, 1);
|
|
226
220
|
}
|
|
227
|
-
this.log.info("Current authorized clients: " +
|
|
228
|
-
String(this.clients.length));
|
|
229
221
|
});
|
|
230
222
|
client.on("authed", () => {
|
|
231
|
-
this.log.info("New client authorized: " + client.toString());
|
|
232
223
|
this.clients.push(client);
|
|
233
|
-
this.log.info("Current authorized clients: " +
|
|
234
|
-
String(this.clients.length));
|
|
235
224
|
});
|
|
236
225
|
}
|
|
237
|
-
catch (
|
|
238
|
-
|
|
226
|
+
catch (_err) {
|
|
227
|
+
// debugger: WS auth failed
|
|
239
228
|
const errMsg = {
|
|
240
229
|
transmissionID: crypto.randomUUID(),
|
|
241
230
|
type: "unauthorized",
|
|
@@ -299,9 +288,7 @@ export class Spire extends EventEmitter {
|
|
|
299
288
|
return;
|
|
300
289
|
}
|
|
301
290
|
try {
|
|
302
|
-
this.log.info("New token requested of type " + tokenType);
|
|
303
291
|
const token = this.createActionToken(scope);
|
|
304
|
-
this.log.info("New token created: " + token.key);
|
|
305
292
|
setTimeout(() => {
|
|
306
293
|
this.deleteActionToken(token);
|
|
307
294
|
}, TOKEN_EXPIRY);
|
|
@@ -315,8 +302,8 @@ export class Spire extends EventEmitter {
|
|
|
315
302
|
res.set("Content-Type", "application/msgpack");
|
|
316
303
|
return res.send(msgpack.encode(token));
|
|
317
304
|
}
|
|
318
|
-
catch (
|
|
319
|
-
|
|
305
|
+
catch (_err) {
|
|
306
|
+
// debugger: token creation failed
|
|
320
307
|
return res.sendStatus(500);
|
|
321
308
|
}
|
|
322
309
|
});
|
|
@@ -327,7 +314,6 @@ export class Spire extends EventEmitter {
|
|
|
327
314
|
}
|
|
328
315
|
res.send(msgpack.encode({
|
|
329
316
|
exp: req.exp,
|
|
330
|
-
token: req.bearerToken,
|
|
331
317
|
user: req.user,
|
|
332
318
|
}));
|
|
333
319
|
});
|
|
@@ -343,7 +329,11 @@ export class Spire extends EventEmitter {
|
|
|
343
329
|
const dbHealthy = this.dbReady ? await this.db.isHealthy() : false;
|
|
344
330
|
const checkDurationMs = Date.now() - started;
|
|
345
331
|
const ok = dbHealthy;
|
|
332
|
+
const canaryEnv = process.env["CANARY"]?.trim().toLowerCase();
|
|
346
333
|
res.json({
|
|
334
|
+
canary: canaryEnv === "1" ||
|
|
335
|
+
canaryEnv === "true" ||
|
|
336
|
+
canaryEnv === "yes",
|
|
347
337
|
checkDurationMs,
|
|
348
338
|
commitSha: this.commitSha,
|
|
349
339
|
dbHealthy,
|
|
@@ -360,6 +350,67 @@ export class Spire extends EventEmitter {
|
|
|
360
350
|
withinLatencyBudget: checkDurationMs <= STATUS_LATENCY_BUDGET_MS,
|
|
361
351
|
});
|
|
362
352
|
});
|
|
353
|
+
/**
|
|
354
|
+
* Dev-only process snapshot (same gate as rate-limit bypass: `DEV_API_KEY`
|
|
355
|
+
* env + `x-dev-api-key` header). Returns 404 when not enabled or key wrong
|
|
356
|
+
* so the route is not advertised to anonymous callers.
|
|
357
|
+
* Lets local stress / `sample <pid>` workflows see RSS, WS count, etc.
|
|
358
|
+
*/
|
|
359
|
+
this.api.get("/status/process", (req, res) => {
|
|
360
|
+
if (!devApiKeySkipsRateLimits(req)) {
|
|
361
|
+
res.sendStatus(404);
|
|
362
|
+
return;
|
|
363
|
+
}
|
|
364
|
+
const mu = process.memoryUsage();
|
|
365
|
+
const ru = process.resourceUsage();
|
|
366
|
+
res.json({
|
|
367
|
+
activeRequestsApprox: this.requestsTotal,
|
|
368
|
+
dbReady: this.dbReady,
|
|
369
|
+
hostOs: {
|
|
370
|
+
freemem: freemem(),
|
|
371
|
+
loadavg: loadavg(),
|
|
372
|
+
totalmem: totalmem(),
|
|
373
|
+
},
|
|
374
|
+
memory: {
|
|
375
|
+
arrayBuffers: mu.arrayBuffers,
|
|
376
|
+
external: mu.external,
|
|
377
|
+
heapTotal: mu.heapTotal,
|
|
378
|
+
heapUsed: mu.heapUsed,
|
|
379
|
+
rss: mu.rss,
|
|
380
|
+
},
|
|
381
|
+
pid: process.pid,
|
|
382
|
+
resourceUsage: {
|
|
383
|
+
fsRead: ru.fsRead,
|
|
384
|
+
fsWrite: ru.fsWrite,
|
|
385
|
+
maxRSS: ru.maxRSS,
|
|
386
|
+
systemMicros: ru.systemCPUTime,
|
|
387
|
+
userMicros: ru.userCPUTime,
|
|
388
|
+
},
|
|
389
|
+
uptimeSeconds: Math.floor(process.uptime()),
|
|
390
|
+
websocketClients: this.wss.clients.size,
|
|
391
|
+
});
|
|
392
|
+
});
|
|
393
|
+
/**
|
|
394
|
+
* Dev-only SQLite file + pragma snapshot (same gate as `/status/process`).
|
|
395
|
+
*/
|
|
396
|
+
this.api.get("/status/sqlite", (req, res) => {
|
|
397
|
+
if (!devApiKeySkipsRateLimits(req)) {
|
|
398
|
+
res.sendStatus(404);
|
|
399
|
+
return;
|
|
400
|
+
}
|
|
401
|
+
if (!this.dbReady) {
|
|
402
|
+
res.status(503).json({ dbReady: false, ok: false });
|
|
403
|
+
return;
|
|
404
|
+
}
|
|
405
|
+
try {
|
|
406
|
+
const sqlite = this.db.getDevSqliteMonitor();
|
|
407
|
+
res.json({ ok: true, sqlite });
|
|
408
|
+
}
|
|
409
|
+
catch (err) {
|
|
410
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
411
|
+
res.status(500).json({ error: msg, ok: false });
|
|
412
|
+
}
|
|
413
|
+
});
|
|
363
414
|
this.api.post("/goodbye", protect, (req, res) => {
|
|
364
415
|
jwt.sign({ user: req.user }, getJwtSecret(), { expiresIn: -1 });
|
|
365
416
|
res.sendStatus(200);
|
|
@@ -390,11 +441,10 @@ export class Spire extends EventEmitter {
|
|
|
390
441
|
setTimeout(() => {
|
|
391
442
|
this.deviceChallenges.delete(challengeID);
|
|
392
443
|
}, DEVICE_CHALLENGE_EXPIRY);
|
|
393
|
-
this.log.info("Device challenge issued for " + deviceID);
|
|
394
444
|
return res.send(msgpack.encode({ challenge: nonce, challengeID }));
|
|
395
445
|
}
|
|
396
|
-
catch (
|
|
397
|
-
|
|
446
|
+
catch (_err) {
|
|
447
|
+
// debugger: device challenge error
|
|
398
448
|
return res.sendStatus(500);
|
|
399
449
|
}
|
|
400
450
|
});
|
|
@@ -449,15 +499,10 @@ export class Spire extends EventEmitter {
|
|
|
449
499
|
}
|
|
450
500
|
// Issue short-lived JWT (1 hour, not 7 days)
|
|
451
501
|
const token = jwt.sign({ user: censorUser(user) }, getJwtSecret(), { expiresIn: DEVICE_AUTH_JWT_EXPIRY });
|
|
452
|
-
this.log.info("Device-key auth succeeded for " +
|
|
453
|
-
user.username +
|
|
454
|
-
" (device " +
|
|
455
|
-
device.deviceID +
|
|
456
|
-
")");
|
|
457
502
|
return res.send(msgpack.encode({ token, user: censorUser(user) }));
|
|
458
503
|
}
|
|
459
|
-
catch (
|
|
460
|
-
|
|
504
|
+
catch (_err) {
|
|
505
|
+
// debugger: device verify error
|
|
461
506
|
return res.sendStatus(500);
|
|
462
507
|
}
|
|
463
508
|
});
|
|
@@ -478,7 +523,6 @@ export class Spire extends EventEmitter {
|
|
|
478
523
|
}
|
|
479
524
|
const { header, mail } = parsed.data;
|
|
480
525
|
await this.db.saveMail(mail, header, senderDeviceDetails.deviceID, authorUserDetails.userID);
|
|
481
|
-
this.log.info("Received mail for " + mail.recipient);
|
|
482
526
|
const recipientDeviceDetails = await this.db.retrieveDevice(mail.recipient);
|
|
483
527
|
if (!recipientDeviceDetails) {
|
|
484
528
|
res.sendStatus(400);
|
|
@@ -499,23 +543,25 @@ export class Spire extends EventEmitter {
|
|
|
499
543
|
try {
|
|
500
544
|
const userEntry = await this.db.retrieveUser(username);
|
|
501
545
|
if (!userEntry) {
|
|
502
|
-
res.sendStatus(
|
|
503
|
-
this.log.warn("User does not exist.");
|
|
546
|
+
res.sendStatus(401);
|
|
504
547
|
return;
|
|
505
548
|
}
|
|
506
|
-
const
|
|
507
|
-
|
|
508
|
-
if (payloadHash !== userEntry.passwordHash) {
|
|
549
|
+
const { needsRehash, valid } = await verifyPassword(password, userEntry);
|
|
550
|
+
if (!valid) {
|
|
509
551
|
res.sendStatus(401);
|
|
510
552
|
return;
|
|
511
553
|
}
|
|
554
|
+
if (needsRehash) {
|
|
555
|
+
const newHash = await hashPasswordArgon2(password);
|
|
556
|
+
await this.db.rehashPassword(userEntry.userID, newHash);
|
|
557
|
+
}
|
|
512
558
|
const token = jwt.sign({ user: censorUser(userEntry) }, getJwtSecret(), { expiresIn: JWT_EXPIRY });
|
|
513
559
|
// just to make sure
|
|
514
560
|
jwt.verify(token, getJwtSecret());
|
|
515
561
|
res.send(msgpack.encode({ token, user: censorUser(userEntry) }));
|
|
516
562
|
}
|
|
517
|
-
catch (
|
|
518
|
-
|
|
563
|
+
catch (_err) {
|
|
564
|
+
// debugger: auth error
|
|
519
565
|
res.sendStatus(500);
|
|
520
566
|
}
|
|
521
567
|
});
|
|
@@ -548,7 +594,6 @@ export class Spire extends EventEmitter {
|
|
|
548
594
|
case "ER_DUP_ENTRY":
|
|
549
595
|
const usernameConflict = String(err).includes("users_username_unique");
|
|
550
596
|
const signKeyConflict = String(err).includes("users_signkey_unique");
|
|
551
|
-
this.log.warn("User attempted to register duplicate account.");
|
|
552
597
|
if (usernameConflict) {
|
|
553
598
|
res.status(400).send({
|
|
554
599
|
error: "Username is already registered.",
|
|
@@ -566,15 +611,11 @@ export class Spire extends EventEmitter {
|
|
|
566
611
|
});
|
|
567
612
|
break;
|
|
568
613
|
default:
|
|
569
|
-
this.log.info("Unsupported sql error type: " +
|
|
570
|
-
String(errCode));
|
|
571
|
-
this.log.error(String(err));
|
|
572
614
|
res.sendStatus(500);
|
|
573
615
|
break;
|
|
574
616
|
}
|
|
575
617
|
}
|
|
576
618
|
else {
|
|
577
|
-
this.log.info("Registration success.");
|
|
578
619
|
if (!user) {
|
|
579
620
|
res.sendStatus(500);
|
|
580
621
|
return;
|
|
@@ -588,14 +629,12 @@ export class Spire extends EventEmitter {
|
|
|
588
629
|
});
|
|
589
630
|
}
|
|
590
631
|
}
|
|
591
|
-
catch (
|
|
592
|
-
|
|
632
|
+
catch (_err) {
|
|
633
|
+
// debugger: registration error
|
|
593
634
|
res.sendStatus(500);
|
|
594
635
|
}
|
|
595
636
|
});
|
|
596
|
-
this.server = this.api.listen(apiPort
|
|
597
|
-
this.log.info("API started on port " + String(apiPort));
|
|
598
|
-
});
|
|
637
|
+
this.server = this.api.listen(apiPort);
|
|
599
638
|
// Accept all WS upgrades — auth happens post-connection.
|
|
600
639
|
this.server.on("upgrade", (req, socket, head) => {
|
|
601
640
|
this.wss.handleUpgrade(req, socket, head, (ws) => {
|
|
@@ -604,7 +643,10 @@ export class Spire extends EventEmitter {
|
|
|
604
643
|
});
|
|
605
644
|
}
|
|
606
645
|
notify(userID, event, transmissionID, data, deviceID) {
|
|
607
|
-
|
|
646
|
+
// Snapshot the array so that a synchronous `fail` → splice inside
|
|
647
|
+
// client.send() doesn't corrupt the iteration.
|
|
648
|
+
const snapshot = this.clients.slice();
|
|
649
|
+
for (const client of snapshot) {
|
|
608
650
|
if (deviceID) {
|
|
609
651
|
if (client.getDevice().deviceID === deviceID) {
|
|
610
652
|
const msg = {
|
|
@@ -630,25 +672,18 @@ export class Spire extends EventEmitter {
|
|
|
630
672
|
}
|
|
631
673
|
}
|
|
632
674
|
validateToken(key, scope) {
|
|
633
|
-
this.log.info("Validating token: " + key);
|
|
634
675
|
for (const rKey of this.actionTokens) {
|
|
635
676
|
if (rKey.key === key) {
|
|
636
677
|
if (rKey.scope !== scope) {
|
|
637
678
|
continue;
|
|
638
679
|
}
|
|
639
680
|
const age = Date.now() - new Date(rKey.time).getTime();
|
|
640
|
-
this.log.info("Token found, " + String(age) + " ms old.");
|
|
641
681
|
if (age < TOKEN_EXPIRY) {
|
|
642
|
-
this.log.info("Token is valid.");
|
|
643
682
|
this.deleteActionToken(rKey);
|
|
644
683
|
return true;
|
|
645
684
|
}
|
|
646
|
-
else {
|
|
647
|
-
this.log.info("Token is expired.");
|
|
648
|
-
}
|
|
649
685
|
}
|
|
650
686
|
}
|
|
651
|
-
this.log.info("Token not found.");
|
|
652
687
|
return false;
|
|
653
688
|
}
|
|
654
689
|
}
|
package/dist/Spire.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Spire.js","sourceRoot":"","sources":["../src/Spire.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAEH,YAAY,EACZ,sBAAsB,EACtB,SAAS,GACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACH,YAAY,EACZ,yBAAyB,EACzB,WAAW,EACX,UAAU,GACb,MAAM,iBAAiB,CAAC;AAEzB,OAAO,GAAG,MAAM,cAAc,CAAC;AAC/B,OAAO,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AACrC,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAE3B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,2BAA2B;AAC3B,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC;AAC3C,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAAC;AAC/B,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,CAAC;AAC3C,MAAM,uBAAuB,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC,aAAa;AACxD,MAAM,wBAAwB,GAAG,GAAG,CAAC;AAErC,kBAAkB;AAClB,MAAM,aAAa,GAAG,cAAc,CAAC;AAErC,0EAA0E;AAC1E,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC;IACvB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;CAC1B,CAAC,CAAC;AAEH,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC;IACxB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,IAAI,EAAE,UAAU;CACnB,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IACzB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC9B,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC7B,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CAC5B,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,MAAM,EAAE,CAAC,CAAC,MAAM,CAAa,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,YAAY,UAAU,CAAC;IAChE,IAAI,EAAE,YAAY;CACrB,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;AAClD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;IAC5B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;AACL,CAAC;AAED,MAAM,aAAa,GAAG,GAAW,EAAE;IAC/B,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CACvB,IAAI,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAC3C;YACI,QAAQ,EAAE,MAAM;SACnB,CACJ,CAAC;QACF,MAAM,GAAG,GAAY,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrC,IACI,OAAO,GAAG,KAAK,QAAQ;YACvB,GAAG,KAAK,IAAI;YACZ,SAAS,IAAI,GAAG;YAChB,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EACjC,CAAC;YACC,OAAO,GAAG,CAAC,OAAO,CAAC;QACvB,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,SAAS,CAAC;IACrB,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,GAAW,EAAE;IAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAE/C,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,QAAQ,CAAC,wCAAwC,EAAE;YAC3D,GAAG,EAAE,QAAQ;YACb,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC;YACnC,OAAO,EAAE,IAAI;SAChB,CAAC,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,GAAG,IAAI,SAAS,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,SAAS,CAAC;IACrB,CAAC;AACL,CAAC,CAAC;AAeF,MAAM,OAAO,KAAM,SAAQ,YAAY;IAC3B,YAAY,GAAkB,EAAE,CAAC;IACjC,GAAG,GAAG,OAAO,EAAE,CAAC;IAChB,OAAO,GAAoB,EAAE,CAAC;IACrB,SAAS,GAAG,YAAY,EAAE,CAAC;IACpC,EAAE,CAAW;IACb,OAAO,GAAG,KAAK,CAAC;IAChB,gBAAgB,GAAG,IAAI,GAAG,EAG/B,CAAC;IACI,GAAG,CAAiB;IACpB,OAAO,CAA2B;IAElC,uBAAuB,GAAG,CAAC,CAAC;IAC5B,aAAa,GAAG,CAAC,CAAC;IAElB,mBAAmB,GAAG,KAAK,CAAC;IAE5B,MAAM,GAAkB,IAAI,CAAC;IAC7B,QAAQ,CAAU;IAET,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,OAAO,GAAG,aAAa,EAAE,CAAC;IACnC,GAAG,GAAoB,IAAI,eAAe,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvE,YAAY,EAAU,EAAE,OAAsB;QAC1C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,GAAG,sBAAsB,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;QAE7D,iEAAiE;QACjE,mEAAmE;QACnE,kEAAkE;QAClE,iEAAiE;QACjE,+DAA+D;QAC/D,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;QAE/B,IAAI,CAAC,EAAE,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC;QAChC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACrB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,IAAI,CAAC,uBAAuB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;gBAClD,IAAI,CAAC,GAAG,CAAC,KAAK,CACV,4CAA4C,GAAG,MAAM,CAAC,GAAG,CAAC,CAC7D,CAAC;YACN,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,GAAG,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,IAAI,OAAO,CAAC,CAAC;QAC/D,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,IAAI,KAAK,CAAC,CAAC;QAErC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,KAAK;QACd,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YAC5B,EAAE,CAAC,SAAS,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACtB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YAC1B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACjB,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QACtB,OAAO;IACX,CAAC;IAEO,KAAK,CAAC,uBAAuB;QACjC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC;QACxD,MAAM,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,CAAC;QACvD,IAAI,CAAC,uBAAuB,GAAG,CAAC,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,cAAc,GAAG,iBAAiB,CAAC;QACxD,IAAI,iBAAiB,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,EAAE,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;QAC5D,CAAC;QACD,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;IACpC,CAAC;IAEO,iBAAiB,CAAC,KAAkB;QACxC,MAAM,KAAK,GAAgB;YACvB,GAAG,EAAE,MAAM,CAAC,UAAU,EAAE;YACxB,KAAK;YACL,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACjC,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9B,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,iBAAiB,CAAC,GAAgB;QACtC,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAChE,CAAC;IACL,CAAC;IAEO,IAAI,CAAC,OAAe;QACxB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;YAC9B,IAAI,CAAC,aAAa,IAAI,CAAC,CAAC;YAExB,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC5B,IAAI,CAAC,uBAAuB,IAAI,CAAC,CAAC;YACtC,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;oBACrD,IAAI,CAAC,GAAG,CAAC,IAAI,CACT,+CAA+C;wBAC3C,MAAM,CAAC,GAAG,CAAC,CAClB,CAAC;gBACN,CAAC,CAAC,CAAC;YACP,CAAC;YAED,IAAI,EAAE,CAAC;QACX,CAAC,CAAC,CAAC;QAEH,yEAAyE;QACzE,OAAO,CACH,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAC7B,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CACzB,CAAC;QAEF,iEAAiE;QACjE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE;YAC7B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;YAChE,MAAM,YAAY,GAAG,MAAM,CAAC;YAE5B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC1B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;gBAC5C,EAAE,CAAC,KAAK,EAAE,CAAC;YACf,CAAC,EAAE,YAAY,CAAC,CAAC;YAEjB,MAAM,cAAc,GAAG,CAAC,IAAqC,EAAE,EAAE;gBAC7D,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAC7B,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE;oBACjB,CAAC,CAAC,IAAI,YAAY,WAAW;wBAC3B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;wBAC9B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACvC,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpB,EAAE,CAAC,GAAG,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;gBAElC,IAAI,CAAC;oBACD,MAAM,SAAS,GAAY,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAC3C,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;oBAClD,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;wBACtB,MAAM,IAAI,KAAK,CACX,yCAAyC;4BACrC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAC9C,CAAC;oBACN,CAAC;oBACD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CACrB,UAAU,CAAC,IAAI,CAAC,KAAK,EACrB,YAAY,EAAE,CACjB,CAAC;oBACF,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;oBAC/C,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;wBACrB,MAAM,IAAI,KAAK,CACX,uBAAuB;4BACnB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAC7C,CAAC;oBACN,CAAC;oBACD,MAAM,WAAW,GAAS,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;oBAE9C,IAAI,CAAC,GAAG,CAAC,IAAI,CACT,wBAAwB,GAAG,WAAW,CAAC,QAAQ,CAClD,CAAC;oBAEF,MAAM,MAAM,GAAG,IAAI,aAAa,CAC5B,EAAE,EACF,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EACtB,WAAW,EACX,IAAI,CAAC,OAAO,CACf,CAAC;oBAEF,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;wBACnB,IAAI,CAAC,GAAG,CAAC,IAAI,CACT,uCAAuC;4BACnC,MAAM,CAAC,QAAQ,EAAE,CACxB,CAAC;wBACF,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;4BAChC,IAAI,CAAC,OAAO,CAAC,MAAM,CACf,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAC5B,CAAC,CACJ,CAAC;wBACN,CAAC;wBACD,IAAI,CAAC,GAAG,CAAC,IAAI,CACT,8BAA8B;4BAC1B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAClC,CAAC;oBACN,CAAC,CAAC,CAAC;oBAEH,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;wBACrB,IAAI,CAAC,GAAG,CAAC,IAAI,CACT,yBAAyB,GAAG,MAAM,CAAC,QAAQ,EAAE,CAChD,CAAC;wBACF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;wBAC1B,IAAI,CAAC,GAAG,CAAC,IAAI,CACT,8BAA8B;4BAC1B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAClC,CAAC;oBACN,CAAC,CAAC,CAAC;gBACP,CAAC;gBAAC,OAAO,GAAY,EAAE,CAAC;oBACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;oBAChD,MAAM,MAAM,GAAY;wBACpB,cAAc,EAAE,MAAM,CAAC,UAAU,EAAE;wBACnC,IAAI,EAAE,cAAc;qBACvB,CAAC;oBACF,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;oBACpC,EAAE,CAAC,KAAK,EAAE,CAAC;gBACf,CAAC;YACL,CAAC,CAAC;YAEF,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;YACjC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBAChB,YAAY,CAAC,KAAK,CAAC,CAAC;YACxB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,GAAG,CACR,mBAAmB,EACnB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACf,IAAI,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,KAAK,UAAU,EAAE,CAAC;gBAC5C,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACJ,IAAI,EAAE,CAAC;YACX,CAAC;QACL,CAAC,EACD,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACT,MAAM,aAAa,GAAG;gBAClB,MAAM;gBACN,UAAU;gBACV,QAAQ;gBACR,QAAQ;gBACR,QAAQ;gBACR,OAAO;gBACP,SAAS;aACZ,CAAC;YAEF,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAE7C,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBACpB,OAAO;YACX,CAAC;YAED,IAAI,KAAK,CAAC;YAEV,QAAQ,SAAS,EAAE,CAAC;gBAChB,KAAK,QAAQ;oBACT,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC;oBAC3B,MAAM;gBACV,KAAK,SAAS;oBACV,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC;oBAC5B,MAAM;gBACV,KAAK,QAAQ;oBACT,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC;oBAC3B,MAAM;gBACV,KAAK,OAAO;oBACR,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;oBAC1B,MAAM;gBACV,KAAK,MAAM;oBACP,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC;oBACzB,MAAM;gBACV,KAAK,QAAQ;oBACT,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC;oBAC3B,MAAM;gBACV,KAAK,UAAU;oBACX,KAAK,GAAG,WAAW,CAAC,QAAQ,CAAC;oBAC7B,MAAM;gBACV;oBACI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;oBACpB,OAAO;YACf,CAAC;YAED,IAAI,CAAC;gBACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,GAAG,SAAS,CAAC,CAAC;gBAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBAC5C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;gBAEjD,UAAU,CAAC,GAAG,EAAE;oBACZ,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBAClC,CAAC,EAAE,YAAY,CAAC,CAAC;gBAEjB,MAAM,YAAY,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;gBAC5D,MAAM,SAAS,GACX,YAAY,CAAC,QAAQ,CAAC,kBAAkB,CAAC;oBACzC,CAAC,YAAY,CAAC,QAAQ,CAAC,qBAAqB,CAAC;oBAC7C,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAElC,IAAI,SAAS,EAAE,CAAC;oBACZ,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC3B,CAAC;gBAED,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,qBAAqB,CAAC,CAAC;gBAC/C,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAC3C,CAAC;YAAC,OAAO,GAAY,EAAE,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC5B,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAC/B,CAAC;QACL,CAAC,CACJ,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAClC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBACZ,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBACpB,OAAO;YACX,CAAC;YAED,GAAG,CAAC,IAAI,CACJ,OAAO,CAAC,MAAM,CAAC;gBACX,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,KAAK,EAAE,GAAG,CAAC,WAAW;gBACtB,IAAI,EAAE,GAAG,CAAC,IAAI;aACjB,CAAC,CACL,CAAC;QACN,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YACnC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAChB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBACpD,OAAO;YACX,CAAC;YACD,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;YACxC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;YACnE,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;YAE7C,MAAM,EAAE,GAAG,SAAS,CAAC;YACrB,GAAG,CAAC,IAAI,CAAC;gBACL,eAAe;gBACf,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,SAAS;gBACT,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,eAAe,EAAE,wBAAwB;gBACzC,OAAO,EAAE;oBACL,aAAa,EAAE,IAAI,CAAC,aAAa;iBACpC;gBACD,GAAG,EAAE,IAAI,IAAI,EAAE;gBACf,EAAE;gBACF,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;gBACvC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBAC3C,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,mBAAmB,EACf,eAAe,IAAI,wBAAwB;aAClD,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC5C,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YAChE,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,gEAAgE;QAEhE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAC1D,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,iBAAiB,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACrD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;oBAClB,OAAO,GAAG;yBACL,MAAM,CAAC,GAAG,CAAC;yBACX,IAAI,CAAC,EAAE,KAAK,EAAE,gCAAgC,EAAE,CAAC,CAAC;gBAC3D,CAAC;gBACD,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;gBAE1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;gBACtD,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;oBACxC,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAC;gBAChE,CAAC;gBAED,sCAAsC;gBACtC,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;gBACjD,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;gBACxC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,EAAE;oBACnC,QAAQ;oBACR,KAAK;oBACL,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;iBACnB,CAAC,CAAC;gBAEH,8BAA8B;gBAC9B,UAAU,CAAC,GAAG,EAAE;oBACZ,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBAC9C,CAAC,EAAE,uBAAuB,CAAC,CAAC;gBAE5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,GAAG,QAAQ,CAAC,CAAC;gBACzD,OAAO,GAAG,CAAC,IAAI,CACX,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CACpD,CAAC;YACN,CAAC;YAAC,OAAO,GAAY,EAAE,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBACzD,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAC/B,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACjE,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,mBAAmB,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACvD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;oBAClB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACxB,KAAK,EAAE,kCAAkC;qBAC5C,CAAC,CAAC;gBACP,CAAC;gBACD,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;gBAE5C,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBACzD,IAAI,CAAC,SAAS,EAAE,CAAC;oBACb,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACxB,KAAK,EAAE,iCAAiC;qBAC3C,CAAC,CAAC;gBACP,CAAC;gBAED,qCAAqC;gBACrC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBAE1C,eAAe;gBACf,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,IAAI,GAAG,uBAAuB,EAAE,CAAC;oBACxD,OAAO,GAAG;yBACL,MAAM,CAAC,GAAG,CAAC;yBACX,IAAI,CAAC,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC,CAAC;gBAC/C,CAAC;gBAED,+CAA+C;gBAC/C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBAChE,IAAI,CAAC,MAAM,EAAE,CAAC;oBACV,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAC;gBAChE,CAAC;gBAED,+BAA+B;gBAC/B,MAAM,MAAM,GAAG,SAAS,CACpB,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EACxB,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CACnC,CAAC;gBACF,IAAI,CAAC,MAAM,EAAE,CAAC;oBACV,OAAO,GAAG;yBACL,MAAM,CAAC,GAAG,CAAC;yBACX,IAAI,CAAC,EAAE,KAAK,EAAE,gCAAgC,EAAE,CAAC,CAAC;gBAC3D,CAAC;gBAED,wDAAwD;gBACxD,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAC7C,IAAI,WAAW,KAAK,SAAS,CAAC,KAAK,EAAE,CAAC;oBAClC,OAAO,GAAG;yBACL,MAAM,CAAC,GAAG,CAAC;yBACX,IAAI,CAAC,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC,CAAC;gBAChD,CAAC;gBAED,uBAAuB;gBACvB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACtD,IAAI,CAAC,IAAI,EAAE,CAAC;oBACR,OAAO,GAAG;yBACL,MAAM,CAAC,GAAG,CAAC;yBACX,IAAI,CAAC,EAAE,KAAK,EAAE,yBAAyB,EAAE,CAAC,CAAC;gBACpD,CAAC;gBAED,6CAA6C;gBAC7C,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAClB,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,EAC1B,YAAY,EAAE,EACd,EAAE,SAAS,EAAE,sBAAsB,EAAE,CACxC,CAAC;gBACF,IAAI,CAAC,GAAG,CAAC,IAAI,CACT,gCAAgC;oBAC5B,IAAI,CAAC,QAAQ;oBACb,WAAW;oBACX,MAAM,CAAC,QAAQ;oBACf,GAAG,CACV,CAAC;gBACF,OAAO,GAAG,CAAC,IAAI,CACX,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CACpD,CAAC;YACN,CAAC;YAAC,OAAO,GAAY,EAAE,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBACtD,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAC/B,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAC/C,MAAM,mBAAmB,GAAG,GAAG,CAAC,MAAM,CAAC;YACvC,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACvB,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBACpB,OAAO;YACX,CAAC;YACD,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YAEvC,MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACnD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACjB,KAAK,EAAE,sBAAsB;oBAC7B,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM;iBAC9B,CAAC,CAAC;gBACH,OAAO;YACX,CAAC;YACD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;YAErC,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAClB,IAAI,EACJ,MAAM,EACN,mBAAmB,CAAC,QAAQ,EAC5B,iBAAiB,CAAC,MAAM,CAC3B,CAAC;YACF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;YAErD,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CACvD,IAAI,CAAC,SAAS,CACjB,CAAC;YACF,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAC1B,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBACpB,OAAO;YACX,CAAC;YAED,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACpB,IAAI,CAAC,MAAM,CACP,sBAAsB,CAAC,KAAK,EAC5B,MAAM,EACN,MAAM,CAAC,UAAU,EAAE,EACnB,IAAI,EACJ,IAAI,CAAC,SAAS,CACjB,CAAC;QACN,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACnD,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACjB,KAAK,EAAE,4BAA4B;iBACtC,CAAC,CAAC;gBACH,OAAO;YACX,CAAC;YACD,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;YAE3C,IAAI,CAAC;gBACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBACvD,IAAI,CAAC,SAAS,EAAE,CAAC;oBACb,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;oBACpB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;oBACtC,OAAO;gBACX,CAAC;gBAED,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;gBACtD,MAAM,WAAW,GAAG,MAAM,CAAC,SAAS,CAChC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAC/B,CAAC;gBAEF,IAAI,WAAW,KAAK,SAAS,CAAC,YAAY,EAAE,CAAC;oBACzC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;oBACpB,OAAO;gBACX,CAAC;gBAED,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAClB,EAAE,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,EAAE,EAC/B,YAAY,EAAE,EACd,EAAE,SAAS,EAAE,UAAU,EAAE,CAC5B,CAAC;gBAEF,oBAAoB;gBACpB,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;gBAElC,GAAG,CAAC,IAAI,CACJ,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC,CACzD,CAAC;YACN,CAAC;YAAC,OAAO,GAAY,EAAE,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC5B,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACxB,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACvD,IAAI,CAAC;gBACD,MAAM,SAAS,GAAG,yBAAyB,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBAChE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;oBACrB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACjB,KAAK,EAAE,8BAA8B;wBACrC,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,MAAM;qBACjC,CAAC,CAAC;oBACH,OAAO;gBACX,CAAC;gBACD,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC;gBAClC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC3C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACjB,KAAK,EAAE,8EAA8E;qBACxF,CAAC,CAAC;oBACH,OAAO;gBACX,CAAC;gBAED,MAAM,MAAM,GAAG,SAAS,CACpB,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EACnC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CACvC,CAAC;gBAEF,IACI,MAAM;oBACN,IAAI,CAAC,aAAa,CACd,aAAa,CAAC,MAAM,CAAC,EACrB,WAAW,CAAC,QAAQ,CACvB,EACH,CAAC;oBACC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CACxC,MAAM,EACN,UAAU,CACb,CAAC;oBACF,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;wBACf,MAAM,OAAO,GACT,MAAM,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ;4BACzC,CAAC,CAAC,GAAG,CAAC,IAAI;4BACV,CAAC,CAAC,SAAS,CAAC;wBACpB,QAAQ,OAAO,EAAE,CAAC;4BACd,KAAK,cAAc;gCACf,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CACzC,uBAAuB,CAC1B,CAAC;gCACF,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CACxC,sBAAsB,CACzB,CAAC;gCAEF,IAAI,CAAC,GAAG,CAAC,IAAI,CACT,+CAA+C,CAClD,CAAC;gCACF,IAAI,gBAAgB,EAAE,CAAC;oCACnB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wCACjB,KAAK,EAAE,iCAAiC;qCAC3C,CAAC,CAAC;oCACH,OAAO;gCACX,CAAC;gCACD,IAAI,eAAe,EAAE,CAAC;oCAClB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wCACjB,KAAK,EAAE,mCAAmC;qCAC7C,CAAC,CAAC;oCACH,OAAO;gCACX,CAAC;gCACD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oCACjB,KAAK,EAAE,gCAAgC;iCAC1C,CAAC,CAAC;gCACH,MAAM;4BACV;gCACI,IAAI,CAAC,GAAG,CAAC,IAAI,CACT,8BAA8B;oCAC1B,MAAM,CAAC,OAAO,CAAC,CACtB,CAAC;gCACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gCAC5B,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gCACpB,MAAM;wBACd,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACJ,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;wBACvC,IAAI,CAAC,IAAI,EAAE,CAAC;4BACR,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;4BACpB,OAAO;wBACX,CAAC;wBACD,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBAC/C,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACjB,KAAK,EAAE,+BAA+B;qBACzC,CAAC,CAAC;gBACP,CAAC;YACL,CAAC;YAAC,OAAO,GAAY,EAAE,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBACzD,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACxB,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE;YACxC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,yDAAyD;QACzD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;YAC5C,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE;gBAC7C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,MAAM,CACV,MAAc,EACd,KAAa,EACb,cAAsB,EACtB,IAAc,EACd,QAAiB;QAEjB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAChC,IAAI,QAAQ,EAAE,CAAC;gBACX,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBAC3C,MAAM,GAAG,GAAc;wBACnB,IAAI;wBACJ,KAAK;wBACL,cAAc;wBACd,IAAI,EAAE,QAAQ;qBACjB,CAAC;oBACF,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACrB,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;oBACrC,MAAM,GAAG,GAAc;wBACnB,IAAI;wBACJ,KAAK;wBACL,cAAc;wBACd,IAAI,EAAE,QAAQ;qBACjB,CAAC;oBACF,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACrB,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAEO,aAAa,CAAC,GAAW,EAAE,KAAkB;QACjD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,GAAG,GAAG,CAAC,CAAC;QAC1C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACnC,IAAI,IAAI,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;gBACnB,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;oBACvB,SAAS;gBACb,CAAC;gBAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;gBACvD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,CAAC;gBAC1D,IAAI,GAAG,GAAG,YAAY,EAAE,CAAC;oBACrB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;oBACjC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;oBAC7B,OAAO,IAAI,CAAC;gBAChB,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;gBACvC,CAAC;YACL,CAAC;QACL,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAClC,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ"}
|
|
1
|
+
{"version":3,"file":"Spire.js","sourceRoot":"","sources":["../src/Spire.ts"],"names":[],"mappings":"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"}
|
package/dist/db/schema.d.ts
CHANGED
|
@@ -125,6 +125,7 @@ export interface ServiceMetricsTable {
|
|
|
125
125
|
export type ServiceMetricUpdate = Updateable<ServiceMetricsTable>;
|
|
126
126
|
export type UserRow = Selectable<UsersTable>;
|
|
127
127
|
export interface UsersTable {
|
|
128
|
+
hashAlgo: string;
|
|
128
129
|
lastSeen: string;
|
|
129
130
|
passwordHash: string;
|
|
130
131
|
passwordSalt: string;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { sql } from "kysely";
|
|
2
|
+
export async function down(db) {
|
|
3
|
+
await db.schema.alterTable("users").dropColumn("hashAlgo").execute();
|
|
4
|
+
}
|
|
5
|
+
export async function up(db) {
|
|
6
|
+
await db.schema
|
|
7
|
+
.alterTable("users")
|
|
8
|
+
.addColumn("hashAlgo", "varchar(16)", (cb) => cb.defaultTo("pbkdf2").notNull())
|
|
9
|
+
.execute();
|
|
10
|
+
await sql `UPDATE users SET hashAlgo = 'pbkdf2' WHERE hashAlgo = 'pbkdf2'`.execute(db);
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=2026-04-14_argon2id-password-hashing.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"2026-04-14_argon2id-password-hashing.js","sourceRoot":"","sources":["../../src/migrations/2026-04-14_argon2id-password-hashing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE1C,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,EAAmB;IAC1C,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC;AACzE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC,EAAmB;IACxC,MAAM,EAAE,CAAC,MAAM;SACV,UAAU,CAAC,OAAO,CAAC;SACnB,SAAS,CAAC,UAAU,EAAE,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,CACzC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CACnC;SACA,OAAO,EAAE,CAAC;IAEf,MAAM,GAAG,CAAA,gEAAgE,CAAC,OAAO,CAC7E,EAAE,CACL,CAAC;AACN,CAAC"}
|
package/dist/run.js
CHANGED
package/dist/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,SAAS,IAAI;IACT,gFAAgF;IAChF,OAAO,EAAE,CAAC;IAEV,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,CAAC,GAAG,EAAE,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IAEnD,IAAI,KAAK,CAAC,GAAG,EAAE;QACX,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,SAAS,IAAI;IACT,gFAAgF;IAChF,OAAO,EAAE,CAAC;IAEV,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,CAAC,GAAG,EAAE,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IAEnD,IAAI,KAAK,CAAC,GAAG,EAAE;QACX,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9C,CAAC,CAAC;AACP,CAAC;AAED,SAAS,WAAW,CAAC,KAAyB;IAC1C,QAAQ,KAAK,EAAE,CAAC;QACZ,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS,CAAC;QACf,KAAK,YAAY;YACb,OAAO,KAAK,CAAC;QACjB;YACI,OAAO,SAAS,CAAC;IACzB,CAAC;AACL,CAAC;AAED,IAAI,EAAE,CAAC"}
|
package/dist/server/avatar.d.ts
CHANGED
|
@@ -1,3 +1 @@
|
|
|
1
|
-
|
|
2
|
-
import type winston from "winston";
|
|
3
|
-
export declare const getAvatarRouter: (db: Database, log: winston.Logger) => import("express-serve-static-core").Router;
|
|
1
|
+
export declare const getAvatarRouter: () => import("express-serve-static-core").Router;
|
package/dist/server/avatar.js
CHANGED
|
@@ -10,7 +10,7 @@ import { uploadLimiter } from "./rateLimit.js";
|
|
|
10
10
|
import { getParam, getUser } from "./utils.js";
|
|
11
11
|
import { ALLOWED_IMAGE_TYPES, protect } from "./index.js";
|
|
12
12
|
const safePathParam = z.string().regex(/^[a-zA-Z0-9._-]+$/);
|
|
13
|
-
export const getAvatarRouter = (
|
|
13
|
+
export const getAvatarRouter = () => {
|
|
14
14
|
const router = express.Router();
|
|
15
15
|
router.get("/:userID", async (req, res) => {
|
|
16
16
|
const safeId = safePathParam.safeParse(getParam(req, "userID"));
|
|
@@ -27,8 +27,8 @@ export const getAvatarRouter = (db, log) => {
|
|
|
27
27
|
res.set("Content-type", typeDetails.mime);
|
|
28
28
|
res.set("Cache-control", "public, max-age=31536000");
|
|
29
29
|
const stream = fs.createReadStream(filePath);
|
|
30
|
-
stream.on("error", (
|
|
31
|
-
|
|
30
|
+
stream.on("error", (_err) => {
|
|
31
|
+
// debugger: avatar stream read error
|
|
32
32
|
res.sendStatus(500);
|
|
33
33
|
});
|
|
34
34
|
stream.pipe(res);
|
|
@@ -50,7 +50,6 @@ export const getAvatarRouter = (db, log) => {
|
|
|
50
50
|
return;
|
|
51
51
|
}
|
|
52
52
|
if (!payload.file) {
|
|
53
|
-
log.warn("MISSING FILE");
|
|
54
53
|
res.sendStatus(400);
|
|
55
54
|
return;
|
|
56
55
|
}
|
|
@@ -66,11 +65,10 @@ export const getAvatarRouter = (db, log) => {
|
|
|
66
65
|
try {
|
|
67
66
|
// write the file to disk
|
|
68
67
|
await fsp.writeFile("avatars/" + userDetails.userID, buf);
|
|
69
|
-
log.info("Wrote new avatar " + userDetails.userID);
|
|
70
68
|
res.sendStatus(200);
|
|
71
69
|
}
|
|
72
|
-
catch (
|
|
73
|
-
|
|
70
|
+
catch (_err) {
|
|
71
|
+
// debugger: avatar write failed
|
|
74
72
|
res.sendStatus(500);
|
|
75
73
|
}
|
|
76
74
|
});
|
|
@@ -82,7 +80,6 @@ export const getAvatarRouter = (db, log) => {
|
|
|
82
80
|
return;
|
|
83
81
|
}
|
|
84
82
|
if (!req.file) {
|
|
85
|
-
log.warn("MISSING FILE");
|
|
86
83
|
res.sendStatus(400);
|
|
87
84
|
return;
|
|
88
85
|
}
|
|
@@ -97,11 +94,10 @@ export const getAvatarRouter = (db, log) => {
|
|
|
97
94
|
try {
|
|
98
95
|
// write the file to disk
|
|
99
96
|
await fsp.writeFile("avatars/" + userDetails.userID, req.file.buffer);
|
|
100
|
-
log.info("Wrote new avatar " + userDetails.userID);
|
|
101
97
|
res.sendStatus(200);
|
|
102
98
|
}
|
|
103
|
-
catch (
|
|
104
|
-
|
|
99
|
+
catch (_err) {
|
|
100
|
+
// debugger: avatar write failed
|
|
105
101
|
res.sendStatus(500);
|
|
106
102
|
}
|
|
107
103
|
});
|