fix(core): update

dist_ts/smartarchive.classes.smartarchive.d.ts

@@ -21,4 +21,10 @@ export declare class SmartArchive {
      * extracts to Observable
      */
     extractArchiveFromUrlToObservable(urlArg: string): Promise<plugins.smartrx.rxjs.ReplaySubject<plugins.smartfile.Smartfile>>;
+    extractArchiveFromUrlToStream(): Promise<void>;
+    extractArchiveFromFilePathToStream(): Promise<void>;
+    extractArchiveFromStreamToStream(): Promise<void>;
+    packFromStreamToStream(): Promise<void>;
+    packFromDirPathToStream(): Promise<void>;
+    packFromDirPathToFs(): Promise<void>;
 }

dist_ts/smartarchive.classes.smartarchive.js

@@ -1,6 +1,5 @@
 import * as plugins from './smartarchive.plugins.js';
 import * as paths from './smartarchive.paths.js';
-import 'tar';
 export class SmartArchive {
     constructor() { }
     /**
@@ -22,22 +21,13 @@ export class SmartArchive {
      * @param targetDir
      */
     async extractArchiveFromFilePathToFs(filePathArg, targetDir) {
-        const parsedPath = plugins.path.parse(filePathArg);
+        console.log(`extracting ${filePathArg}`);
-        switch (parsedPath.ext) {
-            case '.tgz':
-                console.log(`detected a .tgz archive`);
-                await plugins.tar.extract({
-                    file: filePathArg,
-                    cwd: targetDir,
-                });
-                break;
-        }
     }
     /**
      * extracts to Observable
      */
     async extractArchiveFromBufferToObservable(bufferArg) {
-        const intake = new plugins.streamfunction.Intake();
+        const intake = new plugins.smartstream.StreamIntake();
         const replaySubject = new plugins.smartrx.rxjs.ReplaySubject();
         const readableStream = intake.getReadableStream();
         const extractPipeStop = plugins.tarStream.extract();
@@ -55,7 +45,7 @@ export class SmartArchive {
                 replaySubject.next(new plugins.smartfile.Smartfile({
                     base: null,
                     contentBuffer: fileBuffer,
-                    path: `./${header.name}`
+                    path: `${header.name}`
                 }));
                 next();
             });
@@ -80,5 +70,18 @@ export class SmartArchive {
         const replaySubject = this.extractArchiveFromBufferToObservable(response.body);
         return replaySubject;
     }
+    // TODO
+    async extractArchiveFromUrlToStream() {
+    }
+    // TODO
+    async extractArchiveFromFilePathToStream() { }
+    // TODO
+    async extractArchiveFromStreamToStream() { }
+    // TODO
+    async packFromStreamToStream() { }
+    // TODO
+    async packFromDirPathToStream() { }
+    // TODO
+    async packFromDirPathToFs() { }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhcmNoaXZlLmNsYXNzZXMuc21hcnRhcmNoaXZlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhcmNoaXZlLmNsYXNzZXMuc21hcnRhcmNoaXZlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sMkJBQTJCLENBQUM7QUFDckQsT0FBTyxLQUFLLEtBQUssTUFBTSx5QkFBeUIsQ0FBQztBQUNqRCxPQUF3QixLQUFLLENBQUM7QUFFOUIsTUFBTSxPQUFPLFlBQVk7SUFFdkIsZ0JBQWUsQ0FBQztJQUVoQjs7T0FFRztJQUNJLEtBQUssQ0FBQyx5QkFBeUIsQ0FBQyxNQUFjLEVBQUUsU0FBaUI7UUFDdEUsTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDOUMsTUFBTSxjQUFjLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxVQUFVLENBQUMsR0FBRyxDQUFDO1FBQ2xFLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxxQ0FBcUM7UUFDckYsTUFBTSxZQUFZLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsRUFBRSxjQUFjLENBQUMsQ0FBQztRQUN2RSxNQUFNLGlCQUFpQixHQUFHLENBQUMsTUFBTSxPQUFPLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztRQUM5RSxNQUFNLE9BQU8sQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxZQUFZLENBQUMsQ0FBQztRQUNyRSxNQUFNLElBQUksQ0FBQyw4QkFBOEIsQ0FBQyxZQUFZLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDbkUsTUFBTSxPQUFP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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhcmNoaXZlLmNsYXNzZXMuc21hcnRhcmNoaXZlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhcmNoaXZlLmNsYXNzZXMuc21hcnRhcmNoaXZlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sMkJBQTJCLENBQUM7QUFDckQsT0FBTyxLQUFLLEtBQUssTUFBTSx5QkFBeUIsQ0FBQztBQUVqRCxNQUFNLE9BQU8sWUFBWTtJQUV2QixnQkFBZSxDQUFDO0lBRWhCOztPQUVHO0lBQ0ksS0FBSyxDQUFDLHlCQUF5QixDQUFDLE1BQWMsRUFBRSxTQUFpQjtRQUN0RSxNQUFNLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUM5QyxNQUFNLGNBQWMsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLEdBQUcsRUFBRSxHQUFHLFVBQVUsQ0FBQyxHQUFHLENBQUM7UUFDbEUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLHFDQUFxQztRQUNyRixNQUFNLFlBQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxFQUFFLGNBQWMsQ0FBQyxDQUFDO1FBQ3ZFLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO1FBQzlFLE1BQU0sT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGlCQUFpQixFQUFFLFlBQVksQ0FBQyxDQUFDO1FBQ3JFLE1BQU0sSUFBSSxDQUFDLDhCQUE4QixDQUFDLFlBQVksRUFBRSxTQUFTLENBQUMsQ0FBQztRQUNuRSxNQUFNLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxD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

dist_ts/smartarchive.plugins.d.ts

@@ -4,9 +4,9 @@ import * as smartfile from '@pushrocks/smartfile';
 import * as smartpath from '@pushrocks/smartpath';
 import * as smartrequest from '@pushrocks/smartrequest';
 import * as smartunique from '@pushrocks/smartunique';
-import * as streamfunction from '@pushrocks/streamfunction';
+import * as smartstream from '@pushrocks/smartstream';
 import * as smartrx from '@pushrocks/smartrx';
-export { smartfile, smartpath, smartrequest, smartunique, streamfunction, smartrx };
+export { smartfile, smartpath, smartrequest, smartunique, smartstream, smartrx };
 import gunzipMaybe from 'gunzip-maybe';
 import tar from 'tar';
 import tarStream from 'tar-stream';

dist_ts/smartarchive.plugins.js

@@ -6,13 +6,13 @@ import * as smartfile from '@pushrocks/smartfile';
 import * as smartpath from '@pushrocks/smartpath';
 import * as smartrequest from '@pushrocks/smartrequest';
 import * as smartunique from '@pushrocks/smartunique';
-import * as streamfunction from '@pushrocks/streamfunction';
+import * as smartstream from '@pushrocks/smartstream';
 import * as smartrx from '@pushrocks/smartrx';
-export { smartfile, smartpath, smartrequest, smartunique, streamfunction, smartrx };
+export { smartfile, smartpath, smartrequest, smartunique, smartstream, smartrx };
 // third party scope
 import gunzipMaybe from 'gunzip-maybe';
 // @ts-ignore
 import tar from 'tar';
 import tarStream from 'tar-stream';
 export { gunzipMaybe, tar, tarStream };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhcmNoaXZlLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFyY2hpdmUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxvQkFBb0I7QUFDcEIsT0FBTyxLQUFLLElBQUksTUFBTSxNQUFNLENBQUM7QUFFN0IsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDO0FBRWhCLG1CQUFtQjtBQUNuQixPQUFPLEtBQUssU0FBUyxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sS0FBSyxTQUFTLE1BQU0sc0JBQXNCLENBQUM7QUFDbEQsT0FBTyxLQUFLLFlBQVksTUFBTSx5QkFBeUIsQ0FBQztBQUN4RCxPQUFPLEtBQUssV0FBVyxNQUFNLHdCQUF3QixDQUFDO0FBQ3RELE9BQU8sS0FBSyxjQUFjLE1BQU0sMkJBQTJCLENBQUM7QUFDNUQsT0FBTyxLQUFLLE9BQU8sTUFBTSxvQkFBb0IsQ0FBQztBQUU5QyxPQUFPLEVBQUUsU0FBUyxFQUFFLFNBQVMsRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFFLGNBQWMsRUFBRSxPQUFPLEVBQUUsQ0FBQztBQUVwRixvQkFBb0I7QUFDcEIsT0FBTyxXQUFXLE1BQU0sY0FBYyxDQUFDO0FBRXZDLGFBQWE7QUFDYixPQUFPLEdBQUcsTUFBTSxLQUFLLENBQUM7QUFDdEIsT0FBTyxTQUFTLE1BQU0sWUFBWSxDQUFDO0FBRW5DLE9BQU8sRUFBRSxXQUFXLEVBQUUsR0FBRyxFQUFFLFNBQVMsRUFBRSxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhcmNoaXZlLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGFyY2hpdmUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxvQkFBb0I7QUFDcEIsT0FBTyxLQUFLLElBQUksTUFBTSxNQUFNLENBQUM7QUFFN0IsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDO0FBRWhCLG1CQUFtQjtBQUNuQixPQUFPLEtBQUssU0FBUyxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sS0FBSyxTQUFTLE1BQU0sc0JBQXNCLENBQUM7QUFDbEQsT0FBTyxLQUFLLFlBQVksTUFBTSx5QkFBeUIsQ0FBQztBQUN4RCxPQUFPLEtBQUssV0FBVyxNQUFNLHdCQUF3QixDQUFDO0FBQ3RELE9BQU8sS0FBSyxXQUFXLE1BQU0sd0JBQXdCLENBQUM7QUFDdEQsT0FBTyxLQUFLLE9BQU8sTUFBTSxvQkFBb0IsQ0FBQztBQUU5QyxPQUFPLEVBQUUsU0FBUyxFQUFFLFNBQVMsRUFBRSxZQUFZLEVBQUUsV0FBVyxFQUFFLFdBQVcsRUFBRSxPQUFPLEVBQUUsQ0FBQztBQUVqRixvQkFBb0I7QUFDcEIsT0FBTyxXQUFXLE1BQU0sY0FBYyxDQUFDO0FBRXZDLGFBQWE7QUFDYixPQUFPLEdBQUcsTUFBTSxLQUFLLENBQUM7QUFDdEIsT0FBTyxTQUFTLE1BQU0sWUFBWSxDQUFDO0FBRW5DLE9BQU8sRUFBRSxXQUFXLEVBQUUsR0FBRyxFQUFFLFNBQVMsRUFBRSxDQUFDIn0=

package.json

@@ -20,12 +20,13 @@
   },
   "homepage": "https://github.com/pushrocks/smartarchive#readme",
   "dependencies": {
-    "@pushrocks/smartfile": "^9.0.6",
+    "@pushrocks/smartfile": "^10.0.1",
     "@pushrocks/smartpath": "^5.0.5",
+    "@pushrocks/smartpromise": "^3.1.7",
     "@pushrocks/smartrequest": "^1.1.56",
     "@pushrocks/smartrx": "^2.0.25",
+    "@pushrocks/smartstream": "^2.0.2",
     "@pushrocks/smartunique": "^3.0.3",
-    "@pushrocks/streamfunction": "^4.0.1",
     "@types/gunzip-maybe": "^1.4.0",
     "@types/tar-stream": "^2.2.2",
     "gunzip-maybe": "^1.4.2",

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@pushrocks/smartarchive',
-  version: '3.0.4',
+  version: '3.0.5',
   description: 'work with archives'
 }

