wip

Author: charliegerard

.dep-stats.json

@@ -29,12 +29,14 @@
     "chalk": "^5.3.0",
     "cli-cursor": "^4.0.0",
     "configstore": "^7.0.0",
+    "data-uri-to-buffer": "^4.0.0",
     "default-browser": "^5.2.1",
     "default-browser-id": "^5.0.0",
     "define-lazy-prop": "^3.0.0",
     "dot-prop": "^9.0.0",
     "escape-goat": "^4.0.0",
     "execa": "^9.3.0",
+    "fetch-blob": "^3.1.2",
     "figures": "^6.1.0",
     "get-east-asian-width": "^1.0.0",
     "get-stream": "^9.0.0",
@@ -56,6 +58,7 @@
     "latest-version": "^9.0.0",
     "log-symbols": "^6.0.0",
     "meow": "^13.2.0",
+    "node-fetch": "3.3.2",
     "npm-run-path": "^5.2.0",
     "open": "^10.1.0",
     "ora": "^8.0.1",
@@ -105,6 +108,7 @@
     "hpagent": "^1.2.0",
     "ignore": "^5.3.1",
     "ini": "4.1.3",
+    "node-domexception": "^1.0.0",
     "onetime": "^5.1.0",
     "pacote": "^18.0.6",
     "pony-cause": "^2.1.11",
@@ -129,6 +133,7 @@
     "fast-glob": "^3.3.2",
     "graceful-fs": "^4.2.6",
     "ini": "4.1.3",
+    "node-domexception": "^1.0.0",
     "onetime": "^5.1.0",
     "rc": "1.2.8",
     "registry-auth-token": "^5.0.2",

package-lock.json

@@ -45,6 +45,7 @@
     "hpagent": "^1.2.0",
     "ignore": "^5.3.1",
     "ini": "4.1.3",
+    "node-domexception": "^1.0.0",
     "onetime": "^5.1.0",
     "pacote": "^18.0.6",
     "pony-cause": "^2.1.11",

package.json

@@ -1,16 +1,15 @@
 import chalk from 'chalk'
-// @ts-ignore
-import chalkTable from 'chalk-table'
 import meow from 'meow'
 import ora from 'ora'
+import fetch from 'node-fetch'
 
 import { outputFlags } from '../../flags'
-import {
-  handleApiCall,
-  handleUnsuccessfulApiResponse
-} from '../../utils/api-helpers'
+// import {
+//   handleApiCall,
+//   handleUnsuccessfulApiResponse
+// } from '../../utils/api-helpers'
 import { printFlagList } from '../../utils/formatting'
-import { getDefaultKey, setupSdk } from '../../utils/sdk'
+import { getDefaultKey } from '../../utils/sdk'
 
 import type { CliSubcommand } from '../../utils/meow-with-subcommands'
 import type { Ora } from 'ora'
@@ -26,65 +25,42 @@ export const get: CliSubcommand = {
       if(!apiKey){
         throw new AuthError("User must be authenticated to run this command. To log in, run the command `socket login` and enter your API key.")
       }
-      const spinnerText = 'Listing scans... \n'
+      const spinnerText = 'Getting diff scan... \n'
       const spinner = ora(spinnerText).start()
-      await listOrgFullScan(input.orgSlug, input, spinner, apiKey)
+      await getDiffScan(input.before, input.after, spinner, apiKey)
     }
   }
 }
 
