Merge branch 'update-devdeps-20231208' into dev

package.json

@@ -53,6 +53,7 @@
         "@babel/preset-env": "^7.23.5",
         "@babel/preset-typescript": "^7.23.3",
         "@types/bluebird": "^3.5.42",
+        "@types/node": "^20.10.4",
         "@types/node-fetch": "^2.6.9",
         "@types/progress-stream": "^2.0.5",
         "@types/webos-service": "^0.4.6",

services/adapter.ts

@@ -24,6 +24,7 @@ fetch.Promise = Bluebird.Promise;
 // Sadly these need to be manually typed according to
 // https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node
 // since types infered from Bluebird.Promise.promisify are wrong.
+// @ts-ignore
 export const asyncPipeline: (
   ...args: ReadonlyArray<NodeJS.ReadableStream | NodeJS.WritableStream | NodeJS.ReadWriteStream>
 ) => Promise<void> = Bluebird.Promise.promisify(pipeline);

services/elevate-service.ts

@@ -4,7 +4,7 @@ import { existsSync, statSync, readFileSync, writeFileSync } from 'fs';
 import { execFile } from 'child_process';
 import { dirname, resolve } from 'path';
 
-process.env.PATH = `/usr/sbin:${process.env.PATH}`;
+process.env['PATH'] = `/usr/sbin:${process.env['PATH']}`;
 
 function isFile(path: string): boolean {
   try {
@@ -40,7 +40,7 @@ function patchServiceFile(serviceFile: string): boolean {
     serviceFileNew = serviceFileNew.replace(/^Exec=\/usr\/bin\/run-js-service/gm, `Exec=${runJsServicePath}`);
   } else if (serviceFileNew.indexOf('/jailer') !== -1) {
     console.info(`[ ] ${serviceFile} is a native service`);
-    serviceFileNew = serviceFileNew.replace(/^Exec=\/usr\/bin\/jailer .* ([^ ]*)$/gm, (match, binaryPath) => `Exec=${binaryPath}`);
+    serviceFileNew = serviceFileNew.replace(/^Exec=\/usr\/bin\/jailer .* ([^ ]*)$/gm, (_, binaryPath) => `Exec=${binaryPath}`);
   } else if (serviceFileNew.indexOf('Exec=/media') === -1) {
     // Ignore elevated native services...
     console.info(`[~] ${serviceFile}: unknown service type, this may cause some troubles`);

services/protocol.ts

@@ -1,16 +1,16 @@
-type Response<T extends Record<string, any>> = T & {
+interface Response {
   returnValue: true;
-};
+}
 
-type ErrorResponse<T extends Record<string, any>> = T & {
+interface ErrorResponse {
   returnValue: false;
   errorText: string;
-};
+}
 
-export function makeSuccess<T>(payload: T): Response<T> {
+export function makeSuccess(payload: Record<string, any>): Response {
   return { returnValue: true, ...payload };
 }
 
-export function makeError<T>(error: string, payload?: T): ErrorResponse<T> {
+export function makeError(error: string, payload?: Record<string, any>): ErrorResponse {
   return { returnValue: false, errorText: error, ...payload };
 }