Fix proto imports

AliceO2Group · Oct 10, 2024 · 3b68353 · 3b68353
1 parent c38647a
commit 3b68353
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/proto-sync.yml b/.github/workflows/proto-sync.yml
@@ -22,7 +22,7 @@ jobs:
         cp aliecs/common/protos/events.proto Control/protobuf/protos
         cp aliecs/common/protos/common.proto Control/protobuf/protos/protos
         cp aliecs/common/protos/events.proto Framework/Backend/protos
-        cp aliecs/common/protos/common.proto Framework/Backend/protos/protos
+        cp aliecs/common/protos/common.proto Framework/Backend/protos
         cp aliecs/apricot/protos/apricot.proto Control/protobuf/o2apricot.proto
         rm -rf aliecs
     - name: Check if there are any differences and create PR

diff --git a/Framework/Backend/kafka/AliEcsEventMessagesConsumer.js b/Framework/Backend/kafka/AliEcsEventMessagesConsumer.js
@@ -13,8 +13,16 @@
 const protobuf = require('protobufjs');
 const path = require('node:path');
 const { KafkaMessagesConsumer } = require('./KafkaMessagesConsumer.js');
+const {getWebUiProtoIncludeDir} = require('../protobuf/getWebUiProtoIncludeDir.js');
+
+const root = protobuf.loadSync(path.resolve(__dirname, '../protobuf/protos/events.proto');
+root.resolvePath = (origin, target) => {
+  if (path.isAbsolute(target)) {
+    return target;
+  }
+  return path.join(getWebUiProtoIncludeDir(), target);
+}
 
-const root = protobuf.loadSync(path.resolve(__dirname, '../protobuf/protos/events.proto'));
 const EventMessage = root.lookupType('events.Event');
 
 /**