@senguoyun/dsh-arkme 0.1.31 → 0.1.33

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

@@ -35,15 +35,18 @@ function parseExtensionProfileRestartPlan(value) {
 		installStoreDirectory: stringValue(source.installStoreDirectory),
 		previousInstalled: source.previousInstalled !== null && typeof source.previousInstalled === "object" ? source.previousInstalled : void 0,
 		activationChange: source.activationChange === true ? true : void 0,
+		desktopQuarantineActivation: source.desktopQuarantineActivation === true ? true : void 0,
 		previousProfileIncluded: typeof source.previousProfileIncluded === "boolean" ? source.previousProfileIncluded : void 0,
 		healthUrl: stringValue(source.healthUrl),
-		logPath: stringValue(source.logPath)
+		logPath: stringValue(source.logPath),
+		runtimeReleaseId: stringValue(source.runtimeReleaseId)
 	};
 	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");
+		3,
+		4
+	].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.runtimeReleaseId !== void 0 && !/^electron-runtime-v1-[a-f0-9]{32}$/.test(plan.runtimeReleaseId) || plan.schemaVersion === 3 && (plan.activationChange !== true || plan.desktopQuarantineActivation === true || plan.previousInstalled === void 0 || plan.previousProfileIncluded === void 0) || plan.schemaVersion === 4 && (plan.activationChange !== true || plan.desktopQuarantineActivation !== true || plan.previousInstalled !== void 0 || plan.previousProfileIncluded !== false || plan.expectActive !== true || plan.extensionId !== `desktop-quarantine:${plan.packageName}`) || ![3, 4].includes(plan.schemaVersion) && plan.activationChange === true || plan.schemaVersion !== 4 && plan.desktopQuarantineActivation === 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,12 +91,21 @@ async function healthy(plan) {
 					"Content-Type": "application/json",
 					Origin: new URL(plan.healthUrl).origin
 				},
-				body: JSON.stringify({ operation: "extensions.installed-list" }),
+				body: JSON.stringify(plan.desktopQuarantineActivation === true ? {
+					operation: "extensions.quarantine.health",
+					params: { packageName: plan.packageName }
+				} : { operation: "extensions.installed-list" }),
 				signal: AbortSignal.timeout(2e3)
 			});
 			if (response.ok) {
 				const body = await response.json();
-				const installed = body.value?.find((item) => item.extensionId === plan.extensionId);
+				if (plan.desktopQuarantineActivation === true) {
+					const status = body.value;
+					if (body.ok === true && status?.profileEnabled === true && status.active === true) return true;
+					await new Promise((resolve) => setTimeout(resolve, 500));
+					continue;
+				}
+				const installed = Array.isArray(body.value) ? body.value.find((item) => item.extensionId === plan.extensionId) : void 0;
 				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 {}