@senguoyun/dsh-arkme 0.1.16 → 0.1.23

package/lib/extension-profile-restart-helper.js

@@ -1,7 +1,7 @@
-import { n as prepareProfilePackageManager, t as localExtensionPnpmArgs } from "./profile-package-manager-DwuQu8ZL.js";
-import { t as ArkmeExtensionInstallStore } from "./install-store-Beau1y-o.js";
+import { i as prepareProfilePackageManager, r as localExtensionPnpmArgs, t as applyArkmeProfileBundlePolicy } from "./profile-bundle-policy-CvojZuTD.js";
+import { t as ArkmeExtensionInstallStore } from "./install-store-C1tAM346.js";
 import { closeSync, openSync } from "node:fs";
-import { relative, resolve } from "node:path";
+import { join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { spawn, spawnSync } from "node:child_process";
 import { readFile, rm, unlink } from "node:fs/promises";
@@ -34,10 +34,16 @@ function parseExtensionProfileRestartPlan(value) {
 		cleanupPaths: Array.isArray(source.cleanupPaths) ? source.cleanupPaths.map(stringValue).filter((item) => item !== void 0) : [],
 		installStoreDirectory: stringValue(source.installStoreDirectory),
 		previousInstalled: source.previousInstalled !== null && typeof source.previousInstalled === "object" ? source.previousInstalled : void 0,
+		activationChange: source.activationChange === true ? true : void 0,
+		previousProfileIncluded: typeof source.previousProfileIncluded === "boolean" ? source.previousProfileIncluded : void 0,
 		healthUrl: stringValue(source.healthUrl),
 		logPath: stringValue(source.logPath)
 	};
-	if (![1, 2].includes(plan.schemaVersion) || typeof plan.parentPid !== "number" || !Number.isSafeInteger(plan.parentPid) || plan.parentPid <= 0 || plan.execPath === void 0 || plan.dshBinPath === void 0 || plan.restartArgv.length === 0 || plan.dshHome === void 0 || plan.profileName === void 0 || plan.packageName === void 0 || plan.extensionId === void 0 || typeof plan.expectActive !== "boolean" || plan.installStoreDirectory === void 0 || plan.healthUrl === void 0 || plan.logPath === void 0 || (plan.schemaVersion === 1 ? !/^@arkme-local\/ext-[a-f0-9]{16}$/.test(plan.packageName) : !/^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/.test(plan.packageName))) throw new Error("extension restart plan is incomplete");
+	if (![
+		1,
+		2,
+		3
+	].includes(plan.schemaVersion) || typeof plan.parentPid !== "number" || !Number.isSafeInteger(plan.parentPid) || plan.parentPid <= 0 || plan.execPath === void 0 || plan.dshBinPath === void 0 || plan.restartArgv.length === 0 || plan.dshHome === void 0 || plan.profileName === void 0 || plan.packageName === void 0 || plan.extensionId === void 0 || typeof plan.expectActive !== "boolean" || plan.installStoreDirectory === void 0 || plan.healthUrl === void 0 || plan.logPath === void 0 || plan.schemaVersion === 3 && (plan.activationChange !== true || plan.previousInstalled === void 0 || plan.previousProfileIncluded === void 0) || plan.schemaVersion !== 3 && plan.activationChange === true || (plan.schemaVersion === 1 ? !/^@arkme-local\/ext-[a-f0-9]{16}$/.test(plan.packageName) : !/^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/.test(plan.packageName))) throw new Error("extension restart plan is incomplete");
 	const health = new URL(plan.healthUrl);
 	if (health.protocol !== "http:" || !["127.0.0.1", "localhost"].includes(health.hostname)) throw new Error("extension restart health URL must be loopback HTTP");
 	return {
@@ -88,7 +94,7 @@ async function healthy(plan) {
 			if (response.ok) {
 				const body = await response.json();
 				const installed = body.value?.find((item) => item.extensionId === plan.extensionId);
-				if (body.ok === true && (plan.expectActive ? installed?.active === true : installed === void 0)) return true;
+				if (body.ok === true && (plan.activationChange === true ? plan.expectActive ? installed?.enabled === true && installed.active === true : installed?.enabled === false && installed.active === false : plan.expectActive ? installed?.active === true : installed === void 0)) return true;
 			}
 		} catch {}
 		await new Promise((resolve) => setTimeout(resolve, 500));
@@ -117,6 +123,7 @@ const defaultOperations = {
 	start,
 	isHealthy: healthy,
 	profileCommand,
+	applyBundlePolicy: applyArkmeProfileBundlePolicy,
 	removePath: async (path) => await rm(path, {
 		recursive: true,
 		force: true
@@ -136,7 +143,11 @@ async function cleanup(plan, helper) {
 	}
 }
 async function rollback(plan, restart, helper) {
-	if (!helper.profileCommand(plan, extensionProfileRollbackArgs(plan))) throw new Error("extension profile rollback failed");
+	if (plan.activationChange === true) helper.applyBundlePolicy(join(plan.dshHome, "profiles", plan.profileName), [{
+		packageName: plan.packageName,
+		enabled: plan.previousProfileIncluded === true
+	}]);
+	else if (!helper.profileCommand(plan, extensionProfileRollbackArgs(plan))) throw new Error("extension profile rollback failed");
 	const store = new ArkmeExtensionInstallStore(plan.installStoreDirectory);
 	try {
 		if (plan.previousInstalled === void 0) store.remove(plan.extensionId);
@@ -150,6 +161,7 @@ async function rollback(plan, restart, helper) {
 	if (restart) helper.start(plan);
 }
 function extensionProfileRollbackArgs(plan) {
+	if (plan.activationChange === true) throw new Error("activation restart rollback does not use DSH plugin commands");
 	if (plan.previousBundlePath === void 0) return ["remove", plan.packageName];
 	return plan.schemaVersion === 1 ? ["add", `link:${plan.previousBundlePath}`] : ["add", plan.previousBundlePath];
 }
@@ -196,7 +208,7 @@ async function main() {
 	if (planPath === void 0) throw new Error("extension restart plan path is required");
 	const rawPlan = JSON.parse(await readFile(planPath, "utf8"));
 	if (managed && isPluginUpdateRestartPlan(rawPlan)) {
-		const pluginUpdate = await import("./plugin-updater-helper.js");
+		const pluginUpdate = await import("./plugin-updater-helper-Ddppbids.js");
 		if (mode === "--managed-finalize") {
 			const healthUrl = process.argv[4];
 			if (healthUrl === void 0) throw new Error("managed plugin update health URL is required");