Compare commits

...

103 Commits
2.5.2 ... 2.7.2

Author SHA1 Message Date
crazywhalecc
41f03fbba4 update docs 2022-03-21 01:25:26 +08:00
crazywhalecc
b3089c1bba add composer module support (build 449, 2.7.2) 2022-03-21 01:24:07 +08:00
crazywhalecc
c5a6f1fea4 update docs 2022-03-20 23:28:20 +08:00
crazywhalecc
ba2777137b let build command faster (build 448, 2.7.1) 2022-03-20 23:26:42 +08:00
crazywhalecc
6d90be164a update docs 2022-03-20 22:16:34 +08:00
crazywhalecc
4da6f5859a update to 2.7.0 release (build 447) 2022-03-20 22:12:58 +08:00
crazywhalecc
15d4ea710a add --no-state-check option (build 446) 2022-03-20 21:04:07 +08:00
crazywhalecc
f0541c1f32 Merge remote-tracking branch 'origin/master' 2022-03-20 19:05:54 +08:00
crazywhalecc
2b8cab1824 add AnnotationReader ignore name config (build 445, 2.7.0-beta5) 2022-03-20 19:05:13 +08:00
Jerry Ma
61c7972915 Update README.md 2022-03-20 17:09:24 +08:00
crazywhalecc
44a0eec74c change to integration-test 2022-03-20 17:00:37 +08:00
crazywhalecc
e57753e44b change to integration-test 2022-03-20 16:58:53 +08:00
crazywhalecc
74e91a2950 fix unpack autoload not working, change exclude_annotate to another name (build 444) 2022-03-20 16:51:48 +08:00
crazywhalecc
7ce3ef41df fix comment spacing problem (build 443) 2022-03-20 16:23:07 +08:00
crazywhalecc
444a77933a change autoload to hotload for phar hotload mode (build 442) 2022-03-20 16:20:14 +08:00
crazywhalecc
78f78c607d add packer namespace adjust (build 441) 2022-03-20 16:18:33 +08:00
crazywhalecc
69155002dc add site to gitignore 2022-03-20 16:13:51 +08:00
crazywhalecc
475d14fab7 update composer.json 2022-03-20 16:13:33 +08:00
crazywhalecc
f4d7e63358 update php cs fixer 2022-03-20 15:48:14 +08:00
crazywhalecc
f222d2b45b update composer requirement version 2022-03-20 15:43:31 +08:00
Jerry Ma
d0155fe1da Create code-style-analysis.yml 2022-03-20 15:35:10 +08:00
Jerry Ma
4737d0b507 Update and rename main.yml to mkdocs-deploy.yml 2022-03-20 15:23:05 +08:00
Jerry Ma
09bd0197bb Merge pull request #64 from sunxyw/patch-1
docs: add weather bot example
2022-03-20 15:20:59 +08:00
crazywhalecc
f0f120bd32 add Macroable (build 440) 2022-03-20 01:54:14 +08:00
crazywhalecc
c897da29c6 add PHP8 Attribute compatibility (build 439, 2.7.0-beta4) 2022-03-20 01:53:36 +08:00
sunxyw
e347e254e8 update docs index 2022-03-20 00:11:45 +08:00
crazywhalecc
12363aebf0 Merge remote-tracking branch 'origin/master' 2022-03-19 23:23:54 +08:00
crazywhalecc
ff0b925313 update docs 2022-03-19 23:23:14 +08:00
sunxyw
a6b4bd9b80 update weather bot example 2022-03-19 21:35:48 +08:00
sunxyw
485fa5476c add weather bot example 2022-03-19 21:25:10 +08:00
Jerry Ma
689076d97c Update mkdocs.yml 2022-03-19 20:33:13 +08:00
Jerry Ma
cca6102e91 Update README.md 2022-03-18 16:57:27 +08:00
Jerry Ma
095855162b Update mkdocs.yml 2022-03-18 16:48:30 +08:00
Jerry Ma
326f934013 Update mkdocs.yml 2022-03-18 16:44:04 +08:00
Jerry Ma
35b0c258fe Merge pull request #63 from sunxyw/patch-2
docs: add qingyunke chatbot integration example
2022-03-18 16:01:15 +08:00
sunxyw
6650846b15 update integrate-qingyunke-chatbot.md 2022-03-18 15:19:19 +08:00
sunxyw
a33d320f4c update integrate-qingyunke-chatbot.md 2022-03-18 02:54:23 +08:00
sunxyw
0bcfea6aa4 add qingyunke chatbot integration example 2022-03-18 02:30:45 +08:00
crazywhalecc
db6e63e91c fix Response class null error (build 438) 2022-03-17 20:48:09 +08:00
crazywhalecc
a7f84fb53a Merge remote-tracking branch 'origin/master' 2022-03-17 19:48:38 +08:00
crazywhalecc
ce7f2b1765 change ctx return force to ContextInterface (build 437) 2022-03-17 19:42:59 +08:00
Jerry Ma
abbfb59eff Merge pull request #62 from sunxyw/patch-2
docs: add missing module version example
2022-03-17 18:19:02 +08:00
sunxyw
b57fef16f9 add missing module version example 2022-03-17 01:53:06 +08:00
crazywhalecc
1706afbcd0 add cs fixer and PHPStan and activate it (build 436) 2022-03-15 18:05:33 +08:00
crazywhalecc
d01bd69aa5 update to 2.7.0-beta1 (build 435) 2022-03-13 22:50:32 +08:00
crazywhalecc
e6b9ae3ee1 add --watch function for no-installed-inotify users 2022-03-13 22:50:01 +08:00
crazywhalecc
73b6b8045d enhancement for process state 2022-03-13 22:47:11 +08:00
crazywhalecc
3c87abc6e8 enhancement for process state 2022-03-13 22:46:22 +08:00
crazywhalecc
e95925c129 add compatibility for PHP 8.1 2022-03-13 22:16:02 +08:00
crazywhalecc
82c44d6c40 enhancement for process state 2022-03-13 22:15:27 +08:00
crazywhalecc
e0a268e05e add autoload-dev auto scanner 2022-03-13 22:11:30 +08:00
crazywhalecc
487892e1d9 add force kill framework command --force 2022-03-13 22:05:53 +08:00
crazywhalecc
7ab4e88359 add KILLER PROMPT function 2022-03-13 22:05:23 +08:00
crazywhalecc
4702b6ee75 separate ProcessManager and WorkerManager 2022-03-13 22:04:52 +08:00
crazywhalecc
20cd3aa66d update docs 2022-03-13 22:03:52 +08:00
crazywhalecc
391114bdef update docs 2022-03-13 21:57:41 +08:00
crazywhalecc
ffe1052ecc add gitignore items 2022-03-13 21:54:43 +08:00
crazywhalecc
b4159152a7 add watcher 2022-01-08 20:19:10 +08:00
crazywhalecc
8fc6e4b0f7 update docs 2022-01-08 16:26:47 +08:00
crazywhalecc
c8938b7a4b update docs 2022-01-08 16:23:10 +08:00
crazywhalecc
34db1626a5 update to 2.6.6 (build 434) 2022-01-08 16:19:43 +08:00
crazywhalecc
7f0c97c5b9 update to 2.6.5 (build 433) 2021-12-28 22:40:40 +08:00
crazywhalecc
74050c46e7 update to 2.6.4 (build 432) 2021-12-25 19:21:41 +08:00
3ed1cb665a update to build 431 2021-12-22 14:39:46 +08:00
crazywhalecc
a6f33ba69d update to build 430 2021-12-08 21:29:38 +08:00
Jerry Ma
176b690417 Update v2.md 2021-12-07 13:28:21 +08:00
Jerry Ma
e22b1b90ec Update build-update.md 2021-12-07 13:27:33 +08:00
Jerry Ma
a3c560790c Merge pull request #55 from zhamao-robot/fix/cqafter
update to build 429
2021-12-07 13:25:55 +08:00
570e2108dd - 新增配置项 onebot.message_command_policy
- 新增 CQCommand 阻断策略的自定义配置功能
- 修复 CQAfter 无法正常使用的 bug #53
2021-12-07 13:21:29 +08:00
Jerry Ma
59c0d95e5d Create 2_Feature_request.yaml 2021-12-07 12:34:18 +08:00
Jerry Ma
9ceaecdc02 Update README.md 2021-12-07 12:17:47 +08:00
Jerry Ma
19d50898ef Create 1_Bug_report.yaml 2021-12-07 12:15:49 +08:00
Jerry Ma
5b62ca62ae Update README.md 2021-11-17 00:28:54 +08:00
fb528d30ce update docs 2021-11-16 16:51:05 +08:00
5f2d5ed334 update to build 428 2021-11-16 16:49:32 +08:00
c20e459900 update docs 2021-11-16 15:44:34 +08:00
09220825cf update to build 427 2021-11-16 15:41:01 +08:00
Jerry Ma
3d4db23d27 Update v2.md 2021-11-10 14:10:08 +08:00
Jerry Ma
4496b67dcc Update build-update.md 2021-11-10 14:09:18 +08:00
Jerry Ma
2a13298384 update to 2.5.8 (build 426) 2021-11-10 14:07:21 +08:00
Jerry Ma
d6ec404d76 Merge pull request #52 from YuFengZe/master
Update CQ.php
2021-11-10 14:06:13 +08:00
YuFengZe
3235fd4dc1 Update CQ.php 2021-11-08 22:05:41 +08:00
crazywhalecc
293740fee2 update to 2.5.7 (build 425) 2021-11-03 23:26:43 +08:00
crazywhalecc
d3c420ec84 update to build 424 (2.6.0-alpha1) 2021-11-02 16:01:24 +08:00
crazywhalecc
85ef09d43c Merge remote-tracking branch 'origin/master' 2021-11-01 00:29:11 +08:00
Jerry Ma
e4561d69c4 Merge pull request #45 from YuFengZe/master
Bug Fixed
2021-10-31 22:50:49 +08:00
Jerry Ma
6b4d206099 Update Hello.php 2021-10-31 22:50:12 +08:00
YuFengZe
50843edf6a Bug Fixed
解决发送“我是谁”却返回机器人信息的奇怪问题。
2021-10-31 22:01:14 +08:00
crazywhalecc
3a1686f8da update docs 2021-10-18 22:24:28 +08:00
crazywhalecc
66dd91bb97 update to 2.5.6 (build 423) 2021-10-17 23:55:02 +08:00
crazywhalecc
e020e5d593 update docs 2021-10-17 17:00:33 +08:00
crazywhalecc
3d62663281 update docs 2021-10-17 16:56:52 +08:00
crazywhalecc
8d9485c02e update docs 2021-10-17 15:37:55 +08:00
Jerry Ma
9fb45dd683 Update README.md 2021-10-15 09:38:07 +08:00
Jerry Ma
8a4924dba9 Update light-cache.md 2021-10-08 11:41:40 +08:00
crazywhalecc
beaf7be606 update to version 2.5.5 (buid 422) 2021-10-06 18:01:40 +08:00
Jerry Ma
7dbd21bdf4 Merge pull request #44 from furleywolf/patch-1
更新message-util的文档
2021-09-15 12:46:48 +08:00
furleywolf
9ce3056203 更新message-util的文档
发现漏掉了一个方法,还是补上去吧
2021-09-13 17:35:39 +08:00
crazywhalecc
880b4e847c update to version 2.5.4 (buid 421) 2021-09-11 16:27:16 +08:00
crazywhalecc
71e83d5bc8 update docs 2021-09-11 12:06:22 +08:00
crazywhalecc
432fd92cca update docs 2021-09-11 12:00:48 +08:00
crazywhalecc
907a9cea25 update to build 420 2021-09-11 11:59:02 +08:00
07391810ff update to build 419 2021-09-11 11:07:23 +08:00
216 changed files with 7814 additions and 3894 deletions

View File

@@ -0,0 +1,38 @@
name: 🐛 漏洞BUG报告
description: ⚠️ 请不要直接在此提交安全漏洞
labels: bug
body:
- type: input
id: affected-versions
attributes:
label: 受影响版本
placeholder: x.y.z
validations:
required: true
- type: textarea
id: description
attributes:
label: 描述
description: 请详细地描述您的问题
validations:
required: true
- type: textarea
id: reproduce-steps
attributes:
label: 复现步骤
description: |
请尽可能地提供可以复现此步骤的漏洞。
如果步骤过长或难以描述,您可以自行建立一个用于复现漏洞的仓库。
validations:
required: true
- type: textarea
id: possible-solution
attributes:
label: 解决方案
description: 如果您对这个漏洞的成因或修复有任何意见的话,请在此提出
- type: textarea
id: additional-context
attributes:
label: 附加信息
description: 其他可能有帮助的信息,如日志、截图等

View File

@@ -0,0 +1,19 @@
name: 🚀 功能建议
description: 新功能、改进的意见、草案
labels: enhancement
body:
- type: textarea
id: description
attributes:
label: 描述
description: 请提供简洁清楚的描述
validations:
required: true
- type: textarea
id: example
attributes:
label: 例子
description: |
一个简单的例子,展示该功能将如何被使用(包括代码、配置文件等)
如果这是针对已有功能的改进,请展示改进前后使用方式(或效能)的对比

59
.github/workflows/integration-test.yml vendored Normal file
View File

@@ -0,0 +1,59 @@
name: Integration Test
on:
push:
branches:
- master
pull_request:
branches:
- master
types:
- opened
- synchronize
- reopened
- ready_for_review
- review_requested
jobs:
integration:
name: Integration Test (PHP ${{ matrix.php-versions }}) (OS ${{ matrix.operating-system }})
runs-on: ${{ matrix.operating-system }}
strategy:
matrix:
operating-system: [ "ubuntu-latest", "macos-latest" ]
php-versions: [ "7.2", "7.3", "7.4", "8.0", "8.1" ]
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Setup PHP
uses: "shivammathur/setup-php@v2"
with:
php-version: ${{ matrix.php-versions }}
extensions: swoole, posix, json
- name: Setup problem matchers for PHP
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
- name: Validate composer.json
run: "composer validate --strict"
- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- name: Cache dependencies
uses: actions/cache@v2
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-composer-
- name: Install Composer Dependencies
run: "composer install --prefer-dist --no-progress --optimize-autoloader"
- name: Run Static Analysis
run: "composer analyse"
- name: Run PHP CS Fixer Check
run: "./vendor/bin/php-cs-fixer fix --dry-run --diff"

View File

@@ -1,4 +1,4 @@
name: Docs Build name: MkDocs Auto Deploy
on: on:
push: push:
branches: branches:

9
.gitignore vendored
View File

@@ -12,9 +12,18 @@ composer.lock
.daemon_pid .daemon_pid
/runtime/ /runtime/
/tmp/ /tmp/
/temp/
/site/
# go-cqhttp快速安装启动相关可能被废弃
/ext/go-cqhttp/data/ /ext/go-cqhttp/data/
/ext/go-cqhttp/logs/ /ext/go-cqhttp/logs/
/ext/go-cqhttp/config.hjson /ext/go-cqhttp/config.hjson
/ext/go-cqhttp/device.json /ext/go-cqhttp/device.json
/ext/go-cqhttp/go-cqhttp /ext/go-cqhttp/go-cqhttp
/ext/go-cqhttp/session.token /ext/go-cqhttp/session.token
.zm_worker_*.pid
# Git Hook 的相关锁文件
cghooks.lock

75
.php-cs-fixer.php Normal file
View File

@@ -0,0 +1,75 @@
<?php
declare(strict_types=1);
/**
* @since 2.7.0
*/
return (new PhpCsFixer\Config())
->setRiskyAllowed(true)
->setRules([
'@PSR12' => true,
'@Symfony' => true,
'@PhpCsFixer' => true,
'array_syntax' => [
'syntax' => 'short',
],
'list_syntax' => [
'syntax' => 'short',
],
'concat_space' => [
'spacing' => 'one',
],
'blank_line_before_statement' => [
'statements' => [
'declare',
],
],
'ordered_imports' => [
'imports_order' => [
'class',
'function',
'const',
],
'sort_algorithm' => 'alpha',
],
'single_line_comment_style' => [
'comment_types' => [
],
],
'yoda_style' => [
'always_move_variable' => false,
'equal' => false,
'identical' => false,
],
'multiline_whitespace_before_semicolons' => [
'strategy' => 'no_multi_line',
],
'constant_case' => [
'case' => 'lower',
],
'class_attributes_separation' => true,
'combine_consecutive_unsets' => true,
'declare_strict_types' => true,
'linebreak_after_opening_tag' => true,
'lowercase_static_reference' => true,
'no_useless_else' => true,
'no_unused_imports' => true,
'not_operator_with_successor_space' => false,
'not_operator_with_space' => false,
'ordered_class_elements' => true,
'php_unit_strict' => false,
'phpdoc_separation' => false,
'single_quote' => true,
'standardize_not_equals' => true,
'multiline_comment_opening_closing' => true,
'phpdoc_summary' => false,
])
->setFinder(
PhpCsFixer\Finder::create()
->exclude('vendor')
->exclude('docs')
->in(__DIR__ . '/src')
)
->setUsingCache(false);

View File

@@ -0,0 +1,17 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Reload Zhamao Server" type="ShConfigurationType">
<option name="SCRIPT_TEXT" value="./zhamao server:reload &amp;&amp; exit" />
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="" />
<option name="SCRIPT_OPTIONS" value="" />
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs />
<method v="2" />
</configuration>
</component>

View File

@@ -0,0 +1,17 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run Zhamao Server" type="ShConfigurationType">
<option name="SCRIPT_TEXT" value="./zhamao server" />
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="./zhamao" />
<option name="SCRIPT_OPTIONS" value="server" />
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs />
<method v="2" />
</configuration>
</component>

17
.run/Run watcher.run.xml Normal file
View File

@@ -0,0 +1,17 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run watcher" type="ShConfigurationType">
<option name="SCRIPT_TEXT" value="bin/watcher" />
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="" />
<option name="SCRIPT_OPTIONS" value="" />
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="/bin/zsh" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs />
<method v="2" />
</configuration>
</component>

View File

@@ -0,0 +1,17 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Stop Zhamao Server" type="ShConfigurationType">
<option name="SCRIPT_TEXT" value="./zhamao server:stop &amp;&amp; exit" />
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="" />
<option name="SCRIPT_OPTIONS" value="" />
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs />
<method v="2" />
</configuration>
</component>

View File

