Debug file upload in production

This commit is contained in:
Sam Becker 2023-10-14 12:46:34 -05:00
parent d41c7f4617
commit 3dac053a90
3 changed files with 183 additions and 2 deletions

View File

@ -1,15 +1,18 @@
{
"cSpell.words": [
"ABCDEFGHIJKLMNOP",
"ARROWLEFT",
"ARROWRIGHT",
"camelcase",
"exif",
"ghijklmnopqrstuv",
"hgetall",
"hset",
"Lightbox",
"nanoids",
"nextjs",
"qaub",
"QRSTUVWXYZ",
"skippable",
"sonner",
"thephotoblog",
@ -17,6 +20,7 @@
"unnest",
"UsKSGcbt",
"WRHGZC",
"wxyz",
"zadd",
"zrange"
],

View File

@ -27,7 +27,6 @@ import AdminGrid from '@/admin/AdminGrid';
import DeleteButton from '@/admin/DeleteButton';
import EditButton from '@/admin/EditButton';
import BlobUrls from '@/admin/BlobUrls';
import { PRO_MODE_ENABLED } from '@/site/config';
export const runtime = 'edge';
@ -54,7 +53,7 @@ export default async function AdminTagsPage({
<SiteGrid
contentMain={
<div className="space-y-8">
<PhotoUpload shouldResize={PRO_MODE_ENABLED} />
<PhotoUpload shouldResize={true} debug />
{blobPhotoUrls.length > 0 &&
<div className={cc(
'border-b pb-6',

178
src/lib/ExifRestorer.ts Normal file
View File

@ -0,0 +1,178 @@
/* eslint-disable max-len */
//Based on MinifyJpeg
//http://elicon.blog57.fc2.com/blog-entry-206.html
export const ExifRestorer = (function () {
const ExifRestorer: {
KEY_STR: string;
encode64: (input: Uint8Array) => string;
restore: (origFileBase64: string, resizedFileBase64: string) => string;
exifManipulation: (resizedFileBase64: string, segments: any[]) => Uint8Array;
getExifArray: (segments: any[]) => any[];
insertExif: (resizedFileBase64: string, exifArray: any[]) => any[];
slice2Segments: (rawImageArray: any[]) => any[];
decode64: (input: string) => any[];
} = {} as any;
ExifRestorer.KEY_STR =
'ABCDEFGHIJKLMNOP' +
'QRSTUVWXYZabcdef' +
'ghijklmnopqrstuv' +
'wxyz0123456789+/' +
'=';
ExifRestorer.encode64 = function (input) {
let output: any = '',
chr1: any, chr2: any, chr3: any = '',
enc1: any, enc2: any, enc3: any, enc4: any = '',
i = 0;
do {
chr1 = input[i++];
chr2 = input[i++];
chr3 = input[i++];
enc1 = chr1 >> 2;
enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
enc4 = chr3 & 63;
if (isNaN(chr2)) {
enc3 = enc4 = 64;
} else if (isNaN(chr3)) {
enc4 = 64;
}
output = output +
this.KEY_STR.charAt(enc1) +
this.KEY_STR.charAt(enc2) +
this.KEY_STR.charAt(enc3) +
this.KEY_STR.charAt(enc4);
chr1 = chr2 = chr3 = '';
enc1 = enc2 = enc3 = enc4 = '';
} while (i < input.length);
return output;
};
ExifRestorer.restore = function (origFileBase64, resizedFileBase64) {
if (!origFileBase64.match('data:image/jpeg;base64,')) {
return resizedFileBase64;
}
var rawImage = this.decode64(origFileBase64.replace('data:image/jpeg;base64,', ''));
var segments = this.slice2Segments(rawImage);
var image = this.exifManipulation(resizedFileBase64, segments);
return this.encode64(image);
};
ExifRestorer.exifManipulation = function (resizedFileBase64, segments) {
var exifArray = this.getExifArray(segments),
newImageArray = this.insertExif(resizedFileBase64, exifArray),
aBuffer = new Uint8Array(newImageArray);
return aBuffer;
};
ExifRestorer.getExifArray = function (segments) {
var seg;
for (var x = 0; x < segments.length; x++) {
seg = segments[x];
if (seg[0] == 255 && seg[1] == 225) //(ff e1)
{
return seg;
}
}
return [];
};
ExifRestorer.insertExif = function (resizedFileBase64, exifArray) {
var imageData = resizedFileBase64.replace('data:image/jpeg;base64,', ''),
buf = this.decode64(imageData),
separatePoint = buf.indexOf(255, 3),
mae = buf.slice(0, separatePoint),
ato = buf.slice(separatePoint),
array = mae;
array = array.concat(exifArray);
array = array.concat(ato);
return array;
};
ExifRestorer.slice2Segments = function (rawImageArray) {
var head = 0,
segments = [];
while (1) {
if (rawImageArray[head] == 255 && rawImageArray[head + 1] == 218) { break; }
if (rawImageArray[head] == 255 && rawImageArray[head + 1] == 216) {
head += 2;
}
else {
var length = rawImageArray[head + 2] * 256 + rawImageArray[head + 3],
endPoint = head + length + 2,
seg = rawImageArray.slice(head, endPoint);
segments.push(seg);
head = endPoint;
}
if (head > rawImageArray.length) { break; }
}
return segments;
};
ExifRestorer.decode64 = function (input) {
let
chr1: any, chr2: any, chr3: any = '',
enc1: any, enc2: any, enc3: any, enc4: any = '',
i = 0,
buf = [];
// remove all characters that are not A-Z, a-z, 0-9, +, /, or =
var base64test = /[^A-Za-z0-9\+\/\=]/g;
if (base64test.exec(input)) {
alert('There were invalid base64 characters in the input text.\n' +
'Valid base64 characters are A-Z, a-z, 0-9, \'+\', \'/\',and \'=\'\n' +
'Expect errors in decoding.');
}
input = input.replace(/[^A-Za-z0-9\+\/\=]/g, '');
do {
enc1 = this.KEY_STR.indexOf(input.charAt(i++));
enc2 = this.KEY_STR.indexOf(input.charAt(i++));
enc3 = this.KEY_STR.indexOf(input.charAt(i++));
enc4 = this.KEY_STR.indexOf(input.charAt(i++));
chr1 = (enc1 << 2) | (enc2 >> 4);
chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
chr3 = ((enc3 & 3) << 6) | enc4;
buf.push(chr1);
if (enc3 != 64) {
buf.push(chr2);
}
if (enc4 != 64) {
buf.push(chr3);
}
chr1 = chr2 = chr3 = '';
enc1 = enc2 = enc3 = enc4 = '';
} while (i < input.length);
return buf;
};
return ExifRestorer;
})();