pinokiod 3.8.1532 → 3.8.1533

package/kernel/bin/index.js

@@ -646,7 +646,6 @@ class Bin {
       this.client = null
     }
     let requirements = JSON.parse(req.params)
-    console.log({ requirements })
     for(let x=0; x<10; x++) {
       console.log(`## Install Attempt ${x}`)
       let i = 0;
@@ -717,7 +716,6 @@ class Bin {
     //  }
     //}
     if (this.kernel.shell) {
-      console.log(">>> shell reset")
       this.kernel.shell.reset()
     }
     await this.init()

package/kernel/bin/setup.js

@@ -126,5 +126,21 @@ module.exports = {
         "caddy"
       ]
     }
+  },
+  connect: (kernel) => {
+    return {
+      icon: "fa-solid fa-wifi",
+      title: "API Connect",
+      description: "Connect with 3rd party APIs",
+      requirements: [
+        { name: "conda", },
+        { name: "git", },
+        { name: "caddy", },
+      ],
+      conda_requirements: [
+        "git",
+        "caddy"
+      ]
+    }
   }
 }

package/kernel/connect/index.js

@@ -0,0 +1,25 @@
+const fetch = require('cross-fetch')
+const X = require('./providers/x')
+class Connect {
+  constructor(kernel) {
+    this.kernel = kernel
+    this.x = new X(kernel)
+  }
+  async request(provider, method, req) {
+    let res = await this[provider].request(method, req)
+    return res
+  }
+  async login(provider, req) {
+    let res = await this[provider].login(req)
+    return res
+  }
+  async logout(provider, req) {
+    let res = await this[provider].logout(req)
+    return res
+  }
+  async keys(provider) {
+    let res = await this[provider].keys()
+    return res
+  }
+}
+module.exports = Connect

package/kernel/connect/providers/github/README.md

