@keplr-wallet/background 0.11.64 → 0.12.0-alpha.2

package/build/analytics/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/analytics/handler.ts"],"names":[],"mappings":";;;AACA,yCAA+C;AAGxC,MAAM,UAAU,GAA2C,CAAC,OAAO,EAAE,EAAE;IAC5E,OAAO,CAAC,GAAQ,EAAE,GAAqB,EAAE,EAAE;QACzC,QAAQ,GAAG,CAAC,WAAW,EAAE;YACvB,KAAK,4BAAiB;gBACpB,OAAO,uBAAuB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAwB,CAAC,CAAC;YACzE;gBACE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;SACvC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,UAAU,cASrB;AAEF,MAAM,uBAAuB,GAEa,CAAC,OAAyB,EAAE,EAAE,CAAC,CACvE,GAAG,EACH,GAAG,EACH,EAAE;IACF,OAAO,OAAO,CAAC,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;AACjE,CAAC,CAAC"}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/analytics/handler.ts"],"names":[],"mappings":";;;AACA,yCAA+C;AAGxC,MAAM,UAAU,GAA2C,CAAC,OAAO,EAAE,EAAE;IAC5E,OAAO,CAAC,GAAQ,EAAE,GAAqB,EAAE,EAAE;QACzC,QAAQ,GAAG,CAAC,WAAW,EAAE;YACvB,KAAK,4BAAiB;gBACpB,OAAO,uBAAuB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAwB,CAAC,CAAC;YACzE;gBACE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;SACvC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,UAAU,cASrB;AAEF,MAAM,uBAAuB,GAG3B,CAAC,OAAyB,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IAC1C,OAAO,OAAO,CAAC,8BAA8B,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;AACjE,CAAC,CAAC"}

package/build/analytics/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/build/analytics/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/analytics/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA0B;AAC1B,6CAA2B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/analytics/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,6CAA2B"}

package/build/analytics/init.js

@@ -6,7 +6,7 @@ const constants_1 = require("./constants");
 const handler_1 = require("./handler");
 function init(router, service) {
     router.registerMessage(messages_1.GetAnalyticsIdMsg);
-    router.addHandler(constants_1.ROUTE, handler_1.getHandler(service));
+    router.addHandler(constants_1.ROUTE, (0, handler_1.getHandler)(service));
 }
 exports.init = init;
 //# sourceMappingURL=init.js.map

package/build/analytics/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/analytics/init.ts"],"names":[],"mappings":";;;AACA,yCAA+C;AAC/C,2CAAoC;AACpC,uCAAuC;AAGvC,SAAgB,IAAI,CAAC,MAAc,EAAE,OAAyB;IAC5D,MAAM,CAAC,eAAe,CAAC,4BAAiB,CAAC,CAAC;IAE1C,MAAM,CAAC,UAAU,CAAC,iBAAK,EAAE,oBAAU,CAAC,OAAO,CAAC,CAAC,CAAC;AAChD,CAAC;AAJD,oBAIC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/analytics/init.ts"],"names":[],"mappings":";;;AACA,yCAA+C;AAC/C,2CAAoC;AACpC,uCAAuC;AAGvC,SAAgB,IAAI,CAAC,MAAc,EAAE,OAAyB;IAC5D,MAAM,CAAC,eAAe,CAAC,4BAAiB,CAAC,CAAC;IAE1C,MAAM,CAAC,UAAU,CAAC,iBAAK,EAAE,IAAA,oBAAU,EAAC,OAAO,CAAC,CAAC,CAAC;AAChD,CAAC;AAJD,oBAIC"}

package/build/analytics/internal.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/build/analytics/internal.js.map

