Example-flows + noder: defaults pekar bara på filer som finns
Flöden (flows/example-flows.json): - Kedjor som skapar det de behöver: png→asset, templates:list→create→ extract/fill/transform/extractFields, create A+B→compareVersionsPdf - Defaults /Dokument/Example.md, /Dokument/exempel.odt, dest /Dokument/OfficeOut/, mall-id 230 (Invoice.odt via templates:list) - Ingen referens till /Mallar/avtal.docx, avtal-ny.docx eller logotyp.png - Debug-noder med tostatus=false (undviker TypeError-length i status) Noder: - nc-office templates:create: skickar path+template (richdocuments- kontrakt), ärver extension från mallen, MKCOL av mapp, idempotent (återanvänd existerande fil i stället för 'namn (2)') — fixar OCS 400 - nc-office document:direct: fileId camelCase (+fileid), 996-fel inkluderar nu OCS-body i felmeddelandet - collabora-wopi discovery: rewrite urlsrc/favIconUrl till collaboraPublicUrl så iframe inte går mot CODE bridge-IP - webdavGet/PROPFIND 404: feltext med föreslagen åtgärd - resolveDestNcPath: tvingar rätt filändelse (.pdf/.png/…) - Nytt: listUserExamples (PROPFIND /Dokument+/Documents) + bridge-op pickDemoSource; scripts/discover-examples.js Verifierat mot cloud.domain.name (your-user): capabilities, discovery- rewrite, pdf/png, asset-länk, mall-skapa+extract/fill/transform, compare A/B→pdf, document:direct, htmlToOffice — ALL PASS.
This commit is contained in:
dev
@@ -11,7 +11,8 @@ const OPERATIONS = {
|
||||
fillTemplateSave: bridge.fillTemplateSave,
|
||||
compareVersionsPdf: bridge.compareVersionsPdf,
|
||||
extractToPayload: bridge.extractToPayload,
|
||||
createAssetLink: bridge.createAssetLink
|
||||
createAssetLink: bridge.createAssetLink,
|
||||
pickDemoSource: bridge.pickDemoSource
|
||||
};
|
||||
|
||||
module.exports = function (RED) {
|
||||
|
||||
@@ -4,6 +4,24 @@ const { getConfig, setError, setSuccess, clearStatus } = require('../lib/utils')
|
||||
const { getCapabilities, getDiscovery } = require('../lib/collabora');
|
||||
const { requestBuffer } = require('../lib/http-client');
|
||||
|
||||
// Discovery urlsrc/favIconUrl pekar ofta på CODE:s interna host (t.ex.
|
||||
// https://172.17.0.2:9980). Om en publik bas är satt (collaboraPublicUrl)
|
||||
// skrivs hosten om så att browser/iframes inte går mot bridge-IP:t.
|
||||
function rewriteDiscoveryHosts(xml, internalBase, publicBase) {
|
||||
if (!xml || !publicBase || !internalBase) {
|
||||
return xml;
|
||||
}
|
||||
let internalOrigin;
|
||||
try {
|
||||
internalOrigin = new URL(internalBase).origin;
|
||||
} catch {
|
||||
return xml;
|
||||
}
|
||||
const escaped = internalOrigin.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
||||
const publicOrigin = String(publicBase).replace(/\/+$/, '');
|
||||
return xml.replace(new RegExp(escaped, 'g'), publicOrigin);
|
||||
}
|
||||
|
||||
module.exports = function (RED) {
|
||||
function CollaboraWopiNode(config) {
|
||||
RED.nodes.createNode(this, config);
|
||||
@@ -24,6 +42,8 @@ module.exports = function (RED) {
|
||||
msg.payload = await getCapabilities(cfg);
|
||||
} else if (op === 'discovery') {
|
||||
msg.payload = await getDiscovery(cfg);
|
||||
const publicBase = cfg.collaboraPublicUrl || '';
|
||||
msg.payload = rewriteDiscoveryHosts(msg.payload, cfg.collaboraUrl, publicBase);
|
||||
} else if (op === 'buildEditor') {
|
||||
const publicBase = cfg.collaboraPublicUrl || cfg.collaboraUrl;
|
||||
const wopiSrc = encodeURIComponent(msg.wopiSrc || msg.WOPISrc || '');
|
||||
|
||||
+67
-7
@@ -4,15 +4,20 @@ const { getConfig, setError, setSuccess, clearStatus, pickMsgField } = require('
|
||||
const { ocsRequest } = require('../lib/ocs');
|
||||
const bridge = require('../lib/bridge');
|
||||
const { resolveFileId } = bridge;
|
||||
const { webdavGet, webdavPut } = require('../lib/webdav');
|
||||
const { webdavGet, webdavPut, ensureFolder, webdavPropfindFileId } = require('../lib/webdav');
|
||||
const { convertTo } = require('../lib/collabora');
|
||||
const {
|
||||
resolveDestNcPath,
|
||||
assertSafeDestination,
|
||||
contentTypeForFormat,
|
||||
normalizeNcPath
|
||||
normalizeNcPath,
|
||||
DEFAULT_OUTPUT_FOLDER
|
||||
} = require('../lib/utils');
|
||||
|
||||
function hasExtension(p) {
|
||||
return /\.[^/.]+$/.test(String(p).replace(/\/+$/, ''));
|
||||
}
|
||||
|
||||
module.exports = function (RED) {
|
||||
function NcOfficeNode(config) {
|
||||
RED.nodes.createNode(this, config);
|
||||
@@ -41,16 +46,69 @@ module.exports = function (RED) {
|
||||
break;
|
||||
}
|
||||
case 'templates:create': {
|
||||
// richdocuments OCS#createFromTemplate($path, $template)
|
||||
// POST /ocs/v2.php/apps/richdocuments/api/v1/templates/new
|
||||
const template = pickMsgField(msg, 'template', 'templateId');
|
||||
if (template === undefined || template === null || template === '') {
|
||||
throw new Error('templates:create kräver msg.template (numeriskt id från templates:list)');
|
||||
}
|
||||
|
||||
let path = normalizeNcPath(
|
||||
pickMsgField(msg, 'path', 'destNcPath') ||
|
||||
msg.templatePath ||
|
||||
undefined
|
||||
);
|
||||
if (!path) {
|
||||
const name = msg.destName || msg.fileName;
|
||||
if (!name) {
|
||||
throw new Error('templates:create kräver msg.path eller msg.destFolder+msg.destName');
|
||||
}
|
||||
const folder = normalizeNcPath(msg.destFolder || DEFAULT_OUTPUT_FOLDER);
|
||||
path = normalizeNcPath((folder.endsWith('/') ? folder : folder + '/') + String(name).replace(/^\/+/, ''));
|
||||
}
|
||||
|
||||
// Ärv extension från mallen om målnamnet saknar en.
|
||||
if (!hasExtension(path)) {
|
||||
const ext = pickMsgField(msg, 'templateExtension', 'extension');
|
||||
if (ext) {
|
||||
path += '.' + String(ext).replace(/^\./, '');
|
||||
}
|
||||
}
|
||||
|
||||
// Idempotent: finns filen redan → återanvänd (ingen
|
||||
// "namn (2)"-dubblett via direct editing).
|
||||
try {
|
||||
await webdavPropfindFileId(cfg, path);
|
||||
msg.template = Number(template);
|
||||
msg.path = path;
|
||||
msg.createdPath = path;
|
||||
msg.reused = true;
|
||||
msg.payload = { path, reused: true };
|
||||
setSuccess(node, msg, 'templates:create (återanvänd)');
|
||||
send(msg);
|
||||
done();
|
||||
return;
|
||||
} catch (e) { /* finns inte — skapa nedan */ }
|
||||
|
||||
// Mallifyllning via direct editing kräver att mappen finns.
|
||||
await ensureFolder(cfg, path.substring(0, path.lastIndexOf('/')) || '/');
|
||||
|
||||
result = await ocsRequest(cfg, {
|
||||
method: 'POST',
|
||||
path: '/ocs/v2.php/apps/richdocuments/api/v1/templates/new',
|
||||
body: {
|
||||
templateId: msg.templateId,
|
||||
fileName: msg.fileName || msg.destName,
|
||||
templatePath: msg.templatePath
|
||||
path,
|
||||
template: Number(template)
|
||||
}
|
||||
});
|
||||
msg.payload = result.data;
|
||||
|
||||
msg.template = Number(template);
|
||||
msg.path = path;
|
||||
msg.createdPath = path;
|
||||
if (result.data && typeof result.data === 'object' && result.data.url) {
|
||||
msg.directEditUrl = result.data.url;
|
||||
}
|
||||
msg.payload = { ...result.data, path };
|
||||
break;
|
||||
}
|
||||
case 'template:extractFields': {
|
||||
@@ -80,11 +138,13 @@ module.exports = function (RED) {
|
||||
break;
|
||||
}
|
||||
case 'document:direct': {
|
||||
// richdocuments OCS#createDirect($fileId) binder parametern
|
||||
// per metodnamn — skicka både fileId och fileid (Number).
|
||||
const fileId = await resolveFileId(cfg, msg);
|
||||
result = await ocsRequest(cfg, {
|
||||
method: 'POST',
|
||||
path: '/ocs/v2.php/apps/richdocuments/api/v1/document',
|
||||
body: { fileid: Number(fileId) }
|
||||
body: { fileId: Number(fileId), fileid: Number(fileId) }
|
||||
});
|
||||
msg.fileId = fileId;
|
||||
msg.editorUrl = result.data?.url || result.data;
|
||||
|
||||
Reference in New Issue
Block a user