Apply automatic changes

.github/FUNDING.yml

@@ -1 +1,2 @@
-custom: ['t.me/tribute/app?startapp=dqW2']
+ko_fi: vitalygashkov
+custom: [ "pay.cloudtips.ru/p/e04763eb" ]

.github/workflows/extract.yml

@@ -3,7 +3,7 @@ name: Extract
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 6 * * 6' # Runs every Saturday at 06:00 UTC
+    - cron: '0 6 1 * *' # Runs monthly on the 1st day at 06:00 UTC
 
 jobs:
   extract:
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version-file: 'package.json'
       - uses: actions/setup-java@v4
         with:
           java-version: '21'
@@ -28,6 +28,7 @@ jobs:
           echo "Installing JADX version ${JADX_VERSION}..."
           curl -Lo jadx.zip "https://github.com/skylot/jadx/releases/download/v${JADX_VERSION}/jadx-${JADX_VERSION}.zip"
           unzip -q jadx.zip -d jadx-dist
+          chmod +x jadx-dist/bin/jadx
           echo "$(pwd)/jadx-dist/bin" >> $GITHUB_PATH
           rm jadx.zip
 

.github/workflows/publish.yml

@@ -1,22 +1,28 @@
 name: Publish
 
 on:
+  workflow_dispatch:
   push:
     tags:
-      - 'v*'
+      - "v*"
+
+permissions:
+  id-token: write
+  contents: write
 
 jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version-file: 'package.json'
           registry-url: https://registry.npmjs.org/
+      - run: npm install -g npm@latest
       - run: npm ci
+      - run: npm run build --if-present
 
-      # Extract version from package.json and determine release channel
       - name: Parse version and determine release channel
         id: version
         run: |
@@ -33,19 +39,13 @@ jobs:
             echo "NPM_TAG=latest" >> $GITHUB_OUTPUT
           fi
 
-      # Publish with the appropriate tag
-      - name: Publish to npm
+      - name: Publish new version
         run: npm publish --tag ${{ steps.version.outputs.NPM_TAG }}
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-      # Only create GitHub releases for stable versions
-      - name: Create GitHub Release
+      - name: Create release
         uses: softprops/action-gh-release@v2
+        if: github.ref_type == 'tag'
         with:
           generate_release_notes: true
           prerelease: ${{ steps.version.outputs.PRERELEASE == 'true' }}
           token: ${{ secrets.GITHUB_TOKEN }}
-
-permissions:
-  contents: write

.oxfmtrc.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "./node_modules/oxfmt/configuration_schema.json",
+  "printWidth": 100,
+  "singleQuote": true,
+  "jsxSingleQuote": false,
+  "trailingComma": "all",
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "ignorePatterns": []
+}

README.md

@@ -2,34 +2,35 @@
 
 Utility for extracting credentials from the Crunchyroll Android app (both TV and mobile versions).
 
