@port-labs/jq-node-bindings 1.0.1 → 1.0.3

package/deps/jq/tests/shtest

@@ -14,9 +14,6 @@ JQ="$JQ -b"
 
 PATH=$JQBASEDIR:$PATH $JQBASEDIR/tests/jq-f-test.sh > /dev/null
 
-SHELL=/bin/sh
-export SHELL
-
 if [ -f "$JQBASEDIR/.libs/libinject_errors.so" ]; then
   # Do some simple error injection tests to check that we're handling
   # I/O errors correctly.
@@ -213,28 +210,6 @@ else
   cmp $d/out $d/expected
 fi
 
-# Regression tests for #3194
-echo 42 > $d/expected
-$JQ -nn 42 > $d/out 2>&1
-cmp $d/out $d/expected
-
-$JQ -nL. 42 > $d/out 2>&1
-cmp $d/out $d/expected
-$JQ -nL . 42 > $d/out 2>&1
-cmp $d/out $d/expected
-
-$JQ -h > $d/expected 2>&1
-$JQ -hV > $d/out 2>&1
-cmp $d/out $d/expected
-$JQ -h -V > $d/out 2>&1
-cmp $d/out $d/expected
-
-$JQ -V > $d/expected 2>&1
-$JQ -Vh > $d/out 2>&1
-cmp $d/out $d/expected
-$JQ -V -h > $d/out 2>&1
-cmp $d/out $d/expected
-
 ## Test streaming parser
 
 ## If we add an option to stream to the `import ... as $symbol;` directive
@@ -384,17 +359,6 @@ if [ "$(HOME="$mods/home1" $VALGRIND $Q $JQ -nr fg)" != foobar ]; then
     exit 1
 fi
 
-if $msys || $mingw; then
-    HOME_BAK=$HOME
-    unset HOME
-    if [ "$(USERPROFILE="$mods/home1" $VALGRIND $Q $JQ -nr foo)" != baz ]; then
-        echo "Bug #3104 regressed (sourcing %USERPROFILE%/.jq on Windows)" 1>&2
-        exit 1
-    fi
-    export HOME=$HOME_BAK
-    unset HOME_BAK
-fi
-
 if [ $(HOME="$mods/home1" $VALGRIND $Q $JQ --debug-dump-disasm -n fg | grep '^[a-z]' | wc -l) -ne 3 ]; then
     echo "Binding too many defs into program" 1>&2
     exit 1
@@ -472,96 +436,41 @@ printf '\033[4;31mnull\033[0m\n' > $d/expect
 cmp $d/color $d/expect
 
 ## Default colors, complex input
-$JQ -Ccn '[{"a":true,"b":false},"abc",123,null]' > $d/color
+$JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color
 {
-  printf '\033[1;39m[\033[0m'
-  printf '\033[1;39m{\033[0m'
-  printf '\033[1;34m"a"\033[0m'
-  printf '\033[1;39m:\033[0m'
-  printf '\033[0;39mtrue\033[0m'
-  printf '\033[1;39m,\033[0m'
-  printf '\033[1;34m"b"\033[0m'
-  printf '\033[1;39m:\033[0m'
-  printf '\033[0;39mfalse\033[0m'
-  printf '\033[1;39m}\033[0m'
-  printf '\033[1;39m,\033[0m'
-  printf '\033[0;32m"abc"\033[0m'
-  printf '\033[1;39m,\033[0m'
-  printf '\033[0;39m123\033[0m'
-  printf '\033[1;39m,\033[0m'
-  printf '\033[0;90mnull\033[0m'
-  printf '\033[1;39m]\033[0m\n'
+  printf '\033[1;39m[\033[1;39m{'
+  printf '\033[0m\033[1;34m"a"\033['
+  printf '0m\033[1;39m:\033[0m\033['
+  printf '0;39mtrue\033[0m\033[1'
+  printf ';39m,\033[0m\033[1;34m'
+  printf '"b"\033[0m\033[1;39m:\033'
+  printf '[0m\033[0;39mfalse\033'
+  printf '[0m\033[1;39m\033[1;39'
+  printf 'm}\033[0m\033[1;39m,\033['
+  printf '0;39m123\033[0m\033[1;'
+  printf '39m,\033[0;90mnull\033'
+  printf '[0m\033[1;39m\033[1;39'
+  printf 'm]\033[0m\n'
 } > $d/expect
 cmp $d/color $d/expect
 
 ## Set non-default colors, complex input
 JQ_COLORS='0;30:0;31:0;32:0;33:0;34:1;35:1;36:1;37' \
