@jayfong/x-server 2.118.1 → 3.0.0

package/lib/cli/build_util.js

@@ -1,236 +0,0 @@
-import path from 'node:path';
-import compressing from 'compressing';
-import * as esbuild from 'esbuild';
-import exec from 'execa';
-import fs from 'fs-extra';
-import { dedent, uniq } from 'vtils';
-export class BuildUtil {
-  static async build(options) {
-    const mainFile = path.join(options.cwd, 'src/main.ts');
-    const pkgFile = path.join(options.cwd, 'package.json');
-    const pkgContent = await fs.readJson(pkgFile);
-    const distDir = path.join(options.cwd, options.channel ? `dist/${options.channel}` : 'dist');
-    const tempDir = path.join(options.cwd, options.channel ? `temp/${options.channel}` : 'temp');
-    const distMainFile = path.join(distDir, 'main.js');
-    const distPkgFile = path.join(distDir, 'package.json');
-    const distNvmrcFile = path.join(distDir, '.nvmrc');
-    const distPm2File = path.join(distDir, 'pm2.config.js');
-    const distNoInstallFile = path.join(distDir, 'no_install.lock');
-    const distBundleFile = path.join(tempDir, `app.${pkgContent.version}.tgz`);
-    await fs.ensureDir(distDir);
-    await fs.ensureDir(tempDir);
-
-    // 处理 external
-    const external = uniq([...(options.external || []),
-    // bull 始终作为外部依赖
-    'bull']);
-    const externalWithVersions = (await Promise.all(external.map(async item => {
-      try {
-        // 为何不用 require.resolve:
-        // Package subpath './package.json' is not defined by "exports"
-        const itemPkgFile = path.join(process.cwd(), `node_modules/${item}/package.json`);
-        const itemPkgContent = await fs.readJson(itemPkgFile);
-        return {
-          name: item,
-          version: itemPkgContent.version
-        };
-      } catch {
-        return {
-          name: item,
-          version: ''
-        };
-      }
-    }))).filter(item => !!item.version);
-
-    // fix: hexoid 构建问题
-    try {
-      const hexoidPackageJsonFile = require.resolve('hexoid/package.json');
-      const pkg = await fs.readJson(hexoidPackageJsonFile);
-      delete pkg.module;
-      await fs.writeJson(hexoidPackageJsonFile, pkg);
-    } catch {}
-
-    // 构建
-    if (!options.noEmptyDistDir) {
-      await fs.emptyDir(distDir);
-    }
-    // @ts-ignore
-    const {
-      default: macrosPlugin
-    } = await import('unplugin-macros/esbuild');
-    await esbuild.build({
-      entryPoints: [mainFile],
-      bundle: true,
-      outfile: distMainFile,
-      platform: 'node',
-      // https://esbuild.github.io/api/#main-fields
-      // 当 platform 是 node 时，
-      // esbuild 默认的 mainFields 是 main,module，
-      // 这会导致 treeShaking 失效
-      mainFields: ['module', 'main'],
-      target: `node${process.version.slice(1)}`,
-      external: external,
-      minify: options.minify ?? true,
-      format: 'cjs',
-      sourcemap: false,
-      treeShaking: true,
-      banner: {
-        js: [...Object.keys(options.inlineEnvs || {}).map(key => `process.env[${JSON.stringify(key)}]=${JSON.stringify(options.inlineEnvs[key])};`), `process.env["X_SERVER_ENVS"]=${JSON.stringify(JSON.stringify(options.inlineEnvs || {}))};`].join('\n')
-      },
-      plugins: [{
-        name: 'extract-assets',
-        async setup(build) {
-          build.onLoad({
-            filter: /\/svg-captcha\/lib\/option-manager\.js$/
-          }, async args => {
-            let js = await fs.readFile(args.path, 'utf-8');
-            js = js.replace('../fonts/Comismsh.ttf', './assets/svg-captcha/fonts/Comismsh.ttf');
-            await fs.copy(path.dirname(require.resolve('svg-captcha/fonts/LICENSE.md')), path.join(distDir, 'assets/svg-captcha/fonts'));
-            return {
-              contents: js,
-              loader: 'js'
-            };
-          });
-
-          // build.onLoad(
-          //   { filter: /\/bull\/lib\/commands\/index\.js$/ },
-          //   async args => {
-          //     let js = await fs.readFile(args.path, 'utf-8');
-          //     js = js.replace(/__dirname/g, '"./assets/bull/commands"');
-          //     await fs.copy(
-          //       path.dirname(require.resolve('bull/lib/commands/index.js')),
-          //       path.join(distDir, 'assets/bull/commands'),
-          //     );
-          //     return {
-          //       contents: js,
-          //       loader: 'js',
-          //     };
-          //   },
-          // );
-
-          build.onLoad({
-            filter: /\/vm2\/lib\/vm\.js$/
-          }, async args => {
-            let js = await fs.readFile(args.path, 'utf-8');
-            const jsDir = path.dirname(args.path);
-            const assetsDir = path.join(distDir, 'assets/vm2');
-            await fs.ensureDir(assetsDir);
-            js = js.replace(/__dirname/g, '"./assets/vm2"');
-            await Promise.all([fs.copyFile(path.join(jsDir, 'bridge.js'), path.join(assetsDir, 'bridge.js')), fs.copyFile(path.join(jsDir, 'setup-sandbox.js'), path.join(assetsDir, 'setup-sandbox.js'))]);
-            return {
-              contents: js,
-              loader: 'js'
-            };
-          });
-
-          // 支持仅开发时生效的路由
-          build.onLoad({
-            filter: /@dev[/.]/
-          }, async () => {
-            return {
-              contents: 'module.exports = {}',
-              loader: 'js'
-            };
-          });
-
-          // 支持构建时排除文件
-          if (options.excludeFiles?.length) {
-            const excludeRegExps = options.excludeFiles.map(item => new RegExp(item));
-            build.onLoad({
-              filter: /\.ts$/
-            }, async args => {
-              if (excludeRegExps.some(re => re.test(args.path))) {
-                return {
-                  // 不用 export {} 避免 esbuild 检测报错
-                  contents: 'module.exports = {}',
-                  loader: 'js'
-                };
-              }
-            });
-          }
-        }
-      }, macrosPlugin()],
-      loader: {
-        // 兼容 x-text-render 在服务端使用
-        // dev 时用 css_register 兼容
-        // https://esbuild.github.io/content-types/#empty-file
-        '.css': 'empty'
-      }
-    });
-
-    // 兼容 prisma
-    const prismaSchemaFile = path.join(options.cwd, 'src/db/schema.prisma');
-    if (await fs.pathExists(prismaSchemaFile)) {
-      // 复制 schema.prisma
-      const distPrismaSchemaFile = path.join(distDir, path.basename(prismaSchemaFile));
-      await fs.copyFile(prismaSchemaFile, distPrismaSchemaFile);
-
-      // 多 schema 文件兼容
-      const multipleSchemaDir = path.join(options.cwd, 'src/db/schema');
-      if (await fs.pathExists(multipleSchemaDir)) {
-        const distMultipleSchemaDir = path.join(distDir, path.basename(multipleSchemaDir));
-        await fs.copy(multipleSchemaDir, distMultipleSchemaDir);
-      }
-    }
-
-    // 写入 pkg
-    const deps = externalWithVersions.reduce((res, item) => {
-      res[item.name] = item.version;
-      return res;
-    }, {});
-    const distPkgContent = {
-      name: options.appId,
-      version: pkgContent.version,
-      dependencies: deps
-    };
-    await fs.writeJSON(distPkgFile, distPkgContent);
-
-    // .nvmrc
-    const nvmrcFile = path.join(options.cwd, '.nvmrc');
-    const hasNvmrc = await fs.pathExists(nvmrcFile);
-    if (hasNvmrc) {
-      await fs.writeFile(distNvmrcFile, await fs.readFile(nvmrcFile));
-    }
-
-    // 写入 pm2 配置
-    await fs.writeFile(distPm2File, dedent`
-        module.exports = {
-          apps: [
-            {
-              name: ${JSON.stringify(distPkgContent.name)},
-              script: './main.js',
-              interpreter: 'node',
-              interpreter_args: ${JSON.stringify(options.pm2NodeArgs || [])},
-              ${hasNvmrc ? `
-                      env: {
-                        PATH: \`\${require('child_process').execSync('fnm exec which node').toString().trim().replace(/\\/node$/, '')}:\${process.env.PATH}\`,
-                      },
-                    ` : ''}
-              ${options.pm2MaxMemoryRestart ? `max_memory_restart: '${options.pm2MaxMemoryRestart}',` : ''}
-              ${options.pm2CronRestart ? `cron_restart: '${options.pm2CronRestart}',` : ''}
-            },
-          ],
-        }
-      `);
-    if (externalWithVersions.length) {
-      if (options.noInstall) {
-        await fs.writeFile(distNoInstallFile, '');
-      } else {
-        // 安装 external 依赖
-        await exec('tyn', {
-          cwd: distDir,
-          stdio: 'inherit',
-          // @ts-ignore
-          env: {
-            // 禁止 yarn 更新检测，因网络原因容易超时长时间卡住
-            // https://classic.yarnpkg.com/lang/en/docs/yarnrc/#toc-disable-self-update-check
-            yarn_disable_self_update_check: 'true'
-          }
-        });
-      }
-    }
-
-    // 打包为 tgz
-    await compressing.tgz.compressDir(distDir, distBundleFile);
-  }
-}

package/lib/cli/cli.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/lib/cli/cli.js

@@ -1,374 +0,0 @@
-#!/usr/bin/env node
-import path from 'node:path';
-import chokidar from 'chokidar';
-import execa from 'execa';
-import fs from 'fs-extra';
-import { generateManyIndex } from 'vscode-generate-index-standalone';
-import * as vtils from 'vtils';
-import { castArray, debounce, StringTemplate } from 'vtils';
-import yargs from 'yargs';
-import { ApiGenerator } from "./api_generator";
-import { BuildUtil } from "./build_util";
-import { DeployUtil } from "./deploy_util";
-import { DevUtil } from "./dev_util";
-import { EnvUtil } from "./env_util";
-import { TemplateUtil } from "./template_util";
-async function deploy(argv) {
-  await EnvUtil.withChannel({
-    cwd: process.cwd(),
-    channel: argv.channel,
-    cb: async channel => {
-      const deployEnvFiles = EnvUtil.getFile('deploy', channel, true);
-      const deployEnv = await EnvUtil.parseFileAsMap({
-        cwd: process.cwd(),
-        file: deployEnvFiles,
-        channel: channel
-      });
-      if (argv.type === 'env') {
-        const appEnvFiles = EnvUtil.getFile('production', channel);
-        const appEnv = await EnvUtil.parseFileAsMap({
-          cwd: process.cwd(),
-          file: appEnvFiles,
-          channel: channel
-        });
-        await DeployUtil.deployEnv({
-          host: deployEnv.HOST,
-          user: deployEnv.USER,
-          key: deployEnv.KEY,
-          pass: deployEnv.PASSWORD,
-          token: appEnv.APP_TOKEN,
-          port: appEnv.APP_PORT,
-          env: appEnv
-        });
-      } else {
-        await DeployUtil.deploy({
-          cwd: process.cwd(),
-          host: deployEnv.HOST,
-          user: deployEnv.USER,
-          key: deployEnv.KEY,
-          pass: deployEnv.PASSWORD,
-          dir: deployEnv.DIR,
-          cmd: deployEnv.CMD,
-          channel: channel
-        });
-      }
-    }
-  });
-}
-yargs.command('dev', '开始开发', _ => _.positional('index', {
-  alias: 'i',
-  describe: '额外需要生成的索引文件',
-  type: 'string',
-  array: true
-}).positional('npc', {
-  describe: 'npc 地址及密钥，格式：地址@密钥',
-  type: 'string'
-}).positional('tsx', {
-  describe: '使用 tsx 运行',
-  type: 'boolean'
-}).positional('channel', {
-  alias: 'h',
-  describe: '渠道',
-  type: 'string'
-}), async argv => {
-  await EnvUtil.withChannel({
-    cwd: process.cwd(),
-    channel: argv.channel,
-    cb: async channel => {
-      process.env.NODE_ENV = 'development';
-      let lastRun;
-      const run = () => {
-        lastRun = DevUtil.runFile({
-          file: 'src/main.ts',
-          cwd: process.cwd(),
-          runner: argv.tsx ? 'tsx' : 'esbuild-register'
-        });
-      };
-      if (argv.npc) {
-        const [server, vkey] = argv.npc.split('@');
-        execa('docker', ['run', '--rm', 'ffdfgdfg/npc:v0.26.9', `-server=${server}`, `-vkey=${vkey}`, '-type=tcp'], {
-          cwd: process.cwd(),
-          stdio: 'inherit'
-        });
-      }
-      await TemplateUtil.init(process.cwd());
-      const xsignoreFile = path.join(process.cwd(), '.xsignore');
-      const xsignoreContent = (await fs.pathExists(xsignoreFile)) ? (await fs.readFile(xsignoreFile, 'utf-8')).trim().split(/[\r\n]+/g).filter(v => v && !v.startsWith('#')) : [];
-      const watcher = chokidar.watch(['src', '.env', '.env*'], {
-        cwd: process.cwd(),
-        ignored: ['**/*.test.*', ...xsignoreContent]
-      });
-      watcher.on('all', debounce(async () => {
-        const envFiles = EnvUtil.getFile(process.env.NODE_ENV, channel);
-        await EnvUtil.importFile({
-          cwd: process.cwd(),
-          file: envFiles,
-          channel: channel
-        });
-        EnvUtil.outputTypes({
-          cwd: process.cwd(),
-          file: envFiles,
-          outFile: 'env.d.ts',
-          channel: channel
-        });
-        generateManyIndex({
-          cwd: process.cwd(),
-          patterns: ['src/**/index.ts', 'node_modules/.x/*.ts', '!src/handlers/**/*', ...(argv.index || [])],
-          replaceFile: true,
-          onSuccess: filePath => {
-            console.log(`✔️ 索引文件已更新: ${filePath}`);
-          }
-        });
-        if (lastRun) {
-          console.log('==== 重启服务中 ====');
-          lastRun.kill();
-          setTimeout(run, 0);
-        } else {
-          console.log('==== 启动服务中 ====');
-          run();
-        }
-      }, 30));
-    }
-  });
-}).command('build', '构建', _ => _.positional('external', {
-  alias: 'e',
-  describe: '不应该被打的包',
-  type: 'string',
-  array: true
-}).positional('minify', {
-  alias: 'm',
-  describe: '是否压缩',
-  type: 'boolean',
-  default: true
-}).positional('local-install', {
-  describe: '是否本地安装外部依赖',
-  type: 'boolean',
-  default: true
-}).positional('channel', {
-  alias: 'h',
-  describe: '渠道',
-  type: 'string'
-}).positional('deploy', {
-  alias: 'd',
-  describe: '构建完是否部署',
-  type: 'boolean',
-  default: false
-}).positional('concurrency', {
-  alias: 'c',
-  describe: '同时构建的数量',
-  type: 'number',
-  default: 1
-}).positional('exclude', {
-  alias: 'x',
-  describe: '构建时排除的文件',
-  type: 'string',
-  array: true
-}).positional('empty-dist-dir', {
-  describe: '是否清空构建目录',
-  type: 'boolean',
-  default: true
-}), async argv => {
-  await EnvUtil.withChannel({
-    cwd: process.cwd(),
-    channel: argv.channel,
-    concurrency: argv.concurrency,
-    cb: async channel => {
-      process.env.NODE_ENV = 'production';
-      const externals = castArray(argv.external || []).flatMap(item => item.split(',')).filter(Boolean);
-      const envFiles = EnvUtil.getFile(process.env.NODE_ENV, channel);
-      const envMap = await EnvUtil.parseFileAsMap({
-        cwd: process.cwd(),
-        file: envFiles,
-        channel: channel
-      });
-      envMap.NODE_ENV = 'production';
-      const deployEnvFiles = EnvUtil.getFile('deploy', channel, true);
-      const deployEnv = await EnvUtil.parseFileAsMap({
-        cwd: process.cwd(),
-        file: deployEnvFiles,
-        channel: channel
-      });
-      await TemplateUtil.init(process.cwd());
-      await generateManyIndex({
-        cwd: process.cwd(),
-        patterns: ['src/.x/*.ts'],
-        replaceFile: true,
-        onSuccess: filePath => {
-          console.log(`✔️ 索引文件已更新: ${filePath}`);
-        }
-      });
-      await BuildUtil.build({
-        appId: envMap.APP_ID,
-        cwd: process.cwd(),
-        external: externals,
-        inlineEnvs: envMap,
-        minify: argv.minify,
-        noInstall: argv['local-install'] === false,
-        channel: channel,
-        excludeFiles: (argv.exclude ? castArray(argv.exclude) : []).map(item => {
-          return StringTemplate.render(item, {
-            ...envMap,
-            _: vtils,
-            __: vtils.escapeRegExp
-          }, {
-            code: true,
-            onlyCode: true
-          });
-        }),
-        noEmptyDistDir: argv['empty-dist-dir'] === false,
-        pm2MaxMemoryRestart: deployEnv.MEMORY,
-        pm2CronRestart: deployEnv.CRON,
-        pm2NodeArgs: deployEnv.NODE_ARGS
-      });
-      console.log('构建成功');
-      if (argv.deploy) {
-        await deploy({
-          ...argv,
-          channel
-        });
-      }
-    }
-  });
-}).command('api', '生成 API', _ => _.positional('channel', {
-  alias: 'h',
-  describe: '渠道',
-  type: 'string'
-}).positional('include', {
-  alias: 'i',
-  describe: '包括',
-  type: 'string',
-  array: true
-}).positional('exclude', {
-  alias: 'e',
-  describe: '排除',
-  type: 'string',
-  array: true
-}).positional('name', {
-  alias: 'n',
-  describe: '名称',
-  type: 'string'
-}), async argv => {
-  await EnvUtil.withChannel({
-    cwd: process.cwd(),
-    channel: argv.channel,
-    cb: async channel => {
-      process.env.NODE_ENV = 'production';
-      const envFiles = EnvUtil.getFile(process.env.NODE_ENV, channel);
-      await EnvUtil.importFile({
-        cwd: process.cwd(),
-        file: envFiles,
-        channel: channel
-      });
-      await new ApiGenerator({
-        cwd: process.cwd(),
-        include: argv.include && castArray(argv.include).flatMap(v => v.split(',')),
-        exclude: argv.exclude && castArray(argv.exclude).flatMap(v => v.split(',')),
-        name: argv.name
-      }).start();
-    }
-  });
-}).command('prisma', 'prisma 代理，主要为了注入环境变量', _ => _.positional('production', {
-  alias: 'p',
-  describe: '是否生产模式',
-  type: 'boolean',
-  default: false
-}).positional('channel', {
-  alias: 'h',
-  describe: '渠道',
-  type: 'string'
-}), async argv => {
-  await EnvUtil.withChannel({
-    cwd: process.cwd(),
-    channel: argv.channel,
-    cb: async channel => {
-      process.env.NODE_ENV = argv.production ? 'production' : 'development';
-      const envFiles = EnvUtil.getFile(process.env.NODE_ENV, channel);
-      await EnvUtil.importFile({
-        cwd: process.cwd(),
-        file: envFiles,
-        channel: channel
-      });
-      // 之所以能成功是因为 Prisma 用的 dotenv 默认不会覆盖已经设置的环境变量
-      // https://github.com/motdotla/dotenv#override
-      process.env.DATABASE_URL = process.env.DATABASE_ACTION_URL || process.env.DATABASE_URL;
-
-      // 多 schema 文件兼容
-      // https://www.prisma.io/docs/orm/prisma-schema/overview/location#how-to-use-existing-prisma-cli-commands-with-multiple-prisma-schema-files
-      const schemaDir = path.join(process.cwd(), 'src/db/schema');
-      const isMultipleFiles = await fs.pathExists(schemaDir);
-      const schemaArg = isMultipleFiles ? 'src/db' : 'src/db/schema.prisma';
-      const prismaArgs = argv._.slice(1);
-      await execa('tnpx', ['prisma', ...prismaArgs, '--schema', schemaArg], {
-        cwd: process.cwd(),
-        stdio: 'inherit'
-      });
-      if (!argv.production && prismaArgs[0] === 'generate') {
-        await TemplateUtil.initModels(process.cwd());
-      }
-    }
-  });
-}).command('run [script]', '执行脚本', _ => _.positional('script', {
-  describe: '脚本',
-  type: 'string'
-}).positional('production', {
-  alias: 'p',
-  describe: '是否生产模式',
-  type: 'boolean',
-  default: false
-}).positional('channel', {
-  alias: 'h',
-  describe: '渠道',
-  type: 'string'
-}).positional('tsx', {
-  describe: '使用 tsx 运行',
-  type: 'boolean'
-}), async argv => {
-  await EnvUtil.withChannel({
-    cwd: process.cwd(),
-    channel: argv.channel,
-    cb: async channel => {
-      process.env.NODE_ENV = argv.production ? 'production' : 'development';
-      const envFiles = EnvUtil.getFile(process.env.NODE_ENV, channel);
-      await EnvUtil.importFile({
-        cwd: process.cwd(),
-        file: envFiles,
-        channel: channel
-      });
-      process.env.DATABASE_URL = process.env.DATABASE_ACTION_URL || process.env.DATABASE_URL;
-      if (!argv.script) {
-        await execa('tnpx', ['select-run'], {
-          cwd: process.cwd(),
-          stdio: 'inherit'
-        });
-      } else {
-        await DevUtil.runFile({
-          file: argv.script,
-          cwd: process.cwd(),
-          runner: argv.tsx ? 'tsx' : 'esbuild-register'
-        });
-      }
-    }
-  });
-}).command('deploy [type]', '部署', _ => _.positional('type', {
-  describe: '类型',
-  type: 'string',
-  choices: ['env']
-}).positional('channel', {
-  alias: 'h',
-  describe: '渠道',
-  type: 'string'
-}), deploy).command('get-channel [file]', '获取渠道', _ => _.positional('file', {
-  describe: '写入文件',
-  type: 'string'
-}), async argv => {
-  await EnvUtil.withChannel({
-    cwd: process.cwd(),
-    channel: '_',
-    cb: async channel => {
-      if (channel && argv.file) {
-        await fs.writeFile(path.join(process.cwd(), argv.file), channel);
-      }
-      console.log(channel || '');
-    }
-  });
-}).parse();

package/lib/cli/css_register.js

@@ -1,5 +0,0 @@
-import { addHook } from 'pirates';
-addHook(() => 'module.exports = {};', {
-  exts: ['.css'],
-  ignoreNodeModules: false
-});

package/lib/cli/deploy_util.d.ts

@@ -1,23 +0,0 @@
-export interface DeployOptions {
-    cwd: string;
-    host: string;
-    user: string;
-    key?: string;
-    pass?: string;
-    dir: string;
-    cmd?: string;
-    channel?: string;
-}
-export interface DeployEnvOptions {
-    host: string;
-    user: string;
-    key?: string;
-    pass?: string;
-    port: number;
-    token: string;
-    env: Record<string, any>;
-}
-export declare class DeployUtil {
-    static deploy(options: DeployOptions): Promise<void>;
-    static deployEnv(options: DeployEnvOptions): Promise<void>;
-}