diff --git a/cgi.d b/cgi.d index 9ac46b9..1edcdb9 100644 --- a/cgi.d +++ b/cgi.d @@ -3294,6 +3294,8 @@ mixin template DispatcherMain(Presenter, DispatcherArgs...) { /++ Request handler that creates the presenter then forwards to the [dispatcher] function. Renders 404 if the dispatcher did not handle the request. + + Will automatically serve the presenter.style and presenter.script as "style.css" and "script.js" +/ void handler(Cgi cgi) { auto presenter = new Presenter; @@ -3303,11 +3305,29 @@ mixin template DispatcherMain(Presenter, DispatcherArgs...) { if(cgi.dispatcher!DispatcherArgs(presenter)) return; - presenter.renderBasicError(cgi, 404); + switch(cgi.pathInfo) { + case "/style.css": + cgi.setCache(true); + cgi.setResponseContentType("text/css"); + cgi.write(presenter.style(), true); + break; + case "/script.js": + cgi.setCache(true); + cgi.setResponseContentType("application/javascript"); + cgi.write(presenter.script(), true); + break; + default: + presenter.renderBasicError(cgi, 404); + } } mixin GenericMain!handler; } +mixin template DispatcherMain(DispatcherArgs...) if(!is(DispatcherArgs[0] : WebPresenter!T, T)) { + class GenericPresenter : WebPresenter!GenericPresenter {} + mixin DispatcherMain!(GenericPresenter, DispatcherArgs); +} + private string simpleHtmlEncode(string s) { return s.replace("&", "&").replace("<", "<").replace(">", ">").replace("\n", "
\n"); } @@ -4140,12 +4160,20 @@ class CgiFiber : Fiber { } void proceed() { - call(); - auto py = postYield; - postYield = null; - if(py !is null) - py(); + try { + call(); + auto py = postYield; + postYield = null; + if(py !is null) + py(); + } catch(Exception e) { + if(connection) + connection.close(); + goto terminate; + } + if(state == State.TERM) { + terminate: import core.memory; GC.removeRoot(cast(void*) this); } @@ -4168,8 +4196,10 @@ void doThreadHttpConnection(CustomCgi, alias fun)(Socket connection) { void doThreadHttpConnectionGuts(CustomCgi, alias fun, bool alwaysCloseConnection = false)(Socket connection) { scope(failure) { // catch all for other errors - sendAll(connection, plainHttpError(false, "500 Internal Server Error", null)); - connection.close(); + try { + sendAll(connection, plainHttpError(false, "500 Internal Server Error", null)); + connection.close(); + } catch(Exception e) {} // swallow it, we're aborting anyway. } bool closeConnection = alwaysCloseConnection; @@ -8466,8 +8496,8 @@ class WebPresenter(CRTP) { :root { --mild-border: #ccc; --middle-border: #999; - --accent-color: #e8e8e8; - --sidebar-color: #f2f2f2; + --accent-color: #f2f2f2; + --sidebar-color: #fefefe; } ` ~ genericFormStyling() ~ genericSiteStyling(); } @@ -8988,6 +9018,11 @@ html", true, true); ol.addChild("li", formatReturnValueAsHtml(e)); return ol; } + } else static if(is(T : Object)) { + static if(is(typeof(t.toHtml()))) // FIXME: maybe i will make this an interface + return Element.make("div", t.toHtml()); + else + return Element.make("div", t.toString()); } else static assert(0, "bad return value for cgi call " ~ T.stringof); assert(0); @@ -9580,6 +9615,8 @@ template urlNamesForMethod(alias method, string default_) { /++ The base of all REST objects, to be used with [serveRestObject] and [serveRestCollectionOf]. + + WARNING: this is not stable. +/ class RestObject(CRTP) : WebObject { @@ -9594,21 +9631,24 @@ class RestObject(CRTP) : WebObject { show(); } - ValidationResult delegate(typeof(this)) validateFromReflection; - Element delegate(typeof(this)) toHtmlFromReflection; - var delegate(typeof(this)) toJsonFromReflection; - /// Override this to provide access control to this object. AccessCheck accessCheck(string urlId, Operation operation) { return AccessCheck.allowed; } ValidationResult validate() { - if(validateFromReflection !is null) - return validateFromReflection(this); + // FIXME return ValidationResult.valid; } + string getUrlSlug() { + import std.conv; + static if(is(typeof(CRTP.id))) + return to!string((cast(CRTP) this).id); + else + return null; + } + // The functions with more arguments are the low-level ones, // they forward to the ones with fewer arguments by default. @@ -9618,7 +9658,9 @@ class RestObject(CRTP) : WebObject { of the new object. +/ string create(scope void delegate() applyChanges) { - return null; + applyChanges(); + save(); + return getUrlSlug(); } void replace() { @@ -9649,18 +9691,31 @@ class RestObject(CRTP) : WebObject { abstract void load(string urlId); abstract void save(); - Element toHtml() { - if(toHtmlFromReflection) - return toHtmlFromReflection(this); - else - assert(0); + Element toHtml(Presenter)(Presenter presenter) { + import arsd.dom; + import std.conv; + auto obj = cast(CRTP) this; + auto div = Element.make("div"); + div.addClass("Dclass_" ~ CRTP.stringof); + div.dataset.url = getUrlSlug(); + bool first = true; + foreach(idx, memberName; __traits(derivedMembers, CRTP)) + static if(__traits(compiles, __traits(getMember, obj, memberName).offsetof)) { + if(!first) div.addChild("br"); else first = false; + div.appendChild(presenter.formatReturnValueAsHtml(__traits(getMember, obj, memberName))); + } + return div; } var toJson() { - if(toJsonFromReflection) - return toJsonFromReflection(this); - else - assert(0); + import arsd.jsvar; + var v = var.emptyObject(); + auto obj = cast(CRTP) this; + foreach(idx, memberName; __traits(derivedMembers, CRTP)) + static if(__traits(compiles, __traits(getMember, obj, memberName).offsetof)) { + v[memberName] = __traits(getMember, obj, memberName); + } + return v; } /+ @@ -9889,32 +9944,6 @@ bool restObjectServeHandler(T, Presenter)(Cgi cgi, Presenter presenter, string u // FIXME: support precondition failed, if-modified-since, expectation failed, etc. auto obj = new T(); - obj.toHtmlFromReflection = delegate(t) { - import arsd.dom; - auto div = Element.make("div"); - div.addClass("Dclass_" ~ T.stringof); - div.dataset.url = urlId; - bool first = true; - foreach(idx, memberName; __traits(derivedMembers, T)) - static if(__traits(compiles, __traits(getMember, obj, memberName).offsetof)) { - if(!first) div.addChild("br"); else first = false; - div.appendChild(presenter.formatReturnValueAsHtml(__traits(getMember, obj, memberName))); - } - return div; - }; - obj.toJsonFromReflection = delegate(t) { - import arsd.jsvar; - var v = var.emptyObject(); - foreach(idx, memberName; __traits(derivedMembers, T)) - static if(__traits(compiles, __traits(getMember, obj, memberName).offsetof)) { - v[memberName] = __traits(getMember, obj, memberName); - } - return v; - }; - obj.validateFromReflection = delegate(t) { - // FIXME - return ValidationResult.valid; - }; obj.initialize(cgi); // FIXME: populate reflection info delegates @@ -9965,13 +9994,14 @@ bool restObjectServeHandler(T, Presenter)(Cgi cgi, Presenter presenter, string u `); else container.appendHtml(` + Back
`); } - container.appendChild(obj.toHtml()); + container.appendChild(obj.toHtml(presenter)); cgi.write(container.parentDocument.toString, true); } } @@ -10162,6 +10192,32 @@ auto serveStaticFile(string urlPrefix, string filename = null, string contentTyp return DispatcherDefinition!(internalHandler, DispatcherDetails)(urlPrefix, true, DispatcherDetails(filename, contentType)); } +/++ + Serves static data. To be used with [dispatcher]. + + History: + Added October 31, 2021 ++/ +auto serveStaticData(string urlPrefix, immutable(void)[] data, string contentType = null) { + assert(urlPrefix[0] == '/'); + if(contentType is null) { + contentType = contentTypeFromFileExtension(urlPrefix); + } + + static struct DispatcherDetails { + immutable(void)[] data; + string contentType; + } + + static bool internalHandler(string urlPrefix, Cgi cgi, Object presenter, DispatcherDetails details) { + cgi.setCache(true); + cgi.setResponseContentType(details.contentType); + cgi.write(details.data, true); + return true; + } + return DispatcherDefinition!(internalHandler, DispatcherDetails)(urlPrefix, true, DispatcherDetails(data, contentType)); +} + string contentTypeFromFileExtension(string filename) { if(filename.endsWith(".png")) return "image/png"; diff --git a/color.d b/color.d index cb1fb71..927827a 100644 --- a/color.d +++ b/color.d @@ -102,21 +102,20 @@ private { bool startsWithInternal(in char[] a, in char[] b) { return (a.length >= b.length && a[0 .. b.length] == b); } - inout(char)[][] splitInternal(inout(char)[] a, char c) { - inout(char)[][] ret; + void splitInternal(scope inout(char)[] a, char c, scope void delegate(int, scope inout(char)[]) @safe dg) { + int count; size_t previous = 0; foreach(i, char ch; a) { if(ch == c) { - ret ~= a[previous .. i]; + dg(count++, a[previous .. i]); previous = i + 1; } } if(previous != a.length) - ret ~= a[previous .. $]; - return ret; + dg(count++, a[previous .. $]); } nothrow @safe @nogc pure - inout(char)[] stripInternal(inout(char)[] s) { + inout(char)[] stripInternal(return inout(char)[] s) { foreach(i, char c; s) if(c != ' ' && c != '\t' && c != '\n') { s = s[i .. $]; @@ -309,13 +308,12 @@ struct Color { double[3] hsl; ubyte a = 255; - auto parts = s.splitInternal(','); - foreach(i, part; parts) { + s.splitInternal(',', (int i, scope const(char)[] part) { if(i < 3) hsl[i] = toInternal!double(part.stripInternal); else a = clampToByte(cast(int) (toInternal!double(part.stripInternal) * 255)); - } + }); c = .fromHsl(hsl); c.a = a; @@ -328,8 +326,7 @@ struct Color { assert(s[$-1] == ')'); s = s[s.startsWithInternal("rgb(") ? 4 : 5 .. $ - 1]; // the closing paren - auto parts = s.splitInternal(','); - foreach(i, part; parts) { + s.splitInternal(',', (int i, scope const(char)[] part) { // lol the loop-switch pattern auto v = toInternal!double(part.stripInternal); switch(i) { @@ -347,7 +344,7 @@ struct Color { break; default: // ignore } - } + }); return c; } diff --git a/database.d b/database.d index af6010d..d878d1e 100644 --- a/database.d +++ b/database.d @@ -78,11 +78,17 @@ interface Database { } import std.stdio; -Ret queryOneColumn(Ret, string file = __FILE__, size_t line = __LINE__, T...)(Database db, string sql, T t) { +// Added Oct 26, 2021 +Row queryOneRow(string file = __FILE__, size_t line = __LINE__, T...)(Database db, string sql, T t) { auto res = db.query(sql, t); if(res.empty) throw new Exception("no row in result", file, line); auto row = res.front; + return row; +} + +Ret queryOneColumn(Ret, string file = __FILE__, size_t line = __LINE__, T...)(Database db, string sql, T t) { + auto row = queryOneRow(db, sql, t); return to!Ret(row[0]); } @@ -727,19 +733,19 @@ mixin template DataObjectConstructors() { } } -string yield(string what) { return `if(auto result = dg(`~what~`)) return result;`; } +private string yield(string what) { return `if(auto result = dg(`~what~`)) return result;`; } import std.typecons; import std.json; // for json value making class DataObject { // lets you just free-form set fields, assuming they all come from the given table // note it doesn't try to handle joins for new rows. you've gotta do that yourself - this(Database db, string table) { + this(Database db, string table, UpdateOrInsertMode mode = UpdateOrInsertMode.CheckForMe) { assert(db !is null); this.db = db; this.table = table; - mode = UpdateOrInsertMode.CheckForMe; + this.mode = mode; } JSONValue makeJsonValue() { @@ -1103,19 +1109,24 @@ class SimpleDataObject(string tableToUse, fieldsToUse) : DataObject { break on complex tables. Data types handled: + + ``` INTEGER, SMALLINT, MEDIUMINT -> D's int TINYINT -> D's bool BIGINT -> D's long TEXT, VARCHAR -> D's string FLOAT, DOUBLE -> D's double + ``` It also reads DEFAULT values to pass to D, except for NULL. It ignores any length restrictions. Bugs: - Skips all constraints - Doesn't handle nullable fields, except with strings - It only handles SQL keywords if they are all caps + $(LIST + * Skips all constraints + * Doesn't handle nullable fields, except with strings + * It only handles SQL keywords if they are all caps + ) This, when combined with SimpleDataObject!(), can automatically create usable D classes from @@ -1206,6 +1217,7 @@ string getCreateTable(string sql, string tableName) { case "INTEGER": case "SMALLINT": case "MEDIUMINT": + case "SERIAL": // added Oct 23, 2021 structCode ~= "int"; break; case "BOOLEAN": @@ -1221,6 +1233,7 @@ string getCreateTable(string sql, string tableName) { case "varchar": case "TEXT": case "text": + case "TIMESTAMPTZ": // added Oct 23, 2021 structCode ~= "string"; break; case "FLOAT": @@ -1352,15 +1365,70 @@ mixin template DatabaseOperations(string table) { } +string toDbName(string s) { + import std.string; + return s.toLower ~ "s"; +} + +/++ + Easy interop with [arsd.cgi] serveRestObject classes. + + History: + Added October 31, 2021. + + Warning: not stable/supported at this time. ++/ +mixin template DatabaseRestObject(alias getDb) { + override void save() { + this.id = this.saveToDatabase(getDb()); + } + + override void load(string urlId) { + import std.conv; + this.id = to!int(urlId); + this.loadFromDatabase(getDb()); + } +} + +void loadFromDatabase(T)(T t, Database database, string tableName = toDbName(__traits(identifier, T))) { + static assert(is(T == class), "structs wont work for this function, try rowToObject instead for now and complain to me adding struct support is easy enough"); + auto query = new SelectBuilder(database); + query.table = tableName; + query.fields ~= "*"; + query.wheres ~= "id = ?0"; + auto res = database.query(query.toString(), t.id); + if(res.empty) + throw new Exception("no such row"); + + rowToObject(res.front, t); +} + +auto saveToDatabase(T)(T t, Database database, string tableName = toDbName(__traits(identifier, T))) { + DataObject obj = objectToDataObject(t, database, tableName, t.id ? UpdateOrInsertMode.AlwaysUpdate : UpdateOrInsertMode.AlwaysInsert); + if(!t.id) { + import std.random; // omg i hate htis + obj.id = uniform(2, int.max); + } + obj.commitChanges; + return t.id; +} + import std.traits, std.datetime; enum DbSave; enum DbNullable; alias AliasHelper(alias T) = T; T rowToObject(T)(Row row) { + T t; + static if(is(T == class)) + t = new T(); + rowToObject(row, t); + return t; +} + +void rowToObject(T)(Row row, ref T t) { import arsd.dom, arsd.cgi; - T t; foreach(memberName; __traits(allMembers, T)) { alias member = AliasHelper!(__traits(getMember, t, memberName)); foreach(attr; __traits(getAttributes, member)) { @@ -1381,14 +1449,12 @@ T rowToObject(T)(Row row) { } } } - return t; - } -DataObject objectToDataObject(T)(T t, Database db, string table) { +DataObject objectToDataObject(T)(T t, Database db, string table, UpdateOrInsertMode mode = UpdateOrInsertMode.CheckForMe) { import arsd.dom, arsd.cgi; - DataObject obj = new DataObject(db, table); + DataObject obj = new DataObject(db, table, mode); foreach(memberName; __traits(allMembers, T)) { alias member = AliasHelper!(__traits(getMember, t, memberName)); foreach(attr; __traits(getAttributes, member)) { @@ -1408,8 +1474,18 @@ DataObject objectToDataObject(T)(T t, Database db, string table) { } } - if(!done) - obj.opDispatch!memberName(__traits(getMember, t, memberName)); + if(!done) { + static if(memberName == "id") { + if(__traits(getMember, t, memberName)) { + // maybe i shouldn't actually set the id but idk + obj.opDispatch!memberName(__traits(getMember, t, memberName)); + } else { + // it is null, let the system do something about it like auto increment + + } + } else + obj.opDispatch!memberName(__traits(getMember, t, memberName)); + } } } } diff --git a/dom.d b/dom.d index 485cd12..0648e02 100644 --- a/dom.d +++ b/dom.d @@ -6228,6 +6228,17 @@ int intFromHex(string hex) { // a "*" matcher to act as a root. for cases like document.querySelector("> body") // which implies html + // however, if it is a child-matching selector and there are no children, + // bail out early as it obviously cannot match. + bool hasNonTextChildren = false; + foreach(c; e.children) + if(c.nodeType != 3) { + hasNonTextChildren = true; + break; + } + if(!hasNonTextChildren) + return false; + // there is probably a MUCH better way to do this. auto dummy = SelectorPart.init; dummy.tagNameFilter = "*"; @@ -7804,11 +7815,22 @@ unittest {
Foo
Bar
+
+
test
"); auto doc = document; + { + auto empty = doc.requireElementById("empty"); + assert(empty.querySelector(" > *") is null, empty.querySelector(" > *").toString); + } + { + auto empty = doc.requireElementById("empty-but-text"); + assert(empty.querySelector(" > *") is null, empty.querySelector(" > *").toString); + } + assert(doc.querySelectorAll("div div").length == 2); assert(doc.querySelector("div").querySelectorAll("div").length == 2); assert(doc.querySelectorAll("> html").length == 0); diff --git a/http2.d b/http2.d index 3b7bd72..07c5b86 100644 --- a/http2.d +++ b/http2.d @@ -3574,7 +3574,16 @@ class WebSocket { //connect(); while(d.length) { auto r = socket.send(d); - if(r <= 0) throw new Exception("Socket send failed"); + if(r < 0 && wouldHaveBlocked()) { + import core.thread; + Thread.sleep(1.msecs); + continue; + } + //import core.stdc.errno; import std.stdio; writeln(errno); + if(r <= 0) { + // import std.stdio; writeln(GetLastError()); + throw new Exception("Socket send failed"); + } d = d[r .. $]; } } @@ -3604,8 +3613,12 @@ class WebSocket { auto r = socket.receive(receiveBuffer[receiveBufferUsedLength .. $]); if(r == 0) return false; - if(r <= 0) + if(r < 0 && wouldHaveBlocked()) + return true; + if(r <= 0) { + //import std.stdio; writeln(WSAGetLastError()); throw new Exception("Socket receive failed"); + } receiveBufferUsedLength += r; return true; } @@ -4023,6 +4036,9 @@ class WebSocket { } } +/++ + Warning: you should call this AFTER websocket.connect or else it might throw on connect because the function sets nonblocking mode and the connect function doesn't handle that well (it throws on the "would block" condition in that function. easier to just do that first) ++/ template addToSimpledisplayEventLoop() { import arsd.simpledisplay; void addToSimpledisplayEventLoop(WebSocket ws, SimpleWindow window) { @@ -4038,12 +4054,91 @@ template addToSimpledisplayEventLoop() { version(linux) { auto reader = new PosixFdReader(&midprocess, ws.socket.handle); + } else version(none) { + if(WSAAsyncSelect(ws.socket.handle, window.hwnd, WM_USER + 150, FD_CLOSE | FD_READ)) + throw new Exception("WSAAsyncSelect"); + + window.handleNativeEvent = delegate int(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { + if(hwnd !is window.impl.hwnd) + return 1; // we don't care... + switch(msg) { + case WM_USER + 150: // socket activity + switch(LOWORD(lParam)) { + case FD_READ: + case FD_CLOSE: + midprocess(); + break; + default: + // nothing + } + break; + default: return 1; // not handled, pass it on + } + return 0; + }; + } else version(Windows) { - auto reader = new WindowsHandleReader(&midprocess, ws.socket.handle); + ws.socket.blocking = false; // the WSAEventSelect does this anyway and doing it here lets phobos know about it. + //CreateEvent(null, 0, 0, null); + auto event = WSACreateEvent(); + if(!event) { + throw new Exception("WSACreateEvent"); + } + if(WSAEventSelect(ws.socket.handle, event, 1/*FD_READ*/ | (1<<5)/*FD_CLOSE*/)) { + //import std.stdio; writeln(WSAGetLastError()); + throw new Exception("WSAEventSelect"); + } + + auto handle = new WindowsHandleReader(&midprocess, event); + + /+ + static class Ready {} + + Ready thisr = new Ready; + + justCommunication.addEventListener((Ready r) { + if(r is thisr) + midprocess(); + }); + + import core.thread; + auto thread = new Thread({ + while(true) { + WSAWaitForMultipleEvents(1, &event, true, -1/*WSA_INFINITE*/, false); + justCommunication.postEvent(thisr); + } + }); + thread.isDaemon = true; + thread.start; + +/ + } else static assert(0, "unsupported OS"); } } +version(Windows) { + import core.sys.windows.windows; + import core.sys.windows.winsock2; +} + +version(none) { + extern(Windows) int WSAAsyncSelect(SOCKET, HWND, uint, int); + enum int FD_CLOSE = 1 << 5; + enum int FD_READ = 1 << 0; + enum int WM_USER = 1024; +} + +version(Windows) { + import core.stdc.config; + extern(Windows) + int WSAEventSelect(SOCKET, HANDLE /* to an Event */, c_long); + + extern(Windows) + HANDLE WSACreateEvent(); + + extern(Windows) + DWORD WSAWaitForMultipleEvents(DWORD, HANDLE*, BOOL, DWORD, BOOL); +} /* copy/paste from cgi.d */ public { diff --git a/jsvar.d b/jsvar.d index fdde32b..c0fdbde 100644 --- a/jsvar.d +++ b/jsvar.d @@ -769,7 +769,8 @@ struct var { }; } } else static if(is(typeof(__traits(getMember, t, member)))) { - this[member] = __traits(getMember, t, member); + static if(!is(typeof(__traits(getMember, t, member)) == void)) + this[member] = __traits(getMember, t, member); } } } else { @@ -860,6 +861,8 @@ struct var { // foo in this public var* opBinaryRight(string op : "in", T)(T s) { // this needs to be an object + if(this._object is null) + return null; return var(s).get!string in this._object._properties; } @@ -985,7 +988,7 @@ struct var { else static if(isFloatingPoint!T || isIntegral!T) return cast(T) (this._payload._boolean ? 1 : 0); // the cast is for enums, I don't like this so FIXME else static if(isSomeString!T) - return this._payload._boolean ? "true" : "false"; + return to!T(this._payload._boolean ? "true" : "false"); else return T.init; case Type.Object: @@ -1012,15 +1015,17 @@ struct var { // first, we'll try to give them back the native object we have, if we have one static if(is(T : Object) || is(T == interface)) { auto t = this; - // need to walk up the prototype chain to + // need to walk up the prototype chain too while(t != null) { + assert(t.payloadType == Type.Object); if(auto wno = cast(WrappedNativeObject) t._payload._object) { auto no = cast(T) wno.getObject(); if(no !is null) { auto sc = cast(ScriptableSubclass) no; - if(sc !is null) + if(sc !is null) { sc.setScriptVar(this); + } return no; } @@ -1060,7 +1065,7 @@ struct var { } } else static if(isSomeString!T) { if(this._object !is null) - return this._object.toString(); + return to!T(this._object.toString()); return null;// "null"; } else return T.init; @@ -1068,14 +1073,14 @@ struct var { static if(isFloatingPoint!T || isIntegral!T) return to!T(this._payload._integral); else static if(isSomeString!T) - return to!string(this._payload._integral); + return to!T(this._payload._integral); else return T.init; case Type.Floating: static if(isFloatingPoint!T || isIntegral!T) return to!T(this._payload._floating); else static if(isSomeString!T) - return to!string(this._payload._floating); + return to!T(this._payload._floating); else return T.init; case Type.String: @@ -1089,7 +1094,7 @@ struct var { import std.range; auto pl = this._payload._array; static if(isSomeString!T) { - return to!string(pl); + return to!T(pl); } else static if(is(T == E[N], E, size_t N)) { T ret; foreach(i; 0 .. N) { @@ -1113,7 +1118,7 @@ struct var { // is it sane to translate anything else? case Type.Function: static if(isSomeString!T) { - return ""; + return to!T(""); } else static if(isDelegate!T) { // making a local copy because otherwise the delegate might refer to a struct on the stack and get corrupted later or something auto func = this._payload._function; @@ -2087,8 +2092,13 @@ var subclassable(T)() if(is(T == class) || is(T == interface)) { static if(memberName != "toHash") static foreach(overload; __traits(getOverloads, T, memberName)) static if(__traits(isVirtualMethod, overload)) + static if(!__traits(isFinalFunction, overload)) + static if(!__traits(isDeprecated, overload)) // note: overload behavior undefined - static if(!(functionAttributes!(overload) & (FunctionAttribute.pure_ | FunctionAttribute.safe | FunctionAttribute.trusted | FunctionAttribute.nothrow_))) + static if(!(functionAttributes!(overload) & (FunctionAttribute.pure_ | FunctionAttribute.safe | FunctionAttribute.trusted | FunctionAttribute.nothrow_ | FunctionAttribute.const_ | FunctionAttribute.inout_))) + static if(!hasRefParam!overload) + static if(__traits(getFunctionVariadicStyle, overload) == "none") + static if(__traits(identifier, overload) == memberName) // to filter out aliases mixin(q{ @scriptable override ReturnType!(overload) @@ -2096,8 +2106,10 @@ var subclassable(T)() if(is(T == class) || is(T == interface)) { (Parameters!(overload) p) { //import std.stdio; writeln("calling ", T.stringof, ".", memberName, " - ", methodOverriddenByScript(memberName), "/", _next_devirtualized, " on ", cast(size_t) cast(void*) this); - if(_next_devirtualized || !methodOverriddenByScript(memberName)) + if(_next_devirtualized || !methodOverriddenByScript(memberName)) { + _next_devirtualized = false; return __traits(getMember, super, memberName)(p); + } return _this[memberName].call(_this, p).get!(typeof(return)); } }); @@ -2124,6 +2136,20 @@ var subclassable(T)() if(is(T == class) || is(T == interface)) { return f; } + +template hasRefParam(alias overload) { + bool helper() { + static if(is(typeof(overload) P == __parameters)) + foreach(idx, p; P) + foreach(thing; __traits(getParameterStorageClasses, overload, idx)) + if(thing == "ref") + return true; + return false; + } + + enum hasRefParam = helper(); +} + }); /// Demonstrates tested capabilities of [subclassable] @@ -2153,6 +2179,12 @@ unittest { } static class Bar : Foo { override string method() { return "Bar"; } + string test1() { return test2(); } + string test2() { return "test2"; } + + int acceptFoo(Foo f) { + return f.method2(); + } } static class Baz : Bar { override int method2() { return 20; } @@ -2194,9 +2226,15 @@ unittest { assert(bar.method() == "Bar"); assert(bar.method2() == 10); + assert(bar.acceptFoo(new Foo()) == 10); + assert(bar.acceptFoo(new Baz()) == 20); + // this final member is accessible because it was marked @scriptable assert(bar.fm() == 56); + assert(bar.test1() == "test2"); + assert(bar.test2() == "test2"); + // the script can even subclass D classes! class Amazing : Bar { // and override its methods @@ -2217,6 +2255,10 @@ unittest { // calling parent class method still possible return super.args(a*2, b*2); } + + function test2() { + return "script test"; + } } var amazing = new Amazing(); @@ -2224,6 +2266,8 @@ unittest { assert(amazing.method2() == 10); // calls back to the parent class amazing.member(5); + assert(amazing.test1() == "script test"); // even the virtual method call from D goes into the script override + // this line I can paste down to interactively debug the test btw. //}, globals); repl!true(globals); interpret(q{ diff --git a/minigui.d b/minigui.d index 6544519..41d5d20 100644 --- a/minigui.d +++ b/minigui.d @@ -1902,6 +1902,14 @@ abstract class ComboboxBase : Widget { return selection_; } + /++ + History: + Added November 17, 2021 + +/ + string getSelectionString() { + return selection_ == -1 ? null : options[selection_]; + } + void setSelection(int idx) { selection_ = idx; version(win32_widgets) diff --git a/minigui_addons/webview.d b/minigui_addons/webview.d index 26d706a..02d278d 100644 --- a/minigui_addons/webview.d +++ b/minigui_addons/webview.d @@ -89,16 +89,31 @@ class WebViewWidgetBase : NestedChildWindowWidget { abstract void navigate(string url); - // the url and line are for error reporting purposes + // the url and line are for error reporting purposes. They might be ignored. abstract void executeJavascript(string code, string url = null, int line = 0); + // for injecting stuff into the context + // abstract void executeJavascriptBeforeEachLoad(string code); abstract void showDevTools(); + /++ + Your communication consists of running Javascript and sending string messages back and forth, + kinda similar to your communication with a web server. + +/ + // these form your communcation channel between the web view and the native world + // abstract void sendMessageToHost(string json); + // void delegate(string json) receiveMessageFromHost; + + /+ + I also need a url filter + +/ + // this is implemented as a do-nothing in the NestedChildWindowWidget base // but you will almost certainly need to override it in implementations. // abstract void registerMovementAdditionalWork(); } +// AddScriptToExecuteOnDocumentCreated version(wv2) class WebViewWidget_WV2 : WebViewWidgetBase { @@ -123,6 +138,11 @@ class WebViewWidget_WV2 : WebViewWidgetBase { webview_window = controller.CoreWebView2; + webview_window.add_DocumentTitleChanged((sender, args) { + this.title = toGC(&sender.get_DocumentTitle); + return S_OK; + }); + RC!ICoreWebView2Settings Settings = webview_window.Settings; Settings.IsScriptEnabled = TRUE; Settings.AreDefaultScriptDialogsEnabled = TRUE; @@ -131,21 +151,7 @@ class WebViewWidget_WV2 : WebViewWidgetBase { auto ert = webview_window.add_NavigationStarting( delegate (sender, args) { - wchar* t; - args.get_Uri(&t); - auto ot = t; - - string s; - - while(*t) { - s ~= *t; - t++; - } - - this.url = s; - - CoTaskMemFree(ot); - + this.url = toGC(&args.get_Uri); return S_OK; }); diff --git a/simpleaudio.d b/simpleaudio.d index e4d123a..c98ef8a 100644 --- a/simpleaudio.d +++ b/simpleaudio.d @@ -1230,7 +1230,14 @@ final class AudioPcmOutThreadImplementation : Thread { buffer[] = 0; } }; + //try ao.play(); + /+ + catch(Throwable t) { + import std.stdio; + writeln(t); + } + +/ } } @@ -1548,12 +1555,22 @@ struct AudioOutput { //throw new AlsaException("uh oh", err); continue; } + if(err == 0) + continue; // err == 0 means timeout // err == 1 means ready auto ready = snd_pcm_avail_update(handle); - if(ready < 0) - throw new AlsaException("avail", cast(int)ready); + if(ready < 0) { + //import std.stdio; writeln("recover"); + + // actually it seems ok to just try again.. + + // err = snd_pcm_recover(handle, err, 0); + //if(err) + //throw new AlsaException("avail", cast(int)ready); + continue; + } if(ready > BUFFER_SIZE_FRAMES) ready = BUFFER_SIZE_FRAMES; //import std.stdio; writeln("filling ", ready); @@ -1565,7 +1582,9 @@ struct AudioOutput { while(data.length) { written = snd_pcm_writei(handle, data.ptr, data.length / channels); if(written < 0) { + //import std.stdio; writeln(written); written = snd_pcm_recover(handle, cast(int)written, 0); + //import std.stdio; writeln("recover ", written); if (written < 0) throw new AlsaException("pcm write", cast(int)written); } data = data[written * channels .. $]; @@ -2321,12 +2340,13 @@ snd_pcm_t* openAlsaPcm(snd_pcm_stream_t direction, int SampleRate, int channels, if (auto err = snd_pcm_hw_params_set_channels(handle, hwParams, channels)) throw new AlsaException("params channels", err); - uint periods = 2; + uint periods = 4; { auto err = snd_pcm_hw_params_set_periods_near(handle, hwParams, &periods, 0); if(err < 0) throw new AlsaException("periods", err); + // import std.stdio; writeln(periods); snd_pcm_uframes_t sz = (BUFFER_SIZE_FRAMES * periods); err = snd_pcm_hw_params_set_buffer_size_near(handle, hwParams, &sz); if(err < 0) diff --git a/terminal.d b/terminal.d index 3e4d1e4..d995bbb 100644 --- a/terminal.d +++ b/terminal.d @@ -2215,6 +2215,10 @@ struct Terminal { History: The `echoChar` parameter was added on October 11, 2021 (dub v10.4). + + The `prompt` would not take effect if it was `null` prior to November 12, 2021. Before then, a `null` prompt would just leave the previous prompt string in place on the object. After that, the prompt is always set to the argument, including turning it off if you pass `null` (which is the default). + + Always pass a string if you want it to display a string. +/ string getline(string prompt = null, dchar echoChar = dchar.init) { if(lineGetter is null) @@ -2224,12 +2228,15 @@ struct Terminal { lineGetter.terminal = &this; auto ec = lineGetter.echoChar; - scope(exit) + auto p = lineGetter.prompt; + scope(exit) { lineGetter.echoChar = ec; + lineGetter.prompt = p; + } lineGetter.echoChar = echoChar; - if(prompt !is null) - lineGetter.prompt = prompt; + + lineGetter.prompt = prompt; auto input = RealTimeConsoleInput(&this, ConsoleInputFlags.raw | ConsoleInputFlags.selectiveMouse | ConsoleInputFlags.paste | ConsoleInputFlags.size | ConsoleInputFlags.noEolWrap); auto line = lineGetter.getline(&input); @@ -6871,6 +6878,13 @@ class FileLineGetter : LineGetter { } } +/+ +class FullscreenEditor { + +} ++/ + + version(Windows) { // to get the directory for saving history in the line things enum CSIDL_APPDATA = 26; diff --git a/webview.d b/webview.d index 6047a5d..e3f3ff9 100644 --- a/webview.d +++ b/webview.d @@ -32,6 +32,15 @@ +/ module arsd.webview; +enum WebviewEngine { + none, + cef, + wv2, + webkit_gtk +} +// see activeEngine which is an enum you can static if on + + // I might recover this gtk thing but i don't like gtk // dmdi webview -version=linux_gtk -version=Demo @@ -82,6 +91,8 @@ T callback(T)(typeof(&T.init.Invoke) dg) { }; } +enum activeEngine = WebviewEngine.wv2; + struct RC(T) { private T object; this(T t) { @@ -105,6 +116,8 @@ struct RC(T) { this.object = obj; } + T raw() { return object; } + T returnable() { if(object is null) return null; return object; @@ -121,6 +134,32 @@ struct RC(T) { } } +extern(Windows) +alias StringMethod = int delegate(wchar**); + +string toGC(scope StringMethod dg) { + wchar* t; + auto res = dg(&t); + if(res != S_OK) + throw new ComException(res); + + auto ot = t; + + string s; + + // FIXME: encode properly in UTF-8 + while(*t) { + s ~= *t; + t++; + } + + auto ret = s; + + CoTaskMemFree(ot); + + return ret; +} + class ComException : Exception { HRESULT errorCode; this(HRESULT errorCode) { @@ -524,6 +563,8 @@ void main() { version(linux_gtk) +enum activeEngine = WebviewEngine.webkit_gtk; + /++ +/ @@ -1176,6 +1217,8 @@ private template CefToD(T...) { } } +enum activeEngine = WebviewEngine.cef; + struct RC(Base) { private Base* inner;