Compare commits

..

No commits in common. "d3f466d3c4a92844d1e3ec31c1ad8b401c37822e" and "4b2eb1b25888c138c2cdf4cfe0434ca58da56e0b" have entirely different histories.

6 changed files with 9 additions and 10 deletions

View File

@ -20,6 +20,6 @@ jobs:
registry-url: "https://registry.npmjs.org" registry-url: "https://registry.npmjs.org"
- run: npm install - run: npm install
- run: npm ci - run: npm ci
- run: npm publish --access public - run: npm publish
env: env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

View File

@ -20,6 +20,6 @@ jobs:
registry-url: "https://registry.npmjs.org" registry-url: "https://registry.npmjs.org"
- run: npm install - run: npm install
- run: npm ci - run: npm ci
- run: npm publish --access public - run: npm publish
env: env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

View File

@ -259,7 +259,6 @@ namespace VELConnect
{ {
state = JsonConvert.DeserializeObject<State>(json); state = JsonConvert.DeserializeObject<State>(json);
if (state == null) return; if (state == null) return;
if (state.room == null) return;
bool isInitialState = false; bool isInitialState = false;
@ -405,12 +404,12 @@ namespace VELConnect
} }
// if (state.room.modified_by != DeviceId && state.room.data != null) // if (state.room.modified_by != DeviceId && state.room.data != null)
if (state.room.data != null) if (state.room?.data != null)
{ {
foreach (KeyValuePair<string, string> elem in state.room.data) foreach (KeyValuePair<string, string> elem in state.room.data)
{ {
string oldValue = null; string oldValue = null;
lastState?.room?.data.TryGetValue(elem.Key, out oldValue); lastState?.room.data.TryGetValue(elem.Key, out oldValue);
if (elem.Value != oldValue) if (elem.Value != oldValue)
{ {
try try
@ -752,7 +751,6 @@ namespace VELConnect
State.DataBlock room = new State.DataBlock State.DataBlock room = new State.DataBlock
{ {
category = "room", category = "room",
modified_by = "Unity",
data = data data = data
}; };
@ -915,7 +913,7 @@ namespace VELConnect
case UnityWebRequest.Result.ConnectionError: case UnityWebRequest.Result.ConnectionError:
case UnityWebRequest.Result.DataProcessingError: case UnityWebRequest.Result.DataProcessingError:
case UnityWebRequest.Result.ProtocolError: case UnityWebRequest.Result.ProtocolError:
Debug.LogWarning(url + ": Error: " + webRequest.error + "\n" + webRequest.downloadHandler.text + "\n" + Environment.StackTrace); Debug.LogError(url + ": Error: " + webRequest.error + "\n" + webRequest.downloadHandler.text + "\n" + Environment.StackTrace);
failureCallback?.Invoke(webRequest.error); failureCallback?.Invoke(webRequest.error);
break; break;
case UnityWebRequest.Result.Success: case UnityWebRequest.Result.Success:

View File

@ -73,6 +73,7 @@ namespace VELConnect
loading = false; loading = false;
}, s => }, s =>
{ {
Debug.LogError(s);
loading = false; loading = false;
}); });
} }

View File

@ -1,7 +1,7 @@
{ {
"name": "edu.uga.engr.vel.vel-connect", "name": "edu.uga.engr.vel.vel-connect",
"displayName": "VEL-Connect", "displayName": "VEL-Connect",
"version": "4.0.5", "version": "4.0.2",
"unity": "2019.1", "unity": "2019.1",
"description": "Web-based configuration for VR applications", "description": "Web-based configuration for VR applications",
"keywords": [], "keywords": [],

View File

@ -1,12 +1,12 @@
{ {
"name": "@velaboratory/velconnect", "name": "@velaboratory/velconnect",
"version": "1.0.1", "version": "1.0.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@velaboratory/velconnect", "name": "@velaboratory/velconnect",
"version": "1.0.1", "version": "1.0.0",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"pocketbase": "^0.20.3" "pocketbase": "^0.20.3"