refactor: confusing timeout handling

.github/workflows/docs.yml

@@ -19,10 +19,10 @@ jobs:
         steps:
             -   uses: actions/checkout@v4
 
-            -   name: Use Node.js 20
+            -   name: Use Node.js 22
                 uses: actions/setup-node@v4
                 with:
-                    node-version: 20
+                    node-version: 22
 
             -   name: Enable corepack
                 run: |

.github/workflows/release.yml

@@ -33,7 +33,7 @@ jobs:
             matrix:
                 # We don't test on Windows as the tests are flaky
                 os: [ ubuntu-22.04 ]
-                node-version: [ 16, 18, 20, 22 ]
+                node-version: [ 22, 24 ]
 
         runs-on: ${{ matrix.os }}
 
@@ -94,17 +94,17 @@ jobs:
                     token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}
                     fetch-depth: 0
 
-            -   name: Use Node.js 20
+            -   name: Use Node.js 22
                 uses: actions/setup-node@v4
                 with:
-                    node-version: 20
+                    node-version: 22
 
             -   name: Enable corepack
                 run: |
                     corepack enable
                     corepack prepare yarn@stable --activate
 
-            -   name: Activate cache for Node.js 20
+            -   name: Activate cache for Node.js 22
                 uses: actions/setup-node@v4
                 with:
                     cache: 'yarn'
@@ -183,10 +183,10 @@ jobs:
                     token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}
                     fetch-depth: 0
 
-            -   name: Use Node.js 20
+            -   name: Use Node.js 22
                 uses: actions/setup-node@v4
                 with:
-                    node-version: 20
+                    node-version: 22
 
             -   name: Install jq
                 run: sudo apt-get install jq
@@ -196,7 +196,7 @@ jobs:
                     corepack enable
                     corepack prepare yarn@stable --activate
 
-            -   name: Activate cache for Node.js 20
+            -   name: Activate cache for Node.js 22
                 uses: actions/setup-node@v4
                 with:
                     cache: 'yarn'

.github/workflows/test-ci.yml

@@ -2,9 +2,9 @@ name: Check
 
 on:
     push:
