system store - endpoints load from core instead of db

alphaprinz · alphaprinz · commit 93bd92a75bc7 · 2025-07-09T10:50:45.000-07:00
Signed-off-by: Amit Prinz Setter &lt;alphaprinz@gmail.com&gt;
diff --git a/src/api/system_api.js b/src/api/system_api.js
@@ -459,6 +459,27 @@ module.exports = {
             auth: {
                 system: 'admin'
             }
+        },
+
+        get_system_store: {
+            method: 'GET',
+            /*params: {
+                type: 'object'
+            },*/
+            reply: {
+                type: 'object',
+                /*properites: {
+                    systems: {
+                        type: 'array',
+                        items: {
+                            $ref: '#/definitions/role_info'
+                        }
+                    }
+                }*/
+            },
+            auth: {
+                system: false
+            }
         }
     },
 
diff --git a/src/endpoint/endpoint.js b/src/endpoint/endpoint.js
@@ -171,7 +171,7 @@ async function main(options = {}) {
                 // Load a system store instance for the current process and register for changes.
                 // We do not wait for it in becasue the result or errors are not relevent at
                 // this point (and should not kill the process);
-                system_store.get_instance().load();
+                system_store.get_instance({source: system_store.SOURCE.CORE}).load();
                 // Register the process as an md_server.
                 await md_server.register_rpc();
             }
