fixes for safari and firefox

lib/package.json

@@ -57,6 +57,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.75.0",
     "axios": "^0.26.1",
+    "browser-fs-access": "^0.30.2",
     "buffer-crc32": "^0.2.13",
     "events": "^3.3.0",
     "jose": "^4.8.1",

lib/tdf3/src/client/BrowserTdfSteam.js

@@ -1,18 +1,18 @@
-import streamSaver from 'streamsaver';
-import { WritableStream } from 'web-streams-polyfill/ponyfill';
 import ReadableStream from './DecoratedReadableStream';
+import streamSaver from 'streamsaver';
+import { fileSave } from 'browser-fs-access';
 
 class BrowserTdfStream extends ReadableStream {
   static convertToWebStream() {
-    throw new Error('Please use Web Streams in browser environment')
+    throw new Error('Please use Web Streams in browser environment');
   }
 
   /**
    * Dump the stream content to a string. This will consume the stream.
    * @return {string} - the plaintext in string form.
    */
   async toString() {
-    const results = await this.toBuffer()
+    const results = await this.toBuffer();
     return results.toString('utf8');
   }
 
@@ -47,23 +47,24 @@ class BrowserTdfStream extends ReadableStream {
    * Dump the stream content to a local file. This will consume the stream.
    *
    * @param {string} filepath - the path of the local file to write plaintext to.
-   * @param {string} encoding - the charset encoding to use. Defaults to utf-8.
    */
-  async toFile(filepath, encoding) {
-    try {
-      new streamSaver.WritableStream();
-    } catch (e) {
-      // Conditionally add ponyfill for Firefox
-      streamSaver.WritableStream = WritableStream;
-    }
-
+  async toFile(filepath) {
     const fileName = filepath || 'download.tdf';
 
+    const isFirefox = typeof InstallTrigger !== 'undefined';
+
+    if (isFirefox) {
+      return await fileSave(new Response(this), {
+        fileName: fileName,
+        extensions: [`.${filepath.split('.').pop()}`],
+      });
+    }
+
     const fileStream = streamSaver.createWriteStream(fileName, {
       ...(this.contentLength && { size: this.contentLength }),
     });
 
-    if (WritableStream && this.pipeTo) {
+    if (WritableStream) {
       return this.pipeTo(fileStream);
     }
 
@@ -78,4 +79,4 @@ class BrowserTdfStream extends ReadableStream {
   }
 }
 
-export default BrowserTdfStream
+export default BrowserTdfStream;

lib/tdf3/src/client/DecoratedReadableStream.js

@@ -9,6 +9,14 @@ class DecoratedReadableStream extends ReadableStream {
     const ee = new EventEmitter();
     this.on = ee.on;
     this.emit = ee.emit;
+
+    const isSafari =
+      /constructor/i.test(window.HTMLElement) ||
+      window?.safari?.pushNotification?.toString() === '[object SafariRemoteNotification]';
+
+    if (isSafari) {
+      Object.setPrototypeOf(this, DecoratedReadableStream.prototype);
+    }
   }
 
   /**

lib/webpack.config.js

@@ -6,9 +6,7 @@ const prodPattern = /^prod/i;
 
 module.exports = (env, argv) => {
   const isProd = prodPattern.test(argv.mode) || prodPattern.test(process.env.NODE_ENV);
-  const mode = (isProd)
-    ? 'production'
-    : 'development';
+  const mode = isProd ? 'production' : 'development';
   // CRA fails to run build with mode: 'production'
 
   const clientConfig = {
@@ -27,14 +25,14 @@ module.exports = (env, argv) => {
     },
     target: 'web',
     resolve: {
-      extensions: [ '.ts', '.tsx', '.js'],
+      extensions: ['.ts', '.tsx', '.js'],
       modules: ['src', 'node_modules'],
       fallback: {
         crypto: false,
         fs: false,
         constants: false,
         stream: false,
-      }
+      },
     },
     output: {
       publicPath: '',
@@ -63,7 +61,7 @@ module.exports = (env, argv) => {
     },
     target: 'node',
     resolve: {
-      extensions: [ '.ts', '.tsx', '.js'],
+      extensions: ['.ts', '.tsx', '.js'],
       modules: ['src', 'node_modules'],
     },
     output: {
@@ -89,7 +87,10 @@ module.exports = (env, argv) => {
       ...clientConfig.resolve,
       alias: {
         '@tdfStream': path.resolve(__dirname, '/tdf3/src/client/BrowserTdfSteam.js'),
-        "@runtimeConfig": path.resolve(__dirname, '/tdf3/src/utils/aws-lib-storage/runtimeConfig.browser'),
+        '@runtimeConfig': path.resolve(
+          __dirname,
+          '/tdf3/src/utils/aws-lib-storage/runtimeConfig.browser'
+        ),
       },
     },
     output: {
@@ -105,11 +106,11 @@ module.exports = (env, argv) => {
     resolve: {
       ...serverConfig.resolve,
       fallback: {
-        fetch: require.resolve('node-fetch')
+        fetch: require.resolve('node-fetch'),
       },
       alias: {
         '@tdfStream': path.resolve(__dirname, '/tdf3/src/client/NodeTdfStream.js'),
-        "@runtimeConfig": path.resolve(__dirname, '/tdf3/src/utils/aws-lib-storage/runtimeConfig'),
+        '@runtimeConfig': path.resolve(__dirname, '/tdf3/src/utils/aws-lib-storage/runtimeConfig'),
       },
     },
     output: {
@@ -118,10 +119,5 @@ module.exports = (env, argv) => {
     },
   };
 
-  return [
-    clientConfig,
-    serverConfig,
-    clientTdf3Config,
-    serverTdf3Config,
-  ];
+  return [clientConfig, serverConfig, clientTdf3Config, serverTdf3Config];
 };