@browserless.io/browserless 2.4.0 → 2.5.0-beta-1

package/src/sdk-utils.ts

@@ -0,0 +1,136 @@
+import { createInterface } from 'readline';
+import debug from 'debug';
+import fs from 'fs/promises';
+import path from 'path';
+import { spawn } from 'child_process';
+
+export const getArgSwitches = () => {
+  return process.argv.reduce(
+    (accum, arg, idx) => {
+      if (!arg.startsWith('--')) {
+        return accum;
+      }
+
+      if (arg.includes('=')) {
+        const [parameter, value] = arg.split('=');
+        accum[parameter.replace(/-/gi, '')] = value || true;
+        return accum;
+      }
+
+      const nextSwitchOrParameter = process.argv[idx + 1];
+      const param = arg.replace(/-/gi, '');
+
+      if (
+        typeof nextSwitchOrParameter === 'undefined' ||
+        nextSwitchOrParameter?.startsWith('--')
+      ) {
+        accum[param] = true;
+        return accum;
+      }
+
+      accum[param] = nextSwitchOrParameter;
+
+      return accum;
+    },
+    {} as { [key: string]: string | true },
+  );
+};
+
+export const getSourceFiles = async (cwd: string) => {
+  const buildDir = path.join(cwd, 'build');
+  const files = await fs.readdir(buildDir, { recursive: true });
+  const [httpRoutes, webSocketRoutes] = files.reduce(
+    ([httpRoutes, webSocketRoutes], file) => {
+      const parsed = path.parse(file);
+      if (parsed.name.endsWith('http')) {
+        httpRoutes.push(path.join(buildDir, file));
+      }
+
+      if (parsed.name.endsWith('ws')) {
+        webSocketRoutes.push(path.join(buildDir, file));
+      }
+
+      return [httpRoutes, webSocketRoutes];
+    },
+    [[] as string[], [] as string[]],
+  );
+
+  return {
+    files,
+    httpRoutes,
+    webSocketRoutes,
+  };
+};
+
+export const camelCase = (str: string) =>
+  str.replace(/-([a-z])/g, (_, w) => w.toUpperCase());
+
+export const prompt = async (question: string) => {
+  const promptLog = debug('browserless.io:prompt');
+  const rl = createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  });
+
+  return new Promise((resolve) => {
+    promptLog(question);
+    rl.question('  > ', (a) => {
+      rl.close();
+      resolve(a.trim());
+    });
+  });
+};
+
+export const installDependencies = async (
+  workingDirectory: string,
+): Promise<void> =>
+  new Promise((resolve, reject) => {
+    spawn('npm', ['i'], {
+      cwd: workingDirectory,
+      stdio: 'inherit',
+    }).once('close', (code) => {
+      if (code === 0) {
+        return resolve();
+      }
+      return reject(
+        `Error when installing dependencies, see output for more details`,
+      );
+    });
+  });
+
+export const buildDockerImage = async (
+  cmd: string,
+  projectDir: string,
+): Promise<void> =>
+  new Promise((resolve, reject) => {
+    const [docker, ...args] = cmd.split(' ');
+    spawn(docker, args, {
+      cwd: projectDir,
+      stdio: 'inherit',
+    }).once('close', (code) => {
+      if (code === 0) {
+        return resolve();
+      }
+      return reject(
+        `Error when building Docker image, see output for more details`,
+      );
+    });
+  });
+
+export const buildTypeScript = async (
+  buildDir: string,
+  projectDir: string,
+): Promise<void> =>
+  new Promise((resolve, reject) => {
+    spawn('npx', ['tsc', '--outDir', buildDir], {
+      cwd: projectDir,
+      stdio: 'inherit',
+    }).once('close', (code) => {
+      if (code === 0) {
+        return resolve();
+      }
+      return reject(
+        `Error in building TypeScript, see output for more details`,
+      );
+    });
+  });

package/src/server.ts

@@ -4,6 +4,7 @@ import {
   BadRequest,
   Config,
   HTTPRoute,
+  Hooks,
   Metrics,
   NotFound,
   Request,
@@ -14,7 +15,6 @@ import {
   TooManyRequests,
   Unauthorized,
   WebSocketRoute,
-  beforeRequest,
   contentTypes,
   convertPathToURL,
   createLogger,
@@ -48,6 +48,7 @@ export class HTTPServer extends EventEmitter {
     protected metrics: Metrics,
     protected token: Token,
     protected router: Router,
+    protected hooks: Hooks,
   ) {
     super();
     this.host = config.getHost();
@@ -111,7 +112,7 @@ export class HTTPServer extends EventEmitter {
     );
 
     const req = request as Request;
-    const proceed = await beforeRequest({ req, res });
+    const proceed = await this.hooks.before({ req, res });
     req.parsed = convertPathToURL(request.url || '', this.config);
     shimLegacyRequests(req.parsed);
 
@@ -297,7 +298,7 @@ export class HTTPServer extends EventEmitter {
     this.verbose(`Handling inbound WebSocket request on "${request.url}"`);
 
     const req = request as Request;
-    const proceed = await beforeRequest({ head, req, socket });
+    const proceed = await this.hooks.before({ head, req, socket });
     req.parsed = convertPathToURL(request.url || '', this.config);
     shimLegacyRequests(req.parsed);
 

package/src/shared/content.http.ts

@@ -180,7 +180,6 @@ export default class ChromiumContentPostRoute extends BrowserHTTPRoute {
       bestAttemptCatch(bestAttempt),
     );
 
-
     if (addStyleTag.length) {
       for (const tag in addStyleTag) {
         await page.addStyleTag(addStyleTag[tag]);

package/src/utils.ts

@@ -745,7 +745,8 @@ export const encrypt = (text: string, secret: Buffer) => {
 };
 
 export const decrypt = (encryptedText: string, secret: Buffer) => {
-  const [encrypted, iv] = encryptedText.split(encryptionSep);
+  const [encrypted, iv] = encryptedText.toString().split(encryptionSep);
+  console.log('>>', encryptedText.toString());
   if (!iv) throw new ServerError('Bad or invalid encrypted format');
   const decipher = crypto.createDecipheriv(
     encryptionAlgo,