Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v9.x Dev #549

Merged
merged 100 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
0009808
add EXT-Background
bugsounet Dec 14, 2024
4a53fae
delete linter deps
bugsounet Dec 14, 2024
73ece54
fix package
bugsounet Dec 14, 2024
ed465c4
Update dependabot.yml - add EXT-Background
bugsounet Dec 14, 2024
271e49c
update esbuild
bugsounet Dec 14, 2024
5522f56
esbuild EXT-Background
bugsounet Dec 14, 2024
86a59b6
review esbuild
bugsounet Dec 14, 2024
656a33c
add src
bugsounet Dec 15, 2024
0d61a7b
update gitignore
bugsounet Dec 15, 2024
5793c6a
delete linter script
bugsounet Dec 15, 2024
f8ca743
update linter config file
bugsounet Dec 15, 2024
4b8276f
change GA version
bugsounet Dec 15, 2024
e91aa8f
add dev command
bugsounet Dec 15, 2024
33eacec
clean package.json
bugsounet Dec 15, 2024
b9a4f05
updload EXT-Browser
bugsounet Dec 15, 2024
8df544e
add ESBuild Testing EXT-Browser
bugsounet Dec 15, 2024
dfe752a
delete commom deps
bugsounet Dec 15, 2024
31a0a72
update gitignore
bugsounet Dec 15, 2024
b927c9c
update package
bugsounet Dec 15, 2024
524ca59
add EXT-Detector
bugsounet Dec 15, 2024
ad362cd
add gitignore
bugsounet Dec 15, 2024
3ea9a49
cleaning package
bugsounet Dec 15, 2024
47573bf
cleaning package.json
bugsounet Dec 15, 2024
36ea3e2
add esbuild EXT-Detector
bugsounet Dec 15, 2024
4a193ad
add build EXT-Detector
bugsounet Dec 15, 2024
836deaa
update workflow of EXT-Detector (test)
bugsounet Dec 15, 2024
711fcec
add develop build testing EXT-Detector
bugsounet Dec 15, 2024
5daa148
update workflow
bugsounet Dec 15, 2024
ba17750
update eslint config
bugsounet Dec 15, 2024
b51bbd3
add EXT-FreeboxTV
bugsounet Dec 15, 2024
608bbc3
clean package
bugsounet Dec 15, 2024
f5c5fd1
lint recipe
bugsounet Dec 15, 2024
6b64f0d
move to src
bugsounet Dec 15, 2024
fc5e8a5
update gitignore
bugsounet Dec 15, 2024
221dba8
add workflow EXT-FreeboxTV
bugsounet Dec 15, 2024
9d21255
add EXT-Touch
bugsounet Dec 15, 2024
aa4a1de
Delete EXTs/EXT-Touch/.gitignore
bugsounet Dec 15, 2024
4e3d816
add src
bugsounet Dec 15, 2024
1380206
update esint config
bugsounet Dec 15, 2024
bfd839c
fix package
bugsounet Dec 15, 2024
76d703a
move to src
bugsounet Dec 15, 2024
9fcf14d
esbuild EXT-Touch
bugsounet Dec 15, 2024
c672ba2
update gitignore
bugsounet Dec 15, 2024
9148bbe
update packages script
bugsounet Dec 15, 2024
0525799
cleaning
bugsounet Dec 15, 2024
1a96aaa
update gitignore
bugsounet Dec 15, 2024
cc00cc2
add EXT-GooglePhotos
bugsounet Dec 15, 2024
879967a
update gitignore
bugsounet Dec 15, 2024
028355b
update eslint config
bugsounet Dec 15, 2024
8ae4310
simplify eslint config
bugsounet Dec 15, 2024
625ade6
eslint config fix
bugsounet Dec 15, 2024
33ea4f2
add EXT-Keyboard
bugsounet Dec 15, 2024
779c89a
move to src
bugsounet Dec 15, 2024
acb9611
clean package
bugsounet Dec 15, 2024
e1c396e
esbuild EXT-Keyboard
bugsounet Dec 15, 2024
9fe5fe5
update gitignore
bugsounet Dec 15, 2024
86019c6
add EXT-Librespot
bugsounet Dec 15, 2024
30d5306
renew package.json
bugsounet Dec 15, 2024
0e7232b
add linter script
bugsounet Dec 15, 2024
25647ce
add linter scripts
bugsounet Dec 15, 2024
e0cc064
add esbuild EXT-Librespot
bugsounet Dec 15, 2024
d8e5e7d
add EXT-MusicPlayer
bugsounet Dec 15, 2024
7c785a2
update gitignore
bugsounet Dec 15, 2024
02bb55e
add EXT-Pages
bugsounet Dec 15, 2024
8c40483
update version
bugsounet Dec 15, 2024
1d2b991
add EXT-Photos
bugsounet Dec 15, 2024
0c1cd2b
add test build EXT-MusicPlayer
bugsounet Dec 15, 2024
e1e3137
add EXT-RadioPlayer
bugsounet Dec 15, 2024
3c023d3
add EXT-Screen
bugsounet Dec 15, 2024
56a1f46
add EXT-SmartHome
bugsounet Dec 15, 2024
5367138
add EXT-Spotify
bugsounet Dec 15, 2024
8c79a7b
add EXT-StreamDeck
bugsounet Dec 15, 2024
f177001
lint package
bugsounet Dec 15, 2024
fd95df4
update npm run reset
bugsounet Dec 15, 2024
8cee92a
add EXT-TelegramBot
bugsounet Dec 15, 2024
17c1744
update dep review
bugsounet Dec 15, 2024
11f67c4
add esbuild EXT-TelegramBot
bugsounet Dec 15, 2024
062c88a
update dep review
bugsounet Dec 15, 2024
7feebf7
add esbuild EXTs
bugsounet Dec 15, 2024
7a6a279
update workflows
bugsounet Dec 15, 2024
5b49695
add EXT-Updates
bugsounet Dec 15, 2024
c937220
review electron rebuild
bugsounet Dec 15, 2024
949533b
cleaning
bugsounet Dec 15, 2024
d07a2c8
add EXT-VLCServer
bugsounet Dec 15, 2024
8560bca
add EXT-Volume
bugsounet Dec 15, 2024
60d9db8
add EXT-Website
bugsounet Dec 15, 2024
57a42d2
renew package-lock.json
bugsounet Dec 15, 2024
b5a5eb1
add some installer files
bugsounet Dec 15, 2024
6345a3c
move to src
bugsounet Dec 15, 2024
670fdca
update ignores
bugsounet Dec 15, 2024
3488235
update npm run reset
bugsounet Dec 15, 2024
6bc01c0
again
bugsounet Dec 15, 2024
00eb97f
renew package-lock
bugsounet Dec 15, 2024
896293b
add EXT-Welcome
bugsounet Dec 15, 2024
eb62bc1
add EXT-YouTube
bugsounet Dec 15, 2024
e91ab04
add EXT-YouTubeCast
bugsounet Dec 15, 2024
74428b9
update Dependabot
bugsounet Dec 15, 2024
b2bef72
update dependabot
bugsounet Dec 15, 2024
e828fe6
update dependabot
bugsounet Dec 15, 2024
4dee1cb
update dependabot
bugsounet Dec 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
directories:
- "/"
- "/EXTs/EXT-*"
schedule:
interval: "weekly"
target-branch: "dev"
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ jobs:
- name: 'Dependency Review'
uses: actions/dependency-review-action@v4
with:
allow-ghsas: GHSA-wf5p-g6vw-rhxx, GHSA-mrr8-v49w-3333
allow-ghsas: GHSA-wf5p-g6vw-rhxx, GHSA-mrr8-v49w-3333, GHSA-p8p7-x288-28g6, GHSA-72xf-g2v4-qvf3
47 changes: 47 additions & 0 deletions .github/workflows/electron-rebuild Develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: "MagicMirror² (develop) and electron-rebuild Testing"

