Merge branch 'master' into eleanor-gptdraw

5 files changed, 66 insertions, 25 deletions

diff --git a/src/.DS_Store b/src/.DS_Store
index 9b66f8d8e..1ef749033 100644
--- a/src/.DS_Store
+++ b/src/.DS_Store
diff --git a/src/client/views/nodes/ImageBox.tsx b/src/client/views/nodes/ImageBox.tsx
index 4d35068ee..d847b7940 100644
--- a/src/client/views/nodes/ImageBox.tsx
+++ b/src/client/views/nodes/ImageBox.tsx
@@ -39,6 +39,8 @@ import { FieldView, FieldViewProps } from './FieldView';
 import { FocusViewOptions } from './FocusViewOptions';
 import './ImageBox.scss';
 import { OpenWhere } from './OpenWhere';
+import { Upload } from '../../../server/SharedMediaTypes';
+import { ImageUtils } from '../../util/Import & Export/ImageUtils';
 
 export class ImageEditorData {
     // eslint-disable-next-line no-use-before-define
@@ -310,6 +312,35 @@ export class ImageBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
             funcs.push({ description: 'Rotate Clockwise 90', event: this.rotate, icon: 'redo-alt' });
             funcs.push({ description: `Show ${this.layoutDoc._showFullRes ? 'Dynamic Res' : 'Full Res'}`, event: this.resolution, icon: 'expand' });
             funcs.push({ description: 'Set Native Pixel Size', event: this.setNativeSize, icon: 'expand-arrows-alt' });
+            funcs.push({
+                description: 'GetImageText',
+                event: () => {
+                    Networking.PostToServer('/queryFireflyImageText', {
+                        file: (file => {
+                            const ext = extname(file);
+                            return file.replace(ext, (this._error ? '_o' : this._curSuffix) + ext);
+                        })(ImageCast(this.Document[Doc.LayoutFieldKey(this.Document)])?.url.href),
+                    }).then(text => alert(text));
+                },
+                icon: 'expand-arrows-alt',
+            });
+            funcs.push({
+                description: 'Expand Image',
+                event: () => {
+                    Networking.PostToServer('/expandImage', {
+                        prompt: 'sunny skies',
+                        file: (file => {
+                            const ext = extname(file);
+                            return file.replace(ext, (this._error ? '_o' : this._curSuffix) + ext);
+                        })(ImageCast(this.Document[Doc.LayoutFieldKey(this.Document)])?.url.href),
+                    }).then((info: Upload.ImageInformation) => {
+                        const img = Docs.Create.ImageDocument(info.accessPaths.agnostic.client, { title: 'expand:' + this.Document.title });
+                        DocUtils.assignImageInfo(info, img);
+                        this._props.addDocTab(img, OpenWhere.addRight);
+                    });
+                },
+                icon: 'expand-arrows-alt',
+            });
             funcs.push({ description: 'Copy path', event: () => ClientUtils.CopyText(this.choosePath(field.url)), icon: 'copy' });
             funcs.push({
                 description: 'Open Image Editor',
diff --git a/src/server/ApiManagers/FireflyManager.ts b/src/server/ApiManagers/FireflyManager.ts
index 4425aff43..73cf94206 100644
--- a/src/server/ApiManagers/FireflyManager.ts
+++ b/src/server/ApiManagers/FireflyManager.ts
@@ -1,4 +1,4 @@
-import { Dropbox, files } from 'dropbox';
+import { Dropbox } from 'dropbox';
 import * as fs from 'fs';
 import * as multipart from 'parse-multipart-data';
 import * as path from 'path';
@@ -227,9 +227,9 @@ export default class FireflyManager extends ApiManager {
                 const { prompt, imageBlob, strength = 0.5 } = req.body;
                 const uploadId = imageBlob ? await this.uploadImageToFirefly(imageBlob) : null;
                 this.askFireflyOld(prompt, uploadId, strength).then(fire =>
-                    DashUploadUtils.UploadImage(JSON.parse(fire).url).then(info => {
+                    DashUploadUtils.UploadImage(JSON.parse(fire ?? '').url).then(info => {
                         if (info instanceof Error) _invalid(res, info.message);
-                        else _success(res, info.accessPaths.agnostic.client);
+                        else _success(res, info);
                     })
                 );
             },
diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index 868373474..5a880901b 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -70,10 +70,16 @@ export default class UploadManager extends ApiManager {
                             ]);
                         } else {
                             fileguids.split(';').map(guid => DashUploadUtils.uploadProgress.set(guid, `resampling images`));
+                            // original filenames with '.'s, such as a Macbook screenshot, can be a problem - their extension is not kept in formidable's newFilename.
+                            // This makes sure that the extension is preserved in the newFilename.
+                            const fixNewFilename = (f: formidable.File) => {
+                                if (path.extname(f.originalFilename ?? '') !== path.extname(f.newFilename)) f.newFilename = f.newFilename + path.extname(f.originalFilename ?? '');
+                                return f;
+                            };
                             const results = (
                                 await Promise.all(
                                     Array.from(Object.keys(files)).map(
-                                        async key => (!files[key] ? undefined : DashUploadUtils.upload(files[key]![0] /* , key */)) // key is the guid used by the client to track upload progress.
+                                        async key => (!files[key] ? undefined : DashUploadUtils.upload(fixNewFilename(files[key][0]) /* , key */)) // key is the guid used by the client to track upload progress.
                                     )
                                 )
                             ).filter(result => result && !(result.result instanceof Error));
@@ -147,13 +153,10 @@ export default class UploadManager extends ApiManager {
                     if (doc.id) {
                         doc.id = getId(doc.id);
                     }
-                    // eslint-disable-next-line no-restricted-syntax
                     for (const key in doc.fields) {
-                        // eslint-disable-next-line no-continue
                         if (!Object.prototype.hasOwnProperty.call(doc.fields, key)) continue;
 
                         const field = doc.fields[key];
-                        // eslint-disable-next-line no-continue
                         if (field === undefined || field === null) continue;
 
                         if (field.__type === 'Doc') {
@@ -182,11 +185,9 @@ export default class UploadManager extends ApiManager {
                         let docids: string[] = [];
                         let linkids: string[] = [];
                         try {
-                            // eslint-disable-next-line no-restricted-syntax
                             for (const name in files) {
                                 if (Object.prototype.hasOwnProperty.call(files, name)) {
                                     const f = files[name];
-                                    // eslint-disable-next-line no-continue
                                     if (!f) continue;
                                     const path2 = f[0]; // what about the rest of the array? are we guaranteed only one value is set?
                                     const zip = new AdmZip(path2.filepath);
diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index 351351ca5..a06fa3b6e 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -22,7 +22,6 @@ import { AzureManager } from './ApiManagers/AzureManager';
 import { AcceptableMedia, Upload } from './SharedMediaTypes';
 import { Directory, clientPathToFile, filesDirectory, pathToDirectory, publicDirectory, serverPathToFile } from './SocketData';
 import { resolvedServerUrl } from './server_Initialization';
-
 import { Worker, isMainThread, parentPort } from 'worker_threads';
 
 // Create an array to store worker threads
@@ -55,7 +54,8 @@ if (isMainThread) {
             .then(img => 
                 sizes.forEach(({ width, suffix }) =>
                     img.resize({ w: width || img.bitmap.width })
-                       .write(InjectSize(outputPath, suffix) as `${string}.${string}`)
+                        .write(InjectSize(outputPath, suffix) as `${string}.${string}`)
+                        .catch(e => console.log("Jimp error:", e))
                 ))
             .catch(e => console.log('Error Jimp:', e))
             .finally(() => unlinkSource && unlinkSync(imgSourcePath));
@@ -223,7 +223,6 @@ export namespace DashUploadUtils {
     const parseExifData = async (source: string) => {
         const image = await request.get(source, { encoding: null });
         const { /* data, */ error } = await new Promise<{ data: ExifData; error: string | undefined }>(resolve => {
-            // eslint-disable-next-line no-new
             new ExifImage({ image }, (exifError, data) => {
                 resolve({ data, error: exifError?.message });
             });
@@ -302,7 +301,6 @@ export namespace DashUploadUtils {
             // Bundle up the information into an object
             return {
                 source,
-                // eslint-disable-next-line radix
                 contentSize: parseInt(headers[size]),
                 contentType: headers[type],
                 nativeWidth,
@@ -345,15 +343,24 @@ export namespace DashUploadUtils {
         const outputPath = path.resolve(pathToDirectory(Directory.images), outputFileName);
         const sizes = imageResampleSizes(path.extname(outputFileName));
 
-        const imgReadStream = new Duplex();
-        imgReadStream.push(fs.readFileSync(imgSourcePath));
-        imgReadStream.push(null);
-        await Promise.all(
-            sizes.map(({ suffix }) => 
-                new Promise<unknown>(res =>
-                    imgReadStream.pipe(createWriteStream(writtenFiles[suffix] = InjectSize(outputPath, suffix))).on('close', res)
-                )
-        )); // prettier-ignore
+        if (unlinkSource) {
+            const imgReadStream = new Duplex();
+            imgReadStream.push(fs.readFileSync(imgSourcePath));
+            imgReadStream.push(null);
+            await Promise.all(
+                sizes.map(({ suffix }) => 
+                    new Promise<unknown>(res =>
+                        imgReadStream.pipe(createWriteStream(writtenFiles[suffix] = InjectSize(outputPath, suffix))).on('close', res)
+                    )
+            )); // prettier-ignore
+        } else {
+            await Promise.all(
+                sizes.map(({ suffix }) => 
+                    new Promise<unknown>(res =>
+                        request.get(imgSourcePath).pipe(createWriteStream(writtenFiles[suffix] = InjectSize(outputPath, suffix))).on('close', res)
+                    )
+            )); // prettier-ignore
+        }
 
         workerResample(imgSourcePath, outputPath, SizeSuffix.Original, unlinkSource);
         return writtenFiles;
@@ -370,7 +377,7 @@ export namespace DashUploadUtils {
      * @returns the accessPaths for the resized files.
      */
     export const UploadInspectedImage = async (metadata: Upload.InspectionResults, filename: string, prefix = '', cleanUp = true): Promise<Upload.ImageInformation> => {
-        const { requestable, source, ...remaining } = metadata;
+        const { requestable, ...remaining } = metadata;
         const dfltSuffix = remaining.contentType.split('/')[1].toLowerCase();
         const resolved = filename || `${prefix}upload_${Utils.GenerateGuid()}.${dfltSuffix === 'xml' ? 'jpg' : dfltSuffix}`;
         const { images } = Directory;
@@ -452,7 +459,7 @@ export namespace DashUploadUtils {
         }
         const outputFile = filename || result.filename || '';
 
-        return UploadInspectedImage(result, outputFile, prefix);
+        return UploadInspectedImage(result, outputFile, prefix, isLocal().exec(source) ? true : false);
     };
 
     type md5 = 'md5';
@@ -570,7 +577,9 @@ export namespace DashUploadUtils {
         switch (category) {
             case 'image':
                 if (imageFormats.includes(format)) {
-                    const result = await UploadImage(filepath, basename(filepath));
+                    const outputName = basename(filepath);
+                    const extname = path.extname(originalFilename ?? '');
+                    const result = await UploadImage(filepath, outputName.endsWith(extname) ? outputName : outputName + extname, undefined);
                     return { source: file, result };
                 }
                 fs.unlink(filepath, () => {});