package/mq
1
0
Fork 0
mirror of https://github.com/oarkflow/mq.git synced 2025-10-19 19:04:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add task completion

Browse Source
This commit is contained in:
sujit
2024-11-18 11:17:25 +05:45
parent e07b8ed3fd
commit 78b266ac04
2 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
examples/v2.go
View File

@@ -10,14 +10,16 @@ import (
"time"
"golang.org/x/exp/maps"
"github.com/oarkflow/mq/storage"
"github.com/oarkflow/mq/storage/memory"
)
type DAG struct {
Nodes map[string]*Node
Edges map[string][]string
ParentNodes map[string]string
taskManager map[string]*TaskManager
mu sync.Mutex
taskManager storage.IMap[string, *TaskManager]
finalResult func(taskID string, result Result)
}
@@ -26,20 +28,16 @@ func NewDAG(finalResultCallback func(taskID string, result Result)) *DAG {
Nodes: make(map[string]*Node),
Edges: make(map[string][]string),
ParentNodes: make(map[string]string),
taskManager: make(map[string]*TaskManager),
taskManager: memory.New[string, *TaskManager](),
finalResult: finalResultCallback,
}
}
func (tm *DAG) AddNode(nodeID string, handler func(payload json.RawMessage) Result) {
tm.mu.Lock()
defer tm.mu.Unlock()
tm.Nodes[nodeID] = &Node{ID: nodeID, Handler: handler}
}
func (tm *DAG) AddEdge(from string, to ...string) {
tm.mu.Lock()
defer tm.mu.Unlock()
tm.Edges[from] = append(tm.Edges[from], to...)
for _, targetNode := range to {
tm.ParentNodes[targetNode] = from
@@ -253,9 +251,7 @@ func (tm *DAG) formHandler(w http.ResponseWriter, r *http.Request) {
gender := r.FormValue("gender")
taskID := generateTaskID()
manager := NewTaskManager(tm)
tm.mu.Lock()
tm.taskManager[taskID] = manager
tm.mu.Unlock()
tm.taskManager.Set(taskID, manager)
go manager.Run()
payload := fmt.Sprintf(`{"email": "%s", "age": "%s", "gender": "%s"}`, email, age, gender)
manager.Trigger(taskID, "NodeA", json.RawMessage(payload))
@@ -270,14 +266,12 @@ func (tm *DAG) resultHandler(w http.ResponseWriter, r *http.Request) {
func (tm *DAG) taskStatusHandler(w http.ResponseWriter, r *http.Request) {
taskID := r.URL.Query().Get("taskID")
if taskID == "" {
http.Error(w, "taskID is missing", http.StatusBadRequest)
http.Error(w, `{"message": "taskID is missing"}`, http.StatusBadRequest)
return
}
tm.mu.Lock()
manager, ok := tm.taskManager[taskID]
tm.mu.Unlock()
manager, ok := tm.taskManager.Get(taskID)
if !ok {
http.Error(w, "Invalid taskID", http.StatusNotFound)
http.Error(w, `{"message": "Invalid TaskID"}`, http.StatusNotFound)
return
}
w.Header().Set("Content-Type", "application/json")

15
examples/webroot/result.html
View File

@@ -99,12 +99,14 @@
fetch(`/task-result?taskID=${taskID}`)
.then(response => response.json())
.then(data => {
if(data?.message) {
document.getElementById('result').innerHTML = `
<p>Error loading task result. ${data.message}</p> <br> <a href="/form">Go back</a>`;
} else {
const container = document.getElementById('result');
let htmlContent = '';
// Show final result in a table
htmlContent += `
<h2>Final Task Result</h2>
<h2>Final Task Result <a href="/form">Go back</a></h2>
<table>
<tr>
<th>Task ID</th>
@@ -120,8 +122,6 @@
</tr>
</table>
`;
// Show result per node
htmlContent += `
<div class="node-result">
<h2>Result Per Node</h2>
@@ -133,8 +133,6 @@
<th>Node Result Data</th>
</tr>
`;
// Loop through each node result and display in a table
for (const nodeID in data) {
if (nodeID !== "Result") {
const node = data[nodeID];
@@ -148,11 +146,12 @@
`;
}
}
htmlContent += '</table></div>';
container.innerHTML = htmlContent;
}
})
.catch(error => {
console.log(error)
document.getElementById('result').innerHTML = '<p>Error loading task result.</p>';
});
} else {