refactor(plugins): dedupe index database options · opencl...

Recent Commits to openclaw:main

vincentkoc · 2026-06-18 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ import path from "node:path";`
`4`	`4`	`import { isRecord } from "@openclaw/normalization-core/record-coerce";`
`5`	`5`	`import type { PluginInstallRecord } from "../config/types.plugins.js";`
`6`	`6`	`import { tryReadJsonSync } from "../infra/json-files.js";`
`7`		`-import type { OpenClawStateDatabaseOptions } from "../state/openclaw-state-db.js";`
`8`	`7`	`import { openOpenClawStateDatabase } from "../state/openclaw-state-db.js";`
`9`	`8`	`import { resolveDefaultPluginNpmDir, validatePluginId } from "./install-paths.js";`
`10`	`9`	`import {`
`@@ -13,6 +12,7 @@ import {`
`13`	`12`	`setInstalledPluginIndexInstallRecordsCache,`
`14`	`13`	`} from "./installed-plugin-index-record-cache.js";`
`15`	`14`	`import {`
	`15`	`+resolveInstalledPluginIndexStateDatabaseOptions,`
`16`	`16`	`resolveInstalledPluginIndexStorePath,`
`17`	`17`	`type InstalledPluginIndexStoreOptions,`
`18`	`18`	`} from "./installed-plugin-index-store-path.js";`
`@@ -246,26 +246,6 @@ type InstalledPluginIndexRecordRow = {`
`246`	`246`	`plugins_json: string;`
`247`	`247`	`};`
`248`	`248`
`249`		`-function resolveStateDatabaseOptions(`
`250`		`-options: InstalledPluginIndexStoreOptions = {},`
`251`		`-): OpenClawStateDatabaseOptions {`
`252`		`-if (options.filePath) {`
`253`		`-return {`
`254`		`- ...(options.env ? { env: options.env } : {}),`
`255`		`-path: options.filePath,`
`256`		`-};`
`257`		`-}`
`258`		`-if (options.stateDir) {`
`259`		`-return {`
`260`		`-env: {`
`261`		`- ...(options.env ?? process.env),`
`262`		`-OPENCLAW_STATE_DIR: options.stateDir,`
`263`		`-},`
`264`		`-};`
`265`		`-}`
`266`		`-return options.env ? { env: options.env } : {};`
`267`		`-}`
`268`		`-`
`269`	`249`	`function parseJsonColumn(value: string): unknown {`
`270`	`250`	`try {`
`271`	`251`	`return JSON.parse(value) as unknown;`
`@@ -285,7 +265,9 @@ function readPersistedInstalledPluginIndexForRecords(`
`285`	`265`	`return tryReadJsonSync(options.filePath);`
`286`	`266`	`}`
`287`	`267`	`try {`
`288`		`-const database = openOpenClawStateDatabase(resolveStateDatabaseOptions(options));`
	`268`	`+const database = openOpenClawStateDatabase(`
	`269`	`+resolveInstalledPluginIndexStateDatabaseOptions(options),`
	`270`	`+);`
`289`	`271`	`const row = database.db`
`290`	`272`	`.prepare(`
`291`	`273`	`

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`// Resolves filesystem paths for installed plugin index storage.`
`2`	`2`	`import path from "node:path";`
`3`	`3`	`import { resolveStateDir } from "../config/paths.js";`
	`4`	`+import type { OpenClawStateDatabaseOptions } from "../state/openclaw-state-db.js";`
`4`	`5`	`import { resolveOpenClawStateSqlitePath } from "../state/openclaw-state-db.paths.js";`
`5`	`6`
`6`	`7`	`const LEGACY_INSTALLED_PLUGIN_INDEX_STORE_PATH = path.join("plugins", "installs.json");`
`@@ -28,6 +29,24 @@ export function resolveInstalledPluginIndexStorePath(`
`28`	`29`	`return resolveOpenClawStateSqlitePath(resolveStoreEnv(options));`
`29`	`30`	`}`
`30`	`31`
	`32`	`+/** Resolves state database options for the installed plugin index store. */`
	`33`	`+export function resolveInstalledPluginIndexStateDatabaseOptions(`
	`34`	`+options: InstalledPluginIndexStoreOptions = {},`
	`35`	`+): OpenClawStateDatabaseOptions {`
	`36`	`+if (options.filePath) {`
	`37`	`+return {`
	`38`	`+ ...(options.env ? { env: options.env } : {}),`
	`39`	`+path: options.filePath,`
	`40`	`+};`
	`41`	`+}`
	`42`	`+if (options.stateDir) {`
	`43`	`+return {`
	`44`	`+env: resolveStoreEnv(options),`
	`45`	`+};`
	`46`	`+}`
	`47`	`+return options.env ? { env: options.env } : {};`
	`48`	`+}`
	`49`	`+`
`31`	`50`	`/** Resolves the legacy JSON installed plugin index path for migration/doctor use. */`
`32`	`51`	`export function resolveLegacyInstalledPluginIndexStorePath(`
`33`	`52`	`options: InstalledPluginIndexStoreOptions = {},`

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`import { existsSync, readFileSync } from "node:fs";`
`3`	`3`	`import { z } from "zod";`
`4`	`4`	`import { isBlockedObjectKey } from "../infra/prototype-keys.js";`
`5`		`-import type { OpenClawStateDatabaseOptions } from "../state/openclaw-state-db.js";`
`6`	`5`	`import {`
`7`	`6`	`openOpenClawStateDatabase,`
`8`	`7`	`runOpenClawStateWriteTransaction,`
`@@ -15,6 +14,7 @@ import { hashJson } from "./installed-plugin-index-hash.js";`
`15`	`14`	`import { resolveCompatRegistryVersion } from "./installed-plugin-index-policy.js";`
`16`	`15`	`import { clearLoadInstalledPluginIndexInstallRecordsCache } from "./installed-plugin-index-record-cache.js";`
`17`	`16`	`import {`
	`17`	`+resolveInstalledPluginIndexStateDatabaseOptions,`
`18`	`18`	`resolveInstalledPluginIndexStorePath,`
`19`	`19`	`type InstalledPluginIndexStoreOptions,`
`20`	`20`	`} from "./installed-plugin-index-store-path.js";`
`@@ -196,26 +196,6 @@ type InstalledPluginIndexSqliteRow = {`
`196`	`196`	`diagnostics_json: string;`
`197`	`197`	`};`
`198`	`198`
`199`		`-function resolveStateDatabaseOptions(`
`200`		`-options: InstalledPluginIndexStoreOptions = {},`
`201`		`-): OpenClawStateDatabaseOptions {`
`202`		`-if (options.filePath) {`
`203`		`-return {`
`204`		`- ...(options.env ? { env: options.env } : {}),`
`205`		`-path: options.filePath,`
`206`		`-};`
`207`		`-}`
`208`		`-if (options.stateDir) {`
`209`		`-return {`
`210`		`-env: {`
`211`		`- ...(options.env ?? process.env),`
`212`		`-OPENCLAW_STATE_DIR: options.stateDir,`
`213`		`-},`
`214`		`-};`
`215`		`-}`
`216`		`-return options.env ? { env: options.env } : {};`
`217`		`-}`
`218`		`-`
`219`	`199`	`function isExplicitLegacyJsonStorePath(options: InstalledPluginIndexStoreOptions): boolean {`
`220`	`200`	`return Boolean(options.filePath && options.filePath.endsWith(".json"));`
`221`	`201`	`}`
`@@ -309,7 +289,9 @@ function readPersistedInstalledPluginIndexFromSqlite(`
`309`	`289`	`return null;`
`310`	`290`	`}`
`311`	`291`	`try {`
`312`		`-const database = openOpenClawStateDatabase(resolveStateDatabaseOptions(options));`
	`292`	`+const database = openOpenClawStateDatabase(`
	`293`	`+resolveInstalledPluginIndexStateDatabaseOptions(options),`
	`294`	`+);`
`313`	`295`	`const row = database.db`
`314`	`296`	`.prepare(`
`315`	`297`	`
`@@ -379,7 +361,7 @@ function writePersistedInstalledPluginIndexToSqlite(`
`379`	`361`	`warning: persisted.warning,`
`380`	`362`	`updated_at_ms: now,`
`381`	`363`	`});`
`382`		`-}, resolveStateDatabaseOptions(options));`
	`364`	`+}, resolveInstalledPluginIndexStateDatabaseOptions(options));`
`383`	`365`	`}`
`384`	`366`
`385`	`367`	`export async function readPersistedInstalledPluginIndex(`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main