From 23df651ac659d156d6421e7f416987750e9a4efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Roli=C5=84ski?= Date: Mon, 12 Jan 2026 12:42:44 +0100 Subject: [PATCH 1/3] =?UTF-8?q?`defaultAutoCertifierClientFactory`=20?= =?UTF-8?q?=E2=86=92=20`createDefaultAutocertifierClient`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...erClientFactory.ts => createDefaultAutocertifierClient.ts} | 2 +- .../dht/src/connection/websocket/AutoCertifierClientFacade.ts | 4 ++-- ...erClientFactory.ts => createDefaultAutocertifierClient.ts} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename packages/dht/src/browser/{defaultAutoCertifierClientFactory.ts => createDefaultAutocertifierClient.ts} (89%) rename packages/dht/src/nodejs/{defaultAutoCertifierClientFactory.ts => createDefaultAutocertifierClient.ts} (93%) diff --git a/packages/dht/src/browser/defaultAutoCertifierClientFactory.ts b/packages/dht/src/browser/createDefaultAutocertifierClient.ts similarity index 89% rename from packages/dht/src/browser/defaultAutoCertifierClientFactory.ts rename to packages/dht/src/browser/createDefaultAutocertifierClient.ts index aae07665f8..c35a20c620 100644 --- a/packages/dht/src/browser/defaultAutoCertifierClientFactory.ts +++ b/packages/dht/src/browser/createDefaultAutocertifierClient.ts @@ -1,7 +1,7 @@ import type { AutoCertifierClient } from '@streamr/autocertifier-client' import { ListeningRpcCommunicator } from '../transport/ListeningRpcCommunicator' -export const defaultAutoCertifierClientFactory = ( +export const createDefaultAutocertifierClient = ( _configFile: string, _autoCertifierUrl: string, _autoCertifierRpcCommunicator: ListeningRpcCommunicator, diff --git a/packages/dht/src/connection/websocket/AutoCertifierClientFacade.ts b/packages/dht/src/connection/websocket/AutoCertifierClientFacade.ts index 28c0442f0e..92851181da 100644 --- a/packages/dht/src/connection/websocket/AutoCertifierClientFacade.ts +++ b/packages/dht/src/connection/websocket/AutoCertifierClientFacade.ts @@ -5,7 +5,7 @@ import { import { ListeningRpcCommunicator } from '../../transport/ListeningRpcCommunicator' import { Logger, waitForEvent } from '@streamr/utils' import { ITransport } from '../../transport/ITransport' -import { defaultAutoCertifierClientFactory } from '@/defaultAutoCertifierClientFactory' +import { createDefaultAutocertifierClient } from '@/createDefaultAutocertifierClient' const START_TIMEOUT = 60 * 1000 @@ -40,7 +40,7 @@ export class AutoCertifierClientFacade { this.options = options this.rpcCommunicator = new ListeningRpcCommunicator(AUTO_CERTIFIER_SERVICE_ID, options.transport) this.autoCertifierClient = options.createClientFactory ? options.createClientFactory() - : defaultAutoCertifierClientFactory( + : createDefaultAutocertifierClient( options.configFile, options.url, this.rpcCommunicator, diff --git a/packages/dht/src/nodejs/defaultAutoCertifierClientFactory.ts b/packages/dht/src/nodejs/createDefaultAutocertifierClient.ts similarity index 93% rename from packages/dht/src/nodejs/defaultAutoCertifierClientFactory.ts rename to packages/dht/src/nodejs/createDefaultAutocertifierClient.ts index 50367d8c20..70c600f3cd 100644 --- a/packages/dht/src/nodejs/defaultAutoCertifierClientFactory.ts +++ b/packages/dht/src/nodejs/createDefaultAutocertifierClient.ts @@ -6,7 +6,7 @@ import { } from '@streamr/autocertifier-client' import { ListeningRpcCommunicator } from '../transport/ListeningRpcCommunicator' -export const defaultAutoCertifierClientFactory = ( +export const createDefaultAutocertifierClient = ( configFile: string, autoCertifierUrl: string, autoCertifierRpcCommunicator: ListeningRpcCommunicator, From a0f862180197d4b35a75153b3b87a8fed3b54d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Roli=C5=84ski?= Date: Mon, 12 Jan 2026 12:47:21 +0100 Subject: [PATCH 2/3] Use `utf8ToBinary` in `computeSha1` (DRY) --- packages/utils/src/browser/crypto.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/utils/src/browser/crypto.ts b/packages/utils/src/browser/crypto.ts index 70559b3648..b1115e1f0c 100644 --- a/packages/utils/src/browser/crypto.ts +++ b/packages/utils/src/browser/crypto.ts @@ -6,6 +6,7 @@ import { import aesModes from 'browserify-aes/modes' import { sha1 } from '@noble/hashes/legacy.js' import type { Transform } from 'readable-stream' +import { utf8ToBinary } from 'src/binaryUtils' export function getSubtle(): SubtleCrypto { const { crypto } = globalThis @@ -26,7 +27,7 @@ export function computeMd5(input: string): Buffer { } export function computeSha1(input: string): Buffer { - return Buffer.from(sha1(new TextEncoder().encode(input))) + return Buffer.from(sha1(utf8ToBinary(input))) } export type Jwk = JsonWebKey From a5e8dc991d0268892b658ce3e7422ac604eb3646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mariusz=20Roli=C5=84ski?= Date: Mon, 12 Jan 2026 13:11:42 +0100 Subject: [PATCH 3/3] Fix imports --- packages/utils/src/browser/crypto.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/utils/src/browser/crypto.ts b/packages/utils/src/browser/crypto.ts index b1115e1f0c..de13cf1715 100644 --- a/packages/utils/src/browser/crypto.ts +++ b/packages/utils/src/browser/crypto.ts @@ -6,7 +6,7 @@ import { import aesModes from 'browserify-aes/modes' import { sha1 } from '@noble/hashes/legacy.js' import type { Transform } from 'readable-stream' -import { utf8ToBinary } from 'src/binaryUtils' +import { utf8ToBinary } from '../binaryUtils' export function getSubtle(): SubtleCrypto { const { crypto } = globalThis