adapt service changes

package-lock.json

@@ -28,7 +28,7 @@
         "eslint-config-prettier": "^8.3.0",
         "eslint-plugin-prettier": "^3.4.1",
         "jest": "^27.4.3",
-        "koishi": "^4.0.1",
+        "koishi": "^4.1.0",
         "prettier": "^2.4.1",
         "rimraf": "^3.0.2",
         "supertest": "^6.1.6",
@@ -37,7 +37,7 @@
         "ws": "^8.2.3"
       },
       "peerDependencies": {
-        "koishi": "^4.0.0"
+        "koishi": "^4.0.1"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -1026,9 +1026,9 @@
       }
     },
     "node_modules/@koishijs/core": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.0.1.tgz",
-      "integrity": "sha512-zZi/IDRyoyPxaHpfHvSFYoIJ+T6d5jT0mmj9fQOfkTQtMF3kFeXiACAAAEQhdmkrmxsixx0+BPcxN1kzO1nxgA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.1.0.tgz",
+      "integrity": "sha512-f9SSEHxYt5OixXLhX0W9ME36JLQxdb8gwv8R5YOAd4y1IYchOX3qVfbnhRCd41SHUaKLhRWMBzwnl9R1dmqm4A==",
       "dev": true,
       "dependencies": {
         "@koishijs/utils": "^5.0.0",
@@ -4724,13 +4724,13 @@
       }
     },
     "node_modules/koishi": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.0.1.tgz",
-      "integrity": "sha512-BkhEPdgBhOZFSBqycfXyIF5clLWN666Ezv98XJi8hRj3Wl+Hdy4H0bCaHf4Ss3tfokezzXZXTLvzEYzNd8n7uQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.1.0.tgz",
+      "integrity": "sha512-jS1IWN5gi1GTUmoZ9bUxez6mIrGCPE/huVHEcF8uq1Fu2nzxlH8J9Xc5GD/UNzlyarB9/7fcOyOpv+K//uCM0A==",
       "dev": true,
       "dependencies": {
         "@koa/router": "^10.1.1",
-        "@koishijs/core": "^4.0.1",
+        "@koishijs/core": "^4.1.0",
         "@koishijs/utils": "^5.0.0",
         "@types/koa": "*",
         "@types/koa__router": "*",
@@ -7544,9 +7544,9 @@
       }
     },
     "@koishijs/core": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.0.1.tgz",
-      "integrity": "sha512-zZi/IDRyoyPxaHpfHvSFYoIJ+T6d5jT0mmj9fQOfkTQtMF3kFeXiACAAAEQhdmkrmxsixx0+BPcxN1kzO1nxgA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.1.0.tgz",
+      "integrity": "sha512-f9SSEHxYt5OixXLhX0W9ME36JLQxdb8gwv8R5YOAd4y1IYchOX3qVfbnhRCd41SHUaKLhRWMBzwnl9R1dmqm4A==",
       "dev": true,
       "requires": {
         "@koishijs/utils": "^5.0.0",
@@ -10388,13 +10388,13 @@
       }
     },
     "koishi": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.0.1.tgz",
-      "integrity": "sha512-BkhEPdgBhOZFSBqycfXyIF5clLWN666Ezv98XJi8hRj3Wl+Hdy4H0bCaHf4Ss3tfokezzXZXTLvzEYzNd8n7uQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.1.0.tgz",
+      "integrity": "sha512-jS1IWN5gi1GTUmoZ9bUxez6mIrGCPE/huVHEcF8uq1Fu2nzxlH8J9Xc5GD/UNzlyarB9/7fcOyOpv+K//uCM0A==",
       "dev": true,
       "requires": {
         "@koa/router": "^10.1.1",
-        "@koishijs/core": "^4.0.1",
+        "@koishijs/core": "^4.1.0",
         "@koishijs/utils": "^5.0.0",
         "@types/koa": "*",
         "@types/koa__router": "*",

package.json

@@ -39,7 +39,7 @@
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^3.4.1",
     "jest": "^27.4.3",
-    "koishi": "^4.0.1",
+    "koishi": "^4.1.0",
     "prettier": "^2.4.1",
     "rimraf": "^3.0.2",
     "supertest": "^6.1.6",

src/register.ts

@@ -359,17 +359,32 @@ export function DefinePlugin<T = any>(
         );
       }
 
-      _handleServiceProvide(immediate: boolean) {
-        const providingServices = [
+      _getProvidingServices() {
+        return [
           ...reflector.getArray(KoishiServiceProvideSym, originalClass),
           ...reflector.getArray(KoishiServiceProvideSym, this),
-        ].filter((serviceDef) => !serviceDef.immediate === !immediate);
+        ];
+      }
+
+      _handleServiceProvide(immediate: boolean) {
+        const providingServices = this._getProvidingServices().filter(
+          (serviceDef) => !serviceDef.immediate === !immediate,
+        );
         for (const key of providingServices) {
           // console.log(`Processing ${key}`);
           this.__ctx[key.serviceName] = this as any;
         }
       }
 
+      _uninstallServiceProvide() {
+        const providingServices = this._getProvidingServices();
+        for (const key of providingServices) {
+          if (this.__ctx[key.serviceName] === (this as never)) {
+            this.__ctx[key.serviceName] = null;
+          }
+        }
+      }
+
       _registerAfterInit() {
         this.__ctx.on('ready', async () => {
           if (typeof this.onConnect === 'function') {
@@ -378,6 +393,7 @@ export function DefinePlugin<T = any>(
           this._handleServiceProvide(false);
         });
         this.__ctx.on('dispose', async () => {
+          this._uninstallServiceProvide();
           if (typeof this.onDisconnect === 'function') {
             await this.onDisconnect();
           }