mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-04-04 14:29:45 +00:00
chore: Fix the build for the start9labs/sdk was a new directory structure
This commit is contained in:
@@ -117,7 +117,7 @@ function getAddresses(
|
|||||||
: []
|
: []
|
||||||
|
|
||||||
return hostnames
|
return hostnames
|
||||||
.map(h => {
|
.map((h: any) => {
|
||||||
const addresses: MappedAddress[] = []
|
const addresses: MappedAddress[] = []
|
||||||
|
|
||||||
let name = ''
|
let name = ''
|
||||||
|
|||||||
@@ -1785,6 +1785,7 @@ export module Mock {
|
|||||||
scheme: 'http',
|
scheme: 'http',
|
||||||
preferredExternalPort: 80,
|
preferredExternalPort: 80,
|
||||||
addSsl: {
|
addSsl: {
|
||||||
|
addXForwardedHeaders: null,
|
||||||
preferredExternalPort: 443,
|
preferredExternalPort: 443,
|
||||||
scheme: 'https',
|
scheme: 'https',
|
||||||
},
|
},
|
||||||
@@ -1857,6 +1858,7 @@ export module Mock {
|
|||||||
scheme: 'http',
|
scheme: 'http',
|
||||||
preferredExternalPort: 80,
|
preferredExternalPort: 80,
|
||||||
addSsl: {
|
addSsl: {
|
||||||
|
addXForwardedHeaders: null,
|
||||||
preferredExternalPort: 443,
|
preferredExternalPort: 443,
|
||||||
scheme: 'https',
|
scheme: 'https',
|
||||||
},
|
},
|
||||||
@@ -2032,6 +2034,7 @@ export module Mock {
|
|||||||
scheme: 'http',
|
scheme: 'http',
|
||||||
preferredExternalPort: 80,
|
preferredExternalPort: 80,
|
||||||
addSsl: {
|
addSsl: {
|
||||||
|
addXForwardedHeaders: null,
|
||||||
preferredExternalPort: 443,
|
preferredExternalPort: 443,
|
||||||
scheme: 'https',
|
scheme: 'https',
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -410,6 +410,7 @@ export const mockPatchData: DataModel = {
|
|||||||
scheme: 'http',
|
scheme: 'http',
|
||||||
preferredExternalPort: 80,
|
preferredExternalPort: 80,
|
||||||
addSsl: {
|
addSsl: {
|
||||||
|
addXForwardedHeaders: null,
|
||||||
preferredExternalPort: 443,
|
preferredExternalPort: 443,
|
||||||
scheme: 'https',
|
scheme: 'https',
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
import { DOCUMENT } from '@angular/common'
|
import { DOCUMENT } from '@angular/common'
|
||||||
import { Inject, Injectable } from '@angular/core'
|
import { Inject, Injectable } from '@angular/core'
|
||||||
import { WorkspaceConfig } from '@start9labs/shared'
|
import { WorkspaceConfig } from '@start9labs/shared'
|
||||||
import {
|
import { types } from '@start9labs/start-sdk'
|
||||||
HostnameInfoIp,
|
|
||||||
HostnameInfoOnion,
|
|
||||||
} from '@start9labs/start-sdk/mjs/lib/types'
|
|
||||||
import {
|
import {
|
||||||
InstalledPackageDataEntry,
|
InstalledPackageDataEntry,
|
||||||
PackageMainStatus,
|
PackageMainStatus,
|
||||||
PackageState,
|
PackageState,
|
||||||
} from 'src/app/services/patch-db/data-model'
|
} from 'src/app/services/patch-db/data-model'
|
||||||
|
|
||||||
|
type HostnameInfoIp = types.HostnameInfoIp
|
||||||
|
type HostnameInfoOnion = types.HostnameInfoOnion
|
||||||
|
|
||||||
const {
|
const {
|
||||||
gitHash,
|
gitHash,
|
||||||
useMocks,
|
useMocks,
|
||||||
@@ -79,14 +79,14 @@ export class ConfigService {
|
|||||||
|
|
||||||
if (host.kind === 'multi') {
|
if (host.kind === 'multi') {
|
||||||
const onionHostname = host.hostnames.find(
|
const onionHostname = host.hostnames.find(
|
||||||
h => h.kind === 'onion',
|
(h: any) => h.kind === 'onion',
|
||||||
) as HostnameInfoOnion
|
) as HostnameInfoOnion
|
||||||
|
|
||||||
if (this.isTor() && onionHostname) {
|
if (this.isTor() && onionHostname) {
|
||||||
url.hostname = onionHostname.hostname.value
|
url.hostname = onionHostname.hostname.value
|
||||||
} else {
|
} else {
|
||||||
const ipHostname = host.hostnames.find(
|
const ipHostname = host.hostnames.find(
|
||||||
h => h.kind === 'ip',
|
(h: any) => h.kind === 'ip',
|
||||||
) as HostnameInfoIp
|
) as HostnameInfoIp
|
||||||
|
|
||||||
if (!ipHostname) return ''
|
if (!ipHostname) return ''
|
||||||
|
|||||||
@@ -2,7 +2,8 @@ import { ConfigSpec } from 'src/app/pkg-config/config-types'
|
|||||||
import { Url } from '@start9labs/shared'
|
import { Url } from '@start9labs/shared'
|
||||||
import { MarketplaceManifest } from '@start9labs/marketplace'
|
import { MarketplaceManifest } from '@start9labs/marketplace'
|
||||||
import { BasicInfo } from 'src/app/pages/developer-routes/developer-menu/form-info'
|
import { BasicInfo } from 'src/app/pages/developer-routes/developer-menu/form-info'
|
||||||
import { ServiceInterfaceWithHostInfo } from '@start9labs/start-sdk/mjs/lib/types'
|
import { types } from '@start9labs/start-sdk'
|
||||||
|
type ServiceInterfaceWithHostInfo = types.ServiceInterfaceWithHostInfo
|
||||||
|
|
||||||
export interface DataModel {
|
export interface DataModel {
|
||||||
'server-info': ServerInfo
|
'server-info': ServerInfo
|
||||||
|
|||||||
Reference in New Issue
Block a user