Merge branch 'master' into feat/enum-suggested-values

mfori · web-flow · commit bbb2b89ead13 · 2025-11-18T15:44:39.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,12 +13,12 @@ package | version | changelog
 `@apify/dummy-package-for-testing` | 2.2.0 | [CHANGELOG](./packages/dummy/CHANGELOG.md)
 `@apify/git` | 2.1.4 | [CHANGELOG](./packages/git/CHANGELOG.md)
 `@apify/image_proxy_client` | 2.0.3 | [CHANGELOG](./packages/image_proxy_client/CHANGELOG.md)
-`@apify/input_schema` | 3.23.8 | [CHANGELOG](./packages/input_schema/CHANGELOG.md)
-`@apify/input_secrets` | 1.2.14 | [CHANGELOG](./packages/input_secrets/CHANGELOG.md)
+`@apify/input_schema` | 3.23.10 | [CHANGELOG](./packages/input_schema/CHANGELOG.md)
+`@apify/input_secrets` | 1.2.16 | [CHANGELOG](./packages/input_secrets/CHANGELOG.md)
 `@apify/json_schemas` | 0.7.0 | [CHANGELOG](./packages/json_schemas/CHANGELOG.md)
 `@apify/log` | 2.5.26 | [CHANGELOG](./packages/log/CHANGELOG.md)
-`@apify/markdown` | 3.0.38 | [CHANGELOG](./packages/markdown/CHANGELOG.md)
+`@apify/markdown` | 3.0.40 | [CHANGELOG](./packages/markdown/CHANGELOG.md)
 `@apify/payment_qr_codes` | 0.2.1 | [CHANGELOG](./packages/payment_qr_codes/CHANGELOG.md)
 `@apify/pseudo_url` | 2.0.67 | [CHANGELOG](./packages/pseudo_url/CHANGELOG.md)
 `@apify/timeout` | 0.3.2 | [CHANGELOG](./packages/timeout/CHANGELOG.md)
-`@apify/utilities` | 2.23.0 | [CHANGELOG](./packages/utilities/CHANGELOG.md)
+`@apify/utilities` | 2.23.2 | [CHANGELOG](./packages/utilities/CHANGELOG.md)
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/input_schema/CHANGELOG.md b/packages/input_schema/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.23.10](https://github.com/apify/apify-shared-js/compare/@apify/input_schema@3.23.9...@apify/input_schema@3.23.10) (2025-11-18)
+
+**Note:** Version bump only for package @apify/input_schema
+
+
+
+
+
+## [3.23.9](https://github.com/apify/apify-shared-js/compare/@apify/input_schema@3.23.8...@apify/input_schema@3.23.9) (2025-11-18)
+
+**Note:** Version bump only for package @apify/input_schema
+
+
+
+
+
 ## [3.23.8](https://github.com/apify/apify-shared-js/compare/@apify/input_schema@3.23.5...@apify/input_schema@3.23.8) (2025-11-11)
 
 **Note:** Version bump only for package @apify/input_schema
diff --git a/packages/input_schema/package.json b/packages/input_schema/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@apify/input_schema",
-    "version": "3.23.8",
+    "version": "3.23.10",
     "description": "Tools and constants shared across Apify projects.",
     "main": "./dist/cjs/index.cjs",
     "module": "./dist/esm/index.mjs",
@@ -49,7 +49,7 @@
     },
     "dependencies": {
         "@apify/consts": "^2.47.0",
-        "@apify/input_secrets": "^1.2.14",
+        "@apify/input_secrets": "^1.2.16",
         "@apify/json_schemas": "^0.7.0",
         "acorn-loose": "^8.4.0",
         "countries-list": "^3.0.0"
diff --git a/packages/input_secrets/CHANGELOG.md b/packages/input_secrets/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.16](https://github.com/apify/apify-shared-js/compare/@apify/input_secrets@1.2.15...@apify/input_secrets@1.2.16) (2025-11-18)
+
+**Note:** Version bump only for package @apify/input_secrets
+
+
+
+
+
+## [1.2.15](https://github.com/apify/apify-shared-js/compare/@apify/input_secrets@1.2.14...@apify/input_secrets@1.2.15) (2025-11-18)
+
+**Note:** Version bump only for package @apify/input_secrets
+
+
+
+
+
 ## [1.2.14](https://github.com/apify/apify-shared-js/compare/@apify/input_secrets@1.2.11...@apify/input_secrets@1.2.14) (2025-11-11)
 
 **Note:** Version bump only for package @apify/input_secrets
diff --git a/packages/input_secrets/package.json b/packages/input_secrets/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@apify/input_secrets",
-    "version": "1.2.14",
+    "version": "1.2.16",
     "description": "Package to encrypt and decrypt apify actor input secrets.",
     "main": "./dist/cjs/index.cjs",
     "module": "./dist/esm/index.mjs",
@@ -45,7 +45,7 @@
     },
     "dependencies": {
         "@apify/log": "^2.5.26",
-        "@apify/utilities": "^2.23.0",
+        "@apify/utilities": "^2.23.2",
         "ow": "^0.28.2"
     }
 }
