adnbn 0.13.0 → 0.15.0

package/dist/message/providers/Message.js

@@ -78,7 +78,7 @@ class Message extends AbstractMessage {
       return false;
     }
     if (response.ok) {
-      return "payload" in response;
+      return true;
     }
     return this.isSerializedError(response.error);
   }

package/dist/message/providers/Message.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/message/providers/Message.ts"],"sourcesContent":["import {getBrowserInfo, sendMessage, sendTabMessage} from \"@addon-core/browser\";\n\nimport {markRemoteMessageError, restoreError, UnsupportedMessageTargetError} from \"../error\";\n\nimport {isBrowser} from \"@main/env\";\n\nimport {\n    MessageBody,\n    MessageData,\n    MessageDictionary,\n    MessageError,\n    MessageGeneralHandler,\n    MessageHandler,\n    MessageMapHandler,\n    MessageResult,\n    MessageResultEnvelopeProperty,\n    MessageResponse,\n    MessageSendOptions,\n    MessageTargetHandler,\n    MessageType,\n} from \"@typing/message\";\nimport {Browser} from \"@typing/browser\";\n\nimport AbstractMessage from \"./AbstractMessage\";\nimport MessageManager from \"../MessageManager\";\n\nimport {GeneralHandler, MapHandler, SingleHandler} from \"../handlers\";\n\nexport default class Message<T extends MessageDictionary> extends AbstractMessage<T, MessageSendOptions> {\n    private static readonly FirefoxDocumentIdMinVersion = 153;\n    private static instance: Message<MessageDictionary> | null = null;\n    private firefoxDocumentIdVersion?: Promise<{major: number; version: string}>;\n\n    public static getInstance<T extends MessageDictionary>() {\n        return (this.instance ??= new Message<T>());\n    }\n\n    protected get manager(): MessageManager<T> {\n        return MessageManager.getInstance<T>();\n    }\n\n    public async send<K extends MessageType<T>>(\n        type: K,\n        data: MessageData<T, K>,\n        options?: MessageSendOptions\n    ): Promise<MessageResponse<T, K>> {\n        const message = this.buildMessage(type, data);\n        const response = await this.dispatch(message, options);\n\n        return this.unwrap(response);\n    }\n\n    private async dispatch<K extends MessageType<T>>(\n        message: MessageBody<T, K>,\n        options?: MessageSendOptions\n    ): Promise<MessageResult<MessageResponse<T, K>> | MessageResponse<T, K> | undefined> {\n        if (options === undefined) {\n            return sendMessage(message);\n        }\n\n        if (typeof options === \"number\") {\n            return sendTabMessage(options, message);\n        }\n\n        const {tabId, ...other} = options;\n\n        if (other.documentId !== undefined && isBrowser(Browser.Firefox)) {\n            await this.assertFirefoxDocumentTargetSupport();\n        }\n\n        return sendTabMessage(tabId, message, other);\n    }\n\n    private unwrap<K extends MessageType<T>>(\n        response: MessageResult<MessageResponse<T, K>> | MessageResponse<T, K> | undefined\n    ): MessageResponse<T, K> {\n        if (!this.isMessageResult(response)) {\n            return response as MessageResponse<T, K>;\n        }\n\n        if (response.ok) {\n            return response.payload;\n        }\n\n        throw markRemoteMessageError(restoreError(response.error));\n    }\n\n    private async assertFirefoxDocumentTargetSupport(): Promise<void> {\n        this.firefoxDocumentIdVersion ??= getBrowserInfo().then(info => {\n            const major = Number.parseInt(info.version.split(\".\")[0], 10);\n\n            if (!Number.isInteger(major)) {\n                throw new UnsupportedMessageTargetError(\n                    `Cannot determine whether Firefox ${JSON.stringify(info.version)} supports documentId message targets.`\n                );\n            }\n\n            return {major, version: info.version};\n        });\n\n        let browserVersion: {major: number; version: string};\n\n        try {\n            browserVersion = await this.firefoxDocumentIdVersion;\n        } catch (error) {\n            if (error instanceof UnsupportedMessageTargetError) {\n                throw error;\n            }\n\n            throw new UnsupportedMessageTargetError(\n                \"Cannot determine whether the current Firefox version supports documentId message targets.\",\n                error\n            );\n        }\n\n        if (browserVersion.major < Message.FirefoxDocumentIdMinVersion) {\n            throw new UnsupportedMessageTargetError(\n                `Messaging by documentId requires Firefox ${Message.FirefoxDocumentIdMinVersion} or newer; current version is ${browserVersion.version}.`\n            );\n        }\n    }\n\n    private isMessageResult(response: unknown): response is MessageResult {\n        if (\n            !this.isRecord(response) ||\n            response[MessageResultEnvelopeProperty] !== true ||\n            typeof response.ok !== \"boolean\"\n        ) {\n            return false;\n        }\n\n        if (response.ok) {\n            return \"payload\" in response;\n        }\n\n        return this.isSerializedError(response.error);\n    }\n\n    private isSerializedError(error: unknown): error is MessageError {\n        return (\n            this.isRecord(error) &&\n            typeof error.name === \"string\" &&\n            typeof error.message === \"string\" &&\n            (error.stack === undefined || typeof error.stack === \"string\")\n        );\n    }\n\n    private isRecord(value: unknown): value is Record<string, unknown> {\n        return typeof value === \"object\" && value !== null;\n    }\n\n    public watch<K extends MessageType<T>>(\n        arg1: K | MessageMapHandler<T> | MessageGeneralHandler<T, K>,\n        arg2?: MessageTargetHandler<T, K>\n    ): () => void {\n        let handler: MessageHandler<T>;\n\n        if (typeof arg1 === \"function\") {\n            handler = new GeneralHandler<T, K>(arg1);\n        } else if (typeof arg1 === \"object\" && arg2 === undefined) {\n            handler = new MapHandler<T>(arg1);\n        } else if (typeof arg1 === \"string\" && arg2) {\n            handler = new SingleHandler<T>(arg1, arg2);\n        } else {\n            throw new Error(\"Invalid arguments passed to watch()\");\n        }\n\n        this.manager.add(handler);\n\n        return () => this.manager.remove(handler);\n    }\n}\n"],"mappings":"AAAA,SAAQ,gBAAgB,aAAa,sBAAqB;AAE1D,SAAQ,wBAAwB,cAAc,qCAAoC;AAElF,SAAQ,iBAAgB;AAExB;AAAA,EASI;AAAA,OAKG;AACP,SAAQ,eAAc;AAEtB,OAAO,qBAAqB;AAC5B,OAAO,oBAAoB;AAE3B,SAAQ,gBAAgB,YAAY,qBAAoB;AAExD,MAAO,gBAA2D,gBAAuC;AAAA,EACrG,OAAwB,8BAA8B;AAAA,EACtD,OAAe,WAA8C;AAAA,EACrD;AAAA,EAER,OAAc,cAA2C;AACrD,WAAQ,KAAK,aAAL,KAAK,WAAa,IAAI,QAAW;AAAA,EAC7C;AAAA,EAEA,IAAc,UAA6B;AACvC,WAAO,eAAe,YAAe;AAAA,EACzC;AAAA,EAEA,MAAa,KACT,MACA,MACA,SAC8B;AAC9B,UAAM,UAAU,KAAK,aAAa,MAAM,IAAI;AAC5C,UAAM,WAAW,MAAM,KAAK,SAAS,SAAS,OAAO;AAErD,WAAO,KAAK,OAAO,QAAQ;AAAA,EAC/B;AAAA,EAEA,MAAc,SACV,SACA,SACiF;AACjF,QAAI,YAAY,QAAW;AACvB,aAAO,YAAY,OAAO;AAAA,IAC9B;AAEA,QAAI,OAAO,YAAY,UAAU;AAC7B,aAAO,eAAe,SAAS,OAAO;AAAA,IAC1C;AAEA,UAAM,EAAC,OAAO,GAAG,MAAK,IAAI;AAE1B,QAAI,MAAM,eAAe,UAAa,UAAU,QAAQ,OAAO,GAAG;AAC9D,YAAM,KAAK,mCAAmC;AAAA,IAClD;AAEA,WAAO,eAAe,OAAO,SAAS,KAAK;AAAA,EAC/C;AAAA,EAEQ,OACJ,UACqB;AACrB,QAAI,CAAC,KAAK,gBAAgB,QAAQ,GAAG;AACjC,aAAO;AAAA,IACX;AAEA,QAAI,SAAS,IAAI;AACb,aAAO,SAAS;AAAA,IACpB;AAEA,UAAM,uBAAuB,aAAa,SAAS,KAAK,CAAC;AAAA,EAC7D;AAAA,EAEA,MAAc,qCAAoD;AAC9D,SAAK,6BAAL,KAAK,2BAA6B,eAAe,EAAE,KAAK,UAAQ;AAC5D,YAAM,QAAQ,OAAO,SAAS,KAAK,QAAQ,MAAM,GAAG,EAAE,CAAC,GAAG,EAAE;AAE5D,UAAI,CAAC,OAAO,UAAU,KAAK,GAAG;AAC1B,cAAM,IAAI;AAAA,UACN,oCAAoC,KAAK,UAAU,KAAK,OAAO,CAAC;AAAA,QACpE;AAAA,MACJ;AAEA,aAAO,EAAC,OAAO,SAAS,KAAK,QAAO;AAAA,IACxC,CAAC;AAED,QAAI;AAEJ,QAAI;AACA,uBAAiB,MAAM,KAAK;AAAA,IAChC,SAAS,OAAO;AACZ,UAAI,iBAAiB,+BAA+B;AAChD,cAAM;AAAA,MACV;AAEA,YAAM,IAAI;AAAA,QACN;AAAA,QACA;AAAA,MACJ;AAAA,IACJ;AAEA,QAAI,eAAe,QAAQ,QAAQ,6BAA6B;AAC5D,YAAM,IAAI;AAAA,QACN,4CAA4C,QAAQ,2BAA2B,iCAAiC,eAAe,OAAO;AAAA,MAC1I;AAAA,IACJ;AAAA,EACJ;AAAA,EAEQ,gBAAgB,UAA8C;AAClE,QACI,CAAC,KAAK,SAAS,QAAQ,KACvB,SAAS,6BAA6B,MAAM,QAC5C,OAAO,SAAS,OAAO,WACzB;AACE,aAAO;AAAA,IACX;AAEA,QAAI,SAAS,IAAI;AACb,aAAO,aAAa;AAAA,IACxB;AAEA,WAAO,KAAK,kBAAkB,SAAS,KAAK;AAAA,EAChD;AAAA,EAEQ,kBAAkB,OAAuC;AAC7D,WACI,KAAK,SAAS,KAAK,KACnB,OAAO,MAAM,SAAS,YACtB,OAAO,MAAM,YAAY,aACxB,MAAM,UAAU,UAAa,OAAO,MAAM,UAAU;AAAA,EAE7D;AAAA,EAEQ,SAAS,OAAkD;AAC/D,WAAO,OAAO,UAAU,YAAY,UAAU;AAAA,EAClD;AAAA,EAEO,MACH,MACA,MACU;AACV,QAAI;AAEJ,QAAI,OAAO,SAAS,YAAY;AAC5B,gBAAU,IAAI,eAAqB,IAAI;AAAA,IAC3C,WAAW,OAAO,SAAS,YAAY,SAAS,QAAW;AACvD,gBAAU,IAAI,WAAc,IAAI;AAAA,IACpC,WAAW,OAAO,SAAS,YAAY,MAAM;AACzC,gBAAU,IAAI,cAAiB,MAAM,IAAI;AAAA,IAC7C,OAAO;AACH,YAAM,IAAI,MAAM,qCAAqC;AAAA,IACzD;AAEA,SAAK,QAAQ,IAAI,OAAO;AAExB,WAAO,MAAM,KAAK,QAAQ,OAAO,OAAO;AAAA,EAC5C;AACJ;","names":[]}
+{"version":3,"sources":["../../../src/message/providers/Message.ts"],"sourcesContent":["import {getBrowserInfo, sendMessage, sendTabMessage} from \"@addon-core/browser\";\n\nimport {markRemoteMessageError, restoreError, UnsupportedMessageTargetError} from \"../error\";\n\nimport {isBrowser} from \"@main/env\";\n\nimport {\n    MessageBody,\n    MessageData,\n    MessageDictionary,\n    MessageError,\n    MessageGeneralHandler,\n    MessageHandler,\n    MessageMapHandler,\n    MessageResult,\n    MessageResultEnvelopeProperty,\n    MessageResponse,\n    MessageSendOptions,\n    MessageTargetHandler,\n    MessageType,\n} from \"@typing/message\";\nimport {Browser} from \"@typing/browser\";\n\nimport AbstractMessage from \"./AbstractMessage\";\nimport MessageManager from \"../MessageManager\";\n\nimport {GeneralHandler, MapHandler, SingleHandler} from \"../handlers\";\n\nexport default class Message<T extends MessageDictionary> extends AbstractMessage<T, MessageSendOptions> {\n    private static readonly FirefoxDocumentIdMinVersion = 153;\n    private static instance: Message<MessageDictionary> | null = null;\n    private firefoxDocumentIdVersion?: Promise<{major: number; version: string}>;\n\n    public static getInstance<T extends MessageDictionary>() {\n        return (this.instance ??= new Message<T>());\n    }\n\n    protected get manager(): MessageManager<T> {\n        return MessageManager.getInstance<T>();\n    }\n\n    public async send<K extends MessageType<T>>(\n        type: K,\n        data: MessageData<T, K>,\n        options?: MessageSendOptions\n    ): Promise<MessageResponse<T, K>> {\n        const message = this.buildMessage(type, data);\n        const response = await this.dispatch(message, options);\n\n        return this.unwrap(response);\n    }\n\n    private async dispatch<K extends MessageType<T>>(\n        message: MessageBody<T, K>,\n        options?: MessageSendOptions\n    ): Promise<MessageResult<MessageResponse<T, K>> | MessageResponse<T, K> | undefined> {\n        if (options === undefined) {\n            return sendMessage(message);\n        }\n\n        if (typeof options === \"number\") {\n            return sendTabMessage(options, message);\n        }\n\n        const {tabId, ...other} = options;\n\n        if (other.documentId !== undefined && isBrowser(Browser.Firefox)) {\n            await this.assertFirefoxDocumentTargetSupport();\n        }\n\n        return sendTabMessage(tabId, message, other);\n    }\n\n    private unwrap<K extends MessageType<T>>(\n        response: MessageResult<MessageResponse<T, K>> | MessageResponse<T, K> | undefined\n    ): MessageResponse<T, K> {\n        if (!this.isMessageResult(response)) {\n            return response as MessageResponse<T, K>;\n        }\n\n        if (response.ok) {\n            return response.payload;\n        }\n\n        throw markRemoteMessageError(restoreError(response.error));\n    }\n\n    private async assertFirefoxDocumentTargetSupport(): Promise<void> {\n        this.firefoxDocumentIdVersion ??= getBrowserInfo().then(info => {\n            const major = Number.parseInt(info.version.split(\".\")[0], 10);\n\n            if (!Number.isInteger(major)) {\n                throw new UnsupportedMessageTargetError(\n                    `Cannot determine whether Firefox ${JSON.stringify(info.version)} supports documentId message targets.`\n                );\n            }\n\n            return {major, version: info.version};\n        });\n\n        let browserVersion: {major: number; version: string};\n\n        try {\n            browserVersion = await this.firefoxDocumentIdVersion;\n        } catch (error) {\n            if (error instanceof UnsupportedMessageTargetError) {\n                throw error;\n            }\n\n            throw new UnsupportedMessageTargetError(\n                \"Cannot determine whether the current Firefox version supports documentId message targets.\",\n                error\n            );\n        }\n\n        if (browserVersion.major < Message.FirefoxDocumentIdMinVersion) {\n            throw new UnsupportedMessageTargetError(\n                `Messaging by documentId requires Firefox ${Message.FirefoxDocumentIdMinVersion} or newer; current version is ${browserVersion.version}.`\n            );\n        }\n    }\n\n    private isMessageResult(response: unknown): response is MessageResult {\n        if (\n            !this.isRecord(response) ||\n            response[MessageResultEnvelopeProperty] !== true ||\n            typeof response.ok !== \"boolean\"\n        ) {\n            return false;\n        }\n\n        if (response.ok) {\n            // JSON serialization omits payload when a successful handler returns undefined.\n            return true;\n        }\n\n        return this.isSerializedError(response.error);\n    }\n\n    private isSerializedError(error: unknown): error is MessageError {\n        return (\n            this.isRecord(error) &&\n            typeof error.name === \"string\" &&\n            typeof error.message === \"string\" &&\n            (error.stack === undefined || typeof error.stack === \"string\")\n        );\n    }\n\n    private isRecord(value: unknown): value is Record<string, unknown> {\n        return typeof value === \"object\" && value !== null;\n    }\n\n    public watch<K extends MessageType<T>>(\n        arg1: K | MessageMapHandler<T> | MessageGeneralHandler<T, K>,\n        arg2?: MessageTargetHandler<T, K>\n    ): () => void {\n        let handler: MessageHandler<T>;\n\n        if (typeof arg1 === \"function\") {\n            handler = new GeneralHandler<T, K>(arg1);\n        } else if (typeof arg1 === \"object\" && arg2 === undefined) {\n            handler = new MapHandler<T>(arg1);\n        } else if (typeof arg1 === \"string\" && arg2) {\n            handler = new SingleHandler<T>(arg1, arg2);\n        } else {\n            throw new Error(\"Invalid arguments passed to watch()\");\n        }\n\n        this.manager.add(handler);\n\n        return () => this.manager.remove(handler);\n    }\n}\n"],"mappings":"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","names":[]}

