mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
13739 commits 12 branches 100 tags 40 MiB
Commit graph

38 commits

Author SHA1 Message Date
Matthew Wild
57d168dd5e prosodyctl shell: More reliable detection of REPL/interactive mode (fixes #1895) 2025-03-13 11:37:11 +00:00
Matthew Wild
79381510cf mod_admin_shell, util.prosodyctl.shell: Process command-line args on server-side, with argparse support 
This allow a shell-command to provide a 'flags' field, which will automatically
cause the parameters to be fed through argparse.

The rationale is to make it easier for more complex commands to be invoked
from the command line (`prosodyctl shell foo bar ...`). Until now they were
limited to accepting a list of strings, and any complex argument processing
was non-standard and awkward to implement.
 2025-02-17 17:02:35 +00:00
Matthew Wild
1377333751 util.prosodyctl.shell: Export function to check for availability of admin socket 2025-02-06 14:23:15 +00:00
Kim Alvefur
4569e951af util.prosodyctl.shell: Remove non-existent export [luacheck] 2025-01-08 08:53:43 +01:00
Matthew Wild
91776f57ef util.prosodyctl.shell: Support for requesting special inputs, e.g. passwords 
This lets the server signal to the client that a special input is requested.
Currently we support the "password" type only.
 2025-01-07 18:10:59 +00:00
Matthew Wild
272e700f50 prosodyctl shell: Fix invocation with 3+ command arguments 
The code correctly inserted the ',' when there was already a "%q" in the
format string, but then the next argument would fail to match because it
inserted ", %q" instead of "%q". The code now matches both, ensuring the
generated code will not produce a syntax error with multiple arguments.
 2024-04-24 11:45:37 +01:00
Kim Alvefur
3764f34fcf util.prosodyctl.shell: Fix lint [luacheck] 2023-12-09 17:00:22 +01:00
Kim Alvefur
f0061feef8 util.prosodyctl.shell: Add :method syntax to make e.g. MUC commands easier 
e.g.
prosodyctl shell muc room room@muc.example.com :set_name "This Room"
 2023-12-09 16:25:04 +01:00
Kim Alvefur
21eabc7e58 util.prosodyctl.shell: Fix sending terminal width with single argument 
E.g. when you do 'prosodyctl shell "s2s:show()"', this is the case that
triggers, and it was missing the @width argument, causing confusion.
 2023-04-07 13:58:39 +02:00
Kim Alvefur
4725a96218 util.prosodyctl.shell: Coerce terminal width to string (for util.stanza) 
Fixes invalid attribute value: expected string, got number
 2023-04-07 13:53:40 +02:00
Kim Alvefur
9760019a25 util.human.io: Prefer using the $COLUMNS environment variable if set (by readline) 
Feels like it should be faster.
 2023-04-07 13:42:20 +02:00
Kim Alvefur
d73eaf9e5e util.prosodyctl.shell: Use new term_width() for width 
Kicks in if/when readline hasn't set $COLUMNS, e.g. when using the
`prosodyctl shell command like this` form.
 2023-04-07 13:38:59 +02:00
Kim Alvefur
43531740f9 util: Prefix module imports with prosody namespace 2023-03-17 16:23:16 +01:00
Kim Alvefur
9228a851bc Merge 0.12->trunk 2023-01-22 15:43:44 +01:00
Kim Alvefur
7c302e9c4c util.prosodyctl.shell: Close state on exit to fix saving shell history 
This ensures a last round of garbage collection and finalizers, which
should include flushing the readline history file.

Test procedure:
```
$ ./prosodyctl shell
prosody> s2s:show() -- any command that is not the last in history
... output
prosody> bye
$ ./prosodyctl shell
prosody> ^P
```

After this, the shell prompt should contain the last command from before
the "bye". Before this patch, recent history is gone most of the time.
 2023-01-22 14:42:07 +01:00
Kim Alvefur
49a9a1e76a util: Remove various Lua 5.1 compatibility hacks 
Part of #1600
 2022-07-02 17:31:14 +02:00
Kim Alvefur
02f67bb917 util.prosodyctl.shell: Print errors in red to highlight them 2022-06-01 13:59:00 +02:00
Kim Alvefur
0267554c8e prosodyctl shell: Communicate width of terminal to mod_admin_shell 
This lets it adjust the width of tables to the actual terminal width.
 2022-05-30 15:28:44 +02:00
Kim Alvefur
256466cd33 util.prosodyctl.shell: Bring back banner set from config! 
I miss my custom ANSI-colored greeting!
 2021-11-12 22:34:04 +01:00
Matthew Wild
2077bef777 util.prosodyctl.shell: Allow setting custom prompt (admin_shell_prompt) 2021-11-11 13:27:28 +00:00
Kim Alvefur
75ca81a26e util.prosodyctl.shell: Fix for different location of unpack in Lua 5.1 2021-04-25 17:32:27 +02:00
Kim Alvefur
549a0aa28f util.prosodyctl.shell: Fix for missing 'sep' arg to string.rep in Lua 5.1 2021-04-25 17:27:02 +02:00
Kim Alvefur
ea470c72e0 util.prosodyctl.shell: Allow calling console commands with fewer shell quotes 
E.g. `prosodyctl shell module reload disco example.com` becomes
equivalent to `prosodyctl shell 'module:reload("disco", "example.com")`.

Won't work for every possible command, but reduces the amount of shell
quoting problems for most common commands.
 2021-04-25 17:20:58 +02:00
Kim Alvefur
cd641dca64 util.prosodyctl.shell: Allow passing a single command as argument 
Test procedure:

$ prosodyctl shell 'server:version()'

Expect:

> OK: hg:926d53af9a7a

$ prosodyctl shell 'server:version()' 'hello'

Expect:

> Only one command is supported as argument

$ prosodyctl shell 'lorem ipsum'; echo $?

Expect:
> Sorry, I couldn't understand that... console:1: syntax error near 'show'
> 1 (error code)

Thanks Menel for mentioning the feature
 2021-03-05 13:02:37 +01:00
Kim Alvefur
71cb57df51 util.prosodyctl.shell: Fix check for --quiet 
Looked in the wrong table

Test procedure:

$ prosodyctl shell --quiet

Expect:
Prosody>

(No banner)
 2021-03-05 12:39:49 +01:00
Kim Alvefur
3077309ce7 util.prosodyctl.shell: Collect extra return values 
Forgot in previous commit
 2020-06-17 19:39:14 +02:00
Kim Alvefur
e2685cad2f util.prosodyctl.shell: Handle argument parsing errors 
While almost identical to the handling in util.startup, this seems more
appropriate. It would also simplify if shell-specific options need to be
handled in the future.
 2020-06-17 19:36:39 +02:00
Kim Alvefur
6264bd48c1 util.prosodyctl.shell: Save readline history 2020-06-02 09:35:07 +02:00
Matthew Wild
78a8bfc31d util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse 2020-06-02 08:28:39 +01:00
Kim Alvefur
425c9cb979 util.prosodyctl.shell: Really fix --socket option 
Forgot it stops parsing --foo options at the first argument, so
subsequent commands need to parse their own options like this.
 2020-06-02 09:19:07 +02:00
Kim Alvefur
0fea1b599e util.prosodyctl.shell: Correct check for --socket 2020-06-02 09:07:29 +02:00
Matthew Wild
46022b0988 prosodyctl+util.prosodyctl.*: Start breaking up the ever-growing prosodyctl 2020-06-02 08:01:21 +01:00
Kim Alvefur
f4436b0ad8 util.prosodyctl.shell: Allow passing path to socket on command line 
E.g. `prosodyctl shell --socket /path/to/prosody.scok`
 2020-06-01 23:57:50 +02:00
Kim Alvefur
05f5f794bf util.prosodyctl.shell: Use same config option as module for socket path 
So now if you set it to a custom value, both the client and the server
should use it.
 2020-06-01 23:53:03 +02:00
Kim Alvefur
aa24574b89 util.prosodyctl.shell: Join socket path with current data directory 
Don't hardcode socket path as it happens to be in a source checkout.

Hold on, it should use the same config option as the module!
 2020-06-01 23:26:30 +02:00
Matthew Wild
e703759258 mod_admin_shell, mod_admin_telnet, util.prosodyctl.shell: Separate output from final result 
Fixes the client pausing for input after output from commands.
 2020-06-01 16:14:06 +01:00
Matthew Wild
a355440c01 prosodyctl, util.prosodyctl.shell: prosodyctl shell - a client to access the prosodyctl admin shell 2020-06-01 15:44:44 +01:00
Matthew Wild
b617c24af4 util.prosodyctl.shell: Support for receiving partial lines (no automatic \n) 2022-03-17 10:21:43 +00:00