Skip to content

Commit 8754624

Browse files
kevinrieskevinries
committed
Merge branch 'dev'
2 parents 48d38e0 + 3ce894f commit 8754624

File tree

96 files changed

+1046
-588
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+1046
-588
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,7 @@ packages/core/core/coverage
1414
packages/*/coverage
1515
packages/core/core/coverage
1616
packages/core/validator/coverage
17-
packages/services/node-info/coverage
17+
packages/services/node-info/coverage
18+
.history
19+
.lh
20+
packages/core/repl/.vscode

‎misc/development/core/logger.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
const { createBroker } = require('../../../packages/core/core/lib')
2+
3+
const broker = createBroker({
4+
logger: {
5+
level: 'debug'
6+
}
7+
})
8+
9+
broker.createService({
10+
name: 'test',
11+
actions: {
12+
hello: {
13+
handler (context, { service }) {
14+
service
15+
}
16+
}
17+
}
18+
})
19+
20+
broker.log.info({ name: 'Kevin' })
21+
broker.log.error(new Error('asdassds'))
22+
broker.log.debug('debug')
23+
broker.log.fatal('fatal')
24+
broker.log.verbose('verbose')
25+
broker.log.warn('warn')
26+
broker.log.info({ node: 123, name: 'sdasdas' }, 'test')
27+
broker.log.info('test', { node: 123, name: 'sdasdas' })
28+
29+
broker.start()

‎misc/development/core/simple.js‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎misc/development/repl/events.js‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
2+
const { createBroker, TransportAdapters } = require('../../../packages/core/core/lib')
3+
const repl = require('../../../packages/core/repl/lib/index')
4+
5+
const broker = createBroker({
6+
nodeId: '1',
7+
transport: {
8+
adapter: TransportAdapters.Dummy()
9+
}
10+
})
11+
12+
const broker2 = createBroker({
13+
nodeId: '2',
14+
transport: {
15+
adapter: TransportAdapters.Dummy()
16+
}
17+
})
18+
19+
const broker3 = createBroker({
20+
nodeId: '3',
21+
transport: {
22+
adapter: TransportAdapters.Dummy()
23+
}
24+
})
25+
26+
broker.createService({
27+
name: 'test1',
28+
actions: {
29+
hello: {
30+
handler (context) {
31+
console.log(context.data)
32+
return {
33+
name: 'Kevin'
34+
}
35+
}
36+
}
37+
}
38+
})
39+
40+
broker.createService({
41+
name: 'test2',
42+
events: {
43+
'my-event' (context) {
44+
this.log.info('hello 1' + context.nodeId)
45+
}
46+
}
47+
})
48+
49+
broker.createService({
50+
name: 'test3',
51+
events: {
52+
'my-event' (context) {
53+
this.log.info('hello 1' + context.nodeId)
54+
}
55+
}
56+
})
57+
58+
// broker 2
59+
broker2.createService({
60+
name: 'test1',
61+
actions: {
62+
hello: {
63+
handler (context) {
64+
console.log(context.data)
65+
return {
66+
name: 'Kevin'
67+
}
68+
}
69+
}
70+
},
71+
events: {
72+
'my-event' (context) {
73+
this.log.info('hello 2', context.nodeId)
74+
}
75+
}
76+
})
77+
78+
broker3.createService({
79+
name: 'test1',
80+
actions: {
81+
hello: {
82+
handler (context) {
83+
console.log(context.data)
84+
return {
85+
name: 'Kevin'
86+
}
87+
}
88+
}
89+
},
90+
events: {
91+
'my-event' (context) {
92+
this.log.info('hello 2', context.nodeId)
93+
}
94+
}
95+
})
96+
97+
broker2.createService({
98+
name: 'test2-2',
99+
events: {
100+
'my-event' (context) {
101+
this.log.info('hello 2' + context.nodeId)
102+
}
103+
}
104+
})
105+
106+
broker2.createService({
107+
name: 'test3-2',
108+
events: {
109+
'my-event' (context) {
110+
this.log.info('hello 2' + context.nodeId)
111+
}
112+
}
113+
})
114+
115+
Promise.all([
116+
broker.start(),
117+
broker2.start(),
118+
broker3.start()
119+
])
120+
.then(() => repl(broker))

‎misc/diagrams/node.drawio‎

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,48 @@
11
<mxfile host="65bd71144e">
22
<diagram id="IjjydHZNGLpz2tJpYeSi" name="Page-1">
3-
<mxGraphModel dx="782" dy="829" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
3+
<mxGraphModel dx="786" dy="955" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" background="#F1FAEE" math="0" shadow="0">
44
<root>
55
<mxCell id="0"/>
66
<mxCell id="1" parent="0"/>
7+
<mxCell id="2" value="Broker" style="rounded=0;whiteSpace=wrap;html=1;sketch=1;fillColor=#d80073;strokeColor=#A50040;fontColor=#000000;fontStyle=1" vertex="1" parent="1">
8+
<mxGeometry x="50" y="60" width="240" height="380" as="geometry"/>
9+
</mxCell>
10+
<mxCell id="3" value="Registry" style="rounded=0;whiteSpace=wrap;html=1;sketch=1;fillColor=#1ba1e2;strokeColor=#006EAF;fontColor=#000000;" vertex="1" parent="1">
11+
<mxGeometry x="50" y="470" width="540" height="60" as="geometry"/>
12+
</mxCell>
13+
<mxCell id="4" value="Services" style="rounded=0;whiteSpace=wrap;html=1;sketch=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" vertex="1" parent="1">
14+
<mxGeometry x="190" y="550" width="120" height="60" as="geometry"/>
15+
</mxCell>
16+
<mxCell id="5" value="Nodes" style="rounded=0;whiteSpace=wrap;html=1;sketch=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" vertex="1" parent="1">
17+
<mxGeometry x="50" y="550" width="120" height="60" as="geometry"/>
18+
</mxCell>
19+
<mxCell id="6" value="Actions" style="rounded=0;whiteSpace=wrap;html=1;sketch=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" vertex="1" parent="1">
20+
<mxGeometry x="330" y="550" width="120" height="60" as="geometry"/>
21+
</mxCell>
22+
<mxCell id="7" value="Events" style="rounded=0;whiteSpace=wrap;html=1;sketch=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" vertex="1" parent="1">
23+
<mxGeometry x="470" y="550" width="120" height="60" as="geometry"/>
24+
</mxCell>
25+
<mxCell id="8" value="Transport" style="rounded=0;whiteSpace=wrap;html=1;sketch=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" vertex="1" parent="1">
26+
<mxGeometry x="450" y="380" width="140" height="60" as="geometry"/>
27+
</mxCell>
28+
<mxCell id="9" value="Middlewares&lt;br&gt;" style="rounded=0;whiteSpace=wrap;html=1;sketch=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" vertex="1" parent="1">
29+
<mxGeometry x="310" y="60" width="120" height="380" as="geometry"/>
30+
</mxCell>
31+
<mxCell id="10" value="Logger&lt;span style=&quot;color: rgba(0 , 0 , 0 , 0) ; font-family: monospace ; font-size: 0px&quot;&gt;%3CmxGraphModel%3E%3Croot%3E%3CmxCell%20id%3D%220%22%2F%3E%3CmxCell%20id%3D%221%22%20parent%3D%220%22%2F%3E%3CmxCell%20id%3D%222%22%20value%3D%22Middlewares%26lt%3Bbr%26gt%3B%22%20style%3D%22rounded%3D0%3BwhiteSpace%3Dwrap%3Bhtml%3D1%3B%22%20vertex%3D%221%22%20parent%3D%221%22%3E%3CmxGeometry%20x%3D%22400%22%20y%3D%22150%22%20width%3D%22120%22%20height%3D%2260%22%20as%3D%22geometry%22%2F%3E%3C%2FmxCell%3E%3C%2Froot%3E%3C%2FmxGraphModel%3E&lt;/span&gt;" style="rounded=0;whiteSpace=wrap;html=1;sketch=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" vertex="1" parent="1">
32+
<mxGeometry x="450" y="60" width="140" height="60" as="geometry"/>
33+
</mxCell>
34+
<mxCell id="11" value="Tracing" style="rounded=0;whiteSpace=wrap;html=1;sketch=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" vertex="1" parent="1">
35+
<mxGeometry x="450" y="300" width="140" height="60" as="geometry"/>
36+
</mxCell>
37+
<mxCell id="12" value="Metrics" style="rounded=0;whiteSpace=wrap;html=1;sketch=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" vertex="1" parent="1">
38+
<mxGeometry x="450" y="220" width="140" height="60" as="geometry"/>
39+
</mxCell>
40+
<mxCell id="14" value="Cache" style="rounded=0;whiteSpace=wrap;html=1;sketch=1;fillColor=#A8DADC;strokeColor=#457B9D;fontColor=#1D3557;" vertex="1" parent="1">
41+
<mxGeometry x="450" y="140" width="140" height="60" as="geometry"/>
42+
</mxCell>
43+
<mxCell id="15" value="Weave core structure" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;sketch=0;fontColor=#000000;" vertex="1" parent="1">
44+
<mxGeometry x="50" y="20" width="220" height="20" as="geometry"/>
45+
</mxCell>
746
</root>
847
</mxGraphModel>
948
</diagram>

‎misc/diagrams/transports.drawio‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<mxfile host="65bd71144e">
2+
<diagram id="KvPBWvNXsIncWh-X33ra" name="Page-1">
3+
<mxGraphModel dx="786" dy="955" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
4+
<root>
5+
<mxCell id="0"/>
6+
<mxCell id="1" parent="0"/>
7+
<mxCell id="7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="2" target="3">
8+
<mxGeometry relative="1" as="geometry"/>
9+
</mxCell>
10+
<mxCell id="8" value="One Transport Adapter" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="7">
11+
<mxGeometry x="0.3625" y="4" relative="1" as="geometry">
12+
<mxPoint x="-58" y="-16" as="offset"/>
13+
</mxGeometry>
14+
</mxCell>
15+
<mxCell id="2" value="Node1" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
16+
<mxGeometry x="30" y="130" width="260" height="100" as="geometry"/>
17+
</mxCell>
18+
<mxCell id="3" value="Node2" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
19+
<mxGeometry x="610" y="130" width="120" height="100" as="geometry"/>
20+
</mxCell>
21+
<mxCell id="4" value="Service1" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
22+
<mxGeometry x="30" y="260" width="260" height="60" as="geometry"/>
23+
</mxCell>
24+
<mxCell id="5" value="Actions" style="whiteSpace=wrap;html=1;aspect=fixed;" vertex="1" parent="1">
25+
<mxGeometry x="30" y="350" width="120" height="120" as="geometry"/>
26+
</mxCell>
27+
<mxCell id="6" value="Events" style="whiteSpace=wrap;html=1;aspect=fixed;" vertex="1" parent="1">
28+
<mxGeometry x="170" y="350" width="120" height="120" as="geometry"/>
29+
</mxCell>
30+
<mxCell id="9" value="Discovery,&amp;nbsp; Request/Response, Events, ..." style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;" vertex="1" parent="1">
31+
<mxGeometry x="310" y="190" width="240" height="20" as="geometry"/>
32+
</mxCell>
33+
</root>
34+
</mxGraphModel>
35+
</diagram>
36+
</mxfile>

0 commit comments

Comments
 (0)