@@ -7,7 +7,7 @@
[![zhamao License](https://img.shields.io/hexpm/l/plug.svg?maxAge=2592000)](https://github.com/zhamao-robot/zhamao-framework/blob/master/LICENSE) [![zhamao License](https://img.shields.io/hexpm/l/plug.svg?maxAge=2592000)](https://github.com/zhamao-robot/zhamao-framework/blob/master/LICENSE)
[![Latest Stable Version](http://img.shields.io/packagist/v/zhamao/framework.svg)](https://packagist.org/packages/zhamao/framework) [![Latest Stable Version](http://img.shields.io/packagist/v/zhamao/framework.svg)](https://packagist.org/packages/zhamao/framework)
[![Banner](https://img.shields.io/badge/OneBot-v11-success)](https://github.com/howmanybots/onebot) [![Banner](https://img.shields.io/badge/OneBot-v11-success)](https://github.com/howmanybots/onebot)
![Build Actions](https://github.com/zhamao-robot/zhamao-framework/actions/workflows/main.yml/badge.svg) ![Integration Test](https://github.com/zhamao-robot/zhamao-framework/actions/workflows/integration-test.yml/badge.svg)
[![注解数量](https://img.shields.io/github/search/zhamao-robot/zhamao-framework/AnnotationBase.svg)](https://github.com/zhamao-robot/zhamao-framework/search?q=AnnotationBase) [![注解数量](https://img.shields.io/github/search/zhamao-robot/zhamao-framework/AnnotationBase.svg)](https://github.com/zhamao-robot/zhamao-framework/search?q=AnnotationBase)
[![TODO 数量](https://img.shields.io/github/search/zhamao-robot/zhamao-framework/TODO.svg)](https://github.com/zhamao-robot/zhamao-framework/search?q=TODO) [![TODO 数量](https://img.shields.io/github/search/zhamao-robot/zhamao-framework/TODO.svg)](https://github.com/zhamao-robot/zhamao-framework/search?q=TODO)
@@ -62,20 +62,15 @@ vendor/bin/start server
## 特点 ## 特点
- 原生为多账号设计,支持多个机器人负载均衡 - 原生为多账号设计,支持多个机器人负载均衡
- 使用 Swoole 多工作进程机制和协程加持,尽可能简单的情况下提升了性能 - 使用 Swoole 多工作进程机制和协程加持,尽可能简单的情况下提升了性能
- 灵活的注解事件绑定机制 - 灵活的注解事件绑定机制,可兼容使用 PHP8 的 Attribute>=2.7 可用)
- 易用的上下文,模块内随处可用 - 易用的上下文,模块内随处可用
- 采用模块化编写,可自由搭配其他 composer 组件 - 采用模块化编写,可自由搭配其他 composer 组件,也可单文件面向过程编写
- 常驻内存,全局缓存变量随处使用,提供多种缓存方案 - 常驻内存,全局缓存变量随处使用,提供多种缓存方案
- 自带 MySQL、Redis 等数据库连接池等数据库连接方案 - 自带 MySQL、Redis 等数据库连接池等数据库连接方案
- 本身为 HTTP 服务器、WebSocket 服务器,可以构建属于自己的 HTTP API 接口 - 本身为 HTTP 服务器、WebSocket 服务器,可以构建属于自己的 HTTP API 接口
- 静态文件服务器,可将前端合并到一起 - 静态文件服务器,可将前端合并到一起
- 自带 PHP + Swoole 环境无需手动编译安装by [crazywhalecc/static-php-cli](https://github.com/crazywhalecc/static-php-cli) - 自带 PHP + Swoole 环境无需手动编译安装by [crazywhalecc/static-php-cli](https://github.com/crazywhalecc/static-php-cli)
## 从 v1 升级
炸毛框架 v2 相对 v1 版本改动了不少内容,其中包括框架底层机制、注解事件分发、调试、命名空间等变化,详情可查看上方文档。
如果旧版框架使用过程中无问题且对新功能暂无需求,可以继续使用 v1 版本,后续也将维护安全类更新和修复致命 bug。
## 下载源码 ## 下载源码
框架源码可直接克隆本仓库进行编辑,如果你在国内,访问 GitHub 和 clone 仓库比较慢,可以将 `github.com` 替换为 `fgit.zhamao.me` 进行加速。 框架源码可直接克隆本仓库进行编辑,如果你在国内,访问 GitHub 和 clone 仓库比较慢,可以将 `github.com` 替换为 `fgit.zhamao.me` 进行加速。
@@ -93,12 +88,10 @@ vendor/bin/start server
### 支付宝 ### 支付宝
![支付宝二维码](https://cdn.jsdelivr.net/gh/zhamao-robot/zhamao-framework/resources/images/alipay_img.jpg) ![支付宝二维码](https://cdn.jsdelivr.net/gh/zhamao-robot/zhamao-framework/resources/images/alipay_img.jpg)
如果你对我们的周边感兴趣,我们还有炸毛机器人定制 logo 的雨伞,详情咨询作者 QQ我们会作为您捐助了本项目
## 关于 ## 关于
框架和 SDK 是 炸毛机器人 项目的核心框架开源部分。炸毛机器人是作者写的一个高性能机器人,曾获全国计算机设计大赛一等奖。 框架和 SDK 是 炸毛机器人 项目的核心框架开源部分。炸毛机器人是作者写的一个高性能机器人,曾获全国计算机设计大赛一等奖。
作者的炸毛机器人已从2018年初起稳定运行了**三年**,并且持续迭代。 作者的炸毛机器人已从2018年初起稳定运行了**四年半**,并且持续迭代。
欢迎随时在 HTTP-API 插件群里提问,当然更好的话可以加作者 QQ[627577391](http://wpa.qq.com/msgrd?v=3&uin=627577391&site=qq&menu=yes))或提交 Issue 进行疑难解答。 欢迎随时在 HTTP-API 插件群里提问,当然更好的话可以加作者 QQ[627577391](http://wpa.qq.com/msgrd?v=3&uin=627577391&site=qq&menu=yes))或提交 Issue 进行疑难解答。
@@ -110,4 +103,10 @@ vendor/bin/start server
在贡献代码时,请保管好自己的全局配置文件中的敏感信息,请勿将带有个人信息的配置文件上传 GitHub 等网站。 在贡献代码时,请保管好自己的全局配置文件中的敏感信息,请勿将带有个人信息的配置文件上传 GitHub 等网站。
![star](https://starchart.cc/zhamao-robot/zhamao-framework.svg) 感谢 JetBrains 为此开源项目提供 PhpStorm 开发工具支持:
<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/PhpStorm.svg" width="300">
感谢 [php-libonebot](https://github.com/botuniverse/php-libonebot) 开发者 @sunxyw 中为项目开发规范化提出的一些建议。
<!-- ![star](https://starchart.cc/zhamao-robot/zhamao-framework.svg) -->

0
bin/start Normal file → Executable file
View File

118
bin/watcher Executable file
View File

@@ -0,0 +1,118 @@
#!/usr/bin/env bash
_red="\e[33m"
_green="\e[32m"
_reset="\e[0m"
unix_s=$(uname -s)
unix_release=$(
marked_release=""
if [ "$unix_s" = "Linux" ]; then
echo $HOME | grep com.termux >/dev/null
if [ $? == 0 ]; then
marked_release="termux"
elif [ -f "/etc/redhat-release" ]; then
if [ "$(cat /etc/redhat-release | awk '{print $1}' | grep -v '^$')" = "CentOS" ]; then
marked_release="CentOS"
else
marked_release="unknown"
fi
elif [ -f "/etc/os-release" ]; then
cat /etc/os-release | grep Alpine > /dev/null
if [ $? == 0 ]; then
marked_release="Alpine"
fi
fi
if [ "$marked_release" = "" ]; then
if [ -f "/etc/issue" ]; then
marked_release=$(cat /etc/issue | grep -v '^$' | awk '{print $1}')
else
marked_release="unknown"
fi
fi
elif [ "$unix_s" = "Darwin" ]; then
marked_release=$(sw_vers | grep ProductName | awk '{print $2" "$3" "$4}')
fi
echo $marked_release
)
unix_release=$(echo $unix_release | xargs)
function echo_error() {
echo -e "${_red}$1${_reset}"
}
function echo_info() {
echo -e "${_green}$1${_reset}"
}
function install_test() {
which fswatch >/dev/null
if [ $? != 0 ]; then
operate_confirm "fswatch还没有安装是否确认安装" && install_fswatch
fi
}
function install_fswatch() {
if [ "$unix_s" = "Linux" ]; then
case $unix_release in
"Kali" | "Ubuntu" | "Debian" | "Raspbian" | 'Pop!_OS')
sudo apt-get install fswatch -y ;;
#"termux") pkg install $1 -y ;;
"CentOS")
curl -o fswatch.tgz https://download.fastgit.org/emcrisostomo/fswatch/releases/download/1.16.0/fswatch-1.16.0.tar.gz && \
tar -xzf fswatch.tgz && \
cd fswatch-1.16.0 && \
./configure && \
make && \
sudo make install && \
cd .. && \
rm -rf fswatch.tgz fswatch-1.16.0
;;
#"Alpine") apk add $1 ;;
*)
echo_error "不支持的 Linux 发行版:$unix_release"
exit 1
;;
esac
elif [ "$unix_s" = "Darwin" ]; then
brew install fswatch
else
echo_error "不支持的操作系统:$unix_s"
exit 1
fi
}
function operate_confirm() {
echo -n $(echo_info "$1 [Y/n] ")
read operate
operate=$(echo $operate | tr A-Z a-z)
if [[ "$operate" = "y" || "$operate" = "" ]]; then
return 0
else
return 1
fi
}
echo_info "当前系统:$unix_release"
install_test
if [ $? -ne 0 ]; then
exit 1
else
echo_info "程序路径:$(which fswatch)"
fi
watch_dir="./src"
if [ ! -d "$watch_dir" ]; then
echo_error "src目录不存在"
exit 1
else
echo_info "监听目录:$watch_dir"
fi
_pid=$(cat .daemon_pid | awk -F"\"pid\": " '{print $2}' | grep -v ^$ | sed 's/,//g')
if [ "$_pid" = "" ]; then
echo_error "未检测到框架进程"
exit 1
fi
fswatch $watch_dir | while read file
do
echo "Detect file change: $file"
kill -USR1 $_pid
done

View File

@@ -4,9 +4,22 @@
"minimum-stability": "stable", "minimum-stability": "stable",
"license": "Apache-2.0", "license": "Apache-2.0",
"extra": { "extra": {
"exclude_annotate": [ "zm": {
"src/ZM" "exclude-annotation-path": [
] "src/ZM"
]
},
"hooks": {
"post-merge": "composer install",
"pre-commit": [
"echo committing as $(git config user.name)",
"./vendor/bin/php-cs-fixer fix --dry-run --diff ./src"
],
"pre-push": [
"./vendor/bin/php-cs-fixer fix --dry-run --diff ./src",
"composer analyse"
]
}
}, },
"authors": [ "authors": [
{ {
@@ -17,25 +30,26 @@
"prefer-stable": true, "prefer-stable": true,
"bin": [ "bin": [
"bin/start", "bin/start",
"bin/phpunit-swoole" "bin/phpunit-swoole",
"bin/watcher"
], ],
"require": { "require": {
"php": ">=7.2", "php": "^7.2 || ^7.3 || ^7.4 || ^8.0 || ^8.1",
"ext-json": "*", "ext-json": "*",
"ext-posix": "*", "ext-posix": "*",
"doctrine/annotations": "~1.12 || ~1.4.0", "doctrine/dbal": "^2.13.1",
"jelix/version": "^2.0",
"koriym/attributes": "^1.0",
"psy/psysh": "^0.11.2",
"symfony/console": "~5.0 || ~4.0 || ~3.0",
"symfony/polyfill-ctype": "^1.19", "symfony/polyfill-ctype": "^1.19",
"symfony/polyfill-mbstring": "^1.19", "symfony/polyfill-mbstring": "^1.19",
"symfony/console": "~5.0 || ~4.0 || ~3.0", "symfony/polyfill-php80": "^1.16",
"symfony/routing": "~5.0 || ~4.0 || ~3.0", "symfony/routing": "~5.0 || ~4.0 || ~3.0",
"zhamao/console": "^1.0",
"zhamao/config": "^1.0", "zhamao/config": "^1.0",
"zhamao/request": "^1.1",
"zhamao/connection-manager": "^1.0", "zhamao/connection-manager": "^1.0",
"jelix/version": "^2.0", "zhamao/console": "^1.0",
"league/climate": "^3.6", "zhamao/request": "^1.1"
"psy/psysh": "@stable",
"doctrine/orm": "^2.9"
}, },
"suggest": { "suggest": {
"ext-ctype": "Use C/C++ extension instead of polyfill will be more efficient", "ext-ctype": "Use C/C++ extension instead of polyfill will be more efficient",
@@ -52,8 +66,28 @@
"src/ZM/global_functions.php" "src/ZM/global_functions.php"
] ]
}, },
"autoload-dev": {
"psr-4": {
"Module\\": "src/Module",
"Custom\\": "src/Custom"
}
},
"config": {
"optimize-autoloader": true,
"sort-packages": true
},
"require-dev": { "require-dev": {
"swoole/ide-helper": "@dev", "brainmaestro/composer-git-hooks": "^2.8",
"phpunit/phpunit": "^8.5 || ^9.0" "friendsofphp/php-cs-fixer": "^3.2 != 3.7.0",
"phpstan/phpstan": "^1.1",
"phpunit/phpunit": "^8.5 || ^9.0",
"swoole/ide-helper": "^4.5"
},
"scripts": {
"post-install-cmd": [
"[ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/cghooks add"
],
"analyse": "phpstan analyse --memory-limit 300M -l 0 ./src",
"cs-fix": "php-cs-fixer fix $1"
} }
} }

View File

@@ -1,78 +1,73 @@
<?php <?php
/** @noinspection PhpFullyQualifiedNameUsageInspection */
/** @noinspection PhpComposerExtensionStubsInspection */ /** @noinspection PhpComposerExtensionStubsInspection */
/** bind host */ declare(strict_types=1);
/* bind host */
$config['host'] = '0.0.0.0'; $config['host'] = '0.0.0.0';
/** bind port */ /* bind port */
$config['port'] = 20001; $config['port'] = 20001;
/** 框架开到公网或外部的HTTP访问链接通过 DataProvider::getFrameworkLink() 获取 */ /* 框架开到公网或外部的HTTP访问链接通过 DataProvider::getFrameworkLink() 获取 */
$config['http_reverse_link'] = 'http://127.0.0.1:' . $config['port']; $config['http_reverse_link'] = 'http://127.0.0.1:' . $config['port'];
/** 框架是否启动debug模式当debug模式为true时启用热更新需要安装inotify扩展 */ /* 框架是否启动debug模式当debug模式为true时启用热更新需要安装inotify扩展 */
$config['debug_mode'] = false; $config['debug_mode'] = false;
/** 存放框架内文件数据的目录 */ /* 存放框架内文件数据的目录 */
$config['zm_data'] = realpath(WORKING_DIR) . '/zm_data/'; $config['zm_data'] = realpath(WORKING_DIR) . '/zm_data/';
/** 存放各个模块配置文件的目录 */ /* 存放各个模块配置文件的目录 */
$config['config_dir'] = $config['zm_data'] . 'config/'; $config['config_dir'] = $config['zm_data'] . 'config/';
/** 存放崩溃和运行日志的目录 */ /* 存放崩溃和运行日志的目录 */
$config['crash_dir'] = $config['zm_data'] . 'crash/'; $config['crash_dir'] = $config['zm_data'] . 'crash/';
/** 对应swoole的server->set参数 */ /* 对应swoole的server->set参数 */
$config['swoole'] = [ $config['swoole'] = [
'log_file' => $config['crash_dir'] . 'swoole_error.log', 'log_file' => $config['crash_dir'] . 'swoole_error.log',
//'worker_num' => swoole_cpu_num(), //如果你只有一个 OneBot 实例连接到框架并且代码没有复杂的CPU密集计算则可把这里改为1使用全局变量 // 'worker_num' => swoole_cpu_num(), //如果你只有一个 OneBot 实例连接到框架并且代码没有复杂的CPU密集计算则可把这里改为1使用全局变量
'dispatch_mode' => 2, //包分配原则,见 https://wiki.swoole.com/#/server/setting?id=dispatch_mode 'dispatch_mode' => 2, // 包分配原则,见 https://wiki.swoole.com/#/server/setting?id=dispatch_mode
'max_coroutine' => 300000, 'max_coroutine' => 300000,
'max_wait_time' => 5 'max_wait_time' => 5,
//'task_worker_num' => 4, // 'task_worker_num' => 4,
//'task_enable_coroutine' => true // 'task_enable_coroutine' => true
]; ];
/* 一些框架与框架运行时设置的调整 */
/** 一些框架与框架运行时设置的调整 */
$config['runtime'] = [ $config['runtime'] = [
'swoole_coroutine_hook_flags' => SWOOLE_HOOK_ALL & (~SWOOLE_HOOK_CURL), 'swoole_coroutine_hook_flags' => SWOOLE_HOOK_ALL & (~SWOOLE_HOOK_CURL),
'swoole_server_mode' => SWOOLE_PROCESS, 'swoole_server_mode' => SWOOLE_PROCESS,
'middleware_error_policy' => 1 'middleware_error_policy' => 1,
'reload_delay_time' => 800,
'global_middleware_binding' => [],
'save_console_log_file' => false, // 改为目标路径,则将 Console 输出的日志保存到文件
'annotation_reader_ignore' => [ // 设置注解解析器忽略的注解名或命名空间,防止解析到不该解析的
'name' => [
'mixin',
],
'namespace' => [],
],
]; ];
/** 轻量字符串缓存,默认开启 */ /* 轻量字符串缓存,默认开启 */
$config['light_cache'] = [ $config['light_cache'] = [
'size' => 512, //最多允许储存的条数需要2的倍数 'size' => 512, // 最多允许储存的条数需要2的倍数
'max_strlen' => 32768, //单行字符串最大长度需要2的倍数 'max_strlen' => 32768, // 单行字符串最大长度需要2的倍数
'hash_conflict_proportion' => 0.6, //Hash冲突率越大越好但是需要的内存更多 'hash_conflict_proportion' => 0.6, // Hash冲突率越大越好但是需要的内存更多
'persistence_path' => $config['zm_data'] . '_cache.json', 'persistence_path' => $config['zm_data'] . '_cache.json',
'auto_save_interval' => 900 'auto_save_interval' => 900,
]; ];
/** 大容量跨进程变量存储2.2.0可用) */ /* 大容量跨进程变量存储2.2.0可用) */
$config['worker_cache'] = [ $config['worker_cache'] = [
'worker' => 0, 'worker' => 0,
'transaction_timeout' => 30000 'transaction_timeout' => 30000,
]; ];
/** @deprecated 放弃使用,旧版数据库,请使用 mysql_config 和 doctrine/dbal 搭配使用 */ /* MySQL数据库连接信息host留空则启动时不创建sql连接池 */
$config['sql_config'] = [
'sql_host' => '',
'sql_port' => 3306,
'sql_username' => 'name',
'sql_database' => 'db_name',
'sql_password' => '',
'sql_options' => [
PDO::ATTR_STRINGIFY_FETCHES => false,
PDO::ATTR_EMULATE_PREPARES => false
],
'sql_no_exception' => false,
'sql_default_fetch_mode' => PDO::FETCH_ASSOC //added in 1.5.6
];
/** MySQL数据库连接信息host留空则启动时不创建sql连接池 */
$config['mysql_config'] = [ $config['mysql_config'] = [
'host' => '', 'host' => '',
'port' => 3306, 'port' => 3306,
@@ -84,72 +79,74 @@ $config['mysql_config'] = [
'pool_size' => 64, 'pool_size' => 64,
'options' => [ 'options' => [
PDO::ATTR_STRINGIFY_FETCHES => false, PDO::ATTR_STRINGIFY_FETCHES => false,
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
] ],
]; ];
/** Redis连接信息host留空则启动时不创建Redis连接池 */ /* Redis连接信息host留空则启动时不创建Redis连接池 */
$config['redis_config'] = [ $config['redis_config'] = [
'host' => '', 'host' => '',
'port' => 6379, 'port' => 6379,
'timeout' => 1, 'timeout' => 1,
'db_index' => 0, 'db_index' => 0,
'auth' => '' 'auth' => '',
]; ];
/** onebot连接约定的token */ /* onebot连接约定的token */
$config['access_token'] = ''; $config['access_token'] = '';
/** HTTP服务器固定请求头的返回 */ /* HTTP服务器固定请求头的返回 */
$config['http_header'] = [ $config['http_header'] = [
'Server' => 'zhamao-framework', 'Server' => 'zhamao-framework',
'Content-Type' => 'text/html; charset=utf-8' 'Content-Type' => 'text/html; charset=utf-8',
]; ];
/** HTTP服务器在指定状态码下回复的页面默认 */ /* HTTP服务器在指定状态码下回复的页面默认 */
$config['http_default_code_page'] = [ $config['http_default_code_page'] = [
'404' => '404.html' '404' => '404.html',
]; ];
/** zhamao-framework在框架启动时初始化的atomic们 */ /* zhamao-framework在框架启动时初始化的atomic们 */
$config['init_atomics'] = [ $config['init_atomics'] = [
//'custom_atomic_name' => 0, //自定义添加的Atomic // 'custom_atomic_name' => 0, //自定义添加的Atomic
]; ];
/** 终端日志显示等级0-4 */ /* 终端日志显示等级0-4 */
$config['info_level'] = 2; $config['info_level'] = 2;
/** 上下文接口类 implemented from ContextInterface */ /* 上下文接口类 implemented from ContextInterface */
$config['context_class'] = \ZM\Context\Context::class; $config['context_class'] = \ZM\Context\Context::class;
/** 静态文件访问 */ /* 静态文件访问 */
$config['static_file_server'] = [ $config['static_file_server'] = [
'status' => false, 'status' => false,
'document_root' => realpath(__DIR__ . '/../') . '/resources/html', 'document_root' => realpath(__DIR__ . '/../') . '/resources/html',
'document_index' => [ 'document_index' => [
'index.html' 'index.html',
] ],
]; ];
/** 机器人解析模块关闭后无法使用如CQCommand等注解(上面的modules即将废弃) */ /* 机器人解析模块关闭后无法使用如CQCommand等注解(上面的modules即将废弃) */
$config['onebot'] = [ $config['onebot'] = [
'status' => true, 'status' => true,
'single_bot_mode' => false, 'single_bot_mode' => false,
'message_level' => 99999 'message_level' => 99,
'message_convert_string' => true,
'message_command_policy' => 'interrupt',
]; ];
/** 一个远程简易终端使用nc直接连接即可但是不建议开放host为0.0.0.0(远程连接) */ /* 一个远程简易终端使用nc直接连接即可但是不建议开放host为0.0.0.0(远程连接) */
$config['remote_terminal'] = [ $config['remote_terminal'] = [
'status' => false, 'status' => false,
'host' => '127.0.0.1', 'host' => '127.0.0.1',
'port' => 20002, 'port' => 20002,
'token' => '' 'token' => '',
]; ];
/** 模块(插件)加载器的相关设置 */ /* 模块(插件)加载器的相关设置 */
$config['module_loader'] = [ $config['module_loader'] = [
'enable_hotload' => false, 'enable_hotload' => false,
'load_path' => $config['zm_data'] . 'modules' 'load_path' => $config['zm_data'] . 'modules',
]; ];
return $config; return $config;

View File

@@ -0,0 +1,88 @@
# 接入青云客智能聊天机器人API
作为一个群聊机器人,懂得聊天会让机器人增色不少,在大数据和 AI 热潮下,不少厂商都研发了自己的智能聊天 API例如图灵机器人、腾讯智能闲聊等大厂开发的 API 自然有着他人无可比拟的健壮性和可靠性,但是随之而来不菲的价格显然并不适合大众开发者。这时候一个免费、可用的智能聊天 API 便非常重要了,其中,青云客是少有的完全免费、无需注册的智能聊天 API提供了包括智能聊天、歌词、天气查询、笑话等多种有用功能且接入简单非常适合新手开发者尝试。
## 结果演示
![圖片](https://user-images.githubusercontent.com/31698606/158875192-108698a3-b54e-4fc0-889a-0829ca328b13.png)
## 阅读接入指南
不管接入何种服务,阅读接入指南永远都是最优先、最重要的一步,所幸青云客的接入指南十分简单,简单来说归纳为以下:
* 请求GET https://api.qingyunke.com/api.php
* 参数:
* * `key` 目前固定为 `free`
* * `appid` 目前固定为 `0`
* * `msg` 关键词,需要经过 `urlencode`
* 注意:返回结果中 `{br}` 代表换行
## 逻辑编写
阅读过后,我们便可以进行主要的编写工作了。
首先,为了机器人的性能考虑,也为了避免过分打扰群聊的聊天,我们希望机器人只有在主动触发(@AT 或者 关键词等)时才会进行智能聊天。
对于关键词匹配,我们可以使用 `@CQCommand`
```php
/**
* 智能聊天
*
* @CQCommand(start_with="机器人")
*/
public function chat()
{
// 替换掉机器人前缀,并获取消息内容
$msg = ctx()->getMessage();
$msg = str_replace('机器人', '', $msg);
if (empty(trim($msg))) {
$msg = ctx()->getFullArg('怎么了?');
}
Console::info('正在获取智能聊天回复:' . $msg);
// 请求 API 获取回复
$raw_data = file_get_contents('https://api.qingyunke.com/api.php?key=free&appid=0&msg=' . urlencode($msg));
try {
$data = json_decode($raw_data, true, 512, JSON_THROW_ON_ERROR);
} catch (\Exception $e) {
$data = ['content' => '机器人解析异常,请稍后再试'];
Console::warning('无法获取智能聊天回复:' . $e->getMessage());
}
if ($data['result'] !== 0) {
$data = ['content' => '机器人服务异常,请稍后再试'];
Console::warning('无法获取智能聊天回复:' . $raw_data);
}
Console::info('获取智能聊天回复完成:' . $data['content']);
// 将 {br} 替换为换行
$data['content'] = strtr($data['content'], ['{br}' => "\n"]);
return $data['content'];
}
```
这样我们的命令便只会在用户发送以`机器人`开头的消息时才会触发。
同时,我们也希望在 @AT 机器人时也进行回复,此时可以使用 `@CQBefore` 方法进行折中:
```php
/**
* 将 AT 机器人的消息交由智能聊天处理
*
* @CQBefore("message")
*/
public function changeAt(): bool
{
// 判断此条消息是否 AT 了机器人
if (MessageUtil::isAtMe(ctx()->getMessage(), ctx()->getRobotId())) {
// 将 AT 本身从消息中去掉
$msg = str_replace(CQ::at(ctx()->getRobotId()), '', ctx()->getMessage());
ctx()->setMessage('机器人' . trim($msg));
// 调用智能聊天
ctx()->reply($this->chat());
return false;
}
return true;
}
```

View File

@@ -0,0 +1,112 @@
# 基于词性分析和魅族天气的天气查询机器人
本文将基于 [`jieba-php`](https://github.com/fukuball/jieba-php) 中文分词库以及 [魅族天气 API](https://github.com/shichunlei/-Api/blob/master/MeizuWeather.md) 开发一个天气查询机器人。
## 结果演示
![圖片](https://user-images.githubusercontent.com/31698606/159122016-61ba9696-5786-4561-b371-827d9f1d01aa.png)
尾部的随机表情并非本教程的一部分。
## 逻辑编写
[`jieba-php`](https://github.com/fukuball/jieba-php) 是目前比较好用的中文分词库,虽然最近的维护并不活跃,但已足够我们的需求:
```shell
composer require fukuball/jieba-php:dev-master
```
以下代码使用了本文作者自行编写的天气查询库,需要进行引入:
```shell
composer require sunxyw/weather
```
您也可以将以下代码自行改写为直接调用魅族天气 API详情请参阅[魅族天气 API 文档](https://github.com/shichunlei/-Api/blob/master/MeizuWeather.md)。
```php
<?php
namespace Bot\Module\SmartChat;
use Fukuball\Jieba\Jieba;
use Fukuball\Jieba\Posseg;
use Sunxyw\Weather\Weather;
use ZM\Annotation\CQ\CQCommand;
use ZM\Console\Console;
class WeatherReport
{
/**
* 加载字典
*
* @OnStart(worker_id=-1)
*
* @return void
*/
public function initDictionary(): void
{
// 分词以及词性分析需要载入字典到内存
ini_set('memory_limit', '600M');
Jieba::init(['dict' => 'small']);
Posseg::init();
}
/**
* 查询天气
*
* @CQCommand(keyword="天气")
*
* @return string
*/
public function cmdQueryWeather(): string
{
// 分词并进行词性分析
$seg_list = Posseg::cut(ctx()->getMessage());
$tags = array_column($seg_list, 'tag');
// 找出词性为 ns地名的单词
$location_index = array_search('ns', $tags, true);
$location = $seg_list[$location_index]['word'];
// 此处引入了本文作者自己写的天气库
$w = new Weather();
try {
$report = $w->getWeather($location);
} catch (\InvalidArgumentException) {
return '城市输入错误';
} catch (\JsonException $e) {
Console::warning("天气查询失败:{$e->getMessage()}");
return '天气查询失败';
}
$template = <<<EOF
%s天气%s
温度:%s℃
湿度:%s%%
风向:%s %s
空气质量:%s
------------------------------
未来三天天气:
%s%s日间%s℃夜间%s℃吹%s %s
%s%s日间%s℃夜间%s℃吹%s %s
%s%s日间%s℃夜间%s℃吹%s %s
EOF;
$args = [
$report->getCity(),
$report->getRealtime()['weather'],
$report->getRealtime()['temperature'],
$report->getRealtime()['humidity'],
$report->getRealtime()['wind_direction'],
$report->getRealtime()['wind_speed'],
$report->getRealtime()['air_quality'],
];
foreach (array_slice($report->getForecastDaily(), 0, 3) as $forecast) {
$args[] = $forecast['date'];
$args[] = $forecast['weather'];
$args[] = $forecast['temperature']['day'];
$args[] = $forecast['temperature']['night'];
$args[] = $forecast['wind_direction'];
$args[] = $forecast['wind_speed'];
}
return vsprintf($template, ...$args);
}
}
```

View File

@@ -0,0 +1 @@
.hljs{display:block;overflow-x:auto;padding:.5em;background:#f0f0f0}.hljs,.hljs-subst{color:#444}.hljs-comment{color:#888}.hljs-attribute,.hljs-doctag,.hljs-keyword,.hljs-meta-keyword,.hljs-name,.hljs-selector-tag{font-weight:700}.hljs-deletion,.hljs-number,.hljs-quote,.hljs-selector-class,.hljs-selector-id,.hljs-string,.hljs-template-tag,.hljs-type{color:#800}.hljs-section,.hljs-title{color:#800;font-weight:700}.hljs-link,.hljs-regexp,.hljs-selector-attr,.hljs-selector-pseudo,.hljs-symbol,.hljs-template-variable,.hljs-variable{color:#bc6060}.hljs-literal{color:#78a960}.hljs-addition,.hljs-built_in,.hljs-bullet,.hljs-code{color:#397300}.hljs-meta{color:#1f7199}.hljs-meta-string{color:#4d99bf}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}

View File

@@ -42,6 +42,21 @@ MessageUtil::containsImage("[CQ:image,file=a.jpg,url=http://xxx]"); // true
MessageUtil::containsImage("[CQ:face,id=140] 咦,这是一条带表情的消息"); // false MessageUtil::containsImage("[CQ:face,id=140] 咦,这是一条带表情的消息"); // false
``` ```
### isAtMe()
检查消息中是否含有@bot的消息
定义:`isAtMe($msg, $me_id)`
参数 `$me_id` 为Bot的QQ号。
返回:`bool`true 就是有false 就没有。
```php
MessageUtil::isAtMe("[CQ:at,qq=123456]炸毛你好","123456"); // true
MessageUtil::isAtMe("[CQ:at,qq=123456789]另一个朋友你好","123456"); // false
```
### getImageCQFromLocal() ### getImageCQFromLocal()
通过文件路径获取图片的发送 CQ 码。 通过文件路径获取图片的发送 CQ 码。
@@ -113,3 +128,52 @@ public function onStart() {
( 其实还是很聪明的! ( 其实还是很聪明的!
</chat-box> </chat-box>
### strToArray()
`string` 类型的消息文本转换为 `array` 格式。
定义:`strToArray($msg, bool $ignore_space = true, bool $trim_text = false)`
参数 `$msg` 为带 OB/CQ 码的字符串消息,如 `你好啊,[CQ:at,qq=123]`
参数 `$ignore_space``false` 时,转换的数组内会包含空 `text` 段。
参数 `$trim_text``true` 时,会自动去除 `text` 段消息头尾的换行符和空格。
这个命令转换的数组格式符合 OneBot 11/12 标准,但细节上可能会与不同 OneBot 实现有所差异。
```php
$str = "你好啊,[CQ:at,qq=123]";
$arr = \ZM\Utils\MessageUtil::strToArray($str);
```
转换结果参考如下:
```json
[
{
"type": "text",
"data": {
"text": "你好啊,"
}
},
{
"type": "at",
"data": {
"qq": "123"
}
}
]
```
### arrayToStr()
`array` 格式的消息内容转换为字符串 + CQ 码的形式。
定义:`arrayToStr(array $array)`
```php
// 我们使用上边的 $arr 作为传入值。
$new_str = \ZM\Utils\MessageUtil::arrayToStr($arr);
// 结果:"你好啊,[CQ:at,qq=123]"
```

View File

@@ -0,0 +1,9 @@
# 机器人 APIOneBotV12待发布
!!! tip "提示"
目前由于 OneBot 12 标准还没有定稿,处于草案阶段,故框架暂不更新。
在未来升级到 OneBot 12 标准后,框架会提供转换及兼容措施以及 12 版本的 API 方法。
见 [机器人动作OneBot 11](../robot-api)。

View File

@@ -769,6 +769,21 @@ vardump($result["retcode"]); //如果成功撤回,输出 int(0)
响应数据:无 响应数据:无
### getExtendedAPI()
用来调用 OneBot 标准之外扩展出来的自定义 API。与下方 `callExtendedAPI` 不同的是,为了方便用户使用,炸毛框架内置了热门使用并且相对稳定的机器人客户端的专有 API。
目前内置了 `go-cqhttp` 频道相关的扩充 API。
使用示例:`getExtendedAPI('go-cqhttp')->getGuildList()`
使用示例2`getExtendedAPI()->sendGuildChannelMsg($guild_id, $channel_id, '频道的消息')`
唯一一个参数做保留,用于选择不同客户端,目前仅支持 `go-cqhttp`,所以缺省也默认为 `go-cqhttp`。
!!! warning "注意"
由于不同版本的扩展 API 变化可能会很大,改动较多,炸毛框架不会将对应扩展方法写入文档,具体调用情况可根据 IDE 自动补全中的文档或对应类的注释查看。
### callExtendedAPI() (扩充 API ### callExtendedAPI() (扩充 API
用来调用 OneBot 标准之外扩展出来的自定义 API。 用来调用 OneBot 标准之外扩展出来的自定义 API。

View File

@@ -124,7 +124,7 @@ public function ping() {
## getRobot() - 获取机器人 API 对象 ## getRobot() - 获取机器人 API 对象
返回当前上下文关联的机器人 API 调用对象 [ZMRobot](bot/robot-api.md)。 返回当前上下文关联的机器人 API 调用对象 [ZMRobot](../bot/robot-api.md)。
可以使用的事件:所有 HTTP API 发来的事件:`@CQCommand()``@CQMessage()` 等。 可以使用的事件:所有 HTTP API 发来的事件:`@CQCommand()``@CQMessage()` 等。

View File

@@ -0,0 +1,104 @@
# 事件跟踪器及调试
众所周知炸毛框架中的事件由内置的事件分发器EventDispatcher负责分发但调试事件分发在之前的版本比较困难例如不能获取到事件如何被调用以及事件如何被捕获。
EventTracer 的作用是记录事件的调用顺序,以便于调试。
命名空间使用指南:`use ZM\Event\EventTracer;`
## EventTracer::getCurrentEvent() - 获取当前注解事件对象
```php
/**
* @OnStart()
*/
public function onStart() {
zm_dump(EventTracer::getCurrentEvent());
}
/*
^ ZM\Annotation\Swoole\OnStart^ {#192
+worker_id: 0
+method: "onStart"
+class: "Module\Example\Hello"
}
*/
```
这里这个方法必须在注解事件内执行,如果在注解事件外执行,将会返回 `null`
## EventTracer::getCurrentEventMiddlewares() - 获取当前注解事件的中间件们
```php
/**
* @OnStart()
* @Middleware("timer")
*/
public function onStart() {
zm_dump(EventTracer::getCurrentEventMiddlewares());
}
/*
^ array:1 [
0 => ZM\Annotation\Http\Middleware^ {#194
+middleware: "timer"
+params: []
+method: "onStart"
+class: "Module\Example\Hello"
}
]
*/
```
返回值为当前注解事件的中间件们,如果没有注解中间件,返回 `[]`
## EventTracer::getEventTraceList() - 获取注解事件的列表
此处返回的是 `getCurrentEvent()` 相同的对象,但是返回的是一个数组,数组中的元素是注解事件。
```php
/**
* 一个简单随机数的功能demo
* 问法1随机数 1 20
* 问法2从1到20的随机数
* @CQCommand("随机数")
* @Middleware("timer")
* @CQCommand(pattern="*从*到*的随机数")
* @return string
*/
public function randNum() {
// 此处为随机数代码
zm_dump(EventTracer::getEventTraceList());
return "随机数:" . rand(1, 20);
}
/*
^ array:2 [
0 => ZM\Annotation\CQ\CQCommand^ {#193
+match: ""
+pattern: "*从*到*的随机数"
+regex: ""
+start_with: ""
+end_with: ""
+keyword: ""
+alias: []
+message_type: ""
+user_id: 0
+group_id: 0
+discuss_id: 0
+level: 20
+method: "randNum"
+class: "Module\Example\Hello"
}
1 => ZM\Annotation\Swoole\OnMessageEvent^ {#165
+connect_type: "default"
+rule: "connectIsQQ()"
+level: 99
+method: "handleByEvent"
+class: "ZM\Module\QQBot"
}
]
*/
```
## EventDispatcher::enableEventTrace() - 启用事件跟踪器
还没写完,不着急。

View File

@@ -2,7 +2,7 @@
此类管理的是 TaskWorker 相关工作。有关使用 TaskWorker 的教程,见 [进阶 - 使用 TaskWorker 进程处理密集运算](/advanced/task-worker) 此类管理的是 TaskWorker 相关工作。有关使用 TaskWorker 的教程,见 [进阶 - 使用 TaskWorker 进程处理密集运算](/advanced/task-worker)
类定义:`\ZM\Utils\TaskManager` 类定义:`\ZM\Utils\Manager\TaskManager`
使用 TaskWorker 需要先在 `global.php` 配置文件中开启! 使用 TaskWorker 需要先在 `global.php` 配置文件中开启!

View File

@@ -14,7 +14,6 @@ src/
   │   └── zm.json    │   └── zm.json
   └── Middleware/    └── Middleware/
   └── TimerMiddleware.php    └── TimerMiddleware.php
``` ```
我们在 Example 目录下创建一个 `zm.json` 的文件,编写配置,即代表 `src/Module/Example/` 文件夹及里面的用户模块源码为一个模块包,也就可以被框架识别并打包处理。 我们在 Example 目录下创建一个 `zm.json` 的文件,编写配置,即代表 `src/Module/Example/` 文件夹及里面的用户模块源码为一个模块包,也就可以被框架识别并打包处理。
@@ -57,7 +56,8 @@ src/
```json ```json
{ {
"name": "my-first-module", "name": "my-first-module",
"description": "这个是一个示例模块打包教程" "description": "这个是一个示例模块打包教程",
"version": "1.0.0"
} }
``` ```
@@ -160,6 +160,68 @@ src/
在打包时框架会自动添加这些文件到 phar 插件包内,到解包时,会自动将这些文件释放到对应框架的 `zm_data` 目录下。 在打包时框架会自动添加这些文件到 phar 插件包内,到解包时,会自动将这些文件释放到对应框架的 `zm_data` 目录下。
## 打包模块命令
编写配置文件 `zm.json` 后,就可以被框架正常识别为模块形式,你也可以使用对无需打包的模块进行配置以进行分类管理。
### module:list
使用 list 命令可以列出炸毛框架检测到配置文件或打包好的模块。
```
$ ./zhamao module:list
[foo]
类型: source
版本: 1.0.0
描述: 示例模块打包文件
目录: src/Module/Example
没有发现已打包且装载的模块!
```
其中 `[ ]` 内为识别出来的模块名称,由上方用户编写的 `zm.json` 定义,类型为 `source` 是源码形式,也就是指定了 `zm.json` 形式的模块,目录为模块所在子目录。
我们假设打包上方定义的 `foo` 模块,使用下方命令 `module:pack` 即可。
### module:pack
使用 pack 命令可以将配置好的模块打包为 `xxx.phar` 文件并转移或发布给他人。
我们假设打包模块脚手架的默认模块 `src/Module/Example` 下面的模块源码和附带一个 `zm_data` 目录下的文件(我们就随便打包一下 Swoole 的输出日志吧)。`zm.json` 文件内容如下:
```json
{
"name": "foo",
"description": "示例模块打包文件",
"version": "1.0.0",
"allow-hotload": true,
"zm-data-store": [
"crash/swoole_error.log"
]
}
```
然后输入命令:
```
$ ./zhamao module:pack foo
[15:07:11] [I] 模块输出文件:/root/zhamao-framework/zm_data/output/foo_1.0.0.phar
[15:07:11] [S] 打包完成!
```
如果提示文件夹不存在,请先手动创建文件夹:`mkdir /path/to/your/zm_data/output`
在打包后,你将获得一个 `foo_1.0.0.phar` 的文件。
> 如果你没有在 `zm.json` 中指定 `version`,那么输出的 phar 文件是不会带版本号的。
打包后的 phar 内将包含:
- Hello.php
- zm.json
- crash/swoole_error.log
- 必要的框架热加载以及解包需要的配置信息
## 打包命令 ## 打包命令
```bash ```bash

View File

@@ -8,6 +8,10 @@ DataProvider 是框架内提供的一个简易的文件管理类。
`working_dir()` `working_dir()`
## DataProvider::getSourceRootDir()
获取用户的源码根目录,除 Phar 模式外与 `getWorkingDir()` 相同。
## DataProvider::getFrameworkLink() ## DataProvider::getFrameworkLink()
`ZMConfig::get("global", "http_reverse_link")`,获取反向代理的链接。 `ZMConfig::get("global", "http_reverse_link")`,获取反向代理的链接。
@@ -46,6 +50,45 @@ DataProvider::getDataFolder("TestModule"); // 例如返回 /root/zhamao-framewor
文件名同上 `saveToJson()` 的定义,解析后的返回值为原先的内容或 `null`(如果文件不存在或 json 解析失败)。 文件名同上 `saveToJson()` 的定义,解析后的返回值为原先的内容或 `null`(如果文件不存在或 json 解析失败)。
## DataProvider::scanDirFiles()
递归或非递归扫描目录,返回相对目录的文件列表或绝对目录的文件列表。(非常好用)
定义:`scanDirFiles($dir, $recursive = true, $relative = false)`
`$dir` 为要扫描的目录,`$recursive` 为是否递归,`$relative` 为是否返回相对目录的文件列表。
从给定的目录下开始遍历整个目录,如果将 `$recursive` 设置为 `true`,则会递归扫描子目录,否则将返回包含目录的文件列表。
如果将 `$relative` 设置为 `true`,则会返回文件列表的相对路径,否则返回绝对路径。
例如:假设目录 `/home/test/` 下有两个文件:`test1.txt``testdir/test2.txt`:如果将 `$recursive` 设置为 `true``$relative` 设置为 `false`,则返回的文件列表为:
```json
[
"/home/test/test1.txt",
"home/test/testdir/test2.txt"
]
```
相同条件下,如果将 `$relative` 设置为 `true`
```json
[
"test1.txt",
"testdir/test2.txt"
]
```
如果再把 `$recursive` 设置为 `false`
```json
[
"test1.txt",
"testdir"
]
```
## 其他文件读取 ## 其他文件读取
框架比较贴近原生的 PHP所以推荐直接使用原生的方法来读写文件`file_get_contents``file_put_contents`)。但有一点要注意,框架内最好使用**工作目录或者绝对路径**。 框架比较贴近原生的 PHP所以推荐直接使用原生的方法来读写文件`file_get_contents``file_put_contents`)。但有一点要注意,框架内最好使用**工作目录或者绝对路径**。

View File

@@ -125,9 +125,9 @@ dump(LightCache::getExpire("test")); // 返回 10
```php ```php
$s = LightCache::set("test", "hello", 20); //假设这条代码执行时时间戳是 1616838482 $s = LightCache::set("test", "hello", 20); //假设这条代码执行时时间戳是 1616838482
zm_sleep(10); zm_sleep(10);
dump(LightCache::getExpire("test")); // 返回 1616838502 dump(LightCache::getExpireTS("test")); // 返回 1616838502
zm_sleep(10); zm_sleep(10);
dump(LightCache::getExpire("test")); // 返回 null dump(LightCache::getExpireTS("test")); // 返回 null
``` ```
### LightCache::getMemoryUsage() ### LightCache::getMemoryUsage()

View File

@@ -0,0 +1,184 @@
# 执行 SQL 语句
在一开始,无论你做什么数据库操作,均需要获取一个 `\ZM\MySQL\MySQLWrapper` 作为你的操作对象。
```php
/** @var \ZM\MySQL\MySQLWrapper $wrapper */
$wrapper = \ZM\MySQL\MySQLManager::getWrapper();
```
!!! tip "提示"
这部分内容部分直接取自 [DBAL - Data Retrieval And Manipulation](https://www.doctrine-project.org/projects/doctrine-dbal/en/2.13/reference/data-retrieval-and-manipulation.html) 原文并直接翻译,如有实际不同请提交 Issue 反馈。
## 执行预处理 SQL 语句
预处理查询很巧妙地解决了 SQL 注入问题,并且可以方便地绑定参数进行查询。
预处理一般是指使用 `?` 占位符或 `:xxx` 命名标签进行参数留空,先处理 SQL 语句再填入数据。
一般 `?` 具有前后位置性,例如如下的查询:
```php
$sql = "SELECT * FROM users WHERE id = ? AND username = ?";
$stmt = $wrapper->getConnection()->prepare($sql);
$stmt->bindValue(1, "1");
$stmt->bindValue(2, "jack");
$resultSet = $stmt->executeQuery();
```
其中 `$resultSet``Statement` 方法相似,此处的对象可能是 [数据库语句对象](../mysql-statement) 或 数据库结果对象(结果对象与语句对象的 `fetchXXX()` 部分一致)。
这里也可以使用命名标签,使用标签可以给相同参数处使用同一个标签:
```php
$sql = "SELECT * FROM users WHERE gender = :name OR username = :name";
$stmt = $wrapper->getConnection()->prepare($sql);
$stmt->bindValue("name", "jack");
$resultSet = $stmt->executeQuery();
```
## 执行常规语句
执行常规语句为 `statement` 方式执行,此方法执行后只返回影响的行数,而不返回结果,适用于 `UPDATE` 等语句。
```php
<?php
$count = $wrapper->executeStatement('UPDATE users SET username = ? WHERE id = ?', array('jwage', 1));
echo $count; // 1
```
## 执行查询语句
为给定的 SQL 创建一个准备好的语句并将参数传递给 executeQuery 方法,然后返回结果集。此方法为上述的「预处理查询语句」的简化版,可直接在第二个参数使用 array 插入绑定参数执行。
```php
$resultSet = $wrapper->executeQuery('SELECT * FROM user WHERE username = ?', array('jack'));
$user = $resultSet->fetchAssociative();
/* $user 值
array(
0 => array(
'id' => 1,
'username' => 'jack',
'gender' => 'man',
'update_time' => '2021-10-12'
)
)
*/
```
### fetchAllAssociative()
执行查询并将所有结果返回一个数组中。
因此,上面的查询语句还可以直接被简化为一次方法调用:
```php
$resultSet = $wrapper->fetchAllAssociative('SELECT * FROM user WHERE username = ?', array('jack'));
// 结果同 executeQuery()->fetchAllAssociative() 中 $user 的值。
```
### fetchAllKeyValue()
执行查询并将前两列分别作为键和值提取到关联数组中。
```php
$resultSet = $wrapper->fetchAllKeyValue('SELECT username, gender FROM user WHERE username = ?', array('jack'));
/* $resultSet 值
array(
'jack' => 'man'
)
*/
```
### fetchAllAssociativeIndexed()
执行查询并将数据作为关联数组获取,其中键代表第一列,值是其余列及其值的关联数组。
```php
$users = $wrapper->fetchAllAssociativeIndexed('SELECT id, username, gender FROM users');
/*
array(
1 => array(
'username' => 'jack',
'gender' => 'man',
'update_time' => '2021-10-12'
)
)
*/
```
### fetchNumeric()
查询并返回第一行数据,形式以数字索引方式返回每一列。
```php
$user = $wrapper->fetchNumeric('SELECT * FROM users WHERE username = ?', array('jack'));
/*
array(
0 => 'jwage',
1 => 'man',
2 => '2021-10-12'
)
*/
```
### fetchOne()
仅返回查询结果的第一行第一列的值。
```php
$username = $wrapper->fetchOne('SELECT username FROM users WHERE id = ?', array(1));
echo $username; // jack
```
### fetchAssociative()
返回结果内第一行的关联数组形式的数据。
```php
$users = $wrapper->fetchAssociative('SELECT * FROM users');
/*
array(
'id' => 1,
'username' => 'jack',
'gender' => 'man',
'update_time' => '2021-10-12'
)
*/
```
### delete()
删除查询操作,第一个参数为表名,第二个参数为 `['列名' => '列值']`
```php
<?php
$wrapper->delete('users', array('username' => 'jack'));
// 等同于执行DELETE FROM user WHERE username = ? ,参数列表为('jack')
```
### insert()
插入数据库一行,第一个参数为表名,第二个参数为对应数据。
```php
$wrapper->insert('users', array('id' => 0, 'username' => 'jwage', 'gender' => 'woman', 'update_time' => '2021-10-17'));
// INSERT INTO user (id, username, gender, update_time) VALUES (?,?,?,?) (0,jwage,woman,2021-10-17)
```
### update()
更新数据库,使用给定数据更新匹配键值标识符的所有行。
```php
<?php
$wrapper->update('user', array('username' => 'jwage'), array('id' => 1));
// UPDATE user (username) VALUES (?) WHERE id = ? (jwage, 1)
```

View File

@@ -0,0 +1,7 @@
# 配置
炸毛框架的数据库组件支持原生 SQL、查询构造器去掉了复杂的对象模型关联同时默认为数据库连接池使开发变得简单。
数据库的配置位于 `config/global.php` 文件的 `mysql_config` 段,见 [全局配置](../../../../guide/basic-config#mysql_config)。
如果 `mysql_config.host` 字段为空,则不创建数据库连接池,填写后将创建,且默认保持长连接。

View File

@@ -0,0 +1 @@
你好啊,这里是 Statement。

View File

@@ -1,10 +1,14 @@
# MySQL 数据库 # MySQL 数据库简介
## 简介
炸毛框架的数据库组件对接了 MySQL 连接池,在使用过程中无需配置即可实现 MySQL 查询,同时拥有高并发。 炸毛框架的数据库组件对接了 MySQL 连接池,在使用过程中无需配置即可实现 MySQL 查询,同时拥有高并发。
目前 2.5 版本后炸毛框架底层采用了 `doctrine/dbal` 组件,可以方便地构建 SQL 语句。 目前 2.5 版本后炸毛框架底层采用了 `doctrine/dbal` 组件,可以方便地构建 SQL 语句。
> 文档正在加急编写!!!用的话可以先用 `MySQLManager::getWrapper()` 获取 wrapper 后返回的方法。 本章大体查询内容均以下表 `users` 为基础:
| id | username | gender | update_time |
| -- | -------- | ------ | ----------- |
| 1 | jack | man | 2021-10-12 |
| 2 | rose | woman | 2021-10-11 |
#

View File

@@ -2,6 +2,10 @@
前面讲到 LightCache 轻量缓存在特定的情况下为了保证数据不被多进程的因素导致丢失或覆盖,在高并发情况下修改数据需要加锁,所以炸毛框架内置了 SpinLock 自旋锁。 前面讲到 LightCache 轻量缓存在特定的情况下为了保证数据不被多进程的因素导致丢失或覆盖,在高并发情况下修改数据需要加锁,所以炸毛框架内置了 SpinLock 自旋锁。
!!! tip "提示"
框架单进程运行的模式下不需要任何自旋锁。
## 配置 ## 配置
自旋锁使用无需配置,和 LightCache 同源。 自旋锁使用无需配置,和 LightCache 同源。

View File

@@ -6,9 +6,18 @@
但是如果因为用户的误操作,导致炸毛框架其中的一个或多个进程阻塞,或者比如将框架挂在 screen 等守护但是守护服务进程被杀掉,总之就是无法使用 Ctrl+C 的方式正常关闭框架,这时就需要正确地杀掉所有框架进程(这固然可能会造成内存的缓存数据丢失)。 但是如果因为用户的误操作,导致炸毛框架其中的一个或多个进程阻塞,或者比如将框架挂在 screen 等守护但是守护服务进程被杀掉,总之就是无法使用 Ctrl+C 的方式正常关闭框架,这时就需要正确地杀掉所有框架进程(这固然可能会造成内存的缓存数据丢失)。
### v2.7.0 及以上版本教程
- 安全关框架指令:`./zhamao server:stop`
- 万能杀死所有框架进程指令:`./zhamao server:stop --force`
- 监视框架是否在运行:`./zhamao server:status`
- Worker 进程卡死:连续按 5 次 Ctrl+C 即可强行杀掉所有进程SIGKILL
### v2.6.6 及以下版本教程
!!! warning "注意" !!! warning "注意"
下方涉及 `ps` 命令后使用 `grep` 过滤的框架进程方式,如果你的服务器同时有其他使用 PHP 启动的服务,命令行刚好有 `server` 字样,可能会导致误杀,如果有影响的话,建议将 `grep server` 换成你启动时命令行的特殊参数或手动排除! 下方涉及 `ps` 命令后使用 `grep` 过滤的框架进程方式,如果你的服务器同时有其他使用 PHP 启动的服务,命令行刚好有 `server` 字样,可能会导致误杀,如果有影响的话,建议将 `grep server` 换成你启动时命令行的特殊参数或手动排除!
**一、**首先,使用 `ps``htop``netstat -nlp` 等命令确定框架的入口进程(也就是 Master 进程的 pid **一、**首先,使用 `ps``htop``netstat -nlp` 等命令确定框架的入口进程(也就是 Master 进程的 pid

View File

@@ -23,7 +23,7 @@
| `runtime` | 一些框架运行时调整的设置 | 见子表 `runtime` | | `runtime` | 一些框架运行时调整的设置 | 见子表 `runtime` |
| `light_cache` | 轻量内置 key-value 缓存 | 见字表 `light_cache` | | `light_cache` | 轻量内置 key-value 缓存 | 见字表 `light_cache` |
| `worker_cache` | 跨进程变量级缓存 | 见子表 `worker_cache` | | `worker_cache` | 跨进程变量级缓存 | 见子表 `worker_cache` |
| `sql_config` | MySQL 数据库连接信息 | 见子表 `sql_config` | | `mysql_config` | MySQL 数据库连接信息 | 见子表 `mysql_config` |
| `redis_config` | Redis 连接信息 | 见子表 `redis_config` | | `redis_config` | Redis 连接信息 | 见子表 `redis_config` |
| `access_token` | OneBot 客户端连接约定的token留空则无相关设置见 [组件 - Access Token 验证](component/access-token) | 空 | | `access_token` | OneBot 客户端连接约定的token留空则无相关设置见 [组件 - Access Token 验证](component/access-token) | 空 |
| `http_header` | HTTP 请求自定义返回的header | 见配置文件 | | `http_header` | HTTP 请求自定义返回的header | 见配置文件 |
@@ -55,7 +55,10 @@
| ----------------------------- | ------------------------------------------------------------ | --------------------------------------- | | ----------------------------- | ------------------------------------------------------------ | --------------------------------------- |
| `swoole_coroutine_hook_flags` | Swoole 启动时一键协程化 Hook 的 Flag 值,详见 [一键协程化](http://wiki.swoole.com/#/runtime?id=%e5%87%bd%e6%95%b0%e5%8e%9f%e5%9e%8b) | `SWOOLE_HOOK_ALL & (~SWOOLE_HOOK_CURL)` | | `swoole_coroutine_hook_flags` | Swoole 启动时一键协程化 Hook 的 Flag 值,详见 [一键协程化](http://wiki.swoole.com/#/runtime?id=%e5%87%bd%e6%95%b0%e5%8e%9f%e5%9e%8b) | `SWOOLE_HOOK_ALL & (~SWOOLE_HOOK_CURL)` |
| `swoole_server_mode` | Swoole Server 启动的进程模式,有 `SWOOLE_PROCESS``SWOOLE_BASE` 两种,见 [启动方式](http://wiki.swoole.com/#/learn?id=swoole_process) | `SWOOLE_PROCESS` | | `swoole_server_mode` | Swoole Server 启动的进程模式,有 `SWOOLE_PROCESS``SWOOLE_BASE` 两种,见 [启动方式](http://wiki.swoole.com/#/learn?id=swoole_process) | `SWOOLE_PROCESS` |
| `middleware_error_policy` | 中间件错误处理策略,见 [中间件 - 错误处理策略](event/middleware/#_6) | 1 | | `middleware_error_policy` | 中间件错误处理策略,见 [中间件 - 错误处理策略](../../event/middleware/#_6) | 1 |
| `reload_delay_time` | 框架 reload 重载命令接收后延迟的时间毫秒0 为不等待) | 800 |
| `global_middleware_binding` | 给注解事件绑定全局中间件,见 [中间件 - 全局中间件](../../event/middleware/#_6) | `[]` |
| `save_console_log_file` | 当这里输入字符串路径时,所有 `Console::xxx()` 输出的日志都将保存到目标文件 | false |
### 子表 **light_cache** ### 子表 **light_cache**
@@ -73,17 +76,18 @@
| -------- | --------------------------- | ------ | | -------- | --------------------------- | ------ |
| `worker` | 跨进程缓存的存储工作进程 id | 0 | | `worker` | 跨进程缓存的存储工作进程 id | 0 |
### 子表 **sql_config** ### 子表 **mysql_config**
| 配置名称 | 说明 | 默认值 | | 配置名称 | 说明 | 默认值 |
| ------------------------ | ------------------------------ | ------------------------------------------------------------ | | ------------------------ | ------------------------------ | ------------------------------------------------------------ |
| `sql_host` | 数据库地址(留空则不使用数据库) | 空 | | `host` | 数据库地址(留空则不使用数据库) | 空 |
| `sql_port` | 数据库端口 | 3306 | | `port` | 数据库端口 | 3306 |
| `sql_username` | 连接数据库的用户名 | | | `username` | 连接数据库的用户名 | |
| `sql_database` | 要连接的数据库名 | | | `dbname` | 要连接的数据库名 | |
| `sql_password` | 数据库连接密码 | | | `password` | 数据库连接密码 | |
| `sql_options` | PDO 数据库的 options 参数 | `[PDO::ATTR_STRINGIFY_FETCHES => false,PDO::ATTR_EMULATE_PREPARES => false]` | | `options` | PDO 数据库的 options 参数 | `[PDO::ATTR_STRINGIFY_FETCHES => false,PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC]` |
| `sql_default_fetch_mode` | PDO 的 fetch 模式 | `PDO::FETCH_ASSOC` | | `pool_size` | MySQL 连接池大小 | 64 |
| `charset` | MySQL 字符集 | `utf8mb4` |
### 子表 **redis_config** ### 子表 **redis_config**
@@ -105,11 +109,13 @@
### 子表 onebot ### 子表 onebot
| 配置名称 | 说明 | 默认值 | | 配置名称 | 说明 | 默认值 |
| ----------------- | ------------------------------------------------------------ | ------ | | ------------------------ | ------------------------------------------------------------ | ------ |
| `status` | 是否开启 OneBot 标准机器人解析功能 | true | | `status` | 是否开启 OneBot 标准机器人解析功能 | true |
| `single_bot_mode` | 是否开启单机器人模式 | false | | `single_bot_mode` | 是否开启单机器人模式 | false |
| `message_level` | 机器人的 WebSocket 事件在 Swoole 原生事件 `@OnMessageEvent` 中的等级(越高说明越被优先处理) | 99999 | | `message_level` | 机器人的 WebSocket 事件在 Swoole 原生事件 `@OnMessageEvent` 中的等级(越高说明越被优先处理) | 99 |
| `message_convert_string` | 是否将数组格式的消息转换为字符串以保证与旧版本的兼容性 | true |
| `message_command_policy` | CQCommand命令匹配后执行流程`interrupt` 为不执行后续 CQMessage`continue` 为继续 | `interrupt` |
### 子表 remote_terminal ### 子表 remote_terminal

View File

@@ -70,5 +70,9 @@
| E00068 | 模块解包时无法正常拷贝文件 | 检查文件夹是否正常可以创建和写入。 | | E00068 | 模块解包时无法正常拷贝文件 | 检查文件夹是否正常可以创建和写入。 |
| E00069 | 框架不能启动两个 ConsoleApplication 实例 | 不要重复使用 `new ConsoleApplication()`。 | | E00069 | 框架不能启动两个 ConsoleApplication 实例 | 不要重复使用 `new ConsoleApplication()`。 |
| E00070 | 框架找不到 `zm_data` 目录 | 检查配置中指定的 `zm_data` 目录是否存在。 | | E00070 | 框架找不到 `zm_data` 目录 | 检查配置中指定的 `zm_data` 目录是否存在。 |
| E00071 | 框架找不到对应类型的 API 调用类 | 检查 `getExtendedAPI($name)` 传入的 `$name` 是否正确 |
| E00072 | 上下文无法找到 | 检查上下文环境,如是否处于协程环境中 |
| E00073 | 在类中找不到方法 | 检查调用对象是否存在对应的方法method或检查是否插入了对应的macro宏方法 |
| E00074 | 参数非法 | 检查调用的参数是否正常(此处可能有多处问题,请看具体调用栈炸掉的地方) |
| E99999 | 未知错误 | | | E99999 | 未知错误 | |

View File

@@ -49,20 +49,22 @@ docker run -it --rm -v $(pwd):/app/ -p 20001:20001 zmbot/swoole vendor/bin/start
```verilog ```verilog
$ vendor/bin/start server $ vendor/bin/start server
host: 0.0.0.0 | port: 20001 =================================================================
log_level: 2 | version: 2.0.0 working_dir: /app/zhamao-framework-starter
config: global.php | worker_num: 4 listen: 0.0.0.0:20001 | worker: 4 (auto)
working_dir: /app/zhamao-framework environment: default | log_level: 2
______ version: 2.7.0 | master_pid: 28449
|__ / |__ __ _ _ __ ___ __ _ ___ =================================================================
/ /| '_ \ / _` | '_ ` _ \ / _` |/ _ \ ______
/ /_| | | | (_| | | | | | | (_| | (_) | |__ / |__ __ _ _ __ ___ __ _ ___
/____|_| |_|\__,_|_| |_| |_|\__,_|\___/ / /| '_ \ / _` | '_ ` _ \ / _` |/ _ \
/ /_| | | | (_| | | | | | | (_| | (_) |
/____|_| |_|\__,_|_| |_| |_|\__,_|\___/
[14:27:31] [S] [#3] Worker #3 [03-20 22:30:56] [S] [#1] Worker #1 started
[14:27:31] [S] [#0] Worker #0 [03-20 22:30:56] [S] [#2] Worker #2 started
[14:27:31] [S] [#2] Worker #2 [03-20 22:30:56] [S] [#3] Worker #3 started
[14:27:31] [S] [#1] Worker #1 [03-20 22:30:56] [S] [#0] Worker #0 started
``` ```
单纯运行 炸毛框架 后,如果不部署或安装启动任何机器人客户端的话,仅仅相当于启动了一个 监听 20001 端口的WebSoket + HTTP 服务器。你可以通过浏览器访问http://127.0.0.1:20001 ,或者你部署到了服务器后需要输入服务器地址。 单纯运行 炸毛框架 后,如果不部署或安装启动任何机器人客户端的话,仅仅相当于启动了一个 监听 20001 端口的WebSoket + HTTP 服务器。你可以通过浏览器访问http://127.0.0.1:20001 ,或者你部署到了服务器后需要输入服务器地址。

37
docs/guide/upgrade.md Normal file
View File

@@ -0,0 +1,37 @@
# 升级指南
因为框架在随着需求以及 Bug 在不断更新,所以在未来框架会发布新版本。为了方便从旧版本安装并使用框架的开发者无损更新到新版本,这里提供了升级版本上需要注意的事项。
## 版本约定
炸毛框架的版本号一般情况均按照 [Semantic Versioning 2.0.0](https://semver.org/) 标准进行滚动发行,规则简述如下:
假设版本号为 x.y.z
- `x` 为大版本,一般只有在发生完全无法兼容的更新时增加,需要开发者最重视。
- `y` 为小发行版本,默认情况下会新增组件功能,但会尽可能兼容旧版本,存在不兼容情况极少。
- `z` 为补丁版本,在不进行任何大功能更新情况下提供 Bug 的修复,完全兼容前版本。
例如,炸毛框架的 `2.4.2` 版本,在 `2.5.0` 发行后,框架提供了大量新组件,但是对旧版本的配置和组件完全兼容,无任何额外的说明,则可以直接升级。
## 升级方法
根据安装方法不同,升级的方法也不同。
框架安装方式有多种,但主要分为三类:
- Composer 加载库的方式
- 框架源码模式
- Phar 打包模式
在 Composer 加载库的方式下,一般是指使用命令 `composer require zhamao/framework``composer create-project zhamao/framework-starter` 的方式安装框架,框架的核心文件都在 `vendor` 目录下。
此方式安装的框架升级最方便,直接执行命令 `composer update` 即可。
框架源码模式安装一般为直接使用 `git clone` 框架本体的 GitHub 仓库或下载 master 分支安装,这种情况不可升级版本(或使用 `git pull` 拉取)。
Phar 打包模式更新则必须重新自行打包新版本,例如从 Composer 加载库方式打包的框架,则需在原目录使用 `composer update` 后再次打包一个新版本。
## 升级提示
如果在升级过程中遇到了提示,则可能是需要升级某些配置文件需要手动进行合并更新。如果提示了更新,建议到 `vendor/zhamao/framework/config/global.php` 框架的最新库内配置文件与 `config/global.php` 文件进行对比。

View File

@@ -1,9 +1,7 @@
# 介绍 # 介绍
> 本文档为炸毛框架 v2 版本,如需查看 v1 版本,[点我](https://docs-v1.zhamao.xin/)。
!!! tip "提示" !!! tip "提示"
编写文档需要较大精力,你也可以参与到本文档的建设中来,比如找错字,增加或更正内容,每页文档可直接点击右上方铅笔图标直接跳转至 GitHub 进行编辑,编辑后自动 Fork 并生成 Pull Request以此来贡献此文档 编写文档需要较大精力,你也可以参与到本文档的建设中来,比如找错字,增加或更正内容,每页文档可直接点击右上方铅笔图标直接跳转至 GitHub 进行编辑,编辑后自动 Fork 并生成 Pull Request以此来贡献此文档
炸毛框架使用 PHP 编写,采用 Swoole 扩展为基础,主要面向 API 服务聊天机器人OneBot 标准的机器人对接),包含 WebSocket、HTTP 等监听和请求库,用户代码采用模块化处理,使用注解可以方便地编写各类功能。 炸毛框架使用 PHP 编写,采用 Swoole 扩展为基础,主要面向 API 服务聊天机器人OneBot 标准的机器人对接),包含 WebSocket、HTTP 等监听和请求库,用户代码采用模块化处理,使用注解可以方便地编写各类功能。

File diff suppressed because one or more lines are too long

View File

@@ -4,11 +4,173 @@
同时此处将只使用 build 版本号进行区分。 同时此处将只使用 build 版本号进行区分。
## build 449 (2022-3-21)
- 新增 Composer 模块加载和分发模式
## build 448 (2022-3-20)
- 加快 build 命令的执行速度,取消进度条和提升性能
## build 447 (2022-3-20)
- 发布 2.7.0 正式版
## build 446 (2022-3-20)
- 新增 `./zhamao server` 下的 `--no-state-check` 参数,关闭“启动框架前的运行状态检查”功能
## build 445 (2022-3-20)
- 新增配置项 `runtime`.`annotation_reader_ignore`:支持注解解析器忽略注解的自定义
## build 444 (2022-3-20)
- 更改 `extra`.`exclude_annotate``zm`.`exclude-annotation-path`
## build 443 (2022-3-20)
- 修复注释空格的样式
## build 442 (2022-3-20)
- 修复打包模块后 `files` 的 autoload 项不能被解压和引入的 Bug
## build 441 (2022-3-20)
- 修复打包模块时命名空间与实际不一致的 Bug
## build 440 (2022-3-20)
- 新增方法宏Macroable
## build 439 (2022-3-19)
- 新增 PHP 8 Attribute 与注解同时支持的特性
## build 438 (2022-3-18)
- 修复 Response 类在 PHP 8.1 环境下的报错
## build 437 (2022-3-17)
- 修复 `ctx()` 可能会返回 null 的 Bug
## build 436 (2022-3-15)
- 新增 PHPStan 和 PHP CS Fixer 并优化全局代码
## build 435 (2022-3-13)
- 优化分离 WorkerManager 与 ProcessManager 的职责
- 新增 Ctrl+C 一次无法停止框架时多次 Ctrl+C 后可强行杀掉所有进程的功能
- `./zhamao server:stop` 新增参数 `--force`,使用 `SIGKILL` 强行杀掉所有进程
- 新增 AnnotationParser 对 `autoload-dev` 项中的 `psr-4` 默认检索条件
- 新增框架启动状态检测功能,如果已经启动了同样目录的框架,则会报错
- 新增“强制启用轮询模式启动热更新”功能(参数 `--polling-watch`
- 修复与 PHP 8.1 的兼容性
- 对 DaemonCommand 进行优化,与 ServerCommand 效果相同
- 修复 `autoload`.`psr-4` 不存在时报错的 Bug
- 新增框架停止时 Worker 退出回显状态码
- 新增 inotify 判断模式,如果使用 `--watch` 检测到没有安装 inotify则自动使用轮询模式
## build 434 (2022-1-8)
- 修复框架在 PHP 8.1 下运行时的一些问题
- 新增 Console 日志输出到文件的功能
## build 433 (2021-12-28)
- 修复 OneBotV11 因 IDE 自动优化导致 API 接口发生变化的问题
## build 432 (2021-12-25)
- 新增 GoCqhttpAPI 包,用于支持额外的 OneBot ActionAPI
- 修复 MySQL 查询器中 `fetchOne()` 方法无法正确返回值的 Bug
- 修复 Swoole Hook 因配置不当无法正确使用的 Bug
## build 431 (2021-12-22)
- 修复 Issue #50
- 新增 PhpStorm IDE 直接运行框架的脚本
## build 430 (2021-12-8)
- 删除调试信息
- 修复 #56 中关于数据库组件的 Bug
## build 429 (2021-12-7)
- 新增配置项 `onebot`.`message_command_policy`
- 新增 CQCommand 阻断策略的自定义配置功能
- 修复 CQAfter 无法正常使用的 bug #53
## build 428 (2021-11-16)
- 修复 `ctx()->waitMessage()` 在 array 消息模式下无法正确返回消息字符串的问题
- 新增 `ctx()->getArrayMessage()``ctx()->getStringMessage()` 两个方法
- 修复注解事件 `CQCommand``CQMessage` 在 array 消息模式下无法正确解析的 Bug
## build 427 (2021-11-16)
- 新增全局中间件,可在全局配置文件中设置
- 修复部分 Typo
- 新增指令 `server:status``server:reload``server:stop` 可用在新开终端中查看框架运行状态、重启和退出
- 新增支持 `array` 格式的消息
- 上下文 Context 对象新增 `getOriginMessage()` 用于获取原消息,`getMessage()` 如果在设置了转换后,将默认转换消息为字符串格式保持与旧模块兼容
- OneBot API 新增全局过滤器,可用作 Action 过滤重写等操作
- 配置文件新增 `runtime.reload_delay_time`,用于可配置重载 Worker 等待的时间(毫秒)
- 配置文件新增 `runtime.global_middleware_binding`,用于配置全局中间件
- 配置文件新增 `onebot.message_convert_string`,用于配置是否转换数组格式为字符串,保证与前版本的兼容性(默认为 true
- MessageUtil 消息工具类新增方法:`strToArray($msg, bool $ignore_space = true, bool $trim_text = false)`
- MessageUtil 消息工具类新增方法:`arrayToStr(array $array)`
- 新增框架启动多次监测功能,无法使用同一个框架项目同时启动两个框架
## build 426 (2021-11-10)
- 修复 CQ 码的解析函数 Bug#52
## build 425 (2021-11-3)
- 删除未实际应用功能的配置参数
- 修复 reload 时会断开 WebSocket 连接且导致进程崩溃的 Bug
## build 424 (2021-11-2)
- 新增 InstantModule 类、ZMServer 类、ModuleBase 类
- 配置文件新增 `runtime.reload_kill_connect``runtime.global_middleware_binding` 选项
- 修复部分情况下闭包事件分发时崩溃的 bug
- 新增内部方法 `_zm_env_check`
- 调整默认的 OneBot 模块对应的等级从 99999 调整为 99
- 新增导出框架运行参数的列表功能
## build 423 (2021-10-17)
- 修复 PHP 7.2 ~ 7.3 下无法使用新版 MySQL 组件的 bug
## build 422 (2021-10-6)
- 修复 `script_` 前缀无法被排除加载模块的 bug
- 修复 MySQL 组件的依赖问题
## build 421 (2021-9-11)
- 删除多余的调试信息
## build 420 (2021-9-11)
- 修复 OneBot 事件无法响应的 bug
- 新增部分 EventDispatcher 触发的事件 debug 日志
## build 419 (2021-9-11)
- 修复 DB 模块在未连接数据库的时候抛出未知异常
- 修复部分情况下打包模块出现的错误
## build 418 (2021-9-10) ## build 418 (2021-9-10)
- 修复 ZMAtomic 在 test 环境下的 bug - 修复 ZMAtomic 在 test 环境下的 bug
- 修复 MessageUtil 的报错 - 修复 MessageUtil 的报错
-
## build 417 (2021-8-29) ## build 417 (2021-8-29)

View File

@@ -2,6 +2,23 @@
这里将会记录各个主版本的框架升级后,涉及 `global.php` 的更新日志,你可以根据这里描述的内容与你的旧配置文件进行合并。 这里将会记录各个主版本的框架升级后,涉及 `global.php` 的更新日志,你可以根据这里描述的内容与你的旧配置文件进行合并。
## v2.7.0 (build 447)
- 新增 `$config['runtime']` 下的 `annotation_reader_ignore` 项。
## v2.6.6 (build 434)
- 新增 `$config['runtime']` 下的 `save_console_log_file` 项。
## v2.6.0 (build 427)
- 新增 `$config['runtime']` 下的 `reload_delay_time``global_middleware_binding` 项。
- 新增 `$config['onebot']` 下的 `message_convert_string` 项。
## v2.5.1 (build 417)
- 新增 `$config['runtime']` 下的 `middleware_error_policy` 选项。
## v2.5.0 (build 413) ## v2.5.0 (build 413)
- 新增 `$config['runtime']` 运行时设置。 - 新增 `$config['runtime']` 运行时设置。

View File

@@ -1,5 +1,176 @@
# 更新日志v2 版本) # 更新日志v2 版本)
## v2.7.2build 449
> 更新时间2022.3.21
- 新增 Composer 模块加载和分发模式
## v2.7.1build 448
> 更新时间2022.3.20
- 加快 build 命令的执行速度,取消进度条和提升性能
## v2.7.0build 447
> 更新时间2022.3.20
- 优化分离 WorkerManager 与 ProcessManager 的职责
- 新增 Ctrl+C 一次无法停止框架时多次 Ctrl+C 后可强行杀掉所有进程的功能
- `./zhamao server:stop` 新增参数 `--force`,使用 `SIGKILL` 强行杀掉所有进程
- 新增 AnnotationParser 对 `autoload-dev` 项中的 `psr-4` 默认检索条件
- 新增框架启动状态检测功能,如果已经启动了同样目录的框架,则会报错
- 新增“强制启用轮询模式启动热更新”功能(参数 `--polling-watch`
- 修复与 PHP 8.1 的兼容性
- 对 DaemonCommand 进行优化,与 ServerCommand 效果相同
- 修复 `autoload`.`psr-4` 不存在时报错的 Bug
- 新增框架停止时 Worker 退出回显状态码
- 新增 inotify 判断模式,如果使用 `--watch` 检测到没有安装 inotify则自动使用轮询模式
- 新增 PHPStan 和 PHP CS Fixer 并优化全局代码
- 修复 `ctx()` 可能会返回 null 的 Bug
- 修复 Response 类在 PHP 8.1 环境下的报错
- 新增 PHP 8 Attribute 与注解同时支持的特性
- 新增方法宏Macroable
- 修复打包模块时命名空间与实际不一致的 Bug
- 修复打包模块后 `files` 的 autoload 项不能被解压和引入的 Bug
- 修复注释空格的样式
- 更改 `extra`.`exclude_annotate``zm`.`exclude-annotation-path`
- 新增配置项 `runtime`.`annotation_reader_ignore`:支持注解解析器忽略注解的自定义
- 新增 `./zhamao server` 下的 `--no-state-check` 参数,关闭“启动框架前的运行状态检查”功能
## v2.6.6build 434
> 更新时间2022.1.8
- 修复框架在 PHP 8.1 下运行时的一些问题
- 新增 Console 日志输出到文件的功能
## v2.6.5build 433
> 更新时间2021.12.28
- 修复 OneBotV11 因 IDE 自动优化导致 API 接口发生变化的问题
## v2.6.4build 432
> 更新时间2021.12.25
- 新增 GoCqhttpAPI 包,用于支持额外的 OneBot ActionAPI
- 修复 MySQL 查询器中 `fetchOne()` 方法无法正确返回值的 Bug
- 修复 Swoole Hook 因配置不当无法正确使用的 Bug
- 修复 Issue #50
- 新增 PhpStorm IDE 直接运行框架的脚本
## v2.6.3 (build 430)
> 更新时间2021.12.8
- 删除调试信息
- 修复 #56 中关于数据库组件的 Bug
## v2.6.2 (build 429)
> 更新时间2021.12.7
- 新增配置项 `onebot`.`message_command_policy`
- 新增 CQCommand 阻断策略的自定义配置功能
- 修复 CQAfter 无法正常使用的 bug #53
## v2.6.1 (build 428)
> 更新时间2021.11.16
- 修复 ctx()->waitMessage() 在 array 消息模式下无法正确返回消息字符串的问题
- 新增 ctx()->getArrayMessage() 和 ctx()->getStringMessage() 两个方法
- 修复注解事件 CQCommand 和 CQMessage 在 array 消息模式下无法正确解析的 Bug
## v2.6.0 (build 427)
> 更新时间2021.11.16
- 新增全局中间件,可在全局配置文件中设置
- 修复部分 Typo
- 新增指令 `server:status``server:reload``server:stop` 可用在新开终端中查看框架运行状态、重启和退出
- 新增支持 `array` 格式的消息
- 上下文 Context 对象新增 `getOriginMessage()` 用于获取原消息,`getMessage()` 如果在设置了转换后,将默认转换消息为字符串格式保持与旧模块兼容
- OneBot API 新增全局过滤器,可用作 Action 过滤重写等操作
- 配置文件新增 `runtime.reload_delay_time`,用于可配置重载 Worker 等待的时间(毫秒)
- 配置文件新增 `runtime.global_middleware_binding`,用于配置全局中间件
- 配置文件新增 `onebot.message_convert_string`,用于配置是否转换数组格式为字符串,保证与前版本的兼容性(默认为 true
- MessageUtil 消息工具类新增方法:`strToArray($msg, bool $ignore_space = true, bool $trim_text = false)`
- MessageUtil 消息工具类新增方法:`arrayToStr(array $array)`
- 新增框架启动多次监测功能,无法使用同一个框架项目同时启动两个框架
## v2.5.8 (build 426)
> 更新时间2021.11.10
- 修复 CQ 码的解析函数 Bug#52
## v2.5.7 (build 425)
> 更新时间2021.11.3
- 调低 OneBot 相关事件在 Swoole 的优先级
- 修复部分情况下闭包事件函数分发时引发的崩溃 bug
- 修复 reload 时会断开 WebSocket 连接且导致进程崩溃的 bug
## v2.5.6 (build 423)
> 更新时间2021.10.17
- 修复 PHP 7.2 ~ 7.3 下无法使用新版 MySQL 组件的 bug
## v2.5.5 (build 422)
> 更新时间2021.10.6
- 修复 `script_` 前缀无法被排除加载模块的 bug
- 修复 MySQL 组件的依赖问题
## v2.5.4 (buidl 421)
> 更新时间2021.9.11
- 删除多余的调试信息
## v2.5.3 (build 420)
> 更新时间2021.9.11
- 修复 DB 模块在未连接数据库的时候抛出未知异常
- 修复部分情况下打包模块出现的错误
- 修复 OneBot 事件无法响应的 bug
- 新增部分 EventDispatcher 触发的事件 debug 日志
## v2.5.2 (build 418)
> 更新时间2021.9.10
- 新增 AnnotationException统一框架内部的抛出异常的类型
- 新增 AnnotationParser 下的 `verifyMiddlewares()` 方法
- 私有化 CQAPI 类下的内部方法
- 将 WebSocket API 响应超时时间从 60 秒缩短为 30 秒
- 修复 DB 类不能使用旧查询器的 bug
- 统一 DB 类下抛出 Exception 的类型为 ZMException 的子类
- EventDispatcher 新增对 `middleware_error_policy` 的处理段
- 配置文件下 `runtime` 新增 `middleware_error_policy` 字段
- 将 LightCache 组件抛出的异常改为 LightCacheException
- ModuleManager 修复改配置的 `load_path` 不生效的 bug
- 修复打包时生成的 Phar Autoload 列表出错的 bug
- 将配置的 override 改为 overwrite
- 新增解包时忽略依赖的选项(`--ignore-depends`
- 删除众多调试日志,修改部分调试日志为 debug 级别的输出
- 修改 `ZM\MySQL\MySQLManager` 下的 `getConnection()``getWrapper()`
- MySQLPool 对象新增 `getCount()` 方法
- 新增 MySQLQueryBuilder 类(`doctrine/dbal` 的 wrapper 类)
- 修复 MySQLStatement 封装原 dbal 组件时与连接池不兼容的 bug
- 新增 MySQLStatementWrapper 类
- 完善 MySQLWrapper 类,用作主要的查询对象控制类
- 编写外部插件加载方式Phar 热加载功能)
- 修复 `ZMUtil::getClassesPsr4()` 方法在遇到空扩展名文件时的报错
## v2.5.1 (build 416) ## v2.5.1 (build 416)
> 更新时间2021.7.9 > 更新时间2021.7.9
@@ -379,4 +550,4 @@
> 更新时间2020.12.23 > 更新时间2020.12.23
已发布正式版。 已发布正式版。

2
install-runtime.sh Normal file → Executable file
View File

@@ -55,4 +55,4 @@ if [ $? -ne 0 ]; then
fi fi
echo "成功下载!" && \ echo "成功下载!" && \
echo -e "PHP使用\truntime/php -v" && \ echo -e "PHP使用\truntime/php -v" && \
echo -e "Composer使用\truntime/composer" echo -e "Composer使用\truntime/composer"

26
instant-demo.php Normal file
View File

@@ -0,0 +1,26 @@
<?php
declare(strict_types=1);
require_once 'vendor/autoload.php';
use ZM\Annotation\CQ\CQCommand;
use ZM\Annotation\Swoole\OnOpenEvent;
use ZM\ConnectionManager\ConnectionObject;
use ZM\Console\Console;
use ZM\Module\InstantModule;
use ZM\ZMServer;
$weather = new InstantModule('weather');
$weather->onEvent(OnOpenEvent::class, ['connect_type' => 'qq'], function (ConnectionObject $conn) {
Console::info('机器人 ' . $conn->getOption('connect_id') . ' 已连接!');
});
$weather->onEvent(CQCommand::class, ['match' => '你好'], function () {
ctx()->reply('hello呀');
});
$app = new ZMServer('app-name');
$app->addModule($weather);
$app->run();

View File

@@ -14,12 +14,13 @@ theme:
accent: indigo accent: indigo
features: features:
- navigation.tabs - navigation.tabs
- navigation.sections
extra_javascript: extra_javascript:
- https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/highlight.min.js - javascripts/library/highlight.min.js
- javascripts/config.js - javascripts/config.js
extra_css: extra_css:
- assets/css/extra.css - assets/css/extra.css
- https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/styles/default.min.css - assets/css/library/default.min.css
plugins: plugins:
- search: - search:
lang: ja lang: ja
@@ -38,7 +39,7 @@ extra:
version: version:
provider: mike provider: mike
copyright: 'Copyright &copy; 2019 - 2021 CrazyBot Team&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="tx-switch"> copyright: 'Copyright &copy; 2019 - 2022 CrazyBot Team&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="tx-switch">
<button data-md-color-scheme="default"><code>默认模式</code></button> <button data-md-color-scheme="default"><code>默认模式</code></button>
<button data-md-color-scheme="slate"><code>暗黑模式</code></button> <button data-md-color-scheme="slate"><code>暗黑模式</code></button>
</span> </span>
@@ -66,6 +67,7 @@ nav:
- 基本配置: guide/basic-config.md - 基本配置: guide/basic-config.md
- 编写模块: guide/write-module.md - 编写模块: guide/write-module.md
- 注册事件响应: guide/register-event.md - 注册事件响应: guide/register-event.md
- 升级指南: guide/upgrade.md
- 错误码对照表: guide/errcode.md - 错误码对照表: guide/errcode.md
- 事件和注解: - 事件和注解:
- 事件和注解: event/index.md - 事件和注解: event/index.md
@@ -77,48 +79,57 @@ nav:
- 事件分发器: event/event-dispatcher.md - 事件分发器: event/event-dispatcher.md
- 框架组件: - 框架组件:
- 框架组件: component/index.md - 框架组件: component/index.md
- 上下文: component/context.md
- 聊天机器人组件: - 聊天机器人组件:
- 机器人 API: component/bot/robot-api.md - 机器人动作V12: component/bot/robot-api-12.md
- 机器人动作V11: component/bot/robot-api.md
- CQ 码(多媒体消息): component/bot/cqcode.md - CQ 码(多媒体消息): component/bot/cqcode.md
- 机器人消息处理: component/bot/message-util.md - 机器人消息处理: component/bot/message-util.md
- Token 验证: component/bot/access-token.md - Token 验证: component/bot/access-token.md
- 图灵机器人 API: component/bot/turing-api.md - 图灵机器人 API: component/bot/turing-api.md
- 存储: - 存储:
- LightCache 轻量缓存: component/store/light-cache.md - LightCache 轻量缓存: component/store/light-cache.md
- MySQL 查询器: component/store/mysql.md - MySQL 查询器:
- 简介: component/store/mysql/mysql.md
- 配置: component/store/mysql/config.md
- 执行 SQL 语句: component/store/mysql/common-query.md
- MySQL 查询器(废弃): component/store/mysql-db.md - MySQL 查询器(废弃): component/store/mysql-db.md
- Redis 数据库: component/store/redis.md - Redis 数据库: component/store/redis.md
- ZMAtomic 原子计数器: component/store/atomics.md - ZMAtomic 原子计数器: component/store/atomics.md
- SpinLock 自旋锁: component/store/spin-lock.md - SpinLock 自旋锁: component/store/spin-lock.md
- 文件管理: component/store/data-provider.md - 文件管理: component/store/data-provider.md
- 通用组件:
- 上下文: component/common/context.md
- 协程池: component/common/coroutine-pool.md
- 单例类: component/common/singleton-trait.md
- ZMUtil 杂项: component/common/zmutil.md
- 全局方法: component/common/global-functions.md
- Console 终端: component/common/console.md
- TaskWorker 管理: component/common/task-worker.md
- Terminal 终端: component/common/remote-terminal.md
- EventTracer 事件追踪器: component/common/event-tracer.md
- HTTP 服务器工具类: - HTTP 服务器工具类:
- HTTP 和 WebSocket 客户端: component/zmrequest.md - HTTP 和 WebSocket 客户端: component/http/zmrequest.md
- HTTP 路由管理: component/route-manager.md - HTTP 路由管理: component/http/route-manager.md
- 模块/插件管理: - 模块/插件管理:
- 模块打包: component/module/module-pack.md - 模块打包: component/module/module-pack.md
- 模块解包: component/module/module-unpack.md - 模块解包: component/module/module-unpack.md
- 协程池: component/coroutine-pool.md
- 单例类: component/singleton-trait.md
- ZMUtil 杂项: component/zmutil.md
- 全局方法: component/global-functions.md
- Console 终端: component/console.md
- TaskWorker 管理: component/task-worker.md
- Terminal 终端: component/remote-terminal.md
- 进阶开发: - 进阶开发:
- 进阶开发: advanced/index.md - 进阶开发: advanced/index.md
- 框架剖析: advanced/framework-structure.md - 框架高级开发:
- 框架启动模式: advanced/custom-start.md - 框架剖析: advanced/framework-structure.md
- 手动安装环境: advanced/manually-install.md - 框架启动模式: advanced/custom-start.md
- 从 v1 升级: advanced/to-v2.md - 手动安装环境: advanced/manually-install.md
- 内部类文件手册: advanced/inside-class.md - 内部类文件手册: advanced/inside-class.md
- 接入 WebSocket 客户端: advanced/connect-ws-client.md - 框架多进程: advanced/multi-process.md
- 框架多进程: advanced/multi-process.md - TaskWorker 提高并发: advanced/task-worker.md
- TaskWorker 提高并发: advanced/task-worker.md
- 开发实战教程: - 开发实战教程:
- 接入 WebSocket 客户端: advanced/connect-ws-client.md
- 编写管理员才能触发的功能: advanced/example/admin.md - 编写管理员才能触发的功能: advanced/example/admin.md
- 接入青云客聊天API: advanced/example/integrate-qingyunke-chatbot.md
- 开发天气机器人: advanced/example/weather-bot.md
- FAQ: - FAQ:
- FAQ: faq/FAQ.md - FAQ: faq/FAQ.md
- 从 v1 升级: faq/to-v2.md
- 框架常见问题(持续更新): faq/usual-question.md - 框架常见问题(持续更新): faq/usual-question.md
- 启动时报错 Address already in use: faq/address-already-in-use.md - 启动时报错 Address already in use: faq/address-already-in-use.md
- 出现 deadlock 字样: faq/display-deadlock.md - 出现 deadlock 字样: faq/display-deadlock.md

7
phpstan.neon Normal file
View File

@@ -0,0 +1,7 @@
parameters:
reportUnmatchedIgnoredErrors: false
level: 0
paths:
- ./src/
ignoreErrors:
- '#Used constant OS_TYPE_(LINUX|WINDOWS) not found#'

View File

@@ -1,8 +1,11 @@
<?php <?php
declare(strict_types=1);
namespace Custom\Annotation; namespace Custom\Annotation;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
use ZM\Annotation\Interfaces\CustomAnnotation; use ZM\Annotation\Interfaces\CustomAnnotation;
@@ -10,11 +13,17 @@ use ZM\Annotation\Interfaces\CustomAnnotation;
/** /**
* Class CustomAnnotation * Class CustomAnnotation
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("ALL") * @Target("ALL")
* @package Custom\Annotation
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_ALL)]
class Example extends AnnotationBase implements CustomAnnotation class Example extends AnnotationBase implements CustomAnnotation
{ {
/** @var string */ /** @var string */
public $str = ''; public $str = '';
public function __construct($str = '')
{
$this->str = $str;
}
} }

View File

@@ -1,11 +1,10 @@
<?php /** @noinspection PhpFullyQualifiedNameUsageInspection */ #plain <?php
//这里写你的全局函数 declare(strict_types=1);
/**
* @param callable $func use ZM\Utils\CoroutinePool;
* @param string $name
* @noinspection PhpUnused function pgo(callable $func, string $name = 'default')
*/ {
function pgo(callable $func, $name = "default") { CoroutinePool::go($func, $name);
\ZM\Utils\CoroutinePool::go($func, $name);
} }

View File

@@ -1,19 +1,22 @@
<?php /** @noinspection PhpMissingReturnTypeInspection */ <?php
declare(strict_types=1);
namespace Module\Example; namespace Module\Example;
use ZM\Annotation\CQ\CQBefore; use ZM\Annotation\CQ\CQBefore;
use ZM\Annotation\CQ\CQCommand;
use ZM\Annotation\CQ\CQMessage; use ZM\Annotation\CQ\CQMessage;
use ZM\Annotation\Http\Middleware; use ZM\Annotation\Http\Middleware;
use ZM\Annotation\Http\RequestMapping;
use ZM\Annotation\Swoole\OnCloseEvent; use ZM\Annotation\Swoole\OnCloseEvent;
use ZM\Annotation\Swoole\OnOpenEvent; use ZM\Annotation\Swoole\OnOpenEvent;
use ZM\Annotation\Swoole\OnRequestEvent; use ZM\Annotation\Swoole\OnRequestEvent;
use ZM\API\CQ; use ZM\API\CQ;
use ZM\API\OneBotV11;
use ZM\API\TuringAPI; use ZM\API\TuringAPI;
use ZM\ConnectionManager\ConnectionObject; use ZM\ConnectionManager\ConnectionObject;
use ZM\Console\Console; use ZM\Console\Console;
use ZM\Annotation\CQ\CQCommand;
use ZM\Annotation\Http\RequestMapping;
use ZM\Event\EventDispatcher; use ZM\Event\EventDispatcher;
use ZM\Exception\InterruptException; use ZM\Exception\InterruptException;
use ZM\Module\QQBot; use ZM\Module\QQBot;
@@ -23,7 +26,6 @@ use ZM\Utils\ZMUtil;
/** /**
* Class Hello * Class Hello
* @package Module\Example
* @since 2.0 * @since 2.0
*/ */
class Hello class Hello
@@ -32,45 +34,57 @@ class Hello
* 默认的图片监听路由对应目录,如需要使用可取消下面的注释,把上面的 /* 换成 /** * 默认的图片监听路由对应目录,如需要使用可取消下面的注释,把上面的 /* 换成 /**
* @OnStart(-1) * @OnStart(-1)
*/ */
//public function onStart() { // public function onStart() {
// \ZM\Http\RouteManager::addStaticFileRoute("/images/", \ZM\Utils\DataProvider::getWorkingDir()."/zm_data/images/"); // \ZM\Http\RouteManager::addStaticFileRoute("/images/", \ZM\Utils\DataProvider::getWorkingDir()."/zm_data/images/");
//} // }
/** /**
* 使用命令 .reload 发给机器人远程重载,注意将 user_id 换成你自己的 QQ * 使用命令 .reload 发给机器人远程重载,注意将 user_id 换成你自己的 QQ
* @CQCommand(".reload",user_id=627577391) * @CQCommand(".reload",user_id=627577391)
*/ */
public function reload() { public function reload()
ctx()->reply("重启中..."); {
ctx()->reply('重启中...');
ZMUtil::reload(); ZMUtil::reload();
} }
/** /**
* @CQCommand("我是谁") * @CQCommand("我是谁")
*/ */
public function whoami() { public function whoami()
$user = ctx()->getRobot()->getLoginInfo(); {
return "你是" . $user["data"]["nickname"] . "QQ号是" . $user["data"]["user_id"]; $bot = ctx()->getRobot()->getLoginInfo();
$bot_id = $bot['data']['user_id'];
$r = OneBotV11::get($bot_id);
$QQid = ctx()->getUserId();
$nick = $r->getStrangerInfo($QQid)['data']['nickname'];
return '你是' . $nick . 'QQ号是' . $QQid;
} }
/** /**
* 向机器人发送"你好啊",也可回复这句话 * 向机器人发送"你好啊",也可回复这句话
* @CQCommand(match="你好",alias={"你好啊","你是谁"}) * @CQCommand(match="你好",alias={"你好啊","你是谁"})
*/ */
public function hello() { public function hello()
return "你好啊,我是由炸毛框架构建的机器人!"; {
return '你好啊,我是由炸毛框架构建的机器人!';
} }
/** /**
* 一个最基本的第三方 API 接口使用示例 * 一个最基本的第三方 API 接口使用示例
* @CQCommand("一言") * @CQCommand("一言")
*/ */
public function hitokoto() { public function hitokoto()
$api_result = ZMRequest::get("https://v1.hitokoto.cn/"); {
if ($api_result === false) return "接口请求出错,请稍后再试!"; $api_result = ZMRequest::get('https://v1.hitokoto.cn/');
if ($api_result === false) {
return '接口请求出错,请稍后再试!';
}
$obj = json_decode($api_result, true); $obj = json_decode($api_result, true);
if ($obj === null) return "接口解析出错!可能返回了非法数据!"; if ($obj === null) {
return $obj["hitokoto"] . "\n----「" . $obj["from"] . ""; return '接口解析出错!可能返回了非法数据!';
}
return $obj['hitokoto'] . "\n----「" . $obj['from'] . '」';
} }
/** /**
@@ -78,33 +92,36 @@ class Hello
* @CQCommand(start_with="机器人",end_with="机器人",message_type="group") * @CQCommand(start_with="机器人",end_with="机器人",message_type="group")
* @CQMessage(message_type="private",level=1) * @CQMessage(message_type="private",level=1)
*/ */
public function turingAPI() { public function turingAPI()
{
$user_id = ctx()->getUserId(); $user_id = ctx()->getUserId();
$api = ""; // 请在这里填入你的图灵机器人的apikey $api = ''; // 请在这里填入你的图灵机器人的apikey
if ($api === "") return false; //如果没有填入apikey则此功能关闭 if ($api === '') {
return false;
} // 如果没有填入apikey则此功能关闭
if (($this->_running_annotation ?? null) instanceof CQCommand) { if (($this->_running_annotation ?? null) instanceof CQCommand) {
$msg = ctx()->getFullArg("我在!有什么事吗?"); $msg = ctx()->getFullArg('我在!有什么事吗?');
} else { } else {
$msg = ctx()->getMessage(); $msg = ctx()->getMessage();
} }
ctx()->setMessage($msg); ctx()->setMessage($msg);
if (MessageUtil::matchCommand($msg, ctx()->getData())->status === false) { if (MessageUtil::matchCommand($msg, ctx()->getData())->status === false) {
return TuringAPI::getTuringMsg($msg, $user_id, $api); return TuringAPI::getTuringMsg($msg, $user_id, $api);
} else {
QQBot::getInstance()->handle(ctx()->getData(), ctx()->getCache("level") + 1);
//执行嵌套消息,递归层级+1
return true;
} }
QQBot::getInstance()->handle(ctx()->getData(), ctx()->getCache('level') + 1);
// 执行嵌套消息,递归层级+1
return true;
} }
/** /**
* 响应at机器人的消息 * 响应at机器人的消息
* @CQBefore("message") * @CQBefore("message")
*/ */
public function changeAt() { public function changeAt()
{
if (MessageUtil::isAtMe(ctx()->getMessage(), ctx()->getRobotId())) { if (MessageUtil::isAtMe(ctx()->getMessage(), ctx()->getRobotId())) {
$msg = str_replace(CQ::at(ctx()->getRobotId()), "", ctx()->getMessage()); $msg = str_replace(CQ::at(ctx()->getRobotId()), '', ctx()->getMessage());
ctx()->setMessage("机器人" . $msg); ctx()->setMessage('机器人' . $msg);
Console::info(ctx()->getMessage()); Console::info(ctx()->getMessage());
} }
return true; return true;
@@ -118,15 +135,16 @@ class Hello
* @CQCommand(pattern="*从*到*的随机数") * @CQCommand(pattern="*从*到*的随机数")
* @return string * @return string
*/ */
public function randNum() { public function randNum()
{
// 获取第一个数字类型的参数 // 获取第一个数字类型的参数
$num1 = ctx()->getNumArg("请输入第一个数字"); $num1 = ctx()->getNumArg('请输入第一个数字');
// 获取第二个数字类型的参数 // 获取第二个数字类型的参数
$num2 = ctx()->getNumArg("请输入第二个数字"); $num2 = ctx()->getNumArg('请输入第二个数字');
$a = min(intval($num1), intval($num2)); $a = min(intval($num1), intval($num2));
$b = max(intval($num1), intval($num2)); $b = max(intval($num1), intval($num2));
// 回复用户结果 // 回复用户结果
return "随机数是:" . mt_rand($a, $b); return '随机数是:' . mt_rand($a, $b);
} }
/** /**
@@ -134,8 +152,9 @@ class Hello
* @RequestMapping("/httpTimer") * @RequestMapping("/httpTimer")
* @Middleware("timer") * @Middleware("timer")
*/ */
public function timer() { public function timer()
return "This page is used as testing TimerMiddleware! Do not use it in production."; {
return 'This page is used as testing TimerMiddleware! Do not use it in production.';
} }
/** /**
@@ -143,8 +162,9 @@ class Hello
* @RequestMapping("/index") * @RequestMapping("/index")
* @RequestMapping("/") * @RequestMapping("/")
*/ */
public function index() { public function index()
return "Hello Zhamao!"; {
return 'Hello Zhamao!';
} }
/** /**
@@ -153,8 +173,9 @@ class Hello
* @param $param * @param $param
* @return string * @return string
*/ */
public function paramGet($param) { public function paramGet($param)
return "Hello, " . $param["name"]; {
return 'Hello, ' . $param['name'];
} }
/** /**
@@ -162,17 +183,18 @@ class Hello
* @OnOpenEvent("qq") * @OnOpenEvent("qq")
* @param $conn * @param $conn
*/ */
public function onConnect(ConnectionObject $conn) { public function onConnect(ConnectionObject $conn)
Console::info("机器人 " . $conn->getOption("connect_id") . " 已连接!"); {
Console::info('机器人 ' . $conn->getOption('connect_id') . ' 已连接!');
} }
/** /**
* 在机器人断开连接后向终端输出信息 * 在机器人断开连接后向终端输出信息
* @OnCloseEvent("qq") * @OnCloseEvent("qq")
* @param ConnectionObject $conn
*/ */
public function onDisconnect(ConnectionObject $conn) { public function onDisconnect(ConnectionObject $conn)
Console::info("机器人 " . $conn->getOption("connect_id") . " 已断开连接!"); {
Console::info('机器人 ' . $conn->getOption('connect_id') . ' 已断开连接!');
} }
/** /**
@@ -180,7 +202,8 @@ class Hello
* @OnRequestEvent(rule="ctx()->getRequest()->server['request_uri'] == '/favicon.ico'",level=200) * @OnRequestEvent(rule="ctx()->getRequest()->server['request_uri'] == '/favicon.ico'",level=200)
* @throws InterruptException * @throws InterruptException
*/ */
public function onRequest() { public function onRequest()
{
EventDispatcher::interrupt(); EventDispatcher::interrupt();
} }
@@ -188,8 +211,9 @@ class Hello
* 框架会默认关闭未知的WebSocket链接因为这个绑定的事件你可以根据你自己的需求进行修改 * 框架会默认关闭未知的WebSocket链接因为这个绑定的事件你可以根据你自己的需求进行修改
* @OnOpenEvent("default") * @OnOpenEvent("default")
*/ */
public function closeUnknownConn() { public function closeUnknownConn()
Console::info("Unknown connection , I will close it."); {
Console::info('Unknown connection , I will close it.');
server()->disconnect(ctx()->getConnection()->getFd()); server()->disconnect(ctx()->getConnection()->getFd());
} }
} }

View File

@@ -1,5 +1,7 @@
<?php <?php
declare(strict_types=1);
namespace Module\Middleware; namespace Module\Middleware;
use Exception; use Exception;
@@ -13,7 +15,6 @@ use ZM\Http\MiddlewareInterface;
/** /**
* Class TimerMiddleware * Class TimerMiddleware
* 示例中间件:用于统计路由函数运行时间用的 * 示例中间件:用于统计路由函数运行时间用的
* @package Module\Middleware
* @MiddlewareClass("timer") * @MiddlewareClass("timer")
*/ */
class TimerMiddleware implements MiddlewareInterface class TimerMiddleware implements MiddlewareInterface
@@ -22,9 +23,9 @@ class TimerMiddleware implements MiddlewareInterface
/** /**
* @HandleBefore() * @HandleBefore()
* @return bool
*/ */
public function onBefore(): bool { public function onBefore(): bool
{
$this->starttime = microtime(true); $this->starttime = microtime(true);
return true; return true;
} }
@@ -32,17 +33,18 @@ class TimerMiddleware implements MiddlewareInterface
/** /**
* @HandleAfter() * @HandleAfter()
*/ */
public function onAfter() { public function onAfter()
Console::info("Using " . round((microtime(true) - $this->starttime) * 1000, 2) . " ms."); {
Console::info('Using ' . round((microtime(true) - $this->starttime) * 1000, 3) . ' ms.');
} }
/** /**
* @HandleException(\Exception::class) * @HandleException(\Exception::class)
* @param Exception $e
* @throws Exception * @throws Exception
*/ */
public function onException(Exception $e) { public function onException(Exception $e)
Console::error("Using " . round((microtime(true) - $this->starttime) * 1000, 2) . " ms but an Exception occurred."); {
Console::error('Using ' . round((microtime(true) - $this->starttime) * 1000, 3) . ' ms but an Exception occurred.');
throw $e; throw $e;
} }
} }

View File

@@ -1,11 +1,9 @@
<?php /** @noinspection PhpUnused */ <?php
/** @noinspection PhpMissingReturnTypeInspection */
declare(strict_types=1);
namespace ZM\API; namespace ZM\API;
use ZM\Console\Console; use ZM\Console\Console;
use ZM\Entity\CQObject; use ZM\Entity\CQObject;
@@ -16,12 +14,13 @@ class CQ
* @param $qq * @param $qq
* @return string * @return string
*/ */
public static function at($qq) { public static function at($qq)
if (is_numeric($qq) || $qq === "all") { {
return "[CQ:at,qq=" . $qq . "]"; if (is_numeric($qq) || $qq === 'all') {
return '[CQ:at,qq=' . $qq . ']';
} }
Console::warning(zm_internal_errcode("E00035") . "传入的QQ号码($qq)错误!"); Console::warning(zm_internal_errcode('E00035') . "传入的QQ号码({$qq})错误!");
return " "; return ' ';
} }
/** /**
@@ -29,127 +28,130 @@ class CQ
* @param $id * @param $id
* @return string * @return string
*/ */
public static function face($id) { public static function face($id)
{
if (is_numeric($id)) { if (is_numeric($id)) {
return "[CQ:face,id=" . $id . "]"; return '[CQ:face,id=' . $id . ']';
} }
Console::warning(zm_internal_errcode("E00035") . "传入的face id($id)错误!"); Console::warning(zm_internal_errcode('E00035') . "传入的face id({$id})错误!");
return " "; return ' ';
} }
/** /**
* 发送图片 * 发送图片
* @param $file * @param $file
* @param bool $cache
* @param bool $flash
* @param bool $proxy
* @param int $timeout
* @return string * @return string
*/ */
public static function image($file, bool $cache = true, bool $flash = false, bool $proxy = true, int $timeout = -1) { public static function image($file, bool $cache = true, bool $flash = false, bool $proxy = true, int $timeout = -1)
{
return return
"[CQ:image,file=" . self::encode($file, true) . '[CQ:image,file=' . self::encode($file, true) .
(!$cache ? ",cache=0" : "") . (!$cache ? ',cache=0' : '') .
($flash ? ",type=flash" : "") . ($flash ? ',type=flash' : '') .
(!$proxy ? ",proxy=false" : "") . (!$proxy ? ',proxy=false' : '') .
($timeout != -1 ? (",timeout=" . $timeout) : "") . ($timeout != -1 ? (',timeout=' . $timeout) : '') .
"]"; ']';
} }
/** /**
* 发送语音 * 发送语音
* @param $file * @param $file
* @param bool $magic
* @param bool $cache
* @param bool $proxy
* @param int $timeout
* @return string * @return string
*/ */
public static function record($file, bool $magic = false, bool $cache = true, bool $proxy = true, int $timeout = -1) { public static function record($file, bool $magic = false, bool $cache = true, bool $proxy = true, int $timeout = -1)
{
return return
"[CQ:record,file=" . self::encode($file, true) . '[CQ:record,file=' . self::encode($file, true) .
(!$cache ? ",cache=0" : "") . (!$cache ? ',cache=0' : '') .
($magic ? ",magic=1" : "") . ($magic ? ',magic=1' : '') .
(!$proxy ? ",proxy=false" : "") . (!$proxy ? ',proxy=false' : '') .
($timeout != -1 ? (",timeout=" . $timeout) : "") . ($timeout != -1 ? (',timeout=' . $timeout) : '') .
"]"; ']';
} }
/** /**
* 发送短视频 * 发送短视频
* @param $file * @param $file
* @param bool $cache
* @param bool $proxy
* @param int $timeout
* @return string * @return string
*/ */
public static function video($file, bool $cache = true, bool $proxy = true, int $timeout = -1) { public static function video($file, bool $cache = true, bool $proxy = true, int $timeout = -1)
{
return return
"[CQ:video,file=" . self::encode($file, true) . '[CQ:video,file=' . self::encode($file, true) .
(!$cache ? ",cache=0" : "") . (!$cache ? ',cache=0' : '') .
(!$proxy ? ",proxy=false" : "") . (!$proxy ? ',proxy=false' : '') .
($timeout != -1 ? (",timeout=" . intval($timeout)) : "") . ($timeout != -1 ? (',timeout=' . $timeout) : '') .
"]"; ']';
} }
/** /**
* 发送投掷骰子(只能在单条回复中单独使用) * 发送投掷骰子(只能在单条回复中单独使用)
* @return string * @return string
*/ */
public static function rps() { public static function rps()
return "[CQ:rps]"; {
return '[CQ:rps]';
} }
/** /**
* 发送掷骰子表情(只能在单条回复中单独使用) * 发送掷骰子表情(只能在单条回复中单独使用)
* @return string * @return string
*/ */
public static function dice() { public static function dice()
return "[CQ:dice]"; {
return '[CQ:dice]';
} }
/** /**
* 戳一戳(原窗口抖动,仅支持好友消息使用) * 戳一戳(原窗口抖动,仅支持好友消息使用)
* @return string * @return string
*/ */
public static function shake() { public static function shake()
return "[CQ:shake]"; {
return '[CQ:shake]';
} }
/** /**
* 发送新的戳一戳 * 发送新的戳一戳
* @param $type * @param $type
* @param $id * @param $id
* @param string $name
* @return string * @return string
*/ */
public static function poke($type, $id, string $name = "") { public static function poke($type, $id, string $name = '')
return "[CQ:poke,type=$type,id=$id" . ($name != "" ? (",name=" . self::encode($name, true)) : "") . "]"; {
return "[CQ:poke,type={$type},id={$id}" . ($name != '' ? (',name=' . self::encode($name, true)) : '') . ']';
} }
/** /**
* 发送匿名消息 * 发送匿名消息
* @param int $ignore
* @return string * @return string
*/ */
public static function anonymous(int $ignore = 1) { public static function anonymous(int $ignore = 1)
return "[CQ:anonymous" . ($ignore != 1 ? ",ignore=0" : "") . "]"; {
return '[CQ:anonymous' . ($ignore != 1 ? ',ignore=0' : '') . ']';
} }
/** /**
* 发送链接分享(只能在单条回复中单独使用) * 发送链接分享(只能在单条回复中单独使用)
* @param $url * @param $url
* @param $title * @param $title
* @param null $content * @param null $content
* @param null $image * @param null $image
* @return string * @return string
*/ */
public static function share($url, $title, $content = null, $image = null) { public static function share($url, $title, $content = null, $image = null)
if ($content === null) $c = ""; {
else $c = ",content=" . self::encode($content, true); if ($content === null) {
if ($image === null) $i = ""; $c = '';
else $i = ",image=" . self::encode($image, true); } else {
return "[CQ:share,url=" . self::encode($url, true) . ",title=" . self::encode($title, true) . $c . $i . "]"; $c = ',content=' . self::encode($content, true);
}
if ($image === null) {
$i = '';
} else {
$i = ',image=' . self::encode($image, true);
}
return '[CQ:share,url=' . self::encode($url, true) . ',title=' . self::encode($title, true) . $c . $i . ']';
} }
/** /**
@@ -158,25 +160,25 @@ class CQ
* @param $id * @param $id
* @return string * @return string
*/ */
public static function contact($type, $id) { public static function contact($type, $id)
return "[CQ:contact,type=$type,id=$id]"; {
return "[CQ:contact,type={$type},id={$id}]";
} }
/** /**
* 发送位置 * 发送位置
* @param $lat * @param $lat
* @param $lon * @param $lon
* @param string $title
* @param string $content
* @return string * @return string
*/ */
public static function location($lat, $lon, string $title = "", string $content = "") { public static function location($lat, $lon, string $title = '', string $content = '')
return "[CQ:location" . {
",lat=" . self::encode($lat, true) . return '[CQ:location' .
",lon=" . self::encode($lon, true) . ',lat=' . self::encode($lat, true) .
($title != "" ? (",title=" . self::encode($title, true)) : "") . ',lon=' . self::encode($lon, true) .
($content != "" ? (",content=" . self::encode($content, true)) : "") . ($title != '' ? (',title=' . self::encode($title, true)) : '') .
"]"; ($content != '' ? (',content=' . self::encode($content, true)) : '') .
']';
} }
/** /**
@@ -191,101 +193,119 @@ class CQ
* $image 为音乐卡片的图片链接地址(可忽略) * $image 为音乐卡片的图片链接地址(可忽略)
* @param $type * @param $type
* @param $id_or_url * @param $id_or_url
* @param null $audio * @param null $audio
* @param null $title * @param null $title
* @param null $content * @param null $content
* @param null $image * @param null $image
* @return string * @return string
*/ */
public static function music($type, $id_or_url, $audio = null, $title = null, $content = null, $image = null) { public static function music($type, $id_or_url, $audio = null, $title = null, $content = null, $image = null)
{
switch ($type) { switch ($type) {
case "qq": case 'qq':
case "163": case '163':
case "xiami": case 'xiami':
return "[CQ:music,type=$type,id=$id_or_url]"; return "[CQ:music,type={$type},id={$id_or_url}]";
case "custom": case 'custom':
if ($title === null || $audio === null) { if ($title === null || $audio === null) {
Console::warning(zm_internal_errcode("E00035") . "传入CQ码实例的标题和音频链接不能为空"); Console::warning(zm_internal_errcode('E00035') . '传入CQ码实例的标题和音频链接不能为空');
return " "; return ' ';
} }
if ($content === null) $c = ""; if ($content === null) {
else $c = ",content=" . self::encode($content, true); $c = '';
if ($image === null) $i = ""; } else {
else $i = ",image=" . self::encode($image, true); $c = ',content=' . self::encode($content, true);
return "[CQ:music,type=custom,url=" . }
if ($image === null) {
$i = '';
} else {
$i = ',image=' . self::encode($image, true);
}
return '[CQ:music,type=custom,url=' .
self::encode($id_or_url, true) . self::encode($id_or_url, true) .
",audio=" . self::encode($audio, true) . ",title=" . self::encode($title, true) . $c . $i . ',audio=' . self::encode($audio, true) . ',title=' . self::encode($title, true) . $c . $i .
"]"; ']';
default: default:
Console::warning(zm_internal_errcode("E00035") . "传入的music type($type)错误!"); Console::warning(zm_internal_errcode('E00035') . "传入的music type({$type})错误!");
return " "; return ' ';
} }
} }
public static function forward($id) { public static function forward($id)
return "[CQ:forward,id=".self::encode($id)."]"; {
return '[CQ:forward,id=' . self::encode($id) . ']';
} }
public static function node($user_id, $nickname, $content) { public static function node($user_id, $nickname, $content)
return "[CQ:node,user_id=$user_id,nickname=" . self::encode($nickname, true) . ",content=" . self::encode($content, true) . "]"; {
return "[CQ:node,user_id={$user_id},nickname=" . self::encode($nickname, true) . ',content=' . self::encode($content, true) . ']';
} }
public static function xml($data) { public static function xml($data)
return "[CQ:xml,data=" . self::encode($data, true) . "]"; {
return '[CQ:xml,data=' . self::encode($data, true) . ']';
} }
public static function json($data, $resid = 0) { public static function json($data, $resid = 0)
return "[CQ:json,data=" . self::encode($data, true) . ",resid=" . intval($resid) . "]"; {
return '[CQ:json,data=' . self::encode($data, true) . ',resid=' . intval($resid) . ']';
} }
public static function _custom(string $type_name, $params) { public static function _custom(string $type_name, $params)
$code = "[CQ:" . $type_name; {
$code = '[CQ:' . $type_name;
foreach ($params as $k => $v) { foreach ($params as $k => $v) {
$code .= "," . $k . "=" . self::escape($v, true); $code .= ',' . $k . '=' . self::escape($v, true);
} }
$code .= "]"; $code .= ']';
return $code; return $code;
} }
/** /**
* 反转义字符串中的CQ码敏感符号 * 反转义字符串中的CQ码敏感符号
* @param $msg * @param mixed $msg
* @param bool $is_content * @param mixed $is_content
* @return mixed
*/ */
public static function decode($msg, $is_content = false) { public static function decode($msg, $is_content = false)
$msg = str_replace(["&amp;", "&#91;", "&#93;"], ["&", "[", "]"], $msg); {
if ($is_content) $msg = str_replace("&#44;", ",", $msg); $msg = str_replace(['&amp;', '&#91;', '&#93;'], ['&', '[', ']'], $msg);
if ($is_content) {
$msg = str_replace('&#44;', ',', $msg);
}
return $msg; return $msg;
} }
public static function replace($str) { public static function replace($str)
$str = str_replace("{{", "[", $str); {
$str = str_replace("}}", "]", $str); $str = str_replace('{{', '[', $str);
return $str; return str_replace('}}', ']', $str);
} }
/** /**
* 转义CQ码的特殊字符同encode * 转义CQ码的特殊字符同encode
* @param $msg * @param mixed $msg
* @param bool $is_content * @param mixed $is_content
* @return mixed
*/ */
public static function escape($msg, $is_content = false) { public static function escape($msg, $is_content = false)
$msg = str_replace(["&", "[", "]"], ["&amp;", "&#91;", "&#93;"], $msg); {
if ($is_content) $msg = str_replace(",", "&#44;", $msg); $msg = str_replace(['&', '[', ']'], ['&amp;', '&#91;', '&#93;'], $msg);
if ($is_content) {
$msg = str_replace(',', '&#44;', $msg);
}
return $msg; return $msg;
} }
/** /**
* 转义CQ码的特殊字符 * 转义CQ码的特殊字符
* @param $msg * @param mixed $msg
* @param false $is_content * @param mixed $is_content
* @return mixed
*/ */
public static function encode($msg, $is_content = false) { public static function encode($msg, $is_content = false)
$msg = str_replace(["&", "[", "]"], ["&amp;", "&#91;", "&#93;"], $msg); {
if ($is_content) $msg = str_replace(",", "&#44;", $msg); $msg = str_replace(['&', '[', ']'], ['&amp;', '&#91;', '&#93;'], $msg);
if ($is_content) {
$msg = str_replace(',', '&#44;', $msg);
}
return $msg; return $msg;
} }
@@ -294,12 +314,13 @@ class CQ
* @param $msg * @param $msg
* @return string * @return string
*/ */
public static function removeCQ($msg) { public static function removeCQ($msg)
$final = ""; {
$final = '';
$last_end = 0; $last_end = 0;
foreach (self::getAllCQ($msg) as $v) { foreach (self::getAllCQ($msg) as $v) {
$final .= mb_substr($msg, $last_end, $v["start"] - $last_end); $final .= mb_substr($msg, $last_end, $v['start'] - $last_end);
$last_end = $v["end"] + 1; $last_end = $v['end'] + 1;
} }
$final .= mb_substr($msg, $last_end); $final .= mb_substr($msg, $last_end);
return $final; return $final;
@@ -307,56 +328,59 @@ class CQ
/** /**
* 获取消息中第一个CQ码 * 获取消息中第一个CQ码
* @param $msg * @param mixed $msg
* @param bool $is_object * @param mixed $is_object
* @return array|CQObject|null
*/ */
public static function getCQ($msg, $is_object = false) { public static function getCQ($msg, $is_object = false)
if (($head = mb_strpos($msg, "[CQ:")) !== false) { {
if (($head = mb_strpos($msg, '[CQ:')) !== false) {
$key_offset = mb_substr($msg, $head); $key_offset = mb_substr($msg, $head);
$close = mb_strpos($key_offset, "]"); $close = mb_strpos($key_offset, ']');
if ($close === false) return null; if ($close === false) {
$content = mb_substr($msg, $head + 4, $close + $head - mb_strlen($msg)); return null;
$exp = explode(",", $content);
$cq["type"] = array_shift($exp);
foreach ($exp as $v) {
$ss = explode("=", $v);
$sk = array_shift($ss);
$cq["params"][$sk] = self::decode(implode("=", $ss), true);
} }
$cq["start"] = $head; $content = mb_substr($msg, $head + 4, $close + $head - mb_strlen($msg));
$cq["end"] = $close + $head; $exp = explode(',', $content);
$cq['type'] = array_shift($exp);
foreach ($exp as $v) {
$ss = explode('=', $v);
$sk = array_shift($ss);
$cq['params'][$sk] = self::decode(implode('=', $ss), true);
}
$cq['start'] = $head;
$cq['end'] = $close + $head;
return !$is_object ? $cq : CQObject::fromArray($cq); return !$is_object ? $cq : CQObject::fromArray($cq);
} else {
return null;
} }
return null;
} }
/** /**
* 获取消息中所有的CQ码 * 获取消息中所有的CQ码
* @param $msg * @param mixed $msg
* @param bool $is_object * @param mixed $is_object
* @return array|CQObject[]
*/ */
public static function getAllCQ($msg, $is_object = false) { public static function getAllCQ($msg, $is_object = false)
{
$cqs = []; $cqs = [];
$offset = 0; $offset = 0;
while (($head = mb_strpos(($submsg = mb_substr($msg, $offset)), "[CQ:")) !== false) { while (($head = mb_strpos(($submsg = mb_substr($msg, $offset)), '[CQ:')) !== false) {
$key_offset = mb_substr($submsg, $head); $key_offset = mb_substr($submsg, $head);
$tmpmsg = mb_strpos($key_offset, "]"); $tmpmsg = mb_strpos($key_offset, ']');
if ($tmpmsg === false) break; // 没闭合不算CQ码 if ($tmpmsg === false) {
break;
} // 没闭合不算CQ码
$content = mb_substr($submsg, $head + 4, $tmpmsg + $head - mb_strlen($submsg)); $content = mb_substr($submsg, $head + 4, $tmpmsg + $head - mb_strlen($submsg));
$exp = explode(",", $content); $exp = explode(',', $content);
$cq = []; $cq = [];
$cq["type"] = array_shift($exp); $cq['type'] = array_shift($exp);
foreach ($exp as $v) { foreach ($exp as $v) {
$ss = explode("=", $v); $ss = explode('=', $v);
$sk = array_shift($ss); $sk = array_shift($ss);
$cq["params"][$sk] = self::decode(implode("=", $ss), true); $cq['params'][$sk] = self::decode(implode('=', $ss), true);
} }
$cq["start"] = $offset + $head; $cq['start'] = $offset + $head;
$cq["end"] = $offset + $tmpmsg + $head; $cq['end'] = $offset + $tmpmsg + $head;
$offset += $tmpmsg + 1; $offset += $head + $tmpmsg + 1;
$cqs[] = (!$is_object ? $cq : CQObject::fromArray($cq)); $cqs[] = (!$is_object ? $cq : CQObject::fromArray($cq));
} }
return $cqs; return $cqs;

View File

@@ -1,8 +1,10 @@
<?php <?php
declare(strict_types=1);
namespace ZM\API; namespace ZM\API;
use Closure;
use ZM\Console\Console; use ZM\Console\Console;
use ZM\Store\LightCacheInside; use ZM\Store\LightCacheInside;
use ZM\Store\Lock\SpinLock; use ZM\Store\Lock\SpinLock;
@@ -11,63 +13,90 @@ use ZM\Utils\CoMessage;
trait CQAPI trait CQAPI
{ {
/** @var null|Closure */
private static $filter;
public function __call($name, $arguments)
{
return false;
}
public static function registerFilter(callable $callable)
{
self::$filter = $callable;
}
public function getActionName($suffix, string $method)
{
$postfix = ($suffix == OneBotV11::API_ASYNC ? '_async' : ($suffix == OneBotV11::API_RATE_LIMITED ? '_rate_limited' : ''));
$func_name = strtolower(preg_replace('/(?<=[a-z])([A-Z])/', '_$1', $method));
return $func_name . $postfix;
}
/** /**
* @param $connection * @param $connection
* @param $reply * @param $reply
* @param |null $function * @param |null $function
* @return bool|array * @return array|bool
*/ */
private function processAPI($connection, $reply, $function = null) { private function processAPI($connection, $reply, $function = null)
if ($connection->getOption("type") === CONN_WEBSOCKET) {
if (is_callable(self::$filter)) {
$reply2 = call_user_func(self::$filter, $reply);
if (is_bool($reply2)) {
return $reply2;
}
$reply = $reply2;
}
if ($connection->getOption('type') === CONN_WEBSOCKET) {
return $this->processWebsocketAPI($connection, $reply, $function); return $this->processWebsocketAPI($connection, $reply, $function);
else }
return $this->processHttpAPI($connection, $reply, $function);
return $this->processHttpAPI($connection, $reply, $function);
} }
private function processWebsocketAPI($connection, $reply, $function = false) { private function processWebsocketAPI($connection, $reply, $function = false)
$api_id = ZMAtomic::get("wait_msg_id")->add(1); {
$reply["echo"] = $api_id; $api_id = ZMAtomic::get('wait_msg_id')->add(1);
$reply['echo'] = $api_id;
if (server()->push($connection->getFd(), json_encode($reply))) { if (server()->push($connection->getFd(), json_encode($reply))) {
if ($function === true) { if ($function === true) {
$obj = [ $obj = [
"data" => $reply, 'data' => $reply,
"time" => microtime(true), 'time' => microtime(true),
"self_id" => $connection->getOption("connect_id"), 'self_id' => $connection->getOption('connect_id'),
"echo" => $api_id 'echo' => $api_id,
]; ];
return CoMessage::yieldByWS($obj, ["echo"], 30); return CoMessage::yieldByWS($obj, ['echo'], 30);
} }
return true; return true;
} else {
Console::warning(zm_internal_errcode("E00036") . "CQAPI send failed, websocket push error.");
$response = [
"status" => "failed",
"retcode" => -1000,
"data" => null,
"self_id" => $connection->getOption("connect_id")
];
SpinLock::lock("wait_api");
$r = LightCacheInside::get("wait_api", "wait_api");
unset($r[$reply["echo"]]);
LightCacheInside::set("wait_api", "wait_api", $r);
SpinLock::unlock("wait_api");
if ($function === true) return $response;
return false;
} }
Console::warning(zm_internal_errcode('E00036') . 'CQAPI send failed, websocket push error.');
$response = [
'status' => 'failed',
'retcode' => -1000,
'data' => null,
'self_id' => $connection->getOption('connect_id'),
];
SpinLock::lock('wait_api');
$r = LightCacheInside::get('wait_api', 'wait_api');
unset($r[$reply['echo']]);
LightCacheInside::set('wait_api', 'wait_api', $r);
SpinLock::unlock('wait_api');
if ($function === true) {
return $response;
}
return false;
} }
/** /**
* @param $connection * @param $connection
* @param $reply * @param $reply
* @param null $function * @param null $function
* @return bool
* @noinspection PhpUnusedParameterInspection * @noinspection PhpUnusedParameterInspection
*/ */
private function processHttpAPI($connection, $reply, $function = null): bool { private function processHttpAPI($connection, $reply, $function = null): bool
return false; {
}
public function __call($name, $arguments) {
return false; return false;
} }
} }

View File

@@ -0,0 +1,120 @@
<?php
declare(strict_types=1);
namespace ZM\API;
class GoCqhttpAPIV11
{
use CQAPI;
public const SUPPORT_VERSION = '1.0.0-beta8';
private $connection;
private $callback;
private $prefix;
public function __construct($connection, $callback, $prefix)
{
$this->connection = $connection;
$this->callback = $callback;
$this->prefix = $prefix;
}
/**
* 获取频道系统内BOT的资料
* 响应字段nickname, tiny_id, avatar_url
* @see https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E8%8E%B7%E5%8F%96%E9%A2%91%E9%81%93%E7%B3%BB%E7%BB%9F%E5%86%85bot%E7%9A%84%E8%B5%84%E6%96%99
* @return array|bool
*/
public function getGuildServiceProfile()
{
return $this->processAPI($this->connection, [
'action' => $this->getActionName($this->prefix, __FUNCTION__),
], $this->callback);
}
/**
* 获取频道列表
* @see https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E8%8E%B7%E5%8F%96%E9%A2%91%E9%81%93%E5%88%97%E8%A1%A8
* @return array|bool
*/
public function getGuildList()
{
return $this->processAPI($this->connection, [
'action' => $this->getActionName($this->prefix, __FUNCTION__),
], $this->callback);
}
/**
* 通过访客获取频道元数据
* @see https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E9%80%9A%E8%BF%87%E8%AE%BF%E5%AE%A2%E8%8E%B7%E5%8F%96%E9%A2%91%E9%81%93%E5%85%83%E6%95%B0%E6%8D%AE
* @param $guild_id
* @return array|bool
*/
public function getGuildMetaByGuest($guild_id)
{
return $this->processAPI($this->connection, [
'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [
'guild_id' => $guild_id,
],
], $this->callback);
}
/**
* 获取子频道列表
* @see https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E8%8E%B7%E5%8F%96%E5%AD%90%E9%A2%91%E9%81%93%E5%88%97%E8%A1%A8
* @param $guild_id
* @param false $no_cache
* @return array|bool
*/
public function getGuildChannelList($guild_id, bool $no_cache = false)
{
return $this->processAPI($this->connection, [
'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [
'guild_id' => $guild_id,
'no_cache' => $no_cache,
],
], $this->callback);
}
/**
* 获取频道成员列表
* @see https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E8%8E%B7%E5%8F%96%E9%A2%91%E9%81%93%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8
* @param $guild_id
* @return array|bool
*/
public function getGuildMembers($guild_id)
{
return $this->processAPI($this->connection, [
'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [
'guild_id' => $guild_id,
],
], $this->callback);
}
/**
* 发送信息到子频道
* @see https://github.com/Mrs4s/go-cqhttp/blob/master/docs/guild.md#%E5%8F%91%E9%80%81%E4%BF%A1%E6%81%AF%E5%88%B0%E5%AD%90%E9%A2%91%E9%81%93
* @param $guild_id
* @param $channel_id
* @param $message
* @return array|bool
*/
public function sendGuildChannelMsg($guild_id, $channel_id, $message)
{
return $this->processAPI($this->connection, [
'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [
'guild_id' => $guild_id,
'channel_id' => $channel_id,
'message' => $message,
],
], $this->callback);
}
}

View File

@@ -1,59 +1,77 @@
<?php <?php
/** @noinspection PhpUnused */
declare(strict_types=1);
namespace ZM\API; namespace ZM\API;
use ZM\ConnectionManager\ConnectionObject; use ZM\ConnectionManager\ConnectionObject;
use ZM\ConnectionManager\ManagerGM; use ZM\ConnectionManager\ManagerGM;
use ZM\Exception\RobotNotFoundException; use ZM\Exception\RobotNotFoundException;
use ZM\Exception\ZMKnownException;
/** /**
* OneBot V11 的 API 实现类 * OneBot V11 的 API 实现类
* Class OneBotV11 * Class OneBotV11
* @package ZM\API * @since 2.5.0
* @since 2.5
*/ */
class OneBotV11 class OneBotV11
{ {
use CQAPI; use CQAPI;
const API_ASYNC = 1; public const API_ASYNC = 1;
const API_NORMAL = 0;
const API_RATE_LIMITED = 2;
/** @var ConnectionObject|null */ public const API_NORMAL = 0;
private $connection;
private $callback = true; public const API_RATE_LIMITED = 2;
private $prefix = 0;
/** /** @var null|ConnectionObject */
* @param $robot_id protected $connection;
* @return ZMRobot
* @throws RobotNotFoundException protected $callback = true;
*/
public static function get($robot_id) { protected $prefix = 0;
$r = ManagerGM::getAllByName('qq');
foreach ($r as $v) { public function __construct(ConnectionObject $connection)
if ($v->getOption('connect_id') == $robot_id) return new ZMRobot($v); {
} $this->connection = $connection;
throw new RobotNotFoundException("机器人 " . $robot_id . " 未连接到框架!");
} }
/** /**
* @return ZMRobot * @param $robot_id
* @throws RobotNotFoundException * @throws RobotNotFoundException
* @return ZMRobot
*/ */
public static function getRandom() { public static function get($robot_id)
{
$r = ManagerGM::getAllByName('qq'); $r = ManagerGM::getAllByName('qq');
if ($r == []) throw new RobotNotFoundException("没有任何机器人连接到框架!"); foreach ($r as $v) {
if ($v->getOption('connect_id') == $robot_id) {
return new ZMRobot($v);
}
}
throw new RobotNotFoundException('机器人 ' . $robot_id . ' 未连接到框架!');
}
/**
* @throws RobotNotFoundException
* @return ZMRobot
*/
public static function getRandom()
{
$r = ManagerGM::getAllByName('qq');
if ($r == []) {
throw new RobotNotFoundException('没有任何机器人连接到框架!');
}
return new ZMRobot($r[array_rand($r)]); return new ZMRobot($r[array_rand($r)]);
} }
/** /**
* @return ZMRobot[] * @return ZMRobot[]
*/ */
public static function getAllRobot() { public static function getAllRobot()
{
$r = ManagerGM::getAllByName('qq'); $r = ManagerGM::getAllByName('qq');
$obj = []; $obj = [];
foreach ($r as $v) { foreach ($r as $v) {
@@ -62,21 +80,20 @@ class OneBotV11
return $obj; return $obj;
} }
public function __construct(ConnectionObject $connection) { public function setCallback($callback = true)
$this->connection = $connection; {
}
public function setCallback($callback = true) {
$this->callback = $callback; $this->callback = $callback;
return $this; return $this;
} }
public function setPrefix($prefix = self::API_NORMAL) { public function setPrefix($prefix = self::API_NORMAL)
{
$this->prefix = $prefix; $this->prefix = $prefix;
return $this; return $this;
} }
public function getSelfId() { public function getSelfId()
{
return $this->connection->getOption('connect_id'); return $this->connection->getOption('connect_id');
} }
@@ -84,603 +101,629 @@ class OneBotV11
/** /**
* 发送私聊消息 * 发送私聊消息
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_private_msg-%E5%8F%91%E9%80%81%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_private_msg-%E5%8F%91%E9%80%81%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF
* @param $user_id * @param $user_id
* @param $message * @param $message
* @param bool $auto_escape * @return null|array|bool
* @return array|bool|null
*/ */
public function sendPrivateMsg($user_id, $message, $auto_escape = false) { public function sendPrivateMsg($user_id, $message, bool $auto_escape = false)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'user_id' => $user_id, 'user_id' => $user_id,
'message' => $message, 'message' => $message,
'auto_escape' => $auto_escape 'auto_escape' => $auto_escape,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 发送群消息 * 发送群消息
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_group_msg-%E5%8F%91%E9%80%81%E7%BE%A4%E6%B6%88%E6%81%AF * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_group_msg-%E5%8F%91%E9%80%81%E7%BE%A4%E6%B6%88%E6%81%AF
* @param $group_id * @param $group_id
* @param $message * @param $message
* @param bool $auto_escape * @return null|array|bool
* @return array|bool|null
*/ */
public function sendGroupMsg($group_id, $message, $auto_escape = false) { public function sendGroupMsg($group_id, $message, bool $auto_escape = false)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'group_id' => $group_id, 'group_id' => $group_id,
'message' => $message, 'message' => $message,
'auto_escape' => $auto_escape 'auto_escape' => $auto_escape,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 发送消息 * 发送消息
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_msg-%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_msg-%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF
* @param $message_type * @param $message_type
* @param $target_id * @param $target_id
* @param $message * @param $message
* @param bool $auto_escape * @return null|array|bool
* @return array|bool|null
*/ */
public function sendMsg($message_type, $target_id, $message, $auto_escape = false) { public function sendMsg($message_type, $target_id, $message, bool $auto_escape = false)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'message_type' => $message_type, 'message_type' => $message_type,
($message_type == 'private' ? 'user' : $message_type) . '_id' => $target_id, ($message_type == 'private' ? 'user' : $message_type) . '_id' => $target_id,
'message' => $message, 'message' => $message,
'auto_escape' => $auto_escape 'auto_escape' => $auto_escape,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 撤回消息 * 撤回消息
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#delete_msg-%E6%92%A4%E5%9B%9E%E6%B6%88%E6%81%AF * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#delete_msg-%E6%92%A4%E5%9B%9E%E6%B6%88%E6%81%AF
* @param $message_id * @param $message_id
* @return array|bool|null * @return null|array|bool
*/ */
public function deleteMsg($message_id) { public function deleteMsg($message_id)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'message_id' => $message_id 'message_id' => $message_id,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 获取消息 * 获取消息
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_msg-%E8%8E%B7%E5%8F%96%E6%B6%88%E6%81%AF * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_msg-%E8%8E%B7%E5%8F%96%E6%B6%88%E6%81%AF
* @param $message_id * @param $message_id
* @return array|bool|null * @return null|array|bool
*/ */
public function getMsg($message_id) { public function getMsg($message_id)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'message_id' => $message_id 'message_id' => $message_id,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 获取合并转发消息 * 获取合并转发消息
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_forward_msg-%E8%8E%B7%E5%8F%96%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E6%B6%88%E6%81%AF * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_forward_msg-%E8%8E%B7%E5%8F%96%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E6%B6%88%E6%81%AF
* @param $id * @param $id
* @return array|bool|null * @return null|array|bool
*/ */
public function getForwardMsg($id) { public function getForwardMsg($id)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'id' => $id 'id' => $id,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 发送好友赞 * 发送好友赞
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_like-%E5%8F%91%E9%80%81%E5%A5%BD%E5%8F%8B%E8%B5%9E * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_like-%E5%8F%91%E9%80%81%E5%A5%BD%E5%8F%8B%E8%B5%9E
* @param $user_id * @param $user_id
* @param int $times * @return null|array|bool
* @return array|bool|null
*/ */
public function sendLike($user_id, $times = 1) { public function sendLike($user_id, int $times = 1)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'user_id' => $user_id, 'user_id' => $user_id,
'times' => $times 'times' => $times,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 群组踢人 * 群组踢人
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_kick-%E7%BE%A4%E7%BB%84%E8%B8%A2%E4%BA%BA * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_kick-%E7%BE%A4%E7%BB%84%E8%B8%A2%E4%BA%BA
* @param $group_id * @param $group_id
* @param $user_id * @param $user_id
* @param bool $reject_add_request * @return null|array|bool
* @return array|bool|null
*/ */
public function setGroupKick($group_id, $user_id, $reject_add_request = false) { public function setGroupKick($group_id, $user_id, bool $reject_add_request = false)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'group_id' => $group_id, 'group_id' => $group_id,
'user_id' => $user_id, 'user_id' => $user_id,
'reject_add_request' => $reject_add_request 'reject_add_request' => $reject_add_request,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 群组单人禁言 * 群组单人禁言
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_ban-%E7%BE%A4%E7%BB%84%E5%8D%95%E4%BA%BA%E7%A6%81%E8%A8%80 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_ban-%E7%BE%A4%E7%BB%84%E5%8D%95%E4%BA%BA%E7%A6%81%E8%A8%80
* @param $group_id * @param $group_id
* @param $user_id * @param $user_id
* @param $duration * @return null|array|bool
* @return array|bool|null
*/ */
public function setGroupBan($group_id, $user_id, $duration = 1800) { public function setGroupBan($group_id, $user_id, int $duration = 1800)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'group_id' => $group_id, 'group_id' => $group_id,
'user_id' => $user_id, 'user_id' => $user_id,
'duration' => $duration 'duration' => $duration,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 群组匿名用户禁言 * 群组匿名用户禁言
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_anonymous_ban-%E7%BE%A4%E7%BB%84%E5%8C%BF%E5%90%8D%E7%94%A8%E6%88%B7%E7%A6%81%E8%A8%80 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_anonymous_ban-%E7%BE%A4%E7%BB%84%E5%8C%BF%E5%90%8D%E7%94%A8%E6%88%B7%E7%A6%81%E8%A8%80
* @param $group_id * @param $group_id
* @param $anonymous_or_flag * @param $anonymous_or_flag
* @param int $duration * @return null|array|bool
* @return array|bool|null
*/ */
public function setGroupAnonymousBan($group_id, $anonymous_or_flag, $duration = 1800) { public function setGroupAnonymousBan($group_id, $anonymous_or_flag, int $duration = 1800)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'group_id' => $group_id, 'group_id' => $group_id,
(is_string($anonymous_or_flag) ? 'flag' : 'anonymous') => $anonymous_or_flag, (is_string($anonymous_or_flag) ? 'flag' : 'anonymous') => $anonymous_or_flag,
'duration' => $duration 'duration' => $duration,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 群组全员禁言 * 群组全员禁言
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_whole_ban-%E7%BE%A4%E7%BB%84%E5%85%A8%E5%91%98%E7%A6%81%E8%A8%80 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_whole_ban-%E7%BE%A4%E7%BB%84%E5%85%A8%E5%91%98%E7%A6%81%E8%A8%80
* @param $group_id * @param $group_id
* @param bool $enable * @return null|array|bool
* @return array|bool|null
*/ */
public function setGroupWholeBan($group_id, $enable = true) { public function setGroupWholeBan($group_id, bool $enable = true)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'group_id' => $group_id, 'group_id' => $group_id,
'enable' => $enable 'enable' => $enable,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 群组设置管理员 * 群组设置管理员
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_admin-%E7%BE%A4%E7%BB%84%E8%AE%BE%E7%BD%AE%E7%AE%A1%E7%90%86%E5%91%98 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_admin-%E7%BE%A4%E7%BB%84%E8%AE%BE%E7%BD%AE%E7%AE%A1%E7%90%86%E5%91%98
* @param $group_id * @param $group_id
* @param $user_id * @param $user_id
* @param bool $enable * @return null|array|bool
* @return array|bool|null
*/ */
public function setGroupAdmin($group_id, $user_id, $enable = true) { public function setGroupAdmin($group_id, $user_id, bool $enable = true)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'group_id' => $group_id, 'group_id' => $group_id,
'user_id' => $user_id, 'user_id' => $user_id,
'enable' => $enable 'enable' => $enable,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 群组匿名 * 群组匿名
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_anonymous-%E7%BE%A4%E7%BB%84%E5%8C%BF%E5%90%8D * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_anonymous-%E7%BE%A4%E7%BB%84%E5%8C%BF%E5%90%8D
* @param $group_id * @param $group_id
* @param bool $enable * @return null|array|bool
* @return array|bool|null
*/ */
public function setGroupAnonymous($group_id, $enable = true) { public function setGroupAnonymous($group_id, bool $enable = true)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'group_id' => $group_id, 'group_id' => $group_id,
'enable' => $enable 'enable' => $enable,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 设置群名片(群备注) * 设置群名片(群备注)
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_card-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D%E7%89%87%E7%BE%A4%E5%A4%87%E6%B3%A8 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_card-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D%E7%89%87%E7%BE%A4%E5%A4%87%E6%B3%A8
* @param $group_id * @param $group_id
* @param $user_id * @param $user_id
* @param string $card * @return null|array|bool
* @return array|bool|null
*/ */
public function setGroupCard($group_id, $user_id, $card = "") { public function setGroupCard($group_id, $user_id, string $card = '')
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'group_id' => $group_id, 'group_id' => $group_id,
'user_id' => $user_id, 'user_id' => $user_id,
'card' => $card 'card' => $card,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 设置群名 * 设置群名
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_name-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_name-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D
* @param $group_id * @param $group_id
* @param $group_name * @param $group_name
* @return array|bool|null * @return null|array|bool
*/ */
public function setGroupName($group_id, $group_name) { public function setGroupName($group_id, $group_name)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'group_id' => $group_id, 'group_id' => $group_id,
'group_name' => $group_name 'group_name' => $group_name,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 退出群组 * 退出群组
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_leave-%E9%80%80%E5%87%BA%E7%BE%A4%E7%BB%84 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_leave-%E9%80%80%E5%87%BA%E7%BE%A4%E7%BB%84
* @param $group_id * @param $group_id
* @param bool $is_dismiss * @return null|array|bool
* @return array|bool|null
*/ */
public function setGroupLeave($group_id, $is_dismiss = false) { public function setGroupLeave($group_id, bool $is_dismiss = false)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'group_id' => $group_id, 'group_id' => $group_id,
'is_dismiss' => $is_dismiss 'is_dismiss' => $is_dismiss,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 设置群组专属头衔 * 设置群组专属头衔
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_special_title-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E7%BB%84%E4%B8%93%E5%B1%9E%E5%A4%B4%E8%A1%94 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_special_title-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E7%BB%84%E4%B8%93%E5%B1%9E%E5%A4%B4%E8%A1%94
* @param $group_id * @param $group_id
* @param $user_id * @param $user_id
* @param string $special_title * @return null|array|bool
* @param int $duration
* @return array|bool|null
*/ */
public function setGroupSpecialTitle($group_id, $user_id, $special_title = "", $duration = -1) { public function setGroupSpecialTitle($group_id, $user_id, string $special_title = '', int $duration = -1)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'group_id' => $group_id, 'group_id' => $group_id,
'user_id' => $user_id, 'user_id' => $user_id,
'special_title' => $special_title, 'special_title' => $special_title,
'duration' => $duration 'duration' => $duration,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 处理加好友请求 * 处理加好友请求
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_friend_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_friend_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82
* @param $flag * @param $flag
* @param bool $approve * @return null|array|bool
* @param string $remark
* @return array|bool|null
*/ */
public function setFriendAddRequest($flag, $approve = true, $remark = "") { public function setFriendAddRequest($flag, bool $approve = true, string $remark = '')
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'flag' => $flag, 'flag' => $flag,
'approve' => $approve, 'approve' => $approve,
'remark' => $remark 'remark' => $remark,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 处理加群请求/邀请 * 处理加群请求/邀请
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7
* @param $flag * @param $flag
* @param $sub_type * @param $sub_type
* @param bool $approve * @return null|array|bool
* @param string $reason
* @return array|bool|null
*/ */
public function setGroupAddRequest($flag, $sub_type, $approve = true, $reason = "") { public function setGroupAddRequest($flag, $sub_type, bool $approve = true, string $reason = '')
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'flag' => $flag, 'flag' => $flag,
'sub_type' => $sub_type, 'sub_type' => $sub_type,
'approve' => $approve, 'approve' => $approve,
'reason' => $reason 'reason' => $reason,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 获取登录号信息 * 获取登录号信息
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_login_info-%E8%8E%B7%E5%8F%96%E7%99%BB%E5%BD%95%E5%8F%B7%E4%BF%A1%E6%81%AF * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_login_info-%E8%8E%B7%E5%8F%96%E7%99%BB%E5%BD%95%E5%8F%B7%E4%BF%A1%E6%81%AF
* @return array|bool|null * @return null|array|bool
*/ */
public function getLoginInfo() { public function getLoginInfo()
return $this->processAPI($this->connection, ['action' => $this->getActionName(__FUNCTION__)], $this->callback); {
return $this->processAPI($this->connection, ['action' => $this->getActionName($this->prefix, __FUNCTION__)], $this->callback);
} }
/** /**
* 获取陌生人信息 * 获取陌生人信息
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_stranger_info-%E8%8E%B7%E5%8F%96%E9%99%8C%E7%94%9F%E4%BA%BA%E4%BF%A1%E6%81%AF * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_stranger_info-%E8%8E%B7%E5%8F%96%E9%99%8C%E7%94%9F%E4%BA%BA%E4%BF%A1%E6%81%AF
* @param $user_id * @param $user_id
* @param bool $no_cache * @return null|array|bool
* @return array|bool|null
*/ */
public function getStrangerInfo($user_id, $no_cache = false) { public function getStrangerInfo($user_id, bool $no_cache = false)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'user_id' => $user_id, 'user_id' => $user_id,
'no_cache' => $no_cache 'no_cache' => $no_cache,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 获取好友列表 * 获取好友列表
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_friend_list-%E8%8E%B7%E5%8F%96%E5%A5%BD%E5%8F%8B%E5%88%97%E8%A1%A8 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_friend_list-%E8%8E%B7%E5%8F%96%E5%A5%BD%E5%8F%8B%E5%88%97%E8%A1%A8
* @return array|bool|null * @return null|array|bool
*/ */
public function getFriendList() { public function getFriendList()
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__) 'action' => $this->getActionName($this->prefix, __FUNCTION__),
], $this->callback); ], $this->callback);
} }
/** /**
* 获取群信息 * 获取群信息
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E4%BF%A1%E6%81%AF * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E4%BF%A1%E6%81%AF
* @param $group_id * @param $group_id
* @param bool $no_cache * @return null|array|bool
* @return array|bool|null
*/ */
public function getGroupInfo($group_id, $no_cache = false) { public function getGroupInfo($group_id, bool $no_cache = false)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'group_id' => $group_id, 'group_id' => $group_id,
'no_cache' => $no_cache 'no_cache' => $no_cache,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 获取群列表 * 获取群列表
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%88%97%E8%A1%A8 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%88%97%E8%A1%A8
* @return array|bool|null * @return null|array|bool
*/ */
public function getGroupList() { public function getGroupList()
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__) 'action' => $this->getActionName($this->prefix, __FUNCTION__),
], $this->callback); ], $this->callback);
} }
/** /**
* 获取群成员信息 * 获取群成员信息
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E4%BF%A1%E6%81%AF * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E4%BF%A1%E6%81%AF
* @param $group_id * @param $group_id
* @param $user_id * @param $user_id
* @param bool $no_cache * @return null|array|bool
* @return array|bool|null
*/ */
public function getGroupMemberInfo($group_id, $user_id, $no_cache = false) { public function getGroupMemberInfo($group_id, $user_id, bool $no_cache = false)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'group_id' => $group_id, 'group_id' => $group_id,
'user_id' => $user_id, 'user_id' => $user_id,
'no_cache' => $no_cache 'no_cache' => $no_cache,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 获取群成员列表 * 获取群成员列表
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8
* @param $group_id * @param $group_id
* @return array|bool|null * @return null|array|bool
*/ */
public function getGroupMemberList($group_id) { public function getGroupMemberList($group_id)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'group_id' => $group_id 'group_id' => $group_id,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 获取群荣誉信息 * 获取群荣誉信息
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_honor_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E8%8D%A3%E8%AA%89%E4%BF%A1%E6%81%AF * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_honor_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E8%8D%A3%E8%AA%89%E4%BF%A1%E6%81%AF
* @param $group_id * @param $group_id
* @param $type * @param $type
* @return array|bool|null * @return null|array|bool
*/ */
public function getGroupHonorInfo($group_id, $type) { public function getGroupHonorInfo($group_id, $type)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'group_id' => $group_id, 'group_id' => $group_id,
'type' => $type 'type' => $type,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 获取 CSRF Token * 获取 CSRF Token
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_csrf_token-%E8%8E%B7%E5%8F%96-csrf-token * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_csrf_token-%E8%8E%B7%E5%8F%96-csrf-token
* @return array|bool|null * @return null|array|bool
*/ */
public function getCsrfToken() { public function getCsrfToken()
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__) 'action' => $this->getActionName($this->prefix, __FUNCTION__),
], $this->callback); ], $this->callback);
} }
/** /**
* 获取 QQ 相关接口凭证 * 获取 QQ 相关接口凭证
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_credentials-%E8%8E%B7%E5%8F%96-qq-%E7%9B%B8%E5%85%B3%E6%8E%A5%E5%8F%A3%E5%87%AD%E8%AF%81 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_credentials-%E8%8E%B7%E5%8F%96-qq-%E7%9B%B8%E5%85%B3%E6%8E%A5%E5%8F%A3%E5%87%AD%E8%AF%81
* @param string $domain * @return null|array|bool
* @return array|bool|null
*/ */
public function getCredentials($domain = "") { public function getCredentials(string $domain = '')
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'domain' => $domain 'domain' => $domain,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 获取语音 * 获取语音
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_record-%E8%8E%B7%E5%8F%96%E8%AF%AD%E9%9F%B3 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_record-%E8%8E%B7%E5%8F%96%E8%AF%AD%E9%9F%B3
* @param $file * @param $file
* @param $out_format * @param $out_format
* @return array|bool|null * @return null|array|bool
*/ */
public function getRecord($file, $out_format) { public function getRecord($file, $out_format)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'file' => $file, 'file' => $file,
'out_format' => $out_format 'out_format' => $out_format,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 获取图片 * 获取图片
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_image-%E8%8E%B7%E5%8F%96%E5%9B%BE%E7%89%87 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_image-%E8%8E%B7%E5%8F%96%E5%9B%BE%E7%89%87
* @param $file * @param $file
* @return array|bool|null * @return null|array|bool
*/ */
public function getImage($file) { public function getImage($file)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'file' => $file 'file' => $file,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 检查是否可以发送图片 * 检查是否可以发送图片
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_image-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E5%9B%BE%E7%89%87 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_image-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E5%9B%BE%E7%89%87
* @return array|bool|null * @return null|array|bool
*/ */
public function canSendImage() { public function canSendImage()
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__) 'action' => $this->getActionName($this->prefix, __FUNCTION__),
], $this->callback); ], $this->callback);
} }
/** /**
* 检查是否可以发送语音 * 检查是否可以发送语音
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_record-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E8%AF%AD%E9%9F%B3 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_record-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E8%AF%AD%E9%9F%B3
* @return array|bool|null * @return null|array|bool
*/ */
public function canSendRecord() { public function canSendRecord()
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__) 'action' => $this->getActionName($this->prefix, __FUNCTION__),
], $this->callback); ], $this->callback);
} }
/** /**
* 获取运行状态 * 获取运行状态
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_status-%E8%8E%B7%E5%8F%96%E8%BF%90%E8%A1%8C%E7%8A%B6%E6%80%81 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_status-%E8%8E%B7%E5%8F%96%E8%BF%90%E8%A1%8C%E7%8A%B6%E6%80%81
* @return array|bool|null * @return null|array|bool
*/ */
public function getStatus() { public function getStatus()
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__) 'action' => $this->getActionName($this->prefix, __FUNCTION__),
], $this->callback); ], $this->callback);
} }
/** /**
* 获取版本信息 * 获取版本信息
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_version_info-%E8%8E%B7%E5%8F%96%E7%89%88%E6%9C%AC%E4%BF%A1%E6%81%AF * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_version_info-%E8%8E%B7%E5%8F%96%E7%89%88%E6%9C%AC%E4%BF%A1%E6%81%AF
* @return array|bool|null * @return null|array|bool
*/ */
public function getVersionInfo() { public function getVersionInfo()
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__) 'action' => $this->getActionName($this->prefix, __FUNCTION__),
], $this->callback); ], $this->callback);
} }
/** /**
* 重启 OneBot 实现 * 重启 OneBot 实现
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_restart-%E9%87%8D%E5%90%AF-onebot-%E5%AE%9E%E7%8E%B0 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_restart-%E9%87%8D%E5%90%AF-onebot-%E5%AE%9E%E7%8E%B0
* @param int $delay * @return null|array|bool
* @return array|bool|null
*/ */
public function setRestart($delay = 0) { public function setRestart(int $delay = 0)
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__), 'action' => $this->getActionName($this->prefix, __FUNCTION__),
'params' => [ 'params' => [
'delay' => $delay 'delay' => $delay,
] ],
], $this->callback); ], $this->callback);
} }
/** /**
* 清理缓存 * 清理缓存
* @link https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#clean_cache-%E6%B8%85%E7%90%86%E7%BC%93%E5%AD%98 * @see https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#clean_cache-%E6%B8%85%E7%90%86%E7%BC%93%E5%AD%98
* @return array|bool|null * @return null|array|bool
*/ */
public function cleanCache() { public function cleanCache()
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $this->getActionName(__FUNCTION__) 'action' => $this->getActionName($this->prefix, __FUNCTION__),
], $this->callback); ], $this->callback);
} }
public function callExtendedAPI($action, $params = []) { /**
* 获取内置支持的扩展API对象
* 现支持 go-cqhttp 的扩展API
* @throws ZMKnownException
* @return mixed
*/
public function getExtendedAPI(string $package_name = 'go-cqhttp')
{
$table = [
'go-cqhttp' => GoCqhttpAPIV11::class,
];
if (isset($table[$package_name])) {
return new $table[$package_name]($this->connection, $this->callback, $this->prefix);
}
throw new ZMKnownException(zm_internal_errcode('E00071'), '无法找到对应的调用扩展类');
}
public function callExtendedAPI($action, $params = [])
{
return $this->processAPI($this->connection, [ return $this->processAPI($this->connection, [
'action' => $action, 'action' => $action,
'params' => $params 'params' => $params,
], $this->callback); ], $this->callback);
} }
}
private function getActionName(string $method) {
$prefix = ($this->prefix == self::API_ASYNC ? '_async' : ($this->prefix == self::API_RATE_LIMITED ? '_rate_limited' : ''));
$func_name = strtolower(preg_replace('/(?<=[a-z])([A-Z])/', '_$1', $method));
return $func_name . $prefix;
}
}

View File

@@ -1,9 +1,9 @@
<?php <?php
declare(strict_types=1);
namespace ZM\API; namespace ZM\API;
use Swoole\Coroutine\Http\Client; use Swoole\Coroutine\Http\Client;
use ZM\Console\Console; use ZM\Console\Console;
@@ -16,103 +16,113 @@ class TuringAPI
* @param $api * @param $api
* @return string * @return string
*/ */
public static function getTuringMsg($msg, $user_id, $api) { public static function getTuringMsg($msg, $user_id, $api)
{
$origin = $msg; $origin = $msg;
if (($cq = CQ::getCQ($msg)) !== null) {//如有CQ码则去除 if (($cq = CQ::getCQ($msg)) !== null) {// 如有CQ码则去除
if ($cq["type"] == "image") { if ($cq['type'] == 'image') {
$url = $cq["params"]["url"]; $url = $cq['params']['url'];
$msg = str_replace(mb_substr($msg, $cq["start"], $cq["end"] - $cq["start"] + 1), "", $msg); $msg = str_replace(mb_substr($msg, $cq['start'], $cq['end'] - $cq['start'] + 1), '', $msg);
} }
$msg = trim($msg); $msg = trim($msg);
} }
//构建将要发送的json包给图灵 // 构建将要发送的json包给图灵
$content = [ $content = [
"reqType" => 0, 'reqType' => 0,
"userInfo" => [ 'userInfo' => [
"apiKey" => $api, 'apiKey' => $api,
"userId" => $user_id 'userId' => $user_id,
] ],
]; ];
if ($msg != "") { if ($msg != '') {
$content["perception"]["inputText"]["text"] = $msg; $content['perception']['inputText']['text'] = $msg;
} }
$msg = trim($msg); $msg = trim($msg);
if (mb_strlen($msg) < 1 && !isset($url)) return "请说出你想说的话"; if (mb_strlen($msg) < 1 && !isset($url)) {
if (isset($url)) { return '请说出你想说的话';
$content["perception"]["inputImage"]["url"] = $url;
$content["reqType"] = 1;
} }
if (!isset($content["perception"])) return "请说出你想说的话"; if (isset($url)) {
$client = new Client("openapi.tuling123.com", 80); $content['perception']['inputImage']['url'] = $url;
$client->setHeaders(["Content-type" => "application/json"]); $content['reqType'] = 1;
$client->post("/openapi/api/v2", json_encode($content, JSON_UNESCAPED_UNICODE)); }
if (!isset($content['perception'])) {
return '请说出你想说的话';
}
$client = new Client('openapi.tuling123.com', 80);
$client->setHeaders(['Content-type' => 'application/json']);
$client->post('/openapi/api/v2', json_encode($content, JSON_UNESCAPED_UNICODE));
$api_return = json_decode($client->body, true); $api_return = json_decode($client->body, true);
if (!isset($api_return["intent"]["code"])) return "XD 哎呀,我脑子突然短路了,请稍后再问我吧!"; if (!isset($api_return['intent']['code'])) {
return 'XD 哎呀,我脑子突然短路了,请稍后再问我吧!';
}
$status = self::getResultStatus($api_return); $status = self::getResultStatus($api_return);
if ($status !== true) { if ($status !== true) {
if ($status == "err:输入文本内容超长(上限150)") return "你的话太多了!!!"; if ($status == 'err:输入文本内容超长(上限150)') {
if ($api_return["intent"]["code"] == 4003) { return '你的话太多了!!!';
return "哎呀,我刚才有点走神了,可能忘记你说什么了,可以重说一遍吗";
} }
Console::error(zm_internal_errcode("E00038") . "图灵机器人发送错误!\n错误原始内容:" . $origin . "\n来自:" . $user_id . "\n错误信息:" . $status); if ($api_return['intent']['code'] == 4003) {
//echo json_encode($r, 128|256); return '哎呀,我刚才有点走神了,可能忘记你说什么了,可以重说一遍吗';
return "哎呀,我刚才有点走神了,要不一会儿换一种问题试试?"; }
Console::error(zm_internal_errcode('E00038') . "图灵机器人发送错误!\n错误原始内容:" . $origin . "\n来自:" . $user_id . "\n错误信息:" . $status);
// echo json_encode($r, 128|256);
return '哎呀,我刚才有点走神了,要不一会儿换一种问题试试?';
} }
$result = $api_return["results"]; $result = $api_return['results'];
//Console::info(Console::setColor(json_encode($result, 128 | 256), "green")); // Console::info(Console::setColor(json_encode($result, 128 | 256), "green"));
$final = ""; $final = '';
foreach ($result as $v) { foreach ($result as $v) {
switch ($v["resultType"]) { switch ($v['resultType']) {
case "url": case 'url':
$final .= "\n" . $v["values"]["url"]; $final .= "\n" . $v['values']['url'];
break; break;
case "text": case 'text':
$final .= "\n" . $v["values"]["text"]; $final .= "\n" . $v['values']['text'];
break; break;
case "image": case 'image':
$final .= "\n" . CQ::image($v["values"]["image"]); $final .= "\n" . CQ::image($v['values']['image']);
break; break;
} }
} }
return trim($final); return trim($final);
} }
public static function getResultStatus($r) { public static function getResultStatus($r)
switch ($r["intent"]["code"]) { {
switch ($r['intent']['code']) {
case 5000: case 5000:
return "err:无解析结果"; return 'err:无解析结果';
case 4000: case 4000:
case 6000: case 6000:
return "err:暂不支持该功能"; return 'err:暂不支持该功能';
case 4001: case 4001:
return "err:加密方式错误"; return 'err:加密方式错误';
case 4005: case 4005:
case 4002: case 4002:
return "err:无功能权限"; return 'err:无功能权限';
case 4003: case 4003:
return "err:该apikey没有可用请求次数"; return 'err:该apikey没有可用请求次数';
case 4007: case 4007:
return "err:apikey不合法"; return 'err:apikey不合法';
case 4100: case 4100:
return "err:userid获取失败"; return 'err:userid获取失败';
case 4200: case 4200:
return "err:上传格式错误"; return 'err:上传格式错误';
case 4300: case 4300:
return "err:批量操作超过限制"; return 'err:批量操作超过限制';
case 4400: case 4400:
return "err:没有上传合法userid"; return 'err:没有上传合法userid';
case 4500: case 4500:
return "err:userid申请个数超过限制"; return 'err:userid申请个数超过限制';
case 4600: case 4600:
return "err:输入内容为空"; return 'err:输入内容为空';
case 4602: case 4602:
return "err:输入文本内容超长(上限150)"; return 'err:输入文本内容超长(上限150)';
case 7002: case 7002:
return "err:上传信息失败"; return 'err:上传信息失败';
case 8008: case 8008:
return "err:服务器错误"; return 'err:服务器错误';
default: default:
return true; return true;
} }
} }
} }

View File

@@ -1,17 +1,14 @@
<?php /** @noinspection PhpMissingReturnTypeInspection */ <?php
/** @noinspection PhpUnused */
declare(strict_types=1);
namespace ZM\API; namespace ZM\API;
/** /**
* Class ZMRobot * Class ZMRobot
* @package ZM\Utils
* @since 1.2 * @since 1.2
* @version V11 * @version V11
*/ */
class ZMRobot extends OneBotV11 class ZMRobot extends OneBotV11
{ {
} }

View File

@@ -1,29 +1,38 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation; namespace ZM\Annotation;
use Closure; use Closure;
abstract class AnnotationBase abstract class AnnotationBase
{ {
public $method; public $method = '';
public $class; public $class = '';
public function __toString() { public function __toString()
$str = __CLASS__ . ": "; {
$str = __CLASS__ . ': ';
foreach ($this as $k => $v) { foreach ($this as $k => $v) {
$str .= "\n\t" . $k . " => "; $str .= "\n\t" . $k . ' => ';
if (is_string($v)) $str .= "\"$v\""; if (is_string($v)) {
elseif (is_numeric($v)) $str .= $v; $str .= "\"{$v}\"";
elseif (is_bool($v)) $str .= ($v ? "TRUE" : "FALSE"); } elseif (is_numeric($v)) {
elseif (is_array($v)) $str .= json_encode($v, JSON_UNESCAPED_UNICODE); $str .= $v;
elseif ($v instanceof Closure) $str .= "@AnonymousFunction"; } elseif (is_bool($v)) {
elseif (is_null($v)) $str .= "NULL"; $str .= ($v ? 'TRUE' : 'FALSE');
else $str .= "@Unknown"; } elseif (is_array($v)) {
$str .= json_encode($v, JSON_UNESCAPED_UNICODE);
} elseif ($v instanceof Closure) {
$str .= '@AnonymousFunction';
} elseif (is_null($v)) {
$str .= 'NULL';
} else {
$str .= '@Unknown';
}
} }
return $str; return $str;
} }
} }

View File

@@ -1,12 +1,12 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation; namespace ZM\Annotation;
use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\Common\Annotations\AnnotationReader;
use ZM\Annotation\Interfaces\ErgodicAnnotation; use Koriym\Attributes\AttributeReader;
use ZM\Config\ZMConfig; use Koriym\Attributes\DualReader;
use ZM\Console\Console;
use ReflectionClass; use ReflectionClass;
use ReflectionException; use ReflectionException;
use ReflectionMethod; use ReflectionMethod;
@@ -16,11 +16,15 @@ use ZM\Annotation\Http\HandleException;
use ZM\Annotation\Http\Middleware; use ZM\Annotation\Http\Middleware;
use ZM\Annotation\Http\MiddlewareClass; use ZM\Annotation\Http\MiddlewareClass;
use ZM\Annotation\Http\RequestMapping; use ZM\Annotation\Http\RequestMapping;
use ZM\Annotation\Interfaces\ErgodicAnnotation;
use ZM\Annotation\Interfaces\Level; use ZM\Annotation\Interfaces\Level;
use ZM\Annotation\Module\Closed; use ZM\Annotation\Module\Closed;
use ZM\Config\ZMConfig;
use ZM\Console\Console;
use ZM\Exception\AnnotationException; use ZM\Exception\AnnotationException;
use ZM\Utils\Manager\RouteManager; use ZM\Utils\Manager\RouteManager;
use ZM\Utils\ZMUtil; use ZM\Utils\ZMUtil;
use function server;
class AnnotationParser class AnnotationParser
{ {
@@ -29,23 +33,27 @@ class AnnotationParser
private $start_time; private $start_time;
private $annotation_map = []; private $annotation_map = [];
private $middleware_map = []; private $middleware_map = [];
private $middlewares = []; private $middlewares = [];
/** @var null|AnnotationReader */ /** @var null|AnnotationReader */
private $reader = null; private $reader;
private $req_mapping = []; private $req_mapping = [];
/** /**
* AnnotationParser constructor. * AnnotationParser constructor.
*/ */
public function __construct() { public function __construct()
{
$this->start_time = microtime(true); $this->start_time = microtime(true);
//$this->loadAnnotationClasses(); // $this->loadAnnotationClasses();
$this->req_mapping[0] = [ $this->req_mapping[0] = [
'id' => 0, 'id' => 0,
'pid' => -1, 'pid' => -1,
'name' => '/' 'name' => '/',
]; ];
} }
@@ -53,19 +61,32 @@ class AnnotationParser
* 注册各个模块类的注解和模块level的排序 * 注册各个模块类的注解和模块level的排序
* @throws ReflectionException * @throws ReflectionException
*/ */
public function registerMods() { public function registerMods()
{
foreach ($this->path_list as $path) { foreach ($this->path_list as $path) {
Console::debug("parsing annotation in " . $path[0].":".$path[1]); Console::debug('parsing annotation in ' . $path[0] . ':' . $path[1]);
$all_class = ZMUtil::getClassesPsr4($path[0], $path[1]); $all_class = ZMUtil::getClassesPsr4($path[0], $path[1]);
$this->reader = new AnnotationReader();
$conf = ZMConfig::get('global', 'runtime')['annotation_reader_ignore'] ?? [];
if (isset($conf['name']) && is_array($conf['name'])) {
foreach ($conf['name'] as $v) {
AnnotationReader::addGlobalIgnoredName($v);
}
}
if (isset($conf['namespace']) && is_array($conf['namespace'])) {
foreach ($conf['namespace'] as $v) {
AnnotationReader::addGlobalIgnoredNamespace($v);
}
}
AnnotationReader::addGlobalIgnoredName('mixin');
$this->reader = new DualReader(new AnnotationReader(), new AttributeReader());
foreach ($all_class as $v) { foreach ($all_class as $v) {
Console::debug("正在检索 " . $v); Console::debug('正在检索 ' . $v);
$reflection_class = new ReflectionClass($v); $reflection_class = new ReflectionClass($v);
$methods = $reflection_class->getMethods(ReflectionMethod::IS_PUBLIC); $methods = $reflection_class->getMethods(ReflectionMethod::IS_PUBLIC);
$class_annotations = $this->reader->getClassAnnotations($reflection_class); $class_annotations = $this->reader->getClassAnnotations($reflection_class);
// 这段为新加的:start // 这段为新加的:start
//这里将每个类里面所有的类注解、方法注解通通加到一颗大树上,后期解析 // 这里将每个类里面所有的类注解、方法注解通通加到一颗大树上,后期解析
/* /*
$annotation_map: { $annotation_map: {
Module\Example\Hello: { Module\Example\Hello: {
@@ -84,44 +105,57 @@ class AnnotationParser
*/ */
// 生成主树 // 生成主树
$this->annotation_map[$v]["class_annotations"] = $class_annotations; $this->annotation_map[$v]['class_annotations'] = $class_annotations;
$this->annotation_map[$v]["methods"] = $methods; $this->annotation_map[$v]['methods'] = $methods;
foreach ($methods as $method) { foreach ($methods as $method) {
$this->annotation_map[$v]["methods_annotations"][$method->getName()] = $this->reader->getMethodAnnotations($method); $this->annotation_map[$v]['methods_annotations'][$method->getName()] = $this->reader->getMethodAnnotations($method);
} }
foreach ($this->annotation_map[$v]['class_annotations'] as $vs) {
foreach ($this->annotation_map[$v]["class_annotations"] as $vs) {
$vs->class = $v; $vs->class = $v;
//预处理1将适用于每一个函数的注解到类注解重新注解到每个函数下面 // 预处理1将适用于每一个函数的注解到类注解重新注解到每个函数下面
if ($vs instanceof ErgodicAnnotation) { if ($vs instanceof ErgodicAnnotation) {
foreach (($this->annotation_map[$v]["methods"] ?? []) as $method) { foreach (($this->annotation_map[$v]['methods'] ?? []) as $method) {
$copy = clone $vs; $copy = clone $vs;
/** @noinspection PhpUndefinedFieldInspection */
$copy->method = $method->getName(); $copy->method = $method->getName();
$this->annotation_map[$v]["methods_annotations"][$method->getName()][] = $copy; $this->annotation_map[$v]['methods_annotations'][$method->getName()][] = $copy;
} }
} }
//预处理2处理 class 下面的注解 // 预处理2处理 class 下面的注解
if ($vs instanceof Closed) { if ($vs instanceof Closed) {
unset($this->annotation_map[$v]); unset($this->annotation_map[$v]);
continue 2; continue 2;
} elseif ($vs instanceof MiddlewareClass) { }
//注册中间件本身的类,标记到 middlewares 属性中 if ($vs instanceof MiddlewareClass) {
Console::debug("正在注册中间件 " . $reflection_class->getName()); // 注册中间件本身的类,标记到 middlewares 属性中
Console::debug('正在注册中间件 ' . $reflection_class->getName());
$rs = $this->registerMiddleware($vs, $reflection_class); $rs = $this->registerMiddleware($vs, $reflection_class);
$this->middlewares[$rs["name"]] = $rs; $this->middlewares[$rs['name']] = $rs;
} }
} }
//预处理3处理每个函数上面的特殊注解就是需要操作一些东西的 $inserted = [];
foreach (($this->annotation_map[$v]["methods_annotations"] ?? []) as $method_name => $methods_annotations) {
// 预处理3处理每个函数上面的特殊注解就是需要操作一些东西的
foreach (($this->annotation_map[$v]['methods_annotations'] ?? []) as $method_name => $methods_annotations) {
foreach ($methods_annotations as $method_anno) { foreach ($methods_annotations as $method_anno) {
/** @var AnnotationBase $method_anno */ /* @var AnnotationBase $method_anno */
$method_anno->class = $v; $method_anno->class = $v;
$method_anno->method = $method_name; $method_anno->method = $method_name;
if (!($method_anno instanceof Middleware) && ($middlewares = ZMConfig::get('global', 'runtime')['global_middleware_binding'][get_class($method_anno)] ?? []) !== []) {
if (!isset($inserted[$v][$method_name])) {
// 在这里在其他中间件前插入插入全局的中间件
foreach ($middlewares as $middleware) {
$mid_class = new Middleware($middleware);
$mid_class->class = $v;
$mid_class->method = $method_name;
$this->middleware_map[$v][$method_name][] = $mid_class;
}
$inserted[$v][$method_name] = true;
}
}
if ($method_anno instanceof RequestMapping) { if ($method_anno instanceof RequestMapping) {
RouteManager::importRouteByAnnotation($method_anno, $method_name, $v, $methods_annotations); RouteManager::importRouteByAnnotation($method_anno, $method_name, $v, $methods_annotations);
} elseif ($method_anno instanceof Middleware) { } elseif ($method_anno instanceof Middleware) {
@@ -131,22 +165,25 @@ class AnnotationParser
} }
} }
} }
Console::debug("解析注解完毕!"); Console::debug('解析注解完毕!');
} }
public function generateAnnotationEvents() { public function generateAnnotationEvents(): array
{
$o = []; $o = [];
foreach ($this->annotation_map as $obj) { foreach ($this->annotation_map as $obj) {
foreach (($obj["class_annotations"] ?? []) as $class_annotation) { // 这里的ErgodicAnnotation是为了解决类上的注解可穿透到方法上的问题
if ($class_annotation instanceof ErgodicAnnotation) continue; foreach (($obj['class_annotations'] ?? []) as $class_annotation) {
else $o[get_class($class_annotation)][] = $class_annotation; if ($class_annotation instanceof ErgodicAnnotation) {
continue;
}
$o[get_class($class_annotation)][] = $class_annotation;
} }
foreach (($obj["methods_annotations"] ?? []) as $methods_annotations) { foreach (($obj['methods_annotations'] ?? []) as $methods_annotations) {
foreach ($methods_annotations as $annotation) { foreach ($methods_annotations as $annotation) {
$o[get_class($annotation)][] = $annotation; $o[get_class($annotation)][] = $annotation;
} }
} }
} }
foreach ($o as $k => $v) { foreach ($o as $k => $v) {
$this->sortByLevel($o, $k); $this->sortByLevel($o, $k);
@@ -154,55 +191,39 @@ class AnnotationParser
return $o; return $o;
} }
/** public function getMiddlewares(): array
* @return array {
*/ return $this->middlewares;
public function getMiddlewares(): array { return $this->middlewares; } }
/** public function getMiddlewareMap(): array
* @return array {
*/ return $this->middleware_map;
public function getMiddlewareMap(): array { return $this->middleware_map; } }
/** public function getReqMapping(): array
* @return array {
*/ return $this->req_mapping;
public function getReqMapping(): array { return $this->req_mapping; } }
/** /**
* @param $path * @param $path
* @param $indoor_name * @param $indoor_name
*/ */
public function addRegisterPath($path, $indoor_name) { $this->path_list[] = [$path, $indoor_name]; } public function addRegisterPath($path, $indoor_name)
{
//private function below if (server()->worker_id === 0) {
Console::verbose('Add register path: ' . $path . ' => ' . $indoor_name);
private function registerMiddleware(MiddlewareClass $vs, ReflectionClass $reflection_class): array {
$result = [
"class" => "\\" . $reflection_class->getName(),
"name" => $vs->name
];
foreach ($reflection_class->getMethods() as $vss) {
$method_annotations = $this->reader->getMethodAnnotations($vss);
foreach ($method_annotations as $vsss) {
if ($vsss instanceof HandleBefore) $result["before"] = $vss->getName();
if ($vsss instanceof HandleAfter) $result["after"] = $vss->getName();
if ($vsss instanceof HandleException) {
$result["exceptions"][$vsss->class_name] = $vss->getName();
}
}
} }
return $result; $this->path_list[] = [$path, $indoor_name];
} }
/** /**
* @internal 用于 level 排序
* @param $events * @param $events
* @param string $class_name * @internal 用于 level 排序
* @param string $prefix
*/ */
public function sortByLevel(&$events, string $class_name, $prefix = "") { public function sortByLevel(&$events, string $class_name, string $prefix = '')
{
if (is_a($class_name, Level::class, true)) { if (is_a($class_name, Level::class, true)) {
$class_name .= $prefix; $class_name .= $prefix;
usort($events[$class_name], function ($a, $b) { usort($events[$class_name], function ($a, $b) {
@@ -216,12 +237,13 @@ class AnnotationParser
/** /**
* @throws AnnotationException * @throws AnnotationException
*/ */
public function verifyMiddlewares() { public function verifyMiddlewares()
if ((ZMConfig::get("global", "runtime")["middleware_error_policy"] ?? 1) === 2) { {
//我承认套三层foreach很不优雅但是这个会很快的。 if ((ZMConfig::get('global', 'runtime')['middleware_error_policy'] ?? 1) === 2) {
foreach($this->middleware_map as $class => $v) { // 我承认套三层foreach很不优雅但是这个会很快的。
foreach ($v as $method => $vs) { foreach ($this->middleware_map as $v) {
foreach($vs as $mid) { foreach ($v as $vs) {
foreach ($vs as $mid) {
if (!isset($this->middlewares[$mid->middleware])) { if (!isset($this->middlewares[$mid->middleware])) {
throw new AnnotationException("Annotation parse error: Unknown MiddlewareClass named \"{$mid->middleware}\"!"); throw new AnnotationException("Annotation parse error: Unknown MiddlewareClass named \"{$mid->middleware}\"!");
} }
@@ -230,4 +252,35 @@ class AnnotationParser
} }
} }
} }
public function getRunTime()
{
return microtime(true) - $this->start_time;
}
// private function below
private function registerMiddleware(MiddlewareClass $vs, ReflectionClass $reflection_class): array
{
$result = [
'class' => '\\' . $reflection_class->getName(),
'name' => $vs->name,
];
foreach ($reflection_class->getMethods() as $vss) {
$method_annotations = $this->reader->getMethodAnnotations($vss);
foreach ($method_annotations as $vsss) {
if ($vsss instanceof HandleBefore) {
$result['before'] = $vss->getName();
}
if ($vsss instanceof HandleAfter) {
$result['after'] = $vss->getName();
}
if ($vsss instanceof HandleException) {
$result['exceptions'][$vsss->class_name] = $vss->getName();
}
}
}
return $result;
}
} }

View File

@@ -1,19 +1,22 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\CQ; namespace ZM\Annotation\CQ;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Required; use Doctrine\Common\Annotations\Annotation\Required;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
/** /**
* Class CQAPIResponse * Class CQAPIResponse
* @package ZM\Annotation\CQ
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("METHOD") * @Target("METHOD")
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class CQAPIResponse extends AnnotationBase class CQAPIResponse extends AnnotationBase
{ {
/** /**
@@ -21,4 +24,9 @@ class CQAPIResponse extends AnnotationBase
* @Required() * @Required()
*/ */
public $retcode; public $retcode;
public function __construct($retcode)
{
$this->retcode = $retcode;
}
} }

View File

@@ -1,8 +1,11 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\CQ; namespace ZM\Annotation\CQ;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
use ZM\Annotation\Interfaces\Level; use ZM\Annotation\Interfaces\Level;
@@ -10,9 +13,10 @@ use ZM\Annotation\Interfaces\Level;
/** /**
* Class CQAfter * Class CQAfter
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("METHOD") * @Target("METHOD")
* @package ZM\Annotation\CQ
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class CQAfter extends AnnotationBase implements Level class CQAfter extends AnnotationBase implements Level
{ {
/** /**
@@ -23,17 +27,25 @@ class CQAfter extends AnnotationBase implements Level
public $level = 20; public $level = 20;
public function __construct($cq_event, $level = 20)
{
$this->cq_event = $cq_event;
$this->level = $level;
}
/** /**
* @return mixed * @return mixed
*/ */
public function getLevel() { public function getLevel()
{
return $this->level; return $this->level;
} }
/** /**
* @param mixed $level * @param mixed $level
*/ */
public function setLevel($level) { public function setLevel($level)
{
$this->level = $level; $this->level = $level;
} }
} }

View File

@@ -1,9 +1,11 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\CQ; namespace ZM\Annotation\CQ;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Required; use Doctrine\Common\Annotations\Annotation\Required;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
@@ -12,9 +14,10 @@ use ZM\Annotation\Interfaces\Level;
/** /**
* Class CQBefore * Class CQBefore
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("METHOD") * @Target("METHOD")
* @package ZM\Annotation\CQ
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class CQBefore extends AnnotationBase implements Level class CQBefore extends AnnotationBase implements Level
{ {
/** /**
@@ -25,18 +28,25 @@ class CQBefore extends AnnotationBase implements Level
public $level = 20; public $level = 20;
public function __construct($cq_event, $level = 20)
{
$this->cq_event = $cq_event;
$this->level = $level;
}
/** /**
* @return mixed * @return mixed
*/ */
public function getLevel(): int { public function getLevel(): int
{
return $this->level; return $this->level;
} }
/** /**
* @param mixed $level * @param mixed $level
*/ */
public function setLevel($level) { public function setLevel($level)
{
$this->level = $level; $this->level = $level;
} }
}
}

View File

@@ -1,8 +1,11 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\CQ; namespace ZM\Annotation\CQ;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
use ZM\Annotation\Interfaces\Level; use ZM\Annotation\Interfaces\Level;
@@ -10,44 +13,74 @@ use ZM\Annotation\Interfaces\Level;
/** /**
* Class CQCommand * Class CQCommand
* @Annotation * @Annotation
* @NamedArgumentConstructor
* @Target("ALL") * @Target("ALL")
* @package ZM\Annotation\CQ
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_ALL)]
class CQCommand extends AnnotationBase implements Level class CQCommand extends AnnotationBase implements Level
{ {
/** @var string */ /** @var string */
public $match = ""; public $match = '';
/** @var string */ /** @var string */
public $pattern = ""; public $pattern = '';
/** @var string */ /** @var string */
public $regex = ""; public $regex = '';
/** @var string */ /** @var string */
public $start_with = ""; public $start_with = '';
/** @var string */ /** @var string */
public $end_with = ""; public $end_with = '';
/** @var string */ /** @var string */
public $keyword = ""; public $keyword = '';
/** @var string[] */ /** @var string[] */
public $alias = []; public $alias = [];
/** @var string */ /** @var string */
public $message_type = ""; public $message_type = '';
/** @var int */ /** @var int */
public $user_id = 0; public $user_id = 0;
/** @var int */ /** @var int */
public $group_id = 0; public $group_id = 0;
/** @var int */ /** @var int */
public $discuss_id = 0; public $discuss_id = 0;
/** @var int */ /** @var int */
public $level = 20; public $level = 20;
/** public function __construct($match = '', $pattern = '', $regex = '', $start_with = '', $end_with = '', $keyword = '', $alias = [], $message_type = '', $user_id = 0, $group_id = 0, $discuss_id = 0, $level = 20)
* @return int {
*/ $this->match = $match;
public function getLevel(): int { return $this->level; } $this->pattern = $pattern;
$this->regex = $regex;
$this->start_with = $start_with;
$this->end_with = $end_with;
$this->keyword = $keyword;
$this->alias = $alias;
$this->message_type = $message_type;
$this->user_id = $user_id;
$this->group_id = $group_id;
$this->discuss_id = $discuss_id;
$this->level = $level;
}
public function getLevel(): int
{
return $this->level;
}
/** /**
* @param int $level * @param int $level
*/ */
public function setLevel($level) { $this->level = $level; } public function setLevel($level)
{
$this->level = $level;
}
} }

View File

@@ -1,8 +1,11 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\CQ; namespace ZM\Annotation\CQ;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
use ZM\Annotation\Interfaces\Level; use ZM\Annotation\Interfaces\Level;
@@ -10,31 +13,53 @@ use ZM\Annotation\Interfaces\Level;
/** /**
* Class CQMessage * Class CQMessage
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("ALL") * @Target("ALL")
* @package ZM\Annotation\CQ
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_ALL)]
class CQMessage extends AnnotationBase implements Level class CQMessage extends AnnotationBase implements Level
{ {
/** /**
* @var string * @var string
*/ */
public $message_type = ""; public $message_type = '';
/** @var int */ /** @var int */
public $user_id = 0; public $user_id = 0;
/** @var int */ /** @var int */
public $group_id = 0; public $group_id = 0;
/** @var int */ /** @var int */
public $discuss_id = 0; public $discuss_id = 0;
/** @var string */ /** @var string */
public $message = ""; public $message = '';
/** @var string */ /** @var string */
public $raw_message = ""; public $raw_message = '';
/** @var int */ /** @var int */
public $level = 20; public $level = 20;
public function getLevel(): int { return $this->level; } public function __construct($message_type = '', $user_id = 0, $group_id = 0, $discuss_id = 0, $message = '', $raw_message = '', $level = 20)
{
public function setLevel($level) { $this->message_type = $message_type;
$this->user_id = $user_id;
$this->group_id = $group_id;
$this->discuss_id = $discuss_id;
$this->message = $message;
$this->raw_message = $raw_message;
$this->level = $level; $this->level = $level;
} }
}
public function getLevel(): int
{
return $this->level;
}
public function setLevel($level)
{
$this->level = $level;
}
}

View File

@@ -1,8 +1,11 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\CQ; namespace ZM\Annotation\CQ;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Required; use Doctrine\Common\Annotations\Annotation\Required;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
@@ -11,28 +14,40 @@ use ZM\Annotation\Interfaces\Level;
/** /**
* Class CQMetaEvent * Class CQMetaEvent
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("ALL") * @Target("ALL")
* @package ZM\Annotation\CQ
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_ALL)]
class CQMetaEvent extends AnnotationBase implements Level class CQMetaEvent extends AnnotationBase implements Level
{ {
/** /**
* @var string * @var string
* @Required() * @Required()
*/ */
public $meta_event_type = ''; public $meta_event_type;
/** @var int */ /** @var int */
public $level; public $level = 20;
public function __construct($meta_event_type, $level = 20)
{
$this->meta_event_type = $meta_event_type;
$this->level = $level;
}
/** /**
* @return mixed * @return mixed
*/ */
public function getLevel(): int { return $this->level; } public function getLevel(): int
{
return $this->level;
}
/** /**
* @param int $level * @param int $level
*/ */
public function setLevel($level) { public function setLevel($level)
{
$this->level = $level; $this->level = $level;
} }
} }

View File

@@ -1,8 +1,11 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\CQ; namespace ZM\Annotation\CQ;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
use ZM\Annotation\Interfaces\Level; use ZM\Annotation\Interfaces\Level;
@@ -10,33 +13,46 @@ use ZM\Annotation\Interfaces\Level;
/** /**
* Class CQNotice * Class CQNotice
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("ALL") * @Target("ALL")
* @package ZM\Annotation\CQ
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_ALL)]
class CQNotice extends AnnotationBase implements Level class CQNotice extends AnnotationBase implements Level
{ {
/** @var string */ /** @var string */
public $notice_type = ""; public $notice_type = '';
/** @var string */ /** @var string */
public $sub_type = ""; public $sub_type = '';
/** @var int */ /** @var int */
public $group_id = 0; public $group_id = 0;
/** @var int */ /** @var int */
public $operator_id = 0; public $operator_id = 0;
/** @var int */ /** @var int */
public $level = 20; public $level = 20;
/** public function __construct($notice_type = '', $sub_type = '', $group_id = 0, $operator_id = 0, $level = 20)
* @return int {
*/ $this->notice_type = $notice_type;
public function getLevel(): int { $this->sub_type = $sub_type;
$this->group_id = $group_id;
$this->operator_id = $operator_id;
$this->level = $level;
}
public function getLevel(): int
{
return $this->level; return $this->level;
} }
/** /**
* @param int $level * @param int $level
*/ */
public function setLevel($level) { public function setLevel($level)
{
$this->level = $level; $this->level = $level;
} }
} }

View File

@@ -1,8 +1,11 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\CQ; namespace ZM\Annotation\CQ;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
use ZM\Annotation\Interfaces\Level; use ZM\Annotation\Interfaces\Level;
@@ -10,33 +13,46 @@ use ZM\Annotation\Interfaces\Level;
/** /**
* Class CQRequest * Class CQRequest
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("ALL") * @Target("ALL")
* @package ZM\Annotation\CQ
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_ALL)]
class CQRequest extends AnnotationBase implements Level class CQRequest extends AnnotationBase implements Level
{ {
/** @var string */ /** @var string */
public $request_type = ""; public $request_type = '';
/** @var string */ /** @var string */
public $sub_type = ""; public $sub_type = '';
/** @var int */ /** @var int */
public $user_id = 0; public $user_id = 0;
/** @var string */ /** @var string */
public $comment = ""; public $comment = '';
/** @var int */ /** @var int */
public $level = 20; public $level = 20;
/** public function __construct($request_type = '', $sub_type = '', $user_id = 0, $comment = '', $level = 20)
* @return int {
*/ $this->request_type = $request_type;
public function getLevel(): int { $this->sub_type = $sub_type;
$this->user_id = $user_id;
$this->comment = $comment;
$this->level = $level;
}
public function getLevel(): int
{
return $this->level; return $this->level;
} }
/** /**
* @param int $level * @param int $level
*/ */
public function setLevel($level) { public function setLevel($level)
{
$this->level = $level; $this->level = $level;
} }
} }

View File

@@ -1,18 +1,22 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Command; namespace ZM\Annotation\Command;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Required; use Doctrine\Common\Annotations\Annotation\Required;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
/** /**
* Class TerminalCommand * Class TerminalCommand
* @package ZM\Annotation\Command
* @Annotation * @Annotation
* @NamedArgumentConstructor
* @Target("METHOD") * @Target("METHOD")
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class TerminalCommand extends AnnotationBase class TerminalCommand extends AnnotationBase
{ {
/** /**
@@ -26,5 +30,12 @@ class TerminalCommand extends AnnotationBase
/** /**
* @var string * @var string
*/ */
public $description = ""; public $description = '';
}
public function __construct($command, $alias = '', $description = '')
{
$this->command = $command;
$this->alias = $alias;
$this->description = $description;
}
}

