jishushell 0.4.10 → 0.4.24

package/apps/searxng-container.yaml

@@ -0,0 +1,115 @@
+id: searxng-container
+name: SearXNG
+version: "1.0.0"
+jishushell:
+  min_version: "0.4.24"
+description: "隐私优先的元搜索引擎，Docker 容器模式由 Nomad 管理生命周期"
+singleInstance: false
+
+tasks:
+  - name: searxng
+    role: service
+    runtime: container
+    image: "searxng/searxng:latest"
+    env:
+      SEARXNG_PORT: "8080"
+      SEARXNG_BASE_URL: "http://localhost:8080/"
+      FORCE_OWNERSHIP: "false"
+    resources:
+      cpu: "500m"
+      memory: "512Mi"
+    ports:
+      - name: http
+        port: 8080
+        visibility: external
+    volumes:
+      - source: "~/.jishushell/apps/${app_id}/settings/settings.yml"
+        target: "/etc/searxng/settings.yml"
+        readonly: true
+      - source: "~/.jishushell/apps/${app_id}/settings/limiter.toml"
+        target: "/etc/searxng/limiter.toml"
+        readonly: true
+    health:
+      http:
+        path: /healthz
+        port: 8080
+      interval: "15s"
+      timeout: "5s"
+      retries: 3
+      start_period: "30s"
+
+provides:
+  - capability: "web-ui"
+    port: 8080
+    description: "SearXNG Web UI"
+  - capability: "search-api"
+    port: 8080
+    path: "/search"
+    description: "SearXNG 搜索 API，支持 JSON 格式 (/search?q=xxx&format=json)"
+
+lifecycle:
+  install:
+    - downloadImage: "searxng/searxng:latest"
+    - mkdir: "~/.jishushell/apps/${app_id}/settings"
+    - run: |
+        SETTINGS_DIR="$HOME/.jishushell/apps/${app_id}/settings"
+        SECRET_KEY="$(head -c 48 /dev/urandom | base64 | tr -dc 'A-Za-z0-9' | head -c 32)"
+
+        export SETTINGS_DIR SECRET_KEY
+        python3 <<'PY'
+        from pathlib import Path
+        import os
+        from textwrap import dedent
+
+        settings_dir = Path(os.environ["SETTINGS_DIR"])
+        secret = os.environ["SECRET_KEY"]
+
+        (settings_dir / "settings.yml").write_text(
+            dedent(
+                f'''
+                use_default_settings:
+                  engines:
+                    remove:
+                      - ahmia
+                      - torch
+                      - wikidata
+                server:
+                  secret_key: "{secret}"
+                  port: 8080
+                  bind_address: "0.0.0.0"
+                  limiter: false
+                search:
+                  formats:
+                    - html
+                    - json
+                '''
+            ).lstrip(),
+            encoding="utf-8",
+        )
+
+        (settings_dir / "limiter.toml").write_text(
+            dedent(
+                '''
+                [botdetection]
+                ipv4_prefix = 32
+                ipv6_prefix = 48
+                trusted_proxies = [
+                  "127.0.0.0/8",
+                  "::1",
+                ]
+
+                [botdetection.ip_limit]
+                filter_link_local = false
+                link_token = false
+
+                [botdetection.ip_lists]
+                block_ip = []
+                pass_ip = []
+                pass_searxng_org = true
+                '''
+            ).lstrip(),
+            encoding="utf-8",
+        )
+        PY
+
+        chmod 644 "$SETTINGS_DIR/settings.yml" "$SETTINGS_DIR/limiter.toml"

package/dist/auth.d.ts

@@ -1,5 +1,6 @@
 export declare function isInitialized(): boolean;
 export declare function initPassword(password: string): Promise<boolean>;
+export declare function resetPassword(password: string): Promise<void>;
 export declare function verifyPassword(password: string): Promise<boolean>;
 export declare function changePassword(oldPassword: string, newPassword: string): Promise<boolean>;
 export declare function createToken(): string;

package/dist/auth.js

@@ -8,6 +8,16 @@ let _authCache = null;
 // seeing isInitialized()=false and then racing to write the password file.
 let _initInProgress = false;
 function invalidateAuthCache() { _authCache = null; }
+async function persistPassword(password) {
+    const hashed = await bcrypt.hash(password, 10);
+    let passwordVersion = Date.now();
+    const existing = readAuthData();
+    const previousVersion = existing?.password_version || 0;
+    if (passwordVersion <= previousVersion)
+        passwordVersion = previousVersion + 1;
+    writeAuthData({ password_hash: hashed, password_version: passwordVersion });
+    invalidateAuthCache();
+}
 function readAuthData() {
     return safeReadSecretJson(AUTH_FILE, "auth");
 }
@@ -27,16 +37,16 @@ export async function initPassword(password) {
         // Double-check after the flag is set — in case two calls raced to the check above.
         if (readAuthData() !== null)
             return false;
-        const hashed = await bcrypt.hash(password, 10);
-        const version = Date.now();
-        writeAuthData({ password_hash: hashed, password_version: version });
-        invalidateAuthCache();
+        await persistPassword(password);
         return true;
     }
     finally {
         _initInProgress = false;
     }
 }
+export async function resetPassword(password) {
+    await persistPassword(password);
+}
 export async function verifyPassword(password) {
     const data = readAuthData();
     if (!data)
@@ -46,16 +56,7 @@ export async function verifyPassword(password) {
 export async function changePassword(oldPassword, newPassword) {
     if (!await verifyPassword(oldPassword))
         return false;
-    const hashed = await bcrypt.hash(newPassword, 10);
-    let currentVersion = Date.now();
-    const data = readAuthData();
-    if (data) {
-        const prev = data.password_version || 0;
-        if (currentVersion <= prev)
-            currentVersion = prev + 1;
-    }
-    writeAuthData({ password_hash: hashed, password_version: currentVersion });
-    invalidateAuthCache();
+    await persistPassword(newPassword);
     return true;
 }
 export function createToken() {

package/dist/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"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"}

package/dist/cli/app.d.ts

@@ -0,0 +1,4 @@
+export declare function run(rest: string[]): Promise<void>;
+export declare function dispatch(argv: string[]): Promise<boolean>;
+export declare function brief(): string;
+export declare function printHelp(): void;