diff --git a/components/login-modal.html b/components/login-modal.html
index 1af9e8b1..69cafce8 100644
--- a/components/login-modal.html
+++ b/components/login-modal.html
@@ -240,10 +240,10 @@
class="space-y-4 rounded-xl border border-border bg-overlay-panel-soft px-5 py-4"
>
-
Connect remote signer
+
Pair a remote signer
- Paste the nostrconnect:// or bunker:// link
- from your signer to establish a Nostr Connect session.
+ Scan the QR code with your signer or share the connect link to start a
+ Nostr Connect session.
+
+
+
+
+ Generating connect code…
+
+
+
+
+ Connect URI
+
+
+
+
+ Copy link
+
+
+
+
+
+
+
+
+
+
+ Open signer challenge
+
+
-
- Connection string
-
-
-
- We will connect to the relays embedded in the link and request signing
- permissions on your behalf.
-
+
+ Paste a signer-provided bunker link instead
+
+
+
+ Signer link
+
+
+
+ Use this fallback when your signer cannot scan QR codes.
+
+
diff --git a/docs/nip46-remote-signers.md b/docs/nip46-remote-signers.md
index f7cbb079..5b486454 100644
--- a/docs/nip46-remote-signers.md
+++ b/docs/nip46-remote-signers.md
@@ -4,26 +4,37 @@ bitvid can delegate event signing to a remote NIP-46 compatible signer. This
flow lets operators keep long-lived keys on hardened devices while approving
publish/edit/delete actions from a separate browser session.
-## Connection strings
+## Connection workflow
-bitvid currently expects `bunker://` style URIs. They should embed the remote
-signer pubkey in the host segment and may include the following query
-parameters:
+### Client-initiated handshake (preferred)
-- `relay=` – one or more WSS relay URLs the signer watches for RPC requests.
- Repeat the parameter to advertise multiple relays.
-- `secret=` – optional shared secret that must echo back during the `connect`
- handshake.
-- `perms=` – optional permission string. When present bitvid forwards it during
- the initial `connect` RPC.
-- `name`, `url`, `image` – optional metadata shown in the login modal so users
- can distinguish between saved signers.
+When an operator chooses the remote signer option, bitvid now generates a fresh
+`nostrconnect://` URI and displays it alongside a QR code. The URI encodes:
-URIs without `relay=` parameters fall back to bitvid’s default relay bundle
-(`wss://relay.damus.io`, `wss://nos.lol`, `wss://relay.snort.social`,
-`wss://relay.primal.net`, `wss://relay.nostr.band`). Make sure your signer also
-publishes to at least one of these relays so both the browser and signer see the
-same NIP-46 frames.
+- A short-lived client key pair dedicated to the session.
+- The default WSS relay bundle (`wss://relay.damus.io`, `wss://nos.lol`,
+ `wss://relay.snort.social`, `wss://relay.primal.net`,
+ `wss://relay.nostr.band`).
+- A random `secret` value that must be echoed back by the signer to prevent
+ spoofed acknowledgements.
+- Optional metadata (`name`, `url`, `image`) so the signer can display the
+ client branding during pairing.
+- Optional `perms` requested by the client.
+
+Remote signers should scan the QR code or otherwise receive the
+`nostrconnect://` link, subscribe to the advertised relays, and respond with a
+`connect` acknowledgement signed by the remote signer key. The response must
+include the `secret` value that was present in the URI. bitvid listens for this
+acknowledgement before attempting the RPC `connect` call so operators see a
+clear “waiting for signer” status in the modal.
+
+### Fallback bunker links
+
+Some signers still distribute `bunker://` URIs that point to the remote signer
+pubkey. The modal keeps a “paste bunker link” toggle so operators can supply the
+URI manually when QR pairing isn’t available. These URIs can advertise the same
+`relay=`, `secret=`, `perms=`, `name`, `url`, and `image` parameters described
+above. If no relays are specified the default bundle listed earlier is used.
## Relay requirements
diff --git a/js/nostr.js b/js/nostr.js
index 1260052a..55d6491e 100644
--- a/js/nostr.js
+++ b/js/nostr.js
@@ -193,6 +193,8 @@ const NIP46_PUBLISH_TIMEOUT_MS = 8_000;
const NIP46_RESPONSE_TIMEOUT_MS = 15_000;
const NIP46_SIGN_EVENT_TIMEOUT_MS = 20_000;
const NIP46_MAX_RETRIES = 1;
+const NIP46_HANDSHAKE_TIMEOUT_MS = 60_000;
+const NIP46_AUTH_CHALLENGE_MAX_ATTEMPTS = 5;
function getNip46Storage() {
if (typeof localStorage !== "undefined" && localStorage) {
@@ -3412,6 +3414,61 @@ function parseNip46ConnectionString(uri) {
};
}
+function generateNip46Secret(length = 16) {
+ const size = Number.isFinite(length) && length > 0 ? Math.min(64, Math.max(8, Math.floor(length))) : 16;
+ try {
+ if (typeof crypto !== "undefined" && crypto?.getRandomValues) {
+ const bytes = new Uint8Array(size);
+ crypto.getRandomValues(bytes);
+ return Array.from(bytes, (byte) => byte.toString(16).padStart(2, "0")).join("");
+ }
+ } catch (error) {
+ // fall through to Math.random fallback
+ }
+
+ let secret = "";
+ for (let i = 0; i < size; i += 1) {
+ secret += Math.floor(Math.random() * 16).toString(16);
+ }
+ return secret;
+}
+
+function sanitizeNip46Metadata(metadata) {
+ if (!metadata || typeof metadata !== "object") {
+ return {};
+ }
+
+ const normalized = {};
+ for (const key of ["name", "url", "image"]) {
+ if (typeof metadata[key] === "string" && metadata[key].trim()) {
+ normalized[key] = metadata[key].trim();
+ }
+ }
+ return normalized;
+}
+
+async function decryptNip46PayloadWithKeys(privateKey, remotePubkey, ciphertext) {
+ const tools = (await ensureNostrTools()) || getCachedNostrTools();
+ if (!tools) {
+ throw new Error("NostrTools helpers are unavailable for NIP-46 payload decryption.");
+ }
+
+ let decrypt = null;
+ if (tools?.nip44?.v2?.decrypt) {
+ decrypt = (priv, pub, payload) => tools.nip44.v2.decrypt(priv, pub, payload);
+ } else if (tools?.nip44?.decrypt) {
+ decrypt = (priv, pub, payload) => tools.nip44.decrypt(priv, pub, payload);
+ } else if (tools?.nip04?.decrypt) {
+ decrypt = (priv, pub, payload) => tools.nip04.decrypt(priv, pub, payload);
+ }
+
+ if (!decrypt) {
+ throw new Error("Remote signer encryption helpers are unavailable.");
+ }
+
+ return decrypt(privateKey, remotePubkey, ciphertext);
+}
+
class Nip46RpcClient {
constructor({
nostrClient,
@@ -4616,6 +4673,46 @@ export class NostrClient {
return { privateKey, publicKey: publicKey.toLowerCase() };
}
+ async prepareRemoteSignerHandshake({ metadata, relays, secret, permissions } = {}) {
+ const keyPair = await this.createNip46KeyPair();
+ const sanitizedMetadata = sanitizeNip46Metadata(metadata);
+ const requestedPermissions =
+ typeof permissions === "string" && permissions.trim() ? permissions.trim() : "";
+
+ const resolvedRelays = resolveNip46Relays(relays, this.relays);
+ const handshakeSecret =
+ typeof secret === "string" && secret.trim() ? secret.trim() : generateNip46Secret();
+
+ const params = [];
+ for (const relay of resolvedRelays) {
+ params.push(`relay=${encodeURIComponent(relay)}`);
+ }
+ if (handshakeSecret) {
+ params.push(`secret=${encodeURIComponent(handshakeSecret)}`);
+ }
+ if (requestedPermissions) {
+ params.push(`perms=${encodeURIComponent(requestedPermissions)}`);
+ }
+ for (const [key, value] of Object.entries(sanitizedMetadata)) {
+ params.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
+ }
+
+ const query = params.length ? `?${params.join("&")}` : "";
+ const uri = `nostrconnect://${keyPair.publicKey}${query}`;
+
+ return {
+ type: "client",
+ connectionString: uri,
+ uri,
+ clientPrivateKey: keyPair.privateKey,
+ clientPublicKey: keyPair.publicKey,
+ relays: resolvedRelays,
+ secret: handshakeSecret,
+ permissions: requestedPermissions,
+ metadata: sanitizedMetadata,
+ };
+ }
+
installNip46Client(client, { userPubkey } = {}) {
if (this.nip46Client && this.nip46Client !== client) {
try {
@@ -4638,54 +4735,398 @@ export class NostrClient {
return signer;
}
- async connectRemoteSigner({ connectionString, remember = true } = {}) {
+ async waitForRemoteSignerHandshake({
+ clientPrivateKey,
+ clientPublicKey,
+ relays,
+ secret,
+ onAuthUrl,
+ onStatus,
+ timeoutMs,
+ } = {}) {
+ const normalizedClientPublicKey = normalizeNostrPubkey(clientPublicKey);
+ if (!normalizedClientPublicKey) {
+ throw new Error("A client public key is required to await the remote signer handshake.");
+ }
+
+ if (!clientPrivateKey || typeof clientPrivateKey !== "string" || !HEX64_REGEX.test(clientPrivateKey)) {
+ throw new Error("A client private key is required to await the remote signer handshake.");
+ }
+
+ const resolvedRelays = resolveNip46Relays(relays, this.relays);
+ if (!resolvedRelays.length) {
+ throw new Error("No relays available to complete the remote signer handshake.");
+ }
+
+ const pool = await this.ensurePool();
+ const filters = [
+ {
+ kinds: [NIP46_RPC_KIND],
+ "#p": [normalizedClientPublicKey],
+ },
+ ];
+
+ const waitTimeout = Number.isFinite(timeoutMs) && timeoutMs > 0 ? timeoutMs : NIP46_HANDSHAKE_TIMEOUT_MS;
+
+ return new Promise((resolve, reject) => {
+ let settled = false;
+ const cleanup = () => {
+ if (settled) {
+ return;
+ }
+ settled = true;
+ try {
+ subscription?.unsub?.();
+ } catch (error) {
+ // ignore subscription cleanup failures
+ }
+ if (timeoutId) {
+ clearTimeout(timeoutId);
+ }
+ };
+
+ const timeoutId = setTimeout(() => {
+ cleanup();
+ const error = new Error("Timed out waiting for the remote signer to acknowledge the connection.");
+ error.code = "nip46-handshake-timeout";
+ reject(error);
+ }, waitTimeout);
+
+ let subscription;
+ try {
+ subscription = pool.sub(resolvedRelays, filters);
+ } catch (error) {
+ cleanup();
+ reject(error);
+ return;
+ }
+
+ subscription.on("event", (event) => {
+ if (settled) {
+ return;
+ }
+
+ if (!event || event.kind !== NIP46_RPC_KIND) {
+ return;
+ }
+
+ const remotePubkey = normalizeNostrPubkey(event.pubkey);
+ if (!remotePubkey) {
+ return;
+ }
+
+ Promise.resolve()
+ .then(() => decryptNip46PayloadWithKeys(clientPrivateKey, remotePubkey, event.content))
+ .then((payload) => {
+ let parsed;
+ try {
+ parsed = JSON.parse(payload);
+ } catch (error) {
+ devLogger.warn("[nostr] Failed to parse remote signer handshake payload:", error);
+ return;
+ }
+
+ const resultValue = typeof parsed?.result === "string" ? parsed.result.trim() : "";
+ const errorValue = typeof parsed?.error === "string" ? parsed.error.trim() : "";
+
+ if (resultValue === "auth_url" && errorValue) {
+ if (typeof onAuthUrl === "function") {
+ try {
+ onAuthUrl(errorValue, {
+ phase: "handshake",
+ remotePubkey,
+ requestId: typeof parsed?.id === "string" ? parsed.id : "",
+ });
+ } catch (callbackError) {
+ devLogger.warn("[nostr] Handshake auth_url callback threw:", callbackError);
+ }
+ }
+ return;
+ }
+
+ if (secret) {
+ if (!resultValue || resultValue !== secret) {
+ return;
+ }
+ }
+
+ if (!secret && resultValue) {
+ const normalized = resultValue.toLowerCase();
+ if (!["ack", "ok", "success"].includes(normalized)) {
+ return;
+ }
+ }
+
+ cleanup();
+
+ if (typeof onStatus === "function") {
+ try {
+ onStatus({
+ phase: "handshake",
+ state: "acknowledged",
+ message: "Remote signer acknowledged the connect request.",
+ remotePubkey,
+ });
+ } catch (callbackError) {
+ devLogger.warn("[nostr] Handshake status callback threw:", callbackError);
+ }
+ }
+
+ resolve({
+ remotePubkey,
+ response: parsed,
+ });
+ })
+ .catch((error) => {
+ devLogger.warn("[nostr] Failed to decrypt remote signer handshake payload:", error);
+ });
+ });
+
+ subscription.on("eose", () => {
+ // no-op: handshake responses are push-based
+ });
+ });
+ }
+
+ async connectRemoteSigner({
+ connectionString,
+ remember = true,
+ clientPrivateKey: providedClientPrivateKey = "",
+ clientPublicKey: providedClientPublicKey = "",
+ relays: providedRelays = [],
+ secret: providedSecret = "",
+ permissions: providedPermissions = "",
+ metadata: providedMetadata = {},
+ onAuthUrl,
+ onStatus,
+ handshakeTimeoutMs,
+ } = {}) {
const parsed = parseNip46ConnectionString(connectionString);
- if (!parsed || parsed.type !== "remote" || !parsed.remotePubkey) {
+ if (!parsed) {
const error = new Error(
- "Unsupported NIP-46 URI. Paste the bunker:// link provided by your signer.",
+ "Unsupported NIP-46 URI. Provide a nostrconnect:// handshake or bunker:// pointer.",
);
error.code = "invalid-connection-string";
throw error;
}
- const keyPair = await this.createNip46KeyPair();
- const relays = resolveNip46Relays(parsed.relays, this.relays);
+ const baseMetadata = sanitizeNip46Metadata(parsed.metadata);
+ const overrideMetadata = sanitizeNip46Metadata(providedMetadata);
+ const metadata = { ...baseMetadata, ...overrideMetadata };
- this.emitRemoteSignerChange({
- state: "connecting",
- remotePubkey: parsed.remotePubkey,
- relays,
- metadata: parsed.metadata,
- });
+ const handleStatus = (status) => {
+ if (typeof onStatus !== "function") {
+ return;
+ }
+ try {
+ onStatus(status);
+ } catch (error) {
+ devLogger.warn("[nostr] Remote signer status callback threw:", error);
+ }
+ };
+
+ const handleAuthChallenge = async (url, context = {}) => {
+ if (typeof onAuthUrl !== "function" || !url) {
+ return;
+ }
+ try {
+ const result = onAuthUrl(url, context);
+ if (result && typeof result.then === "function") {
+ await result.catch((error) => {
+ devLogger.warn("[nostr] Auth challenge callback promise rejected:", error);
+ });
+ }
+ } catch (error) {
+ devLogger.warn("[nostr] Remote signer auth callback threw:", error);
+ }
+ };
+
+ const mergedRelaysSource = parsed.relays.length ? parsed.relays : providedRelays;
+ const relays = resolveNip46Relays(mergedRelaysSource, this.relays);
+
+ let secret = typeof providedSecret === "string" && providedSecret.trim() ? providedSecret.trim() : parsed.secret;
+ let permissions =
+ typeof providedPermissions === "string" && providedPermissions.trim()
+ ? providedPermissions.trim()
+ : parsed.permissions;
+
+ let clientPrivateKey = "";
+ let clientPublicKey = "";
+ let remotePubkey = normalizeNostrPubkey(parsed.remotePubkey);
+
+ if (parsed.type === "client") {
+ clientPrivateKey =
+ typeof providedClientPrivateKey === "string" && providedClientPrivateKey.trim()
+ ? providedClientPrivateKey.trim().toLowerCase()
+ : "";
+
+ if (!clientPrivateKey || !HEX64_REGEX.test(clientPrivateKey)) {
+ const error = new Error(
+ "Remote signer handshake requires the generated client private key.",
+ );
+ error.code = "missing-client-private-key";
+ throw error;
+ }
+
+ clientPublicKey = normalizeNostrPubkey(providedClientPublicKey) || parsed.clientPubkey;
+ if (!clientPublicKey) {
+ const tools = (await ensureNostrTools()) || getCachedNostrTools();
+ if (!tools || typeof tools.getPublicKey !== "function") {
+ throw new Error("Public key derivation is unavailable for the remote signer handshake.");
+ }
+ clientPublicKey = normalizeNostrPubkey(tools.getPublicKey(clientPrivateKey));
+ }
+
+ if (!clientPublicKey || !HEX64_REGEX.test(clientPublicKey)) {
+ const error = new Error("Invalid client public key for the remote signer handshake.");
+ error.code = "invalid-client-public-key";
+ throw error;
+ }
+
+ if (parsed.clientPubkey && normalizeNostrPubkey(parsed.clientPubkey) !== clientPublicKey) {
+ const error = new Error("Handshake public key mismatch detected.");
+ error.code = "client-public-key-mismatch";
+ throw error;
+ }
+
+ if (!secret) {
+ secret = generateNip46Secret();
+ }
+
+ handleStatus({
+ phase: "handshake",
+ state: "waiting",
+ message: "Waiting for the signer to acknowledge the connection…",
+ relays,
+ });
+
+ this.emitRemoteSignerChange({
+ state: "connecting",
+ relays,
+ metadata,
+ message: "Waiting for the signer to acknowledge the connection.",
+ });
+
+ let handshakeResult;
+ try {
+ handshakeResult = await this.waitForRemoteSignerHandshake({
+ clientPrivateKey,
+ clientPublicKey,
+ relays,
+ secret,
+ onAuthUrl: (url, context) => handleAuthChallenge(url, context),
+ onStatus: handleStatus,
+ timeoutMs: handshakeTimeoutMs,
+ });
+ } catch (error) {
+ this.emitRemoteSignerChange({
+ state: "error",
+ relays,
+ metadata,
+ message: error?.message || "Remote signer handshake failed.",
+ error,
+ });
+ throw error;
+ }
+
+ remotePubkey = normalizeNostrPubkey(handshakeResult?.remotePubkey);
+ if (!remotePubkey) {
+ const error = new Error("Remote signer did not return a valid public key.");
+ error.code = "missing-remote-pubkey";
+ throw error;
+ }
+ } else {
+ const keyPair = await this.createNip46KeyPair(
+ providedClientPrivateKey,
+ providedClientPublicKey,
+ );
+ clientPrivateKey = keyPair.privateKey;
+ clientPublicKey = keyPair.publicKey;
+
+ this.emitRemoteSignerChange({
+ state: "connecting",
+ remotePubkey,
+ relays,
+ metadata,
+ });
+ }
+
+ if (!remotePubkey) {
+ remotePubkey = normalizeNostrPubkey(parsed.remotePubkey);
+ }
+
+ if (!remotePubkey) {
+ const error = new Error("Remote signer pubkey is required to establish the session.");
+ error.code = "missing-remote-pubkey";
+ throw error;
+ }
const client = new Nip46RpcClient({
nostrClient: this,
- clientPrivateKey: keyPair.privateKey,
- clientPublicKey: keyPair.publicKey,
- remotePubkey: parsed.remotePubkey,
+ clientPrivateKey,
+ clientPublicKey,
+ remotePubkey,
relays,
- secret: parsed.secret,
- permissions: parsed.permissions,
- metadata: parsed.metadata,
+ secret,
+ permissions,
+ metadata,
});
try {
await client.ensureSubscription();
- await client.connect({ permissions: parsed.permissions });
+
+ handleStatus({
+ phase: "connect",
+ state: "request",
+ message: "Requesting approval from the remote signer…",
+ remotePubkey,
+ });
+
+ let attempts = 0;
+ // Attempt the connect RPC, handling auth challenges when provided.
+ for (;;) {
+ try {
+ await client.connect({ permissions });
+ break;
+ } catch (error) {
+ if (error?.code === "auth-challenge" && error.authUrl) {
+ attempts += 1;
+ handleStatus({
+ phase: "auth",
+ state: "waiting",
+ message: "Complete the authentication challenge in your signer…",
+ remotePubkey,
+ attempt: attempts,
+ });
+ await handleAuthChallenge(error.authUrl, {
+ phase: "connect",
+ remotePubkey,
+ attempt: attempts,
+ });
+
+ if (attempts >= NIP46_AUTH_CHALLENGE_MAX_ATTEMPTS) {
+ throw error;
+ }
+ continue;
+ }
+ throw error;
+ }
+ }
+
const userPubkey = await client.getUserPubkey();
- client.metadata = parsed.metadata;
+ client.metadata = metadata;
const signer = this.installNip46Client(client, { userPubkey });
if (remember) {
writeStoredNip46Session({
version: 1,
- clientPrivateKey: keyPair.privateKey,
- clientPublicKey: keyPair.publicKey,
- remotePubkey: parsed.remotePubkey,
+ clientPrivateKey,
+ clientPublicKey,
+ remotePubkey,
relays,
- secret: parsed.secret,
- permissions: parsed.permissions,
- metadata: parsed.metadata,
+ secret,
+ permissions,
+ metadata,
userPubkey,
lastConnectedAt: Date.now(),
});
@@ -4695,10 +5136,18 @@ export class NostrClient {
this.emitRemoteSignerChange({
state: "connected",
- remotePubkey: parsed.remotePubkey,
+ remotePubkey,
userPubkey,
relays,
- metadata: parsed.metadata,
+ metadata,
+ });
+
+ handleStatus({
+ phase: "connected",
+ state: "ready",
+ message: "Remote signer connected successfully.",
+ remotePubkey,
+ userPubkey,
});
return { pubkey: userPubkey, signer };
@@ -4710,9 +5159,9 @@ export class NostrClient {
}
this.emitRemoteSignerChange({
state: "error",
- remotePubkey: parsed.remotePubkey,
+ remotePubkey,
relays,
- metadata: parsed.metadata,
+ metadata,
message: error?.message || "Remote signer connection failed.",
error,
});
diff --git a/js/services/authProviders/nip46.js b/js/services/authProviders/nip46.js
index 7991f6f1..badaa808 100644
--- a/js/services/authProviders/nip46.js
+++ b/js/services/authProviders/nip46.js
@@ -1,3 +1,5 @@
+import { devLogger } from "../../utils/logger.js";
+
const PROVIDER_ID = "nip46";
const PROVIDER_LABEL = "remote signer (nip-46)";
const PROVIDER_DESCRIPTION =
@@ -49,6 +51,15 @@ function normalizeOptions(options) {
connectionString: "",
remember: true,
reuseStored: false,
+ mode: "handshake",
+ onHandshakePrepared: null,
+ onStatus: null,
+ onAuthUrl: null,
+ metadata: {},
+ secret: "",
+ permissions: "",
+ relays: [],
+ handshakeTimeoutMs: undefined,
};
}
@@ -57,6 +68,22 @@ function normalizeOptions(options) {
typeof options.connectionString === "string" ? options.connectionString.trim() : "",
remember: options.remember !== false,
reuseStored: options.reuseStored === true,
+ mode: options.mode === "manual" ? "manual" : "handshake",
+ onHandshakePrepared:
+ typeof options.onHandshakePrepared === "function" ? options.onHandshakePrepared : null,
+ onStatus: typeof options.onStatus === "function" ? options.onStatus : null,
+ onAuthUrl: typeof options.onAuthUrl === "function" ? options.onAuthUrl : null,
+ metadata: options.metadata && typeof options.metadata === "object" ? options.metadata : {},
+ secret:
+ typeof options.secret === "string" && options.secret.trim() ? options.secret.trim() : "",
+ permissions:
+ typeof options.permissions === "string" && options.permissions.trim()
+ ? options.permissions.trim()
+ : "",
+ relays: Array.isArray(options.relays) ? options.relays : [],
+ handshakeTimeoutMs: Number.isFinite(options.handshakeTimeoutMs)
+ ? Number(options.handshakeTimeoutMs)
+ : undefined,
};
}
@@ -95,7 +122,7 @@ export default {
}
result = await nostrClient.useStoredRemoteSigner();
- } else {
+ } else if (normalized.mode === "manual") {
const uri = normalized.connectionString;
if (!uri) {
const error = new Error("A connection string is required to continue.");
@@ -106,7 +133,54 @@ export default {
result = await nostrClient.connectRemoteSigner({
connectionString: uri,
remember: normalized.remember,
+ onAuthUrl: normalized.onAuthUrl,
+ onStatus: normalized.onStatus,
});
+ } else {
+ if (normalized.onStatus) {
+ try {
+ normalized.onStatus({
+ phase: "handshake",
+ state: "preparing",
+ message: "Generating remote signer connect link…",
+ });
+ } catch (callbackError) {
+ devLogger.warn("[nip46] Handshake status callback threw:", callbackError);
+ }
+ }
+
+ const handshake = await nostrClient.prepareRemoteSignerHandshake({
+ metadata: normalized.metadata,
+ relays: normalized.relays,
+ secret: normalized.secret,
+ permissions: normalized.permissions,
+ });
+
+ if (normalized.onHandshakePrepared) {
+ try {
+ normalized.onHandshakePrepared(handshake);
+ } catch (callbackError) {
+ devLogger.warn("[nip46] Handshake prepared callback threw:", callbackError);
+ }
+ }
+
+ result = await nostrClient.connectRemoteSigner({
+ connectionString: handshake.connectionString,
+ remember: normalized.remember,
+ clientPrivateKey: handshake.clientPrivateKey,
+ clientPublicKey: handshake.clientPublicKey,
+ relays: handshake.relays,
+ secret: handshake.secret,
+ permissions: handshake.permissions,
+ metadata: handshake.metadata,
+ onAuthUrl: normalized.onAuthUrl,
+ onStatus: normalized.onStatus,
+ handshakeTimeoutMs: normalized.handshakeTimeoutMs,
+ });
+
+ if (result && typeof result === "object") {
+ result.handshake = handshake;
+ }
}
const pubkey = normalizePubkey(result);
diff --git a/js/ui/loginModalController.js b/js/ui/loginModalController.js
index 91c5b5d3..af8e8dac 100644
--- a/js/ui/loginModalController.js
+++ b/js/ui/loginModalController.js
@@ -1,4 +1,5 @@
import { devLogger, userLogger } from "../utils/logger.js";
+import { renderQrCode } from "../utils/qrcode.js";
const noop = () => {};
const SLOW_PROVIDER_DELAY_MS = 8_000;
@@ -261,6 +262,7 @@ export default class LoginModalController {
this.boundClickHandler = (event) => this.handleContainerClick(event);
this.activeNsecForm = null;
this.activeNip46Form = null;
+ this.pendingNip46Cleanup = null;
this.remoteSignerUnsubscribe = null;
this.lastRemoteSignerStatus = null;
this.nextRequestLoginOptions = null;
@@ -751,15 +753,26 @@ export default class LoginModalController {
return null;
}
- const connectInput = form.querySelector("[data-nip46-connect-uri]");
+ const handshakePanel = form.querySelector("[data-nip46-handshake-panel]");
+ const qrContainer = form.querySelector("[data-nip46-qr]");
+ const handshakeInput = form.querySelector("[data-nip46-handshake-uri]");
+ const copyButton = form.querySelector("[data-nip46-copy-uri]");
+ const secretNode = form.querySelector("[data-nip46-secret]");
+ const statusNode = form.querySelector("[data-nip46-status]");
+ const authContainer = form.querySelector("[data-nip46-auth]");
+ const authMessageNode = form.querySelector("[data-nip46-auth-message]");
+ const authOpenButton = form.querySelector("[data-nip46-auth-open]");
+ const manualToggle = form.querySelector("[data-nip46-toggle-manual]");
+ const manualFields = form.querySelector("[data-nip46-manual-fields]");
+ const manualInput = form.querySelector("[data-nip46-legacy-uri]");
const rememberCheckbox = form.querySelector("[data-nip46-remember]");
const reuseButton = form.querySelector("[data-nip46-reuse]");
const cancelButton = form.querySelector("[data-nip46-cancel]");
+ const submitButton = form.querySelector("[data-nip46-submit]");
const errorNode = form.querySelector("[data-nip46-error]");
const storedMetadata = this.getStoredNip46Metadata();
const hasStoredSession = storedMetadata?.hasSession === true;
-
if (reuseButton instanceof HTMLButtonElement) {
reuseButton.classList.toggle("hidden", !hasStoredSession);
}
@@ -781,6 +794,25 @@ export default class LoginModalController {
this.modalBody.appendChild(form);
this.activeNip46Form = form;
+ if (handshakeInput instanceof HTMLTextAreaElement) {
+ handshakeInput.readOnly = true;
+ handshakeInput.value = "";
+ handshakeInput.placeholder = "Waiting for connect link…";
+ }
+ if (copyButton instanceof HTMLButtonElement) {
+ copyButton.disabled = true;
+ }
+
+ const statusClassMap = {
+ info: ["border-info/40", "bg-info/10", "text-info"],
+ success: ["border-success/40", "bg-success/10", "text-success"],
+ warning: ["border-warning/50", "bg-warning/10", "text-warning"],
+ danger: ["border-danger/60", "bg-danger/10", "text-danger"],
+ };
+ const statusClassValues = new Set(
+ Object.values(statusClassMap).flat(),
+ );
+
const setError = (message) => {
if (!(errorNode instanceof HTMLElement)) {
return;
@@ -795,14 +827,190 @@ export default class LoginModalController {
}
};
- setError("");
- if (connectInput instanceof HTMLTextAreaElement) {
- connectInput.focus();
- }
+ const setStatus = (message, variant = "info") => {
+ if (!(statusNode instanceof HTMLElement)) {
+ return;
+ }
+ const normalized = typeof message === "string" ? message.trim() : "";
+ if (!normalized) {
+ statusNode.textContent = "";
+ statusNode.classList.add("hidden");
+ for (const cls of statusClassValues) {
+ statusNode.classList.remove(cls);
+ }
+ return;
+ }
+ statusNode.textContent = normalized;
+ statusNode.classList.remove("hidden");
+ for (const cls of statusClassValues) {
+ statusNode.classList.remove(cls);
+ }
+ const classes = statusClassMap[variant] || statusClassMap.info;
+ statusNode.classList.add(...classes);
+ };
+
+ const resetStatus = () => setStatus("", "info");
+
+ let qrInstance = null;
+ let manualMode = false;
+ let pendingAuthUrl = "";
+
+ const setAuthChallenge = (url) => {
+ pendingAuthUrl = typeof url === "string" ? url.trim() : "";
+ if (!(authContainer instanceof HTMLElement)) {
+ return;
+ }
+ if (!pendingAuthUrl) {
+ authContainer.classList.add("hidden");
+ if (authMessageNode instanceof HTMLElement) {
+ authMessageNode.textContent = "";
+ }
+ return;
+ }
+ authContainer.classList.remove("hidden");
+ if (authMessageNode instanceof HTMLElement) {
+ authMessageNode.textContent =
+ "The signer requested additional authentication.";
+ }
+ };
+
+ const clearAuthChallenge = () => {
+ setAuthChallenge("");
+ };
+
+ const setPendingState = (pending) => {
+ const disabled = pending === true;
+ if (submitButton instanceof HTMLButtonElement) {
+ submitButton.disabled = disabled;
+ }
+ if (rememberCheckbox instanceof HTMLInputElement) {
+ rememberCheckbox.disabled = disabled;
+ }
+ if (manualToggle instanceof HTMLButtonElement) {
+ manualToggle.disabled = disabled;
+ }
+ if (manualInput instanceof HTMLTextAreaElement) {
+ manualInput.disabled = disabled;
+ }
+ if (reuseButton instanceof HTMLButtonElement) {
+ reuseButton.disabled = disabled;
+ }
+ if (cancelButton instanceof HTMLButtonElement) {
+ cancelButton.disabled = disabled;
+ }
+ if (copyButton instanceof HTMLButtonElement) {
+ const hasUri =
+ handshakeInput instanceof HTMLTextAreaElement &&
+ !!handshakeInput.value;
+ copyButton.disabled = disabled || !hasUri;
+ }
+ };
+
+ const updateHandshakeDisplay = (detail) => {
+ const uri =
+ detail && typeof detail === "object"
+ ? detail.uri || detail.connectionString || ""
+ : "";
+ if (handshakeInput instanceof HTMLTextAreaElement) {
+ handshakeInput.value = uri;
+ }
+ if (copyButton instanceof HTMLButtonElement) {
+ copyButton.disabled = !uri;
+ }
+ if (secretNode instanceof HTMLElement) {
+ const secretValue =
+ detail && typeof detail.secret === "string" ? detail.secret.trim() : "";
+ if (secretValue) {
+ secretNode.textContent = `Secret: ${secretValue}`;
+ secretNode.classList.remove("hidden");
+ } else {
+ secretNode.textContent = "";
+ secretNode.classList.add("hidden");
+ }
+ }
+ if (qrContainer instanceof HTMLElement) {
+ qrContainer.innerHTML = "";
+ if (uri) {
+ qrInstance = renderQrCode(qrContainer, uri, { width: 224, height: 224 });
+ } else {
+ qrInstance = null;
+ }
+ }
+ resetStatus();
+ clearAuthChallenge();
+ setError("");
+ };
+
+ const handleStatus = (status) => {
+ if (!status || typeof status !== "object") {
+ resetStatus();
+ return;
+ }
+ const message =
+ typeof status.message === "string" ? status.message.trim() : "";
+ if (!message) {
+ resetStatus();
+ return;
+ }
+ let variant =
+ typeof status.variant === "string" && status.variant.trim()
+ ? status.variant.trim().toLowerCase()
+ : "";
+ if (!variant) {
+ if (status.phase === "auth") {
+ variant = "warning";
+ } else if (
+ status.phase === "connected" ||
+ status.state === "ready" ||
+ status.state === "acknowledged"
+ ) {
+ variant = "success";
+ } else {
+ variant = "info";
+ }
+ }
+ setStatus(message, variant);
+ };
+
+ const handleAuthUrl = (url) => {
+ const normalized = typeof url === "string" ? url.trim() : "";
+ if (!normalized) {
+ clearAuthChallenge();
+ return;
+ }
+ setAuthChallenge(normalized);
+ };
+
+ const applyManualMode = (enabled) => {
+ manualMode = enabled === true;
+ if (manualFields instanceof HTMLElement) {
+ manualFields.classList.toggle("hidden", !manualMode);
+ }
+ if (handshakePanel instanceof HTMLElement) {
+ handshakePanel.classList.toggle("hidden", manualMode);
+ }
+ if (manualToggle instanceof HTMLButtonElement) {
+ manualToggle.textContent = manualMode
+ ? "Back to QR pairing"
+ : "Paste a signer-provided bunker link instead";
+ }
+ if (manualMode && manualInput instanceof HTMLTextAreaElement) {
+ manualInput.focus();
+ }
+ if (!manualMode && manualInput instanceof HTMLTextAreaElement) {
+ manualInput.value = "";
+ }
+ resetStatus();
+ clearAuthChallenge();
+ setError("");
+ };
let submitHandler = null;
let cancelHandler = null;
let reuseHandler = null;
+ let copyHandler = null;
+ let manualToggleHandler = null;
+ let authOpenHandler = null;
const cleanup = () => {
if (submitHandler) {
@@ -814,6 +1022,15 @@ export default class LoginModalController {
if (reuseHandler && reuseButton instanceof HTMLButtonElement) {
reuseButton.removeEventListener("click", reuseHandler);
}
+ if (copyHandler && copyButton instanceof HTMLButtonElement) {
+ copyButton.removeEventListener("click", copyHandler);
+ }
+ if (manualToggleHandler && manualToggle instanceof HTMLButtonElement) {
+ manualToggle.removeEventListener("click", manualToggleHandler);
+ }
+ if (authOpenHandler && authOpenButton instanceof HTMLButtonElement) {
+ authOpenButton.removeEventListener("click", authOpenHandler);
+ }
if (form.parentElement) {
form.parentElement.removeChild(form);
@@ -827,38 +1044,97 @@ export default class LoginModalController {
}
}
this.activeNip46Form = null;
+ this.pendingNip46Cleanup = null;
+ qrInstance = null;
+ clearAuthChallenge();
+ resetStatus();
+ setError("");
};
+ resetStatus();
+ clearAuthChallenge();
+ applyManualMode(false);
+ setError("");
+
return new Promise((resolve) => {
let settled = false;
- const finish = (detail) => {
+
+ const finish = (detail, { keepMounted = false } = {}) => {
if (settled) {
return;
}
settled = true;
- cleanup();
+
+ if (keepMounted) {
+ this.pendingNip46Cleanup = () => {
+ cleanup();
+ };
+ } else {
+ cleanup();
+ }
+
resolve(detail);
};
submitHandler = (event) => {
event.preventDefault();
setError("");
-
- if (!(connectInput instanceof HTMLTextAreaElement)) {
- setError("Enter the remote signer connection link to continue.");
- return;
- }
-
- const raw = connectInput.value.trim();
- if (!raw) {
- setError("Paste the nostrconnect:// or bunker:// link from your signer.");
- connectInput.focus();
- return;
- }
+ resetStatus();
+ clearAuthChallenge();
const remember =
- rememberCheckbox instanceof HTMLInputElement ? rememberCheckbox.checked : true;
- finish({ connectionString: raw, remember: remember !== false });
+ rememberCheckbox instanceof HTMLInputElement
+ ? rememberCheckbox.checked
+ : true;
+
+ if (manualMode) {
+ if (!(manualInput instanceof HTMLTextAreaElement)) {
+ setError("Manual input is unavailable.");
+ return;
+ }
+ const raw = manualInput.value.trim();
+ if (!raw) {
+ setError("Paste the bunker:// link from your signer.");
+ manualInput.focus();
+ return;
+ }
+ setPendingState(true);
+ finish(
+ {
+ mode: "manual",
+ connectionString: raw,
+ remember: remember !== false,
+ onStatus: handleStatus,
+ onAuthUrl: handleAuthUrl,
+ },
+ { keepMounted: false },
+ );
+ return;
+ }
+
+ const metadata = {};
+ if (this.document && typeof this.document.title === "string") {
+ const title = this.document.title.trim();
+ if (title) {
+ metadata.name = title;
+ }
+ }
+ if (this.window?.location?.origin) {
+ metadata.url = this.window.location.origin;
+ }
+
+ setPendingState(true);
+ finish(
+ {
+ mode: "handshake",
+ remember: remember !== false,
+ metadata,
+ onHandshakePrepared: updateHandshakeDisplay,
+ onStatus: handleStatus,
+ onAuthUrl: handleAuthUrl,
+ },
+ { keepMounted: true },
+ );
};
form.addEventListener("submit", submitHandler);
@@ -866,7 +1142,7 @@ export default class LoginModalController {
if (cancelButton instanceof HTMLButtonElement) {
cancelHandler = (event) => {
event.preventDefault();
- finish(null);
+ finish(null, { keepMounted: false });
};
cancelButton.addEventListener("click", cancelHandler);
}
@@ -874,10 +1150,82 @@ export default class LoginModalController {
if (reuseButton instanceof HTMLButtonElement) {
reuseHandler = (event) => {
event.preventDefault();
- finish({ reuseStored: true });
+ finish({ reuseStored: true }, { keepMounted: false });
};
reuseButton.addEventListener("click", reuseHandler);
}
+
+ if (copyButton instanceof HTMLButtonElement) {
+ copyHandler = async (event) => {
+ event.preventDefault();
+ if (!(handshakeInput instanceof HTMLTextAreaElement)) {
+ return;
+ }
+ const value = handshakeInput.value.trim();
+ if (!value) {
+ return;
+ }
+ let copied = false;
+ if (
+ typeof navigator !== "undefined" &&
+ navigator?.clipboard?.writeText
+ ) {
+ try {
+ await navigator.clipboard.writeText(value);
+ copied = true;
+ } catch (error) {
+ copied = false;
+ }
+ }
+ if (!copied && handshakeInput.select) {
+ try {
+ handshakeInput.select();
+ if (this.document?.execCommand) {
+ copied = this.document.execCommand("copy");
+ }
+ } catch (error) {
+ copied = false;
+ } finally {
+ handshakeInput.setSelectionRange(
+ handshakeInput.value.length,
+ handshakeInput.value.length,
+ );
+ }
+ }
+ if (copied) {
+ setStatus("Connect URI copied to clipboard.", "success");
+ } else {
+ setStatus(
+ "Copy failed. Copy the link manually if needed.",
+ "warning",
+ );
+ }
+ };
+ copyButton.addEventListener("click", copyHandler);
+ }
+
+ if (manualToggle instanceof HTMLButtonElement) {
+ manualToggleHandler = (event) => {
+ event.preventDefault();
+ applyManualMode(!manualMode);
+ };
+ manualToggle.addEventListener("click", manualToggleHandler);
+ }
+
+ if (authOpenButton instanceof HTMLButtonElement) {
+ authOpenHandler = (event) => {
+ event.preventDefault();
+ if (!pendingAuthUrl) {
+ return;
+ }
+ if (this.window && typeof this.window.open === "function") {
+ this.window.open(pendingAuthUrl, "_blank", "noopener,noreferrer");
+ } else if (this.document && this.document.location) {
+ this.document.location.href = pendingAuthUrl;
+ }
+ };
+ authOpenButton.addEventListener("click", authOpenHandler);
+ }
});
}
@@ -1383,6 +1731,16 @@ export default class LoginModalController {
});
} finally {
this.setLoadingState(providerId, false);
+ if (this.pendingNip46Cleanup) {
+ try {
+ this.pendingNip46Cleanup();
+ } catch (cleanupError) {
+ devLogger.warn(
+ "[LoginModalController] Failed to dispose remote signer form:",
+ cleanupError,
+ );
+ }
+ }
}
}
diff --git a/js/utils/qrcode.js b/js/utils/qrcode.js
new file mode 100644
index 00000000..21d3ebc3
--- /dev/null
+++ b/js/utils/qrcode.js
@@ -0,0 +1,634 @@
+/**
+ * @fileoverview
+ * - Using the 'QRCode for Javascript library'
+ * - Fixed dataset of 'QRCode for Javascript library' for support full-spec.
+ * - this library has no dependencies.
+ *
+ * @author davidshimjs
+ * @see http://www.d-project.com/
+ * @see http://jeromeetienne.github.com/jquery-qrcode/
+ */
+var QRCode;
+
+(function () {
+ //---------------------------------------------------------------------
+ // QRCode for JavaScript
+ //
+ // Copyright (c) 2009 Kazuhiko Arase
+ //
+ // URL: http://www.d-project.com/
+ //
+ // Licensed under the MIT license:
+ // http://www.opensource.org/licenses/mit-license.php
+ //
+ // The word "QR Code" is registered trademark of
+ // DENSO WAVE INCORPORATED
+ // http://www.denso-wave.com/qrcode/faqpatent-e.html
+ //
+ //---------------------------------------------------------------------
+ function QR8bitByte(data) {
+ this.mode = QRMode.MODE_8BIT_BYTE;
+ this.data = data;
+ this.parsedData = [];
+
+ // Added to support UTF-8 Characters
+ for (var i = 0, l = this.data.length; i < l; i++) {
+ var byteArray = [];
+ var code = this.data.charCodeAt(i);
+
+ if (code > 0x10000) {
+ byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18);
+ byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12);
+ byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6);
+ byteArray[3] = 0x80 | (code & 0x3F);
+ } else if (code > 0x800) {
+ byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12);
+ byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6);
+ byteArray[2] = 0x80 | (code & 0x3F);
+ } else if (code > 0x80) {
+ byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6);
+ byteArray[1] = 0x80 | (code & 0x3F);
+ } else {
+ byteArray[0] = code;
+ }
+
+ this.parsedData.push(byteArray);
+ }
+
+ this.parsedData = Array.prototype.concat.apply([], this.parsedData);
+
+ if (this.parsedData.length != this.data.length) {
+ this.parsedData.unshift(191);
+ this.parsedData.unshift(187);
+ this.parsedData.unshift(239);
+ }
+ }
+
+ QR8bitByte.prototype = {
+ getLength: function (buffer) {
+ return this.parsedData.length;
+ },
+ write: function (buffer) {
+ for (var i = 0, l = this.parsedData.length; i < l; i++) {
+ buffer.put(this.parsedData[i], 8);
+ }
+ }
+ };
+
+ function QRCodeModel(typeNumber, errorCorrectLevel) {
+ this.typeNumber = typeNumber;
+ this.errorCorrectLevel = errorCorrectLevel;
+ this.modules = null;
+ this.moduleCount = 0;
+ this.dataCache = null;
+ this.dataList = [];
+ }
+
+ QRCodeModel.prototype={addData:function(data){var newData=new QR8bitByte(data);this.dataList.push(newData);this.dataCache=null;},isDark:function(row,col){if(row<0||this.moduleCount<=row||col<0||this.moduleCount<=col){throw new Error(row+","+col);}
+ return this.modules[row][col];},getModuleCount:function(){return this.moduleCount;},make:function(){this.makeImpl(false,this.getBestMaskPattern());},makeImpl:function(test,maskPattern){this.moduleCount=this.typeNumber*4+17;this.modules=new Array(this.moduleCount);for(var row=0;row=7){this.setupTypeNumber(test);}
+ if(this.dataCache==null){this.dataCache=QRCodeModel.createData(this.typeNumber,this.errorCorrectLevel,this.dataList);}
+ this.mapData(this.dataCache,maskPattern);},setupPositionProbePattern:function(row,col){for(var r=-1;r<=7;r++){if(row+r<=-1||this.moduleCount<=row+r)continue;for(var c=-1;c<=7;c++){if(col+c<=-1||this.moduleCount<=col+c)continue;if((0<=r&&r<=6&&(c==0||c==6))||(0<=c&&c<=6&&(r==0||r==6))||(2<=r&&r<=4&&2<=c&&c<=4)){this.modules[row+r][col+c]=true;}else{this.modules[row+r][col+c]=false;}}}},getBestMaskPattern:function(){var minLostPoint=0;var pattern=0;for(var i=0;i<8;i++){this.makeImpl(true,i);var lostPoint=QRUtil.getLostPoint(this);if(i==0||minLostPoint>lostPoint){minLostPoint=lostPoint;pattern=i;}}
+ return pattern;},createMovieClip:function(target_mc,instance_name,depth){var qr_mc=target_mc.createEmptyMovieClip(instance_name,depth);var cs=1;this.make();for(var row=0;row>i)&1)==1);this.modules[Math.floor(i/3)][i%3+this.moduleCount-8-3]=mod;}
+ for(var i=0;i<18;i++){var mod=(!test&&((bits>>i)&1)==1);this.modules[i%3+this.moduleCount-8-3][Math.floor(i/3)]=mod;}},setupTypeInfo:function(test,maskPattern){var data=(this.errorCorrectLevel<<3)|maskPattern;var bits=QRUtil.getBCHTypeInfo(data);for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<6){this.modules[i][8]=mod;}else if(i<8){this.modules[i+1][8]=mod;}else{this.modules[this.moduleCount-15+i][8]=mod;}}
+ for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<8){this.modules[8][this.moduleCount-i-1]=mod;}else if(i<9){this.modules[8][15-i-1+1]=mod;}else{this.modules[8][15-i-1]=mod;}}
+ this.modules[this.moduleCount-8][8]=(!test);},mapData:function(data,maskPattern){var inc=-1;var row=this.moduleCount-1;var bitIndex=7;var byteIndex=0;for(var col=this.moduleCount-1;col>0;col-=2){if(col==6)col--;while(true){for(var c=0;c<2;c++){if(this.modules[row][col-c]==null){var dark=false;if(byteIndex>>bitIndex)&1)==1);}
+ var mask=QRUtil.getMask(maskPattern,row,col-c);if(mask){dark=!dark;}
+ this.modules[row][col-c]=dark;bitIndex--;if(bitIndex==-1){byteIndex++;bitIndex=7;}}}
+ row+=inc;if(row<0||this.moduleCount<=row){row-=inc;inc=-inc;break;}}}}};QRCodeModel.PAD0=0xEC;QRCodeModel.PAD1=0x11;QRCodeModel.createData=function(typeNumber,errorCorrectLevel,dataList){var rsBlocks=QRRSBlock.getRSBlocks(typeNumber,errorCorrectLevel);var buffer=new QRBitBuffer();for(var i=0;itotalDataCount*8){throw new Error("code length overflow. ("
+ +buffer.getLengthInBits()
+ +">"
+ +totalDataCount*8
+ +")");}
+ if(buffer.getLengthInBits()+4<=totalDataCount*8){buffer.put(0,4);}
+ while(buffer.getLengthInBits()%8!=0){buffer.putBit(false);}
+ while(true){if(buffer.getLengthInBits()>=totalDataCount*8){break;}
+ buffer.put(QRCodeModel.PAD0,8);if(buffer.getLengthInBits()>=totalDataCount*8){break;}
+ buffer.put(QRCodeModel.PAD1,8);}
+ return QRCodeModel.createBytes(buffer,rsBlocks);};QRCodeModel.createBytes=function(buffer,rsBlocks){var offset=0;var maxDcCount=0;var maxEcCount=0;var dcdata=new Array(rsBlocks.length);var ecdata=new Array(rsBlocks.length);for(var r=0;r=0)?modPoly.get(modIndex):0;}}
+ var totalCodeCount=0;for(var i=0;i=0){d^=(QRUtil.G15<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G15)));}
+ return((data<<10)|d)^QRUtil.G15_MASK;},getBCHTypeNumber:function(data){var d=data<<12;while(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)>=0){d^=(QRUtil.G18<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)));}
+ return(data<<12)|d;},getBCHDigit:function(data){var digit=0;while(data!=0){digit++;data>>>=1;}
+ return digit;},getPatternPosition:function(typeNumber){return QRUtil.PATTERN_POSITION_TABLE[typeNumber-1];},getMask:function(maskPattern,i,j){switch(maskPattern){case QRMaskPattern.PATTERN000:return(i+j)%2==0;case QRMaskPattern.PATTERN001:return i%2==0;case QRMaskPattern.PATTERN010:return j%3==0;case QRMaskPattern.PATTERN011:return(i+j)%3==0;case QRMaskPattern.PATTERN100:return(Math.floor(i/2)+Math.floor(j/3))%2==0;case QRMaskPattern.PATTERN101:return(i*j)%2+(i*j)%3==0;case QRMaskPattern.PATTERN110:return((i*j)%2+(i*j)%3)%2==0;case QRMaskPattern.PATTERN111:return((i*j)%3+(i+j)%2)%2==0;default:throw new Error("bad maskPattern:"+maskPattern);}},getErrorCorrectPolynomial:function(errorCorrectLength){var a=new QRPolynomial([1],0);for(var i=0;i5){lostPoint+=(3+sameCount-5);}}}
+ for(var row=0;row=256){n-=255;}
+ return QRMath.EXP_TABLE[n];},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)};for(var i=0;i<8;i++){QRMath.EXP_TABLE[i]=1<>>(7-index%8))&1)==1;},put:function(num,length){for(var i=0;i>>(length-i-1))&1)==1);}},getLengthInBits:function(){return this.length;},putBit:function(bit){var bufIndex=Math.floor(this.length/8);if(this.buffer.length<=bufIndex){this.buffer.push(0);}
+ if(bit){this.buffer[bufIndex]|=(0x80>>>(this.length%8));}
+ this.length++;}};var QRCodeLimitLength=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]];
+
+ function _isSupportCanvas() {
+ return typeof CanvasRenderingContext2D != "undefined";
+ }
+
+ // android 2.x doesn't support Data-URI spec
+ function _getAndroid() {
+ var android = false;
+ var sAgent = navigator.userAgent;
+
+ if (/android/i.test(sAgent)) { // android
+ android = true;
+ var aMat = sAgent.toString().match(/android ([0-9]\.[0-9])/i);
+
+ if (aMat && aMat[1]) {
+ android = parseFloat(aMat[1]);
+ }
+ }
+
+ return android;
+ }
+
+ var svgDrawer = (function() {
+
+ var Drawing = function (el, htOption) {
+ this._el = el;
+ this._htOption = htOption;
+ };
+
+ Drawing.prototype.draw = function (oQRCode) {
+ var _htOption = this._htOption;
+ var _el = this._el;
+ var nCount = oQRCode.getModuleCount();
+ var nWidth = Math.floor(_htOption.width / nCount);
+ var nHeight = Math.floor(_htOption.height / nCount);
+
+ this.clear();
+
+ function makeSVG(tag, attrs) {
+ var el = document.createElementNS('http://www.w3.org/2000/svg', tag);
+ for (var k in attrs)
+ if (attrs.hasOwnProperty(k)) el.setAttribute(k, attrs[k]);
+ return el;
+ }
+
+ var svg = makeSVG("svg" , {'viewBox': '0 0 ' + String(nCount) + " " + String(nCount), 'width': '100%', 'height': '100%', 'fill': _htOption.colorLight});
+ svg.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:xlink", "http://www.w3.org/1999/xlink");
+ _el.appendChild(svg);
+
+ svg.appendChild(makeSVG("rect", {"fill": _htOption.colorLight, "width": "100%", "height": "100%"}));
+ svg.appendChild(makeSVG("rect", {"fill": _htOption.colorDark, "width": "1", "height": "1", "id": "template"}));
+
+ for (var row = 0; row < nCount; row++) {
+ for (var col = 0; col < nCount; col++) {
+ if (oQRCode.isDark(row, col)) {
+ var child = makeSVG("use", {"x": String(col), "y": String(row)});
+ child.setAttributeNS("http://www.w3.org/1999/xlink", "href", "#template")
+ svg.appendChild(child);
+ }
+ }
+ }
+ };
+ Drawing.prototype.clear = function () {
+ while (this._el.hasChildNodes())
+ this._el.removeChild(this._el.lastChild);
+ };
+ return Drawing;
+ })();
+
+ var useSVG = document.documentElement.tagName.toLowerCase() === "svg";
+
+ // Drawing in DOM by using Table tag
+ var Drawing = useSVG ? svgDrawer : !_isSupportCanvas() ? (function () {
+ var Drawing = function (el, htOption) {
+ this._el = el;
+ this._htOption = htOption;
+ };
+
+ /**
+ * Draw the QRCode
+ *
+ * @param {QRCode} oQRCode
+ */
+ Drawing.prototype.draw = function (oQRCode) {
+ var _htOption = this._htOption;
+ var _el = this._el;
+ var nCount = oQRCode.getModuleCount();
+ var nWidth = Math.floor(_htOption.width / nCount);
+ var nHeight = Math.floor(_htOption.height / nCount);
+ var aHTML = [''];
+
+ for (var row = 0; row < nCount; row++) {
+ aHTML.push('');
+
+ for (var col = 0; col < nCount; col++) {
+ aHTML.push(' ');
+ }
+
+ aHTML.push(' ');
+ }
+
+ aHTML.push('
');
+ _el.innerHTML = aHTML.join('');
+
+ // Fix the margin values as real size.
+ var elTable = _el.childNodes[0];
+ var nLeftMarginTable = (_htOption.width - elTable.offsetWidth) / 2;
+ var nTopMarginTable = (_htOption.height - elTable.offsetHeight) / 2;
+
+ if (nLeftMarginTable > 0 && nTopMarginTable > 0) {
+ elTable.style.margin = nTopMarginTable + "px " + nLeftMarginTable + "px";
+ }
+ };
+
+ /**
+ * Clear the QRCode
+ */
+ Drawing.prototype.clear = function () {
+ this._el.innerHTML = '';
+ };
+
+ return Drawing;
+ })() : (function () { // Drawing in Canvas
+ function _onMakeImage() {
+ this._elImage.src = this._elCanvas.toDataURL("image/png");
+ this._elImage.style.display = "block";
+ this._elCanvas.style.display = "none";
+ }
+
+ // Android 2.1 bug workaround
+ // http://code.google.com/p/android/issues/detail?id=5141
+ if (this._android && this._android <= 2.1) {
+ var factor = 1 / window.devicePixelRatio;
+ var drawImage = CanvasRenderingContext2D.prototype.drawImage;
+ CanvasRenderingContext2D.prototype.drawImage = function (image, sx, sy, sw, sh, dx, dy, dw, dh) {
+ if (("nodeName" in image) && /img/i.test(image.nodeName)) {
+ for (var i = arguments.length - 1; i >= 1; i--) {
+ arguments[i] = arguments[i] * factor;
+ }
+ } else if (typeof dw == "undefined") {
+ arguments[1] *= factor;
+ arguments[2] *= factor;
+ arguments[3] *= factor;
+ arguments[4] *= factor;
+ }
+
+ drawImage.apply(this, arguments);
+ };
+ }
+
+ /**
+ * Check whether the user's browser supports Data URI or not
+ *
+ * @private
+ * @param {Function} fSuccess Occurs if it supports Data URI
+ * @param {Function} fFail Occurs if it doesn't support Data URI
+ */
+ function _safeSetDataURI(fSuccess, fFail) {
+ var self = this;
+ self._fFail = fFail;
+ self._fSuccess = fSuccess;
+
+ // Check it just once
+ if (self._bSupportDataURI === null) {
+ var el = document.createElement("img");
+ var fOnError = function() {
+ self._bSupportDataURI = false;
+
+ if (self._fFail) {
+ self._fFail.call(self);
+ }
+ };
+ var fOnSuccess = function() {
+ self._bSupportDataURI = true;
+
+ if (self._fSuccess) {
+ self._fSuccess.call(self);
+ }
+ };
+
+ el.onabort = fOnError;
+ el.onerror = fOnError;
+ el.onload = fOnSuccess;
+ el.src = "data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=="; // the Image contains 1px data.
+ return;
+ } else if (self._bSupportDataURI === true && self._fSuccess) {
+ self._fSuccess.call(self);
+ } else if (self._bSupportDataURI === false && self._fFail) {
+ self._fFail.call(self);
+ }
+ };
+
+ /**
+ * Drawing QRCode by using canvas
+ *
+ * @constructor
+ * @param {HTMLElement} el
+ * @param {Object} htOption QRCode Options
+ */
+ var Drawing = function (el, htOption) {
+ this._bIsPainted = false;
+ this._android = _getAndroid();
+
+ this._htOption = htOption;
+ this._elCanvas = document.createElement("canvas");
+ this._elCanvas.width = htOption.width;
+ this._elCanvas.height = htOption.height;
+ el.appendChild(this._elCanvas);
+ this._el = el;
+ this._oContext = this._elCanvas.getContext("2d");
+ this._bIsPainted = false;
+ this._elImage = document.createElement("img");
+ this._elImage.alt = "Scan me!";
+ this._elImage.style.display = "none";
+ this._el.appendChild(this._elImage);
+ this._bSupportDataURI = null;
+ };
+
+ /**
+ * Draw the QRCode
+ *
+ * @param {QRCode} oQRCode
+ */
+ Drawing.prototype.draw = function (oQRCode) {
+ var _elImage = this._elImage;
+ var _oContext = this._oContext;
+ var _htOption = this._htOption;
+
+ var nCount = oQRCode.getModuleCount();
+ var nWidth = _htOption.width / nCount;
+ var nHeight = _htOption.height / nCount;
+ var nRoundedWidth = Math.round(nWidth);
+ var nRoundedHeight = Math.round(nHeight);
+
+ _elImage.style.display = "none";
+ this.clear();
+
+ for (var row = 0; row < nCount; row++) {
+ for (var col = 0; col < nCount; col++) {
+ var bIsDark = oQRCode.isDark(row, col);
+ var nLeft = col * nWidth;
+ var nTop = row * nHeight;
+ _oContext.strokeStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight;
+ _oContext.lineWidth = 1;
+ _oContext.fillStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight;
+ _oContext.fillRect(nLeft, nTop, nWidth, nHeight);
+
+ // 안티 앨리어싱 방지 처리
+ _oContext.strokeRect(
+ Math.floor(nLeft) + 0.5,
+ Math.floor(nTop) + 0.5,
+ nRoundedWidth,
+ nRoundedHeight
+ );
+
+ _oContext.strokeRect(
+ Math.ceil(nLeft) - 0.5,
+ Math.ceil(nTop) - 0.5,
+ nRoundedWidth,
+ nRoundedHeight
+ );
+ }
+ }
+
+ this._bIsPainted = true;
+ };
+
+ /**
+ * Make the image from Canvas if the browser supports Data URI.
+ */
+ Drawing.prototype.makeImage = function () {
+ if (this._bIsPainted) {
+ _safeSetDataURI.call(this, _onMakeImage);
+ }
+ };
+
+ /**
+ * Return whether the QRCode is painted or not
+ *
+ * @return {Boolean}
+ */
+ Drawing.prototype.isPainted = function () {
+ return this._bIsPainted;
+ };
+
+ /**
+ * Clear the QRCode
+ */
+ Drawing.prototype.clear = function () {
+ this._oContext.clearRect(0, 0, this._elCanvas.width, this._elCanvas.height);
+ this._bIsPainted = false;
+ };
+
+ /**
+ * @private
+ * @param {Number} nNumber
+ */
+ Drawing.prototype.round = function (nNumber) {
+ if (!nNumber) {
+ return nNumber;
+ }
+
+ return Math.floor(nNumber * 1000) / 1000;
+ };
+
+ return Drawing;
+ })();
+
+ /**
+ * Get the type by string length
+ *
+ * @private
+ * @param {String} sText
+ * @param {Number} nCorrectLevel
+ * @return {Number} type
+ */
+ function _getTypeNumber(sText, nCorrectLevel) {
+ var nType = 1;
+ var length = _getUTF8Length(sText);
+
+ for (var i = 0, len = QRCodeLimitLength.length; i <= len; i++) {
+ var nLimit = 0;
+
+ switch (nCorrectLevel) {
+ case QRErrorCorrectLevel.L :
+ nLimit = QRCodeLimitLength[i][0];
+ break;
+ case QRErrorCorrectLevel.M :
+ nLimit = QRCodeLimitLength[i][1];
+ break;
+ case QRErrorCorrectLevel.Q :
+ nLimit = QRCodeLimitLength[i][2];
+ break;
+ case QRErrorCorrectLevel.H :
+ nLimit = QRCodeLimitLength[i][3];
+ break;
+ }
+
+ if (length <= nLimit) {
+ break;
+ } else {
+ nType++;
+ }
+ }
+
+ if (nType > QRCodeLimitLength.length) {
+ throw new Error("Too long data");
+ }
+
+ return nType;
+ }
+
+ function _getUTF8Length(sText) {
+ var replacedText = encodeURI(sText).toString().replace(/\%[0-9a-fA-F]{2}/g, 'a');
+ return replacedText.length + (replacedText.length != sText ? 3 : 0);
+ }
+
+ /**
+ * @class QRCode
+ * @constructor
+ * @example
+ * new QRCode(document.getElementById("test"), "http://jindo.dev.naver.com/collie");
+ *
+ * @example
+ * var oQRCode = new QRCode("test", {
+ * text : "http://naver.com",
+ * width : 128,
+ * height : 128
+ * });
+ *
+ * oQRCode.clear(); // Clear the QRCode.
+ * oQRCode.makeCode("http://map.naver.com"); // Re-create the QRCode.
+ *
+ * @param {HTMLElement|String} el target element or 'id' attribute of element.
+ * @param {Object|String} vOption
+ * @param {String} vOption.text QRCode link data
+ * @param {Number} [vOption.width=256]
+ * @param {Number} [vOption.height=256]
+ * @param {String} [vOption.colorDark="#000000"]
+ * @param {String} [vOption.colorLight="#ffffff"]
+ * @param {QRCode.CorrectLevel} [vOption.correctLevel=QRCode.CorrectLevel.H] [L|M|Q|H]
+ */
+ QRCode = function (el, vOption) {
+ this._htOption = {
+ width : 256,
+ height : 256,
+ typeNumber : 4,
+ colorDark : "#000000",
+ colorLight : "#ffffff",
+ correctLevel : QRErrorCorrectLevel.H
+ };
+
+ if (typeof vOption === 'string') {
+ vOption = {
+ text : vOption
+ };
+ }
+
+ // Overwrites options
+ if (vOption) {
+ for (var i in vOption) {
+ this._htOption[i] = vOption[i];
+ }
+ }
+
+ if (typeof el == "string") {
+ el = document.getElementById(el);
+ }
+
+ if (this._htOption.useSVG) {
+ Drawing = svgDrawer;
+ }
+
+ this._android = _getAndroid();
+ this._el = el;
+ this._oQRCode = null;
+ this._oDrawing = new Drawing(this._el, this._htOption);
+
+ if (this._htOption.text) {
+ this.makeCode(this._htOption.text);
+ }
+ };
+
+ /**
+ * Make the QRCode
+ *
+ * @param {String} sText link data
+ */
+ QRCode.prototype.makeCode = function (sText) {
+ this._oQRCode = new QRCodeModel(_getTypeNumber(sText, this._htOption.correctLevel), this._htOption.correctLevel);
+ this._oQRCode.addData(sText);
+ this._oQRCode.make();
+ this._el.title = sText;
+ this._oDrawing.draw(this._oQRCode);
+ this.makeImage();
+ };
+
+ /**
+ * Make the Image from Canvas element
+ * - It occurs automatically
+ * - Android below 3 doesn't support Data-URI spec.
+ *
+ * @private
+ */
+ QRCode.prototype.makeImage = function () {
+ if (typeof this._oDrawing.makeImage == "function" && (!this._android || this._android >= 3)) {
+ this._oDrawing.makeImage();
+ }
+ };
+
+ /**
+ * Clear the QRCode
+ */
+ QRCode.prototype.clear = function () {
+ this._oDrawing.clear();
+ };
+
+ /**
+ * @name QRCode.CorrectLevel
+ */
+ QRCode.CorrectLevel = QRErrorCorrectLevel;
+})();
+
+export { QRCode };
+
+export function createQrCode(element, options = {}) {
+ return new QRCode(element, options);
+}
+
+export function renderQrCode(element, text, options = {}) {
+ const normalizedOptions = Object.assign({}, options, { text });
+ const instance = new QRCode(element, normalizedOptions);
+ return instance;
+}
+
+export function updateQrCode(instance, text) {
+ if (!instance || typeof instance.makeCode !== "function") {
+ throw new Error("Invalid QRCode instance");
+ }
+ instance.makeCode(text);
+ return instance;
+}