jiriks74/presence.nvim
1
0
Fork 0
mirror of https://github.com/jiriks74/presence.nvim synced 2025-04-06 20:33:00 +02:00
Code Issues Releases Activity Actions

Merge branch 'main' into lazy-plugin-manager

Browse source
This commit is contained in:
jan Mikowa 2024-04-06 15:58:44 +02:00 committed by GitHub
commit 8b18beb367
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 2264 additions and 1938 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
.github/ISSUE_TEMPLATE/bug_report.yml vendored
View file

@ -1,47 +1,98 @@
name: Issue report name: Issue report
description: Report any errors, bugs, or unexpected behaviors related to presence.nvim description: Report any errors, bugs, or unexpected behaviors related to presence.nvim
title: "[Bug]: "
labels: [bug] labels: [bug]
assignees:
- jiriks74
body: body:
- type: markdown - type: markdown
attributes: attributes:
value: | value: |
Before reporting, please search [existing issues](https://github.com/andweeb/presence.nvim/issues) and make sure that presence.nvim is updated to the latest version. Before reporting, please search [existing issues](https://github.com/andweeb/presence.nvim/issues) and make sure that presence.nvim is updated to the latest version.
- type: checkboxes
attributes:
label: Are you on the latest version?
options:
- label: I have updated to the latest version.
required: true
- type: checkboxes
attributes:
label: Have you tried it with default config?
options:
- label: I have tried the default config.
required: true
- type: textarea - type: textarea
attributes: attributes:
label: "Description" label: "Description"
description: "A short summary of the error, bug, or unexpected behavior you're facing." description: "A short summary of the error, bug, or unexpected behavior you're facing."
validations: validations:
required: true required: true
- type: textarea - type: textarea
attributes: attributes:
label: "Neovim version" label: "Neovim version"
description: "Output of `nvim --version`" description: "Output of `nvim --version`"
render: markdown render: markdown
placeholder: | placeholder: |
NVIM v0.6.0-dev+209-g0603eba6e NVIM: v0.6.0-dev+209-g0603eba6e
Build type: Release Build type: Release
LuaJIT 2.1.0-beta3 LuaJIT: 2.1.0-beta3
value: |
NVIM:
Build type:
LuaJIT:
validations: validations:
required: true required: true
- type: input - type: input
attributes: attributes:
label: "OS information" label: "OS information"
placeholder: "macOS 12.0.1" placeholder: "macOS 12.0.1"
validations: validations:
required: true required: true
- type: textarea - type: textarea
attributes: attributes:
label: "Steps to reproduce" label: "Steps to reproduce"
description: "Steps to reproduce the issue with your config(s) if applicable" description: "Steps to reproduce the issue with your config(s) if applicable."
placeholder: | placeholder: |
1. Setup presence.nvim with `require("presence"):setup({...})` 1. Setup presence.nvim with `require("presence"):setup({...})`
2. Run Neovim with `nvim test.txt` 2. Run Neovim with `nvim test.txt`
3. ... 3. ...
validations: validations:
required: true required: true
- type: textarea - type: textarea
attributes: attributes:
label: "Logs" label: "Logs"
description: "The full list of `:messages` from one or more `nvim` instances" description: "The full list of `:messages` from one or more `nvim` instances.\nPlease insert the logs into code blocks."
placeholder: |
<details>
```
[presence.nvim] Using runtime path: /run/user/1000
[presence.nvim] Using Discord IPC socket path: /run/user/1000/discord-ipc-0
[presence.nvim] Checking Discord IPC socket at /run/user/1000/discord-ipc-0...
```
</details>
value: |
<details>
```
```
</details>
validations: validations:
required: true required: true
- type: textarea
attributes:
label: "Aditional info"
description: "If you'd like to add anything else put it here."
validations:
required: false

20
.github/ISSUE_TEMPLATE/feature_request.md vendored
View file

@ -1,20 +0,0 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: enhancement
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

34
.github/ISSUE_TEMPLATE/feature_request.yml vendored Normal file
View file

@ -0,0 +1,34 @@
name: Feature request
description: Report any errors, bugs, or unexpected behaviors related to presence.nvim
title: "[FEAT]: "
labels: [enhancement]
assignees:
- jiriks74
body:
- type: textarea
attributes:
label: Is your feature request related to a problem?
description: A clear and concise description of what the problem is. Ex. I'm always frustrated when...
validations:
required: true
- type: textarea
attributes:
label: Describe the solution you'd like
description: A clear and concise description of what you want to happen.
validations:
required: false
- type: textarea
attributes:
label: Describe alternatives you've considered
description: A clear and concise description of any alternative solutions or features you've considered.
validations:
required: false
- type: textarea
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here.
validations:
required: false

14
.github/workflows/CI.yml vendored
View file

@ -1,14 +0,0 @@
name: CI
on:
push:
pull_request:
jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: nebularg/actions-luacheck@v1
with:
files: 'lua'

10
.github/workflows/luacheck.yml vendored Normal file
View file

@ -0,0 +1,10 @@
name: Luacheck
on: [push, pull_request]
jobs:
Luacheck:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Luacheck linter
uses: lunarmodules/luacheck@v1

15
.github/workflows/stylua.yml vendored Normal file
View file

@ -0,0 +1,15 @@
name: StyLua
on: [push, pull_request]
jobs:
StyLuacheck:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: StyLua check
uses: JohnnyMorganz/stylua-action@v3
with:
token: ${{ secrets.GH_TOKEN }}
version: v0.18.2 # NOTE: we recommend pinning to a specific version in case of formatting changes
# CLI arguments
args: --check .

123
README.md
View file

@ -1,41 +1,63 @@
<img src="https://gist.githubusercontent.com/andweeb/df3216345530234289b87cf5080c2c60/raw/8de399cfed82c137f793e9f580027b5246bc4379/presence.nvim.png" alt="presence.nvim">&#x200B; # ![presence.nvim](https://gist.githubusercontent.com/andweeb/df3216345530234289b87cf5080c2c60/raw/8de399cfed82c137f793e9f580027b5246bc4379/presence.nvim.png)
**[Features](#features)** | **[Installation](#installation)** | **[Configuration](#configuration)** | **[Troubleshooting](#troubleshooting)** | **[Development](#development)** | **[Contributing](#contributing)** This repository uses
[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://conventionalcommits.org)
**[Features](#features)** | **[Installation](#installation)** |
**[Configuration](#configuration)** | **[Troubleshooting](#troubleshooting)** |
**[Development](#development)** | **[Contributing](#contributing)**
> Discord [Rich Presence](https://discord.com/rich-presence) plugin for [Neovim](https://neovim.io) > Discord [Rich Presence](https://discord.com/rich-presence) plugin for [Neovim](https://neovim.io)
<img src="https://gist.githubusercontent.com/andweeb/df3216345530234289b87cf5080c2c60/raw/ad916fec8de921d0021801a0af877a5349621e7e/presence-demo-a.gif" width="100%" alt="demo.gif"> ![Presence demo](https://gist.githubusercontent.com/andweeb/df3216345530234289b87cf5080c2c60/raw/ad916fec8de921d0021801a0af877a5349621e7e/presence-demo-a.gif)
## Features ## Features
* Light and unobtrusive
* No Python/Node providers (or CoC) required - Light and unobtrusive
* Cross-platform support: macOS, nixOS, Linux[\*](#notes), Windows[\*](https://github.com/andweeb/presence.nvim/projects/1#card-60537963), WSL[\*](https://github.com/andweeb/presence.nvim/wiki/Rich-Presence-in-WSL) - No Python/Node providers (or CoC) required
* Startup time is fast(er than other Rich Presence plugins, by [kind of a lot](https://github.com/andweeb/presence.nvim/wiki/Plugin-Comparisons)) - Cross-platform support: macOS, nixOS, Linux[\*](#notes),
* Written in Lua and [highly configurable](#configuration) in Lua (but also configurable in VimL if you want) Windows, WSL
* Manages Rich Presence across multiple Neovim instances in various environments (tmux panes/windows, ssh sessions, terminal tabs/windows, etc.) - Startup time is fast(er than other Rich Presence plugins, by
[kind of a lot](https://github.com/andweeb/presence.nvim/wiki/Plugin-Comparisons))
- Written in Lua and [highly configurable](#configuration) in Lua
(but also configurable in VimL if you want)
- Manages Rich Presence across multiple Neovim instances in various environments
(tmux panes/windows, ssh sessions, terminal tabs/windows, etc.)
- Now with Flatpak support!
## Installation ## Installation
Use your favorite plugin manager Use your favorite plugin manager
* [vim-plug](https://github.com/junegunn/vim-plug): `Plug 'andweeb/presence.nvim'`
* [packer.nvim](https://github.com/wbthomason/packer.nvim): `use 'andweeb/presence.nvim'` - [vim-plug](https://github.com/junegunn/vim-plug): `Plug 'jiriks74/presence.nvim'`
- [packer.nvim](https://github.com/wbthomason/packer.nvim): `use 'jiriks74/presence.nvim'`
- [lazy.nvim](https://github.com/folke/lazy.nvim):
```lua ```lua
{ {
'andweeb/presence.nvim', "jiriks74/presence.nvim",
event = 'UIEnter', event = "UIEnter",
} },
``` ```
#### Notes ### Notes
* Requires [Neovim 0.5](https://github.com/neovim/neovim/releases/tag/v0.5.0) or higher
* Rich Presence should work automatically after installation (unless you're using WSL, in which case [see here](https://github.com/andweeb/presence.nvim/wiki/Rich-Presence-in-WSL)) - Requires [Neovim 0.5](https://github.com/neovim/neovim/releases/tag/v0.5.0)
* If you're using an unofficial Discord package on Linux ([flatpak](https://flathub.org/apps/details/com.discordapp.Discord), [snap](https://snapcraft.io/discord), etc.), you may need to follow some instructions to expose the Discord socket on your system (e.g. [flatpak instructions](https://github.com/flathub/com.discordapp.Discord/wiki/Rich-Precense-(discord-rpc))) or higher
- Rich Presence should work automatically after installation
(unless you're using WSL, in which case
[see here](https://github.com/andweeb/presence.nvim/wiki/Rich-Presence-in-WSL))
## Configuration ## Configuration
Configuration is not necessary for Rich Presence to work. But for those that want to override the default configs, the following options are available to configure in either Lua or VimL.
Configuration is not necesary unless you want to override the default config.
If you want to change the default config here are your options in Lua and VimL:
### Lua ### Lua
Require the plugin and call `setup` with a config table with one or more of the following keys:
Require the plugin and call `setup` with a config table with one or more of the
following keys:
```lua ```lua
-- The setup config table shows all available config options with their default values: -- The setup config table shows all available config options with their default values:
@ -44,7 +66,7 @@ require("presence").setup({
auto_update = true, -- Update activity based on autocmd events (if `false`, map or manually execute `:lua package.loaded.presence:update()`) auto_update = true, -- Update activity based on autocmd events (if `false`, map or manually execute `:lua package.loaded.presence:update()`)
neovim_image_text = "The One True Text Editor", -- Text displayed when hovered over the Neovim image neovim_image_text = "The One True Text Editor", -- Text displayed when hovered over the Neovim image
main_image = "neovim", -- Main image display (either "neovim" or "file") main_image = "neovim", -- Main image display (either "neovim" or "file")
client_id = "793271441293967371", -- Use your own Discord application client id (not recommended) client_id = "1172122807501594644", -- Use your own Discord application client id (not recommended)
log_level = nil, -- Log messages at or above this level (one of the following: "debug", "info", "warn", "error") log_level = nil, -- Log messages at or above this level (one of the following: "debug", "info", "warn", "error")
debounce_timeout = 10, -- Number of seconds to debounce events (or calls to `:lua package.loaded.presence:update(<filename>, true)`) debounce_timeout = 10, -- Number of seconds to debounce events (or calls to `:lua package.loaded.presence:update(<filename>, true)`)
enable_line_number = false, -- Displays the current line number instead of the current project enable_line_number = false, -- Displays the current line number instead of the current project
@ -65,13 +87,15 @@ require("presence").setup({
``` ```
### VimL ### VimL
Or if global variables are more your thing, you can use any of the following instead: Or if global variables are more your thing, you can use any of the following instead:
```viml ```viml
" General options " General options
let g:presence_auto_update = 1 let g:presence_auto_update = 1
let g:presence_neovim_image_text = "The One True Text Editor" let g:presence_neovim_image_text = "The One True Text Editor"
let g:presence_main_image = "neovim" let g:presence_main_image = "neovim"
let g:presence_client_id = "793271441293967371" let g:presence_client_id = "1172122807501594644"
let g:presence_log_level let g:presence_log_level
let g:presence_debounce_timeout = 10 let g:presence_debounce_timeout = 10
let g:presence_enable_line_number = 0 let g:presence_enable_line_number = 0
@ -91,23 +115,48 @@ let g:presence_line_number_text = "Line %s out of %s"
``` ```
## Troubleshooting ## Troubleshooting
* Ensure that Discord is running
* Ensure that your Neovim version is 0.5 or higher - Ensure that Discord is running
* Ensure Game Activity is enabled in your Discord settings - Ensure that your Neovim version is 0.5 or higher
* Enable logging and inspect the logs after opening a buffer - Ensure Game Activity is enabled in your Discord settings
* Set the [`log_level`](#lua) setup option or [`g:presence_log_level`](#viml) to `"debug"` - Enable logging and inspect the logs after opening a buffer
* Load a file and inspect the logs with `:messages` - Set the [`log_level`](#lua) setup option or [`g:presence_log_level`](#viml)
* If there is a `Failed to determine Discord IPC socket` error, your particular OS may not yet be supported to `"debug"`
* If you don't see an existing [issue](https://github.com/andweeb/presence.nvim/issues) or [card](https://github.com/andweeb/presence.nvim/projects/1#column-14183588) for your OS, create a prefixed [issue](https://github.com/andweeb/presence.nvim/issues/new) (e.g. `[Void Linux]`) - Load a file and inspect the logs with `:messages`
* Still not working and need help? Create a new [issue](https://github.com/andweeb/presence.nvim/issues)! - If there is a `Failed to determine Discord IPC socket` error, your particular
OS may not yet be supported
- If you don't see an existing
[issue](https://github.com/jiriks74/presence.nvim/issues)
or [card](https://github.com/jiriks74/presence.nvim/projects/1#column-14183588)
for your OS, create a prefixed
[issue](https://github.com/jiriks74/presence.nvim/issues/new)
(e.g. `[Void Linux]`)
- Still not working and need help? Create a new
[issue](https://github.com/jiriks74/presence.nvim/issues)!
## Development ## Development
* Clone the repo: `git clone https://github.com/andweeb/presence.nvim.git`
* Enable [logging](#configuration) and ensure that `presence.nvim` is **_not_** in the list of vim plugins in your config - Clone the repo: `git clone https://github.com/jiriks74/presence.nvim.git`
* Run `nvim` with your local changes: `nvim --cmd 'set rtp+=path/to/your/local/presence.nvim' file.txt` - Enable [logging](#configuration) and ensure that `presence.nvim` is **_not_**
* Ensure that there are no [luacheck](https://github.com/mpeterv/luacheck/) errors: `luacheck lua` in the list of vim plugins in your config
- Run `nvim` with your local changes: `nvim --cmd
'set rtp+=path/to/your/local/presence.nvim' file.txt`
- Ensure that there are no [luacheck](https://github.com/mpeterv/luacheck/)
errors: `luacheck lua`
## Contributing ## Contributing
Pull requests are very welcome, feel free to open an issue to work on any of the open [todo items](https://github.com/andweeb/presence.nvim/projects/1?add_cards_query=is%3Aopen) or message [droob#1322](https://discordapp.com/users/241953146232897550) on Discord!
Asset additions and changes are also welcome! Supported file types can be found in [`file_assets.lua`](lua/presence/file_assets.lua) and their referenced asset files can be found [in this folder](https://www.dropbox.com/sh/j8913f0gav3toeh/AADxjn0NuTprGFtv3Il1Pqz-a?dl=0). **Please use [Conventional Commits](https://www.conventionalcommits.org/)
if you want to contribute.
It makes everyones jobs easier.**
**This project uses [StyLua](https://github.com/JohnnyMorganz/StyLua).
Please format your code using StyLua for better readability**
Pull requests are very welcome, feel free to open an issue to work on
or message [me (@jiriks74)](https://discordapp.com/users/517810049360461837) on my
[Discord server](https://discord.gg/cCq3qcB4jB)!
Asset additions and changes are also welcome! Supported file types can be found in
[`file_assets.lua`](lua/presence/file_assets.lua) and their referenced asset files
can be found [in this folder](https://www.dropbox.com/sh/j8913f0gav3toeh/AADxjn0NuTprGFtv3Il1Pqz-a?dl=0).

328
lua/deps/msgpack.lua
View file

@ -12,34 +12,32 @@ if not rshift then -- luajit differ from luabit
rshift = luabit.rshift rshift = luabit.rshift
end end
local function byte_mod(x,v) local function byte_mod(x, v)
if x < 0 then if x < 0 then
x = x + 256 x = x + 256
end end
return (x%v) return (x % v)
end end
-- buffer -- buffer
local strbuf = "" -- for unpacking local strbuf = "" -- for unpacking
local strary = {} -- for packing local strary = {} -- for packing
local function strary_append_int16(n,h) local function strary_append_int16(n, h)
if n < 0 then if n < 0 then
n = n + 65536 n = n + 65536
end end
table.insert( strary, tostr(h, math.floor(n / 256), n % 256 ) ) table.insert(strary, tostr(h, math.floor(n / 256), n % 256))
end end
local function strary_append_int32(n,h) local function strary_append_int32(n, h)
if n < 0 then if n < 0 then
n = n + 4294967296 n = n + 4294967296
end end
table.insert(strary, tostr(h, table.insert(
math.floor(n / 16777216), strary,
math.floor(n / 65536) % 256, tostr(h, math.floor(n / 16777216), math.floor(n / 65536) % 256, math.floor(n / 256) % 256, n % 256)
math.floor(n / 256) % 256, )
n % 256 ))
end end
local doubleto8bytes local doubleto8bytes
@ -47,8 +45,8 @@ local strary_append_double = function(n)
-- assume double -- assume double
double_encode_count = double_encode_count + 1 double_encode_count = double_encode_count + 1
local b = doubleto8bytes(n) local b = doubleto8bytes(n)
table.insert( strary, tostr(0xcb)) table.insert(strary, tostr(0xcb))
table.insert( strary, string.reverse(b) ) -- reverse: make big endian double precision table.insert(strary, string.reverse(b)) -- reverse: make big endian double precision
end end
--- IEEE 754 --- IEEE 754
@ -59,11 +57,14 @@ doubleto8bytes = function(x)
return math.floor(v / 256), tostr(math.fmod(math.floor(v), 256)) return math.floor(v / 256), tostr(math.fmod(math.floor(v), 256))
end end
local sign = 0 local sign = 0
if x < 0 then sign = 1; x = -x end if x < 0 then
sign = 1
x = -x
end
local mantissa, exponent = math.frexp(x) local mantissa, exponent = math.frexp(x)
if x == 0 then -- zero if x == 0 then -- zero
mantissa, exponent = 0, 0 mantissa, exponent = 0, 0
elseif x == 1/0 then elseif x == 1 / 0 then
mantissa, exponent = 0, 2047 mantissa, exponent = 0, 2047
else else
mantissa = (mantissa * 2 - 1) * math.ldexp(0.5, 53) mantissa = (mantissa * 2 - 1) * math.ldexp(0.5, 53)
@ -72,11 +73,14 @@ doubleto8bytes = function(x)
local v, byte = "" -- convert to bytes local v, byte = "" -- convert to bytes
x = mantissa x = mantissa
for _ = 1,6 do for _ = 1, 6 do
_, byte = grab_byte(x); v = v..byte -- 47:0 _, byte = grab_byte(x)
v = v .. byte -- 47:0
end end
x, byte = grab_byte(exponent * 16 + x); v = v..byte -- 55:48 x, byte = grab_byte(exponent * 16 + x)
x, byte = grab_byte(sign * 128 + x); v = v..byte -- 63:56 v = v .. byte -- 55:48
x, byte = grab_byte(sign * 128 + x)
v = v .. byte -- 63:56
return v, x return v, x
end end
@ -91,10 +95,10 @@ local function bitstofrac(ary)
end end
local function bytestobits(ary) local function bytestobits(ary)
local out={} local out = {}
for _, v in ipairs(ary) do for _, v in ipairs(ary) do
for j = 0, 7, 1 do for j = 0, 7, 1 do
table.insert(out, band( rshift(v,7-j), 1 ) ) table.insert(out, band(rshift(v, 7 - j), 1))
end end
end end
return out return out
@ -105,22 +109,38 @@ local function bytestodouble(v)
-- sign:1bit -- sign:1bit
-- exp: 11bit (2048, bias=1023) -- exp: 11bit (2048, bias=1023)
local sign = math.floor(v:byte(8) / 128) local sign = math.floor(v:byte(8) / 128)
local exp = band( v:byte(8), 127 ) * 16 + rshift( v:byte(7), 4 ) - 1023 -- bias local exp = band(v:byte(8), 127) * 16 + rshift(v:byte(7), 4) - 1023 -- bias
-- frac: 52 bit -- frac: 52 bit
local fracbytes = { local fracbytes = {
band( v:byte(7), 15 ), v:byte(6), v:byte(5), v:byte(4), v:byte(3), v:byte(2), v:byte(1) -- big endian band(v:byte(7), 15),
v:byte(6),
v:byte(5),
v:byte(4),
v:byte(3),
v:byte(2),
v:byte(1), -- big endian
} }
local bits = bytestobits(fracbytes) local bits = bytestobits(fracbytes)
for _ = 1, 4 do table.remove(bits,1) end for _ = 1, 4 do
table.remove(bits, 1)
end
if sign == 1 then sign = -1 else sign = 1 end if sign == 1 then
sign = -1
else
sign = 1
end
local frac = bitstofrac(bits) local frac = bitstofrac(bits)
if exp == -1023 and frac==0 then return 0 end if exp == -1023 and frac == 0 then
if exp == 1024 and frac==0 then return 1/0 *sign end return 0
end
if exp == 1024 and frac == 0 then
return 1 / 0 * sign
end
local real = math.ldexp(1+frac,exp) local real = math.ldexp(1 + frac, exp)
return real * sign return real * sign
end end
@ -135,14 +155,14 @@ packers.dynamic = function(data)
end end
packers["nil"] = function() packers["nil"] = function()
table.insert( strary, tostr(0xc0)) table.insert(strary, tostr(0xc0))
end end
packers.boolean = function(data) packers.boolean = function(data)
if data then -- pack true if data then -- pack true
table.insert( strary, tostr(0xc3)) table.insert(strary, tostr(0xc3))
else -- pack false else -- pack false
table.insert( strary, tostr(0xc2)) table.insert(strary, tostr(0xc2))
end end
end end
@ -150,25 +170,25 @@ packers.number = function(n)
if math.floor(n) == n then -- integer if math.floor(n) == n then -- integer
if n >= 0 then -- positive integer if n >= 0 then -- positive integer
if n < 128 then -- positive fixnum if n < 128 then -- positive fixnum
table.insert( strary, tostr(n)) table.insert(strary, tostr(n))
elseif n < 256 then -- uint8 elseif n < 256 then -- uint8
table.insert(strary, tostr(0xcc,n)) table.insert(strary, tostr(0xcc, n))
elseif n < 65536 then -- uint16 elseif n < 65536 then -- uint16
strary_append_int16(n,0xcd) strary_append_int16(n, 0xcd)
elseif n < 4294967296 then -- uint32 elseif n < 4294967296 then -- uint32
strary_append_int32(n,0xce) strary_append_int32(n, 0xce)
else -- lua cannot handle uint64, so double else -- lua cannot handle uint64, so double
strary_append_double(n) strary_append_double(n)
end end
else -- negative integer else -- negative integer
if n >= -32 then -- negative fixnum if n >= -32 then -- negative fixnum
table.insert( strary, tostr( 0xe0 + ((n+256)%32)) ) table.insert(strary, tostr(0xe0 + ((n + 256) % 32)))
elseif n >= -128 then -- int8 elseif n >= -128 then -- int8
table.insert( strary, tostr(0xd0,byte_mod(n,0x100))) table.insert(strary, tostr(0xd0, byte_mod(n, 0x100)))
elseif n >= -32768 then -- int16 elseif n >= -32768 then -- int16
strary_append_int16(n,0xd1) strary_append_int16(n, 0xd1)
elseif n >= -2147483648 then -- int32 elseif n >= -2147483648 then -- int32
strary_append_int32(n,0xd2) strary_append_int32(n, 0xd2)
else -- lua cannot handle int64, so double else -- lua cannot handle int64, so double
strary_append_double(n) strary_append_double(n)
end end
@ -181,15 +201,15 @@ end
packers.string = function(data) packers.string = function(data)
local n = #data local n = #data
if n < 32 then if n < 32 then
table.insert( strary, tostr( 0xa0+n ) ) table.insert(strary, tostr(0xa0 + n))
elseif n < 65536 then elseif n < 65536 then
strary_append_int16(n,0xda) strary_append_int16(n, 0xda)
elseif n < 4294967296 then elseif n < 4294967296 then
strary_append_int32(n,0xdb) strary_append_int32(n, 0xdb)
else else
error("overflow") error("overflow")
end end
table.insert( strary, data) table.insert(strary, data)
end end
packers["function"] = function() packers["function"] = function()
@ -205,38 +225,44 @@ packers.thread = function()
end end
packers.table = function(data) packers.table = function(data)
local is_map,ndata,nmax = false,0,0 local is_map, ndata, nmax = false, 0, 0
for k,_ in pairs(data) do for k, _ in pairs(data) do
if type(k) == "number" then if type(k) == "number" then
if k > nmax then nmax = k end if k > nmax then
else is_map = true end nmax = k
ndata = ndata+1 end
else
is_map = true
end
ndata = ndata + 1
end end
if is_map then -- pack as map if is_map then -- pack as map
if ndata < 16 then if ndata < 16 then
table.insert( strary, tostr(0x80+ndata)) table.insert(strary, tostr(0x80 + ndata))
elseif ndata < 65536 then elseif ndata < 65536 then
strary_append_int16(ndata,0xde) strary_append_int16(ndata, 0xde)
elseif ndata < 4294967296 then elseif ndata < 4294967296 then
strary_append_int32(ndata,0xdf) strary_append_int32(ndata, 0xdf)
else else
error("overflow") error("overflow")
end end
for k,v in pairs(data) do for k, v in pairs(data) do
packers[type(k)](k) packers[type(k)](k)
packers[type(v)](v) packers[type(v)](v)
end end
else -- pack as array else -- pack as array
if nmax < 16 then if nmax < 16 then
table.insert( strary, tostr( 0x90+nmax ) ) table.insert(strary, tostr(0x90 + nmax))
elseif nmax < 65536 then elseif nmax < 65536 then
strary_append_int16(nmax,0xdc) strary_append_int16(nmax, 0xdc)
elseif nmax < 4294967296 then elseif nmax < 4294967296 then
strary_append_int32(nmax,0xdd) strary_append_int32(nmax, 0xdd)
else else
error("overflow") error("overflow")
end end
for i=1,nmax do packers[type(data[i])](data[i]) end for i = 1, nmax do
packers[type(data[i])](data[i])
end
end end
end end
@ -265,105 +291,119 @@ local types_map = {
} }
local type_for = function(n) local type_for = function(n)
if types_map[n] then
if types_map[n] then return types_map[n] return types_map[n]
elseif n < 0xc0 then elseif n < 0xc0 then
if n < 0x80 then return "fixnum_posi" if n < 0x80 then
elseif n < 0x90 then return "fixmap" return "fixnum_posi"
elseif n < 0xa0 then return "fixarray" elseif n < 0x90 then
else return "fixraw" end return "fixmap"
elseif n > 0xdf then return "fixnum_neg" elseif n < 0xa0 then
else return "undefined" end return "fixarray"
else
return "fixraw"
end
elseif n > 0xdf then
return "fixnum_neg"
else
return "undefined"
end
end end
local types_len_map = { local types_len_map = {
uint16 = 2, uint32 = 4, uint64 = 8, uint16 = 2,
int16 = 2, int32 = 4, int64 = 8, uint32 = 4,
float = 4, double = 8, uint64 = 8,
int16 = 2,
int32 = 4,
int64 = 8,
float = 4,
double = 8,
} }
--- unpackers --- unpackers
local unpackers = {} local unpackers = {}
local unpack_number = function(offset,ntype,nlen) local unpack_number = function(offset, ntype, nlen)
local b1,b2,b3,b4,b5,b6,b7,b8 local b1, b2, b3, b4, b5, b6, b7, b8
if nlen>=2 then if nlen >= 2 then
b1,b2 = string.byte( strbuf, offset+1, offset+2 ) b1, b2 = string.byte(strbuf, offset + 1, offset + 2)
end end
if nlen>=4 then if nlen >= 4 then
b3,b4 = string.byte( strbuf, offset+3, offset+4 ) b3, b4 = string.byte(strbuf, offset + 3, offset + 4)
end end
if nlen>=8 then if nlen >= 8 then
b5,b6,b7,b8 = string.byte( strbuf, offset+5, offset+8 ) b5, b6, b7, b8 = string.byte(strbuf, offset + 5, offset + 8)
end end
if ntype == "uint16_t" then if ntype == "uint16_t" then
return b1 * 256 + b2 return b1 * 256 + b2
elseif ntype == "uint32_t" then elseif ntype == "uint32_t" then
return b1*65536*256 + b2*65536 + b3 * 256 + b4 return b1 * 65536 * 256 + b2 * 65536 + b3 * 256 + b4
elseif ntype == "int16_t" then elseif ntype == "int16_t" then
local n = b1 * 256 + b2 local n = b1 * 256 + b2
local nn = (65536 - n)*-1 local nn = (65536 - n) * -1
if nn == -65536 then nn = 0 end if nn == -65536 then
nn = 0
end
return nn return nn
elseif ntype == "int32_t" then elseif ntype == "int32_t" then
local n = b1*65536*256 + b2*65536 + b3 * 256 + b4 local n = b1 * 65536 * 256 + b2 * 65536 + b3 * 256 + b4
local nn = ( 4294967296 - n ) * -1 local nn = (4294967296 - n) * -1
if nn == -4294967296 then nn = 0 end if nn == -4294967296 then
nn = 0
end
return nn return nn
elseif ntype == "double_t" then elseif ntype == "double_t" then
local s = tostr(b8,b7,b6,b5,b4,b3,b2,b1) local s = tostr(b8, b7, b6, b5, b4, b3, b2, b1)
double_decode_count = double_decode_count + 1 double_decode_count = double_decode_count + 1
local n = bytestodouble( s ) local n = bytestodouble(s)
return n return n
else else
error("unpack_number: not impl:" .. ntype ) error("unpack_number: not impl:" .. ntype)
end end
end end
local function unpacker_number(offset) local function unpacker_number(offset)
local obj_type = type_for( string.byte( strbuf, offset+1, offset+1 ) ) local obj_type = type_for(string.byte(strbuf, offset + 1, offset + 1))
local nlen = types_len_map[obj_type] local nlen = types_len_map[obj_type]
local ntype local ntype
if (obj_type == "float") then if obj_type == "float" then
error("float is not implemented") error("float is not implemented")
else else
ntype = obj_type .. "_t" ntype = obj_type .. "_t"
end end
return offset+nlen+1,unpack_number(offset+1,ntype,nlen) return offset + nlen + 1, unpack_number(offset + 1, ntype, nlen)
end end
local function unpack_map(offset,n) local function unpack_map(offset, n)
local r = {} local r = {}
local k,v local k, v
for _ = 1, n do for _ = 1, n do
offset,k = unpackers.dynamic(offset) offset, k = unpackers.dynamic(offset)
assert(offset) assert(offset)
offset,v = unpackers.dynamic(offset) offset, v = unpackers.dynamic(offset)
assert(offset) assert(offset)
r[k] = v r[k] = v
end end
return offset,r return offset, r
end end
local function unpack_array(offset,n) local function unpack_array(offset, n)
local r = {} local r = {}
for i=1,n do for i = 1, n do
offset,r[i] = unpackers.dynamic(offset) offset, r[i] = unpackers.dynamic(offset)
assert(offset) assert(offset)
end end
return offset,r return offset, r
end end
function unpackers.dynamic(offset) function unpackers.dynamic(offset)
if offset >= #strbuf then error("need more data") end if offset >= #strbuf then
local obj_type = type_for( string.byte( strbuf, offset+1, offset+1 ) ) error("need more data")
end
local obj_type = type_for(string.byte(strbuf, offset + 1, offset + 1))
return unpackers[obj_type](offset) return unpackers[obj_type](offset)
end end
@ -372,23 +412,23 @@ function unpackers.undefined()
end end
unpackers["nil"] = function(offset) unpackers["nil"] = function(offset)
return offset+1,nil return offset + 1, nil
end end
unpackers["false"] = function(offset) unpackers["false"] = function(offset)
return offset+1,false return offset + 1, false
end end
unpackers["true"] = function(offset) unpackers["true"] = function(offset)
return offset+1,true return offset + 1, true
end end
unpackers.fixnum_posi = function(offset) unpackers.fixnum_posi = function(offset)
return offset+1, string.byte(strbuf, offset+1, offset+1) return offset + 1, string.byte(strbuf, offset + 1, offset + 1)
end end
unpackers.uint8 = function(offset) unpackers.uint8 = function(offset)
return offset+2, string.byte(strbuf, offset+2, offset+2) return offset + 2, string.byte(strbuf, offset + 2, offset + 2)
end end
unpackers.uint16 = unpacker_number unpackers.uint16 = unpacker_number
@ -397,17 +437,17 @@ unpackers.uint64 = unpacker_number
unpackers.fixnum_neg = function(offset) unpackers.fixnum_neg = function(offset)
-- alternative to cast below: -- alternative to cast below:
local n = string.byte( strbuf, offset+1, offset+1) local n = string.byte(strbuf, offset + 1, offset + 1)
local nn = ( 256 - n ) * -1 local nn = (256 - n) * -1
return offset+1, nn return offset + 1, nn
end end
unpackers.int8 = function(offset) unpackers.int8 = function(offset)
local i = string.byte( strbuf, offset+2, offset+2 ) local i = string.byte(strbuf, offset + 2, offset + 2)
if i > 127 then if i > 127 then
i = (256 - i ) * -1 i = (256 - i) * -1
end end
return offset+2, i return offset + 2, i
end end
unpackers.int16 = unpacker_number unpackers.int16 = unpacker_number
@ -418,92 +458,96 @@ unpackers.float = unpacker_number
unpackers.double = unpacker_number unpackers.double = unpacker_number
unpackers.fixraw = function(offset) unpackers.fixraw = function(offset)
local n = byte_mod( string.byte( strbuf, offset+1, offset+1) ,0x1f+1) local n = byte_mod(string.byte(strbuf, offset + 1, offset + 1), 0x1f + 1)
-- print("unpackers.fixraw: offset:", offset, "#buf:", #buf, "n:",n ) -- print("unpackers.fixraw: offset:", offset, "#buf:", #buf, "n:",n )
local b local b
if ( #strbuf - 1 - offset ) < n then if (#strbuf - 1 - offset) < n then
error("require more data") error("require more data")
end end
if n > 0 then if n > 0 then
b = string.sub( strbuf, offset + 1 + 1, offset + 1 + 1 + n - 1 ) b = string.sub(strbuf, offset + 1 + 1, offset + 1 + 1 + n - 1)
else else
b = "" b = ""
end end
return offset+n+1, b return offset + n + 1, b
end end
unpackers.raw16 = function(offset) unpackers.raw16 = function(offset)
local n = unpack_number(offset+1,"uint16_t",2) local n = unpack_number(offset + 1, "uint16_t", 2)
if ( #strbuf - 1 - 2 - offset ) < n then if (#strbuf - 1 - 2 - offset) < n then
error("require more data") error("require more data")
end end
local b = string.sub( strbuf, offset+1+1+2, offset+1 + 1+2 + n - 1 ) local b = string.sub(strbuf, offset + 1 + 1 + 2, offset + 1 + 1 + 2 + n - 1)
return offset+n+3, b return offset + n + 3, b
end end
unpackers.raw32 = function(offset) unpackers.raw32 = function(offset)
local n = unpack_number(offset+1,"uint32_t",4) local n = unpack_number(offset + 1, "uint32_t", 4)
if ( #strbuf - 1 - 4 - offset ) < n then if (#strbuf - 1 - 4 - offset) < n then
error( "require more data (possibly bug)") error("require more data (possibly bug)")
end end
local b = string.sub( strbuf, offset+1+ 1+4, offset+1 + 1+4 +n -1 ) local b = string.sub(strbuf, offset + 1 + 1 + 4, offset + 1 + 1 + 4 + n - 1)
return offset+n+5,b return offset + n + 5, b
end end
unpackers.fixarray = function(offset) unpackers.fixarray = function(offset)
return unpack_array( offset+1,byte_mod( string.byte( strbuf, offset+1,offset+1),0x0f+1)) return unpack_array(offset + 1, byte_mod(string.byte(strbuf, offset + 1, offset + 1), 0x0f + 1))
end end
unpackers.array16 = function(offset) unpackers.array16 = function(offset)
return unpack_array(offset+3,unpack_number(offset+1,"uint16_t",2)) return unpack_array(offset + 3, unpack_number(offset + 1, "uint16_t", 2))
end end
unpackers.array32 = function(offset) unpackers.array32 = function(offset)
return unpack_array(offset+5,unpack_number(offset+1,"uint32_t",4)) return unpack_array(offset + 5, unpack_number(offset + 1, "uint32_t", 4))
end end
unpackers.fixmap = function(offset) unpackers.fixmap = function(offset)
return unpack_map(offset+1,byte_mod( string.byte( strbuf, offset+1,offset+1),0x0f+1)) return unpack_map(offset + 1, byte_mod(string.byte(strbuf, offset + 1, offset + 1), 0x0f + 1))
end end
unpackers.map16 = function(offset) unpackers.map16 = function(offset)
return unpack_map(offset+3,unpack_number(offset+1,"uint16_t",2)) return unpack_map(offset + 3, unpack_number(offset + 1, "uint16_t", 2))
end end
unpackers.map32 = function(offset) unpackers.map32 = function(offset)
return unpack_map(offset+5,unpack_number(offset+1,"uint32_t",4)) return unpack_map(offset + 5, unpack_number(offset + 1, "uint32_t", 4))
end end
-- Main functions -- Main functions
local ljp_pack = function(data) local ljp_pack = function(data)
strary={} strary = {}
packers.dynamic(data) packers.dynamic(data)
local s = table.concat(strary,"") local s = table.concat(strary, "")
return s return s
end end
local ljp_unpack = function(s,offset) local ljp_unpack = function(s, offset)
if offset == nil then offset = 0 end if offset == nil then
if type(s) ~= "string" then return false,"invalid argument" end offset = 0
end
if type(s) ~= "string" then
return false, "invalid argument"
end
local data local data
strbuf = s strbuf = s
offset,data = unpackers.dynamic(offset) offset, data = unpackers.dynamic(offset)
return offset,data return offset, data
end end
local function ljp_stat() local function ljp_stat()
return { return {
double_decode_count = double_decode_count, double_decode_count = double_decode_count,
double_encode_count = double_encode_count double_encode_count = double_encode_count,
} }
end end
local msgpack = { local msgpack = {
pack = ljp_pack, pack = ljp_pack,
unpack = ljp_unpack, unpack = ljp_unpack,
stat = ljp_stat stat = ljp_stat,
} }
return msgpack return msgpack

287
lua/deps/serpent.lua
View file

@ -1,140 +1,265 @@
local n, v = "serpent", "0.302" -- (C) 2012-18 Paul Kulchenko; MIT License local n, v = "serpent", "0.302" -- (C) 2012-18 Paul Kulchenko; MIT License
local c, d = "Paul Kulchenko", "Lua serializer and pretty printer" local c, d = "Paul Kulchenko", "Lua serializer and pretty printer"
local snum = {[tostring(1/0)]='1/0 --[[math.huge]]',[tostring(-1/0)]='-1/0 --[[-math.huge]]',[tostring(0/0)]='0/0'} local snum = {
local badtype = {thread = true, userdata = true, cdata = true} [tostring(1 / 0)] = "1/0 --[[math.huge]]",
[tostring(-1 / 0)] = "-1/0 --[[-math.huge]]",
[tostring(0 / 0)] = "0/0",
}
local badtype = { thread = true, userdata = true, cdata = true }
local getmetatable = debug and debug.getmetatable or getmetatable local getmetatable = debug and debug.getmetatable or getmetatable
local pairs = function(t) return next, t end -- avoid using __pairs in Lua 5.2+ local pairs = function(t)
return next, t
end -- avoid using __pairs in Lua 5.2+
local keyword, globals, G = {}, {}, (_G or _ENV) local keyword, globals, G = {}, {}, (_G or _ENV)
for _,k in ipairs({'and', 'break', 'do', 'else', 'elseif', 'end', 'false', for _, k in ipairs({
'for', 'function', 'goto', 'if', 'in', 'local', 'nil', 'not', 'or', 'repeat', "and",
'return', 'then', 'true', 'until', 'while'}) do keyword[k] = true end "break",
for k,v in pairs(G) do globals[v] = k end -- build func to name mapping "do",
for _,g in ipairs({'coroutine', 'debug', 'io', 'math', 'string', 'table', 'os'}) do "else",
for k,v in pairs(type(G[g]) == 'table' and G[g] or {}) do globals[v] = g..'.'..k end end "elseif",
"end",
"false",
"for",
"function",
"goto",
"if",
"in",
"local",
"nil",
"not",
"or",
"repeat",
"return",
"then",
"true",
"until",
"while",
}) do
keyword[k] = true
end
for k, v in pairs(G) do
globals[v] = k
end -- build func to name mapping
for _, g in ipairs({ "coroutine", "debug", "io", "math", "string", "table", "os" }) do
for k, v in pairs(type(G[g]) == "table" and G[g] or {}) do
globals[v] = g .. "." .. k
end
end
local function s(t, opts) local function s(t, opts)
local name, indent, fatal, maxnum = opts.name, opts.indent, opts.fatal, opts.maxnum local name, indent, fatal, maxnum = opts.name, opts.indent, opts.fatal, opts.maxnum
local sparse, custom, huge = opts.sparse, opts.custom, not opts.nohuge local sparse, custom, huge = opts.sparse, opts.custom, not opts.nohuge
local space, maxl = (opts.compact and '' or ' '), (opts.maxlevel or math.huge) local space, maxl = (opts.compact and "" or " "), (opts.maxlevel or math.huge)
local maxlen, metatostring = tonumber(opts.maxlength), opts.metatostring local maxlen, metatostring = tonumber(opts.maxlength), opts.metatostring
local iname, comm = '_'..(name or ''), opts.comment and (tonumber(opts.comment) or math.huge) local iname, comm = "_" .. (name or ""), opts.comment and (tonumber(opts.comment) or math.huge)
local numformat = opts.numformat or "%.17g" local numformat = opts.numformat or "%.17g"
local seen, sref, syms, symn = {}, {'local '..iname..'={}'}, {}, 0 local seen, sref, syms, symn = {}, { "local " .. iname .. "={}" }, {}, 0
local function gensym(val) return '_'..(tostring(tostring(val)):gsub("[^%w]",""):gsub("(%d%w+)", local function gensym(val)
return "_"
.. (
tostring(tostring(val)):gsub("[^%w]", ""):gsub(
"(%d%w+)",
-- tostring(val) is needed because __tostring may return a non-string value -- tostring(val) is needed because __tostring may return a non-string value
function(s) if not syms[s] then symn = symn+1; syms[s] = symn end return tostring(syms[s]) end)) end function(s)
local function safestr(s) return type(s) == "number" and tostring(huge and snum[tostring(s)] or numformat:format(s)) if not syms[s] then
symn = symn + 1
syms[s] = symn
end
return tostring(syms[s])
end
)
)
end
local function safestr(s)
return type(s) == "number" and tostring(huge and snum[tostring(s)] or numformat:format(s))
or type(s) ~= "string" and tostring(s) -- escape NEWLINE/010 and EOF/026 or type(s) ~= "string" and tostring(s) -- escape NEWLINE/010 and EOF/026
or ("%q"):format(s):gsub("\010","n"):gsub("\026","\\026") end or ("%q"):format(s):gsub("\010", "n"):gsub("\026", "\\026")
local function comment(s,l) return comm and (l or 0) < comm and ' --[['..select(2, pcall(tostring, s))..']]' or '' end end
local function globerr(s,l) return globals[s] and globals[s]..comment(s,l) or not fatal local function comment(s, l)
and safestr(select(2, pcall(tostring, s))) or error("Can't serialize "..tostring(s)) end return comm and (l or 0) < comm and " --[[" .. select(2, pcall(tostring, s)) .. "]]" or ""
end
local function globerr(s, l)
return globals[s] and globals[s] .. comment(s, l)
or not fatal and safestr(select(2, pcall(tostring, s)))
or error("Can't serialize " .. tostring(s))
end
local function safename(path, name) -- generates foo.bar, foo[3], or foo['b a r'] local function safename(path, name) -- generates foo.bar, foo[3], or foo['b a r']
local n = name == nil and '' or name local n = name == nil and "" or name
local plain = type(n) == "string" and n:match("^[%l%u_][%w_]*$") and not keyword[n] local plain = type(n) == "string" and n:match("^[%l%u_][%w_]*$") and not keyword[n]
local safe = plain and n or '['..safestr(n)..']' local safe = plain and n or "[" .. safestr(n) .. "]"
return (path or '')..(plain and path and '.' or '')..safe, safe end return (path or "") .. (plain and path and "." or "") .. safe, safe
local alphanumsort = type(opts.sortkeys) == 'function' and opts.sortkeys or function(k, o, n) -- k=keys, o=originaltable, n=padding end
local maxn, to = tonumber(n) or 12, {number = 'a', string = 'b'} local alphanumsort = type(opts.sortkeys) == "function" and opts.sortkeys
local function padnum(d) return ("%0"..tostring(maxn).."d"):format(tonumber(d)) end or function(k, o, n) -- k=keys, o=originaltable, n=padding
table.sort(k, function(a,b) local maxn, to = tonumber(n) or 12, { number = "a", string = "b" }
local function padnum(d)
return ("%0" .. tostring(maxn) .. "d"):format(tonumber(d))
end
table.sort(k, function(a, b)
-- sort numeric keys first: k[key] is not nil for numerical keys -- sort numeric keys first: k[key] is not nil for numerical keys
return (k[a] ~= nil and 0 or to[type(a)] or 'z')..(tostring(a):gsub("%d+",padnum)) return (k[a] ~= nil and 0 or to[type(a)] or "z") .. (tostring(a):gsub("%d+", padnum))
< (k[b] ~= nil and 0 or to[type(b)] or 'z')..(tostring(b):gsub("%d+",padnum)) end) end < (k[b] ~= nil and 0 or to[type(b)] or "z") .. (tostring(b):gsub("%d+", padnum))
end)
end
local function val2str(t, name, indent, insref, path, plainindex, level) local function val2str(t, name, indent, insref, path, plainindex, level)
local ttype, level, mt = type(t), (level or 0), getmetatable(t) local ttype, level, mt = type(t), (level or 0), getmetatable(t)
local spath, sname = safename(path, name) local spath, sname = safename(path, name)
local tag = plainindex and local tag = plainindex and ((type(name) == "number") and "" or name .. space .. "=" .. space)
((type(name) == "number") and '' or name..space..'='..space) or or (name ~= nil and sname .. space .. "=" .. space or "")
(name ~= nil and sname..space..'='..space or '')
if seen[t] then -- already seen this element if seen[t] then -- already seen this element
sref[#sref+1] = spath..space..'='..space..seen[t] sref[#sref + 1] = spath .. space .. "=" .. space .. seen[t]
return tag..'nil'..comment('ref', level) end return tag .. "nil" .. comment("ref", level)
end
-- protect from those cases where __tostring may fail -- protect from those cases where __tostring may fail
if type(mt) == 'table' and metatostring ~= false then if type(mt) == "table" and metatostring ~= false then
local to, tr = pcall(function() return mt.__tostring(t) end) local to, tr = pcall(function()
local so, sr = pcall(function() return mt.__serialize(t) end) return mt.__tostring(t)
if (to or so) then -- knows how to serialize itself end)
local so, sr = pcall(function()
return mt.__serialize(t)
end)
if to or so then -- knows how to serialize itself
seen[t] = insref or spath seen[t] = insref or spath
t = so and sr or tr t = so and sr or tr
ttype = type(t) ttype = type(t)
end -- new value falls through to be serialized end -- new value falls through to be serialized
end end
if ttype == "table" then if ttype == "table" then
if level >= maxl then return tag..'{}'..comment('maxlvl', level) end if level >= maxl then
return tag .. "{}" .. comment("maxlvl", level)
end
seen[t] = insref or spath seen[t] = insref or spath
if next(t) == nil then return tag..'{}'..comment(t, level) end -- table empty if next(t) == nil then
if maxlen and maxlen < 0 then return tag..'{}'..comment('maxlen', level) end return tag .. "{}" .. comment(t, level)
end -- table empty
if maxlen and maxlen < 0 then
return tag .. "{}" .. comment("maxlen", level)
end
local maxn, o, out = math.min(#t, maxnum or #t), {}, {} local maxn, o, out = math.min(#t, maxnum or #t), {}, {}
for key = 1, maxn do o[key] = key end for key = 1, maxn do
o[key] = key
end
if not maxnum or #o < maxnum then if not maxnum or #o < maxnum then
local n = #o -- n = n + 1; o[n] is much faster than o[#o+1] on large tables local n = #o -- n = n + 1; o[n] is much faster than o[#o+1] on large tables
for key in pairs(t) do if o[key] ~= key then n = n + 1; o[n] = key end end end for key in pairs(t) do
if maxnum and #o > maxnum then o[maxnum+1] = nil end if o[key] ~= key then
if opts.sortkeys and #o > maxn then alphanumsort(o, t, opts.sortkeys) end n = n + 1
o[n] = key
end
end
end
if maxnum and #o > maxnum then
o[maxnum + 1] = nil
end
if opts.sortkeys and #o > maxn then
alphanumsort(o, t, opts.sortkeys)
end
local sparse = sparse and #o > maxn -- disable sparsness if only numeric keys (shorter output) local sparse = sparse and #o > maxn -- disable sparsness if only numeric keys (shorter output)
for n, key in ipairs(o) do for n, key in ipairs(o) do
local value, ktype, plainindex = t[key], type(key), n <= maxn and not sparse local value, ktype, plainindex = t[key], type(key), n <= maxn and not sparse
if opts.valignore and opts.valignore[value] -- skip ignored values; do nothing if
opts.valignore and opts.valignore[value] -- skip ignored values; do nothing
or opts.keyallow and not opts.keyallow[key] or opts.keyallow and not opts.keyallow[key]
or opts.keyignore and opts.keyignore[key] or opts.keyignore and opts.keyignore[key]
or opts.valtypeignore and opts.valtypeignore[type(value)] -- skipping ignored value types or opts.valtypeignore and opts.valtypeignore[type(value)] -- skipping ignored value types
or sparse and value == nil then -- skipping nils; do nothing or sparse and value == nil
elseif ktype == 'table' or ktype == 'function' or badtype[ktype] then then -- skipping nils; do nothing
elseif ktype == "table" or ktype == "function" or badtype[ktype] then
if not seen[key] and not globals[key] then if not seen[key] and not globals[key] then
sref[#sref+1] = 'placeholder' sref[#sref + 1] = "placeholder"
local sname = safename(iname, gensym(key)) -- iname is table for local variables local sname = safename(iname, gensym(key)) -- iname is table for local variables
sref[#sref] = val2str(key,sname,indent,sname,iname,true) end sref[#sref] = val2str(key, sname, indent, sname, iname, true)
sref[#sref+1] = 'placeholder' end
local path = seen[t]..'['..tostring(seen[key] or globals[key] or gensym(key))..']' sref[#sref + 1] = "placeholder"
sref[#sref] = path..space..'='..space..tostring(seen[value] or val2str(value,nil,indent,path)) local path = seen[t] .. "[" .. tostring(seen[key] or globals[key] or gensym(key)) .. "]"
sref[#sref] = path
.. space
.. "="
.. space
.. tostring(seen[value] or val2str(value, nil, indent, path))
else else
out[#out+1] = val2str(value,key,indent,nil,seen[t],plainindex,level+1) out[#out + 1] = val2str(value, key, indent, nil, seen[t], plainindex, level + 1)
if maxlen then if maxlen then
maxlen = maxlen - #out[#out] maxlen = maxlen - #out[#out]
if maxlen < 0 then break end if maxlen < 0 then
break
end end
end end
end end
local prefix = string.rep(indent or '', level) end
local head = indent and '{\n'..prefix..indent or '{' local prefix = string.rep(indent or "", level)
local body = table.concat(out, ','..(indent and '\n'..prefix..indent or space)) local head = indent and "{\n" .. prefix .. indent or "{"
local tail = indent and "\n"..prefix..'}' or '}' local body = table.concat(out, "," .. (indent and "\n" .. prefix .. indent or space))
return (custom and custom(tag,head,body,tail,level) or tag..head..body..tail)..comment(t, level) local tail = indent and "\n" .. prefix .. "}" or "}"
return (custom and custom(tag, head, body, tail, level) or tag .. head .. body .. tail) .. comment(t, level)
elseif badtype[ttype] then elseif badtype[ttype] then
seen[t] = insref or spath seen[t] = insref or spath
return tag..globerr(t, level) return tag .. globerr(t, level)
elseif ttype == 'function' then elseif ttype == "function" then
seen[t] = insref or spath seen[t] = insref or spath
if opts.nocode then return tag.."function() --[[..skipped..]] end"..comment(t, level) end if opts.nocode then
local ok, res = pcall(string.dump, t) return tag .. "function() --[[..skipped..]] end" .. comment(t, level)
local func = ok and "((loadstring or load)("..safestr(res)..",'@serialized'))"..comment(t, level)
return tag..(func or globerr(t, level))
else return tag..safestr(t) end -- handle all other types
end end
local sepr = indent and "\n" or ";"..space local ok, res = pcall(string.dump, t)
local func = ok and "((loadstring or load)(" .. safestr(res) .. ",'@serialized'))" .. comment(t, level)
return tag .. (func or globerr(t, level))
else
return tag .. safestr(t)
end -- handle all other types
end
local sepr = indent and "\n" or ";" .. space
local body = val2str(t, name, indent) -- this call also populates sref local body = val2str(t, name, indent) -- this call also populates sref
local tail = #sref>1 and table.concat(sref, sepr)..sepr or '' local tail = #sref > 1 and table.concat(sref, sepr) .. sepr or ""
local warn = opts.comment and #sref>1 and space.."--[[incomplete output with shared/self-references skipped]]" or '' local warn = opts.comment and #sref > 1 and space .. "--[[incomplete output with shared/self-references skipped]]"
return not name and body..warn or "do local "..body..sepr..tail.."return "..name..sepr.."end" or ""
return not name and body .. warn or "do local " .. body .. sepr .. tail .. "return " .. name .. sepr .. "end"
end end
local function deserialize(data, opts) local function deserialize(data, opts)
local env = (opts and opts.safe == false) and G local env = (opts and opts.safe == false) and G
or setmetatable({}, { or setmetatable({}, {
__index = function(t,k) return t end, __index = function(t, k)
__call = function(t,...) error("cannot call functions") end return t
end,
__call = function(t, ...)
error("cannot call functions")
end,
}) })
local f, res = (loadstring or load)('return '..data, nil, nil, env) local f, res = (loadstring or load)("return " .. data, nil, nil, env)
if not f then f, res = (loadstring or load)(data, nil, nil, env) end if not f then
if not f then return f, res end f, res = (loadstring or load)(data, nil, nil, env)
if setfenv then setfenv(f, env) end end
if not f then
return f, res
end
if setfenv then
setfenv(f, env)
end
return pcall(f) return pcall(f)
end end
local function merge(a, b) if b then for k,v in pairs(b) do a[k] = v end end; return a; end local function merge(a, b)
return { _NAME = n, _COPYRIGHT = c, _DESCRIPTION = d, _VERSION = v, serialize = s, if b then
for k, v in pairs(b) do
a[k] = v
end
end
return a
end
return {
_NAME = n,
_COPYRIGHT = c,
_DESCRIPTION = d,
_VERSION = v,
serialize = s,
load = deserialize, load = deserialize,
dump = function(a, opts) return s(a, merge({name = '_', compact = true, sparse = true}, opts)) end, dump = function(a, opts)
line = function(a, opts) return s(a, merge({sortkeys = true, comment = true}, opts)) end, return s(a, merge({ name = "_", compact = true, sparse = true }, opts))
block = function(a, opts) return s(a, merge({indent = ' ', sortkeys = true, comment = true}, opts)) end } end,
line = function(a, opts)
return s(a, merge({ sortkeys = true, comment = true }, opts))
end,
block = function(a, opts)
return s(a, merge({ indent = " ", sortkeys = true, comment = true }, opts))
end,
}

61
lua/deps/struct.lua
View file

@ -2,18 +2,18 @@ local struct = {}
function struct.pack(format, ...) function struct.pack(format, ...)
local stream = {} local stream = {}
local vars = {...} local vars = { ... }
local endianness = true local endianness = true
for i = 1, format:len() do for i = 1, format:len() do
local opt = format:sub(i, i) local opt = format:sub(i, i)
if opt == '<' then if opt == "<" then
endianness = true endianness = true
elseif opt == '>' then elseif opt == ">" then
endianness = false endianness = false
elseif opt:find('[bBhHiIlL]') then elseif opt:find("[bBhHiIlL]") then
local n = opt:find('[hH]') and 2 or opt:find('[iI]') and 4 or opt:find('[lL]') and 8 or 1 local n = opt:find("[hH]") and 2 or opt:find("[iI]") and 4 or opt:find("[lL]") and 8 or 1
local val = tonumber(table.remove(vars, 1)) local val = tonumber(table.remove(vars, 1))
local bytes = {} local bytes = {}
@ -27,7 +27,7 @@ function struct.pack(format, ...)
else else
table.insert(stream, table.concat(bytes)) table.insert(stream, table.concat(bytes))
end end
elseif opt:find('[fd]') then elseif opt:find("[fd]") then
local val = tonumber(table.remove(vars, 1)) local val = tonumber(table.remove(vars, 1))
local sign = 0 local sign = 0
@ -41,12 +41,12 @@ function struct.pack(format, ...)
mantissa = 0 mantissa = 0
exponent = 0 exponent = 0
else else
mantissa = (mantissa * 2 - 1) * math.ldexp(0.5, (opt == 'd') and 53 or 24) mantissa = (mantissa * 2 - 1) * math.ldexp(0.5, (opt == "d") and 53 or 24)
exponent = exponent + ((opt == 'd') and 1022 or 126) exponent = exponent + ((opt == "d") and 1022 or 126)
end end
local bytes = {} local bytes = {}
if opt == 'd' then if opt == "d" then
val = mantissa val = mantissa
for _ = 1, 6 do for _ = 1, 6 do
table.insert(bytes, string.char(math.floor(val) % (2 ^ 8))) table.insert(bytes, string.char(math.floor(val) % (2 ^ 8)))
@ -59,8 +59,8 @@ function struct.pack(format, ...)
val = math.floor(val / (2 ^ 8)) val = math.floor(val / (2 ^ 8))
end end
table.insert(bytes, string.char(math.floor(exponent * ((opt == 'd') and 16 or 128) + val) % (2 ^ 8))) table.insert(bytes, string.char(math.floor(exponent * ((opt == "d") and 16 or 128) + val) % (2 ^ 8)))
val = math.floor((exponent * ((opt == 'd') and 16 or 128) + val) / (2 ^ 8)) val = math.floor((exponent * ((opt == "d") and 16 or 128) + val) / (2 ^ 8))
table.insert(bytes, string.char(math.floor(sign * 128 + val) % (2 ^ 8))) table.insert(bytes, string.char(math.floor(sign * 128 + val) % (2 ^ 8)))
if not endianness then if not endianness then
@ -68,18 +68,18 @@ function struct.pack(format, ...)
else else
table.insert(stream, table.concat(bytes)) table.insert(stream, table.concat(bytes))
end end
elseif opt == 's' then elseif opt == "s" then
table.insert(stream, tostring(table.remove(vars, 1))) table.insert(stream, tostring(table.remove(vars, 1)))
table.insert(stream, string.char(0)) table.insert(stream, string.char(0))
elseif opt == 'c' then elseif opt == "c" then
local n = format:sub(i + 1):match('%d+') local n = format:sub(i + 1):match("%d+")
local str = tostring(table.remove(vars, 1)) local str = tostring(table.remove(vars, 1))
local len = tonumber(n) local len = tonumber(n)
if len <= 0 then if len <= 0 then
len = str:len() len = str:len()
end end
if len - str:len() > 0 then if len - str:len() > 0 then
str = str .. string.rep(' ', len - str:len()) str = str .. string.rep(" ", len - str:len())
end end
table.insert(stream, str:sub(1, len)) table.insert(stream, str:sub(1, len))
end end
@ -96,12 +96,12 @@ function struct.unpack(format, stream, pos)
for i = 1, format:len() do for i = 1, format:len() do
local opt = format:sub(i, i) local opt = format:sub(i, i)
if opt == '<' then if opt == "<" then
endianness = true endianness = true
elseif opt == '>' then elseif opt == ">" then
endianness = false endianness = false
elseif opt:find('[bBhHiIlL]') then elseif opt:find("[bBhHiIlL]") then
local n = opt:find('[hH]') and 2 or opt:find('[iI]') and 4 or opt:find('[lL]') and 8 or 1 local n = opt:find("[hH]") and 2 or opt:find("[iI]") and 4 or opt:find("[lL]") and 8 or 1
local signed = opt:lower() == opt local signed = opt:lower() == opt
local val = 0 local val = 0
@ -120,8 +120,8 @@ function struct.unpack(format, stream, pos)
end end
table.insert(vars, math.floor(val)) table.insert(vars, math.floor(val))
elseif opt:find('[fd]') then elseif opt:find("[fd]") then
local n = (opt == 'd') and 8 or 4 local n = (opt == "d") and 8 or 4
local x = stream:sub(iterator, iterator + n - 1) local x = stream:sub(iterator, iterator + n - 1)
iterator = iterator + n iterator = iterator + n
@ -130,7 +130,7 @@ function struct.unpack(format, stream, pos)
end end
local sign = 1 local sign = 1
local mantissa = string.byte(x, (opt == 'd') and 7 or 3) % ((opt == 'd') and 16 or 128) local mantissa = string.byte(x, (opt == "d") and 7 or 3) % ((opt == "d") and 16 or 128)
for j = n - 2, 1, -1 do for j = n - 2, 1, -1 do
mantissa = mantissa * (2 ^ 8) + string.byte(x, j) mantissa = mantissa * (2 ^ 8) + string.byte(x, j)
end end
@ -139,19 +139,18 @@ function struct.unpack(format, stream, pos)
sign = -1 sign = -1
end end
local exponent = (string.byte(x, n) % 128) * ((opt == 'd') and 16 or 2) + local exponent = (string.byte(x, n) % 128) * ((opt == "d") and 16 or 2)
math.floor(string.byte(x, n - 1) / + math.floor(string.byte(x, n - 1) / ((opt == "d") and 16 or 128))
((opt == 'd') and 16 or 128))
if exponent == 0 then if exponent == 0 then
table.insert(vars, 0.0) table.insert(vars, 0.0)
else else
mantissa = (math.ldexp(mantissa, (opt == 'd') and -52 or -23) + 1) * sign mantissa = (math.ldexp(mantissa, (opt == "d") and -52 or -23) + 1) * sign
table.insert(vars, math.ldexp(mantissa, exponent - ((opt == 'd') and 1023 or 127))) table.insert(vars, math.ldexp(mantissa, exponent - ((opt == "d") and 1023 or 127)))
end end
elseif opt == 's' then elseif opt == "s" then
local bytes = {} local bytes = {}
for j = iterator, stream:len() do for j = iterator, stream:len() do
if stream:sub(j,j) == string.char(0) or stream:sub(j) == '' then if stream:sub(j, j) == string.char(0) or stream:sub(j) == "" then
break break
end end
@ -161,8 +160,8 @@ function struct.unpack(format, stream, pos)
local str = table.concat(bytes) local str = table.concat(bytes)
iterator = iterator + str:len() + 1 iterator = iterator + str:len() + 1
table.insert(vars, str) table.insert(vars, str)
elseif opt == 'c' then elseif opt == "c" then
local n = format:sub(i + 1):match('%d+') local n = format:sub(i + 1):match("%d+")
local len = tonumber(n) local len = tonumber(n)
if len <= 0 then if len <= 0 then
len = table.remove(vars) len = table.remove(vars)

9
lua/presence/discord.lua
View file

@ -66,7 +66,7 @@ function Discord:call(opcode, payload, on_response)
end) end)
-- Construct message denoting little endian, auth opcode, msg length -- Construct message denoting little endian, auth opcode, msg length
local message = struct.pack("<ii", opcode, #body)..body local message = struct.pack("<ii", opcode, #body) .. body
-- Write the message to the pipe -- Write the message to the pipe
self.pipe:write(message, function(err) self.pipe:write(message, function(err)
@ -89,7 +89,6 @@ function Discord:read_message(nonce, on_response, err, chunk)
local err_message = string.format(err_format, err) local err_message = string.format(err_format, err)
on_response(err_message) on_response(err_message)
elseif chunk then elseif chunk then
-- Strip header from the chunk -- Strip header from the chunk
local message = chunk:match("({.+)") local message = chunk:match("({.+)")
@ -164,16 +163,14 @@ end
function Discord.generate_uuid(seed) function Discord.generate_uuid(seed)
local index = 0 local index = 0
local template ="xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx" local template = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
local uuid = template:gsub("[xy]", function(char) local uuid = template:gsub("[xy]", function(char)
-- Increment an index to seed per char -- Increment an index to seed per char
index = index + 1 index = index + 1
math.randomseed((seed or os.clock()) / index) math.randomseed((seed or os.clock()) / index)
local n = char == "x" local n = char == "x" and math.random(0, 0xf) or math.random(8, 0xb)
and math.random(0, 0xf)
or math.random(8, 0xb)
return string.format("%x", n) return string.format("%x", n)
end) end)

2
lua/presence/file_assets.lua
View file

@ -230,7 +230,7 @@ return {
rb = { "Ruby", "ruby" }, rb = { "Ruby", "ruby" },
re = { "Reason", "reason" }, re = { "Reason", "reason" },
res = { "ReScript", "rescript" }, res = { "ReScript", "rescript" },
rkt = { "Racket", "racket"}, rkt = { "Racket", "racket" },
rs = { "Rust", "rust" }, rs = { "Rust", "rust" },
sass = { "Sass", "sass" }, sass = { "Sass", "sass" },
scala = { "Scala", "scala" }, scala = { "Scala", "scala" },

4
lua/presence/file_explorers.lua
View file

@ -5,6 +5,6 @@ return {
["[defx] default-"] = "Defx", ["[defx] default-"] = "Defx",
["netrw"] = "Netrw", ["netrw"] = "Netrw",
["TelescopePrompt"] = "Telescope", ["TelescopePrompt"] = "Telescope",
['neo-tree'] = 'Neotree', ["neo-tree"] = "Neotree",
['fern'] = 'Fern' ["fern"] = "Fern",
} }

162
lua/presence/init.lua
View file

@ -72,7 +72,7 @@ function Presence:setup(...)
-- Support setup invocation via both dot and colon syntax. -- Support setup invocation via both dot and colon syntax.
-- To maintain backwards compatibility, colon syntax will still -- To maintain backwards compatibility, colon syntax will still
-- be supported, but dot syntax should be recommended. -- be supported, but dot syntax should be recommended.
local args = {...} local args = { ... }
local options = args[1] local options = args[1]
if #args == 0 then if #args == 0 then
options = self options = self
@ -89,7 +89,7 @@ function Presence:setup(...)
-- Get operating system information including path separator -- Get operating system information including path separator
-- http://www.lua.org/manual/5.3/manual.html#pdf-package.config -- http://www.lua.org/manual/5.3/manual.html#pdf-package.config
local uname = vim.loop.os_uname() local uname = vim.loop.os_uname()
local separator = package.config:sub(1,1) local separator = package.config:sub(1, 1)
local wsl_distro_name = os.getenv("WSL_DISTRO_NAME") local wsl_distro_name = os.getenv("WSL_DISTRO_NAME")
local os_name = self.get_os_name(uname) local os_name = self.get_os_name(uname)
self.os = { self.os = {
@ -102,7 +102,7 @@ function Presence:setup(...)
local setup_message_fmt = "Setting up plugin for %s" local setup_message_fmt = "Setting up plugin for %s"
if self.os.name then if self.os.name then
local setup_message = self.os.is_wsl local setup_message = self.os.is_wsl
and string.format(setup_message_fmt.." in WSL (%s)", self.os.name, vim.inspect(wsl_distro_name)) and string.format(setup_message_fmt .. " in WSL (%s)", self.os.name, vim.inspect(wsl_distro_name))
or string.format(setup_message_fmt, self.os.name) or string.format(setup_message_fmt, self.os.name)
self.log:debug(setup_message) self.log:debug(setup_message)
else else
@ -116,10 +116,10 @@ function Presence:setup(...)
-- General options -- General options
self:set_option("auto_update", 1) self:set_option("auto_update", 1)
self:set_option("client_id", "793271441293967371") self:set_option("client_id", "1172122807501594644")
self:set_option("debounce_timeout", 10) self:set_option("debounce_timeout", 10)
self:set_option("main_image", "neovim")
self:set_option("neovim_image_text", "The One True Text Editor") self:set_option("neovim_image_text", "The One True Text Editor")
self:set_option("main_image", "neovim")
self:set_option("enable_line_number", false) self:set_option("enable_line_number", false)
-- Status text options -- Status text options
self:set_option("editing_text", "Editing %s") self:set_option("editing_text", "Editing %s")
@ -158,7 +158,9 @@ function Presence:setup(...)
-- Seed instance id using unique socket path -- Seed instance id using unique socket path
local seed_nums = {} local seed_nums = {}
self.socket:gsub(".", function(c) table.insert(seed_nums, c:byte()) end) self.socket:gsub(".", function(c)
table.insert(seed_nums, c:byte())
end)
self.id = self.discord.generate_uuid(tonumber(table.concat(seed_nums)) / os.clock()) self.id = self.discord.generate_uuid(tonumber(table.concat(seed_nums)) / os.clock())
self.log:debug(string.format("Using id %s", self.id)) self.log:debug(string.format("Using id %s", self.id))
@ -181,7 +183,7 @@ end
-- Normalize the OS name from uname -- Normalize the OS name from uname
function Presence.get_os_name(uname) function Presence.get_os_name(uname)
if uname.sysname:find("Windows") then if uname.sysname:find("Windows") or uname.sysname:find("MINGW") then
return "windows" return "windows"
elseif uname.sysname:find("Darwin") then elseif uname.sysname:find("Darwin") then
return "macos" return "macos"
@ -215,9 +217,7 @@ function Presence:set_option(option, default, validate)
self:check_dup_options(option) self:check_dup_options(option)
end end
self.options[option] = self.options[option] or self.options[option] = self.options[option] or vim.g[g_variable] or default
vim.g[g_variable] or
default
end end
-- Check and warn for duplicate user-defined options -- Check and warn for duplicate user-defined options
@ -321,17 +321,19 @@ function Presence:connect(on_done)
if err == "EISCONN" then if err == "EISCONN" then
self.log:info("Already connected to Discord") self.log:info("Already connected to Discord")
elseif err == "ECONNREFUSED" then elseif err == "ECONNREFUSED" then
self.log:warn("Failed to connect to Discord: "..err.." (is Discord running?)") self.log:warn("Failed to connect to Discord: " .. err .. " (is Discord running?)")
return return
elseif err then elseif err then
self.log:error("Failed to connect to Discord: "..err) self.log:error("Failed to connect to Discord: " .. err)
return return
end end
self.log:info("Connected to Discord") self.log:info("Connected to Discord")
self.is_connected = true self.is_connected = true
if on_done then on_done() end if on_done then
on_done()
end
end) end)
end end
@ -350,15 +352,22 @@ function Presence:authorize(on_done)
self.is_authorized = true self.is_authorized = true
return on_done() return on_done()
elseif err then elseif err then
self.log:error("Failed to authorize with Discord: "..err) self.log:error("Failed to authorize with Discord: " .. err)
self.is_authorized = false self.is_authorized = false
return return
end end
if not response then
self.log:info(string.format("Authorized with Discord for %s", "Response was nil"))
else
self.log:info(string.format("Authorized with Discord for %s", response.data.user.username)) self.log:info(string.format("Authorized with Discord for %s", response.data.user.username))
end
self.is_authorized = true self.is_authorized = true
if on_done then on_done() end if on_done then
on_done()
end
end) end)
end end
@ -369,18 +378,16 @@ function Presence:get_discord_socket_path()
if self.os.is_wsl then if self.os.is_wsl then
-- Use socket created by relay for WSL -- Use socket created by relay for WSL
sock_path = "/var/run/"..sock_name sock_path = "/var/run/" .. sock_name
elseif self.os.name == "windows" then elseif self.os.name == "windows" then
-- Use named pipe in NPFS for Windows -- Use named pipe in NPFS for Windows
sock_path = [[\\.\pipe\]]..sock_name sock_path = [[\\.\pipe\]] .. sock_name
elseif self.os.name == "macos" then elseif self.os.name == "macos" then
-- Use $TMPDIR for macOS -- Use $TMPDIR for macOS
local path = os.getenv("TMPDIR") local path = os.getenv("TMPDIR")
if path then if path then
sock_path = path:match("/$") sock_path = path:match("/$") and path .. sock_name or path .. "/" .. sock_name
and path..sock_name
or path.."/"..sock_name
end end
elseif self.os.name == "linux" then elseif self.os.name == "linux" then
-- Check various temp directory environment variables -- Check various temp directory environment variables
@ -391,16 +398,31 @@ function Presence:get_discord_socket_path()
"TMPDIR", "TMPDIR",
} }
local xdg_path = os.getenv("XDG_RUNTIME_DIR")
if xdg_path then
-- Append app/com.discordapp.Discord/ to the end of the path (make sure that / is at the end of xdg_path
-- before appending)
xdg_path = xdg_path and xdg_path:match("/$") and xdg_path .. "app/com.discordapp.Discord"
or xdg_path .. "/app/com.discordapp.Discord"
self.log:debug(string.format("Using XDG runtime path: %s", xdg_path))
sock_path = xdg_path:match("/$") and xdg_path .. sock_name or xdg_path .. "/" .. sock_name
-- Check if the socket path exists and if not set it to nil
sock_path = vim.fn.filereadable(sock_path) == 1 and sock_path or nil
end
-- If the socket path is still nil, check other temp directories
if not sock_path then
for i = 1, #env_vars do for i = 1, #env_vars do
local var = env_vars[i] local var = env_vars[i]
local path = os.getenv(var) local path = os.getenv(var)
if path then if path then
self.log:debug(string.format("Using runtime path: %s", path)) self.log:debug(string.format("Using runtime path: %s", path))
sock_path = path:match("/$") and path..sock_name or path.."/"..sock_name sock_path = path:match("/$") and path .. sock_name or path .. "/" .. sock_name
break break
end end
end end
end end
end
return sock_path return sock_path
end end
@ -423,9 +445,7 @@ function Presence:get_project_name(file_path)
-- TODO: Only checks for a git repository, could add more checks here -- TODO: Only checks for a git repository, could add more checks here
-- Might want to run this in a background process depending on performance -- Might want to run this in a background process depending on performance
local project_path_cmd = "git rev-parse --show-toplevel" local project_path_cmd = "git rev-parse --show-toplevel"
project_path_cmd = file_path project_path_cmd = file_path and string.format([[cd "%s" && %s]], file_path, project_path_cmd) or project_path_cmd
and string.format([[cd "%s" && %s]], file_path, project_path_cmd)
or project_path_cmd
local project_path = vim.fn.system(project_path_cmd) local project_path = vim.fn.system(project_path_cmd)
project_path = vim.trim(project_path) project_path = vim.trim(project_path)
@ -476,8 +496,8 @@ end
-- Get the status text for the current buffer -- Get the status text for the current buffer
function Presence:get_status_text(filename) function Presence:get_status_text(filename)
local file_explorer = file_explorers[vim.bo.filetype:match "[^%d]+"] local file_explorer = file_explorers[vim.bo.filetype:match("[^%d]+")]
or file_explorers[(filename or ""):match "[^%d]+"] or file_explorers[(filename or ""):match("[^%d]+")]
local plugin_manager = plugin_managers[vim.bo.filetype] local plugin_manager = plugin_managers[vim.bo.filetype]
if file_explorer then if file_explorer then
@ -486,7 +506,9 @@ function Presence:get_status_text(filename)
return self:format_status_text("plugin_manager", plugin_manager) return self:format_status_text("plugin_manager", plugin_manager)
end end
if not filename or filename == "" then return nil end if not filename or filename == "" then
return nil
end
if vim.bo.modifiable and not vim.bo.readonly then if vim.bo.modifiable and not vim.bo.readonly then
if vim.bo.filetype == "gitcommit" then if vim.bo.filetype == "gitcommit" then
@ -509,8 +531,8 @@ function Presence:get_nvim_socket_paths(on_done)
if self.os.is_wsl then if self.os.is_wsl then
-- TODO: There needs to be a better way of doing this... no support for ss/netstat? -- TODO: There needs to be a better way of doing this... no support for ss/netstat?
-- (See https://github.com/microsoft/WSL/issues/2249) -- (See https://github.com/microsoft/WSL/issues/2249)
local cmd_fmt = "for file in %s/nvim*; do echo $file/0; done" local cmd_fmt = "for file in %s/nvim*; do echo $file; done"
local shell_cmd = string.format(cmd_fmt, vim.loop.os_tmpdir() or "/tmp") local shell_cmd = string.format(cmd_fmt, vim.fn.stdpath("run") or "/tmp")
cmd = { cmd = {
"sh", "sh",
@ -536,14 +558,14 @@ function Presence:get_nvim_socket_paths(on_done)
cmd = table.concat({ cmd = table.concat({
"netstat -u", "netstat -u",
[[grep --color=never "nvim.*/0"]], [[grep -E --color=never ".+nvim.+"]],
}, "|") }, "|")
elseif self.os.name == "linux" then elseif self.os.name == "linux" then
if vim.fn.executable("ss") == 1 then if vim.fn.executable("ss") == 1 then
-- Use `ss` if available -- Use `ss` if available
cmd = table.concat({ cmd = table.concat({
"ss -lx", "ss -lx",
[[grep "nvim.*/0"]], [[grep -E ".+nvim.+"]],
}, "|") }, "|")
-- Define ss output parser -- Define ss output parser
@ -554,7 +576,7 @@ function Presence:get_nvim_socket_paths(on_done)
-- Use `netstat` if available -- Use `netstat` if available
cmd = table.concat({ cmd = table.concat({
"netstat -u", "netstat -u",
[[grep --color=never "nvim.*/0"]], [[grep -E --color=never ".+nvim.+"]],
}, "|") }, "|")
-- Define netstat output parser -- Define netstat output parser
@ -573,7 +595,9 @@ function Presence:get_nvim_socket_paths(on_done)
end end
local function handle_data(_, data) local function handle_data(_, data)
if not data then return end if not data then
return
end
for i = 1, #data do for i = 1, #data do
local socket = parser.parse and parser.parse(vim.trim(data[i])) or vim.trim(data[i]) local socket = parser.parse and parser.parse(vim.trim(data[i])) or vim.trim(data[i])
@ -584,7 +608,9 @@ function Presence:get_nvim_socket_paths(on_done)
end end
local function handle_error(_, data) local function handle_error(_, data)
if not data then return end if not data then
return
end
if data[1] ~= "" then if data[1] ~= "" then
self.log:error(string.format("Unable to get nvim socket paths: %s", data[1])) self.log:error(string.format("Unable to get nvim socket paths: %s", data[1]))
@ -613,7 +639,7 @@ function Presence.discord_event(on_ready)
return return
end end
local args = {...} local args = { ... }
local callback = function() local callback = function()
on_ready(self, unpack(args)) on_ready(self, unpack(args))
end end
@ -667,22 +693,24 @@ function Presence:check_blacklist(buffer, parent_dirpath, project_dirpath)
-- Loop over the values to see if the provided project/path is in the blacklist -- Loop over the values to see if the provided project/path is in the blacklist
for _, val in pairs(blacklist_table) do for _, val in pairs(blacklist_table) do
-- Matches buffer exactly -- Matches buffer exactly
if buffer:match(val) == buffer then return true end if buffer:match(val) == buffer then
return true
end
-- Match parent either by Lua pattern or by plain string -- Match parent either by Lua pattern or by plain string
local is_parent_directory_blacklisted = parent_dirpath and local is_parent_directory_blacklisted = parent_dirpath
((parent_dirpath:match(val) == parent_dirpath or and (
parent_dirname:match(val) == parent_dirname) or (parent_dirpath:match(val) == parent_dirpath or parent_dirname:match(val) == parent_dirname)
(parent_dirpath:find(val, nil, true) or or (parent_dirpath:find(val, nil, true) or parent_dirname:find(val, nil, true))
parent_dirname:find(val, nil, true))) )
if is_parent_directory_blacklisted then if is_parent_directory_blacklisted then
return true return true
end end
-- Match project either by Lua pattern or by plain string -- Match project either by Lua pattern or by plain string
local is_project_directory_blacklisted = project_dirpath and local is_project_directory_blacklisted = project_dirpath
((project_dirpath:match(val) == project_dirpath or and (
project_dirname:match(val) == project_dirname) or (project_dirpath:match(val) == project_dirpath or project_dirname:match(val) == project_dirname)
(project_dirpath:find(val, nil, true) or or (project_dirpath:find(val, nil, true) or project_dirname:find(val, nil, true))
project_dirname:find(val, nil, true))) )
if is_project_directory_blacklisted then if is_project_directory_blacklisted then
return true return true
end end
@ -708,9 +736,7 @@ function Presence:get_buttons(buffer, parent_dirpath)
-- Escape quotes in the file path -- Escape quotes in the file path
local path = parent_dirpath:gsub([["]], [[\"]]) local path = parent_dirpath:gsub([["]], [[\"]])
local git_url_cmd = "git config --get remote.origin.url" local git_url_cmd = "git config --get remote.origin.url"
local cmd = path local cmd = path and string.format([[cd "%s" && %s]], path, git_url_cmd) or git_url_cmd
and string.format([[cd "%s" && %s]], path, git_url_cmd)
or git_url_cmd
-- Trim and coerce empty string value to null -- Trim and coerce empty string value to null
repo_url = vim.trim(vim.fn.system(cmd)) repo_url = vim.trim(vim.fn.system(cmd))
@ -725,7 +751,6 @@ function Presence:get_buttons(buffer, parent_dirpath)
-- Default behavior to show a "View Repository" button if the repo URL is valid -- Default behavior to show a "View Repository" button if the repo URL is valid
if repo_url then if repo_url then
-- Check if repo url uses short ssh syntax -- Check if repo url uses short ssh syntax
local domain, project = repo_url:match("^git@(.+):(.+)$") local domain, project = repo_url:match("^git@(.+):(.+)$")
if domain and project then if domain and project then
@ -821,8 +846,11 @@ function Presence:update_for_buffer(buffer, should_debounce)
local file_text = description or name local file_text = description or name
local neovim_image_text = self.options.neovim_image_text local neovim_image_text = self.options.neovim_image_text
local use_file_as_main_image = self.options.main_image == "file" local use_file_as_main_image = self.options.main_image == "file"
local use_neovim_as_main_image = self.options.main_image == "neovim"
local assets = { local assets = {
large_image = use_file_as_main_image and asset_key or "neovim", large_image = use_file_as_main_image and asset_key
or use_neovim_as_main_image and "neovim"
or self.options.main_image,
large_text = use_file_as_main_image and file_text or neovim_image_text, large_text = use_file_as_main_image and file_text or neovim_image_text,
small_image = use_file_as_main_image and "neovim" or asset_key, small_image = use_file_as_main_image and "neovim" or asset_key,
small_text = use_file_as_main_image and neovim_image_text or file_text, small_text = use_file_as_main_image and neovim_image_text or file_text,
@ -881,9 +909,11 @@ function Presence:update_for_buffer(buffer, should_debounce)
if self.workspaces[project_path] then if self.workspaces[project_path] then
self.workspaces[project_path].updated_at = activity_set_at self.workspaces[project_path].updated_at = activity_set_at
activity.timestamps = self.options.show_time == 1 and { activity.timestamps = self.options.show_time == 1
and {
start = self.workspaces[project_path].started_at, start = self.workspaces[project_path].started_at,
} or nil }
or nil
else else
self.workspaces[project_path] = { self.workspaces[project_path] = {
started_at = activity_set_at, started_at = activity_set_at,
@ -936,16 +966,18 @@ end
-- Update Rich Presence for the current or provided vim buffer for an authorized connection -- Update Rich Presence for the current or provided vim buffer for an authorized connection
Presence.update = Presence.discord_event(function(self, buffer, should_debounce) Presence.update = Presence.discord_event(function(self, buffer, should_debounce)
-- Default update to not debounce by default -- Default update to not debounce by default
if should_debounce == nil then should_debounce = false end if should_debounce == nil then
should_debounce = false
end
-- Debounce Rich Presence updates (default to 10 seconds): -- Debounce Rich Presence updates (default to 10 seconds):
-- https://discord.com/developers/docs/rich-presence/how-to#updating-presence -- https://discord.com/developers/docs/rich-presence/how-to#updating-presence
local last_updated_at = self.last_activity.set_at local last_updated_at = self.last_activity.set_at
local debounce_timeout = self.options.debounce_timeout local debounce_timeout = self.options.debounce_timeout
local should_skip = local should_skip = should_debounce
should_debounce and and debounce_timeout
debounce_timeout and and last_updated_at
last_updated_at and os.time() - last_updated_at <= debounce_timeout and os.time() - last_updated_at <= debounce_timeout
if should_skip then if should_skip then
local message_fmt = "Last activity sent was within %d seconds ago, skipping..." local message_fmt = "Last activity sent was within %d seconds ago, skipping..."
@ -1034,7 +1066,7 @@ function Presence:register_and_sync_peer(id, socket)
[self.id] = { [self.id] = {
socket = self.socket, socket = self.socket,
workspace = self.workspace, workspace = self.workspace,
} },
} }
for peer_id, peer in pairs(self.peers) do for peer_id, peer in pairs(self.peers) do
if peer_id ~= id then if peer_id ~= id then
@ -1042,11 +1074,13 @@ function Presence:register_and_sync_peer(id, socket)
end end
end end
self:call_remote_method(socket, "sync_self", {{ self:call_remote_method(socket, "sync_self", {
{
last_activity = self.last_activity, last_activity = self.last_activity,
peers = peers, peers = peers,
workspaces = self.workspaces, workspaces = self.workspaces,
}}) },
})
end end
-- Register self to any remote Neovim instances -- Register self to any remote Neovim instances
@ -1124,11 +1158,13 @@ function Presence:sync_self_activity()
end end
end end
self:call_remote_method(peer.socket, "sync_peer_activity", {{ self:call_remote_method(peer.socket, "sync_peer_activity", {
{
last_activity = self.last_activity, last_activity = self.last_activity,
peers = peers, peers = peers,
workspaces = self.workspaces, workspaces = self.workspaces,
}}) },
})
end end
end end