@stuntman/shared 0.1.2 → 0.1.3

package/dist/config.js

@@ -6,18 +6,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.serverConfig = void 0;
 const _1 = require(".");
 const config_1 = __importDefault(require("config"));
-const defaults_1 = __importDefault(require("defaults"));
+const path_1 = __importDefault(require("path"));
 // TODO safeguards & defaults
 const defaultConfig = {
     api: {
         disabled: false,
         port: _1.DEFAULT_API_PORT,
+        apiKeyReadOnly: null,
+        apiKeyReadWrite: null,
     },
     mock: {
         domain: _1.DEFAULT_MOCK_DOMAIN,
         externalDns: _1.EXTERNAL_DNS,
         port: _1.DEFAULT_MOCK_PORT,
         timeout: _1.DEFAULT_PROXY_TIMEOUT,
+        rulesPath: path_1.default.join(process.cwd(), 'rules'),
     },
     storage: {
         traffic: {
@@ -30,6 +33,7 @@ const defaultConfig = {
         disabled: false,
     },
 };
+config_1.default.util.setModuleDefaults('stuntman', defaultConfig);
 let configFromFile = {};
 try {
     configFromFile = config_1.default.get('stuntman');
@@ -38,4 +42,4 @@ catch (error) {
     // eslint-disable-next-line no-console
     console.warn('unable to find correct config - starting with defaults');
 }
-exports.serverConfig = (0, defaults_1.default)(configFromFile, defaultConfig);
+exports.serverConfig = configFromFile;

package/dist/index.d.ts

@@ -123,6 +123,8 @@ export type WebGuiConfig = {
 export type ApiConfig = {
     port: number;
     disabled: boolean;
+    apiKeyReadWrite: string | null;
+    apiKeyReadOnly: string | null;
 };
 export type ClientConfig = {
     protocol?: 'http' | 'https';
@@ -138,6 +140,7 @@ export type MockConfig = {
     httpsCert?: string;
     timeout: number;
     externalDns: string[];
+    rulesPath: string;
 };
 export type StorageConfig = {
     limitCount: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stuntman/shared",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Stuntman - HTTP proxy / mock shared types and utils",
   "main": "dist/index.js",
   "repository": {
@@ -33,18 +33,16 @@
   "license": "MIT",
   "dependencies": {
     "config": "3.3.9",
-    "defaults": "1.0.4",
     "pino": "8.10.0"
   },
   "devDependencies": {
-    "@types/config": "3.3.0",
-    "@types/defaults": "1.0.3"
+    "@types/config": "3.3.0"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "clean": "rm -fr dist",
     "build": "tsc",
     "lint": "prettier --check . && eslint . --ext ts",
-    "lint:fix": "prettier --write ./src && eslint ./src --ext ts --fix"
+    "lint:fix": "prettier --write ./{src,test} && eslint ./{src,test} --ext ts --fix"
   }
 }

package/src/config.ts

@@ -1,5 +1,4 @@
 import {
-    RecursivePartial,
     ServerConfig,
     DEFAULT_API_PORT,
     DEFAULT_MOCK_DOMAIN,
@@ -11,7 +10,7 @@ import {
     DEFAULT_CACHE_TTL,
 } from '.';
 import config from 'config';
-import defaults from 'defaults';
+import path from 'path';
 
 // TODO safeguards & defaults
 
@@ -19,12 +18,15 @@ const defaultConfig: ServerConfig = {
     api: {
         disabled: false,
         port: DEFAULT_API_PORT,
+        apiKeyReadOnly: null,
+        apiKeyReadWrite: null,
     },
     mock: {
         domain: DEFAULT_MOCK_DOMAIN,
         externalDns: EXTERNAL_DNS,
         port: DEFAULT_MOCK_PORT,
         timeout: DEFAULT_PROXY_TIMEOUT,
+        rulesPath: path.join(process.cwd(), 'rules'),
     },
     storage: {
         traffic: {
@@ -38,12 +40,14 @@ const defaultConfig: ServerConfig = {
     },
 };
 
-let configFromFile: RecursivePartial<ServerConfig> = {};
+config.util.setModuleDefaults('stuntman', defaultConfig);
+
+let configFromFile = {} as ServerConfig;
 try {
-    configFromFile = config.get<RecursivePartial<ServerConfig>>('stuntman');
+    configFromFile = config.get<ServerConfig>('stuntman');
 } catch (error) {
     // eslint-disable-next-line no-console
     console.warn('unable to find correct config - starting with defaults');
 }
 
-export const serverConfig = defaults(configFromFile, defaultConfig) as ServerConfig;
+export const serverConfig = configFromFile;

package/src/index.ts

@@ -166,6 +166,8 @@ export type WebGuiConfig = {
 export type ApiConfig = {
     port: number;
     disabled: boolean;
+    apiKeyReadWrite: string | null;
+    apiKeyReadOnly: string | null;
 };
 
 export type ClientConfig = {
@@ -183,6 +185,7 @@ export type MockConfig = {
     httpsCert?: string;
     timeout: number;
     externalDns: string[];
+    rulesPath: string;
 };
 
 export type StorageConfig = {

package/test/dummy.test.ts

@@ -0,0 +1 @@
+// TODO

package/tsconfig.json

@@ -11,6 +11,12 @@
         "skipLibCheck": true,
         "typeRoots": ["node_modules/@types"],
         "allowJs": true,
-        "moduleResolution": "node16"
-    }
+        "moduleResolution": "node16",
+        "types": ["node", "jest"]
+    },
+    "exclude": [
+        "jest.config.js",
+        "./dist/**",
+        "./test/**"
+    ]
 }