node-karin 0.8.7 → 0.8.10

package/lib/cli/karin.js

@@ -25,9 +25,10 @@ class KarinCli {
 
   /**
      * 获取pkg
+     * @param isNpm - 是否是npm包
      */
-  get pkg () {
-    const filePath = path.join(this.karinDir, 'package.json')
+  pkg (isNpm) {
+    const filePath = isNpm ? path.join(this.karinDir, 'package.json') : path.join(process.cwd(), 'package.json')
     const data = JSON.parse(fs.readFileSync(filePath, 'utf-8'))
     return data
   }
@@ -191,7 +192,7 @@ class KarinCli {
       'yaml',
     ]
     let cmd = ''
-    const list = Object.keys(this.pkg.dependencies).filter(key => !pkgdependencies.includes(key))
+    const list = Object.keys(this.pkg(false).dependencies).filter(key => !pkgdependencies.includes(key))
     /** 获取包管理器 */
     const pkg = new KarinInit().getRegistry()
     switch (pkg) {
@@ -261,7 +262,7 @@ class KarinCli {
   }
 }
 const cli = new KarinCli()
-program.version(cli.pkg.version, '-v, --version', '显示版本号')
+program.version(cli.pkg(true).version, '-v, --version', '显示版本号')
 program.command('.').description('启动karin').action(() => cli.start('prod' /* Mode.Prod */, 'js' /* Lang.Js */, 'node' /* Runner.Node */))
 program.command('start').description('启动karin').action(() => cli.start('prod' /* Mode.Prod */, 'js' /* Lang.Js */, 'node' /* Runner.Node */))
 program.command('pm2').description('后台运行karin').action(() => cli.start('prod' /* Mode.Prod */, 'js' /* Lang.Js */, 'pm2' /* Runner.Pm2 */))

package/lib/modules/art-template.d.ts

@@ -0,0 +1 @@
+export { default } from 'art-template';

package/lib/modules/art-template.js

@@ -0,0 +1 @@
+export { default } from 'art-template'

package/lib/modules/axios.d.ts

@@ -0,0 +1,2 @@
+export * from 'axios';
+export { default } from 'axios';

package/lib/modules/axios.js

@@ -0,0 +1,2 @@
+export * from 'axios'
+export { default } from 'axios'

package/lib/modules/chalk.d.ts

@@ -0,0 +1,2 @@
+export * from 'chalk';
+export { default } from 'chalk';

package/lib/modules/chalk.js

@@ -0,0 +1,2 @@
+export * from 'chalk'
+export { default } from 'chalk'

package/lib/modules/chokidar.d.ts

@@ -0,0 +1,2 @@
+export * from 'chokidar';
+export { default } from 'chokidar';

package/lib/modules/chokidar.js

@@ -0,0 +1,2 @@
+export * from 'chokidar'
+export { default } from 'chokidar'

package/lib/modules/commander.d.ts

@@ -0,0 +1,2 @@
+export * from 'commander';
+export { default } from 'commander';

package/lib/modules/commander.js

@@ -0,0 +1,2 @@
+export * from 'commander'
+export { default } from 'commander'

package/lib/modules/express.d.ts

@@ -0,0 +1,3 @@
+import { query, Router } from 'express';
+export { default } from 'express';
+export { query, Router };

package/lib/modules/express.js

@@ -0,0 +1,3 @@
+import { query, Router } from 'express'
+export { default } from 'express'
+export { query, Router }

package/lib/modules/grpc-js.d.ts

@@ -0,0 +1,2 @@
+export * from '@grpc/grpc-js';
+export { default } from '@grpc/grpc-js';

package/lib/modules/grpc-js.js

@@ -0,0 +1,2 @@
+export * from '@grpc/grpc-js'
+export { default } from '@grpc/grpc-js'

package/lib/modules/kritor-proto.d.ts

@@ -0,0 +1,2 @@
+export * from 'kritor-proto';
+export { default } from 'kritor-proto';

package/lib/modules/kritor-proto.js

@@ -0,0 +1,2 @@
+export * from 'kritor-proto'
+export { default } from 'kritor-proto'

package/lib/modules/level.d.ts

@@ -0,0 +1,2 @@
+export * from 'level';
+export { default } from 'level';

package/lib/modules/level.js

@@ -0,0 +1,2 @@
+export * from 'level'
+export { default } from 'level'

package/lib/modules/lodash.d.ts

@@ -0,0 +1 @@
+export { default } from 'lodash';

package/lib/modules/lodash.js

@@ -0,0 +1 @@
+export { default } from 'lodash'

package/lib/modules/log4js.d.ts

@@ -0,0 +1,2 @@
+export * from 'log4js';
+export { default } from 'log4js';

package/lib/modules/log4js.js

@@ -0,0 +1,2 @@
+export * from 'log4js'
+export { default } from 'log4js'

package/lib/modules/moment.d.ts

@@ -0,0 +1 @@
+export { default } from 'moment';

package/lib/modules/moment.js

@@ -0,0 +1 @@
+export { default } from 'moment'

package/lib/modules/node-schedule.d.ts

@@ -0,0 +1,2 @@
+export * from 'node-schedule';
+export { default } from 'node-schedule';

package/lib/modules/node-schedule.js

@@ -0,0 +1,2 @@
+export * from 'node-schedule'
+export { default } from 'node-schedule'

package/lib/modules/proto-loader.d.ts

@@ -0,0 +1,2 @@
+export * from '@grpc/proto-loader';
+export { default } from '@grpc/proto-loader';

package/lib/modules/proto-loader.js

@@ -0,0 +1,2 @@
+export * from '@grpc/proto-loader'
+export { default } from '@grpc/proto-loader'

package/lib/modules/redis.d.ts

@@ -0,0 +1,2 @@
+export * from 'redis';
+export { default } from 'redis';

package/lib/modules/redis.js

@@ -0,0 +1,2 @@
+export * from 'redis'
+export { default } from 'redis'

package/lib/modules/ws.d.ts

@@ -0,0 +1,3 @@
+import { WebSocket, WebSocketServer, createWebSocketStream } from 'ws';
+export { WebSocket, WebSocketServer, createWebSocketStream };
+export { default } from 'ws';

package/lib/modules/ws.js

@@ -0,0 +1,3 @@
+import { WebSocket, WebSocketServer, createWebSocketStream } from 'ws'
+export { WebSocket, WebSocketServer, createWebSocketStream }
+export { default } from 'ws'

package/lib/modules/yaml.d.ts

@@ -0,0 +1,2 @@
+export * from 'yaml';
+export { default } from 'yaml';

package/lib/modules/yaml.js

@@ -0,0 +1,2 @@
+export * from 'yaml'
+export { default } from 'yaml'

package/lib/render/wormhole.js

@@ -33,9 +33,9 @@ export function Wormhole () {
       case 'msg': {
         const { post, token, WormholeClient } = config.Server.HttpRender
         const parsedUrl = new URL(WormholeClient)
-        const { hostname, port } = parsedUrl
+        const { hostname, port, pathname } = parsedUrl
         const ishttps = WormholeClient.includes('wss://')
-        const host = `${ishttps ? 'https' : 'http'}://${hostname}${port ? `:${port}` : ''}/web/${data.date}`
+        const host = `${ishttps ? 'https' : 'http'}://${hostname}${port ? `:${port}` : ''}${pathname.replace(/ws\/(?=[^ws/]*$)/, 'web/')}${data.date}`
         logger.mark(`web渲染器已连接，地址：${host}`)
         /** 注册渲染器 */
         const rd = new HttpRenderer(host, post, token)

package/lib/utils/common.js

@@ -420,22 +420,22 @@ class Common {
       return list
     } else {
       const list = []
-      const readPackageJson = async (name) => {
+      const readPackageJson = async (files) => {
         try {
-          const pkgPath = path.join(process.cwd(), 'node_modules', name, 'package.json')
+          const pkgPath = path.join(process.cwd(), 'node_modules', files, 'package.json')
           const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'))
           if (pkg?.karin) {
             if (pkg?.main) {
-              const dir = `${name}/${path.dirname(pkg.main).replace(/\.\//, '')}`
+              const dir = `${files}/${path.dirname(pkg.main).replace(/\.\//, '')}`
               list.push({ dir, name: path.basename(pkg.main), isMain: true })
             }
             if (pkg?.karin?.apps?.length) {
               pkg.karin.apps.forEach((app) => {
-                fs.readdirSync(`./node_modules/${name}/${app}`).forEach((name) => {
+                fs.readdirSync(`./node_modules/${files}/${app}`).forEach((filename) => {
                   /** 忽略非js */
-                  if (!name.endsWith('.js')) { return }
-                  const dir = `${name}/${app}`
-                  list.push({ dir, name, isMain: false })
+                  if (!filename.endsWith('.js')) { return }
+                  const dir = `${files}/${app}`
+                  list.push({ dir, name: filename, isMain: false })
                 })
               })
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.8.7",
+  "version": "0.8.10",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",
@@ -14,6 +14,98 @@
   "license": "GPL-3.0-only",
   "author": "Karin",
   "type": "module",
+  "exports": {
+    ".": {
+      "import": "./lib/index.js",
+      "require": "./lib/index.js",
+      "types": "./lib/index.d.ts"
+    },
+    "./art-template": {
+      "import": "./lib/modules/art-template.js",
+      "require": "./lib/modules/art-template.js",
+      "types": "./lib/modules/art-template.d.ts"
+    },
+    "./axios": {
+      "import": "./lib/modules/axios.js",
+      "require": "./lib/modules/axios.js",
+      "types": "./lib/modules/axios.d.ts"
+    },
+    "./chalk": {
+      "import": "./lib/modules/chalk.js",
+      "require": "./lib/modules/chalk.js",
+      "types": "./lib/modules/chalk.d.ts"
+    },
+    "./chokidar": {
+      "import": "./lib/modules/chokidar.js",
+      "require": "./lib/modules/chokidar.js",
+      "types": "./lib/modules/chokidar.d.ts"
+    },
+    "./commander": {
+      "import": "./lib/modules/commander.js",
+      "require": "./lib/modules/commander.js",
+      "types": "./lib/modules/commander.d.ts"
+    },
+    "./express": {
+      "import": "./lib/modules/express.js",
+      "require": "./lib/modules/express.js",
+      "types": "./lib/modules/express.d.ts"
+    },
+    "./grpc-js": {
+      "import": "./lib/modules/grpc-js.js",
+      "require": "./lib/modules/grpc-js.js",
+      "types": "./lib/modules/grpc-js.d.ts"
+    },
+    "./kritor-proto": {
+      "import": "./lib/modules/kritor-proto.js",
+      "require": "./lib/modules/kritor-proto.js",
+      "types": "./lib/modules/kritor-proto.d.ts"
+    },
+    "./level": {
+      "import": "./lib/modules/level.js",
+      "require": "./lib/modules/level.js",
+      "types": "./lib/modules/level.d.ts"
+    },
+    "./lodash": {
+      "import": "./lib/modules/lodash.js",
+      "require": "./lib/modules/lodash.js",
+      "types": "./lib/modules/lodash.d.ts"
+    },
+    "./log4js": {
+      "import": "./lib/modules/log4js.js",
+      "require": "./lib/modules/log4js.js",
+      "types": "./lib/modules/log4js.d.ts"
+    },
+    "./moment": {
+      "import": "./lib/modules/moment.js",
+      "require": "./lib/modules/moment.js",
+      "types": "./lib/modules/moment.d.ts"
+    },
+    "./node-schedule": {
+      "import": "./lib/modules/node-schedule.js",
+      "require": "./lib/modules/node-schedule.js",
+      "types": "./lib/modules/node-schedule.d.ts"
+    },
+    "./proto-loader": {
+      "import": "./lib/modules/proto-loader.js",
+      "require": "./lib/modules/proto-loader.js",
+      "types": "./lib/modules/proto-loader.d.ts"
+    },
+    "./redis": {
+      "import": "./lib/modules/redis.js",
+      "require": "./lib/modules/redis.js",
+      "types": "./lib/modules/redis.d.ts"
+    },
+    "./ws": {
+      "import": "./lib/modules/ws.js",
+      "require": "./lib/modules/ws.js",
+      "types": "./lib/modules/ws.d.ts"
+    },
+    "./yaml": {
+      "import": "./lib/modules/yaml.js",
+      "require": "./lib/modules/yaml.js",
+      "types": "./lib/modules/yaml.d.ts"
+    }
+  },
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "bin": {
@@ -40,7 +132,7 @@
     "fix": "eslint lib/**/*.js --fix",
     "fix:all": "eslint lib/**/*.js --fix && eslint lib/**/*.d.ts --fix",
     "pub": "npm publish --access public",
-    "sort": "npx sort-package-json"
+    "sort": "npx sort-package-json && sort-json tsconfig.json"
   },
   "dependencies": {
     "@grpc/grpc-js": "1.11.1",
@@ -69,6 +161,7 @@
     "@types/ws": "^8.5.11",
     "eslint": "^9.7.0",
     "neostandard": "^0.11.1",
+    "sort-json": "^2.0.1",
     "sort-package-json": "^2.10.0",
     "tsc-alias": "^1.8.10",
     "tsx": "^4.16.2",