From 86cdb6d5da1aa294ddb0d87f66308e294cd2cdc3 Mon Sep 17 00:00:00 2001 From: Niccolo Borgioli Date: Thu, 27 Apr 2023 19:01:32 +0200 Subject: [PATCH] cli --- packages/cli/package.json | 6 +- packages/cli/src/download.ts | 3 +- packages/cli/src/index.ts | 11 +++- packages/cli/src/parsers.ts | 4 +- packages/cli/src/upload.ts | 6 +- packages/cli/src/utils.ts | 4 +- packages/cli/tsconfig.json | 111 ++--------------------------------- 7 files changed, 25 insertions(+), 120 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 77271ce..0e02645 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -4,7 +4,8 @@ "scripts": { "dev": "esbuild ./src/index.ts --bundle --platform=node --outfile=dist/index.cjs --watch", "build": "esbuild ./src/index.ts --bundle --platform=node --outfile=dist/index.cjs", - "bin": "pkg ." + "package": "pkg .", + "bin": "run-s build package" }, "bin": { "cryptgeon": "./dist/index.cjs" @@ -13,7 +14,7 @@ "dist" ], "pkg": { - "scripts": "dist/**/*.js", + "scripts": [], "targets": [ "node18-macos-arm64", "node18-macos-x64", @@ -27,6 +28,7 @@ "devDependencies": { "@types/inquirer": "^9.0.3", "@types/mime": "^3.0.1", + "@types/node": "^18.16.1", "esbuild": "^0.17.18", "pkg": "^5.8.1", "typescript": "^4.9.5" diff --git a/packages/cli/src/download.ts b/packages/cli/src/download.ts index eb3a356..4da04ef 100644 --- a/packages/cli/src/download.ts +++ b/packages/cli/src/download.ts @@ -24,7 +24,6 @@ export async function download(url: URL) { exit('No files found in note') return } - console.log(files) const { names } = await inquirer.prompt([ { type: 'checkbox', @@ -50,7 +49,7 @@ export async function download(url: URL) { await access(filename, constants.R_OK) filename = resolve(`${Date.now()}-${file.name}`) } catch {} - await writeFile(filename, new Uint8Array(await file.contents.arrayBuffer())) + await writeFile(filename, file.contents) console.log(`Saved: ${basename(filename)}`) }) ) diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index b6c5a61..5ae9320 100644 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -2,6 +2,7 @@ import { Argument, Option, program } from '@commander-js/extra-typings' import { setBase, status } from '@cryptgeon/shared' +import prettyBytes from 'pretty-bytes' import { download } from './download.js' import { parseFile, parseNumber } from './parsers.js' @@ -37,10 +38,14 @@ program .action(async (options) => { setBase(options.server) const response = await status() - for (const key of Object.keys(response)) { - if (key.startsWith('theme_')) delete response[key as keyof typeof response] + const formatted = { + ...response, + max_size: prettyBytes(response.max_size), } - console.table(response) + for (const key of Object.keys(formatted)) { + if (key.startsWith('theme_')) delete formatted[key as keyof typeof formatted] + } + console.table(formatted) }) const send = program.command('send') diff --git a/packages/cli/src/parsers.ts b/packages/cli/src/parsers.ts index 6cbda70..33cac70 100644 --- a/packages/cli/src/parsers.ts +++ b/packages/cli/src/parsers.ts @@ -1,10 +1,10 @@ import { InvalidArgumentError, InvalidOptionArgumentError } from '@commander-js/extra-typings' import { accessSync, constants } from 'node:fs' -import path from 'node:path' +import { resolve } from 'node:path' export function parseFile(value: string, before: string[] = []) { try { - const file = path.resolve(value) + const file = resolve(value) accessSync(file, constants.R_OK) return [...before, file] } catch { diff --git a/packages/cli/src/upload.ts b/packages/cli/src/upload.ts index f22dec1..ab1b66e 100644 --- a/packages/cli/src/upload.ts +++ b/packages/cli/src/upload.ts @@ -3,7 +3,7 @@ import { readFile, stat } from 'node:fs/promises' import { basename } from 'node:path' import { Adapters, BASE, create, FileDTO, Note } from '@cryptgeon/shared' -import mime from 'mime' +import * as mime from 'mime' import { AES, Hex, TypedArray } from 'occulto' import { exit } from './utils.js' @@ -32,9 +32,9 @@ export async function uploadFiles(paths: string[], options: UploadOptions) { return { name: basename(path), size: stats.size, - contents: new Blob([data]) as FileDTO['contents'], + contents: data, type, - } + } satisfies FileDTO }) ) diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts index a52b4cb..6dcb7e1 100644 --- a/packages/cli/src/utils.ts +++ b/packages/cli/src/utils.ts @@ -1,6 +1,6 @@ -import process from 'node:process' +import { exit as exitNode } from 'node:process' export function exit(message: string) { console.error(message) - process.exit(1) + exitNode(1) } diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index 6bac29d..953caf4 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -1,110 +1,9 @@ { "compilerOptions": { - /* Visit https://aka.ms/tsconfig to read more about this file */ - - /* Projects */ - // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ - // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ - // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ - // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ - // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ - // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ - - /* Language and Environment */ - "target": "es2022" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, - // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ - // "jsx": "preserve", /* Specify what JSX code is generated. */ - // "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */ - // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ - // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ - // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ - // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ - // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ - // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ - // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ - // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ - - /* Modules */ - "module": "es2022" /* Specify what module code is generated. */, - // "rootDir": "./src" /* Specify the root folder within your source files. */, - "moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */, - // "baseUrl": "./" /* Specify the base directory to resolve non-relative module names. */, - // "paths": { - // "@shared/*": ["../shared/*"], - // "@shared": ["../shared"] - // } /* Specify a set of entries that re-map imports to additional lookup locations. */, - // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ - // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ - // "types": [ - // "../shared/types.ts", - // "node" - // ] /* Specify type package names to be included without being referenced in a source file. */, - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ - // "resolveJsonModule": true, /* Enable importing .json files. */ - // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ - - /* JavaScript Support */ - // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ - // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ - // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ - - /* Emit */ - // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ - // "declarationMap": true, /* Create sourcemaps for d.ts files. */ - // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ - // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ - // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ - "outDir": "./dist" /* Specify an output folder for all emitted files. */, - // "removeComments": true, /* Disable emitting comments. */ - // "noEmit": true, /* Disable emitting files from a compilation. */ - // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ - // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ - // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ - // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ - // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ - // "newLine": "crlf", /* Set the newline character for emitting files. */ - // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ - // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ - // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ - // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ - // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ - // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ - - /* Interop Constraints */ - "isolatedModules": true /* Ensure that each file can be safely transpiled without relying on other imports. */, - // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ - "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */, - // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ - "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, - - /* Type Checking */ - "strict": true /* Enable all strict type-checking options. */, - // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ - // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ - // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ - // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ - // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ - // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ - // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ - // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ - // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ - // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ - // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ - // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ - // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ - // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ - // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ - // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ - // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ - - /* Completeness */ - // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ - "skipLibCheck": true /* Skip type checking all .d.ts files. */ + "target": "es2022", + "module": "es2022", + "moduleResolution": "node", + "noEmit": true, + "strict": true } - // "references": [{ "path": "../shared" }] }