Merge pull request #50 from AikidoSec/patch-max-one-class

Max 1 class per file

library/.eslintrc.js

@@ -35,6 +35,7 @@ module.exports = {
     "max-lines-per-function": ["error", { max: 50, skipBlankLines: true }],
     "func-names": ["error", "as-needed"],
     camelcase: "error",
+    "max-classes-per-file": ["error", 1],
   },
   overrides: [
     {

library/src/agent/Agent.test.ts

@@ -2,8 +2,9 @@ import { hostname, platform, release } from "node:os";
 import * as t from "tap";
 import { ip } from "../helpers/ipAddress";
 import { Agent } from "./Agent";
-import { APIForTesting, Token } from "./API";
-import { LoggerNoop } from "./Logger";
+import { APIForTesting } from "./api/APIForTesting";
+import { Token } from "./api/Token";
+import { LoggerNoop } from "./logger/LoggerNoop";
 
 t.test("it sends started event", async (t) => {
   const logger = new LoggerNoop();

library/src/agent/Agent.ts

@@ -1,9 +1,11 @@
 import { hostname, platform, release } from "node:os";
 import { ip } from "../helpers/ipAddress";
-import { API, AgentInfo, Token, Stats, Kind } from "./API";
-import { Logger } from "./Logger";
+import { API } from "./api/API";
+import { AgentInfo, Kind, Stats } from "./api/Event";
+import { Token } from "./api/Token";
 import { Context } from "./Context";
 import { resolve } from "path";
+import { Logger } from "./logger/Logger";
 import { Source } from "./Source";
 
 export class Agent {

library/src/agent/Wrapper.ts

@@ -1,147 +1,4 @@
-type Interceptor = (args: unknown[], subject: unknown) => void;
-
-export class MethodInterceptor {
-  constructor(
-    private readonly name: string,
-    private readonly interceptor: Interceptor
-  ) {
-    if (!this.name) {
-      throw new Error("Method name is required");
-    }
-  }
-
-  getName() {
-    return this.name;
-  }
-
-  getInterceptor() {
-    return this.interceptor;
-  }
-}
-
-type ModifyingArgumentsInterceptor = (
-  args: unknown[],
-  subject: unknown
-) => unknown[];
-
-export class ModifyingArgumentsMethodInterceptor {
-  constructor(
-    private readonly name: string,
-    private readonly interceptor: ModifyingArgumentsInterceptor
-  ) {
-    if (!this.name) {
-      throw new Error("Method name is required");
-    }
-  }
-
-  getName() {
-    return this.name;
-  }
-
-  getInterceptor() {
-    return this.interceptor;
-  }
-}
-
-class Selector {
-  private methods: (MethodInterceptor | ModifyingArgumentsMethodInterceptor)[] =
-    [];
-
-  constructor(private readonly selector: (exports: unknown) => unknown) {}
-
-  inspect(methodName: string, interceptor: Interceptor) {
-    const method = new MethodInterceptor(methodName, interceptor);
-    this.methods.push(method);
-
-    return method;
-  }
-
-  modifyArguments(
-    methodName: string,
-    interceptor: ModifyingArgumentsInterceptor
-  ) {
-    const method = new ModifyingArgumentsMethodInterceptor(
-      methodName,
-      interceptor
-    );
-    this.methods.push(method);
-
-    return method;
-  }
-
-  getSelector() {
-    return this.selector;
-  }
-
-  getMethodInterceptors() {
-    return this.methods;
-  }
-}
-
-class VersionedPackage {
-  private selectors: Selector[] = [];
-
-  constructor(private readonly range: string) {
-    if (!this.range) {
-      throw new Error("Version range is required");
-    }
-  }
-
-  getRange() {
-    return this.range;
-  }
-
-  subject(selector: (exports: any) => unknown): Selector {
-    const fn = new Selector(selector);
-    this.selectors.push(fn);
-
-    return fn;
-  }
-
-  getSelectors() {
-    return this.selectors;
-  }
-}
-
-class Package {
-  private versions: VersionedPackage[] = [];
-
-  constructor(private readonly packageName: string) {}
-
-  getName() {
-    return this.packageName;
-  }
-
-  withVersion(range: string): VersionedPackage {
-    const pkg = new VersionedPackage(range);
-    this.versions.push(pkg);
-
-    return pkg;
-  }
-
-  getVersions() {
-    return this.versions;
-  }
-}
-
-export class Hooks {
-  private readonly packages: Package[] = [];
-
-  package(packageName: string): Package {
-    if (!packageName) {
-      throw new Error("Package name is required");
-    }
-
-    const pkg = new Package(packageName);
-    this.packages.push(pkg);
-
-    return pkg;
-  }
-
-  getPackages() {
-    return this.packages;
-  }
-}
+import { Hooks } from "./hooks/Hooks";
 
 export interface Wrapper {
   wrap(hooks: Hooks): void;

library/src/agent/api/API.ts

@@ -0,0 +1,6 @@
+import { Event } from "./Event";
+import { Token } from "./Token";
+
+export interface API {
+  report(token: Token, event: Event): Promise<void>;
+}