universal-picgo 2.0.1 → 3.0.0

package/dist/src/core/UniversalPicGo.d.ts

@@ -1,4 +1,6 @@
+import { ReadyUnifiedPicGoConfigFacade } from '../config';
 import { PicGoRequestWrapper } from '../lib/PicGoRequest';
+import { StorageAdapter } from 'universal-picgo-store';
 import { PluginHandler } from '../lib/PluginHandler';
 import { IConfig, IHelper, II18nManager, IImgInfo, IPicGo, IPicGoPlugin, IPicGoPluginInterface, IPluginLoader, IStringKeyMap, IUniversalPicGoOptions } from '../types';
 import { EventEmitter } from '../utils/nodePolyfill';
@@ -9,6 +11,8 @@ declare class UniversalPicGo extends EventEmitter implements IPicGo {
     private lifecycle;
     private db;
     private _pluginLoader;
+    /** Storage adapter factory from options. Passed to DB constructors. */
+    readonly storageAdapterFactory?: (dbPath: string) => StorageAdapter;
     configPath: string;
     zhiNpmPath: string;
     baseDir: string;
@@ -23,19 +27,25 @@ declare class UniversalPicGo extends EventEmitter implements IPicGo {
     VERSION: string;
     private readonly isDev;
     private readonly usesOptionsObject;
+    private readyPromise;
+    private unifiedConfigFacade?;
     get pluginLoader(): IPluginLoader;
+    get storageMode(): "sync" | "async";
     getLogger(name?: string): ILogger;
     get request(): PicGoRequestWrapper["PicGoRequest"];
     constructor(options?: IUniversalPicGoOptions);
     constructor(configPath?: string, pluginBaseDir?: string, zhiNpmPath?: string, isDev?: boolean);
-    /**
-     * easily mannually load a plugin
-     * if provide plugin name, will register plugin by name
-     * or just instantiate a plugin
-     */
+    /** Async init: wait for config DB from remote storage, then refresh config. */
+    private initAsync;
+    /** Wait for config and plugins to be ready. */
+    init(): Promise<void>;
+    attachConfigFacade(facade: ReadyUnifiedPicGoConfigFacade): void;
+    getConfigFacade(): ReadyUnifiedPicGoConfigFacade | undefined;
     use(plugin: IPicGoPlugin, name?: string): IPicGoPluginInterface;
     getConfig<T>(name?: string, defaultValue?: any): T;
     reloadConfig(): IConfig;
+    reloadConfigAsync(): Promise<IConfig>;
+    flushConfig(): Promise<void>;
     saveConfig(config: IStringKeyMap<any>): void;
     removeConfig(key: string, propName: string): void;
     setConfig(config: IStringKeyMap<any>): void;
@@ -46,6 +56,5 @@ declare class UniversalPicGo extends EventEmitter implements IPicGo {
     private initConfigPath;
     private initZhiNpmPath;
     private initConfig;
-    private init;
 }
 export { UniversalPicGo };

package/dist/src/db/config/index.d.ts

@@ -19,6 +19,7 @@ declare class ConfigDb implements IPicgoDb<IConfig> {
             txtImageSwitch: boolean;
         };
     };
+    private initReady;
     constructor(ctx: IPicGo);
     read(flush?: boolean): IJSON;
     get(key: string): any;
@@ -27,6 +28,10 @@ declare class ConfigDb implements IPicgoDb<IConfig> {
     unset(key: string, value: any): boolean;
     saveConfig(config: Partial<IConfig>): void;
     removeConfig(config: IConfig): void;
+    get isAsync(): boolean;
+    ensureReady(): Promise<void>;
+    flush(): Promise<void>;
+    private doSafeSet;
     safeSet(key: string, value: any): void;
 }
 export default ConfigDb;

package/dist/src/db/externalPicGo/index.d.ts

@@ -10,7 +10,10 @@ declare class ExternalPicgoConfigDb implements IPicgoDb<IExternalPicgoConfig> {
         useBundledPicgo: boolean;
         picgoType: PicgoTypeEnum;
         extPicgoApiUrl: string;
+        picListApiUrl: string;
+        picListApiKey: string;
     };
+    private initReady;
     constructor(ctx: IPicGo);
     read(flush?: boolean): IJSON;
     get(key: string): any;
@@ -19,6 +22,21 @@ declare class ExternalPicgoConfigDb implements IPicgoDb<IExternalPicgoConfig> {
     unset(key: string, value: any): boolean;
     saveConfig(config: Partial<IExternalPicgoConfig>): void;
     removeConfig(config: IExternalPicgoConfig): void;
+    get isAsync(): boolean;
+    /**
+     * Wait for async backend to load remote data.
+     *
+     * PicGo 3.0: Local defaults are seeded immediately in the constructor
+     * for UI display. When ensureReady() resolves:
+     *   - If remote data exists, it replaces the local defaults.
+     *   - If remote data is missing, local defaults are kept and persisted.
+     *
+     * This prevents the v2 bug where constructor-time safeSet would
+     * overwrite real remote user configuration with generated defaults.
+     */
+    ensureReady(): Promise<void>;
+    flush(): Promise<void>;
+    private doSafeSet;
     safeSet(key: string, value: any): void;
 }
 export default ExternalPicgoConfigDb;

package/dist/src/headless/UniversalPicGoHeadlessManager.d.ts

@@ -5,17 +5,18 @@ declare class UniversalPicGoHeadlessManager implements IPicGoHeadlessManager {
     private readonly ctx;
     constructor(options?: PicGoHeadlessManagerOptions);
     getContext(): IPicGo;
-    getConfig(): IConfig;
-    getCurrentUploader(): string;
-    setCurrentUploader(uploaderId: string): PicGoValidationResult;
+    getConfig(): Promise<IConfig>;
+    getCurrentUploader(): Promise<string>;
+    setCurrentUploader(uploaderId: string): Promise<PicGoValidationResult>;
     listUploaders(): PicGoUploaderListItem[];
     getUploaderSchema(uploaderId: string): PicGoUploaderConfigSchema;
-    getUploaderConfig<T extends Record<string, unknown> = Record<string, unknown>>(uploaderId: string): T;
+    getUploaderConfig<T extends Record<string, unknown> = Record<string, unknown>>(uploaderId: string): Promise<T>;
     validateUploaderConfig(uploaderId: string, config: Record<string, unknown>): PicGoValidationResult;
-    saveUploaderConfig(uploaderId: string, config: Record<string, unknown>, options?: PicGoHeadlessSaveUploaderConfigOptions): PicGoValidationResult;
+    saveUploaderConfig(uploaderId: string, config: Record<string, unknown>, options?: PicGoHeadlessSaveUploaderConfigOptions): Promise<PicGoValidationResult>;
     auditUploaderSchemas(): PicGoUploaderSchemaAuditResult;
     upload(input?: any[]): Promise<IImgInfo[]>;
     private hasUploader;
+    private ensureReady;
     private withSchemaDefaults;
     private unknownUploaderResult;
     private unknownUploaderError;

package/dist/src/headless/types.d.ts

@@ -79,14 +79,14 @@ export interface PicGoHeadlessSaveUploaderConfigOptions {
 }
 export interface IPicGoHeadlessManager {
     getContext(): IPicGo;
-    getConfig(): IConfig;
-    getCurrentUploader(): string;
-    setCurrentUploader(uploaderId: string): PicGoValidationResult;
+    getConfig(): Promise<IConfig>;
+    getCurrentUploader(): Promise<string>;
+    setCurrentUploader(uploaderId: string): Promise<PicGoValidationResult>;
     listUploaders(): PicGoUploaderListItem[];
     getUploaderSchema(uploaderId: string): PicGoUploaderConfigSchema;
-    getUploaderConfig<T extends Record<string, unknown> = Record<string, unknown>>(uploaderId: string): T;
+    getUploaderConfig<T extends Record<string, unknown> = Record<string, unknown>>(uploaderId: string): Promise<T>;
     validateUploaderConfig(uploaderId: string, config: Record<string, unknown>): PicGoValidationResult;
-    saveUploaderConfig(uploaderId: string, config: Record<string, unknown>, options?: PicGoHeadlessSaveUploaderConfigOptions): PicGoValidationResult;
+    saveUploaderConfig(uploaderId: string, config: Record<string, unknown>, options?: PicGoHeadlessSaveUploaderConfigOptions): Promise<PicGoValidationResult>;
     auditUploaderSchemas(): PicGoUploaderSchemaAuditResult;
     upload(input?: any[]): Promise<IImgInfo[]>;
 }

package/dist/src/headless/uploaderSchemas.d.ts

@@ -3,7 +3,7 @@ import { IPicGo } from '../types';
 
 export declare const BUILT_IN_UPLOADER_IDS: readonly ["github", "gitlab", "aliyun", "tcyun", "qiniu", "upyun", "smms", "imgur", "awss3", "lsky"];
 export type BuiltInUploaderId = (typeof BUILT_IN_UPLOADER_IDS)[number];
-export declare const isBuiltInUploaderId: (uploaderId: string) => uploaderId is "smms" | "github" | "gitlab" | "aliyun" | "tcyun" | "qiniu" | "upyun" | "imgur" | "awss3" | "lsky";
+export declare const isBuiltInUploaderId: (uploaderId: string) => uploaderId is "smms" | "lsky" | "github" | "gitlab" | "aliyun" | "tcyun" | "qiniu" | "upyun" | "imgur" | "awss3";
 export declare const listPicGoUploaders: (ctx: IPicGo) => PicGoUploaderListItem[];
 export declare const getPicGoUploaderSchema: (ctx: IPicGo, uploaderId: string) => PicGoUploaderConfigSchema | undefined;
 export declare const auditBuiltInUploaderSchemas: (ctx: IPicGo) => PicGoUploaderSchemaAuditResult;

package/dist/src/index.d.ts

@@ -9,10 +9,11 @@ import { picgoEventBus } from './utils/picgoEventBus';
 import { default as ExternalPicgoConfigDb } from './db/externalPicGo';
 import { default as PluginLoaderDb } from './db/pluginLoder';
 import { default as ConfigDb } from './db/config';
+import { PicListUploader } from './core/PicListUploader';
 import { ExternalPicgo } from './core/ExternalPicgo';
 import { UniversalPicGo } from './core/UniversalPicGo';
 
-export { UniversalPicGo, ExternalPicgo, picgoEventBus };
+export { UniversalPicGo, ExternalPicgo, PicListUploader, picgoEventBus };
 export { UniversalPicGoHeadlessManager, createPicGoHeadlessManager };
 export { ConfigDb, PluginLoaderDb, ExternalPicgoConfigDb };
 export { PicgoTypeEnum, IBusEvent };
@@ -20,5 +21,6 @@ export { isFileOrBlob, calculateMD5, isSiyuanProxyAvailable };
 export { deepMerge, getByPath, setByPath, unsetByPath };
 export { isElectronRuntime, isPicGoPluginPackageName, isThirdPartyPluginRuntimeAvailable };
 export { win, currentWin, parentWin, hasNodeEnv };
+export { createUnifiedPicGoConfigFacade, type ConfigDomain, type ReadyUnifiedPicGoConfigFacade, type UnifiedConfigSnapshot, type UnifiedConfigMigrationState, type UnifiedPicGoConfigFacadeOptions, type UnifiedConfigPaths, type PasteTakeoverSnapshot, type SiyuanConfigLike, UNIFIED_CONFIG_MIGRATION_VERSION, ConfigReadError, ConfigFlushError, ConfigNotReadyError, } from './config';
 export { type IPicGo, type IImgInfo, type IPicgoDb, type IConfig, type IExternalPicgoConfig, type IPicBedType, type IUploaderConfigItem, type IUploaderConfigListItem, type IPluginConfig, type IPicGoPlugin, type IUniversalPicGoOptions, };
 export { BUILT_IN_UPLOADER_IDS, PICGO_HEADLESS_ERROR_CODES, PicGoHeadlessError, auditBuiltInUploaderSchemas, getPicGoUploaderSchema, isBuiltInUploaderId, listPicGoUploaders, type BuiltInUploaderId, type IPicGoHeadlessManager, type PicGoHeadlessErrorCode, type PicGoHeadlessErrorInput, type PicGoHeadlessManagerOptions, type PicGoHeadlessSaveUploaderConfigOptions, type PicGoUploaderConfigSchema, type PicGoUploaderListItem, type PicGoUploaderSchemaAuditResult, type PicGoUploaderSchemaChoice, type PicGoUploaderSchemaField, type PicGoUploaderSchemaFieldType, type PicGoValidationFieldError, type PicGoValidationResult, } from './headless';

package/dist/src/lib/PicGoRequest.d.ts

@@ -5,7 +5,6 @@ declare class PicGoRequestWrapper {
     private readonly ctx;
     private readonly logger;
     private proxy;
-    private siyuanProxy;
     private options;
     constructor(ctx: IPicGo);
     private init;

package/dist/src/lib/PicGoRequest.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/plugins/uploader/aliyun/web.d.ts

@@ -1,4 +1,7 @@
-import { IPicGo } from '../../../types';
+import { AxiosRequestConfig } from 'axios';
+import { IAliyunConfig, IPicGo } from '../../../types';
 
+declare const generateSignature: (options: IAliyunConfig, fileName: string, date: string) => string;
+declare const postOptions: (options: IAliyunConfig, fileName: string, signature: string, image: Buffer, date: string) => AxiosRequestConfig;
 declare const handleWeb: (ctx: IPicGo) => Promise<IPicGo>;
-export { handleWeb };
+export { handleWeb, generateSignature, postOptions };

package/dist/src/plugins/uploader/aliyun/web.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/utils/common.d.ts

@@ -1,7 +1,7 @@
 import { ILogger } from 'zhi-lib-base';
 import { Buffer } from './nodePolyfill';
 import { win } from 'universal-picgo-store';
-import { IImgSize, IPathTransformedImgInfo, IPicGo, IPluginNameType, Undefinable } from '../types';
+import { IImgSize, IPathTransformedImgInfo, IPicGo, IPluginNameType } from '../types';
 
 export declare const isUrl: (url: string) => boolean;
 /**
@@ -128,8 +128,10 @@ export declare const getProcessPluginName: (nameOrPath: string, logger: ILogger)
  */
 export declare const getNormalPluginName: (nameOrPath: string, logger: ILogger) => string;
 /**
- * 思源笔记代理是否可用
+ * 思源笔记内置代理是否可用。
  *
- * @param siyuanProxy
+ * 快速路径：`win.siyuan` 全局对象存在（iframe / Electron）→ 直接 true。
+ * 回退路径：同域浏览器直开时通过同步 HEAD 请求验证 API 可达性。
  */
-export declare const isSiyuanProxyAvailable: (siyuanProxy: Undefinable<string>) => boolean | "" | undefined;
+export declare const isSiyuanProxyAvailable: () => boolean;
+export declare const getSiyuanProxyUrl: () => any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "universal-picgo",
-  "version": "2.0.1",
+  "version": "3.0.0",
   "type": "module",
   "description": "picgo lib for node, browser and electron",
   "main": "./dist/index.js",
@@ -38,7 +38,7 @@
     "mime": "^4.0.3",
     "queue": "^7.0.0",
     "zhi-lib-base": "^0.8.0",
-    "universal-picgo-store": "2.0.1"
+    "universal-picgo-store": "3.0.0"
   },
   "publishConfig": {
     "access": "public"
@@ -48,6 +48,7 @@
     "dev": "vite build --watch",
     "build": "vite build",
     "start": "vite preview",
-    "test": "npx vitest --watch"
+    "test": "vitest run",
+    "test:watch": "npx vitest --watch"
   }
 }