@synopackageland/cli 0.1.0 → 0.3.0

package/dist/templates/native/native.yaml

@@ -0,0 +1,16 @@
+schema: 1
+
+targets:
+  x86_64:
+    path: ./dist/app-x86_64.tar.gz
+    strip_components: 1
+  aarch64:
+    path: ./dist/app-aarch64.tar.gz
+    strip_components: 1
+
+service:
+  exec: bin/app
+  args:
+    - "-data=${SYNOPKG_PKGVAR}"
+  env:
+    TMPDIR: ${SYNOPKG_PKGVAR}/tmp

package/dist/templates/native/synology-app.yaml

@@ -0,0 +1,7 @@
+schema: 1
+package: com.example.native-app
+version: 0.1.0
+displayname: Native App
+description: A minimal Syno Package Land native binary app template.
+maintainer: Syno Package Land
+os_min_ver: "7.2-60000"

package/dist/types.d.ts

@@ -56,4 +56,4 @@ export interface ComposeDocument {
     secrets?: Record<string, unknown>;
     [key: string]: unknown;
 }
-export type TemplateName = "hello-web" | "hello-web-page" | "hello-files" | "compose-import";
+export type TemplateName = "hello-web" | "hello-web-page" | "hello-files" | "compose-import" | "native";

package/dist/validate.js

@@ -1,25 +1,58 @@
 import { existsSync } from "node:fs";
+import { join } from "node:path";
 import { collectInstallParameters, loadContract } from "./contract/load.js";
 import { validateContract } from "./contract/validate.js";
 import { collectComposeInterpolations, collectVolumeSourceInterpolations, loadCompose, validateAdminPortMapping, validateComposeHostBinds, validateComposeRunAs, validateComposeSecurity, } from "./compose/analyze.js";
