chore: convert random to TypeScript

Author: AtofStryker

packages/server/lib/cloud/auth.ts

@@ -9,7 +9,7 @@ const url = require('url')
 const { shell } = require('electron')
 
 const machineId = require('./machine_id')
-const random = require('../util/random')
+import { id as randomId } from '../util/random'
 const user = require('./user')
 
 let app
@@ -29,7 +29,7 @@ const buildFullLoginUrl = (baseLoginUrl, server, utmSource, utmMedium, utmConten
   const { port } = server.address()
 
   if (!authState) {
-    authState = random.id(32)
+    authState = randomId(32)
   }
 
   const authUrl = url.parse(baseLoginUrl)

packages/server/lib/file_server.ts

@@ -7,7 +7,7 @@ import path from 'path'
 import send from 'send'
 import { httpUtils } from '@packages/network'
 import { allowDestroy } from './util/server_destroy'
-import random from './util/random'
+import { id as randomId } from './util/random'
 import networkFailures from './util/network_failures'
 import type { AddressInfo } from 'net'
 
@@ -59,7 +59,7 @@ const onRequest = function (req: http.IncomingMessage, res: http.ServerResponse,
 
 export const create = (fileServerFolder: string): Promise<FileServer> => {
   return new Promise(((resolve) => {
-    const token = random.id(64)
+    const token = randomId(64)
 
     const srv = http.createServer(httpUtils.lenientOptions, (req: http.IncomingMessage, res: http.ServerResponse) => {
       return onRequest(req, res, token, fileServerFolder)
@@ -68,23 +68,21 @@ export const create = (fileServerFolder: string): Promise<FileServer> => {
     allowDestroy(srv)
 
     return srv.listen(0, '127.0.0.1', () => {
-      return resolve({
+      const server: FileServer = {
         token,
-
         port () {
           return (srv.address() as AddressInfo).port
         },
-
         address () {
-          // @ts-expect-error - port is defined on the object context
           return `http://localhost:${this.port()}`
         },
-
         close () {
           // @ts-expect-error - destroyAsync is defined when allowDestroy is called
           return srv.destroyAsync()
         },
-      })
+      }
+
+      return resolve(server)
     })
   }))
 }

packages/server/lib/modes/index.ts

@@ -2,7 +2,7 @@ import { setCtx } from '@packages/data-context'
 import _ from 'lodash'
 
 import { makeDataContext } from '../makeDataContext'
-import random from '../util/random'
+import { id as randomId } from '../util/random'
 import { telemetry } from '@packages/telemetry'
 
 export = (mode, options) => {
@@ -14,7 +14,7 @@ export = (mode, options) => {
 
   if (mode === 'run') {
     _.defaults(options, {
-      socketId: random.id(10),
+      socketId: randomId(10),
       isTextTerminal: true,
       browser: 'electron',
       quiet: false,

packages/server/lib/modes/run.ts

@@ -17,7 +17,7 @@ import { fs, getPath } from '../util/fs'
 import runEvents from '../plugins/run_events'
 import env from '../util/env'
 import trash from '../util/trash'
-import random from '../util/random'
+import { id as randomId } from '../util/random'
 import system from '../util/system'
 import chromePolicyCheck from '../util/chrome_policy_check'
 import type { SpecWithRelativeRoot, SpecFile, TestingType, OpenProjectLaunchOpts, FoundBrowser, BrowserVideoController, VideoRecording, ProcessOptions, ProtocolManagerShape, AutomationCommands } from '@packages/types'
@@ -764,7 +764,7 @@ async function waitForTestsToFinishRunning (options: { project: Project, screens
 
 function screenshotMetadata (data: any, resp: any) {
   return {
-    screenshotId: random.id(),
+    screenshotId: randomId(),
     name: data.name || null,
     testId: data.testId,
     testAttemptIndex: data.testAttemptIndex,

packages/server/lib/util/random.js renamed to packages/server/lib/util/random.ts

@@ -1,13 +1,9 @@
-const random = require('randomstring')
+import random from 'randomstring'
 
 // return a random id
-const id = (length = 5) => {
+export const id = (length = 5): string => {
   return random.generate({
     length,
     capitalization: 'lowercase',
   })
 }
-
-module.exports = {
-  id,
-}

packages/server/test/unit/util/random_spec.js renamed to packages/server/test/unit/util/random_spec.ts

@@ -1,13 +1,11 @@
-require('../../spec_helper')
-
-const randomstring = require('randomstring')
-const random = require(`../../../lib/util/random`)
+import randomstring from 'randomstring'
+import { id as randomId } from '../../../lib/util/random'
 
 context('.id', () => {
   it('returns random.generate string with length 5 by default', () => {
     sinon.spy(randomstring, 'generate')
 
-    const id = random.id()
+    const id = randomId()
 
     expect(id.length).to.eq(5)
 
@@ -20,7 +18,7 @@ context('.id', () => {
   it('passes the length parameter if supplied', () => {
     sinon.spy(randomstring, 'generate')
 
-    const id = random.id(32)
+    const id = randomId(32)
 
     expect(id.length).to.eq(32)