Run the operations API on the main thread

bin/restart.js

@@ -69,6 +69,8 @@ async function restart(req) {
 			// and shut down.
 			hdbLogger.debug('Shutdown workers');
 			await shutdownWorkersNow();
+			const { closeServers } = require('../server/threads/threadServer.js');
+			await closeServers();
 			await processMan.cleanupChildrenProcesses(false);
 			// remove pid file so it doesn't trip up the launch
 			await unlinkSync(path.join(envMgr.get(hdbTerms.CONFIG_PARAMS.ROOTPATH), hdbTerms.HDB_PID_FILE), `${process.pid}`);

components/componentLoader.ts

@@ -21,7 +21,6 @@
 import * as jsHandler from '../resources/jsResource.ts';
 import * as login from '../resources/login.ts';
 import * as REST from '../server/REST.ts';
-import * as fastifyRoutesHandler from '../server/fastifyRoutes.ts';
 import * as staticFiles from '../server/static.ts';
 import * as loadEnv from '../resources/loadEnv.ts';
 import harperLogger from '../utility/logging/harper_logger.js';
@@ -34,7 +33,6 @@
 import { table } from '../resources/databases.ts';
 import { startSocketServer } from '../server/threads/socketRouter.ts';
 import { getHdbBasePath } from '../utility/environment/environmentManager.js';
-import * as operationsServer from '../server/operationsServer.ts';
 import * as auth from '../security/auth.ts';
 import * as mqtt from '../server/mqtt.ts';
 import { getConfigObj, getConfigPath } from '../config/configUtils.js';
@@ -92,17 +90,18 @@
 	});
 }
 
 export const TRUSTED_RESOURCE_PLUGINS = {
 	REST, // for backwards compatibility with older configs
 	rest: REST,
 	graphql: graphqlQueryHandler,
 	graphqlSchema: graphqlHandler,
 	roles,
 	jsResource: jsHandler,
-	fastifyRoutes: fastifyRoutesHandler,
+	get fastifyRoutes() {
+		return require('../server/fastifyRoutes');
+	},
 	login,
 	static: staticFiles,
-	operationsApi: operationsServer,
 	customFunctions: {},
 	http: httpComponent,
 	authentication: auth,
@@ -115,6 +114,9 @@
 	login: ...
 	 */
 };
+if (isMainThread) {
+	TRUSTED_RESOURCE_PLUGINS.operationsApi = require('../server/operationsServer');
+}
 
 for (const { name, packageIdentifier } of getEnvBuiltInComponents()) {
 	TRUSTED_RESOURCE_PLUGINS[name] = packageIdentifier;

components/operations.js

@@ -396,15 +396,12 @@ async function deployComponent(req) {
 
 	await prepareApplication(application);
 
-	// the main thread should never actually load component, just do a deploy
-	if (isMainThread) return;
-
 	// now we attempt to actually load the component in case there is
-	// an error we can immediately detect and report
-	const pseudoResources = new Resources();
-	pseudoResources.isWorker = true;
+	// an error we can immediately detect and report, but app code should not run on the main thread
+	if (!isMainThread && !process.env.HARPER_SAFE_MODE) {
+		const pseudoResources = new Resources();
+		pseudoResources.isWorker = true;
 
-	if (!process.env.HARPER_SAFE_MODE) {
 		const componentLoader = require('./componentLoader.ts');
 		let lastError;
 		componentLoader.setErrorReporter((error) => (lastError = error));

integrationTests/apiTests/tests/18_computedIndexedProperties.mjs

@@ -2,17 +2,16 @@ import { describe, it, beforeEach } from 'node:test';
 import assert from 'node:assert/strict';
 import { req, reqRest } from '../utils/request.mjs';
 import { timestamp } from '../utils/timestamp.mjs';
+import request from 'supertest';
+import { envUrlRest, headers } from '../config/envConfig.mjs';
 
 describe('18. Computed indexed properties', () => {
 	beforeEach(timestamp);
 
 	//Computed indexed properties Folder
 
-	it('Insert data', () => {
-		return req()
-			.send({ operation: 'insert', table: 'Product', records: [{ id: '1', price: 100, taxRate: 0.19 }] })
-			.expect((r) => assert.ok(r.body.message.includes('inserted 1 of 1 records'), r.text))
-			.expect(200);
+	it('PUT data', () => {
+		return request(envUrlRest).put('/Product/1').set(headers).send({ id: '1', price: 100, taxRate: 0.19 }).expect(204);
 	});
 
 	it('Search for attribute', () => {
@@ -48,7 +47,6 @@ describe('18. Computed indexed properties', () => {
 				assert.equal(r.body[0].taxRate, 0.19, r.text);
 				assert.equal(r.body[0].totalPrice, 119, r.text);
 				assert.equal(r.body[0].notIndexedTotalPrice, 119, r.text);
-				assert.equal(r.body[0].jsTotalPrice, 119, r.text);
 			})
 			.expect(200);
 	});