package/dist/relay/RelayPermission.js

@@ -1,4 +1,10 @@
-import { containsPermissions, onPermissionsAdded, onPermissionsRemoved, requestPermissions } from "@addon-core/browser";
+import {
+  containsPermissions,
+  getManifestVersion,
+  onPermissionsAdded,
+  onPermissionsRemoved,
+  requestPermissions
+} from "@addon-core/browser";
 import { RelayMethod } from "./../types/relay.js";
 import { ContentScriptDeclarative } from "./../types/content/index.js";
 const RelayPermissionGlobalKey = "adnbnRelayPermission";
@@ -18,7 +24,7 @@ class RelayPermission {
       const allow = declarative === true || declarative === ContentScriptDeclarative.Required || method === RelayMethod.Messaging;
       const permissions = method === RelayMethod.Messaging ? void 0 : {
         origins: !declarative || declarative === ContentScriptDeclarative.Optional ? matches : [],
-        permissions: ["scripting"]
+        permissions: getManifestVersion() === 3 ? ["scripting"] : []
       };
       this.set(name, { allow, permissions });
     }

package/dist/relay/RelayPermission.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/relay/RelayPermission.ts"],"sourcesContent":["import {containsPermissions, onPermissionsAdded, onPermissionsRemoved, requestPermissions} from \"@addon-core/browser\";\n\nimport {RelayMethod, RelayOptionsMap} from \"@typing/relay\";\nimport {ContentScriptDeclarative} from \"@typing/content\";\n\ntype Permissions = chrome.permissions.Permissions;\n\nexport interface RelayPermissionValue {\n    allow: boolean;\n    permissions?: Permissions;\n}\n\nexport const RelayPermissionGlobalKey = \"adnbnRelayPermission\";\n\nexport default class RelayPermission {\n    private permissions = new Map<string, RelayPermissionValue>();\n    private started = false;\n\n    private constructor(relays: RelayOptionsMap) {\n        this.configure(relays);\n    }\n\n    private configure(relays: RelayOptionsMap): void {\n        for (const [name, {declarative, method, matches}] of relays) {\n            if (declarative === false && method === RelayMethod.Scripting) {\n                console.warn(\n                    `Relay \"${name}\" has invalid configuration: \"scripting\" method cannot work with declarative = false.`\n                );\n            }\n\n            const allow: boolean =\n                declarative === true ||\n                declarative === ContentScriptDeclarative.Required ||\n                method === RelayMethod.Messaging;\n\n            const permissions: Permissions | undefined =\n                method === RelayMethod.Messaging\n                    ? undefined\n                    : {\n                          origins: !declarative || declarative === ContentScriptDeclarative.Optional ? matches : [],\n                          permissions: [\"scripting\"],\n                      };\n\n            this.set(name, {allow, permissions});\n        }\n    }\n\n    public static getInstance(relays: RelayOptionsMap): RelayPermission {\n        const current = globalThis[RelayPermissionGlobalKey] as RelayPermission | undefined;\n\n        if (current) {\n            return current;\n        }\n\n        const instance = new RelayPermission(relays);\n\n        globalThis[RelayPermissionGlobalKey] = instance;\n\n        return instance.start();\n    }\n\n    public start(): this {\n        if (this.started) {\n            return this;\n        }\n\n        this.started = true;\n\n        const checkPermissions = (): void => {\n            void this.check().catch(error => console.error(error));\n        };\n\n        onPermissionsAdded(checkPermissions);\n        onPermissionsRemoved(checkPermissions);\n        checkPermissions();\n\n        return this;\n    }\n\n    public set(name: string, value: Partial<RelayPermissionValue>): this {\n        const relayPermissions = this.get(name) || {allow: false, permissions: {}};\n\n        this.permissions.set(name, {...relayPermissions, ...value});\n\n        return this;\n    }\n\n    public get(name: string): RelayPermissionValue | undefined {\n        return this.permissions.get(name);\n    }\n\n    public has(name: string): boolean {\n        return this.permissions.has(name);\n    }\n\n    public allow(name: string): boolean {\n        return this.get(name)?.allow ?? false;\n    }\n\n    public async contains(name: string): Promise<boolean> {\n        const relayPermissions = this.get(name);\n\n        if (!relayPermissions) {\n            throw new Error(`RelayPermission, relay \"${name}\" not found`);\n        }\n\n        if (!relayPermissions.permissions) {\n            return true;\n        }\n\n        const allow = await containsPermissions(relayPermissions.permissions);\n\n        this.set(name, {allow});\n\n        return allow;\n    }\n\n    public async request(name: string): Promise<boolean> {\n        const relayPermissions = this.get(name);\n\n        if (!relayPermissions) {\n            throw new Error(`RelayPermission, relay \"${name}\" not found`);\n        }\n\n        if (!relayPermissions.permissions) {\n            return true;\n        }\n\n        const allow = await requestPermissions(relayPermissions.permissions);\n\n        this.set(name, {allow});\n\n        return allow;\n    }\n\n    private async check(): Promise<void> {\n        await Promise.allSettled([...this.permissions.keys()].map(name => this.contains(name)));\n    }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../src/relay/RelayPermission.ts"],"sourcesContent":["import {\n    containsPermissions,\n    getManifestVersion,\n    onPermissionsAdded,\n    onPermissionsRemoved,\n    requestPermissions,\n} from \"@addon-core/browser\";\n\nimport {RelayMethod, RelayOptionsMap} from \"@typing/relay\";\nimport {ContentScriptDeclarative} from \"@typing/content\";\n\ntype Permissions = chrome.permissions.Permissions;\n\nexport interface RelayPermissionValue {\n    allow: boolean;\n    permissions?: Permissions;\n}\n\nexport const RelayPermissionGlobalKey = \"adnbnRelayPermission\";\n\nexport default class RelayPermission {\n    private permissions = new Map<string, RelayPermissionValue>();\n    private started = false;\n\n    private constructor(relays: RelayOptionsMap) {\n        this.configure(relays);\n    }\n\n    private configure(relays: RelayOptionsMap): void {\n        for (const [name, {declarative, method, matches}] of relays) {\n            if (declarative === false && method === RelayMethod.Scripting) {\n                console.warn(\n                    `Relay \"${name}\" has invalid configuration: \"scripting\" method cannot work with declarative = false.`\n                );\n            }\n\n            const allow: boolean =\n                declarative === true ||\n                declarative === ContentScriptDeclarative.Required ||\n                method === RelayMethod.Messaging;\n\n            const permissions: Permissions | undefined =\n                method === RelayMethod.Messaging\n                    ? undefined\n                    : {\n                          origins: !declarative || declarative === ContentScriptDeclarative.Optional ? matches : [],\n                          permissions: getManifestVersion() === 3 ? [\"scripting\"] : [],\n                      };\n\n            this.set(name, {allow, permissions});\n        }\n    }\n\n    public static getInstance(relays: RelayOptionsMap): RelayPermission {\n        const current = globalThis[RelayPermissionGlobalKey] as RelayPermission | undefined;\n\n        if (current) {\n            return current;\n        }\n\n        const instance = new RelayPermission(relays);\n\n        globalThis[RelayPermissionGlobalKey] = instance;\n\n        return instance.start();\n    }\n\n    public start(): this {\n        if (this.started) {\n            return this;\n        }\n\n        this.started = true;\n\n        const checkPermissions = (): void => {\n            void this.check().catch(error => console.error(error));\n        };\n\n        onPermissionsAdded(checkPermissions);\n        onPermissionsRemoved(checkPermissions);\n        checkPermissions();\n\n        return this;\n    }\n\n    public set(name: string, value: Partial<RelayPermissionValue>): this {\n        const relayPermissions = this.get(name) || {allow: false, permissions: {}};\n\n        this.permissions.set(name, {...relayPermissions, ...value});\n\n        return this;\n    }\n\n    public get(name: string): RelayPermissionValue | undefined {\n        return this.permissions.get(name);\n    }\n\n    public has(name: string): boolean {\n        return this.permissions.has(name);\n    }\n\n    public allow(name: string): boolean {\n        return this.get(name)?.allow ?? false;\n    }\n\n    public async contains(name: string): Promise<boolean> {\n        const relayPermissions = this.get(name);\n\n        if (!relayPermissions) {\n            throw new Error(`RelayPermission, relay \"${name}\" not found`);\n        }\n\n        if (!relayPermissions.permissions) {\n            return true;\n        }\n\n        const allow = await containsPermissions(relayPermissions.permissions);\n\n        this.set(name, {allow});\n\n        return allow;\n    }\n\n    public async request(name: string): Promise<boolean> {\n        const relayPermissions = this.get(name);\n\n        if (!relayPermissions) {\n            throw new Error(`RelayPermission, relay \"${name}\" not found`);\n        }\n\n        if (!relayPermissions.permissions) {\n            return true;\n        }\n\n        const allow = await requestPermissions(relayPermissions.permissions);\n\n        this.set(name, {allow});\n\n        return allow;\n    }\n\n    private async check(): Promise<void> {\n        await Promise.allSettled([...this.permissions.keys()].map(name => this.contains(name)));\n    }\n}\n"],"mappings":"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","names":[]}

