dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-10-15 17:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sh/nodejs-db

Browse Source 
# Conflicts:
#	packages/simplex-chat-nodejs/src/download-libs.js
This commit is contained in:
shum
2026-10-12 08:20:26 +00:00
parent 1aac698068 599076d7a2
commit 701e56cdae
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/simplex-chat-client/types/typescript/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@simplex-chat/types",
"version": "0.12.0",
"version": "0.12.1",
"description": "TypeScript types for SimpleX Chat bot libraries",
"main": "dist/index.js",
"types": "dist/index.d.ts",
packages/simplex-chat-nodejs/package.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "simplex-chat",
"version": "7.1.0-beta.6",
"version": "7.1.0-beta.6.1",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"bin": {
@@ -23,7 +23,7 @@
"docs": "typedoc"
},
"dependencies": {
"@simplex-chat/types": "^0.11.4",
"@simplex-chat/types": "^0.12.1",
"extract-zip": "^2.0.1",
"fast-deep-equal": "^3.1.3"
},
packages/simplex-chat-nodejs/src/libs.ts
+4 -4
View File
@@ -7,7 +7,7 @@ import {pipeline} from "stream/promises"
import extract = require("extract-zip")
import type {Backend} from "./core"
export const LIBS_VERSION = "7.1.0-beta.6"
export const LIBS_RELEASE = "core-7.1.0.11"
const GITHUB_REPO = "simplex-chat/simplex-chat-libs"
const REQUEST_TIMEOUT_MS = 60_000
@@ -46,7 +46,7 @@ export function cacheRoot(platform: string, env: NodeJS.ProcessEnv, home: string
}
function releaseUrl(asset: string): string {
return `https://github.com/${GITHUB_REPO}/releases/download/v${LIBS_VERSION}/${asset}`
return `https://github.com/${GITHUB_REPO}/releases/download/${LIBS_RELEASE}/${asset}`
}
export function libsUrl(backend: Backend, tag: string): string {
@@ -82,7 +82,7 @@ export async function resolveLibsDir(
if (backend === "postgres" && tag !== "linux-x86_64") {
throw new Error(`postgres backend is only supported on linux-x86_64; current platform is ${tag}`)
}
const target = path.resolve(cacheRoot(platform, env), `v${LIBS_VERSION}`, backend)
const target = path.resolve(cacheRoot(platform, env), LIBS_RELEASE, backend)
if (!fs.existsSync(path.join(target, lib))) await installLibs(libsUrl(backend, tag), target, lib)
return target
}
@@ -98,7 +98,7 @@ export async function resolveAddonPath(
return file
}
const tag = platformTag(platform, arch)
const target = path.resolve(cacheRoot(platform, env), `v${LIBS_VERSION}`, addonName(tag))
const target = path.resolve(cacheRoot(platform, env), LIBS_RELEASE, addonName(tag))
if (!fs.existsSync(target)) await installAddon(addonUrl(tag), target)
return target
}
packages/simplex-chat-nodejs/tests/libs.test.ts
+6 -6
View File
@@ -4,7 +4,7 @@ import * as https from "https"
import * as os from "os"
import * as path from "path"
import {AddressInfo} from "net"
import {addonUrl, cacheRoot, installAddon, installLibs, LIBS_VERSION, libPath, libsUrl, MAX_REDIRECTS, platformTag, resolveAddonPath, resolveLibsDir} from "../src/libs"
import {addonUrl, cacheRoot, installAddon, installLibs, LIBS_RELEASE, libPath, libsUrl, MAX_REDIRECTS, platformTag, resolveAddonPath, resolveLibsDir} from "../src/libs"
import {main, parseInstallArgs} from "../src/cli"
import * as libs from "../src/libs"
import {storedZip} from "./zip"
@@ -74,7 +74,7 @@ describe("paths", () => {
})
it("uses the release URLs", () => {
const release = `https://github.com/simplex-chat/simplex-chat-libs/releases/download/v${LIBS_VERSION}`
const release = `https://github.com/simplex-chat/simplex-chat-libs/releases/download/${LIBS_RELEASE}`
expect(libsUrl("sqlite", "macos-aarch64")).toBe(`${release}/simplex-chat-libs-macos-aarch64.zip`)
expect(libsUrl("postgres", "linux-x86_64")).toBe(`${release}/simplex-chat-libs-linux-x86_64-postgres.zip`)
expect(addonUrl("windows-x86_64")).toBe(`${release}/simplex-chat-nodejs-windows-x86_64.node`)
@@ -256,7 +256,7 @@ describe("installLibs", () => {
const dir = await resolveLibsDir(backend, {XDG_CACHE_HOME: cache}, "linux", "x64")
expect(requested).toEqual([libsUrl(backend, "linux-x86_64")])
expect(path.isAbsolute(dir)).toBe(true)
expect(dir).toBe(path.join(tmp, "cache", "simplex-chat", `v${LIBS_VERSION}`, backend))
expect(dir).toBe(path.join(tmp, "cache", "simplex-chat", LIBS_RELEASE, backend))
expect(fs.readFileSync(path.join(dir, LINUX_LIB), "utf8")).toBe("lib")
})
@@ -264,7 +264,7 @@ describe("installLibs", () => {
routes["/addon.node"] = res => res.writeHead(200).end("addon")
const requested = mockHttps("/addon.node")
const addon = await resolveAddonPath({XDG_CACHE_HOME: tmp}, "linux", "x64")
const version = path.join(tmp, "simplex-chat", `v${LIBS_VERSION}`)
const version = path.join(tmp, "simplex-chat", LIBS_RELEASE)
expect(requested).toEqual([addonUrl("linux-x86_64")])
expect(addon).toBe(path.join(version, "simplex-chat-nodejs-linux-x86_64.node"))
expect(fs.readFileSync(addon, "utf8")).toBe("addon")
@@ -273,7 +273,7 @@ describe("installLibs", () => {
it("does not download a cached add-on", async () => {
const requested = mockHttps("/addon.node")
const cached = path.join(cacheRoot("darwin", {}), `v${LIBS_VERSION}`, "simplex-chat-nodejs-macos-aarch64.node")
const cached = path.join(cacheRoot("darwin", {}), LIBS_RELEASE, "simplex-chat-nodejs-macos-aarch64.node")
fs.mkdirSync(path.dirname(cached), {recursive: true})
fs.writeFileSync(cached, "addon")
await expect(resolveAddonPath({}, "darwin", "arm64")).resolves.toBe(cached)
@@ -297,7 +297,7 @@ describe("installLibs", () => {
it("does not download a cached lib", async () => {
const requested = mockHttps("/good.zip")
const cached = path.join(tmp, "simplex-chat", `v${LIBS_VERSION}`, "postgres")
const cached = path.join(tmp, "simplex-chat", LIBS_RELEASE, "postgres")
fs.mkdirSync(cached, {recursive: true})
fs.writeFileSync(path.join(cached, LINUX_LIB), "lib")
await expect(resolveLibsDir("postgres", {XDG_CACHE_HOME: tmp}, "linux", "x64")).resolves.toBe(cached)