View File

@@ -1,8 +1,11 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Http; namespace ZM\Annotation\Http;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Required; use Doctrine\Common\Annotations\Annotation\Required;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
@@ -11,9 +14,10 @@ use ZM\Annotation\Interfaces\ErgodicAnnotation;
/** /**
* Class Controller * Class Controller
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("CLASS") * @Target("CLASS")
* @package ZM\Annotation\Http
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_CLASS)]
class Controller extends AnnotationBase implements ErgodicAnnotation class Controller extends AnnotationBase implements ErgodicAnnotation
{ {
/** /**
@@ -21,4 +25,9 @@ class Controller extends AnnotationBase implements ErgodicAnnotation
* @Required() * @Required()
*/ */
public $prefix = ''; public $prefix = '';
public function __construct(string $prefix)
{
$this->prefix = $prefix;
}
} }

View File

@@ -1,18 +1,21 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Http; namespace ZM\Annotation\Http;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
/** /**
* Class HandleAfter * Class HandleAfter
* @package ZM\Annotation\Http
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("METHOD") * @Target("METHOD")
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class HandleAfter extends AnnotationBase class HandleAfter extends AnnotationBase
{ {
} }

View File

@@ -1,18 +1,21 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Http; namespace ZM\Annotation\Http;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
/** /**
* Class HandleBefore * Class HandleBefore
* @package ZM\Annotation\Http
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("METHOD") * @Target("METHOD")
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class HandleBefore extends AnnotationBase class HandleBefore extends AnnotationBase
{ {
} }

View File

@@ -1,23 +1,31 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Http; namespace ZM\Annotation\Http;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use Exception; use Exception;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
/** /**
* Class HandleException * Class HandleException
* @package ZM\Annotation\Http
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("METHOD") * @Target("METHOD")
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class HandleException extends AnnotationBase class HandleException extends AnnotationBase
{ {
/** /**
* @var string * @var string
*/ */
public $class_name = Exception::class; public $class_name = Exception::class;
}
public function __construct($class_name = Exception::class)
{
$this->class_name = $class_name;
}
}

