More robust user ID fetching

Uses /api/auth/me if the token is a full access token,
otherwise uses /api/user/name and /api/user/find

Author: AlinaNova21

src/RawAPI.js

@@ -54,6 +54,9 @@ export class RawAPI extends EventEmitter {
         },
         me () {
           return self.req('GET', '/api/auth/me')
+        },
+        queryToken (token) {
+          return self.req('GET', '/api/auth/query-token', { token })
         }
       },
       register: {
@@ -261,6 +264,9 @@ export class RawAPI extends EventEmitter {
         },
         console (expression, shard = DEFAULT_SHARD) {
           return self.req('POST', '/api/user/console', { expression, shard })
+        },
+        name () {
+          return self.req('GET', '/api/user/name')
         }
       },
       experimental: {

src/ScreepsAPI.js

@@ -110,8 +110,32 @@ export class ScreepsAPI extends RawAPI {
     return `https://screeps.com/a/#!/account/auth-tokens/noratelimit?token=${this.token.slice(0, 8)}`
   }
   async me () {
-    this.user = await this.raw.auth.me()
-    return this.user
+    if (this._user) return this._user
+    const tokenInfo = await this.tokenInfo()
+    if (tokenInfo.full) {
+      this._user = await this.raw.auth.me()
+    } else {
+      const { username } = await this.raw.user.name()
+      const { user } = await this.raw.user.find(username)
+      this._user = user
+    }
+    return this._user
+  }
+  async tokenInfo () {
+    if (this._tokenInfo) {
+      return this._tokenInfo
+    }
+    if (this.opts.token) {
+      const { token } = await this.raw.auth.queryToken(this.token)
+      this._tokenInfo = token
+    } else {
+      this._tokenInfo = { full: true }
+    }
+    return this._tokenInfo
+  }
+  async userID () {
+    const user = await this.me()
+    return user._id
   }
   get history () { return this.raw.history }
   get authmod () { return this.raw.authmod }

src/Socket.js

@@ -179,8 +179,8 @@ export class Socket extends EventEmitter {
   }
   async subscribe (path, cb) {
     if (!path) return
-    if (!this.api.user) { await this.api.me() }
-    if (!path.match(/^(\w+):(.+?)$/)) { path = `user:${this.api.user._id}/${path}` }
+    const userID = await this.api.userID()
+    if (!path.match(/^(\w+):(.+?)$/)) { path = `user:${userID}/${path}` }
     if (this.authed) {
       this.send(`subscribe ${path}`)
     } else {
@@ -193,8 +193,8 @@ export class Socket extends EventEmitter {
   }
   async unsubscribe (path) {
     if (!path) return
-    if (!this.api.user) { await this.api.me() }
-    if (!path.match(/^(\w+):(.+?)$/)) { path = `user:${this.api.user._id}/${path}` }
+    const userID = await this.api.userID()
+    if (!path.match(/^(\w+):(.+?)$/)) { path = `user:${userID}/${path}` }
     this.send(`unsubscribe ${path}`)
     this.emit('unsubscribe', path)
     if (this.__subs[path]) this.__subs[path]--