Merge pull request #380 from steilerDev/dev

stage for beta release
steilerDev · Oct 15, 2023 · 45814c2 · 45814c2
2 parents 0412764 + c22fab7
commit 45814c2
Show file tree

Hide file tree

Showing 45 changed files with 1,719 additions and 436 deletions.
diff --git a/.github/actions/helper/prepare-semantic-release/action.yml b/.github/actions/helper/prepare-semantic-release/action.yml
@@ -17,10 +17,40 @@ runs:
     - id: setup-dependencies
       shell: bash
       run: sudo apt-get install -y moreutils
+    - id: setup-release-rules
+      shell: bash
+      run: |
+        {
+          echo 'RELEASE_RULES<<EOF'
+          echo '[
+              { "type": "majorfeat",    "release": "major" },
+              { "type": "feat",         "release": "minor" },
+              { "type": "fix",          "release": "patch" },
+              { "type": "refactor",     "release": "patch" },
+              { "type": "perf",         "release": "patch" },
+              { "type": "test",         "release": "patch" },
+              { "type": "build",        "release": "patch" },
+              { "type": "ci",           "release": "patch" },
+              { "type": "chore",        "release": "patch" },
+              { "type": "docs",         "release": "patch" },
+              { "type": "no-release",   "release": false },
+              { "type": "style",        "release": false }
+          ]'
+          echo EOF
+        } >> "$GITHUB_ENV"
+    - id: setup-force-release
+      if: ${{ github.ref_name == 'dev' }}
+      shell: bash
+      run: |
+        {
+          echo 'RELEASE_RULES<<EOF'
+          echo $RELEASE_RULES | jq -c '. += [{"message": "**", "release": "patch"}]'
+          echo EOF
+        } >> "$GITHUB_ENV"
     - id: setup-fs
       shell: bash
       run: |
-        mkdir ${{ inputs.release-dir }}
+        mkdir -p ${{ inputs.release-dir }}
 
         cp ${{ github.action_path }}/package.json \
           ${{ github.action_path }}/package-lock.json \
@@ -39,22 +69,13 @@ runs:
             "@semantic-release/commit-analyzer",
             {
                 "preset": "conventionalcommits",
-                "releaseRules": [
-                    { "type": "majorfeat",    "release": "major" },
-                    { "type": "feat",         "release": "minor" },
-                    { "type": "fix",          "release": "patch" },
-                    { "type": "refactor",     "release": "patch" },
-                    { "type": "perf",         "release": "patch" },
-                    { "type": "test",         "release": "patch" },
-                    { "type": "build",        "release": "patch" },
-                    { "type": "ci",           "release": "patch" },
-                    { "type": "chore",        "release": "patch" },
-                    { "type": "docs",         "release": "patch" },
-                    { "type": "style",        "release": false }
-                ]
+                "releaseRules": ${{ env.RELEASE_RULES }}
             }
-        ]]' |\
-        sponge ${{ inputs.release-dir }}/.releaserc.json
+          ]]' |\
+          sponge ${{ inputs.release-dir }}/.releaserc.json
+
+        echo "Wrote:"
+        cat ${{ inputs.release-dir }}/.releaserc.json
     - id: setup-node
       uses: actions/setup-node@v3
       with:

diff --git a/.vscode/icloud-photos-sync.cspell b/.vscode/icloud-photos-sync.cspell
@@ -37,6 +37,7 @@ endfor
 fcxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 foldered
 fontawesome
+foxt
 Fqhjt
 FVJQ
 GBIE
@@ -61,6 +62,7 @@ materialx
 mimo
 mkdocs
 mockfs
+moreutils
 ncipollo
 Nerb
 Nfrb
@@ -70,6 +72,7 @@ pano
 parens
 photoshop
 photoslibrary
+polystat
 postbuild
 prerequest
 preshared
@@ -80,6 +83,7 @@ releaserc
 rgba
 RIPEMD
 ritwickdey
+Roboto
 rootfs
 SCNT
 securitycode
@@ -92,6 +96,7 @@ Steiler
 steilerdev
 superfences
 Symbolication