on: [pull_request]

jobs:
build:
name: Test electron-rebuild
runs-on: ubuntu-latest
steps:
- name: "Use Node.js v20.x (latest)"
uses: actions/setup-node@v4
with:
node-version: "20.x"
check-latest: true

- name: Checkout MagicMirror² (develop)
uses: actions/checkout@v4
with:
repository: MagicMirrorOrg/MagicMirror
ref: develop

- name: Install MagicMirror²
run: npm install

- name: Checkout MMM-GoogleAssistant
uses: actions/checkout@v4
with:
path: MagicMirror/modules/MMM-GoogleAssistant

- name: Install MMM-GoogleAssistant
run: npm prune
working-directory: MagicMirror/modules/MMM-GoogleAssistant

- name: Install EXT-Detector
run: npm install
working-directory: MagicMirror/modules/MMM-GoogleAssistant/EXTs/EXT-Detector
continue-on-error: false

- name: Install EXT-MusicPlayer
run: npm install
working-directory: MagicMirror/modules/MMM-GoogleAssistant/EXTs/EXT-MusicPlayer
continue-on-error: false

- name: Install EXT-Website
run: npm install
working-directory: MagicMirror/modules/MMM-GoogleAssistant/EXTs/EXT-Website
continue-on-error: false
49 changes: 49 additions & 0 deletions .github/workflows/electron-rebuild Master.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: "MagicMirror² (master) and electron-rebuild Testing"

