surgio 3.19.0 → 4.0.0-beta.2

package/build/commands/lint.js

@@ -1,21 +1,16 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-// istanbul ignore file
-const core_1 = require("@oclif/core");
-const base_command_1 = __importDefault(require("../base-command"));
-const linter_1 = require("../utils/linter");
-class LintCommand extends base_command_1.default {
+/* istanbul ignore file -- @preserve */
+import { Flags } from '@oclif/core';
+import BaseCommand from '../base-command.js';
+import { check, checkAndFix } from '../utils/linter.js';
+class LintCommand extends BaseCommand {
     static description = '运行 JS 语法检查';
     async run() {
         let result;
         if (this.flags.fix) {
-            result = await (0, linter_1.checkAndFix)(this.projectDir);
+            result = await checkAndFix(this.projectDir);
         }
         else {
-            result = await (0, linter_1.check)(this.projectDir);
+            result = await check(this.projectDir);
         }
         if (!result) {
             console.warn('⚠️  JS 语法检查不通过，请根据提示修改文件（可添加参数 --fix 自动修复部分错误， 参考 https://url.royli.dev/SeB6m）');
@@ -28,10 +23,10 @@ class LintCommand extends base_command_1.default {
     }
 }
 LintCommand.flags = {
-    fix: core_1.Flags.boolean({
+    fix: Flags.boolean({
         default: false,
         description: '自动修复部分 Lint 错误',
     }),
 };
-exports.default = LintCommand;
+export default LintCommand;
 //# sourceMappingURL=lint.js.map

package/build/commands/lint.js.map

@@ -1 +1 @@
-{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../src/commands/lint.ts"],"names":[],"mappings":";;;;;AAAA,uBAAuB;AACvB,sCAAmC;AAEnC,mEAAyC;AACzC,4CAAoD;AAEpD,MAAM,WAAY,SAAQ,sBAA+B;IACvD,MAAM,CAAC,WAAW,GAAG,YAAY,CAAA;IAE1B,KAAK,CAAC,GAAG;QACd,IAAI,MAAM,CAAA;QAEV,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;YACnB,MAAM,GAAG,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC7C,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,MAAM,IAAA,cAAK,EAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACvC,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,CAAC,IAAI,CACV,gFAAgF,CACjF,CAAA;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QAC7B,CAAC;QAED,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;;AAGH,WAAW,CAAC,KAAK,GAAG;IAClB,GAAG,EAAE,YAAK,CAAC,OAAO,CAAC;QACjB,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,gBAAgB;KAC9B,CAAC;CACH,CAAA;AAED,kBAAe,WAAW,CAAA"}
+{"version":3,"file":"lint.js","sourceRoot":"","sources":["../../src/commands/lint.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAC5C,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAEvD,MAAM,WAAY,SAAQ,WAA+B;IACvD,MAAM,CAAC,WAAW,GAAG,YAAY,CAAA;IAE1B,KAAK,CAAC,GAAG;QACd,IAAI,MAAM,CAAA;QAEV,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;YACnB,MAAM,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QAC7C,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACvC,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,CAAC,IAAI,CACV,gFAAgF,CACjF,CAAA;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QAC7B,CAAC;QAED,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;CACF;AAED,WAAW,CAAC,KAAK,GAAG;IAClB,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC;QACjB,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,gBAAgB;KAC9B,CAAC;CACH,CAAA;AAED,eAAe,WAAW,CAAA"}

package/build/commands/new.d.ts

@@ -1,4 +1,17 @@
-import BaseCommand from '../base-command';
+import inquirer from 'inquirer';
+import BaseCommand from '../base-command.js';
+import type { SurgioProjectDefinition } from '../project/types.js';
+type Prompt = typeof inquirer.prompt;
+export interface NewGeneratorContext {
+    project: SurgioProjectDefinition;
+    projectDir: string;
+    projectFile: string;
+    prompt: Prompt;
+}
+export declare const resolveNewTemplatePath: (templateDir: string, input: string) => string;
+export declare const createProvider: (context: NewGeneratorContext) => Promise<string>;
+export declare const createArtifact: (context: NewGeneratorContext) => Promise<string>;
+export declare const createTemplate: (context: NewGeneratorContext) => Promise<string>;
 declare class NewCommand extends BaseCommand<typeof NewCommand> {
     static description: string;
     run(): Promise<void>;

package/build/commands/new.js

@@ -1,37 +1,264 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+import path from 'node:path';
+import { Args } from '@oclif/core';
+import fs from 'fs-extra';
+import inquirer from 'inquirer';
+import BaseCommand from '../base-command.js';
+import { addArtifactToProjectSource, addProviderToProjectSource, updateSurgioProjectFile, } from '../project/editor.js';
+import { resolveSurgioProjectFile } from '../project/file.js';
+import { SupportProviderEnum, } from '../types.js';
+const nonEmpty = (value) => value.trim().length > 0 || '请输入非空名称';
+const httpUrl = (value) => {
+    try {
+        const url = new URL(value);
+        return ['http:', 'https:'].includes(url.protocol)
+            ? true
+            : '请输入 HTTP 或 HTTPS URL';
+    }
+    catch {
+        return '请输入有效的 HTTP 或 HTTPS URL';
+    }
+};
+const isRemoteProvider = (type) => type !== SupportProviderEnum.Custom;
+const listTemplateFiles = async (directory, root = directory) => {
+    if (!(await fs.pathExists(directory)))
+        return [];
+    const entries = await fs.readdir(directory, { withFileTypes: true });
+    const files = await Promise.all(entries.map(async (entry) => {
+        const filename = path.join(directory, entry.name);
+        if (entry.isDirectory())
+            return listTemplateFiles(filename, root);
+        if (!entry.isFile() ||
+            !['.json', '.tpl'].includes(path.extname(entry.name))) {
+            return [];
+        }
+        return [path.relative(root, filename).split(path.sep).join('/')];
+    }));
+    return files.flat().sort((left, right) => left.localeCompare(right));
+};
+export const resolveNewTemplatePath = (templateDir, input) => {
+    const name = input.trim();
+    if (name.length === 0 ||
+        name.includes('\0') ||
+        path.isAbsolute(name) ||
+        path.win32.isAbsolute(name)) {
+        throw new Error('模板名称必须是 templateDir 下的安全相对路径');
+    }
+    const normalized = name.replaceAll('\\', '/');
+    const segments = normalized.split('/');
+    if (segments.some((segment) => segment === '..' || segment === '')) {
+        throw new Error('模板名称不能包含空目录或 .. 路径穿越');
+    }
+    const relativeName = normalized.endsWith('.tpl')
+        ? normalized
+        : `${normalized}.tpl`;
+    const root = path.resolve(templateDir);
+    const filename = path.resolve(root, ...relativeName.split('/'));
+    if (filename !== root && !filename.startsWith(`${root}${path.sep}`)) {
+        throw new Error('模板路径超出 templateDir');
+    }
+    return filename;
+};
+export const createProvider = async (context) => {
+    const answers = await context.prompt([
+        {
+            choices: Object.values(SupportProviderEnum),
+            message: 'Provider 类型',
+            name: 'type',
+            type: 'select',
+        },
+        {
+            message: 'Provider 名称',
+            name: 'name',
+            required: true,
+            type: 'input',
+            validate: nonEmpty,
+        },
+        {
+            message: '订阅 URL',
+            name: 'url',
+            required: true,
+            type: 'input',
+            validate: httpUrl,
+            when: (current) => current.type !== undefined && isRemoteProvider(current.type),
+        },
+        {
+            default: true,
+            message: '自动添加国旗标识',
+            name: 'addFlag',
+            type: 'confirm',
+            when: (current) => current.type !== undefined && isRemoteProvider(current.type),
+        },
+        {
+            default: false,
+            message: '启用 UDP Relay',
+            name: 'udpRelay',
+            type: 'confirm',
+            when: (current) => current.type !== undefined && isRemoteProvider(current.type),
+        },
+        {
+            default: false,
+            message: '配置 Relay URL',
+            name: 'enableRelay',
+            type: 'confirm',
+            when: (current) => current.type !== undefined && isRemoteProvider(current.type),
+        },
+        {
+            message: 'Relay URL',
+            name: 'relayUrl',
+            required: true,
+            type: 'input',
+            validate: httpUrl,
+            when: (current) => current.enableRelay === true,
+        },
+    ]);
+    const name = answers.name.trim();
+    if (Object.hasOwn(context.project.providers, name)) {
+        throw new Error(`Provider ${name} 已存在，Project 未被修改`);
+    }
+    if (isRemoteProvider(answers.type)) {
+        const urlValidation = httpUrl(answers.url ?? '');
+        if (urlValidation !== true)
+            throw new Error(urlValidation);
+        if (answers.enableRelay) {
+            const relayValidation = httpUrl(answers.relayUrl ?? '');
+            if (relayValidation !== true)
+                throw new Error(relayValidation);
+        }
+    }
+    const definition = answers.type === SupportProviderEnum.Custom
+        ? {
+            nodeList: [],
+            type: SupportProviderEnum.Custom,
+        }
+        : {
+            ...(answers.addFlag ? { addFlag: true } : {}),
+            ...(answers.enableRelay ? { relayUrl: answers.relayUrl } : {}),
+            type: answers.type,
+            ...(answers.udpRelay ? { udpRelay: true } : {}),
+            url: answers.url,
+        };
+    await updateSurgioProjectFile(context.projectFile, (source) => addProviderToProjectSource(source, name, definition));
+    return `Provider ${name} 已添加到 ${path.basename(context.projectFile)}`;
+};
+export const createArtifact = async (context) => {
+    const providerNames = Object.keys(context.project.providers).sort((left, right) => left.localeCompare(right));
+    if (providerNames.length === 0) {
+        throw new Error('Project 中没有可用的 Provider，请先运行 surgio new provider');
+    }
+    const templateDir = path.resolve(context.projectDir, context.project.templateDir ?? 'template');
+    const templates = await listTemplateFiles(templateDir);
+    if (templates.length === 0) {
+        throw new Error(`templateDir 中没有 .tpl 或 .json 模板：${templateDir}`);
+    }
+    const answers = await context.prompt([
+        {
+            message: 'Artifact 名称',
+            name: 'name',
+            required: true,
+            type: 'input',
+            validate: nonEmpty,
+        },
+        {
+            choices: providerNames,
+            message: '主 Provider',
+            name: 'provider',
+            type: 'select',
+        },
+        {
+            choices: templates,
+            message: '模板',
+            name: 'template',
+            type: 'select',
+        },
+        {
+            choices: (current) => providerNames.filter((name) => name !== current.provider),
+            message: '额外合并的 Provider',
+            name: 'combineProviders',
+            type: 'checkbox',
+        },
+    ]);
+    const name = answers.name.trim();
+    if (context.project.artifacts.some((artifact) => artifact.name === name)) {
+        throw new Error(`Artifact ${name} 已存在，Project 未被修改`);
+    }
+    const extension = path.extname(answers.template);
+    const artifact = {
+        ...(answers.combineProviders.length > 0
+            ? { combineProviders: answers.combineProviders }
+            : {}),
+        name,
+        provider: answers.provider,
+        template: answers.template.slice(0, -extension.length),
+        ...(extension === '.json' ? { templateType: 'json' } : {}),
+    };
+    await updateSurgioProjectFile(context.projectFile, (source) => addArtifactToProjectSource(source, artifact));
+    return `Artifact ${name} 已添加到 ${path.basename(context.projectFile)}`;
+};
+export const createTemplate = async (context) => {
+    const answers = await context.prompt([
+        {
+            message: '模板名称（可包含相对子目录）',
+            name: 'name',
+            required: true,
+            type: 'input',
+            validate: nonEmpty,
+        },
+    ]);
+    const templateDir = path.resolve(context.projectDir, context.project.templateDir ?? 'template');
+    const filename = resolveNewTemplatePath(templateDir, answers.name);
+    await fs.ensureDir(templateDir);
+    await fs.ensureDir(path.dirname(filename));
+    const [realTemplateDir, realParentDir] = await Promise.all([
+        fs.realpath(templateDir),
+        fs.realpath(path.dirname(filename)),
+    ]);
+    if (realParentDir !== realTemplateDir &&
+        !realParentDir.startsWith(`${realTemplateDir}${path.sep}`)) {
+        throw new Error('模板路径通过符号链接超出 templateDir');
+    }
+    try {
+        await fs.writeFile(filename, '', { flag: 'wx' });
+    }
+    catch (error) {
+        if (error.code === 'EEXIST') {
+            throw new Error(`模板已存在，不会覆盖：${filename}`, { cause: error });
+        }
+        throw error;
+    }
+    return `模板已创建：${path.relative(context.projectDir, filename)}`;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-// istanbul ignore file
-const path_1 = require("path");
-const core_1 = require("@oclif/core");
-const hygen_1 = require("@royli/hygen");
-const base_command_1 = __importDefault(require("../base-command"));
-const defaultTemplates = (0, path_1.join)(__dirname, '../../hygen-template');
-class NewCommand extends base_command_1.default {
-    static description = '新建文件助手';
+class NewCommand extends BaseCommand {
+    static description = '新建文件助手（仅支持 Surgio Project）';
     async run() {
-        const args = [...this.argv].concat('new'); // [type] new ...
-        await (0, hygen_1.runner)(args, {
-            templates: defaultTemplates,
-            cwd: this.projectDir,
-            logger: new hygen_1.Logger(console.log.bind(console)),
-            createPrompter: () => require('inquirer'),
-            exec: async (action, body) => {
-                const opts = body && body.length > 0 ? { input: body } : {};
-                await require('execa')(action, opts);
-            },
-        });
+        if (this.surgioProject.source !== 'project' ||
+            !this.surgioProject.definition) {
+            throw new Error('`surgio new` 仅支持 v4 surgio.project.*；请先将 legacy surgio.conf.js 项目迁移为 Surgio Project');
+        }
+        const projectFile = resolveSurgioProjectFile(this.projectDir);
+        if (!projectFile) {
+            throw new Error('无法定位 surgio.project.ts、.mts、.mjs 或 .js');
+        }
+        const context = {
+            project: this.surgioProject.definition,
+            projectDir: this.projectDir,
+            projectFile,
+            prompt: inquirer.prompt,
+        };
+        const result = this.args.type === 'provider'
+            ? await createProvider(context)
+            : this.args.type === 'artifact'
+                ? await createArtifact(context)
+                : await createTemplate(context);
+        this.log(result);
         await this.cleanup();
     }
 }
 NewCommand.args = {
-    type: core_1.Args.custom({
+    type: Args.custom({
         description: '文件类型',
         required: true,
         options: ['provider', 'template', 'artifact'],
     })(),
 };
-exports.default = NewCommand;
+export default NewCommand;
 //# sourceMappingURL=new.js.map

package/build/commands/new.js.map

@@ -1 +1 @@
-{"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/commands/new.ts"],"names":[],"mappings":";;;;;AAAA,uBAAuB;AACvB,+BAA2B;AAC3B,sCAAkC;AAClC,wCAA6C;AAE7C,mEAAyC;AACzC,MAAM,gBAAgB,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,sBAAsB,CAAC,CAAA;AAEhE,MAAM,UAAW,SAAQ,sBAA8B;IACrD,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAA;IAEtB,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,GAAa,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,CAAC,iBAAiB;QAErE,MAAM,IAAA,cAAM,EAAC,IAAI,EAAE;YACjB,SAAS,EAAE,gBAAgB;YAC3B,GAAG,EAAE,IAAI,CAAC,UAAU;YACpB,MAAM,EAAE,IAAI,cAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7C,cAAc,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;YACzC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;gBAC3B,MAAM,IAAI,GAAG,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;gBAC3D,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;YACtC,CAAC;SACF,CAAC,CAAA;QAEF,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;;AAGH,UAAU,CAAC,IAAI,GAAG;IAChB,IAAI,EAAE,WAAI,CAAC,MAAM,CAAC;QAChB,WAAW,EAAE,MAAM;QACnB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC;KAC9C,CAAC,EAAE;CACL,CAAA;AAED,kBAAe,UAAU,CAAA"}
+{"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/commands/new.ts"],"names":[],"mappings":"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"}

package/build/commands/subscriptions.d.ts

@@ -1,4 +1,4 @@
-import BaseCommand from '../base-command';
+import BaseCommand from '../base-command.js';
 declare class SubscriptionsCommand extends BaseCommand<typeof SubscriptionsCommand> {
     static description: string;
     run(): Promise<void>;

package/build/commands/subscriptions.js

@@ -1,59 +1,22 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-// istanbul ignore file
-const fs_1 = require("fs");
-const path_1 = require("path");
-const logger_1 = require("@surgio/logger");
-const base_command_1 = __importDefault(require("../base-command"));
-const provider_1 = require("../provider");
-const utils_1 = require("../utils");
-const logger = (0, logger_1.createLogger)({
+/* istanbul ignore file -- @preserve */
+import { promises as fsp } from 'fs';
+import { basename, join } from 'path';
+import { createLogger } from '@surgio/logger';
+import BaseCommand from '../base-command.js';
+import { getProvider } from '../provider/index.js';
+import { formatSubscriptionUserInfo } from '../utils/index.js';
+import { loadModuleSync } from '../utils/module-loader.js';
+const logger = createLogger({
     service: 'surgio:SubscriptionsCommand',
 });
-class SubscriptionsCommand extends base_command_1.default {
+class SubscriptionsCommand extends BaseCommand {
     static description = '查询订阅信息';
     async run() {
         const providerList = await this.listProviders();
         for (const provider of providerList) {
             const { subscriptionUserInfo } = await provider.getNodeListV2();
             if (subscriptionUserInfo) {
-                const format = (0, utils_1.formatSubscriptionUserInfo)(subscriptionUserInfo);
+                const format = formatSubscriptionUserInfo(subscriptionUserInfo);
                 console.log('🤟 %s 已用流量：%s 剩余流量：%s 有效期至：%s', provider.name, format.used, format.left, format.expire);
             }
             else {
@@ -63,17 +26,20 @@ class SubscriptionsCommand extends base_command_1.default {
         await this.cleanup();
     }
     async listProviders() {
-        const files = await fs_1.promises.readdir(this.surgioConfig.providerDir, {
+        if (this.surgioProject.providers) {
+            return Promise.all(Object.entries(this.surgioProject.providers).map(([name, definition]) => getProvider(name, definition)));
+        }
+        const files = await fsp.readdir(this.surgioConfig.providerDir, {
             encoding: 'utf8',
         });
         const providerList = [];
         async function readProvider(path) {
             let provider;
             try {
-                const providerName = (0, path_1.basename)(path, '.js');
-                const module = await Promise.resolve(`${path}`).then(s => __importStar(require(s)));
+                const providerName = basename(path, '.js');
+                const providerConfig = loadModuleSync(path);
                 logger.debug('read %s %s', providerName, path);
-                provider = await (0, provider_1.getProvider)(providerName, module.default);
+                provider = await getProvider(providerName, providerConfig);
             }
             catch {
                 logger.debug(`${path} 不是一个合法的模块`);
@@ -87,7 +53,7 @@ class SubscriptionsCommand extends base_command_1.default {
             return provider;
         }
         for (const file of files) {
-            const result = await readProvider((0, path_1.join)(this.surgioConfig.providerDir, file));
+            const result = await readProvider(join(this.surgioConfig.providerDir, file));
             if (result) {
                 providerList.push(result);
             }
@@ -95,5 +61,5 @@ class SubscriptionsCommand extends base_command_1.default {
         return providerList;
     }
 }
-exports.default = SubscriptionsCommand;
+export default SubscriptionsCommand;
 //# sourceMappingURL=subscriptions.js.map

package/build/commands/subscriptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscriptions.js","sourceRoot":"","sources":["../../src/commands/subscriptions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uBAAuB;AACvB,2BAAoC;AACpC,+BAAqC;AACrC,2CAA6C;AAE7C,mEAAyC;AACzC,0CAA+D;AAC/D,oCAAqD;AAErD,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC;IAC1B,OAAO,EAAE,6BAA6B;CACvC,CAAC,CAAA;AAEF,MAAM,oBAAqB,SAAQ,sBAAwC;IACzE,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAA;IAEtB,KAAK,CAAC,GAAG;QACd,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;QAE/C,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE,CAAC;YACpC,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,QAAQ,CAAC,aAAa,EAAE,CAAA;YAE/D,IAAI,oBAAoB,EAAE,CAAC;gBACzB,MAAM,MAAM,GAAG,IAAA,kCAA0B,EAAC,oBAAoB,CAAC,CAAA;gBAC/D,OAAO,CAAC,GAAG,CACT,+BAA+B,EAC/B,QAAQ,CAAC,IAAI,EACb,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,MAAM,CACd,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;YACjD,CAAC;QACH,CAAC;QAED,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;IACtB,CAAC;IAEO,KAAK,CAAC,aAAa;QACzB,MAAM,KAAK,GAAG,MAAM,aAAG,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE;YAC7D,QAAQ,EAAE,MAAM;SACjB,CAAC,CAAA;QACF,MAAM,YAAY,GAA2B,EAAE,CAAA;QAE/C,KAAK,UAAU,YAAY,CACzB,IAAY;YAEZ,IAAI,QAAQ,CAAA;YAEZ,IAAI,CAAC;gBACH,MAAM,YAAY,GAAG,IAAA,eAAQ,EAAC,IAAI,EAAE,KAAK,CAAC,CAAA;gBAC1C,MAAM,MAAM,GAAG,yBAAa,IAAI,uCAAC,CAAA;gBAEjC,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,CAAC,CAAA;gBAE9C,QAAQ,GAAG,MAAM,IAAA,sBAAW,EAAC,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;YAC5D,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,YAAY,CAAC,CAAA;gBACjC,OAAO,SAAS,CAAA;YAClB,CAAC;YAED,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;gBACpB,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,gBAAgB,CAAC,CAAA;gBACrC,OAAO,SAAS,CAAA;YAClB,CAAC;YAED,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAA;YACzC,OAAO,QAAQ,CAAA;QACjB,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,MAAM,YAAY,CAC/B,IAAA,WAAI,EAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,CAC1C,CAAA;YACD,IAAI,MAAM,EAAE,CAAC;gBACX,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YAC3B,CAAC;QACH,CAAC;QAED,OAAO,YAAY,CAAA;IACrB,CAAC;;AAGH,kBAAe,oBAAoB,CAAA"}
+{"version":3,"file":"subscriptions.js","sourceRoot":"","sources":["../../src/commands/subscriptions.ts"],"names":[],"mappings":"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"}

package/build/commands/upload.d.ts

@@ -1,4 +1,4 @@
-import BaseCommand from '../base-command';
+import BaseCommand from '../base-command.js';
 declare class UploadCommand extends BaseCommand<typeof UploadCommand> {
     static description: string;
     run(): Promise<void>;

package/build/commands/upload.js

@@ -1,91 +1,38 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-// istanbul ignore file
-const path_1 = __importDefault(require("path"));
-const core_1 = require("@oclif/core");
-const ali_oss_1 = __importDefault(require("ali-oss"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const node_dir_1 = __importDefault(require("node-dir"));
-const base_command_1 = __importDefault(require("../base-command"));
-const config_1 = require("../config");
-class UploadCommand extends base_command_1.default {
-    static description = '上传规则到阿里云 OSS';
+/* istanbul ignore file -- @preserve */
+import path from 'path';
+import { Flags } from '@oclif/core';
+import { Client } from 'minio';
+import dir from 'node-dir';
+import BaseCommand from '../base-command.js';
+import { setConfig } from '../config.js';
+import { resolveStorageBackend, synchronizeStorage, } from '../utils/object-storage.js';
+class UploadCommand extends BaseCommand {
+    static description = '上传规则到对象存储';
     async run() {
         const config = this.surgioConfig;
         if (this.flags.output) {
-            (0, config_1.setConfig)('output', this.flags.output);
+            setConfig('output', this.flags.output);
         }
-        const region = config?.upload?.region;
-        const bucket = config?.upload?.bucket;
-        const endpoint = config?.upload?.endpoint;
-        const accessKeyId = process.env.OSS_ACCESS_KEY_ID ?? config?.upload?.accessKeyId;
-        const accessKeySecret = process.env.OSS_ACCESS_KEY_SECRET ?? config?.upload?.accessKeySecret;
-        if (!accessKeyId || !accessKeySecret) {
-            throw new Error('请在配置文件中配置 OSS 的 accessKeyId 和 accessKeySecret');
+        if (!config.upload) {
+            throw new Error('请在配置文件中配置 upload');
         }
-        const client = new ali_oss_1.default({
-            secure: true,
-            region,
-            bucket,
-            endpoint,
-            accessKeyId,
-            accessKeySecret,
-        });
-        const prefix = config?.upload?.prefix || '/';
-        const fileList = await node_dir_1.default.promiseFiles(config.output);
+        const backend = resolveStorageBackend(config.upload);
+        const client = new Client(backend.clientOptions);
+        const fileList = await dir.promiseFiles(config.output);
         const files = fileList.map((filePath) => ({
-            fileName: path_1.default.basename(filePath),
+            fileName: path.basename(filePath),
             filePath,
         }));
-        const fileNameList = files.map((file) => file.fileName);
-        const upload = () => {
-            return Promise.all(files.map((file) => {
-                const { fileName, filePath } = file;
-                const objectName = `${prefix}${fileName}`;
-                const readStream = fs_extra_1.default.createReadStream(filePath);
-                return client.put(objectName, readStream, {
-                    mime: 'text/plain; charset=utf-8',
-                    headers: {
-                        'Cache-Control': 'private, no-cache, no-store',
-                    },
-                });
-            }));
-        };
-        const deleteUnwanted = async () => {
-            const list = await client.list({
-                prefix,
-                delimiter: '/',
-                'max-keys': 100,
-            }, {});
-            const deleteList = [];
-            for (const key in list.objects) {
-                if (Object.hasOwn(list.objects, key)) {
-                    const object = list.objects[key];
-                    const objectName = object.name.replace(prefix, '');
-                    const isExist = fileNameList.indexOf(objectName) > -1;
-                    if (objectName && !isExist) {
-                        deleteList.push(object.name);
-                    }
-                }
-            }
-            if (deleteList.length) {
-                await client.deleteMulti(deleteList);
-            }
-        };
-        this.ora.start('开始上传到阿里云 OSS');
-        await upload();
-        await deleteUnwanted();
+        this.ora.start('开始上传到对象存储');
+        await synchronizeStorage(client, backend, files);
         await this.cleanup();
     }
 }
 UploadCommand.flags = {
-    output: core_1.Flags.string({
+    output: Flags.string({
         char: 'o',
         description: '生成规则的目录',
     }),
 };
-exports.default = UploadCommand;
+export default UploadCommand;
 //# sourceMappingURL=upload.js.map