View File

@@ -1,9 +1,11 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Http; namespace ZM\Annotation\Http;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Required; use Doctrine\Common\Annotations\Annotation\Required;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
@@ -11,10 +13,11 @@ use ZM\Annotation\Interfaces\ErgodicAnnotation;
/** /**
* Class Middleware * Class Middleware
* @package ZM\Annotation\Http
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("ALL") * @Target("ALL")
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_ALL)]
class Middleware extends AnnotationBase implements ErgodicAnnotation class Middleware extends AnnotationBase implements ErgodicAnnotation
{ {
/** /**
@@ -27,4 +30,10 @@ class Middleware extends AnnotationBase implements ErgodicAnnotation
* @var string[] * @var string[]
*/ */
public $params = []; public $params = [];
public function __construct($middleware, $params = [])
{
$this->middleware = $middleware;
$this->params = $params;
}
} }

View File

@@ -1,19 +1,22 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Http; namespace ZM\Annotation\Http;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Required; use Doctrine\Common\Annotations\Annotation\Required;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
/** /**
* Class MiddlewareClass * Class MiddlewareClass
* @package ZM\Annotation\Http
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("CLASS") * @Target("CLASS")
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_CLASS)]
class MiddlewareClass extends AnnotationBase class MiddlewareClass extends AnnotationBase
{ {
/** /**
@@ -21,4 +24,9 @@ class MiddlewareClass extends AnnotationBase
* @Required() * @Required()
*/ */
public $name = ''; public $name = '';
public function __construct($name)
{
$this->name = $name;
}
} }