-The [credentials](https://github.com/vitalygashkov/crextractor/blob/main/credentials.tv.json) are [automatically](https://github.com/vitalygashkov/crextractor/actions/workflows/extract.yml) updated once a week (if there are any changes).
-
-## Prerequisites
-
-- [Node.js](https://nodejs.org/en)
-- [jadx](https://github.com/skylot/jadx)
+The [credentials](https://github.com/vitalygashkov/crextractor/blob/main/credentials.tv.json) are [automatically](https://github.com/vitalygashkov/crextractor/actions/workflows/extract.yml) updated once a month (if there are any changes).
 
 ## Usage
 
-### Library
-
-```bash
-npm i crextractor
-```
-
-#### Fetch ready credentials from this GitHub repository
+### Fetch ready credentials from this GitHub repository
 
 ```js
-import { pull } from 'crextractor';
+// Supported targets: mobile, tv
+async function fetchCredentials(target = 'tv') {
+  const url = `https://raw.githubusercontent.com/vitalygashkov/crextractor/refs/heads/main/credentials.${target}.json`;
+  return fetch(url).then((response) => response.json());
+}
 
 async function main() {
-  const credentials = await pull('tv');
+  const credentials = fetchCredentials();
+
+  // You can use credentials to obtain access tokens for Crunchyroll APIs
+
+  // 3.54.5 (22304) -> 3.54.5_22304
+  const userAgentAppVersion = credentials.version
+    .replace(' ', '_')
+    .replace('(', '')
+    .replace(')', '');
 
-  // You can use the extracted credentials to obtain access tokens for Crunchyroll APIs
   const response = await fetch('https://beta-api.crunchyroll.com/auth/v1/token', {
     headers: {
-      Authorization: credentials.authorization, // Ready HTTP header in the format `Basic <encoded>`, can be used to access some Crunchyroll APIs
-      'User-Agent': 'Crunchyroll/ANDROIDTV/3.42.1_22267 (Android 16; en-US; sdk_gphone64_x86_64)',
+      // Ready HTTP header in the format `Basic <encoded>`, can be used to access some Crunchyroll APIs
+      Authorization: credentials.authorization,
+      'User-Agent': `Crunchyroll/ANDROIDTV/${userAgentAppVersion} (Android 16; en-US; sdk_gphone64_x86_64)`,
       // ...
     },
     method: 'POST',
@@ -40,23 +41,12 @@ async function main() {
 }
 ```
 
-#### Extract credentials from the latest APK using jadx
+### Extract fresh credentials from the latest APK using jadx
 
-```js
-import { extract } from 'crextractor';
+#### Prerequisites
 
-async function main() {
-  const { id, secret, encoded, authorization } = await extract();
-  // id - Crunchyroll app ID
-  // secret - Crunchyroll app secret
-  // encoded - Base64 encoded `id:secret` string
-  // authorization - ready HTTP header in the format `Basic <encoded>`, can be used to access some Crunchyroll APIs
-
-  // Do something with the extracted credentials
-}
-```
-
-### Command-line interface
+- [Node.js](https://nodejs.org/en)
+- [jadx](https://github.com/skylot/jadx)
 
 ```bash
 npx crextractor --target mobile --output ./credentials.mobile.json

bin/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-const { parseArgs } = require('node:util');
-const { extract } = require('../crextractor');
+import { parseArgs } from 'node:util';
+import { extract } from '../crextractor.js';
 
 const args = parseArgs({
   options: {

credentials.mobile.json

@@ -1,7 +1,7 @@
 {
-  "version": "3.92.3 (977)",
-  "id": "dvoxpszj59depczpxvwj",
-  "secret": "_VQmMQlJw65tMCIT-SvM2r6OvBTs85Gf",
-  "encoded": "ZHZveHBzemo1OWRlcGN6cHh2d2o6X1ZRbU1RbEp3NjV0TUNJVC1Tdk0ycjZPdkJUczg1R2Y=",
-  "authorization": "Basic ZHZveHBzemo1OWRlcGN6cHh2d2o6X1ZRbU1RbEp3NjV0TUNJVC1Tdk0ycjZPdkJUczg1R2Y="
+  "version": "3.103.2 (1086)",
+  "id": "cisobxghnlkmdsjohfjo",
+  "secret": "aWHXDdm951ZE47r0tTu4zJjzh84LyEaF",
+  "encoded": "Y2lzb2J4Z2hubGttZHNqb2hmam86YVdIWERkbTk1MVpFNDdyMHRUdTR6Smp6aDg0THlFYUY=",
+  "authorization": "Basic Y2lzb2J4Z2hubGttZHNqb2hmam86YVdIWERkbTk1MVpFNDdyMHRUdTR6Smp6aDg0THlFYUY="
 }

credentials.tv.json

@@ -1,7 +1,7 @@
 {
-  "version": "3.45.2 (22274)",
-  "id": "cb9nzrmht32vgtexygko",
-  "secret": "KUwmMjJXxxursHITd1zvl2C2yQaQo8N4",
-  "encoded": "Y2I5bnpybWh0MzJ2Z3RleHlna286S1V3bU1qSlh4eHVyc0hJVGQxenZsMkMyeVFhUW84TjQ=",
-  "authorization": "Basic Y2I5bnpybWh0MzJ2Z3RleHlna286S1V3bU1qSlh4eHVyc0hJVGQxenZsMkMyeVFhUW84TjQ="
+  "version": "3.66.1 (22349)",
+  "id": "mc240ce75w7nbdhbb0q6",
+  "secret": "EcysbbWdXo1R0WWCTE55DPlZnwW4-O5b",
+  "encoded": "bWMyNDBjZTc1dzduYmRoYmIwcTY6RWN5c2JiV2RYbzFSMFdXQ1RFNTVEUGxabndXNC1PNWI=",
+  "authorization": "Basic bWMyNDBjZTc1dzduYmRoYmIwcTY6RWN5c2JiV2RYbzFSMFdXQ1RFNTVEUGxabndXNC1PNWI="
 }

crextractor.js

@@ -1,8 +1,8 @@
-const { execSync } = require('node:child_process');
-const { join } = require('node:path');
-const { readdir, readFile, writeFile, rm } = require('node:fs/promises');
-const { existsSync } = require('node:fs');
-const { download } = require('molnia');
+import { execSync } from 'node:child_process';
+import { join } from 'node:path';
+import { readdir, readFile, writeFile, rm } from 'node:fs/promises';
+import { existsSync } from 'node:fs';
+import { download } from 'molnia';
 
 const downloadMobileApk = async () => {
   const url = 'https://api.qqaoop.com/v11/apps/com.crunchyroll.crunchyroid/download?userId=1';
@@ -15,14 +15,23 @@ const downloadMobileApk = async () => {
 };
 
 const downloadTvApk = async () => {
+  const searchParams = new URLSearchParams();
+  searchParams.append('query', 'crunchyroll');
+  searchParams.append('cdn', 'web');
+  searchParams.append('q', 'bXlDUFU9YXJtNjQtdjhhLGFybWVhYmktdjdhLGFybWVhYmkmbGVhbmJhY2s9MA');
+  searchParams.append('aab', '1');
+  const searchUrl = `https://ws2-cache.aptoide.com/api/7/apps/search?${searchParams.toString()}`;
+  const searchResults = await fetch(searchUrl).then((r) => r.json());
+  const id = searchResults.datalist?.list?.[0]?.id;
+  if (!id) {
+    console.error('Unable to find ID for TV APK');
+    return;
+  }
   const source = 'https://webservices.aptoide.com/webservices/3/getApkInfo';
-  const formData = new FormData();
-  formData.append('identif', 'id:71666229');
-  formData.append('mode', 'json');
-  const response = await fetch(source, {
-    method: 'POST',
-    body: formData,
-  });
+  const body = new FormData();
+  body.append('identif', `id:${id}`);
+  body.append('mode', 'json');
+  const response = await fetch(source, { method: 'POST', body });
   const json = await response.json();
   const url = json.apk.path;
   const filepath = join(process.cwd(), 'crunchyroll.apk');
@@ -74,7 +83,15 @@ const parseCredentials = async (decompiledDir) => {
     if (id && secret) return { id, secret };
   }
 
-  const constantsPath = join(decompiledDir, 'sources', 'com', 'crunchyroll', 'api', 'util', 'Constants.java');
+  const constantsPath = join(
+    decompiledDir,
+    'sources',
+    'com',
+    'crunchyroll',
+    'api',
+    'util',
+    'Constants.java',
+  );
   const constants = await readFile(constantsPath, 'utf8');
   return {
     id: constants.split(' PROD_CLIENT_ID = "')[1].split('"')[0],
@@ -86,7 +103,8 @@ const parseVersion = async (decompiledDir) => {
   const manifestJsonPath = join(decompiledDir, 'resources', 'manifest.json');
   const manifestXmlPath = join(decompiledDir, 'resources', 'AndroidManifest.xml');
   if (existsSync(manifestJsonPath)) {
-    const manifest = require(manifestJsonPath);
+    const manifestContent = await readFile(manifestJsonPath, 'utf8');
+    const manifest = JSON.parse(manifestContent);
     const version = `${manifest.version_name} (${manifest.version_code})`;
     return version;
   } else if (existsSync(manifestXmlPath)) {
@@ -127,7 +145,10 @@ const extract = async ({ target = 'mobile', output, cleanup = false } = {}) => {
   console.log(`Authorization: ${authorization}`);
 
   if (output) {
-    await writeFile(output, JSON.stringify({ version, id, secret, encoded, authorization }, null, 2));
+    await writeFile(
+      output,
+      JSON.stringify({ version, id, secret, encoded, authorization }, null, 2),
+    );
   }
 
   return { version, id, secret, encoded, authorization };
@@ -139,4 +160,4 @@ const pull = async ({ target = 'mobile' } = {}) => {
   return credentials;
 };
 
-module.exports = { extract, pull };
+export { extract, pull };

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "crextractor",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "crextractor",
-      "version": "1.3.3",
+      "version": "1.4.0",
       "funding": [
         {
           "type": "individual",
@@ -21,12 +21,125 @@
         "crextractor": "bin/cli.js"
       },
       "devDependencies": {
-        "typescript": "^5.9.2"
+        "oxfmt": "^0.28.0",
+        "typescript": "^5.9.3"
       },
       "engines": {
-        "node": ">=20"
+        "node": ">=24"
       }
     },
+    "node_modules/@oxfmt/darwin-arm64": {
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@oxfmt/darwin-arm64/-/darwin-arm64-0.28.0.tgz",
+      "integrity": "sha512-jmUfF7cNJPw57bEK7sMIqrYRgn4LH428tSgtgLTCtjuGuu1ShREyrkeB7y8HtkXRfhBs4lVY+HMLhqElJvZ6ww==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@oxfmt/darwin-x64": {
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@oxfmt/darwin-x64/-/darwin-x64-0.28.0.tgz",
+      "integrity": "sha512-S6vlV8S7jbjzJOSjfVg2CimUC0r7/aHDLdUm/3+/B/SU/s1jV7ivqWkMv1/8EB43d1BBwT9JQ60ZMTkBqeXSFA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@oxfmt/linux-arm64-gnu": {
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@oxfmt/linux-arm64-gnu/-/linux-arm64-gnu-0.28.0.tgz",
+      "integrity": "sha512-TfJkMZjePbLiskmxFXVAbGI/OZtD+y+fwS0wyW8O6DWG0ARTf0AipY9zGwGoOdpFuXOJceXvN4SHGLbYNDMY4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@oxfmt/linux-arm64-musl": {
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@oxfmt/linux-arm64-musl/-/linux-arm64-musl-0.28.0.tgz",
+      "integrity": "sha512-7fyQUdW203v4WWGr1T3jwTz4L7KX9y5DeATryQ6fLT6QQp9GEuct8/k0lYhd+ys42iTV/IkJF20e3YkfSOOILg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@oxfmt/linux-x64-gnu": {
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@oxfmt/linux-x64-gnu/-/linux-x64-gnu-0.28.0.tgz",
+      "integrity": "sha512-sRKqAvEonuz0qr1X1ncUZceOBJerKzkO2gZIZmosvy/JmqyffpIFL3OE2tqacFkeDhrC+dNYQpusO8zsfHo3pw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@oxfmt/linux-x64-musl": {
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@oxfmt/linux-x64-musl/-/linux-x64-musl-0.28.0.tgz",
+      "integrity": "sha512-fW6czbXutX/tdQe8j4nSIgkUox9RXqjyxwyWXUDItpoDkoXllq17qbD7GVc0whrEhYQC6hFE1UEAcDypLJoSzw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@oxfmt/win32-arm64": {
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@oxfmt/win32-arm64/-/win32-arm64-0.28.0.tgz",
+      "integrity": "sha512-D/HDeQBAQRjTbD9OLV6kRDcStrIfO+JsUODDCdGmhRfNX8LPCx95GpfyybpZfn3wVF8Jq/yjPXV1xLkQ+s7RcA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@oxfmt/win32-x64": {
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/@oxfmt/win32-x64/-/win32-x64-0.28.0.tgz",
+      "integrity": "sha512-4+S2j4OxOIyo8dz5osm5dZuL0yVmxXvtmNdHB5xyGwAWVvyWNvf7tCaQD7w2fdSsAXQLOvK7KFQrHFe33nJUCA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/fastq": {
       "version": "1.19.1",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
@@ -58,6 +171,35 @@
         "node": ">=20"
       }
     },
+    "node_modules/oxfmt": {
+      "version": "0.28.0",
+      "resolved": "https://registry.npmjs.org/oxfmt/-/oxfmt-0.28.0.tgz",
+      "integrity": "sha512-3+hhBqPE6Kp22KfJmnstrZbl+KdOVSEu1V0ABaFIg1rYLtrMgrupx9znnHgHLqKxAVHebjTdiCJDk30CXOt6cw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tinypool": "2.1.0"
+      },
+      "bin": {
+        "oxfmt": "bin/oxfmt"
+      },
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/Boshen"
+      },
+      "optionalDependencies": {
+        "@oxfmt/darwin-arm64": "0.28.0",
+        "@oxfmt/darwin-x64": "0.28.0",
+        "@oxfmt/linux-arm64-gnu": "0.28.0",
+        "@oxfmt/linux-arm64-musl": "0.28.0",
+        "@oxfmt/linux-x64-gnu": "0.28.0",
+        "@oxfmt/linux-x64-musl": "0.28.0",
+        "@oxfmt/win32-arm64": "0.28.0",
+        "@oxfmt/win32-x64": "0.28.0"
+      }
+    },
     "node_modules/reusify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
@@ -68,10 +210,20 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/tinypool": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-2.1.0.tgz",
+      "integrity": "sha512-Pugqs6M0m7Lv1I7FtxN4aoyToKg1C4tu+/381vH35y8oENM/Ai7f7C4StcoK4/+BSw9ebcS8jRiVrORFKCALLw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^20.0.0 || >=22.0.0"
+      }
+    },
     "node_modules/typescript": {
-      "version": "5.9.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
-      "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {

package.json

@@ -1,8 +1,26 @@
 {
   "name": "crextractor",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "description": "Utility for extracting credentials from the Crunchyroll Android app",
-  "main": "crextractor.js",
+  "keywords": [
+    "crunchyroll"
+  ],
+  "bugs": {
+    "url": "https://github.com/vitalygashkov/crextractor/issues",
+    "email": "vitalygashkov@vk.com"
+  },
+  "license": "MIT",
+  "author": "Vitaly Gashkov <vitalygashkov@vk.com>",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vitalygashkov/crextractor.git"
+  },
+  "funding": [
+    {
+      "type": "individual",
+      "url": "https://t.me/tribute/app?startapp=dqW2"
+    }
+  ],
   "bin": {
     "crextractor": "bin/cli.js"
   },
@@ -11,33 +29,31 @@
     "crextractor.d.ts",
     "crextractor.js"
   ],
+  "type": "module",
+  "main": "crextractor.js",
   "types": "crextractor.d.ts",
-  "type": "commonjs",
+  "exports": {
+    ".": {
+      "types": "./crextractor.d.ts",
+      "import": "./crextractor.js",
+      "require": "./crextractor.js"
+    }
+  },
   "scripts": {
     "start": "node bin/cli.js",
     "extract:mobile": "node bin/cli.js --target mobile --output ./credentials.mobile.json",
     "extract:tv": "node bin/cli.js --target tv --output ./credentials.tv.json",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "keywords": [
-    "crunchyroll"
-  ],
-  "author": "Vitaly Gashkov <vitalygashkov@vk.com>",
-  "license": "MIT",
-  "readmeFilename": "README.md",
-  "funding": [
-    {
-      "type": "individual",
-      "url": "https://t.me/tribute/app?startapp=dqW2"
-    }
-  ],
-  "engines": {
-    "node": ">=20"
-  },
   "dependencies": {
     "molnia": "^0.1.7"
   },
   "devDependencies": {
-    "typescript": "^5.9.2"
-  }
+    "oxfmt": "^0.28.0",
+    "typescript": "^5.9.3"
+  },
+  "engines": {
+    "node": ">=24"
+  },
+  "readmeFilename": "README.md"
 }