nervur 0.7.2 → 0.7.6

package/being.mjs

@@ -39,15 +39,42 @@ const Compartment = ({ memory, voice, address, root, classOf }) => {
   });
 };
 
+const grantable = (program) =>
+  (program?.rights ?? [...STRUCTURAL, 'MEMBER']).filter((one) => !STRUCTURAL.includes(one));
+
+const referable = (mine, key, plain, program) => {
+  const rights = plain.rights ?? 'MEMBER';
+  if (!grantable(program).includes(rights)) {
+    return undefined;
+  }
+  if (key.startsWith('refs/pending/')) {
+    return { ...plain, rights };
+  }
+  const held = mine.read(key);
+  return {
+    ...plain,
+    nextPkHash: plain.nextPkHash ?? held?.nextPkHash ?? null,
+    rights,
+    seen: Math.max(plain.seen ?? 0, held?.seen ?? 0),
+  };
+};
+
 const scoped = (mine, program) =>
   Object.freeze({
     classOf: mine.classOf,
     list: mine.list,
     read: mine.read,
-    write: (key, plain) =>
-      key.startsWith('refs/') || key.startsWith('handles/') || program?.declares(key) !== undefined
+    write: (key, plain) => {
+      if (key.startsWith('refs/') && plain !== undefined) {
+        const guarded = referable(mine, key, plain, program);
+        return guarded === undefined ? undefined : mine.write(key, guarded);
+      }
+      return key.startsWith('refs/') ||
+        key.startsWith('handles/') ||
+        program?.declares(key) !== undefined
         ? mine.write(key, plain)
-        : undefined,
+        : undefined;
+    },
   });
 
 const rootFor = ({ memory, voice, address }) => {
@@ -56,13 +83,13 @@ const rootFor = ({ memory, voice, address }) => {
   return opened === undefined ? undefined : Buffer.from(opened, 'base64');
 };
 
-const Port = ({ voice, mine, modules, rights }) => {
+const Port = ({ voice, mine, deliver, rights }) => {
   const stamp = Stamp();
   const lanes = new Map();
   const send = async (to, op) => {
     const turn = (lanes.get(to) ?? Promise.resolve()).then(() => {
       const handle = mine.read(`handles/${to}`);
-      return modules.deliver(
+      return deliver(
         Tools.envelope(handle === undefined ? voice : Voice.revive(handle.face), to, op, stamp()),
       );
     });
@@ -112,7 +139,7 @@ const rotates = ({ mine }, from, nextPkHash) => {
   return from;
 };
 
-const Being = ({ voice, address, modules, registry, vouched, watch }) => {
+const Being = ({ voice, address, deliver, modules, registry, vouched, watch }) => {
   const memory = modules.memory;
   const root = rootFor({ memory, voice, address });
   const source = memory.read(address, 'program')?.value;
@@ -214,7 +241,7 @@ const Being = ({ voice, address, modules, registry, vouched, watch }) => {
         const asked = await program.ask({
           context: {
             modules: Object.freeze({ ...modules, memory: scoped(mine, program) }),
-            port: Port({ voice, mine, modules, rights }),
+            port: Port({ voice, mine, deliver, rights }),
             registry,
             rights,
           },
@@ -258,6 +285,7 @@ const Registry = ({
   memory,
   adminMine,
   address,
+  deliver,
   modules,
   modulesFor,
   announce,
@@ -276,7 +304,14 @@ const Registry = ({
     if (voice === undefined) {
       return undefined;
     }
-    const door = Being({ voice, address: at, modules: modulesFor(voice), vouched, watch });
+    const door = Being({
+      address: at,
+      deliver,
+      modules: modulesFor(voice),
+      vouched,
+      voice,
+      watch,
+    });
     live.set(at, door);
     return door;
   };
@@ -297,7 +332,7 @@ const Registry = ({
       if (written !== undefined && (brought === undefined || settings === undefined)) {
         return undefined;
       }
-      const allowed = written?.rights ?? [...STRUCTURAL, 'MEMBER'];
+      const allowed = grantable(written);
       if (refs.some((ref) => !allowed.includes(ref.rights ?? 'MEMBER'))) {
         return undefined;
       }

package/ground.mjs

@@ -94,10 +94,7 @@ const Ground = (modules = {}) => {
         {
           ...extra,
           ...boundFor(voice),
-          deliver: (envelope) => deliver(envelope),
           memory,
-          paths,
-          wire,
         },
         Tools.address(voice.pk),
       ),
@@ -148,6 +145,7 @@ const Ground = (modules = {}) => {
     memory,
     adminMine,
     address,
+    deliver: (envelope) => deliver(envelope),
     modules: adminModules,
     modulesFor,
     announce,
@@ -157,10 +155,15 @@ const Ground = (modules = {}) => {
     watch,
   });
   const admin = (envelope, token) =>
-    Being({ voice: adminVoice, address, modules: adminModules, registry, vouched, watch })(
-      envelope,
-      token,
-    );
+    Being({
+      address,
+      deliver: (envelope) => deliver(envelope),
+      modules: adminModules,
+      registry,
+      vouched,
+      voice: adminVoice,
+      watch,
+    })(envelope, token);
 
   announce(address);
   for (const key of adminMine.list('identity/custody/')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nervur",
-  "version": "0.7.2",
+  "version": "0.7.6",
   "description": "A distributed system of sovereign beings — one door, one question: by whose authority.",
   "license": "Apache-2.0",
   "author": "Razvan Gherghina",