Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cli-tools/tsconfig.node.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
],
"references": [
{ "path": "../utils/tsconfig.node.json" },
{ "path": "../sdk/tsconfig.node.json" }
{ "path": "../sdk" }
]
}
2 changes: 1 addition & 1 deletion packages/node/tsconfig.jest.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"references": [
{ "path": "../utils/tsconfig.node.json" },
{ "path": "../test-utils/tsconfig.node.json" },
{ "path": "../sdk/tsconfig.node.json" }
{ "path": "../sdk" }
]
}
2 changes: 1 addition & 1 deletion packages/node/tsconfig.node.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"references": [
{ "path": "../utils/tsconfig.node.json" },
{ "path": "../test-utils/tsconfig.node.json" },
{ "path": "../sdk/tsconfig.node.json" }
{ "path": "../sdk" }
]
}
2 changes: 1 addition & 1 deletion packages/sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"scripts": {
"prebuild": "node bin/generate-config-validator.js && ./proto.sh",
"postbuild": "./scripts/postbuild.sh && bash fix-esm.sh",
"build": "tsc --build ./tsconfig.node.json",
"build": "tsc -b",
"build-browser": "npm run build-browser-development && npm run build-browser-production",
"build-browser-development": "NODE_ENV=development webpack --mode=development --progress",
"build-browser-production": "NODE_ENV=production webpack --mode=production --progress",
Expand Down
7 changes: 7 additions & 0 deletions packages/sdk/src/encryption/RSAKeyPair.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/**
* @todo This file contains code for both browser and Node.js environments. Consider
* making it environment-specific (using separate files or conditional exports), and
* remove the following "dom" lib reference when done.
*/
/// <reference lib="dom" />

import crypto from 'crypto'
import { promisify } from 'util'
import { KeyExchangeKeyPair } from './KeyExchangeKeyPair'
Expand Down
3 changes: 2 additions & 1 deletion packages/sdk/src/identity/ECDSAKeyPairIdentity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { hexToBinary, EcdsaSecp256r1 } from '@streamr/utils'
import { KeyPairIdentity } from './KeyPairIdentity'
import { SignatureType } from '@streamr/trackerless-network'
import { StrictStreamrClientConfig } from '../Config'
import type { webcrypto } from 'crypto'

const signingUtil = new EcdsaSecp256r1()

Expand All @@ -10,7 +11,7 @@ const signingUtil = new EcdsaSecp256r1()
*/
export class ECDSAKeyPairIdentity extends KeyPairIdentity {

private cachedJWK: JsonWebKey | undefined
private cachedJWK: webcrypto.JsonWebKey | undefined

assertValidKeyPair(): void {
signingUtil.assertValidKeyPair(this.publicKey, this.privateKey)
Expand Down
17 changes: 7 additions & 10 deletions packages/sdk/tsconfig.jest.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
{
"extends": "../../tsconfig.jest.json",
"compilerOptions": {
"noEmit": true,
"lib": ["es2021", "dom"],
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"resolveJsonModule": true,
"noImplicitOverride": false
},
"include": [
"package.json",
"bin",
"src",
"src/**/*.json",
"bin",
"test",
"test/**/*.json",
"scripts"
"test/**/*.json"
],
"exclude": [
"test/exports",
"src/exports-esm.mjs"
"src/exports-esm.mjs",
"test/exports"
],
"references": [
{ "path": "../test-utils/tsconfig.node.json" },
{ "path": "../dht/tsconfig.node.json" },
{ "path": "../trackerless-network/tsconfig.node.json" }
{ "path": "../trackerless-network/tsconfig.node.json" },
{ "path": "../utils/tsconfig.node.json" },
{ "path": "../proto-rpc/tsconfig.node.json" }
]
}
1 change: 1 addition & 0 deletions packages/sdk/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"composite": true
},
"references": [
{ "path": "./tsconfig.node.json" },
{ "path": "./tsconfig.jest.json" }
]
}
9 changes: 4 additions & 5 deletions packages/sdk/tsconfig.node.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,22 @@
"compilerOptions": {
"outDir": "dist",
"declarationDir": "dist/types",
"lib": ["es2021", "dom"],
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"resolveJsonModule": true,
"noImplicitOverride": false
},
"include": [
"bin",
"src",
"src/**/*.json"
],
"exclude": [
"src/exports-esm.mjs"
],
"references": [
{ "path": "../test-utils/tsconfig.node.json" },
{ "path": "../trackerless-network/tsconfig.node.json" },
{ "path": "../dht/tsconfig.node.json" }

{ "path": "../dht/tsconfig.node.json" },
{ "path": "../utils/tsconfig.node.json" },
{ "path": "../proto-rpc/tsconfig.node.json" }
]
}
Loading