Skip to content

Fix for empty Socket environments #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkucharz merged 2 commits into from
Mar 9, 2018
Merged

Fix for empty Socket environments #188

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2996158
fix(cli): empty zip
mkucharz Mar 9, 2018
94d6260
fix()
mkucharz Mar 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions packages/cli/src/utils/sockets/sockets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,11 @@ class Socket {
return path.join(session.getDistPath(), `${this.name}.env.zip`)
}

isEmptyEnv () {
debug('isEmptyEnv', !fs.existsSync(this.getSocketEnvZip()))
return !fs.existsSync(this.getSocketEnvZip())
}

getSocketNodeModulesChecksum () {
debug('getSocketNodeModulesChecksum')
return hashdirectory.sync(path.join(this.socketPath, '.dist', 'node_modules'))
Expand Down Expand Up @@ -797,6 +802,8 @@ class Socket {
mkdirp.sync(envFolder)
}

let filesInZip = 0

archive.pipe(output)
archive.on('error', reject)

Expand All @@ -808,16 +815,24 @@ class Socket {

files.forEach(file => {
archive.file(path.join(envFolder, file), {name: path.join('node_modules', file)})
filesInZip += 1
})

archive.finalize()
if (filesInZip) {
archive.finalize()
} else {
fs.unlinkSync(this.getSocketEnvZip())
resolve()
}

output.on('close', () => {
resolve()
})
})
}

updateEnvCall (method) {
debug('updateEnvCall')
return new Promise((resolve, reject) => {
const form = new FormData()

Expand Down Expand Up @@ -876,7 +891,9 @@ class Socket {
const resp = await this.socketEnvShouldBeUpdated()
if (resp) {
await this.createEnvZip()
return this.updateEnvCall(resp)
if (!this.isEmptyEnv()) {
return this.updateEnvCall(resp)
}
}
return 'No need to update'
}
Expand Down Expand Up @@ -910,7 +927,13 @@ class Socket {
const form = new FormData()

form.append('name', this.name)
form.append('environment', this.name)

if (this.isEmptyEnv()) {
debug('environment is null')
form.append('environment', '')
} else {
form.append('environment', this.name)
}

if (config) {
form.append('config', JSON.stringify(config))
Expand Down