@keplr-wallet/router 0.9.0 → 0.9.12-rc.3

package/build/index.d.ts

@@ -3,8 +3,6 @@ export * from "./handler";
 export * from "./interfaces";
 export * from "./types";
 export * from "./message";
-export * from "./requester";
 export * from "./constant";
 export * from "./encoding";
-export * from "./guard";
-export * from "./env";
+export * from "./json-uint8-array";

package/build/index.js

@@ -15,9 +15,7 @@ __exportStar(require("./handler"), exports);
 __exportStar(require("./interfaces"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./message"), exports);
-__exportStar(require("./requester"), exports);
 __exportStar(require("./constant"), exports);
 __exportStar(require("./encoding"), exports);
-__exportStar(require("./guard"), exports);
-__exportStar(require("./env"), exports);
+__exportStar(require("./json-uint8-array"), exports);
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyB;AACzB,4CAA0B;AAC1B,+CAA6B;AAC7B,0CAAwB;AACxB,4CAA0B;AAC1B,8CAA4B;AAC5B,6CAA2B;AAC3B,6CAA2B;AAC3B,0CAAwB;AACxB,wCAAsB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyB;AACzB,4CAA0B;AAC1B,+CAA6B;AAC7B,0CAAwB;AACxB,4CAA0B;AAC1B,6CAA2B;AAC3B,6CAA2B;AAC3B,qDAAmC"}

package/build/json-uint8-array/hex.d.ts

@@ -0,0 +1,2 @@
+export declare function toHex(data: Uint8Array): string;
+export declare function fromHex(hexstring: string): Uint8Array;

package/build/json-uint8-array/hex.js

@@ -0,0 +1,31 @@
+"use strict";
+/*
+  Belows are from @cosmjs/encoding library.
+  To reduce the bundle size of provider, put them directly here.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fromHex = exports.toHex = void 0;
+function toHex(data) {
+    let out = "";
+    for (const byte of data) {
+        out += ("0" + byte.toString(16)).slice(-2);
+    }
+    return out;
+}
+exports.toHex = toHex;
+function fromHex(hexstring) {
+    if (hexstring.length % 2 !== 0) {
+        throw new Error("hex string length must be a multiple of 2");
+    }
+    const listOfInts = [];
+    for (let i = 0; i < hexstring.length; i += 2) {
+        const hexByteAsString = hexstring.substr(i, 2);
+        if (!hexByteAsString.match(/[0-9a-f]{2}/i)) {
+            throw new Error("hex string contains invalid characters");
+        }
+        listOfInts.push(parseInt(hexByteAsString, 16));
+    }
+    return new Uint8Array(listOfInts);
+}
+exports.fromHex = fromHex;
+//# sourceMappingURL=hex.js.map

package/build/json-uint8-array/hex.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hex.js","sourceRoot":"","sources":["../../src/json-uint8-array/hex.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,SAAgB,KAAK,CAAC,IAAgB;IACpC,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;QACvB,GAAG,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KAC5C;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAND,sBAMC;AAED,SAAgB,OAAO,CAAC,SAAiB;IACvC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;QAC9B,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;KAC9D;IAED,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;QAC5C,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC/C,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE;YAC1C,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;SAC3D;QACD,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC;KAChD;IACD,OAAO,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC;AACpC,CAAC;AAdD,0BAcC"}

package/build/json-uint8-array/index.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JSONUint8Array = void 0;
-const buffer_1 = require("buffer/");
 // The JSON encoder that supports the `Uint8Array`.
+const hex_1 = require("./hex");
 class JSONUint8Array {
     static parse(text) {
         return JSON.parse(text, (_, value) => {
             if (value &&
                 typeof value === "string" &&
                 value.startsWith("__uint8array__")) {
-                return new Uint8Array(buffer_1.Buffer.from(value.replace("__uint8array__", ""), "hex"));
+                return hex_1.fromHex(value.replace("__uint8array__", ""));
             }
             return value;
         });
@@ -23,7 +23,8 @@ class JSONUint8Array {
                         "data" in value &&
                         value.type === "Buffer" &&
                         Array.isArray(value.data)))) {
-                return `__uint8array__${buffer_1.Buffer.from(value).toString("hex")}`;
+                const array = value instanceof Uint8Array ? value : new Uint8Array(value.data);
+                return `__uint8array__${hex_1.toHex(array)}`;
             }
             return value;
         });

package/build/json-uint8-array/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/json-uint8-array/index.ts"],"names":[],"mappings":";;;AAAA,oCAAiC;AAEjC,mDAAmD;AACnD,MAAa,cAAc;IACzB,MAAM,CAAC,KAAK,CAAC,IAAY;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YACnC,IACE,KAAK;gBACL,OAAO,KAAK,KAAK,QAAQ;gBACzB,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAClC;gBACA,OAAO,IAAI,UAAU,CACnB,eAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CACxD,CAAC;aACH;YAED,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,GAAY;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YACtC,IACE,KAAK;gBACL,CAAC,KAAK,YAAY,UAAU;oBAC1B,CAAC,OAAO,KAAK,KAAK,QAAQ;wBACxB,MAAM,IAAI,KAAK;wBACf,MAAM,IAAI,KAAK;wBACf,KAAK,CAAC,IAAI,KAAK,QAAQ;wBACvB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAC/B;gBACA,OAAO,iBAAiB,eAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;aAC9D;YAED,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,GAAQ;QAClB,IAAI,GAAG,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAExC,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,GAAQ;QACpB,IAAI,GAAG,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAExC,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IACnD,CAAC;CACF;AA9CD,wCA8CC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/json-uint8-array/index.ts"],"names":[],"mappings":";;;AAAA,mDAAmD;AACnD,+BAAuC;AAEvC,MAAa,cAAc;IACzB,MAAM,CAAC,KAAK,CAAC,IAAY;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YACnC,IACE,KAAK;gBACL,OAAO,KAAK,KAAK,QAAQ;gBACzB,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAClC;gBACA,OAAO,aAAO,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,CAAC;aACrD;YAED,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,GAAY;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YACtC,IACE,KAAK;gBACL,CAAC,KAAK,YAAY,UAAU;oBAC1B,CAAC,OAAO,KAAK,KAAK,QAAQ;wBACxB,MAAM,IAAI,KAAK;wBACf,MAAM,IAAI,KAAK;wBACf,KAAK,CAAC,IAAI,KAAK,QAAQ;wBACvB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAC/B;gBACA,MAAM,KAAK,GACT,KAAK,YAAY,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAEnE,OAAO,iBAAiB,WAAK,CAAC,KAAK,CAAC,EAAE,CAAC;aACxC;YAED,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,GAAQ;QAClB,IAAI,GAAG,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAExC,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,GAAQ;QACpB,IAAI,GAAG,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAExC,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IACnD,CAAC;CACF;AA/CD,wCA+CC"}

package/build/json-uint8-array/json.spec.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const assert_1 = __importDefault(require("assert"));
-const buffer_1 = require("buffer/");
 const index_1 = require("./index");
 describe("Test json with Uint8Array", () => {
     it("should stringify properly with uint8array", () => {
@@ -12,7 +11,7 @@ describe("Test json with Uint8Array", () => {
             a: 1,
             b: "test",
             c: new Uint8Array([1, 2, 3]),
-            d: buffer_1.Buffer.from([1, 2, 3]),
+            d: Buffer.from([1, 2, 3]),
             e: undefined,
             f: null,
         };
@@ -37,8 +36,8 @@ describe("Test json with Uint8Array", () => {
             c: new Uint8Array([1, 2, 3]),
             d: {
                 a: new Uint8Array([1, 2, 3]),
-                b: buffer_1.Buffer.from([1, 2, 3]),
-                c: [new Uint8Array([1, 2, 3]), buffer_1.Buffer.from([1, 2, 3])],
+                b: Buffer.from([1, 2, 3]),
+                c: [new Uint8Array([1, 2, 3]), Buffer.from([1, 2, 3])],
                 d: [new Uint8Array([1, 2, 3]), null, undefined],
             },
         };
@@ -67,8 +66,8 @@ describe("Test json with Uint8Array", () => {
             c: new Uint8Array([1, 2, 3]),
             d: {
                 a: new Uint8Array([1, 2, 3]),
-                b: buffer_1.Buffer.from([1, 2, 3]),
-                c: [new Uint8Array([1, 2, 3]), buffer_1.Buffer.from([1, 2, 3])],
+                b: Buffer.from([1, 2, 3]),
+                c: [new Uint8Array([1, 2, 3]), Buffer.from([1, 2, 3])],
                 d: [new Uint8Array([1, 2, 3]), null, undefined],
             },
         };

package/build/json-uint8-array/json.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"json.spec.js","sourceRoot":"","sources":["../../src/json-uint8-array/json.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"json.spec.js","sourceRoot":"","sources":["../../src/json-uint8-array/json.spec.ts"],"names":[],"mappings":"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"}

package/build/message.d.ts

@@ -30,6 +30,11 @@ export declare abstract class Message<R> {
      * And, message manager should check that this origin is set properly.
      */
     readonly origin: string;
+    /**
+     * You can put values here that can be helpful when processing in the router.
+     * In logic, these values should not be used.
+     */
+    routerMeta?: Record<string, any>;
     /**
      * Ask for approval if message is sent externally.
      */

package/build/message.js.map

@@ -1 +1 @@
-{"version":3,"file":"message.js","sourceRoot":"","sources":["../src/message.ts"],"names":[],"mappings":";;;AAEA;;;;;;;;GAQG;AACH,MAAsB,OAAO;IA2B3B;;OAEG;IACH,eAAe,CACb,IAAqC,EACrC,OAAsB;QAEtB,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AApCD,0BAoCC"}
+{"version":3,"file":"message.js","sourceRoot":"","sources":["../src/message.ts"],"names":[],"mappings":";;;AAEA;;;;;;;;GAQG;AACH,MAAsB,OAAO;IAiC3B;;OAEG;IACH,eAAe,CACb,IAAqC,EACrC,OAAsB;QAEtB,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA1CD,0BA0CC"}

package/build/router/index.d.ts

@@ -1,3 +1,22 @@
-export * from "./types";
-export * from "./extension";
-export * from "./mock";
+import { Message } from "../message";
+import { Handler } from "../handler";
+import { EnvProducer, Guard, MessageSender } from "../types";
+import { MessageRegistry } from "../encoding";
+export declare abstract class Router {
+    protected readonly envProducer: EnvProducer;
+    protected msgRegistry: MessageRegistry;
+    protected registeredHandler: Map<string, Handler>;
+    protected guards: Guard[];
+    protected port: string;
+    constructor(envProducer: EnvProducer);
+    registerMessage(msgCls: {
+        new (...args: any): Message<unknown>;
+    } & {
+        type(): string;
+    }): void;
+    addHandler(route: string, handler: Handler): void;
+    addGuard(guard: Guard): void;
+    abstract listen(port: string): void;
+    abstract unlisten(): void;
+    protected handleMessage(message: any, sender: MessageSender): Promise<unknown>;
+}

package/build/router/index.js

@@ -1,16 +1,58 @@
 "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]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./types"), exports);
