minor cleanups

diff --git a/src/authenticator.js b/src/authenticator.js
index bc3f3842c0a0a29aa740a33731814be1058b25c7..a3a0638c6ad011403e03e1120fac1d1af3d12798 100644 (file)
--- 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 21324c3c5c17ee2574b05a56acb2235df1e2ade0..a5f49b8e411f71a23ae2ff400f56f140689b41fb 100644 (file)
--- 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 a0b2d1cf24927e0f74c7a5fc62f21107ed6b172f..e46a40113aee0db6d954ceb7852d8467a6500034 100644 (file)
--- 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 fb7a2121d7006fe64357bc7001df9d1221275620..1259fea2f59bdb19d12bac833242dc179802bc08 100644 (file)
--- 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 f3047ced9f909d4782b1a557652e545c2c9cc90d..18d5736748a14ce21871171f44f09dfe2f30115e 100644 (file)
--- 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 a39ef01e65365abeb55065c66ff95615b199dc7b..d80cbb8bc1a6f859cf98a85ac10dc3458ece7539 100644 (file)
--- 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 70ce7643dc80918fca3de2f5baaa33527094d9a1..8d7755e5ae322a47c59b06fb9d2206c964ef1118 100644 (file)
--- 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 25fc433c4dce2cde8a89b10e14b6cb232688fff6..0a099bcf2af42d241d9721f705060b9dc53a6cc3 100644 (file)
--- 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 753f8c9e824df7a7ccb3e64f5460a2d4aa306e6b..72d96ac2fd9583ddddebb45d3f4b5e0d378a182e 100644 (file)
--- 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 b94ca021160d834580ef33bab9dbc0187f12f6de..16ef31f150995e680f94f6422c447161a8c5f53a 100644 (file)
--- 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 35a83281af27cd8c38593918fdcedfd84621f48f..d52fc9024b65c4e52411d832c5c443ccf0a0d8c1 100644 (file)
--- 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 62f245a408f27697e72ad69b739d7ab84a813bc7..b73b34f92bf36f11b5020f0882afef2e610c97d8 100644 (file)
--- 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 ad1c11f54e17edb1eb59afe2eb86e525f7213794..c25d4e52f8f9e94b9f23693a8325a367ced3c80d 100644 (file)
--- 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 5f4e223d2378c00087e30c3bc1a0ba8266310329..c19984e6ae6e97a32dd95e7725de75dc4bba71fc 100644 (file)
--- 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 4b768c7bb423cf3247704bc99d92e395880ab91d..0a7f4fea22f4c01c1b74b0f9b2fa7ce752325b33 100644 (file)
--- 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 () {