Merge pull request #17 from BBN-Holding/plugin-store

WIP: Plugin Store

.github/workflows/deploy.yml

@@ -38,8 +38,11 @@ jobs:
           echo "PATH=${PATH}" >> $GITHUB_ENV
           deno upgrade
 
+      - name: Lint
+        run: deno lint
+
       - name: Building bbn.one
-        run: deno run --no-check -A serve.ts build
+        run: deno run -A serve.ts build
 
       - name: Login to GitHub Container Registry
         uses: docker/[email protected]

.gitignore

@@ -1,3 +1,2 @@
 .DS_Store
-dist
-deno.lock
+dist

.vscode/settings.json

@@ -32,7 +32,7 @@
     },
     "deno.cacheOnSave": true,
     "deno.suggest.imports.autoDiscover": true,
-    "deno.suggest.autoImports": true,
+    "typescript.suggest.autoImports": true,
     "deno.suggest.imports.hosts": {
         "https://deno.land": true,
         "https://esm.sh": true,

assets/imports.ts

@@ -9,9 +9,5 @@ import dots from './img/dots.svg';
 import templateArtwork from "./img/template-artwork.png";
 
 export {
-    heroImage,
-    googleLogo,
-    discordLogo,
-    dots,
-    templateArtwork
+    discordLogo, dots, googleLogo, heroImage, templateArtwork
 };

components/nav.ts

@@ -1,4 +1,4 @@
-import { API } from "shared";
+import { API } from "shared/mod.ts";
 import { delay } from "std/async/delay.ts";
 import { BasicLabel, Box, Button, ButtonStyle, Component, Custom, Grid, Horizontal, Image, Label, MIcon, Spacer, Vertical, createElement } from "webgen/mod.ts";
 import { IsLoggedIn, activeUser, permCheck, showProfilePicture } from "../pages/_legacy/helper.ts";

components/pages.ts

@@ -9,9 +9,9 @@ import bbnAdminLogo from '../assets/img/bbnAdmin.svg';
 // @deno-types="https://raw.githubusercontent.com/lucsoft-DevTeam/lucsoft.de/master/custom.d.ts"
 import bbnWalletLogo from '../assets/img/bbnWallet.svg';
 
-import { Permission } from "shared";
+import { Permission } from "shared/mod.ts";
 
-export const pages: [ logo: any, perm: Array<Permission>, route: string ][] = [
+export const pages: [ logo: string, perm: Array<Permission>, route: string ][] = [
     [ bbnHolding, [], "/" ],
     [ bbnMusicLogo, [], "/music" ],
     [ bbnHostingLogo, [], "/hosting" ],

data/servers.json

@@ -19,17 +19,5 @@
     },
     "/minecraft/pocketmine/": {
         "name": "Pocketmine MP"
-    },
-    "/minecraft/legacy/magma/": {
-        "name": "Minecraft Magma"
-    },
-    "/minecraft/legacy/nukkit/": {
-        "name": "Minecraft Nukkit"
-    },
-    "/minecraft/legacy/pgf/": {
-        "name": "Minecraft Purpur Geyser Floodgate"
-    },
-    "/minecraft/legacy/purpur/": {
-        "name": "Minecraft Purpur"
     }
 }

deno.jsonc

@@ -1,10 +1,11 @@
 {
     "imports": {
-        "webgen/": "https://raw.githubusercontent.com/lucsoft/WebGen/99f109f/",
+        "webgen/": "https://raw.githubusercontent.com/lucsoft/WebGen/b6fafd3/",
         // "webgen/": "../WebGen/",
-        "std/": "https://deno.land/std@0.207.0/",
-        "shared": "./pages/shared/mod.ts"
+        "std/": "https://deno.land/std@0.208.0/",
+        "shared/": "./pages/shared/"
     },
+    "lock": false,
     "compilerOptions": {
         "lib": [
             "dom",

pages/_legacy/helper.ts

@@ -1,6 +1,6 @@
 // This code Will be ported to webgen
 
-import { API, fileCache, Permission, stupidErrorAlert } from "shared";
+import { API, fileCache, Permission, stupidErrorAlert } from "shared/mod.ts";
 import { Box, Button, Cache, Component, Custom, Dialog, DropDownInput, Horizontal, Image, Label, Page, Spacer, State, StateHandler, Style, SupportedThemes, Table, TextInput, Vertical } from "webgen/mod.ts";
 import artwork from "../../assets/img/template-artwork.png";
 import { loginRequired } from "../../components/pages.ts";
@@ -234,7 +234,7 @@ export function EditArtists(list: Artist[]) {
                     Spacer(),
                     Button("Add Artist") // TODO: Remove this in the future => switch to ghost rows
                         .onClick(() => {
-                            state.list = <any>[ ...state.list, [ "", "", ArtistTypes.Primary ] ];
+                            state.list = State([ ...state.list, [ "", "", ArtistTypes.Primary ] ] as [ string, string, ArtistTypes ][]);
                         })
                 ).setPadding("0 0 3rem 0")
             )
@@ -284,7 +284,7 @@ function update(state: StateHandler<{ list: [ name: string, img: string, type: A
     state.list = [ ...state.list ];
 }
 
-export function getDropFromPages(data: StateHandler<any>[], restore?: Drop): Drop {
+export function getDropFromPages(data: StateHandler<Partial<Drop>>[], restore?: Drop): Drop {
     return <Drop>{
         ...restore,
         ...Object.assign({}, ...data)

pages/_legacy/music/changeDrop.ts

@@ -1,4 +1,4 @@
-import { API, stupidErrorAlert, uploadFilesDialog } from "shared";
+import { API, stupidErrorAlert, uploadFilesDialog } from "shared/mod.ts";
 import { AdvancedImage, Box, Button, DropAreaInput, DropDownInput, Grid, IconButton, Image, MIcon, Page, Spacer, State, TextInput, Wizard } from "webgen/mod.ts";
 import artwork from "../../../assets/img/template-artwork.png";
 import language from "../../../data/language.json" assert { type: "json" };

pages/_legacy/music/changeSongs.ts

@@ -1,4 +1,4 @@
-import { API, uploadFilesDialog } from "shared";
+import { API, uploadFilesDialog } from "shared/mod.ts";
 import { Button, Grid, Horizontal, Page, Spacer, Wizard } from "webgen/mod.ts";
 import { Drop, pageFive } from "../../../spec/music.ts";
 import { allowedAudioFormats, getDropFromPages } from "../helper.ts";

pages/_legacy/music/data.ts

@@ -1,4 +1,4 @@
-import { API, StreamingUploadHandler } from "shared";
+import { API, StreamingUploadHandler } from "shared/mod.ts";
 import { delay } from "std/async/delay.ts";
 import { AdvancedImage, State, StateHandler } from "webgen/mod.ts";
 import { Drop } from "../../../spec/music.ts";

pages/_legacy/music/edit.ts

@@ -1,4 +1,4 @@
-import { API, LoadingSpinner, Navigation, createActionList, createBreadcrumb, createTagList, stupidErrorAlert } from "shared";
+import { API, LoadingSpinner, Navigation, createActionList, createBreadcrumb, createTagList, stupidErrorAlert } from "shared/mod.ts";
 import { Box, Grid, Horizontal, Label, Spacer, State, Vertical, View, WebGen, isMobile } from "webgen/mod.ts";
 import '../../../assets/css/main.css';
 import '../../../assets/css/music.css';

pages/_legacy/music/table.ts

@@ -1,4 +1,4 @@
-import { Progress } from "shared";
+import { Progress } from "shared/mod.ts";
 import { Box, ButtonStyle, Checkbox, Color, DropDownInput, IconButton, Image, InlineTextInput, Label, MIcon, State, StateHandler, Table, View } from "webgen/mod.ts";
 import language from "../../../data/language.json" assert { type: "json" };
 import primary from "../../../data/primary.json" assert { type: "json" };

pages/_legacy/newDrop.ts

@@ -1,4 +1,4 @@
-import { API, LoadingSpinner, stupidErrorAlert, uploadFilesDialog } from "shared";
+import { API, LoadingSpinner, stupidErrorAlert, uploadFilesDialog } from "shared/mod.ts";
 import { AdvancedImage, Button, ButtonStyle, Center, CenterV, Color, DropAreaInput, DropDownInput, Grid, Horizontal, Image, Label, MediaQuery, Page, Spacer, State, SupportedThemes, TextInput, Vertical, View, WebGen, Wizard } from "webgen/mod.ts";
 import '../../assets/css/main.css';
 import { DynaNavigation } from "../../components/nav.ts";

pages/admin/dialog.ts

@@ -1,4 +1,4 @@
-import { API } from "shared";
+import { API } from "shared/mod.ts";
 import { Box, Checkbox, Custom, Dialog, Horizontal, Image, Label, Page, Spacer, State, Wizard, createElement } from "webgen/mod.ts";
 import reviewTexts from "../../data/reviewTexts.json" assert { type: "json" };
 import { Drop, ReviewResponse } from "../../spec/music.ts";

pages/admin/loading.ts

@@ -1,4 +1,4 @@
-import { API, StreamingUploadHandler } from "shared";
+import { API, StreamingUploadHandler } from "shared/mod.ts";
 import { delay } from "std/async/delay.ts";
 import { UploadFilesDialog } from "webgen/mod.ts";
 import { DropType } from "../../spec/music.ts";

pages/admin/review.ts

@@ -1,4 +1,4 @@
-import { API, LoadingSpinner, Navigation, createActionList, createBreadcrumb, createTagList, stupidErrorAlert } from "shared";
+import { API, LoadingSpinner, Navigation, createActionList, createBreadcrumb, createTagList, stupidErrorAlert } from "shared/mod.ts";
 import { Box, Button, ButtonStyle, Color, Entry, Grid, Horizontal, Label, Spacer, Vertical, View, WebGen, isMobile } from "webgen/mod.ts";
 import '../../assets/css/main.css';
 import '../../assets/css/music.css';

pages/admin/state.ts

@@ -1,6 +1,6 @@
-import { External } from "shared";
+import { External } from "shared/mod.ts";
 import { State } from "webgen/mod.ts";
-import { AdminStats, Drop, File, OAuthApp, Payout, Server, Transcript, Wallet } from "../../spec/music.ts";
+import { AdminStats, Drop, File, Group, OAuthApp, Payout, Server, Transcript, Wallet } from "../../spec/music.ts";
 import { ProfileData } from "../_legacy/helper.ts";
 
 export const state = State({
@@ -13,7 +13,7 @@ export const state = State({
         drafts: <External<Drop[]> | "loading">"loading",
     },
     users: <External<ProfileData[]> | "loading">"loading",
-    groups: <External<any[]> | "loading">"loading",
+    groups: <External<Group[]> | "loading">"loading",
     payouts: <External<Payout[]> | "loading">"loading",
     oauth: <External<OAuthApp[]> | "loading">"loading",
     files: <External<File[]> | "loading">"loading",
@@ -24,6 +24,6 @@ export const state = State({
 });
 
 export const reviewState = State({
-    drop: <any | undefined>undefined,
+    drop: <Drop | undefined>undefined,
     drops: <Drop[] | undefined>undefined,
 });

pages/admin/views/entryReview.ts

@@ -1,7 +1,7 @@
+import { API } from "shared/mod.ts";
 import { Button, ButtonStyle, Color, Dialog, DropDownInput, Entry, State, Vertical } from "webgen/mod.ts";
 import { Drop, DropType } from "../../../spec/music.ts";
 import { showPreviewImage } from "../../_legacy/helper.ts";
-import { API } from "../../shared/restSpec.ts";
 
 export function ReviewEntry(x: Drop) {
     return Entry({

pages/admin/views/entryUser.ts

@@ -1,4 +1,5 @@
 import { Entry } from "webgen/mod.ts";
+import { Group } from "../../../spec/music.ts";
 import { ProfileData, showProfilePicture } from "../../_legacy/helper.ts";
 
 export function UserEntry(x: ProfileData) {
@@ -10,7 +11,7 @@ export function UserEntry(x: ProfileData) {
         .addPrefix(showProfilePicture(x));
 }
 
-export function GroupEntry(x: any) {
+export function GroupEntry(x: Group) {
     return Entry({
         title: x.displayName,
         subtitle: `${x._id} - ${x.permission}`

pages/admin/views/list.ts

@@ -1,4 +1,4 @@
-import { API, External, fileCache, RenderItem, stupidErrorAlert } from "shared";
+import { API, External, fileCache, RenderItem, stupidErrorAlert } from "shared/mod.ts";
 import { Box, Button, Cache, Color, Dialog, Entry, Grid, IconButton, Image, MIcon, ref, TextInput } from "webgen/mod.ts";
 import { templateArtwork } from "../../../assets/imports.ts";
 import { File, OAuthApp, Transcript, Wallet } from "../../../spec/music.ts";

pages/admin/views/menu.ts

@@ -1,4 +1,4 @@
-import { API, count, HeavyList, loadMore, Navigation, placeholder } from "shared";
+import { API, count, HeavyList, loadMore, Navigation, placeholder } from "shared/mod.ts";
 import { sumOf } from "std/collections/sum_of.ts";
 import { Box, Button, Color, Dialog, Entry, Grid, Horizontal, isMobile, Label, ref, Spacer, State, Table, TextInput, Vertical } from "webgen/mod.ts";
 import { DropType } from "../../../spec/music.ts";

pages/holding/distributionAgreement.ts

@@ -1,7 +1,7 @@
+import { Footer } from "shared/footer.ts";
 import { Box, Label, View, WebGen } from "webgen/mod.ts";
 import { DynaNavigation } from "../../components/nav.ts";
 import { RegisterAuthRefresh } from "../_legacy/helper.ts";
-import { Footer } from "../shared/footer.ts";
 import './flowText.css';
 WebGen();
 await RegisterAuthRefresh();

pages/holding/imprint.ts

@@ -1,7 +1,7 @@
+import { Footer } from "shared/footer.ts";
 import { Box, Button, ButtonStyle, Horizontal, Label, Spacer, View, WebGen } from "webgen/mod.ts";
 import { DynaNavigation } from "../../components/nav.ts";
 import { RegisterAuthRefresh } from "../_legacy/helper.ts";
-import { Footer } from "../shared/footer.ts";
 import './flowText.css';
 WebGen();
 await RegisterAuthRefresh();

pages/holding/index.ts

@@ -5,14 +5,19 @@ import { RegisterAuthRefresh } from "../_legacy/helper.ts";
 import './landing.css';
 import { data, streamingPool } from "./loading.ts";
 // Main
+// @deno-types="https://raw.githubusercontent.com/lucsoft-DevTeam/lucsoft.de/master/custom.d.ts"
 import bbnHosting from "./resources/bbnHosting.svg";
+// @deno-types="https://raw.githubusercontent.com/lucsoft-DevTeam/lucsoft.de/master/custom.d.ts"
 import bbnMusic from "./resources/bbnMusic.svg";
 
 // External
-import { Counter } from "../shared/counter.ts";
-import { Footer } from "../shared/footer.ts";
+import { Counter } from "shared/counter.ts";
+import { Footer } from "shared/footer.ts";
+// @deno-types="https://raw.githubusercontent.com/lucsoft-DevTeam/lucsoft.de/master/custom.d.ts"
 import bbnCard from "./resources/bbnCard.svg";
+// @deno-types="https://raw.githubusercontent.com/lucsoft-DevTeam/lucsoft.de/master/custom.d.ts"
 import bbnGameStudios from "./resources/bbnGameStudios.svg";
+// @deno-types="https://raw.githubusercontent.com/lucsoft-DevTeam/lucsoft.de/master/custom.d.ts"
 import bbnPublishing from "./resources/bbnPublishing.svg";
 WebGen();
 await RegisterAuthRefresh();

pages/holding/loading.ts

@@ -1,5 +1,6 @@
 import { lazyInit, State } from "webgen/mod.ts";
 import { API } from "../shared/restSpec.ts";
+import { createStableWebSocket } from "webgen/network.ts";
 
 export const data = State({
     stats: {
@@ -9,20 +10,14 @@ export const data = State({
     }
 });
 
-// deno-lint-ignore require-await
 export const streamingPool = lazyInit(async () => {
-    function connect() {
-        const ws = new WebSocket(API.WS_URL.replace("/ws", "/api/@bbn/public/stats"));
-
-        ws.onmessage = ({ data: msg }) => {
-            const json = JSON.parse(msg);
+    await createStableWebSocket({
+        url: API.WS_URL.replace("/ws", "/api/@bbn/public/stats")
+    }, {
+        onMessage: (msg) => {
+            if(typeof msg !== "string") return;
+            const json = JSON.parse(msg)
             data.stats = State(json as typeof data.stats);
-        };
-        ws.onerror = () => {
-
-        };
-        ws.onclose = () => setTimeout(() => connect(), 1000);
-
-    }
-    connect();
+        }
+    });
 });