@stuntman/server 0.2.4 → 0.3.0

package/src/ruleExecutor.ts

@@ -1,4 +1,4 @@
-import AwaitLock from 'await-lock';
+import { Lock } from 'async-await-mutex-lock';
 import { AppError, DEFAULT_RULE_PRIORITY, HttpCode, errorToLog, logger } from '@stuntman/shared';
 import type * as Stuntman from '@stuntman/shared';
 import { CUSTOM_RULES, DEFAULT_RULES } from './rules';
@@ -17,7 +17,7 @@ const transformMockRuleToLive = (rule: Stuntman.Rule): Stuntman.LiveRule => {
 class RuleExecutor implements Stuntman.RuleExecutorInterface {
     // TODO persistent rule storage maybe
     private _rules: Stuntman.LiveRule[];
-    private rulesLock = new AwaitLock();
+    private rulesLock = new Lock();
 
     private get enabledRules(): readonly Stuntman.LiveRule[] {
         if (!this._rules) {
@@ -42,7 +42,7 @@ class RuleExecutor implements Stuntman.RuleExecutorInterface {
         if (!this.hasExpired()) {
             return;
         }
-        await this.rulesLock.acquireAsync();
+        await this.rulesLock.acquire();
         const now = Date.now();
         try {
             this._rules = this._rules.filter((r) => {
@@ -59,7 +59,7 @@ class RuleExecutor implements Stuntman.RuleExecutorInterface {
 
     async addRule(rule: Stuntman.Rule, overwrite?: boolean): Promise<Stuntman.LiveRule> {
         await this.cleanUpExpired();
-        await this.rulesLock.acquireAsync();
+        await this.rulesLock.acquire();
         try {
             if (this._rules.some((r) => r.id === rule.id)) {
                 if (!overwrite) {
@@ -90,7 +90,7 @@ class RuleExecutor implements Stuntman.RuleExecutorInterface {
     async removeRule(rule: Stuntman.Rule): Promise<void>;
     async removeRule(ruleOrId: string | Stuntman.Rule): Promise<void> {
         await this.cleanUpExpired();
-        await this.rulesLock.acquireAsync();
+        await this.rulesLock.acquire();
         try {
             this._removeRule(ruleOrId);
         } finally {

package/src/rules/index.ts

@@ -2,4 +2,4 @@ import type * as Stuntman from '@stuntman/shared';
 import { loadRules } from './loadRules';
 export { DEFAULT_RULES } from './loadRules';
 
-export const CUSTOM_RULES: Stuntman.DeployedRule[] = loadRules();
+export const CUSTOM_RULES: Stuntman.DeployedRule[] = await loadRules();

package/src/rules/loadRules.ts

@@ -8,7 +8,7 @@ import type * as Stuntman from '@stuntman/shared';
 
 export const DEFAULT_RULES: Stuntman.DeployedRule[] = [catchAllRule, echoRule];
 
-export const loadRules = (): Stuntman.DeployedRule[] => {
+export const loadRules = async (): Promise<Stuntman.DeployedRule[]> => {
     const customRules: Stuntman.DeployedRule[] = [];
     if (!stuntmanConfig.mock.rulesPath || !fs.existsSync(stuntmanConfig.mock.rulesPath)) {
         logger.debug({ rulesPath: stuntmanConfig.mock.rulesPath }, `additional rules directory not found`);
@@ -30,7 +30,7 @@ export const loadRules = (): Stuntman.DeployedRule[] => {
     for (const filePath of filePaths) {
         // TODO add .ts rule support
         try {
-            const loadedFile = tsImport.loadSync(filePath, { useCache: false });
+            const loadedFile = await tsImport.load(filePath, { useCache: false });
             // eslint-disable-next-line @typescript-eslint/no-var-requires
             const exportedRules = (Object.values(loadedFile) as Stuntman.DeployedRule[]).filter((rule) => {
                 if (!rule || !rule.id || typeof rule.matches !== 'function') {

package/src/storage.ts

@@ -1,8 +1,8 @@
-import LRUCache from 'lru-cache';
+import { LRUCache } from 'lru-cache';
 import type * as Stuntman from '@stuntman/shared';
 import sizeof from 'object-sizeof';
 
-const DNS_CACHE_OPTIONS: LRUCache.Options<string, string> = {
+const DNS_CACHE_OPTIONS: any = {
     max: 1000,
     ttl: 1000 * 60 * 15,
     allowStale: false,