728/ismism
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.0.2 release close #19

Browse Source
This commit is contained in:
728
2022-12-07 14:43:22 +08:00
parent 7feca670c2
commit 750c48b2a8
12 changed files with 27 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -8,4 +8,5 @@
/release
/ssl
/cache
cli/*.js
*.zip

19
cli/build.zsh
View File

@@ -1,17 +1,20 @@
echo "building ismism.ts"
rm cli/*.js
rm -rf ui
mkdir ui
cd ismism.ts
deno bundle src/serve.ts ../cli/serve.js
deno bundle cli/dbinit.ts ../cli/dbinit.js
deno bundle cli/keygen.ts ../cli/keygen.js
cp ui/index.html ../ui/index.html
deno bundle ui/bind.ts ../ui/bind.js
mkdir ../ui/cast
cp ui/cast/index.html ../ui/cast/index.html
cp ui/cast/*.webp ../ui/cast/
deno bundle ui/cast/bind.ts ../ui/cast/bind.js
cd ..
mkdir ui/json
cp json/*.json ui/json/
# mkdir ../ui/cast
# cp ui/cast/index.html ../ui/cast/index.html
# cp ui/cast/*.webp ../ui/cast/
# deno bundle ui/cast/bind.ts ../ui/cast/bind.js

1
cli/deploy.zsh
View File

@@ -1,5 +1,4 @@
rm -rf ismism/cli
rm -rf ismism/ismism.ts
rm -rf ismism/ui
sleep 1

69
cli/json.ts
View File

@@ -1,69 +0,0 @@
import { coll, rec_of_aid, rec_of_sid, rec_of_uid, rec_of_recent } from "../ismism.ts/src/db.ts"
import { soc } from "../ismism.ts/src/query/soc.ts"
import { user } from "../ismism.ts/src/query/user.ts"
import { agenda } from "../ismism.ts/src/query/agenda.ts"
import { Fund, Work, Worker } from "../ismism.ts/src/typ.ts"
async function recent(
): Promise<Rec> {
const t = Date.now()
const [worker, work, fund] = await Promise.all([
rec_of_recent(coll.worker, t, 1000),
rec_of_recent(coll.work, t, 1000),
rec_of_recent(coll.fund, t, 1000),
])
return { worker, work, fund }
}
const [uid, sid, a, r] = await Promise.all([
coll.user.find({}, { projection: { _id: 1 } }).toArray(),
coll.soc.find({}, { projection: { _id: 1 } }).toArray(),
agenda(),
recent(),
])
await Promise.all(uid.map(async ({ _id }) => {
const [u, worker, work, fund] = await Promise.all([
user(_id),
rec_of_uid(coll.worker, [_id]),
rec_of_uid(coll.work, [_id]),
rec_of_uid(coll.fund, [_id]),
])
await Deno.writeTextFile(`json/u${_id}.json`, JSON.stringify({
...u, rec: { worker, work, fund }
}))
}))
await Promise.all(sid.map(async ({ _id }) => {
const [s, worker, work, fund] = await Promise.all([
soc(_id),
rec_of_sid(coll.worker, _id),
rec_of_sid(coll.work, _id),
rec_of_sid(coll.fund, _id),
])
await Deno.writeTextFile(`json/s${_id}.json`, JSON.stringify({
...s, rec: { worker, work, fund }
}))
}))
await Promise.all(a.map(async ({ _id }) => {
const [worker, work, fund] = await Promise.all([
rec_of_aid(coll.worker, _id),
rec_of_aid(coll.work, _id),
rec_of_aid(coll.fund, _id),
])
await Deno.writeTextFile(`json/a${_id}.json`, JSON.stringify({
worker, work, fund
}))
}))
await Promise.all([
Deno.writeTextFile(`json/agenda.json`, JSON.stringify(a)),
Deno.writeTextFile(`json/recent.json`, JSON.stringify(r)),
])
export type Rec = {
worker: Awaited<ReturnType<typeof rec_of_uid<Worker>>>,
work: Awaited<ReturnType<typeof rec_of_uid<Work>>>,
fund: Awaited<ReturnType<typeof rec_of_uid<Fund>>>,
}
export type Agenda = typeof a[0]
export type User = Awaited<ReturnType<typeof user>> & { rec: Rec }
export type Soc = Awaited<ReturnType<typeof soc>> & { rec: Rec }

3
cli/keygen.ts
View File

@@ -1,3 +0,0 @@
import { keygen } from "../ismism.ts/src/aut.ts"
await keygen(true)

12
cli/release.zsh
View File

@@ -1,12 +1,12 @@
rm -rf release
git clone --depth 1 git@gitlab.com:728/ismism.git release
rm -rf release/.git
zsh cli/build.zsh
rm -rf release
mkdir release
cp -r cli release
cp -r ui release
cp -r ssl release
cp jwk.json release
cp jwk.json mongod.service mongod.yaml nginx.conf release
if [ "$1" = "dbimport" ]; then
echo "cp -r dbimport release"
@@ -17,7 +17,7 @@ rm -f ismism.zip
cd release
zip -r ../ismism.zip .
cd ..
scp ismism.zip i:/root
scp ismism.zip i:
ssh i zsh < cli/deploy.zsh

2
cli/start.zsh
View File

@@ -10,7 +10,7 @@ fi
sleep 3.0
nohup deno run --allow-net --allow-read ismism.ts/src/serve.ts > log/ismism.log &
nohup deno run --allow-net --allow-read cli/serve.js > log/ismism.log &
nohup nginx -p . -c nginx.conf > log/nginx.log &
sleep 0.5

2
cli/dbinit.ts → ismism.ts/cli/dbinit.ts
View File

@@ -1,4 +1,4 @@
import { init } from "../ismism.ts/src/db.ts"
import { init } from "../src/db.ts"
const coll = await init()
console.log(`collections created:\n${coll.join("\n")}`)

2
cli/jsonfix.ts → ismism.ts/cli/jsonfix.ts
View File

@@ -1,4 +1,4 @@
import { User, Work } from "../ismism.ts/src/typ.ts";
import { User, Work } from "../src/typ.ts";
function rand_utc(
utc: number

3
ismism.ts/cli/keygen.ts Normal file
View File

@@ -0,0 +1,3 @@
import { keygen } from "../src/aut.ts"
await keygen(true)

7
ismism.ts/ui/bind.ts
View File

@@ -193,15 +193,14 @@ function erecent(
]] = template("recent", [
"tab.work", "tab.worker", "tab.fund", "rec.work", "rec.worker", "rec.fund",
])
const utc = Date.now()
erecof(
[bwork, bworker, bfund],
[dwork, dworker, dfund],
[nrec.work, nrec.worker, nrec.fund], () => {
return Promise.all([
query(`rec_of_recent?coll=work&utc=${utc}`),
query(`rec_of_recent?coll=worker&utc=${utc}`),
query(`rec_of_recent?coll=fund&utc=${utc}`),
query(`rec_of_recent?coll=work&utc=${utc_etag}`),
query(`rec_of_recent?coll=worker&utc=${utc_etag}`),
query(`rec_of_recent?coll=fund&utc=${utc_etag}`),
])
})
el.appendChild(t)

9
nginx.conf
View File

@@ -59,15 +59,6 @@ http {
proxy_cache_path cache levels=1:2 keys_zone=cache:10m max_size=10g inactive=1d use_temp_path=off;
server {
server_name _;
location = /444.html {
return 444;
}
return 444;
}
server {
server_name _;
listen 80 default_server;