From 2f42fcb35a644b30ecf8c4f7f50f36bfa06cd2bb Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Tue, 21 Apr 2020 22:43:22 +0200 Subject: [PATCH] Revive http service for serving assets. Streamlined flagset. --- pkg/assets/embed.go | 119 ++------------------------------------ pkg/assets/embed.yml | 4 +- pkg/command/server.go | 27 +++++++-- pkg/config/config.go | 7 +++ pkg/flagset/flagset.go | 14 +++++ pkg/server/grpc/option.go | 26 +++++---- pkg/server/grpc/server.go | 15 +++-- pkg/server/http/option.go | 16 ++--- pkg/server/http/server.go | 114 +++++++++++++++++++++--------------- 9 files changed, 148 insertions(+), 194 deletions(-) diff --git a/pkg/assets/embed.go b/pkg/assets/embed.go index 48433d19b..e834e140a 100644 --- a/pkg/assets/embed.go +++ b/pkg/assets/embed.go @@ -1,5 +1,5 @@ -// Code generated by fileb0x at "2020-04-21 21:09:33.242683 +0200 CEST m=+0.003837269" from config file "embed.yml" DO NOT EDIT. -// modification hash(f63be23a1d0af58f2fbee0850affb860.f981a36dcc1205c4270f67885fe56dea) +// Code generated by fileb0x at "2020-04-21 22:37:24.103861 +0200 CEST m=+0.004279436" from config file "embed.yml" DO NOT EDIT. +// modification hash(1b88c5605a5a76f1c853f14034afa80d.8058aec596c5fb73022d09bb97af796e) package assets @@ -35,17 +35,8 @@ type HTTPFS struct { Prefix string } -// FileAppJs is "app.js" -var FileAppJs = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x51\xc1\x8a\xc2\x30\x10\xbd\xe7\x2b\xde\x61\x21\x17\xb1\xbb\x47\x03\x1e\xf6\xb0\x0b\x1e\xf6\xe4\x51\x04\x43\x3b\xd5\x40\x9b\x09\xc9\x54\x04\xe9\xbf\x2f\x4d\x5b\xb5\xe0\x2d\xf3\x26\xf3\xde\x9b\x37\xae\x0d\x1c\x05\x7b\x12\x71\xfe\x9c\xbe\x43\x40\x1d\xb9\x85\x5e\x17\x25\xb7\x81\x3d\x79\x49\xc5\x4b\x7b\x7d\xed\x48\xab\x69\x2c\x09\x47\x7a\x0c\xe4\x4a\x2b\x55\xb2\x4f\x02\x1b\xc2\xce\xd7\x8c\x2d\xee\x0a\xf0\xb6\x25\x03\x3d\x13\xe9\x95\x02\x5c\x65\xa0\xd3\x02\x29\xd9\x1b\xe8\x33\xd9\x38\xd6\xe9\xd7\x35\xf4\x53\x39\xe1\x68\x50\xdb\x26\xd1\x00\xd3\x4d\xc8\x27\xc7\x3e\x19\x1c\x8e\x03\x52\xb2\xaf\xdd\xd9\x64\x29\xa0\x8b\x8d\x81\xbe\x88\x04\x53\x14\x0d\x97\xb6\xb9\x70\x12\xb3\xf9\xda\x7c\x6a\x05\xf4\xaa\x9f\x4d\x46\xee\x84\x12\xb6\x38\x28\x4c\xc3\x93\xd3\x85\x2f\x20\x58\xb9\x18\xe8\x62\x2a\x9f\xd9\xcc\x9a\x18\x16\x36\xaf\x41\x66\xb8\xcf\x7a\xc7\x59\xcf\xdb\xeb\x4e\xa8\x7d\xab\xb8\x5f\x2a\x0e\x59\xfc\x59\xa1\xe8\x6c\x63\xe6\x34\xd7\x03\x3a\xf6\xb3\xf5\xa7\xfa\x7b\xdb\xb3\xf1\x53\xf1\x71\x7f\x50\x54\x7d\x71\x5a\x9a\xa3\x5b\x3e\x67\x45\xb5\xed\x1a\xc9\x9c\xd3\xef\x81\x26\xdf\x75\x78\x8c\x69\xad\xf2\x39\xc7\x3d\x54\xaf\xfe\x03\x00\x00\xff\xff\x23\x2f\x62\x64\x42\x02\x00\x00") - -// FileClientSettingsIndexJs is "client/settings/index.js" -var FileClientSettingsIndexJs = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x57\x5f\x6f\xe3\x36\x0c\x7f\x0f\x90\xef\xc0\x01\xc5\x64\x27\x39\xfb\x9e\x3b\xf8\xba\xad\x2b\x86\x01\xdd\x16\x74\x2b\x86\xa1\x28\x7a\x6e\xcc\xa4\xba\xd8\x92\x23\x29\x6b\x83\x20\xdf\x7d\x90\xfc\x27\xb1\x2d\xa7\x5e\x9b\x1b\x96\xeb\xf2\x90\x38\x22\xf9\x23\x29\x91\xfc\xc9\xfe\x00\x50\xc6\x94\xa9\x77\x11\x95\xe1\x7d\x8c\x30\xf0\xfb\x3d\x9a\xa4\x5c\x28\x08\x9f\x28\x97\x30\x15\x3c\x01\x62\x9e\x49\x29\x5a\x14\xeb\x0b\xbd\x18\xa3\x82\x88\x27\x21\x65\x10\x00\x21\xfd\x1e\x3e\x19\xad\x09\x67\x52\xc1\x0c\xd5\x0f\x85\xd0\x71\x21\xf8\x00\xeb\x7e\x0f\x40\xa0\x5a\x0a\x96\xdb\xf5\x7b\x9b\x9a\x95\xdc\xb5\x3a\xc9\xb4\xb6\xc6\xa5\xb7\x93\x36\x7b\x81\x8b\x25\x4a\xa5\xad\x13\x54\x0f\x3c\x1a\xc1\x52\xc4\x23\xb8\xe7\xd1\x6a\x04\x8b\x25\x8a\xd5\x38\x14\x61\x82\x0a\x85\x1c\xc1\x94\x8b\x64\xa4\x4d\xa7\x74\xb6\x75\x93\x59\x42\x90\x3f\x78\x8a\x5f\xf2\x47\x14\xe7\xa1\x44\xc7\xd5\x0a\x3a\xf3\x39\xae\x24\x04\xf0\xeb\xfd\x27\x9c\x28\x4f\xff\x73\x6a\xf0\xa5\xaa\x59\xbf\x16\x31\x04\x3a\x18\xbd\x4a\xa7\xe0\x68\x13\x2f\x46\x36\x53\x0f\xf0\x01\xde\xbb\x99\x6f\xa8\x69\xc3\x10\xc8\x19\x81\x21\x2c\xa4\x27\x95\xa0\x6c\x46\xa7\x2b\xab\xa7\x8d\xfe\xf2\x7d\x8b\xc7\x61\xdd\x17\x9c\xe5\xa0\x99\x20\x09\x53\xfd\xa0\xf3\xd7\x3f\x43\x20\x81\x16\x22\x9b\xf0\x08\xaf\xaf\x7e\x3a\xe7\x49\xca\x19\x32\x55\xf7\x7b\x33\xc7\xd5\xad\xeb\x7a\x9f\x38\x65\x0e\xf9\x9a\xb8\x2e\x9c\x02\x21\x6e\x91\xa2\xde\xf5\x32\xaf\xfc\xe4\x4d\x49\xdd\x64\x3b\x7b\xeb\x14\x81\x16\x27\x94\x1f\x85\xc9\x07\x30\x96\x68\x70\x8a\x03\x09\x02\x20\x33\x54\xa4\x2b\x66\x13\xad\x9b\x5d\x65\xaf\x75\x8d\xb8\x55\x2c\x53\x77\xfe\x20\x78\xf1\xa7\xdf\x83\x01\x58\x3e\xfd\x1e\xbc\x1c\x54\xf7\xb0\x3f\x18\x18\x6c\xf3\x95\x37\xc3\x29\x5c\x52\xa9\x7e\x43\xa5\x28\x9b\xc9\xef\x97\x2c\x8a\x51\x1a\x85\xa5\x88\xad\xc2\xeb\xab\x4b\x23\xcf\x76\xc6\xaa\x72\xf7\xfb\x9f\xe3\x8b\xcc\x4b\xf8\x78\xd7\x06\x74\x77\xf5\xdd\x1f\x77\x05\xda\xb7\xa9\x2e\x1c\xc0\x27\x85\x4c\x52\xce\xe0\x9d\x09\xd3\xaf\xb5\xb0\x05\x06\x02\x98\x2e\xd9\x44\x51\xce\x9c\xb4\xac\x3e\x08\x60\xbd\xc9\x4b\x21\x33\x2d\xe7\xc3\x56\xc9\xcb\x47\x05\x9c\xd9\x16\x4f\xb7\x63\x2a\xeb\xec\x0c\x27\x3b\xeb\x1a\x4e\xb6\x58\xf4\x74\x1a\xaa\x07\x3d\xf6\xfc\x30\xa5\xfe\x5f\xef\xfd\xfb\x2c\x52\x52\xc8\x75\x39\x57\xfa\x7f\x5c\x8d\xbb\x90\xe9\xea\x2a\x17\x74\xad\x6f\x5d\xde\x90\x72\xab\xc8\x2d\x7c\x15\x04\xb0\x64\x11\x4e\x29\xc3\xa8\x3a\x2c\xc6\x2d\x26\xbb\xf1\x57\x24\xe5\xb8\xa8\x3a\xf4\x4e\xea\x73\xa5\x70\xb3\x3b\xe5\xf6\xe9\x7b\x53\x2e\x2e\xc2\xc9\x83\xd3\x3c\xae\x5f\xc2\x04\x4b\xbc\x66\xe0\x15\xbd\xdb\xda\xd6\xef\x57\xce\x20\x37\xee\x37\x65\x5a\x79\x7b\xe7\xf5\xef\x98\x99\x31\x2a\xaa\x63\x68\xce\xae\x1b\x25\x34\x09\x66\x4f\x91\xef\x56\xa9\x5b\x61\x3b\x4b\x95\x74\xc1\xd5\x2d\xb6\x07\x54\x67\xd5\x09\xa8\x16\x9b\xbd\x83\xf6\x15\xea\xa1\xba\xeb\xb9\xc6\xf9\xbf\xfe\x5f\x53\xff\x65\x56\xff\xe0\x7a\x52\xb9\x8e\xe5\xad\x51\xde\x0b\xfe\xcd\x0b\xc3\xa6\x8d\xbb\xce\x05\x86\x0a\xab\x15\xbd\x25\x2f\x9b\xb4\xce\x5e\x36\x1d\x0b\x7d\x59\xd5\x2c\xfc\xa5\xe7\x46\x0b\x75\xd9\x20\xde\x2a\x77\x69\x90\xd6\xb6\x35\x7b\x58\x6d\xcf\x4c\xbf\xa5\x33\x4b\xb8\xc0\x0a\x97\x57\xf1\x58\xf0\x84\x4a\xf4\x04\xea\xa2\x77\x18\x3e\xc2\x85\x10\x5c\x38\xe4\x67\x2a\x25\x65\x33\x53\x55\x54\x60\x04\x5b\xd7\xa7\x26\x18\xe2\xba\x5f\xe6\x50\x68\x27\xc5\x94\xcb\x83\xb1\xe2\xbe\xde\x79\x15\x2d\xb6\xf6\xee\x1e\x54\x93\x58\x37\xa8\x23\x65\xc6\x23\xaf\xc9\x2f\x93\xa8\x7e\x44\xd5\xc6\x52\x0d\x51\x9d\xa2\x1a\x0a\x16\x7e\x6a\xea\x74\x78\xb9\x2a\xd6\x75\xf6\x76\xce\x6a\xc0\x1e\x0f\x61\xf9\xeb\x32\xdd\x8d\xbf\x9e\xe3\x6a\xf3\x3a\x0a\xcb\xdd\xe8\x1f\x4f\x60\x1a\x87\x13\x74\xc8\x8e\x0f\x32\x82\x8f\x27\xeb\x96\x3b\xe5\xe6\xa3\xfb\xdc\x15\xf6\x73\x90\xd7\x16\x7f\x87\xc1\xec\x89\x98\x0d\x6a\xa4\x30\xc7\x55\x6b\xf0\x46\xf6\x59\xc2\xd6\xc8\x6f\x8f\x72\x0f\xf8\x1e\xda\x3a\x0d\xba\xd3\xad\xb5\x7d\x9e\xf7\xf3\xa2\xb7\x52\xdb\x04\xfc\xcf\x33\x6f\xcb\x7c\x39\xc4\x98\x38\x4c\x87\x1e\x79\xa3\x1c\xf7\x3d\xe0\xef\x00\x00\x00\xff\xff\x3d\x0a\xc9\xdc\x45\x19\x00\x00") - -// FileComponentsSettingsAppVue is "components/SettingsApp.vue" -var FileComponentsSettingsAppVue = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x91\xcf\x8a\xb3\x30\x14\xc5\xf7\x79\x8a\x4b\x37\x2a\xd4\xc8\xb7\x6d\xad\xd0\x6f\x33\x0f\xd0\xe5\x30\x0b\x49\xae\x1a\x26\xff\x30\x37\x22\x14\xdf\x7d\xd0\xa6\xed\x4c\xe9\xea\xde\x8b\xe7\xfc\x3c\x87\xd4\x84\xc6\xeb\x96\xb0\x61\x00\xb5\x54\x13\x08\xdd\x86\x70\xda\xc5\xef\xb2\xd3\x38\x43\x9a\xa5\x70\x3a\x1a\xfb\x38\x8d\x92\x52\xe3\x7a\x9a\x76\xec\x95\x2d\x67\xdd\x8e\x3d\x96\xe4\xfc\x6e\x45\x01\xd4\xc3\xbf\xdb\x02\x70\x41\x22\x65\xfb\x00\x01\xc7\x49\x09\xe4\x9c\xdf\x24\xd5\x4d\x53\x57\x52\x4d\x0d\xab\xab\x67\x18\x56\x07\x31\x2a\x4f\x0d\x53\xc6\xbb\x91\xe0\x0a\xa6\xf5\x67\x41\xca\xd9\xb0\x5f\xf7\x0f\x24\xc2\x31\xc0\x02\xdd\xe8\x0c\x64\x53\xc4\x39\x3b\x32\x9c\x37\xb9\xc4\xae\x8d\x9a\xe0\xca\x00\x6c\x6b\xf0\x00\xd9\x3d\xc5\xd9\xfb\x6c\xcf\x00\x84\x33\x3e\x12\xca\xc3\x26\x02\xe0\x9c\x3f\xb1\xf9\x35\x65\x0f\xc9\xf5\x3f\x5a\xa9\x31\xfc\xe2\x54\x2f\x9f\xb2\xcd\xb1\x14\x0c\x60\x59\xf9\x06\x69\x70\x32\xfc\xc5\xa7\x06\xf9\x83\x92\xed\xe1\x33\xfd\x2a\xeb\x90\xc4\x70\x79\x47\xfd\x7a\x52\x5d\xb4\x84\x12\xf2\x22\x71\x69\x50\x81\xbf\x73\xe6\x05\xa7\x01\x6d\x9e\x17\x70\x6a\xe0\xde\x47\x38\x1b\x9c\x46\xae\x5d\x9f\x6f\xd6\x97\x16\xc5\x31\xd5\x58\xe7\xc2\x16\x56\x57\xf7\x97\xf8\x09\x00\x00\xff\xff\x3b\x62\x86\x7e\x2c\x02\x00\x00") - -// FileStoreIndexJs is "store/index.js" -var FileStoreIndexJs = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x53\xc1\x6a\xe3\x30\x10\xbd\xeb\x2b\xde\x61\x41\x2e\x18\xb7\xec\xd1\xe0\x85\x6d\x9b\x96\x42\x36\x3d\x24\x7b\x5a\x96\xa0\xb5\x27\x8e\x40\x96\x82\x35\xa6\x2d\xc1\xff\xbe\xd8\xb2\x95\xd6\xe4\x24\x31\xf3\xde\x9b\xa7\x99\x91\x6e\x4e\xae\x65\x9c\xb1\xd6\x9e\xb7\xc4\xac\x6d\xed\xef\x3b\x5b\x19\xf2\xe8\x71\x68\x5d\x03\x99\x65\xb7\xa5\xd1\x64\xf9\xd6\x4f\x08\x29\x44\xe9\xac\x67\x78\x56\x4c\x28\x70\x16\x40\xe9\xec\x41\xd7\x39\x6c\x67\x4c\x2a\x00\xff\x55\x2e\xc7\x9f\xbf\xa2\x9f\x89\x35\x31\x53\xeb\x17\xd4\x49\xee\x47\xb8\x64\x21\x7c\x55\x6b\x81\x5c\xe4\x2f\x75\x9a\x8e\x15\x6b\x67\xe7\x4a\xdb\xd5\x6e\xbf\x5d\xed\x76\x2f\x9b\xe7\xed\xfe\xfe\xf7\xe6\x71\xbd\xda\x22\x19\x45\x52\x9c\xd4\x87\x71\xaa\xba\x19\x91\xb8\x2e\x8d\x62\x86\x09\xa0\x4f\x85\x00\xd6\xaf\x3f\x1f\xf7\x0f\xaf\x9b\xa7\x97\xe7\x28\x15\xac\x7f\x55\x0a\x31\x14\x53\x72\xe0\x5f\x8c\xaa\xf2\xb3\xcd\x41\xff\x21\xc0\x93\x33\x4a\xd7\x34\x9a\xd1\x2f\x65\x43\x3c\x91\x9f\x0c\xc8\x88\x89\xf6\x94\xff\xb0\x25\x0e\xc4\xe5\x71\x39\xe1\xa8\x9d\xa2\xd2\xfe\xa4\xb8\x3c\xa6\x71\x34\xfd\xa5\xcc\x60\xb0\x25\x7f\x72\xd6\x0f\xd3\x56\x6f\x4a\xf3\xb5\x95\x49\x02\x01\xf8\x56\xb9\x46\x69\x9b\xcf\x62\xd3\xdb\xb3\xae\x35\x23\xa2\xbf\x19\x0f\x7d\x40\x32\xeb\x66\x43\x93\x3a\x8f\xa2\x28\xf0\xfd\xee\x6e\x2e\x1e\xca\x3b\x43\x99\x71\xf5\x05\x5c\x29\x56\x37\x11\x10\xda\x70\x6d\xb6\x32\xc5\x15\x4e\x0f\x32\x9e\x62\x85\xf9\xed\x89\xf4\x47\xf7\xf6\x8b\xbc\x57\x35\xc9\x34\xe6\x01\xd6\x6c\x28\x87\x7c\x52\xda\x50\x05\x76\xa1\x9f\x71\x2f\xf1\x2f\x34\x20\x93\x69\xe4\x54\xe4\xcb\x1c\x8b\xe7\xed\xe8\x9d\x2f\x90\x10\xcb\x21\x2b\x65\x6b\x6a\xe5\x94\xe8\x53\x9c\xd1\x3a\xc7\x39\xb8\xed\x68\xee\x56\x3f\x6f\x0c\xbd\x8f\xbf\xb6\xa2\x83\xea\x0c\x8f\x36\xad\x6a\xc8\x9f\x54\x49\x55\xe0\x8c\x9f\x66\x5c\x45\x81\x79\x08\xc3\x75\x5a\xb3\xe1\x1a\xbf\x86\xe8\xc5\xff\x00\x00\x00\xff\xff\x7f\xe5\xdf\x9e\x08\x04\x00\x00") +// FileSettingsJs is "settings.js" +var FileSettingsJs = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x7c\x6b\x77\xdb\x38\xb2\xe0\xf7\xfd\x15\x12\x6e\x87\x07\x68\xc1\xb4\xec\x3c\x26\xa1\x82\xd6\x3a\x8e\xd3\x93\x99\xb4\xd3\x63\x3b\x33\x3d\xa3\x68\x7c\x69\xb2\x24\xa1\x4d\x01\x6a\x10\xf4\xa3\x25\xfe\xf7\x3d\x00\xf8\x16\x9d\x9e\xdd\x73\xcf\x7e\xb0\x05\x14\x0a\xaf\x42\xa1\x5e\x00\x18\xc3\x82\x0b\xc0\x33\x74\x97\xc1\x03\x9a\x53\xbc\xc8\x44\xa4\xb9\x14\x18\xc8\x16\x65\x29\x0c\x52\xad\x78\xa4\xd1\x24\x92\x22\xd5\x03\xcd\xb6\x22\x5c\x43\x80\x2e\x41\x6b\x2e\x96\xe9\xc9\x66\x83\x68\x24\xd7\x9b\x4c\x43\x1c\x6c\x7d\xdf\x07\x7f\x1d\x6e\x7e\x04\xad\x41\xa5\x78\x9b\x16\x78\xef\x32\x11\x27\x90\xd6\x15\x0f\x3b\x25\x28\x27\x39\x5d\x83\x5e\xc9\x38\xad\xdb\x39\xb1\x83\x49\x71\x55\x0d\xd1\x19\x5a\x80\x8e\x56\x97\x9d\xea\x73\x53\x5d\x66\x42\x43\x8c\xc9\x56\xaf\x78\xea\xf7\xe1\x61\xe2\xeb\x15\x08\x8c\x09\xfb\x61\x6b\xe6\x24\x13\xf0\x13\xb9\xc4\xb6\x46\x67\x4c\x24\x27\x79\x3e\xb9\x0b\xd5\x40\xb0\x8a\x30\x64\x6b\x00\xc0\x6c\x85\xef\x22\x05\xa1\x86\xb3\x04\xd6\x20\xf4\xc4\xc2\xae\x53\x48\x16\xfe\x75\x34\x51\xa0\x33\x25\x06\x0e\xb8\xc6\x63\x92\x4f\x84\x7f\x7d\xcf\xf5\xea\x52\x2b\xbe\xd9\x40\xcc\x86\xe3\x82\xb0\xaa\xee\x00\xa8\xa6\x82\x2a\x2a\x29\xa7\x21\x4d\x69\x44\x33\xb2\x45\x37\x52\x26\x10\x0a\x34\x64\xfa\x71\x03\x72\x31\x08\x3d\x0f\x47\x2c\xa5\x29\x0b\x69\xc8\x86\x47\xa4\x68\x69\xc1\x50\xd9\x14\x62\x25\xb2\x98\x0a\x5f\x6e\x2c\x2d\x03\x31\x49\x40\x0f\x92\x09\x5f\x60\xf0\x3c\xf0\x15\x88\x18\x94\xe7\xe1\x45\x91\x64\x25\x8c\x2e\xfc\x54\x87\x9a\x47\x17\x36\xfb\x41\xa4\x0c\xba\x10\x6a\xa6\x2a\xd7\x1b\x9e\xd8\xe9\x50\x69\x1b\x2a\x47\x10\x26\x6c\x38\x26\x84\xba\xe6\xaf\xd3\x48\x6e\xe0\x63\xcc\x14\xa1\x7c\x8a\x13\xd6\xe4\x36\x0c\x0c\x76\x3b\x47\xd5\x3b\x21\x63\xf0\xbc\x46\xc6\x4f\x53\x75\x2a\x85\x86\x07\x5d\x20\x6d\x42\x05\x42\x17\x48\x2e\xd3\xae\xd8\x82\x35\xea\x93\xdd\x0e\x65\xc2\x71\x7e\x5c\x93\xe8\xfa\xfa\xef\x5f\xce\xae\x2f\x2f\x2f\xae\x4f\x3f\x9f\x5f\x9d\xfd\x72\x75\x7d\xbd\xdb\x61\x60\x3d\x70\x42\x4d\xbf\x7e\x14\x26\x89\xe5\x1b\x1a\x61\x20\x84\x5a\x6a\x5e\x2b\x58\xf2\x54\x83\x82\xf8\x54\xae\x37\x52\x80\xd0\xe9\x93\x05\x7e\x18\xc7\x98\x93\xdc\x50\x31\x4d\xd5\x45\x81\xc2\x12\x12\x68\xcf\xc3\x09\x0b\xa7\x4d\x1a\x35\xfb\xcc\x0c\xa3\x58\x02\x29\x29\xb5\xff\x5d\xb1\xbc\x7e\xba\x0a\x63\x79\x7f\x21\xa5\x26\x24\x0f\x9e\xaa\x9d\x9a\x11\xe7\x84\x26\x84\x2f\x5a\xeb\x45\xb6\x8e\x8d\x80\x95\xec\x30\xa9\xf8\xa2\x6a\x4c\x53\x41\xb6\x05\x7b\x27\xae\x55\x41\x28\x58\x78\x9e\x43\x92\x42\xa3\x95\x1b\x58\x48\x05\xa7\x76\xa3\x4c\xda\x59\x06\xd3\xd9\xdc\x8f\xa4\x88\x42\x8d\x81\x26\x24\x98\x25\xf3\xbc\x68\x58\xe4\x78\xeb\x3a\x0e\x04\xed\x70\x5d\x30\xfb\x4f\xf6\x23\xd5\xac\xb5\x23\x77\x3b\xa8\x36\x25\x46\x31\xbf\x43\x74\xeb\x1a\x3e\x4d\xc2\x34\x0d\x50\x76\x7b\xb0\x48\xe0\x61\x50\xfc\x1e\x44\x32\xc9\xd6\xa2\xca\xae\x79\x1c\x27\x60\xb2\xeb\x50\x2d\xb9\x38\x78\x48\x42\xb5\x84\x03\x2d\x37\x28\xa7\x33\x8d\xd1\xea\x08\xd1\x99\xeb\xf3\x0e\xa3\xaf\x62\x30\x18\x0c\x4a\x09\x34\x48\x41\xdd\xf1\x08\x7c\xdf\x37\x05\x88\xcc\xc9\x9c\xe4\xf3\x9c\xde\x49\x1e\x0f\xc6\x54\x97\x89\xe1\xd1\x7e\xaa\xf5\x43\xac\x4c\x92\x2d\x91\x51\xad\x47\x83\x30\x0b\xa9\xb0\x93\x5e\x02\xee\x07\x27\x4a\x85\x8f\x38\x54\xcb\x6c\x6d\x59\x2f\x01\xb1\xd4\x2b\x42\x15\x1b\x4f\xd4\x5b\x51\xe4\x27\x6a\x34\x22\x62\xa6\xe6\xac\xc2\x9c\xa9\x79\x49\x36\xf0\xc3\xcd\x26\x79\x2c\x16\x9a\x72\xf6\xf9\xe6\x57\x88\xb4\xbf\x51\x52\x4b\xb3\x91\x7c\x2d\x8d\x70\x13\xcb\x49\x39\x8e\x41\x68\x78\xcf\xd5\x47\x33\x69\xf1\xdd\x58\xe6\x88\x31\xc6\x1d\xfb\x00\xc9\xab\x0a\x69\x5d\x61\xe0\x26\xcc\x18\x83\xba\x3c\x6a\x94\x8b\x2c\x49\x86\x8c\x81\xe7\x21\xd7\x74\xbd\xa1\x1b\x35\xb2\x9e\x21\x7c\x28\x0a\x9f\x1a\xc5\xc2\x51\x95\x2f\xb0\xeb\x03\xcc\x4e\x29\x3b\xa9\xa4\x30\x78\x1e\x06\x36\x83\x39\xa1\x66\x9e\xa4\x26\xf9\x98\x1a\x41\x5a\x10\x55\xbc\x55\x13\x31\x1a\x91\x62\x0b\x9a\x16\x29\xcc\xc4\x9c\x0a\x0a\x64\x62\x36\xcc\xa0\xac\x29\x07\x5c\x0c\x80\xec\x11\x76\x15\xa6\x9f\xef\xc5\xcf\x4a\x6e\x40\xe9\xc7\x62\xbc\x54\x92\x4a\x12\x15\x8d\xca\x39\x95\x14\x48\x6e\xda\x4a\xd8\x96\xa7\x96\xd6\x41\x48\x8b\xd4\xbb\x6c\xb1\x00\xd5\x12\x0c\x7d\x8b\xe3\xd0\x3a\xc4\xa1\x3c\x7d\xb2\x7a\x63\x29\x86\x66\x05\x3d\xaf\x04\xf8\x56\x16\xa8\x2c\xd2\x52\xb9\xc2\x26\x84\x78\x5e\x8f\xc2\x6a\xa1\xf8\x65\xb7\x46\x8e\xf6\xc1\x8b\xb1\x7d\x90\x6a\xfd\x3e\xd4\x61\xdf\xe4\x6a\x89\x5f\xad\x5d\x89\xee\x79\x30\xe0\x22\xd5\xa1\x88\x9a\xe0\xbc\x4d\xb1\xbf\x73\xb8\xff\x0f\x1b\x6e\xd4\xf2\xbc\x46\xc6\xe7\xa9\x69\x65\xba\x0f\xc2\x40\x02\xab\x3e\x6e\xaa\x79\xba\x54\x73\x60\x8d\x6a\x66\x6c\x6e\x9f\xf5\x0d\x29\xb5\x25\xcd\x9d\x40\x79\x7a\x9e\xad\x6f\xfa\xd7\x5d\xd8\x92\x0e\xba\xe3\xbf\x20\xa2\x3c\xfd\x52\xce\x30\x48\x29\x4f\xdf\x87\x1a\xbe\xc5\x3d\xa6\x7c\x9f\x6d\x3e\xf0\xe4\x9b\xb5\x4c\x79\x0f\xb3\x25\xf2\xe6\x5b\xb5\x4c\x79\x4f\x5f\x45\x85\x20\x73\x54\x82\x70\xdd\xc7\xaf\x91\x65\xd2\x0c\x83\xbf\xe1\x1b\x57\xf3\xcb\xc5\xa7\x4b\x08\x55\xb4\xfa\x39\x54\xe1\x3a\xfd\x0f\x97\xbb\x53\xab\xc3\x4e\x9d\x52\xb7\x72\xa1\x88\x43\x15\xbf\x53\xf2\x3e\x05\x75\x26\xee\x82\x86\xd4\x76\x1d\xe1\x3e\x1b\x45\x84\x77\x7c\x19\x6a\xa9\x76\x3b\x74\x01\x61\xa4\xcf\x43\xcd\xef\x00\x0d\x19\xab\x8a\x8c\xc8\x88\xb3\x48\x7b\x1e\x72\xa5\x97\x91\xe2\x1b\xfd\x24\xce\x65\x6f\x09\xf1\x3c\xdc\x37\xd7\x7b\x2e\x62\x79\xef\x79\x7d\x65\xb1\x8c\xac\xc2\x30\xe6\x8c\x54\x67\x61\xb4\x0a\x16\x74\x0d\x6a\x59\xaf\xfc\x00\x0a\x7d\xad\xd9\x36\xaf\x55\x84\xc0\x82\x2a\xb2\xdd\x13\xe1\x7a\xa6\xe6\x3d\x92\x5d\x4c\x4d\x01\x03\x6c\x7e\xa8\x20\x81\xcd\x8a\xbc\x14\xa1\x8a\x8d\xa9\x64\x5d\x4d\x37\x51\x6f\xa5\xd5\x6e\x0b\xdc\x54\x6d\x54\x90\xca\x28\xc8\x69\x0c\xb0\xf9\xe9\xff\xdb\x90\x7b\xd0\x00\x6f\x73\x53\xfe\x3f\x32\x1b\x78\xd0\x20\xe2\xa0\xed\x5a\xd4\x96\x02\xd6\x0d\x87\x4f\x9b\xe9\x80\x25\x64\xaf\x44\xd6\x53\x69\xd5\x7e\xa0\x73\x63\xeb\xe6\x54\x2b\xde\xbb\xaf\x8c\xf7\xb0\x49\xc2\x08\xf0\xe1\xbf\xbf\xa6\xdf\x1f\x52\x84\x48\x0d\xfa\x9a\x7e\xff\x9d\x05\xe5\x0d\x62\xc6\xcd\xea\x22\x92\x31\x7c\xb9\xf8\x58\x59\xc9\x18\x1a\xf5\x9f\xbd\x18\x1f\x2e\x39\x45\xff\xbb\xd9\xe8\xb3\xe7\x27\x16\x18\xb4\x80\xc7\x2f\x0e\x97\x14\x7d\xd7\x86\x9d\x5a\x44\xda\x06\x8e\x0d\xe2\xa8\x05\x7b\xf9\xce\x22\xce\xda\xc0\xf7\x16\x38\x47\x4e\xbd\x6e\x58\x97\xb2\x7c\x81\x87\x9a\x94\x33\xb1\x66\x9a\x32\x8e\x96\x20\x8a\x09\xac\x0b\x55\xcf\x17\x38\xf1\xf7\xa4\x0d\xd6\x84\x28\xa6\x2b\x0b\x0a\x3b\xec\xad\xb3\xf5\x66\xf3\x49\xe2\x17\xdb\xaa\xb5\x6e\xd6\x4a\x29\x4c\x14\xe3\x32\xf8\x85\xd6\xc2\x40\xa6\x7a\xc4\xd0\x6c\x8e\x02\x6b\xa1\xd0\xba\x3e\xb4\x1d\x7d\x53\xc7\x88\x6d\x53\x05\x98\xb1\xe1\x3e\x5e\x7e\x2e\x07\x11\x98\x52\xa7\x0d\xac\xc0\xc4\xc0\xfe\x72\xf9\xf9\xdc\x77\x4a\x86\x2f\x1e\xad\xef\x23\xfd\x4d\x96\xae\x70\x8c\x35\x19\x21\x86\x46\xb1\xf3\x2f\xec\x1f\x55\x4c\xfa\xbf\x4a\x2e\x30\xf2\x10\xc9\xf9\x02\x2b\xb7\xa3\x38\x03\x9f\x8b\x18\x1e\x3e\x2f\x30\xfa\x2f\x44\x26\x07\x47\x43\xc6\xb8\xed\x03\xfc\x34\xe1\x11\xe0\x31\xe5\x86\xdd\x46\x0c\x1f\x1c\x19\x33\xb0\xae\x30\x45\x64\x8a\xa6\x28\x30\x8d\x8e\x54\xe9\x35\x40\x83\xad\x56\x65\x24\x60\x15\x1a\x7f\x5e\xa5\x6c\x36\xcf\x57\x0d\x9b\x2a\x4b\xa1\xdf\x88\x6e\xd5\x72\x53\xdb\x2e\xb2\x64\xc1\x93\x04\xe2\x00\xa8\x02\x43\x0f\x88\xcd\x66\xa0\x6d\x64\xb7\x3d\x0f\x8e\x72\xda\xec\xc9\xe2\xb7\xfc\xdd\x56\xad\x19\xcc\x3d\x0f\x77\x41\xcc\x2c\x2b\x69\x37\x54\x2c\x21\x6b\xaf\x5f\xc5\x18\xcd\x16\x9a\x9b\xbb\x64\x11\xa6\x3d\x0f\xb0\x36\xcb\xe2\x22\x1b\x6b\xb6\xa2\x8f\x7b\x7c\x5c\xf9\x76\x65\xc3\xa2\xd1\x98\x20\x5b\x60\x8e\x5e\x85\x28\x58\xb2\x7d\x39\x30\xc4\x43\xd8\xed\x86\xe0\x5f\x5f\x9f\x9e\x9c\x9f\x9e\x7d\xba\xbe\x26\x39\xbd\x63\x7d\x9a\x63\x99\xc8\x9b\x30\x99\xba\x9f\xa0\x0f\xc3\x78\x70\x53\xf3\xaf\xb7\xd4\x69\xa5\xa9\xfb\x09\x9a\x62\xfa\xc6\xb2\x80\x92\xf7\x03\xe3\x02\x9d\x29\x25\x15\x46\x29\xe8\x2b\xbe\x06\x99\xe9\xc1\x2a\x4c\x07\x42\xea\xc1\x0d\x80\x18\x94\xed\x36\xbc\x80\xfb\xbe\xfa\x51\x02\xa1\xfa\x83\x16\x0c\x6d\x2f\xd9\x0d\x3d\x63\xf7\xf5\x68\x7e\x35\xe4\xe1\x0b\x7c\xc9\x18\xab\x07\x51\xca\x8b\x1a\x82\x81\x8e\x89\x91\x1b\x16\xf3\x66\xb7\x1b\x5e\x12\xcf\xdb\xaf\x71\xd9\x68\x85\x76\xab\x6b\xf5\x58\xae\xe3\xa5\x85\xe4\x51\xa8\x0d\x8f\x90\x6d\xb3\xa8\xe9\x3c\xb4\x90\xda\x08\x36\x6a\x60\x11\xf2\xbc\x47\x3b\xdc\xf9\x75\xf7\x9e\x87\x9b\x03\x23\xb4\x17\xbf\x49\x44\xcf\xc3\x67\xac\x09\x70\x1e\xee\x29\xbd\x62\xb3\x39\xfd\xcc\x86\x47\xf4\x81\x1d\x1c\xd5\x84\x3c\xc7\x64\xfb\xd9\xf3\x4e\x3d\x0f\xdb\xd2\xd3\x62\xdb\x4d\xaf\xd8\x69\x19\x4f\xb8\x22\x81\xa9\x44\xaf\x8a\x32\xcf\xbb\xc0\xa4\xb1\xb4\x17\xd8\xc9\xeb\xcf\x65\x04\xe1\x57\x7c\x4e\x26\x9f\xd9\x70\x3c\x29\x55\xaf\x66\x65\xe5\x89\x9e\x38\x7f\xfa\x94\x5d\xd9\x51\x4d\x46\xa3\x87\xb7\x7a\x42\x4e\x3d\xef\x74\xf6\x30\xf7\x55\x26\x30\x99\xd8\x0e\xeb\x5a\xf9\xa9\xdd\xc2\x6e\x06\xcd\x2d\xc2\x17\xf8\x8c\xb1\xf6\x94\x4b\xb3\xb4\x01\xc3\xe0\xb8\xc0\xe0\xde\xef\x76\xc3\x33\xe2\x79\x7d\x75\xda\xc4\xa3\xdd\x26\xcc\x72\x9f\x19\xe3\xb8\x8f\x01\xce\x9a\x0c\xb0\xbf\xfc\x67\xcd\xe5\x37\x8b\x6f\xda\xa9\x89\x78\xe2\xc4\xa6\x8b\xb7\x66\x82\x15\x31\xa9\xd0\x68\x20\xa6\xf3\x93\x86\xe4\x52\x59\x2b\x8a\x5a\x56\x29\x22\x0a\xb6\xff\xba\x2e\x69\xec\xe1\x5b\x4c\xb6\x76\x3f\xbd\x63\xb7\xf4\x9a\xdd\xd2\xf7\xec\x96\xfe\xcc\x6e\xe9\x17\x76\x4b\x3f\xb1\x5b\xfa\x81\xdd\x5a\x7e\xf9\x8d\xdd\xf9\x1b\x50\x0b\xa9\xd6\xc6\xf8\xde\xed\xb6\x39\xfd\x8e\xfd\xe6\x0b\x79\xbf\xdb\xfd\xe6\xaf\xe5\xef\xe7\x45\x2a\x2d\x12\xb2\xf8\xbd\x87\x9b\x5b\xae\x6d\x66\xdf\x12\x37\x3b\xdf\xa8\x47\xe2\x2f\x1d\x53\xe3\x42\x76\x7e\x64\x65\x91\xcd\xfe\xce\xb6\x02\x1e\xf4\x15\x8f\x6e\x5b\x76\x91\xe3\xa4\xa7\x43\x30\x07\x47\x76\x95\xbb\xe0\x1f\x8e\x1a\xd1\x84\xa3\x89\x78\xbb\x67\x02\xda\x88\xc2\x4c\x1c\x1c\x35\x83\x35\x62\x3e\xb9\x72\x1a\xcb\xf6\x68\xd7\x87\x50\xa3\x58\x4b\xae\xdc\xed\x3e\xef\x76\xbf\xe2\x0b\x92\x53\xcd\x75\x02\x01\xba\x71\x8e\x08\xa2\x45\x22\x18\x8e\x29\x88\xbb\x60\x9b\xd3\x50\x2d\xef\x82\xd9\x9c\xde\x81\x4a\x8d\x4f\x85\x50\x99\x4c\x4d\xb1\x14\xc1\x3b\x1a\xc6\xf1\x27\x9e\x6a\x10\xa0\x82\x6b\x2a\x45\x04\xc1\x7b\x2a\x17\x8b\xe0\x67\xaa\x60\x2d\xef\xa0\x2a\xfd\x52\x00\x4e\x92\xa4\x84\xa5\xc1\x27\x0a\x6b\xae\x83\x0f\xf4\x86\x8b\xb8\xeb\xd2\xee\x09\xdf\x8d\x92\x11\xa4\xa9\x5f\x20\x0f\xb8\x13\xbf\x69\xb6\xd9\x48\xa5\xad\xec\xa5\xd1\x7d\xbc\xef\x51\xa1\x43\x94\xd3\x68\x15\x73\xf5\x9f\x75\x60\x51\x7b\x9b\xcf\xd6\x61\x7a\xbb\xdf\xc1\x60\x9c\xd3\x95\xd2\x7c\x0d\x3d\xcb\xef\x8f\xc7\x47\xdf\x7f\xe7\x36\xd3\x6f\x84\x0a\xf6\x53\xa8\x57\xfe\x22\x91\x52\x61\x6d\x4c\xa4\x66\xfe\xd9\xd1\xf7\x47\xf0\xa6\xb2\xe4\x8d\x5d\x27\x0e\x18\xcc\xc6\x73\x8a\x95\x49\x1c\xcd\xc9\xdb\xb1\x85\x1e\x50\x35\x62\x06\x99\xd0\x99\xa0\x6a\x9e\xd3\x4d\x12\x6a\xb3\x05\x1a\xcb\xaa\x20\x81\x30\x05\xb3\x60\x91\x14\x0b\xbe\x34\xa9\x6c\xd3\x1e\xea\x1e\xbf\x1f\x7c\x24\x87\x47\xf0\x3c\xcf\xe9\x9f\x3b\x56\x52\xbf\x25\x69\x1d\x22\xe5\x6c\x0c\xe5\x6b\xf9\x65\xb3\x01\x75\x1a\xa6\x80\x09\x63\xd6\xb0\x6d\x40\x8c\x91\x37\xd3\x73\x26\x68\x0c\x09\x68\x18\x18\xd7\xc3\x9a\x25\xf4\xa7\x9e\xb3\x90\xfd\xf0\xe6\x7e\x91\x8d\x0d\x2d\xf8\x92\x69\x2a\x4c\xf3\xbe\x71\x24\x98\x20\xd4\x78\x24\xbf\x65\x90\x6a\xa6\x6c\x3a\xdd\x48\x91\x02\x93\x14\x8c\xb1\xfc\xc0\x65\x6a\x97\x9e\x19\xae\xf7\xb5\x34\xe6\x2d\xdb\x23\xcb\x76\x0d\x69\x1a\x2e\x21\xb0\x42\xaa\xc8\x50\x7b\x1a\x66\x21\x26\x45\x63\x48\xad\xb7\x6d\x76\x8a\x85\x36\x00\xd4\xc5\x59\x0a\x6c\x9b\xa6\x0b\x9e\xc0\x79\xd5\x44\x99\xa3\x09\x17\x70\xde\xc0\xae\xf3\xd4\x85\xa4\x9b\x85\x4d\x08\x4d\x75\x18\xdd\x3a\xb8\x4d\x96\xeb\x5d\x60\x9a\x34\x35\x64\x29\x01\x31\xe4\x39\x85\x1c\xd7\xfc\x0f\xa4\x22\x6c\x4e\xff\xce\x66\x28\x5c\x02\xa2\x28\xcc\xf4\x4a\x2a\xfe\x7b\x68\xf5\x38\x45\x91\x14\x1a\x84\x3e\x70\x22\xa5\x01\x30\xb2\x1e\x51\x04\x3a\x5c\x9a\x9f\x87\x0d\x57\x90\x22\x8a\x16\x4a\xae\x11\x45\x2b\x99\x6a\x44\x11\x5f\x1c\xac\x65\xcc\x17\x1c\xe2\x83\x94\x8b\x08\x1c\x2c\x13\x7b\xd0\x24\x4c\x75\x85\x6b\xf2\x32\x2a\xc7\xb0\x0e\x1f\x0e\x16\x52\xdd\x87\x2a\x36\x3d\x6c\x94\x7c\x78\x3c\xe8\x0e\x54\xc1\x02\x94\xd9\x04\x48\x81\x56\x8f\x07\xe1\x42\xdb\x5c\x96\x82\x3a\x08\x97\x20\x34\x9a\xd3\x5f\x98\xf1\x72\xf6\xe3\x32\x98\x4c\xbb\x07\x0d\x54\xb3\x43\xbc\x4e\x39\xec\xb4\xe2\x31\x08\x4d\x0e\xb9\xaf\x21\xd5\xb8\x0e\xa2\x98\xb6\x4f\x4c\xd3\x66\xa3\x97\x61\x11\xbf\x75\x36\x81\x51\x88\x48\xad\xe3\x54\x29\x29\x14\xab\xcf\x28\xcc\x06\x37\x76\xd5\x89\xd6\x8a\xdf\x64\x1a\x30\x5a\x29\x58\x20\xaa\x8c\xc0\x10\xbe\xc9\x10\xfa\x24\xca\xd6\xa4\x02\x87\x46\xad\x1e\x8e\x64\x12\x08\xbf\x4c\x4e\xeb\x64\xed\xe3\x06\xce\x3b\x37\x72\xde\x2c\x95\xa9\x2e\x53\x63\x5c\x1a\x47\x35\x30\x7d\x99\xc4\xb4\x4c\x34\x7d\xfd\x69\x5d\x33\x4c\x0d\xae\xf9\x99\xba\x9f\x06\xde\x7f\xb5\x3a\xb0\x1b\xc8\x75\x62\x77\x90\x91\xb2\x66\x8c\x52\x69\xba\x09\xf5\xca\x1d\x37\x1f\x22\xc6\x98\xf0\x4b\x80\x1f\xad\x42\x75\xa2\xf1\x98\x4c\x6b\xa0\xc1\x1a\xd5\xd9\xbc\xf2\x08\x99\xc2\xce\x33\xf0\x4b\xde\x29\x28\xd7\x74\x8f\x9c\x9a\x75\x5c\x60\x1d\x5f\x4d\xa6\x46\x32\x07\xba\x5c\x8e\x9a\x5a\xd6\x0f\x2d\x33\x9e\xe7\x46\x6f\x81\x26\x91\xe7\x98\xec\x4b\xd5\xe1\x38\xa7\x3f\x3e\xcd\x65\xdb\x7b\xc5\x5b\x71\xd5\xfa\x10\xd8\x8d\x2d\x34\x36\x67\xe8\x14\x3b\x58\x17\xbb\x27\x50\x62\x34\xbd\xe9\xc2\x09\x03\x2c\x88\xe7\x15\x55\xca\x8d\xc8\xd0\xa8\x14\xef\x58\x10\x5f\xcb\x1f\x7f\xba\x2a\x3d\x7d\x57\xb7\xc8\xa9\x46\x5d\x43\x52\x86\x46\xaa\x85\x20\x1b\x08\xb1\x5c\x87\x5c\x30\x34\x92\x84\x0e\xc7\xcc\xfa\xf0\x65\x59\x0a\x51\xa6\x00\x11\x5a\xef\x03\x29\x6f\x39\xb0\xb0\x88\x09\x4c\x06\x46\xa7\x2a\x08\xe3\x1e\xb5\xd9\xa9\xe4\xaf\xad\x79\x6a\xa6\x70\x01\xcb\xb3\x87\x0d\x46\xf8\xdf\xbb\xc9\xd7\xaf\xe9\xf7\x04\xa3\x11\x8c\x10\x61\x78\xf6\xef\xc9\xfc\x7b\x82\x48\x1d\x09\x9b\xc6\xb0\x4f\xab\xd9\xf3\x39\x09\x8c\xd9\x99\x17\x46\x49\xb0\xe7\x9e\xdb\x45\xc1\x40\x11\xa2\x86\x62\xc6\x90\xc4\xe4\xe0\xf5\xab\x17\xf0\x92\xe4\x79\xd0\x5d\x34\xb2\xed\xce\xa3\x75\x38\xb2\xdf\x0f\xd9\xe6\x39\xfd\x5b\x8f\xf3\x6c\xed\x91\x9f\x95\x5c\xf3\x14\x30\x6e\x9f\xbb\x16\x52\xc2\x8f\x43\x1d\x52\x69\x98\x0e\xc2\x18\x54\x3a\x31\x8b\x53\x1e\x5e\xd8\xf5\x2b\x34\xab\x9c\xa1\xd3\x42\x38\x5f\x19\xe1\x3c\x9f\xb8\xe0\x8b\xe9\xe3\x97\x9f\x3e\xfd\x59\xeb\xcd\x85\xd3\x8f\xf6\x4e\x80\x6f\x24\x68\xc9\x74\x2e\x67\x05\x9a\xd9\x54\xbb\x1d\x42\x34\x2d\xa1\x9b\x30\x4d\xef\xa5\x8a\x0d\x74\x22\xfd\x93\xa6\xe4\x65\xe8\x5d\x98\xf2\x68\x80\x46\x37\x5a\x86\x38\x1c\xa1\x00\x8d\x52\xe7\x17\x47\x34\xa3\x0b\x86\x23\x06\xfe\x4d\x98\xc2\x97\x8b\x4f\x34\x63\xe0\x67\x2a\xa1\x91\xe7\x0d\x0f\xff\x8d\x67\xe1\xc1\xef\x73\xf3\xef\x6b\xfc\x75\xf4\xf5\xe0\xab\x3f\xff\x3e\x20\xd3\xaf\x87\x5f\x0f\x4b\x61\x9b\x35\x24\x73\x2b\x72\x33\x6d\xc4\x1f\xbf\x1e\x8e\x9c\x38\x1b\x19\xd9\xa0\x9b\xc2\xea\x70\xe4\xc4\x10\xe4\x38\xa2\x19\x09\x32\x6b\x83\x73\x5f\x6e\x40\x60\xf0\xdd\x4d\x94\xb6\xc9\x42\x37\x78\x41\xc1\xdf\xd8\x68\x5d\x95\xb8\x04\xc5\xc3\x84\xff\x0e\xca\xf0\x3e\xa1\xdc\xd7\xce\xf3\x62\x50\xa6\x28\xf7\xa5\x30\x8c\xf1\x98\xea\x50\x43\xb4\x0a\xc5\x12\x9a\x16\x86\xe9\xd9\xf3\x5e\xd8\x83\x0c\x8b\x77\x69\xf0\x3c\x0f\x8f\x87\x06\x64\x6a\x65\xe9\x6e\xc7\x2b\xdb\xe5\xcb\xc5\x27\xcf\x1b\x17\xf8\x15\xa8\x8e\x8d\x19\x4b\x22\x40\x84\x14\xdc\x42\x65\x79\x93\x84\xa1\x25\xe8\x93\x24\xb9\x28\x6a\xfd\xd9\xf1\x0e\xe2\x62\xc0\xa7\x58\x31\xee\xf7\x96\x63\x42\x23\x66\xb8\x7b\x8a\x6b\xdb\x4f\xf9\xe9\x26\xe1\x1a\xa3\xaf\x02\x91\x76\x44\x91\x2f\x70\xda\x8c\xd5\x05\x88\x50\xc9\x12\x5f\x2b\xbe\xc6\xe0\xa7\xd9\x4d\xaa\x15\x1e\xd3\x94\x18\x19\xf4\x49\xde\x57\x34\x0e\xf7\xb0\xd2\xd1\x11\x21\xc6\xcc\xe3\x0b\x1c\xcd\xe4\xdc\xf3\xfe\x5e\x35\x2c\xc9\x0f\x6c\x5c\x78\xc1\x13\x53\xc8\x50\x0a\xfa\xc0\x09\x0b\xa3\x33\xe4\xd4\xd6\x99\x9a\x7f\xc1\x6c\x4e\xca\xe0\xc0\x2c\x9c\x93\xa0\x2a\x19\x21\x3a\x40\xa3\x30\x08\xf3\x9c\x10\x1a\x91\x20\x72\x92\x81\x2e\xd8\xd6\x6c\xb3\xa0\xb6\x1a\xcd\x0e\xf2\x3c\xa4\xe1\xc1\x1e\xa9\xb4\x0b\xa6\xf5\x72\x04\x75\xf2\x0a\x1e\x34\x75\x6b\x18\x94\x8b\x59\xe4\x4d\x51\x05\xb3\x78\xc5\x66\x0e\xb2\xd2\x72\x03\x5a\x18\xaf\x01\xcf\x27\xc3\x6e\xa0\xce\x09\x03\x51\x98\x76\xfe\x5d\x98\xf0\x38\xd4\x70\x69\x1b\x9c\x0c\xd5\x6e\xa7\x8c\x0d\x61\xb3\x64\x6a\x64\x7e\xa0\xf1\x4f\x18\x15\x1b\x7e\xb0\x08\x79\x02\xf1\xe0\x9e\xeb\xd5\xc0\x61\x0d\x8c\xa4\x1c\x18\x4d\x5a\x8c\xb4\x6c\x9c\x5a\x8a\x88\xd2\x96\xa6\x82\x90\xdc\x48\x24\xba\x20\x94\xdb\x38\x47\x9e\x5b\x4e\x0f\x6f\xa4\xd2\x2d\xf6\x36\x86\x4c\xb3\x57\x8b\x61\xac\x39\xa0\xe8\xec\xf4\xf3\xf9\xf9\xc9\xbb\xcf\x17\x57\x67\xef\x91\x0d\xf6\xf2\x32\xee\x69\x1a\x03\x6b\x99\x37\x1a\xb3\x0d\x9d\x83\xbe\x97\xea\xd6\x99\xac\xa6\x19\x3b\xb6\xba\xb2\xab\x5b\x6e\xc4\x8e\x09\xa7\x19\x2a\x4a\x06\x72\x31\x40\xa3\x6a\x9f\x8e\xd0\x3a\x1d\xc0\x43\x04\x10\x43\x8c\x26\x15\xdc\xf6\xf2\x93\xb3\xf8\x3d\x0f\x37\x76\x76\xb3\x84\x50\x33\x34\xfd\xad\x39\xe5\xf4\x29\x03\xc0\x8d\x2c\x66\x3f\xd2\x15\xc3\xe0\x9b\xf5\x38\x55\x60\xcc\x4b\x1e\x26\xe9\x6e\xf7\x0b\x5e\x10\xe2\x79\xe0\x3f\xa4\x6a\x71\x6a\xd9\xdb\x78\x0a\xd3\xd8\xca\x0b\xdc\x85\x93\xc0\x5d\x9c\x98\xac\x3c\x0f\xcb\x99\x2b\x76\x7b\xd9\x14\xcf\xd9\xca\xc6\xe1\xcd\x66\x29\xd6\xc4\x15\x5a\x39\xe0\x79\xf5\x1e\x97\xdd\x93\x86\xea\x42\x86\xf2\xbc\xb6\xcd\x5f\xf8\x78\x8d\xcd\x3c\xad\x14\x90\x9e\x1b\x2e\xef\x74\x66\x68\x65\x23\xc8\xf6\x30\xa4\x8c\xea\xee\xcf\x9e\xec\x76\x98\x77\x81\x6c\x38\xdc\x47\xa4\xed\xed\x48\xb4\x7a\xdc\xf2\x16\xa8\xb3\x61\xeb\x70\x97\xa1\xc6\xaf\xa9\x14\xfb\x9b\x9a\xb8\x08\x81\xee\x0b\x7b\x82\x2f\xc5\x7b\x79\x2f\x12\x19\xc6\x3f\x2b\xb9\x54\x90\xa6\x9e\xc7\xfd\x30\x8e\xcf\xee\x40\xe8\x32\xc8\x61\xa3\x0a\xb6\x14\xd1\xbe\x3a\xbd\x31\x52\x83\xf8\x65\xd3\x6d\x3a\xb3\x90\x3a\xf5\x87\x7d\xb5\x9b\x30\x34\x8a\x42\x11\x41\x72\x25\x6f\x41\xd8\x1b\x15\x75\xd6\x58\xb5\xc6\xe6\x28\x2e\x49\xb6\x44\xba\xe7\x61\xee\xdb\x9d\x8b\x0d\xab\x43\xbd\x51\x09\xa1\x4d\xb6\xc0\xca\xc1\xa9\x59\x72\x11\x63\xe5\xdc\xfa\xbf\xb0\x6d\xdb\x0e\x09\x50\xb8\xd9\x24\xdc\x99\xe4\x87\x0f\x07\xf7\xf7\xf7\xc6\x9d\x5b\x1f\x64\x2a\x71\xc6\x6d\x8c\x1a\x61\xc0\xbf\x3a\x06\x1c\x76\xb8\x85\x18\x76\x6d\x41\xba\xe6\x8e\x8b\x35\x74\x80\x4c\x3b\x5b\xe4\x1f\xf4\x9f\x6c\x1b\xc6\xe1\x46\x83\x0a\x70\xef\x99\x77\xdb\x46\xda\xed\xdc\x5c\x87\x8c\xfd\xee\x79\xd5\x55\x84\x22\x6a\x64\x6f\x23\x3c\x79\x29\xca\x85\x7f\x7e\x37\x3b\x19\xff\x83\xfd\x8d\xd0\x7f\x10\xaa\x55\x28\x52\x33\xed\xa2\xfd\xc6\xd5\xb6\xa6\x5d\xf3\x67\xac\x29\x3a\x89\x22\xd8\x68\x44\xa8\xcd\xb5\x26\xe4\x76\x51\x65\xfe\x01\xd9\xed\xaa\xa3\xc0\xea\x92\x8c\x83\x75\xb2\xee\x86\x44\x95\xfd\xc0\x13\xa8\x51\x13\x79\x63\x4f\x05\x83\x4e\x63\xc5\xa5\x95\x69\x79\x4f\x25\xe8\x3b\xd0\x04\x32\xc5\x7f\x35\x23\xfd\xc3\x75\x9e\x18\x87\x2e\x05\xcd\x32\xbd\x38\x78\x8d\x08\x85\xc6\x31\x68\xe7\x08\xb2\xa7\x4d\xb3\x71\xf7\x9a\xd8\x3f\xa5\x0c\x20\x9f\x37\xe9\x5d\x68\xea\x59\xc7\x72\xd9\xbf\x3f\x63\x05\x49\x71\xee\xb9\x31\xbd\xd4\xc1\x74\x20\xdb\xfa\xe8\x71\x4e\x0b\xbd\x10\x8c\x69\x5b\x20\x07\xe8\x97\xcb\x8b\x0f\x07\x57\x9f\xff\x7a\x76\x8e\x68\x5b\x1a\x07\xe8\x97\x83\x66\xe9\x3a\x7c\x28\x96\xf6\x93\x0d\xae\x04\x07\x47\xb4\xad\xd8\x7b\x8f\xdd\x7f\x60\xc7\xe3\xb1\xe7\xc1\xdb\xe7\xe3\x71\x9e\x4f\xfe\x59\xfa\x05\x6c\x1b\xc9\xf5\x5a\x8a\x60\xeb\xd8\x27\xd8\x23\x1d\x1d\x18\x73\xe6\x70\x93\x84\x5c\xd0\xc1\xf7\x87\xdf\xa3\x3c\x6f\x9c\x16\xcf\x90\x93\xe3\x88\x1a\xe3\x11\x51\x64\x1a\xee\x5e\x16\xaf\xba\x9b\xc1\x9c\x6d\x73\x27\xd6\xeb\x16\x36\x2e\xec\xb3\xc9\xec\x7f\x43\xb9\x6f\x36\x90\xf8\xf6\xde\x08\xfe\x8b\x11\x1d\xd6\x5d\xf9\x17\xfb\x67\x2d\x0a\xc0\x2c\xc0\xf6\x9b\x82\xcc\x0a\xed\x8f\x8b\x62\x53\x41\x8c\xdd\x76\xd7\xd0\xe7\x6d\xd9\xf6\x68\xe5\x49\xd5\x3e\x95\x3d\x42\x70\xae\x16\x7b\xc4\x85\xcf\x55\x95\x1a\x2e\xed\xec\xde\x66\x2b\xe5\x24\x2a\x88\xef\x16\xa2\x68\xb4\x9a\x6e\xe1\x6c\xcc\xdb\x70\xf2\x87\x2b\x40\xfb\xa8\x4a\x91\xeb\xa4\x45\x5e\x4d\xb6\x65\x94\xb5\xea\x56\xcf\xcd\x1a\x19\x77\xcf\x09\xbf\xdd\xee\x5f\x65\x92\x60\x20\x5d\x0d\xa0\x3b\xc4\xd2\x25\x51\x5c\x82\xea\x7e\xa2\xb8\x2d\x46\xa8\xce\x09\xed\x6b\x6c\x89\xb5\x51\xef\x45\x9b\x9e\xa7\x2b\xd5\x6b\x0c\xad\x2a\x53\x77\xd6\x82\xd0\x46\xfe\x5b\xdd\x13\x42\x0b\x67\xda\x77\x27\xf7\xc5\x09\x38\x15\xdd\xf3\x7f\xcd\xb4\x59\x86\xe2\xd2\xbf\xf1\x78\xd8\x0c\x65\x2a\x41\x14\xb9\x55\xb2\x84\x36\xd2\x0d\x51\x64\x86\x80\xe6\x54\xb2\x19\x2a\x7a\x2f\x02\xa5\x65\x30\x12\xcd\x29\x67\x33\x54\x38\xb9\x88\x16\x2d\x75\x99\xa6\x0d\x72\x63\xae\xfa\xa9\xfd\x4b\x83\xe6\xc4\x0b\xa2\xa8\x63\xfa\x98\x8e\xdd\xe2\xd9\x40\x67\x6d\xbd\x20\x8a\xda\x92\xa8\x00\xd4\xe2\x07\x51\xd4\x35\x12\x2c\xa8\x6b\xa3\xb8\x80\x6b\x4b\x32\x21\x8a\xda\x82\xc9\xe1\x5c\x40\xcc\x15\x44\xda\x64\x57\x5a\x6f\x6c\x28\xb4\x48\xa7\x65\xa6\xb1\x59\x11\x45\xa9\x8c\x6e\x41\xff\x1c\xea\x15\x6a\x5e\x74\x51\x6d\x19\x51\x69\x5e\xed\x2e\x4c\x08\x23\x2b\x4c\x9a\xb4\xe5\x4d\xd3\x6a\x55\xee\x7e\x4b\xa1\x3e\xf4\x4c\xcd\xc9\xd4\xde\x6f\x4e\xfc\xea\xb2\x17\x86\x99\x9a\x53\x5b\x16\x34\xfa\x50\x73\x87\x69\x52\x2d\x1d\xf4\x74\x23\x8d\xfa\x60\x6f\x82\x61\x8b\x56\x1e\x6e\x34\xc6\xc8\xdb\x63\x7c\xaa\xdb\x6f\x36\x37\x71\x41\x1a\x55\x7a\xb5\xb2\xf2\x6f\x39\xa1\x69\x69\x87\xdc\xc2\x63\x8a\x35\xf1\x17\x3c\xd1\xa0\xda\x56\x9d\xdb\x86\xf6\x6a\x4d\x58\x79\xd5\xd6\x2a\x9f\xec\xdd\x01\x49\xff\x07\x46\x4c\x45\xc3\xa2\x53\x50\x45\xda\x62\x58\x84\x59\xa2\xd3\xf2\x00\x99\x0b\x0d\xca\x68\x2b\x69\x14\x58\xe9\x01\x0b\xb8\x1f\xac\x69\xe5\x62\xdb\x6c\x9e\x2b\x68\x9e\x32\x17\x27\x3d\xad\x87\x4c\x7b\x0a\x7d\x8a\xa1\x71\x64\x7a\x64\x45\x2f\xf1\x33\x95\x34\xa0\xe3\x79\x60\x9f\xa4\x6c\x73\x8a\x81\x09\xc0\xad\x81\x52\x20\xa4\x10\xdc\xd3\x52\x82\xb3\x46\xdc\xa8\xe1\x06\x05\xad\x8a\x7b\x95\xfa\x4a\x3b\x0d\x54\xb8\x56\xfc\x4f\x9c\x13\x3b\xd3\x50\x98\xdd\x73\x2a\x58\x2d\xdf\x52\x99\xdc\x19\xc2\xda\x5b\x0c\x7b\xc4\x2c\x09\x54\xad\x2a\x6e\x3f\x11\xc9\x44\xba\xe2\x0b\x8d\xc1\xaf\xee\x3b\xd1\x52\x6a\x42\x6c\x97\xb0\xaf\xcd\x42\x08\x3f\xd1\xa8\x8b\x5a\x3f\xd9\xe2\x44\x97\x27\xda\x44\x30\xe1\x34\x8f\xf6\xdd\x38\x8c\xa6\x29\x52\x15\x4b\x8a\x9c\xb6\xd6\x7c\x09\xfa\x8b\xe2\xbd\x8a\xbd\x6f\xdd\xe8\x06\xbb\x60\xe3\xb7\x62\x79\xfb\x07\x1b\x7f\x6c\x12\x51\x54\x3c\xc2\xe9\xda\x36\xcd\xd1\x1a\x91\xd5\xfb\x90\xc6\x0e\xb3\x58\x1d\x5c\xda\x0e\xce\x58\xd8\xba\xe5\x0f\x80\x66\x2a\xb1\x17\x30\xff\x1f\x0c\xac\x6f\x0d\xc2\x9e\xdc\x7e\x63\x18\xaa\x6f\x18\xd4\x86\xc6\x44\x31\x1a\xf7\x26\x05\x98\x82\x7a\x83\xf3\x7a\x83\x17\x07\xa6\x0c\x72\x0e\x3d\x9e\xd1\xfe\x79\x2b\x3a\xb5\x0a\x02\x8d\x70\xb3\xfe\x14\x05\x03\x34\x6a\x42\x02\xbb\x34\xad\x46\xeb\x1b\x67\x6c\x38\x76\x32\x12\x18\x6f\x8c\xcb\x1a\xf0\xd6\xd4\xaf\xbc\xee\x61\xc3\xd8\xaf\x6e\x04\x18\x05\x5a\xdc\x0a\x80\x07\x88\x32\x2d\xd5\x60\x9d\xa5\x7a\x70\x03\x83\xb0\x3a\x8a\xf6\x91\x9b\x7c\xf1\xfe\xaf\x70\xa1\x59\x7f\x08\xdf\xd0\x83\x41\x49\x2f\x61\x77\xff\xa4\x83\x20\x7c\x05\x61\x6a\x0c\x45\x5c\x26\x6d\x6b\xa1\xb3\x92\x2a\xa0\xbd\x5d\x99\xa7\x2d\x7a\x76\xcc\xde\x4e\x94\xb9\x58\x5c\x5b\xb9\x08\x6b\xd4\x90\x9c\xa6\xe0\xa7\x32\x53\x11\xec\x3d\x77\x2c\xb6\xde\x56\x1b\x7d\x6d\x05\x6f\xfb\x60\x82\x6c\x81\xd9\x8b\xc1\x4e\xad\x07\x50\x3c\x9c\x8c\x80\xa5\x0d\xc2\x67\xd0\xbe\x10\x23\xed\x8c\x04\x93\x58\xf6\x08\x71\xaa\x1b\x5a\xc8\xdd\x65\xc6\x82\x36\x31\xa9\x36\xbb\xa0\x2a\xd2\x46\xbf\x98\xd6\x17\xc0\x32\xc0\xff\x22\x93\x05\xf8\xf6\x80\x9f\x49\xa0\x0b\x28\x8e\x60\xfb\x24\x45\x06\x58\x00\x5e\x40\x4b\xc0\xe7\xa6\x8e\xe3\x43\x16\x42\x9d\xb1\x56\x0b\x8b\x2c\x84\xa7\x05\xc2\xd2\xe4\xc2\x24\xe9\x6b\xbd\x94\xce\xe5\x23\x85\x05\xf8\xe9\x46\x41\x18\xf7\x21\xf7\xd9\xdc\xad\x5b\x52\xe5\xab\xd4\x04\xd8\x02\x68\x6c\xfe\x4f\x92\x6a\xe4\x2c\x76\xd7\x91\x36\xc0\x12\xa0\x2b\xd8\x0f\x47\xb4\x9f\x12\xd1\x35\x30\xeb\xd9\x97\x1e\x3e\x7d\x6c\xad\x7f\x79\x09\x09\xd8\x6c\x4e\x35\x1b\x4f\xf4\xdb\xe3\x97\xaf\x26\xa3\x91\x26\x50\x9c\xf1\x3d\x43\x23\x8c\xf5\xdb\xa3\x57\x53\x34\x46\x66\x43\x8e\x1a\xd7\x98\x8f\x5e\xd9\x20\x7f\xe3\x20\xa5\xbe\xd8\x92\x63\x42\x97\x5d\x1b\xbc\xbe\xf5\x64\x1d\x02\xeb\x96\xba\x39\xa4\xd3\x62\x2e\x6e\x1d\x2d\x39\x48\x60\xad\xf4\xf1\x44\xbd\xad\x9e\x5b\x8d\x46\x8a\x3c\x6d\x86\x34\xd4\xc8\x1d\xb0\xad\xbd\x6f\x76\x25\x8b\x07\x2f\x4b\xa0\x61\x9a\xf2\xa5\x08\x7a\xc3\x30\x1d\x93\x4a\x41\x9c\x45\xad\xdd\xdb\x10\xe8\x30\x13\xc6\x24\x12\x73\x0a\x39\xa1\x66\xd9\x23\xb9\xbe\xe1\x02\x7a\x9b\x6e\x3e\x84\xd4\x0e\x77\x13\x46\xba\xe5\xea\xd7\xf7\x12\x67\x5b\x79\xf3\x6b\xb0\x95\x01\xe4\x74\xa3\xe4\x26\x40\x12\xe5\xc6\x0e\x98\xcd\x0b\x62\xe8\x26\x31\xaa\xc7\x65\xd6\x44\xa3\x9c\x49\x5f\xde\xfc\x3a\x93\x86\x29\x36\x73\x1a\xb6\x4c\x45\x6b\x3b\x8e\x27\xe9\xdb\xb0\x6e\x22\x75\xbb\x36\x62\xe1\x2c\x9d\xd3\x8c\xf1\x59\x34\x9f\xec\x3d\x5f\xc8\xaa\x47\x5f\x99\xe7\x59\xa3\x52\x54\x46\x65\x46\xac\x47\xe7\xee\x52\x9b\xc1\x73\x37\xf0\x28\x27\x54\x38\x70\x46\x48\xbe\x77\xcd\xc7\xcd\x7a\x02\xd5\xad\xb8\x49\x29\x40\xc0\xdf\xc8\x0d\x36\xe2\x43\xdb\xd9\x68\x37\x9b\x09\x5f\xe0\x35\x60\x41\x6a\x7a\x29\x43\x16\xc9\xc6\x13\x59\xbf\x73\x1c\x8d\x64\xcd\x23\xc2\x9e\x2b\xa9\xe2\xde\xdc\x4c\xce\x8d\x4d\xd2\x68\x93\xa9\x3c\xcf\xb1\xb6\x97\x9d\xdd\x59\xf2\xde\xa3\x8a\xf2\x58\xb6\x3e\x7c\x1c\x1d\x2e\x29\x1a\x20\x7b\xb0\x88\x78\x2a\x0f\x5e\xbf\x7e\xf9\xe6\xe0\xc8\x5e\x65\x28\x6f\x6e\xaa\xc6\xeb\x82\xd9\xf8\xe0\x4d\x78\xb0\x98\x6f\x8f\xf3\xc3\x25\xa7\x99\x80\x34\x0a\x37\xd0\xba\xc9\xdb\x73\x90\xad\x1a\xa1\xa8\xb2\xd5\x3c\xa7\x2e\xb2\xb6\x37\x4c\xbe\xc0\xf6\x39\x65\xf9\xfc\xb3\xfd\x56\x81\x81\x1d\x6c\xfa\xb8\xbe\x91\x49\xd3\x5e\x56\xec\xd2\xc2\x9e\x0c\x6a\x02\x09\x4a\x33\xbb\xf5\x38\x52\xb1\x42\x0c\x00\x21\xf4\x29\x2a\xb8\x89\xe2\xa6\xd5\xf5\x2c\xab\xc8\xf1\xc2\x92\xa3\xc7\x6d\x41\xcf\x8e\x5f\x3d\x3b\x7e\x8e\x46\x36\x26\xf7\x51\x18\xab\xd5\xbd\x1a\x38\x26\xf4\xe8\x15\x19\xa1\x67\xcf\xdf\x21\xa3\x6b\x6b\xfe\x47\x88\x72\x36\x9e\xf0\xb7\xaa\x66\x84\xea\x8a\x85\xb2\x17\x4b\x4e\x65\x0c\x27\xc6\x85\x9a\xbc\x78\x69\xfc\xa2\xdd\xee\xc5\x2b\xf7\xfb\xa6\xc8\x1f\x1d\x17\x80\xf0\x07\xf6\xe2\xb5\xe7\x85\x6f\xd9\xcb\x3f\xd9\xdc\xab\x97\x36\xf7\x66\x6c\x73\x6f\xfe\x64\x73\x47\xc7\xc7\x53\x39\x2a\x5a\xb7\x2d\x07\xe1\xdb\xa3\xe3\xd7\x06\xf8\x08\xb3\x70\x1e\x84\x6f\x8f\xc7\x2f\xca\xfc\xd1\x9b\xe3\x5d\xf8\xc3\x0f\xaf\xe6\x23\x93\x39\x7e\xbd\x7b\xf5\xdc\xb3\x38\x2f\x5f\x1e\xbf\x79\x65\x1b\x7e\xf9\xa7\xe7\x2f\x5e\x14\xe8\xc7\xc7\x2f\x0c\xfa\xd1\x71\x85\x6f\x2a\x7b\xaf\x9e\x77\xea\x63\x3e\x62\x47\x34\x64\xaf\x5e\xbe\x7c\xfe\x6a\x84\xf1\xd1\xf8\xf8\xb9\x17\x92\xb7\x6f\x8f\xc6\x3b\x9b\xee\xcc\x9e\xd0\xa2\xfd\x17\x63\xdb\xfe\xeb\x66\xfb\x47\xc7\xcd\x0e\x7a\x3b\xac\xf6\xb2\xfc\xe6\xbb\x51\xf7\x4e\x60\xff\x61\x2d\xf1\xbc\xe1\x10\x77\x1e\x8f\xfe\x5f\x3f\x0b\xb5\xcf\xfa\xdc\x55\x91\x6f\x3d\x24\x74\x18\xff\x49\xf0\x1e\xec\x67\x2a\x3a\x0f\xc4\x0a\x0b\x9a\x2f\xf0\xb0\xe2\x69\x7b\x99\x62\x6f\x5a\x6e\x07\xae\x01\x6b\x42\x0a\x61\x28\x8a\x77\x3e\xf6\xed\x50\x0f\x25\xca\x5b\xde\x33\x4d\xc5\x7c\x82\xed\x01\x4b\x4b\x29\xee\x76\xca\x18\x16\xf2\xfe\xe7\x72\xcc\x29\xd9\xed\x86\x2b\x70\x23\xee\x4e\x88\x0a\x7b\xfe\x60\x14\x13\x1b\x8e\xab\x55\xd2\xf9\x1f\x0f\xa0\x52\x51\xa2\x7c\x82\x5e\xdd\x8e\xb2\x53\xf2\xbc\xa1\x95\xbc\x9e\x87\x25\x5b\x82\x7d\x53\x46\x68\x51\x64\x4b\xa6\x58\xf4\x38\x89\xa2\x38\xde\x2f\x87\xac\xa9\x24\xe5\x13\x21\x3d\x93\xf3\x09\xef\x79\x52\xc7\x3d\x4f\x3c\xf1\xd2\x4e\xce\x19\x60\x6e\x17\x25\xa8\xa8\x6c\xbf\x4b\x30\xb0\x85\xc2\xba\xb1\x24\x68\x6a\x3d\xd1\xa3\xcd\xcd\x38\x8a\x61\x18\xa5\x50\xce\xb5\x39\xcc\xb2\x37\xf3\x43\xb9\xed\xd0\x00\xb8\x8d\x78\x4a\x92\xe7\xf4\x06\x0a\x11\xd8\x32\x70\xad\x98\xa3\xf7\xc0\x8a\xe7\x67\x97\xc0\xb6\x17\x1f\x4e\x8f\xfe\xf4\xfc\x75\x80\x8a\x04\xa2\x17\x1f\x4e\x9f\xbf\x79\xfd\xca\x42\x4c\x02\xe5\xf4\x0c\xd8\x1d\xf8\xce\x46\xc1\xdb\xc2\xe6\x0b\x2e\xc1\x2f\x50\xa8\xbd\xfe\x6e\x3f\xbf\x12\x54\x2d\xf6\x58\x99\x37\x50\xbe\x21\xbf\x07\xfb\xf8\x2d\xaf\x7a\xeb\xc1\xae\x84\x78\x9e\xe7\xf4\x12\x08\xfd\xf5\x8f\xed\xca\x53\x60\xdb\x1b\x15\x46\xb7\xa0\xfb\x4f\x2c\x46\x68\x36\x47\xd6\xd2\x59\x87\x81\x8d\x5b\x87\x88\x72\x11\xf3\x08\xd2\x7e\xf3\xcb\x54\x41\x23\x3d\x42\xa6\x9e\x82\x0d\x84\xba\xb7\xe5\x3c\xa7\x57\x5d\xab\xf6\x73\x09\xa8\x07\x6c\x38\x83\x3e\x74\xed\xcf\xcf\xa5\xb5\x0d\xf4\xca\xb0\xee\x54\x07\x33\x3d\x27\x39\x3d\x07\x66\xaf\x81\x35\x65\x43\xf5\x52\x8e\x5e\x00\x3b\xab\x8c\x70\x7a\x62\x2c\xcb\x38\xfe\x5b\x06\xea\xf1\x67\x05\x0b\xfe\x10\x0c\x8f\xa8\xdd\xa6\xef\xa5\x4e\x4d\xa6\x38\xb0\x0a\x90\x3b\xb1\x2a\xf3\x97\x20\x34\x17\x90\x18\x94\x18\x12\xbe\xe6\x1a\x54\x80\x3c\x54\xaa\x74\x7b\x39\xdf\xa4\x54\x70\x07\xbe\x4b\x16\x90\xbf\x87\x49\x06\xe9\x67\x91\x3c\x9a\xda\x8e\x13\x82\x0b\xa8\x79\x22\x38\xb3\x41\x9a\x82\x41\x66\x17\x30\xaf\x08\x3e\x3c\xa2\x69\x19\xff\x78\xe2\x91\xf7\xe0\x1c\x6a\x29\x98\xde\xf2\xcd\x79\x96\x24\xae\xa6\xfd\x4c\x90\xc9\xfe\x39\x14\x71\xc2\xc5\x32\x18\x1e\xe5\xf4\xb6\xa6\x6d\x29\x26\x9b\xdf\xb5\xa1\x0b\x9a\xd0\x98\x6e\xdc\x26\x5b\xd1\x35\x73\x52\x73\xff\x2c\x3c\x9d\xae\x59\x8a\x05\x5d\x93\x60\xdd\x7c\x5d\x6d\x06\x3a\x5d\xb3\x05\x5e\x93\x92\x83\xdc\x21\xf4\x15\xe0\xb5\x91\x43\x6b\xb6\x2e\xee\x19\x52\x44\x88\xbd\x27\xc2\x18\x5b\x5b\x71\x23\x4b\x59\x1d\x7a\xde\x30\x9e\x86\x58\xd0\x93\x92\xa0\x8a\x6e\x28\xba\x85\x47\x44\x02\x31\x59\x33\x84\xf2\x9e\x93\x41\xbc\x62\x6b\xb2\xdb\xed\xbd\xa0\x5f\xed\x76\xd5\x07\x7b\x5a\xc0\xae\x61\x65\x11\xf9\x92\x0b\xdd\x82\xdd\x41\xad\xc3\xd6\xa4\x1a\xe5\x74\x96\xe0\x78\x2a\x82\x27\x06\xea\x5e\x5e\x26\x38\xc4\xeb\x4e\xf1\x9d\x61\x0b\x44\xc8\x3c\x98\x25\x58\x94\x78\xc5\x9e\x5e\x13\xe2\x6e\x04\x3e\xd2\x25\x9b\x59\xf3\xb9\x3a\xcd\x5f\x97\x7d\x2f\x0d\xf8\x0a\x70\x4a\xc8\x23\x4b\xeb\x87\xa9\x77\x2d\xcf\x61\x4d\x26\x8f\x2c\x9a\xde\xf9\xa9\x54\x1a\x47\x24\xb8\xab\x5e\x31\xdf\xb0\xf1\xe4\xe6\xed\x63\x6d\x74\xdd\xb8\x45\xbf\x67\x8f\xb3\x1b\x2b\xe0\xcb\xa5\x99\xdd\xcf\x77\x3b\x6c\xd7\x6f\xfa\x00\x78\x49\x01\x1b\x58\xdf\x0d\x09\x35\x55\x58\xd0\x7b\x12\x3c\xc5\x57\x24\x68\xb6\x20\x46\x38\x9b\x22\x1f\x8d\xee\x03\x23\x46\xee\x8d\x18\x21\x4f\xd5\xac\x14\xe3\x32\xa7\xef\x80\xed\xa9\xd1\xae\xb4\x6b\x0b\x9b\xce\xa5\x19\xe3\xcd\x52\xc5\x80\x4a\xd6\x39\x6c\x1e\x42\x49\xe2\x13\x6b\x7b\x57\x1f\xcd\x28\x96\xcf\xf3\x6a\x47\xb6\x86\xf5\xc5\xad\xca\xd2\xfe\xf8\xd5\x99\x2b\xb4\xcf\x15\xb5\x7c\x22\x80\xc5\xdc\xcd\xea\x14\xf4\x6e\x77\x52\xa5\x6b\x8e\x70\x5f\xf3\x70\x50\xcf\x2b\xe4\x56\x07\xd8\x30\xf1\x9b\x25\xfd\xa3\xba\x5a\xc1\xa0\x40\x18\xb8\xd8\x69\x15\x5f\x03\xae\x57\xa0\x06\xb6\x0f\x3a\xa8\x5b\xa5\x03\xa9\x06\xf5\x2d\x8d\x32\x8e\x56\x8b\xde\xce\x70\x9d\xb4\x73\xb4\xfe\xb5\x10\x5f\x2d\x21\x48\x2b\x9c\xfe\x31\x7e\x11\xb7\x42\xde\x8b\x81\x43\x2a\x87\xb9\x51\xf2\x8e\xc7\x10\x1b\xda\x89\xaa\x9b\xdc\x79\x51\x6d\x21\x2b\x8c\xef\x79\x02\xc5\xf9\xcb\xa4\xfc\xbe\x43\xdf\x85\x1f\x87\xb2\xdb\x5d\x01\x2e\x33\xc4\x59\x53\x55\x96\x76\xd5\xca\xbe\xa4\x01\xbf\x8d\x32\xed\x02\x82\x93\x2e\xa4\xa1\x99\xea\x4f\xee\xf8\x15\x70\x7a\xd2\xc8\x04\xc3\x61\x23\x57\xa9\x31\xbd\xa7\xc0\xfa\x46\xd6\xc1\x99\xee\x41\x82\x93\x3d\x50\x43\x0d\x36\x06\x57\x01\xcd\xe0\x6a\x8c\x46\xba\x54\x98\x7d\xe3\x70\x45\xd3\x32\x11\x9c\x74\x34\xa9\x0a\x7a\x17\xa8\x28\xac\xea\xa9\xa0\x21\x69\xf7\x74\xf0\xd3\x1d\xd7\x48\xd3\x7d\x50\xdd\x66\x0d\xa3\x6e\xf9\x03\xd9\xd0\xe5\xaa\xa3\xb0\x7b\x47\xdc\x42\x99\x76\xf2\xa6\xa7\x16\xa0\xa1\xd5\xfb\x06\x5f\x95\x4e\x1b\x69\xdb\x48\x99\xa1\x46\xf4\x3f\x31\x12\xa9\xf4\xd4\xfd\xb8\xdb\xb5\x3d\x46\x43\x6f\xa7\x7b\x68\xd3\x3e\xa0\x1d\xc6\x1e\xd4\x86\x6d\x26\x3d\xe3\x91\xc5\x86\x9a\x2a\x86\xc7\xb4\xcc\x11\x8c\x90\x31\xe2\xaf\x00\x57\x20\xcf\xc3\x82\x55\x39\x77\x79\x9e\x86\x85\xaa\xdc\xf3\x96\xd4\x6e\x57\x68\x32\x55\x48\x76\x84\x26\xdc\x85\x32\x6d\xa8\xf1\x83\x93\x23\x5c\x0c\x4e\x61\xda\x82\x05\x56\x7e\x3a\x73\x0c\x71\x31\xd0\x53\xed\x17\xd9\x69\x05\x0f\x90\xb3\x7b\x51\x50\x81\xec\x90\x52\x76\x0a\x33\x3e\x9f\xd8\x53\x83\x96\x56\x56\xf6\xfb\x0c\x86\xec\x9e\x27\x9c\x6a\x76\xd9\x3a\x2e\x12\xb1\xf1\x24\x6a\xc6\xc6\x22\xa7\xb4\x32\x26\x66\xd1\x7c\x22\xeb\xf5\xad\xf4\xb4\x9a\x65\xf3\xdd\xee\x01\x70\x48\x6f\x01\x9b\x1c\xcd\x68\x6a\x3a\xda\x5b\x03\xda\xa8\x4f\x65\xb9\xf5\x64\xb5\x85\x2c\x33\x94\x04\x2e\x86\x4a\x65\x43\xc4\xc8\x0e\x93\xca\x5a\xbc\x56\xed\x35\xb6\x8a\xac\x94\x8e\xbb\xf4\xb3\x28\xdf\x9a\xc8\x5a\x36\x10\x9a\x30\xfb\x54\x45\x76\x85\xa5\xfd\xa6\x04\x2a\x7d\x3d\xd9\x15\x46\x9e\xd7\x0d\xe6\x55\x28\xd3\x64\xc4\x8c\x52\x7c\xcd\x5c\x60\xea\x68\x3c\x1e\x3f\x7f\xf6\xfc\x9d\x87\x82\xba\xe4\xec\xf8\xd9\x9b\xd3\x67\x6f\x9e\x7b\x88\xd0\x45\x19\xd4\x1c\x4f\x93\xd1\x22\x40\x28\x2f\xbf\xe2\x78\xdd\x74\x4a\xd8\x36\x2f\x3f\xcb\x67\x54\xf4\x77\xee\xb9\xcd\xb4\x4a\x05\x08\x51\xa3\x83\xbe\x73\x17\xb5\xed\xf7\x1d\x15\xdb\xe6\x93\xd6\x47\xd4\x9c\x05\xf1\xa0\x41\xa4\x5c\x0a\x1b\x45\xa8\x72\xcd\x12\x42\xc1\xff\xee\x37\x4b\x90\x50\x85\x6b\x30\x3a\xcc\xf3\x9a\x0c\xb5\x5f\x4e\x7a\x9c\x7a\xe3\xb5\xcd\xf4\x9c\xed\x63\x97\x77\x8f\x5a\xaf\x9c\xd8\x0f\x5b\xf7\xed\x91\xc6\xc1\xb7\x9d\x49\x58\x07\x19\xda\x5c\x5d\x11\xcf\xf3\x70\xc8\xf4\x08\x4d\xd1\xe8\x1d\x58\x76\x17\x53\x7b\xc6\x89\x43\x2a\x28\x27\x81\x3d\xa4\x35\x4a\xa3\x02\x73\x12\x94\xc9\x77\x80\x25\xa1\x9c\xe4\x04\xbb\xc3\x5c\x3d\x42\x87\xe1\x86\x1f\xde\x8d\x0f\x6f\x8a\xaf\x8b\x96\xdf\xdf\x53\xd4\x7e\x9d\x27\x2f\x56\xe9\x3d\x74\xbf\x87\x8a\x28\x8f\x03\x94\xd6\xb9\x48\x0a\xd3\x7d\xa8\x50\xf1\x15\xac\xb3\x98\x6b\xa9\x8c\xcf\x54\x51\x3c\x0d\x66\xf3\xea\x61\x6e\xa6\x92\xc0\xde\x94\x09\x0e\x0f\x13\x19\x85\x89\x7d\x86\xf7\xe6\xe8\xcd\x18\xe5\xe5\x8a\x6e\xc3\xcd\xe6\xa3\x58\xc8\xe0\x3d\xd0\x54\x4b\x05\x81\x1d\x46\xba\x09\x23\x88\x8d\x7f\x68\xdf\x99\x04\xdb\xa2\x4d\x27\x6c\x3b\x5f\x62\x9d\xcd\x73\xba\x84\x22\x4e\x50\xbe\x35\x60\x3f\x94\x8f\x68\xf7\xf0\x6d\x59\x07\x98\xd3\xd0\xae\x75\x1a\x6c\x13\x19\xc6\xa7\xb6\x26\xb6\xf7\x0d\xb9\x0e\x20\x37\xb6\x2f\x60\xf4\xe9\xf3\xc9\xfb\xeb\xd3\xcf\xe7\x1f\x3e\xfe\x88\xec\xd9\x46\x98\x3e\x8a\x68\xd0\xfb\x7d\xd6\xaa\x32\x8d\x79\x6a\xcf\xb1\x03\x5d\x8d\x53\x54\xfb\x40\xb1\xf0\x3e\xe4\x66\x9f\xe0\x6d\xb9\x0b\xaa\x57\x10\x99\x4a\x72\x32\x39\x1e\xdb\xfb\xc8\xc5\x33\x86\x29\x6e\x7e\xed\x55\xd9\xeb\x63\x84\x02\x46\x97\x67\x57\xd7\x97\x67\x57\x57\x1f\xcf\x7f\xbc\xbc\x7e\xf7\xe5\xfc\xfd\xa7\xb3\x4b\x44\x0b\x04\x12\x68\x8c\xd2\x95\xbc\x2f\xee\xf8\x23\xba\x2d\x9e\xcc\x7f\x70\x0f\x27\xb4\x74\xd3\x18\x94\x94\x19\x14\x2c\xe3\x23\xfb\x18\x38\x50\xcd\xc7\x1d\xc5\x23\x10\x14\x87\x62\x09\x0a\xe5\x74\xab\xa4\xd4\xc1\x70\x9c\x93\x3c\xa7\xeb\x4c\x87\x05\x35\xfb\x06\xe5\x5c\x89\xbd\x35\x60\x3a\xa7\x0d\x02\x97\x58\xe5\x53\xe8\x3c\xcf\xa9\x92\x99\x36\x2b\x5e\xf0\x6a\xcd\x9d\x9b\x50\xaf\x02\x74\xe8\xbe\xe0\xeb\xbe\x48\x1a\x18\xde\x0a\x54\x9e\xcf\xa9\x08\xef\x3e\x6a\x58\xd7\x15\x2f\x5b\x6c\xfd\x53\xa8\xad\x50\x0e\xde\x83\x6f\xf2\xae\x9b\xa0\xbf\x93\xff\x3e\xfc\x6e\x6b\xf0\xe2\xfc\xf0\xbf\xf3\x7c\x6e\x2f\x0c\xfc\xaf\xff\x13\x00\x00\xff\xff\xc8\xa0\x82\xfe\x7e\x58\x00\x00") func init() { err := CTX.Err() @@ -53,32 +44,12 @@ func init() { panic(err) } - err = FS.Mkdir(CTX, "components/", 0777) - if err != nil && err != os.ErrExist { - panic(err) - } - - err = FS.Mkdir(CTX, "client/", 0777) - if err != nil && err != os.ErrExist { - panic(err) - } - - err = FS.Mkdir(CTX, "client/settings/", 0777) - if err != nil && err != os.ErrExist { - panic(err) - } - - err = FS.Mkdir(CTX, "store/", 0777) - if err != nil && err != os.ErrExist { - panic(err) - } - var f webdav.File var rb *bytes.Reader var r *gzip.Reader - rb = bytes.NewReader(FileAppJs) + rb = bytes.NewReader(FileSettingsJs) r, err = gzip.NewReader(rb) if err != nil { panic(err) @@ -89,85 +60,7 @@ func init() { panic(err) } - f, err = FS.OpenFile(CTX, "app.js", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0777) - if err != nil { - panic(err) - } - - _, err = io.Copy(f, r) - if err != nil { - panic(err) - } - - err = f.Close() - if err != nil { - panic(err) - } - - rb = bytes.NewReader(FileClientSettingsIndexJs) - r, err = gzip.NewReader(rb) - if err != nil { - panic(err) - } - - err = r.Close() - if err != nil { - panic(err) - } - - f, err = FS.OpenFile(CTX, "client/settings/index.js", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0777) - if err != nil { - panic(err) - } - - _, err = io.Copy(f, r) - if err != nil { - panic(err) - } - - err = f.Close() - if err != nil { - panic(err) - } - - rb = bytes.NewReader(FileComponentsSettingsAppVue) - r, err = gzip.NewReader(rb) - if err != nil { - panic(err) - } - - err = r.Close() - if err != nil { - panic(err) - } - - f, err = FS.OpenFile(CTX, "components/SettingsApp.vue", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0777) - if err != nil { - panic(err) - } - - _, err = io.Copy(f, r) - if err != nil { - panic(err) - } - - err = f.Close() - if err != nil { - panic(err) - } - - rb = bytes.NewReader(FileStoreIndexJs) - r, err = gzip.NewReader(rb) - if err != nil { - panic(err) - } - - err = r.Close() - if err != nil { - panic(err) - } - - f, err = FS.OpenFile(CTX, "store/index.js", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0777) + f, err = FS.OpenFile(CTX, "settings.js", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0777) if err != nil { panic(err) } diff --git a/pkg/assets/embed.yml b/pkg/assets/embed.yml index 7b70cb008..6dcfc266a 100644 --- a/pkg/assets/embed.yml +++ b/pkg/assets/embed.yml @@ -10,8 +10,8 @@ compression: custom: - files: - - "../../ui/" - base: "../../ui/" + - "../../assets/" + base: "../../assets/" prefix: "" ... diff --git a/pkg/command/server.go b/pkg/command/server.go index 62d136a51..30d8d90e4 100644 --- a/pkg/command/server.go +++ b/pkg/command/server.go @@ -2,7 +2,6 @@ package command import ( "context" - "github.com/owncloud/ocis-settings/pkg/server/grpc" "os" "os/signal" "strings" @@ -18,6 +17,8 @@ import ( "github.com/owncloud/ocis-settings/pkg/config" "github.com/owncloud/ocis-settings/pkg/flagset" "github.com/owncloud/ocis-settings/pkg/server/debug" + "github.com/owncloud/ocis-settings/pkg/server/grpc" + "github.com/owncloud/ocis-settings/pkg/server/http" "go.opencensus.io/stats/view" "go.opencensus.io/trace" ) @@ -39,7 +40,6 @@ func Server(cfg *config.Config) *cli.Command { }, Action: func(c *cli.Context) error { logger := NewLogger(cfg) - httpNamespace := c.String("http-namespace") if cfg.Tracing.Enabled { switch t := cfg.Tracing.Type; t { @@ -132,14 +132,31 @@ func Server(cfg *config.Config) *cli.Command { defer cancel() + { + server := http.Server( + http.Name("settings"), + http.Logger(logger), + http.Context(ctx), + http.Config(cfg), + ) + + gr.Add(func() error { + return server.Run() + }, func(_ error) { + logger.Info(). + Str("server", "http"). + Msg("Shutting down server") + + cancel() + }) + } + { server := grpc.Server( - grpc.Name("ocis-settings"), - grpc.Address(":9190"), + grpc.Name("settings"), grpc.Logger(logger), grpc.Context(ctx), grpc.Config(cfg), - grpc.Namespace(httpNamespace), ) gr.Add(func() error { diff --git a/pkg/config/config.go b/pkg/config/config.go index 08c600e33..4030c1339 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -22,6 +22,12 @@ type HTTP struct { Root string } +// GRPC defines the available grpc configuration. +type GRPC struct { + Addr string + Namespace string +} + // Tracing defines the available tracing configuration. type Tracing struct { Enabled bool @@ -48,6 +54,7 @@ type Config struct { Log Log Debug Debug HTTP HTTP + GRPC GRPC Tracing Tracing Asset Asset } diff --git a/pkg/flagset/flagset.go b/pkg/flagset/flagset.go index 9fc1ca1f2..b66358b19 100644 --- a/pkg/flagset/flagset.go +++ b/pkg/flagset/flagset.go @@ -136,6 +136,20 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag { EnvVars: []string{"SETTINGS_HTTP_ROOT"}, Destination: &cfg.HTTP.Root, }, + &cli.StringFlag{ + Name: "grpc-addr", + Value: "0.0.0.0:9191", + Usage: "Address to bind grpc server", + EnvVars: []string{"HELLO_GRPC_ADDR"}, + Destination: &cfg.GRPC.Addr, + }, + &cli.StringFlag{ + Name: "grpc-namespace", + Value: "com.owncloud.api", + Usage: "Set the base namespace for the grpc namespace", + EnvVars: []string{"SETTINGS_GRPC_NAMESPACE"}, + Destination: &cfg.GRPC.Namespace, + }, &cli.StringFlag{ Name: "mount-path", Usage: "Mount path for the storage", diff --git a/pkg/server/grpc/option.go b/pkg/server/grpc/option.go index f47fed7df..d5ab4e970 100644 --- a/pkg/server/grpc/option.go +++ b/pkg/server/grpc/option.go @@ -3,6 +3,8 @@ package grpc import ( "context" + "github.com/micro/cli/v2" + "github.com/owncloud/ocis-settings/pkg/metrics" "github.com/owncloud/ocis-settings/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" ) @@ -13,11 +15,11 @@ type Option func(o *Options) // Options defines the available options for this package. type Options struct { Name string - Address string Logger log.Logger Context context.Context Config *config.Config - Namespace string + Metrics *metrics.Metrics + Flags []cli.Flag } // newOptions initializes the available default options. @@ -45,13 +47,6 @@ func Name(val string) Option { } } -// Address provides an address for the service. -func Address(val string) Option { - return func(o *Options) { - o.Address = val - } -} - // Context provides a function to set the context option. func Context(val context.Context) Option { return func(o *Options) { @@ -66,9 +61,16 @@ func Config(val *config.Config) Option { } } -// Namespace provides a function to set the namespace option. -func Namespace(val string) Option { +// Metrics provides a function to set the metrics option. +func Metrics(val *metrics.Metrics) Option { return func(o *Options) { - o.Namespace = val + o.Metrics = val + } +} + +// Flags provides a function to set the flags option. +func Flags(val []cli.Flag) Option { + return func(o *Options) { + o.Flags = append(o.Flags, val...) } } diff --git a/pkg/server/grpc/server.go b/pkg/server/grpc/server.go index 69ea95f3e..039fc6ffe 100644 --- a/pkg/server/grpc/server.go +++ b/pkg/server/grpc/server.go @@ -4,6 +4,7 @@ import ( "github.com/owncloud/ocis-settings/pkg/proto/v0" svc "github.com/owncloud/ocis-settings/pkg/service/v0" "github.com/owncloud/ocis-pkg/v2/service/grpc" + "github.com/owncloud/ocis-settings/pkg/version" ) // NewService initializes a new go-micro service ready to run @@ -11,15 +12,17 @@ func Server(opts ...Option) grpc.Service { options := newOptions(opts...) service := grpc.NewService( - grpc.Name(options.Name), - grpc.Context(options.Context), - grpc.Address(options.Address), - grpc.Namespace(options.Namespace), grpc.Logger(options.Logger), + grpc.Name(options.Name), + grpc.Version(version.String), + grpc.Address(options.Config.GRPC.Addr), + grpc.Namespace(options.Config.GRPC.Namespace), + grpc.Context(options.Context), + grpc.Flags(options.Flags...), ) - hdlr := svc.NewService(options.Config) - if err := proto.RegisterBundleServiceHandler(service.Server(), hdlr); err != nil { + handle := svc.NewService(options.Config) + if err := proto.RegisterBundleServiceHandler(service.Server(), handle); err != nil { options.Logger.Fatal().Err(err).Msg("could not register service handler") } diff --git a/pkg/server/http/option.go b/pkg/server/http/option.go index d1335bd16..97e03b125 100644 --- a/pkg/server/http/option.go +++ b/pkg/server/http/option.go @@ -14,7 +14,7 @@ type Option func(o *Options) // Options defines the available options for this package. type Options struct { - Namespace string + Name string Logger log.Logger Context context.Context Config *config.Config @@ -40,6 +40,13 @@ func Logger(val log.Logger) Option { } } +// Name provides a name for the service. +func Name(val string) Option { + return func(o *Options) { + o.Name = val + } +} + // Context provides a function to set the context option. func Context(val context.Context) Option { return func(o *Options) { @@ -67,10 +74,3 @@ func Flags(val []cli.Flag) Option { o.Flags = append(o.Flags, val...) } } - -// Namespace provides a function to set the Namespace option. -func Namespace(val string) Option { - return func(o *Options) { - o.Namespace = val - } -} diff --git a/pkg/server/http/server.go b/pkg/server/http/server.go index 72d79b943..c8eb37f1b 100644 --- a/pkg/server/http/server.go +++ b/pkg/server/http/server.go @@ -1,56 +1,74 @@ package http -// import ( -// svc "github.com/owncloud/ocis-settings/pkg/service/v0" -// "github.com/owncloud/ocis-settings/pkg/version" -// "github.com/owncloud/ocis-pkg/v2/middleware" -// "github.com/owncloud/ocis-pkg/v2/service/http" -// ) +import ( + "github.com/go-chi/chi" + "github.com/owncloud/ocis-pkg/v2/middleware" + "github.com/owncloud/ocis-pkg/v2/service/http" + "github.com/owncloud/ocis-settings/pkg/assets" + "github.com/owncloud/ocis-settings/pkg/proto/v0" + svc "github.com/owncloud/ocis-settings/pkg/service/v0" + "github.com/owncloud/ocis-settings/pkg/version" +) -// // Server initializes the http service and server. -// func Server(opts ...Option) (http.Service, error) { -// options := newOptions(opts...) +// Server initializes the http service and server. +func Server(opts ...Option) http.Service { + options := newOptions(opts...) -// service := http.NewService( -// http.Logger(options.Logger), -// http.Name("settings"), -// http.Version(version.String), -// http.Namespace(options.Config.HTTP.Namespace), -// http.Address(options.Config.HTTP.Addr), -// http.Context(options.Context), -// http.Flags(options.Flags...), -// ) + service := http.NewService( + http.Logger(options.Logger), + http.Name(options.Name), + http.Version(version.String), + http.Address(options.Config.HTTP.Addr), + http.Namespace(options.Config.HTTP.Namespace), + http.Context(options.Context), + http.Flags(options.Flags...), + ) -// handle := svc.NewService( -// svc.Logger(options.Logger), -// svc.Config(options.Config), -// svc.Middleware( -// middleware.RealIP, -// middleware.RequestID, -// middleware.Cache, -// middleware.Cors, -// middleware.Secure, -// middleware.Version( -// "settings", -// version.String, -// ), -// middleware.Logger( -// options.Logger, -// ), -// ), -// ) + handle := svc.NewService(options.Config) -// { -// handle = svc.NewInstrument(handle, options.Metrics) -// handle = svc.NewLogging(handle, options.Logger) -// handle = svc.NewTracing(handle) -// } + { + handle = svc.NewInstrument(handle, options.Metrics) + handle = svc.NewLogging(handle, options.Logger) + handle = svc.NewTracing(handle) + } -// service.Handle( -// "/", -// handle, -// ) + mux := chi.NewMux() -// service.Init() -// return service, nil -// } + mux.Use(middleware.RealIP) + mux.Use(middleware.RequestID) + mux.Use(middleware.Cache) + mux.Use(middleware.Cors) + mux.Use(middleware.Secure) + + mux.Use(middleware.Version( + "settings", + version.String, + )) + + mux.Use(middleware.Logger( + options.Logger, + )) + + mux.Use(middleware.Static( + options.Config.HTTP.Root, + assets.New( + assets.Logger(options.Logger), + assets.Config(options.Config), + ), + )) + + mux.Route(options.Config.HTTP.Root, func(r chi.Router) { + proto.RegisterBundleServiceWeb( + r, + handle, + ) + }) + + service.Handle( + "/", + mux, + ) + + service.Init() + return service +}