deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2026-03-14 14:35:46 +01:00
Code Issues Projects Releases Wiki Activity

Update PR

Browse source 
* Update PR
This commit is contained in:
abraunegg 2025-09-30 13:37:19 +10:00
commit a082510141
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main.d
View file

@ -969,13 +969,12 @@ int main(string[] cliArgs) {
// Were we able to correctly obtain the endpoint response and build the socket.io WS endpoint
if (appConfig.websocketNotificationUrlAvailable) {
// URL is available
// Notification URL is available
if (oneDriveSocketIo is null) {
oneDriveSocketIo = new OneDriveSocketIo(thisTid, appConfig);
oneDriveSocketIo.start();
}
// Logging of WebSocket being enabled is moved to socketio.d
addLogEntry("Enabled WebSocket support to monitor Microsoft Graph API changes in near real-time.");
} else {
addLogEntry("ERROR: Unable to configure WebSocket support to monitor Microsoft Graph API changes in near real-time.");
}

11
src/socketio.d
View file

@ -19,7 +19,9 @@ import curlWebsockets;
// ========== Logging Shim ==========
private void logSocketIOOutput(string s) {
collectException(addLogEntry("SOCKETIO: " ~ s));
if (debugLogging) {
collectException(addLogEntry("SOCKETIO: " ~ s, ["debug"]));
}
}
final class OneDriveSocketIo {
@ -68,7 +70,6 @@ public:
started = true;
pleaseStop = false;
workerTid = spawn(&run, cast(shared) this);
logSocketIOOutput("Enabled WebSocket support to monitor Microsoft Graph API changes in near real-time.");
}
void stop() {
@ -259,7 +260,7 @@ private:
auto remain = expiry - Clock.currTime(UTC());
if (remain <= dur!"minutes"(2)) {
self.renewRequested = true;
logSocketIOOutput("Subscription nearing expiry; requesting renewal from main");
logSocketIOOutput("Subscription nearing expiry; requesting renewal from main() monitor loop");
send(self.parentTid, "SOCKETIO_RENEWAL_REQUEST");
send(self.parentTid, "SOCKETIO_RENEWAL_CONTEXT:" ~ "id=" ~ self.appConfig.websocketEndpointResponse ~ " url=" ~ self.appConfig.websocketNotificationUrl);
}
@ -460,8 +461,6 @@ private:
if (packet.length < 2) return false;
auto jsonPart = packet[1 .. packet.length];
import std.json : JSONValue, parseJSON, JSONType;
JSONValue j;
auto err = collectException(j = parseJSON(jsonPart));
if (err !is null) {
@ -555,7 +554,7 @@ private:
if (evName == "notification") {
logSocketIOOutput("Notification Event (ns='/" ~ ns ~ "') -> " ~ dataText);
// *** Signal main exactly like webhook does ***
// Signal main() monitor loop exactly like webhook does
collectException(send(self.parentTid, cast(ulong)1));
} else {
// Visibility in case the service uses other event names