on: [pull_request]

jobs:
build:
name: Test electron-rebuild
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [20.x, 22.x]
steps:
- name: "Use Node.js ${{ matrix.node-version }}"
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
check-latest: true

- name: Checkout MagicMirror²
uses: actions/checkout@v4
with:
repository: MagicMirrorOrg/MagicMirror

- name: Install MagicMirror²
run: npm install

- name: Checkout MMM-GoogleAssistant
uses: actions/checkout@v4
with:
path: MagicMirror/modules/MMM-GoogleAssistant

- name: Install MMM-GoogleAssistant
run: npm prune
working-directory: MagicMirror/modules/MMM-GoogleAssistant

- name: Install EXT-Detector
run: npm install
working-directory: MagicMirror/modules/MMM-GoogleAssistant/EXTs/EXT-Detector
continue-on-error: false

- name: Install EXT-MusicPlayer
run: npm install
working-directory: MagicMirror/modules/MMM-GoogleAssistant/EXTs/EXT-MusicPlayer
continue-on-error: false

- name: Install EXT-Website
run: npm install
working-directory: MagicMirror/modules/MMM-GoogleAssistant/EXTs/EXT-Website
continue-on-error: false
116 changes: 116 additions & 0 deletions .github/workflows/esbuild - EXTs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
name: "ESBuild Testing: EXTs"

on: [pull_request]

jobs:
eslint:
name: Run esbuild
runs-on: ubuntu-latest
steps:
- name: "Use Node.js v20.x (latest)"
uses: actions/setup-node@v4
with:
node-version: "20.x"
check-latest: true

- name: Checkout code
uses: actions/checkout@v4

- name: Install Dependencies
run: npm prune

- name: Run ESBuild EXT-Background
run: cd EXTs/EXT-Background && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-Browser
run: cd EXTs/EXT-Browser && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-Detector
run: cd EXTs/EXT-Detector && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-FreeboxTV
run: cd EXTs/EXT-FreeboxTV && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-GooglePhotos
run: cd EXTs/EXT-GooglePhotos && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-Keyboard
run: cd EXTs/EXT-Keyboard && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-Librespot
run: cd EXTs/EXT-Librespot && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-MusicPlayer
run: cd EXTs/EXT-MusicPlayer && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-Pages
run: cd EXTs/EXT-Pages && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-Photos
run: cd EXTs/EXT-Photos && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-RadioPlayer
run: cd EXTs/EXT-RadioPlayer && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-Screen
run: cd EXTs/EXT-Screen && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-SmartHome
run: cd EXTs/EXT-SmartHome && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-Spotify
run: cd EXTs/EXT-Spotify && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-StreamDeck
run: cd EXTs/EXT-StreamDeck && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-TelegramBot
run: cd EXTs/EXT-TelegramBot && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-Touch
run: cd EXTs/EXT-Touch && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-Updates
run: cd EXTs/EXT-Updates && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-VLCServer
run: cd EXTs/EXT-VLCServer && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-Volume
run: cd EXTs/EXT-Volume && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-Website
run: cd EXTs/EXT-Website && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-Welcome
run: cd EXTs/EXT-Welcome && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-YouTube
run: cd EXTs/EXT-YouTube && npm run test:minify
continue-on-error: false

