beremiz: comparison runtime/WampClient.py

equal deleted inserted replaced

-:a603d1ba287b
+:7a4deed94eb2
 from autobahn.wamp import types, auth
 from autobahn.wamp.serializer import MsgPackSerializer
 from twisted.internet.defer import inlineCallbacks
 from twisted.internet.protocol import ReconnectingClientFactory
+import runtime.NevowServer as NS
+from formless import annotate
 mandatoryConfigItems = ["ID", "active", "realm", "url"]
 _transportFactory = None
 _WampSession = None
 SubscribedEvents = []
 """ things to do on join (callables) """
 DoOnJoin = []
+lastKnownConfig = None
 def GetCallee(name):
 """ Get Callee or Subscriber corresponding to '.' spearated object path """
 names = name.split('.')
 obj = _PySrv.plcobj
 else:
 self.join(u"Automation")
 def onChallenge(self, challenge):
 if challenge.method == u"wampcra":
-secret = self.config.extra["secret"].encode('utf8')
+if "secret" in self.config.extra:
-signature = auth.compute_wcs(secret, challenge.extra['challenge'].encode('utf8'))
+secret = self.config.extra["secret"].encode('utf8')
-return signature.decode("ascii")
+signature = auth.compute_wcs(secret, challenge.extra['challenge'].encode('utf8'))
+return signature.decode("ascii")
+else:
+raise Exception("no secret given for authentication")
 else:
 raise Exception("don't know how to handle authmethod {}".format(challenge.method))
 @inlineCallbacks
 def onJoin(self, details):
 super(ReconnectingWampWebSocketClientFactory, self).clientConnectionFailed(connector, reason)
 else:
 del connector
+def CheckConfiguration(WSClientConf):
+url = WSClientConf["url"]
+if not IsCorrectUri(url):
+raise annotate.ValidateError(
+{"url":"Invalid URL: {}".format(url)},
+_("WAMP confiuration error:"))
 def GetConfiguration():
+global lastKnownConfig
 WSClientConf = json.load(open(_WampConf))
 for itemName in mandatoryConfigItems:
 if WSClientConf.get(itemName, None) is None :
 raise Exception(_("WAMP configuration error : missing '{}' parameter.").format(itemName))
+CheckConfiguration(WSClientConf)
+lastKnownConfig = WSClientConf.copy()
 return WSClientConf
 def SetConfiguration(WSClientConf):
-try:
+global lastKnownConfig
-with open(os.path.realpath(_WampConf), 'w') as f:
-json.dump(WSClientConf, f, sort_keys=True, indent=4)
+CheckConfiguration(WSClientConf)
-if 'active' in WSClientConf and WSClientConf['active']:
-if _transportFactory and _WampSession:
+lastKnownConfig = WSClientConf.copy()
-StopReconnectWampClient()
-StartReconnectWampClient()
+with open(os.path.realpath(_WampConf), 'w') as f:
-else:
+json.dump(WSClientConf, f, sort_keys=True, indent=4)
+if 'active' in WSClientConf and WSClientConf['active']:
+if _transportFactory and _WampSession:
 StopReconnectWampClient()
+StartReconnectWampClient()
-return WSClientConf
+else:
-except ValueError, ve:
+StopReconnectWampClient()
-print(_("WAMP save error: "), ve)
-return None
+return WSClientConf
-except Exception, e:
-print(_("WAMP save error: "), e)
-return None
 def LoadWampSecret(secretfname):
-try:
+WSClientWampSecret = open(secretfname, 'rb').read()
-WSClientWampSecret = open(secretfname, 'rb').read()
+if len(WSClientWampSecret) == 0 :
-return WSClientWampSecret
+raise Exception(_("WAMP secret empty"))
-except ValueError, ve:
+return WSClientWampSecret
-print(_("Wamp secret load error:"), ve)
-return None
-except Exception:
-return None
 def IsCorrectUri(uri):
-if re.match(r'w{1}s{1,2}:{1}/{2}.+:{1}[0-9]+/{1}.+', uri):
+return re.match(r'wss?://[^\s?:#-]+(:[0-9]+)?(/[^\s]*)?$', uri) is not None
-return True
-else:
-return False
 def RegisterWampClient(wampconf=None, wampsecret=None):
 global _WampConf, _WampSecret
 if wampsecret:
 if wampconf:
 _WampConf = wampconf
 WSClientConf = GetConfiguration()
-if not IsCorrectUri(WSClientConf["url"]):
-raise Exception(_("WAMP url {} is not correct!").format(WSClientConf["url"]))
 if not WSClientConf["active"]:
 print(_("WAMP deactivated in configuration"))
 return
-WampSecret = LoadWampSecret(_WampSecret)
+if _WampSecret is not None:
+WSClientConf["secret"] = LoadWampSecret(_WampSecret)
-if WampSecret is not None:
-WSClientConf["secret"] = WampSecret
 # create a WAMP application session factory
 component_config = types.ComponentConfig(
 realm=WSClientConf["realm"],
 extra=WSClientConf)
 print(_("WAMP client can not connect to :"), WSClientConf["url"])
 return False
 def StopReconnectWampClient():
-_transportFactory.stopTrying()
+if _transportFactory is not None :
-return _WampSession.leave()
+_transportFactory.stopTrying()
+if _WampSession is not None :
+_WampSession.leave()
 def StartReconnectWampClient():
 if _WampSession:
 # do reconnect
 def GetSession():
 return _WampSession
+def getWampStatus():
-def StatusWampClient():
+if _transportFactory is not None :
-return _WampSession and _WampSession.is_attached()
+if _WampSession is not None :
+if _WampSession.is_attached() :
+return "Attached"
+return "Established"
+return "Connecting"
+return "Disconnected"
 def SetServer(pysrv):
 _PySrv = pysrv
+#### WEB CONFIGURATION INTERFACE ####
+webExposedConfigItems = ['active', 'url', 'ID']
+def wampConfigDefault(ctx,argument):
+if lastKnownConfig is not None :
+return lastKnownConfig.get(argument.name, None)
+def wampConfig(**kwargs):
+newConfig = lastKnownConfig.copy()
+for argname in webExposedConfigItems:
+newConfig[argname] = kwargs[argname]
+SetConfiguration(newConfig)
+webFormInterface = [
+("status",
+annotate.String(label=_("Current status"),
+immutable = True,
+default = lambda *k:getWampStatus())),
+("ID",
+annotate.String(label=_("ID"),
+default = wampConfigDefault)),
+("active",
+annotate.Boolean(label=_("Enable WAMP connection"),
+default=wampConfigDefault)),
+("url",
+annotate.String(label=_("WAMP Server URL"),
+default=wampConfigDefault))]
+NS.ConfigurableSettings.addExtension(
+"wamp",
+_("Wamp Settings"),
+webFormInterface,
+_("Set"),
+wampConfig)

branch	nevow_service_rework
changeset 2218	7a4deed94eb2
parent 2215	f808ec7dc10e
child 2220	985f234b0d09