Revert "Downloadable logs (#152)"

SharkPool-SP · web-flow · commit d400ac5b3c5f · 2025-08-19T22:28:55.000-07:00
This reverts commit ea4ab36.
diff --git a/src/components/crash-message/crash-message.jsx b/src/components/crash-message/crash-message.jsx
@@ -5,7 +5,6 @@ import {FormattedMessage} from 'react-intl';
 
 import styles from './crash-message.css';
 import reloadIcon from './reload.svg';
-import { downloadLogs } from '../../lib/pm-log-capture.js';
 
 const CrashMessage = props => (
     <div className={styles.crashWrapper}>
@@ -26,7 +25,7 @@ const CrashMessage = props => (
                     defaultMessage={'We are so sorry, but it looks like the page has crashed.' +
                         ' Please refresh your page to try' +
                         ' again.' +
-                        ' If the problem persists, please report the downloadable error below to our Discord.'}
+                        ' If the problem persists, please report this error to our Discord.'}
                     description="Message to inform the user that page has crashed."
                     id="tw.gui.crashMessage.description"
                 />
@@ -58,12 +57,6 @@ const CrashMessage = props => (
                     id="gui.crashMessage.reload"
                 />
             </button>
-            <button
-                className={styles.reloadButton}
-                onClick={downloadLogs}
-            >
-                {'Download Error'}
-            </button>
         </Box>
     </div>
 );
diff --git a/src/components/menu-bar/menu-bar.jsx b/src/components/menu-bar/menu-bar.jsx
@@ -85,7 +85,7 @@ import sharedMessages from '../../lib/shared-messages';
 import SeeInsideButton from './tw-see-inside.jsx';
 import { notScratchDesktop } from '../../lib/isScratchDesktop.js';
 
-import { downloadLogs } from '../../lib/pm-log-capture.js';
+//import { consoleLogs } from '../../lib/pm-log-capture.js';
 
 const ariaMessages = defineMessages({
     language: {
@@ -207,7 +207,6 @@ class MenuBar extends React.Component {
             'handleClickPackager',
             'handleClickRestorePoints',
             'handleClickSeeCommunity',
-            'handleClickDownloadLogs',
             'handleClickShare',
             'handleKeyPress',
             'handleLanguageMouseUp',
@@ -423,7 +422,21 @@ class MenuBar extends React.Component {
             this.props.onRequestCloseAbout();
         };
     }
-    handleClickDownloadLogs() { downloadLogs(); }
+    /*
+      - hidden until this is actually helpful for developers
+      - unhide when a solution is found for not blocking error tracking/using 3rd parties
+    handleClickDownloadLogs() {
+        const str = JSON.stringify(consoleLogs);
+        const a = document.createElement('a');
+        a.style.display = 'none';
+        document.body.append(a);
+        const url = window.URL.createObjectURL(new Blob([str]));
+        a.href = url;
+        a.download = 'pm-log-trace.json';
+        a.click();
+        window.URL.revokeObjectURL(url);
+        a.remove();
+    }*/
     render() {
         const saveNowMessage = (
             <FormattedMessage
@@ -847,9 +860,6 @@ class MenuBar extends React.Component {
                                             id="pm.menuBar.moreSettings"
                                         />
                                     </MenuItem>
-                                    <MenuItem onClick={this.handleClickDownloadLogs}>
-                                        Download Logs
-                                    </MenuItem>
                                 </MenuSection>
                             </MenuBarMenu>
                         </div>
diff --git a/src/lib/analytics.js b/src/lib/analytics.js
@@ -4,4 +4,3 @@ const GoogleAnalytics = {
 };
 
 export default GoogleAnalytics;
- 
diff --git a/src/lib/pm-log-capture.js b/src/lib/pm-log-capture.js
@@ -1,6 +1,3 @@
-import JSZip from 'jszip';
-import uid from './uid';
-
 /**
  * String.prototype.indexOf, but it returns NaN not -1 on failure
  * @param {string} str The string to check in
@@ -59,7 +56,7 @@ const push = (type, message, trace) => {
         trace
     });
 };
-const _parseFirefoxStack = stack => stack.split('\n').slice(1)
+const _parseFirefoxStack = stack => stack.split('\n')
     .map(line => {
         const at = line.indexOf('@');
         const secondCol = line.lastIndexOf(':');
@@ -90,7 +87,7 @@ const _parseFirefoxStack = stack => stack.split('\n').slice(1)
             origin
         };
     });
-const _parseChromeStack = stack => stack.split('\n').slice(2)
+const _parseChromeStack = stack => stack.split('\n').slice(1)
     .map(line => {
         // we have no use for the human readable fluff
         line = line.slice(7);
@@ -145,83 +142,18 @@ const parseStack = (stack, url, line, column) => {
     if (stack.split('\n', 2)[0].includes('@')) return _parseFirefoxStack(stack);
     return _parseChromeStack(stack);
 };
-const downloadLogs = async () => {
-    const files = new JSZip();
-    files.file('logs.json', JSON.stringify(consoleLogs));
-    const index = {};
-    // get files
-    // sadly, this may just dead ass fail to get files due to blob lifecycle
-    // and i dont want to make these files get stored at runtime, cause poopy doo doo ram
-    for (const log of consoleLogs) {
-        for (const trace of log.trace) {
-            if (index[trace.url]) continue;
-            const id = uid();
-            const content = await fetch(trace.url)
-                .then(res => res.ok ? res.text() : null)
-                .catch(() => {});
-            if (!content) continue;
-            files.file(id, content);
-            index[trace.url] = id;
-        }
-    }
-    files.file('index.json', JSON.stringify(index));
-    let blob = await files.generateAsync({ type: 'blob', compression: 'DEFLATE' });
-    let filename = 'pm-error-download.pml';
-    /* actually, this is a bad idea
-    // if we can, include the project
-    if (vm) {
-        filename = 'pm-error-download.pmp';
-        const archive = vm._saveProjectZip();
-        archive.file('logs.json', blob);
-        blob = await archive.generateAsync({
-            type: 'blob',
-            mimeType: 'application/x.scratch.sb3',
-            compression: 'DEFLATE'
-        });
-    }
-    */
-    const a = document.createElement('a');
-    a.style.display = 'none';
-    document.body.append(a);
-    const url = window.URL.createObjectURL(blob);
-    a.href = url;
-    a.download = filename;
-    a.click();
-    window.URL.revokeObjectURL(url);
-    a.remove();
-};
-window.downloadLogs = downloadLogs;
 
 window.addEventListener('error', e =>
     push('error', e.message, parseStack(`\n${e.error.stack}`, e.filename, e.lineno, e.colno)));
 window.addEventListener('unhandledrejection', e => push('promiseError', e.reason, []));
-class StackTrace extends Error {
-    constructor() {
-        super('');
-        if (this.stack.split('\n', 2)[0].includes('@'))
-            this.stack = this.stack
-                .split('\n')
-                .slice(2, 3)
-                .join('\n');
-        else {
-            // chrome is weird ngl
-            const lines = this.stack
-                .split('\n')
-                .slice(0, 3);
-            lines.splice(1, 2);
-            this.stack = lines.join('\n');
-        }
-    }
+for (const name of ['log', 'warn', 'error', 'debug', 'info']) {
+    const item = window.console[name];
+    window.console[name] = (...args) => {
+        let stack = [];
+        if (browserHasStack) stack = parseStack(new Error().stack);
+        push(name, args, stack);
+        item(...args);
+    };
 }
-if (!String(window.location.href).startsWith(`http://localhost:`)) {
-    for (const name of ['log', 'warn', 'error', 'debug', 'info']) {
-        const item = window.console[name];
-        window.console[name] = (...args) => {
-            let stack = [];
-            if (browserHasStack) stack = parseStack(new Error().stack);
-            push(name, args, stack);
-            item.call(console, ...args, new StackTrace());
-        };
-    }
-}
-export { consoleLogs, parseStack, push, downloadLogs };
+
+export { consoleLogs, parseStack, push };
diff --git a/src/lib/uid.js b/src/lib/uid.js
@@ -6,10 +6,10 @@
  * Legal characters for the unique ID.
  * Should be all on a US keyboard.  No XML special characters or control codes.
  * Removed $ due to issue 251.
- * Removed all symbols due to use in files
  * @private
  */
-const soup_ = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+const soup_ = '!#%()*+,-./:;=?@[]^_`{|}~' +
+    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 
 /**
  * Generate a unique ID, from Blockly.  This should be globally unique.

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,3 @@ const GoogleAnalytics = {`
`4`	`4`	`};`
`5`	`5`
`6`	`6`	`export default GoogleAnalytics;`
`7`		`-`