- name: Run ESBuild EXT-YouTubeCast
run: cd EXTs/EXT-YouTubeCast && npm run test:minify
continue-on-error: false
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "ESBuild Testing"
name: "ESBuild Testing: MMM-GoogleAssistant"

on: [pull_request]

Expand Down
24 changes: 22 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,25 @@
/tokenGA.json
/MMM-GoogleAssistant.js
/node_helper.js
/components/*.js
/components/AssistantSDK/*.js
/components/**/*.js
/EXTs/EXT-*/EXT-*.js
/EXTs/EXT-*/node_helper.js
/EXTs/EXT-*/components/**/*.js
/EXTs/EXT-*/node_modules/
/EXTs/EXT-Detector/build/
/EXTs/EXT-Detector/bin/
/EXTs/EXT-Detector/components/lib/node/binding/*
/EXTs/EXT-Librespot/components/librespot/cache/credentials.json
/EXTs/EXT-Librespot/components/librespot/cache/files/*
/EXTs/EXT-Librespot/components/librespot/cache/volume
/EXTs/EXT-Librespot/components/sources/
/EXTs/EXT-MusicPlayer/cover/*.jpg
/EXTs/EXT-Spotify/tokenSpotify.json
/EXTs/EXT-TelegramBot/cache/*
/EXTs/EXT-TelegramBot/screenshot/screenshot_*.png
/EXTs/EXT-Website/smarthome.json
/EXTs/EXT-Website/backup/config.js.GA.*
/EXTs/EXT-Website/website/tools/.uptimed
/EXTs/EXT-Website/website/tokens/*
/EXTs/EXT-Website/website/config/**/*.js
/EXTs/EXT-Website/website/tools/*.js
2 changes: 2 additions & 0 deletions EXTs/EXT-Background/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
engine-strict=true
audit=false
21 changes: 21 additions & 0 deletions EXTs/EXT-Background/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020 @bugsounet

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
13 changes: 13 additions & 0 deletions EXTs/EXT-Background/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# EXT-Background
## Extented for `MMM-GoogleAssistant`

It allows to change background of `MMM-GoogleAssistant` with animated picture or your own background picture

![](https://raw.githubusercontent.com/bugsounet/EXT-Background/dev/jarvis/standby.gif)

## Installation / update / configuration

Read the docs in [wiki](https://wiki.bugsounet.fr/EXT-Background)

## Donate
[Donate](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TTHRH94Y4KL36&source=url), if you love this module !
Binary file added EXTs/EXT-Background/cortana/confirmation.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added EXTs/EXT-Background/cortana/error.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added EXTs/EXT-Background/cortana/listen.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added EXTs/EXT-Background/cortana/reply.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added EXTs/EXT-Background/cortana/standby.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 54 additions & 0 deletions EXTs/EXT-Background/installer/dev.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/*
* Install src code without minify
* @busgounet
*/

const path = require("node:path");
const { copyFileSync } = require("node:fs");
const { globSync } = require("glob");

var files = [];

let project = require("../package.json").name;

/**
* search all javascript files
*/
function searchFiles () {
let components = globSync("../src/**/*.js");
files = files.concat(components);
console.log(`Found: ${files.length} files to install\n`);
}

/**
* Install all files in array with Promise
*/
async function installFiles () {
searchFiles();
await Promise.all(files.map((file) => { return install(file); })).catch(() => process.exit(255));
}

/**
* Install filename with copyFileSync
* @param {string} file to install
* @returns {boolean} resolved with true
*/
function install (file) {
let FileName = file.replace("../src/", "../");
let GAFileName = `${project}/${FileName.replace("../", "")}`;
let pathInResolve = path.resolve(__dirname, file);
let pathOutResolve = path.resolve(__dirname, FileName);
console.log("Process File:", GAFileName);
return new Promise((resolve, reject) => {
try {
copyFileSync(pathInResolve, pathOutResolve);
resolve(true);
} catch {
reject();
}
});
}

console.log("⚠ This Tools is reserved for develop only ⚠\n");
installFiles();
console.log("\n✅ All sources files are installed and ready for developing\n");
Loading
Loading