-  $JQ -Ccn '[{"a":true,"b":false},"abc",123,null]' > $d/color
-{
-  printf '\033[1;35m[\033[0m'
-  printf '\033[1;36m{\033[0m'
-  printf '\033[1;37m"a"\033[0m'
-  printf '\033[1;36m:\033[0m'
-  printf '\033[0;32mtrue\033[0m'
-  printf '\033[1;36m,\033[0m'
-  printf '\033[1;37m"b"\033[0m'
-  printf '\033[1;36m:\033[0m'
-  printf '\033[0;31mfalse\033[0m'
-  printf '\033[1;36m}\033[0m'
-  printf '\033[1;35m,\033[0m'
-  printf '\033[0;34m"abc"\033[0m'
-  printf '\033[1;35m,\033[0m'
-  printf '\033[0;33m123\033[0m'
-  printf '\033[1;35m,\033[0m'
-  printf '\033[0;30mnull\033[0m'
-  printf '\033[1;35m]\033[0m\n'
-} > $d/expect
-cmp $d/color $d/expect
-
-## Default colors, complex input, indented
-$JQ -Cn '[{"a":true,"b":false},"abc",123,null]' > $d/color
-{
-  printf '\033[1;39m[\033[0m\n'
-  printf '  \033[1;39m{\033[0m\n'
-  printf '    \033[1;34m"a"\033[0m'
-  printf '\033[1;39m:\033[0m '
-  printf '\033[0;39mtrue\033[0m'
-  printf '\033[1;39m,\033[0m\n'
-  printf '    \033[1;34m"b"\033[0m'
-  printf '\033[1;39m:\033[0m '
-  printf '\033[0;39mfalse\033[0m\n'
-  printf '  \033[1;39m}\033[0m'
-  printf '\033[1;39m,\033[0m\n'
-  printf '  \033[0;32m"abc"\033[0m'
-  printf '\033[1;39m,\033[0m\n'
-  printf '  \033[0;39m123\033[0m'
-  printf '\033[1;39m,\033[0m\n'
-  printf '  \033[0;90mnull\033[0m\n'
-  printf '\033[1;39m]\033[0m\n'
-} > $d/expect
-cmp $d/color $d/expect
-
-## Set non-default colors, complex input, indented
-JQ_COLORS='0;30:0;31:0;32:0;33:0;34:1;35:1;36:1;37' \
-  $JQ -Cn '[{"a":true,"b":false},"abc",123,null]' > $d/color
+  $JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color
 {
-  printf '\033[1;35m[\033[0m\n'
-  printf '  \033[1;36m{\033[0m\n'
-  printf '    \033[1;37m"a"\033[0m'
-  printf '\033[1;36m:\033[0m '
-  printf '\033[0;32mtrue\033[0m'
-  printf '\033[1;36m,\033[0m\n'
-  printf '    \033[1;37m"b"\033[0m'
-  printf '\033[1;36m:\033[0m '
-  printf '\033[0;31mfalse\033[0m\n'
-  printf '  \033[1;36m}\033[0m'
-  printf '\033[1;35m,\033[0m\n'
-  printf '  \033[0;34m"abc"\033[0m'
-  printf '\033[1;35m,\033[0m\n'
-  printf '  \033[0;33m123\033[0m'
-  printf '\033[1;35m,\033[0m\n'
-  printf '  \033[0;30mnull\033[0m\n'
-  printf '\033[1;35m]\033[0m\n'
+  printf '\033[1;35m[\033[1;36m{'
+  printf '\033[0m\033[1;37m"a"\033['
+  printf '0m\033[1;36m:\033[0m\033['
+  printf '0;32mtrue\033[0m\033[1'
+  printf ';36m,\033[0m\033[1;37m'
+  printf '"b"\033[0m\033[1;36m:\033'
+  printf '[0m\033[0;31mfalse\033'
+  printf '[0m\033[1;36m\033[1;36'
+  printf 'm}\033[0m\033[1;35m,\033['
+  printf '0;33m123\033[0m\033[1;'
+  printf '35m,\033[0;30mnull\033'
+  printf '[0m\033[1;35m\033[1;35'
+  printf 'm]\033[0m\n'
 } > $d/expect
 cmp $d/color $d/expect
 
@@ -571,25 +480,25 @@ cmp $d/color $d/expect
 # on stderr.
 set -vx
 echo 'Failed to set $JQ_COLORS' > $d/expect_warning
