@peerbit/server 5.4.15 → 5.4.16-6611d7c

package/dist/ui/index.html

@@ -23,7 +23,7 @@
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
 	<title>Peerbit</title>
-  <script type="module" crossorigin src="/assets/index-BPdbODjv.js"></script>
+  <script type="module" crossorigin src="/assets/index-C8bxNrXj.js"></script>
   <link rel="stylesheet" crossorigin href="/assets/index-CIfVvUo9.css">
 </head>
 

package/package.json

@@ -1,91 +1,91 @@
 {
-	"name": "@peerbit/server",
-	"version": "5.4.15",
-	"author": "dao.xyz",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/dao-xyz/peerbit"
-	},
-	"license": "Apache-2.0",
-	"type": "module",
-	"sideEffects": false,
-	"bin": {
-		"peerbit": "./dist/src/bin.js"
-	},
-	"module": "dist/src/index.js",
-	"types": "dist/src/index.d.ts",
-	"exports": {
-		"import": "./dist/src/index.js"
-	},
-	"browser": {
-		"./dist/src/server.js": "./dist/src/server.browser.js",
-		"./server.js": "./dist/src/server.browser.js",
-		"./dist/src/config.js": "./dist/src/config.browser.js",
-		"./config.js": "./dist/src/config.browser.js",
-		"./dist/src/remotes.js": "./dist/src/remotes.browser.js",
-		"./remotes.js": "./dist/src/remotes.browser.js",
-		"./dist/src/docker.js": "./dist/src/docker.browser.js",
-		"./docker.js": "./dist/src/docker.browser.js",
-		"./dist/src/aws.js": "./dist/src/aws.browser.js"
-	},
-	"files": [
-		"dist",
-		"src",
-		"src/nginx-template.conf",
-		"!src/test",
-		"!src/**/__tests__",
-		"!lib/**/__tests__",
-		"patches",
-		"LICENSE"
-	],
-	"publishConfig": {
-		"access": "public"
-	},
-	"engines": {
-		"node": ">=18"
-	},
-	"eslintConfig": {
-		"extends": "peerbit",
-		"parserOptions": {
-			"project": true,
-			"sourceType": "module"
-		},
-		"ignorePatterns": [
-			"!.aegir.js",
-			"test/ts-use",
-			"*.d.ts"
-		]
-	},
-	"scripts": {
-		"clean": "shx rm -rf lib/*",
-		"build": "yarn clean && yarn build-lib && yarn build-ui",
-		"build-lib": "tsc -p tsconfig.json",
-		"build-ui": "cd ../frontend && yarn build && cd ../node",
-		"postbuild": "cp src/nginx-template.conf dist/src/ && cp -r ../frontend/dist/. dist/ui",
-		"test": "aegir test --t node",
-		"lint": "aegir lint"
-	},
-	"devDependencies": {
-		"@peerbit/test-lib": "^0.0.1",
-		"@peerbit/test-utils": "2.1.56",
-		"@types/yargs": "17.0.24",
-		"aws-sdk": "^2.1259.0",
-		"dotenv": "^16.1.4",
-		"@types/tmp": "^0.2.3",
-		"@types/tar-stream": "^3.1.3",
-		"shx": "^0.3.4"
-	},
-	"dependencies": {
-		"axios": "^1.4.0",
-		"chalk": "^5.3.0",
-		"peerbit": "4.1.45",
-		"yargs": "^17.7.2",
-		"tar-stream": "^3.1.7",
-		"tmp": "^0.2.1",
-		"tty-table": "^4.2.1"
-	},
-	"optionalDependencies": {
-		"@aws-sdk/client-ec2": "^3.390.0",
-		"@aws-sdk/client-route-53": "^3.391.0"
-	}
+  "name": "@peerbit/server",
+  "version": "5.4.16-6611d7c",
+  "author": "dao.xyz",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dao-xyz/peerbit"
+  },
+  "license": "Apache-2.0",
+  "type": "module",
+  "sideEffects": false,
+  "bin": {
+    "peerbit": "./dist/src/bin.js"
+  },
+  "module": "dist/src/index.js",
+  "types": "dist/src/index.d.ts",
+  "exports": {
+    "import": "./dist/src/index.js"
+  },
+  "browser": {
+    "./dist/src/server.js": "./dist/src/server.browser.js",
+    "./server.js": "./dist/src/server.browser.js",
+    "./dist/src/config.js": "./dist/src/config.browser.js",
+    "./config.js": "./dist/src/config.browser.js",
+    "./dist/src/remotes.js": "./dist/src/remotes.browser.js",
+    "./remotes.js": "./dist/src/remotes.browser.js",
+    "./dist/src/docker.js": "./dist/src/docker.browser.js",
+    "./docker.js": "./dist/src/docker.browser.js",
+    "./dist/src/aws.js": "./dist/src/aws.browser.js"
+  },
+  "files": [
+    "dist",
+    "src",
+    "src/nginx-template.conf",
+    "!src/test",
+    "!src/**/__tests__",
+    "!lib/**/__tests__",
+    "patches",
+    "LICENSE"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "eslintConfig": {
+    "extends": "peerbit",
+    "parserOptions": {
+      "project": true,
+      "sourceType": "module"
+    },
+    "ignorePatterns": [
+      "!.aegir.js",
+      "test/ts-use",
+      "*.d.ts"
+    ]
+  },
+  "scripts": {
+    "clean": "shx rm -rf lib/*",
+    "build": "yarn clean && yarn build-lib && yarn build-ui",
+    "build-lib": "tsc -p tsconfig.json",
+    "build-ui": "cd ../frontend && yarn build && cd ../node",
+    "postbuild": "cp src/nginx-template.conf dist/src/ && cp -r ../frontend/dist/. dist/ui",
+    "test": "aegir test --t node",
+    "lint": "aegir lint"
+  },
+  "devDependencies": {
+    "@peerbit/test-lib": "0.0.1-6611d7c",
+    "@peerbit/test-utils": "2.1.56-6611d7c",
+    "@types/yargs": "17.0.24",
+    "aws-sdk": "^2.1259.0",
+    "dotenv": "^16.1.4",
+    "@types/tmp": "^0.2.3",
+    "@types/tar-stream": "^3.1.3",
+    "shx": "^0.3.4"
+  },
+  "dependencies": {
+    "axios": "^1.4.0",
+    "chalk": "^5.3.0",
+    "peerbit": "4.1.45-6611d7c",
+    "yargs": "^17.7.2",
+    "tar-stream": "^3.1.7",
+    "tmp": "^0.2.1",
+    "tty-table": "^4.2.1"
+  },
+  "optionalDependencies": {
+    "@aws-sdk/client-ec2": "^3.390.0",
+    "@aws-sdk/client-route-53": "^3.391.0"
+  }
 }

