pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-20 09:36:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to using networks

Browse Source
This commit is contained in:
Owen
2026-03-19 21:22:04 -07:00
parent 7cbe3d42a1
commit b7421e47cc
2 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
server/db/pg/schema/schema.ts
View File

@@ -81,6 +81,10 @@ export const sites = pgTable("sites", {
exitNodeId: integer("exitNode").references(() => exitNodes.exitNodeId, {
onDelete: "set null"
}),
networkId: integer("networkId").references(
() => networks.networkId,
{ onDelete: "set null" }
),
name: varchar("name").notNull(),
pubKey: varchar("pubKey"),
subnet: varchar("subnet"),
@@ -219,6 +223,16 @@ export const siteResources = pgTable("siteResources", {
orgId: varchar("orgId")
.notNull()
.references(() => orgs.orgId, { onDelete: "cascade" }),
networkId: integer("networkId").references(
() => networks.networkId,
{ onDelete: "set null" }
),
defaultNetworkId: integer("defaultNetworkId").references(
() => networks.networkId,
{
onDelete: "restrict"
}
),
niceId: varchar("niceId").notNull(),
name: varchar("name").notNull(),
mode: varchar("mode").$type<"host" | "cidr">().notNull(), // "host" | "cidr" | "port"
@@ -238,13 +252,19 @@ export const siteResources = pgTable("siteResources", {
.default("site")
});
export const siteSiteResources = pgTable("siteSiteResources", {
siteId: integer("siteId")
export const networks = pgTable("networks", {
networkId: serial("networkId").primaryKey(),
niceId: text("niceId").notNull(),
name: text("name").notNull(),
scope: varchar("scope")
.$type<"global" | "resource">()
.notNull()
.references(() => sites.siteId, { onDelete: "cascade" }),
siteResourceId: integer("siteResourceId")
.default("global"),
orgId: varchar("orgId")
.references(() => orgs.orgId, {
onDelete: "cascade"
})
.notNull()
.references(() => siteResources.siteResourceId, { onDelete: "cascade" })
});
export const clientSiteResources = pgTable("clientSiteResources", {
@@ -1080,3 +1100,4 @@ export type RequestAuditLog = InferSelectModel<typeof requestAuditLog>;
export type RoundTripMessageTracker = InferSelectModel<
typeof roundTripMessageTracker
>;
export type Network = InferSelectModel<typeof networks>;

25
server/db/sqlite/schema/schema.ts
View File

@@ -82,6 +82,9 @@ export const sites = sqliteTable("sites", {
exitNodeId: integer("exitNode").references(() => exitNodes.exitNodeId, {
onDelete: "set null"
}),
networkId: integer("networkId").references(() => networks.networkId, {
onDelete: "set null"
}),
name: text("name").notNull(),
pubKey: text("pubKey"),
subnet: text("subnet"),
@@ -242,6 +245,13 @@ export const siteResources = sqliteTable("siteResources", {
orgId: text("orgId")
.notNull()
.references(() => orgs.orgId, { onDelete: "cascade" }),
networkId: integer("networkId").references(() => networks.networkId, {
onDelete: "set null"
}),
defaultNetworkId: integer("defaultNetworkId").references(
() => networks.networkId,
{ onDelete: "restrict" }
),
niceId: text("niceId").notNull(),
name: text("name").notNull(),
mode: text("mode").$type<"host" | "cidr">().notNull(), // "host" | "cidr" | "port"
@@ -263,13 +273,17 @@ export const siteResources = sqliteTable("siteResources", {
.default("site")
});
export const siteSiteResources = sqliteTable("siteSiteResources", {
siteId: integer("siteId")
export const networks = sqliteTable("networks", {
networkId: integer("networkId").primaryKey({ autoIncrement: true }),
niceId: text("niceId").notNull(),
name: text("name").notNull(),
scope: text("scope")
.$type<"global" | "resource">()
.notNull()
.references(() => sites.siteId, { onDelete: "cascade" }),
siteResourceId: integer("siteResourceId")
.default("global"),
orgId: text("orgId")
.notNull()
.references(() => siteResources.siteResourceId, { onDelete: "cascade" })
.references(() => orgs.orgId, { onDelete: "cascade" })
});
export const clientSiteResources = sqliteTable("clientSiteResources", {
@@ -1164,6 +1178,7 @@ export type ApiKey = InferSelectModel<typeof apiKeys>;
export type ApiKeyAction = InferSelectModel<typeof apiKeyActions>;
export type ApiKeyOrg = InferSelectModel<typeof apiKeyOrg>;
export type SiteResource = InferSelectModel<typeof siteResources>;
export type Network = InferSelectModel<typeof networks>;
export type OrgDomains = InferSelectModel<typeof orgDomains>;
export type SetupToken = InferSelectModel<typeof setupTokens>;
export type HostMeta = InferSelectModel<typeof hostMeta>;