Merge branch 'espruino:master' into master

.eslintignore

@@ -1,7 +1,6 @@
-apps/animclk/V29.LBM.js
-apps/banglerun/rollup.config.js
-apps/schoolCalendar/fullcalendar/main.js
-apps/authentiwatch/qr_packed.js
-apps/qrcode/qr-scanner.umd.min.js
-apps/gipy/pkg/gpconv.js
-*.test.js
+
+# Needs to be ignored because it uses ESM export/import
+apps/gipy/pkg/gps.js
+
+# Needs to be ignored because it includes broken JS
+apps/health/chart.min.js

modules/.eslintrc.json → .eslintrc.js

@@ -1,7 +1,32 @@
-{
+const lintExemptions = require("./apps/lint_exemptions.js");
+const fs = require("fs");
+const path = require("path");
+
+function findGeneratedJS(roots) {
+    function* listFiles(dir, allow) {
+        for (const f of fs.readdirSync(dir)) {
+            const filepath = path.join(dir, f);
+            const stat = fs.statSync(filepath);
+
+            if (stat.isDirectory()) {
+                yield* listFiles(filepath, allow);
+            } else if(allow(filepath)) {
+                yield filepath;
+            }
+        }
+    }
+
+    return roots.flatMap(root =>
+        [...listFiles(root, f => f.endsWith(".ts"))]
+            .map(f => f.replace(/\.ts$/, ".js"))
+    );
+}
+
+module.exports = {
     "env": {
         // TODO: "espruino": false
         // TODO: "banglejs": false
+        // For a prototype of the above, see https://github.com/espruino/BangleApps/pull/3237
     },
     "extends": "eslint:recommended",
     "globals": {
@@ -23,10 +48,8 @@
         "Flash": "readonly",
         "Float32Array": "readonly",
         "Float64Array": "readonly",
-        "fs": "readonly",
         "Function": "readonly",
         "Graphics": "readonly",
-        "heatshrink": "readonly",
         "I2C": "readonly",
         "Int16Array": "readonly",
         "Int32Array": "readonly",
@@ -46,20 +69,20 @@
         "RegExp": "readonly",
         "Serial": "readonly",
         "SPI": "readonly",
-        "Storage": "readonly",
         "StorageFile": "readonly",
         "String": "readonly",
         "SyntaxError": "readonly",
-        "tensorflow": "readonly",
         "TFMicroInterpreter": "readonly",
         "TypeError": "readonly",
         "Uint16Array": "readonly",
         "Uint24Array": "readonly",
         "Uint32Array": "readonly",
         "Uint8Array": "readonly",
         "Uint8ClampedArray": "readonly",
+        "Unistroke": "readonly",
         "Waveform": "readonly",
         // Methods and Fields at https://banglejs.com/reference
+        "__FILE__": "readonly",
         "analogRead": "readonly",
         "analogWrite": "readonly",
         "arguments": "readonly",
@@ -129,7 +152,43 @@
         "VIBRATE": "readonly",
         // Aliases and not defined at https://banglejs.com/reference
         "g": "readonly",
-        "WIDGETS": "readonly"
+        "WIDGETS": "readonly",
+        "module": "readonly",
+        "exports": "writable",
+        "D0": "readonly",
+        "D1": "readonly",
+        "D2": "readonly",
+        "D3": "readonly",
+        "D4": "readonly",
+        "D5": "readonly",
+        "D6": "readonly",
+        "D7": "readonly",
+        "D8": "readonly",
+        "D9": "readonly",
+        "D10": "readonly",
+        "D11": "readonly",
+        "D12": "readonly",
+        "D13": "readonly",
+        "D14": "readonly",
+        "D15": "readonly",
+        "D16": "readonly",
+        "D17": "readonly",
+        "D18": "readonly",
+        "D19": "readonly",
+        "D20": "readonly",
+        "D21": "readonly",
+        "D22": "readonly",
+        "D23": "readonly",
+        "D24": "readonly",
+        "D25": "readonly",
+        "D26": "readonly",
+        "D27": "readonly",
+        "D28": "readonly",
+        "D29": "readonly",
+        "D30": "readonly",
+        "D31": "readonly",
+
+        "bleServiceOptions": "writable", // available in boot.js code that's called ad part of bootupdate
     },
     "parserOptions": {
         "ecmaVersion": 11
@@ -142,22 +201,48 @@
                 "SwitchCase": 1
             }
         ],
-        "no-case-declarations": "off",
         "no-constant-condition": "off",
         "no-delete-var": "off",
-        "no-empty": "off",
+        "no-empty": ["warn", { "allowEmptyCatch": true }],
         "no-global-assign": "off",
         "no-inner-declarations": "off",
-        "no-octal": "off",
         "no-prototype-builtins": "off",
         "no-redeclare": "off",
         "no-unreachable": "warn",
         "no-cond-assign": "warn",
         "no-useless-catch": "warn",
-        // TODO: "no-undef": "warn",
-        "no-undef": "off",
-        "no-unused-vars": "off",
+        "no-undef": "warn",
+        "no-unused-vars": ["warn", { "args": "none" } ],
         "no-useless-escape": "off",
         "no-control-regex" : "off"
-    }
+    },
+    overrides: [
+        {
+            files: ["*.ts"],
+            extends: [
+                "eslint:recommended",
+                "plugin:@typescript-eslint/recommended",
+            ],
+            "parser": "@typescript-eslint/parser",
+            "plugins": ["@typescript-eslint"],
+            rules: {
+                "no-delete-var": "off",
+                "no-empty": ["error", { "allowEmptyCatch": true }],
+                "no-prototype-builtins": "off",
+                "prefer-const": "off",
+                "prefer-rest-params": "off",
+                "no-control-regex" : "off",
+                "@typescript-eslint/no-delete-var": "off",
+                "@typescript-eslint/no-explicit-any": "off",
+                "@typescript-eslint/no-this-alias": "off",
+                "@typescript-eslint/no-unused-vars": "off",
+                "@typescript-eslint/no-var-requires": "off",
+            }
+        },
+        ...Object.entries(lintExemptions).map(([filePath, {rules}]) => ({
+            files: [filePath],
+            rules: Object.fromEntries(rules.map(rule => [rule, "off"])),
+        })),
+    ],
+    ignorePatterns: findGeneratedJS(["apps/", "modules/"]),
 }

