fix root package access (#49)

* fix root package access

* fix root package access

* eslint fixes

* eslint fixes

* add filename to dictionary

* add filename to dictionary

Author: Idrinth

.dictionary.txt

@@ -22,6 +22,7 @@ Javascript
 Jira
 LinkedIn
 MSSQL
+package-lock.json
 Matomo
 Microservice
 Middleware

language/en.yml

@@ -43,3 +43,4 @@ response_not_success: 'The response was not success, %1% field was %2%'
 response_not_failure: 'The response was not failure, %1% field was %2%'
 no_errors_warnings: No errors or warnings found.
 impossible_include: Can't include %1%'s export %2%.
+missing_package_lock: Can't find a package-lock.json.

package.json

@@ -2,7 +2,7 @@
   "name": "@idrinth-api-bench/framework",
   "description": "A library to benchmark apis, no matter if rest or soap",
   "license": "MIT",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "type": "module",
   "main": "index.js",
   "homepage": "https://idrinth-api-ben.ch",

src/helper/root-package.ts

@@ -0,0 +1,29 @@
+import {
+  readFileSync,
+  existsSync,
+} from 'fs';
+import language from './language.js';
+
+export interface Versioned {
+  name: string;
+  version: string;
+}
+export interface Lock extends Versioned{
+  packages: {[lib: string]: Versioned};
+}
+
+let lock: Lock;
+
+export const set = (cwd: string,) => {
+  if (! existsSync(cwd + '/package-lock.json',)) {
+    throw new Error(language('missing_package_lock',),);
+  }
+  lock = JSON.parse(readFileSync(cwd + '/package-lock.json', 'utf8',),);
+};
+
+export default (): Lock => {
+  if (! lock) {
+    set(process.cwd(),);
+  }
+  return lock;
+};

src/helper/user-agent.ts

@@ -1,11 +1,7 @@
-import reqlib from 'app-root-path';
-interface Versioned {
-  name: string;
-  version: string;
-}
-interface Lock extends Versioned{
-  packages: {[lib: string]: Versioned};
-}
+import getLock, {
+  Versioned,
+  Lock,
+} from '../helper/root-package.js';
 
 const formatVersion = (ob: Versioned,): string => {
   if (! ob) {
@@ -29,7 +25,7 @@ const getVersion = (name: string, lock: Lock,): string => {
   return '0.0';
 };
 
-const lock: Lock = reqlib.require('/package-lock.json',) as Lock;
+const lock = getLock();
 const main = `${ lock.name }/${ formatVersion(lock,) }`;
 const needle = `needle/${ getVersion('needle', lock,) }`;
 const name = '@idrinth-api-bench/framework';

src/load/loader.ts

@@ -49,6 +49,6 @@ const loadUp = async(config: Config,) => {
       threads += config.increment;
     } while (threads <= config.maximum);
   }
-  defaultReporter(runs, config.cwd);
+  defaultReporter(runs, config.cwd,);
 };
 export default loadUp;

src/main.ts

@@ -25,6 +25,9 @@ import {
 import blacklist from './routes/blacklist.js';
 import validateTasks from './routes/validate-tasks.js';
 import Executions from './executions.js';
+import {
+  set,
+} from './helper/root-package.js';
 
 // eslint-disable-next-line complexity
 export const run = async(
@@ -46,7 +49,11 @@ export const run = async(
   job?: Job|Array<Task>|undefined,
   // eslint-disable-next-line max-params
 ): Promise<void> => {
+  if (! configuration.cwd) {
+    configuration.cwd = process.cwd();
+  }
   await locale(configuration.language || DEFAULT_LANGUAGE,);
+  set(configuration.cwd,);
   if (typeof configuration.logger === 'undefined') {
     configuration.logger = new NullLogger();
   }
@@ -64,12 +71,12 @@ export const run = async(
   }
   if (typeof configuration.blacklist === 'undefined') {
     configuration.blacklist = blacklist(
-      process.cwd(),
+      configuration.cwd,
       configuration.mode || 'benchmarking',
     );
   }
   if (typeof job === 'undefined') {
-    job = await jobCreator(configuration.cwd || process.cwd(),);
+    job = await jobCreator(configuration.cwd,);
   } else if (typeof job === 'object' && Array.isArray(job,)) {
     job = {
       before: [],

src/storage/mssql-storage.ts

@@ -1,15 +1,13 @@
 import Storage from './storage.js';
 import FinishedSet from '../messaging/finished-set.js';
 import mssql from 'msnodesqlv8';
-import reqlib from 'app-root-path';
 import {
   MONTH_OFFSET,
   TEN,
 } from '../constants.js';
+import getLock from '../helper/root-package.js';
 
-const project: string = reqlib
-  .require('/package-lock.json',)
-  .name.replace(/[^a-z0-9\-_]/gu, '_',);
+const project: string = getLock().name.replace(/[^a-z0-9\-_]/gu, '_',);
 
 export class MssqlStorage implements Storage {
   private readonly connection: string;

src/storage/mysql-storage.ts

@@ -4,15 +4,13 @@ import {
   createConnection,
   Connection,
 } from 'mysql2';
-import reqlib from 'app-root-path';
 import {
   MONTH_OFFSET,
   TEN,
 } from '../constants.js';
+import getLock from '../helper/root-package.js';
 
-const project: string = reqlib
-  .require('/package-lock.json',)
-  .name.replace(/[^a-z0-9\-_]/gu, '_',);
+const project: string = getLock().name.replace(/[^a-z0-9\-_]/gu, '_',);
 
 export class MysqlStorage implements Storage {
   private connection: Connection;

src/storage/postgres-storage.ts

@@ -1,15 +1,13 @@
 import Storage from './storage.js';
 import FinishedSet from '../messaging/finished-set.js';
 import postgres from 'postgres';
-import reqlib from 'app-root-path';
+import getLock from '../helper/root-package.js';
 import {
   MONTH_OFFSET,
   TEN,
 } from '../constants.js';
 
-const project: string = reqlib
-  .require('/package-lock.json',)
-  .name.replace(/[^a-z0-9\-_]/gu, '_',);
+const project: string = getLock().name.replace(/[^a-z0-9\-_]/gu, '_',);
 
 export class PostgresStorage implements Storage {
   private connection: postgres.Sql<Record<string, unknown>>;