fix versioning bugs

Author: hazelnutcloud

deno.jsonc

@@ -0,0 +1,9 @@
+{
+	"fmt": {
+		"options": {
+			"useTabs": true,
+			"semiColons": false,
+			"singleQuote": true
+		}
+	}
+}

manager/deno.lock

@@ -1,12 +1,10 @@
 services:
   mongodb:
     image: mongo
-    restart: always
     ports:
       - 27017:27017
 
   influxdb:
     image: influxdb
-    restart: always
     ports:
       - 8086:8086

manager/docker-compose.yml

@@ -8,8 +8,9 @@ import { logger } from '../logger.ts'
 
 export class LocalArkiveProvider implements ArkiveProvider {
 	newArkiveHandler?: (arkive: arkiverTypes.Arkive) => Promise<void>
-	delArkiveHandler?: (arkiveId: { id: number }) => Promise<void>
+	delArkiveHandler?: (arkiveId: { id: number }) => void
 	currentId = 0
+	idToDeploymentId = new Map<number, number>()
 	nameToArkive = new Map<
 		string,
 		{ id: number; majorVersion: number; minorVersion: number; status: string }
@@ -84,14 +85,18 @@ export class LocalArkiveProvider implements ArkiveProvider {
 
 			let arkive = this.nameToArkive.get(arkiveData.name)
 
-			if (arkiveData.majorUpdate && arkive) {
-				arkive.minorVersion = 0
-				arkive.majorVersion++
-			} else if (arkive) {
-				arkive.minorVersion++
-			}
+			let deploymentId = 0
 
-			if (!arkive) {
+			if (arkive) {
+				if (arkiveData.majorUpdate) {
+					arkive.minorVersion = 0
+					arkive.majorVersion++
+				} else {
+					arkive.minorVersion++
+				}
+				deploymentId = (this.idToDeploymentId.get(arkive.id) ?? 0) + 1
+				this.idToDeploymentId.set(arkive.id, deploymentId)
+			} else {
 				arkive = {
 					id: this.currentId,
 					majorVersion: 1,
@@ -100,6 +105,7 @@ export class LocalArkiveProvider implements ArkiveProvider {
 				}
 				this.currentId++
 				this.nameToArkive.set(arkiveData.name, arkive)
+				this.idToDeploymentId.set(arkive.id, deploymentId)
 			}
 
 			const localDir = join(
@@ -121,7 +127,7 @@ export class LocalArkiveProvider implements ArkiveProvider {
 				user_id: 'dev',
 				deployment: {
 					arkive_id: arkive.id,
-					id: 0,
+					id: deploymentId,
 					created_at: new Date().toISOString(),
 					file_path: localDir,
 					major_version: arkive.majorVersion,
@@ -156,21 +162,21 @@ export class LocalArkiveProvider implements ArkiveProvider {
 		return new Response('Invalid request', { status: 400 })
 	}
 
-	getArkives(): Promise<arkiverTypes.Arkive[]> {
+	getDeployments(): Promise<arkiverTypes.Arkive[]> {
 		return Promise.resolve([])
 	}
-	listenNewArkive(
+	listenNewDeployment(
 		callback: (arkive: arkiverTypes.Arkive) => Promise<void>,
 	): void {
 		this.newArkiveHandler = callback
 	}
 	listenDeletedArkive(
-		callback: (arkiveId: { id: number }) => Promise<void>,
+		callback: (arkiveId: { id: number }) => void,
 	): void {
 		this.delArkiveHandler = callback
 	}
 
-	async pullArkive(_arkives: arkiverTypes.Arkive): Promise<void> {}
+	async pullDeployment(_arkives: arkiverTypes.Arkive): Promise<void> {}
 
 	// deno-lint-ignore require-await
 	async updateDeploymentStatus(

manager/packages/local-arkive-provider/local-arkive-provider.ts

@@ -18,6 +18,7 @@ export class GraphQLServer {
 		// deno-lint-ignore ban-types
 		grapQLYoga.YogaServerInstance<{}, {}>
 	> = new Map()
+	private arkiveIdToHighestVersion: Map<number, number> = new Map()
 	arkiverProvider: ArkiveProvider
 
 	constructor(arkiveProvider: ArkiveProvider) {
@@ -39,13 +40,18 @@ export class GraphQLServer {
 		})
 	}
 
-	async addNewArkive(arkive: arkiverTypes.Arkive) {
+	async removeDeployment(arkive: arkiverTypes.Arkive) {
 		const username = await this.arkiverProvider.getUsername(arkive.user_id)
-		const path = `/${username}/${arkive.name}`
-		const pathWithVersion = `${path}/${arkive.deployment.major_version}`
+		const pathWithVersion =
+			`/${username}/${arkive.name}/${arkive.deployment.major_version}`
 		logger('graphQLServer').info(
-			`[GraphQL Server] Adding new arkive: ${pathWithVersion}, ${path}`,
+			`[GraphQL Server] Removing arkive: ${pathWithVersion}`,
 		)
+		this.pathToYoga.delete(pathWithVersion)
+	}
+
+	async addNewDeployment(arkive: arkiverTypes.Arkive) {
+		const username = await this.arkiverProvider.getUsername(arkive.user_id)
 		const manifestPath = new URL(
 			denoPath.join(
 				arkivesDir,
@@ -102,6 +108,12 @@ export class GraphQLServer {
 			landingPage: false,
 		}
 
+		const path = `/${username}/${arkive.name}`
+		const pathWithVersion = `${path}/${arkive.deployment.major_version}`
+		logger('graphQLServer').info(
+			`[GraphQL Server] Adding new arkive: ${pathWithVersion}`,
+		)
+
 		const yogaWithVersion = grapQLYoga.createYoga({
 			...options,
 			graphqlEndpoint: `${pathWithVersion}/graphql`,
@@ -112,7 +124,19 @@ export class GraphQLServer {
 		})
 
 		this.pathToYoga.set(`${pathWithVersion}/graphql`, yogaWithVersion)
-		this.pathToYoga.set(`${path}/graphql`, yoga)
+
+		const highestVersion = this.arkiveIdToHighestVersion.get(arkive.id)
+
+		if (!highestVersion || highestVersion < arkive.deployment.major_version) {
+			this.arkiveIdToHighestVersion.set(
+				arkive.id,
+				arkive.deployment.major_version,
+			)
+			this.pathToYoga.set(`${path}/graphql`, yoga)
+			logger('graphQLServer').info(
+				`[GraphQL Server] Updating highest version for ${path} to ${arkive.deployment.major_version}`,
+			)
+		}
 	}
 
 	async handleRequest(req: Request) {