-$JQ -Ccn '[{"a":true,"b":false},"abc",123,null]' > $d/expect
+$JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/expect
 JQ_COLORS='garbage;30:*;31:,;3^:0;$%:0;34:1;35:1;36' \
-  $JQ -Ccn '[{"a":true,"b":false},"abc",123,null]' > $d/color 2>$d/warning
+  $JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color 2>$d/warning
 cmp $d/color $d/expect
 cmp $d/warning $d/expect_warning
 JQ_COLORS='1234567890123456789;30:0;31:0;32:0;33:0;34:1;35:1;36' \
-  $JQ -Ccn '[{"a":true,"b":false},"abc",123,null]' > $d/color 2>$d/warning
+  $JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color 2>$d/warning
 cmp $d/color $d/expect
 cmp $d/warning $d/expect_warning
 JQ_COLORS='1;31234567890123456789:0;31:0;32:0;33:0;34:1;35:1;36' \
-  $JQ -Ccn '[{"a":true,"b":false},"abc",123,null]' > $d/color 2>$d/warning
+  $JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color 2>$d/warning
 cmp $d/color $d/expect
 cmp $d/warning $d/expect_warning
 JQ_COLORS='1234567890123456;1234567890123456:1234567890123456;1234567890123456:1234567890123456;1234567890123456:1234567890123456;1234567890123456:1234567890123456;1234567890123456:1234567890123456;1234567890123456:1234567890123456;1234567890123456' \
-  $JQ -Ccn '[{"a":true,"b":false},"abc",123,null]' > $d/color 2>$d/warning
+  $JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color 2>$d/warning
 cmp $d/color $d/expect
 cmp $d/warning $d/expect_warning
 JQ_COLORS="0123456789123:0123456789123:0123456789123:0123456789123:0123456789123:0123456789123:0123456789123:0123456789123:" \
-  $JQ -Ccn '[{"a":true,"b":false},"abc",123,null]' > $d/color 2>$d/warning
+  $JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color 2>$d/warning
 cmp $d/color $d/expect
 cmp $d/warning $d/expect_warning
 
@@ -611,17 +520,17 @@ if $test_no_color && command -v script >/dev/null 2>&1; then
   od -tc $d/expect
   od -tc $d/color
   cmp $d/color $d/expect
-  faketty env NO_COLOR= $JQ_NO_B -n . > $d/color
+  NO_COLOR= faketty $JQ_NO_B -n . > $d/color
   printf '\033[0;90mnull\033[0m\r\n' > $d/expect
   od -tc $d/expect
   od -tc $d/color
   cmp $d/color $d/expect
-  faketty env NO_COLOR=1 $JQ_NO_B -n . > $d/color
+  NO_COLOR=1 faketty $JQ_NO_B -n . > $d/color
   printf 'null\r\n' > $d/expect
   od -tc $d/expect
   od -tc $d/color
   cmp $d/color $d/expect
-  faketty env NO_COLOR=1 $JQ_NO_B -Cn . > $d/color
+  NO_COLOR=1 faketty $JQ_NO_B -Cn . > $d/color
   printf '\033[0;90mnull\033[0m\r\n' > $d/expect
   od -tc $d/expect
   od -tc $d/color
@@ -685,30 +594,10 @@ if ! x=$($JQ -n "1 # foo$cr + 2") || [ "$x" != 1 ]; then
   exit 1
 fi
 
-if ! x=$($JQ -cn '[
-  1,
-  # foo \
-  2,
-  # bar \\
-  3,
-  4, # baz \\\
-  5, \
-  6,
-  7
-  # comment \
-    comment \
-    comment
-]') || [ "$x" != '[1,3,4,7]' ]; then
-  echo 'multiline comment was not handled correctly'
-  exit 1
-fi
-
 # CVE-2023-50268: No stack overflow comparing a nan with a large payload
-if $JQ -ne 'have_decnum'; then
-  $VALGRIND $Q $JQ '1 != .' <<\EOF >/dev/null
-  Nan4000
+$VALGRIND $Q $JQ '1 != .' <<\EOF >/dev/null
+Nan4000
 EOF
-fi
 
 # Allow passing the inline jq script before -- #2919
 if ! r=$($JQ --args -rn -- '$ARGS.positional[0]' bar) || [ "$r" != bar ]; then

package/index.d.ts

