diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..67acbf4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,253 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
diff --git a/ChakraCore Samples/JSRT Hosting Samples/C#/ChakraCoreHost/App.config b/ChakraCore Samples/JSRT Hosting Samples/C#/ChakraCoreHost/App.config
index 88fa402..343984d 100644
--- a/ChakraCore Samples/JSRT Hosting Samples/C#/ChakraCoreHost/App.config
+++ b/ChakraCore Samples/JSRT Hosting Samples/C#/ChakraCoreHost/App.config
@@ -1,6 +1,6 @@
-
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/ChakraCore Samples/JSRT Hosting Samples/C#/ChakraCoreHost/ChakraCoreHost.cs b/ChakraCore Samples/JSRT Hosting Samples/C#/ChakraCoreHost/ChakraCoreHost.cs
index 106a696..9d7c728 100644
--- a/ChakraCore Samples/JSRT Hosting Samples/C#/ChakraCoreHost/ChakraCoreHost.cs
+++ b/ChakraCore Samples/JSRT Hosting Samples/C#/ChakraCoreHost/ChakraCoreHost.cs
@@ -1,6 +1,8 @@
using System;
using System.IO;
using ChakraHost.Hosting;
+using System.Collections.Generic;
+using System.Threading;
namespace ChakraHost
{
@@ -11,11 +13,40 @@ private struct CommandLineArguments
public int ArgumentsStart;
};
+ class TimeoutCall
+ {
+ public TimeoutCall( int msecs, JavaScriptValue callback_, JavaScriptValue callee_)
+ {
+ dt = InspecificNow().AddMilliseconds(msecs);
+ callback = callback_;
+ callee = callee_;
+ callback.AddRef();
+ callee.AddRef();
+ }
+ public DateTime dt;
+ public JavaScriptValue callback;
+ public JavaScriptValue callee;
+ public void CallTimeoutFunction()
+ {
+ callback.CallFunction(callee);
+ callback.Release();
+ callee.Release();
+ }
+ }
+
+ private static DateTime InspecificNow()
+ {
+ return DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Unspecified);
+ }
+
+ private static SortedList timeouts = new SortedList();
+
private static JavaScriptSourceContext currentSourceContext = JavaScriptSourceContext.FromIntPtr(IntPtr.Zero);
// We have to hold on to the delegates on the managed side of things so that the
// delegates aren't collected while the script is running.
private static readonly JavaScriptNativeFunction echoDelegate = Echo;
+ private static readonly JavaScriptNativeFunction setTimeoutDelegate = SetTimeout;
private static readonly JavaScriptNativeFunction runScriptDelegate = RunScript;
private static void ThrowException(string errorString)
@@ -43,6 +74,23 @@ private static JavaScriptValue Echo(JavaScriptValue callee, bool isConstructCall
return JavaScriptValue.Invalid;
}
+ private static JavaScriptValue SetTimeout(JavaScriptValue callee, bool isConstructCall, JavaScriptValue[] arguments, ushort argumentCount, IntPtr callbackData)
+ {
+ // setTimeout signature is (callback, after)
+ if (arguments.Length < 2)
+ {
+ Console.WriteLine("Invalid argument lengths, required 2");
+ return JavaScriptValue.Invalid;
+ }
+ JavaScriptValue callbackValue = arguments[1];
+ JavaScriptValue timeout = arguments[2];
+ JavaScriptValue afterValue = arguments[2].ConvertToNumber();
+ int after = (int)Math.Max(afterValue.ToDouble(), 1.0);
+ TimeoutCall to = new TimeoutCall(after, callbackValue, callee);
+ timeouts.Add(to.dt,to);
+ return JavaScriptValue.Invalid;
+ }
+
private static JavaScriptValue RunScript(JavaScriptValue callee, bool isConstructCall, JavaScriptValue[] arguments, ushort argumentCount, IntPtr callbackData)
{
if (argumentCount < 2)
@@ -141,6 +189,7 @@ private static JavaScriptContext CreateHostContext(JavaScriptRuntime runtime, st
DefineHostCallback(hostObject, "echo", echoDelegate, IntPtr.Zero);
DefineHostCallback(hostObject, "runScript", runScriptDelegate, IntPtr.Zero);
+ DefineHostCallback(JavaScriptValue.GlobalObject, "setTimeout", setTimeoutDelegate, IntPtr.Zero);
//
// Create an array for arguments.
@@ -248,6 +297,20 @@ public static int Main(string[] arguments)
try
{
result = JavaScriptContext.RunScript(script, currentSourceContext++, arguments[commandLineArguments.ArgumentsStart]);
+ while( timeouts.Count > 0)
+ {
+ DateTime inow = InspecificNow();
+ DateTime next = timeouts.Keys[0];
+ TimeSpan diff = next.Subtract(inow);
+ if ( diff.TotalMilliseconds <= 0 )
+ {
+ timeouts.Values[0].CallTimeoutFunction();
+ timeouts.RemoveAt(0);
+ }else
+ {
+ Thread.Sleep(diff);
+ }
+ }
}
catch (JavaScriptScriptException e)
{
diff --git a/ChakraCore Samples/JSRT Hosting Samples/C#/ChakraCoreHost/ChakraCoreHost.csproj b/ChakraCore Samples/JSRT Hosting Samples/C#/ChakraCoreHost/ChakraCoreHost.csproj
index 44a4777..a1e4472 100644
--- a/ChakraCore Samples/JSRT Hosting Samples/C#/ChakraCoreHost/ChakraCoreHost.csproj
+++ b/ChakraCore Samples/JSRT Hosting Samples/C#/ChakraCoreHost/ChakraCoreHost.csproj
@@ -9,9 +9,10 @@
Properties
ChakraCoreHost
ChakraCoreHost
- v4.5.2
+ v3.5
512
true
+
AnyCPU
@@ -77,9 +78,7 @@
-
-
@@ -117,8 +116,15 @@
-
+
+
+ PreserveNewest
+
+
+
+ xcopy /y /d "$(SolutionDir)..\..\..\ChakraCoreDll\x64Debug\*.dll" "$(ProjectDir)$(OutDir)"
+