Automatically update version to 0.10.8

.github/workflows/deploy1.yml

@@ -12,19 +12,22 @@ jobs:
 
   update-versions:
     runs-on: "ubuntu-latest"
+    outputs:
+      skip: "${{ steps.check_recursive.outputs.skip || 'false' }}" # Default to false if not set
     steps:
       - uses: "actions/checkout@v4"
         with: # Ensure we are not in a detached HEAD state
           ref: "master"
           token: "${{ secrets.GH_PAT }}"
       # Check that the tag commit is the latest master commit
-      - run: |
+      - id: check_recursive
+        run: |
           git fetch --tags
           tag_commit=$(git rev-parse ${{ github.ref }})
           master_commit=$(git rev-parse master)
           if [ "$tag_commit" != "$master_commit" ]; then
-              echo "The tag commit ($tag_commit) is not the latest master commit ($master_commit)"
-              exit 1
+              echo "::warning ::The tag commit $tag_commit does not match the latest master commit $master_commit. This is probably a recursive tag push that will be ignored."
+              echo "skip=true" >> $GITHUB_OUTPUT
           fi
       - run: "echo 'CLEAN_VERSION=${{ github.ref }}' | sed 's,refs/tags/v,,g' >> $GITHUB_ENV"
       # Write the new version to package.json
@@ -38,7 +41,8 @@ jobs:
           cache: "poetry"
       - run: "poetry version $CLEAN_VERSION"
       # Commit the changes and move the tag!
-      - run: |
+      - if: "steps.check_recursive.outputs.skip != 'true'"
+        run: |
           git config --global user.email "yeicor@users.noreply.github.com"
           git config --global user.name "Yeicor"
           if git commit -am "Automatically update version to $CLEAN_VERSION"; then
@@ -54,6 +58,7 @@ jobs:
 
   deploy: # Makes sure all artifacts are updated and use the new version for the next deployment steps
     needs: "update-versions"
+    if: "needs.update-versions.outputs.skip != 'true'" # Only run if the update-versions job did not skip
     uses: "./.github/workflows/deploy2.yml"
     secrets: "inherit" # Inherit the secrets from the parent workflow
     with:

assets/licenses.txt

@@ -809,9 +809,9 @@ The above copyright notice and this permission notice shall be included in all c
 
 The following npm packages may be included in this product:
 
- - @img/sharp-linux-x64@0.33.5
- - @img/sharp-linuxmusl-x64@0.33.5
- - sharp@0.33.5
+ - @img/sharp-linux-x64@0.34.3
+ - @img/sharp-linuxmusl-x64@0.34.3
+ - sharp@0.34.3
 
 These packages each contain the following license:
 
@@ -1504,6 +1504,16 @@ SOFTWARE.
 
 -----------
 
+The following npm package may be included in this product:
+
+ - tanmayo7lock@1.0.18
+
+This package contains the following license:
+
+ISC
+
+-----------
+
 The following npm package may be included in this product:
 
  - picocolors@1.1.1
@@ -1530,8 +1540,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 The following npm packages may be included in this product:
 
- - @img/sharp-libvips-linux-x64@1.0.4
- - @img/sharp-libvips-linuxmusl-x64@1.0.4
+ - @img/sharp-libvips-linux-x64@1.2.0
+ - @img/sharp-libvips-linuxmusl-x64@1.2.0
 
 These packages each contain the following license:
 
@@ -1908,7 +1918,7 @@ THE SOFTWARE.
 
 The following npm package may be included in this product:
 
- - three@0.178.0
+ - three@0.179.1
 
 This package contains the following license:
 
@@ -2028,7 +2038,7 @@ SOFTWARE.
 
 The following npm package may be included in this product:
 
- - vuetify@3.9.2
+ - vuetify@3.9.3
 
 This package contains the following license:
 
@@ -2128,7 +2138,7 @@ SOFTWARE.
 The following npm packages may be included in this product:
 
  - ndarray-lanczos@0.3.0
- - ndarray-pixels@4.1.0
+ - ndarray-pixels@5.0.1
  - property-graph@3.0.0
 
 These packages each contain the following license:
@@ -2159,9 +2169,9 @@ SOFTWARE.
 
 The following npm packages may be included in this product:
 
- - @gltf-transform/core@4.2.0
- - @gltf-transform/extensions@4.2.0
- - @gltf-transform/functions@4.2.0
+ - @gltf-transform/core@4.2.1
+ - @gltf-transform/extensions@4.2.1
+ - @gltf-transform/functions@4.2.1
 
 These packages each contain the following license:
 

frontend/misc/network.ts