diff --git a/packages/markdown/CHANGELOG.md b/packages/markdown/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.40](https://github.com/apify/apify-shared-js/compare/@apify/markdown@3.0.39...@apify/markdown@3.0.40) (2025-11-18)
+
+**Note:** Version bump only for package @apify/markdown
+
+
+
+
+
+## [3.0.39](https://github.com/apify/apify-shared-js/compare/@apify/markdown@3.0.38...@apify/markdown@3.0.39) (2025-11-18)
+
+**Note:** Version bump only for package @apify/markdown
+
+
+
+
+
 ## [3.0.38](https://github.com/apify/apify-shared-js/compare/@apify/markdown@3.0.35...@apify/markdown@3.0.38) (2025-11-11)
 
 **Note:** Version bump only for package @apify/markdown
diff --git a/packages/markdown/package.json b/packages/markdown/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@apify/markdown",
-    "version": "3.0.38",
+    "version": "3.0.40",
     "description": "Tools and constants shared across Apify projects.",
     "main": "./dist/cjs/index.cjs",
     "module": "./dist/esm/index.mjs",
@@ -49,7 +49,7 @@
     },
     "dependencies": {
         "@apify/consts": "^2.47.0",
-        "@apify/utilities": "^2.23.0",
+        "@apify/utilities": "^2.23.2",
         "marked": "^15.0.0",
         "match-all": "^1.2.6"
     },
diff --git a/packages/utilities/CHANGELOG.md b/packages/utilities/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.23.2](https://github.com/apify/apify-shared-js/compare/@apify/utilities@2.23.1...@apify/utilities@2.23.2) (2025-11-18)
+
+
+### Bug Fixes
+
+* improve `createHmacSignatureAsync` compatibility with worker-based environments ([#573](https://github.com/apify/apify-shared-js/issues/573)) ([3689d59](https://github.com/apify/apify-shared-js/commit/3689d59514c1183854509fff4133d2da784805bc)), closes [#570](https://github.com/apify/apify-shared-js/issues/570)
+
+
+
+
+
+## [2.23.1](https://github.com/apify/apify-shared-js/compare/@apify/utilities@2.23.0...@apify/utilities@2.23.1) (2025-11-18)
+
+
+### Bug Fixes
+
+* dynamic `require` imports for `crypto` package in HMAC signature function ([#572](https://github.com/apify/apify-shared-js/issues/572)) ([1c55aa5](https://github.com/apify/apify-shared-js/commit/1c55aa56f1e34b99933688ac911812f78906f913))
+
+
+
+
+
 # [2.23.0](https://github.com/apify/apify-shared-js/compare/@apify/utilities@2.20.3...@apify/utilities@2.23.0) (2025-11-11)
 
 
diff --git a/packages/utilities/package.json b/packages/utilities/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@apify/utilities",
-    "version": "2.23.0",
+    "version": "2.23.2",
     "description": "Tools and constants shared across Apify projects.",
     "main": "./dist/cjs/index.cjs",
     "module": "./dist/esm/index.mjs",
diff --git a/packages/utilities/src/hmac.ts b/packages/utilities/src/hmac.ts
@@ -37,11 +37,30 @@ export function createHmacSignature(secretKey: string, message: string): string
     return encodeBase62(BigInt(`0x${signature}`));
 }
 
-let webcrypto = globalThis.crypto?.subtle;
+let subtleCrypto = globalThis.crypto?.subtle;
 
-async function ensureCryptoSubtleExists() {
-    // this might happen in Node.js versions < 19
-    webcrypto ??= (await import('node:crypto')).webcrypto.subtle as typeof webcrypto;
+async function ensureSubtleCryptoExists() {
+    if (!subtleCrypto) {
+        try {
+            // eslint-disable-next-line @typescript-eslint/no-require-imports, global-require -- Backward compatibility for Node.js versions < 19
+            subtleCrypto = require('node:crypto')?.webcrypto?.subtle;
+            if (subtleCrypto) return;
+        } catch {
+            // Ignore require error
+        }
+
+        try {
+            subtleCrypto = (await import('node:crypto'))?.webcrypto?.subtle as SubtleCrypto;
+        } catch {
+            // Ignore import error
+        }
+
+        if (!subtleCrypto) {
+            throw new Error(`SubtleCrypto is not available in this environment.
+Please ensure you're running in an environment that supports Web Crypto API,
+or submit an issue to https://github.com/apify/apify-shared-js so we can help you further.`);
+        }
+    }
 }
 
 /**
@@ -53,18 +72,18 @@ async function ensureCryptoSubtleExists() {
  * @returns Promise<string>
  */
 export async function createHmacSignatureAsync(secretKey: string, message: string): Promise<string> {
-    await ensureCryptoSubtleExists();
+    await ensureSubtleCryptoExists();
     const encoder = new TextEncoder();
 
-    const key = await webcrypto.importKey(
+    const key = await subtleCrypto.importKey(
         'raw',
         encoder.encode(secretKey),
         { name: 'HMAC', hash: 'SHA-256' },
         false,
         ['sign'],
     );
 
-    const signatureBuffer = await webcrypto.sign(
+    const signatureBuffer = await subtleCrypto.sign(
         'HMAC',
         key,
         encoder.encode(message),

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@apify/input_secrets",`
`3`		`- "version": "1.2.14",`
	`3`	`+ "version": "1.2.16",`
`4`	`4`	`"description": "Package to encrypt and decrypt apify actor input secrets.",`
`5`	`5`	`"main": "./dist/cjs/index.cjs",`
`6`	`6`	`"module": "./dist/esm/index.mjs",`
`@@ -45,7 +45,7 @@`
`45`	`45`	`},`
`46`	`46`	`"dependencies": {`
`47`	`47`	`"@apify/log": "^2.5.26",`
`48`		`- "@apify/utilities": "^2.23.0",`
	`48`	`+ "@apify/utilities": "^2.23.2",`
`49`	`49`	`"ow": "^0.28.2"`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@apify/utilities",`
`3`		`- "version": "2.23.0",`
	`3`	`+ "version": "2.23.2",`
`4`	`4`	`"description": "Tools and constants shared across Apify projects.",`
`5`	`5`	`"main": "./dist/cjs/index.cjs",`
`6`	`6`	`"module": "./dist/esm/index.mjs",`