View File

@@ -1,8 +1,11 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Http; namespace ZM\Annotation\Http;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Required; use Doctrine\Common\Annotations\Annotation\Required;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
@@ -10,9 +13,10 @@ use ZM\Annotation\AnnotationBase;
/** /**
* Class RequestMapping * Class RequestMapping
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("METHOD") * @Target("METHOD")
* @package ZM\Annotation\Http
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class RequestMapping extends AnnotationBase class RequestMapping extends AnnotationBase
{ {
/** /**
@@ -36,4 +40,12 @@ class RequestMapping extends AnnotationBase
* @var array * @var array
*/ */
public $params = []; public $params = [];
public function __construct($route, $name = '', $request_method = [RequestMethod::GET, RequestMethod::POST], $params = [])
{
$this->route = $route;
$this->name = $name;
$this->request_method = $request_method;
$this->params = $params;
}
} }

View File

@@ -1,29 +1,46 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Http; namespace ZM\Annotation\Http;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Required; use Doctrine\Common\Annotations\Annotation\Required;
use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
/** /**
* Class RequestMethod * Class RequestMethod
* @Annotation * @Annotation
* @package ZM\Annotation\Http * @NamedArgumentConstructor()
* @Target("METHOD")
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class RequestMethod extends AnnotationBase class RequestMethod extends AnnotationBase
{ {
public const GET = 'GET';
public const POST = 'POST';
public const PUT = 'PUT';
public const PATCH = 'PATCH';
public const DELETE = 'DELETE';
public const OPTIONS = 'OPTIONS';
public const HEAD = 'HEAD';
/** /**
* @var string * @var string
* @Required() * @Required()
*/ */
public $method = self::GET; public $method = self::GET;
public const GET = 'GET'; public function __construct($method)
public const POST = 'POST'; {
public const PUT = 'PUT'; $this->method = $method;
public const PATCH = 'PATCH'; }
public const DELETE = 'DELETE';
public const OPTIONS = 'OPTIONS';
public const HEAD = 'HEAD';
} }

