Fixed crypto import and isNodeStream function (#79)

* Fixed crypto import and isNodeStream function * The same version * fix globalThis.crypto * return ts-ignore
opentdf · Aug 25, 2022 · f24b115 · f24b115
1 parent 7f189f0
commit f24b115
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/facade/FileClient.ts b/lib/facade/FileClient.ts
@@ -14,7 +14,7 @@ interface FileClientConfig {
 }
 
 function isNodeStream(source: InputSource): source is NodeJS.ReadableStream {
-  return Object.prototype.hasOwnProperty.call(source, 'pipe');
+  return typeof (source as NodeJS.ReadableStream)?.pipe === 'function';
 }
 
 export class FileClient {

diff --git a/lib/src/index.node.ts b/lib/src/index.node.ts
@@ -1,6 +1,6 @@
 import { NanoTDFClient, NanoTDFDatasetClient, AuthProviders, version, clientType } from './index';
 import fetch from 'node-fetch';
-import crypto from 'crypto';
+import { webcrypto as crypto } from 'node:crypto';
 
 globalThis.crypto = crypto as unknown as Crypto;
 globalThis.fetch = fetch as typeof globalThis.fetch;

diff --git a/lib/src/nanotdf-crypto/getCryptoLib.ts b/lib/src/nanotdf-crypto/getCryptoLib.ts
@@ -11,5 +11,5 @@ export default function getCryptoLib(): SubtleCrypto {
     return subtleCrypto;
   }
 
-  return globalThis.crypto.webcrypto.subtle;
+  return globalThis.crypto.subtle;
 }