streamql len field

js/httpql/src/index.spec.ts

@@ -26,8 +26,8 @@ const readFile = (path: string) => {
 describe("httpql", () => {
   describe("ast", () => {
     const cases = [
-      1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-      21, 22, 23,
+      1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+      22, 23,
     ];
     for (const c of cases) {
       it(`Case ${c}`, () => {

js/httpql/src/parser/parser.terms.ts

@@ -1,6 +1,5 @@
 // This file was generated by lezer-generator. You probably shouldn't edit it.
-export const
-  BlockComment = 1,
+export const BlockComment = 1,
   LineComment = 2,
   HTTPQL = 3,
   Query = 4,
@@ -57,4 +56,4 @@ export const
   GroupQuery = 55,
   LogicalQuery = 56,
   And = 57,
-  Or = 58
+  Or = 58;

js/httpql/src/serialize.ts

@@ -2,7 +2,6 @@ import { err, ok, Result } from "neverthrow";
 
 import { type HTTPQLError, InvalidQuery } from "./errors.js";
 import {
-  OperatorString,
   type ClauseHeader,
   type ClauseRequest,
   type ClauseResponse,
@@ -13,6 +12,7 @@ import {
   type ExprPreset,
   type ExprSource,
   type ExprString,
+  OperatorString,
   type Query,
 } from "./primitives.js";
 import { isPresent } from "./utils.js";

js/streamql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caido/streamql",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Parser for the StreamQL language",
   "author": "Caido Labs Inc. <dev@caido.io>",
   "repository": "https://github.com/caido/httpql",

js/streamql/src/deserialize/clause.websocket.ts

@@ -8,6 +8,7 @@ import type { ClauseWs } from "../primitives.js";
 import { getChildString, isPresent } from "../utils.js";
 
 import { deserializeDateExpr } from "./expr.date.js";
+import { deserializeIntExpr } from "./expr.int.js";
 import { deserializeStringExpr } from "./expr.string.js";
 
 export const deserializeWsClause = (
@@ -40,6 +41,17 @@ export const deserializeWsClause = (
     }
   })();
 
+  const intField = (() => {
+    const child = getChildString(node, terms.WsIntFieldName, doc);
+
+    if (isPresent(child)) {
+      switch (child) {
+        case "len":
+          return "len";
+      }
+    }
+  })();
+
   const stringFilter = (() => {
     const child = node.getChild(terms.StringExpression);
     if (isPresent(child)) return deserializeStringExpr(child, doc);
@@ -50,6 +62,11 @@ export const deserializeWsClause = (
     if (isPresent(child)) return deserializeDateExpr(child, doc);
   })();
 
+  const intFilter = (() => {
+    const child = node.getChild(terms.IntExpression);
+    if (isPresent(child)) return deserializeIntExpr(child, doc);
+  })();
+
   if (isPresent(stringField) && isPresent(stringFilter)) {
     return stringFilter.map((filter) => {
       return {
@@ -66,5 +83,13 @@ export const deserializeWsClause = (
     });
   }
 
+  if (isPresent(intField) && isPresent(intFilter)) {
+    return intFilter.map((filter) => {
+      return {
+        [intField]: filter,
+      };
+    });
+  }
+
   return err(new InvalidQuery());
 };

js/streamql/src/deserialize/index.spec.ts

@@ -103,6 +103,29 @@ describe("deserialize", () => {
     });
   });
 
+  it("should parse StreamQL ws len expression", () => {
+    const query = "ws.len.gte:1212";
+
+    const filter = deserialize(query)._unsafeUnwrap();
+
+    expect(filter).to.deep.equal({
+      websocket: {
+        len: {
+          operator: OperatorInt.Gte,
+          value: 1212,
+        },
+      },
+    });
+  });
+
+  it("should fail given a quoted ws len value", () => {
+    const query = 'ws.len.lt:"12"';
+
+    const result = deserialize(query);
+
+    expect(result.isErr()).to.be.true;
+  });
+
   it("should parse StreamQL AND expression", () => {
     const query = 'stream.host.cont:"test.com" AND ws.direction.eq:"client"';
 

js/streamql/src/index.spec.ts

@@ -26,7 +26,7 @@ const readFile = (path: string) => {
 
 describe("streamql", () => {
   describe("ast", () => {
-    const cases = [1, 2, 3, 4];
+    const cases = [1, 2, 3, 4, 5];
     for (const c of cases) {
       it(`Case ${c}`, () => {
         const input = readFile(`ast/${c}/input.streamql`);

js/streamql/src/primitives.ts

@@ -14,6 +14,7 @@ export type ClauseWs = {
   raw?: Maybe<ExprString>;
   direction?: Maybe<ExprString>;
   format?: Maybe<ExprString>;
+  len?: Maybe<ExprInt>;
 };
 
 export type ClauseStream = {

js/streamql/src/serialize.ts

@@ -65,6 +65,9 @@ const serializeClauseWs = (value: ClauseWs): Result<string, StreamQLError> => {
   if (isPresent(value.format)) {
     return serializeExprString(value.format).map((str) => `format.${str}`);
   }
+  if (isPresent(value.len)) {
+    return serializeExprInt(value.len).map((str) => `len.${str}`);
+  }
 
   return err(new InvalidQuery());
 };

rust/streamql/src/lib.rs

@@ -33,6 +33,7 @@ mod tests {
     #[case(2)]
     #[case(3)]
     #[case(4)]
+    #[case(5)]
     fn test_ast(#[case] case: u32) {
         let input =
             std::fs::read_to_string(format!("../../tests/streamql/ast/{case}/input.streamql"))

tests/streamql/ast/5/input.streamql

@@ -0,0 +1 @@
+ws.len.gte:1212 AND stream.port.lt:8080

tests/streamql/ast/5/output.ast

@@ -0,0 +1 @@
+(ws.len.gte:1212 and stream.port.lt:8080)