@@ -0,0 +1,11 @@
+---
+
+# Usage
+
+When you log into Github here, the login will be used for the git installed within Pinokio.
+
+Logging into Github lets you do things like:
+
+1. Cloning from Private Repositories
+2. Publishing to Github
+3. Use all `gh` CLI commands in all Pinokio shells ([Learn more](https://cli.github.com/))

package/kernel/connect/providers/x/README.md

@@ -0,0 +1,96 @@
+---
+
+# Usage
+
+## 1. Iniitialize
+
+First include the script
+
+```html
+<script src="https://pinokio.localhost/x.js"></script>
+```
+
+Then initialize the X object
+
+```javascript
+const x = new X()
+```
+
+## 2. Make API Calls
+
+Now you can make API calls to X v2 API (Without worrying about authentication). For example:
+
+```javascript
+await x.tweet({ text: text })
+```
+
+The instantiated object `x` is equivalent to the `client.v2` object from [node-twitter-api-v2](https://github.com/PLhery/node-twitter-api-v2)
+
+Read the full API documentation here: https://github.com/PLhery/node-twitter-api-v2/blob/master/doc/v2.md
+
+---
+
+# Examples
+
+## 1. Minimal Post App
+
+The authentication is automatically taken care of. You just need to make a POST request to the `/connect/x/api` endpoint, using ANY x.com API.
+
+```html
+<html>
+  <body>
+    <form>
+      <input type='text' id='post'/>
+      <input type='submit'>
+    </form>
+    <script src="https://pinokio.localhost/x.js"></script>
+    <script>
+      const x = new X()
+      document.querySelector("form").addEventListener('submit', async (e) => {
+        e.preventDefault()
+        let text = document.querySelector("#post").value
+        await x.tweet({ text: text })
+      })
+    </script>
+  </body>
+</html>
+```
+
+---
+
+## 2. Upload Media App
+
+```html
+<html>
+  <body>
+    <form>
+      <input type='file' id='media' name='media'>
+      <input type='submit'>
+    </form>
+    <script src="https://pinokio.localhost/x.js"></script>
+    <script>
+      const x = new X()
+      document.querySelector("form").addEventListener('submit', async (e) => {
+        e.preventDefault()
+        // 1. get the uploaded file
+        let media = document.querySelector("#media").files[0]
+        // 2. determine the media_type ("tweet_gif", "tweet_image", or "tweet_video")
+        let type = media.type; // e.g., "image/png", "video/mp4", "image/gif"
+        let media_category
+        if (type.startsWith("image/")) {
+          media_category = (type === "image/gif" ? "tweet_gif" : "tweet_image");
+        } else if (type.startsWith("video/")) {
+          media_category = "tweet_video"
+        }
+        // 3. upload media
+        let media_id = await x.uploadMedia(media, { media_category })
+        // 4. post the uploaded media
+        let res = await x.tweet({ media: { media_ids: [media_id] }})
+        console.log(res)
+      })
+    </script>
+  </body>
+</html>
+```
+
+---

package/kernel/connect/providers/x/index.js

@@ -0,0 +1,152 @@
+const fs = require('fs')
+const path = require('path')
+const fetch = require('cross-fetch')
+const FormData = require('form-data');
+const marked = require('marked')
+const { TwitterApi } = require('twitter-api-v2')
+class X {
+  id = 'd2FQZ0U4NXpzYnRyS1hZeHBvbUc6MTpjaQ'
+  constructor(kernel) {
+    this.kernel = kernel
+  }
+  async readme() {
+    let md = await fs.promises.readFile(path.resolve(__dirname, "README.md"), "utf8")
+    return marked.parse(md, {
+      //baseUrl: req._parsedUrl.pathname.replace(/^\/_api/, "/raw/") + "/"
+      //baseUrl: req.originalUrl + "/"
+    })
+  }
+  async persist(auth) {
+    this.auth = auth
+    this.auth.expires_at = Date.now() + this.auth.expires_in * 1000
+    let authPath = this.kernel.path('connect/x.json')
+    await fs.promises.mkdir(this.kernel.path("connect"), { recursive: true }).catch((e) => { })
+    await fs.promises.writeFile(authPath, JSON.stringify(this.auth, null, 2))
+  }
+  async destroy() {
+    await fs.promises.rm(this.kernel.path("connect/x.json"))
+    this.auth = null
+  }
+  async sync() {
+    // check if auth exists
+    //  if not, throw error
+    let authPath = this.kernel.path('connect/x.json')
+    this.auth = (await this.kernel.loader.load(authPath)).resolved
+    if (!this.auth) {
+      throw new Error("not authenticated")
+      return
+    }
+    if (!this.auth.refresh_token) {
+      throw new Error("no refresh token")
+      return
+    }
+
+    // check if auth has expired
+    //  if expired, refresh and return
+    if (Date.now() < this.auth.expires_at) {
+      console.log("authentication valid")
+      return
+    }
+
+
+    console.log("auth expired. refresh....", JSON.stringify({ auth: this.auth, id: this.id }, null, 2))
+    // expired — refresh
+    const response = await fetch('https://api.twitter.com/2/oauth2/token', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        grant_type: 'refresh_token',
+        refresh_token: this.auth.refresh_token,
+        client_id: this.id
+      })
+    }).then((res) => {
+      return res.json()
+    });
+    await this.persist(response)
+    return this.auth
+  }
+  async keys() {
+    await this.sync()
+    return this.auth
+  }
+  async request(method, req) {
+    /*
+      method := "uploadMedia"
+      params := {
+        "value.0", val1,
+        "type.0": "String",
+        "value.1": val2,
+        "type.1": "Blob"
+      }
+
+      uploadMedia(
+        val1,
+        {
+          key2: val2,
+          key3: val3
+        }
+      )
+    */
+    await this.sync()
+    const contentType = req.headers['content-type'];
+    let args
+    if (contentType.toLowerCase() === "application/json") {
+      // don't transform
+      args = req.body
+      let response = await this.client.v2[method](...args)
+      return response
+    } else {
+      args = []
+      let body = Object.assign({}, req.body)
+      if (req.files) {
+        for (const file of req.files) {
+          body[file.fieldname] = file.buffer
+        }
+      }
+      let types = []
+      for(let key in body) {
+        let chunks = key.split(".")
+        let index = parseInt(chunks[1])
+        if (chunks[0] === "type") {
+          types[index] = body[key]
+        }
+      }
+      for(let key in body) {
+        let chunks = key.split(".")
+        let index = parseInt(chunks[1])
+        if (chunks[0] === "value") {
+          let type = types[index]
+          if (type === "Object") {
+            args[index] = JSON.parse(body[key])
+          } else {
+            args[index] = body[key]
+          }
+        }
+      }
+      console.log({ args, method })
+
+      this.client = new TwitterApi(this.auth.access_token);
+      let response = await this.client.v2[method](...args)
+      return response
+    }
+  }
+  async login (req) {
+    const authHeader = 'Basic ' + Buffer.from(`${this.id}:`).toString('base64');
+    const response = await fetch('https://api.x.com/2/oauth2/token', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+//        'Authorization': authHeader
+      },
+      body: JSON.stringify(req.payload)
+    }).then((res) => {
+      return res.json()
+    });
+    await this.persist(response)
+    return this.auth
+  }
+  async logout (req) {
+    await this.destroy() 
+  }
+}
+module.exports = X

package/kernel/index.js

@@ -33,6 +33,7 @@ const Proto = require('./prototype')
 const Router = require("./router")
 const Procs = require('./procs')
 const Peer = require('./peer')