-__exportStar(require("./extension"), exports);
-__exportStar(require("./mock"), exports);
+exports.Router = void 0;
+const encoding_1 = require("../encoding");
+const json_uint8_array_1 = require("../json-uint8-array");
+class Router {
+    constructor(envProducer) {
+        this.envProducer = envProducer;
+        this.msgRegistry = new encoding_1.MessageRegistry();
+        this.registeredHandler = new Map();
+        this.guards = [];
+        this.port = "";
+    }
+    registerMessage(msgCls) {
+        this.msgRegistry.registerMessage(msgCls);
+    }
+    addHandler(route, handler) {
+        if (this.registeredHandler.has(route)) {
+            throw new Error(`Already registered type ${route}`);
+        }
+        this.registeredHandler.set(route, handler);
+    }
+    addGuard(guard) {
+        this.guards.push(guard);
+    }
+    handleMessage(message, sender) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const msg = this.msgRegistry.parseMessage(json_uint8_array_1.JSONUint8Array.unwrap(message));
+            const env = this.envProducer(sender, (_a = msg.routerMeta) !== null && _a !== void 0 ? _a : {});
+            for (const guard of this.guards) {
+                yield guard(env, msg, sender);
+            }
+            // Can happen throw
+            msg.validateBasic();
+            const route = msg.route();
+            if (!route) {
+                throw new Error("Null router");
+            }
+            const handler = this.registeredHandler.get(route);
+            if (!handler) {
+                throw new Error("Can't get handler");
+            }
+            return json_uint8_array_1.JSONUint8Array.wrap(yield handler(env, msg));
+        });
+    }
+}
+exports.Router = Router;
 //# sourceMappingURL=index.js.map