@@ -1,5 +1,6 @@
 declare module '@port-labs/jq-node-bindings' {
   type ExecOptions = { enableEnv?: boolean, throwOnError?: boolean };
+  type ExecAsyncOptions = { enableEnv?: boolean, throwOnError?: boolean, timeoutSec?: number };
 
   export class JqExecError extends Error {
   }
@@ -8,8 +9,8 @@ declare module '@port-labs/jq-node-bindings' {
   }
 
   export function exec(json: object, input: string, options?: ExecOptions): object | Array<any> | string | number | boolean | null;
-  export function execAsync(json: object, input: string, options?: ExecOptions): Promise<object | Array<any> | string | number | boolean | null>;
+  export function execAsync(json: object, input: string, options?: ExecAsyncOptions): Promise<object | Array<any> | string | number | boolean | null>;
 
   export function renderRecursively(json: object, input: object | Array<any> | string | number | boolean | null, execOptions?: ExecOptions): object | Array<any> | string | number | boolean | null;
-  export function renderRecursivelyAsync(json: object, input: object | Array<any> | string | number | boolean | null, execOptions?: ExecOptions): Promise<object | Array<any> | string | number | boolean | null>;
+  export function renderRecursivelyAsync(json: object, input: object | Array<any> | string | number | boolean | null, execOptions?: ExecAsyncOptions): Promise<object | Array<any> | string | number | boolean | null>;
 }

package/lib/jq.js

@@ -27,9 +27,9 @@ const exec = (object, filter, {enableEnv = false, throwOnError = false} = {}) =>
   }
 }
 