ts/smartarchive.classes.smartarchive.ts

@@ -1,6 +1,5 @@
 import * as plugins from './smartarchive.plugins.js';
 import * as paths from './smartarchive.paths.js';
-import { extract } from 'tar';
 
 export class SmartArchive {
   public archiveDirectory: string;
@@ -23,28 +22,54 @@ export class SmartArchive {
   /**
    * extracts an archive from a given filePath on disk
    * @param filePathArg
-   * @param targetDir
+   * @param targetDirArg
    */
-  public async extractArchiveFromFilePathToFs(filePathArg: string, targetDir: string) {
+  public async extractArchiveFromFilePathToFs(filePathArg: string, targetDirArg: string) {
-    const parsedPath = plugins.path.parse(filePathArg);
+    console.log(`extracting ${filePathArg}`);
-    switch (parsedPath.ext) {
+    const done = plugins.smartpromise.defer();
-      case '.tgz':
+    filePathArg = plugins.smartpath.transform.makeAbsolute(filePathArg);
-        console.log(`detected a .tgz archive`);
+    targetDirArg = plugins.smartpath.transform.makeAbsolute(targetDirArg);
-        await plugins.tar.extract({
+    const readableStream = plugins.smartfile.fsStream.createReadStream(filePathArg);
-          file: filePathArg,
+    const extractPipeStop = plugins.tarStream.extract();
-          cwd: targetDir,
+    extractPipeStop.on('entry', async (header, stream, next) => {
-        });
+      const targetFilePath = plugins.path.join(targetDirArg, header.name);
-        break;
+      const parsedPath = plugins.path.parse(targetFilePath);
-    }
+      await plugins.smartfile.fs.ensureDir(parsedPath.dir);
+      const writeStream = plugins.smartfile.fsStream.createWriteStream(targetFilePath);
+      stream.pipe(writeStream);
+      stream.on('end', () => {
+        console.log(`extracted ${header.name}`);
+        next();
+      })
+      stream.resume();
+    });
+    extractPipeStop.on('finish', () => {
+      console.log(`Sucessfully extracted ${filePathArg}!`);
+      done.resolve();
+    });
+
+    // lets run the stream
+    readableStream
+      .pipe(plugins.gunzipMaybe())
+      .pipe(extractPipeStop);
+    await done.promise;
   }
 
   /**
    * extracts to Observable
+   * where the Observable is emitting smartfiles
    */
   public async extractArchiveFromBufferToObservable(
     bufferArg: Buffer
   ): Promise<plugins.smartrx.rxjs.ReplaySubject<plugins.smartfile.Smartfile>> {
-    const intake = new plugins.streamfunction.Intake();
+    const { intake, replaySubject } = this.extractArchiveWithIntakeAndReplaySubject();
+    intake.pushData(bufferArg);
+    intake.signalEnd();
+    return replaySubject;
+  }
+
+  extractArchiveWithIntakeAndReplaySubject() {
+    const intake = new plugins.smartstream.StreamIntake<Buffer>();
     const replaySubject = new plugins.smartrx.rxjs.ReplaySubject<plugins.smartfile.Smartfile>();
     const readableStream = intake.getReadableStream();
     const extractPipeStop = plugins.tarStream.extract();
@@ -76,9 +101,10 @@ export class SmartArchive {
     readableStream
       .pipe(plugins.gunzipMaybe())
       .pipe(extractPipeStop);
-    intake.pushData(bufferArg);
+    return {
-    intake.signalEnd();
+      intake,
-    return replaySubject;
+      replaySubject
+    };
   }
 
   /**
@@ -93,10 +119,12 @@ export class SmartArchive {
   }
 
   // TODO
-  public async extractArchiveFromUrlToStream() {}
+  public async extractArchiveFromUrlToStream() {
+
+  }
 
   // TODO
-  public async extractArchiveFromFsToStream() {}
+  public async extractArchiveFromFilePathToStream() {}
 
   // TODO
   public async extractArchiveFromStreamToStream() {}
@@ -105,8 +133,8 @@ export class SmartArchive {
   public async packFromStreamToStream() {}
 
   // TODO
-  public async packFromFsToStream() {}
+  public async packFromDirPathToStream() {}
 
   // TODO
-  public async packFromFsToFs() {}
+  public async packFromDirPathToFs() {}
 }

ts/smartarchive.plugins.ts

@@ -6,12 +6,13 @@ export { path };
 // @pushrocks scope
 import * as smartfile from '@pushrocks/smartfile';
 import * as smartpath from '@pushrocks/smartpath';
+import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartrequest from '@pushrocks/smartrequest';
 import * as smartunique from '@pushrocks/smartunique';
-import * as streamfunction from '@pushrocks/streamfunction';
+import * as smartstream from '@pushrocks/smartstream';
 import * as smartrx from '@pushrocks/smartrx';
 
-export { smartfile, smartpath, smartrequest, smartunique, streamfunction, smartrx };
+export { smartfile, smartpath, smartpromise, smartrequest, smartunique, smartstream, smartrx };
 
 // third party scope
 import gunzipMaybe from 'gunzip-maybe';