@@ -1 +1 @@
-{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../src/analytics/internal.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA0B;AAC1B,yCAAuB"}
+{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../src/analytics/internal.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,yCAAuB"}

package/build/analytics/messages.js.map

@@ -1 +1 @@
-{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/analytics/messages.ts"],"names":[],"mappings":";;;AAAA,iDAA+C;AAC/C,2CAAoC;AAEpC,MAAa,iBAAkB,SAAQ,gBAAe;IAC7C,MAAM,CAAC,IAAI;QAChB,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,aAAa;QACX,OAAO;IACT,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK;QACH,OAAO,iBAAK,CAAC;IACf,CAAC;IAED,IAAI;QACF,OAAO,iBAAiB,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;CACF;AAxBD,8CAwBC"}
+{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/analytics/messages.ts"],"names":[],"mappings":";;;AAAA,iDAA+C;AAC/C,2CAAoC;AAEpC,MAAa,iBAAkB,SAAQ,gBAAe;IAC7C,MAAM,CAAC,IAAI;QAChB,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,aAAa;QACX,OAAO;IACT,CAAC;IAEQ,eAAe;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK;QACH,OAAO,iBAAK,CAAC;IACf,CAAC;IAED,IAAI;QACF,OAAO,iBAAiB,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;CACF;AAxBD,8CAwBC"}

package/build/analytics/service.d.ts

@@ -1,14 +1,12 @@
 import { KVStore } from "@keplr-wallet/common";
-import { RNG } from "@keplr-wallet/crypto";
 import { Env } from "@keplr-wallet/router";
 export declare class AnalyticsService {
     protected readonly kvStore: KVStore;
-    protected readonly rng: RNG;
     protected readonly privilegedOrigins: string[];
     protected analyticsId: string;
-    constructor(kvStore: KVStore, rng: RNG, privilegedOrigins: string[]);
+    constructor(kvStore: KVStore, privilegedOrigins: string[]);
     init(): Promise<void>;
-    getAnalyticsIdOnlyIfPrivileged(env: Env, origin: string): Promise<string>;
+    getAnalyticsIdOnlyIfPrivileged(env: Env, origin: string): string;
     logEvent(event: string, params: Record<string, number | string | boolean | number[] | string[] | undefined>): Promise<void>;
     logEventIgnoreError(event: string, params: Record<string, number | string | boolean | number[] | string[] | undefined>): void;
 }

package/build/analytics/service.js

@@ -8,17 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnalyticsService = void 0;
-const axios_1 = __importDefault(require("axios"));
 const constants_1 = require("./constants");
+const simple_fetch_1 = require("@keplr-wallet/simple-fetch");
 class AnalyticsService {
-    constructor(kvStore, rng, privilegedOrigins) {
+    constructor(kvStore, privilegedOrigins) {
         this.kvStore = kvStore;
-        this.rng = rng;
         this.privilegedOrigins = privilegedOrigins;
         this.analyticsId = "";
     }
@@ -30,7 +26,8 @@ class AnalyticsService {
                 return;
             }
             const bytes = new Uint8Array(20);
-            const rand = Array.from(yield this.rng(bytes))
+            crypto.getRandomValues(bytes);
+            const rand = Array.from(bytes)
                 .map((value) => {
                 let v = value.toString(16);
                 if (v.length === 1) {
@@ -44,23 +41,18 @@ class AnalyticsService {
         });
     }
     getAnalyticsIdOnlyIfPrivileged(env, origin) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!env.isInternalMsg && !this.privilegedOrigins.includes(origin)) {
-                throw new Error("Rejected");
-            }
-            return this.analyticsId;
-        });
+        if (!env.isInternalMsg && !this.privilegedOrigins.includes(origin)) {
+            throw new Error("Rejected");
+        }
+        return this.analyticsId;
     }
     logEvent(event, params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!constants_1.KEPLR_EXT_ANALYTICS_API_URL || !constants_1.KEPLR_EXT_ANALYTICS_API_AUTH_TOKEN) {
                 return;
             }
-            const loggerInstance = axios_1.default.create({
-                baseURL: constants_1.KEPLR_EXT_ANALYTICS_API_URL,
-            });
-            const loggingMsg = Buffer.from(JSON.stringify(Object.assign(Object.assign({}, params), { event, analyticsId: this.analyticsId }))).toString("base64");
-            yield loggerInstance.get(`/log?msg=${loggingMsg}`, {
+            const loggingMsg = Buffer.from(JSON.stringify(Object.assign(Object.assign({}, params), { event, analyticsId: this.analyticsId, v2: true }))).toString("base64");
+            yield (0, simple_fetch_1.simpleFetch)(constants_1.KEPLR_EXT_ANALYTICS_API_URL, `/log?msg=${loggingMsg}`, {
                 headers: {
                     Authorization: constants_1.KEPLR_EXT_ANALYTICS_API_AUTH_TOKEN,
                 },

package/build/analytics/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/analytics/service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,kDAA0B;AAC1B,2CAGqB;AAErB,MAAa,gBAAgB;IAG3B,YACqB,OAAgB,EAChB,GAAQ,EACR,iBAA2B;QAF3B,YAAO,GAAP,OAAO,CAAS;QAChB,QAAG,GAAH,GAAG,CAAK;QACR,sBAAiB,GAAjB,iBAAiB,CAAU;QALtC,gBAAW,GAAW,EAAE,CAAC;IAMhC,CAAC;IAEE,IAAI;;YACR,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAS,aAAa,CAAC,CAAC;YAC5D,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;gBACzB,OAAO;aACR;YACD,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;YACjC,MAAM,IAAI,GAAW,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBACnD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBACb,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC3B,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;oBAClB,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;iBACb;gBACD,OAAO,CAAC,CAAC;YACX,CAAC,CAAC;iBACD,IAAI,CAAC,EAAE,CAAC,CAAC;YACZ,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAS,aAAa,EAAE,IAAI,CAAC,CAAC;QACtD,CAAC;KAAA;IAEK,8BAA8B,CAClC,GAAQ,EACR,MAAc;;YAEd,IAAI,CAAC,GAAG,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBAClE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;aAC7B;YAED,OAAO,IAAI,CAAC,WAAW,CAAC;QAC1B,CAAC;KAAA;IAEK,QAAQ,CACZ,KAAa,EACb,MAGC;;YAED,IAAI,CAAC,uCAA2B,IAAI,CAAC,8CAAkC,EAAE;gBACvE,OAAO;aACR;YAED,MAAM,cAAc,GAAG,eAAK,CAAC,MAAM,CAAC;gBAClC,OAAO,EAAE,uCAA2B;aACrC,CAAC,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAC5B,IAAI,CAAC,SAAS,iCACT,MAAM,KACT,KAAK,EACL,WAAW,EAAE,IAAI,CAAC,WAAW,IAC7B,CACH,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACrB,MAAM,cAAc,CAAC,GAAG,CAAC,YAAY,UAAU,EAAE,EAAE;gBACjD,OAAO,EAAE;oBACP,aAAa,EAAE,8CAAkC;iBAClD;aACF,CAAC,CAAC;QACL,CAAC;KAAA;IAED,mBAAmB,CACjB,KAAa,EACb,MAGC;QAED,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC;CACF;AA7ED,4CA6EC"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/analytics/service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,2CAGqB;AACrB,6DAAyD;AAEzD,MAAa,gBAAgB;IAG3B,YACqB,OAAgB,EAChB,iBAA2B;QAD3B,YAAO,GAAP,OAAO,CAAS;QAChB,sBAAiB,GAAjB,iBAAiB,CAAU;QAJtC,gBAAW,GAAW,EAAE,CAAC;IAKhC,CAAC;IAEE,IAAI;;YACR,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAS,aAAa,CAAC,CAAC;YAC5D,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;gBACzB,OAAO;aACR;YACD,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;YACjC,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,IAAI,GAAW,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;iBACnC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBACb,IAAI,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC3B,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;oBAClB,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;iBACb;gBACD,OAAO,CAAC,CAAC;YACX,CAAC,CAAC;iBACD,IAAI,CAAC,EAAE,CAAC,CAAC;YACZ,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAS,aAAa,EAAE,IAAI,CAAC,CAAC;QACtD,CAAC;KAAA;IAED,8BAA8B,CAAC,GAAQ,EAAE,MAAc;QACrD,IAAI,CAAC,GAAG,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAClE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC;SAC7B;QAED,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAEK,QAAQ,CACZ,KAAa,EACb,MAGC;;YAED,IAAI,CAAC,uCAA2B,IAAI,CAAC,8CAAkC,EAAE;gBACvE,OAAO;aACR;YAED,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAC5B,IAAI,CAAC,SAAS,iCACT,MAAM,KACT,KAAK,EACL,WAAW,EAAE,IAAI,CAAC,WAAW,EAC7B,EAAE,EAAE,IAAI,IACR,CACH,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACrB,MAAM,IAAA,0BAAW,EAAC,uCAA2B,EAAE,YAAY,UAAU,EAAE,EAAE;gBACvE,OAAO,EAAE;oBACP,aAAa,EAAE,8CAAkC;iBAClD;aACF,CAAC,CAAC;QACL,CAAC;KAAA;IAED,mBAAmB,CACjB,KAAa,EACb,MAGC;QAED,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC;CACF;AAxED,4CAwEC"}

package/build/auto-lock-account/handler.js

@@ -12,6 +12,12 @@ const getHandler = (service) => {
                 return handleUpdateAutoLockAccountDurationMsg(service)(env, msg);
             case messages_1.StartAutoLockMonitoringMsg:
                 return handleStartAutoLockMonitoringMsg(service)(env, msg);
+            case messages_1.GetLockOnSleepMsg:
+                return handleGetLockOnSleepMsg(service)(env, msg);
+            case messages_1.SetLockOnSleepMsg:
+                return handleSetLockOnSleepMsg(service)(env, msg);
+            case messages_1.GetAutoLockStateMsg:
+                return handleGetAutoLockStateMsg(service)(env, msg);
             default:
                 throw new router_1.KeplrError("auto-lock-account", 100, "Unknown msg type");
         }
@@ -36,4 +42,22 @@ const handleStartAutoLockMonitoringMsg = (service) => {
         return service.startAppStateCheckTimer();
     };
 };
+const handleGetLockOnSleepMsg = (service) => {
+    return () => {
+        return service.getLockOnSleep();
+    };
+};
+const handleSetLockOnSleepMsg = (service) => {
+    return (_, msg) => {
+        return service.setLockOnSleep(msg.lockOnSleep);
+    };
+};
+const handleGetAutoLockStateMsg = (service) => {
+    return () => {
+        return {
+            duration: service.getAutoLockDuration(),
+            lockOnSleep: service.getLockOnSleep(),
+        };
+    };
+};
 //# sourceMappingURL=handler.js.map

package/build/auto-lock-account/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/auto-lock-account/handler.ts"],"names":[],"mappings":";;;AAAA,iDAM8B;AAC9B,yCAIoB;AAGb,MAAM,UAAU,GAAiD,CACtE,OAA+B,EAC/B,EAAE;IACF,OAAO,CAAC,GAAQ,EAAE,GAAqB,EAAE,EAAE;QACzC,QAAQ,GAAG,CAAC,WAAW,EAAE;YACvB,KAAK,wCAA6B;gBAChC,OAAO,mCAAmC,CAAC,OAAO,CAAC,CACjD,GAAG,EACH,GAAoC,CACrC,CAAC;YACJ,KAAK,2CAAgC;gBACnC,OAAO,sCAAsC,CAAC,OAAO,CAAC,CACpD,GAAG,EACH,GAAuC,CACxC,CAAC;YACJ,KAAK,qCAA0B;gBAC7B,OAAO,gCAAgC,CAAC,OAAO,CAAC,CAC9C,GAAG,EACH,GAAiC,CAClC,CAAC;YACJ;gBACE,MAAM,IAAI,mBAAU,CAAC,mBAAmB,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAC;SACtE;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,UAAU,cAwBrB;AAEF,MAAM,mCAAmC,GAEa,CAAC,OAAO,EAAE,EAAE;IAChE,OAAO,GAAG,EAAE;QACV,OAAO,OAAO,CAAC,mBAAmB,EAAE,CAAC;IACvC,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,sCAAsC,GAEa,CAAC,OAAO,EAAE,EAAE;IACnE,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;QAChB,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE;YAC9B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QAED,OAAO,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,gCAAgC,GAEa,CAAC,OAAO,EAAE,EAAE;IAC7D,OAAO,GAAG,EAAE;QACV,OAAO,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAC3C,CAAC,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/auto-lock-account/handler.ts"],"names":[],"mappings":";;;AAAA,iDAM8B;AAC9B,yCAOoB;AAGb,MAAM,UAAU,GAAiD,CACtE,OAA+B,EAC/B,EAAE;IACF,OAAO,CAAC,GAAQ,EAAE,GAAqB,EAAE,EAAE;QACzC,QAAQ,GAAG,CAAC,WAAW,EAAE;YACvB,KAAK,wCAA6B;gBAChC,OAAO,mCAAmC,CAAC,OAAO,CAAC,CACjD,GAAG,EACH,GAAoC,CACrC,CAAC;YACJ,KAAK,2CAAgC;gBACnC,OAAO,sCAAsC,CAAC,OAAO,CAAC,CACpD,GAAG,EACH,GAAuC,CACxC,CAAC;YACJ,KAAK,qCAA0B;gBAC7B,OAAO,gCAAgC,CAAC,OAAO,CAAC,CAC9C,GAAG,EACH,GAAiC,CAClC,CAAC;YACJ,KAAK,4BAAiB;gBACpB,OAAO,uBAAuB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAwB,CAAC,CAAC;YACzE,KAAK,4BAAiB;gBACpB,OAAO,uBAAuB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAwB,CAAC,CAAC;YACzE,KAAK,8BAAmB;gBACtB,OAAO,yBAAyB,CAAC,OAAO,CAAC,CACvC,GAAG,EACH,GAA0B,CAC3B,CAAC;YACJ;gBACE,MAAM,IAAI,mBAAU,CAAC,mBAAmB,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAC;SACtE;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAjCW,QAAA,UAAU,cAiCrB;AAEF,MAAM,mCAAmC,GAEa,CAAC,OAAO,EAAE,EAAE;IAChE,OAAO,GAAG,EAAE;QACV,OAAO,OAAO,CAAC,mBAAmB,EAAE,CAAC;IACvC,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,sCAAsC,GAEa,CAAC,OAAO,EAAE,EAAE;IACnE,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;QAChB,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE;YAC9B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QAED,OAAO,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,gCAAgC,GAEa,CAAC,OAAO,EAAE,EAAE;IAC7D,OAAO,GAAG,EAAE;QACV,OAAO,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAC3C,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAEa,CAAC,OAAO,EAAE,EAAE;IACpD,OAAO,GAAG,EAAE;QACV,OAAO,OAAO,CAAC,cAAc,EAAE,CAAC;IAClC,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAEa,CAAC,OAAO,EAAE,EAAE;IACpD,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;QAChB,OAAO,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAEa,CAAC,OAAO,EAAE,EAAE;IACtD,OAAO,GAAG,EAAE;QACV,OAAO;YACL,QAAQ,EAAE,OAAO,CAAC,mBAAmB,EAAE;YACvC,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE;SACtC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC"}

package/build/auto-lock-account/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/build/auto-lock-account/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auto-lock-account/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA0B;AAC1B,6CAA2B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auto-lock-account/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,6CAA2B"}

package/build/auto-lock-account/init.js

@@ -8,7 +8,10 @@ function init(router, service) {
     router.registerMessage(messages_1.GetAutoLockAccountDurationMsg);
     router.registerMessage(messages_1.UpdateAutoLockAccountDurationMsg);
     router.registerMessage(messages_1.StartAutoLockMonitoringMsg);
-    router.addHandler(constants_1.ROUTE, handler_1.getHandler(service));
+    router.registerMessage(messages_1.GetLockOnSleepMsg);
+    router.registerMessage(messages_1.SetLockOnSleepMsg);
+    router.registerMessage(messages_1.GetAutoLockStateMsg);
+    router.addHandler(constants_1.ROUTE, (0, handler_1.getHandler)(service));
 }
 exports.init = init;
 //# sourceMappingURL=init.js.map

package/build/auto-lock-account/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/auto-lock-account/init.ts"],"names":[],"mappings":";;;AACA,yCAIoB;AACpB,2CAAoC;AACpC,uCAAuC;AAGvC,SAAgB,IAAI,CAAC,MAAc,EAAE,OAA+B;IAClE,MAAM,CAAC,eAAe,CAAC,wCAA6B,CAAC,CAAC;IACtD,MAAM,CAAC,eAAe,CAAC,2CAAgC,CAAC,CAAC;IACzD,MAAM,CAAC,eAAe,CAAC,qCAA0B,CAAC,CAAC;IAEnD,MAAM,CAAC,UAAU,CAAC,iBAAK,EAAE,oBAAU,CAAC,OAAO,CAAC,CAAC,CAAC;AAChD,CAAC;AAND,oBAMC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/auto-lock-account/init.ts"],"names":[],"mappings":";;;AACA,yCAOoB;AACpB,2CAAoC;AACpC,uCAAuC;AAGvC,SAAgB,IAAI,CAAC,MAAc,EAAE,OAA+B;IAClE,MAAM,CAAC,eAAe,CAAC,wCAA6B,CAAC,CAAC;IACtD,MAAM,CAAC,eAAe,CAAC,2CAAgC,CAAC,CAAC;IACzD,MAAM,CAAC,eAAe,CAAC,qCAA0B,CAAC,CAAC;IACnD,MAAM,CAAC,eAAe,CAAC,4BAAiB,CAAC,CAAC;IAC1C,MAAM,CAAC,eAAe,CAAC,4BAAiB,CAAC,CAAC;IAC1C,MAAM,CAAC,eAAe,CAAC,8BAAmB,CAAC,CAAC;IAE5C,MAAM,CAAC,UAAU,CAAC,iBAAK,EAAE,IAAA,oBAAU,EAAC,OAAO,CAAC,CAAC,CAAC;AAChD,CAAC;AATD,oBASC"}

package/build/auto-lock-account/internal.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/build/auto-lock-account/internal.js.map

@@ -1 +1 @@
-{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../src/auto-lock-account/internal.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA0B;AAC1B,yCAAuB"}
+{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../src/auto-lock-account/internal.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,yCAAuB"}

package/build/auto-lock-account/messages.d.ts

@@ -21,3 +21,28 @@ export declare class StartAutoLockMonitoringMsg extends Message<void> {
     route(): string;
     type(): string;
 }
+export declare class GetLockOnSleepMsg extends Message<boolean> {
+    static type(): string;
+    constructor();
+    validateBasic(): void;
+    route(): string;
+    type(): string;
+}
+export declare class SetLockOnSleepMsg extends Message<void> {
+    readonly lockOnSleep: boolean;
+    static type(): string;
+    constructor(lockOnSleep: boolean);
+    validateBasic(): void;
+    route(): string;
+    type(): string;
+}
+export declare class GetAutoLockStateMsg extends Message<{
+    duration: number;
+    lockOnSleep: boolean;
+}> {
+    static type(): string;
+    constructor();
+    validateBasic(): void;
+    route(): string;
+    type(): string;
+}

package/build/auto-lock-account/messages.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StartAutoLockMonitoringMsg = exports.UpdateAutoLockAccountDurationMsg = exports.GetAutoLockAccountDurationMsg = void 0;
+exports.GetAutoLockStateMsg = exports.SetLockOnSleepMsg = exports.GetLockOnSleepMsg = exports.StartAutoLockMonitoringMsg = exports.UpdateAutoLockAccountDurationMsg = exports.GetAutoLockAccountDurationMsg = void 0;
 const router_1 = require("@keplr-wallet/router");
 const constants_1 = require("./constants");
 class GetAutoLockAccountDurationMsg extends router_1.Message {
@@ -22,13 +22,13 @@ class GetAutoLockAccountDurationMsg extends router_1.Message {
 }
 exports.GetAutoLockAccountDurationMsg = GetAutoLockAccountDurationMsg;
 class UpdateAutoLockAccountDurationMsg extends router_1.Message {
+    static type() {
+        return "update-auto-lock-account-duration";
+    }
     constructor(duration) {
         super();
         this.duration = duration;
     }
-    static type() {
-        return "update-auto-lock-account-duration";
-    }
     validateBasic() {
         if (this.duration < 0) {
             throw new router_1.KeplrError("auto-lock-account", 101, "duration cannot be set to a negative number.");
@@ -60,4 +60,59 @@ class StartAutoLockMonitoringMsg extends router_1.Message {
     }
 }
 exports.StartAutoLockMonitoringMsg = StartAutoLockMonitoringMsg;
+class GetLockOnSleepMsg extends router_1.Message {
+    static type() {
+        return "get-lock-on-sleep";
+    }
+    constructor() {
+        super();
+    }
+    validateBasic() {
+        // noop
+    }
+    route() {
+        return constants_1.ROUTE;
+    }
+    type() {
+        return GetLockOnSleepMsg.type();
+    }
+}
+exports.GetLockOnSleepMsg = GetLockOnSleepMsg;
+class SetLockOnSleepMsg extends router_1.Message {
+    static type() {
+        return "set-lock-on-sleep";
+    }
+    constructor(lockOnSleep) {
+        super();
+        this.lockOnSleep = lockOnSleep;
+    }
+    validateBasic() {
+        // noop
+    }
+    route() {
+        return constants_1.ROUTE;
+    }
+    type() {
+        return SetLockOnSleepMsg.type();
+    }
+}
+exports.SetLockOnSleepMsg = SetLockOnSleepMsg;
+class GetAutoLockStateMsg extends router_1.Message {
+    static type() {
+        return "get-auto-lock-state";
+    }
+    constructor() {
+        super();
+    }
+    validateBasic() {
+        // noop
+    }
+    route() {
+        return constants_1.ROUTE;
+    }
+    type() {
+        return GetAutoLockStateMsg.type();
+    }
+}
+exports.GetAutoLockStateMsg = GetAutoLockStateMsg;
 //# sourceMappingURL=messages.js.map

package/build/auto-lock-account/messages.js.map

@@ -1 +1 @@
-{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/auto-lock-account/messages.ts"],"names":[],"mappings":";;;AAAA,iDAA2D;AAC3D,2CAAoC;AAEpC,MAAa,6BAA8B,SAAQ,gBAAe;IACzD,MAAM,CAAC,IAAI;QAChB,OAAO,gCAAgC,CAAC;IAC1C,CAAC;IAED;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,aAAa;QACX,OAAO;IACT,CAAC;IAED,KAAK;QACH,OAAO,iBAAK,CAAC;IACf,CAAC;IAED,IAAI;QACF,OAAO,6BAA6B,CAAC,IAAI,EAAE,CAAC;IAC9C,CAAC;CACF;AApBD,sEAoBC;AAED,MAAa,gCAAiC,SAAQ,gBAAa;IAKjE,YAA4B,QAAgB;QAC1C,KAAK,EAAE,CAAC;QADkB,aAAQ,GAAR,QAAQ,CAAQ;IAE5C,CAAC;IANM,MAAM,CAAC,IAAI;QAChB,OAAO,mCAAmC,CAAC;IAC7C,CAAC;IAMD,aAAa;QACX,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC,EAAE;YACrB,MAAM,IAAI,mBAAU,CAClB,mBAAmB,EACnB,GAAG,EACH,8CAA8C,CAC/C,CAAC;SACH;IACH,CAAC;IAED,KAAK;QACH,OAAO,iBAAK,CAAC;IACf,CAAC;IAED,IAAI;QACF,OAAO,gCAAgC,CAAC,IAAI,EAAE,CAAC;IACjD,CAAC;CACF;AA1BD,4EA0BC;AAED,MAAa,0BAA2B,SAAQ,gBAAa;IACpD,MAAM,CAAC,IAAI;QAChB,OAAO,4BAA4B,CAAC;IACtC,CAAC;IAED;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,aAAa;QACX,OAAO;IACT,CAAC;IAED,KAAK;QACH,OAAO,iBAAK,CAAC;IACf,CAAC;IAED,IAAI;QACF,OAAO,0BAA0B,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC;CACF;AApBD,gEAoBC"}
+{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../src/auto-lock-account/messages.ts"],"names":[],"mappings":";;;AAAA,iDAA2D;AAC3D,2CAAoC;AAEpC,MAAa,6BAA8B,SAAQ,gBAAe;IACzD,MAAM,CAAC,IAAI;QAChB,OAAO,gCAAgC,CAAC;IAC1C,CAAC;IAED;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,aAAa;QACX,OAAO;IACT,CAAC;IAED,KAAK;QACH,OAAO,iBAAK,CAAC;IACf,CAAC;IAED,IAAI;QACF,OAAO,6BAA6B,CAAC,IAAI,EAAE,CAAC;IAC9C,CAAC;CACF;AApBD,sEAoBC;AAED,MAAa,gCAAiC,SAAQ,gBAAa;IAC1D,MAAM,CAAC,IAAI;QAChB,OAAO,mCAAmC,CAAC;IAC7C,CAAC;IAED,YAA4B,QAAgB;QAC1C,KAAK,EAAE,CAAC;QADkB,aAAQ,GAAR,QAAQ,CAAQ;IAE5C,CAAC;IAED,aAAa;QACX,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC,EAAE;YACrB,MAAM,IAAI,mBAAU,CAClB,mBAAmB,EACnB,GAAG,EACH,8CAA8C,CAC/C,CAAC;SACH;IACH,CAAC;IAED,KAAK;QACH,OAAO,iBAAK,CAAC;IACf,CAAC;IAED,IAAI;QACF,OAAO,gCAAgC,CAAC,IAAI,EAAE,CAAC;IACjD,CAAC;CACF;AA1BD,4EA0BC;AAED,MAAa,0BAA2B,SAAQ,gBAAa;IACpD,MAAM,CAAC,IAAI;QAChB,OAAO,4BAA4B,CAAC;IACtC,CAAC;IAED;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,aAAa;QACX,OAAO;IACT,CAAC;IAED,KAAK;QACH,OAAO,iBAAK,CAAC;IACf,CAAC;IAED,IAAI;QACF,OAAO,0BAA0B,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC;CACF;AApBD,gEAoBC;AAED,MAAa,iBAAkB,SAAQ,gBAAgB;IAC9C,MAAM,CAAC,IAAI;QAChB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,aAAa;QACX,OAAO;IACT,CAAC;IAED,KAAK;QACH,OAAO,iBAAK,CAAC;IACf,CAAC;IAED,IAAI;QACF,OAAO,iBAAiB,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;CACF;AApBD,8CAoBC;AAED,MAAa,iBAAkB,SAAQ,gBAAa;IAC3C,MAAM,CAAC,IAAI;QAChB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,YAA4B,WAAoB;QAC9C,KAAK,EAAE,CAAC;QADkB,gBAAW,GAAX,WAAW,CAAS;IAEhD,CAAC;IAED,aAAa;QACX,OAAO;IACT,CAAC;IAED,KAAK;QACH,OAAO,iBAAK,CAAC;IACf,CAAC;IAED,IAAI;QACF,OAAO,iBAAiB,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;CACF;AApBD,8CAoBC;AAED,MAAa,mBAAoB,SAAQ,gBAGvC;IACO,MAAM,CAAC,IAAI;QAChB,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IAED;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,aAAa;QACX,OAAO;IACT,CAAC;IAED,KAAK;QACH,OAAO,iBAAK,CAAC;IACf,CAAC;IAED,IAAI;QACF,OAAO,mBAAmB,CAAC,IAAI,EAAE,CAAC;IACpC,CAAC;CACF;AAvBD,kDAuBC"}

package/build/auto-lock-account/service.d.ts

@@ -1,34 +1,22 @@
 /// <reference types="node" />
 import { KVStore } from "@keplr-wallet/common";
-import { KeyRingStatus } from "../keyring";
+import { KeyRingService } from "../keyring";
 export declare class AutoLockAccountService {
     protected readonly kvStore: KVStore;
-    protected readonly opts: {
-        readonly monitoringInterval: number;
-    };
-    protected keyringService: {
-        lock: () => void;
-        readonly keyRingStatus: KeyRingStatus;
-    };
+    protected readonly keyRingService: KeyRingService;
     protected autoLockDuration: number;
-    protected appStateCheckTimer: NodeJS.Timeout | null;
+    protected lockOnSleep: boolean;
     protected autoLockTimer: NodeJS.Timeout | null;
-    constructor(kvStore: KVStore, opts?: {
-        readonly monitoringInterval: number;
-    });
-    init(keyringService: {
-        lock: () => void;
-        readonly keyRingStatus: KeyRingStatus;
-    }): Promise<void>;
+    constructor(kvStore: KVStore, keyRingService: KeyRingService);
+    init(): Promise<void>;
     private stateChangedHandler;
     startAppStateCheckTimer(): void;
-    private stopAppStateCheckTimer;
-    checkAppIsActive(): boolean;
     private startAutoLockTimer;
     private stopAutoLockTimer;
     private lock;
     get keyRingIsUnlocked(): boolean;
     getAutoLockDuration(): number;
-    setDuration(duration: number): Promise<void>;
-    private loadDuration;
+    setDuration(duration: number): void;
+    getLockOnSleep(): boolean;
+    setLockOnSleep(lockOnSleep: boolean): void;
 }

package/build/auto-lock-account/service.js

@@ -1,4 +1,10 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,74 +16,65 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutoLockAccountService = void 0;
-const keyring_1 = require("../keyring");
+const mobx_1 = require("mobx");
 class AutoLockAccountService {
-    constructor(kvStore, opts = {
-        monitoringInterval: 10000,
-    }) {
+    constructor(kvStore, keyRingService) {
         this.kvStore = kvStore;
-        this.opts = opts;
+        this.keyRingService = keyRingService;
         // Unit: ms
+        // Zero means disabled
+        // auto lock duration이 설정되면 컴퓨터가 sleep 모드가 되면 lock된다.
         this.autoLockDuration = 0;
-        this.appStateCheckTimer = null;
+        // auto lock duration이 설정되어 있지 않더라도 sleep 모드가 되면 lock된다.
+        this.lockOnSleep = false;
         this.autoLockTimer = null;
+        (0, mobx_1.makeObservable)(this);
     }
-    init(keyringService) {
+    init() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.keyringService = keyringService;
+            const duration = yield this.kvStore.get("autoLockDuration");
+            (0, mobx_1.runInAction)(() => {
+                if (duration == null || Number.isNaN(duration)) {
+                    this.autoLockDuration = 0;
+                }
+                else {
+                    this.autoLockDuration = duration;
+                }
+            });
+            (0, mobx_1.autorun)(() => {
+                this.kvStore.set("autoLockDuration", this.autoLockDuration);
+            });
+            const lockOnSleep = yield this.kvStore.get("lockOnSleep");
+            (0, mobx_1.runInAction)(() => {
+                if (lockOnSleep) {
+                    this.lockOnSleep = true;
+                }
+                else {
+                    this.lockOnSleep = false;
+                }
+            });
+            (0, mobx_1.autorun)(() => {
+                this.kvStore.set("lockOnSleep", this.lockOnSleep);
+            });
             browser.idle.onStateChanged.addListener((idle) => {
                 this.stateChangedHandler(idle);
             });
-            yield this.loadDuration();
         });
     }
     stateChangedHandler(newState) {
-        if (this.autoLockDuration > 0) {
-            if (newState === "locked") {
-                this.stopAppStateCheckTimer();
+        if (newState === "locked") {
+            if (this.autoLockDuration > 0) {
                 this.stopAutoLockTimer();
                 this.lock();
             }
+            else if (this.lockOnSleep) {
+                this.lock();
+            }
         }
     }
     startAppStateCheckTimer() {
-        this.stopAppStateCheckTimer();
-        if (this.autoLockDuration > 0 && this.keyRingIsUnlocked) {
-            this.appStateCheckTimer = setTimeout(() => {
-                const isAppActive = this.checkAppIsActive();
-                if (isAppActive) {
-                    this.stopAutoLockTimer();
-                    this.startAppStateCheckTimer();
-                }
-                else {
-                    if (this.keyRingIsUnlocked) {
-                        this.startAutoLockTimer();
-                    }
-                    this.stopAppStateCheckTimer();
-                }
-            }, this.opts.monitoringInterval);
-        }
-    }
-    stopAppStateCheckTimer() {
-        if (this.appStateCheckTimer != null) {
-            clearTimeout(this.appStateCheckTimer);
-            this.appStateCheckTimer = null;
-        }
-    }
-    checkAppIsActive() {
-        const background = browser.extension.getBackgroundPage();
-        const views = browser.extension.getViews();
-        if (background) {
-            for (const view of views) {
-                if (background.location.href !== view.location.href) {
-                    return true;
-                }
-            }
-        }
-        else if (views.length > 0) {
-            return true;
-        }
-        return false;
+        this.stopAutoLockTimer();
+        this.startAutoLockTimer();
     }
     startAutoLockTimer() {
         if (!this.keyRingIsUnlocked) {
@@ -87,7 +84,6 @@ class AutoLockAccountService {
             return;
         }
         this.autoLockTimer = setTimeout(() => {
-            this.stopAppStateCheckTimer();
             this.stopAutoLockTimer();
             this.lock();
         }, this.autoLockDuration);
@@ -100,23 +96,11 @@ class AutoLockAccountService {
     }
     lock() {
         if (this.keyRingIsUnlocked) {
-            this.keyringService.lock();
-            const background = browser.extension.getBackgroundPage();
-            const views = browser.extension.getViews();
-            for (const view of views) {
-                // Possibly, keyring can be locked with UI opened. Ex) when device sleep.
-                // In this case, to simplify the UI logic, just close all UI.
-                if (!background || background.location.href !== view.location.href) {
-                    view.close();
-                }
-            }
+            this.keyRingService.lockKeyRing();
         }
     }
     get keyRingIsUnlocked() {
-        if (this.keyringService == null) {
-            throw new Error("Keyring service is null");
-        }
-        return this.keyringService.keyRingStatus === keyring_1.KeyRingStatus.UNLOCKED;
+        return this.keyRingService.keyRingStatus === "unlocked";
     }
     getAutoLockDuration() {
         return this.autoLockDuration;
@@ -124,22 +108,27 @@ class AutoLockAccountService {
     setDuration(duration) {
         this.autoLockDuration = duration;
         if (duration <= 0) {
-            this.stopAppStateCheckTimer();
             this.stopAutoLockTimer();
         }
-        return this.kvStore.set("autoLockDuration", duration);
     }
-    loadDuration() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const duration = yield this.kvStore.get("autoLockDuration");
-            if (duration == null) {
-                this.autoLockDuration = 0;
-            }
-            else {
-                this.autoLockDuration = duration;
-            }
-        });
+    getLockOnSleep() {
+        return this.lockOnSleep;
+    }
+    setLockOnSleep(lockOnSleep) {
+        this.lockOnSleep = lockOnSleep;
     }
 }
+__decorate([
+    mobx_1.observable
+], AutoLockAccountService.prototype, "autoLockDuration", void 0);
+__decorate([
+    mobx_1.observable
+], AutoLockAccountService.prototype, "lockOnSleep", void 0);
+__decorate([
+    mobx_1.action
+], AutoLockAccountService.prototype, "setDuration", null);
+__decorate([
+    mobx_1.action
+], AutoLockAccountService.prototype, "setLockOnSleep", null);
 exports.AutoLockAccountService = AutoLockAccountService;
 //# sourceMappingURL=service.js.map