-const execAsync = async (object, filter, {enableEnv = false, throwOnError = false} = {}) => {
+const execAsync = async (object, filter, {enableEnv = false, throwOnError = false, timeoutSec} = {}) => {
   try {
-    const data = await nativeJq.execAsync(JSON.stringify(object), formatFilter(filter, {enableEnv}))
+    const data = await nativeJq.execAsync(JSON.stringify(object), formatFilter(filter, {enableEnv}), timeoutSec)
     return data?.value;
   } catch (err) {
     if (throwOnError) {

package/lib/templateAsync.js

@@ -1,5 +1,7 @@
 const jq = require('./jq');
 
+const SPREAD_KEYWORD_PATTERN = /^\s*\{\{\s*spreadValue\(\s*\)\s*\}\}\s*$/;  // matches {{ <Keyword>() }} with white spaces where you'd expect them
+
 const findInsideDoubleBracesIndices = (input) => {
   let wrappingQuote = null;
   let insideDoubleBracesStart = null;
@@ -64,15 +66,12 @@ const renderAsync =async (inputJson, template, execOptions = {}) => {
   const firstIndex = indices[0];
   if (indices.length === 1 && template.trim().startsWith('{{') && template.trim().endsWith('}}')) {
     // If entire string is a template, evaluate and return the result with the original type
-    return await jq.execAsync(inputJson, template.slice(firstIndex.start, firstIndex.end), execOptions);
+    return jq.execAsync(inputJson, template.slice(firstIndex.start, firstIndex.end), execOptions);
   }
 
   let result = template.slice(0, firstIndex.start - '{{'.length); // Initiate result with string until first template start index
   for (let i = 0; i < indices.length; i++) {
     const index = indices[i];
-    
-//   }
-//   indices.forEach((index, i) => {
     const jqResult = await jq.execAsync(inputJson, template.slice(index.start, index.end), execOptions);
     result +=
       // Add to the result the stringified evaluated jq of the current template
@@ -82,7 +81,6 @@ const renderAsync =async (inputJson, template, execOptions = {}) => {
         index.end + '}}'.length,
         i + 1 === indices.length ? template.length : indices[i + 1].start - '{{'.length,
       );
-//   });
     }
 
   return result;
@@ -90,20 +88,15 @@ const renderAsync =async (inputJson, template, execOptions = {}) => {
 
 const renderRecursivelyAsync = async(inputJson, template, execOptions = {}) => {
   if (typeof template === 'string') {
-    return await renderAsync(inputJson, template, execOptions);
+    return renderAsync(inputJson, template, execOptions);
   }
   if (Array.isArray(template)) {
-    return await Promise.all(template.map((value) => renderRecursivelyAsync(inputJson, value, execOptions)));
+    return Promise.all(template.map((value) => renderRecursivelyAsync(inputJson, value, execOptions)));
   }
   if (typeof template === 'object' && template !== null) {
-    
-
-
-      const t =Object.entries(template).map(async([key, value]) => {
-        const SPREAD_KEYWORD = "spreadValue";
-        const keywordMatcher = `^\\{\\{\\s*${SPREAD_KEYWORD}\\(\\s*\\)\\s*\\}\\}$`;  // matches {{ <Keyword>() }} with white spaces where you'd expect them
+      const t = Object.entries(template).map(async([key, value]) => {
 
-        if (key.trim().match(keywordMatcher)) {
+        if (SPREAD_KEYWORD_PATTERN.test(key)) {
           const evaluatedValue = await renderRecursivelyAsync(inputJson, value, execOptions);
           if (typeof evaluatedValue !== "object") {
             throw new Error(
@@ -114,7 +107,7 @@ const renderRecursivelyAsync = async(inputJson, template, execOptions = {}) => {
         }
 
         const evaluatedKey = await renderRecursivelyAsync(inputJson, key, execOptions);
-        if (!['undefined', 'string'].includes(typeof evaluatedKey) && evaluatedKey !== null) {
+        if (typeof evaluatedKey !== 'string' && evaluatedKey != null) {
           throw new Error(
             `Evaluated object key should be undefined, null or string. Original key: ${key}, evaluated to: ${JSON.stringify(evaluatedKey)}`,
           );

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@port-labs/jq-node-bindings",
-  "version": "v1.0.1",
+  "version": "v1.0.3",
   "description": "Node.js bindings for JQ",
-  "jq-node-bindings": "1.0.1",
+  "jq-node-bindings": "1.0.3",
   "main": "lib/index.js",
   "scripts": {
     "configure": "node-gyp configure",

package/src/binding.cc

@@ -45,6 +45,7 @@
 #endif
 
 static size_t global_cache_size = 100;
+static unsigned int global_timeout_sec = 5;
 
 static size_t get_uv_thread_pool_size() {
     const char* uv_threads = getenv("UV_THREADPOOL_SIZE");
@@ -61,7 +62,7 @@ static size_t validate_cache_size(size_t requested_size) {
     size_t min_size = get_uv_thread_pool_size();
     size_t new_size = std::max(requested_size, min_size);
     if(requested_size < min_size){
-        DEBUG_LOG("Requested cache size %zu adjusted to minimum %zu (UV thread pool size)",requested_size,min_size); 
+        DEBUG_LOG("Requested cache size %zu adjusted to minimum %zu (UV thread pool size)",requested_size,min_size);
         return min_size;
     }
     return new_size;
@@ -69,7 +70,7 @@ static size_t validate_cache_size(size_t requested_size) {
 
 /* err_data and throw_err_cb to get jq error message*/
 struct err_data {
-    char buf[4096]; 
+    char buf[4096];
 };
 void throw_err_cb(void* data, jv msg) {
   struct err_data *err_data = (struct err_data *)data;
@@ -99,8 +100,8 @@ public:
     std::string filter_name;
     std::list<JqFilterWrapper*>::iterator cache_pos;
     /* init mutex and set filter_name */
-    explicit JqFilterWrapper(jq_state* jq_, std::string filter_name_) : 
-        filter_name(filter_name_), 
+    explicit JqFilterWrapper(jq_state* jq_, std::string filter_name_) :
+        filter_name(filter_name_),
         jq(jq_) {
         DEBUG_LOG("[WRAPPER:%p] Creating wrapper for filter: %s", (void*)this, filter_name_.c_str());
         pthread_mutex_init(&filter_mutex, nullptr);
@@ -137,7 +138,7 @@ private:
 
 template <class KEY_T> class LRUCache {
 private:
-    pthread_mutex_t cache_mutex; 
+    pthread_mutex_t cache_mutex;
     std::list<JqFilterWrapper*> item_list;
     std::unordered_map<KEY_T,  JqFilterWrapper*> item_map;
     std::unordered_map<JqFilterWrapper*,  size_t> item_refcnt;
@@ -171,8 +172,8 @@ private:
             item_refcnt.erase(wrapper);
             item_list.pop_back();
             CACHE_DEBUG_LOG((void*)wrapper, "Deleting wrapper");
-            delete wrapper; 
-        
+            delete wrapper;
+
         }
         CACHE_DEBUG_LOG(this, "Cleanup complete. New size=%zu", item_map.size());
         pthread_mutex_unlock(&cache_mutex);
@@ -217,7 +218,7 @@ public:
         CACHE_DEBUG_LOG((void*)val, "Released cache lock after put");
         clean();
     }
- 
+
     JqFilterWrapper* get(const KEY_T &key) {
         pthread_mutex_lock(&cache_mutex);
         CACHE_DEBUG_LOG(nullptr, "Got cache lock for get operation, key='%s'", key.c_str());
@@ -234,7 +235,7 @@ public:
         item_list.push_front(wrapper);
         wrapper->cache_pos = item_list.begin();
         inc_refcnt(wrapper);
-        CACHE_DEBUG_LOG((void*)wrapper, "Cache hit for jq wrapper,pointer=%p,name=%s,refcnt=%zu", 
+        CACHE_DEBUG_LOG((void*)wrapper, "Cache hit for jq wrapper,pointer=%p,name=%s,refcnt=%zu",
                  (void*)wrapper, wrapper->filter_name.c_str(),item_refcnt[wrapper]);
         pthread_mutex_unlock(&cache_mutex);
         CACHE_DEBUG_LOG((void*)wrapper, "Released cache lock after get");
@@ -385,7 +386,7 @@ napi_value ExecSync(napi_env env, napi_callback_info info) {
     }
 
     struct err_data err_msg;
-    JqFilterWrapper* wrapper; 
+    JqFilterWrapper* wrapper;
 
     DEBUG_LOG("[SYNC] ExecSync called with filter='%s'", filter.c_str());
 
@@ -418,7 +419,7 @@ napi_value ExecSync(napi_env env, napi_callback_info info) {
     wrapper->lock();
 
     jq_start(wrapper->get_jq(), input, 0);
-    jv result = jq_next(wrapper->get_jq());
+    jv result = jq_next(wrapper->get_jq(), global_timeout_sec);
 
     napi_value ret;
     napi_create_object(env, &ret);
@@ -442,6 +443,7 @@ struct AsyncWork {
     /* input */
     std::string json;
     std::string filter;
+    unsigned int timeout_sec;
     /* promise */
     napi_deferred deferred;
     napi_async_work async_work;
@@ -457,7 +459,7 @@ void ExecuteAsync(napi_env env, void* data) {
     ASYNC_DEBUG_LOG(work, "ExecuteAsync started for filter='%s'", work->filter.c_str());
 
     struct err_data err_msg;
-    JqFilterWrapper* wrapper; 
+    JqFilterWrapper* wrapper;
 
     wrapper = cache.get(work->filter);
     if (wrapper == nullptr) {
@@ -474,7 +476,7 @@ void ExecuteAsync(napi_env env, void* data) {
         wrapper=new JqFilterWrapper(jq, work->filter);
         cache.put(work->filter, wrapper );
     }
-    
+
     jv input = jv_parse_sized(work->json.c_str(), work->json.size());
     ASYNC_DEBUG_LOG(work, "JSON input parsed");
 
@@ -488,11 +490,11 @@ void ExecuteAsync(napi_env env, void* data) {
 
         return;
     }
-    wrapper->lock(); 
+    wrapper->lock();
     jq_start(wrapper->get_jq(), input, 0);
     ASYNC_DEBUG_LOG(work, "jq execution started");
 
-    jv result=jq_next(wrapper->get_jq());
+    jv result=jq_next(wrapper->get_jq(), work->timeout_sec);
     if(jv_get_kind(result) == JV_KIND_INVALID){
         jv msg = jv_invalid_get_msg(jv_copy(result));
 
@@ -590,8 +592,8 @@ void CompleteAsync(napi_env env, napi_status status, void* data) {
 napi_value ExecAsync(napi_env env, napi_callback_info info) {
     napi_handle_scope scope;
 
-    size_t argc = 2;
-    napi_value args[2];
+    size_t argc = 3;
+    napi_value args[3];
     napi_value promise;
 
     napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
@@ -612,6 +614,23 @@ napi_value ExecAsync(napi_env env, napi_callback_info info) {
         napi_throw_error(env, nullptr, "Invalid filter input");
         return nullptr;
     }
+
+    work->timeout_sec = global_timeout_sec;
+    if(argc > 2){
+      napi_valuetype valuetype;
+      napi_status status = napi_typeof(env, args[2], &valuetype);
+      if(status != napi_ok){
+        napi_throw_error(env, nullptr, "Invalid timeout_sec input");
+        return nullptr;
+      }
+      if(valuetype == napi_number){
+        status = napi_get_value_uint32(env, args[2], &work->timeout_sec);
+        if (status != napi_ok) {
+          napi_throw_error(env, nullptr, "Invalid timeout_sec input");
+          return nullptr;
+        }
+      }
+    }
     work->success = false;
 
     napi_create_promise(env, &work->deferred, &promise);
@@ -629,18 +648,18 @@ napi_value ExecAsync(napi_env env, napi_callback_info info) {
 //     size_t argc = 1;
 //     napi_value args[1];
 //     bool enable;
-    
+
 //     napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
-    
+
 //     if (argc < 1) {
 //         napi_throw_type_error(env, nullptr, "Wrong number of arguments");
 //         return nullptr;
 //     }
-    
+
 //     napi_get_value_bool(env, args[0], &enable);
 //     debug_enabled = enable;
 //     DEBUG_LOG("Debug mode %s", enable ? "enabled" : "disabled");
-    
+
 //     napi_value result;
 //     napi_get_boolean(env, debug_enabled, &result);
 //     return result;
@@ -648,8 +667,8 @@ napi_value ExecAsync(napi_env env, napi_callback_info info) {
 
 // napi_value GetCacheStats(napi_env env, napi_callback_info info) {
 //     napi_value result;
-//     napi_create_object(env, &result);  
-//     struct rusage usage;    
+//     napi_create_object(env, &result);
+//     struct rusage usage;
 //     getrusage(RUSAGE_SELF, &usage);
 //     napi_value maxrss;
 //     napi_create_int64(env, usage.ru_maxrss, &maxrss);
@@ -661,14 +680,14 @@ napi_value SetCacheSize(napi_env env, napi_callback_info info) {
     size_t argc = 1;
     napi_value args[1];
     int64_t new_size;
-    
+
     napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
     napi_status status;
     if (argc < 1) {
         napi_throw_type_error(env, nullptr, "Wrong number of arguments");
         return nullptr;
     }
-    
+
     status=napi_get_value_int64(env, args[0], &new_size);
     if(!CheckNapiStatus(env,status,"error loading int64")){
         return nullptr;
@@ -677,13 +696,13 @@ napi_value SetCacheSize(napi_env env, napi_callback_info info) {
         napi_throw_error(env, nullptr, "Cache size must be positive");
         return nullptr;
     }
-    
+
     DEBUG_LOG("Changing cache size from %zu to %lld", global_cache_size, new_size);
     size_t old_size = global_cache_size;
 
     global_cache_size = validate_cache_size(static_cast<size_t>(new_size));
     cache.resize(global_cache_size);  // Update cache size
-    
+
     napi_value result;
     napi_create_int64(env, global_cache_size, &result);
     return result;

package/test/santiy-async.test.js

@@ -167,5 +167,9 @@ describe('jq - async', () => {
         await expect(jq.execAsync({}, 'null | map(.+1)', {throwOnError: true})).rejects.toThrow("jq: error: Cannot iterate over null (null)");
         await expect(jq.execAsync({foo: "bar"}, '.foo + 1', {throwOnError: true})).rejects.toThrow("jq: error: string (\"bar\") and number (1) cannot be added");
     })
+
+    it('throw after timeout', async () => {
+      await expect(jq.execAsync({}, '[range(infinite)]', { timeoutSec: 1, throwOnError: true })).rejects.toThrow('timeout');
+    });
 })
 

package/deps/jq/sig/v1.7.1/jq-1.7.1.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEuNEmQbLVV2S3XP+l4aewjAfp7oYFAmV6CBUACgkQ4aewjAfp
-7oYyWw//fvi2FRb/BEHWj9WirM5aj9x3F2J1V3cLH97B9XeBFFw3slj7OtYxjb3o
-dm7GzMN9RKlQiI4MQ8nhrzePKeI6c6igURwylVxHgiRp2jENVxCDoZOydnfpEuPx
-lIPAmnGNW4mlYVLQSFRZmTunCSIISbtjO/TPxX2x41nBRdp9AhfUQ/MfR0Ioya4V
-UHx82ScB5jKejiZqLpEfbqNAonmpDkdM8OXV/wmCAy6ICXB70IjMPgjTWwl0NZdt
-9Ao4q2nZ44G1qOAsDWxIPqG1f6pjmwDE2k/ugpqOaVrXFKMbzdavReicGclw+sPy
-KbZ2k6hcz+GkUC/SulDTc6Opa0lonewPKaynRxhVsTX6wGu1M4tsjBSxF8/WlcWM
-aUdwDNv2WDsQSFL5AtHsH/V2aBBh6699yS9gz12wzT3qQXO34Gh7uSg8GCTwFhzV
-RQbP0oFLSZCGCtVR8zjJbZAHLu0xp25oZWI66HArbuqqQmCrx83FIMPE8rGvM1+4
-BeXuz+5gm8lG9JKxGB8klHRqP007XV5dLcYv01G+ITX0gpI+fNi9XTKDUR9W/LSO
-WP5P4LOH0N0nCvSPguaGSk5MdDs7SlD364uWfCkEReNDIxSUqNglk5U5vXzMi1Id
-hqC800IquRdKkPNolrJlu6IinSLcwld1EPR8HX596b5C0EQk/eU=
-=q9i8
------END PGP SIGNATURE-----

package/deps/jq/sig/v1.7.1/jq-1.7.1.zip.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEuNEmQbLVV2S3XP+l4aewjAfp7oYFAmV6CBYACgkQ4aewjAfp
-7obkuw/6Ahvl1j6xlRfZ3SwyWhQscwOBB1LWbIIVhJDOBVKv/XTe/Gx2x0kxMvZX
-jrEENi498I2mqQfie7Qw9ThhD8oWnvZLOsa2H1ijK7vcPjbVvPTuE4gvySWPhbIa
-tJid1kOBveJ6QJHptznfZzXhMuOUh3kS2lwyzKpru2Ke2hCkc5/qs45HjcRcsS9j
-XJTwr4QfCcPOuCeECdZM9I8s1JwmhUVNjyfcMXraFhl1d9lpb1K2pIUVMpxhp7i2
-jSRrw0p4a0IWuGnBLhb22PVjHK+vVFxpHblBSqsEYWBwxjIfClIhLgXpQ2SSwUkF
-hPRvqOwLemyz+cU3qz/O164td4v7m6DG4cqjpJd2JJepjZVaXs1Tuj18ENhuAdCu
-OIRefytdtrBh27cb125yMGMBa+qMgNsQSmpZIXuys4HLFyJWWPtxnU6zIlcnkM/O
-G/QEGMWbAdpVx8dIe2SLXrdNJUv1NXMiRTsmd9dmUkAbAb2lQy7rLLP6b8oJZwV+
-dsnB8cvftbLnKIAaLNzhfYieK7wtIZ1wNx5sJ+juz6EmpV2I0KdgbpNS2Qr2j6Dr
-/KZkaaDQtEX6RLuwQSU+m6odPYJvYryhGNKRgNJ5RTEpq0//sYeHUHsrzw2gOvQK
-R8l4Vj1lVbXKamwZj7c8WOS4gnNtMSvGCtSNTCbQNjMIdECVWHA=
-=X878
------END PGP SIGNATURE-----

package/deps/jq/sig/v1.7.1/jq-linux-amd64.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEuNEmQbLVV2S3XP+l4aewjAfp7oYFAmV6CBYACgkQ4aewjAfp
-7oZ5QRAArt5MOnrI0UNfLl8GjEWwFMxtSh2gz9ykRxdaIqS+xjmuJOs9hm9j4iZx
-Nbs3EJkRBgi8CUZZJm6JxRJKkeIBOFn3NSf5Gel9yQH5VPmAkQZCLpGJGt/SGJwb
-uzeOI7u+lW+BSMixc3cxTHJgIpQ/WrKd6FAzlqNL6RN8wH0F9b+UALgLoCzgdtSO
-km71GNeyP091uIImFvkfjM0jbbksvAIqOYvQO1ZjKLbMBeDrFih4Bp7OiDDRyt9I
-XrzMiv8Tg0bOamOpNYd/TwcgnEBtZhsfzwu83Yv+VPKAj/v1852SCJxbji2nO2H2
-JtbSg6FX+EnXWD1o9Pjii+31YW1U4C5TnimGsIwIzYKDjB7IFDDr89svj1pdSmv9
-kYidSYLu68vo+/nxEGpmapJr0wOIh8ysapsdE/mFlYa6bHn9ocAMj2Xs0BdYphrp
-t7ha0nEKKPxu+c96CTP9kH4eE4zTNTb/PY4y8r8p1QOoGteq9aGOUfLjnJeCX6lC
-LmT9Bn/9RkZwKJ7TjlHUQIhht2Tf5d/Mtbu68pODU5ruyWf8ZvTDB0m6Ib1A1qiE
-nRsNAil5z683Gr54xahSlRiwv0loITTquPEs6lHky+IdZL6MSHjRa5xPGVZ/TS6O
-1Y4wjE1Yogr7821VBV+aXHdDMzVDrJmYKdOdWQkqplXUODaid6k=
-=oOwG
------END PGP SIGNATURE-----