@harperfast/harper-pro 5.0.0-alpha.9 → 5.0.0-beta.2

package/core/.dockerignore

@@ -0,0 +1,9 @@
+.git/
+/dist/
+/node_modules/
+
+/.idea/
+/.claude/
+/.github/
+
+/harperfast-harper-*.tgz

package/core/.git-blame-ignore-revs

@@ -5,3 +5,5 @@
 f66b9d9a77db9dfae1d1fe7b764b0a850883df60
 e892d2934b7048b610e4c879fd9b1a523b0004f7
 4e2e8b7980a31086a35c71de8fc8c305393ff771
+7e6779182655c4989d999ac1943fca54036e86af
+5c2b7323cdbaa43e22daa40c779fa0e526a73a73

package/core/.github/workflows/create-release.yaml

@@ -46,7 +46,7 @@ jobs:
         uses: slackapi/slack-github-action@v2
         with:
           method: chat.postMessage
-          token: ${{ secrets.SLACK_BOT_KEY }}
+          token: ${{ secrets.SLACK_BOT_TOKEN }}
           payload: |
             {
               "channel": "#development-ci",
@@ -91,7 +91,7 @@ jobs:
         with:
           name: ${{ steps.tag-version.outputs.tagVersion }}
           tag_name: ${{ steps.tag-version.outputs.tagVersion }}
-          files: harperfast-harper-*.tgz
+          files: harper-*.tgz
           fail_on_unmatched_files: true
           generate_release_notes: true
           prerelease: ${{ steps.version-components.outputs.prerelease != '' }}
@@ -106,7 +106,7 @@ jobs:
       - uses: slackapi/slack-github-action@v2
         with:
           method: chat.postMessage
-          token: ${{ secrets.SLACK_BOT_KEY }}
+          token: ${{ secrets.SLACK_BOT_TOKEN }}
           payload: |
             {
               "channel": "#development-ci",
@@ -147,7 +147,7 @@ jobs:
       - uses: slackapi/slack-github-action@v2
         with:
           method: chat.postMessage
-          token: ${{ secrets.SLACK_BOT_KEY }}
+          token: ${{ secrets.SLACK_BOT_TOKEN }}
           payload: |
             {
               "channel": "#development-ci",

package/core/.github/workflows/integration-tests.yml

@@ -64,7 +64,7 @@ jobs:
         run: npm run build || true # we currently have type errors so just ignore that
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: harper-build-artifacts-node-${{ matrix.node-version }}
           path: |
@@ -95,7 +95,7 @@ jobs:
           package-manager-cache: false
 
       - name: Download build artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: harper-build-artifacts-node-${{ matrix.node-version }}
 
@@ -112,9 +112,10 @@ jobs:
           THREADS_DEBUG: false
           NODE_HOSTNAME: 'localhost'
         run: |
-          node ./dist/bin/harper.js install
+          mkdir -p /tmp/hdb/log
+          node ./dist/bin/harper.js install > /tmp/hdb/log/install-stdout.log 2> /tmp/hdb/log/install-stderr.log
           sleep 10
-          node ./dist/bin/harper.js start
+          node ./dist/bin/harper.js start > /tmp/hdb/log/start-stdout.log 2> /tmp/hdb/log/start-stderr.log &
           sleep 10
 
       - name: Run API Tests
@@ -125,12 +126,13 @@ jobs:
         run: npm run test:integration:api-tests
 
       - name: Upload Harper logs
-        if: steps.run-api-tests.outcome == 'failure'
-        uses: actions/upload-artifact@v4
+        if: failure()
+        uses: actions/upload-artifact@v7
         with:
           name: harper-integration-api-test-logs-node-${{ matrix.node-version }}
-          path: /tmp/hdb/log/hdb.log
-          retention-days: 2
+          path: /tmp/hdb/log/
+          retention-days: 3
+          if-no-files-found: ignore
 
   run-integration-tests:
     name: Integration Tests ${{matrix.shard}}/4 (Node.js v${{ matrix.node-version }})
@@ -155,7 +157,7 @@ jobs:
           package-manager-cache: false
 
       - name: Download build artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           name: harper-build-artifacts-node-${{ matrix.node-version }}
 
@@ -167,7 +169,7 @@ jobs:
 
       - name: Upload Harper server logs
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: harper-server-logs-node-${{ matrix.node-version }}-shard-${{ matrix.shard }}
           path: /tmp/harper-integration-test-logs/

package/core/.github/workflows/notify-release-published.yaml

@@ -16,7 +16,7 @@ jobs:
         uses: slackapi/slack-github-action@v2
         with:
           method: chat.postMessage
-          token: ${{ secrets.SLACK_BOT_KEY }}
+          token: ${{ secrets.SLACK_BOT_TOKEN }}
           payload: |
             {
               "channel": "#development-ci",

package/core/.github/workflows/publish-docker.yaml

@@ -99,7 +99,7 @@ jobs:
         uses: slackapi/slack-github-action@v2
         with:
           method: chat.postMessage
-          token: ${{ secrets.SLACK_BOT_KEY }}
+          token: ${{ secrets.SLACK_BOT_TOKEN }}
           payload: |
             {
               "channel": "#development-ci",
@@ -140,7 +140,7 @@ jobs:
       - uses: slackapi/slack-github-action@v2
         with:
           method: chat.postMessage
-          token: ${{ secrets.SLACK_BOT_KEY }}
+          token: ${{ secrets.SLACK_BOT_TOKEN }}
           payload: |
             {
               "channel": "#development-ci",

package/core/.github/workflows/publish-npm.yaml

@@ -38,7 +38,7 @@ jobs:
           fi
       - name: Publish package to NPM registry
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_KEY }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: npm publish --access=public --tag=${{ steps.package-tag.outputs.packageTag }} harper-*.tgz
 
   publish-harperfast-npm-package:
@@ -78,7 +78,7 @@ jobs:
           fi
       - name: Publish package to NPM registry
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_KEY }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: npm publish --access=public --tag=${{ steps.package-tag.outputs.packageTag }} harperfast-harper-*.tgz
 
   send-slack-message-on-success:
@@ -92,7 +92,7 @@ jobs:
         uses: slackapi/slack-github-action@v2
         with:
           method: chat.postMessage
-          token: ${{ secrets.SLACK_BOT_KEY }}
+          token: ${{ secrets.SLACK_BOT_TOKEN }}
           payload: |
             {
               "channel": "#development-ci",
@@ -139,7 +139,7 @@ jobs:
       - uses: slackapi/slack-github-action@v2
         with:
           method: chat.postMessage
-          token: ${{ secrets.SLACK_BOT_KEY }}
+          token: ${{ secrets.SLACK_BOT_TOKEN }}
           payload: |
             {
               "channel": "#development-ci",

package/core/CONTRIBUTING.md

@@ -83,7 +83,7 @@ These are the steps @Ethan-Arrowood has been following to synchronize the reposi
 
 ### Last Synchronized Commit
 
-`e69e4b9c0c1c94576d306965c511e9c99efbf00c`
+`f969f21d780581fd0cb5566730028f2d13f1363e`
 
 ## Code of Conduct
 

package/core/Dockerfile

@@ -0,0 +1,62 @@
+ARG NODE_BUILD_VERSION=24
+ARG NODE_VERSION=24
+
+FROM docker.io/node:${NODE_BUILD_VERSION} AS build
+
+WORKDIR /usr/src/harper
+
+COPY . .
+
+RUN env NO_USE_GIT=true npm run package
+
+FROM docker.io/node:${NODE_VERSION} AS run
+
+# Change node user to harper
+RUN <<-EOF
+  mkdir -p /home/harperdb
+  usermod -d /home/harperdb -l harperdb node
+  groupmod -n harperdb node
+  rm -rf /home/node
+  chown -R harperdb:harperdb /home/harperdb
+EOF
+
+WORKDIR /home/harperdb
+
+USER harperdb
+
+# Install pnpm
+RUN wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.bashrc" SHELL="$(which bash)" bash -
+
+COPY --from=build /usr/src/harper/harper-*.tgz .
+
+# Configure NPM
+ENV NPM_CONFIG_PREFIX=/home/harperdb/.npm-global
+ENV PATH=/home/harperdb/.npm-global/bin:$PATH
+
+VOLUME /home/harperdb/harper
+
+# Install Harper globally
+RUN <<-EOF
+  npm install --global harper-*.tgz
+  rm harper-*.tgz
+  mkdir -p /home/harperdb/harper
+  chown harperdb:harperdb /home/harperdb/harper
+EOF
+
+# Harper config parameters
+ENV HDB_ADMIN_USERNAME=admin
+ENV ROOTPATH=/home/harperdb/harper
+ENV TC_AGREEMENT=yes
+ENV NETWORK_OPERATIONSAPI_PORT=9925
+ENV LOGGING_STDSTREAMS=true
+ENV NODE_HOSTNAME=localhost
+ENV DEFAULTS_MODE=prod
+
+EXPOSE 9925
+EXPOSE 9926
+EXPOSE 9932
+EXPOSE 9933
+
+ENTRYPOINT ["harper"]
+
+CMD ["run"]

package/core/build-tools/build-studio.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+rm -Rf studio-src studio
+mkdir studio-src
+cd studio-src
+git clone --branch prod --single-branch --depth 1 https://github.com/HarperFast/studio.git .
+npm install -g pnpm
+pnpm install
+VITE_STUDIO_VERSION="v$(jq -r '.version' ../package.json)" pnpm run build:local
+cd ..
+mkdir studio
+mv ./studio-src/web ./studio/web

package/core/build-tools/build.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo -e "\n📦 Installing core deps"
+npm install
+
+echo -e "\n📦 Building project"
+npm run build || true
+
+echo -e "\n📦 Creating shrinkwrap"
+npm shrinkwrap
+
+./build-tools/build-studio.sh
+
+echo -e "\n📦 Building package"
+npm pack
+
+version=$(npm pkg get version | tr -d \")
+packageFile="harper-${version}.tgz"
+echo -e "\n📦 Built Harper Pro ${version} in ${packageFile}"
+echo "📦 Run 'npm publish ${packageFile}' to release"

package/core/build-tools/download-prebuilds.js

@@ -0,0 +1,13 @@
+const util = require('util');
+const exec = util.promisify(require('child_process').exec);
+
+(async function () {
+	// need prebuildify-ci for the downloads to run
+	let output = await exec('npm install -g prebuildify-ci');
+	console.error(output.stderr);
+	console.log(output.stdout);
+	// download lmdb (and msgpackr-extract) binaries
+	output = await exec('download-lmdb-prebuilds');
+	console.error(output.stderr);
+	console.log(output.stdout);
+})();

package/core/components/Logger.ts

@@ -0,0 +1,14 @@
+export interface Logger {
+	logLevel: string;
+
+	notify?: (...args: any[]) => void;
+	fatal?: (...args: any[]) => void;
+	error?: (...args: any[]) => void;
+	warn?: (...args: any[]) => void;
+	info?: (...args: any[]) => void;
+	debug?: (...args: any[]) => void;
+	trace?: (...args: any[]) => void;
+
+	withTag: (tag: string) => Logger;
+	loggerWithTag: (tag: string) => Logger;
+}

package/core/components/Scope.ts

@@ -1,6 +1,7 @@
 import { type Logger } from '../utility/logging/logger.ts';
 import { loggerWithTag } from '../utility/logging/harper_logger.js';
 import { EventEmitter, once } from 'node:events';
+import { databaseEventsEmitter } from '../resources/databases.ts';
 import { server, type Server } from '../server/Server.ts';
 import { EntryHandler, type EntryHandlerEventMap, type onEntryEventHandler } from './EntryHandler.ts';
 import { OptionsWatcher, OptionsWatcherEventMap } from './OptionsWatcher.ts';
@@ -17,17 +18,26 @@ export class MissingDefaultFilesOptionError extends Error {
 	}
 }
 
+export type ScopeEventsMap = {
+	all: [...args: unknown[]];
+	close: [];
+	error: [error: unknown];
+	ready: [];
+	[record: string]: [...args: unknown[]];
+};
+
 /**
  * This class is what is passed to the `handleApplication` function of an extension.
  *
- * It is imperative that the instance is "ready" before its passed to the `handleApplication` function
+ * It is imperative that the instance is "ready" before it's passed to the `handleApplication` function
  * so that the developer can immediately start using `scope.options`, etc.
  *
  */
-export class Scope extends EventEmitter {
+export class Scope extends EventEmitter<ScopeEventsMap> {
 	#configFilePath: string;
 	#directory: string;
-	#name: string;
+	#appName: string;
+	#pluginName: string;
 	#entryHandler?: EntryHandler;
 	#entryHandlers: EntryHandler[];
 	#logger: Logger;
@@ -38,14 +48,24 @@ export class Scope extends EventEmitter {
 	resources?: Resources;
 	server?: Server;
 	ready: Promise<any[]>;
-	constructor(name: string, directory: string, configFilePath: string, applicationScope: ApplicationScope) {
+	databaseEvents: typeof databaseEventsEmitter;
+
+	constructor(
+		appName: string,
+		pluginName: string,
+		directory: string,
+		configFilePath: string,
+		applicationScope: ApplicationScope
+	) {
 		super();
 
-		this.#name = name;
+		this.#appName = appName;
+		this.#pluginName = pluginName;
 		this.#directory = directory;
 		this.#configFilePath = configFilePath;
-		this.#logger = loggerWithTag(this.#name);
+		this.#logger = logger || loggerWithTag(this.#appName);
 
+		this.databaseEvents = databaseEventsEmitter;
 		this.applicationScope = applicationScope;
 		this.resources = applicationScope?.resources ?? resources;
 		this.server = applicationScope?.server ?? server;
@@ -56,7 +76,7 @@ export class Scope extends EventEmitter {
 		this.ready = once(this, 'ready');
 
 		// Create the options instance for the scope immediately
-		this.options = new OptionsWatcher(name, configFilePath, this.#logger)
+		this.options = new OptionsWatcher(pluginName, configFilePath, this.#logger)
 			.on('error', this.#handleError.bind(this))
 			.on('change', this.#optionsWatcherChangeListener.bind(this)())
 			.on('ready', this.#handleOptionsWatcherReady.bind(this));
@@ -66,8 +86,12 @@ export class Scope extends EventEmitter {
 		return this.#logger;
 	}
 
-	get name(): string {
-		return this.#name;
+	get appName(): string {
+		return this.#appName;
+	}
+
+	get pluginName(): string {
+		return this.#pluginName;
 	}
 
 	get directory(): string {
@@ -107,7 +131,7 @@ export class Scope extends EventEmitter {
 	}
 
 	#createEntryHandler(config: FilesOption | FileAndURLPathConfig): EntryHandler {
-		const entryHandler = new EntryHandler(this.#name, this.#directory, config, this.#logger)
+		const entryHandler = new EntryHandler(this.#pluginName, this.#directory, config, this.#logger)
 			.on('error', this.#handleError.bind(this))
 			.on('add', this.#defaultEntryHandlerListener('add'))
 			.on('change', this.#defaultEntryHandlerListener('change'))
@@ -279,7 +303,7 @@ export class Scope extends EventEmitter {
 	}
 
 	requestRestart() {
-		this.#logger.debug?.(`Restart requested from ${this.name} scope for ${this.directory}`);
+		this.#logger.debug?.(`Restart requested from ${this.#pluginName} scope for ${this.#appName}`);
 		requestRestart();
 	}
 

package/core/components/componentLoader.ts

@@ -60,12 +60,20 @@ export function loadComponentDirectories(loadedPluginModules?: Map<any, any>, lo
 			if (!appEntry.isDirectory() && !appEntry.isSymbolicLink()) continue;
 			const appName = appEntry.name;
 			const appFolder = join(CF_ROUTES_DIR, appName);
-			cfsLoaded.push(loadComponent(appFolder, resources, HDB_ROOT_DIR_NAME));
+			cfsLoaded.push(
+				loadComponent(appFolder, resources, HDB_ROOT_DIR_NAME, { isRoot: false, autoReload: false, appName })
+			);
 		}
 	}
 	const hdbAppFolder = process.env.RUN_HDB_APP;
 	if (hdbAppFolder) {
-		cfsLoaded.push(loadComponent(hdbAppFolder, resources, hdbAppFolder, { autoReload: Boolean(process.env.DEV_MODE) }));
+		cfsLoaded.push(
+			loadComponent(hdbAppFolder, resources, hdbAppFolder, {
+				isRoot: false,
+				autoReload: Boolean(process.env.DEV_MODE),
+				appName: hdbAppFolder,
+			})
+		);
 	}
 	return Promise.all(cfsLoaded).then(() => {
 		watchesSetup = true;
@@ -176,7 +184,7 @@ function sequentiallyHandleApplication(scope: Scope, plugin: PluginModule) {
 		// Timeout priority is user config, plugin default, finally 30 seconds
 		const timeout = scope.options.get(['timeout']) || plugin.defaultTimeout || 30_000; // default 30 second timeout
 		if (typeof timeout !== 'number') {
-			throw new Error(`Invalid timeout value for ${scope.name}. Expected a number, received: ${typeof timeout}`);
+			throw new Error(`Invalid timeout value for ${scope.pluginName}. Expected a number, received: ${typeof timeout}`);
 		}
 		let whenResolved, timer;
 		const callback = () => {
@@ -184,13 +192,13 @@ function sequentiallyHandleApplication(scope: Scope, plugin: PluginModule) {
 			whenResolved(sequentiallyHandleApplication(scope, plugin));
 		};
 		const store = Status.primaryStore;
-		const lockAcquired = store.tryLock(scope.name, callback);
+		const lockAcquired = store.tryLock(scope.pluginName, callback);
 
 		if (!lockAcquired) {
 			return new Promise((resolve, reject) => {
 				whenResolved = resolve;
 				timer = setTimeout(() => {
-					reject(new Error(`Timeout waiting for lock on ${scope.name}`));
+					reject(new Error(`Timeout waiting for lock on ${scope.pluginName}`));
 				}, timeout + 5_000); // extra time for lock acquisition
 			});
 		}
@@ -206,13 +214,18 @@ function sequentiallyHandleApplication(scope: Scope, plugin: PluginModule) {
 				new Promise(
 					(_, reject) =>
 						(loadTimeout = setTimeout(
-							() => reject(new Error(`handleApplication timed out after ${timeout}ms for ${scope.name}`)),
+							() =>
+								reject(
+									new Error(
+										`handleApplication timed out after ${timeout}ms for ${scope.pluginName} on behalf of ${scope.appName}`
+									)
+								),
 							timeout
 						))
 				),
 			]);
 		} finally {
-			Status.primaryStore.unlock(scope.name);
+			Status.primaryStore.unlock(scope.pluginName);
 			clearTimeout(loadTimeout);
 		}
 	});
@@ -222,8 +235,8 @@ export interface LoadComponentOptions {
 	isRoot?: boolean;
 	applicationScope?: ApplicationScope;
 	autoReload?: boolean;
-	applicationContainment?: ApplicationContainment;
 	providedLoadedComponents?: Map<any, any>;
+	appName?: string;
 }
 
 /**
@@ -249,6 +262,7 @@ export async function loadComponent(
 		applicationScope = new ApplicationScope(basename(componentDirectory), resources, server),
 		isRoot,
 		autoReload,
+		appName,
 	} = options;
 	applicationScope.verifyPath ??= componentDirectory;
 	if (providedLoadedComponents) loadedComponents = providedLoadedComponents;
@@ -321,7 +335,10 @@ export async function loadComponent(
 						subApplicationScope.verifyPath = componentPath;
 						if (!process.env.HARPER_SAFE_MODE) {
 							extensionModule = await loadComponent(componentPath, resources, origin, {
+								isRoot: false,
 								applicationScope: subApplicationScope,
+								autoReload: false,
+								appName: appName || componentName,
 							});
 							componentFunctionality[componentName] = true;
 						}
@@ -373,7 +390,7 @@ export async function loadComponent(
 
 				// New Plugin API (`handleApplication`)
 				if (resources.isWorker && extensionModule.handleApplication) {
-					const scope = new Scope(componentName, componentDirectory, configPath, applicationScope);
+					const scope = new Scope(appName || 'harper', componentName, componentDirectory, configPath, applicationScope);
 
 					await sequentiallyHandleApplication(scope, extensionModule);
 
@@ -477,7 +494,7 @@ export async function loadComponent(
 				return loadComponentDirectories(); // return the promise
 			});
 		}
-		if (config.extensionModule || config.pluginModule) {
+		if ((config.extensionModule || config.pluginModule) && (!isMainThread || config.runOnMainThread)) {
 			const extensionModule = await scopedImport(
 				join(componentDirectory, config.extensionModule || config.pluginModule),
 				applicationScope

package/core/components/operations.js

@@ -408,7 +408,15 @@ async function deployComponent(req) {
 		const componentLoader = require('./componentLoader.ts');
 		let lastError;
 		componentLoader.setErrorReporter((error) => (lastError = error));
-		await componentLoader.loadComponent(application.dirPath, pseudoResources);
+		await componentLoader.loadComponent(
+			application.dirPath,
+			pseudoResources,
+			undefined,
+			false,
+			undefined,
+			false,
+			req.project
+		);
 
 		if (lastError) throw lastError;
 	}
@@ -473,7 +481,7 @@ async function getComponents() {
 			const list = await fs.readdir(dir, { withFileTypes: true });
 			for (let item of list) {
 				const itemName = item.name;
-				if (itemName.startsWith('.') || itemName === 'node_modules') continue;
+				if (itemName === 'node_modules') continue;
 				const itemPath = path.join(dir, itemName);
 				if (item.isDirectory() || item.isSymbolicLink()) {
 					let res = {

package/core/config/configUtils.js

@@ -140,7 +140,7 @@ function createConfigFile(args, skipFsValidation = false) {
 	if (configDoc.errors?.length > 0) {
 		throw handleHDBError(
 			new Error(),
-			`Error parsing harperdb-config.yaml ${configDoc.errors}`,
+			`Error parsing ${configFilePath} ${configDoc.errors}`,
 			HTTP_STATUS_CODES.BAD_REQUEST,
 			undefined,
 			undefined,

package/core/dataLayer/CreateTableObject.js

@@ -1,10 +1,10 @@
 'use strict';
 
 class CreateTableObject {
-	constructor(schema, table, hash_attribute) {
+	constructor(schema, table, primary_key) {
 		this.schema = schema;
 		this.table = table;
-		this.hash_attribute = hash_attribute;
+		this.primary_key = primary_key;
 	}
 }
 

package/core/dataLayer/schema.js

@@ -13,7 +13,7 @@ const harperBridge = require('./harperBridge/harperBridge.js');
 const { handleHDBError, hdbErrors, ClientError } = require('../utility/errors/hdbError.js');
 const { HDB_ERROR_MSGS, HTTP_STATUS_CODES } = hdbErrors;
 const { SchemaEventMsg } = require('../server/threads/itc.js');
-const { getDatabases } = require('../resources/databases.ts');
+const { getDatabases, dropTableMeta } = require('../resources/databases.ts');
 const { transformReq } = require('../utility/common_utils.js');
 const { server } = require('../server/Server.ts');
 const { cleanupOrphans } = require('../resources/blob.ts');
@@ -96,7 +96,7 @@ async function createSchemaStructure(schemaCreateObject) {
 
 async function createTable(createTableObject) {
 	transformReq(createTableObject);
-	createTableObject.hash_attribute = createTableObject.primary_key ?? createTableObject.hash_attribute;
+	createTableObject.primary_key = createTableObject.primary_key ?? createTableObject.hash_attribute;
 	return await createTableStructure(createTableObject);
 }
 
@@ -108,7 +108,7 @@ async function createTableStructure(createTableObject) {
 			schema: DB_NAME_CONSTRAINTS,
 			table: TABLE_NAME_CONSTRAINTS,
 			residence: Joi.array().items(Joi.string().min(1)).optional(),
-			hash_attribute: PRIMARY_KEY_CONSTRAINTS,
+			primary_key: PRIMARY_KEY_CONSTRAINTS,
 		})
 	);
 	if (validation) throw new ClientError(validation.message);
@@ -132,7 +132,7 @@ async function createTableStructure(createTableObject) {
 		name: createTableObject.table,
 		schema: createTableObject.schema,
 		id: uuidV4(),
-		hash_attribute: createTableObject.hash_attribute,
+		primary_key: createTableObject.primary_key,
 	};
 
 	if (createTableObject.residence) {
@@ -219,6 +219,8 @@ async function dropTable(dropTableObject) {
 
 	await harperBridge.dropTable(dropTableObject);
 
+	await dropTableMeta({ table: dropTableObject.table, database: dropTableObject.schema });
+
 	let response = await server.replication.replicateOperation(dropTableObject);
 	response.message = `successfully deleted table '${dropTableObject.schema}.${dropTableObject.table}'`;
 	return response;
@@ -260,7 +262,7 @@ async function dropAttribute(dropAttributeObject) {
 
 	if (
 		dropAttributeObject.attribute ===
-		global.hdb_schema[dropAttributeObject.schema][dropAttributeObject.table].hash_attribute
+		global.hdb_schema[dropAttributeObject.schema][dropAttributeObject.table].primary_key
 	) {
 		throw handleHDBError(
 			new Error(),

package/core/dataLayer/schemaDescribe.js

@@ -192,7 +192,7 @@ async function descTable(describeTableObject, attrPerms) {
 	let tableResult = {
 		schema,
 		name: tableObj.tableName,
-		hash_attribute: tableObj.attributes.find((attribute) => attribute.isPrimaryKey || attribute.isPrimaryKey)?.name,
+		primary_key: tableObj.attributes.find((attribute) => attribute.isPrimaryKey || attribute.isPrimaryKey)?.name,
 		audit: tableObj.audit,
 		schema_defined: tableObj.schemaDefined,
 		attributes,