+const Connect = require('./connect')
 //const kill = require('./tree-kill');
 const kill = require('kill-sync')
 const VARS = {
@@ -45,10 +46,6 @@ const VARS = {
 
 //const memwatch = require('@airbnb/node-memwatch');
 class Kernel {
-  //schema = ">=1.0.0"
-  //schema = "<=2.1.0"
-  //schema = "<=3.2.0"
-  //schema = "<=3.7.0"
   schema = "<=4.0.0"
   constructor(store) {
     this.fetch = fetch
@@ -81,13 +78,6 @@ class Kernel {
     this.jsdom = jsdom
     this.exposed = {}
     this.envs = {}
-//    this.info = new Info(this)
-//    this.pipe = new Pipe(this)
-//    this.proto = new Proto(this)
-//    this.processes = new Procs()
-//    this.kv = new KV(this)
-//    this.cloudflare = new Cloudflare()
-//    this.peer = new Peer()
     this.shellpath = shellPath.sync()
 
 
@@ -292,41 +282,7 @@ class Kernel {
 
       // 9. announce self to the peer network
       this.peer.announce()
-      
     }
-
-    //if (https_installed && peer_active) {
-
-    //  // 1. get the process list
-    //  await this.processes.refresh()
-
-    //  // 2. refresh peer info to reflect the proc info
-    //  await this.peer.refresh()
-
-    //  // 3. load custom routers from ~/pinokio/network
-    //  await this.router.init()
-
-    //  // 4. set current local host router info
-    //  await this.router.local()
-
-    //  // 5. refresh peer info to reflect the updated router info
-    //  await this.peer.refresh()
-
-    //  // 6. tell peers to refresh
-    //  if (notify_peers) {
-    //    await this.peer.notify_peers()
-    //  }
-
-    //  // 7. update remote router
-    //  await this.router.remote()
-
-    //  // 8. update caddy config
-    //  await this.router.update()
-
-    //  // 9. announce self to the peer network
-    //  this.peer.announce()
-
-    //}
   }
   async clearLog(group) {
     let relativePath = path.relative(this.homedir, group)
@@ -599,6 +555,7 @@ class Kernel {
     this.python = new Python(this)
     this.shell = new Shells(this)
     this.router = new Router(this)
+    this.connect = new Connect(this)
     this.system = system
     this.keys = {}
     this.memory = {

package/kernel/router/index.js

@@ -221,5 +221,15 @@ class Router {
       }
     }
   }
+  async check() {
+    try {
+      let res = await axios.get(`http://localhost:2019/config/`, {
+        timeout: 2000
+      })
+      return res.data
+    } catch (e) {
+      return null
+    }
+  }
 }
 module.exports = Router

package/kernel/shell.js

@@ -924,7 +924,6 @@ class Shell {
           this.done = false
           this.ptyProcess = pty.spawn(this.shell, this.args, config)
           this.ptyProcess.onData((data) => {
-            console.log({ data, done: this.done })
             if (!this.done) {
               this.queue.push(data)
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.8.1532",
+  "version": "3.8.1533",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -28,6 +28,7 @@
     "express-session": "^1.17.3",
     "fake-useragent": "^1.0.1",
     "fastq": "^1.15.0",
+    "form-data": "^4.0.2",
     "fs-extra": "^11.1.1",
     "glob": "^10.3.3",
     "glob-gitignore": "^1.0.14",
@@ -60,6 +61,7 @@
     "sudo-prompt-programfiles-x86": "^9.2.10",
     "symlink-dir": "^5.2.1",
     "systeminformation": "^5.18.4",
+    "twitter-api-v2": "^1.23.2",
     "uuid": "^9.0.0",
     "wait-on": "^7.2.0",
     "which": "^5.0.0",

package/script/index.js

@@ -51,6 +51,18 @@ class Store {
 const server = new Server({
   port: 41999,
   //port: 42000,
+  newsfeed: (gitRemote) => {
+    return `https://pinokiocomputer.github.io/home/item?uri=${gitRemote}&display=feed`
+  },
+  profile: (gitRemote) => {
+    return `https://pinokiocomputer.github.io/home/item?uri=${gitRemote}&display=profile`
+  },
+  site: "https://pinokiocomputer.github.io/home",
+  discover_dark: "https://pinokiocomputer.github.io/home/app",
+  discover_light: "https://pinokiocomputer.github.io/home/app",
+  portal: "https://pinokiocomputer.github.io/home/portal",
+  docs: "https://pinokiocomputer.github.io/program.pinokio.computer",
+  install: "https://pinokiocomputer.github.io/program.pinokio.computer/#/?id=install",
   agent: "web",
   store: new Store()
 })