source irccore.tcl
source parsecmd.tcl
source stdhelp.tcl
+source userv.tcl
# variables
#
# monitor/$monname(time-recent) -> $seconds
# monitor/$monname(time-recentnow) -> $seconds
#
-# deviceset/$username:$lno(monname) -> $monname
-# deviceset/$username:$lno(group) -> $led_group
-# deviceset/$username:$lno(states) -> [list $state1 $value1 $state2 ...]
-# deviceset/$username:$lno(fchan) -> [open remoteleds ... |] or unset
-# deviceset/$username:$lno(retry) -> [after ... ] or unset
+# deviceset/$username:$lno(monname) -> $monname
+# deviceset/$username:$lno(group) -> $led_group
+# deviceset/$username:$lno(username) -> $username
+# deviceset/$username:$lno(states) -> [list $state1 $value1 $state2 ...]
+# deviceset/$username:$lno(fchan) -> [open remoteleds ... |] or unset
+# deviceset/$username:$lno(retry) -> [after ... ] or unset
#
# onchans($chan) [list mustleave] # in config_chane
# onchans($chan) [list idle]
return $l
}
-proc privmsg_unlogged {prefix ischan params} {
- if {!$ischan} {
- prefix_nick
- execute_usercommand $p PRIVMSG $n $n \
- [lindex $params 0] [lindex $params 1]
- return 0
- }
+proc privmsg_unlogged {p ischan params} {
+ global errorInfo
+ if {!$ischan} { return 0 }
- foreach m [list_objs monitor] {
- mon_speech $m [irctolower [lindex $params 0]] [irctolower $n]
+ # on-channel message
+ if {[catch {
+ prefix_nick
+ foreach m [list_objs monitor] {
+ mon_speech $m [irctolower [lindex $params 0]] [irctolower $n]
+ }
+ } emsg]} {
+ log "processing error: $emsg\n$errorInfo"
}
return 1;
}
sendprivmsg $errchan $m
}
+proc msg_PRIVMSG {p c dest text} {
+ global errchan
+ prefix_nick
+ execute_usercommand $p $c $n $errchan $dest $text
+}
+
proc proc_mon {name argl body} {
proc mon_$name [concat m $argl] "
upvar #0 monitor/\$m mm
$body"
}
+proc mon_nick_is {globlist ln} {
+ foreach gl $globlist {
+ if {[string match $gl $ln]} { return 1 }
+ }
+ return 0
+}
+
proc_mon speech {chan ln} {
- if {[search -exact $mm(chans) $chan] == -1} return
+ if {[lsearch -exact $mm(chans) $chan] == -1} return
if {[mon_nick_is $mm(ignore) $ln]} return
set now [clock seconds]
set mm(last-talk) $now
- if {[mon_nick_is $mm(prefer)]} { set mm(last-talkpref) $now }
+ if {[mon_nick_is $mm(prefer) $ln]} { set mm(last-talkpref) $now }
mon_updateall $m
}
set s " "
if {[llength $mm(present)]} { append s "present " }
set now [clock seconds]
- for p {{} pref} {
+ foreach p {{} pref} {
foreach t {{} now} {
set since [expr {$now - $mm(time-recent$t)}]
- if {[expr {$mm(last-talk$pref) < $since}]} continue
+ if {[expr {$mm(last-talk$p) < $since}]} continue
append s "${p}talk${t} "
}
}
proc_mon updateall {} {
set s [mon_calcstate $m]
- for d [list_objs deviceset] {
+ foreach d [list_objs deviceset] {
upvar #0 deviceset/$d dd
if {[string compare $m $dd(monname)]} continue
- dset_setbystate $s
+ dset_setbystate $d $s
}
}
proc proc_dset {name argl body} {
proc dset_$name [concat d $argl] "
upvar #0 deviceset/\$d dd
- if {[catch {
+ if {\[catch {
$body
- } emsg]} {
+ } emsg\]} {
reporterr \"error on \$d: \$emsg\"
}"
}
+proc timed_log {m} {
+ log "[clock seconds] $m"
+}
+
proc_dset setbystate {s} {
set lv {}
- foreach {sq v} {
+ foreach {sq v} $s {
if {![string match *$sq* $s]} continue
set lv $v; break
}
+ timed_log "->$d $lv"
puts $dd(fchan) $lv
}
-proc dset_destroy {} {
+proc_dset destroy {} {
catch { after cancel $dd(retry) }
- catch { close $dd(fchan) }
+ catch {
+ if {[info exists dd(fchan)]} { timed_log ">\$$d destroy" }
+ close $dd(fchan)
+ }
catch { unset dd }
}
if {[catch {
set cfg [exec userv --timeout 3 $username irc-ledcontrol-config \
< /dev/null]
- set pw [exec userv --timeout 3 $username irc-ledcontrol-passwords \
- < /dev/null > pwdb/p$username]
} emsg]} {
+ regsub "\n" $emsg " // " emsg
reporterr "error reloading $username: $emsg"
+ return ""
}
- for d [list_objs deviceset] {
+ foreach d [list_objs deviceset] {
if {![string match $username:* $d]} continue
dset_destroy $d
}
- for m [list_objs monitor] {
+ foreach m [list_objs monitor] {
if {![string match $username* $m]} continue
mon_destroy $m
}
if {![string length $cfg]} {
file remove pwdb/$username
+ return "no config from $username"
+ } elseif {[catch {
+ exec userv --timeout 3 $username irc-ledcontrol-passwords \
+ < /dev/null > pwdb/p$username
+ } emsg]} {
+ reporterr "error reading passwords for $username: $emsg"
+ return ""
} elseif {[catch {
foreach cv {ignore nopresence prefer} { set cc($cv) {} }
set cc(time-recentnow) 120
set cc(time-recent) 450
- set pline 0
+ set lno 0
foreach l [split $cfg "\n"] {
- incr pline
+ incr lno
set l [string trim $l]
if {[regexp {^\#} $l]} {
} elseif {[regexp {^nick\s+(ignore|nopresence|prefer)\s+(\S.*)$} \
if {![string match $username:* $m]} {
error "monname must start with $username:"
}
+ check_monname $m
foreach ch [split $cl " "] {
if {![string length $ch]} continue
- check_nick $ch
+ check_chan $ch
if {![ischan $ch]} { error "invalid channel $ch" }
lappend cc(chans) [irctolower $ch]
+ chan_shortly $ch
}
upvar #0 monitor/$m mm
foreach cv [array names cc] { set mm($cv) $cc($cv) }
foreach cv {{} pref} { set mm(last-talk$cv) 0 }
+ set mm(present) {}
} elseif {[regexp \
{^leds\s+([0-9A-Za-z][-:/0-9A-Za-z]+)\s+(\S+)\s+(\S+.*)$} \
$l dummy g m states]} {
set d $username:$lno:$g
set sl {}
+ check_monname $m
foreach sv [split $states " "] {
if {![string length $sv]} continue
if {![regexp \
set dd(monname) $m
set dd(states) $sl
set dd(group) $g
+ set dd(username) $username
dset_start $d
}
}
} emsg]} {
- reporterr "setup error $username:$pline:$emsg"
+ reporterr "setup error $username:$lno:$emsg"
+ return ""
+ } else {
+ return "reloaded $username"
+ }
+}
+
+proc check_monname {m} {
+ if {[regexp {[^-_+:.#0-9a-zA-Z]} $m badchar]} {
+ error "char $badchar not allowed in monnames"
+ }
+ if {![regexp {^[0-9a-zA-Z]} $m]} {
+ error "monname must start with alphanum"
}
}
proc_dset start {} {
catch { unset dd(retry) }
+ set username $dd(username)
if {[catch {
- set fchan [open [list | \
- remoteleds 2>&1 --pipe $g \
- --passfile-only pwdb/p$username \
- |& cat \
- ]]
+ set cmdl [list remoteleds --pipe $dd(group) \
+ --passfile-only pwdb/p$username]
+ timed_log "!-$d [join $cmdl " "]"
+ set fchan [open |[concat $cmdl {|& cat}] r+]
fconfigure $fchan -blocking 0
fileevent $fchan readable [list dset_rledout $d]
set dd(fchan) $fchan
}
proc_dset rledout {} {
- global errchan retry_after
+ global errchan
while {[gets $dd(fchan) l] != -1} { reporterr "remoteleds on $d: $l" }
if {[fblocked $dd(fchan)]} return
- catch { close $dd(fchan) }
+ catch {
+ timed_log ">\$$d failure";
+ close $dd(fchan)
+ }
unset dd(fchan)
reporterr "remoteleds on $d died"
dset_trylater $d
}
proc_dset trylater {} {
- set dd(retry) [after $retry_after [list proc_dset start $d]]
+ global retry_after
+ set dd(retry) [after $retry_after [list dset_start $d]]
}
proc config_change {} {
}
set onchans($ch) mustleave
}
- set ch($errchan) forced
sendout JOIN $errchan
+ chan_shortly $errchan
foreach m [list_objs monitor] {
upvar #0 monitor/$m mm
foreach ch $mm(chans) {
proc chan_shortly {ch} {
global chan_after
upvar #0 onchans($ch) oc
- manyset $oc status after
- if {"$status" != "idle"} return
+ if {[info exists oc]} {
+ manyset $oc status after
+ if {"$status" == "shortly"} return
+ }
set oc [list shortly [after $chan_after chan_sendnames $ch]]
}
set oc idle
}
-def_ucmd reload {} {
+def_ucmd reload {
set username [ta_word]
ta_nomore
- reloaduser $username
+ set m [reloaduser $username]
config_change
+ ucmdr {} $m
}
-proc connected {
+def_ucmd who {
+ set r {}
+ foreach m [list_objs monitor] {
+ upvar #0 monitor/$m mm
+ lappend r "monitoring $mm(chans) for $m"
+ }
+ foreach d [list_objs deviceset] {
+ upvar #0 deviceset/$d dd
+ regexp {^[^:]*\:[^:]*} $dd(group) dest
+ lappend r "sending $dd(monname) to $dest"
+ }
+}
+
+proc connected {} {
foreach f [glob -nocomplain pwdb/p*] {
regexp {^pwdb/p(.*)$} $f dummy username
- check_username $username
- reloaduser $username
+ set m [reloaduser $username]
}
config_change
}
# 353
# JOIN PART
# KICK KILL QUIT
+
+if {[catch {
+ loadhelp
+ ensure_connecting
+} emsg]} {
+ fail "startup: $emsg"
+}
~ijackson / ircbot.git / commitdiff