View File

@@ -1,10 +1,9 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Interfaces; namespace ZM\Annotation\Interfaces;
interface CustomAnnotation interface CustomAnnotation
{ {
}
}

View File

@@ -1,10 +1,9 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Interfaces; namespace ZM\Annotation\Interfaces;
interface ErgodicAnnotation interface ErgodicAnnotation
{ {
} }

View File

@@ -1,12 +1,12 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Interfaces; namespace ZM\Annotation\Interfaces;
interface Level interface Level
{ {
public function getLevel(); public function getLevel();
public function setLevel($level); public function setLevel($level);
} }

View File

@@ -1,10 +1,10 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Interfaces; namespace ZM\Annotation\Interfaces;
interface Rule interface Rule
{ {
public function getRule(); public function getRule();
} }

View File

@@ -1,18 +1,21 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Module; namespace ZM\Annotation\Module;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
/** /**
* Class Closed * Class Closed
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("CLASS") * @Target("CLASS")
* @package ZM\Annotation\Module
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_CLASS)]
class Closed extends AnnotationBase class Closed extends AnnotationBase
{ {
}
}

View File

@@ -1,21 +1,31 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Swoole; namespace ZM\Annotation\Swoole;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
/** /**
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("METHOD") * @Target("METHOD")
* Class OnCloseEvent * Class OnCloseEvent
* @package ZM\Annotation\Swoole
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class OnCloseEvent extends OnSwooleEventBase class OnCloseEvent extends OnSwooleEventBase
{ {
/** /**
* @var string * @var string
*/ */
public $connect_type = "default"; public $connect_type = 'default';
}
public function __construct($connect_type = 'default', $rule = '', $level = 20)
{
$this->connect_type = $connect_type;
$this->rule = $rule;
$this->level = $level;
}
}

