netflix error fix

fabyday · Jun 26, 2024 · 149b608 · 149b608
1 parent 972b291
commit 149b608
Show file tree

Hide file tree

Showing 3 changed files with 127 additions and 4 deletions.
diff --git a/.github/workflows/publish_development.yaml b/.github/workflows/publish_development.yaml
@@ -0,0 +1,122 @@
+name: CI
+
+on:
+  push:
+    branches: 
+      - dev
+
+
+jobs:
+  warm-up-cache:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: echo running on branch $GITHUB_REF
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "21.4.0"
+
+
+
+
+      # yarn setup
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - name: Cache yarn cache
+        uses: actions/cache@v2
+        id: cache-yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Cache node_modules
+        id: cache-node-modules
+        uses: actions/cache@v2
+        with:
+          path: |
+            **/node_modules
+          key: ${{ runner.os }}-${{ matrix.node-version }}-nodemodules-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.node-version }}-nodemodules-
+
+      - name: Install dependencies
+        if: |
+          steps.cache-yarn-cache.outputs.cache-hit != 'true' ||
+          steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: yarn install --frozen-lockfile
+
+
+
+
+
+
+
+
+
+
+
+  # GENERAL electron packaging
+  electron-package:
+    needs: [warm-up-cache]
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: echo running on branch $GITHUB_REF
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "21.4.0"
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        id : setup-python
+        with:
+          python-version: '3.10'
+          cache: 'pip' # caching pip dependencies
+      - run: pip install -r requirements.txt
+
+      - name: Cache yarn cache
+        uses: actions/cache@v2
+        id: cache-yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Cache node_modules
+        id: cache-node-modules
+        uses: actions/cache@v2
+        with:
+          path: |
+            **/node_modules
+          key: ${{ runner.os }}-${{ matrix.node-version }}-nodemodules-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.node-version }}-nodemodules-
+      - name: Install dependencies
+        if: |
+          steps.cache-yarn-cache.outputs.cache-hit != 'true' ||
+          steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: yarn install --frozen-lockfile 
+      - name: Install dependencies yarn
+        run: cd react_src && yarn install --frozen-lockfile
+
+      - name : test
+        run : powershell.exe ./scripts/reauth.ps1
+        env : 
+          ACCOUNT : ${{secrets.ACCOUNT}}
+          PASSWORD : ${{secrets.PASSWD}}
+
+      - name: Build electron package
+        run: yarn release
+        env :
+          GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
+          CSC_LINK : ${{secrets.SELF_SIGNED_CERT}}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kawaikara",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "cho kwai OTT-viewer for discord",
   "main": "public/electron.js",
   "repository": "git@github.com:fabyday/kawaikara.git",

diff --git a/typescript_src/component/mainview.ts b/typescript_src/component/mainview.ts
@@ -35,7 +35,7 @@ export const get_instance = (conf : Configure):BrowserWindow =>{
     let sess = session.fromPartition("persist:main")
     sess.setPreloads([resolved_ses_preload_path])
     let ext_paths = path.resolve("extensions/eimadpbcbfnmbkopoojfekhnkhdbieeh/4.9.85_0/")
-    sess.loadExtension(ext_paths, { allowFileAccess : true})
+    // sess.loadExtension(ext_paths, { allowFileAccess : true})
 
     console.log("ext path : ", ext_paths)
 
@@ -50,7 +50,7 @@ export const get_instance = (conf : Configure):BrowserWindow =>{
 
                 webPreferences: {
                   session : sess,
-                  contextIsolation:false,
+                  contextIsolation: true,
                   nodeIntegration : true,
                   sandbox : false,
                   preload: path.join(__dirname, 'predefine/mainview_predef.js'),
@@ -143,7 +143,7 @@ export const get_instance = (conf : Configure):BrowserWindow =>{
               }
             }
           })
-        console.log(table)
+        // console.log(table)
 
         mainView.setFullScreenable(false)
         setup_pogress_bar(mainView)
@@ -157,6 +157,7 @@ export const get_instance = (conf : Configure):BrowserWindow =>{
           extensions.addTab(mainView.webContents, mainView)
 
           mainView.loadURL(process.env.IS_DEV? "http://localhost:3000/main.html" : html_path, {userAgent :'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36'})
+          // mainView.webContents.openDevTools({mode : "right"})
           // mainView.loadURL(process.env.IS_DEV? "http://localhost:3000/main.html" : html_path)
           // console.log(extensions.getContextMenuItems(mainView.webContents))