@fiduswriter/editor 0.1.7 → 0.1.9

package/dist/exporter/native/copy.js

@@ -1,8 +1,117 @@
 import { SaveCopy as GenericSaveCopy } from "@fiduswriter/document/exporter/native";
-import { addProgress, gettext, shortFileTitle } from "fwtoolkit";
+import { addAlert, addProgress, gettext, postJson, shortFileTitle } from "fwtoolkit";
 import { E2EEEncryptor } from "../../e2ee/encryptor.js";
 import { E2EEKeyManager } from "../../e2ee/key-manager.js";
 import { NativeImporter } from "@fiduswriter/document/importer/native";
+async function maybeDecryptImage(imageEntry, sourceKey) {
+    if (!sourceKey || !imageEntry.file) {
+        return;
+    }
+    if (imageEntry.file_type !== "application/octet-stream") {
+        return;
+    }
+    const fileBuffer = await imageEntry.file.arrayBuffer();
+    const bytes = new Uint8Array(fileBuffer);
+    let binary = "";
+    const chunkSize = 65536;
+    for (let i = 0; i < bytes.length; i += chunkSize) {
+        const chunk = bytes.subarray(i, i + chunkSize);
+        binary += String.fromCharCode.apply(null, chunk);
+    }
+    const base64 = btoa(binary);
+    const decrypted = await E2EEEncryptor.decryptBufferToBase64(base64, sourceKey);
+    const mime = imageEntry.original_file_type || "image/png";
+    const byteCharacters = atob(decrypted);
+    const byteNumbers = new Array(byteCharacters.length);
+    for (let i = 0; i < byteCharacters.length; i++) {
+        byteNumbers[i] = byteCharacters.charCodeAt(i);
+    }
+    const byteArray = new Uint8Array(byteNumbers);
+    imageEntry.file = new Blob([byteArray], { type: mime });
+    imageEntry.file_type = mime;
+}
+function createNativeImporterBackend(user, e2eeOptions) {
+    return {
+        createDoc: (template, importId, path, e2ee, files) => {
+            const jsonData = {
+                template: template.content,
+                export_templates: template.exportTemplates,
+                document_styles: template.documentStyles,
+                import_id: importId
+                    ? importId
+                    : template.content.attrs.import_id,
+                template_title: template.content.attrs.template,
+                path
+            };
+            if (e2ee?.enabled) {
+                jsonData.e2ee = true;
+                if (e2ee.salt) {
+                    jsonData.e2ee_salt = e2ee.salt;
+                }
+                if (e2ee.iterations) {
+                    jsonData.e2ee_iterations = e2ee.iterations;
+                }
+            }
+            return postJson("/api/document/import/create/", jsonData, files)
+                .then(({ json }) => ({
+                id: json.id,
+                path: json.path,
+                e2ee: json.e2ee,
+                template: json.template
+            }))
+                .catch(error => {
+                addAlert("error", gettext("Could not create document"));
+                throw error;
+            });
+        },
+        saveImages: async (images, docId, e2ee) => {
+            const isE2EE = e2ee?.enabled;
+            const endpoint = isE2EE
+                ? "/api/document/e2ee_image/"
+                : "/api/document/import/image/";
+            const imageTranslationTable = {};
+            await Promise.all(Object.values(images.db).map(async (imageEntry) => {
+                await maybeDecryptImage(imageEntry, e2ee?.sourceKey);
+                const encryptedFile = e2ee?.enabled && e2ee.key
+                    ? await E2EEEncryptor.encryptImage(imageEntry.file, e2ee.key)
+                    : imageEntry.file;
+                const jsonData = {
+                    doc_id: docId,
+                    title: imageEntry.title,
+                    copyright: imageEntry.copyright,
+                    checksum: imageEntry.checksum
+                };
+                const files = {
+                    image: {
+                        file: encryptedFile,
+                        filename: imageEntry.image.split("/").pop()
+                    }
+                };
+                const { json } = await postJson(endpoint, jsonData, files);
+                imageTranslationTable[imageEntry.id] = json.id;
+            }));
+            return imageTranslationTable;
+        },
+        saveDocument: async (saveData, e2ee) => {
+            if (e2ee?.enabled && e2ee.key) {
+                saveData.content = await E2EEEncryptor.encryptObject(saveData.content, e2ee.key);
+                saveData.comments = await E2EEEncryptor.encryptObject(saveData.comments || {}, e2ee.key);
+                saveData.bibliography = await E2EEEncryptor.encryptObject(saveData.bibliography, e2ee.key);
+                saveData.title = await E2EEEncryptor.encrypt(saveData.title, e2ee.key);
+            }
+            return postJson("/api/document/import/", saveData)
+                .then(({ json }) => ({ added: json.added, updated: json.updated }))
+                .catch(error => {
+                addAlert("error", `${gettext("Could not save ")} ${shortFileTitle(saveData.title, "")}`);
+                throw error;
+            });
+        },
+        encryptImage: E2EEEncryptor.encryptImage.bind(E2EEEncryptor),
+        encryptObject: E2EEEncryptor.encryptObject.bind(E2EEEncryptor),
+        encrypt: E2EEEncryptor.encrypt.bind(E2EEEncryptor),
+        storeKeyInSession: E2EEKeyManager.storeKeyInSession.bind(E2EEKeyManager)
+    };
+}
 export class SaveCopy extends GenericSaveCopy {
     constructor(doc, bibDB, imageDB, newUser, importId = null, e2eeOptions = null) {
         const title = shortFileTitle(doc.title, doc.path || "");
@@ -16,7 +125,11 @@ export class SaveCopy extends GenericSaveCopy {
             generateSalt: E2EEKeyManager.generateSalt.bind(E2EEKeyManager),
             deriveKey: E2EEKeyManager.deriveKey.bind(E2EEKeyManager)
         };
-        const importDocument = (doc, bibDB, imageDB, httpIncludes, options) => new NativeImporter(doc, bibDB, imageDB, httpIncludes, options.user, options.importId, options.requestedPath, null, options.e2eeOptions).init();
+        const importDocument = (doc, bibDB, imageDB, httpIncludes, options) => new NativeImporter(doc, bibDB, imageDB, httpIncludes, options.user, createNativeImporterBackend(options.user, options.e2eeOptions), {
+            importId: options.importId,
+            requestedPath: options.requestedPath,
+            e2eeOptions: options.e2eeOptions
+        }).init();
         super(doc, bibDB, imageDB, newUser, {
             importId,
             e2eeOptions,

package/dist/exporter/native/copy.js.map

@@ -1 +1 @@
-{"version":3,"file":"copy.js","sourceRoot":"","sources":["../../../src/exporter/native/copy.js"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,IAAI,eAAe,EAAC,MAAM,uCAAuC,CAAA;AACjF,OAAO,EAAC,WAAW,EAAE,OAAO,EAAE,cAAc,EAAC,MAAM,WAAW,CAAA;AAC9D,OAAO,EAAC,aAAa,EAAC,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAC,cAAc,EAAC,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAC,cAAc,EAAC,MAAM,uCAAuC,CAAA;AAEpE,MAAM,OAAO,QAAS,SAAQ,eAAe;IACzC,YACI,GAAG,EACH,KAAK,EACL,OAAO,EACP,OAAO,EACP,QAAQ,GAAG,IAAI,EACf,WAAW,GAAG,IAAI;QAElB,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAA;QACvD,MAAM,IAAI,GAAG,WAAW,CACpB,MAAM,EACN,GAAG,KAAK,KAAK,OAAO,CAAC,kBAAkB,CAAC,EAAE,EAC1C,EAAC,SAAS,EAAE,IAAI,EAAC,CACpB,CAAA;QACD,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAC7C,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QACpC,MAAM,IAAI,GAAG;YACT,aAAa,EAAE,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC;YAC9D,aAAa,EAAE,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC;YAC9D,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC;YAClD,YAAY,EAAE,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC;YAC5D,YAAY,EAAE,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC;YAC9D,SAAS,EAAE,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC;SAC3D,CAAA;QAED,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE,CAClE,IAAI,cAAc,CACd,GAAG,EACH,KAAK,EACL,OAAO,EACP,YAAY,EACZ,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,aAAa,EACrB,IAAI,EACJ,OAAO,CAAC,WAAW,CACtB,CAAC,IAAI,EAAE,CAAA;QAEZ,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE;YAChC,QAAQ;YACR,WAAW;YACX,IAAI;YACJ,cAAc;YACd,gBAAgB;SACnB,CAAC,CAAA;IACN,CAAC;CACJ"}
+{"version":3,"file":"copy.js","sourceRoot":"","sources":["../../../src/exporter/native/copy.js"],"names":[],"mappings":"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"}

package/dist/exporter/native/revision.js

@@ -50,5 +50,11 @@ export class SaveRevision extends GenericSaveRevision {
             progressCallback
         });
     }
+    init() {
+        return super.init().then(result => {
+            addAlert("success", gettext("Revision saved."));
+            return result;
+        });
+    }
 }
 //# sourceMappingURL=revision.js.map

package/dist/exporter/native/revision.js.map

@@ -1 +1 @@
-{"version":3,"file":"revision.js","sourceRoot":"","sources":["../../../src/exporter/native/revision.js"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,IAAI,mBAAmB,EAAC,MAAM,uCAAuC,CAAA;AACzF,OAAO,EAAC,UAAU,EAAC,MAAM,2CAA2C,CAAA;AACpE,OAAO,EAAC,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAC,MAAM,WAAW,CAAA;AAC9E,OAAO,EAAC,wBAAwB,EAAC,MAAM,qCAAqC,CAAA;AAE5E,MAAM,OAAO,YAAa,SAAQ,mBAAmB;IACjD,YAAY,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG;QACtC,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAA;QACvD,MAAM,IAAI,GAAG,WAAW,CACpB,MAAM,EACN,GAAG,KAAK,KAAK,OAAO,CAAC,oBAAoB,CAAC,EAAE,EAC5C,EAAC,SAAS,EAAE,IAAI,EAAC,CACpB,CAAA;QACD,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAC7C,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QAEpC,MAAM,OAAO,GAAG,KAAK,CAAC,EAAE;YACpB,IAAI,CAAC,KAAK,EAAE,CAAA;YACZ,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,uCAAuC,CAAC,CAAC,CAAA;YACnE,IAAI,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC;gBAClB,QAAQ,CACJ,MAAM,EACN,OAAO,CACH,uEAAuE,CAC1E,CACJ,CAAA;YACL,CAAC;iBAAM,CAAC;gBACJ,MAAM,KAAK,CAAA;YACf,CAAC;QACL,CAAC,CAAA;QAED,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACtC,MAAM,gBAAgB,GAAG,IAAI,wBAAwB,CACjD,KAAK,EACL,qCAAqC,EACrC,KAAK,EACL,KAAK,CACR,CAAA;YACD,OAAO,gBAAgB,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;gBACvC,SAAS,EAAE,gBAAgB,CAAC,SAAS;gBACrC,SAAS,EAAE,gBAAgB,CAAC,SAAS;aACxC,CAAC,CAAC,CAAA;QACP,CAAC,CAAA;QAED,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YACjC,OAAO,IAAI,CACP,uBAAuB,EACvB;gBACI,IAAI;gBACJ,WAAW,EAAE,GAAG,CAAC,EAAE;aACtB,EACD;gBACI,IAAI,EAAE;oBACF,IAAI,EAAE,IAAI;oBACV,QAAQ,EAAE,GAAG,UAAU,CACnB,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,CACtC,QAAQ;iBACZ;aACJ,CACJ;iBACI,IAAI,CACD,GAAG,EAAE,GAAE,CAAC,EACR,GAAG,EAAE;gBACD,IAAI,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC;oBAClB,QAAQ,CACJ,MAAM,EACN,OAAO,CACH,uEAAuE,CAC1E,CACJ,CAAA;gBACL,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC,CAAA;YAC5D,CAAC,CACJ;iBACA,KAAK,CAAC,KAAK,CAAC,EAAE;gBACX,MAAM,KAAK,CAAA;YACf,CAAC,CAAC,CAAA;QACV,CAAC,CAAA;QAED,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE;YAC7C,gBAAgB;YAChB,OAAO;YACP,gBAAgB;SACnB,CAAC,CAAA;IACN,CAAC;CACJ"}
+{"version":3,"file":"revision.js","sourceRoot":"","sources":["../../../src/exporter/native/revision.js"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fiduswriter/editor",
-    "version": "0.1.7",
+    "version": "0.1.9",
     "description": "Fidus Writer browser editor",
     "repository": {
         "type": "git",

package/src/exporter/native/copy.js

@@ -1,9 +1,144 @@
 import {SaveCopy as GenericSaveCopy} from "@fiduswriter/document/exporter/native"
-import {addProgress, gettext, shortFileTitle} from "fwtoolkit"
+import {addAlert, addProgress, gettext, postJson, shortFileTitle} from "fwtoolkit"
 import {E2EEEncryptor} from "../../e2ee/encryptor.js"
 import {E2EEKeyManager} from "../../e2ee/key-manager.js"
 import {NativeImporter} from "@fiduswriter/document/importer/native"
 
+async function maybeDecryptImage(imageEntry, sourceKey) {
+    if (!sourceKey || !imageEntry.file) {
+        return
+    }
+    if (imageEntry.file_type !== "application/octet-stream") {
+        return
+    }
+    const fileBuffer = await imageEntry.file.arrayBuffer()
+    const bytes = new Uint8Array(fileBuffer)
+    let binary = ""
+    const chunkSize = 65536
+    for (let i = 0; i < bytes.length; i += chunkSize) {
+        const chunk = bytes.subarray(i, i + chunkSize)
+        binary += String.fromCharCode.apply(null, chunk)
+    }
+    const base64 = btoa(binary)
+    const decrypted = await E2EEEncryptor.decryptBufferToBase64(base64, sourceKey)
+    const mime = imageEntry.original_file_type || "image/png"
+    const byteCharacters = atob(decrypted)
+    const byteNumbers = new Array(byteCharacters.length)
+    for (let i = 0; i < byteCharacters.length; i++) {
+        byteNumbers[i] = byteCharacters.charCodeAt(i)
+    }
+    const byteArray = new Uint8Array(byteNumbers)
+    imageEntry.file = new Blob([byteArray], {type: mime})
+    imageEntry.file_type = mime
+}
+
+function createNativeImporterBackend(user, e2eeOptions) {
+    return {
+        createDoc: (template, importId, path, e2ee, files) => {
+            const jsonData = {
+                template: template.content,
+                export_templates: template.exportTemplates,
+                document_styles: template.documentStyles,
+                import_id: importId
+                    ? importId
+                    : template.content.attrs.import_id,
+                template_title: template.content.attrs.template,
+                path
+            }
+            if (e2ee?.enabled) {
+                jsonData.e2ee = true
+                if (e2ee.salt) {
+                    jsonData.e2ee_salt = e2ee.salt
+                }
+                if (e2ee.iterations) {
+                    jsonData.e2ee_iterations = e2ee.iterations
+                }
+            }
+            return postJson("/api/document/import/create/", jsonData, files)
+                .then(({json}) => ({
+                    id: json.id,
+                    path: json.path,
+                    e2ee: json.e2ee,
+                    template: json.template
+                }))
+                .catch(error => {
+                    addAlert("error", gettext("Could not create document"))
+                    throw error
+                })
+        },
+        saveImages: async (images, docId, e2ee) => {
+            const isE2EE = e2ee?.enabled
+            const endpoint = isE2EE
+                ? "/api/document/e2ee_image/"
+                : "/api/document/import/image/"
+            const imageTranslationTable = {}
+            await Promise.all(
+                Object.values(images.db).map(async imageEntry => {
+                    await maybeDecryptImage(imageEntry, e2ee?.sourceKey)
+                    const encryptedFile =
+                        e2ee?.enabled && e2ee.key
+                            ? await E2EEEncryptor.encryptImage(
+                                  imageEntry.file,
+                                  e2ee.key
+                              )
+                            : imageEntry.file
+                    const jsonData = {
+                        doc_id: docId,
+                        title: imageEntry.title,
+                        copyright: imageEntry.copyright,
+                        checksum: imageEntry.checksum
+                    }
+                    const files = {
+                        image: {
+                            file: encryptedFile,
+                            filename: imageEntry.image.split("/").pop()
+                        }
+                    }
+                    const {json} = await postJson(endpoint, jsonData, files)
+                    imageTranslationTable[imageEntry.id] = json.id
+                })
+            )
+            return imageTranslationTable
+        },
+        saveDocument: async (saveData, e2ee) => {
+            if (e2ee?.enabled && e2ee.key) {
+                saveData.content = await E2EEEncryptor.encryptObject(
+                    saveData.content,
+                    e2ee.key
+                )
+                saveData.comments = await E2EEEncryptor.encryptObject(
+                    saveData.comments || {},
+                    e2ee.key
+                )
+                saveData.bibliography = await E2EEEncryptor.encryptObject(
+                    saveData.bibliography,
+                    e2ee.key
+                )
+                saveData.title = await E2EEEncryptor.encrypt(
+                    saveData.title,
+                    e2ee.key
+                )
+            }
+            return postJson("/api/document/import/", saveData)
+                .then(({json}) => ({added: json.added, updated: json.updated}))
+                .catch(error => {
+                    addAlert(
+                        "error",
+                        `${gettext("Could not save ")} ${shortFileTitle(
+                            saveData.title,
+                            ""
+                        )}`
+                    )
+                    throw error
+                })
+        },
+        encryptImage: E2EEEncryptor.encryptImage.bind(E2EEEncryptor),
+        encryptObject: E2EEEncryptor.encryptObject.bind(E2EEEncryptor),
+        encrypt: E2EEEncryptor.encrypt.bind(E2EEEncryptor),
+        storeKeyInSession: E2EEKeyManager.storeKeyInSession.bind(E2EEKeyManager)
+    }
+}
+
 export class SaveCopy extends GenericSaveCopy {
     constructor(
         doc,
@@ -37,10 +172,12 @@ export class SaveCopy extends GenericSaveCopy {
                 imageDB,
                 httpIncludes,
                 options.user,
-                options.importId,
-                options.requestedPath,
-                null,
-                options.e2eeOptions
+                createNativeImporterBackend(options.user, options.e2eeOptions),
+                {
+                    importId: options.importId,
+                    requestedPath: options.requestedPath,
+                    e2eeOptions: options.e2eeOptions
+                }
             ).init()
 
         super(doc, bibDB, imageDB, newUser, {

package/src/exporter/native/revision.js

@@ -83,4 +83,11 @@ export class SaveRevision extends GenericSaveRevision {
             progressCallback
         })
     }
+
+    init() {
+        return super.init().then(result => {
+            addAlert("success", gettext("Revision saved."))
+            return result
+        })
+    }
 }