-import { COMPOSE_FILENAME, CONTRACT_FILENAME } from "./discovery.js";
+import { loadNative } from "./native/load.js";
+import { validateNative } from "./native/validate.js";
+import { COMPOSE_FILENAME, CONTRACT_FILENAME, NATIVE_FILENAME, } from "./discovery.js";
 import { declaredPrivilegeFlags } from "./compose/privilege.js";
 export function validateProject(project, options = {}) {
     const profile = options.profile ?? "personal";
     const errors = [];
     const contractFile = CONTRACT_FILENAME;
     const composeFile = COMPOSE_FILENAME;
+    const nativeFile = NATIVE_FILENAME;
     const parsed = loadContract(project.contractPath);
     errors.push(...validateContract(parsed, contractFile));
-    if (!existsSync(project.composePath)) {
+    const hasCompose = existsSync(project.composePath);
+    const nativePath = project.nativePath ?? join(project.root, NATIVE_FILENAME);
+    const hasNative = existsSync(nativePath);
+    // 2. native.yaml 與 compose.yaml 互斥：兩個都有 → 拒絕；兩個都沒有 → 拒絕。
+    if (hasCompose && hasNative) {
+        errors.push({
+            code: "PROJECT_RUNTIME_EXCLUSIVE",
+            span: { file: nativeFile, line: 1, column: 1 },
+            message: "專案同時存在 compose.yaml 與 native.yaml，兩者互斥。",
+            suggestion: "請選擇使用 compose.yaml（容器 App）或 native.yaml（原生二進位 App），並刪除另一個檔案。",
+        });
+        return { ok: false, errors };
+    }
+    if (!hasCompose && !hasNative) {
         errors.push({
             code: "COMPOSE_MISSING",
             span: { file: composeFile, line: 1, column: 1 },
-            message: "找不到 compose.yaml。",
-            suggestion: "請在專案根目錄建立 compose.yaml。",
+            message: "找不到 compose.yaml 或 native.yaml。",
+            suggestion: "請在專案根目錄建立 compose.yaml 或 native.yaml。",
         });
         return { ok: false, errors };
     }
+    if (hasNative) {
+        const parsedNative = loadNative(nativePath);
+        if (!parsedNative) {
+            errors.push({
+                code: "NATIVE_LOAD_FAILED",
+                span: { file: nativeFile, line: 1, column: 1 },
+                message: "無法讀取 native.yaml。",
+                suggestion: "請確認 native.yaml 存在且格式為合法 YAML。",
+            });
+            return { ok: false, errors };
+        }
+        errors.push(...validateNative(parsedNative, nativeFile, { profile }));
+        const warnings = errors.filter((item) => item.severity === "warning");
+        const hardErrors = errors.filter((item) => item.severity !== "warning");
+        return { ok: hardErrors.length === 0, errors: hardErrors, warnings };
+    }
     const parsedCompose = loadCompose(project.composePath);
     if (!parsedCompose) {
         return { ok: false, errors };

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@synopackageland/cli",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "Syno Package Land Developer Kit CLI",
   "type": "module",
   "bin": {
-    "synopkgland": "dist/bin.js"
+    "synopkgland": "./dist/bin.js",
+    "synopkgland-release": "./dist/release-bin.js"
   },
   "files": [
     "dist",
@@ -17,13 +18,9 @@
     "test": "npm run build && node --import tsx --test test/**/*.test.ts",
     "prepublishOnly": "npm run build"
   },
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org"
-  },
   "dependencies": {
-    "@synopackageland/dev-sdk": "0.1.0",
-    "@synopackageland/package-source": "0.1.0",
+    "@synopackageland/dev-sdk": "^0.2.0",
+    "@synopackageland/package-source": "^0.2.0",
     "ajv": "^8.17.1",
     "commander": "^13.1.0",
     "jose": "^6.0.10",
@@ -34,5 +31,9 @@
     "@types/node": "^22.13.10",
     "tsx": "^4.19.3",
     "typescript": "^5.8.2"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
   }
 }

package/skills/reference/diagnose.md

@@ -10,7 +10,21 @@
 | `CONTRACT_SCHEMA_UNSUPPORTED` | `schema` 必須為整數 `1` |
 | `CONTRACT_INVALID_STRING`／`CONTRACT_ADMINPORT_INVALID` | 修正字串或 `adminport` 型別 |
 | `INSTALL_STRING_*`／`INSTALL_PARAMETER_UNREFERENCED` | 修正 install 預設值；在 compose 加 `${參數名}` |
-| `COMPOSE_MISSING` | 建立 `compose.yaml` |
+| `COMPOSE_MISSING` | 建立 `compose.yaml`（容器 App）或 `native.yaml`（原生 binary App） |
+| `PROJECT_RUNTIME_EXCLUSIVE` | `compose.yaml` 與 `native.yaml` 互斥，刪掉其中一個 |
+| `NATIVE_SCHEMA_INVALID` | `native.yaml` 的 `schema` 只接受 `1` |
+| `NATIVE_TARGETS_REQUIRED` / `NATIVE_TARGETS_EMPTY` | 在 `targets` 底下至少宣告一個 `x86_64` 或 `aarch64` |
+| `NATIVE_ARCH_UNKNOWN` | `targets` 的 key 只接受 `x86_64`、`aarch64` |
+| `NATIVE_TARGET_SOURCE_EXCLUSIVE` | 每個 target 只能有 `path:` 或 `url:` 其中一個 |
+| `NATIVE_PATH_FORBIDDEN_IN_LISTING` | Curated 上架只接受 `url:` ＋ `sha256:`；本機開發才可以用 `path:` |
+| `NATIVE_SHA256_REQUIRED_IN_LISTING` | 補上 `sha256:`，CI 要能自己重抓比對 |
+| `NATIVE_SHA256_INVALID` | `sha256` 必須是 64 個 hex 字元 |
+| `NATIVE_STRIP_COMPONENTS_INVALID` | `strip_components` 必須是 >= 0 的整數 |
+| `NATIVE_EXEC_REQUIRED` / `NATIVE_EXEC_INVALID_PATH` | `service.exec` 必填，且必須是相對 `SYNOPKG_PKGDEST` 的路徑，不可為絕對路徑或含 `..` |
+| `NATIVE_PKGVAR_REQUIRED` | `service.args` 或 `service.env` 至少要用一次 `${SYNOPKG_PKGVAR}`，否則升級時資料會被連同 `target/` 一起換掉 |
+| `NATIVE_SERVICE_USER_FORBIDDEN` | 拿掉 `service.user`：DSM 自己建 package user，`SYNOPKG_PKGVAR` 已經是對的 owner |
+| `NATIVE_SERVICE_SHELL_FIELD_FORBIDDEN` | 拿掉 `command:` / `pre_start:` 這類 shell 欄位；`args` 是陣列，逐項傳給 exec，不經 shell |
+| `NATIVE_ARGS_INVALID` / `NATIVE_ENV_INVALID` | `args` 必須是字串陣列，`env` 必須是 string→string |
 | `COMPOSE_PRIVILEGED_FORBIDDEN` 等安全碼 | 移除 privileged、host 網路、socket 掛載等 |
 | `COMPOSE_SERVICE_NOT_FOUND` | 修正 `adminport` 對應的 service |
 | `CONTRACT_ADMINPORT_UNMAPPED` | 在 compose 發布與 `adminport` 相同的 host port |

package/templates/native/native.yaml

@@ -0,0 +1,16 @@
+schema: 1
+
+targets:
+  x86_64:
+    path: ./dist/app-x86_64.tar.gz
+    strip_components: 1
+  aarch64:
+    path: ./dist/app-aarch64.tar.gz
+    strip_components: 1
+
+service:
+  exec: bin/app
+  args:
+    - "-data=${SYNOPKG_PKGVAR}"
+  env:
+    TMPDIR: ${SYNOPKG_PKGVAR}/tmp

package/templates/native/synology-app.yaml

@@ -0,0 +1,7 @@
+schema: 1
+package: com.example.native-app
+version: 0.1.0
+displayname: Native App
+description: A minimal Syno Package Land native binary app template.
+maintainer: Syno Package Land
+os_min_ver: "7.2-60000"

package/dist/deploy/package-source.d.ts

@@ -1,7 +0,0 @@
-import { DEFAULT_PACKAGE_SOURCE_ORIGIN, fetchPackageSourceManifest, publishSpkToSource, resolvePublishTarget, type PublishTarget, type PublishSpkResult } from "@synology/package-source/publish-spk";
-import { resolveNextSpkVersion } from "@synology/package-source/next-version";
-import type { IndexManifest } from "@synology/package-source/index-manifest";
-export { DEFAULT_PACKAGE_SOURCE_ORIGIN, fetchPackageSourceManifest, publishSpkToSource, resolvePublishTarget, resolveNextSpkVersion, };
-export type { PublishTarget, PublishSpkResult, IndexManifest };
-export declare function resolvePackageSourceManifest(origin?: string): Promise<IndexManifest | null>;
-export declare function publishBuiltSpk(spkPath: string, target?: PublishTarget): Promise<PublishSpkResult>;

package/dist/deploy/package-source.js

@@ -1,17 +0,0 @@
-import { DEFAULT_PACKAGE_SOURCE_ORIGIN, fetchPackageSourceManifest, publishSpkToSource, resolvePublishTarget, } from "@synology/package-source/publish-spk";
-import { resolveNextSpkVersion } from "@synology/package-source/next-version";
-export { DEFAULT_PACKAGE_SOURCE_ORIGIN, fetchPackageSourceManifest, publishSpkToSource, resolvePublishTarget, resolveNextSpkVersion, };
-const LIVE_TEST_FALLBACK_ORIGIN = "https://syno-package-source-throwaway.bidacumen.workers.dev";
-export async function resolvePackageSourceManifest(origin = resolvePublishTarget().origin) {
-    const manifest = await fetchPackageSourceManifest(origin);
-    if (manifest) {
-        return manifest;
-    }
-    if (origin !== LIVE_TEST_FALLBACK_ORIGIN) {
-        return fetchPackageSourceManifest(LIVE_TEST_FALLBACK_ORIGIN);
-    }
-    return null;
-}
-export async function publishBuiltSpk(spkPath, target = resolvePublishTarget()) {
-    return publishSpkToSource(spkPath, target);
-}

package/dist/deploy/spk-info.d.ts

@@ -1,12 +0,0 @@
-export interface SpkInfo {
-    package: string;
-    version: string;
-    displayname?: string;
-    description?: string;
-    maintainer?: string;
-    install_dep_packages?: string;
-    os_min_ver?: string;
-    startable?: boolean;
-}
-export declare function parseSpkInfoContent(info: string): SpkInfo;
-export declare function readSpkInfo(spkPath: string): Promise<SpkInfo>;

package/dist/deploy/spk-info.js

@@ -1,41 +0,0 @@
-import { readFileSync, rmSync } from "node:fs";
-import { mkdtempSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { extractSpk } from "../build-spk/generator.js";
-function parseInfoField(info, key) {
-    const match = new RegExp(`^${key}="((?:\\\\.|[^"\\\\])*)"`, "m").exec(info);
-    if (!match) {
-        return undefined;
-    }
-    return match[1].replace(/\\"/g, '"').replace(/\\\\/g, "\\");
-}
-export function parseSpkInfoContent(info) {
-    const packageName = parseInfoField(info, "package");
-    const version = parseInfoField(info, "version");
-    if (!packageName || !version) {
-        throw new Error("SPK INFO missing package or version");
-    }
-    const startableRaw = parseInfoField(info, "startable");
-    return {
-        package: packageName,
-        version,
-        displayname: parseInfoField(info, "displayname"),
-        description: parseInfoField(info, "description"),
-        maintainer: parseInfoField(info, "maintainer"),
-        install_dep_packages: parseInfoField(info, "install_dep_packages"),
-        os_min_ver: parseInfoField(info, "os_min_ver"),
-        startable: startableRaw === undefined ? undefined : startableRaw === "yes",
-    };
-}
-export async function readSpkInfo(spkPath) {
-    const dir = mkdtempSync(join(tmpdir(), "syno-spk-info-"));
-    try {
-        await extractSpk(spkPath, dir);
-        const info = readFileSync(join(dir, "INFO"), "utf8");
-        return parseSpkInfoContent(info);
-    }
-    finally {
-        rmSync(dir, { recursive: true, force: true });
-    }
-}