package/build/router/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,8CAA4B;AAC5B,yCAAuB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,0CAA8C;AAC9C,0DAAqD;AAErD,MAAsB,MAAM;IAQ1B,YAA+B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;QAP7C,gBAAW,GAAoB,IAAI,0BAAe,EAAE,CAAC;QACrD,sBAAiB,GAAyB,IAAI,GAAG,EAAE,CAAC;QAEpD,WAAM,GAAY,EAAE,CAAC;QAErB,SAAI,GAAG,EAAE,CAAC;IAEsC,CAAC;IAEpD,eAAe,CACpB,MAAqE;QAErE,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAEM,UAAU,CAAC,KAAa,EAAE,OAAgB;QAC/C,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACrC,MAAM,IAAI,KAAK,CAAC,2BAA2B,KAAK,EAAE,CAAC,CAAC;SACrD;QAED,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IAEM,QAAQ,CAAC,KAAY;QAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IAMe,aAAa,CAC3B,OAAY,EACZ,MAAqB;;;YAErB,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,iCAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YAC1E,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,QAAE,GAAG,CAAC,UAAU,mCAAI,EAAE,CAAC,CAAC;YAE3D,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;gBAC/B,MAAM,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;aAC/B;YAED,mBAAmB;YACnB,GAAG,CAAC,aAAa,EAAE,CAAC;YAEpB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;YAC1B,IAAI,CAAC,KAAK,EAAE;gBACV,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;aAChC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAClD,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;aACtC;YAED,OAAO,iCAAc,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;;KACrD;CACF;AAzDD,wBAyDC"}

