cryptpad-server 0.0.2 → 0.0.4

package/build/core.js

@@ -1354,6 +1354,9 @@ function requireWsConnector() {
                 cb(void 0, ctx.self);
             };
             const port = config.wsPort || config.port;
+            httpServer.on("error", e => {
+                cb(e);
+            });
             httpServer.listen(port, config.host, onServerReady);
         },
         initClient: (ctx, config, id, onConnected, cb) => {
@@ -1967,7 +1970,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 +2089,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",
@@ -3155,6 +3156,14 @@ function requireFile() {
             writeLinkedFile(env, path, content, cb);
         });
     };
+    const hasLinkedDocuments = (env, channelId) => {
+        const path = mkLinkedPath(env, channelId);
+        try {
+            return Fs.existsSync(path);
+        } catch (e) {
+            return false;
+        }
+    };
     const getLinkedDocuments = (env, channelId, cb) => {
         const path = mkLinkedPath(env, channelId);
         readLinkedFile(env, path, cb);
@@ -4227,6 +4236,7 @@ function requireFile() {
                         writeMetadata(env, channelName, data, Util.both(cb, next));
                     });
                 },
+                hasLinkedDocuments: channelId => hasLinkedDocuments(env, channelId),
                 getLinkedDocuments: (channelId, cb) => {
                     if (!isValidChannelId(channelId)) {
                         return cb(new Error("EINVAL"));
@@ -4445,11 +4455,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 +4523,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 +5166,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 +5202,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 +7694,7 @@ function requireHttpCommands() {
     return httpCommands;
 }
 
-var version = "0.0.2";
+var version = "0.0.4";
 
 var require$$2 = {
     version
@@ -9091,7 +9089,6 @@ function requireCore() {
         };
         const {challengePath} = Core.getPaths(mainConfig);
         Env.challengePath = challengePath;
-        Env.workers = WorkerModule(workerConfig);
         let queriesToStorage = [];
         let queriesToFront = [];
         let eventsToStorage = [];
@@ -9136,11 +9133,13 @@ function requireCore() {
                 Env.Log.error("INTERFACE_INIT_ERROR", err);
                 return;
             }
+            Env.workers = WorkerModule(workerConfig);
             if (process.send !== undefined) {
                 process.send({
                     type: "core",
                     index,
-                    msg: "READY"
+                    msg: "READY",
+                    pid: process.pid
                 });
             }
             checkCacheInterval();

package/build/core.worker.js

@@ -970,6 +970,10 @@ function requireWorker() {
                 txid: obj.txid,
                 pid: obj.pid,
                 value
+            }, e => {
+                if (e) {
+                    console.error("E_RESPONSE", Util.serializeError(e));
+                }
             });
         };
         if (!ready) {
@@ -986,6 +990,9 @@ function requireWorker() {
         }
         command(data, cb);
     });
+    process.on("disconnect", () => {
+        process.exit(0);
+    });
     process.on("uncaughtException", function(err) {
         console.error("[%s] UNCAUGHT EXCEPTION IN DB WORKER", new Date);
         console.error(err);