@stuntman/client 0.1.5 → 0.1.6

package/dist/apiClient.d.ts

@@ -17,7 +17,7 @@ export declare class Client {
     enableRule(id: string): Promise<void>;
     removeRule(id: string): Promise<void>;
     addRule(rule: Stuntman.SerializableRule): Promise<Stuntman.Rule>;
-    getTraffic(rule: Stuntman.Rule): Promise<Record<string, Stuntman.LogEntry>>;
-    getTraffic(ruleIdOrLabel: string): Promise<Record<string, Stuntman.LogEntry>>;
+    getTraffic(rule: Stuntman.Rule): Promise<Stuntman.LogEntry[]>;
+    getTraffic(ruleIdOrLabel: string): Promise<Stuntman.LogEntry[]>;
 }
 export {};

package/dist/apiClient.js

@@ -124,7 +124,7 @@ class Client {
                 catch (kiss) {
                     // and swallow
                 }
-                if ('error' in json) {
+                if (json && 'error' in json) {
                     throw new clientError_1.ClientError(json.error);
                 }
                 throw new Error(`Unexpected errror: ${text}`);
@@ -137,11 +137,11 @@ class Client {
     }
     async getRules() {
         const response = await this.fetch(`${this.baseUrl}/rules`);
-        return response.json();
+        return (await response.json());
     }
     async getRule(id) {
         const response = await this.fetch(`${this.baseUrl}/rule/${encodeURIComponent(id)}`);
-        return response.json();
+        return (await response.json());
     }
     async disableRule(id) {
         await this.fetch(`${this.baseUrl}/rule/${encodeURIComponent(id)}/disable`);
@@ -159,12 +159,12 @@ class Client {
             body: JSON.stringify(serializedRule),
             headers: { 'content-type': 'application/json' },
         });
-        return response.json();
+        return (await response.json());
     }
     async getTraffic(ruleOrIdOrLabel) {
         const ruleId = typeof ruleOrIdOrLabel === 'object' ? ruleOrIdOrLabel.id : ruleOrIdOrLabel;
         const response = await this.fetch(`${this.baseUrl}/traffic${ruleId ? `/${encodeURIComponent(ruleId)}` : ''}`);
-        return response.json();
+        return (await response.json());
     }
 }
 exports.Client = Client;

package/dist/ruleBuilder.js

@@ -11,6 +11,9 @@ class RuleBuilderBaseBase {
             id: (0, uuid_1.v4)(),
             ttlSeconds: shared_1.DEFAULT_RULE_TTL_SECONDS,
             priority: shared_1.DEFAULT_RULE_PRIORITY,
+            actions: {
+                mockResponse: { status: 200 },
+            },
             matches: {
                 localFn: (req) => {
                     var _a, _b, _c, _d;
@@ -467,6 +470,7 @@ class RuleBuilderInitialized extends RuleBuilderBase {
         return this;
     }
     proxyPass() {
+        this.rule.actions = { proxyPass: true };
         return this.rule;
     }
     mockResponse(response, localVariables) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stuntman/client",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Stuntman - HTTP proxy / mock API client",
   "main": "dist/index.js",
   "repository": {

package/src/apiClient.ts

@@ -135,7 +135,7 @@ export class Client {
                 } catch (kiss) {
                     // and swallow
                 }
-                if ('error' in json) {
+                if (json && 'error' in json) {
                     throw new ClientError(json.error);
                 }
                 throw new Error(`Unexpected errror: ${text}`);
@@ -148,12 +148,12 @@ export class Client {
 
     async getRules(): Promise<Stuntman.LiveRule[]> {
         const response = await this.fetch(`${this.baseUrl}/rules`);
-        return response.json() as unknown as Promise<Stuntman.LiveRule[]>;
+        return (await response.json()) as Promise<Stuntman.LiveRule[]>;
     }
 
     async getRule(id: string): Promise<Stuntman.LiveRule> {
         const response = await this.fetch(`${this.baseUrl}/rule/${encodeURIComponent(id)}`);
-        return response.json() as unknown as Stuntman.LiveRule;
+        return (await response.json()) as Stuntman.LiveRule;
     }
 
     async disableRule(id: string): Promise<void> {
@@ -175,15 +175,15 @@ export class Client {
             body: JSON.stringify(serializedRule),
             headers: { 'content-type': 'application/json' },
         });
-        return response.json() as unknown as Stuntman.Rule;
+        return (await response.json()) as Stuntman.Rule;
     }
 
     // TODO improve filtering by timestamp from - to, multiple labels, etc.
-    async getTraffic(rule: Stuntman.Rule): Promise<Record<string, Stuntman.LogEntry>>;
-    async getTraffic(ruleIdOrLabel: string): Promise<Record<string, Stuntman.LogEntry>>;
-    async getTraffic(ruleOrIdOrLabel: string | Stuntman.Rule): Promise<Record<string, Stuntman.LogEntry>> {
+    async getTraffic(rule: Stuntman.Rule): Promise<Stuntman.LogEntry[]>;
+    async getTraffic(ruleIdOrLabel: string): Promise<Stuntman.LogEntry[]>;
+    async getTraffic(ruleOrIdOrLabel: string | Stuntman.Rule): Promise<Stuntman.LogEntry[]> {
         const ruleId = typeof ruleOrIdOrLabel === 'object' ? ruleOrIdOrLabel.id : ruleOrIdOrLabel;
         const response = await this.fetch(`${this.baseUrl}/traffic${ruleId ? `/${encodeURIComponent(ruleId)}` : ''}`);
-        return response.json() as unknown as Record<string, Stuntman.LogEntry>;
+        return (await response.json()) as Stuntman.LogEntry[];
     }
 }

package/src/ruleBuilder.ts

@@ -40,6 +40,9 @@ class RuleBuilderBaseBase {
             id: uuidv4(),
             ttlSeconds: DEFAULT_RULE_TTL_SECONDS,
             priority: DEFAULT_RULE_PRIORITY,
+            actions: {
+                mockResponse: { status: 200 },
+            },
             matches: {
                 localFn: (req: Stuntman.Request): Stuntman.RuleMatchResult => {
                     const ___url = new URL(req.url);
@@ -548,6 +551,7 @@ class RuleBuilderInitialized extends RuleBuilderBase {
     }
 
     proxyPass(): Stuntman.SerializableRule {
+        this.rule.actions = { proxyPass: true };
         return this.rule;
     }