-
Notifications
You must be signed in to change notification settings - Fork 3
Polish/browser fallback and install docs #1
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.
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
0xBreadguy
wants to merge
3
commits into
megaeth-labs:main
Choose a base branch
from
crumb-trail:polish/browser-fallback-and-install-docs
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+163
−24
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -173,7 +173,11 @@ check_prerequisites() { | |
|
|
||
| node_major="$(node -p 'Number(process.versions.node.split(".")[0])')" | ||
| if [ "$node_major" -lt "$required_node_major" ]; then | ||
| error "Node.js >= $required_node_major is required; found major version $node_major" | ||
| error "Node.js >= $required_node_major is required, but you have Node.js $(node -v 2>/dev/null || echo unknown). | ||
|
|
||
| To install Node.js 22: | ||
| • Using nvm: nvm install 22 | ||
| • Using apt: curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash - && sudo apt-get install -y nodejs" | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. good idea, can we make this cross-platform guidance? |
||
| fi | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -103,7 +103,7 @@ export type DelegatedKeyPair = { | |
| accessAddress: HexString; | ||
| }; | ||
|
|
||
| export type BrowserOpener = (url: string) => Promise<void> | void; | ||
| export type BrowserOpener = (url: string) => Promise<boolean | void> | boolean | void; | ||
|
|
||
| export type LoopbackLoginOptions = { | ||
| network: Network; | ||
|
|
@@ -316,7 +316,18 @@ export async function runLoopbackLogin( | |
| waitForCallback.catch(() => undefined); | ||
|
|
||
| try { | ||
| await (options.openBrowser ?? openSystemBrowser)(authUrl); | ||
| const browserOpened = await (options.openBrowser ?? openSystemBrowser)(authUrl); | ||
| if (browserOpened === false) { | ||
| process.stderr.write( | ||
| `⚠️ Could not open a browser automatically. | ||
| Open this URL in your browser to continue: | ||
|
|
||
| ${authUrl} | ||
|
|
||
| Waiting for approval... | ||
| `, | ||
| ); | ||
| } | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. see my comment on the PR |
||
| const callback = await waitForCallback; | ||
|
|
||
| if (callback.status !== "approved") { | ||
|
|
@@ -397,7 +408,18 @@ export async function authorizeLoopbackKey( | |
| waitForCallback.catch(() => undefined); | ||
|
|
||
| try { | ||
| await (options.openBrowser ?? openSystemBrowser)(authUrl); | ||
| const browserOpened = await (options.openBrowser ?? openSystemBrowser)(authUrl); | ||
| if (browserOpened === false) { | ||
| process.stderr.write( | ||
| `⚠️ Could not open a browser automatically. | ||
| Open this URL in your browser to continue: | ||
|
|
||
| ${authUrl} | ||
|
|
||
| Waiting for approval... | ||
| `, | ||
| ); | ||
| } | ||
| const callback = await waitForCallback; | ||
|
|
||
| if (callback.status !== "approved") { | ||
|
|
@@ -526,7 +548,18 @@ export async function runLoopbackRevoke( | |
| waitForCallback.catch(() => undefined); | ||
|
|
||
| try { | ||
| await (options.openBrowser ?? openSystemBrowser)(authUrl); | ||
| const browserOpened = await (options.openBrowser ?? openSystemBrowser)(authUrl); | ||
| if (browserOpened === false) { | ||
| process.stderr.write( | ||
| `⚠️ Could not open a browser automatically. | ||
| Open this URL in your browser to continue: | ||
|
|
||
| ${authUrl} | ||
|
|
||
| Waiting for approval... | ||
| `, | ||
| ); | ||
| } | ||
| const callback = await waitForCallback; | ||
|
|
||
| if (callback.status !== "approved") { | ||
|
|
@@ -908,27 +941,19 @@ export function keccak256(input: Uint8Array): Buffer { | |
| return output; | ||
| } | ||
|
|
||
| export async function openSystemBrowser(url: string): Promise<void> { | ||
| export async function openSystemBrowser(url: string): Promise<boolean> { | ||
| const { command, args } = browserCommand(url); | ||
| const child = spawn(command, args, { | ||
| stdio: ["ignore", "ignore", "pipe"], | ||
| stdio: ["ignore", "ignore", "ignore"], | ||
| windowsHide: true, | ||
| }); | ||
|
|
||
| let stderr = ""; | ||
| child.stderr?.on("data", (chunk: Buffer) => { | ||
| stderr += chunk.toString("utf8"); | ||
| const result = await new Promise<boolean>((resolve) => { | ||
| child.once("error", () => resolve(false)); | ||
| child.once("close", (code) => resolve(code === 0)); | ||
| }); | ||
|
|
||
| const code = await new Promise<number | null>((resolve, reject) => { | ||
| child.once("error", reject); | ||
| child.once("close", resolve); | ||
| }); | ||
|
|
||
| if (code !== 0) { | ||
| const message = stderr.trim() || `${command} exited with status ${code}`; | ||
| throw new CliError(`failed to open browser: ${message}`); | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| function handleCallbackRequest( | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you replace the existing uninstall guidance in
# Logout and Uninstallwith this? Also change the instructions to pipe to bash (| bash)