node-karin 0.8.10 → 0.8.12

package/lib/adapter/index.d.ts

@@ -1,4 +1,2 @@
 export * from './input/index.js';
-export * from './kritor/grpc.js';
-export * from './kritor/index.js';
 export * from './onebot/11/index.js';

package/lib/adapter/index.js

@@ -1,4 +1,2 @@
 export * from './input/index.js'
-export * from './kritor/grpc.js'
-export * from './kritor/index.js'
 export * from './onebot/11/index.js'

package/lib/core/server.d.ts

@@ -21,5 +21,5 @@ export declare const server: {
      */
     staticPath(): Promise<void>;
     /** 重启当前HTTP服务器 */
-    "__#17@#restartServer"(): Promise<void>;
+    "__#14@#restartServer"(): Promise<void>;
 };

package/lib/core/server.js

@@ -4,7 +4,6 @@ import { WebSocketServer } from 'ws'
 import { createServer } from 'http'
 import { listener } from './listener.js'
 import express from 'express'
-import { KritorGrpc } from '../adapter/index.js'
 import { exec, config, logger, common } from '../utils/index.js'
 import { AdapterOneBot11 } from '../adapter/onebot/11/index.js'
 import { render, HttpRenderer, Wormhole, RenderClient } from '../render/index.js'
@@ -31,8 +30,6 @@ export const server = new (class Server {
     try {
       /** 防止多进程端口冲突 启动失败 */
       await Process.check()
-      /** 初始化gRPC服务器 */
-      new KritorGrpc().init()
       this.WebSocketServer.on('connection', (socket, request) => {
         const path = request.url
         const headers = request.headers

package/lib/index.d.ts

@@ -1,4 +1,3 @@
-export * from 'kritor-proto';
 export * from './core/index.js';
 export * from './event/index.js';
 export * from './db/index.js';

package/lib/index.js

@@ -1,4 +1,3 @@
-export * from 'kritor-proto';
 export * from './core/index.js';
 export * from './event/index.js';
 export * from './db/index.js';

package/lib/utils/common.d.ts

@@ -1,6 +1,6 @@
+import fs from 'fs';
 import { AxiosRequestConfig } from 'axios';
 import { Readable } from 'stream';
-import { fs } from '../modules.js';
 import { dirName, fileName, KarinElement, NodeElement } from '../types/index.js';
 /**
  * 常用方法

package/lib/utils/common.js

@@ -1,8 +1,12 @@
+import fs from 'fs'
+import path from 'path'
+import Yaml from 'yaml'
+import axios from 'axios'
+import lodash from 'lodash'
 import { promisify } from 'util'
 import { fileURLToPath } from 'url'
 import { pipeline, Readable } from 'stream'
 import { logger, segment, YamlEditor } from '../utils/index.js'
-import { fs, path, axios, lodash, yaml as Yaml } from '../modules.js'
 /**
  * 常用方法
  */

package/lib/utils/config.js

@@ -1,6 +1,8 @@
+import fs from 'fs'
+import Yaml from 'yaml'
 import path from 'path'
+import chokidar from 'chokidar'
 import { karinDir } from '../core/dir.js'
-import { fs, yaml as Yaml, chokidar } from '../modules.js'
 import { common } from './common.js'
 /**
  * 配置文件

package/lib/utils/init.js

@@ -9,9 +9,7 @@ export class KarinInit {
   baseDir
   constructor () {
     this.baseDir = [
-      './lib',
       './config/config',
-      './config/defSet',
       './config/view',
       './config/plugin',
       './temp/input',
@@ -60,7 +58,7 @@ export class KarinInit {
      */
   copyFile () {
     /** 配置 */
-    const list = ['config/defSet', 'config/view']
+    const list = ['config/view']
     list.forEach(dir => {
       const pkgDir = path.join(karinDir, dir)
       const projDir = path.join(process.cwd(), dir)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-karin",
-  "version": "0.8.10",
+  "version": "0.8.12",
   "private": false,
   "description": "基于 Kritor 进行开发的nodejs机器人框架",
   "homepage": "https://github.com/KarinJS/Karin",
@@ -20,6 +20,11 @@
       "require": "./lib/index.js",
       "types": "./lib/index.d.ts"
     },
+    "./modules.js": {
+      "import": "./lib/modules.js",
+      "require": "./lib/modules.js",
+      "types": "./lib/modules.d.ts"
+    },
     "./art-template": {
       "import": "./lib/modules/art-template.js",
       "require": "./lib/modules/art-template.js",
@@ -127,23 +132,19 @@
     "plugins/**"
   ],
   "scripts": {
-    "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",
+    "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json && npm run fix",
     "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-json tsconfig.json"
   },
   "dependencies": {
-    "@grpc/grpc-js": "1.11.1",
-    "@grpc/proto-loader": "0.7.13",
     "art-template": "4.13.2",
     "axios": "1.7.2",
     "chalk": "5.3.0",
     "chokidar": "3.6.0",
     "commander": "^12.1.0",
     "express": "4.19.2",
-    "kritor-proto": "^1.0.2",
     "level": "8.0.1",
     "lodash": "4.17.21",
     "log4js": "6.9.1",

package/lib/adapter/kritor/grpc.d.ts

@@ -1,33 +0,0 @@
-import { KarinElement } from '../../types/index.js';
-import { kritor } from 'kritor-proto';
-import { Role, Scene } from '../../types/index.js';
-export declare class KritorGrpc {
-    #private;
-    /**
-     * - proto 文件路径
-     */
-    dir: string;
-    BotMap: Map<string, any>;
-    constructor();
-    /**
-     * 获取 proto 文件
-     * @param filename 文件名
-     */
-    getProto(filename: string): any;
-    /**
-     * 初始化 gRPC 服务器
-     */
-    init(): void;
-    /**
-     *  scene contact转换器
-     */
-    KarinSceneContact(contact: kritor.common.IContact, sender: kritor.common.ISender): {
-        scene: Scene;
-        role: Role;
-    };
-    /**
-     * kritor 转 karin
-     * @param data 消息数据
-     */
-    AdapterConvertKarin(data: Array<kritor.common.Element>): Array<KarinElement>;
-}