From 8216bc7232b4abad93b35a1280471a41e1137005 Mon Sep 17 00:00:00 2001 From: Ben Allfree Date: Thu, 6 Jun 2024 04:33:17 -0700 Subject: [PATCH 1/2] chore(root,pockethost,common,dashboard,superadmin,lander,plugin-console-logger): reabsorb common --- package.json | 1 - packages/common/package.json | 26 ----- packages/common/tsconfig.json | 109 ------------------ packages/dashboard/package.json | 2 +- .../src/components/ProvisioningStatus.svelte | 2 +- .../src/components/SubscriptionStatus.svelte | 2 +- .../dashboard/src/components/helpers/theme.ts | 2 +- .../tables/pricing-table/PricingTable.svelte | 2 +- packages/dashboard/src/env.ts | 2 +- .../src/pocketbase-client/PocketbaseClient.ts | 4 +- .../dashboard/src/routes/account/+page.svelte | 2 +- .../app/instances/[instanceId]/+layout.svelte | 2 +- .../app/instances/[instanceId]/+page.svelte | 2 +- .../instances/[instanceId]/logs/+page.svelte | 2 +- .../[instanceId]/logs/LoggingInner.svelte | 6 +- .../[instanceId]/secrets/+page.svelte | 2 +- .../[instanceId]/secrets/Form.svelte | 2 +- .../[instanceId]/settings/+page.svelte | 2 +- .../[instanceId]/settings/CustomDomain.svelte | 2 +- .../app/instances/[instanceId]/store.ts | 2 +- .../dashboard/src/routes/app/new/+page.svelte | 2 +- .../src/routes/app/new/Paywall.svelte | 2 +- .../src/routes/dashboard/InstanceList.svelte | 2 +- .../src/routes/dashboard/InstanceRow.svelte | 2 +- packages/dashboard/src/services.ts | 2 +- .../dashboard/src/util/componentCleanup.ts | 2 +- packages/dashboard/src/util/stores.ts | 4 +- .../content/blog/pocket-host-v0-10-0.md | 2 +- packages/lander/package.json | 2 +- packages/plugin-console-logger/package.json | 2 +- packages/plugin-console-logger/src/index.ts | 2 +- packages/pockethost/package.json | 9 +- .../DaemonCommand/ServeCommand/daemon.ts | 2 +- .../FtpCommand/ServeCommand/ftp.ts | 2 +- .../SyslogCommand/ServeCommand/syslog.ts | 2 +- .../ServeCommand/firewall/server.ts | 2 +- .../cli/commands/HealthCommand/checkHealth.ts | 2 +- .../src/cli/commands/HealthCommand/index.ts | 2 +- .../ServeCommand/mothership.ts | 2 +- .../freshenPocketbaseVersions.ts | 2 +- .../src/cli/commands/SendMailCommand/index.ts | 2 +- .../cli/commands/SendMailCommand/sendmail.ts | 2 +- .../src/cli/commands/ServeCommand/index.ts | 2 +- packages/pockethost/src/cli/index.ts | 2 +- packages/pockethost/src/constants.ts | 14 +-- packages/pockethost/src/index.ts | 1 + .../src/public-api}/CleanupManager.ts | 0 .../src/public-api}/Logger.ts | 0 .../src/public-api}/TimerManager.ts | 0 .../src/public-api}/assert.ts | 0 .../src/public-api}/asyncExecutionGuard.ts | 0 .../src/public-api}/events.ts | 0 .../src/public-api}/index.ts | 0 .../src => pockethost/src/public-api}/ioc.ts | 0 .../src/public-api}/mergeConfig.ts | 0 .../src/public-api}/mkSingleton.ts | 0 .../src/public-api}/newId.ts | 0 .../src/public-api}/plugin.ts | 0 .../pocketbase-client-helpers/RestHelper.ts | 0 .../pocketbase-client-helpers/index.ts | 0 .../src/public-api}/pocketbase.ts | 0 .../src/public-api}/schema/Instance.ts | 0 .../src/public-api}/schema/InstanceLog.ts | 0 .../public-api}/schema/Rest/CreateInstance.ts | 0 .../public-api}/schema/Rest/DeleteInstance.ts | 0 .../schema/Rest/GetUserTokenInfo.ts | 0 .../public-api}/schema/Rest/UpdateInstance.ts | 0 .../src/public-api}/schema/Rest/index.ts | 0 .../src/public-api}/schema/User.ts | 0 .../src/public-api}/schema/index.ts | 0 .../src/public-api}/schema/types.ts | 0 .../src/public-api}/schema/util.ts | 0 .../src/public-api}/stringify.ts | 0 .../src/services/FtpService/PhFs.ts | 2 +- .../src/services/FtpService/index.ts | 7 +- .../services/InstanceLoggerService/index.ts | 4 +- .../src/services/InstanceService/index.ts | 20 ++-- .../InstanceService/mkInstanceCache.ts | 2 +- .../InstanceMIxin.ts | 2 +- .../createAdminPbClient.ts | 2 +- .../MothershipAdminClientService/index.ts | 2 +- .../src/services/PocketBaseService/index.ts | 6 +- .../pockethost/src/services/PortService.ts | 2 +- .../pockethost/src/services/ProxyService.ts | 4 +- .../pockethost/src/services/RealtimeLog.ts | 2 +- .../src/services/SqliteService/index.ts | 2 +- packages/pockethost/src/util/Settings.ts | 2 +- packages/pockethost/src/util/SyslogLogger.ts | 2 +- packages/pockethost/src/util/assert.ts | 2 +- packages/pockethost/src/util/discordAlert.ts | 2 +- packages/pockethost/src/util/pexec.ts | 2 +- packages/pockethost/src/util/smartFetch.ts | 2 +- packages/pockethost/src/util/tryFetch.ts | 2 +- packages/pockethost/tsconfig.json | 1 + packages/superadmin/package.json | 2 +- .../src/components/helpers/theme.ts | 2 +- .../src/pocketbase-client/PocketbaseClient.ts | 4 +- packages/superadmin/src/services.ts | 2 +- .../superadmin/src/util/componentCleanup.ts | 2 +- packages/superadmin/src/util/stores.ts | 6 +- pnpm-lock.yaml | 79 ++++++------- 101 files changed, 131 insertions(+), 286 deletions(-) delete mode 100644 packages/common/package.json delete mode 100644 packages/common/tsconfig.json mode change 100644 => 100755 packages/pockethost/src/cli/index.ts create mode 100644 packages/pockethost/src/index.ts rename packages/{common/src => pockethost/src/public-api}/CleanupManager.ts (100%) rename packages/{common/src => pockethost/src/public-api}/Logger.ts (100%) rename packages/{common/src => pockethost/src/public-api}/TimerManager.ts (100%) rename packages/{common/src => pockethost/src/public-api}/assert.ts (100%) rename packages/{common/src => pockethost/src/public-api}/asyncExecutionGuard.ts (100%) rename packages/{common/src => pockethost/src/public-api}/events.ts (100%) rename packages/{common/src => pockethost/src/public-api}/index.ts (100%) rename packages/{common/src => pockethost/src/public-api}/ioc.ts (100%) rename packages/{common/src => pockethost/src/public-api}/mergeConfig.ts (100%) rename packages/{common/src => pockethost/src/public-api}/mkSingleton.ts (100%) rename packages/{common/src => pockethost/src/public-api}/newId.ts (100%) rename packages/{common/src => pockethost/src/public-api}/plugin.ts (100%) rename packages/{common/src => pockethost/src/public-api}/pocketbase-client-helpers/RestHelper.ts (100%) rename packages/{common/src => pockethost/src/public-api}/pocketbase-client-helpers/index.ts (100%) rename packages/{common/src => pockethost/src/public-api}/pocketbase.ts (100%) rename packages/{common/src => pockethost/src/public-api}/schema/Instance.ts (100%) rename packages/{common/src => pockethost/src/public-api}/schema/InstanceLog.ts (100%) rename packages/{common/src => pockethost/src/public-api}/schema/Rest/CreateInstance.ts (100%) rename packages/{common/src => pockethost/src/public-api}/schema/Rest/DeleteInstance.ts (100%) rename packages/{common/src => pockethost/src/public-api}/schema/Rest/GetUserTokenInfo.ts (100%) rename packages/{common/src => pockethost/src/public-api}/schema/Rest/UpdateInstance.ts (100%) rename packages/{common/src => pockethost/src/public-api}/schema/Rest/index.ts (100%) rename packages/{common/src => pockethost/src/public-api}/schema/User.ts (100%) rename packages/{common/src => pockethost/src/public-api}/schema/index.ts (100%) rename packages/{common/src => pockethost/src/public-api}/schema/types.ts (100%) rename packages/{common/src => pockethost/src/public-api}/schema/util.ts (100%) rename packages/{common/src => pockethost/src/public-api}/stringify.ts (100%) diff --git a/package.json b/package.json index edacabaa..90716609 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ "check:types:dashboard": "cd packages/dashboard && pnpm check:types", "check:types:superadmin": "cd packages/superadmin && pnpm check:types", "check:types:pockethost": "cd packages/pockethost && pnpm check:types", - "check:types:common": "cd packages/common && pnpm check:types", "lint": "prettier -c \"./**/*.{ts,js,cjs,svelte,json}\"", "lint:fix": "prettier -w \"./**/*.{ts,js,cjs,svelte,json}\"", "build": "concurrently 'pnpm:build:*'", diff --git a/packages/common/package.json b/packages/common/package.json deleted file mode 100644 index 80ad532f..00000000 --- a/packages/common/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "@pockethost/common", - "version": "1.0.0", - "description": "", - "main": "src/index.ts", - "module": "src/index.ts", - "type": "module", - "scripts": { - "check:types": "tsc --noEmit " - }, - "keywords": [], - "author": "", - "license": "ISC", - "dependencies": { - "@s-libs/micro-dash": "^16.1.0", - "ajv": "^8.12.0", - "bottleneck": "^2.19.5", - "chalk": "^5.3.0", - "json-stringify-safe": "^5.0.1", - "nanoid": "^5.0.2", - "pocketbase": "^0.21.3" - }, - "devDependencies": { - "@types/json-stringify-safe": "^5.0.2" - } -} diff --git a/packages/common/tsconfig.json b/packages/common/tsconfig.json deleted file mode 100644 index bb2f7f66..00000000 --- a/packages/common/tsconfig.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "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": "es2016" /* 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 legacy experimental 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": "commonjs" /* Specify what module code is generated. */, - // "rootDir": "./", /* Specify the root folder within your source files. */ - // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ - // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ - // "paths": {}, /* 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": [], /* 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. */ - // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ - // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ - // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ - // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ - // "resolveJsonModule": true, /* Enable importing .json files. */ - // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ - // "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. */ - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "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": "./", /* 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. */ - // "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. */ - // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ - // "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. */ - } -} diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json index 6826b9a4..991a8a22 100644 --- a/packages/dashboard/package.json +++ b/packages/dashboard/package.json @@ -14,7 +14,7 @@ "type": "module", "devDependencies": { "@microsoft/fetch-event-source": "https://github.com/pockethost/fetch-event-source.git#ebe3b7122647b48b93fd11effbbfb915d98956b0", - "@pockethost/common": "workspace:../common", + "pockethost": "workspace:../pockethost", "@s-libs/micro-dash": "^16.1.0", "@sveltejs/adapter-static": "^2.0.3", "@sveltejs/kit": "^1.25.2", diff --git a/packages/dashboard/src/components/ProvisioningStatus.svelte b/packages/dashboard/src/components/ProvisioningStatus.svelte index 46f75281..890855aa 100644 --- a/packages/dashboard/src/components/ProvisioningStatus.svelte +++ b/packages/dashboard/src/components/ProvisioningStatus.svelte @@ -1,5 +1,5 @@
diff --git a/packages/dashboard/src/routes/dashboard/InstanceList.svelte b/packages/dashboard/src/routes/dashboard/InstanceList.svelte index f4027b21..3226238c 100644 --- a/packages/dashboard/src/routes/dashboard/InstanceList.svelte +++ b/packages/dashboard/src/routes/dashboard/InstanceList.svelte @@ -3,7 +3,7 @@ import CardHeader from '$components/cards/CardHeader.svelte' import InstanceRow from '$src/routes/dashboard/InstanceRow.svelte' import { globalInstancesStore } from '$util/stores' - import { InstanceFields } from '@pockethost/common' + import { InstanceFields } from 'pockethost' import { values } from '@s-libs/micro-dash' let arrayOfActiveInstances: InstanceFields[] = [] diff --git a/packages/dashboard/src/routes/dashboard/InstanceRow.svelte b/packages/dashboard/src/routes/dashboard/InstanceRow.svelte index ec79b469..f454036a 100644 --- a/packages/dashboard/src/routes/dashboard/InstanceRow.svelte +++ b/packages/dashboard/src/routes/dashboard/InstanceRow.svelte @@ -1,6 +1,6 @@