sync: v3 < dev

.github/workflows/cla.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: "CLA Assistant"
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-        uses: contributor-assistant/github-action@v2.6.1
+        uses: ThePedroo/contributor-assistant@v1.0.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PERFORMANC_BOT_ACCESS_TOKEN }}
@@ -29,5 +29,5 @@ jobs:
           remote-organization-name: 'PerformanC'
           remote-repository-name: 'CLA-Signatures'
           create-file-commit-message: 'add: file for storing CLA Signatures'
-          signed-commit-message: 'add: @$contributorName to the list of signed contributors in $owner'
+          signed-commit-message: 'add: @$contributorName to the list of signed contributors in $owner/$repo#$pullRequestNo'
           custom-allsigned-prcomment: 'All Contributors have signed the CLA. The PR is now allowed to be merged.'

README.md

@@ -20,7 +20,7 @@
 
 ## Prerequisites
 
-* **Node.js** v22 or higher (v24 recommended)
+* **Node.js** v22.22.2 or higher (v24 recommended)
 * **Git**
 
 ---

biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.4.0/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.4.12/schema.json",
   "assist": { "actions": { "source": { "organizeImports": "on" } } },
   "formatter": {
     "enabled": true,

config.default.js

@@ -92,6 +92,22 @@ export default {
   enableLoadStreamEndpoint: false,
   resolveExternalLinks: false,
   fetchChannelInfo: false,
+  sponsorblock: {
+    enabled: false,
+    api: 'https://sponsor.ajay.app',
+    categories: [
+      'sponsor',
+      'selfpromo',
+      'interaction',
+      'intro',
+      'outro',
+      'preview',
+      'music_offtopic',
+      'filler'
+    ],
+    actionTypes: ['skip'],
+    skipMarginMs: 150
+  },
   filters: {
     enabled: {
       tremolo: true,
@@ -467,6 +483,9 @@ export default {
       instances: [], // (optional) list of API instances
       streamingInstances: [], // (optional) list of streaming instances
       quality: 'HI_RES_LOSSLESS' // HI_RES_LOSSLESS, LOSSLESS, HIGH, LOW
+    },
+    googledrive: {
+      enabled: true
     }
   },
   lyrics: {

dist/config.default.js

@@ -92,6 +92,22 @@ export default {
     enableLoadStreamEndpoint: false,
     resolveExternalLinks: false,
     fetchChannelInfo: false,
+    sponsorblock: {
+        enabled: false,
+        api: 'https://sponsor.ajay.app',
+        categories: [
+            'sponsor',
+            'selfpromo',
+            'interaction',
+            'intro',
+            'outro',
+            'preview',
+            'music_offtopic',
+            'filler'
+        ],
+        actionTypes: ['skip'],
+        skipMarginMs: 150
+    },
     filters: {
         enabled: {
             tremolo: true,
@@ -467,6 +483,9 @@ export default {
             instances: [], // (optional) list of API instances
             streamingInstances: [], // (optional) list of streaming instances
             quality: 'HI_RES_LOSSLESS' // HI_RES_LOSSLESS, LOSSLESS, HIGH, LOW
+        },
+        googledrive: {
+            enabled: true
         }
     },
     lyrics: {

dist/package.json

@@ -1,17 +1,20 @@
 {
     "name": "nodelink",
-    "version": "3.7.0",
+    "version": "3.8.0-dev.20260422.1",
     "scripts": {
         "build": "tsc --incremental false",
         "start": "node --dns-result-order=ipv4first --import tsx src/index.ts",
         "start:experimental": "node --experimental-transform-types --dns-result-order=ipv4first src/index.ts",
         "start:dist": "node --dns-result-order=ipv4first dist/src/index.js",
-        "start:bun": "bun run --dns-result-order=ipv4first src/index.js",
+        "start:bun": "bun run --dns-result-order=ipv4first src/index.ts",
         "type-check": "tsc --noEmit",
         "prepare": "husky"
     },
     "type": "module",
     "main": "src/index.ts",
+    "engines": {
+        "node": ">=22.22.2"
+    },
     "dependencies": {
         "@alexanderolsen/libsamplerate-js": "^2.1.2",
         "@ecliptia/faad2-wasm": "2.11.2-ecliptia.2",
@@ -21,21 +24,21 @@
         "@toddynnn/symphonia-decoder": "1.0.6",
         "@toddynnn/voice-opus": "^1.0.1",
         "fastest-validator": "^1.19.1",
-        "jsdom": "^27.4.0",
+        "jsdom": "^29.0.2",
         "mp4box": "^2.3.0",
         "prom-client": "^15.1.3",
-        "proxy-agent": "^6.5.0"
+        "proxy-agent": "^8.0.1"
     },
     "devDependencies": {
-        "@biomejs/biome": "^2.4.0",
-        "@commitlint/cli": "20.3.0",
-        "@commitlint/config-conventional": "20.3.0",
-        "@types/bun": "^1.3.8",
-        "@types/jsdom": "^27.0.0",
-        "@types/node": "^25.2.1",
-        "dotenv": "^17.3.1",
+        "@biomejs/biome": "^2.4.12",
+        "@commitlint/cli": "20.5.0",
+        "@commitlint/config-conventional": "20.5.0",
+        "@types/bun": "^1.3.12",
+        "@types/jsdom": "^28.0.1",
+        "@types/node": "^25.6.0",
+        "dotenv": "^17.4.2",
         "husky": "9.1.7",
         "tsx": "^4.21.0",
-        "typescript": "^5.9.3"
+        "typescript": "^6.0.3"
     }
 }

dist/src/api/loadLyrics.js

@@ -39,7 +39,7 @@ function getLoadLyricsRuntime(nodelink) {
     const runtime = nodelink;
     if (runtime.sourceWorkerManager === undefined ||
         runtime.workerManager === undefined ||
-        !runtime.lyrics) {
+        runtime.lyrics === undefined) {
         return null;
     }
     return runtime;

dist/src/api/sessions.id.players.id.sponsorblock.js

@@ -0,0 +1,161 @@
+import { sendErrorResponse } from "../utils.js";
+/**
+ * Builds a strongly typed runtime view for the SponsorBlock route.
+ *
+ * @param nodelink - Router-facing runtime instance.
+ * @returns Runtime compatible with the route, or `null` when the required
+ * session manager field is unavailable.
+ */
+function getSponsorBlockRuntime(nodelink) {
+    const runtime = nodelink;
+    if (!runtime.sessions || typeof runtime.sessions.get !== 'function') {
+        return null;
+    }
+    return runtime;
+}
+/**
+ * Extracts and validates the path parameters used by the route.
+ *
+ * @param parsedUrl - Parsed request URL.
+ * @returns Validated path parameters, or `null` when validation fails.
+ */
+function getPathParams(parsedUrl) {
+    const pathParts = parsedUrl.pathname.split('/');
+    const sessionId = pathParts[3];
+    const guildId = pathParts[5];
+    if (!sessionId || !guildId) {
+        return null;
+    }
+    if (!/^\d{17,20}$/.test(guildId)) {
+        return null;
+    }
+    return {
+        sessionId,
+        guildId
+    };
+}
+/**
+ * Handles `GET /sessions/:id/players/:guildId/sponsorblock`.
+ */
+async function handleGetSponsorBlock(req, res, pathParams, runtime, sendResponse) {
+    const session = runtime.sessions.get(pathParams.sessionId);
+    if (!session) {
+        sendErrorResponse(req, res, 404, 'Not Found', "The provided sessionId doesn't exist.", req.url || '');
+        return;
+    }
+    try {
+        const state = session.players.getSponsorBlock(pathParams.guildId);
+        sendResponse(req, res, state, 200);
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : 'Player not found';
+        sendErrorResponse(req, res, 404, 'Not Found', errorMessage, req.url || '');
+    }
+}
+/**
+ * Handles `PATCH /sessions/:id/players/:guildId/sponsorblock`.
+ */
+async function handlePatchSponsorBlock(req, res, pathParams, runtime, sendResponse) {
+    const session = runtime.sessions.get(pathParams.sessionId);
+    if (!session) {
+        sendErrorResponse(req, res, 404, 'Not Found', "The provided sessionId doesn't exist.", req.url || '');
+        return;
+    }
+    const body = req.body;
+    if (!body || typeof body !== 'object' || Array.isArray(body)) {
+        sendErrorResponse(req, res, 400, 'Bad Request', 'Invalid body', req.url || '');
+        return;
+    }
+    try {
+        session.players.updateSponsorBlock(pathParams.guildId, {
+            enabled: body.enabled,
+            categories: body.categories,
+            actionTypes: body.actionTypes,
+            skipMarginMs: body.skipMarginMs
+        });
+        sendResponse(req, res, session.players.getSponsorBlock(pathParams.guildId), 200);
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : 'Player not found';
+        sendErrorResponse(req, res, 404, 'Not Found', errorMessage, req.url || '');
+    }
+}
+/**
+ * Handles `POST /sessions/:id/players/:guildId/sponsorblock`.
+ */
+async function handlePostSponsorBlock(req, res, pathParams, runtime, sendResponse) {
+    const session = runtime.sessions.get(pathParams.sessionId);
+    if (!session) {
+        sendErrorResponse(req, res, 404, 'Not Found', "The provided sessionId doesn't exist.", req.url || '');
+        return;
+    }
+    const body = req.body;
+    if (!body?.segments || !Array.isArray(body.segments)) {
+        sendErrorResponse(req, res, 400, 'Bad Request', 'Invalid segments array', req.url || '');
+        return;
+    }
+    try {
+        session.players.setSponsorBlockSegments(pathParams.guildId, body.segments);
+        sendResponse(req, res, session.players.getSponsorBlock(pathParams.guildId), 200);
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : 'Player not found';
+        sendErrorResponse(req, res, 404, 'Not Found', errorMessage, req.url || '');
+    }
+}
+/**
+ * Handles `DELETE /sessions/:id/players/:guildId/sponsorblock`.
+ */
+async function handleDeleteSponsorBlock(req, res, pathParams, runtime) {
+    const session = runtime.sessions.get(pathParams.sessionId);
+    if (!session) {
+        sendErrorResponse(req, res, 404, 'Not Found', "The provided sessionId doesn't exist.", req.url || '');
+        return;
+    }
+    try {
+        session.players.clearSponsorBlock(pathParams.guildId);
+        res.writeHead(204);
+        res.end();
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : 'Player not found';
+        sendErrorResponse(req, res, 404, 'Not Found', errorMessage, req.url || '');
+    }
+}
+/**
+ * Handles requests for the SponsorBlock route.
+ */
+async function handler(nodelink, req, res, sendResponse, parsedUrl) {
+    const runtime = getSponsorBlockRuntime(nodelink);
+    if (!runtime) {
+        sendErrorResponse(req, res, 500, 'Internal Server Error', 'SponsorBlock runtime contract is incomplete.', parsedUrl.pathname, true);
+        return;
+    }
+    const pathParams = getPathParams(parsedUrl);
+    if (!pathParams) {
+        sendErrorResponse(req, res, 400, 'Bad Request', 'Invalid path parameters', parsedUrl.pathname, true);
+        return;
+    }
+    if (req.method === 'GET') {
+        await handleGetSponsorBlock(req, res, pathParams, runtime, sendResponse);
+        return;
+    }
+    if (req.method === 'PATCH') {
+        await handlePatchSponsorBlock(req, res, pathParams, runtime, sendResponse);
+        return;
+    }
+    if (req.method === 'POST') {
+        await handlePostSponsorBlock(req, res, pathParams, runtime, sendResponse);
+        return;
+    }
+    if (req.method === 'DELETE') {
+        await handleDeleteSponsorBlock(req, res, pathParams, runtime);
+        return;
+    }
+    sendErrorResponse(req, res, 405, 'Method Not Allowed', 'Method Not Allowed', parsedUrl.pathname);
+}
+const sponsorBlockRoute = {
+    handler,
+    methods: ['GET', 'POST', 'PATCH', 'DELETE']
+};
+export default sponsorBlockRoute;

dist/src/api/sessions.id.players.js

@@ -178,7 +178,7 @@ function getPlayerPatchPayload(body) {
         typeof encodedTrack !== 'string') {
         return null;
     }
-    const position = payload.position;
+    const position = payload.position ?? payload.startTime;
     if (position !== undefined &&
         (typeof position !== 'number' || !Number.isFinite(position) || position < 0)) {
         return null;
@@ -231,6 +231,10 @@ function getPlayerPatchPayload(body) {
                 ? null
                 : undefined,
         position,
+        startTime: typeof payload.startTime === 'number' &&
+            Number.isFinite(payload.startTime)
+            ? payload.startTime
+            : undefined,
         endTime: typeof endTime === 'number'
             ? endTime
             : endTime === null

dist/src/api/trackstream.js

@@ -41,7 +41,7 @@ function getItagFromQuery(parsedUrl) {
  */
 function getTrackStreamRuntime(nodelink) {
     const runtime = nodelink;
-    if (runtime.workerManager === undefined || !runtime.sources) {
+    if (runtime.workerManager === undefined || runtime.sources === undefined) {
         return null;
     }
     return runtime;

dist/src/constants.js

@@ -88,6 +88,7 @@ export const SEMVER_PATTERN = /^(?<major>0|[1-9]\d*)\.(?<minor>0|[1-9]\d*)\.(?<p
  * @public
  */
 export const PATH_VERSION = 'v4';
+export const MINIMUM_NODE_VERSION = '22.22.2';
 /**
  * HTTP status codes that indicate a redirect response
  *
@@ -179,6 +180,10 @@ export const GatewayEvents = {
     TRACK_STUCK: 'TrackStuckEvent',
     /** An exception occurred while playing track */
     TRACK_EXCEPTION: 'TrackExceptionEvent',
+    /** SponsorBlock segments were loaded */
+    SPONSORBLOCK_SEGMENTS_LOADED: 'SponsorBlockSegmentsLoadedEvent',
+    /** SponsorBlock segment was skipped */
+    SPONSORBLOCK_SEGMENT_SKIPPED: 'SponsorBlockSegmentSkippedEvent',
     /** Player position/state update */
     PLAYER_UPDATE: 'playerUpdate',
     /** Voice connection status changed */