cpee 2.1.135 → 2.1.139
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/cockpit/compliance-view.html +11 -19
- data/cockpit/compliance.html +11 -19
- data/cockpit/css/llm.css +3 -3
- data/cockpit/css/llmmodel.css +140 -0
- data/cockpit/css/model.css +0 -1
- data/cockpit/css/ui.css +13 -7
- data/cockpit/css/wfadaptor.css +15 -10
- data/cockpit/edit.html +11 -19
- data/cockpit/graph.html +8 -13
- data/cockpit/index.html +11 -19
- data/cockpit/js/details.js +27 -10
- data/cockpit/js/instance.js +219 -206
- data/cockpit/js/llm-ui-bubble.js +36 -0
- data/cockpit/js/llm-ui-status.js +34 -0
- data/cockpit/js/llm-ui.js +87 -0
- data/cockpit/js/llm.js +469 -121
- data/cockpit/js/parameters.js +45 -14
- data/cockpit/js/wfadaptor.js +402 -77
- data/cockpit/llm.html +16 -21
- data/cockpit/llmmodel.html +17 -23
- data/cockpit/model.html +8 -15
- data/cockpit/only_llm.html +14 -19
- data/cockpit/themes/THEMES.MD +4 -0
- data/cockpit/themes/base.js +1 -1
- data/cockpit/themes/packed/theme.js +3 -0
- data/cockpit/themes/presetlr/rngs/alternative.rng +28 -0
- data/cockpit/themes/presetlr/rngs/call.rng +249 -0
- data/cockpit/themes/presetlr/rngs/callmanipulate.rng +281 -0
- data/cockpit/themes/presetlr/rngs/choose.rng +27 -0
- data/cockpit/themes/presetlr/rngs/closed_loop.rng +62 -0
- data/cockpit/themes/presetlr/rngs/closed_loop_cancel.rng +5 -0
- data/cockpit/themes/presetlr/rngs/closed_loop_control.rng +31 -0
- data/cockpit/themes/presetlr/rngs/closed_loop_measuring.rng +12 -0
- data/cockpit/themes/presetlr/rngs/critical.rng +8 -0
- data/cockpit/themes/presetlr/rngs/escape.rng +5 -0
- data/cockpit/themes/presetlr/rngs/group.rng +3 -0
- data/cockpit/themes/presetlr/rngs/loop.rng +40 -0
- data/cockpit/themes/presetlr/rngs/manipulate.rng +76 -0
- data/cockpit/themes/presetlr/rngs/otherwise.rng +25 -0
- data/cockpit/themes/presetlr/rngs/parallel.rng +24 -0
- data/cockpit/themes/presetlr/rngs/parallel_branch.rng +5 -0
- data/cockpit/themes/presetlr/rngs/scripts.rng +23 -0
- data/cockpit/themes/presetlr/rngs/start.rng +143 -0
- data/cockpit/themes/presetlr/rngs/stop.rng +5 -0
- data/cockpit/themes/presetlr/rngs/terminate.rng +8 -0
- data/cockpit/themes/presetlr/rngs/wait_for_signal.rng +8 -0
- data/cockpit/themes/presetlr/symbols/alternative.svg +19 -0
- data/cockpit/themes/presetlr/symbols/arrow.svg +1 -0
- data/cockpit/themes/presetlr/symbols/call.svg +1 -0
- data/cockpit/themes/presetlr/symbols/call_sensor.svg +1 -0
- data/cockpit/themes/presetlr/symbols/callmanipulate.svg +1 -0
- data/cockpit/themes/presetlr/symbols/callmanipulate_sensor.svg +1 -0
- data/cockpit/themes/presetlr/symbols/callmanipulate_sensor_signal.svg +1 -0
- data/cockpit/themes/presetlr/symbols/callmanipulate_signal.svg +1 -0
- data/cockpit/themes/presetlr/symbols/choose.svg +15 -0
- data/cockpit/themes/presetlr/symbols/choose_exclusive.svg +15 -0
- data/cockpit/themes/presetlr/symbols/choose_exclusive_finish.svg +1 -0
- data/cockpit/themes/presetlr/symbols/choose_inclusive.svg +13 -0
- data/cockpit/themes/presetlr/symbols/choose_inclusive_finish.svg +1 -0
- data/cockpit/themes/presetlr/symbols/closed_loop.svg +1 -0
- data/cockpit/themes/presetlr/symbols/closed_loop_cancel.svg +1 -0
- data/cockpit/themes/presetlr/symbols/closed_loop_control.svg +1 -0
- data/cockpit/themes/presetlr/symbols/closed_loop_measuring.svg +1 -0
- data/cockpit/themes/presetlr/symbols/complex.svg +1 -0
- data/cockpit/themes/presetlr/symbols/critical.svg +1 -0
- data/cockpit/themes/presetlr/symbols/delete.svg +1 -0
- data/cockpit/themes/presetlr/symbols/end.svg +1 -0
- data/cockpit/themes/presetlr/symbols/escape.svg +1 -0
- data/cockpit/themes/presetlr/symbols/event_end.svg +1 -0
- data/cockpit/themes/presetlr/symbols/event_start.svg +1 -0
- data/cockpit/themes/presetlr/symbols/loop.svg +15 -0
- data/cockpit/themes/presetlr/symbols/loop_end.svg +15 -0
- data/cockpit/themes/presetlr/symbols/loop_end_pre.svg +15 -0
- data/cockpit/themes/presetlr/symbols/manipulate.svg +1 -0
- data/cockpit/themes/presetlr/symbols/mark.svg +1 -0
- data/cockpit/themes/presetlr/symbols/otherwise.svg +7 -0
- data/cockpit/themes/presetlr/symbols/parallel.svg +1 -0
- data/cockpit/themes/presetlr/symbols/parallel_branch.svg +7 -0
- data/cockpit/themes/presetlr/symbols/parallel_branch_event.svg +14 -0
- data/cockpit/themes/presetlr/symbols/parallel_branch_event_rev.svg +11 -0
- data/cockpit/themes/presetlr/symbols/parallel_branch_normal.svg +7 -0
- data/cockpit/themes/presetlr/symbols/parallel_eventbased_exclusive.svg +1 -0
- data/cockpit/themes/presetlr/symbols/parallel_eventbased_parallel.svg +1 -0
- data/cockpit/themes/presetlr/symbols/scripts.svg +1 -0
- data/cockpit/themes/presetlr/symbols/start.svg +1 -0
- data/cockpit/themes/presetlr/symbols/start_event.svg +1 -0
- data/cockpit/themes/presetlr/symbols/stop.svg +1 -0
- data/cockpit/themes/presetlr/symbols/terminate.svg +1 -0
- data/cockpit/themes/presetlr/symbols/wait_for_signal.svg +1 -0
- data/cockpit/themes/presetlr/theme.js +54 -0
- data/cockpit/themes/wellformed/rngs/alternative.rng +28 -0
- data/cockpit/themes/wellformed/rngs/call.rng +249 -0
- data/cockpit/themes/wellformed/rngs/callmanipulate.rng +281 -0
- data/cockpit/themes/wellformed/rngs/choose.rng +27 -0
- data/cockpit/themes/wellformed/rngs/closed_loop.rng +62 -0
- data/cockpit/themes/wellformed/rngs/closed_loop_cancel.rng +5 -0
- data/cockpit/themes/wellformed/rngs/closed_loop_control.rng +31 -0
- data/cockpit/themes/wellformed/rngs/closed_loop_measuring.rng +12 -0
- data/cockpit/themes/wellformed/rngs/critical.rng +8 -0
- data/cockpit/themes/wellformed/rngs/escape.rng +5 -0
- data/cockpit/themes/wellformed/rngs/group.rng +3 -0
- data/cockpit/themes/wellformed/rngs/loop.rng +40 -0
- data/cockpit/themes/wellformed/rngs/manipulate.rng +76 -0
- data/cockpit/themes/wellformed/rngs/otherwise.rng +25 -0
- data/cockpit/themes/wellformed/rngs/parallel.rng +24 -0
- data/cockpit/themes/wellformed/rngs/parallel_branch.rng +5 -0
- data/cockpit/themes/wellformed/rngs/scripts.rng +23 -0
- data/cockpit/themes/wellformed/rngs/start.rng +143 -0
- data/cockpit/themes/wellformed/rngs/stop.rng +5 -0
- data/cockpit/themes/wellformed/rngs/terminate.rng +8 -0
- data/cockpit/themes/wellformed/rngs/wait_for_signal.rng +8 -0
- data/cockpit/themes/wellformed/symbols/alternative.svg +1 -0
- data/cockpit/themes/wellformed/symbols/arrow.svg +1 -0
- data/cockpit/themes/wellformed/symbols/call.svg +1 -0
- data/cockpit/themes/wellformed/symbols/call_sensor.svg +1 -0
- data/cockpit/themes/wellformed/symbols/callmanipulate.svg +1 -0
- data/cockpit/themes/wellformed/symbols/callmanipulate_sensor.svg +1 -0
- data/cockpit/themes/wellformed/symbols/callmanipulate_sensor_signal.svg +1 -0
- data/cockpit/themes/wellformed/symbols/callmanipulate_signal.svg +1 -0
- data/cockpit/themes/wellformed/symbols/choose.svg +1 -0
- data/cockpit/themes/wellformed/symbols/choose_exclusive.svg +1 -0
- data/cockpit/themes/wellformed/symbols/choose_exclusive_finish.svg +1 -0
- data/cockpit/themes/wellformed/symbols/choose_inclusive.svg +1 -0
- data/cockpit/themes/wellformed/symbols/choose_inclusive_finish.svg +1 -0
- data/cockpit/themes/wellformed/symbols/closed_loop.svg +1 -0
- data/cockpit/themes/wellformed/symbols/closed_loop_cancel.svg +1 -0
- data/cockpit/themes/wellformed/symbols/closed_loop_control.svg +1 -0
- data/cockpit/themes/wellformed/symbols/closed_loop_measuring.svg +1 -0
- data/cockpit/themes/wellformed/symbols/complex.svg +1 -0
- data/cockpit/themes/wellformed/symbols/critical.svg +1 -0
- data/cockpit/themes/wellformed/symbols/delete.svg +1 -0
- data/cockpit/themes/wellformed/symbols/end.svg +1 -0
- data/cockpit/themes/wellformed/symbols/escape.svg +1 -0
- data/cockpit/themes/wellformed/symbols/event_end.svg +1 -0
- data/cockpit/themes/wellformed/symbols/event_start.svg +6 -0
- data/cockpit/themes/wellformed/symbols/loop.svg +1 -0
- data/cockpit/themes/wellformed/symbols/loop_end.svg +1 -0
- data/cockpit/themes/wellformed/symbols/manipulate.svg +1 -0
- data/cockpit/themes/wellformed/symbols/mark.svg +1 -0
- data/cockpit/themes/wellformed/symbols/otherwise.svg +1 -0
- data/cockpit/themes/wellformed/symbols/parallel.svg +1 -0
- data/cockpit/themes/wellformed/symbols/parallel_branch.svg +1 -0
- data/cockpit/themes/wellformed/symbols/parallel_branch_event.svg +1 -0
- data/cockpit/themes/wellformed/symbols/parallel_branch_event_rev.svg +11 -0
- data/cockpit/themes/wellformed/symbols/parallel_branch_normal.svg +1 -0
- data/cockpit/themes/wellformed/symbols/parallel_eventbased_exclusive.svg +1 -0
- data/cockpit/themes/wellformed/symbols/parallel_eventbased_parallel.svg +1 -0
- data/cockpit/themes/wellformed/symbols/scripts.svg +1 -0
- data/cockpit/themes/wellformed/symbols/start.svg +1 -0
- data/cockpit/themes/wellformed/symbols/start_event.svg +1 -0
- data/cockpit/themes/wellformed/symbols/stop.svg +1 -0
- data/cockpit/themes/wellformed/symbols/terminate.svg +1 -0
- data/cockpit/themes/wellformed/symbols/wait_for_signal.svg +1 -0
- data/cockpit/themes/wellformed/theme.js +32 -0
- data/cockpit/track.html +8 -13
- data/cpee.gemspec +3 -3
- data/lib/callbacks/callbacks.rng +4 -4
- data/lib/callbacks.xml +4 -4
- data/lib/cpee/constants.rb +4 -4
- data/lib/cpee/fail.rb +4 -4
- data/lib/cpee/implementation.rb +10 -4
- data/lib/cpee/implementation_callbacks.rb +6 -6
- data/lib/cpee/implementation_notifications.rb +8 -5
- data/lib/cpee/implementation_properties.rb +132 -12
- data/lib/cpee/json_pointer.rb +110 -0
- data/lib/cpee/message.rb +26 -6
- data/lib/cpee/persistence.rb +10 -4
- data/lib/cpee/redis.rb +12 -4
- data/lib/cpee/statemachine.rb +4 -4
- data/lib/cpee/value_helper.rb +4 -4
- data/lib/cpee.xml +4 -4
- data/lib/engine/executionhandler-list.rng +4 -4
- data/lib/engine/instance-info.rng +4 -4
- data/lib/engine/instances.rng +4 -4
- data/lib/engine.xml +4 -4
- data/lib/properties/t_dslx.rng +356 -0
- data/lib/properties/transformation.rng +14 -0
- data/lib/properties.xml +5 -4
- data/server/executionhandlers/eval/backend/opts.yaml +1 -1
- data/server/executionhandlers/eval/connection.rb +16 -7
- data/server/executionhandlers/eval/execution.rb +4 -4
- data/server/executionhandlers/ruby/backend/opts.yaml +1 -1
- data/server/executionhandlers/ruby/connection.rb +17 -9
- data/server/executionhandlers/ruby/controller.rb +21 -6
- data/server/executionhandlers/ruby/dsl_to_dslx.xsl +6 -2
- data/server/executionhandlers/ruby/execution.rb +4 -4
- data/server/resources/properties.empty +5 -4
- data/server/resources/properties.init +5 -4
- data/server/resources/topics.xml +4 -4
- data/server/routing/end.pid +1 -1
- data/server/routing/end.rb +4 -4
- data/server/routing/forward-events-00.pid +1 -1
- data/server/routing/forward-events.rb +34 -23
- data/server/routing/forward-votes.pid +1 -1
- data/server/routing/forward-votes.rb +60 -47
- data/server/routing/persist.pid +1 -1
- data/server/routing/persist.rb +53 -30
- data/tools/server/cpee +1 -1
- data/tools/server/resources/properties.init +4 -4
- metadata +142 -5
- data/cockpit/CPEE.xml +0 -8
- data/cockpit/Signavio.xml +0 -8
- data/cockpit/transformations.xml +0 -4
- /data/{COPYING → LICENSE} +0 -0
data/server/routing/persist.rb
CHANGED
|
@@ -3,15 +3,15 @@
|
|
|
3
3
|
# This file is part of CPEE.
|
|
4
4
|
#
|
|
5
5
|
# CPEE is free software: you can redistribute it and/or modify it under the terms
|
|
6
|
-
# of the GNU General Public License as published by the Free Software Foundation,
|
|
6
|
+
# of the GNU Lesser General Public License as published by the Free Software Foundation,
|
|
7
7
|
# either version 3 of the License, or (at your option) any later version.
|
|
8
8
|
#
|
|
9
9
|
# CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
10
10
|
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
|
11
|
-
# PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
11
|
+
# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
|
|
12
12
|
#
|
|
13
|
-
# You should have received a copy of the GNU General Public License along with
|
|
14
|
-
# CPEE (file
|
|
13
|
+
# You should have received a copy of the GNU Lesser General Public License along with
|
|
14
|
+
# CPEE (file LICENSE in the main directory). If not, see
|
|
15
15
|
# <http://www.gnu.org/licenses/>.
|
|
16
16
|
|
|
17
17
|
require 'json'
|
|
@@ -38,6 +38,7 @@ Daemonite.new do |opts|
|
|
|
38
38
|
'event:' + ('%02i' % w) + ':state/change',
|
|
39
39
|
'event:' + ('%02i' % w) + ':executionhandler/change',
|
|
40
40
|
'event:' + ('%02i' % w) + ':description/change',
|
|
41
|
+
'event:' + ('%02i' % w) + ':description/sync',
|
|
41
42
|
'event:' + ('%02i' % w) + ':dataelements/change',
|
|
42
43
|
'event:' + ('%02i' % w) + ':documents/change',
|
|
43
44
|
'event:' + ('%02i' % w) + ':endpoints/change',
|
|
@@ -67,25 +68,41 @@ Daemonite.new do |opts|
|
|
|
67
68
|
key = mess.dig('content','key')
|
|
68
69
|
opts[:redis].multi do |multi|
|
|
69
70
|
multi.sadd("instance:#{instance}/callbacks",key)
|
|
70
|
-
multi.set("instance:#{instance}/callbacks/#{key}/uuid",mess.dig('content','activity-uuid'))
|
|
71
|
-
multi.set("instance:#{instance}/callbacks/#{key}/label",mess.dig('content','label'))
|
|
72
|
-
multi.set("instance:#{instance}/callbacks/#{key}/position",mess.dig('content','activity'))
|
|
73
|
-
multi.set("instance:#{instance}/callbacks/#{key}/type",'callback')
|
|
71
|
+
multi.set("instance:#{instance}/callbacks/#{key}/uuid",mess.dig('content','activity-uuid'),keepttl: true)
|
|
72
|
+
multi.set("instance:#{instance}/callbacks/#{key}/label",mess.dig('content','label'),keepttl: true)
|
|
73
|
+
multi.set("instance:#{instance}/callbacks/#{key}/position",mess.dig('content','activity'),keepttl: true)
|
|
74
|
+
multi.set("instance:#{instance}/callbacks/#{key}/type",'callback',keepttl: true)
|
|
74
75
|
end
|
|
75
76
|
when /event:\d+:state\/change/
|
|
76
77
|
opts[:redis].multi do |multi|
|
|
77
78
|
unless mess.dig('content','state') == 'purged'
|
|
78
|
-
multi.set("instance:#{instance}/state",mess.dig('content','state'))
|
|
79
|
-
multi.set("instance:#{instance}/state/@changed",mess.dig('timestamp'))
|
|
79
|
+
multi.set("instance:#{instance}/state",mess.dig('content','state'),keepttl: true)
|
|
80
|
+
multi.set("instance:#{instance}/state/@changed",mess.dig('timestamp'),keepttl: true)
|
|
80
81
|
end
|
|
81
82
|
end
|
|
82
83
|
when /event:\d+:executionhandler\/change/
|
|
83
|
-
opts[:redis].set("instance:#{instance}/executionhandler",mess.dig('content','executionhandler'))
|
|
84
|
+
opts[:redis].set("instance:#{instance}/executionhandler",mess.dig('content','executionhandler'),keepttl: true)
|
|
84
85
|
when /event:\d+:description\/change/
|
|
85
86
|
opts[:redis].multi do |multi|
|
|
86
|
-
multi.set("instance:#{instance}/description",mess.dig('content','description'))
|
|
87
|
-
multi.set("instance:#{instance}/dslx",mess.dig('content','dslx'))
|
|
88
|
-
multi.set("instance:#{instance}/dsl",mess.dig('content','dsl'))
|
|
87
|
+
multi.set("instance:#{instance}/description",mess.dig('content','description'),keepttl: true)
|
|
88
|
+
multi.set("instance:#{instance}/dslx",mess.dig('content','dslx'),keepttl: true)
|
|
89
|
+
multi.set("instance:#{instance}/dsl",mess.dig('content','dsl'),keepttl: true)
|
|
90
|
+
multi.set("instance:#{instance}/dslx/@change_uuid",mess.dig('content','change_uuid'),keepttl: true)
|
|
91
|
+
unless mess.dig('content','change_pending') # otherwise description/sync brings it
|
|
92
|
+
multi.set("instance:#{instance}/description/@change_uuid",mess.dig('content','change_uuid'),keepttl: true)
|
|
93
|
+
end
|
|
94
|
+
end
|
|
95
|
+
when /event:\d+:description\/sync/
|
|
96
|
+
# asynchronous result, only valid when the dslx did not change in the meantime
|
|
97
|
+
opts[:redis].watch("instance:#{instance}/dslx/@change_uuid") do |rd|
|
|
98
|
+
if rd.get("instance:#{instance}/dslx/@change_uuid") == mess.dig('content','change_uuid')
|
|
99
|
+
rd.multi do |multi|
|
|
100
|
+
multi.set("instance:#{instance}/description",mess.dig('content','description'),keepttl: true)
|
|
101
|
+
multi.set("instance:#{instance}/description/@change_uuid",mess.dig('content','change_uuid'),keepttl: true)
|
|
102
|
+
end
|
|
103
|
+
else
|
|
104
|
+
rd.unwatch
|
|
105
|
+
end
|
|
89
106
|
end
|
|
90
107
|
when /event:\d+:dataelements\/change/, /event:\d+:documents\/change/, /event:\d+:endpoints\/change/, /event:\d+:attributes\/change/
|
|
91
108
|
topic = mess.dig('topic')
|
|
@@ -101,7 +118,7 @@ Daemonite.new do |opts|
|
|
|
101
118
|
mess.dig('content','changed')&.each_with_index do |c,i|
|
|
102
119
|
unless what =~ /event:\d+:attributes\/change/ && c == 'uuid'
|
|
103
120
|
multi.zadd("instance:#{instance}/#{topic}",max + 1 + i,c,nx: true)
|
|
104
|
-
multi.set("instance:#{instance}/#{topic}/#{c}",CPEE::ValueHelper::generate(mess.dig('content','values',c)))
|
|
121
|
+
multi.set("instance:#{instance}/#{topic}/#{c}",CPEE::ValueHelper::generate(mess.dig('content','values',c)),keepttl: true)
|
|
105
122
|
end
|
|
106
123
|
end
|
|
107
124
|
mess.dig('content','deleted')&.to_a&.each do |c|
|
|
@@ -115,17 +132,22 @@ Daemonite.new do |opts|
|
|
|
115
132
|
opts[:redis].publish('event:' + $1 + ':transaction/finished',message)
|
|
116
133
|
when /event:\d+:transformation\/change/
|
|
117
134
|
opts[:redis].multi do |multi|
|
|
118
|
-
multi.set("instance:#{instance}/transformation/description",mess.dig('content','description'))
|
|
119
|
-
multi.set("instance:#{instance}/transformation/description/@type",mess.dig('content','description_type'))
|
|
120
|
-
multi.set("instance:#{instance}/transformation/dataelements",mess.dig('content','dataelements'))
|
|
121
|
-
multi.set("instance:#{instance}/transformation/dataelements/@type",mess.dig('content','dataelements_type'))
|
|
122
|
-
multi.set("instance:#{instance}/transformation/endpoints",mess.dig('content','endpoints'))
|
|
123
|
-
multi.set("instance:#{instance}/transformation/endpoints/@type",mess.dig('content','endpoints_type'))
|
|
135
|
+
multi.set("instance:#{instance}/transformation/description",mess.dig('content','description'),keepttl: true)
|
|
136
|
+
multi.set("instance:#{instance}/transformation/description/@type",mess.dig('content','description_type'),keepttl: true)
|
|
137
|
+
multi.set("instance:#{instance}/transformation/dataelements",mess.dig('content','dataelements'),keepttl: true)
|
|
138
|
+
multi.set("instance:#{instance}/transformation/dataelements/@type",mess.dig('content','dataelements_type'),keepttl: true)
|
|
139
|
+
multi.set("instance:#{instance}/transformation/endpoints",mess.dig('content','endpoints'),keepttl: true)
|
|
140
|
+
multi.set("instance:#{instance}/transformation/endpoints/@type",mess.dig('content','endpoints_type'),keepttl: true)
|
|
141
|
+
multi.set("instance:#{instance}/transformation/dslx",mess.dig('content','dslx'),keepttl: true)
|
|
142
|
+
multi.set("instance:#{instance}/transformation/dslx/@type",mess.dig('content','dslx_type'),keepttl: true)
|
|
143
|
+
if mess.dig('content','change_pending') # same dslx, but the description is no longer the one for it
|
|
144
|
+
multi.del("instance:#{instance}/description/@change_uuid")
|
|
145
|
+
end
|
|
124
146
|
end
|
|
125
147
|
when /event:\d+:status\/change/
|
|
126
148
|
opts[:redis].multi do |multi|
|
|
127
|
-
multi.set("instance:#{instance}/status/id",mess.dig('content','id'))
|
|
128
|
-
multi.set("instance:#{instance}/status/message",mess.dig('content','message'))
|
|
149
|
+
multi.set("instance:#{instance}/status/id",mess.dig('content','id'),keepttl: true)
|
|
150
|
+
multi.set("instance:#{instance}/status/message",mess.dig('content','message'),keepttl: true)
|
|
129
151
|
end
|
|
130
152
|
when /event:\d+:position\/change/
|
|
131
153
|
opts[:redis].multi do |multi|
|
|
@@ -137,21 +159,21 @@ Daemonite.new do |opts|
|
|
|
137
159
|
end
|
|
138
160
|
c.dig('before')&.each do |ele|
|
|
139
161
|
multi.sadd("instance:#{instance}/positions",ele['position'])
|
|
140
|
-
multi.set("instance:#{instance}/positions/#{ele['position']}",'before')
|
|
162
|
+
multi.set("instance:#{instance}/positions/#{ele['position']}",'before',keepttl: true)
|
|
141
163
|
end
|
|
142
164
|
c.dig('at')&.each do |ele|
|
|
143
165
|
multi.sadd("instance:#{instance}/positions",ele['position'])
|
|
144
|
-
multi.set("instance:#{instance}/positions/#{ele['position']}",'at')
|
|
145
|
-
multi.set("instance:#{instance}/positions/#{ele['position']}/@passthrough",ele['passthrough']) if ele['passthrough']
|
|
166
|
+
multi.set("instance:#{instance}/positions/#{ele['position']}",'at',keepttl: true)
|
|
167
|
+
multi.set("instance:#{instance}/positions/#{ele['position']}/@passthrough",ele['passthrough'],keepttl: true) if ele['passthrough']
|
|
146
168
|
end
|
|
147
169
|
c.dig('wait')&.each do |ele|
|
|
148
170
|
multi.sadd("instance:#{instance}/positions",ele['position'])
|
|
149
|
-
multi.set("instance:#{instance}/positions/#{ele['position']}",'at')
|
|
150
|
-
multi.set("instance:#{instance}/positions/#{ele['position']}/@passthrough",ele['passthrough']) if ele['passthrough']
|
|
171
|
+
multi.set("instance:#{instance}/positions/#{ele['position']}",'at',keepttl: true)
|
|
172
|
+
multi.set("instance:#{instance}/positions/#{ele['position']}/@passthrough",ele['passthrough'],keepttl: true) if ele['passthrough']
|
|
151
173
|
end
|
|
152
174
|
c.dig('after')&.each do |ele|
|
|
153
175
|
multi.sadd("instance:#{instance}/positions",ele['position'])
|
|
154
|
-
multi.set("instance:#{instance}/positions/#{ele['position']}",'after')
|
|
176
|
+
multi.set("instance:#{instance}/positions/#{ele['position']}",'after',keepttl: true)
|
|
155
177
|
end
|
|
156
178
|
end
|
|
157
179
|
when /event:\d+:handler\/change/
|
|
@@ -159,7 +181,7 @@ Daemonite.new do |opts|
|
|
|
159
181
|
mess.dig('content','changed').each do |c|
|
|
160
182
|
multi.sadd("instance:#{instance}/handlers",mess.dig('content','key'))
|
|
161
183
|
multi.sadd("instance:#{instance}/handlers/#{mess.dig('content','key')}",c)
|
|
162
|
-
multi.set("instance:#{instance}/handlers/#{mess.dig('content','key')}/url",mess.dig('content','url'))
|
|
184
|
+
multi.set("instance:#{instance}/handlers/#{mess.dig('content','key')}/url",mess.dig('content','url'),keepttl: true)
|
|
163
185
|
multi.sadd("instance:#{instance}/handlers/#{c}",mess.dig('content','key'))
|
|
164
186
|
end
|
|
165
187
|
mess.dig('content','deleted').to_a.each do |c|
|
|
@@ -170,6 +192,7 @@ Daemonite.new do |opts|
|
|
|
170
192
|
if opts[:redis].scard("instance:#{instance}/handlers/#{mess.dig('content','key')}") < 1
|
|
171
193
|
opts[:redis].multi do |multi|
|
|
172
194
|
multi.del("instance:#{instance}/handlers/#{mess.dig('content','key')}/url")
|
|
195
|
+
multi.del("instance:#{instance}/handlers/#{mess.dig('content','key')}/seq")
|
|
173
196
|
multi.srem("instance:#{instance}/handlers",mess.dig('content','key'))
|
|
174
197
|
end
|
|
175
198
|
end
|
data/tools/server/cpee
CHANGED
|
@@ -7,7 +7,7 @@ else
|
|
|
7
7
|
require 'cpee/implementation'
|
|
8
8
|
end
|
|
9
9
|
|
|
10
|
-
Riddl::Server.new(CPEE::SERVER, :host => 'localhost', :port =>
|
|
10
|
+
Riddl::Server.new(CPEE::SERVER, :host => 'localhost', :port => 9298) do |opts|
|
|
11
11
|
opts[:instances] = File.join(__dir__,'instances')
|
|
12
12
|
opts[:executionhandlers] = File.join(__dir__,'executionhandlers')
|
|
13
13
|
opts[:notifications_init] = File.join(__dir__,'resources','notifications')
|
|
@@ -3,16 +3,16 @@
|
|
|
3
3
|
This file is part of CPEE.
|
|
4
4
|
|
|
5
5
|
CPEE is free software: you can redistribute it and/or modify it under the
|
|
6
|
-
terms of the GNU General Public License as published by the Free Software
|
|
6
|
+
terms of the GNU Lesser General Public License as published by the Free Software
|
|
7
7
|
Foundation, either version 3 of the License, or (at your option) any later
|
|
8
8
|
version.
|
|
9
9
|
|
|
10
10
|
CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
11
11
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
|
12
|
-
PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
12
|
+
PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
|
|
13
13
|
|
|
14
|
-
You should have received a copy of the GNU General Public License along with
|
|
15
|
-
CPEE (file
|
|
14
|
+
You should have received a copy of the GNU Lesser General Public License along with
|
|
15
|
+
CPEE (file LICENSE in the main directory). If not, see
|
|
16
16
|
<http://www.gnu.org/licenses/>.
|
|
17
17
|
-->
|
|
18
18
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cpee
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.1.
|
|
4
|
+
version: 2.1.139
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Juergen eTM Mangler
|
|
@@ -18,6 +18,9 @@ dependencies:
|
|
|
18
18
|
- - "~>"
|
|
19
19
|
- !ruby/object:Gem::Version
|
|
20
20
|
version: '1.0'
|
|
21
|
+
- - ">="
|
|
22
|
+
- !ruby/object:Gem::Version
|
|
23
|
+
version: 1.0.21
|
|
21
24
|
type: :runtime
|
|
22
25
|
prerelease: false
|
|
23
26
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -25,6 +28,9 @@ dependencies:
|
|
|
25
28
|
- - "~>"
|
|
26
29
|
- !ruby/object:Gem::Version
|
|
27
30
|
version: '1.0'
|
|
31
|
+
- - ">="
|
|
32
|
+
- !ruby/object:Gem::Version
|
|
33
|
+
version: 1.0.21
|
|
28
34
|
- !ruby/object:Gem::Dependency
|
|
29
35
|
name: weel
|
|
30
36
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -234,14 +240,12 @@ extra_rdoc_files:
|
|
|
234
240
|
- README.md
|
|
235
241
|
files:
|
|
236
242
|
- AUTHORS
|
|
237
|
-
- COPYING
|
|
238
243
|
- FEATURES.md
|
|
239
244
|
- INSTALL.md
|
|
245
|
+
- LICENSE
|
|
240
246
|
- README.md
|
|
241
247
|
- Rakefile
|
|
242
|
-
- cockpit/CPEE.xml
|
|
243
248
|
- cockpit/README
|
|
244
|
-
- cockpit/Signavio.xml
|
|
245
249
|
- cockpit/compliance-view.html
|
|
246
250
|
- cockpit/compliance.html
|
|
247
251
|
- cockpit/config.json
|
|
@@ -274,6 +278,9 @@ files:
|
|
|
274
278
|
- cockpit/js/edit.js
|
|
275
279
|
- cockpit/js/extended_columns.js
|
|
276
280
|
- cockpit/js/instance.js
|
|
281
|
+
- cockpit/js/llm-ui-bubble.js
|
|
282
|
+
- cockpit/js/llm-ui-status.js
|
|
283
|
+
- cockpit/js/llm-ui.js
|
|
277
284
|
- cockpit/js/llm.js
|
|
278
285
|
- cockpit/js/model.js
|
|
279
286
|
- cockpit/js/modifiers.js
|
|
@@ -1031,6 +1038,71 @@ files:
|
|
|
1031
1038
|
- cockpit/themes/presetid/symbols/terminate.svg
|
|
1032
1039
|
- cockpit/themes/presetid/symbols/wait_for_signal.svg
|
|
1033
1040
|
- cockpit/themes/presetid/theme.js
|
|
1041
|
+
- cockpit/themes/presetlr/rngs/alternative.rng
|
|
1042
|
+
- cockpit/themes/presetlr/rngs/call.rng
|
|
1043
|
+
- cockpit/themes/presetlr/rngs/callmanipulate.rng
|
|
1044
|
+
- cockpit/themes/presetlr/rngs/choose.rng
|
|
1045
|
+
- cockpit/themes/presetlr/rngs/closed_loop.rng
|
|
1046
|
+
- cockpit/themes/presetlr/rngs/closed_loop_cancel.rng
|
|
1047
|
+
- cockpit/themes/presetlr/rngs/closed_loop_control.rng
|
|
1048
|
+
- cockpit/themes/presetlr/rngs/closed_loop_measuring.rng
|
|
1049
|
+
- cockpit/themes/presetlr/rngs/critical.rng
|
|
1050
|
+
- cockpit/themes/presetlr/rngs/escape.rng
|
|
1051
|
+
- cockpit/themes/presetlr/rngs/group.rng
|
|
1052
|
+
- cockpit/themes/presetlr/rngs/loop.rng
|
|
1053
|
+
- cockpit/themes/presetlr/rngs/manipulate.rng
|
|
1054
|
+
- cockpit/themes/presetlr/rngs/otherwise.rng
|
|
1055
|
+
- cockpit/themes/presetlr/rngs/parallel.rng
|
|
1056
|
+
- cockpit/themes/presetlr/rngs/parallel_branch.rng
|
|
1057
|
+
- cockpit/themes/presetlr/rngs/scripts.rng
|
|
1058
|
+
- cockpit/themes/presetlr/rngs/start.rng
|
|
1059
|
+
- cockpit/themes/presetlr/rngs/stop.rng
|
|
1060
|
+
- cockpit/themes/presetlr/rngs/terminate.rng
|
|
1061
|
+
- cockpit/themes/presetlr/rngs/wait_for_signal.rng
|
|
1062
|
+
- cockpit/themes/presetlr/symbols/alternative.svg
|
|
1063
|
+
- cockpit/themes/presetlr/symbols/arrow.svg
|
|
1064
|
+
- cockpit/themes/presetlr/symbols/call.svg
|
|
1065
|
+
- cockpit/themes/presetlr/symbols/call_sensor.svg
|
|
1066
|
+
- cockpit/themes/presetlr/symbols/callmanipulate.svg
|
|
1067
|
+
- cockpit/themes/presetlr/symbols/callmanipulate_sensor.svg
|
|
1068
|
+
- cockpit/themes/presetlr/symbols/callmanipulate_sensor_signal.svg
|
|
1069
|
+
- cockpit/themes/presetlr/symbols/callmanipulate_signal.svg
|
|
1070
|
+
- cockpit/themes/presetlr/symbols/choose.svg
|
|
1071
|
+
- cockpit/themes/presetlr/symbols/choose_exclusive.svg
|
|
1072
|
+
- cockpit/themes/presetlr/symbols/choose_exclusive_finish.svg
|
|
1073
|
+
- cockpit/themes/presetlr/symbols/choose_inclusive.svg
|
|
1074
|
+
- cockpit/themes/presetlr/symbols/choose_inclusive_finish.svg
|
|
1075
|
+
- cockpit/themes/presetlr/symbols/closed_loop.svg
|
|
1076
|
+
- cockpit/themes/presetlr/symbols/closed_loop_cancel.svg
|
|
1077
|
+
- cockpit/themes/presetlr/symbols/closed_loop_control.svg
|
|
1078
|
+
- cockpit/themes/presetlr/symbols/closed_loop_measuring.svg
|
|
1079
|
+
- cockpit/themes/presetlr/symbols/complex.svg
|
|
1080
|
+
- cockpit/themes/presetlr/symbols/critical.svg
|
|
1081
|
+
- cockpit/themes/presetlr/symbols/delete.svg
|
|
1082
|
+
- cockpit/themes/presetlr/symbols/end.svg
|
|
1083
|
+
- cockpit/themes/presetlr/symbols/escape.svg
|
|
1084
|
+
- cockpit/themes/presetlr/symbols/event_end.svg
|
|
1085
|
+
- cockpit/themes/presetlr/symbols/event_start.svg
|
|
1086
|
+
- cockpit/themes/presetlr/symbols/loop.svg
|
|
1087
|
+
- cockpit/themes/presetlr/symbols/loop_end.svg
|
|
1088
|
+
- cockpit/themes/presetlr/symbols/loop_end_pre.svg
|
|
1089
|
+
- cockpit/themes/presetlr/symbols/manipulate.svg
|
|
1090
|
+
- cockpit/themes/presetlr/symbols/mark.svg
|
|
1091
|
+
- cockpit/themes/presetlr/symbols/otherwise.svg
|
|
1092
|
+
- cockpit/themes/presetlr/symbols/parallel.svg
|
|
1093
|
+
- cockpit/themes/presetlr/symbols/parallel_branch.svg
|
|
1094
|
+
- cockpit/themes/presetlr/symbols/parallel_branch_event.svg
|
|
1095
|
+
- cockpit/themes/presetlr/symbols/parallel_branch_event_rev.svg
|
|
1096
|
+
- cockpit/themes/presetlr/symbols/parallel_branch_normal.svg
|
|
1097
|
+
- cockpit/themes/presetlr/symbols/parallel_eventbased_exclusive.svg
|
|
1098
|
+
- cockpit/themes/presetlr/symbols/parallel_eventbased_parallel.svg
|
|
1099
|
+
- cockpit/themes/presetlr/symbols/scripts.svg
|
|
1100
|
+
- cockpit/themes/presetlr/symbols/start.svg
|
|
1101
|
+
- cockpit/themes/presetlr/symbols/start_event.svg
|
|
1102
|
+
- cockpit/themes/presetlr/symbols/stop.svg
|
|
1103
|
+
- cockpit/themes/presetlr/symbols/terminate.svg
|
|
1104
|
+
- cockpit/themes/presetlr/symbols/wait_for_signal.svg
|
|
1105
|
+
- cockpit/themes/presetlr/theme.js
|
|
1034
1106
|
- cockpit/themes/reduced/rngs/alternative.rng
|
|
1035
1107
|
- cockpit/themes/reduced/rngs/call.rng
|
|
1036
1108
|
- cockpit/themes/reduced/rngs/callmanipulate.rng
|
|
@@ -1093,8 +1165,71 @@ files:
|
|
|
1093
1165
|
- cockpit/themes/reduced/symbols/terminate.svg
|
|
1094
1166
|
- cockpit/themes/reduced/symbols/wait_for_signal.svg
|
|
1095
1167
|
- cockpit/themes/reduced/theme.js
|
|
1168
|
+
- cockpit/themes/wellformed/rngs/alternative.rng
|
|
1169
|
+
- cockpit/themes/wellformed/rngs/call.rng
|
|
1170
|
+
- cockpit/themes/wellformed/rngs/callmanipulate.rng
|
|
1171
|
+
- cockpit/themes/wellformed/rngs/choose.rng
|
|
1172
|
+
- cockpit/themes/wellformed/rngs/closed_loop.rng
|
|
1173
|
+
- cockpit/themes/wellformed/rngs/closed_loop_cancel.rng
|
|
1174
|
+
- cockpit/themes/wellformed/rngs/closed_loop_control.rng
|
|
1175
|
+
- cockpit/themes/wellformed/rngs/closed_loop_measuring.rng
|
|
1176
|
+
- cockpit/themes/wellformed/rngs/critical.rng
|
|
1177
|
+
- cockpit/themes/wellformed/rngs/escape.rng
|
|
1178
|
+
- cockpit/themes/wellformed/rngs/group.rng
|
|
1179
|
+
- cockpit/themes/wellformed/rngs/loop.rng
|
|
1180
|
+
- cockpit/themes/wellformed/rngs/manipulate.rng
|
|
1181
|
+
- cockpit/themes/wellformed/rngs/otherwise.rng
|
|
1182
|
+
- cockpit/themes/wellformed/rngs/parallel.rng
|
|
1183
|
+
- cockpit/themes/wellformed/rngs/parallel_branch.rng
|
|
1184
|
+
- cockpit/themes/wellformed/rngs/scripts.rng
|
|
1185
|
+
- cockpit/themes/wellformed/rngs/start.rng
|
|
1186
|
+
- cockpit/themes/wellformed/rngs/stop.rng
|
|
1187
|
+
- cockpit/themes/wellformed/rngs/terminate.rng
|
|
1188
|
+
- cockpit/themes/wellformed/rngs/wait_for_signal.rng
|
|
1189
|
+
- cockpit/themes/wellformed/symbols/alternative.svg
|
|
1190
|
+
- cockpit/themes/wellformed/symbols/arrow.svg
|
|
1191
|
+
- cockpit/themes/wellformed/symbols/call.svg
|
|
1192
|
+
- cockpit/themes/wellformed/symbols/call_sensor.svg
|
|
1193
|
+
- cockpit/themes/wellformed/symbols/callmanipulate.svg
|
|
1194
|
+
- cockpit/themes/wellformed/symbols/callmanipulate_sensor.svg
|
|
1195
|
+
- cockpit/themes/wellformed/symbols/callmanipulate_sensor_signal.svg
|
|
1196
|
+
- cockpit/themes/wellformed/symbols/callmanipulate_signal.svg
|
|
1197
|
+
- cockpit/themes/wellformed/symbols/choose.svg
|
|
1198
|
+
- cockpit/themes/wellformed/symbols/choose_exclusive.svg
|
|
1199
|
+
- cockpit/themes/wellformed/symbols/choose_exclusive_finish.svg
|
|
1200
|
+
- cockpit/themes/wellformed/symbols/choose_inclusive.svg
|
|
1201
|
+
- cockpit/themes/wellformed/symbols/choose_inclusive_finish.svg
|
|
1202
|
+
- cockpit/themes/wellformed/symbols/closed_loop.svg
|
|
1203
|
+
- cockpit/themes/wellformed/symbols/closed_loop_cancel.svg
|
|
1204
|
+
- cockpit/themes/wellformed/symbols/closed_loop_control.svg
|
|
1205
|
+
- cockpit/themes/wellformed/symbols/closed_loop_measuring.svg
|
|
1206
|
+
- cockpit/themes/wellformed/symbols/complex.svg
|
|
1207
|
+
- cockpit/themes/wellformed/symbols/critical.svg
|
|
1208
|
+
- cockpit/themes/wellformed/symbols/delete.svg
|
|
1209
|
+
- cockpit/themes/wellformed/symbols/end.svg
|
|
1210
|
+
- cockpit/themes/wellformed/symbols/escape.svg
|
|
1211
|
+
- cockpit/themes/wellformed/symbols/event_end.svg
|
|
1212
|
+
- cockpit/themes/wellformed/symbols/event_start.svg
|
|
1213
|
+
- cockpit/themes/wellformed/symbols/loop.svg
|
|
1214
|
+
- cockpit/themes/wellformed/symbols/loop_end.svg
|
|
1215
|
+
- cockpit/themes/wellformed/symbols/manipulate.svg
|
|
1216
|
+
- cockpit/themes/wellformed/symbols/mark.svg
|
|
1217
|
+
- cockpit/themes/wellformed/symbols/otherwise.svg
|
|
1218
|
+
- cockpit/themes/wellformed/symbols/parallel.svg
|
|
1219
|
+
- cockpit/themes/wellformed/symbols/parallel_branch.svg
|
|
1220
|
+
- cockpit/themes/wellformed/symbols/parallel_branch_event.svg
|
|
1221
|
+
- cockpit/themes/wellformed/symbols/parallel_branch_event_rev.svg
|
|
1222
|
+
- cockpit/themes/wellformed/symbols/parallel_branch_normal.svg
|
|
1223
|
+
- cockpit/themes/wellformed/symbols/parallel_eventbased_exclusive.svg
|
|
1224
|
+
- cockpit/themes/wellformed/symbols/parallel_eventbased_parallel.svg
|
|
1225
|
+
- cockpit/themes/wellformed/symbols/scripts.svg
|
|
1226
|
+
- cockpit/themes/wellformed/symbols/start.svg
|
|
1227
|
+
- cockpit/themes/wellformed/symbols/start_event.svg
|
|
1228
|
+
- cockpit/themes/wellformed/symbols/stop.svg
|
|
1229
|
+
- cockpit/themes/wellformed/symbols/terminate.svg
|
|
1230
|
+
- cockpit/themes/wellformed/symbols/wait_for_signal.svg
|
|
1231
|
+
- cockpit/themes/wellformed/theme.js
|
|
1096
1232
|
- cockpit/track.html
|
|
1097
|
-
- cockpit/transformations.xml
|
|
1098
1233
|
- contrib/Screenshot at 2011-09-28 02:38:11.png
|
|
1099
1234
|
- contrib/logo2-small.png
|
|
1100
1235
|
- contrib/logo2.png
|
|
@@ -1114,6 +1249,7 @@ files:
|
|
|
1114
1249
|
- lib/cpee/implementation_callbacks.rb
|
|
1115
1250
|
- lib/cpee/implementation_notifications.rb
|
|
1116
1251
|
- lib/cpee/implementation_properties.rb
|
|
1252
|
+
- lib/cpee/json_pointer.rb
|
|
1117
1253
|
- lib/cpee/message.rb
|
|
1118
1254
|
- lib/cpee/persistence.rb
|
|
1119
1255
|
- lib/cpee/redis.rb
|
|
@@ -1146,6 +1282,7 @@ files:
|
|
|
1146
1282
|
- lib/properties/t_attributes.rng
|
|
1147
1283
|
- lib/properties/t_dataelements.rng
|
|
1148
1284
|
- lib/properties/t_documents.rng
|
|
1285
|
+
- lib/properties/t_dslx.rng
|
|
1149
1286
|
- lib/properties/t_endpoints.rng
|
|
1150
1287
|
- lib/properties/t_position.rng
|
|
1151
1288
|
- lib/properties/t_positions.rng
|
data/cockpit/CPEE.xml
DELETED
data/cockpit/Signavio.xml
DELETED
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0"?>
|
|
2
|
-
<testset xmlns="http://cpee.org/ns/properties/2.0">
|
|
3
|
-
<transformation>
|
|
4
|
-
<description type='rest'>http://localhost:9295/bpmn2/</description>
|
|
5
|
-
<dataelements type='rest'>http://localhost:9295/bpmn2/</dataelements>
|
|
6
|
-
<endpoints type='rest'>http://localhost:9295/bpmn2/</endpoints>
|
|
7
|
-
</transformation>
|
|
8
|
-
</testset>
|
data/cockpit/transformations.xml
DELETED
/data/{COPYING → LICENSE}
RENAMED
|
File without changes
|