Add message-envelope type

.gitea/workflows/release.yaml

@@ -78,17 +78,24 @@ jobs:
         ZIP_ROOT="/tmp/go_upload"
         FULL_PATH="$ZIP_ROOT/$MOD_NAME@$VERSION"
 
+        # 1. Prepare
         cd gen/go
-        go mod init $MOD_NAME
-        go mod tidy
-
+        
+        # 2. Initialize the module
+        go mod init "$MOD_NAME"
+        
+        # 3. Create the structure
         mkdir -p "$FULL_PATH"
-        cp -r . "$FULL_PATH/"
-
-        pushd "$ZIP_ROOT"
-        zip -r "$GITHUB_WORKSPACE/module.zip" .
-        popd
-
+        
+        # 4. Copy the CONTENTS of models to the root of the module
+        # This flattens the structure so the .go files are next to go.mod
+        cp -r models/* "$FULL_PATH/"
+        cp go.mod "$FULL_PATH/"
+        
+        # 5. Zip and Upload
+        cd "$ZIP_ROOT"
+        zip -r -D "$GITHUB_WORKSPACE/module.zip" .
+        
         curl -f --user "owlbot:${{ secrets.PACKAGE_PUSH }}" \
           --upload-file "$GITHUB_WORKSPACE/module.zip" \
           "${{ github.server_url }}/api/packages/owlboard/go/upload?version=$VERSION"

schemas/data-ingress/message-envelope.json

@@ -0,0 +1,32 @@
+{
+    "$id": "https://schema.owlboard.info/data-ingress/message-envelope.schema.json",
+    "$schema": "https://json-schema.org/draft-07/schema#",
+    "title": "MessageEnvelope",
+    "type": "object",
+    "properties": {
+        "service_name": {
+            "type": "string",
+            "description": "Name of the service submitting the update"
+        },
+        "service_id": {
+            "type": "string",
+            "description": "ID of the service sending the message - usually a hostname"
+        },
+        "data_type": {
+            "type": "string",
+            "enum": ["file"],
+            "description": "The type of data contained in this message object"
+        },
+        "sent_timestamp": {
+            "type": "integer",
+            "description": "Unix timestamp representing the time the message was sent"
+        },
+        "data_kind": {
+            "type": "string",
+            "enum": ["pis", "timetable", "knowledgebase"],
+            "description": "The data type contained in the message.  Currently supported PIS: PIS Data, Timetable: CIF or VSTP Data, Knowledgebase: Station Data"
+        }
+    },
+    "required": ["service_name", "service_id", "data_type", "sent_timestamp"],
+    "additionalProperties": true
+}

schemas/data-ingress/mq-file-update.json

@@ -8,23 +8,27 @@
             "type": "string",
             "description": "Name of the service submitting the update"
         },
-        "update_type": {
+        "service_id": {
+            "type": "string",
+            "description": "ID of the service sending the message - usually a hostname"
+        },
+        "data_type": {
             "type": "string",
             "enum": ["file"],
-            "description": "The method of update application"
+            "description": "The type of data contained in this message object"
         },
         "sent_timestamp": {
             "type": "integer",
             "description": "Unix timestamp representing the time the message was sent"
         },
+        "data_kind": {
+            "type": "string",
+            "enum": ["pis", "timetable", "knowledgebase"],
+            "description": "The data type contained in the file.  Currently supported PIS: PIS Data, Timetable: CIF or VSTP Data, Knowledgebase: Station Data"
+        },
         "payload": {
             "type": "object",
             "properties": {
-                "kind": {
-                    "type": "string",
-                    "enum": ["pis"],
-                    "description": "The type of data provided in the update"
-                },
                 "version": {
                     "type": "string",
                     "description": "The version string from the package source"
@@ -34,9 +38,10 @@
                     "description": "The full path to the file, including protocol (eg. s3://) where appropriate"
                 }
             },
-            "required": ["kind", "version", "filepath"]
+            "required": ["version", "filepath"],
+            "additionalProperties": false
         }
     },
-    "required": ["service_name", "update_type", "payload"],
+    "required": ["service_name", "service_id", "data_type", "sent_timestamp", "data_kind", "payload"],
     "additionalProperties": false
 }

scripts/build.sh

@@ -18,7 +18,7 @@ for file in $FILES; do
     npx --yes json-schema-to-typescript "$file" > "gen/ts/${clean_name}.ts"
     
     # Generate Go
-    go-jsonschema -p models "$file" > "gen/go/models/${clean_name}.go"
+    go-jsonschema -p contracts "$file" > "gen/go/models/${clean_name}.go"
 done
 
 echo "✅ Generated single TS package in gen/ts"