From 924c030b13b9abf6e8a82dbd22230d26d29e1121 Mon Sep 17 00:00:00 2001 From: Justin Wind Date: Sat, 14 Jun 2025 11:59:06 -0700 Subject: [PATCH] minor cleanups --- src/authenticator.js | 2 +- src/common.js | 4 ++-- src/db/postgres/index.js | 2 +- src/errors.js | 6 +---- src/service.js | 2 +- src/slug.js | 2 +- test/src/authenticator.js | 7 ++---- test/src/common.js | 6 ++++- test/src/db/base.js | 6 +---- test/src/db/index.js | 6 +---- test/src/db/postgres/index.js | 19 +++++++--------- test/src/db/sqlite/index.js | 41 ++++++++++++++++------------------- test/src/manager.js | 9 +++----- test/src/service.js | 7 +----- test/src/slug.js | 5 +---- 15 files changed, 48 insertions(+), 76 deletions(-) diff --git a/src/authenticator.js b/src/authenticator.js index bc3f384..a3a0638 100644 --- a/src/authenticator.js +++ b/src/authenticator.js @@ -1,7 +1,7 @@ 'use strict'; const argon2 = require('argon2'); -const crypto = require('crypto'); +const crypto = require('node:crypto'); const common = require('./common'); const Enum = require('./enum'); const { ResponseError } = require('./errors'); diff --git a/src/common.js b/src/common.js index 21324c3..a5f49b8 100644 --- a/src/common.js +++ b/src/common.js @@ -2,8 +2,8 @@ const { common } = require('@squeep/api-dingus'); -const { promisify } = require('util'); -const { randomBytes } = require('crypto'); +const { promisify } = require('node:util'); +const { randomBytes } = require('node:crypto'); const randomBytesAsync = promisify(randomBytes); module.exports = { diff --git a/src/db/postgres/index.js b/src/db/postgres/index.js index a0b2d1c..e46a401 100644 --- a/src/db/postgres/index.js +++ b/src/db/postgres/index.js @@ -4,7 +4,7 @@ const pgpInitOptions = { capSQL: true, }; -const path = require('path'); +const path = require('node:path'); const pgp = require('pg-promise')(pgpInitOptions); const BaseDatabase = require('../base'); const common = require('../../common'); diff --git a/src/errors.js b/src/errors.js index fb7a212..1259fea 100644 --- a/src/errors.js +++ b/src/errors.js @@ -17,11 +17,7 @@ class ServeStaticFile extends Errors.DingusError { } } -class SlugGeneratorExhausted extends Errors.DingusError { - constructor(...args) { - super(...args); - } -} +class SlugGeneratorExhausted extends Errors.DingusError {} module.exports = { ...Errors, diff --git a/src/service.js b/src/service.js index f3047ce..18d5736 100644 --- a/src/service.js +++ b/src/service.js @@ -6,7 +6,7 @@ */ const { Dingus } = require('@squeep/api-dingus'); -const path = require('path'); +const path = require('node:path'); const common = require('./common'); const Enum = require('./enum'); const { ServeStaticFile } = require('./errors'); diff --git a/src/slug.js b/src/slug.js index a39ef01..d80cbb8 100644 --- a/src/slug.js +++ b/src/slug.js @@ -1,7 +1,7 @@ 'use strict'; const common = require('./common'); -const { createHash } = require('crypto'); +const { createHash } = require('node:crypto'); /** * TODO: base62 would be slightly prettier diff --git a/test/src/authenticator.js b/test/src/authenticator.js index 70ce764..8d7755e 100644 --- a/test/src/authenticator.js +++ b/test/src/authenticator.js @@ -1,8 +1,6 @@ -/* eslint-env mocha */ -/* eslint-disable capitalized-comments */ 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const sinon = require('sinon'); const Authenticator = require('../../src/authenticator'); @@ -16,7 +14,6 @@ describe('Authenticator', function () { beforeEach(function () { logger = { debug: () => {} }; - // logger = console; db = { context: async (fn) => fn({}), getAuthById: async () => {}, @@ -54,7 +51,7 @@ describe('Authenticator', function () { const epoch = '1602887798'; const body = 'some data'; const expected = 'P5IXYXu5a7aobQvRinPQlN_k1g8GHycRpx3JrK1O7YJlqmhv3WRP5M3ubObPdUWM'; - const result = await Authenticator.signature(secret, id, epoch, body); + const result = Authenticator.signature(secret, id, epoch, body); assert.strictEqual(result, expected); }); }); // generateToken diff --git a/test/src/common.js b/test/src/common.js index 25fc433..0a099bc 100644 --- a/test/src/common.js +++ b/test/src/common.js @@ -2,7 +2,11 @@ 'use strict'; -const sinon = require('sinon'); +const assert = require('node:assert'); +const common = require('../../src/common'); describe('common', function () { + it('exists', function () { + assert(common); + }); }); \ No newline at end of file diff --git a/test/src/db/base.js b/test/src/db/base.js index 753f8c9..72d96ac 100644 --- a/test/src/db/base.js +++ b/test/src/db/base.js @@ -1,9 +1,6 @@ -/* eslint-env mocha */ -/* eslint-disable capitalized-comments */ - 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const sinon = require('sinon'); const BaseDatabase = require('../../../src/db/base'); const DBErrors = require('../../../src/db/errors'); @@ -15,7 +12,6 @@ describe('BaseDatabase', function () { beforeEach(function () { logger = { error: () => {} }; - // logger = console; db = new BaseDatabase(logger); }); diff --git a/test/src/db/index.js b/test/src/db/index.js index b94ca02..16ef31f 100644 --- a/test/src/db/index.js +++ b/test/src/db/index.js @@ -1,10 +1,6 @@ -/* eslint-env mocha */ -/* eslint-disable capitalized-comments */ - 'use strict'; -const assert = require('assert'); -// eslint-disable-next-line node/no-unpublished-require +const assert = require('node:assert'); const sinon = require('sinon'); const DatabaseFactory = require('../../../src/db'); const DBErrors = require('../../../src/db/errors'); diff --git a/test/src/db/postgres/index.js b/test/src/db/postgres/index.js index 35a8328..d52fc90 100644 --- a/test/src/db/postgres/index.js +++ b/test/src/db/postgres/index.js @@ -1,10 +1,7 @@ -/* eslint-disable capitalized-comments */ -/* eslint-env mocha */ - 'use strict'; -const assert = require('assert'); -const sinon = require('sinon'); // eslint-disable-line node/no-unpublished-require +const assert = require('node:assert'); +const sinon = require('sinon'); const noExpectedException = 'did not get expected exception'; @@ -70,7 +67,7 @@ describe('PostgresDatabase', function () { id: 'id', secret: 'secret', password: 'password', - }; + }; id = 'id'; db.db.oneOrNone.resolves(expected); const result = await db.getAuthById(dbCtx, id); @@ -177,7 +174,7 @@ describe('PostgresDatabase', function () { created: 0, expires: 0, lastAccess: 0, - }; + }; id = 'id'; db.db.oneOrNone.resolves(expected); const result = await db.getLinkById(dbCtx, id); @@ -205,7 +202,7 @@ describe('PostgresDatabase', function () { created: 0, expires: 0, lastAccess: 0, - }; + }; url = 'url'; db.db.oneOrNone.resolves(expected); const result = await db.getLinkByUrl(dbCtx, url); @@ -233,7 +230,7 @@ describe('PostgresDatabase', function () { created: 0, expires: 0, lastAccess: 0, - }; + }; id = 'id'; db.db.oneOrNone.resolves(expected); const result = await db.accessLink(dbCtx, id); @@ -264,7 +261,7 @@ describe('PostgresDatabase', function () { changes: 1, duration: 10, lastInsertRowid: 1, - }; + }; id = 'id'; expires = null; db.db.result.resolves(returns); @@ -297,7 +294,7 @@ describe('PostgresDatabase', function () { changes: 1, duration: 10, lastInsertRowid: 1, - }; + }; id = 'id'; expires = null; db.db.result.resolves(returns); diff --git a/test/src/db/sqlite/index.js b/test/src/db/sqlite/index.js index 62f245a..b73b34f 100644 --- a/test/src/db/sqlite/index.js +++ b/test/src/db/sqlite/index.js @@ -1,10 +1,7 @@ -/* eslint-disable capitalized-comments */ -/* eslint-env mocha */ - 'use strict'; -const assert = require('assert'); -const sinon = require('sinon'); // eslint-disable-line node/no-unpublished-require +const assert = require('node:assert'); +const sinon = require('sinon'); const DBErrors = require('../../../../src/db/errors'); const noExpectedException = 'did not get expected exception'; @@ -51,7 +48,7 @@ describe('SQLiteDatabase', function () { id: 'id', secret: 'secret', password: 'password', - }; + }; id = 'id'; db.statement.getAuthById.get.returns(expected); const result = await db.getAuthById(dbCtx, id); @@ -151,17 +148,17 @@ describe('SQLiteDatabase', function () { 'auth_token': 'abc', 'last_access': 0, accesses: 0, - }; - const expected = { - id: 'id', - isSpecial: false, - url: 'url', - created: 0, - expires: 0, - authToken: 'abc', - lastAccess: 0, - accesses: 0, - }; + }; + const expected = { + id: 'id', + isSpecial: false, + url: 'url', + created: 0, + expires: 0, + authToken: 'abc', + lastAccess: 0, + accesses: 0, + }; id = 'id'; db.statement.getLinkById.get.returns(returns); const result = await db.getLinkById(dbCtx, id); @@ -244,8 +241,8 @@ describe('SQLiteDatabase', function () { 'auth_token': 'abc', 'last_access': 0, accesses: 0, - }; - const expected = { + }; + const expected = { id: 'id', isSpecial: false, url: 'url', @@ -263,7 +260,7 @@ describe('SQLiteDatabase', function () { }); it('stubbed missing success', async function () { const returns = undefined; - const expected = undefined; + const expected = undefined; id = 'id'; db.statement.getLinkById.get.returns(returns); db.statement.incrementLinkAccess.run.returns({ changes: 0 }); @@ -319,7 +316,7 @@ describe('SQLiteDatabase', function () { const expected = { changes: 1, lastInsertRowid: 123, - }; + }; id = 'id'; expires = null; db.statement.expireLink.run.returns(returns); @@ -370,7 +367,7 @@ describe('SQLiteDatabase', function () { const expected = { changes: 1, lastInsertRowid: 1, - }; + }; id = 'id'; expires = null; db.statement.updateLink.run.returns(returns); diff --git a/test/src/manager.js b/test/src/manager.js index ad1c11f..c25d4e5 100644 --- a/test/src/manager.js +++ b/test/src/manager.js @@ -1,10 +1,7 @@ -/* eslint-env mocha */ -/* eslint-disable capitalized-comments */ - 'use strict'; -const assert = require('assert'); -const sinon = require('sinon'); // eslint-disable-line node/no-unpublished-require +const assert = require('node:assert'); +const sinon = require('sinon'); const Manager = require('../../src/manager'); const common = require('../../src/common'); @@ -192,7 +189,7 @@ describe('Manager', function () { link = { expires: 1, }; - manager.db.accessLink.resolves(link) + manager.db.accessLink.resolves(link); try { await manager.getById(res, ctx); assert.fail(noExpectedException); diff --git a/test/src/service.js b/test/src/service.js index 5f4e223..c19984e 100644 --- a/test/src/service.js +++ b/test/src/service.js @@ -1,10 +1,6 @@ -/* eslint-env mocha */ -/* eslint-disable capitalized-comments */ - 'use strict'; -const assert = require('assert'); -// eslint-disable-next-line node/no-unpublished-require +const assert = require('node:assert'); const sinon = require('sinon'); const Service = require('../../src/service'); @@ -28,7 +24,6 @@ describe('service', function () { asyncLocalStorage = { getStore: () => ({}), }; - // logger = console; service = new Service(logger, dbStub, options, asyncLocalStorage); sinon.stub(service.manager); sinon.stub(service.authenticator); diff --git a/test/src/slug.js b/test/src/slug.js index 4b768c7..0a7f4fe 100644 --- a/test/src/slug.js +++ b/test/src/slug.js @@ -1,9 +1,6 @@ -/* eslint-env mocha */ -/* eslint-disable capitalized-comments */ - 'use strict'; -const assert = require('assert'); +const assert = require('node:assert'); const sinon = require('sinon'); describe('slug', function () { -- 2.49.0