node-karin 0.6.21 → 0.6.22

package/lib/utils/init.js

@@ -76,7 +76,7 @@ export class KarinInit {
       })
     })
     /** 创建pnpm工作区配置 */
-    fs.copyFileSync(path.join(karinDir, 'pnpm-workspace.yaml'), './pnpm-workspace.yaml')
+    fs.writeFileSync('./pnpm-workspace.yaml', `packages:\n  - 'plugins/**'\n`)
     /** 为每个插件包创建统一存储的文件夹 */
     const plugins = this.getPlugins()
     const DataList = [
@@ -98,13 +98,23 @@ export class KarinInit {
   modifyPackage () {
     const pkg = this.readJson(path.join(karinDir, 'package.json'))
     const projPkg = this.readJson('./package.json')
+    const main = 'node_modules/node-karin/lib/index.js'
     delete pkg.bin
-    pkg.main = './node_modules/node-karin/lib/index.js'
-    pkg.dependencies['node-karin'] = 'latest'
-    pkg.dependencies['kritor-proto'] = 'latest'
+    pkg.main = `./${main}`
+    pkg.types = `./${main.replace('.js', '.d.ts')}`
     pkg.dependencies = { ...projPkg.dependencies, ...pkg.dependencies }
     pkg.devDependencies = { ...projPkg.devDependencies, ...pkg.devDependencies }
-    fs.writeFileSync('./package.json', JSON.stringify(pkg, null, 2))
+    projPkg.type = 'module'
+    projPkg.private = true
+    projPkg.main = `./${main}`
+    projPkg.dependencies = { ...projPkg.dependencies, ...pkg.dependencies }
+    projPkg.dependencies['node-karin'] = 'latest'
+    projPkg.dependencies['kritor-proto'] = 'latest'
+    if (!projPkg.scripts) { projPkg.scripts = {} }
+    if (!projPkg.devDependencies) { projPkg.devDependencies = {} }
+    projPkg.scripts.debug = `node --watch ${main}`
+    projPkg.scripts.dev = `tsx --watch ${main}`
+    fs.writeFileSync('./package.json', JSON.stringify(projPkg, null, 2))
   }
 
   /**
@@ -132,7 +142,7 @@ export class KarinInit {
      */
   async install (type) {
     /** 检查是否已经安装对应的包管理器 */
-    if (!this.shell(`${type} -v`)) {
+    if (!(await this.shell(`${type} -v`))) {
       console.log(`检测到未安装${type}，开始安装...`)
       if (!await this.shell(`npm install -g ${type}`)) {
         console.log(`${type}安装失败，请手动安装${type}！`)
@@ -145,7 +155,7 @@ export class KarinInit {
       console.log('检测到已安装pnpm，开始安装依赖...')
     }
     /** 安装依赖 */
-    if (!this.shell(`${type} install -P`)) {
+    if (!(await this.shell(`${type} -P --force`))) {
       console.log('安装依赖失败，请手动安装依赖！')
       console.log(`可尝试手动执行 【 ${type} install -P 】 安装依赖~`)
       console.log('如中国大陆用户安装失败，请尝试执行换源 【 npm config set registry https://registry.npmmirror.com 】后再安装依赖~')
@@ -153,9 +163,9 @@ export class KarinInit {
       console.log('依赖安装完成~')
     }
     /** 检查安装pm2 */
-    if (!this.shell('pm2 -v')) {
+    if (!(await this.shell('pm2 -v'))) {
       console.log('检测到未安装pm2，开始安装pm2...')
-      if (!this.shell(`${type} install -g pm2`)) {
+      if (!(await this.shell(`${type} install -g pm2`))) {
         console.log('安装pm2失败，请手动安装pm2！')
         console.log('可尝试手动执行 【 npm install -g pm2 】 安装pm2~')
       } else {
@@ -188,18 +198,13 @@ export class KarinInit {
   }
 
   /**
-     * 获取当前的包管理器
+     * 获取当前的包管理器 根据锁文件判断
      */
   getRegistry () {
-    const { npm_config_user_agent: agent, npm_config_userconfig: userconfig } = process.env
-    if (agent && agent.includes('pnpm')) {
-      return 'pnpm'
-    } else if (userconfig && userconfig.includes('cnpm')) {
-      return 'cnpm'
-    } else if (agent && agent.includes('yarn')) {
-      return 'yarn'
-    } else {
-      return 'npm'
-    }
+    if (fs.existsSync('./pnpm-lock')) { return 'pnpm' }
+    if (fs.existsSync('./yarn.lock')) { return 'yarn' }
+    if (fs.existsSync('./package-lock.json')) { return 'npm' }
+    // cnpm 没有锁文件
+    return 'cnpm'
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.6.21",
+  "version": "0.6.22",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",
@@ -17,8 +17,14 @@
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "bin": {
+    "app": "lib/index.js",
+    "debug": "lib/index.js",
+    "dev": "lib/index.js",
     "init": "lib/cli/init.js",
-    "log": "lib/cli/log.js"
+    "log": "lib/cli/log.js",
+    "rs": "lib/cli/restart.js",
+    "start": "lib/cli/start.js",
+    "stop": "lib/cli/stop.js"
   },
   "files": [
     "/lib/**/*.js",
@@ -29,28 +35,18 @@
     "modules.d.ts",
     "LICENSE",
     "package.json",
-    "README.md",
-    "pnpm-workspace.yaml"
+    "README.md"
   ],
   "workspaces": [
     "plugins/**"
   ],
   "scripts": {
-    "app": "node .",
     "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json && npm run cp && npm run fix",
     "cp": "cp ./lib/modules.d.ts ./modules.d.ts && cp ./lib/modules.js ./modules.js",
-    "debug": "node . --dev",
-    "delete": "pm2 delete ./config/config/pm2.yaml",
-    "dev": "tsx ./lib/index.js --dev",
     "fix": "eslint lib/**/*.js --fix",
-    "fix:all": "eslint lib/**/*.js --fix && eslint lib/**/*.ts --fix",
-    "log": "node lib/cli/log.js",
-    "monit": "pm2 monit",
+    "fix:all": "eslint lib/**/*.js --fix && eslint lib/**/*.d.ts --fix",
     "pub": "npm publish --access public",
-    "restart": "pm2 restart ./config/config/pm2.yaml",
-    "sort:pack": "npx sort-package-json",
-    "start": "pm2 start ./config/config/pm2.yaml && pm2 monit",
-    "stop": "pm2 delete ./config/config/pm2.yaml"
+    "sort": "npx sort-package-json"
   },
   "dependencies": {
     "@grpc/grpc-js": "1.10.10",
@@ -84,13 +80,6 @@
     "tsx": "latest",
     "typescript": "latest"
   },
-  "bundledDependencies": [
-    "@types/express",
-    "@types/lodash",
-    "@types/node",
-    "@types/node-schedule",
-    "@types/ws"
-  ],
   "engines": {
     "node": ">=18"
   },

package/lib/cli/postinstall.js

@@ -1,25 +0,0 @@
-#!/usr/bin/env node
-import fs from 'fs'
-import { KarinInit } from '../utils/init.js'
-async function main () {
-  /** 捕获错误 打印日志 */
-  process.on('uncaughtException', err => console.error(err))
-  process.on('unhandledRejection', err => console.error(err))
-  /** 在src目录说明为开发环境 不执行任何初始化操作 */
-  if (fs.existsSync('./src')) { return }
-  const init = new KarinInit()
-  init.init()
-  /** 判断锁文件 优先度: pnpm > yarn > cnpm > npm */
-  let pkg
-  if (fs.existsSync('pnpm-lock.yaml')) {
-    pkg = 'pnpm'
-  } else if (fs.existsSync('yarn.lock')) {
-    pkg = 'yarn'
-  } else if (fs.existsSync('cnpm-lock.yaml')) {
-    pkg = 'cnpm'
-  } else {
-    pkg = 'npm'
-  }
-  await init.install(pkg)
-}
-main().then(() => process.exit(0)).catch(() => process.exit(0))

package/pnpm-workspace.yaml

@@ -1,2 +0,0 @@
-packages:
-  - 'plugins/**'