@kehto/paja 0.21.0 → 0.21.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -0
- package/dist/browser-host.js +75 -10
- package/dist/browser-host.js.map +1 -1
- package/package.json +4 -4
package/README.md
CHANGED
|
@@ -467,6 +467,16 @@ for current events; legacy identities keep their original aggregate. Both paths
|
|
|
467
467
|
verify signatures and bytes before runtime injection and `srcdoc` execution.
|
|
468
468
|
For the schema and removal boundary, see [event migration](https://kehto.github.io/web/docs/migrations/NIP-5D-EVENT-SCHEMA.html).
|
|
469
469
|
|
|
470
|
+
|
|
471
|
+
Paja loads napplets that declare unknown or unavailable domains. Optional `O`
|
|
472
|
+
integrations load quietly so the napplet can gracefully degrade. For unavailable
|
|
473
|
+
required `R` domains (or legacy `requires` declarations), Paja logs a warning per
|
|
474
|
+
frame navigation that full functionality may be unavailable, then continues.
|
|
475
|
+
Declarations never grant capabilities: unsupported or disabled domain objects
|
|
476
|
+
remain absent from `window.napplet`. Check namespace presence before using an
|
|
477
|
+
experimental integration. Paja does not implement an experimental protocol merely
|
|
478
|
+
because a manifest names it.
|
|
479
|
+
|
|
470
480
|
## NAP-INTENT links and lifecycle
|
|
471
481
|
|
|
472
482
|
This follows [NAP-INTENT PR #106](https://github.com/napplet/naps/blob/fc121fc264615482143eda86125863d2e1f741a2/naps/NAP-INTENT.md) at `fc121fc264615482143eda86125863d2e1f741a2` and NIP-5D PR #2303 at `020cb8b33a9e4c6b8ca4b2f9d0ed0a67843b68f7`.
|
package/dist/browser-host.js
CHANGED
|
@@ -4242,6 +4242,44 @@ function relayEventResultFromCarrier(carrier) {
|
|
|
4242
4242
|
}
|
|
4243
4243
|
return null;
|
|
4244
4244
|
}
|
|
4245
|
+
function createServiceExtensionRouter(context) {
|
|
4246
|
+
const { hooks, services, registrations, sessions, acl, enforce, firewall } = context;
|
|
4247
|
+
const windowLifetimes = /* @__PURE__ */ new Map();
|
|
4248
|
+
function handleMessage(windowId, message2) {
|
|
4249
|
+
const dot = message2.type.indexOf(".");
|
|
4250
|
+
const domain = message2.type.slice(0, dot);
|
|
4251
|
+
if (dot <= 0 || dot === message2.type.length - 1 || !/^[a-z][a-z0-9-]*$/.test(domain) || !Object.hasOwn(services, domain)) return;
|
|
4252
|
+
const handler = services[domain];
|
|
4253
|
+
const policies = handler.messageCapabilities;
|
|
4254
|
+
if (!policies || !Object.hasOwn(policies, message2.type)) return;
|
|
4255
|
+
const capability = policies[message2.type];
|
|
4256
|
+
if (capability !== null && !ALL_CAPABILITIES.includes(capability)) return;
|
|
4257
|
+
const session = sessions.getEntryByWindowId(windowId);
|
|
4258
|
+
const registration = registrations.get(domain);
|
|
4259
|
+
if (!session || !registration) return;
|
|
4260
|
+
const allowed2 = () => hooks.isDomainAllowed?.(windowId, domain) === true && !acl.isBlocked("", session.dTag, session.aggregateHash) && (capability === null || enforce(windowId, capability, message2).allowed);
|
|
4261
|
+
if (!allowed2() || firewall(windowId, message2, capability, false) === "drop") return;
|
|
4262
|
+
let lifetime = windowLifetimes.get(windowId);
|
|
4263
|
+
if (!lifetime) {
|
|
4264
|
+
lifetime = {};
|
|
4265
|
+
windowLifetimes.set(windowId, lifetime);
|
|
4266
|
+
}
|
|
4267
|
+
handler.handleMessage(windowId, message2, (response) => {
|
|
4268
|
+
if (registrations.get(domain) !== registration || services[domain] !== handler || windowLifetimes.get(windowId) !== lifetime || sessions.getEntryByWindowId(windowId) !== session) return;
|
|
4269
|
+
if (!response || typeof response.type !== "string" || !response.type.startsWith(`${domain}.`) || response.type.length <= dot + 1) return;
|
|
4270
|
+
if (allowed2()) hooks.sendToNapplet(windowId, response);
|
|
4271
|
+
});
|
|
4272
|
+
}
|
|
4273
|
+
return {
|
|
4274
|
+
handleMessage,
|
|
4275
|
+
destroyWindow(windowId) {
|
|
4276
|
+
windowLifetimes.delete(windowId);
|
|
4277
|
+
},
|
|
4278
|
+
destroy() {
|
|
4279
|
+
windowLifetimes.clear();
|
|
4280
|
+
}
|
|
4281
|
+
};
|
|
4282
|
+
}
|
|
4245
4283
|
function notifyServiceWindowDestroyed(windowId, services) {
|
|
4246
4284
|
for (const handler of Object.values(services)) {
|
|
4247
4285
|
try {
|
|
@@ -5494,13 +5532,18 @@ function buildObservation(envelope, windowId, senderCap, sessionRegistry2, getFo
|
|
|
5494
5532
|
}
|
|
5495
5533
|
function createFirewallGate(config) {
|
|
5496
5534
|
const { firewallState, sessionRegistry: sessionRegistry2, hooks, fireConsent } = config;
|
|
5497
|
-
return function firewallGate(windowId, envelope, senderCap) {
|
|
5535
|
+
return function firewallGate(windowId, envelope, senderCap, respond = true) {
|
|
5498
5536
|
const obs = buildObservation(envelope, windowId, senderCap, sessionRegistry2, hooks.getFocusContext);
|
|
5499
5537
|
const result2 = firewallState.evaluate(obs);
|
|
5500
5538
|
const { decision, action, ruleId, reason } = result2;
|
|
5501
5539
|
const napplet = obs.napplet;
|
|
5502
5540
|
const opClass = obs.opClass;
|
|
5503
5541
|
if (decision === "reject" || decision === "prompt") {
|
|
5542
|
+
if (!respond) {
|
|
5543
|
+
hooks.onFirewallEvent?.({ windowId, napplet, opClass, decision, action, ruleId, reason, message: envelope });
|
|
5544
|
+
if (decision === "prompt") fireConsent(windowId, napplet);
|
|
5545
|
+
return "drop";
|
|
5546
|
+
}
|
|
5504
5547
|
const intentDenial = createIntentPolicyDenial(envelope);
|
|
5505
5548
|
if (intentDenial) {
|
|
5506
5549
|
hooks.sendToNapplet(windowId, intentDenial);
|
|
@@ -5551,7 +5594,7 @@ function createDenialResponse(envelope, error) {
|
|
|
5551
5594
|
const type = denialResponseType(envelope);
|
|
5552
5595
|
return type ? { type, id, error } : null;
|
|
5553
5596
|
}
|
|
5554
|
-
function createMessageHandler(hooks, sessionRegistry2, enforceNap, dispatchNapEnvelope, firewallGate) {
|
|
5597
|
+
function createMessageHandler(hooks, sessionRegistry2, enforceNap, dispatchNapEnvelope, serviceRouting, firewallGate) {
|
|
5555
5598
|
return (windowId, msg) => {
|
|
5556
5599
|
if (typeof msg !== "object" || msg === null || Array.isArray(msg) || !("type" in msg) || typeof msg.type !== "string") return;
|
|
5557
5600
|
const envelope = msg;
|
|
@@ -5559,6 +5602,10 @@ function createMessageHandler(hooks, sessionRegistry2, enforceNap, dispatchNapEn
|
|
|
5559
5602
|
if (dotIdx === -1) return;
|
|
5560
5603
|
if (!sessionRegistry2.getEntryByWindowId(windowId)) return;
|
|
5561
5604
|
const domain = envelope.type.slice(0, dotIdx);
|
|
5605
|
+
if (!serviceRouting.builtInDomains.has(domain)) {
|
|
5606
|
+
serviceRouting.extensions.handleMessage(windowId, envelope);
|
|
5607
|
+
return;
|
|
5608
|
+
}
|
|
5562
5609
|
if (hooks.isDomainAllowed && !hooks.isDomainAllowed(windowId, domain)) return;
|
|
5563
5610
|
if (isIdentityOrThemeMessage(envelope) && !createCanonicalDomainResult(envelope)) return;
|
|
5564
5611
|
const caps = resolveCapabilitiesNap(envelope);
|
|
@@ -5611,7 +5658,8 @@ function createRuntimeInstance(context) {
|
|
|
5611
5658
|
serviceRegistry,
|
|
5612
5659
|
sessionRegistry: sessionRegistry2,
|
|
5613
5660
|
subscriptions,
|
|
5614
|
-
consentHandlerRef
|
|
5661
|
+
consentHandlerRef,
|
|
5662
|
+
extensions
|
|
5615
5663
|
} = context;
|
|
5616
5664
|
const undeclaredServiceConsents = /* @__PURE__ */ new Set();
|
|
5617
5665
|
const attachedServices = /* @__PURE__ */ new Map();
|
|
@@ -5675,6 +5723,8 @@ function createRuntimeInstance(context) {
|
|
|
5675
5723
|
eventBuffer.bufferAndDeliver(createInjectedEvent(hooks, topic, payload), null);
|
|
5676
5724
|
},
|
|
5677
5725
|
destroy() {
|
|
5726
|
+
extensions.destroy();
|
|
5727
|
+
registeredServices.clear();
|
|
5678
5728
|
for (const name of attachedServices.keys()) detachService(name);
|
|
5679
5729
|
manifestCache2.persist();
|
|
5680
5730
|
aclState.persist();
|
|
@@ -5683,13 +5733,13 @@ function createRuntimeInstance(context) {
|
|
|
5683
5733
|
subscriptions.clear();
|
|
5684
5734
|
incRuntime.clear();
|
|
5685
5735
|
eventBuffer.clear();
|
|
5686
|
-
registeredServices.clear();
|
|
5687
5736
|
undeclaredServiceConsents.clear();
|
|
5688
5737
|
},
|
|
5689
5738
|
registerConsentHandler(handler) {
|
|
5690
5739
|
consentHandlerRef.current = handler;
|
|
5691
5740
|
},
|
|
5692
5741
|
registerService(name, handler) {
|
|
5742
|
+
registeredServices.delete(name);
|
|
5693
5743
|
detachService(name);
|
|
5694
5744
|
serviceRegistry[name] = handler;
|
|
5695
5745
|
registeredServices.set(name, {
|
|
@@ -5700,11 +5750,12 @@ function createRuntimeInstance(context) {
|
|
|
5700
5750
|
attachService(name, handler);
|
|
5701
5751
|
},
|
|
5702
5752
|
unregisterService(name) {
|
|
5753
|
+
registeredServices.delete(name);
|
|
5703
5754
|
detachService(name);
|
|
5704
5755
|
delete serviceRegistry[name];
|
|
5705
|
-
registeredServices.delete(name);
|
|
5706
5756
|
},
|
|
5707
5757
|
destroyWindow(windowId) {
|
|
5758
|
+
extensions.destroyWindow(windowId);
|
|
5708
5759
|
for (const [key] of subscriptions) {
|
|
5709
5760
|
if (key.startsWith(`${windowId}:`)) {
|
|
5710
5761
|
subscriptions.delete(key);
|
|
@@ -5733,8 +5784,10 @@ function createRuntime(hooks) {
|
|
|
5733
5784
|
const serviceRegistry = { ...hooks.services };
|
|
5734
5785
|
const registeredServices = createRegisteredServices(serviceRegistry);
|
|
5735
5786
|
const firewallState = createFirewallState(hooks.firewallPersistence);
|
|
5787
|
+
let extensions;
|
|
5736
5788
|
const sessionRegistry2 = createSessionRegistry(hooks.onPendingUpdate, (windowId) => {
|
|
5737
5789
|
firewallState.resetInitBudget(windowId);
|
|
5790
|
+
extensions?.destroyWindow(windowId);
|
|
5738
5791
|
});
|
|
5739
5792
|
let incRuntime = null;
|
|
5740
5793
|
const aclState = createAclState(hooks.aclPersistence, "permissive", (mutation) => {
|
|
@@ -5797,14 +5850,25 @@ function createRuntime(hooks) {
|
|
|
5797
5850
|
firewallState.load();
|
|
5798
5851
|
manifestCache2.load();
|
|
5799
5852
|
const domainHandlers = createRuntimeDomainHandlers({ hooks, serviceRegistry, sessionRegistry: sessionRegistry2, aclState });
|
|
5800
|
-
const
|
|
5853
|
+
const napHandlers = {
|
|
5801
5854
|
relay: createRelayHandler({ hooks, serviceRegistry, subscriptions, eventBuffer, replayDetector }),
|
|
5802
5855
|
identity: createIdentityHandler({ hooks, serviceRegistry }),
|
|
5803
5856
|
count: createCountHandler({ hooks, serviceRegistry }),
|
|
5804
5857
|
inc: incRuntime.handleMessage,
|
|
5805
5858
|
...domainHandlers
|
|
5859
|
+
};
|
|
5860
|
+
const dispatchNapEnvelope = createNapEnvelopeDispatcher(napHandlers);
|
|
5861
|
+
const builtInDomains = /* @__PURE__ */ new Set([...Object.keys(napHandlers), "shell", "signer"]);
|
|
5862
|
+
extensions = createServiceExtensionRouter({
|
|
5863
|
+
hooks,
|
|
5864
|
+
services: serviceRegistry,
|
|
5865
|
+
registrations: registeredServices,
|
|
5866
|
+
sessions: sessionRegistry2,
|
|
5867
|
+
acl: aclState,
|
|
5868
|
+
enforce: enforceNap,
|
|
5869
|
+
firewall: firewallGate
|
|
5806
5870
|
});
|
|
5807
|
-
const handleMessage = createMessageHandler(hooks, sessionRegistry2, enforceNap, dispatchNapEnvelope, firewallGate);
|
|
5871
|
+
const handleMessage = createMessageHandler(hooks, sessionRegistry2, enforceNap, dispatchNapEnvelope, { builtInDomains, extensions }, firewallGate);
|
|
5808
5872
|
return createRuntimeInstance({
|
|
5809
5873
|
hooks,
|
|
5810
5874
|
serviceRegistry,
|
|
@@ -5818,7 +5882,8 @@ function createRuntime(hooks) {
|
|
|
5818
5882
|
firewallState,
|
|
5819
5883
|
manifestCache: manifestCache2,
|
|
5820
5884
|
consentHandlerRef,
|
|
5821
|
-
handleMessage
|
|
5885
|
+
handleMessage,
|
|
5886
|
+
extensions
|
|
5822
5887
|
});
|
|
5823
5888
|
}
|
|
5824
5889
|
|
|
@@ -21848,13 +21913,13 @@ async function navigateFrame(frame, config, generation, adapter, resolvedTarget,
|
|
|
21848
21913
|
frame.srcdoc = "<!doctype html><html><body></body></html>";
|
|
21849
21914
|
return null;
|
|
21850
21915
|
}
|
|
21916
|
+
if (isCurrent && !isCurrent()) return null;
|
|
21851
21917
|
if (!isPajaLocalTarget(resolvedTarget)) {
|
|
21852
21918
|
const missing = resolvedTarget.manifest.requires.filter((domain) => domain !== "shell" && !domains.includes(domain));
|
|
21853
21919
|
if (missing.length > 0) {
|
|
21854
|
-
|
|
21920
|
+
console.warn(`[paja] Napplet requires unsupported NAP capabilities: ${missing.join(", ")}; full functionality may be unavailable.`);
|
|
21855
21921
|
}
|
|
21856
21922
|
}
|
|
21857
|
-
if (isCurrent && !isCurrent()) return null;
|
|
21858
21923
|
const srcdoc = prepareNappletSrcdoc(resolvedTarget.indexHtml, {
|
|
21859
21924
|
domains,
|
|
21860
21925
|
csp: {
|