package/build/types.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="firefox-webext-browser" />
 import { Message } from "./message";
-export declare type MessageSender = Pick<browser.runtime.MessageSender, "id" | "url">;
+export declare type MessageSender = Pick<browser.runtime.MessageSender, "id" | "url" | "tab">;
 export declare type FnRequestInteractionOptions = {
     forceOpenWindow?: boolean;
     channel?: string;
@@ -10,7 +10,7 @@ export interface Env {
     readonly isInternalMsg: boolean;
     readonly requestInteraction: FnRequestInteraction;
 }
-export declare type EnvProducer = (sender: MessageSender) => Env;
+export declare type EnvProducer = (sender: MessageSender, routerMeta: Record<string, any>) => Env;
 export interface MessageRequester {
     sendMessage<M extends Message<unknown>>(port: string, msg: M): Promise<M extends Message<infer R> ? R : never>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keplr-wallet/router",
-  "version": "0.9.0",
+  "version": "0.9.12-rc.3",
   "main": "build/index.js",
   "author": "chainapsis",
   "license": "Apache-2.0",
@@ -16,10 +16,5 @@
     "lint-test": "eslint \"src/**/*\" && prettier --check \"src/**/*\"",
     "lint-fix": "eslint --fix \"src/**/*\" && prettier --write \"src/**/*\""
   },
-  "dependencies": {
-    "@keplr-wallet/popup": "^0.9.0",
-    "buffer": "^6.0.3",
-    "p-queue": "^6.6.2"
-  },
-  "gitHead": "7b44031f1ca4f99e800b3b66bc5d7585197ea202"
+  "gitHead": "b9860ae52543cc989e6daaecf467536659be0fe4"
 }