-        branches: [ master, renovate/** ]
+        branches: [ master, v4, renovate/** ]
     pull_request:
-        branches: [ master ]
+        branches: [ master, v4 ]
 
 env:
     YARN_IGNORE_NODE: 1
@@ -23,7 +23,7 @@ jobs:
                 # tests on windows are extremely unstable
                 # os: [ ubuntu-22.04, windows-2019 ]
                 os: [ ubuntu-22.04 ]
-                node-version: [ 16, 18, 20, 22 ]
+                node-version: [ 22, 24 ]
 
         steps:
             -   name: Cancel Workflow Action
@@ -88,17 +88,17 @@ jobs:
             -   name: Checkout Source code
                 uses: actions/checkout@v4
 
-            -   name: Use Node.js 20
+            -   name: Use Node.js 22
                 uses: actions/setup-node@v4
                 with:
-                    node-version: 20
+                    node-version: 22
 
             -   name: Enable corepack
                 run: |
                     corepack enable
                     corepack prepare yarn@stable --activate
 
-            -   name: Activate cache for Node.js 20
+            -   name: Activate cache for Node.js 22
                 uses: actions/setup-node@v4
                 with:
                     cache: 'yarn'
@@ -132,17 +132,17 @@ jobs:
             -   name: Checkout repository
                 uses: actions/checkout@v4
 
-            -   name: Use Node.js 20
+            -   name: Use Node.js 22
                 uses: actions/setup-node@v4
                 with:
-                    node-version: 20
+                    node-version: 22
 
             -   name: Enable corepack
                 run: |
                     corepack enable
                     corepack prepare yarn@stable --activate
 
-            -   name: Activate cache for Node.js 20
+            -   name: Activate cache for Node.js 22
                 uses: actions/setup-node@v4
                 with:
                     cache: 'yarn'
@@ -167,25 +167,25 @@ jobs:
 
     release_next:
         name: Release @next
-        if: github.event_name == 'push' && contains(github.event.ref, 'master') && (!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, 'docs:'))
+        if: github.event_name == 'push' && contains(github.event.ref, 'v4') && (!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, 'docs:'))
         needs: build_and_test
         runs-on: ubuntu-22.04
 
         steps:
             -   name: Checkout repository
                 uses: actions/checkout@v4
 
-            -   name: Use Node.js 20
+            -   name: Use Node.js 22
                 uses: actions/setup-node@v4
                 with:
-                    node-version: 20
+                    node-version: 22
 
             -   name: Enable corepack
                 run: |
                     corepack enable
                     corepack prepare yarn@stable --activate
 
-            -   name: Activate cache for Node.js 20
+            -   name: Activate cache for Node.js 22
                 uses: actions/setup-node@v4
                 with:
                     cache: 'yarn'
@@ -219,7 +219,7 @@ jobs:
                 run: |
                     git config --global user.name 'Apify Release Bot'
                     git config --global user.email '[email protected]'
-                    yarn turbo copy --force -- --canary --preid=beta
+                    yarn turbo copy --force -- --canary=major --preid=beta
                     git commit -am "chore: bump canary versions [skip ci]"
 
                     echo "access=public" > .npmrc
@@ -230,22 +230,22 @@ jobs:
                     GIT_USER: '[email protected]:${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}'
                     GH_TOKEN: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}
 
-            -   name: Collect versions for Docker images
-                id: versions
-                run: |
-                    crawlee=`node -p "require('./packages/crawlee/package.json').version"`
-                    echo "crawlee=$crawlee" >> $GITHUB_OUTPUT
-
-            -   name: Trigger Docker image builds
-                uses: peter-evans/repository-dispatch@v3
-                # Trigger next images only if we have something new pushed
-                if: steps.changed-packages.outputs.changed_packages != '0'
-                with:
-                    token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}
-                    repository: apify/apify-actor-docker
-                    event-type: build-node-images
-                    client-payload: >
-                        {
-                          "crawlee_version": "${{ steps.versions.outputs.crawlee }}",
-                          "release_tag": "beta"
-                        }
+#            -   name: Collect versions for Docker images
+#                id: versions
+#                run: |
+#                    crawlee=`node -p "require('./packages/crawlee/package.json').version"`
+#                    echo "crawlee=$crawlee" >> $GITHUB_OUTPUT
+#
+#            -   name: Trigger Docker image builds
+#                uses: peter-evans/repository-dispatch@v3
+#                # Trigger next images only if we have something new pushed
+#                if: steps.changed-packages.outputs.changed_packages != '0'
+#                with:
+#                    token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}
+#                    repository: apify/apify-actor-docker
+#                    event-type: build-node-images
+#                    client-payload: >
+#                        {
+#                          "crawlee_version": "${{ steps.versions.outputs.crawlee }}",
+#                          "release_tag": "beta"
+#                        }

.github/workflows/test-e2e.yml

@@ -29,17 +29,17 @@ jobs:
             -   name: Checkout repository
                 uses: actions/checkout@v4
 
-            -   name: Use Node.js 20
+            -   name: Use Node.js 22
                 uses: actions/setup-node@v4
                 with:
-                    node-version: 20
+                    node-version: 22
 
             -   name: Enable corepack
                 run: |
                     corepack enable
                     corepack prepare yarn@stable --activate
 
-            -   name: Activate cache for Node.js 20
+            -   name: Activate cache for Node.js 22
                 uses: actions/setup-node@v4
                 with:
                     cache: 'yarn'

docs/guides/configuration.mdx

@@ -94,7 +94,6 @@ Storage directories are purged by default. If set to `false` - local storage dir
 
 #### `CRAWLEE_CONTAINERIZED`
 
-This variable is only effective when the systemInfoV2 experiment is enabled.
 Changes how crawlee measures its CPU and Memory usage and limits. If unset, crawlee will determine if it is containerised using common features of containerized environments using the `isContainerized` utility function.
  - A file at `/.dockerenv`.
  - A file at `/proc/self/cgroup` containing `docker`.

docs/upgrading/upgrading_v4.md

@@ -0,0 +1,53 @@
+---
+id: upgrading-to-v4
+title: Upgrading to v4
+---
+
+import ApiLink from '@site/src/components/ApiLink';
+
+This page summarizes most of the breaking changes in Crawlee v4.
+
+## ECMAScript modules
+
+Crawlee v4 is a native ESM package now. It can be still consumed from a CJS project, as long as you use TypeScript and Node.js version that supports `require(esm)`.
+
+## Node 22+ required
+
+Support for older node versions was dropped.
+
+## TypeScript 5.8+ required
+
+Support for older TypeScript versions was dropped. Older versions might work too, but only if your project is also ESM.
+
+## Cheerio v1
+
+Previously, we kept the dependency on cheerio locked to the latest RC version, since there were many breaking changes introduced in v1.0. This release bumps cheerio to the stable v1. Also, we now use the default `parse5` internally.
+
+## Deprecated crawler options are removed
+
+The crawler following options are removed:
+
+- `handleRequestFunction` -> `requestHandler`
+- `handlePageFunction` -> `requestHandler`
+- `handleRequestTimeoutSecs` -> `requestHandlerTimeoutSecs`
+- `handleFailedRequestFunction` -> `failedRequestHandler`
+
+## Crawling context no longer includes Error for failed requests
+
+The crawling context no longer includes the `Error` object for failed requests. Use the second parameter of the `errorHandler` or `failedRequestHandler` callbacks to access the error.
+
+## Crawling context is strictly typed
+
+Previously, the crawling context extended a `Record` type, allowing to access any property. This was changed to a strict type, which means that you can only access properties that are defined in the context.
+
+## `additionalBlockedStatusCodes` parameter is removed
+
+`additionalBlockedStatusCodes` parameter of `Session.retireOnBlockedStatusCodes` method is removed. Use the `blockedStatusCodes` crawler option instead.
+
+## Remove `experimentalContainers` option
+
+This experimental option relied on an outdated manifest version for browser extensions, it is not possible to achieve this with the currently supported versions.
+
+## Available resource detection
+
+In v3, we introduced a new way to detect available resources for the crawler, available via `systemInfoV2` flag. In v4, this is the default way to detect available resources. The old way is removed completely together with the `systemInfoV2` flag.