@pipelab/plugin-discord 1.0.0-beta.1 → 1.0.0-beta.4

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@pipelab/plugin-discord",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.4",
   "license": "FSL-1.1-MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/CynToolkit/pipelab.git",
     "directory": "plugins/plugin-discord"
   },
+  "files": [
+    "dist"
+  ],
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -19,13 +22,13 @@
     "electron": "32.1.2",
     "ts-deepmerge": "7.0.1",
     "untun": "0.1.3",
-    "@pipelab/plugin-core": "1.0.0-beta.1",
-    "@pipelab/shared": "1.0.0-beta.0"
+    "@pipelab/plugin-core": "1.0.0-beta.4",
+    "@pipelab/shared": "1.0.0-beta.2"
   },
   "devDependencies": {
     "tsdown": "0.21.2",
     "typescript": "5.9.3",
-    "@pipelab/tsconfig": "1.0.0-beta.0"
+    "@pipelab/tsconfig": "1.0.0-beta.2"
   },
   "scripts": {
     "format": "oxfmt .",

package/CHANGELOG.md

@@ -1,19 +0,0 @@
-# @pipelab/plugin-discord
-
-## 1.0.0-beta.1
-
-### Patch Changes
-
-- @pipelab/plugin-core@1.0.0-beta.1
-
-## 1.0.0-beta.0
-
-### Major Changes
-
-- e1befbf: initial release
-
-### Patch Changes
-
-- Updated dependencies [e1befbf]
-  - @pipelab/plugin-core@1.0.0-beta.0
-  - @pipelab/shared@1.0.0-beta.0

package/src/declarations.d.ts

@@ -1 +0,0 @@
-declare module "*.webp";

package/src/discord.ts

@@ -1,338 +0,0 @@
-import {
-  ActionRunnerData,
-  createAction,
-  createPathParam,
-  createStringParam,
-  detectRuntime,
-  InputsDefinition,
-  OutputsDefinition,
-  runWithLiveLogs,
-  fetchPipelabAsset,
-  runPnpm,
-} from "@pipelab/plugin-core";
-import { dirname, join, basename, delimiter } from "node:path";
-import { cp, readFile, writeFile } from "node:fs/promises";
-import { platform as osPlatform, arch as osArch } from "node:os";
-import { kebabCase } from "change-case";
-import { createServer } from "node:http";
-import serve from "serve-handler";
-import { startTunnel } from "untun";
-
-export const IDPackage = "discord:package";
-export const IDPreview = "discord:preview";
-
-const paramsInputFolder = {
-  "input-folder": createPathParam("", {
-    label: "Folder to package",
-    required: true,
-    control: {
-      type: "path",
-      options: {
-        properties: ["openDirectory"],
-      },
-    },
-  }),
-} satisfies InputsDefinition;
-
-// const paramsInputURL = {
-//   'input-url': createStringParam('', {
-//     label: 'URL to preview',
-//     required: true
-//   })
-// } satisfies InputsDefinition
-
-export const configureParams = {
-  name: createStringParam("Pipelab", {
-    label: "Application name",
-    description: "The name of the application",
-    required: true,
-  }),
-} satisfies InputsDefinition;
-
-const outputs = {
-  outputDir: {
-    label: "Output folder",
-    value: "",
-    description: "The folder where the packaged application is located",
-  },
-} satisfies OutputsDefinition;
-
-export const createPackageProps = (
-  id: string,
-  name: string,
-  description: string,
-  icon: string,
-  displayString: string,
-  advanced?: boolean,
-  deprecated?: boolean,
-  deprecatedMessage?: string,
-  disabled?: false,
-  updateAvailable?: boolean,
-) => {
-  return createAction({
-    id,
-    name,
-    description,
-    icon,
-    displayString,
-    meta: {},
-    advanced,
-    deprecated,
-    deprecatedMessage,
-    disabled,
-    updateAvailable,
-    params: {
-      ...paramsInputFolder,
-      ...configureParams,
-    },
-    outputs: {
-      outputDir: outputs.outputDir,
-    },
-  });
-};
-
-export const createPreviewProps = (
-  id: string,
-  name: string,
-  description: string,
-  icon: string,
-  displayString: string,
-) =>
-  createAction({
-    id,
-    name,
-    description,
-    icon,
-    displayString,
-    meta: {},
-    params: {
-      ...paramsInputFolder,
-      ...configureParams,
-      customHostname: createStringParam("", {
-        required: false,
-        label: "Custom hostname",
-        description: "The hostname to use for the preview",
-      }),
-    },
-    outputs: {
-      // ...outputs.outputDir
-    },
-  });
-
-const createAppServer = async (folder: string) => {
-  try {
-    const server = createServer();
-
-    server.on("request", (req, res) => {
-      return serve(req, res, {
-        maxAge: 0,
-        public: folder,
-        headers: {
-          "bypass-tunnel-reminder": "false",
-        },
-      });
-    });
-
-    const listen = async () => {
-      return new Promise((resolve, reject) => {
-        server.listen(40400, "127.0.0.1", () => {
-          return resolve(server);
-        });
-      });
-    };
-
-    await listen();
-    console.log("listening2");
-    console.log("address", server.address);
-    const addressRes = server.address();
-    console.log("addressRes", addressRes);
-    if (addressRes && typeof addressRes !== "string") {
-      return { port: addressRes.port };
-    }
-    throw new Error("Unable to bind server: adress is not an object");
-  } catch (e) {
-    console.error(e);
-    throw e;
-  }
-};
-
-export const waitForAbort = (signal: AbortSignal): Promise<void> => {
-  return new Promise<void>((resolve, reject) => {
-    if (signal.aborted) {
-      return resolve(); // Already aborted
-    }
-
-    const onAbort = () => {
-      signal.removeEventListener("abort", onAbort);
-      resolve();
-    };
-
-    signal.addEventListener("abort", onAbort);
-  });
-};
-
-export const discord = async (
-  action: "package" | "preview",
-  appFolder: string | undefined,
-  {
-    cwd,
-    log,
-    inputs,
-    setOutput,
-    paths,
-    abortSignal,
-    context,
-  }:
-    | ActionRunnerData<ReturnType<typeof createPackageProps>>
-    | ActionRunnerData<ReturnType<typeof createPreviewProps>>,
-  completeConfiguration: DesktopApp.Config,
-): Promise<{ folder: string; binary: string | undefined } | undefined> => {
-  console.log("appFolder", appFolder);
-
-  log("Building discord");
-
-  const runtime = await detectRuntime(appFolder);
-
-  const { modules, cache, node } = paths;
-
-  const destinationFolder = join(cwd, "build");
-
-  const rawAssetFolder = await fetchPipelabAsset("@pipelab/asset-discord", "^1.0.0", { context });
-  const templateFolder = join(rawAssetFolder, "template");
-
-  // copy template to destination
-  await cp(templateFolder, destinationFolder, {
-    recursive: true,
-    filter: (src) => {
-      log("src", src);
-      // log('dest', dest)
-      // TODO: support other oses
-      return (
-        basename(src) !== "node_modules" &&
-        !src.includes(".nitro") &&
-        !src.includes(".output") &&
-        !src.includes(".env")
-      );
-    },
-  });
-
-  const placeAppFolder = join(destinationFolder, "src", "app");
-
-  // if input is folder, copy folder to destination
-  if (appFolder) {
-    // copy app to template
-    await cp(appFolder, placeAppFolder, { recursive: true });
-  }
-
-  writeFile(
-    join(destinationFolder, ".env"),
-    `DISCORD_CLIENT_ID=1357217738241736724
-DISCORD_CLIENT_SECRET=yJ4vRnzDtKAqg2Le3_Sap2CqHybkTp2U`,
-    "utf8",
-  );
-
-  const sanitizedName = kebabCase(completeConfiguration.name);
-
-  // package.json update
-  // const pkgJSONPath = join(destinationFolder, 'package.json')
-  // const pkgJSONContent = await readFile(pkgJSONPath, 'utf8')
-  // const pkgJSON = JSON.parse(pkgJSONContent)
-  // log('Setting name to', sanitizedName)
-  // pkgJSON.name = sanitizedName
-  // log('Setting productName to', completeConfiguration.name)
-  // pkgJSON.productName = completeConfiguration.name
-  // await writeFile(pkgJSONPath, JSON.stringify(pkgJSON, null, 2))
-
-  // discord.conf.json update
-  // const tauriConfJSONPath = join(destinationFolder, 'src-discord', 'discord.conf.json')
-  // const tauriConfJSONContent = await readFile(tauriConfJSONPath, 'utf8')
-  // const tauriConfJSON = JSON.parse(tauriConfJSONContent)
-  // log('Setting productName to', completeConfiguration.name)
-  // tauriConfJSON.productName = completeConfiguration.name
-  // log('Setting version to', completeConfiguration.appVersion)
-  // tauriConfJSON.version = completeConfiguration.appVersion
-  // log('Setting identifier to', completeConfiguration.appBundleId)
-  // tauriConfJSON.identifier = completeConfiguration.appBundleId
-  // log('Setting build.devUrl to', appFolder)
-  // tauriConfJSON.build.devUrl = appFolder
-  // await writeFile(tauriConfJSONPath, JSON.stringify(tauriConfJSON, null, 2))
-
-  log("Installing packages");
-  const { all: installOut } = await runPnpm(destinationFolder, {
-    args: ["install", "--prefer-offline"],
-    signal: abortSignal,
-    context,
-  });
-  if (installOut) log(installOut);
-
-  // override discord version
-  // if (completeConfiguration.electronVersion && completeConfiguration.electronVersion !== '') {
-  //   log(`Installing discord@${completeConfiguration.electronVersion}`)
-  //   await runWithLiveLogs(
-  //     process.execPath,
-  //     [pnpm, 'install', `discord@${completeConfiguration.electronVersion}`, '--prefer-offline'],
-  //     {
-  //       cwd: destinationFolder,
-  //       env: {
-  //         // DEBUG: '*',
-  //         PNPM_HOME: pnpmHome
-  //       },
-  //       cancelSignal: abortSignal
-  //     },
-  //     log,
-  //     {
-  //       onStderr(data) {
-  //         log(data)
-  //       },
-  //       onStdout(data) {
-  //         log(data)
-  //       }
-  //     }
-  //   )
-  // }
-
-  try {
-    if (action === "preview") {
-      const port = 14141;
-
-      const modulesPath = modules;
-      const nitro = join(modulesPath, "nitropack", "dist", "cli", "index.mjs");
-
-      console.log("nitro", nitro);
-
-      await Promise.allSettled([
-        runPnpm(destinationFolder, {
-          args: ["dlx", "nitropack", "dev"],
-          extraEnv: {
-            PORT: port.toString(),
-          },
-          signal: abortSignal,
-          context,
-        }).then(({ all }) => {
-          if (all) log(all);
-        }),
-        (async () => {
-          const tunnel = await startTunnel({ port, acceptCloudflareNotice: true });
-          console.log("tunnel", tunnel);
-          const url = await tunnel.getURL();
-          console.log("Public URL:", url);
-        })(),
-      ]);
-    } else {
-      throw new Error("TODO");
-    }
-
-    return undefined;
-  } catch (e) {
-    if (e instanceof Error) {
-      if (e.name === "RequestError") {
-        log("Request error");
-      }
-      if (e.name === "RequestError") {
-        log("Request error");
-      }
-    }
-    log(e);
-    return undefined;
-  }
-};

package/src/index.ts

@@ -1,43 +0,0 @@
-import { previewRunner } from "./preview";
-
-import { createNodeDefinition } from "@pipelab/plugin-core";
-const icon = new URL("./public/discord.webp", import.meta.url).href;
-import { createPackageProps, createPreviewProps, IDPreview, IDPackage } from "./discord";
-import { packageV2Runner } from "./package";
-
-export default createNodeDefinition({
-  description: "Discord",
-  name: "Discord",
-  id: "dicord",
-  icon: {
-    type: "image",
-    image: icon,
-  },
-  nodes: [
-    {
-      node: createPackageProps(
-        IDPackage,
-        "Package as Discord Activity",
-        "Package your app as a Discord Activity",
-        "",
-        "`Package app from ${fmt.param(params['input-folder'], 'primary', 'Input folder not set')}`",
-        false,
-        false,
-        undefined,
-        false,
-        false,
-      ),
-      runner: packageV2Runner,
-    },
-    {
-      node: createPreviewProps(
-        IDPreview,
-        "Preview Discord Acitivity app",
-        "Package and preview your app as a Discord Activity",
-        "",
-        "`Preview app from ${fmt.param(params['input-folder'], 'primary', 'Input folder not set')}`",
-      ),
-      runner: previewRunner,
-    },
-  ],
-});

package/src/make.spec.ts

@@ -1,57 +0,0 @@
-import { expect, test, vi } from "vitest";
-import { makeRunner } from "./make.js";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { type fs } from "memfs";
-import { browserWindow } from "@pipelab/shared";
-
-// ...
-
-// vi.mock('node:fs/promises', async () => {
-//   const memfs: { fs: typeof fs } = await vi.importActual('memfs')
-
-//   return memfs.fs.promises
-// })
-
-test("adds 1 + 2 to equal 3", async () => {
-  const outputs: Record<string, unknown> = {};
-
-  const id = "ut-electron-build";
-  const tmpDir = join(tmpdir(), id);
-
-  console.log("tmpDir", tmpDir);
-
-  const inputFolder = join(process.cwd(), "fixtures", "build");
-
-  console.log("inputFolder", inputFolder);
-
-  // await makeRunner({
-  //   inputs: {
-  //     'input-folder': inputFolder,
-  //     configuration: {},
-  //     arch: undefined,
-  //     platform: undefined
-  //   },
-  //   log: (...args) => {
-  //     console.log(...args)
-  //   },
-  //   setOutput: (key, value) => {
-  //     outputs[key] = value
-  //   },
-  //   meta: {
-  //     definition: ''
-  //   },
-  //   setMeta: () => {
-  //     console.log('set meta defined here')
-  //   },
-  //   cwd: tmpDir,
-  //   paths: {
-  //     assets: '',
-  //     unpack: ''
-  //   },
-  //   api: undefined,
-  //   browserWindow
-  // })
-  console.log("outputs", outputs);
-  expect(true).toBe(true);
-}, 120_000);

package/src/package.ts

@@ -1,37 +0,0 @@
-import { createActionRunner, fetchPipelabAsset } from "@pipelab/plugin-core";
-import { createPackageProps, discord } from "./discord";
-import { merge } from "ts-deepmerge";
-import { defaultTauriConfig } from "./utils";
-import { basename, join } from "path";
-import { cp } from "fs/promises";
-
-export const packageV2Runner = createActionRunner<ReturnType<typeof createPackageProps>>(
-  async ({ inputs, cwd, paths, log, setOutput, context }) => {
-    const appFolder = inputs["input-folder"];
-
-    const { cache, node, pnpm } = paths;
-    const destinationFolder = join(cwd);
-    const rawAssetFolder = await fetchPipelabAsset("@pipelab/asset-discord", "^1.0.0", { context });
-    const templateFolder = join(rawAssetFolder, "template");
-
-    // copy template to destination
-    await cp(templateFolder, destinationFolder, {
-      recursive: true,
-      filter: (src) => {
-        log("src", src);
-        // log('dest', dest)
-        // TODO: support other oses
-        return basename(src) !== "node_modules" && !src.includes(".nitro") && !src.includes("dist");
-      },
-    });
-    const placeAppFolder = join(destinationFolder, "server", "public", ".proxy");
-    if (appFolder) {
-      // copy app to template
-      await cp(appFolder, placeAppFolder, { recursive: true });
-    }
-
-    log("destinationFolder", destinationFolder);
-
-    setOutput("outputDir", destinationFolder);
-  },
-);

package/src/preview.ts

@@ -1,25 +0,0 @@
-import { createActionRunner } from "@pipelab/plugin-core";
-import { createPreviewProps, discord } from "./discord";
-import { merge } from "ts-deepmerge";
-
-export const previewRunner = createActionRunner<ReturnType<typeof createPreviewProps>>(
-  async (options) => {
-    const inputFolder = options.inputs["input-folder"];
-    if (inputFolder === "") {
-      throw new Error("URL can't be empty");
-    }
-
-    // if (!options.inputs.configuration) {
-    //   throw new Error('Missing tauri configuration')
-    // }
-
-    const completeConfiguration = merge({}, {
-      ...options.inputs,
-    } satisfies any) as any;
-
-    console.log("completeConfiguration", completeConfiguration);
-
-    await discord("preview", inputFolder, options, completeConfiguration);
-    return;
-  },
-);

package/src/utils.ts

@@ -1,27 +0,0 @@
-export const defaultTauriConfig = {
-  alwaysOnTop: false,
-  appBundleId: "com.pipelab.app",
-  appCategoryType: "",
-  appCopyright: "Copyright © 2024 Pipelab",
-  appVersion: "1.0.0",
-  author: "Pipelab",
-  description: "A simple Electron application",
-  tauriVersion: "",
-  enableExtraLogging: false,
-  clearServiceWorkerOnBoot: false,
-  frame: true,
-  fullscreen: false,
-  icon: "",
-  height: 600,
-  name: "Pipelab",
-  toolbar: true,
-  transparent: false,
-  width: 800,
-  enableSteamSupport: false,
-  steamGameId: 480,
-  enableDiscordSupport: false,
-  discordAppId: "",
-  ignore: [] as string[],
-  backgroundColor: "#FFF",
-  openDevtoolsOnStart: false,
-} satisfies DesktopApp.Tauri;

package/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "extends": "@pipelab/tsconfig/vue.json",
-  "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": "src",
-    "types": ["node"],
-    "skipLibCheck": true
-  },
-  "include": ["src"]
-}

package/tsdown.config.ts

@@ -1,15 +0,0 @@
-import { defineConfig } from "tsdown";
-
-export default defineConfig({
-  entry: ["src/index.ts"],
-  format: ["esm", "cjs"],
-  dts: true,
-  clean: true,
-  loader: {
-    ".webp": "dataurl",
-    ".png": "dataurl",
-    ".jpg": "dataurl",
-    ".jpeg": "dataurl",
-    ".svg": "dataurl",
-  },
-});