Fix for building registry deps (#195)

Syncano · Mar 20, 2018 · a517577 · a517577
1 parent 000fcc9
commit a517577
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/packages/cli/src/commands/socket-add.js b/packages/cli/src/commands/socket-add.js
@@ -26,12 +26,12 @@ export default class SocketAdd {
       if (cmd.socket) {
         // Socket dependency
         this.socket = await this.Socket.get(cmd.socket)
-        return this.socket.addDependency(socketFromRegistry)
+        await this.socket.addDependency(socketFromRegistry)
+      } else {
+        // Project dependency
+        await this.Socket.add(socketFromRegistry)
       }
 
-      // Project dependency
-      await this.Socket.add(socketFromRegistry)
-
       const status = format.grey('socket added:')
       const name = format.cyan(this.socketFromRegistry.name)
       const version = format.dim(`(${this.socketFromRegistry.version})`)
@@ -61,7 +61,11 @@ export default class SocketAdd {
         }
       } else {
         echo()
-        echo(`${format.red(err)}\n`)
+        if(err.message) {
+          echo(`${format.red(err.message)}\n`)
+        } else {
+          echo(`${format.red(err)}\n`)
+        }
         echo()
       }
     }

diff --git a/packages/cli/src/utils/sockets/sockets.js b/packages/cli/src/utils/sockets/sockets.js
@@ -329,11 +329,10 @@ class Socket {
     debug(`Getting Socket: ${socketName}`)
     const socket = Socket.getLocal(socketName)
     const loadedSocket = await socket.loadRemote()
-    await loadedSocket.getDepsRegistrySockets()
-
     if (!socket.existLocally) {
       await socket.loadFromRegistry()
     }
+    await loadedSocket.getDepsRegistrySockets()
     return socket
   }
 
@@ -564,7 +563,7 @@ class Socket {
 
   getSocketNodeModulesChecksum () {
     debug('getSocketNodeModulesChecksum')
-    return hashdirectory.sync(path.join(this.socketPath, '.dist', 'node_modules'))
+    return hashdirectory.sync(path.join(this.getSocketPath(), '.dist', 'node_modules'))
   }
 
   getSocketConfigFile () {
@@ -1021,9 +1020,16 @@ class Socket {
         await new Promise((resolve, reject) => {
           fs.createReadStream(fileName)
             .pipe(unzip.Extract({ path: this.getSocketPath() }))
-            .on('close', () => {
+            .on('close', async () => {
               debug('Unzip finished')
-              resolve()
+
+              // Build registry socket.
+              try {
+                await this.build()
+              } catch(e) {
+                return reject(e)
+              }
+              return resolve()
             })
         })
       }