package/src/index.ts

@@ -3,8 +3,6 @@ export * from "./handler";
 export * from "./interfaces";
 export * from "./types";
 export * from "./message";
-export * from "./requester";
 export * from "./constant";
 export * from "./encoding";
-export * from "./guard";
-export * from "./env";
+export * from "./json-uint8-array";

package/src/json-uint8-array/hex.ts

@@ -0,0 +1,28 @@
+/*
+  Belows are from @cosmjs/encoding library.
+  To reduce the bundle size of provider, put them directly here.
+ */
+
+export function toHex(data: Uint8Array): string {
+  let out = "";
+  for (const byte of data) {
+    out += ("0" + byte.toString(16)).slice(-2);
+  }
+  return out;
+}
+
+export function fromHex(hexstring: string): Uint8Array {
+  if (hexstring.length % 2 !== 0) {
+    throw new Error("hex string length must be a multiple of 2");
+  }
+
+  const listOfInts: number[] = [];
+  for (let i = 0; i < hexstring.length; i += 2) {
+    const hexByteAsString = hexstring.substr(i, 2);
+    if (!hexByteAsString.match(/[0-9a-f]{2}/i)) {
+      throw new Error("hex string contains invalid characters");
+    }
+    listOfInts.push(parseInt(hexByteAsString, 16));
+  }
+  return new Uint8Array(listOfInts);
+}

package/src/json-uint8-array/index.ts

@@ -1,6 +1,6 @@
-import { Buffer } from "buffer/";
-
 // The JSON encoder that supports the `Uint8Array`.