diff --git a/src/rpc/rpc_schema.js b/src/rpc/rpc_schema.js
@@ -59,7 +59,7 @@ class RpcSchema {
         assert(!this[api.$id], 'RPC: api already registered ' + api.$id);
         assert(!this._compiled, 'RPC: schema is already compiled');
 
-        _.each(api.definitions, schema => {
+        /*().each(api.definitions, schema => {
             schema_utils.strictify(schema, {
                 additionalProperties: false
             });
@@ -71,7 +71,7 @@ class RpcSchema {
             schema_utils.strictify(method_api.reply, {
                 additionalProperties: false
             });
-        });
+        });*/
         try {
             this._ajv.addSchema(api);
         } catch (err) {
diff --git a/src/server/bg_services/cluster_hb.js b/src/server/bg_services/cluster_hb.js
@@ -93,7 +93,7 @@ function do_heartbeat({ skip_server_monitor } = {}) {
                             update: {
                                 clusters: [update]
                             }
-                        }, false);
+                        }, true);
                     });
             })
             .then(() => {
diff --git a/src/server/system_services/system_server.js b/src/server/system_services/system_server.js
@@ -303,6 +303,9 @@ function get_system_status(req) {
     };
 }
 
+async function get_system_store() {
+    return await system_store.recent_db_data();
+}
 
 async function _update_system_state(system_id, mode) {
     const update = {
@@ -1600,3 +1603,5 @@ exports.rotate_master_key = rotate_master_key;
 exports.disable_master_key = disable_master_key;
 exports.enable_master_key = enable_master_key;
 exports.upgrade_master_keys = upgrade_master_keys;
+
+exports.get_system_store = get_system_store;
diff --git a/src/server/system_services/system_store.js b/src/server/system_services/system_store.js
@@ -38,6 +38,7 @@ const size_utils = require('../../util/size_utils');
 const os_utils = require('../../util/os_utils');
 const config = require('../../../config');
 const db_client = require('../../util/db_client');
+const { decode_json } = require('../../util/postgres_client');
 
 const { RpcError } = require('../../rpc');
 const master_key_manager = require('./master_key_manager');
@@ -152,6 +153,10 @@ const COLLECTIONS_BY_NAME = _.keyBy(COLLECTIONS, 'name');
 
 const accounts_by_email_lowercase = [];
 
+const SOURCE = Object.freeze({
+    DB: 'DB',
+    CORE: 'CORE',
+});
 
 /**
  *
@@ -352,6 +357,8 @@ class SystemStore extends EventEmitter {
         this.START_REFRESH_THRESHOLD = 10 * 60 * 1000;
         this.FORCE_REFRESH_THRESHOLD = 60 * 60 * 1000;
         this.SYSTEM_STORE_LOAD_CONCURRENCY = config.SYSTEM_STORE_LOAD_CONCURRENCY || 5;
+        this.source = process.env.HOSTNAME.indexOf("endpoint") === -1 ? SOURCE.DB : SOURCE.CORE;
+        dbg.log0("system store source is", this.source);
         this._load_serial = new semaphore.Semaphore(1, { warning_timeout: this.START_REFRESH_THRESHOLD });
         for (const col of COLLECTIONS) {
             db_client.instance().define_collection(col);
@@ -406,8 +413,6 @@ class SystemStore extends EventEmitter {
             dbg.warn(`system_store.refresh: system_store.data.time > FORCE_REFRESH_THRESHOLD, since_load = ${since_load}, FORCE_REFRESH_THRESHOLD = ${this.FORCE_REFRESH_THRESHOLD}`);
             res = this.load();
         }
-        //call refresh periodically
-        P.delay_unblocking(this.START_REFRESH_THRESHOLD).then(this.refresh);
         return res;
     }
 
@@ -418,18 +423,23 @@ class SystemStore extends EventEmitter {
             try {
                 dbg.log3('SystemStore: loading ... this.last_update_time  =', this.last_update_time, ", since =", since);
 
-                const new_data = new SystemStoreData();
-
                 // If we get a load request with an timestamp older then our last update time
                 // we ensure we load everyting from that timestamp by updating our last_update_time.
                 if (!_.isUndefined(since) && since < this.last_update_time) {
                     dbg.log0('SystemStore.load: Got load request with a timestamp', since, 'older than my last update time', this.last_update_time);
                     this.last_update_time = since;
                 }
                 this.master_key_manager.load_root_key();
+                const new_data = new SystemStoreData();
                 let millistamp = time_utils.millistamp();
                 await this._register_for_changes();
-                await this._read_new_data_from_db(new_data);
+                if (this.source === SOURCE.DB) {
+                    await this._read_new_data_from_db(new_data);
+                } else {
+                    this.data = new SystemStoreData();
+                    await this._read_new_data_from_core(this.data);
+                }
+
                 const secret = await os_utils.read_server_secret();
                 this._server_secret = secret;
                 if (dbg.should_log(1)) { //param should match below logs' level
@@ -439,8 +449,10 @@ class SystemStore extends EventEmitter {
                         depth: 4
                     }));
                 }
-                this.old_db_data = this._update_data_from_new(this.old_db_data || {}, new_data);
-                this.data = _.cloneDeep(this.old_db_data);
+                if (this.source === SOURCE.DB) {
+                    this.old_db_data = this._update_data_from_new(this.old_db_data || {}, new_data);
+                    this.data = _.cloneDeep(this.old_db_data);
+                }
                 millistamp = time_utils.millistamp();
                 this.data.rebuild();
                 dbg.log1('SystemStore: rebuild took', time_utils.millitook(millistamp));
@@ -462,6 +474,12 @@ class SystemStore extends EventEmitter {
         });
     }
 
+    //return the latest copy of in-memory data
+    async recent_db_data() {
+        //return this.db_clone;
+        return this._load_serial.surround(async () => this.old_db_data);
+    }
+
     _update_data_from_new(data, new_data) {
         COLLECTIONS.forEach(col => {
             const old_items = data[col.name];
@@ -527,6 +545,27 @@ class SystemStore extends EventEmitter {
         this.last_update_time = now;
     }
 
+    async _read_new_data_from_core(target) {
+        dbg.log0("_read_new_data_from_core");
+        const res = await server_rpc.client.system.get_system_store();
+        for (const key of Object.keys(res)) {
+            const collection = COLLECTIONS_BY_NAME[key];
+            if (collection) {
+                target[key] = [];
+                _.each(res[key], item => {
+                    //these two lines will transform string values into appropriately typed objects
+                    //(SensitiveString, ObjectId) according to schema
+                    const after = decode_json(collection.schema, item);
+                    db_client.instance().validate(key, after);
+                    target[key].push(after);
+                });
+            } else {
+                target[key] = res[key];
+            }
+        }
+        return res;
+    }
+
     _check_schema(col, item, warn) {
         return db_client.instance().validate(col.name, item, warn);
     }
@@ -619,7 +658,7 @@ class SystemStore extends EventEmitter {
         if (any_news) {
             if (this.is_standalone) {
                 await this.load(last_update);
-            } else if (publish) {
+            } else /*if (publish)*/ {
                 // notify all the cluster (including myself) to reload
                 await server_rpc.client.redirector.publish_to_cluster({
                     method_api: 'server_inter_process_api',
@@ -855,3 +894,4 @@ SystemStore._instance = undefined;
 // EXPORTS
 exports.SystemStore = SystemStore;
 exports.get_instance = SystemStore.get_instance;
+exports.SOURCE = SOURCE;
diff --git a/src/util/postgres_client.js b/src/util/postgres_client.js
@@ -1951,3 +1951,4 @@ PostgresClient._instance = undefined;
 // EXPORTS
 exports.PostgresClient = PostgresClient;
 exports.instance = PostgresClient.instance;
+exports.decode_json = decode_json;

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ async function main(options = {}) {`
`171`	`171`	`// Load a system store instance for the current process and register for changes.`
`172`	`172`	`// We do not wait for it in becasue the result or errors are not relevent at`
`173`	`173`	`// this point (and should not kill the process);`
`174`		`- system_store.get_instance().load();`
	`174`	`+ system_store.get_instance({source: system_store.SOURCE.CORE}).load();`
`175`	`175`	`// Register the process as an md_server.`
`176`	`176`	`await md_server.register_rpc();`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ function do_heartbeat({ skip_server_monitor } = {}) {`
`93`	`93`	`update: {`
`94`	`94`	`clusters: [update]`
`95`	`95`	`}`
`96`		`- }, false);`
	`96`	`+ }, true);`
`97`	`97`	`});`
`98`	`98`	`})`
`99`	`99`	`.then(() => {`