diff --git a/README.md b/README.md
index 58d7b2a..fdac44c 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ If you want to compare against an enum or a flag class in defined in `templates.
Decoded messages are displayed in the log pane, clicking one will show the request and
response for HTTP messages, and a human-friendly form for UDP messages. Some messages and
-fields have [special packers defined](https://github.com/SaladDais/Hippolyzer/blob/master/hippolyzer/lib/proxy/templates.py)
+fields have [special packers defined](https://github.com/SaladDais/Hippolyzer/blob/master/hippolyzer/lib/base/templates.py)
that will give a more human-readable form of enum or binary fields, with the original form beside or below it.
For example, an `AgentUpdate` message may show up in the log pane like:
@@ -323,7 +323,7 @@ If you are a viewer developer, please put them in a viewer.
[LGPLv3](https://www.gnu.org/licenses/lgpl-3.0.en.html). If you have a good reason why, I might dual license.
-This package [includes portions of the Second Life(TM) Viewer Artwork](https://github.com/SaladDais/Hippolyzer/tree/master/hippolyzer/lib/proxy/data),
+This package [includes portions of the Second Life(TM) Viewer Artwork](https://github.com/SaladDais/Hippolyzer/tree/master/hippolyzer/lib/base/data),
Copyright (C) 2008 Linden Research, Inc. The viewer artwork is licensed under the Creative Commons
Attribution-Share Alike 3.0 License.
diff --git a/addon_examples/horror_animator.py b/addon_examples/horror_animator.py
index 84ff034..85b0fda 100644
--- a/addon_examples/horror_animator.py
+++ b/addon_examples/horror_animator.py
@@ -16,7 +16,7 @@ from hippolyzer.lib.proxy.http_flow import HippoHTTPFlow
from hippolyzer.lib.proxy.message import ProxiedMessage
from hippolyzer.lib.proxy.region import ProxiedRegion
from hippolyzer.lib.proxy.sessions import Session, SessionManager
-from hippolyzer.lib.proxy.vfs import STATIC_VFS
+from hippolyzer.lib.base.vfs import STATIC_VFS
JOINT_REPLS = {
diff --git a/hippolyzer/lib/proxy/data/LICENSE-artwork.txt b/hippolyzer/lib/base/data/LICENSE-artwork.txt
similarity index 100%
rename from hippolyzer/lib/proxy/data/LICENSE-artwork.txt
rename to hippolyzer/lib/base/data/LICENSE-artwork.txt
diff --git a/hippolyzer/lib/proxy/data/static_data.db2 b/hippolyzer/lib/base/data/static_data.db2
similarity index 100%
rename from hippolyzer/lib/proxy/data/static_data.db2
rename to hippolyzer/lib/base/data/static_data.db2
diff --git a/hippolyzer/lib/proxy/data/static_index.db2 b/hippolyzer/lib/base/data/static_index.db2
similarity index 100%
rename from hippolyzer/lib/proxy/data/static_index.db2
rename to hippolyzer/lib/base/data/static_index.db2
diff --git a/hippolyzer/lib/proxy/templates.py b/hippolyzer/lib/base/templates.py
similarity index 58%
rename from hippolyzer/lib/proxy/templates.py
rename to hippolyzer/lib/base/templates.py
index 9cf0d82..a4a979c 100644
--- a/hippolyzer/lib/proxy/templates.py
+++ b/hippolyzer/lib/base/templates.py
@@ -1,3 +1,7 @@
+"""
+Serialization templates for structures used in LLUDP and HTTP bodies.
+"""
+
import abc
import dataclasses
import enum
@@ -1621,95 +1625,3 @@ class RetrieveNavMeshSrcSerializer(se.BaseHTTPSerializer):
# 15 bit window size, gzip wrapped
deser["navmesh_data"] = zlib.decompress(deser["navmesh_data"], wbits=15 | 32)
return deser
-
-
-@dataclasses.dataclass
-class CAPTemplate:
- cap_name: str
- method: str
- body: Any
- query: Set[str] = dataclasses.field(default_factory=set)
- path: str = ""
-
-
-# Cap request templates for message builder prefills
-CAP_TEMPLATES: List[CAPTemplate] = [
- CAPTemplate(cap_name='Seed', method='POST', body=b'\n\n\n \n \n\n', query=set()),
- CAPTemplate(cap_name='SimulatorFeatures', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='EventQueueGet', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='NavMeshGenerationStatus', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='AgentState', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='AgentPreferences', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='ExtEnvironment', method='GET', body=b'', query={'parcelid'}),
- CAPTemplate(cap_name='UpdateAgentLanguage', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='DirectDelivery', method='GET', body=b'', query=set(), path="/listings"),
- CAPTemplate(cap_name='ViewerStats', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='GetDisplayNames', method='GET', body=b'', query={'ids'}),
- CAPTemplate(cap_name='FetchInventory2', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='FetchLib2', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='FetchInventoryDescendents2', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='ProvisionVoiceAccountRequest', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='AvatarRenderInfo', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='ReadOfflineMsgs', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='MapImageService', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='RenderMaterials', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='AvatarRenderInfo', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='ParcelVoiceInfoRequest', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='ProductInfoRequest', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='ObjectMedia', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='GetObjectCost', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='GetObjectPhysicsData', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='RenderMaterials', method='PUT', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='RenderMaterials', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='GetExperienceInfo', method='GET', body=b'', query={'public_id', 'page_size'}, path="/id/"),
- CAPTemplate(cap_name='LSLSyntax', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='GetCreatorExperiences', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='GetMetadata', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='UpdateScriptTask', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='EstateAccess', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='RegionExperiences', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='SimConsoleAsync', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='FindExperienceByName', method='GET', body=b'', query={'query', 'page', 'page_size'}),
- CAPTemplate(cap_name='ViewerMetrics', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='InventoryAPIv3', method='PATCH', body=b'\n\n\n\n', query={'tid'}, path="/item/SOME_ID"),
- CAPTemplate(cap_name='RemoteParcelRequest', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='ParcelPropertiesUpdate', method='POST', body=b'\n\n \n\n', query=set()),
- CAPTemplate(cap_name='UpdateScriptAgent', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='NewFileAgentInventory', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='UpdateNotecardAgentInventory', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='UpdateNotecardTaskInventory', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='UpdateGestureAgentInventory', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='UpdateGestureTaskInventory', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='MeshUploadFlag', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='UntrustedSimulatorMessage', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='UpdateAvatarAppearance', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='ServerReleaseNotes', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='UserInfo', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='SendPostcard', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='GetAdminExperiences', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='GetExperiences', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='AgentExperiences', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='ExperiencePreferences', method='GET', body=b'', query={'SOME_ID'}),
- CAPTemplate(cap_name='IsExperienceAdmin', method='GET', body=b'', query={'experience_id'}),
- CAPTemplate(cap_name='UpdateExperience', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='AttachmentResources', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='DispatchRegionInfo', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='AvatarPickerSearch', method='GET', body=b'', query={'names', 'page_size'}),
- CAPTemplate(cap_name='LandResources', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='ResourceCostSelected', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='GroupMemberData', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='GroupExperiences', method='GET', body=b'', query={'SOME_ID'}),
- CAPTemplate(cap_name='CopyInventoryFromNotecard', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='HomeLocation', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='CharacterProperties', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='ObjectNavMeshProperties', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='TerrainNavMeshProperties', method='GET', body=b'', query=set()),
- CAPTemplate(cap_name='ObjectNavMeshProperties', method='PUT', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='RetrieveNavMeshSrc', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='MapLayer', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='GroupAPIv1', method='GET', body=b'', query={'group_id'}),
- CAPTemplate(cap_name='ChatSessionRequest', method='POST', body=b'\n\n\n\n', query=set()),
- CAPTemplate(cap_name='ViewerBenefits', method='GET', body=b'', query=set(), path=''),
- CAPTemplate(cap_name='SetDisplayName', method='POST', body=b'\n\n\n\n', query=set(), path=''),
- CAPTemplate(cap_name='ObjectMediaNavigate', method='POST', body=b'\n\n\n\n', query=set(), path=''),
-]
diff --git a/hippolyzer/lib/proxy/vfs.py b/hippolyzer/lib/base/vfs.py
similarity index 93%
rename from hippolyzer/lib/proxy/vfs.py
rename to hippolyzer/lib/base/vfs.py
index 3354936..f37e360 100644
--- a/hippolyzer/lib/proxy/vfs.py
+++ b/hippolyzer/lib/base/vfs.py
@@ -4,7 +4,7 @@ from typing import *
import hippolyzer.lib.base.serialization as se
from hippolyzer.lib.base.datatypes import UUID
from hippolyzer.lib.base.helpers import get_resource_filename
-from hippolyzer.lib.proxy.templates import AssetType
+from hippolyzer.lib.base.templates import AssetType
@dataclasses.dataclass
@@ -63,5 +63,5 @@ class VFS:
return self._data_fh.read(block.size)
-_static_path = get_resource_filename("lib/proxy/data/static_index.db2")
+_static_path = get_resource_filename("lib/base/data/static_index.db2")
STATIC_VFS = VFS(_static_path)
diff --git a/setup.py b/setup.py
index 9a28f43..c05a811 100644
--- a/setup.py
+++ b/setup.py
@@ -63,9 +63,9 @@ setup(
'lib/base/message/data/message_template.msg',
'lib/base/message/data/message.xml',
'lib/base/network/data/ca-bundle.crt',
- 'lib/proxy/data/static_data.db2',
- 'lib/proxy/data/static_index.db2',
- 'lib/proxy/data/LICENSE-artwork.txt',
+ 'lib/base/data/static_data.db2',
+ 'lib/base/data/static_index.db2',
+ 'lib/base/data/LICENSE-artwork.txt',
],
},
entry_points={
diff --git a/tests/proxy/test_vfs.py b/tests/base/test_vfs.py
similarity index 87%
rename from tests/proxy/test_vfs.py
rename to tests/base/test_vfs.py
index 7fb2d47..615a736 100644
--- a/tests/proxy/test_vfs.py
+++ b/tests/base/test_vfs.py
@@ -1,7 +1,7 @@
import unittest
from hippolyzer.lib.base.datatypes import UUID
-from hippolyzer.lib.proxy.vfs import STATIC_VFS
+from hippolyzer.lib.base.vfs import STATIC_VFS
class StaticVFSTest(unittest.TestCase):