Merge pull request #344 from steilerDev/dev

stage for beta release

.github/ISSUE_TEMPLATE/issue.yml

@@ -65,5 +65,5 @@ body:
           required: true
         - label: Checked out [open and known issues](https://github.com/steilerDev/icloud-photos-sync/issues?q=is%3Aopen+is%3Aissue+label%3Aclass%28bug%29%2Cclass%28improvement%29%2C%22class%28known+issue%29%22)
           required: true
-        - label: Enabled [crash and error reporting](https://steilerdev.github.io/icloud-photos-sync/user-guides/error-reporting/)
+        - label: Enabled [crash and error reporting](https://icps.steiler.dev/user-guides/cli/#enable-crash-reporting)
           required: true

.github/actions/helper/prepare-semantic-release/package.json

@@ -1,13 +1,12 @@
 {
     "description": "dependencies for releasing semantic release",
     "devDependencies": {
-        "semantic-release": "^21.0.5",
-        "@semantic-release/release-notes-generator": "^11.0.3",
-        "conventional-changelog": "^4.0.0",
-        "conventional-changelog-conventionalcommits": "^6.1.0",
-        "@backtrace-labs/javascript-cli": "^0.0.1",
+        "@backtrace-labs/javascript-cli": "^0.1.2",
         "@semantic-release-plus/docker": "^3.1.2",
-        "@semantic-release/github": "^9.0.3"
-  }
+        "@semantic-release/github": "^9.0.6",
+        "@semantic-release/release-notes-generator": "^12.0.0",
+        "conventional-changelog": "^5.1.0",
+        "conventional-changelog-conventionalcommits": "^7.0.2",
+        "semantic-release": "^22.0.0"
+    }
 }
-

.github/actions/release/app/action.yml

@@ -30,7 +30,7 @@ runs:
         (cd ${{ inputs.release-dir }}; npx semantic-release)
     - id: upload-source-map
       shell: bash
-      run: (cd ${{ inputs.release-dir }}; npx backtrace-js upload --subdomain steilerdev --token ${{ inputs.bt-token }} app/bin/)
+      run: (cd ${{ inputs.release-dir }}; npx backtrace-js upload app/bin/ --url https://submit.backtrace.io/steilerdev/${{ inputs.bt-token }}/sourcemap)
     - id: get-git-metadata
       uses: ./.github/actions/helper/git-metadata
     - id: get-npm-metadata

.github/dependabot.yml

@@ -24,9 +24,29 @@ updates:
       day: "saturday"
       time: "09:00"
       timezone: "Europe/Berlin"
+    groups:
+      jest:
+        patterns:
+        - "jest*"
+        - "@types/jest*"
+        - "ts-jest*"
+      mockfs:
+        patterns:
+        - "mock-fs*"
+        - "@types/mock-fs*"
+      typescript:
+        patterns:
+        - "@typescript-eslint*"
+        - "@types/typescript*"
+        - 'eslint*'
+        - "typescript*"
+        - "ts-node*"
+        - "typedoc*"
+      tough-cookie:
+        patterns:
+        - "tough-cookie*"
+        - "@types/tough-cookie*"
     ignore:
-      - dependency-name: "typedoc*"
-        update-types: ["version-update:semver-minor"] # ignore minor version for something like typedoc
       - dependency-name: "@types/node"
         versions: ["19.x.x", "20.x.x"] # Ignoring non-LTS version - See https://github.com/nodejs/Release
 
@@ -55,9 +75,10 @@ updates:
       day: "saturday"
       time: "09:00"
       timezone: "Europe/Berlin"
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-minor", "version-update:semver-patch"] # only alert about major update
+    groups:
+      mkdocs:
+        patterns:
+        - "mkdocs*"
 
   # Maintain dependencies for semantic release
   - package-ecosystem: "npm"
@@ -70,6 +91,9 @@ updates:
       day: "saturday"
       time: "09:00"
       timezone: "Europe/Berlin"
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-minor", "version-update:semver-patch"] # only alert about major update
+    groups:
+      semantic-release:
+        patterns:
+        - "semantic-release*"
+        - "@semantic-release*"
+        - "conventional-changelog*"

.github/workflows/action_trust-token.yml

@@ -43,7 +43,7 @@ jobs:
     if: github.event_name == 'workflow_dispatch'
     steps:
     - name: setup/checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: setup/api-token
       uses: ./.github/actions/helper/api-token-setup
       with:

.github/workflows/artifacts_build-release.yml

@@ -32,7 +32,7 @@ jobs:
     permissions: {}
     steps:
       - name: setup/checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup/build-app
         uses: ./.github/actions/build/app-setup
       - name: action/build-app
@@ -51,7 +51,7 @@ jobs:
       url: ${{ steps.release-app.outputs.release-url }}
     steps:
       - name: setup/checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup/release-app
         uses: ./.github/actions/release/app-setup
       - name: action/release-app
@@ -68,7 +68,7 @@ jobs:
     permissions: {}
     steps:
       - name: setup/checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup/build-docker
         uses: ./.github/actions/build/docker-setup
       - name: action/build-docker
@@ -85,7 +85,7 @@ jobs:
       url: ${{ steps.release-docker.outputs.release-url }}
     steps:
       - name: setup/checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup/release-docker
         uses: ./.github/actions/release/docker-setup
       - name: action/release-docker
@@ -100,7 +100,7 @@ jobs:
     permissions: {}
     steps:
       - name: setup/checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup/build-wiki
         uses: ./.github/actions/build/wiki-setup
       - name: action/build-wiki
@@ -117,7 +117,7 @@ jobs:
       url: ${{ steps.release-wiki.outputs.release-url }}
     steps:
       - name: setup/checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup/release-wiki
         uses: ./.github/actions/release/wiki-setup
       - name: action/release-wiki
@@ -133,7 +133,7 @@ jobs:
     permissions: {}
     steps:
       - name: setup/checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup/build-docs
         uses: ./.github/actions/build/docs-setup
       - name: action/build-docs
@@ -151,7 +151,7 @@ jobs:
       url: ${{ steps.release-docs.outputs.release-url }}
     steps:
       - name: setup/checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup/release-docs
         uses: ./.github/actions/release/docs-setup
       - name: action/release-docs
@@ -173,7 +173,7 @@ jobs:
       url: ${{ steps.release-github.outputs.release-url }}
     steps:
       - name: setup/checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup/release-github
         uses: ./.github/actions/release/github-setup
       - name: action/release-github

.github/workflows/artifacts_test.yml

@@ -27,7 +27,7 @@ jobs:
     if: contains(fromJSON(inputs.methods), 'unit-ubuntu')
     steps:
       - name: setup/checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup/test-unit
         uses: ./.github/actions/test/unit-setup
       - name: action/test-unit
@@ -38,7 +38,7 @@ jobs:
     if: contains(fromJSON(inputs.methods), 'unit-macos')
     steps:
       - name: setup/checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup/test-unit
         uses: ./.github/actions/test/unit-setup
       - name: action/test-unit
@@ -49,7 +49,7 @@ jobs:
     if: contains(fromJSON(inputs.methods), 'e2e')
     steps:
       - name: setup/checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup/test-e2e
         uses: ./.github/actions/test/e2e-setup
       - name: action/test-e2e
@@ -64,7 +64,7 @@ jobs:
     if: contains(fromJSON(inputs.methods), 'api')
     steps:
       - name: setup/checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup/test-api
         uses: ./.github/actions/test/api-setup
       - name: action/test-api

.github/workflows/monitor_codeql.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: setup/checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: setup/codeql
         uses: github/codeql-action/init@v2
         with:

.vscode/icloud-photos-sync.cspell

@@ -22,6 +22,7 @@ CPLMASTER
 croner
 datasource
 dawidd6
+DBRP
 dedup
 deFEyox97ecdknADe0xP4YzIDDKf
 devmasx
@@ -94,6 +95,7 @@ Symbolication
 templating
 testparam
 testpassword
+thundernetworkrad
 timepicker
 tplrgn
 truevision

.vscode/launch.json

@@ -65,7 +65,7 @@
                 "--runInBand",
                 "--config", "jest.config.json",
                 //"--detectOpenHandles",
-                "test/unit/icloud.test.ts"
+                "test/unit/app.test.ts"
             ],
             "env": {
                 "NODE_NO_WARNINGS": "1"

README.md

@@ -110,11 +110,11 @@ As this application is using an undocumented public API, there are a couple of k
 
 - **iCloud Shared Photo Library**:
   While this app is syncing all assets from the *Shared Photo Library*, unfortunately the API does not provide the location of shared assets within the user's folder hierarchy (when navigating to a folder on the WebUI while having *Shared Photo Library* enabled will yield an error). Until this functionality is available, *Shared Photo Library* assets will only be present in the `_Shared-Photos` folder and therefore cannot be archived.
-- **Advanced Data Protection**:
-  In order to use this app with an account that is secured through *Advanced Data Protection*, please make sure [access through the iCloud WebUI](https://support.apple.com/de-de/HT212523) is enabled. This  is a minimum requirement since this tool is re-using those APIs - [I'm still waiting on confirmation that this will enable functionality, please report your experience!](https://github.com/steilerDev/icloud-photos-sync/issues/202)
 - **FileType Support**:
   The support of file types needs to be hardcoded by this application, since a full list is not available or retrievable. If you come across an `Unknown filetype descriptor` error, [please report it](https://github.com/steilerDev/icloud-photos-sync/issues/143), in order for the file type to be added to the application.
 
+Please also check out [open and known issues](https://github.com/steilerDev/icloud-photos-sync/issues?q=is%3Aopen+is%3Aissue+label%3Aclass%28bug%29%2Cclass%28improvement%29%2C%22class%28known+issue%29%22) and [existing feature requests](https://github.com/steilerDev/icloud-photos-sync/issues?q=is%3Aopen+is%3Aissue+label%3Aclass%28feature%29+label%3Astatus%28open%29%2Cstatus%28wontfix%29%2Cstatus%28backlog%29%2C%22status%28help+needed%29%22%2C%22status%28in+progress%29%22%2Cstatus%28investigating%29%2Cstatus%28previewed%29+) for more information.
+
 ## OS Support
 
 <p align="center">

SECURITY.md

@@ -8,6 +8,6 @@ At the moment, only the latest version will be supported with security updates.
 
 ## Reporting a Vulnerability
 
-If you should discover a security vulnerability with a CVSS score higher than 6.9 ('High' or 'Critical'), I would like to ask you to report this privately and responsibly to frank@steilerdev.de. You should receive feedback on those inquiries within 10 business days.
+If you should discover a security vulnerability with a CVSS score higher than 6.9 ('High' or 'Critical'), I would like to ask you to report this privately and responsibly to frank@steiler.dev. You should receive feedback on those inquiries within 10 business days.
 
 Any other lower security score should be following the [bug reporting process laid out in the contributing guidelines](https://github.com/steilerDev/icloud-photos-sync/blob/main/CONTRIBUTING.md#issue).

app/build/cli-reference.liquid

@@ -17,6 +17,7 @@ Use `{{ commandName }} {{ helpCommandName }} [command]` for information on a spe
 
 ## Options
 {% for option in globalOptions %}
+
 ### {{ option.pretty }}
 
 {% if option.required -%}

app/build/cli-reference.ts

@@ -12,7 +12,7 @@ const outputPath = process.argv.pop() + `/user-guides/cli.md`;
 /**
  * The program from the app factory
  */
-const program = argParser(() => {});
+const program = argParser(() => {}, () => `somePass`);
 /**
  * Commander js helper to format
  */
@@ -59,7 +59,7 @@ for (const option of program.options) {
             environment: (option as any).envVar,
             required: option.mandatory,
             defaultValue: option.defaultValueDescription ?? option.defaultValue?.toString(),
-            type: (option.flags.match(/<(.*)>/) ?? [``, `boolean`])[1],
+            type: (option.flags.match(/[<[](.*)[>\]]/) ?? [``, `boolean`])[1],
             description: option.description,
             choices: ((option as any).argChoices as string[])?.map(choice => `\`${choice}\``).join(`, `),
         },

app/eslint.config.json

@@ -20,7 +20,7 @@
         "quote-props": ["error", "as-needed"],
         "indent": ["error", 4],
         "eol-last": ["error", "never"],
-        "new-cap": ["error", { "newIsCapExceptions": ["iCloud", "iCloudPhotos", "iCPSError", "default", "iCPSInfluxLineProtocolPoint"], "capIsNewExceptions": ["TTL"] }],
+        "new-cap": ["error", { "newIsCapExceptions": ["iCloud", "iCloudPhotos", "iCPSError", "default", "iCPSInfluxLineProtocolPoint"], "capIsNewExceptions": ["TTL", "BASE"] }],
         "tsdoc/syntax": "warn",
         "no-negated-condition": "off",
         "no-unused-vars": "off",

app/node-version

@@ -1 +1 @@
-18.17.1
+18.18.0