Skip to content

Commit

Permalink
godslayerakp/http: fix extra blocks and add multipart/form-data suppo…
Browse files Browse the repository at this point in the history 
…rt (#824)
  • Loading branch information
@RedMan13
RedMan13 committed Aug 8, 2023
1 parent 856ccf0 commit d835c52
Showing 1 changed file with 102 additions and 13 deletions.
115 changes: 102 additions & 13 deletions extensions/godslayerakp/http.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
'use strict';
if (!Scratch.extensions.unsandboxed) throw new Error('can not load out side unsandboxed mode');

const pathRegex = /[^.]+/g;
const setType = (value, type) => {
switch (type) {
case 'string':
Expand Down Expand Up @@ -81,7 +80,7 @@
}
};
const getPathArray = path => {
const names = path.match(pathRegex);
const names = path.split('.');
for (let index = 0; index < names.length; index++) {
let name = names[index];
name = name.replaceAll(/(?<!\\)&dot/g, '.');
Expand All @@ -90,17 +89,15 @@
};
const getValueAtPath = (object, path) => {
for (const name of path) {
object = object[name];
if (typeof object !== 'object') return;
object = object?.[name];
}
return object;
return setType(object, 'string');
};
const setValueAtPath = (object, path, value) => {
for (const name of path) {
for (const name of path.slice(0, -1)) {
object = object[name];
if (typeof object !== 'object') return;
}
return object = value;
object[path.at(-1)] = value;
};

const {vm} = Scratch;
Expand Down Expand Up @@ -153,6 +150,10 @@
return this.options.headers['Content-Type'];
},
set mimeType(value) {
if (this.options.headers['Content-Type'] === 'multipart/form-data' &&
value !== 'multipart/form-data') {
this.options.body = '';
}
this.options.headers['Content-Type'] = value;
},
set method(val) {
Expand All @@ -173,6 +174,14 @@
},
set body(val) {
if (this.method === 'GET') return;
if (val instanceof FormData && !(this.options.body instanceof FormData)) {
this.options.body = val;
this.options.headers['Content-Type'] = 'multipart/form-data';
}
if (!(val instanceof FormData) && this.options.body instanceof FormData) {
this.options.body = '';
this.options.headers['Content-Type'] = 'text/plain';
}
this.options.body = val;
},
get body() {
Expand Down Expand Up @@ -349,11 +358,56 @@
blockType: BlockType.COMMAND,
arguments: {
text: {
type: ArgumentType.STRING
type: ArgumentType.STRING,
default: 'Apple!'
}
},
text: 'set request body to [text]'
},
'---',
{
opcode: 'setBodyToForm',
blockType: BlockType.COMMAND,
text: 'set request body to a form'
},
{
opcode: 'getFormProperty',
blockType: BlockType.REPORTER,
arguments: {
name: {
type: ArgumentType.STRING,
defaultValue: 'name'
}
},
text: 'get [name] in request form'
},
{
opcode: 'setFormProperty',
blockType: BlockType.COMMAND,
arguments: {
name: {
type: ArgumentType.STRING,
defaultValue: 'name'
},
value: {
type: ArgumentType.STRING,
defaultValue: 'value'
}
},
text: 'set [name] to [value] in request form'
},
{
opcode: 'deleteFormProperty',
blockType: BlockType.COMMAND,
arguments: {
name: {
type: ArgumentType.STRING,
defaultValue: 'name'
}
},
text: 'delete [name] from request form'
},
'---',
{
opcode: 'sendRequest',
blockType: BlockType.COMMAND,
Expand Down Expand Up @@ -587,6 +641,29 @@
this.request.body = body;
}

setBodyToForm() {
this.request.body = new FormData();
}

getFormProperty(args) {
if (!(this.request.options.body instanceof FormData)) return;
const name = Cast.toString(args.name);
return this.request.body.get(name);
}

setFormProperty(args) {
if (!(this.request.options.body instanceof FormData)) return;
const name = Cast.toString(args.name);
const value = Cast.toString(args.value);
this.request.body.set(name, value);
}

deleteFormProperty(args) {
if (!(this.request.options.body instanceof FormData)) return;
const name = Cast.toString(args.name);
this.request.body.delete(name);
}

// eslint-disable-next-line require-await
async sendRequest(args) {
const url = Cast.toString(args.url);
Expand All @@ -609,6 +686,15 @@
this.request.events.activate('reqFail');
}
this.request.end = true;
if (res.headers.get('Content-Type') === 'multipart/form-data') {
const form = await res.formData();
const json = {};
for (const [key, value] of form.entries()) {
json[key] = value;
}
this.response.text = JSON.stringify(json);
return;
}
const body = await res.text();
this.response.text = body;
} catch (err) {
Expand All @@ -624,16 +710,18 @@

showExtra() {
this.showingExtra = true;
// @ts-ignore
vm.extensionManager.refreshBlocks();
}

hideExtra() {
this.showingExtra = false;
// @ts-ignore
vm.extensionManager.refreshBlocks();
}

setUnkownProperty(args) {
const name = Cast.toString(args.name);
const name = Cast.toString(args.path);
const text = Cast.toString(args.value);

const path = getPathArray(name);
Expand All @@ -642,7 +730,7 @@
}

setUnkownPropertyType(args) {
const name = Cast.toString(args.name);
const name = Cast.toString(args.path);
const type = Cast.toString(args.type);
const path = getPathArray(name);

Expand All @@ -652,14 +740,14 @@
}

getUnkownProperty(args) {
const name = Cast.toString(args.name);
const name = Cast.toString(args.path);
const path = getPathArray(name);

return getValueAtPath(this.request.options, path);
}

getUnkownPropertyType(args) {
const name = Cast.toString(args.name);
const name = Cast.toString(args.path);
const path = getPathArray(name);
const value = getValueAtPath(this.request.options, path);

Expand All @@ -668,5 +756,6 @@
}

const instance = new WebRequests();
// @ts-ignore
Scratch.extensions.register(instance);
})(Scratch);

0 comments on commit d835c52

Please sign in to comment.