pasta is done

Author: kirjavascript

database/pasta.js

@@ -2,38 +2,47 @@ const fs = require('fs').promises;
 const path = require('path');
 const { commandHash } = require('./commands');
 
+const exists = async (dir) => !!await fs.stat(dir).catch(_err => false);
+
 function getFilename(commandName, name) {
     const namespace = commandHash(commandName);
     const cleanName = commandHash(name);
     return path.join(__dirname, `../storage/pasta/${namespace}/${cleanName}`);
 }
 
-async function dirSize(commandName) {
-    const dir = path.join(
+function getDir(commandName) {
+    return path.join(
         __dirname,
         `../storage/pasta/${commandHash(commandName)}`,
     );
-    const stats = (await readdir(dir)).map((file) =>
+}
+
+async function dirSize(dir) {
+    const stats = (await fs.readdir(dir)).map((file) =>
         fs.stat(path.join(dir, file)),
     );
     return (await Promise.all(stats)).reduce((acc, { size }) => acc + size, 0);
 }
 
 async function loadPasta(commandName, pastaName) {
     const filename = getFilename(commandName, pastaName);
-    if (!(await fs.access(filename))) return;
+    if (!(await exists(filename))) return;
     return await fs.readFile(filename, 'utf8');
 }
 async function savePasta(commandName, pastaName, content) {
-    if ((await dirSize(commandName)) > 20971520)
+    const dir = getDir(commandName);
+    if (!await exists(dir)) {
+        await fs.mkdir(dir);
+    }
+    if ((await dirSize(dir)) > 20971520)
         throw new Error('paste namespace limit is 20MB');
     const filename = getFilename(commandName, pastaName);
     if (typeof content !== 'string')
         throw new Error('content must be a string');
     if (!content.length) throw new Error('string cannot be length zero');
     if (content.length > 1048576) throw new Error('paste size limit is 1MB');
     await fs.writeFile(filename, content, 'utf8');
-    const url = `/${commandName}/${pastaName}`;
+    const url = `/${encodeURIComponent(commandName)}/${encodeURIComponent(pastaName)}`;
     return {
         html: `/html${url}`,
         text: `/text${url}`,

irc/evaluate/vm.js

@@ -211,6 +211,7 @@ async function createVM({ node, maxTimeout = 60000 }) {
     ctx.setSync('_makePasta', timeoutRef((name, content) => (
         env.namespace
             && node.parent.database.pasta.save(env.namespace, name, content)
+                .then(result => new ivm.ExternalCopy(result).copyInto())
     )));
 
     const scriptRef = await (await isolate.compileScript(`
@@ -360,7 +361,13 @@ async function createVM({ node, maxTimeout = 60000 }) {
         });
 
         IRC.makePasta = (name, pasta) => {
-            return ref.makePasta.applySyncPromise(undefined, [name, pasta]);
+            const { html, text } = ref.makePasta
+                .applySyncPromise(undefined, [name, pasta]);
+
+            return {
+                html: IRC.webAddress + html,
+                text: IRC.webAddress + text,
+            };
         };
 
         IRC.resetBuffer = () => {

web/server/pasta/index.js

@@ -3,7 +3,7 @@ const { readFileSync } = require('fs');
 module.exports = ({ app, parent }) => {
     const htmlTemplate = readFileSync(__dirname + '/index.html', 'utf8');
     const { pasta } = parent.database;
-    const btoa = str => Buffer.from(str, 'base64').toString('binary');
+    const btoa = str => Buffer.from(str).toString('base64');
 
     app.get('/:type(html|text)/:cmd/:name', (req, res) => {
         const { cmd, name, type } = req.params;