View File

@@ -0,0 +1,25 @@
<?php
declare(strict_types=1);
namespace ZM\Annotation\Swoole;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target;
/**
* @Annotation
* @NamedArgumentConstructor()
* @Target("METHOD")
* @since 2.7.0
*/
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class OnManagerStartEvent extends OnSwooleEventBase
{
public function __construct($rule = '', $level = 20)
{
$this->rule = $rule;
$this->level = $level;
}
}

View File

@@ -1,21 +1,31 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Swoole; namespace ZM\Annotation\Swoole;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
/** /**
* @Annotation * @Annotation
* @Target("METHOD") * @Target("METHOD")
* @NamedArgumentConstructor()
* Class OnMessageEvent * Class OnMessageEvent
* @package ZM\Annotation\Swoole
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class OnMessageEvent extends OnSwooleEventBase class OnMessageEvent extends OnSwooleEventBase
{ {
/** /**
* @var string * @var string
*/ */
public $connect_type = "default"; public $connect_type = 'default';
}
public function __construct($connect_type = 'default', $rule = '', $level = 20)
{
$this->connect_type = $connect_type;
$this->rule = $rule;
$this->level = $level;
}
}

View File

@@ -1,21 +1,31 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Swoole; namespace ZM\Annotation\Swoole;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
/** /**
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("METHOD") * @Target("METHOD")
* Class OnOpenEvent * Class OnOpenEvent
* @package ZM\Annotation\Swoole
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class OnOpenEvent extends OnSwooleEventBase class OnOpenEvent extends OnSwooleEventBase
{ {
/** /**
* @var string * @var string
*/ */
public $connect_type = "default"; public $connect_type = 'default';
}
public function __construct($connect_type = 'default', $rule = '', $level = 20)
{
$this->connect_type = $connect_type;
$this->rule = $rule;
$this->level = $level;
}
}