@@ -56,8 +56,13 @@ export class NetworkManager extends EventTarget {
                 name = name.replace('.glb', '').replace('.gltf', '');
             } else {
                 // If there is a #name parameter in the URL, use it as the name
-                let urlObj = new URL(url);
-                let hashParams = new URLSearchParams(urlObj.hash.slice(1));
+                let hashParams: URLSearchParams
+                try {
+                    let urlObj = new URL(url, window.location.href);
+                    hashParams = new URLSearchParams(urlObj.hash.slice(1));
+                } catch (e) {
+                    hashParams = new URLSearchParams();
+                }
                 if (hashParams.has("name")) {
                     name = hashParams.get("name") || `unknown-${Math.random()}`;
                 } else { // Default to the last part of the URL as the "name" of the model

frontend/tools/PlaygroundDialogContent.vue

@@ -113,6 +113,7 @@ async function runCode() {
   } catch (e) {
     output(`Error running code: ${e}\n`);
   } finally {
+    output("Code execution finished.\n");
     running.value = false; // Indicate that Pyodide is ready
   }
 }

frontend/tools/upload-file.ts

@@ -1,4 +1,11 @@
-import { encrypt } from "tanmayo7lock";
+//@ts-expect-error
+import encryptCode from "tanmayo7lock?raw";
+
+function encrypt(msg: string, secret: string = "hudfhgd8fghdfgh3uhuifdgh"): string {
+    let exports: any = {};
+    eval(encryptCode.replace("exports.encrypt = encrypt;", "exports.LargeDataCrypto = LargeDataCrypto;\nexports.encrypt = encrypt;"));
+    return exports.LargeDataCrypto.encrypt(msg, secret);
+}
 
 async function check(lockerName: string) {
     const fileUrl = `https://vouz-backend.onrender.com/api/check_key`;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yet-another-cad-viewer",
-  "version": "0.10.4",
+  "version": "0.10.8",
   "description": "",
   "license": "MIT",
   "private": true,
@@ -28,7 +28,7 @@
     "pako": "^2.1.0",
     "pyodide": "^0.28.0",
     "tanmayo7lock": "^1.0.18",
-    "three": "^0.178.0",
+    "three": "^0.179.0",
     "three-mesh-bvh": "^0.9.0",
     "three-orientation-gizmo": "git+https://github.com/jrj2211/three-orientation-gizmo.git",
     "vue": "^3.5.13",

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "yacv-server"
-version = "0.10.4"
+version = "0.10.8"
 description = "Yet Another CAD Viewer (server)"
 authors = ["Yeicor <4929005+Yeicor@users.noreply.github.com>"]
 license = "MIT"

vite.config.ts

@@ -62,12 +62,7 @@ export default defineConfig({
         __APP_VERSION__: JSON.stringify(version),
         __APP_GIT_SHA__: JSON.stringify(execSync('git rev-parse HEAD').toString().trim()),
         __APP_GIT_DIRTY__: JSON.stringify(execSync('git diff --quiet || echo dirty').toString().trim()),
-        __YACV_SMALL_BUILD__: JSON.stringify(wantsSmallBuild),
-        process: {
-            env: {
-                LOCK_SECRET: "hudfhgd8fghdfgh3uhuifdgh" // Shhh, this is a secret key for the vouz.tech locker
-            }
-        }
+        __YACV_SMALL_BUILD__: JSON.stringify(wantsSmallBuild)
     }
 })
 

yarn.lock

@@ -2974,10 +2974,10 @@ three@^0.125.0:
   resolved "https://registry.yarnpkg.com/three/-/three-0.125.2.tgz#dcba12749a2eb41522e15212b919cd3fbf729b12"
   integrity sha512-7rIRO23jVKWcAPFdW/HREU2NZMGWPBZ4XwEMt0Ak0jwLUKVJhcKM55eCBWyGZq/KiQbeo1IeuAoo/9l2dzhTXA==
 
-three@^0.178.0:
-  version "0.178.0"
-  resolved "https://registry.yarnpkg.com/three/-/three-0.178.0.tgz#470fb4bc35bc0782dfe9a2c9b157fcbc1944bc44"
-  integrity sha512-ybFIB0+x8mz0wnZgSGy2MO/WCO6xZhQSZnmfytSPyNpM0sBafGRVhdaj+erYh5U+RhQOAg/eXqw5uVDiM2BjhQ==
+three@^0.179.0:
+  version "0.179.1"
+  resolved "https://registry.yarnpkg.com/three/-/three-0.179.1.tgz#6c0b43e046eaad0f42b163143517a44ae44ed446"
+  integrity sha512-5y/elSIQbrvKOISxpwXCR4sQqHtGiOI+MKLc3SsBdDXA2hz3Mdp3X59aUp8DyybMa34aeBwbFTpdoLJaUDEWSw==
 
 tinyglobby@^0.2.12, tinyglobby@^0.2.14:
   version "0.2.14"