diff --git a/cli/build.zsh b/cli/build.zsh index da3499d..e4953c9 100644 --- a/cli/build.zsh +++ b/cli/build.zsh @@ -5,5 +5,5 @@ rm -rf ui cd ismism.ts -deno bundle src/serve.ts ../cli/serve.js -deno bundle cli/dbreset.ts ../cli/dbreset.js +deno bundle src/ser.ts ../cli/ser.js +deno bundle cli/dbset.ts ../cli/dbset.js diff --git a/cli/start.zsh b/cli/start.zsh index 9eb0617..f1f28c7 100644 --- a/cli/start.zsh +++ b/cli/start.zsh @@ -10,7 +10,7 @@ fi sleep 3.0 -nohup deno run --allow-net --allow-read cli/serve.js > log/ismism.log & +nohup deno run --allow-net --allow-read cli/ser.js > log/ismism.log & nohup nginx -p . -c nginx.conf > log/nginx.log & sleep 0.5 diff --git a/ismism.ts/cli/dbreset.ts b/ismism.ts/cli/dbset.ts similarity index 100% rename from ismism.ts/cli/dbreset.ts rename to ismism.ts/cli/dbset.ts diff --git a/ismism.ts/src/ont/typ.ts b/ismism.ts/src/ont/typ.ts deleted file mode 100644 index ae2450e..0000000 --- a/ismism.ts/src/ont/typ.ts +++ /dev/null @@ -1,2 +0,0 @@ -// deno-lint-ignore no-explicit-any -export type Ret any> = Awaited> diff --git a/ismism.ts/src/pra/pos.ts b/ismism.ts/src/pra/pos.ts index 7eb6021..115177b 100644 --- a/ismism.ts/src/pra/pos.ts +++ b/ismism.ts/src/pra/pos.ts @@ -1,7 +1,9 @@ -import { Ret } from "../ont/typ.ts" import { pas, Pas, pas_clear, pas_code, pas_issue } from "./pas.ts" import { is_re, pro_agd, pro_rec, pro_soc, pro_usr } from "./pro.ts" +// deno-lint-ignore no-explicit-any +type Ret any> = Awaited> + export type PasPos = { jwt?: string | null, pas?: Pas | null } export type PasCode = Ret diff --git a/ismism.ts/src/serve.ts b/ismism.ts/src/ser.ts similarity index 90% rename from ismism.ts/src/serve.ts rename to ismism.ts/src/ser.ts index 6755682..45ba3f4 100644 --- a/ismism.ts/src/serve.ts +++ b/ismism.ts/src/ser.ts @@ -1,8 +1,8 @@ import { serve } from "https://deno.land/std@0.173.0/http/server.ts" -import { jwk_load } from "./ontic/jwt.ts" -import { utc_short } from "./ontic/utc.ts" -import { pos, PasPos } from "./praxic/pos.ts" -import { que } from "./praxic/que.ts" +import { jwk_load } from "./ont/jwt.ts" +import { utc_short } from "./ont/utc.ts" +import { pos, PasPos } from "./pra/pos.ts" +import { que } from "./pra/que.ts" let etag = `W/"${Date.now()}"`