View File

@@ -1,19 +1,22 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Swoole; namespace ZM\Annotation\Swoole;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Required; use Doctrine\Common\Annotations\Annotation\Required;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
/** /**
* Class OnPipeMessageEvent * Class OnPipeMessageEvent
* @package ZM\Annotation\Swoole
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("METHOD") * @Target("METHOD")
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class OnPipeMessageEvent extends AnnotationBase class OnPipeMessageEvent extends AnnotationBase
{ {
/** /**
@@ -21,4 +24,9 @@ class OnPipeMessageEvent extends AnnotationBase
* @Required() * @Required()
*/ */
public $action; public $action;
}
public function __construct($action)
{
$this->action = $action;
}
}

View File

@@ -1,17 +1,25 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Swoole; namespace ZM\Annotation\Swoole;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
/** /**
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("METHOD") * @Target("METHOD")
* Class OnRequestEvent * Class OnRequestEvent
* @package ZM\Annotation\Swoole
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class OnRequestEvent extends OnSwooleEventBase class OnRequestEvent extends OnSwooleEventBase
{ {
} public function __construct($rule = '', $level = 20)
{
$this->rule = $rule;
$this->level = $level;
}
}

View File

@@ -1,18 +1,21 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Swoole; namespace ZM\Annotation\Swoole;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
/** /**
* Class OnSave * Class OnSave
* @package ZM\Annotation\Swoole
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("METHOD") * @Target("METHOD")
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class OnSave extends AnnotationBase class OnSave extends AnnotationBase
{ {
} }

View File

@@ -1,18 +1,21 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Swoole; namespace ZM\Annotation\Swoole;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
/** /**
* Class ZMSetup * Class ZMSetup
* @package ZM\Annotation\Swoole
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("METHOD") * @Target("METHOD")
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class OnSetup extends AnnotationBase class OnSetup extends AnnotationBase
{ {
} }

View File

@@ -1,21 +1,30 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Swoole; namespace ZM\Annotation\Swoole;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
/** /**
* Class OnWorkerStart * Class OnWorkerStart
* @package ZM\Annotation\Swoole
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("METHOD") * @Target("METHOD")
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class OnStart extends AnnotationBase class OnStart extends AnnotationBase
{ {
/** /**
* @var int * @var int
*/ */
public $worker_id = 0; public $worker_id = 0;
public function __construct($worker_id = 0)
{
$this->worker_id = $worker_id;
}
} }

View File

@@ -1,17 +1,21 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Swoole; namespace ZM\Annotation\Swoole;
use Attribute;
use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
use Doctrine\Common\Annotations\Annotation\Required; use Doctrine\Common\Annotations\Annotation\Required;
use Doctrine\Common\Annotations\Annotation\Target; use Doctrine\Common\Annotations\Annotation\Target;
/** /**
* Class OnSwooleEvent * Class OnSwooleEvent
* @Annotation * @Annotation
* @NamedArgumentConstructor()
* @Target("METHOD") * @Target("METHOD")
* @package ZM\Annotation\Swoole
*/ */
#[Attribute(Attribute::IS_REPEATABLE | Attribute::TARGET_METHOD)]
class OnSwooleEvent extends OnSwooleEventBase class OnSwooleEvent extends OnSwooleEventBase
{ {
/** /**
@@ -20,17 +24,20 @@ class OnSwooleEvent extends OnSwooleEventBase
*/ */
public $type; public $type;
/** public function __construct($type, $rule = '', $level = 20)
* @return string {
*/ $this->type = $type;
public function getType(): string { $this->rule = $rule;
$this->level = $level;
}
public function getType(): string
{
return $this->type; return $this->type;
} }
/** public function setType(string $type)
* @param string $type {
*/
public function setType(string $type) {
$this->type = $type; $this->type = $type;
} }
} }

View File

@@ -1,9 +1,9 @@
<?php <?php
declare(strict_types=1);
namespace ZM\Annotation\Swoole; namespace ZM\Annotation\Swoole;
use ZM\Annotation\AnnotationBase; use ZM\Annotation\AnnotationBase;
use ZM\Annotation\Interfaces\Level; use ZM\Annotation\Interfaces\Level;
use ZM\Annotation\Interfaces\Rule; use ZM\Annotation\Interfaces\Rule;
@@ -13,37 +13,33 @@ abstract class OnSwooleEventBase extends AnnotationBase implements Level, Rule
/** /**
* @var string * @var string
*/ */
public $rule = ""; public $rule = '';
/** /**
* @var int * @var int
*/ */
public $level = 20; public $level = 20;
/** public function getRule()
* @return string {
*/ return $this->rule !== '' ? $this->rule : true;
public function getRule(): string {
return $this->rule !== "" ? $this->rule : true;
} }
/** public function setRule(string $rule)
* @param string $rule {
*/
public function setRule(string $rule) {
$this->rule = $rule; $this->rule = $rule;
} }
/** public function getLevel(): int
* @return int {
*/
public function getLevel(): int {
return $this->level; return $this->level;
} }
/** /**
* @param int $level * @param int $level
*/ */
public function setLevel($level) { public function setLevel($level)
{
$this->level = $level; $this->level = $level;
} }
} }

Some files were not shown because too many files have changed in this diff Show More