From a27941bb7d74a0d69dba00815316646e50334b5f Mon Sep 17 00:00:00 2001 From: Evert Prants Date: Sun, 3 Apr 2022 18:15:35 +0300 Subject: [PATCH] hmm, weird db error --- src/server/index.ts | 2 +- src/server/object/history.ts | 3 ++- src/server/object/imager.ts | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/server/index.ts b/src/server/index.ts index cd1b817..732fb88 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -149,7 +149,7 @@ io.on('connection', (socket) => { }); socket.on('color', ({ c, x, y, t }: Placement) => { - if (!user || c > 0xffffff || c < 0) { + if (!user || c > 0xffffff || c < 0 || c === null) { return; } diff --git a/src/server/object/history.ts b/src/server/object/history.ts index cfae563..5e0466f 100644 --- a/src/server/object/history.ts +++ b/src/server/object/history.ts @@ -19,13 +19,14 @@ export class History { } async insert(record: CanvasRecord): Promise { + const color = record.color ? record.color : 0; await this.db.run( `INSERT INTO Placement (user, x, y, ts, color) VALUES (?,?,?,?,?)`, record.user, record.x, record.y, record.ts, - record.color, + color, ); } diff --git a/src/server/object/imager.ts b/src/server/object/imager.ts index e9a5f16..bee2a64 100644 --- a/src/server/object/imager.ts +++ b/src/server/object/imager.ts @@ -14,6 +14,7 @@ export class Imager { private _size: number, private _store = join(__dirname, '..', '..', '..', 'canvas.png'), private _debounce = 5000, + private _resaveInterval = 60000, ) {} async toImage(array: Uint32Array): Promise { @@ -81,7 +82,7 @@ export class Imager { this._lastSave = Date.now(); }; - if (force || this._lastSave < Date.now() - this._debounce * 2) { + if (force || this._lastSave < Date.now() - this._resaveInterval) { saveFn().catch((e) => console.error(e)); return; }