diff --git a/adapters/dingtalk/package.json b/adapters/dingtalk/package.json
index fc5a0759..2088363f 100644
--- a/adapters/dingtalk/package.json
+++ b/adapters/dingtalk/package.json
@@ -33,6 +33,6 @@
"@cordisjs/server": "^0.1.3"
},
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
}
}
diff --git a/adapters/discord/package.json b/adapters/discord/package.json
index ac44a2a5..16f0c0bb 100644
--- a/adapters/discord/package.json
+++ b/adapters/discord/package.json
@@ -32,7 +32,7 @@
"chat"
],
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
},
"dependencies": {
"form-data": "^4.0.0"
diff --git a/adapters/kook/package.json b/adapters/kook/package.json
index d67443c9..807f9eb3 100644
--- a/adapters/kook/package.json
+++ b/adapters/kook/package.json
@@ -32,7 +32,7 @@
"@cordisjs/server": "^0.1.3"
},
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
},
"dependencies": {
"form-data": "^4.0.0"
diff --git a/adapters/lark/package.json b/adapters/lark/package.json
index 8a6053c6..2741f767 100644
--- a/adapters/lark/package.json
+++ b/adapters/lark/package.json
@@ -36,7 +36,7 @@
"@cordisjs/server": "^0.1.3"
},
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
},
"dependencies": {
"form-data": "^4.0.0"
diff --git a/adapters/line/package.json b/adapters/line/package.json
index 389d5d08..0ad2207c 100644
--- a/adapters/line/package.json
+++ b/adapters/line/package.json
@@ -32,6 +32,6 @@
"@cordisjs/server": "^0.1.3"
},
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
}
}
diff --git a/adapters/mail/package.json b/adapters/mail/package.json
index 67904e47..ecadac51 100644
--- a/adapters/mail/package.json
+++ b/adapters/mail/package.json
@@ -31,7 +31,7 @@
"chat"
],
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
},
"dependencies": {
"@types/mailparser": "^3.4.4",
diff --git a/adapters/matrix/package.json b/adapters/matrix/package.json
index 338a9cad..f5792129 100644
--- a/adapters/matrix/package.json
+++ b/adapters/matrix/package.json
@@ -30,7 +30,7 @@
"@cordisjs/server": "^0.1.3"
},
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
},
"dependencies": {
"html5parser": "^2.0.2",
diff --git a/adapters/qq/package.json b/adapters/qq/package.json
index cf11c8d2..0e6368ac 100644
--- a/adapters/qq/package.json
+++ b/adapters/qq/package.json
@@ -1,7 +1,7 @@
{
"name": "@satorijs/adapter-qq",
"description": "QQ Adapter for Satorijs",
- "version": "4.3.0",
+ "version": "4.3.1",
"main": "lib/index.js",
"typings": "lib/index.d.ts",
"files": [
@@ -30,7 +30,7 @@
"chat"
],
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
},
"dependencies": {
"qface": "^1.4.1"
diff --git a/adapters/satori/package.json b/adapters/satori/package.json
index e756358e..e4fb9aff 100644
--- a/adapters/satori/package.json
+++ b/adapters/satori/package.json
@@ -29,6 +29,6 @@
"chat"
],
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
}
}
diff --git a/adapters/slack/package.json b/adapters/slack/package.json
index 3d722e0c..1c0ffeb6 100644
--- a/adapters/slack/package.json
+++ b/adapters/slack/package.json
@@ -32,7 +32,7 @@
"@cordisjs/server": "^0.1.3"
},
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
},
"dependencies": {
"@slack/types": "^2.10.0",
diff --git a/adapters/telegram/package.json b/adapters/telegram/package.json
index 7e73f5bb..c871550e 100644
--- a/adapters/telegram/package.json
+++ b/adapters/telegram/package.json
@@ -36,7 +36,7 @@
"@cordisjs/server": "^0.1.3"
},
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
},
"dependencies": {
"file-type": "^16.5.4",
diff --git a/adapters/wechat-official/package.json b/adapters/wechat-official/package.json
index bb1f7de2..749c8a6e 100644
--- a/adapters/wechat-official/package.json
+++ b/adapters/wechat-official/package.json
@@ -33,7 +33,7 @@
"@types/xml2js": "^0.4.14"
},
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
},
"dependencies": {
"@wecom/crypto": "^1.0.1",
diff --git a/adapters/wecom/package.json b/adapters/wecom/package.json
index b2a496cf..a1986f7b 100644
--- a/adapters/wecom/package.json
+++ b/adapters/wecom/package.json
@@ -33,7 +33,7 @@
"@types/xml2js": "^0.4.14"
},
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
},
"dependencies": {
"@wecom/crypto": "^1.0.1",
diff --git a/adapters/whatsapp/package.json b/adapters/whatsapp/package.json
index 21d22d02..412d4288 100644
--- a/adapters/whatsapp/package.json
+++ b/adapters/whatsapp/package.json
@@ -30,6 +30,6 @@
"@cordisjs/server": "^0.1.3"
},
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
}
}
diff --git a/adapters/zulip/package.json b/adapters/zulip/package.json
index 7791e37e..0c75e9a3 100644
--- a/adapters/zulip/package.json
+++ b/adapters/zulip/package.json
@@ -29,7 +29,7 @@
"chat"
],
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
},
"dependencies": {
"marked": "^9.1.6"
diff --git a/packages/core/package.json b/packages/core/package.json
index d1eea3d4..eb6916a3 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,7 +1,7 @@
{
"name": "@satorijs/core",
"description": "Core components of Satorijs",
- "version": "3.4.1",
+ "version": "3.4.2",
"main": "lib/index.cjs",
"module": "lib/index.mjs",
"typings": "lib/index.d.ts",
@@ -37,9 +37,9 @@
"dependencies": {
"@cordisjs/logger": "^0.1.3",
"@cordisjs/timer": "^0.2.0",
- "@satorijs/element": "^3.0.0",
+ "@satorijs/element": "^3.1.2",
"@satorijs/protocol": "^1.2.0",
- "cordis": "^3.6.0",
+ "cordis": "^3.6.1",
"cordis-axios": "^4.0.2",
"cosmokit": "^1.5.2",
"schemastery": "^3.14.3",
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index c969e47d..543a96ea 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -1,5 +1,3 @@
-///
-
import * as cordis from 'cordis'
import { Awaitable, defineProperty, Dict } from 'cosmokit'
import { Bot } from './bot'
@@ -7,7 +5,7 @@ import { Session } from './session'
import Schema from 'schemastery'
import Quester from 'cordis-axios'
import * as logger from '@cordisjs/logger'
-import timer from '@cordisjs/timer'
+import TimerService from '@cordisjs/timer'
import { Event, SendOptions } from '@satorijs/protocol'
import h from '@satorijs/element'
@@ -118,6 +116,7 @@ export interface Context {
[Context.session]: Session
baseDir: string
http: Quester
+ timer: TimerService
}
export class Context extends cordis.Context {
@@ -149,7 +148,7 @@ export class Context extends cordis.Context {
this.provide('timer', undefined, true)
this.provide('http', undefined, true)
this.plugin(logger)
- this.plugin(timer)
+ this.plugin(TimerService)
this.http = new Quester(config.request)
}
@@ -162,11 +161,10 @@ export class Context extends cordis.Context {
return session.transform(h.normalize(result))
}
const service = 'component:' + name
- this.root.provide(service)
- this[service] = render
- return this.collect('component', () => {
- this[service] = null
- return true
+ this.provide(service)
+ return this.effect(() => {
+ this[service] = render
+ return () => this[service] = null
})
}
}
diff --git a/packages/protocol/package.json b/packages/protocol/package.json
index 004b8273..74421bd2 100644
--- a/packages/protocol/package.json
+++ b/packages/protocol/package.json
@@ -35,7 +35,7 @@
"api"
],
"dependencies": {
- "@satorijs/element": "^3.0.0",
+ "@satorijs/element": "^3.1.2",
"cosmokit": "^1.5.2"
}
}
diff --git a/packages/satori/package.json b/packages/satori/package.json
index c40f63d5..caf1c3d0 100644
--- a/packages/satori/package.json
+++ b/packages/satori/package.json
@@ -1,7 +1,7 @@
{
"name": "@satorijs/satori",
"description": "Core components of Satorijs",
- "version": "3.4.1",
+ "version": "3.4.2",
"main": "lib/index.js",
"typings": "lib/index.d.ts",
"files": [
@@ -29,7 +29,7 @@
"@types/parseurl": "^1.3.3"
},
"dependencies": {
- "@satorijs/core": "3.4.1",
+ "@satorijs/core": "3.4.2",
"@types/ws": "^8.5.10",
"file-type": "^16.5.4",
"http-proxy-agent": "^5.0.0",
diff --git a/packages/server-proxy/package.json b/packages/server-proxy/package.json
index 7e28cc5b..61599d62 100644
--- a/packages/server-proxy/package.json
+++ b/packages/server-proxy/package.json
@@ -31,6 +31,6 @@
"@cordisjs/server": "^0.1.3"
},
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
}
}
diff --git a/packages/server-satori/package.json b/packages/server-satori/package.json
index 74cbeddf..ec424870 100644
--- a/packages/server-satori/package.json
+++ b/packages/server-satori/package.json
@@ -38,6 +38,6 @@
"@cordisjs/server": "^0.1.3"
},
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
}
}
diff --git a/packages/server-temp/package.json b/packages/server-temp/package.json
index 0b9fcb04..3c9b6efc 100644
--- a/packages/server-temp/package.json
+++ b/packages/server-temp/package.json
@@ -31,6 +31,6 @@
"@cordisjs/server": "^0.1.3"
},
"peerDependencies": {
- "@satorijs/satori": "^3.4.1"
+ "@satorijs/satori": "^3.4.2"
}
}