package/dist/relay/adapters/RelayScriptingAdapter.d.ts

@@ -6,6 +6,7 @@ export default class RelayScriptingAdapter extends RelayAdapter {
     private get injectScript();
     invoke(args: any[], path?: string): Promise<any>;
     private normalize;
+    private isResponse;
     private resultTarget;
     private unwrap;
     private injectScriptOptions;

package/dist/relay/adapters/RelayScriptingAdapter.js

@@ -5,8 +5,15 @@ import {
   RelayFrameErrorKind,
   RelayGlobalKey
 } from "./../../types/relay.js";
-import { fulfilledRelayFrame, injectScriptErrorKind, rejectedRelayFrame, sortRelayFrameResults } from "../result.js";
+import {
+  RelayProtocolError,
+  fulfilledRelayFrame,
+  injectScriptErrorKind,
+  rejectedRelayFrame,
+  sortRelayFrameResults
+} from "../result.js";
 import RelayAdapter from "./RelayAdapter.js";
+import { invokeRelay } from "./invoke-relay.js";
 class RelayScriptingAdapter extends RelayAdapter {
   _injectScript;
   constructor(name, target) {
@@ -16,68 +23,6 @@ class RelayScriptingAdapter extends RelayAdapter {
     return this._injectScript ?? (this._injectScript = injectScriptFactory(this.injectScriptOptions()));
   }
   async invoke(args, path) {
-    const func = (name, path2, args2, key, retryManager) => {
-      const serialize = (error) => {
-        if (error instanceof Error) {
-          return {
-            name: error.name,
-            message: error.message,
-            ...error.stack ? { stack: error.stack } : {}
-          };
-        }
-        if (typeof error === "object" && error !== null) {
-          const record = error;
-          return {
-            name: typeof record.name === "string" ? record.name : "Error",
-            message: typeof record.message === "string" ? record.message : (() => {
-              try {
-                return JSON.stringify(error) ?? String(error);
-              } catch {
-                return String(error);
-              }
-            })(),
-            ...typeof record.stack === "string" ? { stack: record.stack } : {}
-          };
-        }
-        return { name: "Error", message: String(error) };
-      };
-      const invoke = (manager2) => {
-        try {
-          return Promise.resolve(manager2.property(name, { path: path2, args: args2 })).then(
-            (result) => result === void 0 ? { ok: true, hasResult: false } : { ok: true, hasResult: true, result },
-            (error) => ({ ok: false, error: serialize(error) })
-          );
-        } catch (error) {
-          return Promise.resolve({ ok: false, error: serialize(error) });
-        }
-      };
-      const manager = globalThis[key];
-      if (manager) {
-        return invoke(manager);
-      }
-      if (!retryManager) {
-        return Promise.reject(new Error("Relay manager not found."));
-      }
-      return new Promise((resolve, reject) => {
-        const maxAttempts = 10;
-        const delay = 300;
-        let attempts = 0;
-        const findManager = () => {
-          const delayedManager = globalThis[key];
-          if (delayedManager) {
-            resolve(invoke(delayedManager));
-            return;
-          }
-          attempts++;
-          if (attempts >= maxAttempts) {
-            reject(new Error(`Relay manager not found after ${maxAttempts} attempts.`));
-            return;
-          }
-          setTimeout(findManager, delay);
-        };
-        findManager();
-      });
-    };
     const scriptArgs = [
       this.name,
       path ?? null,
@@ -85,7 +30,7 @@ class RelayScriptingAdapter extends RelayAdapter {
       RelayGlobalKey,
       !this.isAnyFramesTarget()
     ];
-    const outcomes = await this.injectScript.run(func, scriptArgs);
+    const outcomes = await this.injectScript.run(invokeRelay, scriptArgs);
     const results = this.normalize(outcomes);
     if (this.isAnyFramesTarget()) {
       const result = results.find((result2) => result2.status === "fulfilled") ?? results[0];
@@ -108,6 +53,13 @@ class RelayScriptingAdapter extends RelayAdapter {
         if (!outcome.success) {
           return rejectedRelayFrame(target, outcome.error, injectScriptErrorKind(outcome.error.kind));
         }
+        if (!this.isResponse(outcome.value)) {
+          const error = new RelayProtocolError(this.name);
+          if (!this.isBatchTarget(this.target)) {
+            throw error;
+          }
+          return rejectedRelayFrame(target, error, RelayFrameErrorKind.Execution);
+        }
         if (!outcome.value.ok) {
           return rejectedRelayFrame(target, outcome.value.error, RelayFrameErrorKind.Remote);
         }
@@ -115,6 +67,20 @@ class RelayScriptingAdapter extends RelayAdapter {
       })
     );
   }
+  isResponse(value) {
+    if (typeof value !== "object" || value === null || Array.isArray(value)) {
+      return false;
+    }
+    const response = value;
+    if (response.ok === true) {
+      return response.hasResult === false ? !Object.hasOwn(response, "result") : response.hasResult === true && Object.hasOwn(response, "result");
+    }
+    if (response.ok !== false || typeof response.error !== "object" || response.error === null || Array.isArray(response.error)) {
+      return false;
+    }
+    const error = response.error;
+    return typeof error.name === "string" && typeof error.message === "string" && (error.stack === void 0 || typeof error.stack === "string");
+  }
   resultTarget(target) {
     if (target.allFrames === true) {
       return {

package/dist/relay/adapters/RelayScriptingAdapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/relay/adapters/RelayScriptingAdapter.ts"],"sourcesContent":["import injectScriptFactory, {\n    type InjectScriptContract,\n    type InjectScriptOptions,\n    type InjectScriptResult,\n    type InjectScriptResultTarget,\n    type InjectScriptTarget,\n    type JsonValue,\n} from \"@addon-core/inject-script\";\n\nimport {restoreError} from \"@message/error\";\n\nimport type {MessageError} from \"@typing/message\";\nimport {\n    RelayAllFrames,\n    RelayFrameErrorKind,\n    RelayGlobalKey,\n    type RelayCallOptions,\n    type RelayDocumentOptions,\n    type RelayFrameOptions,\n    type RelayFramesResult,\n    type RelayResultTarget,\n    type RelayScalarOptions,\n} from \"@typing/relay\";\n\nimport {fulfilledRelayFrame, injectScriptErrorKind, rejectedRelayFrame, sortRelayFrameResults} from \"../result\";\nimport RelayAdapter from \"./RelayAdapter\";\n\ntype RelayInvocationResult =\n    | {\n          ok: true;\n          hasResult: false;\n      }\n    | {\n          ok: true;\n          hasResult: true;\n          result: any;\n      }\n    | {\n          ok: false;\n          error: MessageError;\n      };\n\nexport default class RelayScriptingAdapter extends RelayAdapter {\n    private _injectScript?: InjectScriptContract;\n\n    public constructor(name: string, target: RelayCallOptions) {\n        super(name, target);\n    }\n\n    private get injectScript(): InjectScriptContract {\n        return (this._injectScript ??= injectScriptFactory(this.injectScriptOptions()));\n    }\n\n    public async invoke(args: any[], path?: string): Promise<any> {\n        const func = (\n            name: string,\n            path: string | null,\n            args: JsonValue[],\n            key: string,\n            retryManager: boolean\n        ): Promise<RelayInvocationResult> => {\n            const serialize = (error: unknown): MessageError => {\n                if (error instanceof Error) {\n                    return {\n                        name: error.name,\n                        message: error.message,\n                        ...(error.stack ? {stack: error.stack} : {}),\n                    };\n                }\n\n                if (typeof error === \"object\" && error !== null) {\n                    const record = error as Record<string, unknown>;\n\n                    return {\n                        name: typeof record.name === \"string\" ? record.name : \"Error\",\n                        message:\n                            typeof record.message === \"string\"\n                                ? record.message\n                                : (() => {\n                                      try {\n                                          return JSON.stringify(error) ?? String(error);\n                                      } catch {\n                                          return String(error);\n                                      }\n                                  })(),\n                        ...(typeof record.stack === \"string\" ? {stack: record.stack} : {}),\n                    };\n                }\n\n                return {name: \"Error\", message: String(error)};\n            };\n\n            const invoke = (manager: any): Promise<RelayInvocationResult> => {\n                try {\n                    return Promise.resolve(manager.property(name, {path, args})).then(\n                        result =>\n                            result === undefined\n                                ? {ok: true as const, hasResult: false as const}\n                                : {ok: true as const, hasResult: true as const, result},\n                        error => ({ok: false as const, error: serialize(error)})\n                    );\n                } catch (error) {\n                    return Promise.resolve({ok: false as const, error: serialize(error)});\n                }\n            };\n\n            const manager = globalThis[key];\n\n            if (manager) {\n                // Keep the normal Scripting path synchronous until the remote method starts.\n                return invoke(manager);\n            }\n\n            if (!retryManager) {\n                return Promise.reject(new Error(\"Relay manager not found.\"));\n            }\n\n            return new Promise<RelayInvocationResult>((resolve, reject) => {\n                const maxAttempts = 10;\n                const delay = 300;\n                let attempts = 0;\n\n                const findManager = () => {\n                    const delayedManager = globalThis[key];\n\n                    if (delayedManager) {\n                        resolve(invoke(delayedManager));\n                        return;\n                    }\n\n                    attempts++;\n\n                    if (attempts >= maxAttempts) {\n                        reject(new Error(`Relay manager not found after ${maxAttempts} attempts.`));\n                        return;\n                    }\n\n                    setTimeout(findManager, delay);\n                };\n\n                findManager();\n            });\n        };\n\n        const scriptArgs: [string, string | null, JsonValue[], string, boolean] = [\n            this.name,\n            path ?? null,\n            args as JsonValue[],\n            RelayGlobalKey,\n            !this.isAnyFramesTarget(),\n        ];\n        const outcomes = await this.injectScript.run(func, scriptArgs);\n        const results = this.normalize(outcomes);\n\n        if (this.isAnyFramesTarget()) {\n            const result = results.find(result => result.status === \"fulfilled\") ?? results[0];\n\n            return result\n                ? [\n                      {\n                          ...result,\n                          target: {tabId: this.target.tabId, allFrames: RelayAllFrames.Any},\n                      },\n                  ]\n                : [];\n        }\n\n        if (this.isBatchTarget(this.target)) {\n            return results;\n        }\n\n        return this.unwrap(results);\n    }\n\n    private normalize(outcomes: readonly InjectScriptResult<RelayInvocationResult>[]): RelayFramesResult<any> {\n        return sortRelayFrameResults(\n            outcomes.map(outcome => {\n                const target = this.resultTarget(outcome.target);\n\n                if (!outcome.success) {\n                    return rejectedRelayFrame(target, outcome.error, injectScriptErrorKind(outcome.error.kind));\n                }\n\n                if (!outcome.value.ok) {\n                    return rejectedRelayFrame(target, outcome.value.error, RelayFrameErrorKind.Remote);\n                }\n\n                return fulfilledRelayFrame(target, outcome.value.hasResult ? outcome.value.result : undefined);\n            })\n        );\n    }\n\n    private resultTarget(target: InjectScriptResultTarget): RelayResultTarget {\n        if (target.allFrames === true) {\n            return {\n                tabId: target.tabId,\n                allFrames: this.target.allFrames === RelayAllFrames.All ? RelayAllFrames.All : RelayAllFrames.Any,\n            };\n        }\n\n        return target;\n    }\n\n    private unwrap(results: RelayFramesResult<any>): any {\n        const result = results[0];\n\n        if (!result) {\n            throw new Error(`Relay \"${this.name}\" did not return a frame result.`);\n        }\n\n        if (result.status === \"fulfilled\") {\n            return result.result;\n        }\n\n        throw restoreError(result.error);\n    }\n\n    private injectScriptOptions(): InjectScriptOptions {\n        let injectTarget: InjectScriptTarget;\n\n        if (\n            this.target.allFrames === true ||\n            this.target.allFrames === RelayAllFrames.Any ||\n            this.target.allFrames === RelayAllFrames.All\n        ) {\n            injectTarget = {tabId: this.target.tabId, allFrames: true};\n        } else if (this.target.frameIds !== undefined) {\n            injectTarget = {tabId: this.target.tabId, frameIds: this.target.frameIds};\n        } else if (this.target.documentIds !== undefined) {\n            injectTarget = {tabId: this.target.tabId, documentIds: this.target.documentIds};\n        } else if (this.isFrameTarget(this.target)) {\n            injectTarget = {tabId: this.target.tabId, frameIds: [this.target.frameId]};\n        } else if (this.isDocumentTarget(this.target)) {\n            injectTarget = {tabId: this.target.tabId, documentIds: [this.target.documentId]};\n        } else {\n            injectTarget = {tabId: (this.target as RelayScalarOptions).tabId};\n        }\n\n        return {\n            target: injectTarget,\n            ...(this.target.timeoutMs === undefined ? {} : {timeoutMs: this.target.timeoutMs}),\n        };\n    }\n\n    private isFrameTarget(target: RelayCallOptions): target is RelayFrameOptions {\n        return target.frameId !== undefined;\n    }\n\n    private isDocumentTarget(target: RelayCallOptions): target is RelayDocumentOptions {\n        return target.documentId !== undefined;\n    }\n\n    private isAnyFramesTarget(): boolean {\n        return this.target.allFrames === true || this.target.allFrames === RelayAllFrames.Any;\n    }\n}\n"],"mappings":"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","names":["path","args","manager","result"]}
+{"version":3,"sources":["../../../src/relay/adapters/RelayScriptingAdapter.ts"],"sourcesContent":["import injectScriptFactory, {\n    type InjectScriptContract,\n    type InjectScriptOptions,\n    type InjectScriptResult,\n    type InjectScriptResultTarget,\n    type InjectScriptTarget,\n    type JsonValue,\n} from \"@addon-core/inject-script\";\n\nimport {restoreError} from \"@message/error\";\n\nimport {\n    RelayAllFrames,\n    RelayFrameErrorKind,\n    RelayGlobalKey,\n    type RelayCallOptions,\n    type RelayDocumentOptions,\n    type RelayFrameOptions,\n    type RelayFramesResult,\n    type RelayResultTarget,\n    type RelayScalarOptions,\n} from \"@typing/relay\";\n\nimport {\n    RelayProtocolError,\n    fulfilledRelayFrame,\n    injectScriptErrorKind,\n    rejectedRelayFrame,\n    sortRelayFrameResults,\n} from \"../result\";\nimport RelayAdapter from \"./RelayAdapter\";\nimport {invokeRelay} from \"./invoke-relay\";\nimport type {RelayInvocationResult} from \"./scripting-response\";\n\nexport default class RelayScriptingAdapter extends RelayAdapter {\n    private _injectScript?: InjectScriptContract;\n\n    public constructor(name: string, target: RelayCallOptions) {\n        super(name, target);\n    }\n\n    private get injectScript(): InjectScriptContract {\n        return (this._injectScript ??= injectScriptFactory(this.injectScriptOptions()));\n    }\n\n    public async invoke(args: any[], path?: string): Promise<any> {\n        const scriptArgs: [string, string | null, JsonValue[], string, boolean] = [\n            this.name,\n            path ?? null,\n            args as JsonValue[],\n            RelayGlobalKey,\n            !this.isAnyFramesTarget(),\n        ];\n        const outcomes = await this.injectScript.run(invokeRelay, scriptArgs);\n        const results = this.normalize(outcomes);\n\n        if (this.isAnyFramesTarget()) {\n            const result = results.find(result => result.status === \"fulfilled\") ?? results[0];\n\n            return result\n                ? [\n                      {\n                          ...result,\n                          target: {tabId: this.target.tabId, allFrames: RelayAllFrames.Any},\n                      },\n                  ]\n                : [];\n        }\n\n        if (this.isBatchTarget(this.target)) {\n            return results;\n        }\n\n        return this.unwrap(results);\n    }\n\n    private normalize(outcomes: readonly InjectScriptResult<unknown>[]): RelayFramesResult<any> {\n        return sortRelayFrameResults(\n            outcomes.map(outcome => {\n                const target = this.resultTarget(outcome.target);\n\n                if (!outcome.success) {\n                    return rejectedRelayFrame(target, outcome.error, injectScriptErrorKind(outcome.error.kind));\n                }\n\n                if (!this.isResponse(outcome.value)) {\n                    const error = new RelayProtocolError(this.name);\n\n                    if (!this.isBatchTarget(this.target)) {\n                        throw error;\n                    }\n\n                    return rejectedRelayFrame(target, error, RelayFrameErrorKind.Execution);\n                }\n\n                if (!outcome.value.ok) {\n                    return rejectedRelayFrame(target, outcome.value.error, RelayFrameErrorKind.Remote);\n                }\n\n                return fulfilledRelayFrame(target, outcome.value.hasResult ? outcome.value.result : undefined);\n            })\n        );\n    }\n\n    private isResponse(value: unknown): value is RelayInvocationResult {\n        if (typeof value !== \"object\" || value === null || Array.isArray(value)) {\n            return false;\n        }\n\n        const response = value as Record<string, unknown>;\n\n        if (response.ok === true) {\n            return response.hasResult === false\n                ? !Object.hasOwn(response, \"result\")\n                : response.hasResult === true && Object.hasOwn(response, \"result\");\n        }\n\n        if (\n            response.ok !== false ||\n            typeof response.error !== \"object\" ||\n            response.error === null ||\n            Array.isArray(response.error)\n        ) {\n            return false;\n        }\n\n        const error = response.error as Record<string, unknown>;\n\n        return (\n            typeof error.name === \"string\" &&\n            typeof error.message === \"string\" &&\n            (error.stack === undefined || typeof error.stack === \"string\")\n        );\n    }\n\n    private resultTarget(target: InjectScriptResultTarget): RelayResultTarget {\n        if (target.allFrames === true) {\n            return {\n                tabId: target.tabId,\n                allFrames: this.target.allFrames === RelayAllFrames.All ? RelayAllFrames.All : RelayAllFrames.Any,\n            };\n        }\n\n        return target;\n    }\n\n    private unwrap(results: RelayFramesResult<any>): any {\n        const result = results[0];\n\n        if (!result) {\n            throw new Error(`Relay \"${this.name}\" did not return a frame result.`);\n        }\n\n        if (result.status === \"fulfilled\") {\n            return result.result;\n        }\n\n        throw restoreError(result.error);\n    }\n\n    private injectScriptOptions(): InjectScriptOptions {\n        let injectTarget: InjectScriptTarget;\n\n        if (\n            this.target.allFrames === true ||\n            this.target.allFrames === RelayAllFrames.Any ||\n            this.target.allFrames === RelayAllFrames.All\n        ) {\n            injectTarget = {tabId: this.target.tabId, allFrames: true};\n        } else if (this.target.frameIds !== undefined) {\n            injectTarget = {tabId: this.target.tabId, frameIds: this.target.frameIds};\n        } else if (this.target.documentIds !== undefined) {\n            injectTarget = {tabId: this.target.tabId, documentIds: this.target.documentIds};\n        } else if (this.isFrameTarget(this.target)) {\n            injectTarget = {tabId: this.target.tabId, frameIds: [this.target.frameId]};\n        } else if (this.isDocumentTarget(this.target)) {\n            injectTarget = {tabId: this.target.tabId, documentIds: [this.target.documentId]};\n        } else {\n            injectTarget = {tabId: (this.target as RelayScalarOptions).tabId};\n        }\n\n        return {\n            target: injectTarget,\n            ...(this.target.timeoutMs === undefined ? {} : {timeoutMs: this.target.timeoutMs}),\n        };\n    }\n\n    private isFrameTarget(target: RelayCallOptions): target is RelayFrameOptions {\n        return target.frameId !== undefined;\n    }\n\n    private isDocumentTarget(target: RelayCallOptions): target is RelayDocumentOptions {\n        return target.documentId !== undefined;\n    }\n\n    private isAnyFramesTarget(): boolean {\n        return this.target.allFrames === true || this.target.allFrames === RelayAllFrames.Any;\n    }\n}\n"],"mappings":"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","names":["result"]}

package/dist/relay/adapters/invoke-relay.d.ts

@@ -0,0 +1,3 @@
+import type { JsonValue } from "@addon-core/inject-script";
+import type { RelayInvocationResult } from "./scripting-response.js";
+export declare const invokeRelay: (name: string, path: string | null, args: JsonValue[], key: string, retryManager: boolean) => Promise<RelayInvocationResult>;

package/dist/relay/adapters/invoke-relay.js

@@ -0,0 +1,69 @@
+const invokeRelay = (name, path, args, key, retryManager) => {
+  const serialize = (error) => {
+    if (error instanceof Error) {
+      return {
+        name: error.name,
+        message: error.message,
+        ...error.stack ? { stack: error.stack } : {}
+      };
+    }
+    if (typeof error === "object" && error !== null) {
+      const record = error;
+      return {
+        name: typeof record.name === "string" ? record.name : "Error",
+        message: typeof record.message === "string" ? record.message : (() => {
+          try {
+            return JSON.stringify(error) ?? String(error);
+          } catch {
+            return String(error);
+          }
+        })(),
+        ...typeof record.stack === "string" ? { stack: record.stack } : {}
+      };
+    }
+    return { name: "Error", message: String(error) };
+  };
+  const invoke = (manager2) => {
+    try {
+      return Promise.resolve(manager2.property(name, { path, args })).then(
+        (result) => result === void 0 ? { ok: true, hasResult: false } : { ok: true, hasResult: true, result },
+        (error) => ({ ok: false, error: serialize(error) })
+      );
+    } catch (error) {
+      return Promise.resolve({ ok: false, error: serialize(error) });
+    }
+  };
+  const manager = globalThis[key];
+  if (manager) {
+    return invoke(manager);
+  }
+  if (!retryManager) {
+    return Promise.resolve({ ok: false, error: serialize(new Error("Relay manager not found.")) });
+  }
+  return new Promise((resolve) => {
+    const maxAttempts = 10;
+    const delay = 300;
+    let attempts = 1;
+    const findManager = () => {
+      const delayedManager = globalThis[key];
+      if (delayedManager) {
+        resolve(invoke(delayedManager));
+        return;
+      }
+      attempts++;
+      if (attempts >= maxAttempts) {
+        resolve({
+          ok: false,
+          error: serialize(new Error(`Relay manager not found after ${maxAttempts} attempts.`))
+        });
+        return;
+      }
+      setTimeout(findManager, delay);
+    };
+    setTimeout(findManager, delay);
+  });
+};
+export {
+  invokeRelay
+};
+//# sourceMappingURL=invoke-relay.js.map

package/dist/relay/adapters/invoke-relay.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/relay/adapters/invoke-relay.ts"],"sourcesContent":["import type {JsonValue} from \"@addon-core/inject-script\";\nimport type {MessageError} from \"@typing/message\";\nimport type {RelayInvocationResult} from \"./scripting-response\";\n\n// Serialized by scripting.executeScript: all runtime dependencies must stay inside this function.\nexport const invokeRelay = (\n    name: string,\n    path: string | null,\n    args: JsonValue[],\n    key: string,\n    retryManager: boolean\n): Promise<RelayInvocationResult> => {\n    const serialize = (error: unknown): MessageError => {\n        if (error instanceof Error) {\n            return {\n                name: error.name,\n                message: error.message,\n                ...(error.stack ? {stack: error.stack} : {}),\n            };\n        }\n\n        if (typeof error === \"object\" && error !== null) {\n            const record = error as Record<string, unknown>;\n\n            return {\n                name: typeof record.name === \"string\" ? record.name : \"Error\",\n                message:\n                    typeof record.message === \"string\"\n                        ? record.message\n                        : (() => {\n                              try {\n                                  return JSON.stringify(error) ?? String(error);\n                              } catch {\n                                  return String(error);\n                              }\n                          })(),\n                ...(typeof record.stack === \"string\" ? {stack: record.stack} : {}),\n            };\n        }\n\n        return {name: \"Error\", message: String(error)};\n    };\n\n    const invoke = (manager: any): Promise<RelayInvocationResult> => {\n        try {\n            return Promise.resolve(manager.property(name, {path, args})).then(\n                result =>\n                    result === undefined\n                        ? {ok: true as const, hasResult: false as const}\n                        : {ok: true as const, hasResult: true as const, result},\n                error => ({ok: false as const, error: serialize(error)})\n            );\n        } catch (error) {\n            return Promise.resolve({ok: false as const, error: serialize(error)});\n        }\n    };\n\n    const manager = globalThis[key];\n\n    if (manager) {\n        // Keep the normal Scripting path synchronous until the remote method starts.\n        return invoke(manager);\n    }\n\n    if (!retryManager) {\n        return Promise.resolve({ok: false, error: serialize(new Error(\"Relay manager not found.\"))});\n    }\n\n    return new Promise<RelayInvocationResult>(resolve => {\n        const maxAttempts = 10;\n        const delay = 300;\n        // The synchronous lookup above is the first attempt.\n        let attempts = 1;\n\n        const findManager = () => {\n            const delayedManager = globalThis[key];\n\n            if (delayedManager) {\n                resolve(invoke(delayedManager));\n\n                return;\n            }\n\n            attempts++;\n\n            if (attempts >= maxAttempts) {\n                resolve({\n                    ok: false,\n                    error: serialize(new Error(`Relay manager not found after ${maxAttempts} attempts.`)),\n                });\n\n                return;\n            }\n\n            setTimeout(findManager, delay);\n        };\n\n        setTimeout(findManager, delay);\n    });\n};\n"],"mappings":"AAKO,MAAM,cAAc,CACvB,MACA,MACA,MACA,KACA,iBACiC;AACjC,QAAM,YAAY,CAAC,UAAiC;AAChD,QAAI,iBAAiB,OAAO;AACxB,aAAO;AAAA,QACH,MAAM,MAAM;AAAA,QACZ,SAAS,MAAM;AAAA,QACf,GAAI,MAAM,QAAQ,EAAC,OAAO,MAAM,MAAK,IAAI,CAAC;AAAA,MAC9C;AAAA,IACJ;AAEA,QAAI,OAAO,UAAU,YAAY,UAAU,MAAM;AAC7C,YAAM,SAAS;AAEf,aAAO;AAAA,QACH,MAAM,OAAO,OAAO,SAAS,WAAW,OAAO,OAAO;AAAA,QACtD,SACI,OAAO,OAAO,YAAY,WACpB,OAAO,WACN,MAAM;AACH,cAAI;AACA,mBAAO,KAAK,UAAU,KAAK,KAAK,OAAO,KAAK;AAAA,UAChD,QAAQ;AACJ,mBAAO,OAAO,KAAK;AAAA,UACvB;AAAA,QACJ,GAAG;AAAA,QACb,GAAI,OAAO,OAAO,UAAU,WAAW,EAAC,OAAO,OAAO,MAAK,IAAI,CAAC;AAAA,MACpE;AAAA,IACJ;AAEA,WAAO,EAAC,MAAM,SAAS,SAAS,OAAO,KAAK,EAAC;AAAA,EACjD;AAEA,QAAM,SAAS,CAACA,aAAiD;AAC7D,QAAI;AACA,aAAO,QAAQ,QAAQA,SAAQ,SAAS,MAAM,EAAC,MAAM,KAAI,CAAC,CAAC,EAAE;AAAA,QACzD,YACI,WAAW,SACL,EAAC,IAAI,MAAe,WAAW,MAAc,IAC7C,EAAC,IAAI,MAAe,WAAW,MAAe,OAAM;AAAA,QAC9D,YAAU,EAAC,IAAI,OAAgB,OAAO,UAAU,KAAK,EAAC;AAAA,MAC1D;AAAA,IACJ,SAAS,OAAO;AACZ,aAAO,QAAQ,QAAQ,EAAC,IAAI,OAAgB,OAAO,UAAU,KAAK,EAAC,CAAC;AAAA,IACxE;AAAA,EACJ;AAEA,QAAM,UAAU,WAAW,GAAG;AAE9B,MAAI,SAAS;AAET,WAAO,OAAO,OAAO;AAAA,EACzB;AAEA,MAAI,CAAC,cAAc;AACf,WAAO,QAAQ,QAAQ,EAAC,IAAI,OAAO,OAAO,UAAU,IAAI,MAAM,0BAA0B,CAAC,EAAC,CAAC;AAAA,EAC/F;AAEA,SAAO,IAAI,QAA+B,aAAW;AACjD,UAAM,cAAc;AACpB,UAAM,QAAQ;AAEd,QAAI,WAAW;AAEf,UAAM,cAAc,MAAM;AACtB,YAAM,iBAAiB,WAAW,GAAG;AAErC,UAAI,gBAAgB;AAChB,gBAAQ,OAAO,cAAc,CAAC;AAE9B;AAAA,MACJ;AAEA;AAEA,UAAI,YAAY,aAAa;AACzB,gBAAQ;AAAA,UACJ,IAAI;AAAA,UACJ,OAAO,UAAU,IAAI,MAAM,iCAAiC,WAAW,YAAY,CAAC;AAAA,QACxF,CAAC;AAED;AAAA,MACJ;AAEA,iBAAW,aAAa,KAAK;AAAA,IACjC;AAEA,eAAW,aAAa,KAAK;AAAA,EACjC,CAAC;AACL;","names":["manager"]}

package/dist/relay/adapters/scripting-response.d.ts

@@ -0,0 +1,12 @@
+import type { MessageError } from "../../types/message.js";
+export type RelayInvocationResult = {
+    ok: true;
+    hasResult: false;
+} | {
+    ok: true;
+    hasResult: true;
+    result: any;
+} | {
+    ok: false;
+    error: MessageError;
+};

package/dist/relay/adapters/scripting-response.js

@@ -0,0 +1 @@
+//# sourceMappingURL=scripting-response.js.map

package/dist/relay/adapters/scripting-response.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/dist/relay/result.d.ts

@@ -4,6 +4,9 @@ export declare class RelayFrameTimeoutError extends Error {
     readonly timeoutMs: number;
     constructor(timeoutMs: number);
 }
+export declare class RelayProtocolError extends Error {
+    constructor(relayName: string);
+}
 export declare const fulfilledRelayFrame: <T>(target: RelayResultTarget, result: T) => RelayFrameResult<T>;
 export declare const rejectedRelayFrame: <T>(target: RelayResultTarget, error: unknown, kind: RelayFrameErrorKind) => RelayFrameResult<T>;
 export declare const messageErrorKind: (error: unknown) => RelayFrameErrorKind;

package/dist/relay/result.js

@@ -11,6 +11,12 @@ class RelayFrameTimeoutError extends Error {
   }
   timeoutMs;
 }
+class RelayProtocolError extends Error {
+  constructor(relayName) {
+    super(`Relay "${relayName}" returned an invalid scripting response envelope.`);
+    this.name = "RelayProtocolError";
+  }
+}
 const fulfilledRelayFrame = (target, result) => ({
   target,
   status: "fulfilled",
@@ -78,6 +84,7 @@ const sortRelayFrameResults = (results) => {
 };
 export {
   RelayFrameTimeoutError,
+  RelayProtocolError,
   fulfilledRelayFrame,
   injectScriptErrorKind,
   messageErrorKind,

package/dist/relay/result.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/relay/result.ts"],"sourcesContent":["import {serializeError} from \"@message/error\";\n\nimport {InjectScriptTargetErrorKind} from \"@addon-core/inject-script\";\n\nimport {\n    RelayFrameErrorKind,\n    type RelayFrameResult,\n    type RelayFramesResult,\n    type RelayResultTarget,\n} from \"@typing/relay\";\n\nexport class RelayFrameTimeoutError extends Error {\n    public constructor(public readonly timeoutMs: number) {\n        super(`Relay frame did not respond within ${timeoutMs}ms.`);\n        this.name = \"RelayFrameTimeoutError\";\n    }\n}\n\nexport const fulfilledRelayFrame = <T>(target: RelayResultTarget, result: T): RelayFrameResult<T> => ({\n    target,\n    status: \"fulfilled\",\n    result,\n});\n\nexport const rejectedRelayFrame = <T>(\n    target: RelayResultTarget,\n    error: unknown,\n    kind: RelayFrameErrorKind\n): RelayFrameResult<T> => ({\n    target,\n    status: \"rejected\",\n    error: {\n        kind,\n        ...serializeError(error),\n    },\n});\n\nexport const messageErrorKind = (error: unknown): RelayFrameErrorKind => {\n    const message = error instanceof Error ? error.message : String(error);\n\n    if (\n        /receiving end does not exist|no matching message handler|frame.*(?:removed|not found)|no frame with id|invalid frame id/i.test(\n            message\n        )\n    ) {\n        return RelayFrameErrorKind.TargetGone;\n    }\n\n    return RelayFrameErrorKind.Delivery;\n};\n\nexport const injectScriptErrorKind = (kind: `${InjectScriptTargetErrorKind}`): RelayFrameErrorKind => {\n    switch (kind) {\n        case InjectScriptTargetErrorKind.Execution:\n            return RelayFrameErrorKind.Execution;\n        case InjectScriptTargetErrorKind.Delivery:\n            return RelayFrameErrorKind.Delivery;\n        case InjectScriptTargetErrorKind.Timeout:\n            return RelayFrameErrorKind.Timeout;\n        case InjectScriptTargetErrorKind.TargetGone:\n            return RelayFrameErrorKind.TargetGone;\n        case InjectScriptTargetErrorKind.Unobservable:\n            return RelayFrameErrorKind.Unobservable;\n        default:\n            throw new TypeError(`Unsupported Inject Script target error kind: ${kind}`);\n    }\n};\n\nexport const withRelayTimeout = <T>(promise: Promise<T>, timeoutMs?: number): Promise<T> => {\n    if (timeoutMs === undefined) {\n        return promise;\n    }\n\n    return new Promise<T>((resolve, reject) => {\n        const timeout = setTimeout(() => reject(new RelayFrameTimeoutError(timeoutMs)), timeoutMs);\n\n        promise.then(\n            result => {\n                clearTimeout(timeout);\n                resolve(result);\n            },\n            error => {\n                clearTimeout(timeout);\n                reject(error);\n            }\n        );\n    });\n};\n\nexport const sortRelayFrameResults = <T>(results: RelayFramesResult<T>): RelayFramesResult<T> => {\n    return [...results].sort((a, b) => {\n        const frameDifference =\n            (a.target.frameId ?? Number.MAX_SAFE_INTEGER) - (b.target.frameId ?? Number.MAX_SAFE_INTEGER);\n\n        if (frameDifference !== 0) {\n            return frameDifference;\n        }\n\n        return (a.target.documentId ?? \"\").localeCompare(b.target.documentId ?? \"\");\n    });\n};\n"],"mappings":"AAAA,SAAQ,sBAAqB;AAE7B,SAAQ,mCAAkC;AAE1C;AAAA,EACI;AAAA,OAIG;AAEA,MAAM,+BAA+B,MAAM;AAAA,EACvC,YAA4B,WAAmB;AAClD,UAAM,sCAAsC,SAAS,KAAK;AAD3B;AAE/B,SAAK,OAAO;AAAA,EAChB;AAAA,EAHmC;AAIvC;AAEO,MAAM,sBAAsB,CAAI,QAA2B,YAAoC;AAAA,EAClG;AAAA,EACA,QAAQ;AAAA,EACR;AACJ;AAEO,MAAM,qBAAqB,CAC9B,QACA,OACA,UACuB;AAAA,EACvB;AAAA,EACA,QAAQ;AAAA,EACR,OAAO;AAAA,IACH;AAAA,IACA,GAAG,eAAe,KAAK;AAAA,EAC3B;AACJ;AAEO,MAAM,mBAAmB,CAAC,UAAwC;AACrE,QAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;AAErE,MACI,2HAA2H;AAAA,IACvH;AAAA,EACJ,GACF;AACE,WAAO,oBAAoB;AAAA,EAC/B;AAEA,SAAO,oBAAoB;AAC/B;AAEO,MAAM,wBAAwB,CAAC,SAAgE;AAClG,UAAQ,MAAM;AAAA,IACV,KAAK,4BAA4B;AAC7B,aAAO,oBAAoB;AAAA,IAC/B,KAAK,4BAA4B;AAC7B,aAAO,oBAAoB;AAAA,IAC/B,KAAK,4BAA4B;AAC7B,aAAO,oBAAoB;AAAA,IAC/B,KAAK,4BAA4B;AAC7B,aAAO,oBAAoB;AAAA,IAC/B,KAAK,4BAA4B;AAC7B,aAAO,oBAAoB;AAAA,IAC/B;AACI,YAAM,IAAI,UAAU,gDAAgD,IAAI,EAAE;AAAA,EAClF;AACJ;AAEO,MAAM,mBAAmB,CAAI,SAAqB,cAAmC;AACxF,MAAI,cAAc,QAAW;AACzB,WAAO;AAAA,EACX;AAEA,SAAO,IAAI,QAAW,CAAC,SAAS,WAAW;AACvC,UAAM,UAAU,WAAW,MAAM,OAAO,IAAI,uBAAuB,SAAS,CAAC,GAAG,SAAS;AAEzF,YAAQ;AAAA,MACJ,YAAU;AACN,qBAAa,OAAO;AACpB,gBAAQ,MAAM;AAAA,MAClB;AAAA,MACA,WAAS;AACL,qBAAa,OAAO;AACpB,eAAO,KAAK;AAAA,MAChB;AAAA,IACJ;AAAA,EACJ,CAAC;AACL;AAEO,MAAM,wBAAwB,CAAI,YAAwD;AAC7F,SAAO,CAAC,GAAG,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM;AAC/B,UAAM,mBACD,EAAE,OAAO,WAAW,OAAO,qBAAqB,EAAE,OAAO,WAAW,OAAO;AAEhF,QAAI,oBAAoB,GAAG;AACvB,aAAO;AAAA,IACX;AAEA,YAAQ,EAAE,OAAO,cAAc,IAAI,cAAc,EAAE,OAAO,cAAc,EAAE;AAAA,EAC9E,CAAC;AACL;","names":[]}
+{"version":3,"sources":["../../src/relay/result.ts"],"sourcesContent":["import {serializeError} from \"@message/error\";\n\nimport {InjectScriptTargetErrorKind} from \"@addon-core/inject-script\";\n\nimport {\n    RelayFrameErrorKind,\n    type RelayFrameResult,\n    type RelayFramesResult,\n    type RelayResultTarget,\n} from \"@typing/relay\";\n\nexport class RelayFrameTimeoutError extends Error {\n    public constructor(public readonly timeoutMs: number) {\n        super(`Relay frame did not respond within ${timeoutMs}ms.`);\n        this.name = \"RelayFrameTimeoutError\";\n    }\n}\n\nexport class RelayProtocolError extends Error {\n    public constructor(relayName: string) {\n        super(`Relay \"${relayName}\" returned an invalid scripting response envelope.`);\n        this.name = \"RelayProtocolError\";\n    }\n}\n\nexport const fulfilledRelayFrame = <T>(target: RelayResultTarget, result: T): RelayFrameResult<T> => ({\n    target,\n    status: \"fulfilled\",\n    result,\n});\n\nexport const rejectedRelayFrame = <T>(\n    target: RelayResultTarget,\n    error: unknown,\n    kind: RelayFrameErrorKind\n): RelayFrameResult<T> => ({\n    target,\n    status: \"rejected\",\n    error: {\n        kind,\n        ...serializeError(error),\n    },\n});\n\nexport const messageErrorKind = (error: unknown): RelayFrameErrorKind => {\n    const message = error instanceof Error ? error.message : String(error);\n\n    if (\n        /receiving end does not exist|no matching message handler|frame.*(?:removed|not found)|no frame with id|invalid frame id/i.test(\n            message\n        )\n    ) {\n        return RelayFrameErrorKind.TargetGone;\n    }\n\n    return RelayFrameErrorKind.Delivery;\n};\n\nexport const injectScriptErrorKind = (kind: `${InjectScriptTargetErrorKind}`): RelayFrameErrorKind => {\n    switch (kind) {\n        case InjectScriptTargetErrorKind.Execution:\n            return RelayFrameErrorKind.Execution;\n        case InjectScriptTargetErrorKind.Delivery:\n            return RelayFrameErrorKind.Delivery;\n        case InjectScriptTargetErrorKind.Timeout:\n            return RelayFrameErrorKind.Timeout;\n        case InjectScriptTargetErrorKind.TargetGone:\n            return RelayFrameErrorKind.TargetGone;\n        case InjectScriptTargetErrorKind.Unobservable:\n            return RelayFrameErrorKind.Unobservable;\n        default:\n            throw new TypeError(`Unsupported Inject Script target error kind: ${kind}`);\n    }\n};\n\nexport const withRelayTimeout = <T>(promise: Promise<T>, timeoutMs?: number): Promise<T> => {\n    if (timeoutMs === undefined) {\n        return promise;\n    }\n\n    return new Promise<T>((resolve, reject) => {\n        const timeout = setTimeout(() => reject(new RelayFrameTimeoutError(timeoutMs)), timeoutMs);\n\n        promise.then(\n            result => {\n                clearTimeout(timeout);\n                resolve(result);\n            },\n            error => {\n                clearTimeout(timeout);\n                reject(error);\n            }\n        );\n    });\n};\n\nexport const sortRelayFrameResults = <T>(results: RelayFramesResult<T>): RelayFramesResult<T> => {\n    return [...results].sort((a, b) => {\n        const frameDifference =\n            (a.target.frameId ?? Number.MAX_SAFE_INTEGER) - (b.target.frameId ?? Number.MAX_SAFE_INTEGER);\n\n        if (frameDifference !== 0) {\n            return frameDifference;\n        }\n\n        return (a.target.documentId ?? \"\").localeCompare(b.target.documentId ?? \"\");\n    });\n};\n"],"mappings":"AAAA,SAAQ,sBAAqB;AAE7B,SAAQ,mCAAkC;AAE1C;AAAA,EACI;AAAA,OAIG;AAEA,MAAM,+BAA+B,MAAM;AAAA,EACvC,YAA4B,WAAmB;AAClD,UAAM,sCAAsC,SAAS,KAAK;AAD3B;AAE/B,SAAK,OAAO;AAAA,EAChB;AAAA,EAHmC;AAIvC;AAEO,MAAM,2BAA2B,MAAM;AAAA,EACnC,YAAY,WAAmB;AAClC,UAAM,UAAU,SAAS,oDAAoD;AAC7E,SAAK,OAAO;AAAA,EAChB;AACJ;AAEO,MAAM,sBAAsB,CAAI,QAA2B,YAAoC;AAAA,EAClG;AAAA,EACA,QAAQ;AAAA,EACR;AACJ;AAEO,MAAM,qBAAqB,CAC9B,QACA,OACA,UACuB;AAAA,EACvB;AAAA,EACA,QAAQ;AAAA,EACR,OAAO;AAAA,IACH;AAAA,IACA,GAAG,eAAe,KAAK;AAAA,EAC3B;AACJ;AAEO,MAAM,mBAAmB,CAAC,UAAwC;AACrE,QAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;AAErE,MACI,2HAA2H;AAAA,IACvH;AAAA,EACJ,GACF;AACE,WAAO,oBAAoB;AAAA,EAC/B;AAEA,SAAO,oBAAoB;AAC/B;AAEO,MAAM,wBAAwB,CAAC,SAAgE;AAClG,UAAQ,MAAM;AAAA,IACV,KAAK,4BAA4B;AAC7B,aAAO,oBAAoB;AAAA,IAC/B,KAAK,4BAA4B;AAC7B,aAAO,oBAAoB;AAAA,IAC/B,KAAK,4BAA4B;AAC7B,aAAO,oBAAoB;AAAA,IAC/B,KAAK,4BAA4B;AAC7B,aAAO,oBAAoB;AAAA,IAC/B,KAAK,4BAA4B;AAC7B,aAAO,oBAAoB;AAAA,IAC/B;AACI,YAAM,IAAI,UAAU,gDAAgD,IAAI,EAAE;AAAA,EAClF;AACJ;AAEO,MAAM,mBAAmB,CAAI,SAAqB,cAAmC;AACxF,MAAI,cAAc,QAAW;AACzB,WAAO;AAAA,EACX;AAEA,SAAO,IAAI,QAAW,CAAC,SAAS,WAAW;AACvC,UAAM,UAAU,WAAW,MAAM,OAAO,IAAI,uBAAuB,SAAS,CAAC,GAAG,SAAS;AAEzF,YAAQ;AAAA,MACJ,YAAU;AACN,qBAAa,OAAO;AACpB,gBAAQ,MAAM;AAAA,MAClB;AAAA,MACA,WAAS;AACL,qBAAa,OAAO;AACpB,eAAO,KAAK;AAAA,MAChB;AAAA,IACJ;AAAA,EACJ,CAAC;AACL;AAEO,MAAM,wBAAwB,CAAI,YAAwD;AAC7F,SAAO,CAAC,GAAG,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM;AAC/B,UAAM,mBACD,EAAE,OAAO,WAAW,OAAO,qBAAqB,EAAE,OAAO,WAAW,OAAO;AAEhF,QAAI,oBAAoB,GAAG;AACvB,aAAO;AAAA,IACX;AAEA,YAAQ,EAAE,OAAO,cAAc,IAAI,cAAc,EAAE,OAAO,cAAc,EAAE;AAAA,EAC9E,CAAC;AACL;","names":[]}

package/dist/types/action.d.ts

@@ -0,0 +1,8 @@
+import type { IconName } from "./icon.js";
+/** Default appearance of the extension's toolbar button. */
+export interface ActionOptions {
+    /** Icon group name. Falls back to `config.icon` when omitted. */
+    icon?: IconName;
+    /** Tooltip text or locale key, such as `@action.title`. Defaults to the extension name. */
+    title?: string;
+}

package/dist/types/action.js

@@ -0,0 +1 @@
+//# sourceMappingURL=action.js.map

package/dist/types/action.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/dist/types/background.d.ts

@@ -1,14 +1,9 @@
 import { EntrypointBuilder, EntrypointOptions } from "./entrypoint.js";
 import { Awaiter } from "./helpers.js";
+import { PermissionsOptions } from "./permissions.js";
 export declare const BackgroundEntryName = "background";
-type ManifestPermissions = chrome.runtime.ManifestPermission;
-type ManifestOptionalPermissions = chrome.runtime.ManifestOptionalPermission;
-export interface BackgroundConfig {
+export interface BackgroundConfig extends PermissionsOptions {
     persistent?: boolean;
-    permissions?: ManifestPermissions[];
-    optionalPermissions?: ManifestOptionalPermissions[];
-    hostPermissions?: string[];
-    optionalHostPermissions?: string[];
 }
 export type BackgroundOptions = BackgroundConfig & EntrypointOptions;
 export type BackgroundEntrypointOptions = BackgroundOptions;
@@ -17,4 +12,3 @@ export interface BackgroundDefinition extends BackgroundEntrypointOptions {
     main?: BackgroundMainHandler;
 }
 export type BackgroundBuilder = EntrypointBuilder;
-export {};

package/dist/types/background.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/types/background.ts"],"sourcesContent":["import {EntrypointBuilder, EntrypointOptions} from \"@typing/entrypoint\";\nimport {Awaiter} from \"@typing/helpers\";\n\nexport const BackgroundEntryName = \"background\";\n\ntype ManifestPermissions = chrome.runtime.ManifestPermission;\n\ntype ManifestOptionalPermissions = chrome.runtime.ManifestOptionalPermission;\n\nexport interface BackgroundConfig {\n    persistent?: boolean;\n    permissions?: ManifestPermissions[];\n    optionalPermissions?: ManifestOptionalPermissions[];\n    hostPermissions?: string[];\n    optionalHostPermissions?: string[];\n}\n\nexport type BackgroundOptions = BackgroundConfig & EntrypointOptions;\n\nexport type BackgroundEntrypointOptions = BackgroundOptions;\n\nexport type BackgroundMainHandler = (options: BackgroundOptions) => Awaiter<void>;\n\nexport interface BackgroundDefinition extends BackgroundEntrypointOptions {\n    main?: BackgroundMainHandler;\n}\n\nexport type BackgroundBuilder = EntrypointBuilder;\n"],"mappings":"AAGO,MAAM,sBAAsB;","names":[]}
+{"version":3,"sources":["../../src/types/background.ts"],"sourcesContent":["import {EntrypointBuilder, EntrypointOptions} from \"@typing/entrypoint\";\nimport {Awaiter} from \"@typing/helpers\";\nimport {PermissionsOptions} from \"@typing/permissions\";\n\nexport const BackgroundEntryName = \"background\";\n\nexport interface BackgroundConfig extends PermissionsOptions {\n    persistent?: boolean;\n}\n\nexport type BackgroundOptions = BackgroundConfig & EntrypointOptions;\n\nexport type BackgroundEntrypointOptions = BackgroundOptions;\n\nexport type BackgroundMainHandler = (options: BackgroundOptions) => Awaiter<void>;\n\nexport interface BackgroundDefinition extends BackgroundEntrypointOptions {\n    main?: BackgroundMainHandler;\n}\n\nexport type BackgroundBuilder = EntrypointBuilder;\n"],"mappings":"AAIO,MAAM,sBAAsB;","names":[]}

package/dist/types/config.d.ts

@@ -7,6 +7,7 @@ import { Plugin } from "./plugin.js";
 import { Language } from "./locale.js";
 import { Awaiter } from "./helpers.js";
 import { EnvFilterOptions, EnvFilterVariant } from "./env.js";
+import { ActionOptions } from "./action.js";
 /**
  * Configuration options for building a browser extension. This interface defines
  * all the properties required to customize the build process, extension metadata,
@@ -136,6 +137,18 @@ export interface Config {
      * - "disable"
      */
     icon: string;
+    /**
+     * Default appearance of the toolbar button (`action` in MV3, `browser_action` in MV2).
+     * An explicit object, including `{}`, declares the button without requiring a popup or command.
+     * It does not register a click handler.
+     *
+     * The applied popup overrides each explicitly specified icon/title independently.
+     * Missing values fall back to these settings, then to `icon` and the extension name.
+     * When omitted, only an applied popup or execute-action command declares the button.
+     *
+     * @example {icon: "active", title: "@action.title"}
+     */
+    action?: ActionOptions;
     /**
      * Browser-specific settings (populate manifest.browser_specific_settings).
      *
@@ -405,7 +418,10 @@ export interface Config {
     concatContentScripts: boolean;
     /**
      * Flag indicating whether to merge styles from App and Shared directories.
-     * When `true`, styles from both directories will be combined.
+     * When `true`, importing a shared stylesheet also compiles the app stylesheet at the same
+     * relative path into the same CSS module, with shared rules before app rules. Relative `@use`
+     * and `@forward` requests and literal `url(...)` values in the merged sources resolve from the
+     * file that declares them.
      *
      * @default true
      */

package/dist/types/content/definition.d.ts

@@ -1,6 +1,6 @@
 import type { ContentScriptPrepareHandler } from "./prepare.js";
 import type { ContentScriptBoundaryHandler } from "./boundary.js";
-import type { ContentScriptAnchor, ContentScriptAnchorGetter, ContentScriptAppend, ContentScriptContainerCreator, ContentScriptContainerFactory, ContentScriptContainerOptions, ContentScriptContainerTag, ContentScriptFramePageOptions, ContentScriptFrameRenderOptions, ContentScriptFrameSourceOptions, ContentScriptIsolation, ContentScriptIsolationFrameOptions, ContentScriptIsolationOptions, ContentScriptIsolationShadowOptions, ContentScriptMainFunction, ContentScriptMarkerGetter, ContentScriptMarkerResolver, ContentScriptMarkerType, ContentScriptMountFunction, ContentScriptOptions, ContentScriptWatchStrategy } from "./common.js";
+import type { ContentScriptAnchor, ContentScriptAnchorGetter, ContentScriptBuilder, ContentScriptAppend, ContentScriptContainerCreator, ContentScriptContainerFactory, ContentScriptContainerOptions, ContentScriptContainerTag, ContentScriptFramePageOptions, ContentScriptFrameRenderOptions, ContentScriptFrameSourceOptions, ContentScriptIsolation, ContentScriptIsolationFrameOptions, ContentScriptIsolationOptions, ContentScriptIsolationShadowOptions, ContentScriptMainFunction, ContentScriptMarkerGetter, ContentScriptMarkerResolver, ContentScriptMarkerType, ContentScriptMountFunction, ContentScriptOptions, ContentScriptWatchStrategy } from "./common.js";
 import type { ContentScriptRenderHandler, ContentScriptRenderValue } from "./render.js";
 import type { ContentScriptTarget, ContentScriptTargetCreator } from "./target.js";
 export interface ContentScriptDefinitionBase<Data = unknown> extends Partial<ContentScriptOptions> {
@@ -50,6 +50,7 @@ export type ContentScriptRenderDefinition<Data = unknown, Isolation extends `${C
     isolation: unknown;
 });
 export type ContentScriptDefinition<Data = unknown, Isolation extends `${ContentScriptIsolation}` = `${ContentScriptIsolation}`> = ContentScriptDefinitionBase<Data> & ContentScriptRenderDefinition<Data, Isolation>;
+export type ContentScriptBuilderConstructor<Data = unknown, Isolation extends `${ContentScriptIsolation}` = `${ContentScriptIsolation}`> = new (definition: ContentScriptDefinition<Data, NoInfer<Isolation>>) => ContentScriptBuilder;
 export interface ContentScriptResolvedDefinition<Data = unknown> extends Omit<ContentScriptDefinitionBase<Data>, "anchor" | "marker" | "mount" | "container" | "watch"> {
     isolation: ContentScriptIsolationOptions;
     boundary?: ContentScriptBoundaryHandler<Data>;

package/dist/types/entrypoint.d.ts

@@ -15,7 +15,10 @@ export declare enum EntrypointType {
     Popup = "popup",
     Sidebar = "sidebar",
     Offscreen = "offscreen",
-    Sandbox = "sandbox"
+    Sandbox = "sandbox",
+    Newtab = "newtab",
+    Bookmarks = "bookmarks",
+    History = "history"
 }
 export interface EntrypointOptions {
     /**
@@ -116,6 +119,7 @@ export interface EntrypointNameGenerator {
     reserve(name: string): this;
     name(name: string): string;
     file(file: EntrypointFile): string;
+    derive(file: EntrypointFile): string;
     likely(name?: string): boolean;
     has(name: string): boolean;
     reset(): this;

package/dist/types/entrypoint.js

@@ -13,6 +13,9 @@ var EntrypointType = /* @__PURE__ */ ((EntrypointType2) => {
   EntrypointType2["Sidebar"] = "sidebar";
   EntrypointType2["Offscreen"] = "offscreen";
   EntrypointType2["Sandbox"] = "sandbox";
+  EntrypointType2["Newtab"] = "newtab";
+  EntrypointType2["Bookmarks"] = "bookmarks";
+  EntrypointType2["History"] = "history";
   return EntrypointType2;
 })(EntrypointType || {});
 export {