Merge pull request #148 from scaccogatto/patch-1

k8s-ci-robot · web-flow · commit 45e098779366 · 2018-11-04T20:45:58.000-08:00
watch method crash on unexpected objects
diff --git a/src/watch.ts b/src/watch.ts
@@ -60,10 +60,10 @@ export class Watch {
             } else {
                 obj = JSON.parse(data) as WatchUpdate;
             }
-            if (obj.type && obj.object) {
+            if (typeof obj === 'object' && obj.object) {
                 callback(obj.type, obj.object);
             } else {
-                throw new Error(`unexpected object: ${JSON.stringify(obj)}`);
+                throw new Error(`unexpected ${typeof obj}: ${JSON.stringify(obj)}`);
             }
         });
 

Original file line number	Diff line number	Diff line change
`@@ -60,10 +60,10 @@ export class Watch {`
`60`	`60`	`} else {`
`61`	`61`	`obj = JSON.parse(data) as WatchUpdate;`
`62`	`62`	`}`
`63`		`- if (obj.type && obj.object) {`
	`63`	`+ if (typeof obj === 'object' && obj.object) {`
`64`	`64`	`callback(obj.type, obj.object);`
`65`	`65`	`} else {`
`66`		- throw new Error(`unexpected object: ${JSON.stringify(obj)}`);
	`66`	+ throw new Error(`unexpected ${typeof obj}: ${JSON.stringify(obj)}`);
`67`	`67`	`}`
`68`	`68`	`});`
`69`	`69`