From 33bcbc0dcafa2edd6475e65c9417af8a39c965af Mon Sep 17 00:00:00 2001 From: hensm Date: Sun, 26 Feb 2023 18:04:22 +0000 Subject: [PATCH] Rename directory: app -> bridge --- .gitignore | 4 +-- README.md | 22 ++++++++-------- {app => bridge}/.eslintrc.json | 0 .../@types/bplist-creator/index.d.ts | 0 .../@types/bplist-parser/index.d.ts | 0 {app => bridge}/@types/castv2/index.d.ts | 0 .../@types/fast-srp-hap/index.d.ts | 0 {app => bridge}/bin/build.js | 0 {app => bridge}/bin/install-manifest.js | 0 {app => bridge}/bin/lib/config.js | 0 {app => bridge}/bin/lib/paths.js | 2 +- {app => bridge}/config.json | 0 {app => bridge}/package-lock.json | 2 +- {app => bridge}/package.json | 0 .../packaging/linux/deb/DEBIAN/control | 0 .../packaging/linux/rpm/package.spec | 0 .../packaging/mac/distribution.xml | 0 .../packaging/mac/scripts/postinstall | 0 {app => bridge}/packaging/win/installer.nsi | 0 .../src/bridge/components/airplay/auth.ts | 0 .../src/bridge/components/airplay/bplist.ts | 0 .../src/bridge/components/cast/Session.ts | 0 .../src/bridge/components/cast/client.ts | 0 .../src/bridge/components/cast/discovery.ts | 0 .../src/bridge/components/cast/index.ts | 0 .../src/bridge/components/cast/remote.ts | 0 .../src/bridge/components/cast/types.ts | 0 .../src/bridge/components/mediaServer.ts | 0 {app => bridge}/src/bridge/index.ts | 0 {app => bridge}/src/bridge/lib/subtitles.ts | 0 {app => bridge}/src/bridge/messaging.ts | 0 {app => bridge}/src/bridge/messagingTypes.ts | 0 {app => bridge}/src/daemon.ts | 0 {app => bridge}/src/global.d.ts | 0 {app => bridge}/src/main.ts | 0 {app => bridge}/src/transforms.ts | 0 {app => bridge}/tsconfig.json | 0 package.json | 25 +++++++++++-------- 38 files changed, 29 insertions(+), 26 deletions(-) rename {app => bridge}/.eslintrc.json (100%) rename {app => bridge}/@types/bplist-creator/index.d.ts (100%) rename {app => bridge}/@types/bplist-parser/index.d.ts (100%) rename {app => bridge}/@types/castv2/index.d.ts (100%) rename {app => bridge}/@types/fast-srp-hap/index.d.ts (100%) rename {app => bridge}/bin/build.js (100%) rename {app => bridge}/bin/install-manifest.js (100%) rename {app => bridge}/bin/lib/config.js (100%) rename {app => bridge}/bin/lib/paths.js (97%) rename {app => bridge}/config.json (100%) rename {app => bridge}/package-lock.json (99%) rename {app => bridge}/package.json (100%) rename {app => bridge}/packaging/linux/deb/DEBIAN/control (100%) rename {app => bridge}/packaging/linux/rpm/package.spec (100%) rename {app => bridge}/packaging/mac/distribution.xml (100%) rename {app => bridge}/packaging/mac/scripts/postinstall (100%) rename {app => bridge}/packaging/win/installer.nsi (100%) rename {app => bridge}/src/bridge/components/airplay/auth.ts (100%) rename {app => bridge}/src/bridge/components/airplay/bplist.ts (100%) rename {app => bridge}/src/bridge/components/cast/Session.ts (100%) rename {app => bridge}/src/bridge/components/cast/client.ts (100%) rename {app => bridge}/src/bridge/components/cast/discovery.ts (100%) rename {app => bridge}/src/bridge/components/cast/index.ts (100%) rename {app => bridge}/src/bridge/components/cast/remote.ts (100%) rename {app => bridge}/src/bridge/components/cast/types.ts (100%) rename {app => bridge}/src/bridge/components/mediaServer.ts (100%) rename {app => bridge}/src/bridge/index.ts (100%) rename {app => bridge}/src/bridge/lib/subtitles.ts (100%) rename {app => bridge}/src/bridge/messaging.ts (100%) rename {app => bridge}/src/bridge/messagingTypes.ts (100%) rename {app => bridge}/src/daemon.ts (100%) rename {app => bridge}/src/global.d.ts (100%) rename {app => bridge}/src/main.ts (100%) rename {app => bridge}/src/transforms.ts (100%) rename {app => bridge}/tsconfig.json (100%) diff --git a/.gitignore b/.gitignore index 38217f3..c1ebd96 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ node_modules/ dist/ -app/node_modules/ -app/build +bridge/node_modules/ +bridge/build ext/node_modules/ test/ChromeProfile/ .idea/ diff --git a/README.md b/README.md index dffa7cf..6d93b8f 100644 --- a/README.md +++ b/README.md @@ -93,9 +93,9 @@ $ npm run install-manifest $ npm run remove-manifest ``` -This will build the ext and app, outputting to `dist/`: +This will build the extension and bridge, outputting to `dist/`: -- `dist/app/` +- `dist/bridge/` ... contains the built bridge with launcher script and manifest (with the path pointing that script). The `install-manifest` npm script copies this manifest to the proper location (or adds its current location to the registry on Windows). - `dist/ext/` ... contains the unpacked extension. @@ -117,13 +117,13 @@ $ npm run start:ext Building a 32-bit version is only supported for Windows. If you're building from a 64-bit system, you'll also need to rebuild any native dependencies as 32-bit. ```sh -$ npm clean-install --prefix ./app --arch=ia32 # If on a 64-bit system +$ npm clean-install --prefix ./bridge --arch=ia32 # If on a 64-bit system # If building without packaging -$ npm run build:app -- -- --arch=x86 --use-pkg +$ npm run build:bridge -- -- --arch=x86 --use-pkg # If packaging -$ npm run package:app -- -- --arch=x86 +$ npm run package:bridge -- -- --arch=x86 ``` ### Build scripts @@ -137,7 +137,7 @@ Extension build script (`build:ext`) arguments: - `--mode` `"development"`, `"production"` Sets build mode. Defaults to `development` unless packaging. -Bridge build script (`build:app`) arguments: +Bridge build script (`build:bridge`) arguments: - `--package` Builds and creates installer packages for distribution. @@ -162,7 +162,7 @@ Build and package extension and bridge application for current platform: $ npm run package ``` -- `dist/app/` +- `dist/bridge/` ... contains the installer package: `fx_cast_bridge--.(pkg|deb|rpm|exe)` - `dist/ext/` ... contains the built extension archive: `fx_cast-.xpi`. @@ -171,11 +171,11 @@ Packaging examples: ```sh $ npm run package:ext # Packaging extension -$ npm run package:app # Packaging bridge application +$ npm run package:bridge # Packaging bridge application # Linux platforms -$ npm run package:app -- -- --package-type=deb -$ npm run package:app -- -- --package-type=rpm +$ npm run package:bridge -- -- --package-type=deb +$ npm run package:bridge -- -- --package-type=rpm ``` ### Testing @@ -187,7 +187,7 @@ The test script expects a compatible installed bridge version and a packaged ext Test results will be displayed in the terminal and within the opened browser tab. Chrome may take some time to initialize the media router component before the cast API is available for testing. ```sh -$ npm run build:app +$ npm run build:bridge $ npm run install-manifest $ npm run package:ext $ npm test diff --git a/app/.eslintrc.json b/bridge/.eslintrc.json similarity index 100% rename from app/.eslintrc.json rename to bridge/.eslintrc.json diff --git a/app/@types/bplist-creator/index.d.ts b/bridge/@types/bplist-creator/index.d.ts similarity index 100% rename from app/@types/bplist-creator/index.d.ts rename to bridge/@types/bplist-creator/index.d.ts diff --git a/app/@types/bplist-parser/index.d.ts b/bridge/@types/bplist-parser/index.d.ts similarity index 100% rename from app/@types/bplist-parser/index.d.ts rename to bridge/@types/bplist-parser/index.d.ts diff --git a/app/@types/castv2/index.d.ts b/bridge/@types/castv2/index.d.ts similarity index 100% rename from app/@types/castv2/index.d.ts rename to bridge/@types/castv2/index.d.ts diff --git a/app/@types/fast-srp-hap/index.d.ts b/bridge/@types/fast-srp-hap/index.d.ts similarity index 100% rename from app/@types/fast-srp-hap/index.d.ts rename to bridge/@types/fast-srp-hap/index.d.ts diff --git a/app/bin/build.js b/bridge/bin/build.js similarity index 100% rename from app/bin/build.js rename to bridge/bin/build.js diff --git a/app/bin/install-manifest.js b/bridge/bin/install-manifest.js similarity index 100% rename from app/bin/install-manifest.js rename to bridge/bin/install-manifest.js diff --git a/app/bin/lib/config.js b/bridge/bin/lib/config.js similarity index 100% rename from app/bin/lib/config.js rename to bridge/bin/lib/config.js diff --git a/app/bin/lib/paths.js b/bridge/bin/lib/paths.js similarity index 97% rename from app/bin/lib/paths.js rename to bridge/bin/lib/paths.js index 26bb113..889d9df 100644 --- a/app/bin/lib/paths.js +++ b/bridge/bin/lib/paths.js @@ -8,7 +8,7 @@ import config from "./config.js"; const __dirname = path.dirname(url.fileURLToPath(import.meta.url)); const rootPath = path.join(__dirname, "../../../"); -export const DIST_PATH = path.join(rootPath, "dist/app"); +export const DIST_PATH = path.join(rootPath, "dist/bridge"); export const LICENSE_PATH = path.join(rootPath, "LICENSE"); export const REGISTRY_KEY = config.applicationName; diff --git a/app/config.json b/bridge/config.json similarity index 100% rename from app/config.json rename to bridge/config.json diff --git a/app/package-lock.json b/bridge/package-lock.json similarity index 99% rename from app/package-lock.json rename to bridge/package-lock.json index c856a73..58b36d7 100644 --- a/app/package-lock.json +++ b/bridge/package-lock.json @@ -1,5 +1,5 @@ { - "name": "app", + "name": "bridge", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/app/package.json b/bridge/package.json similarity index 100% rename from app/package.json rename to bridge/package.json diff --git a/app/packaging/linux/deb/DEBIAN/control b/bridge/packaging/linux/deb/DEBIAN/control similarity index 100% rename from app/packaging/linux/deb/DEBIAN/control rename to bridge/packaging/linux/deb/DEBIAN/control diff --git a/app/packaging/linux/rpm/package.spec b/bridge/packaging/linux/rpm/package.spec similarity index 100% rename from app/packaging/linux/rpm/package.spec rename to bridge/packaging/linux/rpm/package.spec diff --git a/app/packaging/mac/distribution.xml b/bridge/packaging/mac/distribution.xml similarity index 100% rename from app/packaging/mac/distribution.xml rename to bridge/packaging/mac/distribution.xml diff --git a/app/packaging/mac/scripts/postinstall b/bridge/packaging/mac/scripts/postinstall similarity index 100% rename from app/packaging/mac/scripts/postinstall rename to bridge/packaging/mac/scripts/postinstall diff --git a/app/packaging/win/installer.nsi b/bridge/packaging/win/installer.nsi similarity index 100% rename from app/packaging/win/installer.nsi rename to bridge/packaging/win/installer.nsi diff --git a/app/src/bridge/components/airplay/auth.ts b/bridge/src/bridge/components/airplay/auth.ts similarity index 100% rename from app/src/bridge/components/airplay/auth.ts rename to bridge/src/bridge/components/airplay/auth.ts diff --git a/app/src/bridge/components/airplay/bplist.ts b/bridge/src/bridge/components/airplay/bplist.ts similarity index 100% rename from app/src/bridge/components/airplay/bplist.ts rename to bridge/src/bridge/components/airplay/bplist.ts diff --git a/app/src/bridge/components/cast/Session.ts b/bridge/src/bridge/components/cast/Session.ts similarity index 100% rename from app/src/bridge/components/cast/Session.ts rename to bridge/src/bridge/components/cast/Session.ts diff --git a/app/src/bridge/components/cast/client.ts b/bridge/src/bridge/components/cast/client.ts similarity index 100% rename from app/src/bridge/components/cast/client.ts rename to bridge/src/bridge/components/cast/client.ts diff --git a/app/src/bridge/components/cast/discovery.ts b/bridge/src/bridge/components/cast/discovery.ts similarity index 100% rename from app/src/bridge/components/cast/discovery.ts rename to bridge/src/bridge/components/cast/discovery.ts diff --git a/app/src/bridge/components/cast/index.ts b/bridge/src/bridge/components/cast/index.ts similarity index 100% rename from app/src/bridge/components/cast/index.ts rename to bridge/src/bridge/components/cast/index.ts diff --git a/app/src/bridge/components/cast/remote.ts b/bridge/src/bridge/components/cast/remote.ts similarity index 100% rename from app/src/bridge/components/cast/remote.ts rename to bridge/src/bridge/components/cast/remote.ts diff --git a/app/src/bridge/components/cast/types.ts b/bridge/src/bridge/components/cast/types.ts similarity index 100% rename from app/src/bridge/components/cast/types.ts rename to bridge/src/bridge/components/cast/types.ts diff --git a/app/src/bridge/components/mediaServer.ts b/bridge/src/bridge/components/mediaServer.ts similarity index 100% rename from app/src/bridge/components/mediaServer.ts rename to bridge/src/bridge/components/mediaServer.ts diff --git a/app/src/bridge/index.ts b/bridge/src/bridge/index.ts similarity index 100% rename from app/src/bridge/index.ts rename to bridge/src/bridge/index.ts diff --git a/app/src/bridge/lib/subtitles.ts b/bridge/src/bridge/lib/subtitles.ts similarity index 100% rename from app/src/bridge/lib/subtitles.ts rename to bridge/src/bridge/lib/subtitles.ts diff --git a/app/src/bridge/messaging.ts b/bridge/src/bridge/messaging.ts similarity index 100% rename from app/src/bridge/messaging.ts rename to bridge/src/bridge/messaging.ts diff --git a/app/src/bridge/messagingTypes.ts b/bridge/src/bridge/messagingTypes.ts similarity index 100% rename from app/src/bridge/messagingTypes.ts rename to bridge/src/bridge/messagingTypes.ts diff --git a/app/src/daemon.ts b/bridge/src/daemon.ts similarity index 100% rename from app/src/daemon.ts rename to bridge/src/daemon.ts diff --git a/app/src/global.d.ts b/bridge/src/global.d.ts similarity index 100% rename from app/src/global.d.ts rename to bridge/src/global.d.ts diff --git a/app/src/main.ts b/bridge/src/main.ts similarity index 100% rename from app/src/main.ts rename to bridge/src/main.ts diff --git a/app/src/transforms.ts b/bridge/src/transforms.ts similarity index 100% rename from app/src/transforms.ts rename to bridge/src/transforms.ts diff --git a/app/tsconfig.json b/bridge/tsconfig.json similarity index 100% rename from app/tsconfig.json rename to bridge/tsconfig.json diff --git a/package.json b/package.json index b272bb0..b4e94c8 100644 --- a/package.json +++ b/package.json @@ -1,22 +1,25 @@ { "scripts": { - "postinstall": "npm run postinstall:app && npm run postinstall:ext", - "postinstall:app": "cd app && npm install", + "postinstall": "npm run postinstall:bridge && npm run postinstall:ext", + "postinstall:bridge": "cd bridge && npm install", "postinstall:ext": "cd ext && npm install", - "build": "npm run build:app && npm run build:ext", - "build:app": "cd app && npm run build", + "build": "npm run build:bridge && npm run build:ext", + "build:bridge": "cd bridge && npm run build", "build:ext": "cd ext && npm run build", "watch:ext": "cd ext && npm run watch", "start:ext": "cd ext && npm run start", - "package": "npm run package:app && npm run package:ext", - "package:app": "cd app && npm run package", + "package": "npm run package:bridge && npm run package:ext", + "package:bridge": "cd bridge && npm run package", "package:ext": "cd ext && npm run package", "test": "node test/driver.js", - "install-manifest": "cd app && npm run install-manifest", - "remove-manifest": "cd app && npm run remove-manifest", - "lint": "npm run lint:app && npm run lint:ext", - "lint:app": "eslint app/src --ext .ts,.js", - "lint:ext": "eslint ext/src --ext .ts,.js,.svelte" + "install-manifest": "cd bridge && npm run install-manifest", + "remove-manifest": "cd bridge && npm run remove-manifest", + "lint": "npm run lint:bridge && npm run lint:ext", + "lint:bridge": "eslint bridge/src --ext .ts,.js", + "lint:ext": "eslint ext/src --ext .ts,.js,.svelte", + "build:app": "npm run build:bridge", + "package:app": "npm run package:bridge", + "lint:app": "npm run lint:bridge" }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.14.0",