cryptpad-server 0.0.2 → 0.0.3

package/build/core.js

@@ -1967,7 +1967,6 @@ function requireCore$1() {
         const Util = requireCommonUtil$1();
         const Constants = requireConstants();
         const escapeKeyCharacters = Util.escapeKeyCharacters;
-        __require$3();
         const Crypto = __require$5();
         const Keys = requireKeys();
         Core.DEFAULT_LIMIT = 50 * 1024 * 1024;
@@ -2087,8 +2086,7 @@ function requireCore$1() {
             cb();
         };
         Core.getPaths = (mainConfig, isEnv) => {
-            const {index, config} = mainConfig;
-            Constants.paths;
+            const {config} = mainConfig;
             const all = {
                 basePath: config.basePath || config.base || "./data",
                 filePath: config.filePath || "./datastore",
@@ -4445,11 +4443,6 @@ function requireAdmin() {
     const nThen = require$$3;
     const Crypto = __require$5();
     const Admin = {};
-    const getWorkerProfiles = function(Env, _publicKey, _data, cb) {
-        cb(void 0, {
-            "Not Implemented": 1
-        });
-    };
     const getUid = () => Crypto.randomBytes(18).toString("hex");
     const getInvitations = (Env, _publicKey, _data, cb) => {
         Env.interface.broadcast("storage", "ADMIN_CMD", {
@@ -4518,11 +4511,6 @@ function requireAdmin() {
         }
         Env.flushCache(args, cb);
     };
-    const getDiskUsage = (Env, _publicKey, _data, cb) => {
-        cb(void 0, {
-            DEPRECATED: 0
-        });
-    };
     const getRegisteredUsers = (Env, _publicKey, _data, cb) => {
         Env.interface.broadcast("storage", "GET_REGISTERED_USERS", {}, (_err, data) => {
             let users = data.reduce((acc, it) => acc + it?.users, 0);
@@ -5166,7 +5154,6 @@ function requireAdmin() {
         ACTIVE_SESSIONS: getActiveSessions,
         ACTIVE_PADS: getActiveChannelCount,
         REGISTERED_USERS: getRegisteredUsers,
-        DISK_USAGE: getDiskUsage,
         FLUSH_CACHE: flushCache,
         GET_FILE_DESCRIPTOR_COUNT: getFileDescriptorCount,
         GET_FILE_DESCRIPTOR_LIMIT: getFileDescriptorLimit,
@@ -5203,7 +5190,6 @@ function requireAdmin() {
         ADMIN_DECREE: Admin.sendDecree,
         INSTANCE_STATUS: instanceStatus,
         GET_LIMITS: getLimits,
-        GET_WORKER_PROFILES: getWorkerProfiles,
         GET_USER_TOTAL_SIZE: getUserTotalSize,
         GET_ALL_INVITATIONS: getInvitations,
         CREATE_INVITATION: createInvitation,
@@ -7696,7 +7682,7 @@ function requireHttpCommands() {
     return httpCommands;
 }
 
-var version = "0.0.2";
+var version = "0.0.3";
 
 var require$$2 = {
     version

package/build/front.js

@@ -22,8 +22,6 @@ var require$$1$2 = require("express");
 
 var require$$4$1 = require("cookie-parser");
 
-var require$$5 = require("body-parser");
-
 var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 
 var commonUtil$2 = {
@@ -1570,7 +1568,6 @@ function requireCore() {
         const Util = requireCommonUtil$1();
         const Constants = requireConstants();
         const escapeKeyCharacters = Util.escapeKeyCharacters;
-        __require();
         const Crypto = __require$3();
         const Keys = requireKeys();
         Core.DEFAULT_LIMIT = 50 * 1024 * 1024;
@@ -1690,8 +1687,7 @@ function requireCore() {
             cb();
         };
         Core.getPaths = (mainConfig, isEnv) => {
-            const {index, config} = mainConfig;
-            Constants.paths;
+            const {config} = mainConfig;
             const all = {
                 basePath: config.basePath || config.base || "./data",
                 filePath: config.filePath || "./datastore",
@@ -4053,7 +4049,7 @@ function requireLogger() {
     return logger;
 }
 
-var version = "0.0.2";
+var version = "0.0.3";
 
 var require$$2 = {
     version
@@ -5010,7 +5006,6 @@ function requireNetwork() {
     const {setHeaders} = requireHeaders();
     const Crypto = require("crypto");
     const cookieParser = require$$4$1;
-    const bodyParser = require$$5;
     const Network = {};
     const app = Express();
     const events = {
@@ -5028,7 +5023,7 @@ function requireNetwork() {
             }
             next();
         });
-        app.use(bodyParser.urlencoded({
+        app.use(Express.urlencoded({
             extended: true
         }));
         app.use(cookieParser());

package/build/http.js

@@ -996,7 +996,6 @@ function requireCore() {
         const Util = requireCommonUtil$1();
         const Constants = requireConstants();
         const escapeKeyCharacters = Util.escapeKeyCharacters;
-        __require$5();
         const Crypto = __require$4();
         const Keys = requireKeys();
         Core.DEFAULT_LIMIT = 50 * 1024 * 1024;
@@ -1116,8 +1115,7 @@ function requireCore() {
             cb();
         };
         Core.getPaths = (mainConfig, isEnv) => {
-            const {index, config} = mainConfig;
-            Constants.paths;
+            const {config} = mainConfig;
             const all = {
                 basePath: config.basePath || config.base || "./data",
                 filePath: config.filePath || "./datastore",
@@ -3479,7 +3477,7 @@ function requireLogger() {
     return logger;
 }
 
-var version = "0.0.2";
+var version = "0.0.3";
 
 var require$$2 = {
     version

package/build/http.worker.js

@@ -2,6 +2,8 @@
 
 var require$$0$2 = require("express");
 
+var require$$1$2 = require("mime-types");
+
 var node_module = require("node:module");
 
 var require$$1$1 = require("fs-extra");
@@ -16,9 +18,9 @@ var require$$0$1 = require("stream-to-pull-stream");
 
 var require$$1 = require("pull-stream");
 
-var require$$5 = require("http-proxy-middleware");
+var require$$6 = require("http-proxy-middleware");
 
-var require$$7 = require("connect-gzip-static");
+var require$$8 = require("connect-gzip-static");
 
 var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 
@@ -1004,7 +1006,6 @@ function requireCore() {
         const Util = requireCommonUtil$1();
         const Constants = requireConstants();
         const escapeKeyCharacters = Util.escapeKeyCharacters;
-        __require$2();
         const Crypto = __require();
         const Keys = requireKeys();
         Core.DEFAULT_LIMIT = 50 * 1024 * 1024;
@@ -1124,8 +1125,7 @@ function requireCore() {
             cb();
         };
         Core.getPaths = (mainConfig, isEnv) => {
-            const {index, config} = mainConfig;
-            Constants.paths;
+            const {config} = mainConfig;
             const all = {
                 basePath: config.basePath || config.base || "./data",
                 filePath: config.filePath || "./datastore",
@@ -3529,7 +3529,7 @@ function requireDefaults() {
     return defaults.exports;
 }
 
-var version = "0.0.2";
+var version = "0.0.3";
 
 var require$$2 = {
     version
@@ -4330,14 +4330,16 @@ function requireWorker() {
     if (hasRequiredWorker) return worker$1;
     hasRequiredWorker = 1;
     const Express = require$$0$2;
+    const Mime = require$$1$2;
     const Http = require("node:http");
+    const Https = require("node:https");
     const Path = __require$2();
     const Fs = __require$1();
     const Logger = requireLogger();
     const Util = requireCommonUtil$1();
-    const {createProxyMiddleware} = require$$5;
+    const {createProxyMiddleware} = require$$6;
     const Default = requireDefaults();
-    const gzipStatic = require$$7;
+    const gzipStatic = require$$8;
     const Environment = requireEnv();
     const {setHeaders} = requireHeaders();
     const COMMANDS = {};
@@ -4350,9 +4352,7 @@ function requireWorker() {
         warn: () => {},
         info: () => {}
     };
-    Express.static.mime.define({
-        "application/wasm": [ "wasm" ]
-    });
+    Mime.lookup("wasm");
     const initFeedback = (Env, app) => {
         if (!Env.logFeedback) {
             return;
@@ -4422,6 +4422,28 @@ function requireWorker() {
         app.use("/cryptpad_websocket", wsProxy);
         app.use("/extensions.js", httpProxy);
         app.use("/api", httpProxy);
+        const checkAllStores = (req, res) => {
+            setHeaders(Env, req, res);
+            const promiseResponses = storageList.map(baseUrl => new Promise((res, rej) => {
+                const protocol = new URL(baseUrl).protocol;
+                if (![ "http:", "https:" ].includes(protocol)) {
+                    return rej();
+                }
+                const H = protocol === "http:" ? Http : Https;
+                H.get(new URL(req.url, baseUrl), {
+                    method: "HEAD"
+                }, resp => {
+                    const {statusCode} = resp;
+                    if (statusCode !== 200) {
+                        return rej();
+                    }
+                    res();
+                });
+            }));
+            Promise.all(promiseResponses).then(() => res.status(200).send("PLACEHOLDER")).catch(() => res.status(404).end());
+        };
+        app.get("/blob/placeholder.txt", checkAllStores);
+        app.get("/block/placeholder.txt", checkAllStores);
         const storeProxy = createProxyMiddleware({
             router: req => {
                 const split = req.url.split("/");

package/build/storage.cluster.js

@@ -18,8 +18,6 @@ var require$$1$1 = require("pull-stream");
 
 var require$$0$2 = require("tweetnacl/nacl-fast");
 
-var require$$11 = require("body-parser");
-
 var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 
 function getDefaultExportFromCjs(x) {
@@ -981,7 +979,6 @@ function requireCore() {
         const Util = requireCommonUtil$1();
         const Constants = requireConstants();
         const escapeKeyCharacters = Util.escapeKeyCharacters;
-        __require$2();
         const Crypto = __require$1();
         const Keys = requireKeys();
         Core.DEFAULT_LIMIT = 50 * 1024 * 1024;
@@ -1101,8 +1098,7 @@ function requireCore() {
             cb();
         };
         Core.getPaths = (mainConfig, isEnv) => {
-            const {index, config} = mainConfig;
-            Constants.paths;
+            const {config} = mainConfig;
             const all = {
                 basePath: config.basePath || config.base || "./data",
                 filePath: config.filePath || "./datastore",
@@ -1425,6 +1421,27 @@ function requireBlock$1() {
                 }, cb);
             });
         };
+        Block.rootPlaceholderCreate = (Env, _cb) => {
+            const cb = Util.once(Util.mkAsync(_cb));
+            nThen(w => {
+                Fse.mkdirp(Env.paths.block, w(err => {
+                    if (err) {
+                        Env.Log.error("BLOCK_FOLDER_CREATE_FAILED", err);
+                        w.abort();
+                        return cb(err);
+                    }
+                }));
+            }).nThen(w => {
+                const fullPath = Path.join(Env.paths.block, "placeholder.txt");
+                Fs.writeFile(fullPath, "PLACEHOLDER\n", w(err => {
+                    if (err) {
+                        Env.Log.error("BLOCK_PLACEHOLDER_CREATE_FAILED", err);
+                        w.abort();
+                        return cb(err);
+                    }
+                }));
+            }).nThen(() => cb());
+        };
     })(block$1);
     return block$1.exports;
 }
@@ -2862,7 +2879,7 @@ function requireMfa() {
     return mfa.exports;
 }
 
-var version = "0.0.2";
+var version = "0.0.3";
 
 var require$$2 = {
     version
@@ -7982,7 +7999,6 @@ function requireCluster() {
     const Util = requireCommonUtil$1();
     const MFA = requireMfa();
     const Sessions = requireSessions();
-    const bodyParser = require$$11;
     const Fs = __require();
     const Environment = requireEnv();
     const Logger = requireLogger();
@@ -8017,7 +8033,7 @@ function requireCluster() {
         Env.Log.error("WORKER__" + errLabel, info);
     });
     const initServerHandlers = (Env, app) => {
-        app.use(bodyParser.urlencoded({
+        app.use(Express.urlencoded({
             extended: true
         }));
         app.use("/blob", function(req, res, next) {
@@ -8244,7 +8260,7 @@ function requireCluster() {
                 res.statusCode = 204;
                 return void res.end();
             }
-            const {chunk, sig, edPublic} = req.body;
+            const {chunk, sig, edPublic} = req.body || {};
             const forbidden = reason => void res.status(403).send({
                 error: reason
             });

package/build/storage.js

@@ -998,7 +998,6 @@ function requireCore() {
         const Util = requireCommonUtil$1();
         const Constants = requireConstants();
         const escapeKeyCharacters = Util.escapeKeyCharacters;
-        __require$5();
         const Crypto = __require$6();
         const Keys = requireKeys();
         Core.DEFAULT_LIMIT = 50 * 1024 * 1024;
@@ -1118,8 +1117,7 @@ function requireCore() {
             cb();
         };
         Core.getPaths = (mainConfig, isEnv) => {
-            const {index, config} = mainConfig;
-            Constants.paths;
+            const {config} = mainConfig;
             const all = {
                 basePath: config.basePath || config.base || "./data",
                 filePath: config.filePath || "./datastore",
@@ -5475,6 +5473,27 @@ function requireBlock$1() {
                 }, cb);
             });
         };
+        Block.rootPlaceholderCreate = (Env, _cb) => {
+            const cb = Util.once(Util.mkAsync(_cb));
+            nThen(w => {
+                Fse.mkdirp(Env.paths.block, w(err => {
+                    if (err) {
+                        Env.Log.error("BLOCK_FOLDER_CREATE_FAILED", err);
+                        w.abort();
+                        return cb(err);
+                    }
+                }));
+            }).nThen(w => {
+                const fullPath = Path.join(Env.paths.block, "placeholder.txt");
+                Fs.writeFile(fullPath, "PLACEHOLDER\n", w(err => {
+                    if (err) {
+                        Env.Log.error("BLOCK_PLACEHOLDER_CREATE_FAILED", err);
+                        w.abort();
+                        return cb(err);
+                    }
+                }));
+            }).nThen(() => cb());
+        };
     })(block$1);
     return block$1.exports;
 }
@@ -6676,7 +6695,7 @@ function requireMfaManager() {
     return mfaManager;
 }
 
-var version = "0.0.2";
+var version = "0.0.3";
 
 var require$$2 = {
     version
@@ -10624,6 +10643,17 @@ function requireAdmin() {
         const {key} = data;
         MFA.revoke(Env, key, cb);
     };
+    const onGetCachedChannelMetadata = (Env, id, cb) => {
+        const index = Env.metadata_cache?.[id];
+        if (!index) {
+            return void cb("ENOENT");
+        }
+        cb(void 0, index);
+    };
+    const onClearCachedChannelMetadata = (Env, id, cb) => {
+        delete Env.metadata_cache[id];
+        cb();
+    };
     const onArchiveBlock = (Env, data, cb) => {
         const {key, reason} = data;
         const archiveReason = {
@@ -11013,17 +11043,6 @@ function requireAdmin() {
         }
         cb(void 0, index);
     };
-    const onGetCachedChannelMetadata = (Env, id, cb) => {
-        const index = Env.metadata_cache?.[id];
-        if (!index) {
-            return void cb("ENOENT");
-        }
-        cb(void 0, index);
-    };
-    const onClearCachedChannelMetadata = (Env, id, cb) => {
-        delete Env.metadata_cache[id];
-        cb();
-    };
     const onGetActiveChannelCount = (Env, _id, cb) => {
         if (!Env.channel_cache) {
             return void cb("ENOENT");
@@ -12059,6 +12078,12 @@ function requireStorage() {
             const bearerSecret = Util.encodeBase64(Crypto.randomBytes(32));
             const decree = [ "SET_BEARER_SECRET", [ bearerSecret ], "INTERNAL", +new Date ];
             Decrees.onNewDecree(Env, decree, "", waitFor());
+        }).nThen(w => {
+            BlockStore.rootPlaceholderCreate(Env, w(err => {
+                if (err) {
+                    console.warn(`${myId}: Impossible to create block's placeholder. Please check the value of blockPath in your config.js file and if you have write access on it.`);
+                }
+            }));
         }).nThen(() => {
             if (index !== 0) {
                 return;

package/build/storage.worker.js

@@ -1000,7 +1000,6 @@ function requireCore() {
         const Util = requireCommonUtil$1();
         const Constants = requireConstants();
         const escapeKeyCharacters = Util.escapeKeyCharacters;
-        __require$1();
         const Crypto = __require();
         const Keys = requireKeys();
         Core.DEFAULT_LIMIT = 50 * 1024 * 1024;
@@ -1120,8 +1119,7 @@ function requireCore() {
             cb();
         };
         Core.getPaths = (mainConfig, isEnv) => {
-            const {index, config} = mainConfig;
-            Constants.paths;
+            const {config} = mainConfig;
             const all = {
                 basePath: config.basePath || config.base || "./data",
                 filePath: config.filePath || "./datastore",
@@ -4733,7 +4731,7 @@ function requireTasks() {
     return tasks.exports;
 }
 
-var version = "0.0.2";
+var version = "0.0.3";
 
 var require$$2 = {
     version

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cryptpad-server",
   "description": "CryptPad Server",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "license": "AGPL-3.0+",
   "repository": {
     "type": "git",
@@ -16,10 +16,10 @@
     "build"
   ],
   "dependencies": {
-    "body-parser": "^2.2.0",
     "connect-gzip-static": "^4.2.1",
     "cookie-parser": "^1.4.7",
-    "express": "~4.22.1",
+    "express": "~5.2.1",
+    "mime-types": "^3.0.2",
     "fs-extra": "^7.0.0",
     "http-proxy-middleware": "^3.0.3",
     "nthen": "0.1.8",
@@ -50,6 +50,7 @@
     "typescript": "^5.6.2"
   },
   "overrides": {
+    "qs": "^6.16.0",
     "http-proxy": "npm:http-proxy-3@^1.23.2",
     "serialize-javascript": "^7.0.4"
   },
@@ -63,6 +64,7 @@
     "tests": "node --test tests/",
     "test": "node tests/runAll.js",
     "start": "node index.js",
-    "dev": "DEV=1 node index.js"
+    "dev": "DEV=1 node index.js",
+    "windev": "set DEV=1& node index.js"
   }
 }