package/src/cli.ts

@@ -1160,6 +1160,24 @@ export const cli = async (args?: string[]) => {
 											}
 										},
 									})
+									.command({
+										command: "uninstall <package>",
+										describe: "uninstall a previously installed dependency",
+										builder: (yargs: any) => {
+											yargs.positional("package", {
+												type: "string",
+												describe: "NPM package name to uninstall",
+												demandOption: true,
+											});
+											return yargs;
+										},
+										handler: async (args) => {
+											for (const api of apis) {
+												await api.api.dependency.uninstall(args.package);
+												api.log(`Uninstalled ${args.package}`);
+											}
+										},
+									})
 
 									.command({
 										command: "restart",

package/src/client.ts

@@ -262,6 +262,19 @@ export const createClient = async (
 				}
 				return resp.data;
 			},
+			uninstall: async (name: string): Promise<void> => {
+				const resp = await axiosInstance.delete(
+					endpoint + INSTALL_PATH + "/" + encodeURIComponent(name),
+					{ validateStatus },
+				);
+				if (resp.status !== 200 && resp.status !== 404) {
+					throw new Error(
+						typeof resp.data === "string"
+							? resp.data
+							: resp.data?.toString?.() || "Uninstall failed",
+					);
+				}
+			},
 			versions: async (): Promise<Record<string, string>> => {
 				const resp = throwIfNot200(
 					await axiosInstance.get(endpoint + VERSIONS_PATH, {

package/src/domain.ts

@@ -1,7 +1,10 @@
 /* eslint-disable no-console */
 import { waitFor } from "@peerbit/time";
 
-const isNode = typeof window === "undefined";
+const isNode =
+	typeof process !== "undefined" &&
+	process.versions != null &&
+	process.versions.node != null;
 
 const validateEmail = (email: any) => {
 	return String(email)
@@ -152,12 +155,12 @@ export const startCertbot = async (
 
 	// copy ui from node_modules to home for permission reasons (volume will not work otherwise)
 	const certbotDockerCommand = `cp -r ${uiPath} $(pwd)/ui && docker pull jonasal/nginx-certbot:latest && docker run -d --net=host \
-    --env CERTBOT_EMAIL=${email} ${isTest ? "--env STAGING=1" : ""}\
+	--restart unless-stopped \
+	--env CERTBOT_EMAIL=${email} ${isTest ? "--env STAGING=1" : ""}\
     -v $(pwd)/nginx_secrets:/etc/letsencrypt \
     -v ${nginxConfigPath}:/etc/nginx/user_conf.d:ro \
     -v $(pwd)/ui:/usr/share/nginx/html:ro \
-    --name ${dockerProcessName} jonasal/nginx-certbot:latest \
-	--restart unless-stopped`;
+    --name ${dockerProcessName} jonasal/nginx-certbot:latest`;
 
 	console.log("Starting Certbot");
 	// try two times with some delay, because sometimes the docker daemon is not available immidatel

package/src/server.ts

@@ -626,6 +626,62 @@ export const startApiServer = async (
 								break;
 							}
 
+							case "DELETE": {
+								try {
+									// Expecting DELETE /install/<packageName>
+									const packageName = getPathValue(req, 1);
+
+									if (!packageName || packageName.length === 0) {
+										res.writeHead(400);
+										res.end("Invalid package name");
+										return;
+									}
+
+									const installDir = getInstallDir();
+									if (!installDir) {
+										res.writeHead(400);
+										res.end("Missing installation directory");
+										return;
+									}
+
+									let permission = "";
+									try {
+										fs.accessSync(installDir, fs.constants.W_OK);
+									} catch (_e) {
+										permission = "sudo";
+									}
+
+									try {
+										console.log("Uninstalling package: " + packageName);
+										execSync(
+											`${permission} npm uninstall ${packageName} --prefix ${installDir} --no-save --no-package-lock`,
+										);
+									} catch (error: any) {
+										res.writeHead(400);
+										res.end(
+											"Failed to uninstall library: " +
+												packageName +
+												". " +
+												error.toString(),
+										);
+										return;
+									}
+
+									try {
+										await properties?.session?.imports.remove(packageName);
+									} catch (e) {
+										// ignore persistence errors; uninstall already done
+									}
+
+									res.writeHead(200);
+									res.end();
+								} catch (error: any) {
+									res.writeHead(400);
+									res.end(error?.message || "Uninstall error");
+								}
+								break;
+							}
+
 							default: {
 								r404();
 								break;