适配 hydro-dev/geoip

hydro/handler/home.js

@@ -125,7 +125,12 @@ class HomeSecurityHandler extends Handler {
             session.isCurrent = session._id === this.session._id;
             session._id = md5(session._id);
             if (useragent) session.updateUa = useragent.parse(session.updateUa || session.createUa || '');
-            if (geoip) session.updateGeoip = geoip.lookup(session.updateIp || session.createIp);
+            if (geoip) {
+                session.updateGeoip = geoip.lookup(
+                    session.updateIp || session.createIp,
+                    this.translate('geoip_locale'),
+                );
+            }
         }
         this.response.template = 'home_security.html';
         this.response.body = { sessions, geoipProvider: (geoip || {}).provider };

hydro/service/server.js

@@ -367,6 +367,7 @@ class Handler {
     }
 
     async onerror(error) {
+        if (!error.msg) error.msg = () => error.message;
         console.error(error.msg(), error.params);
         console.error(error.stack);
         this.response.status = error instanceof UserFacingError ? error.code : 500;

templates/home_security.html

@@ -94,7 +94,7 @@
               </div>
               <div class="media__body medium typo">
                 <p>{{ _('Last Update At') }}: {{ datetimeSpan(session.updateAt)|safe }}</p>
-                <p>{{ _('Location') }}: {{ _(session.updateGeoip) }} ({{ session.updateIp }})</p>
+                <p>{{ _('Location') }}: {{ _(session.updateGeoip.display) }} ({{ session.updateIp }})</p>
                 <p>{{ _('Operating System') }}: {{ session.updateUa.os }}</p>
                 <p>{{ _('Browser') }}: {{ session.updateUa.name }} {{ session.updateUa.version }}</p>
                 <!-- {{ _('User-Agent') }}: {{ session['update_ua']['str'] }} -->