@landstrip/landstrip-api 0.20.8 → 0.20.10

package/README.md

@@ -1,7 +1,8 @@
 # @landstrip/landstrip-api
 
-Node.js wrapper and types for Landstrip. Requires Node.js ≥18; native binaries
-support Linux, macOS, and Windows on x64/arm64.
+TypeScript APIs for Landstrip. Requires Node.js ≥18 and depends on
+`@landstrip/landstrip` to install the executable for Linux, macOS, and Windows on
+x64/arm64. This API package does not own the CLI or platform binary packages.
 
 ## Install
 
@@ -77,5 +78,5 @@ Run `make ci` from the repository root.
 
 ## License
 
-[Apache-2.0](LICENSE); bundled native binaries are
-[LGPL-2.1-or-later](../landstrip/LICENSE).
+[Apache-2.0](LICENSE); native binaries installed through `@landstrip/landstrip`
+are [LGPL-2.1-or-later](../landstrip/LICENSE).

package/lib/index.js

@@ -1,100 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 'use strict';
 
-const fs = require('node:fs');
-const path = require('node:path');
-
-const packages = {
-  'darwin-arm64': {
-    packageName: '@landstrip/landstrip-darwin-arm64',
-    binary: 'bin/landstrip',
-  },
-  'darwin-x64': {
-    packageName: '@landstrip/landstrip-darwin-x64',
-    binary: 'bin/landstrip',
-  },
-  'linux-x64': {
-    packageName: '@landstrip/landstrip-linux-x64',
-    binary: 'bin/landstrip',
-  },
-  'linux-arm64': {
-    packageName: '@landstrip/landstrip-linux-arm64',
-    binary: 'bin/landstrip',
-  },
-  'win32-x64': {
-    packageName: '@landstrip/landstrip-win32-x64',
-    binary: 'bin/landstrip.exe',
-  },
-  'win32-arm64': {
-    packageName: '@landstrip/landstrip-win32-arm64',
-    binary: 'bin/landstrip.exe',
-  },
-};
-
-const officialPackageNames = new Set([
-  '@landstrip/landstrip-api',
-  ...Object.values(packages).map((value) => value.packageName),
-]);
-
-function target(platform = process.platform, arch = process.arch) {
-  const key = `${platform}-${arch}`;
-  const value = packages[key];
-
-  if (!value) {
-    throw new Error(`Unsupported landstrip platform: ${platform} ${arch}`);
-  }
-
-  return value;
-}
-
-function packageName(platform = process.platform, arch = process.arch) {
-  return target(platform, arch).packageName;
-}
-
-function binaryPath(platform = process.platform, arch = process.arch) {
-  const value = target(platform, arch);
-  let manifest;
-
-  try {
-    manifest = require.resolve(`${value.packageName}/package.json`);
-  } catch (error) {
-    throw new Error(
-      `The landstrip binary package ${value.packageName} is not installed. ` +
-        'Reinstall @landstrip/landstrip-api with optional dependencies enabled.'
-    );
-  }
-
-  const resolved = path.join(path.dirname(manifest), value.binary);
-
-  if (!fs.statSync(resolved).isFile()) {
-    throw new Error(`landstrip binary not found at ${resolved}`);
-  }
-
-  const filePath = fs.realpathSync.native(resolved);
-  let probe = path.dirname(filePath);
-  while (true) {
-    let owner;
-    try {
-      owner = JSON.parse(fs.readFileSync(path.join(probe, 'package.json'), 'utf8'));
-    } catch (error) {
-      if (error.code !== 'ENOENT' && !(error instanceof SyntaxError)) throw error;
-    }
-    if (
-      owner !== null &&
-      typeof owner === 'object' &&
-      !Array.isArray(owner) &&
-      officialPackageNames.has(owner.name)
-    ) {
-      return filePath;
-    }
-    const parent = path.dirname(probe);
-    if (parent === probe) break;
-    probe = parent;
-  }
-  throw new Error(
-    `Refusing to use landstrip binary outside official @landstrip/landstrip-api packages: ${filePath}`,
-  );
-}
+const { binaryPath, packageName } = require('@landstrip/landstrip');
 
 exports.binaryPath = binaryPath;
 exports.packageName = packageName;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@landstrip/landstrip-api",
-  "version": "0.20.8",
-  "description": "Sandbox runner using Landlock, Seatbelt, and AppContainer",
+  "version": "0.20.10",
+  "description": "TypeScript APIs for the Landstrip sandbox",
   "license": "Apache-2.0",
   "homepage": "https://github.com/landstrip/landstrip#readme",
   "repository": {
@@ -27,26 +27,15 @@
       "default": "./lib/proxy.js"
     }
   },
-  "bin": {
-    "landstrip": "bin/landstrip.js"
-  },
   "files": [
-    "bin",
     "lib",
     "README.md",
     "LICENSE"
   ],
   "dependencies": {
+    "@landstrip/landstrip": "0.20.10",
     "ipaddr.js": "^2.5.0"
   },
-  "optionalDependencies": {
-    "@landstrip/landstrip-darwin-arm64": "0.20.8",
-    "@landstrip/landstrip-darwin-x64": "0.20.8",
-    "@landstrip/landstrip-linux-x64": "0.20.8",
-    "@landstrip/landstrip-linux-arm64": "0.20.8",
-    "@landstrip/landstrip-win32-x64": "0.20.8",
-    "@landstrip/landstrip-win32-arm64": "0.20.8"
-  },
   "publishConfig": {
     "access": "public"
   },

package/bin/landstrip.js

@@ -1,37 +0,0 @@
-#!/usr/bin/env node
-// SPDX-License-Identifier: Apache-2.0
-'use strict';
-
-const { spawn } = require('node:child_process');
-const { binaryPath } = require('../lib');
-
-let child;
-
-try {
-  const options = { stdio: 'inherit' };
-  if (process.platform === 'linux') {
-    options.env = { ...process.env, APPIMAGE_EXTRACT_AND_RUN: '1' };
-  }
-  child = spawn(binaryPath(), process.argv.slice(2), options);
-} catch (error) {
-  console.error(error.message);
-  process.exit(1);
-}
-
-child.on('error', (error) => {
-  console.error(error.message);
-  process.exit(1);
-});
-
-child.on('exit', (code, signal) => {
-  if (signal) {
-    if (process.platform === 'win32') {
-      process.exit(1);
-    }
-
-    process.kill(process.pid, signal);
-    return;
-  }
-
-  process.exit(code === null ? 1 : code);
-});