+symlog
 templating
 testparam
 testpassword

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -65,7 +65,7 @@
                 "--runInBand",
                 "--config", "jest.config.json",
                 //"--detectOpenHandles",
-                "test/unit/resources.validator.test.ts"
+                "test/unit/icloud.test.ts"
             ],
             "env": {
                 "NODE_NO_WARNINGS": "1"

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -266,7 +266,7 @@ The content of the commit message body should contain:
 
 This projects' development process loosely follows git-flow by (Vincent Driessen)[http://nvie.com/]. Feature development happens on the `dev` branch, however features don't get their own feature branch, due to the lack of contribution complexity at the moment.
 
-External PRs should therefore target the dev branch. This will trigger unit tests, which need to pass, in order for merging to be considered. Every push to the `dev` branch will trigger a pre-release to the `nightly` channel on DockerHub and npm through [semantic-release](https://github.com/semantic-release/semantic-release).
+External PRs should therefore target the dev branch. This will trigger unit tests, which need to pass, in order for merging to be considered. Every push to the `dev` branch will trigger a pre-release to the `nightly` channel on DockerHub and npm through [semantic-release](https://github.com/semantic-release/semantic-release). Unless all commits are of type `no-release`, at least a patch release is triggered on push.
 
 Once the `dev` branch has reached a certain stage, changes can be staged for release on the `beta` channel. This happens through a Pull Request against the `beta` branch. This will trigger more thorough checks, including building all assets necessary for release, as well as E2E and API tests. Once the pull request has been merged, [semantic release](https://github.com/semantic-release/semantic-release) will perform a release to the `beta` channel on DockerHub and npm.
 

diff --git a/README.md b/README.md
@@ -134,6 +134,10 @@ Please also check out [open and known issues](https://github.com/steilerDev/iclo
 
 Please check the [contributing guidelines](https://github.com/steilerDev/icloud-photos-sync/blob/main/CONTRIBUTING.md) to learn how to engage with this project.
 
+## Acknowledgments
+
+- Special thanks to [@foxt](https://foxt.dev/) for helping with reverse engineering some tricky parts of the iCloud API ([GSA](https://github.com/steilerDev/icloud-photos-sync/issues/363) & [ADP](https://github.com/steilerDev/icloud-photos-sync/issues/202)) - check out his [iCloud.js](https://github.com/foxt/icloud.js) project in case you need to access other aspects of iCloud
+
 ### Release Workflow
 
 <p align="center">

diff --git a/app/build/schema.ts b/app/build/schema.ts
@@ -15,6 +15,10 @@ const schemaList = [
         typeName: `SigninResponse`,
         srcPath: `src/lib/resources/network-types.ts`,
         allowAdditionalProperties: true,
+    }, {
+        typeName: `SigninInitResponse`,
+        srcPath: `src/lib/resources/network-types.ts`,
+        allowAdditionalProperties: true,
     }, {
         typeName: `ResendMFADeviceResponse`,
         srcPath: `src/lib/resources/network-types.ts`,

diff --git a/app/eslint.config.json b/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", "BASE"] }],
+        "new-cap": ["error", { "newIsCapExceptions": ["iCloud", "iCloudCrypto", "iCloudPhotos", "iCPSError", "default", "iCPSInfluxLineProtocolPoint"], "capIsNewExceptions": ["TTL", "BASE"] }],
         "tsdoc/syntax": "warn",
         "no-negated-condition": "off",
         "no-unused-vars": "off",

diff --git a/app/knip.config.jsonc b/app/knip.config.jsonc
@@ -1,5 +1,5 @@
 {
-    "entry": ["test/**/*.test.ts", "src/main.ts", "build/cli-reference.ts", "build/schema.ts", "build/package.ts"],
+    "entry": ["test/unit/*", "test/api/*", "src/main.ts", "build/cli-reference.ts", "build/schema.ts", "build/package.ts"],
     "project": ["**/*.ts"],
     "ignoreDependencies": [
         "@typescript-eslint/eslint-plugin", // Loaded by eslint.config.json