diff --git a/.gitignore b/.gitignore index f867683..1f2b190 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,8 @@ -*.meta \ No newline at end of file +*.meta + +# these will be generated in compilation +bin +.DS_Store +obj +*.pidb +*.nupkg diff --git a/AssemblyInfo.cs b/AssemblyInfo.cs new file mode 100644 index 0000000..89dae49 --- /dev/null +++ b/AssemblyInfo.cs @@ -0,0 +1,37 @@ +using System.Reflection; +using System.Runtime.InteropServices; +using System.Runtime.Serialization; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Unity.HTTP")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("")] +[assembly: AssemblyCopyright("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +// generated from : http://www.guidgenerator.com/online-guid-generator.aspx +[assembly: Guid("080f69d5-28bf-4813-adb9-023785939711")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("0.0.0.0")] +[assembly: AssemblyFileVersion("0.0.0.0")] diff --git a/HTTP.pidb b/HTTP.pidb deleted file mode 100644 index 2fbce9c..0000000 Binary files a/HTTP.pidb and /dev/null differ diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..8cdb845 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {description} + Copyright (C) {year} {fullname} + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + {signature of Ty Coon}, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. + diff --git a/README.md b/README.md index 444376f..081b288 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,13 @@ Based on Simon Wittber's UnityWeb code (http://code.google.com/p/unityweb/). +# LICENSE + +UnityHTTP falls under the GPL due to its basis on Simon Wittber's UnityWeb code, +which is licensed under the GPL. + +You should be aware of this license and determine if it is acceptable for your project. + # About This is a TcpClient-based HTTP library for use in Unity. It should work in diff --git a/HTTP.csproj b/UnityHTTP.csproj similarity index 53% rename from HTTP.csproj rename to UnityHTTP.csproj index 1d43640..0ffd78f 100644 --- a/HTTP.csproj +++ b/UnityHTTP.csproj @@ -1,51 +1,57 @@ - + Debug AnyCPU - 9.0.21022 + 8.0.30703 2.0 {8E94F9A4-3E1E-42F4-86E8-58270D44A4D8} Library HTTP HTTP v3.5 - 0.3 - true + True full - false - bin\Debug + False + bin\ DEBUG prompt - 4 - false + 0 + False none - false - bin\Release + False + bin\ prompt 4 - false + False - - False - ..\..\..\..\Unity\DMU\Assets\DMU\DLL\Ionic.Zlib.dll + + ..\..\..\..\..\Applications\Unity\Unity.app\Contents\Frameworks\Managed\UnityEngine.dll - - False - ..\..\..\..\..\..\Applications\Unity\Unity.app\Contents\Frameworks\Managed\UnityEngine.dll + + lib\Ionic.Zlib.dll - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/UnityHTTP.nuspec b/UnityHTTP.nuspec new file mode 100644 index 0000000..ce6f944 --- /dev/null +++ b/UnityHTTP.nuspec @@ -0,0 +1,29 @@ + + + + UnityHTTP + 1.0.0 + UnityHTTP + Andy Burke, Dawson Reid + Andy Burke + https://github.com/andyburke/UnityHTTP/blob/master/LICENSE.md + https://github.com/andyburke/UnityHTTP + false + A TcpClient-based HTTP library for Unity. + First push to NuGet + Copyright 2014 + Unity HTTP Web Game + + + + + + + + + + + + + + \ No newline at end of file diff --git a/external/Ionic.Zlib.dll b/external/Ionic.Zlib.dll deleted file mode 100755 index 7c29e8c..0000000 Binary files a/external/Ionic.Zlib.dll and /dev/null differ diff --git a/lib/Ionic.Zlib.CF.dll b/lib/Ionic.Zlib.CF.dll new file mode 100755 index 0000000..949f804 Binary files /dev/null and b/lib/Ionic.Zlib.CF.dll differ diff --git a/external/JSON.cs b/lib/JSON.cs similarity index 98% rename from external/JSON.cs rename to lib/JSON.cs index c5c4457..ae06abd 100644 --- a/external/JSON.cs +++ b/lib/JSON.cs @@ -12,7 +12,7 @@ /// Spec. details, see http://www.json.org/ /// /// JSON uses Arrays and Objects. These correspond here to the datatypes ArrayList and Hashtable. -/// All numbers are parsed to floats or ints. +/// All numbers are parsed to floats, ints, or longs. /// public class JSON { @@ -279,11 +279,17 @@ protected static object ParseNumber (char[] json, ref int index, ref bool succes success = float.TryParse (token, NumberStyles.Any, CultureInfo.InvariantCulture, out number); return number; } - else + else if(token.Length <= 10) { int number; success = int.TryParse(token, out number); return number; + } + else + { + long number; + success = long.TryParse(token, out number); + return number; } } diff --git a/CookieJar.cs b/src/CookieJar.cs similarity index 99% rename from CookieJar.cs rename to src/CookieJar.cs index 8d6cc7a..d226e5c 100644 --- a/CookieJar.cs +++ b/src/CookieJar.cs @@ -4,7 +4,7 @@ // Based on node-cookiejar (https://github.com/bmeck/node-cookiejar) -namespace HTTP +namespace UnityHTTP { public class CookieAccessInfo { diff --git a/DiskCache.cs b/src/DiskCache.cs similarity index 95% rename from DiskCache.cs rename to src/DiskCache.cs index f634ed9..f5357e3 100644 --- a/DiskCache.cs +++ b/src/DiskCache.cs @@ -2,9 +2,8 @@ using System.Collections; using System.IO; using System; -using HTTP; -namespace HTTP +namespace UnityHTTP { public class DiskCacheOperation { @@ -70,7 +69,7 @@ void Awake () public DiskCacheOperation Fetch (Request request) { - var guid = ""; + var guid = string.Empty; // MD5 is disposable // http://msdn.microsoft.com/en-us/library/system.security.cryptography.md5.aspx#3 using (System.Security.Cryptography.MD5 md5 = System.Security.Cryptography.MD5.Create ()) { @@ -91,14 +90,14 @@ public DiskCacheOperation Fetch (Request request) IEnumerator DownloadAndSave (Request request, string filename, DiskCacheOperation handle) { var useCachedVersion = File.Exists(filename); - Action< HTTP.Request > callback = request.completedCallback; + Action< UnityHTTP.Request > callback = request.completedCallback; request.Send(); // will clear the completedCallback while (!request.isDone) yield return new WaitForEndOfFrame (); if (request.exception == null && request.response != null) { if (request.response.status == 200) { var etag = request.response.GetHeader ("etag"); - if (etag != "") { + if (etag != string.Empty) { File.WriteAllBytes (filename, request.response.bytes); File.WriteAllText (filename + ".etag", etag); } diff --git a/src/FormDataStream.cs b/src/FormDataStream.cs new file mode 100644 index 0000000..02b44ca --- /dev/null +++ b/src/FormDataStream.cs @@ -0,0 +1,168 @@ +using System; +using System.IO; +using System.Text; +using System.Collections.Generic; +namespace UnityHTTP { + + public class FormPart { + byte[] header; + Stream contents; + int position = 0; + + public FormPart(string fieldName, string mimeType, string boundary, Stream contents, string fileName=null){ + string filenameheader = ""; + if (fileName != null){ + filenameheader = "; filename=\"" + fileName +"\""; + } + header = Encoding.ASCII.GetBytes( + "\r\n--" + boundary + "\r\n" + + "Content-Type: " + mimeType + "\r\n" + + "Content-disposition: form-data; name=\"" + fieldName + "\"" + filenameheader + "\r\n\r\n" + ); + this.contents = contents; + } + public long Length { + get { + return header.Length + contents.Length; + } + } + public int Read(byte[] buffer, int offset, int size){ + int writed = 0; + int bytesToWrite; + if (position < header.Length){ + bytesToWrite = (int)(header.Length - position) > size ? size : (int)(header.Length - position); + Array.Copy ( + header, // from header + position, // started from position + buffer, // to buffer + offset, // started with offset + bytesToWrite + ); + writed += bytesToWrite; + position += bytesToWrite; + } + if (writed >= size){ + return writed; + } + bytesToWrite = contents.Read(buffer, writed + offset, size - writed); + writed += bytesToWrite; + position += bytesToWrite; + return writed; + } + + public void Dispose(){ + header = null; + contents.Close(); + } + } + + public class FormDataStream: Stream { + long position = 0; + List parts = new List(); + bool dirty = false; + byte[] footer; + string boundary; + + public FormDataStream(string boundary){ + this.boundary = boundary; + footer = Encoding.ASCII.GetBytes("\r\n--" + boundary + "--\r\n"); + } + + public override bool CanRead { get { return true; } } + public override bool CanSeek { get { return false; } } + public override bool CanTimeout { get { return false; } } + public override bool CanWrite { get { return false; } } + public override int ReadTimeout { get { return 0; } set { } } + public override int WriteTimeout { get { return 0; } set { } } + public override long Position { + get { + return position; + } + set { + throw new NotImplementedException("FormDataStream is non-seekable stream"); + } + } + public override long Length { + get { + if (parts.Count == 0){ + return 0; + } + dirty = true; + long len = 0; + foreach (var part in parts){ + len += part.Length; + } + return len + footer.Length; + } + } + + public override void Flush(){ + throw new NotImplementedException("FormDataStream is readonly stream"); + } + + public override int Read(byte[] buffer, int offset, int count){ + dirty = true; + int writed = 0; + int bytesToWrite = 0; + + // write parts + long partsSize = 0; + foreach (var part in parts){ + partsSize += part.Length; + if (position > partsSize){ + continue; + } + bytesToWrite = part.Read(buffer, writed + offset, count - writed); + writed += bytesToWrite; + position += bytesToWrite; + if (writed >= count){ + return count; + } + } + + + // write footer + bytesToWrite = count - writed > footer.Length? footer.Length : count - writed; + Array.Copy (footer, 0, buffer, writed + offset, bytesToWrite); + position += bytesToWrite; + writed += bytesToWrite; + return writed; + } + + public override long Seek(long amount, SeekOrigin origin){ + throw new NotImplementedException("FormDataStream is non-seekable stream"); + } + + public override void SetLength (long len){ + throw new NotImplementedException("FormDataStream is readonly stream"); + } + + public override void Write(byte[] source, int offset, int count){ + throw new NotImplementedException("FormDataStream is readonly stream"); + } + + public void AddPart(string fieldName, string mimeType, Stream contents, string fileName=null){ + if (dirty){ + throw new InvalidOperationException("You can't change form data, form already readed"); + } + parts.Add(new FormPart(fieldName, mimeType, boundary, contents, fileName)); + } + + public void AddPart(FormPart part){ + if (dirty){ + throw new InvalidOperationException("You can't change form data, form already readed"); + } + parts.Add(part); + } + + public override void Close(){ + foreach (var part in parts){ + part.Dispose(); + } + base.Close(); + } + } + +} + + diff --git a/src/Logger.cs b/src/Logger.cs new file mode 100644 index 0000000..d466a6f --- /dev/null +++ b/src/Logger.cs @@ -0,0 +1,71 @@ +using System; + +namespace UnityHTTP +{ + public interface ILogger + { + void Log(string msg); + void LogError(string msg); + void LogException(Exception e); + void LogWarning(string msg); + } +#if UNITY_EDITOR + public class UnityLogger : ILogger + { + public void Log(string msg) + { + UnityEngine.Debug.Log(msg); + } + public void LogError(string msg) + { + UnityEngine.Debug.LogError(msg); + } + public void LogException(Exception e) + { + UnityEngine.Debug.LogException(e); + } + public void LogWarning(string msg) + { + UnityEngine.Debug.LogWarning(msg); + } + } +#endif + public class ConsoleLogger : ILogger + { + public void Log(string msg) + { + Console.WriteLine(msg); + } + public void LogError(string msg) + { + Console.WriteLine(msg); + } + public void LogException(Exception e) + { + Console.WriteLine(e); + } + public void LogWarning(string msg) + { + Console.WriteLine(msg); + } + } + public class DiscardLogger : ILogger + { + public void Log(string msg) + { + // discard logs + } + public void LogError(string msg) + { + // discard logs + } + public void LogException(Exception e) + { + // discard logs + } + public void LogWarning(string msg) + { + // discard logs + } + } +} \ No newline at end of file diff --git a/Request.cs b/src/Request.cs similarity index 78% rename from Request.cs rename to src/Request.cs index 8da731b..429a52d 100644 --- a/Request.cs +++ b/src/Request.cs @@ -11,7 +11,7 @@ using System.Security.Authentication; using System.Security.Cryptography.X509Certificates; -namespace HTTP +namespace UnityHTTP { public class HTTPException : Exception { @@ -26,13 +26,23 @@ public enum RequestState { public class Request { + public static bool LogAllRequests = false; public static bool VerboseLogging = false; + public static string unityVersion = Application.unityVersion; + public static string operatingSystem = SystemInfo.operatingSystem; + public static ILogger Logger = +#if !UNITY_EDITOR + new ConsoleLogger() +#else + new UnityLogger() +#endif + ; public CookieJar cookieJar = CookieJar.Instance; public string method = "GET"; public string protocol = "HTTP/1.1"; - public byte[] bytes; + public Stream byteStream; public Uri uri; public static byte[] EOL = { (byte)'\r', (byte)'\n' }; public Response response = null; @@ -44,8 +54,11 @@ public class Request public RequestState state = RequestState.Waiting; public long responseTime = 0; // in milliseconds public bool synchronous = false; + public int bufferSize = 4 * 1024; + + public ILogger logger = Request.Logger; - public Action< HTTP.Request > completedCallback = null; + public Action< UnityHTTP.Request > completedCallback = null; Dictionary> headers = new Dictionary> (); static Dictionary etags = new Dictionary (); @@ -67,25 +80,42 @@ public Request (string method, string uri, byte[] bytes) { this.method = method; this.uri = new Uri (uri); - this.bytes = bytes; + this.byteStream = new MemoryStream(bytes); + } + + public Request(string method, string uri, StreamedWWWForm form){ + this.method = method; + this.uri = new Uri (uri); + this.byteStream = form.stream; + foreach ( DictionaryEntry entry in form.headers ) + { + this.AddHeader( (string)entry.Key, (string)entry.Value ); + } } public Request( string method, string uri, WWWForm form ) { this.method = method; this.uri = new Uri (uri); - this.bytes = form.data; + this.byteStream = new MemoryStream(form.data); +#if UNITY_5 || UNITY_5_3_OR_NEWER + foreach ( var entry in form.headers ) + { + this.AddHeader( entry.Key, entry.Value ); + } +#else foreach ( DictionaryEntry entry in form.headers ) { this.AddHeader( (string)entry.Key, (string)entry.Value ); } +#endif } public Request( string method, string uri, Hashtable data ) { this.method = method; this.uri = new Uri( uri ); - this.bytes = Encoding.UTF8.GetBytes( JSON.JsonEncode( data ) ); + this.byteStream = new MemoryStream(Encoding.UTF8.GetBytes( JSON.JsonEncode( data ) )); this.AddHeader( "Content-Type", "application/json" ); } @@ -163,7 +193,8 @@ private void GetResponse() { var ssl = ostream as SslStream; ssl.AuthenticateAsClient (uri.Host); } catch (Exception e) { - Debug.LogError ("Exception: " + e.Message); + logger.LogError ("SSL authentication failed."); + logger.LogException(e); return; } } @@ -193,15 +224,21 @@ private void GetResponse() { } } catch (Exception e) { - Console.WriteLine ("Unhandled Exception, aborting request."); - Console.WriteLine (e); + logger.LogError("Unhandled Exception, aborting request."); + logger.LogException(e); exception = e; response = null; } + state = RequestState.Done; isDone = true; responseTime = curcall.ElapsedMilliseconds; + if ( byteStream != null ) + { + byteStream.Close(); + } + if ( completedCallback != null ) { if (synchronous) { @@ -215,25 +252,25 @@ private void GetResponse() { if ( LogAllRequests ) { #if !UNITY_EDITOR - System.Console.WriteLine("NET: " + InfoString( VerboseLogging )); + logger.Log("NET: " + InfoString( VerboseLogging )); #else if ( response != null && response.status >= 200 && response.status < 300 ) { - Debug.Log( InfoString( VerboseLogging ) ); + logger.Log( InfoString( VerboseLogging ) ); } else if ( response != null && response.status >= 400 ) { - Debug.LogError( InfoString( VerboseLogging ) ); + logger.LogError( InfoString( VerboseLogging ) ); } else { - Debug.LogWarning( InfoString( VerboseLogging ) ); + logger.LogWarning( InfoString( VerboseLogging ) ); } #endif } } - public virtual void Send( Action< HTTP.Request > callback = null) + public virtual void Send( Action< UnityHTTP.Request > callback = null) { if (!synchronous && callback != null && ResponseCallbackDispatcher.Singleton == null ) @@ -265,12 +302,16 @@ public virtual void Send( Action< HTTP.Request > callback = null) SetHeader( "cookie", cookieString ); } - if ( bytes != null && bytes.Length > 0 && GetHeader ("Content-Length") == "" ) { - SetHeader( "Content-Length", bytes.Length.ToString() ); + if ( byteStream != null && byteStream.Length > 0 && GetHeader ("Content-Length") == "" ) { + SetHeader( "Content-Length", byteStream.Length.ToString() ); } if ( GetHeader( "User-Agent" ) == "" ) { - SetHeader( "User-Agent", "UnityWeb 1.0 ( Unity " + Application.unityVersion + " ) ( " + SystemInfo.operatingSystem + " )" ); + try { + SetHeader( "User-Agent", "UnityWeb/1.0 (Unity " + Request.unityVersion + "; " + Request.operatingSystem + ")" ); + } catch (Exception) { + SetHeader( "User-Agent", "UnityWeb/1.0" ); + } } if ( GetHeader( "Connection" ) == "" ) { @@ -292,15 +333,15 @@ public virtual void Send( Action< HTTP.Request > callback = null) } public string Text { - set { bytes = System.Text.Encoding.UTF8.GetBytes (value); } + set { byteStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes (value)); } } public static bool ValidateServerCertificate (object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors) { #if !UNITY_EDITOR - System.Console.WriteLine( "NET: SSL Cert: " + sslPolicyErrors.ToString() ); + Logger.LogWarning( "NET: SSL Cert: " + sslPolicyErrors.ToString() ); #else - Debug.LogWarning("SSL Cert Error: " + sslPolicyErrors.ToString ()); + Logger.LogWarning("SSL Cert Error: " + sslPolicyErrors.ToString ()); #endif return true; } @@ -322,8 +363,16 @@ void WriteToStream( Stream outputStream ) stream.Write( EOL ); - if ( bytes != null && bytes.Length > 0 ) { - stream.Write( bytes ); + if (byteStream == null){ + return; + } + + long numBytesToRead = byteStream.Length; + byte[] buffer = new byte[bufferSize]; + while (numBytesToRead > 0){ + int readed = byteStream.Read(buffer, 0, bufferSize); + stream.Write(buffer, 0, readed); + numBytesToRead -= readed; } } diff --git a/Response.cs b/src/Response.cs similarity index 98% rename from Response.cs rename to src/Response.cs index 7a1a9d7..ac48e70 100644 --- a/Response.cs +++ b/src/Response.cs @@ -6,7 +6,7 @@ using System.Globalization; using Ionic.Zlib; -namespace HTTP +namespace UnityHTTP { public class Response { @@ -210,7 +210,7 @@ public void ReadFromStream( Stream inputStream ) AddHeader( parts[0], parts[1] ); } - } else { + } else if (request.method.ToUpper() != "HEAD") { // Read Body int contentLength = 0; diff --git a/ResponseCallbackDispatcher.cs b/src/ResponseCallbackDispatcher.cs similarity index 88% rename from ResponseCallbackDispatcher.cs rename to src/ResponseCallbackDispatcher.cs index f87c31c..d49a31e 100644 --- a/ResponseCallbackDispatcher.cs +++ b/src/ResponseCallbackDispatcher.cs @@ -2,7 +2,7 @@ using System; using System.Collections; -namespace HTTP +namespace UnityHTTP { public class ResponseCallbackDispatcher : MonoBehaviour { @@ -33,6 +33,7 @@ public static void Init() } singletonGameObject = new GameObject(); + GameObject.DontDestroyOnLoad(singletonGameObject); singleton = singletonGameObject.AddComponent< ResponseCallbackDispatcher >(); singletonGameObject.name = "HTTPResponseCallbackDispatcher"; } @@ -42,7 +43,7 @@ public void Update() { while( requests.Count > 0 ) { - HTTP.Request request = (Request)requests.Dequeue(); + UnityHTTP.Request request = (Request)requests.Dequeue(); request.completedCallback( request ); } } diff --git a/src/StreamedWWWForm.cs b/src/StreamedWWWForm.cs new file mode 100644 index 0000000..0510e48 --- /dev/null +++ b/src/StreamedWWWForm.cs @@ -0,0 +1,62 @@ +using System; +using System.IO; +using System.Text; +using System.Collections; + +namespace UnityHTTP +{ + public class StreamedWWWForm { + string boundary; + public FormDataStream stream; + + public Hashtable headers { + get { + return new Hashtable { + { "Content-Type", "multipart/form-data; boundary=\"" + boundary + "\""} + }; + } + } + + public StreamedWWWForm(){ + byte[] bytes = new byte[40]; + var random = new Random(); + for (int i=0; i<40; i++){ + bytes[i] = (byte)(48 + random.Next(62)); + if (bytes[i] > 57){ + bytes[i] += 7; + } + if (bytes[i] > 90){ + bytes[i] += 6; + } + } + boundary = Encoding.ASCII.GetString(bytes); + stream = new FormDataStream(boundary); + } + + public void AddField(string fieldName, string fieldValue){ + var contentStream = new MemoryStream(Encoding.UTF8.GetBytes(fieldValue)); + stream.AddPart(fieldName, "text/plain; charset=\"utf-8\"", contentStream); + + } + public void AddBinaryData(string fieldName, byte[] contents=null, string mimeType = null){ + var contentStream = new MemoryStream(contents); + if (mimeType == null){ + mimeType = "application/octet-stream"; + } + stream.AddPart(fieldName, mimeType, contentStream, fieldName + ".dat"); + } + public void AddBinaryData(string fieldName, Stream contents=null, string mimeType = null){ + if (mimeType == null){ + mimeType = "application/octet-stream"; + } + stream.AddPart(fieldName, mimeType, contents, fieldName + ".dat"); + } + public void AddFile(string fieldName, string path, string mimeType=null){ + if (mimeType == null){ + mimeType = "application/octet-stream"; + } + var contents = new FileInfo(path).Open(FileMode.Open); + stream.AddPart(fieldName, mimeType, contents, fieldName + ".dat"); + } + } +}