ep_set_title_on_pad 0.7.5 → 0.7.7

package/handleMessage.js

@@ -8,13 +8,10 @@
 
 const authorManager = require('ep_etherpad-lite/node/db/AuthorManager');
 const padMessageHandler = require('ep_etherpad-lite/node/handler/PadMessageHandler');
-const db = require('ep_etherpad-lite/node/db/DB').db;
+const db = require('ep_etherpad-lite/node/db/DB');
 
-// Remove cache for this procedure
-db.dbSettings.cache = 0;
-
-const saveRoomTitle = (padId, message) => {
-  db.set(`title:${padId}`, message);
+const saveRoomTitle = async (padId, message) => {
+  await db.set(`title:${padId}`, message);
 };
 
 const sendToRoom = (message, msg) => {
@@ -66,7 +63,7 @@ exports.handleMessage = async (hookName, context, cb) => {
       },
     };
     sendToRoom(message, msg);
-    saveRoomTitle(message.padId, message.message);
+    await saveRoomTitle(message.padId, message.message);
     return null; // handled by plugin
   }
 };

package/index.js

@@ -1,12 +1,9 @@
 'use strict';
 
-const db = require('ep_etherpad-lite/node/db/DB').db;
+const db = require('ep_etherpad-lite/node/db/DB');
 const padMessageHandler = require('ep_etherpad-lite/node/handler/PadMessageHandler');
 const {padToggle} = require('ep_plugin_helpers/pad-toggle-server');
 
-// Remove cache for this procedure
-db.dbSettings.cache = 0;
-
 // Parallel User Settings + Pad Wide Settings checkboxes for "Show Title".
 // Helper owns the storage, broadcast, enforce, and i18n wiring. The pad
 // creator can enforce the pad-wide value to lock the title bar visible (or
@@ -31,35 +28,42 @@ exports.eejsBlock_padSettings = titleToggle.eejsBlock_padSettings;
 exports.clientVars = async (hookName, context) => {
   const padId = context.pad.id;
   // Fire the saved-title broadcast (legacy behavior — kept verbatim).
-  db.get(`title:${padId}`, (err, value) => {
-    const msg = {
-      type: 'COLLABROOM',
-      data: {
-        type: 'CUSTOM',
-        payload: {
-          action: 'recieveTitleMessage',
-          padId,
-          message: value,
-        },
+  let value;
+  try {
+    value = await db.get(`title:${padId}`);
+  } catch (err) {
+    console.error('ep_set_title_on_pad clientVars db.get failed:', err);
+  }
+  const msg = {
+    type: 'COLLABROOM',
+    data: {
+      type: 'CUSTOM',
+      payload: {
+        action: 'recieveTitleMessage',
+        padId,
+        message: value,
       },
-    };
-    setTimeout(() => {
-      padMessageHandler.handleCustomObjectMessage(msg, false, () => {});
-    }, 100);
-  });
+    },
+  };
+  setTimeout(() => {
+    padMessageHandler.handleCustomObjectMessage(msg, false, () => {});
+  }, 100);
   // Return the padToggle's clientVars contribution so the helper picks up
   // pad-wide state on the client.
   return await titleToggle.clientVars(hookName, context);
 };
 
-exports.exportFileName = (hook, padId, callback) => {
-  let title = padId;
-  // Sets Export File Name to the same as the title
-  db.get(`title:${padId}`, (err, value) => {
-    console.log('Found ', value, ' for ', padId);
-    if (value) title = value;
-    callback(title);
-  });
+exports.exportFileName = async (hook, padId) => {
+  // ueberdb2 v6 is promise-only; the legacy db.get(key, cb) callback never
+  // fires, which previously hung the export pipeline when the export hook's
+  // callback was placed inside it.
+  try {
+    const value = await db.get(`title:${padId}`);
+    if (value) return value;
+  } catch (err) {
+    console.error('ep_set_title_on_pad exportFileName db.get failed:', err);
+  }
+  return padId;
 };
 
 exports.padRemove = async (hookName, {pad}) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ep_set_title_on_pad",
   "description": "Set the title on a pad in Etherpad, also includes real time updates to the UI",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "license": "Apache-2.0",
   "author": "johnyma22 (John McLear) <john@mclear.co.uk>",
   "keywords": [
@@ -25,7 +25,7 @@
     "url": "https://etherpad.org/"
   },
   "dependencies": {
-    "ep_plugin_helpers": "^0.5.2"
+    "ep_plugin_helpers": "^0.6.0"
   },
   "devDependencies": {
     "eslint": "^8.57.1",

package/templates/title.ejs

@@ -6,20 +6,30 @@
 </div>
 
 <style type="text/css">
+  /* Bar height kept tight so the body-level title doesn't eat enough of the
+     editor viewport to break etherpad's auto-scroll on Enter (the bar pushes
+     the iframe down without the editor's scroll calculation accounting for
+     it — see ep_set_title_on_pad CI history vs etherpad-lite #7611). */
   #pad_title {
     flex-direction: row;
     align-items: center;
     border-bottom: 1px solid #ccc;
     margin: 0 !important;
-    padding: 3px 10px;
+    padding: 0 10px;
+    height: 16px;
+    box-sizing: border-box;
+    line-height: 15px;
   }
   #input_title{
     display:none;
     flex: 1 auto;
-    padding: 8px 10px !important;
+    padding: 0 8px !important;
+    height: 14px;
+    box-sizing: border-box;
+    font-size: 11px;
   }
   #title{
-    line-height:30px;
+    line-height: 15px;
     max-width: calc(100% - 30px);
     white-space: nowrap;
     overflow: hidden;
@@ -29,18 +39,24 @@
     text-decoration:none;
   }
   #title h1{
-    line-height:160%;
+    margin: 0;
+    padding: 0;
+    font-size: 11px;
+    line-height: 15px;
+    font-weight: 600;
   }
   #edit_title{
-    padding-top: 5px;
+    padding: 0;
     margin-left: 10px;
     cursor:pointer;
     display:none;
+    line-height: 15px;
   }
   #save_title{
     display:none;
     cursor:pointer;
     margin-left:8px;
+    line-height: 15px;
   }
   #save_title button{
     margin-right: 0 !important;