ciorent 0.4.0 → 0.4.1

package/README.md

@@ -111,34 +111,33 @@ task1();
 co.spawn(5, task2);
 ```
 
-### Pubsub
-Pubsub allows broadcasting messages to topics that can be recieved by subscribers.
+### Semaphore
+Semaphore is a concurrency primitive used to control access to a common resource by multiple processes.
 
 ```ts
-import * as topic from 'ciorent/topic';
+import * as semaphore from 'ciorent/semaphore';
 import * as co from 'ciorent';
 
-const numbers = topic.init<number>();
+// Only allow 2 task to run concurrently
+const sem = semaphore.init(2);
 
-// Spawn 3 tasks that subscribe to the topic
-co.spawn(3, async (id) => {
-  const subscriber = topic.subscribe(numbers);
+const task = async (id: number) => {
+  // Acquire the semaphore or wait for the semaphore to be available
+  await semaphore.acquire(sem);
 
-  while (true) {
-    const msg = await topic.dispatch(subscriber);
-    if (msg == null) return;
-    console.log('Task', id, 'recieved:', msg);
-  }
-});
+  console.log('Task', id, 'started');
 
-// Publish messages to the topic
-for (let i = 0; i < 3; i++) {
-  topic.publish(numbers, i);
-  await co.nextTick;
+  // Let the main thread schedules other tasks
+  for (let i = 1; i <= 5; i++) await co.nextTick;
+
+  console.log('Task', id, 'end');
+
+  // Release the semaphore
+  semaphore.release(sem);
 }
 
-// Send undefined to every topic
-topic.flush(numbers);
+// Try to run 5 tasks concurrently
+co.spawn(5, task);
 ```
 
 ### Stream
@@ -169,35 +168,6 @@ for (let i = 0; i < 3; i++) {
 stream.flush(numbers);
 ```
 
-### Semaphore
-Semaphore is a concurrency primitive used to control access to a common resource by multiple processes.
-
-```ts
-import * as semaphore from 'ciorent/semaphore';
-import * as co from 'ciorent';
-
-// Only allow 2 task to run concurrently
-const sem = semaphore.init(2);
-
-const task = async (id: number) => {
-  // Acquire the semaphore or wait for the semaphore to be available
-  await semaphore.acquire(sem);
-
-  console.log('Task', id, 'started');
-
-  // Let the main thread schedules other tasks
-  for (let i = 1; i <= 5; i++) await co.nextTick;
-
-  console.log('Task', id, 'end');
-
-  // Release the semaphore
-  semaphore.release(sem);
-}
-
-// Try to run 5 tasks concurrently
-co.spawn(5, task);
-```
-
 ### Fibers
 Virtual threads with more controlled execution.
 

package/fiber.d.ts

@@ -6,22 +6,17 @@
  */
 export type Process<TReturn = unknown> = [
     proc: Promise<TReturn | undefined>,
-    status: 0 | 1 | 2 | 3,
-    resume: null | ((state: 1 | 3) => void),
+    status: 1 | 2 | 3,
     children: Process[]
 ];
 /**
  * Describe a fiber runtime
  */
 export type Runtime = <const TReturn, const Args extends any[]>(gen: (proc: Process<TReturn>, ...args: Args) => Generator<any, TReturn>, ...args: Args) => Process<TReturn>;
-/**
- * Check whether the fiber has been paused
- */
-export declare const paused: (t: Process) => boolean;
 /**
  * Check whether the fiber is running
  */
-export declare const resumed: (t: Process) => boolean;
+export declare const running: (t: Process) => boolean;
 /**
  * Check whether the fiber has completed
  */
@@ -40,16 +35,6 @@ export declare const fn: <const Fn extends (thread: Process, ...args: any[]) =>
  * @param g
  */
 export declare const spawn: Runtime;
-/**
- * Pause the execution of a fiber
- * @param t
- */
-export declare const pause: (t: Process) => void;
-/**
- * Resume the execution of a fiber
- * @param t
- */
-export declare const resume: (t: Process) => void;
 /**
  * Interrupt the execution of a fiber
  * @param t

package/fiber.js

@@ -1 +1 @@
-import{sleep}from"./index.js";export let paused=(t)=>t[1]===0;export let resumed=(t)=>t[1]===1;export let completed=(t)=>t[1]===2;export let interrupted=(t)=>t[1]===3;let invoke=async(g,thread)=>{await 0;try{let t=g.next();while(!t.done){let v=await t.value;if(thread[1]===0)thread[1]=await new Promise((res)=>{thread[2]=res});if(thread[1]===3)return;t=g.next(v)}thread[1]=2;return t.value}finally{if(thread[1]!==2)thread[1]=3;thread[3].forEach(interrupt)}};export let fn=(f)=>f;export let spawn=(f,...args)=>{let t=[null,1,null,[]];t[0]=invoke(f(t,...args),t);return t};export let pause=(t)=>{if(t[1]===1)t[1]=0};export let resume=(t)=>{if(t[1]===0){if(t[2]===null)t[1]=1;else t[2](1)}};export let interrupt=(t)=>{if(t[1]!==2){if(t[1]===0&&t[2]!==null)t[2](3);else t[1]=3}};export let timeout=async(t,ms)=>{await sleep(ms);interrupt(t)};export function*join(t){return yield t[0]}export let done=(t)=>t[0];export let mount=(child,parent)=>{parent[3].push(child)};export let control=(t,signal)=>{signal.addEventListener("abort",()=>{interrupt(t)})};export function*unwrap(t){return yield t}
+import{nextTick,sleep}from"./index.js";export let running=(t)=>t[1]===1;export let completed=(t)=>t[1]===2;export let interrupted=(t)=>t[1]===3;let invoke=async(g,thread)=>{await nextTick;try{let t=g.next();while(!t.done){let v=await t.value;if(thread[1]===3)return;t=g.next(v)}thread[1]=2;return t.value}finally{if(thread[1]!==2)thread[1]=3;thread[2].forEach(interrupt)}};export let fn=(f)=>f;export let spawn=(f,...args)=>{let t=[null,1,[]];t[0]=invoke(f(t,...args),t);return t};export let interrupt=(t)=>{if(t[1]!==2)t[1]=3};export let timeout=async(t,ms)=>{await sleep(ms);interrupt(t)};export function*join(t){return yield t[0]}export let done=(t)=>t[0];export let mount=(child,parent)=>{parent[2].push(child)};export let control=(t,signal)=>{signal.addEventListener("abort",()=>{interrupt(t)})};export function*unwrap(t){return yield t}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ciorent",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "A lightweight, low-overhead concurrency library",
   "homepage": "https://ciorent.netlify.app",
   "repository": {
@@ -18,11 +18,10 @@
   "main": "./index.js",
   "types": "./index.d.ts",
   "exports": {
-    "./fiber": "./fiber.js",
     "./queue": "./queue.d.ts",
     "./semaphore": "./semaphore.js",
+    "./fiber": "./fiber.js",
     "./stream": "./stream.js",
-    "./topic": "./topic.js",
     ".": "./index.js"
   }
 }

package/topic.d.ts

@@ -1,45 +0,0 @@
-/**
- * @module Pubsub
- */
-import type { PromiseFn, QueueNode } from './queue.js';
-/**
- * Describe a topic
- */
-export type Topic<T extends {} = {}> = [
-    head: QueueNode<T>,
-    callback: PromiseFn<void>,
-    resolve: (() => void) | null,
-    pending: Promise<void> | null
-];
-/**
- * Describe a subscriber
- */
-export type Subscriber<T extends {} = {}> = [
-    topic: Topic<T>,
-    tail: QueueNode<T>
-];
-/**
- * Create a topic
- */
-export declare const init: <T extends {} = {}>() => Topic<T>;
-/**
- * Publish a message to the topic
- * @param t - The topic
- * @param m - The message to publish
- */
-export declare const publish: <T extends {} = {}>(t: Topic<T>, m: T) => void;
-/**
- * Resolve all pending dispatch
- */
-export declare const flush: (t: Topic) => void;
-/**
- * Subscribe to a topic
- * @param t
- * @returns A subscriber object
- */
-export declare const subscribe: <T extends {}>(t: Topic<T>) => Subscriber<T>;
-/**
- * Wait for messages from the topic
- * @param s
- */
-export declare const dispatch: <T extends {}>(s: Subscriber<T>) => Promise<T | undefined>;

package/topic.js

@@ -1 +0,0 @@
-export let init=()=>{let t=[[null],(res)=>{t[2]=res},null,null];return t};export let publish=(t,m)=>{t[0]=t[0][0]=[null,m];t[2]?.();t[2]=null};export let flush=publish;export let subscribe=(t)=>[t,t[0]];export let dispatch=async(s)=>{if(s[1][0]===null)await(s[0][2]!==null?s[0][3]:s[0][3]=new Promise(s[0][1]));return(s[1]=s[1][0])[1]};