clix/raw.lua

Sun, 15 Nov 2020 20:45:50 +0100

author
Kim Alvefur <zash@zash.se>
date
Sun, 15 Nov 2020 20:45:50 +0100
changeset 140
8815232cbbeb
parent 138
1783d4226ba1
child 149
014e73c329c5
permissions
-rw-r--r--

clix.watch_pep: Take PEP node as positional argument

Thanks MattJ

135
c8cad3c42f3d clix.raw: Import verse, don't rely on globals
Kim Alvefur <zash@zash.se>
parents: 134
diff changeset
1 local verse = require "verse";
19
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
2 short_opts.i = "interactive";
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
3 short_opts.e = "echo";
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
4
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
5 return function (opts, args)
27
5b58c002d6ad clix.*: Add --short-help and make sure they are working correctly
Matthew Wild <mwild1@gmail.com>
parents: 23
diff changeset
6 if opts.short_help then
5b58c002d6ad clix.*: Add --short-help and make sure they are working correctly
Matthew Wild <mwild1@gmail.com>
parents: 23
diff changeset
7 print("Send/receive raw XML to/from the server");
5b58c002d6ad clix.*: Add --short-help and make sure they are working correctly
Matthew Wild <mwild1@gmail.com>
parents: 23
diff changeset
8 return;
5b58c002d6ad clix.*: Add --short-help and make sure they are working correctly
Matthew Wild <mwild1@gmail.com>
parents: 23
diff changeset
9 end
46
b5d6e443e571 raw: If using --stdin and not --interactive then buffer all data before connecting, more reliable in a non-interactive environment
Matthew Wild <mwild1@gmail.com>
parents: 27
diff changeset
10
b5d6e443e571 raw: If using --stdin and not --interactive then buffer all data before connecting, more reliable in a non-interactive environment
Matthew Wild <mwild1@gmail.com>
parents: 27
diff changeset
11 local send_xml;
b5d6e443e571 raw: If using --stdin and not --interactive then buffer all data before connecting, more reliable in a non-interactive environment
Matthew Wild <mwild1@gmail.com>
parents: 27
diff changeset
12 if opts.stdin then
b5d6e443e571 raw: If using --stdin and not --interactive then buffer all data before connecting, more reliable in a non-interactive environment
Matthew Wild <mwild1@gmail.com>
parents: 27
diff changeset
13 send_xml = io.read("*a");
b5d6e443e571 raw: If using --stdin and not --interactive then buffer all data before connecting, more reliable in a non-interactive environment
Matthew Wild <mwild1@gmail.com>
parents: 27
diff changeset
14 end
b5d6e443e571 raw: If using --stdin and not --interactive then buffer all data before connecting, more reliable in a non-interactive environment
Matthew Wild <mwild1@gmail.com>
parents: 27
diff changeset
15
19
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
16 local function on_connect(conn)
83
040fadcc86f9 clix.raw: Print one incoming stanza per line, instead of raw incoming data.
Kim Alvefur <zash@zash.se>
parents: 68
diff changeset
17 local print = print;
040fadcc86f9 clix.raw: Print one incoming stanza per line, instead of raw incoming data.
Kim Alvefur <zash@zash.se>
parents: 68
diff changeset
18 local function stprint(stanza)
040fadcc86f9 clix.raw: Print one incoming stanza per line, instead of raw incoming data.
Kim Alvefur <zash@zash.se>
parents: 68
diff changeset
19 if stanza.attr.to == conn.jid then
040fadcc86f9 clix.raw: Print one incoming stanza per line, instead of raw incoming data.
Kim Alvefur <zash@zash.se>
parents: 68
diff changeset
20 stanza.attr.to = nil;
040fadcc86f9 clix.raw: Print one incoming stanza per line, instead of raw incoming data.
Kim Alvefur <zash@zash.se>
parents: 68
diff changeset
21 end
133
be3b857e991f clix.raw: Use indentation when prettyprinting if available in util.stanza
Kim Alvefur <zash@zash.se>
parents: 132
diff changeset
22 if opts.pretty and stanza.indent then
be3b857e991f clix.raw: Use indentation when prettyprinting if available in util.stanza
Kim Alvefur <zash@zash.se>
parents: 132
diff changeset
23 return print(stanza:indent(1, " "):pretty_print());
be3b857e991f clix.raw: Use indentation when prettyprinting if available in util.stanza
Kim Alvefur <zash@zash.se>
parents: 132
diff changeset
24 end
83
040fadcc86f9 clix.raw: Print one incoming stanza per line, instead of raw incoming data.
Kim Alvefur <zash@zash.se>
parents: 68
diff changeset
25 return print(stanza);
040fadcc86f9 clix.raw: Print one incoming stanza per line, instead of raw incoming data.
Kim Alvefur <zash@zash.se>
parents: 68
diff changeset
26 end
040fadcc86f9 clix.raw: Print one incoming stanza per line, instead of raw incoming data.
Kim Alvefur <zash@zash.se>
parents: 68
diff changeset
27 conn:hook("stanza", stprint)
46
b5d6e443e571 raw: If using --stdin and not --interactive then buffer all data before connecting, more reliable in a non-interactive environment
Matthew Wild <mwild1@gmail.com>
parents: 27
diff changeset
28 if opts.interactive then
19
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
29 local stdin = {
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
30 getfd = function () return 0; end;
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
31 dirty = function (self) return false; end;
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
32 settimeout = function () end;
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
33 send = function (_, d) return #d, 0; end;
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
34 close = function () end;
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
35 receive = function (_, patt)
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
36 local data = io.stdin:read(patt);
68
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
37 if data == nil then
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
38 conn:close();
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
39 end
19
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
40 if opts.echo then
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
41 io.write(data, patt == "*l" and "\n" or "");
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
42 end
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
43 return data;
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
44 end
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
45 };
132
3addfb97296c clix.raw: Add a shorthand for top level stanza attributes
Kim Alvefur <zash@zash.se>
parents: 85
diff changeset
46 local stwrap;
3addfb97296c clix.raw: Add a shorthand for top level stanza attributes
Kim Alvefur <zash@zash.se>
parents: 85
diff changeset
47 do
3addfb97296c clix.raw: Add a shorthand for top level stanza attributes
Kim Alvefur <zash@zash.se>
parents: 85
diff changeset
48 local f_mt, r_mt = {}, {};
3addfb97296c clix.raw: Add a shorthand for top level stanza attributes
Kim Alvefur <zash@zash.se>
parents: 85
diff changeset
49 function f_mt:__call(...) if ... and type(...) == "string" then return self{ to=... } end return self._f(...) end
3addfb97296c clix.raw: Add a shorthand for top level stanza attributes
Kim Alvefur <zash@zash.se>
parents: 85
diff changeset
50 function f_mt:__index(k) return setmetatable({_st = self._f{ type = k }}, r_mt); end
3addfb97296c clix.raw: Add a shorthand for top level stanza attributes
Kim Alvefur <zash@zash.se>
parents: 85
diff changeset
51 function r_mt:__call(to) self._st.attr.to = to; return self._st end
3addfb97296c clix.raw: Add a shorthand for top level stanza attributes
Kim Alvefur <zash@zash.se>
parents: 85
diff changeset
52 function stwrap(f) return setmetatable({_f=f},f_mt) end
3addfb97296c clix.raw: Add a shorthand for top level stanza attributes
Kim Alvefur <zash@zash.se>
parents: 85
diff changeset
53 end
68
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
54 local env = setmetatable({}, { __index = {
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
55 s = verse.stanza,
132
3addfb97296c clix.raw: Add a shorthand for top level stanza attributes
Kim Alvefur <zash@zash.se>
parents: 85
diff changeset
56 m = stwrap(verse.message),
3addfb97296c clix.raw: Add a shorthand for top level stanza attributes
Kim Alvefur <zash@zash.se>
parents: 85
diff changeset
57 p = stwrap(verse.presence),
3addfb97296c clix.raw: Add a shorthand for top level stanza attributes
Kim Alvefur <zash@zash.se>
parents: 85
diff changeset
58 iq = stwrap(verse.iq),
85
8bc27e310e64 clix.raw: Add a ping command to the sandbox
Kim Alvefur <zash@zash.se>
parents: 84
diff changeset
59 ping = function(host)
8bc27e310e64 clix.raw: Add a ping command to the sandbox
Kim Alvefur <zash@zash.se>
parents: 84
diff changeset
60 return verse.iq{ type="get", to=host}:tag("ping", {xmlns="urn:xmpp:ping"});
8bc27e310e64 clix.raw: Add a ping command to the sandbox
Kim Alvefur <zash@zash.se>
parents: 84
diff changeset
61 end,
134
d1fa853325b9 clix.raw: Add sevral shorthand functions for common queries
Kim Alvefur <zash@zash.se>
parents: 133
diff changeset
62 version = function(host)
d1fa853325b9 clix.raw: Add sevral shorthand functions for common queries
Kim Alvefur <zash@zash.se>
parents: 133
diff changeset
63 return verse.iq{ type="get", to=host}:query"jabber:iq:version";
d1fa853325b9 clix.raw: Add sevral shorthand functions for common queries
Kim Alvefur <zash@zash.se>
parents: 133
diff changeset
64 end,
d1fa853325b9 clix.raw: Add sevral shorthand functions for common queries
Kim Alvefur <zash@zash.se>
parents: 133
diff changeset
65 vcard = function(who)
d1fa853325b9 clix.raw: Add sevral shorthand functions for common queries
Kim Alvefur <zash@zash.se>
parents: 133
diff changeset
66 return verse.iq{ type="get", to=who}:tag("vCard",{xmlns="vcard-temp"});
d1fa853325b9 clix.raw: Add sevral shorthand functions for common queries
Kim Alvefur <zash@zash.se>
parents: 133
diff changeset
67 end,
138
1783d4226ba1 clix.raw: Give access to the verse pubsub module
Kim Alvefur <zash@zash.se>
parents: 137
diff changeset
68 pubsub = function(...)
1783d4226ba1 clix.raw: Give access to the verse pubsub module
Kim Alvefur <zash@zash.se>
parents: 137
diff changeset
69 return conn.pubsub(...);
1783d4226ba1 clix.raw: Give access to the verse pubsub module
Kim Alvefur <zash@zash.se>
parents: 137
diff changeset
70 end,
134
d1fa853325b9 clix.raw: Add sevral shorthand functions for common queries
Kim Alvefur <zash@zash.se>
parents: 133
diff changeset
71 disco = function (to, node)
d1fa853325b9 clix.raw: Add sevral shorthand functions for common queries
Kim Alvefur <zash@zash.se>
parents: 133
diff changeset
72 return verse.iq{ type="get", to=to }:tag("query", { xmlns="http://jabber.org/protocol/disco#info", node = node });
d1fa853325b9 clix.raw: Add sevral shorthand functions for common queries
Kim Alvefur <zash@zash.se>
parents: 133
diff changeset
73 end,
d1fa853325b9 clix.raw: Add sevral shorthand functions for common queries
Kim Alvefur <zash@zash.se>
parents: 133
diff changeset
74 items = function (to, node)
d1fa853325b9 clix.raw: Add sevral shorthand functions for common queries
Kim Alvefur <zash@zash.se>
parents: 133
diff changeset
75 return verse.iq{ type="get", to=to }:tag("query", { xmlns="http://jabber.org/protocol/disco#items", node = node });
d1fa853325b9 clix.raw: Add sevral shorthand functions for common queries
Kim Alvefur <zash@zash.se>
parents: 133
diff changeset
76 end,
d1fa853325b9 clix.raw: Add sevral shorthand functions for common queries
Kim Alvefur <zash@zash.se>
parents: 133
diff changeset
77 join = function (roomnick)
d1fa853325b9 clix.raw: Add sevral shorthand functions for common queries
Kim Alvefur <zash@zash.se>
parents: 133
diff changeset
78 return verse.presence({ to=roomnick }):tag("x", { xmlns="http://jabber.org/protocol/muc" });
d1fa853325b9 clix.raw: Add sevral shorthand functions for common queries
Kim Alvefur <zash@zash.se>
parents: 133
diff changeset
79 end,
68
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
80 }});
19
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
81 local function on_incoming(stdin, data)
68
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
82 if not data then
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
83 conn:close();
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
84 return
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
85 end
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
86 if data:sub(1,1) ~= "<" then
84
1b4e64176288 clix.raw: Nicer error reporting from the sandbox.
Kim Alvefur <zash@zash.se>
parents: 83
diff changeset
87 local chunk, err = loadstring("return "..data, "@stdin");
1b4e64176288 clix.raw: Nicer error reporting from the sandbox.
Kim Alvefur <zash@zash.se>
parents: 83
diff changeset
88 if not chunk then
1b4e64176288 clix.raw: Nicer error reporting from the sandbox.
Kim Alvefur <zash@zash.se>
parents: 83
diff changeset
89 conn:error(err);
1b4e64176288 clix.raw: Nicer error reporting from the sandbox.
Kim Alvefur <zash@zash.se>
parents: 83
diff changeset
90 return;
1b4e64176288 clix.raw: Nicer error reporting from the sandbox.
Kim Alvefur <zash@zash.se>
parents: 83
diff changeset
91 end
68
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
92 data = "";
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
93 setfenv(chunk, env);
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
94 local ok, ret = pcall(chunk);
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
95 if ok then
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
96 data = ret
84
1b4e64176288 clix.raw: Nicer error reporting from the sandbox.
Kim Alvefur <zash@zash.se>
parents: 83
diff changeset
97 else
1b4e64176288 clix.raw: Nicer error reporting from the sandbox.
Kim Alvefur <zash@zash.se>
parents: 83
diff changeset
98 conn:error(ret);
1b4e64176288 clix.raw: Nicer error reporting from the sandbox.
Kim Alvefur <zash@zash.se>
parents: 83
diff changeset
99 return;
68
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
100 end
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
101 end
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
102 if data then
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
103 conn:send(data);
b7d92ed9c268 clix.raw: Add a small sandbox with util.stanza functions
Kim Alvefur <zash@zash.se>
parents: 46
diff changeset
104 end
19
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
105 if not opts.interactive then
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
106 conn:close();
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
107 end
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
108 end
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
109 stdin = require "net.server".wrapclient(stdin, "stdin", 0, {
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
110 onincoming = on_incoming, ondisconnect = function () end
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
111 }, "*l");
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
112 else
46
b5d6e443e571 raw: If using --stdin and not --interactive then buffer all data before connecting, more reliable in a non-interactive environment
Matthew Wild <mwild1@gmail.com>
parents: 27
diff changeset
113 if send_xml then
b5d6e443e571 raw: If using --stdin and not --interactive then buffer all data before connecting, more reliable in a non-interactive environment
Matthew Wild <mwild1@gmail.com>
parents: 27
diff changeset
114 conn:send(send_xml);
b5d6e443e571 raw: If using --stdin and not --interactive then buffer all data before connecting, more reliable in a non-interactive environment
Matthew Wild <mwild1@gmail.com>
parents: 27
diff changeset
115 else
136
2309402dd3cb clix.raw: Fix sending arguments from the command line
Kim Alvefur <zash@zash.se>
parents: 135
diff changeset
116 conn:send(table.concat(args, " "));
46
b5d6e443e571 raw: If using --stdin and not --interactive then buffer all data before connecting, more reliable in a non-interactive environment
Matthew Wild <mwild1@gmail.com>
parents: 27
diff changeset
117 end
19
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
118 conn:close();
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
119 end
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
120
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
121 end
137
7130d5ec115c clix.raw: Allow specifying extra plugins to load
Kim Alvefur <zash@zash.se>
parents: 136
diff changeset
122 local plugins = {};
7130d5ec115c clix.raw: Allow specifying extra plugins to load
Kim Alvefur <zash@zash.se>
parents: 136
diff changeset
123 for i=#args,1,-1 do
7130d5ec115c clix.raw: Allow specifying extra plugins to load
Kim Alvefur <zash@zash.se>
parents: 136
diff changeset
124 if args[i]:sub(1,1) == "+" then
7130d5ec115c clix.raw: Allow specifying extra plugins to load
Kim Alvefur <zash@zash.se>
parents: 136
diff changeset
125 table.insert(plugins, table.remove(args, i):sub(2))
7130d5ec115c clix.raw: Allow specifying extra plugins to load
Kim Alvefur <zash@zash.se>
parents: 136
diff changeset
126 end
7130d5ec115c clix.raw: Allow specifying extra plugins to load
Kim Alvefur <zash@zash.se>
parents: 136
diff changeset
127 end
7130d5ec115c clix.raw: Allow specifying extra plugins to load
Kim Alvefur <zash@zash.se>
parents: 136
diff changeset
128 return clix_connect(opts, on_connect, plugins);
19
3a0a156e0a79 clix.raw: New command to set up a raw XML in/out session with the server
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
129 end

mercurial