-const listFullScanFlags: { [key: string]: any } = {
-  sort: {
+const getDiffScanFlags: { [key: string]: any } = {
+  before: {
     type: 'string',
-    shortFlag: 's',
-    default: 'created_at',
-    description:
-      'Sorting option (`name` or `created_at`) - default is `created_at`'
+    shortFlag: 'b',
+    default: '',
+    description: 'The full scan ID of the base scan'
   },
-  direction: {
+  after: {
     type: 'string',
-    shortFlag: 'd',
-    default: 'desc',
-    description: 'Direction option (`desc` or `asc`) - Default is `desc`'
-  },
-  perPage: {
-    type: 'number',
-    shortFlag: 'pp',
-    default: 30,
-    description: 'Results per page - Default is 30'
+    shortFlag: 'a',
+    default: '',
+    description: 'The full scan ID of the head scan'
   },
-  page: {
-    type: 'number',
+  preview: {
+    type: 'boolean',
     shortFlag: 'p',
-    default: 1,
-    description: 'Page number - Default is 1'
+    default: true,
+    description: 'A boolean flag to persist or not the diff scan result'
   },
-  fromTime: {
-    type: 'string',
-    shortFlag: 'f',
-    default: '',
-    description: 'From time - as a unix timestamp'
-  },
-  untilTime: {
-    type: 'string',
-    shortFlag: 'u',
-    default: '',
-    description: 'Until time - as a unix timestamp'
-  }
 }
 
 // Internal functions
 
 type CommandContext = {
   outputJson: boolean
   outputMarkdown: boolean
-  orgSlug: string
-  sort: string
-  direction: string
-  per_page: number
-  page: number
-  from_time: string
-  until_time: string
+  before: string
+  after: string
+  preview: boolean
 }
 
 function setupCommand(
@@ -95,19 +71,19 @@ function setupCommand(
 ): CommandContext | undefined {
   const flags: { [key: string]: any } = {
     ...outputFlags,
-    ...listFullScanFlags
+    ...getDiffScanFlags
   }
 
   const cli = meow(
     `
     Usage
-      $ ${name} <org slug>
+      $ ${name}
 
     Options
       ${printFlagList(flags, 6)}
 
     Examples
-      $ ${name} FakeOrg
+      $ ${name}
   `,
     {
       argv,
@@ -120,80 +96,57 @@ function setupCommand(
   const {
     json: outputJson,
     markdown: outputMarkdown,
-    sort,
-    direction,
-    perPage,
-    page,
-    fromTime,
-    untilTime
+    before,
+    after,
+    preview,
   } = cli.flags
 
-  if (!cli.input[0]) {
+  if (!before || !after) {
     console.error(
-      `${chalk.bgRed('Input error')}: Please specify an organization slug.\n`
+      `${chalk.bgRed('Input error')}: Please specify a before and after full scan ID.\n`
     )
     cli.showHelp()
     return
   }
 
-  const { 0: orgSlug = '' } = cli.input
-
   return <CommandContext>{
     outputJson,
     outputMarkdown,
-    orgSlug,
-    sort,
-    direction,
-    per_page: perPage,
-    page,
-    from_time: fromTime,
-    until_time: untilTime
+    before,
+    after,
+    preview
   }
 }
 
-async function listOrgFullScan(
-  orgSlug: string,
-  input: CommandContext,
+async function getDiffScan(
+  before: string,
+  after: string,
   spinner: Ora, 
   apiKey: string
 ): Promise<void> {
-  const socketSdk = await setupSdk(apiKey)
-  const result = await handleApiCall(
-    socketSdk.getOrgFullScanList(orgSlug, input),
-    'Listing scans'
-  )
+//   const socketSdk = await setupSdk(apiKey)
+//   const result = await handleApiCall(
+//     socketSdk.getOrgFullScanList(orgSlug, input),
+//     'Listing scans'
+//   )
+
+  const response = await fetch(`https://api.socket.dev/v0/orgs/SocketDev/full-scans/diff?before=${before}&after=${after}&preview`, {
+    method: 'GET', 
+    headers: {
+        'Authorization': 'Basic ' + btoa(`${apiKey}:${apiKey}`)
+    }
+  });
+  const data = await response.json();
 
-  if (!result.success) {
-    handleUnsuccessfulApiResponse('getOrgFullScanList', result, spinner)
-    return
-  }
+//   if (!result.success) {
+//     handleUnsuccessfulApiResponse('getOrgFullScanList', result, spinner)
+//     return
+//   }
   spinner.stop()
 
-  console.log(`\n Listing scans for: ${orgSlug}\n`)
-
-  const options = {
-    columns: [
-      { field: 'id', name: chalk.magenta('ID') },
-      { field: 'report_url', name: chalk.magenta('Scan URL') },
-      { field: 'branch', name: chalk.magenta('Branch') },
-      { field: 'created_at', name: chalk.magenta('Created at') }
-    ]
-  }
-
-  const formattedResults = result.data.results.map(d => {
-    return {
-      id: d.id,
-      report_url: chalk.underline(`${d.html_report_url}`),
-      created_at: d.created_at
-        ? new Date(d.created_at).toLocaleDateString('en-us', {
-            year: 'numeric',
-            month: 'numeric',
-            day: 'numeric'
-          })
-        : '',
-      branch: d.branch
-    }
-  })
+  // before: dfc4cf0c-aefd-4081-9e4e-7385257f26e2
+  // after: 922e45f5-8a7b-4b16-95a5-e98ad00470f1
 
-  console.log(`${chalkTable(options, formattedResults)}\n`)
+  console.log(`\n Diff scan result: \n`)
+  console.log(data);
 }

src/commands/diff-scan/get.ts

@@ -14,3 +14,4 @@ export * from './audit-log'
 export * from './repos'
 export * from './dependencies'
 export * from './analytics'
+export * from './diff-scan'