Skip to content

Add more robust method to retrieve config JSON from the terminal #16

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add more robust method to retrieve config JSON from the terminal #16

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6dabbd
Add more robust method to retrieve config JSON from the terminal
stereokai Dec 14, 2016
d1000fa
Move constants to module scope
stereokai Dec 14, 2016
cf0466b
Convert identifiers to camel case
stereokai Dec 14, 2016
f0f8dd9
Fix the rest of the linter errors
stereokai Dec 14, 2016
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
11 changes: 9 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,19 @@ exports.middleware = store => next => action => {
const {type, data} = action
const {sessions} = store.getState()
const {activeUid} = sessions
// Remove ANSI escape code sequences. Visualization: https://goo.gl/IY8vuU
const ANSI_escape_codes = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/gm
Copy link
Owner

@timolins timolins Dec 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These constants won't change, so they shouldn't be defined inside the middleware.

Copy link
Author

@stereokai stereokai Dec 14, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's true. I'll update.

Copy link
Author

@stereokai stereokai Dec 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

// Match hyperlayout config string and ignore lints. Visualization: https://goo.gl/hxz4S1
const config_matcher = /(?:.|\s)*\[hyperlayout config\]:((?:.|\s)*})(?:.|\s)*/gm
// Cross-os new-line characters. Visualization: https://goo.gl/q501uy
const newlines = /[\n\r]/gm

// Check for hyperlayout config
if (type === 'SESSION_ADD_DATA') {
const testedData = /^\[hyperlayout config]:(.*)/.exec(data)
data = data.replace(ANSI_escape_codes, '')
const testedData = config_matcher.exec(data.trim());
if (testedData && testedData[1]) {
const config = JSON.parse(testedData[1])
const config = JSON.parse(testedData[1].replace(newlines, ''))
hyperlayout = new Hyperlayout(config, store)
return
}
Expand Down