.github/ISSUE_TEMPLATE/bangle-bug-report-custom-form.yaml

@@ -58,3 +58,7 @@ body:
 
     validations:
       required: true
+  - type: textarea
+    id: apps
+    attributes:
+      label: Installed apps

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+
+updates:
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/nodejs.yml

@@ -11,10 +11,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: recursive
-      - name: Use Node.js 16.x
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
       - name: Install testing dependencies
         run: npm ci
       - name: Test all apps and widgets

.gitignore

@@ -14,3 +14,4 @@ _site
 .owncloudsync.log
 Desktop.ini
 .sync_*.db*
+*.swp

CONTRIBUTING.md

@@ -0,0 +1,9 @@
+Contributing to BangleApps
+==========================
+
+https://github.com/espruino/BangleApps?tab=readme-ov-file#getting-started
+has some links to tutorials on developing for Bangle.js.
+
+Please check out the Wiki to get an idea what sort of things
+we'd like to see for contributed apps: https://github.com/espruino/BangleApps/wiki/App-Contribution
+

README.md

@@ -6,6 +6,8 @@ Bangle.js App Loader (and Apps)
 * Try the **release version** at [banglejs.com/apps](https://banglejs.com/apps)
 * Try the **development version** at [espruino.github.io](https://espruino.github.io/BangleApps/)
 
+The release version is manually refreshed with regular intervals while the development version is continuously updated as new code is committed to this repository.
+
 **All software (including apps) in this repository is MIT Licensed - see [LICENSE](LICENSE)** By
 submitting code to this repository you confirm that you are happy with it being MIT licensed,
 and that it is not licensed in another way that would make this impossible.
@@ -98,7 +100,7 @@ This is the best way to test...
 
 **Note:** It's a great idea to get a local copy of the repository on your PC,
 then run `bin/sanitycheck.js` - it'll run through a bunch of common issues
-that there might be.
+that there might be. To get the project running locally, you have to initialize and update the git submodules first: `git submodule update --init`.
 
 Be aware of the delay between commits and updates on github.io - it can take a few minutes (and a 'hard refresh' of your browser) for changes to take effect.
 
@@ -251,7 +253,7 @@ and which gives information about the app for the Launcher.
   "description": "...",       // long description (can contain markdown)
   "icon": "icon.png",         // icon in apps/
   "screenshots" : [ { "url":"screenshot.png" } ], // optional screenshot for app
-  "type":"...",               // optional(if app) -  
+  "type":"...",               // optional(if app) -
                               //   'app' - an application
                               //   'clock' - a clock - required for clocks to automatically start
                               //   'widget' - a widget
@@ -277,13 +279,17 @@ and which gives information about the app for the Launcher.
                               //   'game' - a game
                               //   'bluetooth' - uses Bluetooth LE
                               //   'system' - used by the system
-                              //   'clkinfo' - provides or uses clock_info module for data on your clock face (see modules/clock_info.js)
+                              //   'clkinfo' - provides or uses clock_info module for data on your clock face or clocks that support it (see apps/clock_info/README.md)
+                              //   'health' - e.g. heart rate monitors or step counting
   "supports": ["BANGLEJS2"],  // List of device IDs supported, either BANGLEJS or BANGLEJS2
   "dependencies" : { "notify":"type" } // optional, app 'types' we depend on (see "type" above)
   "dependencies" : { "messages":"app" } // optional, depend on a specific app ID
                               // for instance this will use notify/notifyfs is they exist, or will pull in 'notify'
-  "dependencies" : { "messageicons":"module" } // optional, depend on a specific library to be used with 'require'
+  "dependencies" : { "messageicons":"module" } // optional, depend on a specific library to be used with 'require' - see provides_modules
+  "dependencies" : { "message":"widget" } // optional, depend on a specific type of widget - see provides_widgets
   "provides_modules" : ["messageicons"] // optional, this app provides a module that can be used with 'require'
+  "provides_widgets" : ["battery"] // optional, this app provides a type of widget - 'alarm/battery/bluetooth/pedometer/message'
+  "default" : true,           // set if an app is the default implementer of something (a widget/module/etc)
   "readme": "README.md",      // if supplied, a link to a markdown-style text file
                               // that contains more information about this app (usage, etc)
                               // A 'Read more...' link will be added under the app
@@ -296,7 +302,7 @@ and which gives information about the app for the Launcher.
   "customConnect": true,      // if supplied, ensure we are connected to a device
                               // before the "custom.html" iframe is loaded. An
                               // onInit function in "custom.html" is then called
-                              // with info on the currently connected device.                 
+                              // with info on the currently connected device.
 
   "interface": "interface.html",   // if supplied, apps/interface.html is loaded in an
                               // iframe, and it may interact with the connected Bangle
@@ -324,9 +330,9 @@ and which gives information about the app for the Launcher.
     {"name":"appid.data.json",  // filename used in storage
      "storageFile":true       // if supplied, file is treated as storageFile
      "url":"",                // if supplied URL of file to load (currently relative to apps/)
-     "content":"...",         // if supplied, this content is loaded directly     
+     "content":"...",         // if supplied, this content is loaded directly
      "evaluate":true,         // if supplied, data isn't quoted into a String before upload
-                              // (eg it's evaluated as JS)     
+                              // (eg it's evaluated as JS)
     },
     {"wildcard":"appid.data.*" // wildcard of filenames used in storage
     },                         // this is mutually exclusive with using "name"
@@ -399,7 +405,7 @@ in an iframe.
     <link rel="stylesheet" href="../../css/spectre.min.css">
   </head>
   <body>
-    <script src="../../lib/interface.js"></script>
+    <script src="../../core/lib/interface.js"></script>
     <div id="t">Loading...</div>
     <script>
       function onInit() {
@@ -420,9 +426,9 @@ See [apps/gpsrec/interface.html](the GPS Recorder) for a full example.
 
 ### Adding configuration to the "Settings" menu
 
-Apps (or widgets) can add their own settings to the "Settings" menu under "App/widget settings".   
+Apps (or widgets) can add their own settings to the "Settings" menu under "App/widget settings".
 To do so, the app needs to include a `settings.js` file, containing a single function
-that handles configuring the app.   
+that handles configuring the app.
 When the app settings are opened, this function is called with one
 argument, `back`: a callback to return to the settings menu.
 
@@ -445,12 +451,12 @@ Example `settings.js`
     'Monkeys': {
       value: settings.monkeys,
       onchange: (m) => {save('monkeys', m)}
-    }   
+    }
   };
   E.showMenu(appMenu)
 })
 ```
-In this example the app needs to add `myappid.settings.js` to `storage` in `metadata.json`.   
+In this example the app needs to add `myappid.settings.js` to `storage` in `metadata.json`.
 It should also add `myappid.json` to `data`, to make sure it is cleaned up when the app is uninstalled.
 ```json
   { "id": "myappid",
@@ -550,6 +556,30 @@ You can use `g.setColor(r,g,b)` OR `g.setColor(16bitnumber)` - some common 16 bi
 | GreenYellow | 0xAFE5 |
 | Pink | 0xF81F |
 
+## Fonts
+
+A recent addition to Bangle.js is the ability to use extra fonts with support for more characters.
+For example [all regions](https://banglejs.com/apps/?id=fontall) or [extended](https://banglejs.com/apps/?id=fontext) fonts.
+
+Once installed, these apps cause a new font, `Intl` to be added to `Graphics`, which can be used with just `g.setFont("Intl")`.
+
+There is also a `font` library - this is not implemented yet, but more information about the planned implementation
+is available at https://github.com/espruino/BangleApps/issues/3109
+
+For now, to make your app work with the international font, you can check if `Graphics.prototype.setFontIntl` exists,
+and if so you can change the font you plan on using:
+
+```JS
+myFont = "6x8:2";
+if (Graphics.prototype.setFontIntl)
+  myFont = "Intl";
+```
+
+Any new Font library must contain the metadata `"icon": "app.png", "tags": "font", "type": "module", "provides_modules" : ["fonts"],`
+and should provide a `font` library, as well as a `boot.js` that adds `Graphics.prototype.setFontIntl`. If you plan on
+making a new library it's best to just copy one of the existing ones for now.
+
+
 ## API Reference
 
 [Reference](http://www.espruino.com/Reference#software)