@peerbit/server 2.0.0 → 4.0.0

package/lib/esm/remotes.js

@@ -1,4 +1,5 @@
 import fs from "fs";
+export const DEFAULT_REMOTE_GROUP = "default";
 export class Remotes {
     path;
     data;
@@ -19,21 +20,19 @@ export class Remotes {
     getByName(name) {
         return this.data.remotes.find((x) => x.name === name);
     }
+    getByGroup(group) {
+        return this.data.remotes.filter((x) => x.group === group);
+    }
     getByAddress(address) {
         return this.data.remotes.find((x) => x.address === address);
     }
-    add(name, address, password) {
-        const obj = {
-            address,
-            name,
-            password,
-        };
-        const existing = this.data.remotes.findIndex((x) => x.name === name);
+    add(remote) {
+        const existing = this.data.remotes.findIndex((x) => x.name === remote.name);
         if (existing >= 0) {
-            this.data.remotes[existing] = obj;
+            this.data.remotes[existing] = remote;
         }
         else {
-            this.data.remotes.push(obj);
+            this.data.remotes.push(remote);
         }
         this.save();
     }

package/lib/esm/remotes.js.map

@@ -1 +1 @@
-{"version":3,"file":"remotes.js","sourceRoot":"","sources":["../../src/remotes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAYpB,MAAM,OAAO,OAAO;IAGE;IAFb,IAAI,CAAgB;IAE5B,YAAqB,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;QAChC,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACxB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CACrB,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACtB,CAAC;SACnB;aAAM;YACN,IAAI,CAAC,IAAI,GAAG;gBACX,OAAO,EAAE,EAAE;aACX,CAAC;SACF;IACF,CAAC;IAED,IAAI;QACH,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,SAAS,CAAC,IAAY;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACvD,CAAC;IACD,YAAY,CAAC,OAAe;QAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC;IAC7D,CAAC;IACD,GAAG,CAAC,IAAY,EAAE,OAAe,EAAE,QAAgB;QAClD,MAAM,GAAG,GAAiB;YACzB,OAAO;YACP,IAAI;YACJ,QAAQ;SACR,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QACrE,IAAI,QAAQ,IAAI,CAAC,EAAE;YAClB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC;SAClC;aAAM;YACN,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC5B;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;IACb,CAAC;IAED,MAAM,CAAC,IAAY;QAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QACrE,IAAI,QAAQ,IAAI,CAAC,EAAE;YAClB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YACtC,OAAO,IAAI,CAAC;SACZ;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,KAAK,CAAC,GAAG;QACR,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAC1B,CAAC;CACD"}
+{"version":3,"file":"remotes.js","sourceRoot":"","sources":["../../src/remotes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAUpB,MAAM,CAAC,MAAM,oBAAoB,GAAG,SAAS,CAAC;AAa9C,MAAM,OAAO,OAAO;IAGE;IAFb,IAAI,CAAgB;IAE5B,YAAqB,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;QAChC,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACxB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CACrB,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACtB,CAAC;SACnB;aAAM;YACN,IAAI,CAAC,IAAI,GAAG;gBACX,OAAO,EAAE,EAAE;aACX,CAAC;SACF;IACF,CAAC;IAED,IAAI;QACH,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,SAAS,CAAC,IAAY;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,UAAU,CAAC,KAAa;QACvB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;IAC3D,CAAC;IAED,YAAY,CAAC,OAAe;QAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC;IAC7D,CAAC;IAED,GAAG,CAAC,MAAoB;QACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5E,IAAI,QAAQ,IAAI,CAAC,EAAE;YAClB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;SACrC;aAAM;YACN,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC/B;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;IACb,CAAC;IAED,MAAM,CAAC,IAAY;QAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QACrE,IAAI,QAAQ,IAAI,CAAC,EAAE;YAClB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YACtC,OAAO,IAAI,CAAC;SACZ;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,KAAK,CAAC,GAAG;QACR,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAC1B,CAAC;CACD"}

package/lib/esm/routes.d.ts

@@ -1,6 +1,7 @@
 export declare const getPort: (protocol: string) => 9002 | 8082;
-export declare const SSL_PORT = 9002;
-export declare const LOCAL_PORT = 8082;
+export declare const REMOTE_API_PORT = 9002;
+export declare const LOCAL_API_PORT = 8082;
+export declare const TRUST_PATH = "/trust";
 export declare const PEER_ID_PATH = "/peer/id";
 export declare const ADDRESS_PATH = "/peer/address";
 export declare const PROGRAM_PATH = "/program";
@@ -9,3 +10,4 @@ export declare const INSTALL_PATH = "/install";
 export declare const BOOTSTRAP_PATH = "/network/bootstrap";
 export declare const RESTART_PATH = "/restart";
 export declare const TERMINATE_PATH = "/terminate";
+export declare const STOP_PATH = "/path";

package/lib/esm/routes.js

@@ -1,14 +1,15 @@
 export const getPort = (protocol) => {
     if (protocol === "https:") {
-        return SSL_PORT;
+        return REMOTE_API_PORT;
     }
     if (protocol === "http:") {
-        return LOCAL_PORT;
+        return LOCAL_API_PORT;
     }
     throw new Error("Unsupported protocol: " + protocol);
 };
-export const SSL_PORT = 9002;
-export const LOCAL_PORT = 8082;
+export const REMOTE_API_PORT = 9002;
+export const LOCAL_API_PORT = 8082;
+export const TRUST_PATH = "/trust";
 export const PEER_ID_PATH = "/peer/id";
 export const ADDRESS_PATH = "/peer/address";
 export const PROGRAM_PATH = "/program";
@@ -17,4 +18,5 @@ export const INSTALL_PATH = "/install";
 export const BOOTSTRAP_PATH = "/network/bootstrap";
 export const RESTART_PATH = "/restart";
 export const TERMINATE_PATH = "/terminate";
+export const STOP_PATH = "/path";
 //# sourceMappingURL=routes.js.map

package/lib/esm/routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/routes.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,QAAgB,EAAE,EAAE;IAC3C,IAAI,QAAQ,KAAK,QAAQ,EAAE;QAC1B,OAAO,QAAQ,CAAC;KAChB;IAED,IAAI,QAAQ,KAAK,OAAO,EAAE;QACzB,OAAO,UAAU,CAAC;KAClB;IAED,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,QAAQ,CAAC,CAAC;AACtD,CAAC,CAAC;AACF,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAC;AAC7B,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAAC;AAE/B,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAC;AACvC,MAAM,CAAC,MAAM,YAAY,GAAG,eAAe,CAAC;AAC5C,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAC;AACvC,MAAM,CAAC,MAAM,aAAa,GAAG,WAAW,CAAC;AACzC,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAC;AACvC,MAAM,CAAC,MAAM,cAAc,GAAG,oBAAoB,CAAC;AACnD,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAC;AACvC,MAAM,CAAC,MAAM,cAAc,GAAG,YAAY,CAAC"}
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/routes.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,QAAgB,EAAE,EAAE;IAC3C,IAAI,QAAQ,KAAK,QAAQ,EAAE;QAC1B,OAAO,eAAe,CAAC;KACvB;IAED,IAAI,QAAQ,KAAK,OAAO,EAAE;QACzB,OAAO,cAAc,CAAC;KACtB;IAED,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,QAAQ,CAAC,CAAC;AACtD,CAAC,CAAC;AACF,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;AACpC,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC;AACnC,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,CAAC;AACnC,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAC;AACvC,MAAM,CAAC,MAAM,YAAY,GAAG,eAAe,CAAC;AAC5C,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAC;AACvC,MAAM,CAAC,MAAM,aAAa,GAAG,WAAW,CAAC;AACzC,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAC;AACvC,MAAM,CAAC,MAAM,cAAc,GAAG,oBAAoB,CAAC;AACnD,MAAM,CAAC,MAAM,YAAY,GAAG,UAAU,CAAC;AACvC,MAAM,CAAC,MAAM,cAAc,GAAG,YAAY,CAAC;AAC3C,MAAM,CAAC,MAAM,SAAS,GAAG,OAAO,CAAC"}

package/lib/esm/server.d.ts

@@ -3,15 +3,14 @@ import http from "http";
 import { ProgramClient } from "@peerbit/program";
 import { Peerbit } from "peerbit";
 import { Session } from "./session.js";
+import { Trust } from "./trust.js";
 export declare const stopAndWait: (server: http.Server) => Promise<boolean | undefined>;
-export declare const createPassword: (configDirectory: string, password?: string) => Promise<string>;
-export declare const loadOrCreatePassword: (configDirectory: string, password?: string) => Promise<string>;
 export declare const startServerWithNode: (properties: {
-    directory?: string;
+    directory: string;
     domain?: string;
     bootstrap?: boolean;
     newSession?: boolean;
-    password?: string;
+    grantAccess?: string[];
     ports?: {
         node: number;
         api: number;
@@ -21,9 +20,8 @@ export declare const startServerWithNode: (properties: {
     server: http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
     node: Peerbit;
 }>;
-export declare const startApiServer: (client: ProgramClient, options: {
-    configDirectory: string;
+export declare const startApiServer: (client: ProgramClient, properties: {
+    trust: Trust;
     session?: Session;
     port?: number;
-    password?: string;
 }) => Promise<http.Server>;

package/lib/esm/server.js

@@ -1,15 +1,15 @@
 import http from "http";
-import { fromBase64 } from "@peerbit/crypto";
+import { fromBase64, getPublicKeyFromPeerId, } from "@peerbit/crypto";
 import { deserialize } from "@dao-xyz/borsh";
 import { Program, getProgramFromVariant, getProgramFromVariants, } from "@peerbit/program";
 import { waitFor } from "@peerbit/time";
 import { v4 as uuid } from "uuid";
-import { checkExistPath, getHomeConfigDir, getCredentialsPath, loadPassword, NotFoundError, getNodePath, } from "./config.js";
+import { getNodePath, getKeypair, getTrustPath, } from "./config.js";
 import { setMaxListeners } from "events";
 import { create } from "./peerbit.js";
 import { Peerbit } from "peerbit";
 import { getSchema } from "@dao-xyz/borsh";
-import { ADDRESS_PATH, BOOTSTRAP_PATH, TERMINATE_PATH, INSTALL_PATH, LOCAL_PORT, PEER_ID_PATH, PROGRAMS_PATH, PROGRAM_PATH, RESTART_PATH, } from "./routes.js";
+import { ADDRESS_PATH, BOOTSTRAP_PATH, INSTALL_PATH, LOCAL_API_PORT, PEER_ID_PATH, PROGRAMS_PATH, PROGRAM_PATH, RESTART_PATH, TRUST_PATH, STOP_PATH, } from "./routes.js";
 import { Session } from "./session.js";
 import fs from "fs";
 import { exit } from "process";
@@ -21,6 +21,9 @@ import { dirname } from "path";
 import { fileURLToPath } from "url";
 import { Level } from "level";
 import { MemoryLevel } from "memory-level";
+import { Trust } from "./trust.js";
+import { getBody, verifyRequest } from "./signes-request.js";
+import { peerIdFromString } from "@libp2p/peer-id";
 const __dirname = dirname(fileURLToPath(import.meta.url));
 export const stopAndWait = (server) => {
     let closed = false;
@@ -30,44 +33,19 @@ export const stopAndWait = (server) => {
     server.close();
     return waitFor(() => closed);
 };
-export const createPassword = async (configDirectory, password) => {
-    const configDir = configDirectory ?? (await getHomeConfigDir());
-    const credentialsPath = await getCredentialsPath(configDir);
-    if (!password && (await checkExistPath(credentialsPath))) {
-        throw new Error("Config path for credentials: " + credentialsPath + ", already exist");
-    }
-    console.log(`Creating config folder ${configDir}`);
-    fs.mkdirSync(configDir, { recursive: true });
-    await waitFor(() => fs.existsSync(configDir));
-    console.log(`Created config folder ${configDir}`);
-    password = password || uuid();
-    fs.writeFileSync(credentialsPath, JSON.stringify({ username: "admin", password }));
-    console.log(`Created credentials at ${credentialsPath}`);
-    return password;
-};
-export const loadOrCreatePassword = async (configDirectory, password) => {
-    if (!password) {
-        try {
-            return await loadPassword(configDirectory);
-        }
-        catch (error) {
-            if (error instanceof NotFoundError) {
-                return createPassword(configDirectory, password);
-            }
-            throw error;
-        }
-    }
-    else {
-        return createPassword(configDirectory, password);
-    }
-};
 export const startServerWithNode = async (properties) => {
+    if (!fs.existsSync(properties.directory)) {
+        fs.mkdirSync(properties.directory, { recursive: true });
+    }
+    const trustPeerIds = properties.grantAccess && properties.grantAccess.length > 0
+        ? properties.grantAccess.map((x) => peerIdFromString(x))
+        : [];
+    const keypair = await getKeypair(properties.directory);
     const peer = await create({
-        directory: properties.directory != null
-            ? getNodePath(properties.directory)
-            : undefined,
+        directory: getNodePath(properties.directory),
         domain: properties.domain,
         listenPort: properties.ports?.node,
+        peerId: await keypair.toPeerId(),
     });
     if (properties.bootstrap) {
         await peer.bootstrap();
@@ -98,13 +76,11 @@ export const startServerWithNode = async (properties) => {
     else {
         await session.clear();
     }
+    const trust = new Trust(getTrustPath(properties.directory));
     const server = await startApiServer(peer, {
         port: properties.ports?.api,
-        configDirectory: properties.directory != null
-            ? path.join(properties.directory, "server")
-            : undefined || getHomeConfigDir(),
+        trust,
         session,
-        password: properties.password,
     });
     const printNodeInfo = async () => {
         console.log("Starting node with address(es): ");
@@ -138,9 +114,14 @@ export const startServerWithNode = async (properties) => {
         });
     };
     await shutDownHook(peer, server);
+    if (trustPeerIds.length > 0) {
+        for (const id of trustPeerIds) {
+            trust.add(getPublicKeyFromPeerId(id).hashcode());
+        }
+    }
     return { server, node: peer };
 };
-const getProgramFromPath = (client, req, pathIndex) => {
+const getPathValue = (req, pathIndex) => {
     if (!req.url) {
         throw new Error("Missing url");
     }
@@ -152,7 +133,7 @@ const getProgramFromPath = (client, req, pathIndex) => {
         throw new Error("Invalid path");
     }
     const address = decodeURIComponent(path[pathIndex]);
-    return client.handler?.items.get(address);
+    return address;
 };
 function findPeerbitProgramFolder(inputDirectory) {
     let currentDir = path.resolve(inputDirectory);
@@ -171,9 +152,8 @@ function findPeerbitProgramFolder(inputDirectory) {
     }
     return null;
 }
-export const startApiServer = async (client, options) => {
-    const port = options?.port ?? LOCAL_PORT;
-    const password = await loadOrCreatePassword(options.configDirectory, options?.password);
+export const startApiServer = async (client, properties) => {
+    const port = properties?.port ?? LOCAL_API_PORT;
     const restart = async () => {
         await client.stop();
         await stopAndWait(server);
@@ -187,37 +167,21 @@ export const startApiServer = async (client, options) => {
             stdio: "inherit",
             gid: process.getgid(),
         });
-        /* process.on("exit", async () => {
-            child.kill("SIGINT")
-        });
-        process.on("SIGINT", async () => {
-            child.kill("SIGINT")
-        }); */
         process.exit(0);
     };
-    const adminACL = (req) => {
-        const auth = req.headers["authorization"];
-        if (!auth?.startsWith("Basic ")) {
-            return false;
-        }
-        const credentials = auth?.substring("Basic ".length);
-        const username = credentials.split(":")[0];
-        if (username !== "admin") {
-            return false;
+    if (!client.peerId.equals(await client.identity.publicKey.toPeerId())) {
+        throw new Error("Expecting node identity to equal peerId");
+    }
+    const getVerifiedBody = async (req) => {
+        const body = await getBody(req);
+        const result = await verifyRequest(req.headers, req.method, req.url, body);
+        if (result.equals(client.identity.publicKey)) {
+            return body;
         }
-        if (password !== credentials.substring(username.length + 1)) {
-            return false;
+        if (properties.trust.isTrusted(result.hashcode())) {
+            return body;
         }
-        return true;
-    };
-    const getBody = (req, callback) => {
-        let body = "";
-        req.on("data", function (d) {
-            body += d;
-        });
-        req.on("end", function () {
-            callback(body);
-        });
+        throw new Error("Not trusted");
     };
     const e404 = "404";
     const endpoints = (client) => {
@@ -232,14 +196,20 @@ export const startApiServer = async (client, options) => {
             };
             try {
                 if (req.url) {
-                    if (!req.url.startsWith(PEER_ID_PATH) &&
-                        !req.url.startsWith(ADDRESS_PATH) &&
-                        !(await adminACL(req))) {
+                    let body;
+                    try {
+                        body =
+                            req.url.startsWith(PEER_ID_PATH) ||
+                                req.url.startsWith(ADDRESS_PATH)
+                                ? await getBody(req)
+                                : await getVerifiedBody(req);
+                    }
+                    catch (error) {
                         res.writeHead(401);
-                        res.end("Not authorized");
+                        res.end("Not authorized: " + error.toString());
                         return;
                     }
-                    else if (req.url.startsWith(PROGRAMS_PATH)) {
+                    if (req.url.startsWith(PROGRAMS_PATH)) {
                         if (client instanceof Peerbit === false) {
                             res.writeHead(400);
                             res.end("Server node is not running a native client");
@@ -273,7 +243,7 @@ export const startApiServer = async (client, options) => {
                         switch (req.method) {
                             case "HEAD":
                                 try {
-                                    const program = getProgramFromPath(client, req, 1);
+                                    const program = client.handler?.items.get(getPathValue(req, 1));
                                     if (program) {
                                         res.writeHead(200);
                                         res.end();
@@ -292,7 +262,7 @@ export const startApiServer = async (client, options) => {
                                 try {
                                     const url = new URL(req.url, "http://localhost:" + 1234);
                                     const queryData = url.searchParams.get("delete");
-                                    const program = getProgramFromPath(client, req, 1);
+                                    const program = client.handler?.items.get(getPathValue(req, 1));
                                     if (program) {
                                         let closed = false;
                                         if (queryData === "true") {
@@ -302,7 +272,7 @@ export const startApiServer = async (client, options) => {
                                             closed = await program.close();
                                         }
                                         if (closed) {
-                                            await options?.session?.programs.remove(program.address);
+                                            await properties?.session?.programs.remove(program.address);
                                         }
                                         res.writeHead(200);
                                         res.end();
@@ -318,42 +288,40 @@ export const startApiServer = async (client, options) => {
                                 }
                                 break;
                             case "PUT":
-                                getBody(req, (body) => {
-                                    try {
-                                        const startArguments = JSON.parse(body);
-                                        let program;
-                                        if (startArguments.variant) {
-                                            const P = getProgramFromVariant(startArguments.variant);
-                                            if (!P) {
-                                                res.writeHead(400);
-                                                res.end("Missing program with variant: " +
-                                                    startArguments.variant);
-                                                return;
-                                            }
-                                            program = new P();
-                                        }
-                                        else {
-                                            program = deserialize(fromBase64(startArguments.base64), Program);
-                                        }
-                                        client
-                                            .open(program) // TODO all users to pass args
-                                            .then(async (program) => {
-                                            // TODO what if this is a reopen?
-                                            console.log("OPEN ADDRESS", program.address, client.directory, await client.services.blocks.has(program.address));
-                                            await options?.session?.programs.add(program.address, new Uint8Array());
-                                            res.writeHead(200);
-                                            res.end(program.address.toString());
-                                        })
-                                            .catch((error) => {
+                                try {
+                                    const startArguments = JSON.parse(body);
+                                    let program;
+                                    if (startArguments.variant) {
+                                        const P = getProgramFromVariant(startArguments.variant);
+                                        if (!P) {
                                             res.writeHead(400);
-                                            res.end("Failed to open program: " + error.toString());
-                                        });
+                                            res.end("Missing program with variant: " +
+                                                startArguments.variant);
+                                            return;
+                                        }
+                                        program = new P();
                                     }
-                                    catch (error) {
-                                        res.writeHead(400);
-                                        res.end(error.toString());
+                                    else {
+                                        program = deserialize(fromBase64(startArguments.base64), Program);
                                     }
-                                });
+                                    client
+                                        .open(program) // TODO all users to pass args
+                                        .then(async (program) => {
+                                        // TODO what if this is a reopen?
+                                        console.log("OPEN ADDRESS", program.address, client.directory, await client.services.blocks.has(program.address));
+                                        await properties?.session?.programs.add(program.address, new Uint8Array());
+                                        res.writeHead(200);
+                                        res.end(program.address.toString());
+                                    })
+                                        .catch((error) => {
+                                        res.writeHead(400);
+                                        res.end("Failed to open program: " + error.toString());
+                                    });
+                                }
+                                catch (error) {
+                                    res.writeHead(400);
+                                    res.end(error.toString());
+                                }
                                 break;
                             default:
                                 r404();
@@ -362,85 +330,85 @@ export const startApiServer = async (client, options) => {
                     }
                     else if (req.url.startsWith(INSTALL_PATH)) {
                         switch (req.method) {
-                            case "PUT":
-                                getBody(req, async (body) => {
-                                    const installArgs = JSON.parse(body);
-                                    const packageName = installArgs.name; // @abc/123
-                                    let installName = installArgs.name; // abc123.tgz or @abc/123 (npm package name)
-                                    let clear;
-                                    if (installArgs.type === "tgz") {
-                                        const binary = fromBase64(installArgs.base64);
-                                        const tempFile = tmp.fileSync({
-                                            name: base58btc.encode(Buffer.from(installName)) +
-                                                uuid() +
-                                                ".tgz",
-                                        });
-                                        fs.writeFileSync(tempFile.fd, binary);
-                                        clear = () => tempFile.removeCallback();
-                                        installName = tempFile.name;
-                                    }
-                                    else {
-                                        clear = undefined;
-                                    }
-                                    if (!installName || installName.length === 0) {
-                                        res.writeHead(400);
-                                        res.end("Invalid package: " + packageName);
-                                    }
-                                    else {
-                                        try {
-                                            // TODO do this without sudo. i.e. for servers provide arguments so that this app folder is writeable by default by the user
-                                            const installDir = process.env.PEERBIT_MODULES_PATH ||
-                                                findPeerbitProgramFolder(__dirname);
-                                            let permission = "";
-                                            if (!installDir) {
-                                                res.writeHead(400);
-                                                res.end("Missing installation directory");
-                                                return;
-                                            }
-                                            try {
-                                                fs.accessSync(installDir, fs.constants.W_OK);
-                                            }
-                                            catch (error) {
-                                                permission = "sudo";
-                                            }
-                                            console.log("Installing package: " + installName);
-                                            execSync(`${permission} npm install ${installName} --prefix ${installDir} --no-save --no-package-lock`); // TODO omit=dev ? but this makes breaks the tests after running once?
-                                        }
-                                        catch (error) {
+                            case "PUT": {
+                                const installArgs = JSON.parse(body);
+                                const packageName = installArgs.name; // @abc/123
+                                let installName = installArgs.name; // abc123.tgz or @abc/123 (npm package name)
+                                let clear;
+                                if (installArgs.type === "tgz") {
+                                    const binary = fromBase64(installArgs.base64);
+                                    const tempFile = tmp.fileSync({
+                                        name: base58btc.encode(Buffer.from(installName)) +
+                                            uuid() +
+                                            ".tgz",
+                                    });
+                                    fs.writeFileSync(tempFile.fd, binary);
+                                    clear = () => tempFile.removeCallback();
+                                    installName = tempFile.name;
+                                }
+                                else {
+                                    clear = undefined;
+                                }
+                                if (!installName || installName.length === 0) {
+                                    res.writeHead(400);
+                                    res.end("Invalid package: " + packageName);
+                                }
+                                else {
+                                    try {
+                                        // TODO do this without sudo. i.e. for servers provide arguments so that this app folder is writeable by default by the user
+                                        const installDir = process.env.PEERBIT_MODULES_PATH ||
+                                            findPeerbitProgramFolder(__dirname);
+                                        let permission = "";
+                                        if (!installDir) {
                                             res.writeHead(400);
-                                            res.end("Failed to install library: " +
-                                                packageName +
-                                                ". " +
-                                                error.toString());
-                                            clear?.();
+                                            res.end("Missing installation directory");
                                             return;
                                         }
                                         try {
-                                            const programsPre = new Set(getProgramFromVariants().map((x) => getSchema(x).variant));
-                                            await import(
-                                            /* webpackIgnore: true */ /* @vite-ignore */ packageName);
-                                            await options?.session?.imports.add(packageName, new Uint8Array());
-                                            const programsPost = getProgramFromVariants()?.map((x) => getSchema(x));
-                                            const newPrograms = [];
-                                            for (const p of programsPost) {
-                                                if (!programsPre.has(p.variant)) {
-                                                    newPrograms.push(p);
-                                                }
-                                            }
-                                            res.writeHead(200);
-                                            res.end(JSON.stringify(newPrograms.map((x) => x.variant)));
+                                            fs.accessSync(installDir, fs.constants.W_OK);
                                         }
-                                        catch (e) {
-                                            res.writeHead(400);
-                                            res.end(e.message.toString?.());
-                                            clear?.();
+                                        catch (error) {
+                                            permission = "sudo";
                                         }
+                                        console.log("Installing package: " + installName);
+                                        execSync(`${permission} npm install ${installName} --prefix ${installDir} --no-save --no-package-lock`); // TODO omit=dev ? but this makes breaks the tests after running once?
+                                    }
+                                    catch (error) {
+                                        res.writeHead(400);
+                                        res.end("Failed to install library: " +
+                                            packageName +
+                                            ". " +
+                                            error.toString());
+                                        clear?.();
+                                        return;
+                                    }
+                                    try {
+                                        const programsPre = new Set(getProgramFromVariants().map((x) => getSchema(x).variant));
+                                        await import(
+                                        /* webpackIgnore: true */ /* @vite-ignore */ packageName);
+                                        await properties?.session?.imports.add(packageName, new Uint8Array());
+                                        const programsPost = getProgramFromVariants()?.map((x) => getSchema(x));
+                                        const newPrograms = [];
+                                        for (const p of programsPost) {
+                                            if (!programsPre.has(p.variant)) {
+                                                newPrograms.push(p);
+                                            }
+                                        }
+                                        res.writeHead(200);
+                                        res.end(JSON.stringify(newPrograms.map((x) => x.variant)));
+                                    }
+                                    catch (e) {
+                                        res.writeHead(400);
+                                        res.end(e.message.toString?.());
+                                        clear?.();
                                     }
-                                });
+                                }
                                 break;
-                            default:
+                            }
+                            default: {
                                 r404();
                                 break;
+                            }
                         }
                     }
                     else if (req.url.startsWith(BOOTSTRAP_PATH)) {
@@ -460,6 +428,25 @@ export const startApiServer = async (client, options) => {
                                 break;
                         }
                     }
+                    else if (req.url.startsWith(TRUST_PATH)) {
+                        switch (req.method) {
+                            case "PUT": {
+                                properties.trust.add(getPathValue(req, 1));
+                                res.writeHead(200);
+                                res.end();
+                                break;
+                            }
+                            case "DELETE": {
+                                const removed = properties.trust.remove(getPathValue(req, 1));
+                                res.writeHead(200);
+                                res.end(removed);
+                                break;
+                            }
+                            default:
+                                r404();
+                                break;
+                        }
+                    }
                     else if (req.url.startsWith(RESTART_PATH)) {
                         switch (req.method) {
                             case "POST":
@@ -472,7 +459,7 @@ export const startApiServer = async (client, options) => {
                                 break;
                         }
                     }
-                    else if (req.url.startsWith(TERMINATE_PATH)) {
+                    else if (req.url.startsWith(STOP_PATH)) {
                         switch (req.method) {
                             case "POST":
                                 res.writeHead(200);
@@ -483,7 +470,18 @@ export const startApiServer = async (client, options) => {
                                 r404();
                                 break;
                         }
-                    }
+                    } /* else if (req.url.startsWith(TERMINATE_PATH)) {
+                        switch (req.method) {
+                            case "POST":
+                                execSync("shutdown -h now")
+                                process.exit(0);
+                                break;
+
+                            default:
+                                r404();
+                                break;
+                        }
+                    }  */
                     else if (req.url.startsWith(PEER_ID_PATH)) {
                         res.writeHead(200);
                         res.end(client.peerId.toString());