merge: resolve conflict

.github/workflows/npm.yml

@@ -78,9 +78,10 @@ jobs:
       - name: Is A Publish Branch
         if: steps.check-branch.outputs.match == 'true'
         run: |
+          NAME=$(npx pkg-jq -r .name)
           VERSION=$(npx pkg-jq -r .version)
-          if npx version-exists @chatie/grpc "$VERSION"
-          then "Version $VERSION exists on NPM, skipped."
+          if npx version-exists "$NAME" "$VERSION"
+          then echo "$NAME@$VERSION exists on NPM, skipped."
           else npm publish
           fi
         env:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-puppet",
-  "version": "0.21.11",
+  "version": "0.21.12",
   "description": "Abstract Puppet for Wechaty",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",

src/puppet.ts

@@ -453,15 +453,12 @@ export abstract class Puppet extends EventEmitter {
    */
   public abstract async logout (): Promise<void>
 
-  public selfId (): undefined | string {
+  public selfId (): string {
     log.verbose('Puppet', 'selfId()')
 
-    /**
-     * Huan (202003): do not throw exception. deal `undefined` outside.
-     */
-    // if (!this.id) {
-    //   throw new Error('not logged in, no this.id yet.')
-    // }
+    if (!this.id) {
+      throw new Error('not logged in, no this.id yet.')
+    }
 
     return this.id
   }