diff --git a/.gitmodules b/.gitmodules index 37279b19e..f028d8b5e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "apps/speckle-server"] path = apps/speckle-server url = https://github.com/specklesystems/speckle-server.git +[submodule "packages/speckle-sharp"] + path = packages/speckle-sharp + url = git@github.com:specklesystems/speckle-sharp.git diff --git a/apps/rhino-compute-server/Program.cs b/apps/rhino-compute-server/Program.cs index b7877fe75..5f966c8b9 100644 --- a/apps/rhino-compute-server/Program.cs +++ b/apps/rhino-compute-server/Program.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Threading.Tasks; using Topshelf; using Microsoft.Owin.Hosting; using Owin; @@ -74,19 +75,8 @@ public void Configuration(IAppBuilder app) public class Bootstrapper : Nancy.DefaultNancyBootstrapper { - protected override async void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines) + private async Task TryThis() { - // Load Grasshopper - var pluginObject = Rhino.RhinoApp.GetPlugInObject("Grasshopper"); - var runheadless = pluginObject?.GetType().GetMethod("RunHeadless"); - if (runheadless != null) - { - runheadless.Invoke(pluginObject, null); - } - - Class1.Test(); - - // var account = new Speckle.Core.Credentials.Account(); var account = new Account() { token = "8ac998dd805648be63a69a8e0480d07a1e06c6465e", @@ -101,36 +91,79 @@ protected override async void ApplicationStartup(TinyIoCContainer container, IPi } }; - // var streamUrl = "http://localhost:3000/streams/b0d3a3c122"; var streamId = "b0d3a3c122"; var client = new Client(account); var transport = new ServerTransport(account, streamId); + // var ok = await Helpers.Receive("http://localhost:3000/streams/b0d3a3c122/branches/main"); + // Console.WriteLine(Operations.Serialize(ok)); + var data = new Base(); data["test"] = "Some Value 2"; - var objectId = await Operations.Send( - data, - new List { transport }, - useDefaultCache: true, - disposeTransports: true - ); + var commitId = await Helpers.Send("http://localhost:3000/streams/b0d3a3c122/branches/main", data, "Test message"); + + // var objectId = await Operations.Send( + // data, + // new List { transport }, + // useDefaultCache: false, + // disposeTransports: false, + // onErrorAction: new Action((a, b) => + // { + // Console.WriteLine("Error:"); + // Console.WriteLine(a); + // Console.WriteLine(b.Message); + // }), + // onProgressAction: new Action>((a) => + // { + // Console.WriteLine("Progress:"); + + // foreach (var key in a.Keys) + // { + // a.TryGetValue(key, out var val); + + // Console.WriteLine(key); + // Console.WriteLine(val); + // } + // }) + // ); + + // Console.WriteLine($"Successful object creation {objectId}"); + + // var commitId = await client.CommitCreate( + // new CommitCreateInput() + // { + // streamId = streamId, + // branchName = "main", + // objectId = objectId, + // message = "howdy!", + // sourceApplication = ".net", + // totalChildrenCount = 0 + // } + // ); + + return commitId; + } + protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines) + { + // Load Grasshopper + var pluginObject = Rhino.RhinoApp.GetPlugInObject("Grasshopper"); + var runheadless = pluginObject?.GetType().GetMethod("RunHeadless"); + if (runheadless != null) + { + runheadless.Invoke(pluginObject, null); + } + + Class1.Test(); - Console.WriteLine($"Successful object creation {objectId}"); + // var account = new Speckle.Core.Credentials.Account(); - var commitId = await client.CommitCreate( - new CommitCreateInput() - { - streamId = streamId, - branchName = "main", - objectId = objectId, - message = "howdy!", - sourceApplication = "NodePen", - totalChildrenCount = 1 - } - ); + + // var streamUrl = "http://localhost:3000/streams/b0d3a3c122"; + + var commitId = TryThis().Result; // var commitId = client.CommitCreate(new CommitCreateInput() // { diff --git a/apps/rhino-compute-server/Rhino.Compute.csproj b/apps/rhino-compute-server/Rhino.Compute.csproj index c1e04b007..9845e2aac 100644 --- a/apps/rhino-compute-server/Rhino.Compute.csproj +++ b/apps/rhino-compute-server/Rhino.Compute.csproj @@ -24,14 +24,14 @@ - - + + diff --git a/apps/speckle-server b/apps/speckle-server index ee7c9f0a0..de49f3c63 160000 --- a/apps/speckle-server +++ b/apps/speckle-server @@ -1 +1 @@ -Subproject commit ee7c9f0a0c871950c2ba3d07a63d4b113fe156c9 +Subproject commit de49f3c630f0342c7ea2bbe54254e19895a952ec diff --git a/packages/speckle-sharp b/packages/speckle-sharp new file mode 160000 index 000000000..b5ebe1df9 --- /dev/null +++ b/packages/speckle-sharp @@ -0,0 +1 @@ +Subproject commit b5ebe1df95512709b0fd5ee289883f688f2e21f7