From 7dbdc9ca0a1d413aff93fcdce106a7a1d401e2d5 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 11 Apr 2016 17:04:20 -0700
Subject: [PATCH] use tar-fs and zlib for content extraction

---
 server-console/package.json |  2 +-
 server-console/src/main.js  | 57 +++++++++++++++++++++++++------------
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/server-console/package.json b/server-console/package.json
index 44f7b3d05e..ece562c1c4 100644
--- a/server-console/package.json
+++ b/server-console/package.json
@@ -32,7 +32,7 @@
     "os-homedir": "^1.0.1",
     "request": "2.67.0",
     "request-progress": "1.0.2",
-    "unzip": "0.1.11",
+    "tar-fs": "^1.12.0",
     "yargs": "^3.30.0"
   }
 }
diff --git a/server-console/src/main.js b/server-console/src/main.js
index 26ec2dd536..29e874f453 100644
--- a/server-console/src/main.js
+++ b/server-console/src/main.js
@@ -17,7 +17,8 @@ const path = require('path');
 const fs = require('fs-extra');
 const Tail = require('always-tail');
 const http = require('http');
-const unzip = require('unzip');
+const zlib = require('zlib');
+const tar = require('tar-fs');
 
 const request = require('request');
 const progress = require('request-progress');
@@ -90,6 +91,10 @@ function getRootHifiDataDirectory() {
     }
 }
 
+function getDomainServerClientResourcesDirectory() {
+    return path.join(getRootHifiDataDirectory(), '/domain-server');
+}
+
 function getAssignmentClientResourcesDirectory() {
     return path.join(getRootHifiDataDirectory(), '/assignment-client');
 }
@@ -477,18 +482,34 @@ function updateTrayMenu(serverState) {
 const httpStatusPort = 60332;
 
 function maybeInstallDefaultContentSet(onComplete) {
-    // Check for existing AC data
+    // Check for existing data
     const acResourceDirectory = getAssignmentClientResourcesDirectory();
+
     console.log("Checking for existence of " + acResourceDirectory);
-    var userHasExistingServerData = true;
+
+    var userHasExistingACData = true;
     try {
         fs.accessSync(acResourceDirectory);
+        console.log("Found directory " + acResourceDirectory);
     } catch (e) {
         console.log(e);
-        userHasExistingServerData = false;
+        userHasExistingACData = false;
     }
 
-    if (userHasExistingServerData) {
+    const dsResourceDirectory = getDomainServerClientResourcesDirectory();
+
+    console.log("checking for existence of " + dsResourceDirectory);
+
+    var userHasExistingDSData = true;
+    try {
+        fs.accessSync(dsResourceDirectory);
+        console.log("Found directory " + dsResourceDirectory);
+    } catch (e) {
+        console.log(e);
+        userHasExistingDSData = false;
+    }
+
+    if (userHasExistingACData || userHasExistingDSData) {
         console.log("User has existing data, suppressing downloader");
         onComplete();
         return;
@@ -514,16 +535,19 @@ function maybeInstallDefaultContentSet(onComplete) {
 
     electron.ipcMain.on('ready', function() {
         console.log("got ready");
+        var currentState = '';
+
         function sendStateUpdate(state, args) {
             // console.log(state, window, args);
             window.webContents.send('update', { state: state, args: args });
+            currentState = state;
         }
 
         var aborted = false;
 
         // Start downloading content set
         var req = progress(request.get({
-            url: "https://s3.amazonaws.com/hifi-public/homeset/ContentSet-Lounge.zip"
+            url: "http://cachefly.highfidelity.com/home.tgz"
         }, function(error, responseMessage, responseData) {
             if (aborted) {
                 return;
@@ -546,24 +570,21 @@ function maybeInstallDefaultContentSet(onComplete) {
                 sendStateUpdate('downloading', state);
             }
         });
-        var unzipper = unzip.Extract({
-            path: acResourceDirectory,
-            verbose: true
-        });
-        unzipper.on('close', function() {
-            console.log("Done", arguments);
-            sendStateUpdate('complete');
-        });
-        unzipper.on('error', function (err) {
-            console.log("aborting");
+
+        req.pipe(zlib.createGunzip()).pipe(tar.extract(getRootHifiDataDirectory())).on('error', function(){
+            console.log("Aborting request because gunzip/untar failed");
             aborted = true;
             req.abort();
-            console.log("ERROR");
+            console.log("ERROR" +  err);
+
             sendStateUpdate('error', {
                 message: "Error installing resources."
             });
+        }).on('finish', function(){
+            // response and decompression complete, return
+            console.log("Done", arguments);
+            sendStateUpdate('complete');
         });
-        req.pipe(unzipper);
 
         window.on('closed', function() {
             if (currentState == 'downloading') {