Implement EEPROM client directly into the chat.

src/mami.js/eeprom/eeprom.js

@@ -1,37 +1,105 @@
-#include eeprom/script.jsx
+#include utility.js
 
-const MamiEEPROM = function(baseUrl, getAuthLine) {
-    if(typeof baseUrl !== 'string')
-        throw 'baseUrl must be a string';
+const MamiEEPROM = function(endPoint, getAuthLine) {
+    if(typeof endPoint !== 'string')
+        throw 'endPoint must be a string';
     if(typeof getAuthLine !== 'function')
         throw 'getAuthLine must be a function';
 
     // when the pools rewrite happen, retrieve this from futami common
     const appId = '1';
-    let client;
 
     return {
-        get client() {
-            return client;
-        },
-
-        init: async () => {
-            await MamiEEPROMLoadScript(baseUrl);
-            client = new EEPROM(appId, baseUrl, getAuthLine);
-        },
-
         create: fileInput => {
-            if(client === undefined)
-                throw 'eeprom client is uninitialised';
+            if(!(fileInput instanceof File))
+                throw 'fileInput must be an instance of window.File';
 
-            return client.create(fileInput);
+            let userAborted = false;
+            let abortHandler;
+            let progressHandler;
+
+            const reportProgress = ev => {
+                if(progressHandler !== undefined)
+                    progressHandler({
+                        loaded: ev.loaded,
+                        total: ev.total,
+                        progress: ev.total <= 0 ? 0 : ev.loaded / ev.total,
+                    });
+            };
+
+            return {
+                abort: () => {
+                    userAborted = true;
+                    if(typeof abortHandler === 'function')
+                        abortHandler();
+                },
+                onProgress: handler => {
+                    if(typeof handler !== 'function')
+                        throw 'handler must be a function';
+                    progressHandler = handler;
+                },
+                start: async () => {
+                    if(userAborted)
+                        throw 'File upload was cancelled by the user, it cannot be restarted.';
+
+                    try {
+                        const formData = new FormData;
+                        formData.append('src', appId);
+                        formData.append('file', fileInput);
+
+                        const result = await $x.post(`${endPoint}/uploads`, {
+                            type: 'json',
+                            headers: {
+                                Authorization: getAuthLine(),
+                            },
+                            upload: reportProgress,
+                            abort: handler => abortHandler = handler,
+                        }, formData);
+                        const body = result.body();
+                        console.log(body);
+                        if(body === null)
+                            throw "The upload server didn't return the metadata for some reason.";
+
+                        if(result.status !== 201)
+                            throw body.english ?? body.error ?? `Upload failed with status code ${result.status}`;
+
+                        body.isImage = () => body.type.startsWith('image/');
+                        body.isVideo = () => body.type.startsWith('video/');
+                        body.isAudio = () => body.type.startsWith('audio/');
+                        body.isMedia = () => body.isImage() || body.isAudio() || body.isVideo();
+
+                        return Object.freeze(body);
+                    } catch(ex) {
+                        if(userAborted)
+                            throw 'Upload has been cancelled by the user.';
+
+                        console.error(ex);
+                        throw ex;
+                    }
+                },
+            };
         },
 
         delete: async fileInfo => {
-            if(client === undefined)
-                throw 'eeprom client is uninitialised';
+            if(typeof fileInfo !== 'object')
+                throw 'fileInfo must be an object';
+            if(typeof fileInfo.urlf !== 'string')
+                throw 'fileInfo.urlf must be a string';
 
-            await client.delete(fileInfo);
+            const result = await $x.delete(fileInfo.urlf, {
+                type: 'json',
+                headers: {
+                    Authorization: getAuthLine(),
+                },
+            });
+
+            if(result.status !== 204) {
+                const body = result.body();
+                if(body === null)
+                    throw `Delete failed with status code ${result.status}`;
+
+                throw body.english ?? body.error ?? `Delete failed with status code ${result.status}`;
+            }
         },
     };
 };

src/mami.js/eeprom/script.jsx

@@ -1,19 +0,0 @@
-#include utility.js
-
-const MamiEEPROMLoadScript = baseUrl => {
-    return new Promise((resolve, reject) => {
-        if(typeof baseUrl !== 'string')
-            throw 'baseUrl must be a string';
-
-        const src = `${baseUrl}/scripts/eepromv1a.js`;
-
-        let script = $q(`script[src="${src}"]`);
-        if(script instanceof Element) {
-            resolve();
-            return;
-        }
-
-        script = <script src={src} onload={() => { resolve(); }} onerror={() => { $r(script); reject(); }} />;
-        document.body.appendChild(script);
-    });
-};

src/mami.js/main.js

@@ -716,11 +716,8 @@ const MamiInit = async args => {
     });
 
 
-    let doUpload;
     ctx.eeprom = new MamiEEPROM(futami.get('eeprom2'), MamiMisuzuAuth.getLine);
-    ctx.eeprom.init()
-        .catch(ex => { console.error('Failed to initialise EEPROM.', ex); })
-        .then(() => {
+
     sbUploads.addOption({
         name: 'view',
         text: 'View upload',
@@ -762,7 +759,7 @@ const MamiInit = async args => {
         },
     });
 
-            doUpload = async file => {
+    const doUpload = async file => {
         const entry = sbUploads.createEntry(file);
 
         const task = ctx.eeprom.create(file);
@@ -821,7 +818,6 @@ const MamiInit = async args => {
         for(const file of ev.detail.files)
             doUpload(file);
     });
-        });
 
     // figure out how to display a UI for this someday
     //args.parent.addEventListener('dragenter', ev => { console.info('dragenter', ev); });