hello
");` +/// Group: core_functionality struct Html { /// This string holds the actual html. Use it to retrieve the contents. string source; @@ -7294,19 +7344,24 @@ int intFromHex(string hex) { } /++ - Represents a parsed CSS selector. + Represents a parsed CSS selector. You never have to use this directly, but you can if you know it is going to be reused a lot to avoid a bit of repeat parsing. See_Also: - [Element.querySelector] - [Element.querySelectorAll] - [Document.querySelector] - [Document.querySelectorAll] + $(LIST + * [Element.querySelector] + * [Element.querySelectorAll] + * [Element.matches] + * [Element.closest] + * [Document.querySelector] + * [Document.querySelectorAll] + ) +/ + /// Group: core_functionality struct Selector { SelectorComponent[] components; string original; /++ - Parses the selector string and returns the usable structure. + Parses the selector string and constructs the usable structure. +/ this(string cssSelector) { components = parseSelectorString(cssSelector); @@ -8709,11 +8764,11 @@ unittest { } /* -Copyright: Adam D. Ruppe, 2010 - 2019 +Copyright: Adam D. Ruppe, 2010 - 2020 License: Boost License 1.0. Authors: Adam D. Ruppe, with contributions by Nick Sabalausky, Trass3r, and ketmar among others - Copyright Adam D. Ruppe 2010-2019. + Copyright Adam D. Ruppe 2010-2020. Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/dub.json b/dub.json index 2070dab..812dd0f 100644 --- a/dub.json +++ b/dub.json @@ -3,7 +3,7 @@ "targetType": "library", "importPaths": ["."], "sourceFiles": ["package.d"], - "description": "Subpackage collection for web, database, terminal ui, gui, scripting, and more.", + "description": "Subpackage collection for web, database, terminal ui, gui, scripting, and more with a commitment to long-term compatibility and stability.", "authors": ["Adam D. Ruppe"], "license":"BSL-1.0", "dependencies": { diff --git a/http2.d b/http2.d index afc23fc..e141d1a 100644 --- a/http2.d +++ b/http2.d @@ -1,4 +1,4 @@ -// Copyright 2013-2019, Adam D. Ruppe. +// Copyright 2013-2020, Adam D. Ruppe. /++ This is version 2 of my http/1.1 client implementation. @@ -20,6 +20,8 @@ debug(arsd_http2_verbose) debug=arsd_http2; debug(arsd_http2) import std.stdio : writeln; +version=arsd_http_internal_implementation; + version(without_openssl) {} else { version=use_openssl; @@ -28,6 +30,12 @@ version(older_openssl) {} else version=newer_openssl; } +version(arsd_http_winhttp_implementation) { + pragma(lib, "winhttp") + import core.sys.windows.winhttp; + // FIXME: alter the dub package file too +} + /++ @@ -605,6 +613,176 @@ class HttpRequest { /// Automatically follow a redirection? bool followLocation = false; + this() { + } + + /// + this(Uri where, HttpVerb method) { + populateFromInfo(where, method); + } + + /// Final url after any redirections + string finalUrl; + + void populateFromInfo(Uri where, HttpVerb method) { + auto parts = where; + finalUrl = where.toString(); + requestParameters.method = method; + requestParameters.host = parts.host; + requestParameters.port = cast(ushort) parts.port; + requestParameters.ssl = parts.scheme == "https"; + if(parts.port == 0) + requestParameters.port = requestParameters.ssl ? 443 : 80; + requestParameters.uri = parts.path.length ? parts.path : "/"; + if(parts.query.length) { + requestParameters.uri ~= "?"; + requestParameters.uri ~= parts.query; + } + } + + ~this() { + } + + ubyte[] sendBuffer; + + HttpResponse responseData; + private HttpClient parentClient; + + size_t bodyBytesSent; + size_t bodyBytesReceived; + + State state_; + State state() { return state_; } + State state(State s) { + assert(state_ != State.complete); + return state_ = s; + } + /// Called when data is received. Check the state to see what data is available. + void delegate(HttpRequest) onDataReceived; + + enum State { + /// The request has not yet been sent + unsent, + + /// The send() method has been called, but no data is + /// sent on the socket yet because the connection is busy. + pendingAvailableConnection, + + /// The headers are being sent now + sendingHeaders, + + /// The body is being sent now + sendingBody, + + /// The request has been sent but we haven't received any response yet + waitingForResponse, + + /// We have received some data and are currently receiving headers + readingHeaders, + + /// All headers are available but we're still waiting on the body + readingBody, + + /// The request is complete. + complete, + + /// The request is aborted, either by the abort() method, or as a result of the server disconnecting + aborted + } + + /// Sends now and waits for the request to finish, returning the response. + HttpResponse perform() { + send(); + return waitForCompletion(); + } + + /// Sends the request asynchronously. + void send() { + sendPrivate(true); + } + + private void sendPrivate(bool advance) { + if(state != State.unsent && state != State.aborted) + return; // already sent + string headers; + + headers ~= to!string(requestParameters.method) ~ " "~requestParameters.uri; + if(requestParameters.useHttp11) + headers ~= " HTTP/1.1\r\n"; + else + headers ~= " HTTP/1.0\r\n"; + headers ~= "Host: "~requestParameters.host~"\r\n"; + if(requestParameters.userAgent.length) + headers ~= "User-Agent: "~requestParameters.userAgent~"\r\n"; + if(requestParameters.contentType.length) + headers ~= "Content-Type: "~requestParameters.contentType~"\r\n"; + if(requestParameters.authorization.length) + headers ~= "Authorization: "~requestParameters.authorization~"\r\n"; + if(requestParameters.bodyData.length) + headers ~= "Content-Length: "~to!string(requestParameters.bodyData.length)~"\r\n"; + if(requestParameters.acceptGzip) + headers ~= "Accept-Encoding: gzip\r\n"; + + foreach(header; requestParameters.headers) + headers ~= header ~ "\r\n"; + + headers ~= "\r\n"; + + sendBuffer = cast(ubyte[]) headers ~ requestParameters.bodyData; + + // import std.stdio; writeln("******* ", sendBuffer); + + responseData = HttpResponse.init; + responseData.requestParameters = requestParameters; + bodyBytesSent = 0; + bodyBytesReceived = 0; + state = State.pendingAvailableConnection; + + bool alreadyPending = false; + foreach(req; pending) + if(req is this) { + alreadyPending = true; + break; + } + if(!alreadyPending) { + pending ~= this; + } + + if(advance) + HttpRequest.advanceConnections(); + } + + + /// Waits for the request to finish or timeout, whichever comes first. + HttpResponse waitForCompletion() { + while(state != State.aborted && state != State.complete) { + if(state == State.unsent) + send(); + if(auto err = HttpRequest.advanceConnections()) + throw new Exception("waitForCompletion got err " ~ to!string(err)); + } + + return responseData; + } + + /// Aborts this request. + void abort() { + this.state = State.aborted; + // FIXME + } + + HttpRequestParameters requestParameters; /// + + version(arsd_http_winhttp_implementation) { + public static void resetInternals() { + + } + + static assert(0, "implementation not finished"); + } + + + version(arsd_http_internal_implementation) { private static { // we manage the actual connections. When a request is made on a particular // host, we try to reuse connections. We may open more than one connection per @@ -1170,165 +1348,7 @@ class HttpRequest { return stillAlive; } - this() { } - - /// - this(Uri where, HttpVerb method) { - populateFromInfo(where, method); - } - - /// Final url after any redirections - string finalUrl; - - void populateFromInfo(Uri where, HttpVerb method) { - auto parts = where; - finalUrl = where.toString(); - requestParameters.method = method; - requestParameters.host = parts.host; - requestParameters.port = cast(ushort) parts.port; - requestParameters.ssl = parts.scheme == "https"; - if(parts.port == 0) - requestParameters.port = requestParameters.ssl ? 443 : 80; - requestParameters.uri = parts.path.length ? parts.path : "/"; - if(parts.query.length) { - requestParameters.uri ~= "?"; - requestParameters.uri ~= parts.query; - } - } - - ~this() { - } - - ubyte[] sendBuffer; - - HttpResponse responseData; - private HttpClient parentClient; - - size_t bodyBytesSent; - size_t bodyBytesReceived; - - State state_; - State state() { return state_; } - State state(State s) { - assert(state_ != State.complete); - return state_ = s; - } - /// Called when data is received. Check the state to see what data is available. - void delegate(HttpRequest) onDataReceived; - - enum State { - /// The request has not yet been sent - unsent, - - /// The send() method has been called, but no data is - /// sent on the socket yet because the connection is busy. - pendingAvailableConnection, - - /// The headers are being sent now - sendingHeaders, - - /// The body is being sent now - sendingBody, - - /// The request has been sent but we haven't received any response yet - waitingForResponse, - - /// We have received some data and are currently receiving headers - readingHeaders, - - /// All headers are available but we're still waiting on the body - readingBody, - - /// The request is complete. - complete, - - /// The request is aborted, either by the abort() method, or as a result of the server disconnecting - aborted - } - - /// Sends now and waits for the request to finish, returning the response. - HttpResponse perform() { - send(); - return waitForCompletion(); - } - - /// Sends the request asynchronously. - void send() { - sendPrivate(true); - } - - private void sendPrivate(bool advance) { - if(state != State.unsent && state != State.aborted) - return; // already sent - string headers; - - headers ~= to!string(requestParameters.method) ~ " "~requestParameters.uri; - if(requestParameters.useHttp11) - headers ~= " HTTP/1.1\r\n"; - else - headers ~= " HTTP/1.0\r\n"; - headers ~= "Host: "~requestParameters.host~"\r\n"; - if(requestParameters.userAgent.length) - headers ~= "User-Agent: "~requestParameters.userAgent~"\r\n"; - if(requestParameters.contentType.length) - headers ~= "Content-Type: "~requestParameters.contentType~"\r\n"; - if(requestParameters.authorization.length) - headers ~= "Authorization: "~requestParameters.authorization~"\r\n"; - if(requestParameters.bodyData.length) - headers ~= "Content-Length: "~to!string(requestParameters.bodyData.length)~"\r\n"; - if(requestParameters.acceptGzip) - headers ~= "Accept-Encoding: gzip\r\n"; - - foreach(header; requestParameters.headers) - headers ~= header ~ "\r\n"; - - headers ~= "\r\n"; - - sendBuffer = cast(ubyte[]) headers ~ requestParameters.bodyData; - - // import std.stdio; writeln("******* ", sendBuffer); - - responseData = HttpResponse.init; - responseData.requestParameters = requestParameters; - bodyBytesSent = 0; - bodyBytesReceived = 0; - state = State.pendingAvailableConnection; - - bool alreadyPending = false; - foreach(req; pending) - if(req is this) { - alreadyPending = true; - break; - } - if(!alreadyPending) { - pending ~= this; - } - - if(advance) - HttpRequest.advanceConnections(); - } - - - /// Waits for the request to finish or timeout, whichever comes first. - HttpResponse waitForCompletion() { - while(state != State.aborted && state != State.complete) { - if(state == State.unsent) - send(); - if(auto err = HttpRequest.advanceConnections()) - throw new Exception("waitForCompletion got err " ~ to!string(err)); - } - - return responseData; - } - - /// Aborts this request. - void abort() { - this.state = State.aborted; - // FIXME - } - - HttpRequestParameters requestParameters; /// } /// diff --git a/jni.d b/jni.d index e385c4d..0583865 100644 --- a/jni.d +++ b/jni.d @@ -120,6 +120,24 @@ +/ module arsd.jni; +/* + New Java classes: + + class Foo : extends!Bar { + + mixin stuff; + } + mixin stuff; + + The `extends` template creates a wrapper that calls the nonvirtual + methods, so `super()` just works. + + receiving an object should perhaps always give a subclass that is javafied; + calls the virtuals, unless of course it is final. + + dynamic downcasts of java objects will probably never work. +*/ + /+ For interfaces: @@ -261,6 +279,7 @@ private string getJavaName(alias a)() { version(WithClassLoadSupport) { import arsd.declarativeloader; +/// translator. void jarToD()(string jarPath, string dPackagePrefix, string outputDirectory, JavaTranslationConfig jtc, bool delegate(string className) classFilter = null) { import std.zip; import std.file; @@ -278,7 +297,7 @@ void jarToD()(string jarPath, string dPackagePrefix, string outputDirectory, Jav } } -inout(char)[] fixupKeywordsInJavaPackageName(inout(char)[] s) { +private inout(char)[] fixupKeywordsInJavaPackageName(inout(char)[] s) { import std.string; s ~= "."; // lol i suck s = s.replace(".function.", ".function_."); @@ -286,12 +305,13 @@ inout(char)[] fixupKeywordsInJavaPackageName(inout(char)[] s) { return s[0 .. $-1]; // god i am such a bad programmer } -inout(char)[] fixupJavaClassName(inout(char)[] s) { +private inout(char)[] fixupJavaClassName(inout(char)[] s) { if(s == "Throwable" || s == "Object" || s == "Exception" || s == "Error" || s == "TypeInfo") s = cast(typeof(s)) "Java" ~ s; return s; } +/// For the translator struct JavaTranslationConfig { /// List the Java methods, imported to D. bool doImports; @@ -299,8 +319,11 @@ struct JavaTranslationConfig { bool doExports; /// Put implementations inline. If false, this separates interface from impl for quicker builds with dmd -i. bool inlineImplementations; + /// Treat native functions as imports, otherwise fills in as exports. Make sure doImports == true. + bool nativesAreImports = true; } +/// translator. void rawClassBytesToD()(ubyte[] classBytes, string dPackagePrefix, string outputDirectory, JavaTranslationConfig jtc) { import std.file; import std.path; @@ -370,10 +393,15 @@ void rawClassBytesToD()(ubyte[] classBytes, string dPackagePrefix, string output dc ~= (isInterface ? "interface " : "final class ") ~ lastClassName ~ " : IJavaObject {\n"; foreach(method; cf.methodsListing) { bool native = (method.flags & 0x0100) ? true : false; - if(native && !jtc.doExports) - continue; - if(!native && !jtc.doImports) - continue; + if(jtc.nativesAreImports) { + if(!jtc.doImports) + continue; + } else { + if(native && !jtc.doExports) + continue; + if(!native && !jtc.doImports) + continue; + } auto port = native ? "@Export" : "@Import"; if(method.flags & 1) { // public @@ -2084,3 +2112,9 @@ union jvalue jdouble d; jobject l; } + +/* + Copyright 2019-2020, Adam D. Ruppe. + Boost license. or whatever. + Most work done in December 2019. +*/ diff --git a/simpledisplay.d b/simpledisplay.d index 1dc5700..4d0e970 100644 --- a/simpledisplay.d +++ b/simpledisplay.d @@ -459,7 +459,7 @@ I live in the eastern United States, so I will most likely not be around at night in that US east timezone. - License: Copyright Adam D. Ruppe, 2011-2017. Released under the Boost Software License. + License: Copyright Adam D. Ruppe, 2011-2020. Released under the Boost Software License. Building documentation: You may wish to use the `arsd.ddoc` file from my github with building the documentation for simpledisplay yourself. It will give it a bit more style.