parameterized routing implemented

Author: CreatCodeBuild

app.py

@@ -2,13 +2,19 @@
 
 if __name__ == '__main__':
 
+	app = app.App()
+
 	# A basic callback style API is provided
-	async def get_name(http, stream):
+	async def post_name(http, stream, parameters):
 		# this route essentially echo the data received back to client
 		print('data received:')
 		print(str(stream.data, encoding='utf8'))
 		await http.send_and_end(stream, stream.data)
+	app.post('name', post_name)
+
+	async def get_user(http, stream, parameters):
+		print(parameters)
+		await http.send_error(stream, 200)
+	app.get('user/{userId}', get_user)
 
-	app = app.App()
-	app.post('name', get_name)
 	app.up()

hyper2web/abstract.py

@@ -18,13 +18,7 @@ async def handle_route(self, http, stream):
 
 
 class AbstractRouter:
-    def _route(self, method: str, route: str, handler):
-        raise NotImplementedError
-
-    def get(self, route: str, handler):
-        raise NotImplementedError
-
-    def post(self, route: str, handler):
+    def register(self, method: str, route: str, handler):
         raise NotImplementedError
 
     async def handle_route(self, http, stream):

hyper2web/app.py

@@ -28,17 +28,18 @@ def __init__(self, port=5000, root='./public',
 		self.default_file = default_file
 
 		if auto_serve_static_file:
-			async def default_get(http, stream):
+			async def default_get(http, stream, parameters):
+				print('default_get')
 				route = stream.headers[':path'].lstrip('/')
 				full_path = os.path.join(self.root, route)
 				if os.path.exists(full_path):
 					await http.send_file(stream, full_path)
 				else:
 					await http.send_error(stream, 404)
 
-			self._router = router(default_get, None)
+			self._router = router(default_get)
 		else:
-			self._router = router(None, None)
+			self._router = router(None)
 
 	def up(self):
 		kernel = Kernel()
@@ -49,10 +50,10 @@ def up(self):
 				   shutdown=True)
 
 	def get(self, route: str, handler):
-		self._router.get(route, handler)
+		self._router.register('GET', route, handler)
 
 	def post(self, route: str, handler):
-		self._router.post(route, handler)
+		self._router.register('POST', route, handler)
 
 	# async
 	async def handle_route(self, http: HTTP, stream: Stream):

hyper2web/router.py

@@ -8,27 +8,18 @@ class Router(AbstractRouter):
 	"""User should never construct Router"""
 
 	# todo: I may want to change the constructor
-	def __init__(self, default_get, default_post):
+	def __init__(self, default_get):
 		self._routes = {
 			'GET': {},
 			'POST': {}
 		}
-		self.method_default = {
-			'GET': default_get,
-			'POST': default_post
-		}
+		self.default_get = default_get
 
-	def _route(self, method: str, route: str, handler):
-		assert method in ['GET', 'POST']
+	def register(self, method: str, route: str, handler):
+		assert method in ['GET', 'POST']  # 这只是目前为了测试而加的限制
 		self._routes[method][route] = handler
 
-	def get(self, route: str, handler):
-		self._route('GET', route, handler)
-
-	def post(self, route: str, handler):
-		self._route('POST', route, handler)
-
-	def match(self, path: str):
+	def find_match(self, path: str):
 		"""
 		'user/{userId}' should match 'user/abc'
 		userId = abc
@@ -39,11 +30,14 @@ def match(self, path: str):
 		# todo: now the problem is how to implement it
 		# todo: pattern matching should be independent from :method,
 		# todo: but the current implementation doesn't support it. Should improve it later.
+		print(self._routes.values())
 		for routes_of_this_method in self._routes.values():
+			print(routes_of_this_method)
 			for route in routes_of_this_method:
 				matched, parameters = self._match(route, path)
 				if matched:
 					return route, parameters
+		return None, None
 
 	@classmethod
 	def _match(cls, route, path):
@@ -70,8 +64,23 @@ async def handle_route(self, http: HTTP, stream: Stream):
 		path = stream.headers[':path'].lstrip('/')
 		method = stream.headers[':method']
 
-		route, parameters = self.match(path)
+		route, parameters = self.find_match(path)
+		print('app.App.handle_route', route)
+
+		# 如果没有任何匹配，就默认为静态文件读取
+		if route is None:
+			if method == 'GET':
+				print('GET')
+				handler = self.default_get
+			else:
+				handler = None
+		else:
+			handler = self._routes[method].get(route, None)
 
-		handler = self._routes[method].get(route, self.method_default[method])
 		if handler is not None:
-			await handler(http, stream, parameters=parameters)
+			print('handle')
+			print(handler)
+			await handler(http, stream, parameters)
+		else:
+			# maybe raise an error?
+			raise Exception(path, 'is not a valid request path')