+import { fromHex, toHex } from "./hex";
+
 export class JSONUint8Array {
   static parse(text: string) {
     return JSON.parse(text, (_, value) => {
@@ -9,9 +9,7 @@ export class JSONUint8Array {
         typeof value === "string" &&
         value.startsWith("__uint8array__")
       ) {
-        return new Uint8Array(
-          Buffer.from(value.replace("__uint8array__", ""), "hex")
-        );
+        return fromHex(value.replace("__uint8array__", ""));
       }
 
       return value;
@@ -29,7 +27,10 @@ export class JSONUint8Array {
             value.type === "Buffer" &&
             Array.isArray(value.data)))
       ) {
-        return `__uint8array__${Buffer.from(value).toString("hex")}`;
+        const array =
+          value instanceof Uint8Array ? value : new Uint8Array(value.data);
+
+        return `__uint8array__${toHex(array)}`;
       }
 
       return value;

package/src/json-uint8-array/json.spec.ts

@@ -1,6 +1,5 @@
 import assert from "assert";
 
-import { Buffer } from "buffer/";
 import { JSONUint8Array } from "./index";
 
 describe("Test json with Uint8Array", () => {

package/src/message.ts

@@ -36,6 +36,12 @@ export abstract class Message<R> {
    */
   public readonly origin!: string;
 
+  /**
+   * You can put values here that can be helpful when processing in the router.
+   * In logic, these values should not be used.
+   */
+  public routerMeta?: Record<string, any>;
+
   /**
    * Ask for approval if message is sent externally.
    */

package/src/router/index.ts

@@ -1,3 +1,64 @@
-export * from "./types";
-export * from "./extension";
-export * from "./mock";
+import { Message } from "../message";
+import { Handler } from "../handler";
+import { EnvProducer, Guard, MessageSender } from "../types";
+import { MessageRegistry } from "../encoding";
+import { JSONUint8Array } from "../json-uint8-array";
+
+export abstract class Router {
+  protected msgRegistry: MessageRegistry = new MessageRegistry();
+  protected registeredHandler: Map<string, Handler> = new Map();
+
+  protected guards: Guard[] = [];
+
+  protected port = "";
+
+  constructor(protected readonly envProducer: EnvProducer) {}
+
+  public registerMessage(
+    msgCls: { new (...args: any): Message<unknown> } & { type(): string }
+  ): void {
+    this.msgRegistry.registerMessage(msgCls);
+  }
+
+  public addHandler(route: string, handler: Handler) {
+    if (this.registeredHandler.has(route)) {
+      throw new Error(`Already registered type ${route}`);
+    }
+
+    this.registeredHandler.set(route, handler);
+  }
+
+  public addGuard(guard: Guard): void {
+    this.guards.push(guard);
+  }
+
+  public abstract listen(port: string): void;
+
+  public abstract unlisten(): void;
+
+  protected async handleMessage(
+    message: any,
+    sender: MessageSender
+  ): Promise<unknown> {
+    const msg = this.msgRegistry.parseMessage(JSONUint8Array.unwrap(message));
+    const env = this.envProducer(sender, msg.routerMeta ?? {});
+
+    for (const guard of this.guards) {
+      await guard(env, msg, sender);
+    }
+
+    // Can happen throw
+    msg.validateBasic();
+
+    const route = msg.route();
+    if (!route) {
+      throw new Error("Null router");
+    }
+    const handler = this.registeredHandler.get(route);
+    if (!handler) {
+      throw new Error("Can't get handler");
+    }
+
+    return JSONUint8Array.wrap(await handler(env, msg));
+  }
+}

package/src/types.ts

@@ -1,6 +1,9 @@
 import { Message } from "./message";
 
-export type MessageSender = Pick<browser.runtime.MessageSender, "id" | "url">;
+export type MessageSender = Pick<
+  browser.runtime.MessageSender,
+  "id" | "url" | "tab"
+>;
 
 export type FnRequestInteractionOptions = {
   forceOpenWindow?: boolean;
@@ -18,7 +21,10 @@ export interface Env {
   readonly requestInteraction: FnRequestInteraction;
 }
 
-export type EnvProducer = (sender: MessageSender) => Env;
+export type EnvProducer = (
+  sender: MessageSender,
+  routerMeta: Record<string, any>
+) => Env;
 
 export interface MessageRequester {
   sendMessage<M extends Message<unknown>>(

package/build/env/content-script.d.ts

@@ -1,4 +0,0 @@
-import { Env, MessageSender } from "../types";
-export declare class ContentScriptEnv {
-    static readonly produceEnv: (sender: MessageSender) => Env;
-}

package/build/env/content-script.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContentScriptEnv = void 0;
-// ContentScriptEnv only checks the id is same as the extension id.
-// And, doesn't support the request interaction.
-class ContentScriptEnv {
-}
-exports.ContentScriptEnv = ContentScriptEnv;
-ContentScriptEnv.produceEnv = (sender) => {
-    const isInternalMsg = sender.id === browser.runtime.id;
-    return {
-        isInternalMsg,
-        requestInteraction: () => {
-            throw new Error("ContentScriptEnv doesn't support `requestInteraction`");
-        },
-    };
-};
-//# sourceMappingURL=content-script.js.map

package/build/env/content-script.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"content-script.js","sourceRoot":"","sources":["../../src/env/content-script.ts"],"names":[],"mappings":";;;AAEA,mEAAmE;AACnE,gDAAgD;AAChD,MAAa,gBAAgB;;AAA7B,4CAaC;AAZiB,2BAAU,GAAG,CAAC,MAAqB,EAAO,EAAE;IAC1D,MAAM,aAAa,GAAG,MAAM,CAAC,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;IAEvD,OAAO;QACL,aAAa;QACb,kBAAkB,EAAE,GAAG,EAAE;YACvB,MAAM,IAAI,KAAK,CACb,uDAAuD,CACxD,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}

package/build/env/extension.d.ts

@@ -1,5 +0,0 @@
-import { Env, MessageSender } from "../types";
-export declare class ExtensionEnv {
-    static readonly produceEnv: (sender: MessageSender) => Env;
-    static readonly checkIsInternalMessage: (sender: MessageSender, extensionId: string, extensionUrl: string) => boolean;
-}