Merge pull request #52 from FabianTerhorst/dev

NetworkingEntity and docs improvement

Author: FabianTerhorst

.travis.yml

@@ -80,6 +80,18 @@ matrix:
       - WINDOWS_STABLE=false
       - LINUX_BETA=false
       - WINDOWS_BETA=false
+  - language: csharp
+    dist: trusty
+    mono: latest
+    git:
+      depth: false
+    before_script:
+    - DOCS=true
+    - nuget install docfx.console -ExcludeVersion
+    - export DOCFX_TOOL="mono docfx.console/tools/docfx.exe"
+    script:
+    - $DOCFX_TOOL metadata docs/docfx.json
+    - $DOCFX_TOOL build docs/docfx.json
 deploy:
   - provider: releases
     skip_cleanup: true
@@ -186,3 +198,13 @@ deploy:
       repo: FabianTerhorst/coreclr-module
       condition: "$DOTNET_BETA = true"
       tags: true
+  - provider: pages
+    skip-cleanup: true
+    github-token: $GITHUB_TOKEN
+    repo: coreclr-module/fabianterhorst.github.io
+    target-branch: master
+    local-dir: docs/_site
+    keep-history: true
+    on:
+      condition: "$DOCS = true"
+      branch: master

api/AltV.Net.Example/Chat.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using AltV.Net.Elements.Entities;
 
 namespace AltV.Net.Example
@@ -11,6 +12,8 @@ public class Chat
 
         private readonly Action<string, Function> registerCmd;
 
+        private readonly LinkedList<Function> functions = new LinkedList<Function>();
+
         public Chat()
         {
             Alt.Import("chat", "broadcast", out broadcast);
@@ -30,7 +33,9 @@ public void Send(IPlayer player, string message)
 
         public void RegisterCommand(string command, Action<IPlayer, string, string[]> callback)
         {
-            registerCmd?.Invoke(command, Function.Create(callback));
+            var function = Function.Create(callback);
+            functions.AddFirst(function);
+            registerCmd?.Invoke(command, function);
         }
     }
 }

api/AltV.Net.NetworkingEntity/AltNetworking.cs

@@ -83,12 +83,12 @@ public static void RemoveEntity(INetworkingEntity entity)
 
         public static INetworkingClient CreateClient()
         {
-            return Module.ClientPool.Create(Module.TokenProvider.GetNext());
+            return Module.ClientPool.Create(Module.TokenProvider.GetNext(), Module.Streamer);
         }
 
         public static INetworkingClient CreateClient(string token)
         {
-            return Module.ClientPool.Create(token);
+            return Module.ClientPool.Create(token, Module.Streamer);
         }
 
         public static void RemoveClient(INetworkingClient client)

api/AltV.Net.NetworkingEntity/AltV.Net.NetworkingEntity.csproj

@@ -2,9 +2,9 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.0</TargetFramework>
-        <PackageVersion>1.3.1-dev-preview</PackageVersion>
+        <PackageVersion>1.4.0-dev-preview</PackageVersion>
         <PackageLicenseFile>license.txt</PackageLicenseFile>
-        <PackageReleaseNotes>Add StreamingType</PackageReleaseNotes>
+        <PackageReleaseNotes>Add dimensions</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>

api/AltV.Net.NetworkingEntity/Client/client-repository.js

@@ -0,0 +1,7 @@
+class ClientRepository {
+    constructor() {
+        this.dimension = 0;
+    }
+}
+
+export default new ClientRepository();

api/AltV.Net.NetworkingEntity/Client/entity-repository.js

@@ -1,6 +1,7 @@
 import playerPosition from "./player-position.js"
 import proto from "./proto.js"
 import streamingWorker from "./streaming-worker.mjs";
+import clientRepository from "./client-repository.js";
 
 export default class EntityRepository {
     constructor(websocket) {
@@ -120,13 +121,14 @@ export default class EntityRepository {
     updateWorker() {
         this.streamingWorker.postMessage({
             position: playerPosition.getPosition(),
+            dimension: clientRepository.dimension,
             entities: this.copyEntitiesWithoutData()
-        })
+        });
     }
 
     resetWorker() {
         this.streamingWorker.postMessage({
             reset: true
-        })
+        });
     }
 }

api/AltV.Net.NetworkingEntity/Client/entity.proto

@@ -88,6 +88,10 @@ message AuthEvent {
     string token = 1;
 }
 
+message ClientDimensionChangeEvent {
+    int64 dimension = 1;
+}
+
 message ServerEvent {
     oneof Event {
         EntityDataChangeEvent dataChange = 1;
@@ -98,6 +102,7 @@ message ServerEvent {
         EntityCreateEvent create = 6;
         EntityMultipleDataChangeEvent multipleDataChange = 7;
         EntityDimensionChangeEvent dimensionChange = 8;
+        ClientDimensionChangeEvent clientDimensionChange = 9;
     }
 }
 

api/AltV.Net.NetworkingEntity/Client/gen/bundle.json

@@ -230,6 +230,14 @@
             }
           }
         },
+        "ClientDimensionChangeEvent": {
+          "fields": {
+            "dimension": {
+              "type": "int64",
+              "id": 1
+            }
+          }
+        },
         "ServerEvent": {
           "oneofs": {
             "Event": {
@@ -241,7 +249,8 @@
                 "delete",
                 "create",
                 "multipleDataChange",
-                "dimensionChange"
+                "dimensionChange",
+                "clientDimensionChange"
               ]
             }
           },
@@ -277,6 +286,10 @@
             "dimensionChange": {
               "type": "EntityDimensionChangeEvent",
               "id": 8
+            },
+            "clientDimensionChange": {
+              "type": "ClientDimensionChangeEvent",
+              "id": 9
             }
           }
         },

api/AltV.Net.NetworkingEntity/Client/index_debug.html

@@ -5,7 +5,7 @@
         window.callbacks = new Map();
         window.alt = {
             emit: (eventname, ...args) => {
-                console.log("emit:" + eventname + JSON.stringify(args));
+                console.log("emit:" + eventname + " " + args);
                 if (!window.callbacks.has(eventname)) {
                     return;
                 }

api/AltV.Net.NetworkingEntity/Client/networking-entity.js

@@ -5,6 +5,10 @@ class NetworkingEntity {
     constructor() {
         alt.on("entitySetup", (url, token) => {
             const protocolSplit = url.split("//");
+            if (protocolSplit.length < 2) {
+                console.log("Invalid websocket protocol:" +  url);
+                return;
+            }
             const protocol = protocolSplit[0] + "//";
             const splitUrl = protocolSplit[1].split(":");
             if (splitUrl.length > 2) {