diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..f2445b3 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,14 @@ +{ + "tabWidth": 4, + "singleQuote": false, + "semi": true, + "bracketSpacing": true, + "overrides": [ + { + "files": "*.js", + "options": { + "parser": "babel-flow" + } + } + ] +} \ No newline at end of file diff --git a/dist/build.js b/dist/build.js index 85a8c55..c97f44d 100644 --- a/dist/build.js +++ b/dist/build.js @@ -1 +1,17 @@ -(function(){"use strict";const R=n=>typeof n.prev=="function"?n.prev:R(n.prev);var D=(n,e,t)=>{const r=e[n][t];return r===void 0?e[t]:R(r)};class O{constructor(e,t,r){this.data={id:e,func:(i,...o)=>r(i,typeof this.prev=="function"?this.prev:this.prev.data.func,o)},this.prev=t}}var F=(n,e,t,r)=>{const i=n[r][e];if(i.data.id===t){if(typeof i.prev=="function"){n[e]=i.prev,delete n[r][e];return}n[r][e]=i.prev,n[e]=i.prev.data.func;return}const o=a=>a&&typeof a.prev=="object"?(a.data=a.prev.data,a.prev=a.prev.prev,o(a.prev)):!0,u=a=>{if(!a)throw new Error("could not find unpatch");return typeof a.prev=="object"&&a.data.id!==t?u(a.prev):o(a)};let f=Object.assign({},i);u(f),n[r][e]=f,n[e]=f.data.func},T=function(n,e,t,r,i){if(r==="m")throw new TypeError("Private method is not writable");if(r==="a"&&!i)throw new TypeError("Private accessor was defined without a setter");if(typeof e=="function"?n!==e||!i:!e.has(n))throw new TypeError("Cannot write private member to an object whose class did not declare it");return r==="a"?i.call(n,t):i?i.value=t:e.set(n,t),t},s=function(n,e,t,r){if(t==="a"&&!r)throw new TypeError("Private accessor was defined without a getter");if(typeof e=="function"?n!==e||!r:!e.has(n))throw new TypeError("Cannot read private member from an object whose class did not declare it");return t==="m"?r:t==="a"?r.call(n):r?r.value:e.get(n)},v,d,y,b;class ${constructor(e="simian"){v.add(this),d.set(this,void 0),y.set(this,void 0),T(this,d,Symbol(e),"f"),T(this,y,new Set,"f"),this.after=s(this,v,"m",b).call(this,"AFTER"),this.before=s(this,v,"m",b).call(this,"BEFORE"),this.instead=s(this,v,"m",b).call(this,"INSTEAD")}cleanupAll(){for(const e of s(this,y,"f")){for(const t in e[s(this,d,"f")]){const r=D(s(this,d,"f"),e,t);e[t]=r,e[s(this,d,"f")][t]=void 0}e[s(this,d,"f")]=void 0,delete e[s(this,d,"f")]}s(this,y,"f").clear()}}d=new WeakMap,y=new WeakMap,v=new WeakSet,b=function(e){return(t,r,i)=>{const o=r[t];if(typeof o!="function")throw new Error(`${t} is not a function on ${r}`);const u=Symbol();r[s(this,d,"f")]===void 0&&(r[s(this,d,"f")]={});let f;switch(e){case"AFTER":f=(m,S,w)=>{let _=S.apply(m,w);const E=i.apply(m,[w,_]);return typeof E!="undefined"&&(_=E),_};break;case"BEFORE":f=(m,S,w)=>{var _;let E=w;const I=(_=i.apply(m,[w]))!==null&&_!==void 0?_:w;return Array.isArray(I)&&(E=I),S.apply(m,E)};break;case"INSTEAD":f=(m,S,w)=>i.apply(m,[w,S.bind(m)]);break}let a=r[s(this,d,"f")][t];return a===void 0?a=new O(u,o,f):a=new O(u,a,f),r[s(this,d,"f")][t]=a,r[t]=function(){return a.data.func(this,...arguments)},Object.assign(r[t],o),s(this,y,"f").add(r),()=>F(r,t,u,s(this,d,"f"))}};function L(){let n={};return window.webpackChunkdiscord_app.push([[Math.random().toString(36)],{},e=>{n=e}]),n.c}function U(n,e){let t=[];for(const r in e){const i=e[r].exports;i&&(i.default&&i.__esModule&&n(i.default)?t.push(i.default):n(i)&&t.push(i))}return t}let p={modules:L(),filter:U,find:n=>p.filter(n,p.modules)[0],findAll:n=>p.filter(n,p.modules),findByProps:(...n)=>p.find(e=>n.every(t=>e[t]!==void 0)),findByPropsAll:(...n)=>p.findAll(e=>n.every(t=>e[t]!==void 0))};function W(){var n=!navigator.userAgentData&&/Safari\//.test(navigator.userAgent)&&!/Chrom(e|ium)\//.test(navigator.userAgent);if(!n||!indexedDB.databases)return Promise.resolve();var e;return new Promise(function(t){var r=function(){return indexedDB.databases().finally(t)};e=setInterval(r,100),r()}).finally(function(){return clearInterval(e)})}function l(n){return new Promise((e,t)=>{n.oncomplete=n.onsuccess=()=>e(n.result),n.onabort=n.onerror=()=>t(n.error)})}function B(n,e){const t=W().then(()=>{const r=indexedDB.open(n);return r.onupgradeneeded=()=>r.result.createObjectStore(e),l(r)});return(r,i)=>t.then(o=>i(o.transaction(e,r).objectStore(e)))}let x;function c(){return x||(x=B("keyval-store","keyval")),x}function g(n,e=c()){return e("readonly",t=>l(t.get(n)))}function P(n,e,t=c()){return t("readwrite",r=>(r.put(e,n),l(r.transaction)))}function z(n,e=c()){return e("readwrite",t=>(n.forEach(r=>t.put(r[1],r[0])),l(t.transaction)))}function G(n,e=c()){return e("readonly",t=>Promise.all(n.map(r=>l(t.get(r)))))}function H(n,e,t=c()){return t("readwrite",r=>new Promise((i,o)=>{r.get(n).onsuccess=function(){try{r.put(e(this.result),n),i(l(r.transaction))}catch(u){o(u)}}}))}function Y(n,e=c()){return e("readwrite",t=>(t.delete(n),l(t.transaction)))}function K(n,e=c()){return e("readwrite",t=>(n.forEach(r=>t.delete(r)),l(t.transaction)))}function J(n=c()){return n("readwrite",e=>(e.clear(),l(e.transaction)))}function M(n,e){return n("readonly",t=>(t.openCursor().onsuccess=function(){!this.result||(e(this.result),this.result.continue())},l(t.transaction)))}function Q(n=c()){const e=[];return M(n,t=>e.push(t.key)).then(()=>e)}function V(n=c()){const e=[];return M(n,t=>e.push(t.value)).then(()=>e)}function X(n=c()){const e=[];return M(n,t=>e.push([t.key,t.value])).then(()=>e)}var Z=Object.freeze({__proto__:null,clear:J,createStore:B,del:Y,delMany:K,entries:X,get:g,getMany:G,keys:Q,promisifyRequest:l,set:P,setMany:z,update:H,values:V});const q={React:p.findByProps("__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED","createElement"),ReactDOM:p.findByProps("__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED","hydrate"),idb_keyval:Z};function N(n){n.demon.__commands={},n.demon.patcher.after("sendMessage",n.demon.webpack.findByProps("sendMessage"),(e,t)=>{let r;for(const i of Reflect.ownKeys(n.demon.__commands)){let o=n.demon.__commands[i];if(e[1].content.split(" ")[0]===">"+o.name){r=o.callback(e);break}}return r!==void 0&&(e[1].content=r),e})}function j(n){let e=Symbol(n.name);return window.demon.__commands[e]=n,()=>{delete window.demon.__commands[e]}}var k={add:j,init:N};function h(n,e,...t){let r="%cDemoncord%c ",i=[];for(let o=0;o{},()=>{},()=>{}];return i.before!==void 0&&(o=e.before(t,r,i.before)),i.instead!==void 0&&(o=e.instead(t,r,i.instead)),i.after!==void 0&&(o=e.after(t,r,i.after)),()=>{o(),u(),f()}},before:e.before,instead:e.instead,after:e.after},webpack:p,common:q,commands:{add:k.add},__DO_NOT_USE_OR_YOU_WILL_BE_FIRED_UNTO_THE_DEPTHS_OF_HELL:{plugins:C}},k.init(n),C.init(n)}window.demon&&delete window.demon,oe(window)})(); +(function(){"use strict";const x=n=>typeof n.prev=="function"?n.prev:x(n.prev);var $=(n,e,t)=>{const r=e[n][t];return r===void 0?e[t]:x(r)};class M{constructor(e,t,r){this.data={id:e,func:(i,...o)=>r(i,typeof this.prev=="function"?this.prev:this.prev.data.func,o)},this.prev=t}}var L=(n,e,t,r)=>{const i=n[r][e];if(i.data.id===t){if(typeof i.prev=="function"){n[e]=i.prev,delete n[r][e];return}n[r][e]=i.prev,n[e]=i.prev.data.func;return}const o=a=>a&&typeof a.prev=="object"?(a.data=a.prev.data,a.prev=a.prev.prev,o(a.prev)):!0,u=a=>{if(!a)throw new Error("could not find unpatch");return typeof a.prev=="object"&&a.data.id!==t?u(a.prev):o(a)};let f=Object.assign({},i);u(f),n[r][e]=f,n[e]=f.data.func},k=function(n,e,t,r,i){if(r==="m")throw new TypeError("Private method is not writable");if(r==="a"&&!i)throw new TypeError("Private accessor was defined without a setter");if(typeof e=="function"?n!==e||!i:!e.has(n))throw new TypeError("Cannot write private member to an object whose class did not declare it");return r==="a"?i.call(n,t):i?i.value=t:e.set(n,t),t},s=function(n,e,t,r){if(t==="a"&&!r)throw new TypeError("Private accessor was defined without a getter");if(typeof e=="function"?n!==e||!r:!e.has(n))throw new TypeError("Cannot read private member from an object whose class did not declare it");return t==="m"?r:t==="a"?r.call(n):r?r.value:e.get(n)},v,d,m,R;class U{constructor(e="simian"){v.add(this),d.set(this,void 0),m.set(this,void 0),k(this,d,Symbol(e),"f"),k(this,m,new Set,"f"),this.after=s(this,v,"m",R).call(this,"AFTER"),this.before=s(this,v,"m",R).call(this,"BEFORE"),this.instead=s(this,v,"m",R).call(this,"INSTEAD")}cleanupAll(){for(const e of s(this,m,"f")){for(const t in e[s(this,d,"f")]){const r=$(s(this,d,"f"),e,t);e[t]=r,e[s(this,d,"f")][t]=void 0}e[s(this,d,"f")]=void 0,delete e[s(this,d,"f")]}s(this,m,"f").clear()}}d=new WeakMap,m=new WeakMap,v=new WeakSet,R=function(e){return(t,r,i)=>{const o=r[t];if(typeof o!="function")throw new Error(`${t} is not a function on ${r}`);const u=Symbol();r[s(this,d,"f")]===void 0&&(r[s(this,d,"f")]={});let f;switch(e){case"AFTER":f=(w,E,_)=>{let y=E.apply(w,_);const b=i.apply(w,[_,y]);return typeof b!="undefined"&&(y=b),y};break;case"BEFORE":f=(w,E,_)=>{var y;let b=_;const I=(y=i.apply(w,[_]))!==null&&y!==void 0?y:_;return Array.isArray(I)&&(b=I),E.apply(w,b)};break;case"INSTEAD":f=(w,E,_)=>i.apply(w,[_,E.bind(w)]);break}let a=r[s(this,d,"f")][t];return a===void 0?a=new M(u,o,f):a=new M(u,a,f),r[s(this,d,"f")][t]=a,r[t]=function(){return a.data.func(this,...arguments)},Object.assign(r[t],o),s(this,m,"f").add(r),()=>L(r,t,u,s(this,d,"f"))}};function W(){let n={};return window.webpackChunkdiscord_app.push([[Math.random().toString(36)],{},e=>{n=e}]),n.c}function G(n,e){let t=[];for(const r in e){const i=e[r].exports;i&&(i.default&&i.__esModule&&n(i.default)?t.push(i.default):n(i)&&t.push(i))}return t}let p={modules:W(),filter:G,find:n=>p.filter(n,p.modules)[0],findAll:n=>p.filter(n,p.modules),findByProps:(...n)=>p.find(e=>n.every(t=>e[t]!==void 0)),findByPropsAll:(...n)=>p.findAll(e=>n.every(t=>e[t]!==void 0))};function z(){var n=!navigator.userAgentData&&/Safari\//.test(navigator.userAgent)&&!/Chrom(e|ium)\//.test(navigator.userAgent);if(!n||!indexedDB.databases)return Promise.resolve();var e;return new Promise(function(t){var r=function(){return indexedDB.databases().finally(t)};e=setInterval(r,100),r()}).finally(function(){return clearInterval(e)})}function l(n){return new Promise((e,t)=>{n.oncomplete=n.onsuccess=()=>e(n.result),n.onabort=n.onerror=()=>t(n.error)})}function A(n,e){const t=z().then(()=>{const r=indexedDB.open(n);return r.onupgradeneeded=()=>r.result.createObjectStore(e),l(r)});return(r,i)=>t.then(o=>i(o.transaction(e,r).objectStore(e)))}let O;function c(){return O||(O=A("keyval-store","keyval")),O}function h(n,e=c()){return e("readonly",t=>l(t.get(n)))}function P(n,e,t=c()){return t("readwrite",r=>(r.put(e,n),l(r.transaction)))}function H(n,e=c()){return e("readwrite",t=>(n.forEach(r=>t.put(r[1],r[0])),l(t.transaction)))}function Y(n,e=c()){return e("readonly",t=>Promise.all(n.map(r=>l(t.get(r)))))}function K(n,e,t=c()){return t("readwrite",r=>new Promise((i,o)=>{r.get(n).onsuccess=function(){try{r.put(e(this.result),n),i(l(r.transaction))}catch(u){o(u)}}}))}function J(n,e=c()){return e("readwrite",t=>(t.delete(n),l(t.transaction)))}function Q(n,e=c()){return e("readwrite",t=>(n.forEach(r=>t.delete(r)),l(t.transaction)))}function V(n=c()){return n("readwrite",e=>(e.clear(),l(e.transaction)))}function T(n,e){return n("readonly",t=>(t.openCursor().onsuccess=function(){!this.result||(e(this.result),this.result.continue())},l(t.transaction)))}function X(n=c()){const e=[];return T(n,t=>e.push(t.key)).then(()=>e)}function Z(n=c()){const e=[];return T(n,t=>e.push(t.value)).then(()=>e)}function q(n=c()){const e=[];return T(n,t=>e.push([t.key,t.value])).then(()=>e)}var N=Object.freeze({__proto__:null,clear:V,createStore:A,del:J,delMany:Q,entries:q,get:h,getMany:Y,keys:X,promisifyRequest:l,set:P,setMany:H,update:K,values:Z});const j={React:p.findByProps("__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED","createElement"),ReactDOM:p.findByProps("__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED","hydrate"),idb_keyval:N};function ee(n){n.demon.__commands={},n.demon.patcher.after("sendMessage",n.demon.webpack.findByProps("sendMessage"),(e,t)=>{let r;for(const i of Reflect.ownKeys(n.demon.__commands)){let o=n.demon.__commands[i];if(e[1].content.split(" ")[0]===">"+o.name){r=o.callback(e);break}}return r!==void 0&&(e[1].content=r),e})}function ne(n){let e=Symbol(n.name);return window.demon.__commands[e]=n,()=>{delete window.demon.__commands[e]}}var B={add:ne,init:ee};const C=` +@import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@700&display=swap'); +font-family: 'IBM Plex Mono', monospace; +`,te=` +${C} +color: #1d1131; +background-color: #aa8dd8; +font-weight: 600; +font-size: 0.9em; +padding: 0px 5px 1px 5px; +border-radius: 5px; +`,re=` +${C} +color: #E2EECE; +font-weight: 500; +font-size: 0.9em; +`;function S(n){return function(e,t){let r=["Demoncord",...t,e],i=[],o="";for(let u=0;u{},()=>{},()=>{}];return i.before!==void 0&&(o=e.before(t,r,i.before)),i.instead!==void 0&&(o=e.instead(t,r,i.instead)),i.after!==void 0&&(o=e.after(t,r,i.after)),()=>{o(),u(),f()}},before:e.before,instead:e.instead,after:e.after},webpack:p,common:j,commands:{add:B.add},__DO_NOT_USE_OR_YOU_WILL_BE_FIRED_UNTO_THE_DEPTHS_OF_HELL:{plugins:F},logger:g},B.init(n),F.init(n)}window.demon&&delete window.demon,ge(window)})(); diff --git a/src/api/plugins.js b/src/api/plugins.js index c340ef1..5e1628c 100644 --- a/src/api/plugins.js +++ b/src/api/plugins.js @@ -1,6 +1,6 @@ // @flow import { get, set } from 'idb-keyval'; -import log from './utils/logger.js' +import logger from './utils/logger.js' async function init(obj: Object): Promise { //TODO: check for enabled plugins in the idb, start them @@ -42,7 +42,7 @@ async function addPlugin(iife: string, metadata: Object): Promise { async function delPlugin(name: string): Promise { const globalSettings = await get("demoncord") if (globalSettings["plugin"][name] === undefined) { - log("Cannot remove non-existant plugin!", "error", "Plugins") + logger.error("Cannot remove non-existant plugin!", ["Plugins"]) return false } else { globalSettings["plugin"][name] = undefined @@ -55,16 +55,16 @@ async function delPlugin(name: string): Promise { async function startPlugin(name: string): Promise { const globalSettings = await get("demoncord") if (globalSettings["plugin"][name] === undefined) { - log("Cannot start non-existant plugin!", "error", "Plugins") + logger.error("Cannot start non-existant plugin!", ["Plugins"]) return false } else { - log(`Starting ${name}...`, "log", "Plugins") + logger.log(`Starting ${name}...`, ["Plugins"]) const plug = globalSettings["plugin"][name] const exports: Object = (0, eval)(plug.iife) const onStart: (ctx: Object)=>void = exports.onStart let ctx = {} // ctx is how you're going to store things that need to be accessed in both onStart and onStop. dumb, i know onStart(ctx) - log(`Started ${name}!`, "log", "Plugins") + logger.log(`Started ${name}!`, ["Plugins"]) window.demon.__plugins[name] = {status: 1, ctx: ctx} return true } @@ -73,15 +73,15 @@ async function startPlugin(name: string): Promise { async function stopPlugin(name: string): Promise { const globalSettings = await get("demoncord") if (globalSettings["plugin"][name] === undefined ) { - log("Cannot stop non-existant or non-running plugin!", "error", "Plugins") + logger.error("Cannot stop non-existant or non-running plugin!", ["Plugins"]) return false } else { - log(`Stopping ${name}...`, "log", "Plugins") + logger.log(`Stopping ${name}...`, ["Plugins"]) const plug = globalSettings["plugin"][name] const exports: Object = (0, eval)(plug.iife) const onStop: (ctx: Object)=>void = exports.onStop onStop(window.demon.__plugins[name].ctx) - log(`Stopped ${name}!`, "log", "Plugins") + logger.log(`Stopped ${name}!`, ["Plugins"]) return true } } @@ -89,7 +89,7 @@ async function stopPlugin(name: string): Promise { async function togglePlugin(name: string): Promise { const globalSettings = await get("demoncord") if (globalSettings["plugin"][name] === undefined) { - log("Cannot toggle non-existant plugin!", "error", "Plugins") + logger.error("Cannot toggle non-existant plugin!", ["Plugins"]) return false } else { globalSettings["plugin"][name].enabled = !globalSettings["plugin"][name].enabled diff --git a/src/api/utils/logger.js b/src/api/utils/logger.js index e4a4901..a04ccb3 100644 --- a/src/api/utils/logger.js +++ b/src/api/utils/logger.js @@ -1,19 +1,63 @@ //@flow + +// hopefully separating out styles like this is more readable -- sink +const styleBase = ` +@import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@700&display=swap'); +font-family: 'IBM Plex Mono', monospace; +`; + +const styleBg = ` +${styleBase} +color: #1d1131; +background-color: #aa8dd8; +font-weight: 600; +font-size: 0.9em; +padding: 0px 5px 1px 5px; +border-radius: 5px; +`; + +const styleTxt = ` +${styleBase} +color: #E2EECE; +font-weight: 500; +font-size: 0.9em; +`; + +type LogFuncs = "log" | "error" | "warn" | "trace" | "group"; +type LoggerFunction = (message: string, locs: string[]) => void; + //TODO: make setting to save logs in idb, for debugging and troubleshooting purposes -//bg: #aa8dd8 -//fg: #553986 -function log(message: string, type: string, ...locs: string[]): void { - let string = "%cDemoncord%c " - let style = [] - for (let i = 0; i < locs.length; i++) { - const loc = locs[i] - style.push("@import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@700&display=swap'); font-family: 'IBM Plex Mono', monospace; font-weight: 600; background-color: #aa8dd8; color: #1d1131; border-radius: 5px; padding: 0px 5px 1px 5px; font-size: 0.9em;", "") - string += `%c${loc}%c ` - } - style.push("@import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@700&display=swap'); font-family: 'IBM Plex Mono', monospace; font-weight: 600; background-color: #aa8dd8; color: #1d1131; border-radius: 5px; padding: 0px 5px 1px 5px; font-size: 0.9em;", "") - string += `%c${message}` - style.push("@import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@700&display=swap'); font-family: 'IBM Plex Mono', monospace; font-weight: 500; font-size: 0.9em; color: #E2EECE;") - console[type](string, ...style) +function getLogger(type: LogFuncs): LoggerFunction { + return function (message, locs) { + let rawParts = ["Demoncord", ...locs, message]; + let styleParts = []; + let content = ""; + + for (let i = 0; i < rawParts.length; i++) { + if (i === rawParts.length - 1) { + // last item + content += "%c" + rawParts[i]; + styleParts.push(styleTxt); + } else { + content += "%c" + rawParts[i] + "%c "; + styleParts.push(styleBg, ""); + } + } + + console[type](content, ...styleParts); + }; } -export default log; +const log: LoggerFunction = getLogger("log"); +const warn: LoggerFunction = getLogger("warn"); +const error: LoggerFunction = getLogger("error"); +const trace: LoggerFunction = getLogger("trace"); +const group: LoggerFunction = getLogger("group"); + +export default { + log, + warn, + error, + trace, + group +};